2331 files changed, 48245 insertions, 67663 deletions

diff --git a/.travis.yml b/.travis.yml
index 266592f40..ab3908bb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 language: c
+os:
+  - linux
+  - osx
 install:
   - |-
     path="$(pwd)"; cd;
@@ -20,4 +23,3 @@ before_script:
 script:
   - make -j2 compare
   - check_status
-
diff --git a/FAQ.md b/FAQ.md
index 26957631e..60c5bc18c 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -4,9 +4,12 @@
 ## Questions
 
 - [What is pokecrystal11.gbc?](#what-is-pokecrystal11gbc)
-- [Can't build ROM; "ERROR: `UNION` already defined"](#cant-build-rom-error-union-already-defined)
-- [Can't build ROM; "Segmentation fault" from `rgbgfx`](#cant-build-rom-segmentation-fault-from-rgbgfx)
-- [Can't build ROM; "Section is too big" or "Unable to place section in bank"](#cant-build-rom-section-is-too-big-or-unable-to-place-section-in-bank)
+- [I can't build the ROM, `make` just prints an error!](#i-cant-build-the-rom-make-just-prints-an-error)
+  - [`gcc`: command not found](#gcc-command-not-found)
+  - ["ERROR: `UNION` already defined"](#error-union-already-defined)
+  - ["Segmentation fault" from `rgbgfx`](#segmentation-fault-from-rgbgfx)
+  - ["Section is too big" or "Unable to place section in bank"](#section-is-too-big-or-unable-to-place-section-in-bank)
+  - ["Invalid file or object file version"](#invalid-file-or-object-file-version)
 - [How do I edit maps?](#how-do-i-edit-maps)
 - [How do I write new features?](#how-do-i-write-new-features)
 - [I need more help!](#i-need-more-help)
@@ -17,31 +20,41 @@
 Version 1.1 of Pokémon Crystal, which fixed some issues with the initial international release. `make crystal11` defines `_CRYSTAL11` so the assembly builds the changed version.
 
 
-## Can't build ROM; "ERROR: `UNION` already defined"
+## I can't build the ROM, `make` just prints an error!
 
-Download [**rgbds 0.3.3**][rgbds]. Earlier versions will not work.
+Reread [INSTALL.md](INSTALL.md) carefully, and make sure you're following all its steps.
 
+### `gcc`: command not found
 
-## Can't build ROM; "Segmentation fault" from `rgbgfx`
+You need to install `gcc`. If you're using Cygwin, re-run its setup, and at "Select Packages", choose to install `gcc-core`.
 
-If you are using 64-bit Windows, download [**64-bit Cygwin**][cygwin] and [**64-bit rgbds**][rgbds].
+### "ERROR: `UNION` already defined"
+
+Download [the latest **rgbds** release][rgbds]. Versions earlier than 0.3.3 will not work.
+
+### "Segmentation fault" from `rgbgfx`
 
+If you are using 64-bit Windows, download [**64-bit Cygwin**][cygwin] and [**64-bit rgbds**][rgbds].
 
-## Can't build ROM; "Section is too big" or "Unable to place section in bank"
+### "Section is too big" or "Unable to place section in bank"
 
 If you have not changed any of the asm, make sure you have the latest version of pokecrystal and the correct version of rgbds (see [INSTALL.md](INSTALL.md)).
 
-If you added or changed any code, it has to fit in the **memory banks**. The 2MB ROM is divided into 128 banks of 4KB each, numbered $00 to $7F. The linkerscript **pokecrystal.link** lists which **`SECTION`**s go in which banks. Try moving some code into a new section.
+If you added or changed any code, it has to fit in the **memory banks**. The 2MB ROM is divided into 128 banks of 4KB each, numbered $00 to $7F. The linkerscript **pokecrystal.link** lists which `SECTION`s go in which banks. Try moving some code into a new section.
+
+### "Invalid file or object file version"
+
+Run `make clean` to remove all the old `o` files, then re-run `make`.
 
 
 ## How do I edit maps?
 
-For `asm` scripts, read [docs/map_scripts.md](docs/map_scripts.md). For `blk` layouts, try [crowdmap][crowdmap] or [Polished Map][polished-map].
+For `asm` scripts, read [docs/map_event_scripts.md](docs/map_event_scripts.md). For `blk` layouts, try [Polished Map][polished-map] or [crowdmap][crowdmap].
 
 
 ## How do I write new features?
 
-There are a number of special-purpose scripting languages used for different purposes, as described in [docs](docs/). For more general features, you'll need to code directly in assembly language. See [docs/assembly_programming.md](docs/assembly_programming.md).
+There are a number of special-purpose scripting languages, as described in [docs](docs/). For more general features, you'll need to code directly in assembly language. See [docs/assembly_programming.md](docs/assembly_programming.md). Some of the [tutorials][tutorials] may also be helpful.
 
 
 ## I need more help!
@@ -50,5 +63,6 @@ Try asking on IRC or Discord (see [README.md](README.md)).
 
 [cygwin]: https://cygwin.com/install.html
 [rgbds]: https://github.com/rednex/rgbds/releases
+[polished-map]: https://github.com/Rangi42/polished-map
 [crowdmap]: https://github.com/yenatch/crowdmap/
-[polished-map]: https://github.com/roukaour/polished-map
+[tutorials]: https://github.com/pret/pokecrystal/wiki/Tutorials
diff --git a/Makefile b/Makefile
index 89d7af7a7..14235ff3b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,25 +9,20 @@ RGBFIX := rgbfix
 RGBGFX := rgbgfx
 RGBLINK := rgblink
 
-.SUFFIXES:
-.PHONY: all clean tools compare crystal crystal11
-.SECONDEXPANSION:
-.PRECIOUS:
-.SECONDARY:
-
+roms := pokecrystal.gbc pokecrystal11.gbc
 
 crystal_obj := \
 audio.o \
 home.o \
 main.o \
 wram.o \
-data/common_text/common_text.o \
-data/maps/maps.o \
+data/text/common.o \
+data/maps/map_data.o \
 data/pokemon/dex_entries.o \
 data/pokemon/egg_moves.o \
 data/pokemon/evos_attacks.o \
-engine/credits.o \
-engine/events.o \
+engine/movie/credits.o \
+engine/overworld/events.o \
 gfx/pics.o \
 gfx/sprites.o \
 lib/mobile/main.o
@@ -35,7 +30,13 @@ lib/mobile/main.o
 crystal11_obj := $(crystal_obj:.o=11.o)
 
 
-roms := pokecrystal.gbc pokecrystal11.gbc
+### Build targets
+
+.SUFFIXES:
+.PHONY: all crystal crystal11 clean compare tools
+.SECONDEXPANSION:
+.PRECIOUS:
+.SECONDARY:
 
 all: crystal
 crystal: pokecrystal.gbc
@@ -75,16 +76,16 @@ $(foreach obj, $(crystal_obj), $(eval $(call DEP,$(obj),$(obj:.o=.asm))))
 endif
 
 
-pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link
-	$(RGBLINK) -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.link -o $@ $(crystal11_obj)
-	$(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@
-	tools/sort_symfile.sh pokecrystal11.sym
-
 pokecrystal.gbc: $(crystal_obj) pokecrystal.link
 	$(RGBLINK) -n pokecrystal.sym -m pokecrystal.map -l pokecrystal.link -o $@ $(crystal_obj)
 	$(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
 	tools/sort_symfile.sh pokecrystal.sym
 
+pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link
+	$(RGBLINK) -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.link -o $@ $(crystal11_obj)
+	$(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@
+	tools/sort_symfile.sh pokecrystal11.sym
+
 
 # For files that the compressor can't match, there will be a .lz file suffixed with the md5 hash of the correct uncompressed file.
 # If the hash of the uncompressed file matches, use this .lz instead.
@@ -222,6 +223,8 @@ gfx/mobile/pichu_animated.2bpp: tools/gfx += --trim-whitespace
 gfx/unknown/unknown_egg.2bpp: rgbgfx += -h
 
 
+### Catch-all graphics rules
+
 %.bin: ;
 %.blk: ;
 
@@ -235,8 +238,6 @@ gfx/unknown/unknown_egg.2bpp: rgbgfx += -h
 	$(if $(tools/gfx),\
 		tools/gfx $(tools/gfx) -d1 -o $@ $@)
 
-%.tilemap: %.png
-	$(RGBGFX) -t $@ $<
 %.gbcpal: %.png
 	$(RGBGFX) -p $@ $<
 %.dimensions: %.png
diff --git a/README.md b/README.md
index 86b44b7ff..e5036daae 100644
--- a/README.md
+++ b/README.md
@@ -2,27 +2,31 @@
 
 This is a disassembly of Pokémon Crystal.
 
-It builds the following roms:
+It builds the following ROMs:
 
-* Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `sha1: f4cd194bdee0d04ca4eac29e09b8e4e9d818c133`
-* Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `sha1: f2f52230b536214ef7c9924f483392993e226cfb`
+- Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `sha1: f4cd194bdee0d04ca4eac29e09b8e4e9d818c133`
+- Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `sha1: f2f52230b536214ef7c9924f483392993e226cfb`
 
 To set up the repository, see [INSTALL.md](INSTALL.md).
 
 ## See also
 
-* [FAQ](FAQ.md)
-* [Documentation](docs/)
-* Disassembly of [**Pokémon Red/Blue**][pokered]
-* Disassembly of [**Pokémon Yellow**][pokeyellow]
-* Disassembly of [**Pokémon Gold**][pokegold]
-* Disassembly of [**Pokémon Pinball**][pokepinball]
-* Disassembly of [**Pokémon TCG**][poketcg]
-* Disassembly of [**Pokémon Ruby**][pokeruby]
-* Disassembly of [**Pokémon Fire Red**][pokefirered]
-* Disassembly of [**Pokémon Emerald**][pokeemerald]
-* Discord: [**pret**][Discord]
-* irc: [freenode#pret][irc]
+- [**FAQ**](FAQ.md)
+- [**Documentation**](docs/)
+- [**Wiki**][wiki] (includes [tutorials][tutorials])
+- **Discord:** [pret][discord]
+- **IRC:** [freenode#pret][irc]
+
+Other disassembly projects:
+
+- [**Pokémon Red/Blue**][pokered]
+- [**Pokémon Yellow**][pokeyellow]
+- [**Pokémon Gold**][pokegold]
+- [**Pokémon Pinball**][pokepinball]
+- [**Pokémon TCG**][poketcg]
+- [**Pokémon Ruby**][pokeruby]
+- [**Pokémon Fire Red**][pokefirered]
+- [**Pokémon Emerald**][pokeemerald]
 
 [pokered]: https://github.com/pret/pokered
 [pokeyellow]: https://github.com/pret/pokeyellow
@@ -32,7 +36,9 @@ To set up the repository, see [INSTALL.md](INSTALL.md).
 [pokeruby]: https://github.com/pret/pokeruby
 [pokefirered]: https://github.com/pret/pokefirered
 [pokeemerald]: https://github.com/pret/pokeemerald
-[Discord]: https://discord.gg/cJxDDVP
+[wiki]: https://github.com/pret/pokecrystal/wiki
+[tutorials]: https://github.com/pret/pokecrystal/wiki/Tutorials
+[discord]: https://discord.gg/cJxDDVP
 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
 [travis]: https://travis-ci.org/pret/pokecrystal
 [travis-badge]: https://travis-ci.org/pret/pokecrystal.svg?branch=master
diff --git a/audio.asm b/audio.asm
index cecbdae5b..601b49820 100644
--- a/audio.asm
+++ b/audio.asm
@@ -11,7 +11,6 @@ INCLUDE "audio/cry_pointers.asm"
 INCLUDE "audio/sfx_pointers.asm"
 
 
-
 SECTION "Songs 1", ROMX
 
 INCLUDE "audio/music/route36.asm"
@@ -130,7 +129,6 @@ INCLUDE "audio/music/battletowerlobby.asm"
 INCLUDE "audio/music/mobilecenter.asm"
 
 
-
 SECTION "Extra Songs 1", ROMX
 
 INCLUDE "audio/music/credits.asm"
@@ -143,7 +141,6 @@ SECTION "Extra Songs 2", ROMX
 INCLUDE "audio/music/postcredits.asm"
 
 
-
 SECTION "Sound Effects", ROMX
 
 INCLUDE "audio/sfx.asm"
@@ -154,7 +151,6 @@ SECTION "Crystal Sound Effects", ROMX
 INCLUDE "audio/sfx_crystal.asm"
 
 
-
 SECTION "Cries", ROMX
 
 INCLUDE "data/pokemon/cries.asm"
diff --git a/audio/cries.asm b/audio/cries.asm
index 7848d185e..b8d9d2145 100644
--- a/audio/cries.asm
+++ b/audio/cries.asm
@@ -1,178 +1,148 @@
-Cry_Marill: ; f2d81
+Cry_Marill:
 	musicheader 3, 5, Cry_Marill_Ch5
 	musicheader 1, 6, Cry_Marill_Ch6
 	musicheader 1, 8, Cry_Marill_Ch8
-; f2d8a
 
-Cry_Togepi: ; f2d8a
+Cry_Togepi:
 	musicheader 2, 5, Cry_Togepi_Ch5
 	musicheader 1, 6, Cry_Togepi_Ch6
-; f2d90
 
-Cry_Togetic: ; f2d90
+Cry_Togetic:
 	musicheader 2, 5, Cry_Togetic_Ch5
 	musicheader 1, 6, Cry_Togetic_Ch6
-; f2d96
 
-Cry_Spinarak: ; f2d96
+Cry_Spinarak:
 	musicheader 3, 5, Cry_Spinarak_Ch5
 	musicheader 1, 6, Cry_Spinarak_Ch6
 	musicheader 1, 8, Cry_Spinarak_Ch8
-; f2d9f
 
-Cry_Raikou: ; f2d9f
+Cry_Raikou:
 	musicheader 3, 5, Cry_Raikou_Ch5
 	musicheader 1, 6, Cry_Raikou_Ch6
 	musicheader 1, 8, Cry_Raikou_Ch8
-; f2da8
 
-Cry_Hoothoot: ; f2da8
+Cry_Hoothoot:
 	musicheader 3, 5, Cry_Hoothoot_Ch5
 	musicheader 1, 6, Cry_Hoothoot_Ch6
 	musicheader 1, 8, Cry_Hoothoot_Ch8
-; f2db1
 
-Cry_Sentret: ; f2db1
+Cry_Sentret:
 	musicheader 2, 5, Cry_Sentret_Ch5
 	musicheader 1, 6, Cry_Sentret_Ch6
-; f2db7
 
-Cry_Slowking: ; f2db7
+Cry_Slowking:
 	musicheader 3, 5, Cry_Slowking_Ch5
 	musicheader 1, 6, Cry_Slowking_Ch6
 	musicheader 1, 8, Cry_Slowking_Ch8
-; f2dc0
 
-Cry_Mareep: ; f2dc0
+Cry_Mareep:
 	musicheader 2, 5, Cry_Mareep_Ch5
 	musicheader 1, 6, Cry_Mareep_Ch6
-; f2dc6
 
-Cry_Cyndaquil: ; f2dc6
+Cry_Cyndaquil:
 	musicheader 3, 5, Cry_Cyndaquil_Ch5
 	musicheader 1, 6, Cry_Cyndaquil_Ch6
 	musicheader 1, 8, Cry_Cyndaquil_Ch8
-; f2dcf
 
-Cry_Chikorita: ; f2dcf
+Cry_Chikorita:
 	musicheader 3, 5, Cry_Chikorita_Ch5
 	musicheader 1, 6, Cry_Chikorita_Ch6
 	musicheader 1, 8, Cry_Chikorita_Ch8
-; f2dd8
 
-Cry_Gligar: ; f2dd8
+Cry_Gligar:
 	musicheader 2, 5, Cry_Gligar_Ch5
 	musicheader 1, 8, Cry_Gligar_Ch8
-; f2dde
 
-Cry_Girafarig: ; f2dde
+Cry_Girafarig:
 	musicheader 3, 5, Cry_Girafarig_Ch5
 	musicheader 1, 6, Cry_Girafarig_Ch6
 	musicheader 1, 8, Cry_Girafarig_Ch8
-; f2de7
 
-Cry_Slugma: ; f2de7
+Cry_Slugma:
 	musicheader 2, 5, Cry_Slugma_Ch5
 	musicheader 1, 8, Cry_Slugma_Ch8
-; f2ded
 
-Cry_Ledyba: ; f2ded
+Cry_Ledyba:
 	musicheader 3, 5, Cry_Ledyba_Ch5
 	musicheader 1, 6, Cry_Ledyba_Ch6
 	musicheader 1, 8, Cry_Ledyba_Ch8
-; f2df6
 
-Cry_Wooper: ; f2df6
+Cry_Wooper:
 	musicheader 3, 5, Cry_Wooper_Ch5
 	musicheader 1, 6, Cry_Wooper_Ch6
 	musicheader 1, 8, Cry_Wooper_Ch8
-; f2dff
 
-Cry_Donphan: ; f2dff
+Cry_Donphan:
 	musicheader 3, 5, Cry_Donphan_Ch5
 	musicheader 1, 6, Cry_Donphan_Ch6
 	musicheader 1, 8, Cry_Donphan_Ch8
-; f2e08
 
-Cry_Typhlosion: ; f2e08
+Cry_Typhlosion:
 	musicheader 3, 5, Cry_Typhlosion_Ch5
 	musicheader 1, 6, Cry_Typhlosion_Ch6
 	musicheader 1, 8, Cry_Typhlosion_Ch8
-; f2e11
 
-Cry_Natu: ; f2e11
+Cry_Natu:
 	musicheader 3, 5, Cry_Natu_Ch5
 	musicheader 1, 6, Cry_Natu_Ch6
 	musicheader 1, 8, Cry_Natu_Ch8
-; f2e1a
 
-Cry_Teddiursa: ; f2e1a
+Cry_Teddiursa:
 	musicheader 3, 5, Cry_Teddiursa_Ch5
 	musicheader 1, 6, Cry_Teddiursa_Ch6
 	musicheader 1, 8, Cry_Teddiursa_Ch8
-; f2e23
 
-Cry_Sunflora: ; f2e23
+Cry_Sunflora:
 	musicheader 3, 5, Cry_Sunflora_Ch5
 	musicheader 1, 6, Cry_Sunflora_Ch6
 	musicheader 1, 8, Cry_Sunflora_Ch8
-; f2e2c
 
-Cry_Ampharos: ; f2e2c
+Cry_Ampharos:
 	musicheader 3, 5, Cry_Ampharos_Ch5
 	musicheader 1, 6, Cry_Ampharos_Ch6
 	musicheader 1, 8, Cry_Ampharos_Ch8
-; f2e35
 
-Cry_Totodile: ; f2e35
+Cry_Totodile:
 	musicheader 3, 5, Cry_Totodile_Ch5
 	musicheader 1, 6, Cry_Totodile_Ch6
 	musicheader 1, 8, Cry_Totodile_Ch8
-; f2e3e
 
-Cry_Cleffa: ; f2e3e
+Cry_Cleffa:
 	musicheader 3, 5, Cry_Cleffa_Ch5
 	musicheader 1, 6, Cry_Cleffa_Ch6
 	musicheader 1, 8, Cry_Cleffa_Ch8
-; f2e47
 
-Cry_Pichu: ; f2e47
+Cry_Pichu:
 	musicheader 3, 5, Cry_Pichu_Ch5
 	musicheader 1, 6, Cry_Pichu_Ch6
 	musicheader 1, 8, Cry_Pichu_Ch8
-; f2e50
 
-Cry_Aipom: ; f2e50
+Cry_Aipom:
 	musicheader 3, 5, Cry_Aipom_Ch5
 	musicheader 1, 6, Cry_Aipom_Ch6
 	musicheader 1, 8, Cry_Aipom_Ch8
-; f2e59
 
-Cry_Dunsparce: ; f2e59
+Cry_Dunsparce:
 	musicheader 3, 5, Cry_Dunsparce_Ch5
 	musicheader 1, 6, Cry_Dunsparce_Ch6
 	musicheader 1, 8, Cry_Dunsparce_Ch8
-; f2e62
 
-Cry_Magcargo: ; f2e62
+Cry_Magcargo:
 	musicheader 3, 5, Cry_Magcargo_Ch5
 	musicheader 1, 6, Cry_Magcargo_Ch6
 	musicheader 1, 8, Cry_Magcargo_Ch8
-; f2e6b
 
-Cry_Entei: ; f2e6b
+Cry_Entei:
 	musicheader 3, 5, Cry_Entei_Ch5
 	musicheader 1, 6, Cry_Entei_Ch6
 	musicheader 1, 8, Cry_Entei_Ch8
-; f2e74
 
-Cry_Mantine: ; f2e74
+Cry_Mantine:
 	musicheader 3, 5, Cry_Mantine_Ch5
 	musicheader 1, 6, Cry_Mantine_Ch6
 	musicheader 1, 8, Cry_Mantine_Ch8
-; f2e7d
 
-Cry_Entei_Ch5: ; f2e7d
+Cry_Entei_Ch5:
 	soundinput $ff
 	sound_duty 3, 0, 2, 1
 	sound __,  2, $f8, $05f8
@@ -181,26 +151,23 @@ Cry_Entei_Ch5: ; f2e7d
 	sound C_,  5, $f2, $0574
 	soundinput $88
 	endchannel
-; f2e94
 
-Cry_Entei_Ch6: ; f2e94
+Cry_Entei_Ch6:
 	sound_duty 3, 0, 3, 0
 	sound __,  2, $c8, $0640
 	sound __,  7, $ff, $0668
 	sound __,  8, $a8, $0534
 	sound C_,  5, $a2, $04a4
 	endchannel
-; f2ea7
 
-Cry_Entei_Ch8: ; f2ea7
+Cry_Entei_Ch8:
 	noise __, 11, $d6, $6a
 	noise __,  7, $bc, $6c
 	noise __,  7, $e2, $5c
 	noise C#,  1, $b4, $6c
 	endchannel
-; f2eb4
 
-Cry_Magcargo_Ch5: ; f2eb4
+Cry_Magcargo_Ch5:
 	sound_duty 0, 1, 0, 3
 	sound __,  5, $af, $0720
 	sound __,  3, $f8, $071c
@@ -210,9 +177,8 @@ Cry_Magcargo_Ch5: ; f2eb4
 	sound __, 13, $c8, $0712
 	sound __,  5, $91, $070e
 	endchannel
-; f2ed3
 
-Cry_Magcargo_Ch6: ; f2ed3
+Cry_Magcargo_Ch6:
 	sound_duty 2, 2, 0, 0
 	sound __,  2, $b8, $0710
 	sound __,  4, $d8, $072c
@@ -222,19 +188,17 @@ Cry_Magcargo_Ch6: ; f2ed3
 	sound __, 13, $f8, $0760
 	sound __,  5, $c1, $0750
 	endchannel
-; f2ef2
 
-Cry_Magcargo_Ch8: ; f2ef2
+Cry_Magcargo_Ch8:
 	noise __,  3, $e8, $3b
-Cry_Magcargo_branch_f2ef5: ; f2ef5
+.loop
 	noise __,  2, $f1, $4e
-	loopchannel 5, Cry_Magcargo_branch_f2ef5
+	loopchannel 5, .loop
 	noise __,  3, $d8, $3f
 	noise C_,  5, $c2, $5f
 	endchannel
-; f2f03
 
-Cry_Dunsparce_Ch5: ; f2f03
+Cry_Dunsparce_Ch5:
 	sound_duty 2, 0, 2, 0
 	sound __,  2, $f8, $05b0
 	sound __,  2, $f8, $04b4
@@ -246,23 +210,20 @@ Cry_Dunsparce_Ch5: ; f2f03
 	sound C_,  1, $c3, $0490
 	soundinput $88
 	endchannel
-; f2f26
 
-Cry_Dunsparce_Ch6: ; f2f26
+Cry_Dunsparce_Ch6:
 	sound_duty 2, 0, 2, 0
 	sound __,  9, $b8, $04c8
 	sound C#,  1, $b5, $0410
 	endchannel
-; f2f31
 
-Cry_Dunsparce_Ch8: ; f2f31
+Cry_Dunsparce_Ch8:
 	noise __,  4, $ff, $4b
 	noise __,  4, $ef, $4c
 	noise C#,  1, $b5, $5f
 	endchannel
-; f2f3b
 
-Cry_Slowking_Ch5: ; f2f3b
+Cry_Slowking_Ch5:
 	sound_duty 3, 0, 3, 0
 	sound __,  3, $f1, $0550
 	sound __,  3, $f1, $0530
@@ -272,9 +233,8 @@ Cry_Slowking_Ch5: ; f2f3b
 	sound __,  3, $f2, $0630
 	sound C_,  1, $f2, $0550
 	endchannel
-; f2f5a
 
-Cry_Slowking_Ch6: ; f2f5a
+Cry_Slowking_Ch6:
 	sound_duty 2, 0, 3, 3
 	sound __,  5, $e1, $0620
 	sound __,  6, $e2, $0500
@@ -282,9 +242,8 @@ Cry_Slowking_Ch6: ; f2f5a
 	sound __,  3, $e1, $0520
 	sound C_,  1, $e2, $0500
 	endchannel
-; f2f71
 
-Cry_Slowking_Ch8: ; f2f71
+Cry_Slowking_Ch8:
 	noise __,  3, $8a, $5d
 	noise __,  3, $9a, $4c
 	noise __,  6, $9a, $5d
@@ -294,9 +253,8 @@ Cry_Slowking_Ch8: ; f2f71
 	noise __,  3, $9a, $5f
 	noise C_,  1, $b2, $6f
 	endchannel
-; f2f8a
 
-Cry_Pichu_Ch5: ; f2f8a
+Cry_Pichu_Ch5:
 	dutycycle $0
 	soundinput $f7
 	sound __,  3, $f8, $078d
@@ -309,9 +267,8 @@ Cry_Pichu_Ch5: ; f2f8a
 	sound __,  3, $f8, $07b8
 	soundinput $88
 	endchannel
-; f2fab
 
-Cry_Pichu_Ch6: ; f2fab
+Cry_Pichu_Ch6:
 	sound_duty 0, 0, 1, 0
 	sound __,  3, $c8, $076d
 	sound __,  3, $c8, $0771
@@ -319,18 +276,16 @@ Cry_Pichu_Ch6: ; f2fab
 	sound __,  3, $c8, $0794
 	sound __,  3, $c8, $0798
 	endchannel
-; f2fc2
 
-Cry_Pichu_Ch8: ; f2fc2
+Cry_Pichu_Ch8:
 	noise __,  3, $b8, $1
 	noise __,  3, $b8, $19
 	noise __,  3, $c8, $18
 	noise __,  3, $b8, $10
 	noise __,  9, $c2, $18
 	endchannel
-; f2fd2
 
-Cry_Marill_Ch5: ; f2fd2
+Cry_Marill_Ch5:
 	sound_duty 2, 0, 2, 0
 	sound __,  3, $88, $06d8
 	sound __,  9, $e2, $06e0
@@ -340,9 +295,8 @@ Cry_Marill_Ch5: ; f2fd2
 	sound __,  3, $d8, $06b0
 	sound __,  9, $c1, $06aa
 	endchannel
-; f2ff1
 
-Cry_Marill_Ch6: ; f2ff1
+Cry_Marill_Ch6:
 	sound_duty 3, 0, 2, 1
 	sound __,  3, $68, $06b1
 	sound __,  6, $c1, $06b9
@@ -351,9 +305,8 @@ Cry_Marill_Ch6: ; f2ff1
 	sound __,  3, $a8, $0684
 	sound __, 11, $92, $067b
 	endchannel
-; f300c
 
-Cry_Marill_Ch8: ; f300c
+Cry_Marill_Ch8:
 	noise __,  2, $99, $6c
 	noise __,  2, $92, $5c
 	noise __, 11, $62, $4c
@@ -361,58 +314,51 @@ Cry_Marill_Ch8: ; f300c
 	noise __,  3, $68, $6b
 	noise __, 11, $62, $6c
 	endchannel
-; f301f
 
-Cry_Togepi_Ch5: ; f301f
+Cry_Togepi_Ch5:
 	tone $0002
-Cry_Togepi_Ch6: ; f3022
-Cry_Togetic_branch_f3022: ; f3022
+Cry_Togepi_Ch6:
+Cry_Togetic_branch_f3022:
 	sound_duty 2, 0, 1, 1
 	sound __,  5, $f1, $0796
 	sound __,  5, $f1, $072d
 	sound __,  8, $0, 0
 	sound C_,  1, $f1, $07a7
 	endchannel
-; f3035
 
-Cry_Togetic_Ch5: ; f3035
+Cry_Togetic_Ch5:
 	tone $0002
-Cry_Togetic_Ch6: ; f3038
-Cry_Togetic_branch_f3038: ; f3038
+Cry_Togetic_Ch6:
 	callchannel Cry_Togetic_branch_f3022
-	loopchannel 2, Cry_Togetic_branch_f3038
+	loopchannel 2, Cry_Togetic_Ch6
 	sound __, 15, $0, 0
 	sound __,  9, $f2, $07c2
 	endchannel
-; f3048
 
-Cry_Spinarak_Ch5: ; f3048
+Cry_Spinarak_Ch5:
 	dutycycle $1
 	sound __,  4, $2c, $07c4
 	sound __,  2, $0, $0001
 	sound __,  6, $59, $07b9
 	sound __,  7, $b4, $07bb
 	endchannel
-; f305b
 
-Cry_Spinarak_Ch6: ; f305b
+Cry_Spinarak_Ch6:
 	sound_duty 2, 2, 2, 0
 	sound __,  4, $2c, $07c7
 	sound __,  2, $0, 0
 	sound __,  6, $59, $07be
 	sound __,  7, $b4, $07bd
 	endchannel
-; f306e
 
-Cry_Spinarak_Ch8: ; f306e
+Cry_Spinarak_Ch8:
 	noise __,  4, $92, $10
 	noise __,  2, $39, $0
 	noise __,  6, $69, $10
 	noise __,  7, $93, $0
 	endchannel
-; f307b
 
-Cry_Raikou_Ch5: ; f307b
+Cry_Raikou_Ch5:
 	sound_duty 0, 2, 3, 3
 	sound __,  3, $f1, $04b0
 	sound __,  3, $f7, $0590
@@ -422,9 +368,8 @@ Cry_Raikou_Ch5: ; f307b
 	sound __,  4, $f2, $06b0
 	sound C_,  1, $f2, $0690
 	endchannel
-; f309a
 
-Cry_Raikou_Ch6: ; f309a
+Cry_Raikou_Ch6:
 	sound_duty 2, 0, 3, 3
 	sound __,  3, $f1, $0720
 	sound __,  3, $e1, $0650
@@ -435,9 +380,8 @@ Cry_Raikou_Ch6: ; f309a
 	sound __,  4, $f2, $0690
 	sound C_,  1, $e2, $06a0
 	endchannel
-; f30bd
 
-Cry_Raikou_Ch8: ; f30bd
+Cry_Raikou_Ch8:
 	noise __,  3, $89, $2e
 	noise __,  3, $99, $1f
 	noise __,  5, $89, $4e
@@ -447,9 +391,8 @@ Cry_Raikou_Ch8: ; f30bd
 	noise __,  4, $ec, $4d
 	noise C_,  1, $d2, $4f
 	endchannel
-; f30d6
 
-Cry_Hoothoot_Ch5: ; f30d6
+Cry_Hoothoot_Ch5:
 	sound_duty 2, 1, 2, 1
 	sound __,  5, $78, $0650
 	sound __,  5, $f8, $0660
@@ -460,92 +403,82 @@ Cry_Hoothoot_Ch5: ; f30d6
 	sound __,  5, $f8, $0678
 	sound __,  5, $f1, $0674
 	endchannel
-; f30f9
 
-Cry_Hoothoot_Ch6: ; f30f9
+Cry_Hoothoot_Ch6:
 	sound_duty 2, 0, 2, 0
-Cry_Hoothoot_branch_f30fb: ; f30fb
+.loop1
 	sound __,  3, $a1, $0600
-	loopchannel 3, Cry_Hoothoot_branch_f30fb
-Cry_Hoothoot_branch_f3103: ; f3103
+	loopchannel 3, .loop1
+.loop2
 	sound __,  3, $a1, $0630
-	loopchannel 4, Cry_Hoothoot_branch_f3103
+	loopchannel 4, .loop2
 	sound __,  5, $a2, $0634
 	sound __,  5, $91, $0638
 	endchannel
-; f3114
 
-Cry_Hoothoot_Ch8: ; f3114
+Cry_Hoothoot_Ch8:
 	noise __,  2, $68, $36
 	noise C_,  1, $88, $6a
 	noise __,  2, $98, $5e
 	noise C_,  1, $a7, $6e
 	endchannel
-; f3121
 
-Cry_Sentret_Ch5: ; f3121
+Cry_Sentret_Ch5:
 	tone $0020
 	dutycycle $0
 	jumpchannel Cry_Sentret_branch_f312b
-; f3129
 
-Cry_Sentret_Ch6: ; f3129
+Cry_Sentret_Ch6:
 	sound_duty 3, 2, 1, 0
-Cry_Sentret_branch_f312b: ; f312b
+Cry_Sentret_branch_f312b:
 	sound __,  9, $39, $072d
 	sound __,  9, $f1, $0720
 	endchannel
-; f3134
 
-Cry_Sentret_Ch8: ; f3134
+Cry_Sentret_Ch8:
 	noise __,  9, $3b, $0
 	noise __,  9, $92, $0
 	endchannel
-; f313b
 
-Cry_Mareep_Ch5: ; f313b
+Cry_Mareep_Ch5:
 	tone $0020
 	dutycycle $0
 	jumpchannel Cry_Mareep_branch_f3145
-; f3143
 
-Cry_Mareep_Ch6: ; f3143
+Cry_Mareep_Ch6:
 	sound_duty 1, 0, 0, 0
-Cry_Mareep_branch_f3145: ; f3145
-Cry_Gligar_branch_f3145: ; f3145
+Cry_Mareep_branch_f3145:
+Cry_Gligar_branch_f3145:
 	sound __,  5, $3a, $073d
 	sound __,  7, $f8, $0762
 	sound __,  7, $f8, $0760
 	sound __,  7, $f1, $075e
 	endchannel
-; f3156
 
-Cry_Cyndaquil_Ch5: ; f3156
+Cry_Cyndaquil_Ch5:
 	tone $0020
-Cry_Cyndaquil_Ch6: ; f3159
+Cry_Cyndaquil_Ch6:
 	dutycycle $2
 	sound __,  9, $2f, $0107
-Cry_Cyndaquil_branch_f315f: ; f315f
+.loop1
 	sound __,  1, $e1, $0483
 	sound __,  1, $51, $044e
-	loopchannel 4, Cry_Cyndaquil_branch_f315f
-Cry_Cyndaquil_branch_f316b: ; f316b
+	loopchannel 4, .loop1
+.loop2
 	sound __,  1, $e1, $03da
 	sound __,  2, $51, $0312
-	loopchannel 4, Cry_Cyndaquil_branch_f316b
+	loopchannel 4, .loop2
 	endchannel
-; f3178
 
-Cry_Cyndaquil_Ch8: ; f3178
-Cry_Gligar_Ch8: ; f3178
+Cry_Cyndaquil_Ch8:
+Cry_Gligar_Ch8:
 	noise __,  9, $3f, $52
 	noise C#,  1, $93, $4f
 	endchannel
-; f317f
 
-Cry_Chikorita_Ch5: ; f317f
+Cry_Chikorita_Ch5:
 	tone $0020
-Cry_Chikorita_Ch6: ; f3182
+Cry_Chikorita_Ch6:
 	sound_duty 1, 0, 2, 0
 	sound __,  3, $c8, $0641
 	sound __,  3, $48, $0641
@@ -553,46 +486,40 @@ Cry_Chikorita_Ch6: ; f3182
 	sound __,  5, $f8, $078e
 	sound __,  5, $f1, $078b
 	endchannel
-; f3199
 
-Cry_Chikorita_Ch8: ; f3199
+Cry_Chikorita_Ch8:
 	noise __,  5, $91, $10
 	noise __,  9, $94, $3
 	endchannel
-; f31a0
 
-Cry_Gligar_Ch5: ; f31a0
+Cry_Gligar_Ch5:
 	sound_duty 2, 0, 2, 2
 	jumpchannel Cry_Gligar_branch_f3145
-; f31a5
 
-Cry_Girafarig_Ch5: ; f31a5
+Cry_Girafarig_Ch5:
 	dutycycle $1
 	tone $0004
 	jumpchannel Cry_Girafarig_branch_f31af
-; f31ad
 
-Cry_Girafarig_Ch6: ; f31ad
+Cry_Girafarig_Ch6:
 	sound_duty 1, 0, 0, 1
-Cry_Girafarig_branch_f31af: ; f31af
+Cry_Girafarig_branch_f31af:
 	sound __,  5, $68, $0758
 	sound __,  3, $e8, $0760
 	sound __,  3, $e8, $0767
 	sound __,  3, $e8, $076c
 	sound __,  8, $f1, $0767
 	endchannel
-; f31c4
 
-Cry_Girafarig_Ch8: ; f31c4
+Cry_Girafarig_Ch8:
 	noise __,  5, $29, $0
 	noise __,  3, $39, $1
 	noise __,  3, $49, $2
 	noise __,  3, $59, $1
 	noise __,  8, $41, $0
 	endchannel
-; f31d4
 
-Cry_Slugma_Ch5: ; f31d4
+Cry_Slugma_Ch5:
 	sound_duty 1, 0, 1, 2
 	sound __, 13, $f2, $07a6
 	sound __,  5, $f8, $07b0
@@ -600,25 +527,22 @@ Cry_Slugma_Ch5: ; f31d4
 	sound __,  7, $f8, $03a0
 	sound __,  9, $e1, $0290
 	endchannel
-; f31eb
 
-Cry_Slugma_Ch8: ; f31eb
+Cry_Slugma_Ch8:
 	noise __, 13, $b2, $50
 	noise __,  9, $a8, $60
 	noise __,  7, $a8, $5b
 	noise __,  9, $a1, $5c
 	endchannel
-; f31f8
 
-Cry_Ledyba_Ch5: ; f31f8
+Cry_Ledyba_Ch5:
 	tone $0002
 	dutycycle $2
 	jumpchannel Cry_Ledyba_branch_f3202
-; f3200
 
-Cry_Ledyba_Ch6: ; f3200
+Cry_Ledyba_Ch6:
 	sound_duty 1, 0, 0, 0
-Cry_Ledyba_branch_f3202: ; f3202
+Cry_Ledyba_branch_f3202:
 	sound __,  4, $f8, $0791
 	sound __,  4, $d8, $078d
 	sound __,  3, $0, 0
@@ -626,9 +550,8 @@ Cry_Ledyba_branch_f3202: ; f3202
 	sound __,  2, $f8, $0741
 	sound __,  5, $e1, $0751
 	endchannel
-; f321b
 
-Cry_Ledyba_Ch8: ; f321b
+Cry_Ledyba_Ch8:
 	noise __,  4, $59, $21
 	noise __,  4, $81, $0
 	noise __,  3, $20, $0
@@ -636,10 +559,9 @@ Cry_Ledyba_Ch8: ; f321b
 	noise __,  2, $80, $10
 	noise __,  5, $87, $0
 	endchannel
-; f322e
 
-Cry_Wooper_Ch5: ; f322e
-Cry_Donphan_Ch5: ; f322e
+Cry_Wooper_Ch5:
+Cry_Donphan_Ch5:
 	dutycycle $2
 	sound __,  3, $99, $0718
 	sound __,  5, $ab, $0722
@@ -648,10 +570,9 @@ Cry_Donphan_Ch5: ; f322e
 	sound __,  9, $d1, $0712
 	sound __,  9, $0, 0
 	endchannel
-; f3249
 
-Cry_Wooper_Ch6: ; f3249
-Cry_Donphan_Ch6: ; f3249
+Cry_Wooper_Ch6:
+Cry_Donphan_Ch6:
 	sound_duty 3, 1, 0, 0
 	sound __,  3, $b9, $0738
 	sound __,  5, $cb, $0742
@@ -660,57 +581,48 @@ Cry_Donphan_Ch6: ; f3249
 	sound __,  9, $f1, $0732
 	sound __,  9, $0, 0
 	endchannel
-; f3264
 
-Cry_Wooper_Ch8: ; f3264
+Cry_Wooper_Ch8:
 	noise __,  3, $5b, $4
 	noise __,  5, $68, $13
 	noise __,  9, $68, $20
 	noise __,  5, $68, $13
 	noise C_,  1, $51, $4
 	endchannel
-; f3274
 
-Cry_Donphan_Ch8: ; f3274
+Cry_Donphan_Ch8:
 	noise __,  3, $8b, $59
 	noise __,  5, $a8, $6a
 	noise __,  9, $a8, $70
 	noise __,  5, $a8, $69
 	noise C_,  1, $92, $6c
 	endchannel
-; f3284
 
-Cry_Typhlosion_Ch5: ; f3284
-Cry_Teddiursa_Ch5: ; f3284
+Cry_Typhlosion_Ch5:
+Cry_Teddiursa_Ch5:
 	sound_duty 2, 0, 1, 0
-Cry_Typhlosion_branch_f3286: ; f3286
-Cry_Teddiursa_branch_f3286: ; f3286
+.loop1
 	sound __,  4, $c1, $0791
-	loopchannel 3, Cry_Typhlosion_branch_f3286
-Cry_Typhlosion_branch_f328e: ; f328e
-Cry_Teddiursa_branch_f328e: ; f328e
+	loopchannel 3, .loop1
+.loop2
 	sound __,  4, $d1, $04b1
-	loopchannel 6, Cry_Typhlosion_branch_f328e
-Cry_Typhlosion_branch_f3296: ; f3296
-Cry_Teddiursa_branch_f3296: ; f3296
+	loopchannel 6, .loop2
+.loop3
 	sound __,  2, $d1, $0491
 	sound __,  2, $b1, $0451
-	loopchannel 6, Cry_Typhlosion_branch_f3296
-Cry_Typhlosion_branch_f32a2: ; f32a2
-Cry_Teddiursa_branch_f32a2: ; f32a2
+	loopchannel 6, .loop3
+.loop4
 	sound __,  2, $a3, $0471
 	sound __,  2, $81, $0441
-	loopchannel 6, Cry_Typhlosion_branch_f32a2
-Cry_Typhlosion_branch_f32ae: ; f32ae
-Cry_Teddiursa_branch_f32ae: ; f32ae
+	loopchannel 6, .loop4
+.loop5
 	sound __,  2, $41, $0421
 	sound __,  2, $21, $0401
-	loopchannel 4, Cry_Typhlosion_branch_f32ae
+	loopchannel 4, .loop5
 	endchannel
-; f32bb
 
-Cry_Typhlosion_Ch6: ; f32bb
-Cry_Teddiursa_Ch6: ; f32bb
+Cry_Typhlosion_Ch6:
+Cry_Teddiursa_Ch6:
 	sound_duty 0, 2, 3, 1
 	sound __,  9, $99, $0740
 	sound __,  9, $79, $0746
@@ -720,101 +632,90 @@ Cry_Teddiursa_Ch6: ; f32bb
 	sound __,  9, $f8, $0787
 	sound C_,  9, $e2, $0783
 	endchannel
-; f32da
 
-Cry_Typhlosion_Ch8: ; f32da
+Cry_Typhlosion_Ch8:
 	noise C_,  1, $a6, $16
 	noise C_,  9, $98, $3d
 	noise C#,  1, $98, $5c
 	noise C#,  1, $75, $5f
 	endchannel
-; f32e7
 
-Cry_Natu_Ch5: ; f32e7
+Cry_Natu_Ch5:
 	sound_duty 2, 3, 1, 3
-Cry_Mantine_branch_f32e9: ; f32e9
-Cry_Sunflora_branch_f32e9: ; f32e9
+Cry_Mantine_branch_f32e9:
+Cry_Sunflora_branch_f32e9:
 	sound __,  5, $f8, $07b1
 	sound __,  5, $f8, $07b0
 	sound __,  5, $48, $07af
-Cry_Mantine_branch_f32f5: ; f32f5
+Cry_Mantine_branch_f32f5:
 	sound __,  5, $f8, $07b2
 	sound __,  5, $f8, $07b3
 	sound __,  5, $48, $07b4
 	endchannel
-; f3302
 
-Cry_Mantine_branch_f3302: ; f3302
-Cry_Natu_Ch6: ; f3302
-Cry_Sunflora_Ch6: ; f3302
+Cry_Mantine_branch_f3302:
+Cry_Natu_Ch6:
+Cry_Sunflora_Ch6:
 	sound_duty 2, 0, 3, 3
 	sound __,  5, $f8, $07b2
 	sound __,  5, $f8, $07b1
 	sound __,  5, $28, $07b0
-Cry_Mantine_branch_f3310: ; f3310
+Cry_Mantine_branch_f3310:
 	sound __,  5, $f8, $07b4
 	sound __,  5, $f8, $07b6
 	sound __,  5, $48, $07b8
 	endchannel
-; f331d
 
-Cry_Mantine_branch_f331d: ; f331d
-Cry_Natu_Ch8: ; f331d
-Cry_Sunflora_Ch8: ; f331d
+Cry_Mantine_branch_f331d:
+Cry_Natu_Ch8:
+Cry_Sunflora_Ch8:
 	noise __,  5, $88, $5
 	noise __,  5, $88, $4
 	noise __,  5, $38, $3
-Cry_Mantine_branch_f3326: ; f3326
+Cry_Mantine_branch_f3326:
 	noise __,  5, $88, $5
 	noise __,  5, $88, $4
 	noise __,  5, $87, $4
 	endchannel
-; f3330
 
-Cry_Teddiursa_Ch8: ; f3330
+Cry_Teddiursa_Ch8:
 	noise __,  9, $a6, $3a
 	noise __,  9, $a1, $5a
 	endchannel
-; f3337
 
-Cry_Sunflora_Ch5: ; f3337
+Cry_Sunflora_Ch5:
 	dutycycle $0
 	jumpchannel Cry_Sunflora_branch_f32e9
-; f333c
 
-Cry_Mantine_Ch5: ; f333c
+Cry_Mantine_Ch5:
 	dutycycle $0
 	callchannel Cry_Mantine_branch_f32e9
 	callchannel Cry_Mantine_branch_f32f5
 	endchannel
-; f3345
 
-Cry_Mantine_Ch6: ; f3345
+Cry_Mantine_Ch6:
 	callchannel Cry_Mantine_branch_f3302
 	callchannel Cry_Mantine_branch_f3310
 	endchannel
-; f334c
 
-Cry_Mantine_Ch8: ; f334c
+Cry_Mantine_Ch8:
 	callchannel Cry_Mantine_branch_f331d
 	callchannel Cry_Mantine_branch_f3326
 	endchannel
-; f3353
 
-Cry_Ampharos_Ch5: ; f3353
+Cry_Ampharos_Ch5:
 	sound_duty 2, 3, 1, 3
-Cry_Ampharos_branch_f3355: ; f3355
+.loop
 	sound __,  2, $c1, $0520
 	sound __,  2, $a1, $0420
-	loopchannel 4, Cry_Ampharos_branch_f3355
+	loopchannel 4, .loop
 	dutycycle $0
 	sound __,  5, $78, $0760
 	sound __,  5, $78, $0730
 	sound C_,  9, $c2, $0420
 	endchannel
-; f3370
 
-Cry_Ampharos_Ch6: ; f3370
+Cry_Ampharos_Ch6:
 	sound_duty 2, 0, 3, 0
 	sound __,  9, $f8, $0700
 	sound __,  8, $f8, $0720
@@ -822,9 +723,8 @@ Cry_Ampharos_Ch6: ; f3370
 	sound __,  5, $f8, $0760
 	sound C_,  9, $f2, $0730
 	endchannel
-; f3387
 
-Cry_Ampharos_Ch8: ; f3387
+Cry_Ampharos_Ch8:
 	noise __,  5, $88, $6d
 	noise __,  5, $d8, $68
 	noise __,  8, $c8, $69
@@ -832,9 +732,8 @@ Cry_Ampharos_Ch8: ; f3387
 	noise __,  5, $98, $3c
 	noise C_,  9, $d2, $5b
 	endchannel
-; f339a
 
-Cry_Totodile_Ch5: ; f339a
+Cry_Totodile_Ch5:
 	sound_duty 2, 0, 3, 0
 	sound __,  9, $f8, $0330
 	sound __,  9, $f8, $0340
@@ -842,9 +741,8 @@ Cry_Totodile_Ch5: ; f339a
 	sound __,  9, $b8, $07b3
 	sound C#,  1, $b2, $07b4
 	endchannel
-; f33b1
 
-Cry_Totodile_Ch6: ; f33b1
+Cry_Totodile_Ch6:
 	sound_duty 2, 0, 1, 0
 	sound __,  9, $e8, $0320
 	sound __,  9, $e8, $0328
@@ -852,17 +750,15 @@ Cry_Totodile_Ch6: ; f33b1
 	sound __,  9, $88, $0782
 	sound C#,  1, $72, $0784
 	endchannel
-; f33c8
 
-Cry_Totodile_Ch8: ; f33c8
+Cry_Totodile_Ch8:
 	noise __,  3, $be, $49
 	noise __,  6, $be, $3a
 	noise __,  3, $be, $29
 	noise C#,  9, $d3, $6e
 	endchannel
-; f33d5
 
-Cry_Cleffa_Ch5: ; f33d5
+Cry_Cleffa_Ch5:
 	sound_duty 1, 2, 3, 0
 	soundinput $ff
 	sound __,  3, $f8, $0720
@@ -876,18 +772,16 @@ Cry_Cleffa_Ch5: ; f33d5
 	sound __,  9, $f1, $0737
 	soundinput $88
 	endchannel
-; f33fc
 
-Cry_Cleffa_Ch6: ; f33fc
+Cry_Cleffa_Ch6:
 	sound_duty 2, 0, 2, 0
 	sound __,  7, $b2, $071e
 	sound __,  6, $92, $0779
 	sound __,  5, $82, $073e
 	sound __,  9, $a1, $0735
 	endchannel
-; f340f
 
-Cry_Cleffa_Ch8: ; f340f
+Cry_Cleffa_Ch8:
 	noise __,  3, $64, $7f
 	noise __,  3, $84, $7d
 	noise __,  3, $a4, $6f
@@ -895,9 +789,8 @@ Cry_Cleffa_Ch8: ; f340f
 	noise __,  3, $94, $6f
 	noise __,  3, $61, $6b
 	endchannel
-; f3422
 
-Cry_Aipom_Ch5: ; f3422
+Cry_Aipom_Ch5:
 	sound_duty 2, 0, 1, 3
 	sound __,  4, $f8, $06b0
 	sound __,  2, $f8, $06a5
@@ -907,27 +800,24 @@ Cry_Aipom_Ch5: ; f3422
 	sound __,  4, $f8, $0720
 	sound C_,  5, $f2, $070e
 	endchannel
-; f3441
 
-Cry_Aipom_Ch6: ; f3441
+Cry_Aipom_Ch6:
 	sound_duty 3, 1, 2, 0
-Cry_Aipom_branch_f3443: ; f3443
+.loop1
 	sound __,  2, $f1, $07b4
-	loopchannel 8, Cry_Aipom_branch_f3443
-Cry_Aipom_branch_f344b: ; f344b
+	loopchannel 8, .loop1
+.loop2
 	sound __,  2, $c1, $0790
-	loopchannel 3, Cry_Aipom_branch_f344b
-Cry_Aipom_branch_f3453: ; f3453
+	loopchannel 3, .loop2
+.loop3
 	sound __,  2, $b1, $078d
-	loopchannel 2, Cry_Aipom_branch_f3453
+	loopchannel 2, .loop3
 	sound C_,  1, $92, $0795
 	endchannel
-; f3460
 
-Cry_Aipom_Ch8: ; f3460
-Cry_Aipom_branch_f3460: ; f3460
+Cry_Aipom_Ch8:
 	noise __,  1, $f1, $28
-	loopchannel 4, Cry_Aipom_branch_f3460
+	loopchannel 4, Cry_Aipom_Ch8
 	noise __,  1, $91, $49
 	noise __,  2, $a8, $4a
 	noise __,  1, $e1, $4b
@@ -936,237 +826,198 @@ Cry_Aipom_branch_f3460: ; f3460
 	noise __,  4, $b2, $4d
 	noise C_,  5, $a3, $4c
 	endchannel
-; f347d
 
-Cry_Nidoran_M: ; f347d
+Cry_Nidoran_M:
 	musicheader 3, 5, Cry_Nidoran_M_Ch5
 	musicheader 1, 6, Cry_Nidoran_M_Ch6
 	musicheader 1, 8, Cry_Nidoran_M_Ch8
-; f3486
 
-Cry_Nidoran_F: ; f3486
+Cry_Nidoran_F:
 	musicheader 3, 5, Cry_Nidoran_F_Ch5
 	musicheader 1, 6, Cry_Nidoran_F_Ch6
 	musicheader 1, 8, Cry_Nidoran_F_Ch8
-; f348f
 
-Cry_Slowpoke: ; f348f
+Cry_Slowpoke:
 	musicheader 3, 5, Cry_Slowpoke_Ch5
 	musicheader 1, 6, Cry_Slowpoke_Ch6
 	musicheader 1, 8, Cry_Slowpoke_Ch8
-; f3498
 
-Cry_Kangaskhan: ; f3498
+Cry_Kangaskhan:
 	musicheader 3, 5, Cry_Kangaskhan_Ch5
 	musicheader 1, 6, Cry_Kangaskhan_Ch6
 	musicheader 1, 8, Cry_Kangaskhan_Ch8
-; f34a1
 
-Cry_Charmander: ; f34a1
+Cry_Charmander:
 	musicheader 3, 5, Cry_Charmander_Ch5
 	musicheader 1, 6, Cry_Charmander_Ch6
 	musicheader 1, 8, Cry_Charmander_Ch8
-; f34aa
 
-Cry_Grimer: ; f34aa
+Cry_Grimer:
 	musicheader 3, 5, Cry_Grimer_Ch5
 	musicheader 1, 6, Cry_Grimer_Ch6
 	musicheader 1, 8, Cry_Grimer_Ch8
-; f34b3
 
-Cry_Voltorb: ; f34b3
+Cry_Voltorb:
 	musicheader 3, 5, Cry_Voltorb_Ch5
 	musicheader 1, 6, Cry_Voltorb_Ch6
 	musicheader 1, 8, Cry_Voltorb_Ch8
-; f34bc
 
-Cry_Muk: ; f34bc
+Cry_Muk:
 	musicheader 3, 5, Cry_Muk_Ch5
 	musicheader 1, 6, Cry_Muk_Ch6
 	musicheader 1, 8, Cry_Muk_Ch8
-; f34c5
 
-Cry_Oddish: ; f34c5
+Cry_Oddish:
 	musicheader 3, 5, Cry_Oddish_Ch5
 	musicheader 1, 6, Cry_Oddish_Ch6
 	musicheader 1, 8, Cry_Oddish_Ch8
-; f34ce
 
-Cry_Raichu: ; f34ce
+Cry_Raichu:
 	musicheader 3, 5, Cry_Raichu_Ch5
 	musicheader 1, 6, Cry_Raichu_Ch6
 	musicheader 1, 8, Cry_Raichu_Ch8
-; f34d7
 
-Cry_Nidoqueen: ; f34d7
+Cry_Nidoqueen:
 	musicheader 3, 5, Cry_Nidoqueen_Ch5
 	musicheader 1, 6, Cry_Nidoqueen_Ch6
 	musicheader 1, 8, Cry_Nidoqueen_Ch8
-; f34e0
 
-Cry_Diglett: ; f34e0
+Cry_Diglett:
 	musicheader 3, 5, Cry_Diglett_Ch5
 	musicheader 1, 6, Cry_Diglett_Ch6
 	musicheader 1, 8, Cry_Diglett_Ch8
-; f34e9
 
-Cry_Seel: ; f34e9
+Cry_Seel:
 	musicheader 3, 5, Cry_Seel_Ch5
 	musicheader 1, 6, Cry_Seel_Ch6
 	musicheader 1, 8, Cry_Seel_Ch8
-; f34f2
 
-Cry_Drowzee: ; f34f2
+Cry_Drowzee:
 	musicheader 3, 5, Cry_Drowzee_Ch5
 	musicheader 1, 6, Cry_Drowzee_Ch6
 	musicheader 1, 8, Cry_Drowzee_Ch8
-; f34fb
 
-Cry_Pidgey: ; f34fb
+Cry_Pidgey:
 	musicheader 3, 5, Cry_Pidgey_Ch5
 	musicheader 1, 6, Cry_Pidgey_Ch6
 	musicheader 1, 8, Cry_Pidgey_Ch8
-; f3504
 
-Cry_Bulbasaur: ; f3504
+Cry_Bulbasaur:
 	musicheader 3, 5, Cry_Bulbasaur_Ch5
 	musicheader 1, 6, Cry_Bulbasaur_Ch6
 	musicheader 1, 8, Cry_Bulbasaur_Ch8
-; f350d
 
-Cry_Spearow: ; f350d
+Cry_Spearow:
 	musicheader 3, 5, Cry_Spearow_Ch5
 	musicheader 1, 6, Cry_Spearow_Ch6
 	musicheader 1, 8, Cry_Spearow_Ch8
-; f3516
 
-Cry_Rhydon: ; f3516
+Cry_Rhydon:
 	musicheader 3, 5, Cry_Rhydon_Ch5
 	musicheader 1, 6, Cry_Rhydon_Ch6
 	musicheader 1, 8, Cry_Rhydon_Ch8
-; f351f
 
-Cry_Golem: ; f351f
+Cry_Golem:
 	musicheader 3, 5, Cry_Golem_Ch5
 	musicheader 1, 6, Cry_Golem_Ch6
 	musicheader 1, 8, Cry_Golem_Ch8
-; f3528
 
-Cry_Blastoise: ; f3528
+Cry_Blastoise:
 	musicheader 3, 5, Cry_Blastoise_Ch5
 	musicheader 1, 6, Cry_Blastoise_Ch6
 	musicheader 1, 8, Cry_Blastoise_Ch8
-; f3531
 
-Cry_Pidgeotto: ; f3531
+Cry_Pidgeotto:
 	musicheader 3, 5, Cry_Pidgeotto_Ch5
 	musicheader 1, 6, Cry_Pidgeotto_Ch6
 	musicheader 1, 8, Cry_Pidgeotto_Ch8
-; f353a
 
-Cry_Weedle: ; f353a
+Cry_Weedle:
 	musicheader 3, 5, Cry_Weedle_Ch5
 	musicheader 1, 6, Cry_Weedle_Ch6
 	musicheader 1, 8, Cry_Weedle_Ch8
-; f3543
 
-Cry_Caterpie: ; f3543
+Cry_Caterpie:
 	musicheader 3, 5, Cry_Caterpie_Ch5
 	musicheader 1, 6, Cry_Caterpie_Ch6
 	musicheader 1, 8, Cry_Caterpie_Ch8
-; f354c
 
-Cry_Ekans: ; f354c
+Cry_Ekans:
 	musicheader 3, 5, Cry_Ekans_Ch5
 	musicheader 1, 6, Cry_Ekans_Ch6
 	musicheader 1, 8, Cry_Ekans_Ch8
-; f3555
 
-Cry_Fearow: ; f3555
+Cry_Fearow:
 	musicheader 3, 5, Cry_Fearow_Ch5
 	musicheader 1, 6, Cry_Fearow_Ch6
 	musicheader 1, 8, Cry_Fearow_Ch8
-; f355e
 
-Cry_Clefairy: ; f355e
+Cry_Clefairy:
 	musicheader 3, 5, Cry_Clefairy_Ch5
 	musicheader 1, 6, Cry_Clefairy_Ch6
 	musicheader 1, 8, Cry_Clefairy_Ch8
-; f3567
 
-Cry_Venonat: ; f3567
+Cry_Venonat:
 	musicheader 3, 5, Cry_Venonat_Ch5
 	musicheader 1, 6, Cry_Venonat_Ch6
 	musicheader 1, 8, Cry_Venonat_Ch8
-; f3570
 
-Cry_Lapras: ; f3570
+Cry_Lapras:
 	musicheader 3, 5, Cry_Lapras_Ch5
 	musicheader 1, 6, Cry_Lapras_Ch6
 	musicheader 1, 8, Cry_Lapras_Ch8
-; f3579
 
-Cry_Metapod: ; f3579
+Cry_Metapod:
 	musicheader 3, 5, Cry_Metapod_Ch5
 	musicheader 1, 6, Cry_Metapod_Ch6
 	musicheader 1, 8, Cry_Metapod_Ch8
-; f3582
 
-Cry_Squirtle: ; f3582
+Cry_Squirtle:
 	musicheader 3, 5, Cry_Squirtle_Ch5
 	musicheader 1, 6, Cry_Squirtle_Ch6
 	musicheader 1, 8, Cry_Squirtle_Ch8
-; f358b
 
-Cry_Paras: ; f358b
+Cry_Paras:
 	musicheader 3, 5, Cry_Paras_Ch5
 	musicheader 1, 6, Cry_Paras_Ch6
 	musicheader 1, 8, Cry_Paras_Ch8
-; f3594
 
-Cry_Growlithe: ; f3594
+Cry_Growlithe:
 	musicheader 3, 5, Cry_Growlithe_Ch5
 	musicheader 1, 6, Cry_Growlithe_Ch6
 	musicheader 1, 8, Cry_Growlithe_Ch8
-; f359d
 
-Cry_Krabby: ; f359d
+Cry_Krabby:
 	musicheader 3, 5, Cry_Krabby_Ch5
 	musicheader 1, 6, Cry_Krabby_Ch6
 	musicheader 1, 8, Cry_Krabby_Ch8
-; f35a6
 
-Cry_Psyduck: ; f35a6
+Cry_Psyduck:
 	musicheader 3, 5, Cry_Psyduck_Ch5
 	musicheader 1, 6, Cry_Psyduck_Ch6
 	musicheader 1, 8, Cry_Psyduck_Ch8
-; f35af
 
-Cry_Rattata: ; f35af
+Cry_Rattata:
 	musicheader 3, 5, Cry_Rattata_Ch5
 	musicheader 1, 6, Cry_Rattata_Ch6
 	musicheader 1, 8, Cry_Rattata_Ch8
-; f35b8
 
-Cry_Vileplume: ; f35b8
+Cry_Vileplume:
 	musicheader 3, 5, Cry_Vileplume_Ch5
 	musicheader 1, 6, Cry_Vileplume_Ch6
 	musicheader 1, 8, Cry_Vileplume_Ch8
-; f35c1
 
-Cry_Vulpix: ; f35c1
+Cry_Vulpix:
 	musicheader 3, 5, Cry_Vulpix_Ch5
 	musicheader 1, 6, Cry_Vulpix_Ch6
 	musicheader 1, 8, Cry_Vulpix_Ch8
-; f35ca
 
-Cry_Weepinbell: ; f35ca
+Cry_Weepinbell:
 	musicheader 3, 5, Cry_Weepinbell_Ch5
 	musicheader 1, 6, Cry_Weepinbell_Ch6
 	musicheader 1, 8, Cry_Weepinbell_Ch8
-; f35d3
 
-Unused_Cry_Ch5: ; f35d3
+Unused_Cry_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __, 16, $e0, $0780
 	sound __, 16, $f0, $0784
@@ -1175,9 +1026,8 @@ Unused_Cry_Ch5: ; f35d3
 	sound __, 11, $6c, $0780
 	sound __,  9, $71, $0784
 	endchannel
-; f35ee
 
-Unused_Cry_Ch6: ; f35ee
+Unused_Cry_Ch6:
 	sound_duty 1, 1, 0, 0
 	sound __, 16, $a0, $0741
 	sound __, 16, $b0, $0743
@@ -1186,9 +1036,8 @@ Unused_Cry_Ch6: ; f35ee
 	sound __, 11, $4c, $0741
 	sound __,  9, $31, $0746
 	endchannel
-; f3609
 
-Unused_Cry_Ch8: ; f3609
+Unused_Cry_Ch8:
 	noise __,  3, $f2, $4c
 	noise __,  7, $e0, $3a
 	noise __, 16, $d0, $3a
@@ -1197,9 +1046,8 @@ Unused_Cry_Ch8: ; f3609
 	noise __, 13, $7d, $4c
 	noise __, 16, $d3, $4c
 	endchannel
-; f361f
 
-Cry_Raichu_Ch5: ; f361f
+Cry_Raichu_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __, 16, $f7, $07a0
 	sound __,  7, $e6, $07a3
@@ -1209,9 +1057,8 @@ Cry_Raichu_Ch5: ; f361f
 	sound __,  5, $e3, $07d7
 	sound __, 16, $f2, $07d8
 	endchannel
-; f363c
 
-Cry_Raichu_Ch6: ; f363c
+Cry_Raichu_Ch6:
 	sound_duty 1, 1, 0, 0
 	sound __,  3, $8, 0
 	sound __, 16, $a7, $06a1
@@ -1222,9 +1069,8 @@ Cry_Raichu_Ch6: ; f363c
 	sound __,  5, $83, $06d9
 	sound __, 16, $a2, $06d7
 	endchannel
-; f365d
 
-Cry_Raichu_Ch8: ; f365d
+Cry_Raichu_Ch8:
 	noise __,  3, $f2, $3c
 	noise __,  9, $e4, $3e
 	noise __, 16, $d7, $3c
@@ -1234,9 +1080,8 @@ Cry_Raichu_Ch8: ; f365d
 	noise __,  7, $d4, $3d
 	noise __,  9, $c1, $3b
 	endchannel
-; f3676
 
-Cry_Vileplume_Ch5: ; f3676
+Cry_Vileplume_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __, 16, $f7, $07c0
 	sound __,  7, $e4, $07c1
@@ -1244,26 +1089,23 @@ Cry_Vileplume_Ch5: ; f3676
 	sound __,  5, $d3, $07c2
 	sound __,  9, $c1, $07c0
 	endchannel
-; f368d
 
-Cry_Vileplume_Ch6: ; f368d
+Cry_Vileplume_Ch6:
 	sound_duty 3, 3, 1, 1
 	sound __, 16, $97, $0781
 	sound __,  7, $84, $0780
 	sound __, 11, $96, $0781
 	sound __, 16, $83, $0781
 	endchannel
-; f36a0
 
-Cry_Vileplume_Ch8: ; f36a0
+Cry_Vileplume_Ch8:
 	noise __,  4, $f2, $3c
 	noise __, 14, $e6, $2c
 	noise __, 16, $d7, $3c
 	noise __,  9, $c1, $2c
 	endchannel
-; f36ad
 
-Cry_Vulpix_Ch5: ; f36ad
+Cry_Vulpix_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __, 16, $f7, $0680
 	sound __, 11, $e6, $0684
@@ -1274,9 +1116,8 @@ Cry_Vulpix_Ch5: ; f36ad
 	sound __,  5, $d3, $0660
 	sound __,  9, $c1, $0640
 	endchannel
-; f36d0
 
-Cry_Vulpix_Ch6: ; f36d0
+Cry_Vulpix_Ch6:
 	sound_duty 1, 1, 0, 0
 	sound __, 16, $b7, $0641
 	sound __, 11, $96, $0642
@@ -1287,18 +1128,16 @@ Cry_Vulpix_Ch6: ; f36d0
 	sound __,  5, $93, $0622
 	sound __,  9, $71, $0601
 	endchannel
-; f36f3
 
-Cry_Vulpix_Ch8: ; f36f3
+Cry_Vulpix_Ch8:
 	noise __, 16, $e4, $3c
 	noise __, 11, $c7, $4c
 	noise __, 11, $c7, $3c
 	noise __, 13, $b7, $4c
 	noise __, 16, $a2, $5c
 	endchannel
-; f3703
 
-Cry_Rhydon_Ch5: ; f3703
+Cry_Rhydon_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __,  7, $f7, $07a0
 	sound __,  9, $e6, $07a4
@@ -1308,9 +1147,8 @@ Cry_Rhydon_Ch5: ; f3703
 	sound __,  3, $c2, $0728
 	sound __,  9, $b1, $0730
 	endchannel
-; f3722
 
-Cry_Rhydon_Ch6: ; f3722
+Cry_Rhydon_Ch6:
 	sound_duty 2, 2, 0, 0
 	sound __,  5, $8, 0
 	sound __,  7, $a7, $0741
@@ -1321,9 +1159,8 @@ Cry_Rhydon_Ch6: ; f3722
 	sound __,  4, $82, $06cc
 	sound __,  9, $71, $06d8
 	endchannel
-; f3745
 
-Cry_Rhydon_Ch8: ; f3745
+Cry_Rhydon_Ch8:
 	noise __,  3, $f2, $4c
 	noise __,  7, $e6, $3a
 	noise __,  5, $d7, $3a
@@ -1332,9 +1169,8 @@ Cry_Rhydon_Ch8: ; f3745
 	noise __, 13, $d2, $3d
 	noise __,  9, $d1, $2c
 	endchannel
-; f375b
 
-Cry_Weepinbell_Ch5: ; f375b
+Cry_Weepinbell_Ch5:
 	sound_duty 1, 1, 2, 2
 	sound __,  7, $f4, $0740
 	sound __, 16, $e3, $0730
@@ -1342,9 +1178,8 @@ Cry_Weepinbell_Ch5: ; f375b
 	sound __,  6, $b3, $0748
 	sound __,  9, $d1, $0750
 	endchannel
-; f3772
 
-Cry_Weepinbell_Ch6: ; f3772
+Cry_Weepinbell_Ch6:
 	sound_duty 3, 1, 3, 1
 	sound __,  7, $c3, $0712
 	sound __, 16, $b3, $0704
@@ -1352,17 +1187,15 @@ Cry_Weepinbell_Ch6: ; f3772
 	sound __,  5, $c3, $0721
 	sound __,  9, $b1, $0732
 	endchannel
-; f3789
 
-Cry_Weepinbell_Ch8: ; f3789
+Cry_Weepinbell_Ch8:
 	noise __,  9, $d6, $2c
 	noise __, 13, $c6, $3c
 	noise __, 11, $b6, $2c
 	noise __,  9, $91, $1c
 	endchannel
-; f3796
 
-Cry_Kangaskhan_Ch5: ; f3796
+Cry_Kangaskhan_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __,  5, $f7, $0608
 	sound __,  7, $e6, $0600
@@ -1372,9 +1205,8 @@ Cry_Kangaskhan_Ch5: ; f3796
 	sound __,  5, $d3, $05a0
 	sound __,  9, $e1, $0580
 	endchannel
-; f37b5
 
-Cry_Kangaskhan_Ch6: ; f37b5
+Cry_Kangaskhan_Ch6:
 	sound_duty 2, 2, 0, 0
 	sound __,  5, $c7, $0504
 	sound __,  7, $a6, $0502
@@ -1384,17 +1216,15 @@ Cry_Kangaskhan_Ch6: ; f37b5
 	sound __,  5, $b3, $04a3
 	sound __,  9, $c1, $0482
 	endchannel
-; f37d4
 
-Cry_Kangaskhan_Ch8: ; f37d4
+Cry_Kangaskhan_Ch8:
 	noise __, 13, $e4, $4c
 	noise __, 11, $c7, $5c
 	noise __, 13, $b6, $4c
 	noise __, 16, $a2, $5c
 	endchannel
-; f37e1
 
-Cry_Bulbasaur_Ch5: ; f37e1
+Cry_Bulbasaur_Ch5:
 	sound_duty 1, 0, 3, 3
 	sound __,  5, $f7, $07c0
 	sound __, 13, $e6, $07c2
@@ -1403,9 +1233,8 @@ Cry_Bulbasaur_Ch5: ; f37e1
 	sound __,  5, $b5, $0660
 	sound __,  9, $c1, $0640
 	endchannel
-; f37fc
 
-Cry_Bulbasaur_Ch6: ; f37fc
+Cry_Bulbasaur_Ch6:
 	sound_duty 0, 3, 0, 3
 	sound __,  4, $c7, $0781
 	sound __, 13, $b6, $0780
@@ -1414,18 +1243,16 @@ Cry_Bulbasaur_Ch6: ; f37fc
 	sound __,  7, $b5, $0621
 	sound __,  9, $a1, $0602
 	endchannel
-; f3817
 
-Cry_Bulbasaur_Ch8: ; f3817
+Cry_Bulbasaur_Ch8:
 	noise __,  4, $e4, $3c
 	noise __, 13, $d6, $2c
 	noise __,  5, $e4, $3c
 	noise __,  9, $b7, $5c
 	noise __, 16, $c2, $5d
 	endchannel
-; f3827
 
-Cry_Spearow_Ch5: ; f3827
+Cry_Spearow_Ch5:
 	sound_duty 1, 2, 0, 3
 	sound __,  9, $f7, $0680
 	sound __,  3, $f7, $0660
@@ -1436,9 +1263,8 @@ Cry_Spearow_Ch5: ; f3827
 	sound __,  5, $a7, $0730
 	sound __, 16, $91, $0720
 	endchannel
-; f384a
 
-Cry_Spearow_Ch6: ; f384a
+Cry_Spearow_Ch6:
 	sound_duty 1, 2, 3, 1
 	sound __, 11, $e7, $0682
 	sound __,  3, $e7, $0662
@@ -1449,64 +1275,56 @@ Cry_Spearow_Ch6: ; f384a
 	sound __,  3, $97, $0732
 	sound __, 16, $81, $0722
 	endchannel
-; f386d
 
-Cry_Spearow_Ch8: ; f386d
+Cry_Spearow_Ch8:
 	noise __,  5, $74, $21
 	noise __,  5, $74, $10
 	noise __,  5, $71, $20
 	endchannel
-; f3877
 
-Cry_Nidoran_M_Ch5: ; f3877
+Cry_Nidoran_M_Ch5:
 	sound_duty 1, 1, 3, 3
 	sound __,  5, $f3, $0718
 	sound __, 16, $e5, $0798
 	sound __,  9, $91, $0758
 	endchannel
-; f3886
 
-Cry_Nidoran_M_Ch6: ; f3886
+Cry_Nidoran_M_Ch6:
 	sound_duty 0, 0, 2, 2
 	sound __,  6, $b3, $0708
 	sound __, 16, $c5, $0788
 	sound __,  9, $71, $0748
 	endchannel
-; f3895
 
-Cry_Nidoran_M_Ch8: ; f3895
+Cry_Nidoran_M_Ch8:
 	noise __,  4, $a1, $1c
 	noise __, 15, $94, $2c
 	noise __,  9, $81, $1c
 	endchannel
-; f389f
 
-Cry_Pidgey_Ch5: ; f389f
+Cry_Pidgey_Ch5:
 	sound_duty 1, 1, 2, 2
 	sound __,  5, $e1, $0700
 	sound __,  5, $f2, $0780
 	sound __,  3, $92, $0740
 	sound __,  9, $e1, $0600
 	endchannel
-; f38b2
 
-Cry_Pidgey_Ch6: ; f38b2
+Cry_Pidgey_Ch6:
 	sound_duty 2, 2, 0, 0
 	sound __,  5, $b1, $06e1
 	sound __,  4, $c2, $06e1
 	sound __,  4, $62, $0681
 	sound __,  9, $b1, $05e1
 	endchannel
-; f38c5
 
-Cry_Pidgey_Ch8: ; f38c5
+Cry_Pidgey_Ch8:
 	noise __,  3, $61, $32
 	noise __,  3, $61, $21
 	noise __,  9, $61, $11
 	endchannel
-; f38cf
 
-Cry_Voltorb_Ch5: ; f38cf
+Cry_Voltorb_Ch5:
 	sound_duty 2, 2, 3, 3
 	sound __,  7, $83, $0247
 	sound __, 16, $62, $0226
@@ -1514,11 +1332,10 @@ Cry_Voltorb_Ch5: ; f38cf
 	sound __, 10, $63, $0206
 	sound __, 16, $82, $0225
 	sound __, 16, $42, $0207
-Cry_Voltorb_Ch6: ; f38e9
+Cry_Voltorb_Ch6:
 	endchannel
-; f38ea
 
-Cry_Voltorb_Ch8: ; f38ea
+Cry_Voltorb_Ch8:
 	noise __,  9, $d4, $8c
 	noise __,  5, $e2, $9c
 	noise __, 16, $c6, $8c
@@ -1526,51 +1343,45 @@ Cry_Voltorb_Ch8: ; f38ea
 	noise __, 16, $d7, $9c
 	noise __, 16, $f2, $ac
 	endchannel
-; f38fd
 
-Cry_Muk_Ch5: ; f38fd
+Cry_Muk_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __,  5, $f3, $06e0
 	sound __, 16, $e4, $0640
 	sound __,  9, $c1, $0620
 	endchannel
-; f390c
 
-Cry_Muk_Ch6: ; f390c
+Cry_Muk_Ch6:
 	sound_duty 2, 2, 0, 0
 	sound __,  4, $c3, $0683
 	sound __, 15, $b4, $0602
 	sound __,  9, $a1, $0601
 	endchannel
-; f391b
 
-Cry_Muk_Ch8: ; f391b
+Cry_Muk_Ch8:
 	noise __,  5, $d3, $5c
 	noise __, 16, $e6, $4c
 	noise __,  9, $b1, $5c
 	endchannel
-; f3925
 
-Cry_Grimer_Ch5: ; f3925
+Cry_Grimer_Ch5:
 	sound_duty 2, 2, 0, 0
 	sound __,  7, $e2, $0500
 	sound __,  7, $e3, $0580
 	sound __,  7, $d3, $0570
 	sound __,  9, $a1, $0560
 	endchannel
-; f3938
 
-Cry_Grimer_Ch6: ; f3938
+Cry_Grimer_Ch6:
 	sound_duty 1, 1, 3, 3
 	sound __,  7, $e2, $0482
 	sound __,  7, $d3, $0501
 	sound __,  7, $b2, $04e2
 	sound __,  9, $81, $04c1
-Cry_Grimer_Ch8: ; f394a
+Cry_Grimer_Ch8:
 	endchannel
-; f394b
 
-Cry_Diglett_Ch5: ; f394b
+Cry_Diglett_Ch5:
 	sound_duty 0, 3, 0, 3
 	sound __,  5, $f1, $0700
 	sound __,  5, $e1, $0780
@@ -1583,9 +1394,8 @@ Cry_Diglett_Ch5: ; f394b
 	sound __,  5, $c1, $0742
 	sound __,  9, $b1, $0741
 	endchannel
-; f3976
 
-Cry_Diglett_Ch6: ; f3976
+Cry_Diglett_Ch6:
 	sound_duty 0, 1, 0, 1
 	sound __, 13, $8, 0
 	sound __,  5, $f1, $0701
@@ -1595,9 +1405,8 @@ Cry_Diglett_Ch6: ; f3976
 	sound __,  5, $f1, $0782
 	sound __,  9, $d1, $0701
 	endchannel
-; f3995
 
-Cry_Diglett_Ch8: ; f3995
+Cry_Diglett_Ch8:
 	noise __, 16, $8, $0
 	noise __,  5, $8, $0
 	noise __,  5, $d1, $4c
@@ -1607,9 +1416,8 @@ Cry_Diglett_Ch8: ; f3995
 	noise __,  5, $c1, $2c
 	noise __,  9, $a1, $4c
 	endchannel
-; f39ae
 
-Cry_Seel_Ch5: ; f39ae
+Cry_Seel_Ch5:
 	sound_duty 0, 3, 0, 3
 	sound __,  9, $f5, $0600
 	sound __,  3, $d2, $0638
@@ -1621,9 +1429,8 @@ Cry_Seel_Ch5: ; f39ae
 	sound __,  3, $b2, $0610
 	sound __,  9, $c1, $0620
 	endchannel
-; f39d5
 
-Cry_Seel_Ch6: ; f39d5
+Cry_Seel_Ch6:
 	sound_duty 0, 1, 0, 1
 	sound __, 13, $c3, $05c0
 	sound __,  4, $b1, $05f9
@@ -1634,29 +1441,25 @@ Cry_Seel_Ch6: ; f39d5
 	sound __,  3, $81, $05d1
 	sound __,  3, $91, $05d9
 	sound __,  9, $91, $05e1
-Cry_Seel_Ch8: ; f39fb
+Cry_Seel_Ch8:
 	endchannel
-; f39fc
 
-Cry_Slowpoke_Ch5: ; f39fc
+Cry_Slowpoke_Ch5:
 	sound_duty 0, 0, 0, 0
 	sound __,  9, $f5, $0480
 	sound __,  3, $e1, $05e0
 	sound __,  9, $d1, $05dc
 	endchannel
-; f3a0b
 
-Cry_Slowpoke_Ch6: ; f3a0b
+Cry_Slowpoke_Ch6:
 	sound_duty 1, 1, 2, 2
 	sound __,  8, $95, $0441
 	sound __,  3, $81, $0521
 	sound __,  9, $61, $051a
-Cry_Slowpoke_Ch8: ; f3a19
+Cry_Slowpoke_Ch8:
 	endchannel
-; f3a1a
 
-Cry_Drowzee_Ch5: ; f3a1a
-Cry_Drowzee_branch_f3a1a: ; f3a1a
+Cry_Drowzee_Ch5:
 	sound_duty 0, 2, 0, 2
 	sound __,  6, $f2, $0650
 	sound __, 10, $d1, $0660
@@ -1664,11 +1467,10 @@ Cry_Drowzee_branch_f3a1a: ; f3a1a
 	sound __, 10, $c1, $0622
 	sound __,  6, $f2, $0610
 	sound __,  7, $d1, $0620
-	loopchannel 2, Cry_Drowzee_branch_f3a1a
+	loopchannel 2, Cry_Drowzee_Ch5
 	endchannel
-; f3a39
 
-Cry_Drowzee_Ch6: ; f3a39
+Cry_Drowzee_Ch6:
 	sound_duty 0, 0, 0, 1
 	sound __,  5, $8, 0
 	sound __,  6, $f2, $0651
@@ -1682,9 +1484,8 @@ Cry_Drowzee_Ch6: ; f3a39
 	sound __,  6, $f2, $0611
 	sound __,  5, $d1, $0621
 	endchannel
-; f3a68
 
-Cry_Drowzee_Ch8: ; f3a68
+Cry_Drowzee_Ch8:
 	noise __,  7, $d2, $1c
 	noise __, 10, $b1, $2c
 	noise __,  9, $c2, $2c
@@ -1696,35 +1497,31 @@ Cry_Drowzee_Ch8: ; f3a68
 	noise __, 10, $c2, $2c
 	noise __,  5, $a1, $3c
 	endchannel
-; f3a87
 
-Cry_Nidoran_F_Ch5: ; f3a87
+Cry_Nidoran_F_Ch5:
 	sound_duty 0, 0, 2, 2
 	sound __,  5, $f3, $0600
 	sound __,  9, $d5, $0760
 	sound __,  4, $e2, $0720
 	sound __,  9, $d1, $0710
 	endchannel
-; f3a9a
 
-Cry_Nidoran_F_Ch6: ; f3a9a
+Cry_Nidoran_F_Ch6:
 	sound_duty 2, 2, 1, 1
 	sound __,  6, $b3, $06f1
 	sound __,  8, $c5, $0752
 	sound __,  4, $a2, $0711
 	sound __,  9, $b1, $0601
 	endchannel
-; f3aad
 
-Cry_Nidoran_F_Ch8: ; f3aad
+Cry_Nidoran_F_Ch8:
 	noise __,  4, $a2, $3c
 	noise __, 13, $94, $2c
 	noise __,  4, $82, $1c
 	noise __,  9, $71, $2c
 	endchannel
-; f3aba
 
-Cry_Nidoqueen_Ch5: ; f3aba
+Cry_Nidoqueen_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __,  9, $f7, $06e0
 	sound __,  7, $e6, $06e5
@@ -1734,9 +1531,8 @@ Cry_Nidoqueen_Ch5: ; f3aba
 	sound __,  5, $f2, $06b0
 	sound __, 16, $a2, $06c8
 	endchannel
-; f3ad9
 
-Cry_Nidoqueen_Ch6: ; f3ad9
+Cry_Nidoqueen_Ch6:
 	sound_duty 1, 1, 0, 0
 	sound __,  4, $8, 0
 	sound __,  9, $a7, $06a1
@@ -1747,9 +1543,8 @@ Cry_Nidoqueen_Ch6: ; f3ad9
 	sound __,  5, $a2, $0671
 	sound __, 16, $72, $0689
 	endchannel
-; f3afc
 
-Cry_Nidoqueen_Ch8: ; f3afc
+Cry_Nidoqueen_Ch8:
 	noise __,  3, $f2, $3c
 	noise __,  9, $e4, $3e
 	noise __,  9, $d7, $3c
@@ -1759,34 +1554,30 @@ Cry_Nidoqueen_Ch8: ; f3afc
 	noise __,  4, $a4, $2c
 	noise __,  9, $91, $3c
 	endchannel
-; f3b15
 
-Cry_Oddish_Ch5: ; f3b15
+Cry_Oddish_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __, 16, $f6, $0565
 	sound __, 11, $e4, $057c
 	sound __,  4, $c2, $055c
 	sound __, 16, $b2, $053c
 	endchannel
-; f3b28
 
-Cry_Oddish_Ch6: ; f3b28
+Cry_Oddish_Ch6:
 	sound_duty 2, 2, 1, 1
 	sound __, 15, $d6, $0503
 	sound __, 10, $b4, $051b
 	sound __,  5, $92, $04fa
 	sound __, 16, $a2, $04db
 	endchannel
-; f3b3b
 
-Cry_Oddish_Ch8: ; f3b3b
+Cry_Oddish_Ch8:
 	noise __, 13, $e6, $4c
 	noise __, 12, $d7, $5c
 	noise __, 16, $c2, $4c
 	endchannel
-; f3b45
 
-Cry_Charmander_Ch5: ; f3b45
+Cry_Charmander_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __,  5, $f7, $06a0
 	sound __,  9, $e6, $06a4
@@ -1796,9 +1587,8 @@ Cry_Charmander_Ch5: ; f3b45
 	sound __,  5, $c2, $0620
 	sound __,  9, $b1, $0610
 	endchannel
-; f3b64
 
-Cry_Charmander_Ch6: ; f3b64
+Cry_Charmander_Ch6:
 	sound_duty 2, 2, 1, 1
 	sound __,  5, $e7, $0601
 	sound __,  9, $d6, $0603
@@ -1808,9 +1598,8 @@ Cry_Charmander_Ch6: ; f3b64
 	sound __,  5, $b2, $0582
 	sound __,  9, $a1, $0571
 	endchannel
-; f3b83
 
-Cry_Charmander_Ch8: ; f3b83
+Cry_Charmander_Ch8:
 	noise __,  8, $d6, $5c
 	noise __,  9, $e6, $4c
 	noise __,  5, $d4, $5c
@@ -1818,50 +1607,44 @@ Cry_Charmander_Ch8: ; f3b83
 	noise __,  8, $c3, $4c
 	noise __,  9, $a1, $5c
 	endchannel
-; f3b96
 
-Cry_Clefairy_Ch5: ; f3b96
+Cry_Clefairy_Ch5:
 	sound_duty 3, 2, 1, 0
 	sound __,  8, $d2, $0740
 	sound __, 16, $e5, $0760
 	sound C_,  9, $c1, $0730
 	endchannel
-; f3ba5
 
-Cry_Clefairy_Ch6: ; f3ba5
+Cry_Clefairy_Ch6:
 	sound_duty 1, 0, 0, 2
 	sound __,  3, $c2, $0701
 	sound __,  5, $c2, $0708
 	sound __, 16, $d7, $0741
 	sound C_,  9, $a2, $0701
-Cry_Clefairy_Ch8: ; f3bb7
+Cry_Clefairy_Ch8:
 	endchannel
-; f3bb8
 
-Cry_Caterpie_Ch5: ; f3bb8
+Cry_Caterpie_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __, 16, $d7, $0780
 	sound __,  5, $e6, $07a0
 	sound __, 16, $d2, $0740
 	endchannel
-; f3bc7
 
-Cry_Caterpie_Ch6: ; f3bc7
+Cry_Caterpie_Ch6:
 	sound_duty 2, 2, 1, 1
 	sound __, 16, $c7, $0753
 	sound __,  6, $b6, $0772
 	sound __, 16, $c2, $0711
 	endchannel
-; f3bd6
 
-Cry_Caterpie_Ch8: ; f3bd6
+Cry_Caterpie_Ch8:
 	noise __, 14, $f6, $4c
 	noise __,  5, $e6, $3c
 	noise __, 16, $f2, $4c
 	endchannel
-; f3be0
 
-Cry_Lapras_Ch5: ; f3be0
+Cry_Lapras_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __,  7, $f7, $06c0
 	sound __, 16, $e7, $0700
@@ -1869,9 +1652,8 @@ Cry_Lapras_Ch5: ; f3be0
 	sound __,  5, $e4, $06e0
 	sound __,  9, $d1, $06d0
 	endchannel
-; f3bf7
 
-Cry_Lapras_Ch6: ; f3bf7
+Cry_Lapras_Ch6:
 	sound_duty 2, 2, 0, 0
 	sound __,  8, $e6, $0681
 	sound __, 15, $d5, $06c1
@@ -1879,43 +1661,38 @@ Cry_Lapras_Ch6: ; f3bf7
 	sound __,  5, $d4, $06a1
 	sound __,  9, $c1, $0691
 	endchannel
-; f3c0e
 
-Cry_Lapras_Ch8: ; f3c0e
+Cry_Lapras_Ch8:
 	noise __, 11, $a6, $3c
 	noise __, 15, $94, $2c
 	noise __,  6, $a3, $3c
 	noise __,  9, $91, $2c
 	endchannel
-; f3c1b
 
-Cry_Golem_Ch5: ; f3c1b
+Cry_Golem_Ch5:
 	sound_duty 1, 1, 2, 2
 	sound __, 13, $f2, $0440
 	sound __, 16, $e3, $04a0
 	sound __,  5, $d2, $0490
 	sound __,  9, $d1, $0480
 	endchannel
-; f3c2e
 
-Cry_Golem_Ch6: ; f3c2e
+Cry_Golem_Ch6:
 	sound_duty 2, 3, 2, 3
 	sound __, 12, $d2, $0438
 	sound __, 15, $c6, $0498
 	sound __,  4, $b2, $0488
 	sound __,  9, $b1, $0478
 	endchannel
-; f3c41
 
-Cry_Golem_Ch8: ; f3c41
+Cry_Golem_Ch8:
 	noise __, 11, $e6, $6c
 	noise __, 16, $d2, $5c
 	noise __,  4, $c2, $6c
 	noise __,  9, $d1, $5c
 	endchannel
-; f3c4e
 
-Cry_Blastoise_Ch5: ; f3c4e
+Cry_Blastoise_Ch5:
 	sound_duty 3, 0, 3, 0
 	sound __, 16, $f6, $05c0
 	sound __,  9, $e3, $05bc
@@ -1924,9 +1701,8 @@ Cry_Blastoise_Ch5: ; f3c4e
 	sound __,  7, $c2, $05f0
 	sound __,  9, $b1, $0600
 	endchannel
-; f3c69
 
-Cry_Blastoise_Ch6: ; f3c69
+Cry_Blastoise_Ch6:
 	sound_duty 1, 2, 1, 2
 	sound __, 15, $c6, $04b1
 	sound __,  8, $c3, $04ad
@@ -1935,9 +1711,8 @@ Cry_Blastoise_Ch6: ; f3c69
 	sound __,  7, $a2, $04e1
 	sound __,  9, $91, $04f1
 	endchannel
-; f3c84
 
-Cry_Blastoise_Ch8: ; f3c84
+Cry_Blastoise_Ch8:
 	noise __, 11, $e6, $5c
 	noise __, 11, $d6, $6c
 	noise __,  5, $c2, $4c
@@ -1945,32 +1720,28 @@ Cry_Blastoise_Ch8: ; f3c84
 	noise __,  9, $b3, $4c
 	noise __,  9, $a1, $5c
 	endchannel
-; f3c97
 
-Cry_Pidgeotto_Ch5: ; f3c97
+Cry_Pidgeotto_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __,  9, $e4, $0790
 	sound __, 16, $f5, $07c0
 	sound __,  9, $d1, $07d8
 	endchannel
-; f3ca6
 
-Cry_Pidgeotto_Ch6: ; f3ca6
+Cry_Pidgeotto_Ch6:
 	sound_duty 1, 1, 2, 2
 	sound __, 11, $c4, $0771
 	sound __, 16, $b6, $07a2
 	sound __,  9, $a1, $07b7
 	endchannel
-; f3cb5
 
-Cry_Pidgeotto_Ch8: ; f3cb5
+Cry_Pidgeotto_Ch8:
 	noise __,  9, $e4, $4c
 	noise __, 15, $c4, $3c
 	noise __,  9, $d1, $2c
 	endchannel
-; f3cbf
 
-Cry_Paras_Ch5: ; f3cbf
+Cry_Paras_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __,  7, $f2, $0600
 	sound __,  7, $e2, $0640
@@ -1981,9 +1752,8 @@ Cry_Paras_Ch5: ; f3cbf
 	sound __,  7, $b2, $0780
 	sound __,  9, $a1, $07c0
 	endchannel
-; f3ce2
 
-Cry_Paras_Ch6: ; f3ce2
+Cry_Paras_Ch6:
 	sound_duty 1, 0, 1, 0
 	sound __,  4, $8, $0001
 	sound __,  7, $c2, $05c1
@@ -1995,9 +1765,8 @@ Cry_Paras_Ch6: ; f3ce2
 	sound __,  7, $a2, $0742
 	sound __,  9, $81, $0781
 	endchannel
-; f3d09
 
-Cry_Paras_Ch8: ; f3d09
+Cry_Paras_Ch8:
 	noise __,  7, $8, $1
 	noise __,  6, $e2, $5c
 	noise __,  6, $c2, $4c
@@ -2008,9 +1777,8 @@ Cry_Paras_Ch8: ; f3d09
 	noise __,  6, $92, $1a
 	noise __,  9, $81, $18
 	endchannel
-; f3d25
 
-Cry_Weedle_Ch5: ; f3d25
+Cry_Weedle_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __,  5, $f3, $0780
 	sound __, 16, $e7, $0700
@@ -2019,9 +1787,8 @@ Cry_Weedle_Ch5: ; f3d25
 	sound __,  5, $d2, $06f0
 	sound __,  9, $c1, $06e0
 	endchannel
-; f3d40
 
-Cry_Weedle_Ch6: ; f3d40
+Cry_Weedle_Ch6:
 	sound_duty 2, 2, 1, 1
 	sound __,  7, $c3, $0701
 	sound __, 15, $b7, $0681
@@ -2030,9 +1797,8 @@ Cry_Weedle_Ch6: ; f3d40
 	sound __,  5, $b2, $0672
 	sound __,  9, $a1, $0661
 	endchannel
-; f3d5b
 
-Cry_Weedle_Ch8: ; f3d5b
+Cry_Weedle_Ch8:
 	noise __,  7, $e3, $5c
 	noise __, 15, $d6, $4c
 	noise __,  7, $c6, $3c
@@ -2040,35 +1806,31 @@ Cry_Weedle_Ch8: ; f3d5b
 	noise __,  4, $a2, $5c
 	noise __,  9, $b1, $6c
 	endchannel
-; f3d6e
 
-Cry_Ekans_Ch5: ; f3d6e
+Cry_Ekans_Ch5:
 	sound_duty 3, 3, 0, 0
 	sound __, 16, $f7, $0500
 	sound __, 16, $e7, $0508
 	sound __,  9, $b4, $0480
 	sound __, 16, $a2, $0460
 	endchannel
-; f3d81
 
-Cry_Ekans_Ch6: ; f3d81
+Cry_Ekans_Ch6:
 	sound_duty 0, 1, 0, 1
 	sound __, 15, $d7, $0481
 	sound __, 15, $c7, $0489
 	sound __, 11, $b4, $0401
 	sound __, 16, $c2, $03e1
 	endchannel
-; f3d94
 
-Cry_Ekans_Ch8: ; f3d94
+Cry_Ekans_Ch8:
 	noise __, 15, $f7, $7c
 	noise __, 13, $f6, $6c
 	noise __, 10, $e4, $7c
 	noise __, 16, $e2, $6c
 	endchannel
-; f3da1
 
-Cry_Metapod_Ch5: ; f3da1
+Cry_Metapod_Ch5:
 	sound_duty 1, 1, 3, 3
 	sound __,  8, $d6, $07e1
 	sound __,  7, $c6, $07e2
@@ -2079,9 +1841,8 @@ Cry_Metapod_Ch5: ; f3da1
 	sound __,  7, $b6, $07e0
 	sound __,  9, $a1, $07df
 	endchannel
-; f3dc4
 
-Cry_Metapod_Ch6: ; f3dc4
+Cry_Metapod_Ch6:
 	sound_duty 0, 1, 0, 1
 	sound __,  7, $c3, $07c9
 	sound __,  7, $b3, $07c7
@@ -2090,18 +1851,16 @@ Cry_Metapod_Ch6: ; f3dc4
 	sound __,  7, $c3, $07c9
 	sound __, 16, $a2, $07c5
 	endchannel
-; f3ddf
 
-Cry_Metapod_Ch8: ; f3ddf
+Cry_Metapod_Ch8:
 	noise __, 14, $19, $7c
 	noise __, 14, $f7, $8c
 	noise __, 13, $d6, $7c
 	noise __,  9, $c4, $6c
 	noise __, 16, $b3, $5c
 	endchannel
-; f3def
 
-Cry_Venonat_Ch5: ; f3def
+Cry_Venonat_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __,  7, $f7, $0740
 	sound __, 13, $e6, $0744
@@ -2110,9 +1869,8 @@ Cry_Venonat_Ch5: ; f3def
 	sound __,  4, $c3, $0780
 	sound __,  9, $d1, $07a0
 	endchannel
-; f3e0a
 
-Cry_Venonat_Ch6: ; f3e0a
+Cry_Venonat_Ch6:
 	sound_duty 2, 2, 0, 0
 	sound __,  7, $c7, $0701
 	sound __, 12, $b6, $0702
@@ -2121,9 +1879,8 @@ Cry_Venonat_Ch6: ; f3e0a
 	sound __,  4, $a3, $0741
 	sound __,  9, $91, $0762
 	endchannel
-; f3e25
 
-Cry_Venonat_Ch8: ; f3e25
+Cry_Venonat_Ch8:
 	noise __,  4, $e2, $3c
 	noise __,  9, $d6, $4c
 	noise __,  6, $d4, $3c
@@ -2131,9 +1888,8 @@ Cry_Venonat_Ch8: ; f3e25
 	noise __,  3, $e2, $3c
 	noise __,  9, $d1, $2c
 	endchannel
-; f3e38
 
-Cry_Squirtle_Ch5: ; f3e38
+Cry_Squirtle_Ch5:
 	sound_duty 0, 1, 3, 3
 	sound __, 16, $f0, $0705
 	sound __, 11, $e0, $0700
@@ -2142,9 +1898,8 @@ Cry_Squirtle_Ch5: ; f3e38
 	sound __,  7, $b2, $0620
 	sound __,  9, $a1, $0624
 	endchannel
-; f3e53
 
-Cry_Squirtle_Ch6: ; f3e53
+Cry_Squirtle_Ch6:
 	sound_duty 2, 0, 2, 0
 	sound __, 16, $b0, $06c3
 	sound __, 11, $a0, $06c1
@@ -2153,18 +1908,16 @@ Cry_Squirtle_Ch6: ; f3e53
 	sound __,  7, $82, $05e1
 	sound __,  9, $61, $05e8
 	endchannel
-; f3e6e
 
-Cry_Squirtle_Ch8: ; f3e6e
+Cry_Squirtle_Ch8:
 	noise __,  7, $e6, $4c
 	noise __, 16, $d6, $3c
 	noise __, 11, $c5, $4a
 	noise __,  2, $b2, $5b
 	noise __, 16, $c2, $4c
 	endchannel
-; f3e7e
 
-Cry_Fearow_Ch5: ; f3e7e
+Cry_Fearow_Ch5:
 	sound_duty 0, 0, 1, 1
 	sound __, 11, $f5, $0680
 	sound __,  4, $e2, $06a0
@@ -2175,9 +1928,8 @@ Cry_Fearow_Ch5: ; f3e7e
 	sound __,  4, $d2, $06c0
 	sound __,  9, $c1, $06a0
 	endchannel
-; f3ea1
 
-Cry_Fearow_Ch6: ; f3ea1
+Cry_Fearow_Ch6:
 	sound_duty 3, 3, 0, 0
 	sound __, 10, $d5, $0631
 	sound __,  4, $d2, $0652
@@ -2188,9 +1940,8 @@ Cry_Fearow_Ch6: ; f3ea1
 	sound __,  4, $c2, $0671
 	sound __,  9, $b1, $0651
 	endchannel
-; f3ec4
 
-Cry_Fearow_Ch8: ; f3ec4
+Cry_Fearow_Ch8:
 	noise __,  7, $e3, $4c
 	noise __,  5, $c3, $3c
 	noise __,  6, $d4, $3c
@@ -2198,61 +1949,54 @@ Cry_Fearow_Ch8: ; f3ec4
 	noise __,  7, $b4, $3c
 	noise __,  9, $c1, $2c
 	endchannel
-; f3ed7
 
-Cry_Growlithe_Ch5: ; f3ed7
+Cry_Growlithe_Ch5:
 	sound_duty 1, 1, 2, 2
 	sound __,  4, $f4, $0641
 	sound __, 14, $d6, $0721
 	sound __,  9, $f4, $0719
 	sound __,  9, $c1, $071a
 	endchannel
-; f3eea
 
-Cry_Growlithe_Ch6: ; f3eea
+Cry_Growlithe_Ch6:
 	sound_duty 0, 3, 0, 3
 	sound __,  5, $f4, $0580
 	sound __, 15, $e6, $06e0
 	sound __,  9, $d5, $06d8
 	sound __,  9, $d1, $06dc
 	endchannel
-; f3efd
 
-Cry_Growlithe_Ch8: ; f3efd
+Cry_Growlithe_Ch8:
 	noise __,  6, $c4, $46
 	noise __, 14, $a5, $44
 	noise __,  9, $c4, $45
 	noise __,  9, $b1, $44
 	endchannel
-; f3f0a
 
-Cry_Krabby_Ch5: ; f3f0a
+Cry_Krabby_Ch5:
 	sound_duty 0, 0, 3, 3
 	sound __, 14, $f1, $0511
 	sound __, 14, $e1, $0515
 	sound __, 14, $e1, $0511
 	sound __,  9, $d1, $0511
 	endchannel
-; f3f1d
 
-Cry_Krabby_Ch6: ; f3f1d
+Cry_Krabby_Ch6:
 	sound_duty 1, 1, 1, 0
 	sound __, 13, $e1, $050c
 	sound __, 13, $d1, $0510
 	sound __, 15, $c1, $050c
 	sound __,  9, $c1, $050a
 	endchannel
-; f3f30
 
-Cry_Krabby_Ch8: ; f3f30
+Cry_Krabby_Ch8:
 	noise __, 15, $f2, $65
 	noise __, 14, $e2, $55
 	noise __, 15, $d2, $56
 	noise __,  9, $d1, $66
 	endchannel
-; f3f3d
 
-Cry_Psyduck_Ch5: ; f3f3d
+Cry_Psyduck_Ch5:
 	sound_duty 3, 2, 1, 0
 	sound __,  4, $f3, $0564
 	sound __,  3, $e2, $0544
@@ -2263,9 +2007,8 @@ Cry_Psyduck_Ch5: ; f3f3d
 	sound __,  5, $e4, $04e4
 	sound __,  9, $d1, $0502
 	endchannel
-; f3f60
 
-Cry_Psyduck_Ch6: ; f3f60
+Cry_Psyduck_Ch6:
 	sound_duty 0, 3, 0, 3
 	sound __,  4, $d3, $0560
 	sound __,  3, $c2, $0540
@@ -2275,32 +2018,28 @@ Cry_Psyduck_Ch6: ; f3f60
 	sound __,  4, $d3, $0520
 	sound __,  4, $c4, $04e0
 	sound __,  9, $c1, $0500
-Cry_Psyduck_Ch8: ; f3f82
+Cry_Psyduck_Ch8:
 	endchannel
-; f3f83
 
-Cry_Rattata_Ch5: ; f3f83
+Cry_Rattata_Ch5:
 	sound_duty 1, 0, 1, 0
 	sound __,  3, $3d, $0381
 	sound __,  8, $f5, $0601
 	sound __,  2, $c2, $0481
 	sound __,  9, $91, $0381
 	endchannel
-; f3f96
 
-Cry_Rattata_Ch6: ; f3f96
+Cry_Rattata_Ch6:
 	sound_duty 2, 3, 2, 3
 	sound __,  3, $3e, $05b0
 	sound __,  8, $d5, $075d
 	sound __,  2, $b2, $06b0
 	sound __,  9, $61, $05b0
 	endchannel
-; f3fa9
 
-Cry_Rattata_Ch8: ; f3fa9
+Cry_Rattata_Ch8:
 	noise __,  3, $92, $49
 	noise __,  8, $b5, $29
 	noise __,  2, $a2, $39
 	noise __,  9, $91, $49
 	endchannel
-; f3fb6
diff --git a/audio/cry_pointers.asm b/audio/cry_pointers.asm
index 9ea69efdd..ec6b17e01 100644
--- a/audio/cry_pointers.asm
+++ b/audio/cry_pointers.asm
@@ -1,4 +1,4 @@
-Cries: ; e91b0
+Cries:
 	dba Cry_Nidoran_M
 	dba Cry_Nidoran_F
 	dba Cry_Slowpoke
@@ -67,4 +67,3 @@ Cries: ; e91b0
 	dba Cry_Aipom
 	dba Cry_Dunsparce
 	dba Cry_Donphan
-; e927c
diff --git a/audio/drumkits.asm b/audio/drumkits.asm
index 4e311a2e5..a4fa4109b 100644
--- a/audio/drumkits.asm
+++ b/audio/drumkits.asm
@@ -1,13 +1,12 @@
-Drumkits: ; e8e52
+Drumkits:
 	dw Drumkit0
 	dw Drumkit1
 	dw Drumkit2
 	dw Drumkit3
 	dw Drumkit4
 	dw Drumkit5
-; e8e5e
 
-Drumkit0: ; e8e5e
+Drumkit0:
 	dw Drum00    ; rest
 	dw Snare1    ; c
 	dw Snare2    ; c#
@@ -21,7 +20,7 @@ Drumkit0: ; e8e5e
 	dw Snare6    ; a
 	dw Snare7    ; a#
 	dw HiHat2    ; b
-Drumkit1: ; e8e78
+Drumkit1:
 	dw Drum00
 	dw HiHat1
 	dw Snare5
@@ -35,7 +34,7 @@ Drumkit1: ; e8e78
 	dw Snare9
 	dw Snare10
 	dw Snare11
-Drumkit2: ; e8e92
+Drumkit2:
 	dw Drum00
 	dw Snare1
 	dw Snare9
@@ -49,7 +48,7 @@ Drumkit2: ; e8e92
 	dw Snare6
 	dw Snare7
 	dw HiHat2
-Drumkit3: ; e8eac
+Drumkit3:
 	dw Drum21
 	dw Snare12
 	dw Snare13
@@ -63,7 +62,7 @@ Drumkit3: ; e8eac
 	dw Drum21
 	dw Kick2
 	dw Crash2
-Drumkit4: ; e8ec6
+Drumkit4:
 	dw Drum21
 	dw Drum20
 	dw Snare13
@@ -77,7 +76,7 @@ Drumkit4: ; e8ec6
 	dw Drum36
 	dw Kick2
 	dw Crash1
-Drumkit5: ; e8ee0
+Drumkit5:
 	dw Drum00
 	dw Snare9
 	dw Snare10
@@ -91,35 +90,29 @@ Drumkit5: ; e8ee0
 	dw Snare14
 	dw Snare13
 	dw Kick2
-; e8efa
 
-Drum00: ; e8efa
+Drum00:
 ; unused
 	noise C#,  1, $11, $00
 	endchannel
-; e8efe
 
-Snare1: ; e8efe
+Snare1:
 	noise C#,  1, $c1, $33
 	endchannel
-; e8f02
 
-Snare2: ; e8f02
+Snare2:
 	noise C#,  1, $b1, $33
 	endchannel
-; e8f06
 
-Snare3: ; e8f06
+Snare3:
 	noise C#,  1, $a1, $33
 	endchannel
-; e8f0a
 
-Snare4: ; e8f0a
+Snare4:
 	noise C#,  1, $81, $33
 	endchannel
-; e8f0e
 
-Drum05: ; e8f0e
+Drum05:
 	noise C#,  8, $84, $37
 	noise C#,  7, $84, $36
 	noise C#,  6, $83, $35
@@ -127,175 +120,142 @@ Drum05: ; e8f0e
 	noise C#,  4, $82, $33
 	noise C#,  3, $81, $32
 	endchannel
-; e8f21
 
-Triangle1: ; e8f21
+Triangle1:
 	noise C#,  1, $51, $2a
 	endchannel
-; e8f25
 
-Triangle2: ; e8f25
+Triangle2:
 	noise C#,  2, $41, $2b
 	noise C#,  1, $61, $2a
 	endchannel
-; e8f2c
 
-HiHat1: ; e8f2c
+HiHat1:
 	noise C#,  1, $81, $10
 	endchannel
-; e8f30
 
-Snare5: ; e8f30
+Snare5:
 	noise C#,  1, $82, $23
 	endchannel
-; e8f34
 
-Snare6: ; e8f34
+Snare6:
 	noise C#,  1, $82, $25
 	endchannel
-; e8f38
 
-Snare7: ; e8f38
+Snare7:
 	noise C#,  1, $82, $26
 	endchannel
-; e8f3c
 
-HiHat2: ; e8f3c
+HiHat2:
 	noise C#,  1, $a1, $10
 	endchannel
-; e8f40
 
-HiHat3: ; e8f40
+HiHat3:
 	noise C#,  1, $a2, $11
 	endchannel
-; e8f44
 
-Snare8: ; e8f44
+Snare8:
 	noise C#,  1, $a2, $50
 	endchannel
-; e8f48
 
-Triangle3: ; e8f48
+Triangle3:
 	noise C#,  1, $a1, $18
 	noise C#,  1, $31, $33
 	endchannel
-; e8f4f
 
-Triangle4: ; e8f4f
+Triangle4:
 	noise C#,  3, $91, $28
 	noise C#,  1, $71, $18
 	endchannel
-; e8f56
 
-Snare9: ; e8f56
+Snare9:
 	noise C#,  1, $91, $22
 	endchannel
-; e8f5a
 
-Snare10: ; e8f5a
+Snare10:
 	noise C#,  1, $71, $22
 	endchannel
-; e8f5e
 
-Snare11: ; e8f5e
+Snare11:
 	noise C#,  1, $61, $22
 	endchannel
-; e8f62
 
-Drum20: ; e8f62
+Drum20:
 	noise C#,  1, $11, $11
 	endchannel
-; e8f66
 
-Drum21: ; e8f66
+Drum21:
 	endchannel
-; e8f67
 
-Snare12: ; e8f67
+Snare12:
 	noise C#,  1, $91, $33
 	endchannel
-; e8f6b
 
-Snare13: ; e8f6b
+Snare13:
 	noise C#,  1, $51, $32
 	endchannel
-; e8f6f
 
-Snare14: ; e8f6f
+Snare14:
 	noise C#,  1, $81, $31
 	endchannel
-; e8f73
 
-Kick1: ; e8f73
+Kick1:
 	noise C#,  1, $88, $6b
 	noise C#,  1, $71, $00
 	endchannel
-; e8f7a
 
-Triangle5: ; e8f7a
+Triangle5:
 	noise D_,  1, $91, $18
 	endchannel
-; e8f7e
 
-Drum27: ; e8f7e
+Drum27:
 	noise C#,  8, $92, $10
 	endchannel
-; e8f82
 
-Drum28: ; e8f82
+Drum28:
 	noise D_,  4, $91, $00
 	noise D_,  4, $11, $00
 	endchannel
-; e8f89
 
-Drum29: ; e8f89
+Drum29:
 	noise D_,  4, $91, $11
 	noise D_,  4, $11, $00
 	endchannel
-; e8f90
 
-Crash1: ; e8f90
+Crash1:
 	noise D_,  4, $88, $15
 	noise C#,  1, $65, $12
 	endchannel
-; e8f97
 
-Drum31: ; e8f97
+Drum31:
 	noise D_,  4, $51, $21
 	noise D_,  4, $11, $11
 	endchannel
-; e8f9e
 
-Drum32: ; e8f9e
+Drum32:
 	noise D_,  4, $51, $50
 	noise D_,  4, $11, $11
 	endchannel
-; e8fa5
 
-Drum33: ; e8fa5
+Drum33:
 	noise C#,  1, $a1, $31
 	endchannel
-; e8fa9
 
-Crash2: ; e8fa9
+Crash2:
 	noise C#,  1, $84, $12
 	endchannel
-; e8fad
 
-Drum35: ; e8fad
+Drum35:
 	noise D_,  4, $81, $00
 	noise D_,  4, $11, $00
 	endchannel
-; e8fb4
 
-Drum36: ; e8fb4
+Drum36:
 	noise D_,  4, $81, $21
 	noise D_,  4, $11, $11
 	endchannel
-; e8fbb
 
-Kick2: ; e8fbb
+Kick2:
 	noise C#,  1, $a8, $6b
 	noise C#,  1, $71, $00
 	endchannel
-; e8fc2
diff --git a/audio/engine.asm b/audio/engine.asm
index 21a472fec..482b1d1db 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -6,7 +6,7 @@
 ; 	FadeMusic
 ; 	PlayStereoSFX
 
-_MapSetup_Sound_Off:: ; e8000
+_MapSetup_Sound_Off::
 ; restart sound operation
 ; clear all relevant hardware registers & wram
 	push hl
@@ -56,9 +56,7 @@ _MapSetup_Sound_Off:: ; e8000
 	pop hl
 	ret
 
-; e803d
-
-MusicFadeRestart: ; e803d
+MusicFadeRestart:
 ; restart but keep the music id to fade in to
 	ld a, [wMusicFadeID + 1]
 	push af
@@ -71,23 +69,17 @@ MusicFadeRestart: ; e803d
 	ld [wMusicFadeID + 1], a
 	ret
 
-; e8051
-
-MusicOn: ; e8051
+MusicOn:
 	ld a, 1
 	ld [wMusicPlaying], a
 	ret
 
-; e8057
-
-MusicOff: ; e8057
+MusicOff:
 	xor a
 	ld [wMusicPlaying], a
 	ret
 
-; e805c
-
-_UpdateSound:: ; e805c
+_UpdateSound::
 ; called once per frame
 	; no use updating audio if it's not playing
 	ld a, [wMusicPlaying]
@@ -100,12 +92,12 @@ _UpdateSound:: ; e805c
 	ld bc, wChannel1
 .loop
 	; is the channel active?
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	bit SOUND_CHANNEL_ON, [hl]
 	jp z, .nextchannel
 	; check time left in the current note
-	ld hl, wChannel1NoteDuration - wChannel1
+	ld hl, CHANNEL_NOTE_DURATION
 	add hl, bc
 	ld a, [hl]
 	cp $2 ; 1 or 0?
@@ -115,14 +107,14 @@ _UpdateSound:: ; e805c
 
 .noteover
 	; reset vibrato delay
-	ld hl, wChannel1VibratoDelay - wChannel1
+	ld hl, CHANNEL_VIBRATO_DELAY
 	add hl, bc
 	ld a, [hl]
-	ld hl, wChannel1VibratoDelayCount - wChannel1
+	ld hl, CHANNEL_VIBRATO_DELAY_COUNT
 	add hl, bc
 	ld [hl], a
 	; turn vibrato off for now
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	res SOUND_PITCH_WHEEL, [hl]
 	; get next note
@@ -130,7 +122,7 @@ _UpdateSound:: ; e805c
 .continue_sound_update
 	call ApplyPitchWheel
 	; duty cycle
-	ld hl, wChannel1DutyCycle - wChannel1
+	ld hl, CHANNEL_DUTY_CYCLE
 	add hl, bc
 	ld a, [hli]
 	ld [wCurTrackDuty], a
@@ -151,58 +143,58 @@ _UpdateSound:: ; e805c
 	jr z, .next
 	; are we in a sfx channel right now?
 	ld a, [wCurChannel]
-	cp CHAN5
+	cp NUM_MUSIC_CHANS
 	jr nc, .next
 	; are any sfx channels active?
 	; if so, mute
-	ld hl, wChannel5Flags
+	ld hl, wChannel5Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr nz, .restnote
-	ld hl, wChannel6Flags
+	ld hl, wChannel6Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr nz, .restnote
-	ld hl, wChannel7Flags
+	ld hl, wChannel7Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr nz, .restnote
-	ld hl, wChannel8Flags
+	ld hl, wChannel8Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr z, .next
 .restnote
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	set NOTE_REST, [hl] ; Rest
 .next
 	; are we in a sfx channel right now?
 	ld a, [wCurChannel]
-	cp CHAN5
+	cp NUM_MUSIC_CHANS
 	jr nc, .sfx_channel
-	ld hl, wChannel5Flags - wChannel1
+	ld hl, CHANNEL_STRUCT_LENGTH * NUM_MUSIC_CHANS + CHANNEL_FLAGS1
 	add hl, bc
 	bit SOUND_CHANNEL_ON, [hl]
 	jr nz, .sound_channel_on
 .sfx_channel
 	call UpdateChannels
-	ld hl, wChannel1Tracks - wChannel1
+	ld hl, CHANNEL_TRACKS
 	add hl, bc
 	ld a, [wSoundOutput]
 	or [hl]
 	ld [wSoundOutput], a
 .sound_channel_on
 	; clear note flags
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	xor a
 	ld [hl], a
 .nextchannel
 	; next channel
-	ld hl, wChannel2 - wChannel1
+	ld hl, CHANNEL_STRUCT_LENGTH
 	add hl, bc
 	ld c, l
 	ld b, h
 	ld a, [wCurChannel]
 	inc a
 	ld [wCurChannel], a
-	cp $8 ; are we done?
+	cp NUM_CHANNELS ; are we done?
 	jp nz, .loop ; do it all again
 
 	call PlayDanger
@@ -216,9 +208,7 @@ _UpdateSound:: ; e805c
 	ld [rNR51], a
 	ret
 
-; e8125
-
-UpdateChannels: ; e8125
+UpdateChannels:
 	ld hl, .ChannelFnPtrs
 	ld a, [wCurChannel]
 	and $7
@@ -248,7 +238,7 @@ UpdateChannels: ; e8125
 	bit DANGER_ON_F, a
 	ret nz
 .Channel5:
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	bit NOTE_UNKN_3, [hl]
 	jr z, .asm_e8159
@@ -317,7 +307,7 @@ UpdateChannels: ; e8125
 
 .Channel2:
 .Channel6:
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	bit NOTE_REST, [hl] ; rest
 	jr nz, .ch2rest
@@ -377,7 +367,7 @@ UpdateChannels: ; e8125
 
 .Channel3:
 .Channel7:
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	bit NOTE_REST, [hl] ; rest
 	jr nz, .ch3rest
@@ -478,7 +468,7 @@ endr
 
 .Channel4:
 .Channel8:
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	bit NOTE_REST, [hl] ; rest
 	jr nz, .ch4rest
@@ -510,20 +500,18 @@ endr
 	ld [rNR44], a
 	ret
 
-; e82e7
-
-_CheckSFX: ; e82e7
+_CheckSFX:
 ; return carry if any sfx channels are active
-	ld hl, wChannel5Flags
+	ld hl, wChannel5Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr nz, .sfxon
-	ld hl, wChannel6Flags
+	ld hl, wChannel6Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr nz, .sfxon
-	ld hl, wChannel7Flags
+	ld hl, wChannel7Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr nz, .sfxon
-	ld hl, wChannel8Flags
+	ld hl, wChannel8Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr nz, .sfxon
 	and a
@@ -533,75 +521,79 @@ _CheckSFX: ; e82e7
 	scf
 	ret
 
-; e8307
-
-PlayDanger: ; e8307
+PlayDanger:
 	ld a, [wLowHealthAlarm]
 	bit DANGER_ON_F, a
 	ret z
+
+	; Don't do anything if SFX is being played
 	and $ff ^ (1 << DANGER_ON_F)
 	ld d, a
 	call _CheckSFX
-	jr c, .asm_e8335
+	jr c, .increment
+
+	; Play the high tone
 	and a
-	jr z, .asm_e8323
-	cp 16 ; halfway
-	jr z, .asm_e831e
-	jr .asm_e8335
-
-.asm_e831e
-	ld hl, Tablee8354
-	jr .updatehw
-
-.asm_e8323
-	ld hl, Tablee8350
-.updatehw
+	jr z, .begin
+
+	; Play the low tone
+	cp 16
+	jr z, .halfway
+
+	jr .increment
+
+.halfway
+	ld hl, DangerSoundLow
+	jr .applychannel
+
+.begin
+	ld hl, DangerSoundHigh
+
+.applychannel
 	xor a
-	ld [rNR10], a ; sweep off
+	ld [rNR10], a
 	ld a, [hli]
-	ld [rNR11], a ; sound length / duty cycle
+	ld [rNR11], a
 	ld a, [hli]
-	ld [rNR12], a ; ch1 volume envelope
+	ld [rNR12], a
 	ld a, [hli]
-	ld [rNR13], a ; ch1 frequency lo
+	ld [rNR13], a
 	ld a, [hli]
-	ld [rNR14], a ; ch1 frequency hi
-.asm_e8335
+	ld [rNR14], a
+
+.increment
 	ld a, d
 	inc a
-	cp 30
-	jr c, .asm_e833c
+	cp 30 ; Ending frame
+	jr c, .noreset
 	xor a
-.asm_e833c
+.noreset
+	; Make sure the danger sound is kept on
 	or 1 << DANGER_ON_F
 	ld [wLowHealthAlarm], a
-	; is hw ch1 on?
+
+	; Enable channel 1 if it's off
 	ld a, [wSoundOutput]
 	and $11
 	ret nz
-	; if not, turn it on
 	ld a, [wSoundOutput]
 	or $11
 	ld [wSoundOutput], a
 	ret
 
-; e8350
-
-Tablee8350: ; e8350
+DangerSoundHigh:
 	db $80 ; duty 50%
 	db $e2 ; volume 14, envelope decrease sweep 2
 	db $50 ; frequency: $750
 	db $87 ; restart sound
-; e8354
 
-Tablee8354: ; e8354
+DangerSoundLow:
 	db $80 ; duty 50%
 	db $e2 ; volume 14, envelope decrease sweep 2
 	db $ee ; frequency: $6ee
 	db $86 ; restart sound
-; e8358
 
-FadeMusic: ; e8358
+FadeMusic:
 ; fade music if applicable
 ; usage:
 ;	write to wMusicFade
@@ -693,7 +685,7 @@ FadeMusic: ; e8358
 
 .fadein
 	; are we done?
-	cp $7
+	cp MAX_VOLUME & $f
 	jr nc, .maxvolume
 	; inc volume
 	inc a
@@ -713,16 +705,14 @@ FadeMusic: ; e8358
 	ld [wVolume], a
 	ret
 
-; e83d1
-
-LoadNote: ; e83d1
+LoadNote:
 	; wait for pitch wheel to finish
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	bit SOUND_PITCH_WHEEL, [hl]
 	ret z
 	; get note duration
-	ld hl, wChannel1NoteDuration - wChannel1
+	ld hl, CHANNEL_NOTE_DURATION
 	add hl, bc
 	ld a, [hl]
 	ld hl, wCurNoteDuration
@@ -732,13 +722,13 @@ LoadNote: ; e83d1
 .ok
 	ld [hl], a
 	; get frequency
-	ld hl, wChannel1Frequency - wChannel1
+	ld hl, CHANNEL_FREQUENCY
 	add hl, bc
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
 	; get direction of pitch wheel
-	ld hl, wChannel1PitchWheelTarget - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET
 	add hl, bc
 	ld a, e
 	sub [hl]
@@ -746,21 +736,21 @@ LoadNote: ; e83d1
 	ld a, d
 	sbc 0
 	ld d, a
-	ld hl, wChannel1PitchWheelTarget + 1 - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1
 	add hl, bc
 	sub [hl]
 	jr nc, .greater_than
-	ld hl, wChannel1Flags3 - wChannel1
+	ld hl, CHANNEL_FLAGS3
 	add hl, bc
 	set SOUND_PITCH_WHEEL_DIR, [hl]
 	; get frequency
-	ld hl, wChannel1Frequency - wChannel1
+	ld hl, CHANNEL_FREQUENCY
 	add hl, bc
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
 	; ????
-	ld hl, wChannel1PitchWheelTarget - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET
 	add hl, bc
 	ld a, [hl]
 	sub e
@@ -769,7 +759,7 @@ LoadNote: ; e83d1
 	sbc 0
 	ld d, a
 	; ????
-	ld hl, wChannel1PitchWheelTarget + 1 - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1
 	add hl, bc
 	ld a, [hl]
 	sub d
@@ -777,17 +767,17 @@ LoadNote: ; e83d1
 	jr .resume
 
 .greater_than
-	ld hl, wChannel1Flags3 - wChannel1
+	ld hl, CHANNEL_FLAGS3
 	add hl, bc
 	res SOUND_PITCH_WHEEL_DIR, [hl]
 	; get frequency
-	ld hl, wChannel1Frequency - wChannel1
+	ld hl, CHANNEL_FREQUENCY
 	add hl, bc
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
 	; get distance from pitch wheel target
-	ld hl, wChannel1PitchWheelTarget - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET
 	add hl, bc
 	ld a, e
 	sub [hl]
@@ -795,7 +785,7 @@ LoadNote: ; e83d1
 	ld a, d
 	sbc 0
 	ld d, a
-	ld hl, wChannel1PitchWheelTarget + 1 - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1
 	add hl, bc
 	sub [hl]
 	ld d, a
@@ -823,27 +813,25 @@ LoadNote: ; e83d1
 	add [hl]
 	ld d, b ; quotient
 	pop bc
-	ld hl, wChannel1PitchWheelAmount - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_AMOUNT
 	add hl, bc
 	ld [hl], d ; quotient
-	ld hl, wChannel1PitchWheelAmountFraction - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION
 	add hl, bc
 	ld [hl], a ; remainder
-	ld hl, wChannel1Field25 - wChannel1
+	ld hl, CHANNEL_FIELD25
 	add hl, bc
 	xor a
 	ld [hl], a
 	ret
 
-; e8466
-
-HandleTrackVibrato: ; e8466
+HandleTrackVibrato:
 ; handle duty, cry pitch, and vibrato
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	bit SOUND_DUTY, [hl] ; duty
 	jr z, .next
-	ld hl, wChannel1SFXDutyLoop - wChannel1
+	ld hl, CHANNEL_SFX_DUTY_LOOP
 	add hl, bc
 	ld a, [hl]
 	rlca
@@ -851,15 +839,15 @@ HandleTrackVibrato: ; e8466
 	ld [hl], a
 	and $c0
 	ld [wCurTrackDuty], a
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	set NOTE_DUTY_OVERRIDE, [hl]
 .next
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	bit SOUND_CRY_PITCH, [hl]
 	jr z, .vibrato
-	ld hl, wChannel1CryPitch - wChannel1
+	ld hl, CHANNEL_CRY_PITCH
 	add hl, bc
 	ld e, [hl]
 	inc hl
@@ -877,19 +865,19 @@ HandleTrackVibrato: ; e8466
 	ld [hl], d
 .vibrato
 	; is vibrato on?
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	bit SOUND_VIBRATO, [hl] ; vibrato
 	jr z, .quit
 	; is vibrato active for this note yet?
 	; is the delay over?
-	ld hl, wChannel1VibratoDelayCount - wChannel1
+	ld hl, CHANNEL_VIBRATO_DELAY_COUNT
 	add hl, bc
 	ld a, [hl]
 	and a
 	jr nz, .subexit
 	; is the extent nonzero?
-	ld hl, wChannel1VibratoExtent - wChannel1
+	ld hl, CHANNEL_VIBRATO_EXTENT
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -897,7 +885,7 @@ HandleTrackVibrato: ; e8466
 	; save it for later
 	ld d, a
 	; is it time to toggle vibrato up/down?
-	ld hl, wChannel1VibratoRate - wChannel1
+	ld hl, CHANNEL_VIBRATO_RATE
 	add hl, bc
 	ld a, [hl]
 	and $f ; count
@@ -916,7 +904,7 @@ HandleTrackVibrato: ; e8466
 	ld a, [wCurTrackFrequency]
 	ld e, a
 	; toggle vibrato up/down
-	ld hl, wChannel1Flags3 - wChannel1
+	ld hl, CHANNEL_FLAGS3
 	add hl, bc
 	bit SOUND_VIBRATO_DIR, [hl] ; vibrato up/down
 	jr z, .down
@@ -948,33 +936,31 @@ HandleTrackVibrato: ; e8466
 .no_carry
 	ld [wCurTrackFrequency], a
 	;
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	set NOTE_VIBRATO_OVERRIDE, [hl]
 .quit
 	ret
 
-; e84f9
-
-ApplyPitchWheel: ; e84f9
+ApplyPitchWheel:
 	; quit if pitch wheel inactive
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	bit SOUND_PITCH_WHEEL, [hl]
 	ret z
 	; de = Frequency
-	ld hl, wChannel1Frequency - wChannel1
+	ld hl, CHANNEL_FREQUENCY
 	add hl, bc
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
 	; check whether pitch wheel is going up or down
-	ld hl, wChannel1Flags3 - wChannel1
+	ld hl, CHANNEL_FLAGS3
 	add hl, bc
 	bit SOUND_PITCH_WHEEL_DIR, [hl]
 	jr z, .decreasing
 	; frequency += [Channel*PitchWheelAmount]
-	ld hl, wChannel1PitchWheelAmount - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_AMOUNT
 	add hl, bc
 	ld l, [hl]
 	ld h, 0
@@ -983,10 +969,10 @@ ApplyPitchWheel: ; e84f9
 	ld e, l
 	; [Channel*Field25] += [Channel*PitchWheelAmountFraction]
 	; if rollover: Frequency += 1
-	ld hl, wChannel1PitchWheelAmountFraction - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION
 	add hl, bc
 	ld a, [hl]
-	ld hl, wChannel1Field25 - wChannel1
+	ld hl, CHANNEL_FIELD25
 	add hl, bc
 	add [hl]
 	ld [hl], a
@@ -999,13 +985,13 @@ ApplyPitchWheel: ; e84f9
 	; Compare the dw at [Channel*PitchWheelTarget] to de.
 	; If frequency is greater, we're finished.
 	; Otherwise, load the frequency and set two flags.
-	ld hl, wChannel1PitchWheelTarget + 1 - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1
 	add hl, bc
 	ld a, [hl]
 	cp d
 	jp c, .finished_pitch_wheel
 	jr nz, .continue_pitch_wheel
-	ld hl, wChannel1PitchWheelTarget - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET
 	add hl, bc
 	ld a, [hl]
 	cp e
@@ -1015,7 +1001,7 @@ ApplyPitchWheel: ; e84f9
 .decreasing
 	; frequency -= [Channel*PitchWheelAmount]
 	ld a, e
-	ld hl, wChannel1PitchWheelAmount - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_AMOUNT
 	add hl, bc
 	ld e, [hl]
 	sub e
@@ -1025,7 +1011,7 @@ ApplyPitchWheel: ; e84f9
 	ld d, a
 	; [Channel*Field25] *= 2
 	; if rollover: Frequency -= 1
-	ld hl, wChannel1PitchWheelAmountFraction - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION
 	add hl, bc
 	ld a, [hl]
 	add a
@@ -1039,52 +1025,50 @@ ApplyPitchWheel: ; e84f9
 	; Compare the dw at [Channel*PitchWheelTarget] to de.
 	; If frequency is lower, we're finished.
 	; Otherwise, load the frequency and set two flags.
-	ld hl, wChannel1PitchWheelTarget + 1 - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1
 	add hl, bc
 	ld a, d
 	cp [hl]
 	jr c, .finished_pitch_wheel
 	jr nz, .continue_pitch_wheel
-	ld hl, wChannel1PitchWheelTarget - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET
 	add hl, bc
 	ld a, e
 	cp [hl]
 	jr nc, .continue_pitch_wheel
 .finished_pitch_wheel
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	res SOUND_PITCH_WHEEL, [hl]
-	ld hl, wChannel1Flags3 - wChannel1
+	ld hl, CHANNEL_FLAGS3
 	add hl, bc
 	res SOUND_PITCH_WHEEL_DIR, [hl]
 	ret
 
 .continue_pitch_wheel
-	ld hl, wChannel1Frequency - wChannel1
+	ld hl, CHANNEL_FREQUENCY
 	add hl, bc
 	ld [hl], e
 	inc hl
 	ld [hl], d
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	set NOTE_FREQ_OVERRIDE, [hl]
 	set NOTE_DUTY_OVERRIDE, [hl]
 	ret
 
-; e858c
-
-HandleNoise: ; e858c
+HandleNoise:
 	; is noise sampling on?
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	bit SOUND_NOISE, [hl] ; noise sampling
 	ret z
 	; are we in a sfx channel?
 	ld a, [wCurChannel]
-	bit 2, a ; sfx
+	bit NOISE_CHAN_F, a
 	jr nz, .next
 	; is ch8 on? (noise)
-	ld hl, wChannel8Flags
+	ld hl, wChannel8Flags1
 	bit SOUND_CHANNEL_ON, [hl] ; on?
 	jr z, .next
 	; is ch8 playing noise?
@@ -1099,9 +1083,7 @@ HandleNoise: ; e858c
 	ld [wNoiseSampleDelay], a
 	ret
 
-; e85af
-
-ReadNoiseSample: ; e85af
+ReadNoiseSample:
 ; sample struct:
 ;	[wx] [yy] [zz]
 ;	w: ? either 2 or 3
@@ -1143,7 +1125,7 @@ ReadNoiseSample: ; e85af
 	inc hl
 	ld [hl], d
 
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	set NOTE_NOISE_SAMPLING, [hl]
 	ret
@@ -1151,9 +1133,7 @@ ReadNoiseSample: ; e85af
 .quit
 	ret
 
-; e85e1
-
-ParseMusic: ; e85e1
+ParseMusic:
 ; parses until a note is read or the song is ended
 	call GetMusicByte ; store next byte in a
 	cp $ff ; is the song over?
@@ -1168,7 +1148,7 @@ ParseMusic: ; e85e1
 .readnote
 ; wCurMusicByte contains current note
 ; special notes
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	bit SOUND_SFX, [hl]
 	jp nz, ParseSFXOrRest
@@ -1187,38 +1167,38 @@ ParseMusic: ; e85e1
 	and $f
 	jr z, .rest ; pitch 0-> rest
 	; update pitch
-	ld hl, wChannel1Pitch - wChannel1
+	ld hl, CHANNEL_PITCH
 	add hl, bc
 	ld [hl], a
 	; store pitch in e
 	ld e, a
 	; store octave in d
-	ld hl, wChannel1Octave - wChannel1
+	ld hl, CHANNEL_OCTAVE
 	add hl, bc
 	ld d, [hl]
 	; update frequency
 	call GetFrequency
-	ld hl, wChannel1Frequency - wChannel1
+	ld hl, CHANNEL_FREQUENCY
 	add hl, bc
 	ld [hl], e
 	inc hl
 	ld [hl], d
 	; ????
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	set NOTE_NOISE_SAMPLING, [hl]
 	jp LoadNote
 
 .rest
 ; note = rest
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	set NOTE_REST, [hl] ; Rest
 	ret
 
 .endchannel
 ; $ff is reached in music data
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	bit SOUND_SUBROUTINE, [hl] ; in a subroutine?
 	jr nz, .readcommand ; execute
@@ -1226,12 +1206,12 @@ ParseMusic: ; e85e1
 	cp CHAN5
 	jr nc, .chan_5to8
 	; ????
-	ld hl, wChannel5Flags - wChannel1
+	ld hl, CHANNEL_STRUCT_LENGTH * NUM_MUSIC_CHANS + CHANNEL_FLAGS1
 	add hl, bc
 	bit SOUND_CHANNEL_ON, [hl]
 	jr nz, .ok
 .chan_5to8
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	bit SOUND_REST, [hl]
 	call nz, RestoreVolume
@@ -1245,15 +1225,15 @@ ParseMusic: ; e85e1
 .ok
 ; stop playing
 	; turn channel off
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	res SOUND_CHANNEL_ON, [hl]
 	; note = rest
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	set NOTE_REST, [hl]
 	; clear music id & bank
-	ld hl, wChannel1MusicID - wChannel1
+	ld hl, CHANNEL_MUSIC_ID
 	add hl, bc
 	xor a
 	ld [hli], a ; id hi
@@ -1261,9 +1241,7 @@ ParseMusic: ; e85e1
 	ld [hli], a ; bank
 	ret
 
-; e8679
-
-RestoreVolume: ; e8679
+RestoreVolume:
 	; ch5 only
 	ld a, [wCurChannel]
 	cp CHAN5
@@ -1282,11 +1260,9 @@ RestoreVolume: ; e8679
 	ld [wSFXPriority], a
 	ret
 
-; e8698
-
-ParseSFXOrRest: ; e8698
+ParseSFXOrRest:
 	; turn noise sampling on
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	set NOTE_NOISE_SAMPLING, [hl] ; noise sample
 	; update note duration
@@ -1294,12 +1270,12 @@ ParseSFXOrRest: ; e8698
 	call SetNoteDuration ; top nybble doesnt matter?
 	; update intensity from next param
 	call GetMusicByte
-	ld hl, wChannel1Intensity - wChannel1
+	ld hl, CHANNEL_INTENSITY
 	add hl, bc
 	ld [hl], a
 	; update lo frequency from next param
 	call GetMusicByte
-	ld hl, wChannel1FrequencyLo - wChannel1
+	ld hl, CHANNEL_FREQUENCY
 	add hl, bc
 	ld [hl], a
 	; are we on the last channel? (noise sampling)
@@ -1309,18 +1285,16 @@ ParseSFXOrRest: ; e8698
 	ret z
 	; update hi frequency from next param
 	call GetMusicByte
-	ld hl, wChannel1FrequencyHi - wChannel1
+	ld hl, CHANNEL_FREQUENCY + 1
 	add hl, bc
 	ld [hl], a
 	ret
 
-; e86c5
-
-GetNoiseSample: ; e86c5
+GetNoiseSample:
 ; load ptr to sample header in wNoiseSampleAddress
 	; are we on the last channel?
 	ld a, [wCurChannel]
-	and NUM_MUSIC_CHANS +- 1
+	and NUM_MUSIC_CHANS + -1
 	cp CHAN4
 	; ret if not
 	ret nz
@@ -1330,9 +1304,9 @@ GetNoiseSample: ; e86c5
 	call SetNoteDuration
 	; check current channel
 	ld a, [wCurChannel]
-	bit 2, a ; are we in a sfx channel?
+	bit NOISE_CHAN_F, a
 	jr nz, .sfx
-	ld hl, wChannel8Flags
+	ld hl, wChannel8Flags1
 	bit SOUND_CHANNEL_ON, [hl] ; is ch8 on? (noise)
 	ret nz
 	ld a, [wMusicNoiseSampleSet]
@@ -1372,9 +1346,7 @@ GetNoiseSample: ; e86c5
 	ld [wNoiseSampleDelay], a
 	ret
 
-; e870f
-
-ParseMusicCommand: ; e870f
+ParseMusicCommand:
 	; reload command
 	ld a, [wCurMusicByte]
 	; get command #
@@ -1391,9 +1363,7 @@ ParseMusicCommand: ; e870f
 	ld l, a
 	jp hl
 
-; e8720
-
-MusicCommands: ; e8720
+MusicCommands:
 ; entries correspond to macros/sound.asm enumeration
 	dw Music_Octave8 ; octave 8
 	dw Music_Octave7 ; octave 7
@@ -1443,44 +1413,39 @@ MusicCommands: ; e8720
 	dw Music_LoopChannel ; loop
 	dw Music_CallChannel ; call
 	dw Music_EndChannel ; return
-; e8780
 
-MusicF1: ; e8780
-MusicF2: ; e8780
-MusicF3: ; e8780
-MusicF4: ; e8780
-MusicF5: ; e8780
-MusicF6: ; e8780
-MusicF7: ; e8780
-MusicF8: ; e8780
+MusicF1:
+MusicF2:
+MusicF3:
+MusicF4:
+MusicF5:
+MusicF6:
+MusicF7:
+MusicF8:
 	ret
 
-; e8781
-
-Music_EndChannel: ; e8781
+Music_EndChannel:
 ; called when $ff is encountered w/ subroutine flag set
 ; end music stream
 ; return to caller of the subroutine
 	; reset subroutine flag
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	res SOUND_SUBROUTINE, [hl]
 	; copy LastMusicAddress to MusicAddress
-	ld hl, wChannel1LastMusicAddress - wChannel1
+	ld hl, CHANNEL_LAST_MUSIC_ADDRESS
 	add hl, bc
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld [hl], e
 	inc hl
 	ld [hl], d
 	ret
 
-; e8796
-
-Music_CallChannel: ; e8796
+Music_CallChannel:
 ; call music stream (subroutine)
 ; parameters: ll hh ; pointer to subroutine
 	; get pointer from next 2 bytes
@@ -1490,32 +1455,30 @@ Music_CallChannel: ; e8796
 	ld d, a
 	push de
 	; copy MusicAddress to LastMusicAddress
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
-	ld hl, wChannel1LastMusicAddress - wChannel1
+	ld hl, CHANNEL_LAST_MUSIC_ADDRESS
 	add hl, bc
 	ld [hl], e
 	inc hl
 	ld [hl], d
 	; load pointer into MusicAddress
 	pop de
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld [hl], e
 	inc hl
 	ld [hl], d
 	; set subroutine flag
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	set SOUND_SUBROUTINE, [hl]
 	ret
 
-; e87bc
-
-Music_JumpChannel: ; e87bc
+Music_JumpChannel:
 ; jump
 ; parameters: ll hh ; pointer
 	; get pointer from next 2 bytes
@@ -1523,16 +1486,14 @@ Music_JumpChannel: ; e87bc
 	ld e, a
 	call GetMusicByte
 	ld d, a
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld [hl], e
 	inc hl
 	ld [hl], d
 	ret
 
-; e87cc
-
-Music_LoopChannel: ; e87cc
+Music_LoopChannel:
 ; loops xx - 1 times
 ; 	00: infinite
 ; params: 3
@@ -1542,7 +1503,7 @@ Music_LoopChannel: ; e87cc
 
 	; get loop count
 	call GetMusicByte
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	bit SOUND_LOOPING, [hl] ; has the loop been initiated?
 	jr nz, .checkloop
@@ -1551,11 +1512,11 @@ Music_LoopChannel: ; e87cc
 	; initiate loop
 	dec a
 	set SOUND_LOOPING, [hl] ; set loop flag
-	ld hl, wChannel1LoopCount - wChannel1
+	ld hl, CHANNEL_LOOP_COUNT
 	add hl, bc
 	ld [hl], a ; store loop counter
 .checkloop
-	ld hl, wChannel1LoopCount - wChannel1
+	ld hl, CHANNEL_LOOP_COUNT
 	add hl, bc
 	ld a, [hl]
 	and a ; are we done?
@@ -1568,7 +1529,7 @@ Music_LoopChannel: ; e87cc
 	call GetMusicByte
 	ld d, a
 	; load new pointer into MusicAddress
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld [hl], e
 	inc hl
@@ -1577,11 +1538,11 @@ Music_LoopChannel: ; e87cc
 
 .endloop
 	; reset loop flag
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	res SOUND_LOOPING, [hl]
 	; skip to next command
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld e, [hl]
 	inc hl
@@ -1593,9 +1554,7 @@ Music_LoopChannel: ; e87cc
 	ld [hl], e
 	ret
 
-; e880e
-
-Music_SetCondition: ; e880e
+Music_SetCondition:
 ; set condition for a jump
 ; used with FB
 ; params: 1
@@ -1603,14 +1562,12 @@ Music_SetCondition: ; e880e
 
 	; set condition
 	call GetMusicByte
-	ld hl, wChannel1Condition - wChannel1
+	ld hl, CHANNEL_CONDITION
 	add hl, bc
 	ld [hl], a
 	ret
 
-; e8817
-
-Music_JumpIf: ; e8817
+Music_JumpIf:
 ; conditional jump
 ; used with FA
 ; params: 3
@@ -1621,13 +1578,13 @@ Music_JumpIf: ; e8817
 	; a = condition
 	call GetMusicByte
 	; if existing condition matches, jump to new address
-	ld hl, wChannel1Condition - wChannel1
+	ld hl, CHANNEL_CONDITION
 	add hl, bc
 	cp [hl]
 	jr z, .jump
 ; skip to next command
 	; get address
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld e, [hl]
 	inc hl
@@ -1649,16 +1606,14 @@ Music_JumpIf: ; e8817
 	call GetMusicByte
 	ld d, a
 	; update pointer in MusicAddress
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld [hl], e
 	inc hl
 	ld [hl], d
 	ret
 
-; e883e
-
-MusicEE; e883e
+MusicEE
 ; conditional jump
 ; checks a byte in ram corresponding to the current channel
 ; doesn't seem to be set by any commands
@@ -1680,7 +1635,7 @@ MusicEE; e883e
 	jr nz, .jump
 ; skip to next command
 	; get address
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld e, [hl]
 	inc hl
@@ -1703,16 +1658,14 @@ MusicEE; e883e
 	call GetMusicByte
 	ld d, a
 	; update address
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld [hl], e
 	inc hl
 	ld [hl], d
 	ret
 
-; e886d
-
-MusicF9: ; e886d
+MusicF9:
 ; sets some flag
 ; seems to be unused
 ; params: 0
@@ -1720,23 +1673,19 @@ MusicF9: ; e886d
 	ld [wc2b5], a
 	ret
 
-; e8873
-
-MusicE2: ; e8873
+MusicE2:
 ; seems to have been dummied out
 ; params: 1
 	call GetMusicByte
-	ld hl, wChannel1Field2c - wChannel1
+	ld hl, CHANNEL_FIELD2C
 	add hl, bc
 	ld [hl], a
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	set SOUND_UNKN_0B, [hl]
 	ret
 
-; e8882
-
-Music_Vibrato: ; e8882
+Music_Vibrato:
 ; vibrato
 ; params: 2
 ;	1: [xx]
@@ -1746,28 +1695,28 @@ Music_Vibrato: ; e8882
 	; z: rate (# frames per cycle)
 
 	; set vibrato flag?
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	set SOUND_VIBRATO, [hl]
 	; start at lower frequency (extent is positive)
-	ld hl, wChannel1Flags3 - wChannel1
+	ld hl, CHANNEL_FLAGS3
 	add hl, bc
 	res SOUND_VIBRATO_DIR, [hl]
 	; get delay
 	call GetMusicByte
 ; update delay
-	ld hl, wChannel1VibratoDelay - wChannel1
+	ld hl, CHANNEL_VIBRATO_DELAY
 	add hl, bc
 	ld [hl], a
 ; update delay count
-	ld hl, wChannel1VibratoDelayCount - wChannel1
+	ld hl, CHANNEL_VIBRATO_DELAY_COUNT
 	add hl, bc
 	ld [hl], a
 ; update extent
 ; this is split into halves only to get added back together at the last second
 	; get extent/rate
 	call GetMusicByte
-	ld hl, wChannel1VibratoExtent - wChannel1
+	ld hl, CHANNEL_VIBRATO_EXTENT
 	add hl, bc
 	ld d, a
 	; get top nybble
@@ -1775,12 +1724,12 @@ Music_Vibrato: ; e8882
 	swap a
 	srl a ; halve
 	ld e, a
-	adc a, 0; round up
+	adc 0 ; round up
 	swap a
 	or e
 	ld [hl], a
 ; update rate
-	ld hl, wChannel1VibratoRate - wChannel1
+	ld hl, CHANNEL_VIBRATO_RATE
 	add hl, bc
 	; get bottom nybble
 	ld a, d
@@ -1791,9 +1740,7 @@ Music_Vibrato: ; e8882
 	ld [hl], a
 	ret
 
-; e88bd
-
-Music_SlidePitchTo: ; e88bd
+Music_SlidePitchTo:
 ; set the target for pitch wheel
 ; params: 2
 ; note duration
@@ -1813,26 +1760,24 @@ Music_SlidePitchTo: ; e88bd
 	and $f
 	ld d, a
 	call GetFrequency
-	ld hl, wChannel1PitchWheelTarget - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET
 	add hl, bc
 	ld [hl], e
-	ld hl, wChannel1PitchWheelTarget + 1 - wChannel1
+	ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1
 	add hl, bc
 	ld [hl], d
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	set SOUND_PITCH_WHEEL, [hl]
 	ret
 
-; e88e4
-
-Music_Tone: ; e88e4
+Music_Tone:
 ; tone
 ; params: 1 (dw)
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	set SOUND_CRY_PITCH, [hl]
-	ld hl, wChannel1CryPitch + 1 - wChannel1
+	ld hl, CHANNEL_CRY_PITCH + 1
 	add hl, bc
 	call GetMusicByte
 	ld [hld], a
@@ -1840,62 +1785,54 @@ Music_Tone: ; e88e4
 	ld [hl], a
 	ret
 
-; e88f7
-
-MusicE7: ; e88f7
+MusicE7:
 ; unused
 ; params: 1
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	set SOUND_UNKN_0E, [hl]
 	call GetMusicByte
-	ld hl, wChannel1Field29 - wChannel1
+	ld hl, CHANNEL_FIELD29
 	add hl, bc
 	ld [hl], a
 	ret
 
-; e8906
-
-Music_SoundDuty: ; e8906
+Music_SoundDuty:
 ; sequence of 4 duty cycles to be looped
 ; params: 1 (4 2-bit duty cycle arguments)
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	set SOUND_DUTY, [hl] ; duty cycle
 	; sound duty sequence
 	call GetMusicByte
 	rrca
 	rrca
-	ld hl, wChannel1SFXDutyLoop - wChannel1
+	ld hl, CHANNEL_SFX_DUTY_LOOP
 	add hl, bc
 	ld [hl], a
 	; update duty cycle
 	and $c0 ; only uses top 2 bits
-	ld hl, wChannel1DutyCycle - wChannel1
+	ld hl, CHANNEL_DUTY_CYCLE
 	add hl, bc
 	ld [hl], a
 	ret
 
-; e891e
-
-MusicE8: ; e891e
+MusicE8:
 ; unused
 ; params: 1
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	set SOUND_UNKN_0D, [hl]
 	call GetMusicByte
-	ld hl, wChannel1Field2a - wChannel1
+	ld hl, CHANNEL_FIELD2A
 	add hl, bc
 	ld [hl], a
 	ret
 
-; e892d
-
-Music_ToggleSFX: ; e892d
+Music_ToggleSFX:
 ; toggle something
 ; params: none
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	bit SOUND_SFX, [hl]
 	jr z, .on
@@ -1906,16 +1843,14 @@ Music_ToggleSFX: ; e892d
 	set SOUND_SFX, [hl]
 	ret
 
-; e893b
-
-Music_ToggleNoise: ; e893b
+Music_ToggleNoise:
 ; toggle music noise sampling
 ; can't be used as a straight toggle since the param is not read from on->off
 ; params:
 ; 	noise on: 1
 ; 	noise off: 0
 	; check if noise sampling is on
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	bit SOUND_NOISE, [hl]
 	jr z, .on
@@ -1930,15 +1865,13 @@ Music_ToggleNoise: ; e893b
 	ld [wMusicNoiseSampleSet], a
 	ret
 
-; e894f
-
-Music_SFXToggleNoise: ; e894f
+Music_SFXToggleNoise:
 ; toggle sfx noise sampling
 ; params:
 ;	on: 1
 ; 	off: 0
 	; check if noise sampling is on
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	bit SOUND_NOISE, [hl]
 	jr z, .on
@@ -1953,16 +1886,14 @@ Music_SFXToggleNoise: ; e894f
 	ld [wSFXNoiseSampleSet], a
 	ret
 
-; e8963
-
-Music_NoteType: ; e8963
+Music_NoteType:
 ; note length
 ;	# frames per 16th note
 ; intensity: see Music_Intensity
 ; params: 2
 	; note length
 	call GetMusicByte
-	ld hl, wChannel1NoteLength - wChannel1
+	ld hl, CHANNEL_NOTE_LENGTH
 	add hl, bc
 	ld [hl], a
 	ld a, [wCurChannel]
@@ -1973,48 +1904,40 @@ Music_NoteType: ; e8963
 	call Music_Intensity
 	ret
 
-; e8977
-
-Music_SoundStatus: ; e8977
+Music_SoundStatus:
 ; update sound status
 ; params: 1
 	call GetMusicByte
 	ld [wSoundInput], a
-	ld hl, wChannel1NoteFlags - wChannel1
+	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
 	set NOTE_UNKN_3, [hl]
 	ret
 
-; e8984
-
-Music_DutyCycle: ; e8984
+Music_DutyCycle:
 ; duty cycle
 ; params: 1
 	call GetMusicByte
 	rrca
 	rrca
 	and $c0
-	ld hl, wChannel1DutyCycle - wChannel1
+	ld hl, CHANNEL_DUTY_CYCLE
 	add hl, bc
 	ld [hl], a
 	ret
 
-; e8991
-
-Music_Intensity: ; e8991
+Music_Intensity:
 ; intensity
 ; params: 1
 ;	hi: pressure
 ;   lo: velocity
 	call GetMusicByte
-	ld hl, wChannel1Intensity - wChannel1
+	ld hl, CHANNEL_INTENSITY
 	add hl, bc
 	ld [hl], a
 	ret
 
-; e899a
-
-Music_Tempo: ; e899a
+Music_Tempo:
 ; global tempo
 ; params: 2
 ;	de: tempo
@@ -2025,39 +1948,33 @@ Music_Tempo: ; e899a
 	call SetGlobalTempo
 	ret
 
-; e89a6
-
-Music_Octave8: ; e89a6
-Music_Octave7: ; e89a6
-Music_Octave6: ; e89a6
-Music_Octave5: ; e89a6
-Music_Octave4: ; e89a6
-Music_Octave3: ; e89a6
-Music_Octave2: ; e89a6
-Music_Octave1: ; e89a6
+Music_Octave8:
+Music_Octave7:
+Music_Octave6:
+Music_Octave5:
+Music_Octave4:
+Music_Octave3:
+Music_Octave2:
+Music_Octave1:
 ; set octave based on lo nybble of the command
-	ld hl, wChannel1Octave - wChannel1
+	ld hl, CHANNEL_OCTAVE
 	add hl, bc
 	ld a, [wCurMusicByte]
 	and 7
 	ld [hl], a
 	ret
 
-; e89b1
-
-Music_ForceOctave: ; e89b1
+Music_ForceOctave:
 ; set starting octave
 ; this forces all notes up by the starting octave
 ; params: 1
 	call GetMusicByte
-	ld hl, wChannel1PitchOffset - wChannel1
+	ld hl, CHANNEL_PITCH_OFFSET
 	add hl, bc
 	ld [hl], a
 	ret
 
-; e89ba
-
-Music_StereoPanning: ; e89ba
+Music_StereoPanning:
 ; stereo panning
 ; params: 1
 	; stereo on?
@@ -2068,22 +1985,18 @@ Music_StereoPanning: ; e89ba
 	call GetMusicByte
 	ret
 
-; e89c5
-
-Music_Panning: ; e89c5
+Music_Panning:
 ; force panning
 ; params: 1
 	call SetLRTracks
 	call GetMusicByte
-	ld hl, wChannel1Tracks - wChannel1
+	ld hl, CHANNEL_TRACKS
 	add hl, bc
 	and [hl]
 	ld [hl], a
 	ret
 
-; e89d2
-
-Music_Volume: ; e89d2
+Music_Volume:
 ; set volume
 ; params: 1
 ;	see Volume
@@ -2099,10 +2012,8 @@ Music_Volume: ; e89d2
 	ld [wVolume], a
 	ret
 
-; e89e1
-
-Music_TempoRelative: ; e89e1
-; set global tempo to current channel tempo +- param
+Music_TempoRelative:
+; set global tempo to current channel tempo +/- param
 ; params: 1 signed
 	call GetMusicByte
 	ld e, a
@@ -2116,7 +2027,7 @@ Music_TempoRelative: ; e89e1
 .negative
 	ld d, -1
 .ok
-	ld hl, wChannel1Tempo - wChannel1
+	ld hl, CHANNEL_TEMPO
 	add hl, bc
 	ld a, [hli]
 	ld h, [hl]
@@ -2127,27 +2038,21 @@ Music_TempoRelative: ; e89e1
 	call SetGlobalTempo
 	ret
 
-; e89fd
-
-Music_SFXPriorityOn: ; e89fd
+Music_SFXPriorityOn:
 ; turn sfx priority on
 ; params: none
 	ld a, 1
 	ld [wSFXPriority], a
 	ret
 
-; e8a03
-
-Music_SFXPriorityOff: ; e8a03
+Music_SFXPriorityOff:
 ; turn sfx priority off
 ; params: none
 	xor a
 	ld [wSFXPriority], a
 	ret
 
-; e8a08
-
-Music_RestartChannel: ; e8a08
+Music_RestartChannel:
 ; restart current channel from channel header (same bank)
 ; params: 2 (5)
 ; ll hh: pointer to new channel header
@@ -2156,14 +2061,14 @@ Music_RestartChannel: ; e8a08
 ;		zzyy: pointer to new music data
 
 	; update music id
-	ld hl, wChannel1MusicID - wChannel1
+	ld hl, CHANNEL_MUSIC_ID
 	add hl, bc
 	ld a, [hli]
 	ld [wMusicID], a
 	ld a, [hl]
 	ld [wMusicID + 1], a
 	; update music bank
-	ld hl, wChannel1MusicBank - wChannel1
+	ld hl, CHANNEL_MUSIC_BANK
 	add hl, bc
 	ld a, [hl]
 	ld [wMusicBank], a
@@ -2181,9 +2086,7 @@ Music_RestartChannel: ; e8a08
 	pop bc ; restore current channel
 	ret
 
-; e8a30
-
-Music_NewSong: ; e8a30
+Music_NewSong:
 ; new song
 ; params: 2
 ;	de: song id
@@ -2196,29 +2099,27 @@ Music_NewSong: ; e8a30
 	pop bc
 	ret
 
-; e8a3e
-
-GetMusicByte: ; e8a3e
+GetMusicByte:
 ; returns byte from current address in a
 ; advances to next byte in music data
 ; input: bc = start of current channel
 	push hl
 	push de
 	; load address into de
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld a, [hli]
 	ld e, a
 	ld d, [hl]
 	; load bank into a
-	ld hl, wChannel1MusicBank - wChannel1
+	ld hl, CHANNEL_MUSIC_BANK
 	add hl, bc
 	ld a, [hl]
 	; get byte
 	call _LoadMusicByte ; load data into wCurMusicByte
 	inc de ; advance to next byte for next time this is called
 	; update channeldata address
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	ld a, e
 	ld [hli], a
@@ -2230,9 +2131,7 @@ GetMusicByte: ; e8a3e
 	ld a, [wCurMusicByte]
 	ret
 
-; e8a5d
-
-GetFrequency: ; e8a5d
+GetFrequency:
 ; generate frequency
 ; input:
 ; 	d: octave
@@ -2242,7 +2141,7 @@ GetFrequency: ; e8a5d
 
 ; get octave
 	; get starting octave
-	ld hl, wChannel1PitchOffset - wChannel1
+	ld hl, CHANNEL_PITCH_OFFSET
 	add hl, bc
 	ld a, [hl]
 	swap a ; hi nybble
@@ -2251,7 +2150,7 @@ GetFrequency: ; e8a5d
 	add d
 	push af ; we'll use this later
 	; get starting octave
-	ld hl, wChannel1PitchOffset - wChannel1
+	ld hl, CHANNEL_PITCH_OFFSET
 	add hl, bc
 	ld a, [hl]
 	and $f ; lo nybble
@@ -2284,16 +2183,14 @@ GetFrequency: ; e8a5d
 	ld d, a
 	ret
 
-; e8a8d
-
-SetNoteDuration: ; e8a8d
+SetNoteDuration:
 ; input: a = note duration in 16ths
 	; store delay units in de
 	inc a
 	ld e, a
 	ld d, 0
 	; store NoteLength in a
-	ld hl, wChannel1NoteLength - wChannel1
+	ld hl, CHANNEL_NOTE_LENGTH
 	add hl, bc
 	ld a, [hl]
 	; multiply NoteLength by delay units
@@ -2301,13 +2198,13 @@ SetNoteDuration: ; e8a8d
 	call .Multiply
 	ld a, l ; low
 	; store Tempo in de
-	ld hl, wChannel1Tempo - wChannel1
+	ld hl, CHANNEL_TEMPO
 	add hl, bc
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
 	; add ???? to the next result
-	ld hl, wChannel1Field16 - wChannel1
+	ld hl, CHANNEL_FIELD16
 	add hl, bc
 	ld l, [hl]
 	; multiply Tempo by last result (NoteLength * LOW(delay))
@@ -2316,18 +2213,16 @@ SetNoteDuration: ; e8a8d
 	ld e, l
 	ld d, h
 	; store result in ????
-	ld hl, wChannel1Field16 - wChannel1
+	ld hl, CHANNEL_FIELD16
 	add hl, bc
 	ld [hl], e
 	; store result in NoteDuration
-	ld hl, wChannel1NoteDuration - wChannel1
+	ld hl, CHANNEL_NOTE_DURATION
 	add hl, bc
 	ld [hl], d
 	ret
 
-; e8ab8
-
-.Multiply: ; e8ab8
+.Multiply:
 ; multiplies a and de
 ; adds the result to l
 ; stores the result in hl
@@ -2348,9 +2243,7 @@ SetNoteDuration: ; e8a8d
 	jr nz, .loop
 	ret
 
-; e8ac7
-
-SetGlobalTempo: ; e8ac7
+SetGlobalTempo:
 	push bc ; save current channel
 	; are we dealing with music or sfx?
 	ld a, [wCurChannel]
@@ -2379,36 +2272,30 @@ SetGlobalTempo: ; e8ac7
 	pop bc ; restore current channel
 	ret
 
-; e8b03
-
-Tempo: ; e8b03
+Tempo:
 ; input:
 ; 	de: note length
 	; update Tempo
-	ld hl, wChannel1Tempo - wChannel1
+	ld hl, CHANNEL_TEMPO
 	add hl, bc
 	ld [hl], e
 	inc hl
 	ld [hl], d
 	; clear ????
 	xor a
-	ld hl, wChannel1Field16 - wChannel1
+	ld hl, CHANNEL_FIELD16
 	add hl, bc
 	ld [hl], a
 	ret
 
-; e8b11
-
-StartChannel: ; e8b11
+StartChannel:
 	call SetLRTracks
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	set SOUND_CHANNEL_ON, [hl] ; turn channel on
 	ret
 
-; e8b1b
-
-SetLRTracks: ; e8b1b
+SetLRTracks:
 ; set tracks for a the current channel to default
 ; seems to be redundant since this is overwritten by stereo data later
 	push de
@@ -2422,15 +2309,13 @@ SetLRTracks: ; e8b1b
 	add hl, de ; de = channel 0-3
 	ld a, [hl]
 	; load lr tracks into Tracks
-	ld hl, wChannel1Tracks - wChannel1
+	ld hl, CHANNEL_TRACKS
 	add hl, bc
 	ld [hl], a
 	pop de
 	ret
 
-; e8b30
-
-_PlayMusic:: ; e8b30
+_PlayMusic::
 ; load music
 	call MusicOff
 	ld hl, wMusicID
@@ -2472,9 +2357,7 @@ _PlayMusic:: ; e8b30
 	call MusicOn
 	ret
 
-; e8b79
-
-_PlayCry:: ; e8b79
+_PlayCry::
 ; Play cry de using parameters:
 ;	wCryPitch
 ;	wCryLength
@@ -2513,15 +2396,15 @@ _PlayCry:: ; e8b79
 	push af
 	call LoadChannel
 
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	set SOUND_REST, [hl]
 
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	set SOUND_CRY_PITCH, [hl]
 
-	ld hl, wChannel1CryPitch - wChannel1
+	ld hl, CHANNEL_CRY_PITCH
 	add hl, bc
 	ld a, [wCryPitch]
 	ld [hli], a
@@ -2535,7 +2418,7 @@ _PlayCry:: ; e8b79
 	jr nc, .start
 
 ; Tempo is effectively length
-	ld hl, wChannel1Tempo - wChannel1
+	ld hl, CHANNEL_TEMPO
 	add hl, bc
 	ld a, [wCryLength]
 	ld [hli], a
@@ -2555,12 +2438,12 @@ _PlayCry:: ; e8b79
 	jr z, .next
 
 ; [Tracks] &= [wCryTracks]
-	ld hl, wChannel1Tracks - wChannel1
+	ld hl, CHANNEL_TRACKS
 	add hl, bc
 	ld a, [hl]
 	ld hl, wCryTracks
 	and [hl]
-	ld hl, wChannel1Tracks - wChannel1
+	ld hl, CHANNEL_TRACKS
 	add hl, bc
 	ld [hl], a
 
@@ -2585,12 +2468,10 @@ _PlayCry:: ; e8b79
 	call MusicOn
 	ret
 
-; e8c04
-
-_PlaySFX:: ; e8c04
+_PlaySFX::
 ; clear channels if they aren't already
 	call MusicOff
-	ld hl, wChannel5Flags
+	ld hl, wChannel5Flags1
 	bit SOUND_CHANNEL_ON, [hl] ; ch5 on?
 	jr z, .ch6
 	res SOUND_CHANNEL_ON, [hl] ; turn it off
@@ -2606,7 +2487,7 @@ _PlaySFX:: ; e8c04
 	ld [wSoundInput], a ; global sound off
 	ld [rNR10], a ; sweep = 0
 .ch6
-	ld hl, wChannel6Flags
+	ld hl, wChannel6Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr z, .ch7
 	res SOUND_CHANNEL_ON, [hl] ; turn it off
@@ -2619,7 +2500,7 @@ _PlaySFX:: ; e8c04
 	ld a, $80
 	ld [rNR24], a ; restart sound (freq hi = 0)
 .ch7
-	ld hl, wChannel7Flags
+	ld hl, wChannel7Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr z, .ch8
 	res SOUND_CHANNEL_ON, [hl] ; turn it off
@@ -2633,7 +2514,7 @@ _PlaySFX:: ; e8c04
 	ld a, $80
 	ld [rNR34], a ; restart sound (freq hi = 0)
 .ch8
-	ld hl, wChannel8Flags
+	ld hl, wChannel8Flags1
 	bit SOUND_CHANNEL_ON, [hl]
 	jr z, .chscleared
 	res SOUND_CHANNEL_ON, [hl] ; turn it off
@@ -2674,7 +2555,7 @@ _PlaySFX:: ; e8c04
 .startchannels
 	push af
 	call LoadChannel ; bc = current channel
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	set SOUND_SFX, [hl]
 	call StartChannel
@@ -2686,9 +2567,7 @@ _PlaySFX:: ; e8c04
 	ld [wSFXPriority], a
 	ret
 
-; e8ca6
-
-PlayStereoSFX:: ; e8ca6
+PlayStereoSFX::
 ; play sfx de
 
 	call MusicOff
@@ -2729,7 +2608,7 @@ PlayStereoSFX:: ; e8ca6
 	push af
 	call LoadChannel
 
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	set SOUND_SFX, [hl]
 
@@ -2745,11 +2624,11 @@ PlayStereoSFX:: ; e8ca6
 	ld hl, wStereoPanningMask
 	and [hl]
 
-	ld hl, wChannel1Tracks - wChannel1
+	ld hl, CHANNEL_TRACKS
 	add hl, bc
 	ld [hl], a
 
-	ld hl, wChannel1Field30 - wChannel1
+	ld hl, CHANNEL_FIELD30
 	add hl, bc
 	ld [hl], a
 
@@ -2760,15 +2639,15 @@ PlayStereoSFX:: ; e8ca6
 ; ch3-4
 	ld a, [wSFXDuration]
 
-	ld hl, wChannel1Field2e - wChannel1
+	ld hl, CHANNEL_FIELD2E
 	add hl, bc
 	ld [hl], a
 
-	ld hl, wChannel1Field2f - wChannel1
+	ld hl, CHANNEL_FIELD2F
 	add hl, bc
 	ld [hl], a
 
-	ld hl, wChannel1Flags2 - wChannel1
+	ld hl, CHANNEL_FLAGS2
 	add hl, bc
 	set SOUND_UNKN_0F, [hl]
 
@@ -2776,7 +2655,7 @@ PlayStereoSFX:: ; e8ca6
 	pop de
 
 ; turn channel on
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	set SOUND_CHANNEL_ON, [hl] ; on
 
@@ -2789,9 +2668,7 @@ PlayStereoSFX:: ; e8ca6
 	call MusicOn
 	ret
 
-; e8d1b
-
-LoadChannel: ; e8d1b
+LoadChannel:
 ; prep channel for use
 ; input:
 ; 	de:
@@ -2808,12 +2685,12 @@ LoadChannel: ; e8d1b
 	ld c, [hl]
 	inc hl
 	ld b, [hl] ; bc = channel pointer
-	ld hl, wChannel1Flags - wChannel1
+	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	res SOUND_CHANNEL_ON, [hl] ; channel off
 	call ChannelInit
 	; load music pointer
-	ld hl, wChannel1MusicAddress - wChannel1
+	ld hl, CHANNEL_MUSIC_ADDRESS
 	add hl, bc
 	call LoadMusicByte
 	ld [hli], a
@@ -2822,22 +2699,20 @@ LoadChannel: ; e8d1b
 	ld [hl], a
 	inc de
 	; load music id
-	ld hl, wChannel1MusicID - wChannel1
+	ld hl, CHANNEL_MUSIC_ID
 	add hl, bc
 	ld a, [wMusicID]
 	ld [hli], a
 	ld a, [wMusicID + 1]
 	ld [hl], a
 	; load music bank
-	ld hl, wChannel1MusicBank - wChannel1
+	ld hl, CHANNEL_MUSIC_BANK
 	add hl, bc
 	ld a, [wMusicBank]
 	ld [hl], a
 	ret
 
-; e8d5b
-
-ChannelInit: ; e8d5b
+ChannelInit:
 ; make sure channel is cleared
 ; set default tempo and note length in case nothing is loaded
 ; input:
@@ -2845,31 +2720,29 @@ ChannelInit: ; e8d5b
 	push de
 	xor a
 	; get channel struct location and length
-	ld hl, wChannel1MusicID - wChannel1 ; start
+	ld hl, CHANNEL_MUSIC_ID ; start
 	add hl, bc
-	ld e, wChannel2 - wChannel1 ; channel struct length
+	ld e, CHANNEL_STRUCT_LENGTH ; channel struct length
 	; clear channel
 .loop
 	ld [hli], a
 	dec e
 	jr nz, .loop
 	; set tempo to default ($100)
-	ld hl, wChannel1Tempo - wChannel1
+	ld hl, CHANNEL_TEMPO
 	add hl, bc
 	xor a
 	ld [hli], a
 	inc a
 	ld [hl], a
 	; set note length to default ($1) (fast)
-	ld hl, wChannel1NoteLength - wChannel1
+	ld hl, CHANNEL_NOTE_LENGTH
 	add hl, bc
 	ld [hl], a
 	pop de
 	ret
 
-; e8d76
-
-LoadMusicByte:: ; e8d76
+LoadMusicByte::
 ; input:
 ;   de = current music address
 ; output:
@@ -2879,17 +2752,13 @@ LoadMusicByte:: ; e8d76
 	ld a, [wCurMusicByte]
 	ret
 
-; e8d80
-
-
 INCLUDE "audio/notes.asm"
 
 INCLUDE "audio/wave_samples.asm"
 
 INCLUDE "audio/drumkits.asm"
 
-
-GetLRTracks: ; e8fc2
+GetLRTracks:
 ; gets the default sound l/r channels
 ; stores mono/stereo table in hl
 	ld a, [wOptions]
@@ -2903,22 +2772,18 @@ GetLRTracks: ; e8fc2
 	ld hl, StereoTracks
 	ret
 
-; e8fd1
-
-MonoTracks: ; e8fd1
+MonoTracks:
 ; bit corresponds to track #
 ; hi: left channel
 ; lo: right channel
 	db $11, $22, $44, $88
-; e8fd5
 
-StereoTracks: ; e8fd5
+StereoTracks:
 ; made redundant
 ; seems to be modified on a per-song basis
 	db $11, $22, $44, $88
-; e8fd9
 
-ChannelPointers: ; e8fd9
+ChannelPointers:
 ; music channels
 	dw wChannel1
 	dw wChannel2
@@ -2929,9 +2794,8 @@ ChannelPointers: ; e8fd9
 	dw wChannel6
 	dw wChannel7
 	dw wChannel8
-; e8fe9
 
-ClearChannels:: ; e8fe9
+ClearChannels::
 ; runs ClearChannel for all 4 channels
 ; doesn't seem to be used, but functionally identical to MapSetup_Sound_Off
 	ld hl, rNR50
@@ -2948,9 +2812,7 @@ ClearChannels:: ; e8fe9
 	jr nz, .loop
 	ret
 
-; e8ffe
-
-ClearChannel: ; e8ffe
+ClearChannel:
 ; input: hl = beginning hw sound register (rNR10, rNR20, rNR30, rNR40)
 ; output: 00 00 80 00 80
 
@@ -2967,9 +2829,7 @@ ClearChannel: ; e8ffe
 	ld [hli], a ; rNR14, rNR24, rNR34, rNR44 ; restart sound (freq hi = 0)
 	ret
 
-; e900a
-
-PlayTrainerEncounterMusic:: ; e900a
+PlayTrainerEncounterMusic::
 ; input: e = trainer type
 	; turn fade off
 	xor a
@@ -2988,4 +2848,3 @@ PlayTrainerEncounterMusic:: ; e900a
 	ld e, [hl]
 	call PlayMusic
 	ret
-; e9027
diff --git a/audio/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm
index 27ca1dc41..114a6fd55 100644
--- a/audio/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
@@ -1,11 +1,10 @@
-Music_AfterTheRivalFight: ; f5127
+Music_AfterTheRivalFight:
 	musicheader 4, 1, Music_AfterTheRivalFight_Ch1
 	musicheader 1, 2, Music_AfterTheRivalFight_Ch2
 	musicheader 1, 3, Music_AfterTheRivalFight_Ch3
 	musicheader 1, 4, Music_AfterTheRivalFight_Ch4
-; f5133
 
-Music_AfterTheRivalFight_Ch1: ; f5133
+Music_AfterTheRivalFight_Ch1:
 	tempo 112
 	volume $77
 	dutycycle $0
@@ -23,9 +22,8 @@ Music_AfterTheRivalFight_Ch1: ; f5133
 	note G#, 2
 	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1
-; f5153
 
-Music_AfterTheRivalFight_Ch2: ; f5153
+Music_AfterTheRivalFight_Ch2:
 	dutycycle $1
 	vibrato $6, $35
 	stereopanning $f
@@ -39,9 +37,8 @@ Music_AfterTheRivalFight_Ch2: ; f5153
 	note G#, 2
 	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f502e
-; f516a
 
-Music_AfterTheRivalFight_Ch3: ; f516a
+Music_AfterTheRivalFight_Ch3:
 	notetype $c, $28
 	octave 3
 	note D#, 2
@@ -53,9 +50,8 @@ Music_AfterTheRivalFight_Ch3: ; f516a
 	note F_, 2
 	note D#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f509d
-; f517a
 
-Music_AfterTheRivalFight_Ch4: ; f517a
+Music_AfterTheRivalFight_Ch4:
 	togglenoise $3
 	stereopanning $f
 	notetype $c
@@ -66,4 +62,3 @@ Music_AfterTheRivalFight_Ch4: ; f517a
 	note D_, 2
 	note D_, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f5118
-; f518a
diff --git a/audio/music/azaleatown.asm b/audio/music/azaleatown.asm
index 0bce049bf..0b2304476 100644
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@@ -1,18 +1,17 @@
-Music_AzaleaTown: ; f57e8
+Music_AzaleaTown:
 	musicheader 4, 1, Music_AzaleaTown_Ch1
 	musicheader 1, 2, Music_AzaleaTown_Ch2
 	musicheader 1, 3, Music_AzaleaTown_Ch3
 	musicheader 1, 4, Music_AzaleaTown_Ch4
-; f57f4
 
-Music_AzaleaTown_Ch1: ; f57f4
+Music_AzaleaTown_Ch1:
 	tempo 160
 	volume $77
 	dutycycle $2
 	stereopanning $f
 	notetype $c, $a1
 	note __, 2
-Music_AzaleaTown_branch_f5801: ; f5801
+Music_AzaleaTown_branch_f5801:
 	intensity $a1
 	octave 3
 	note F_, 2
@@ -27,7 +26,7 @@ Music_AzaleaTown_branch_f5801: ; f5801
 	note F_, 2
 	note F_, 2
 	loopchannel 2, Music_AzaleaTown_branch_f5801
-Music_AzaleaTown_branch_f5816: ; f5816
+Music_AzaleaTown_branch_f5816:
 	callchannel Music_AzaleaTown_branch_f588c
 	stereopanning $f0
 	intensity $a4
@@ -119,9 +118,8 @@ Music_AzaleaTown_branch_f5816: ; f5816
 	note G#, 14
 	note __, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5816
-; f588c
 
-Music_AzaleaTown_branch_f588c: ; f588c
+Music_AzaleaTown_branch_f588c:
 	notetype $c, $a1
 	octave 4
 	note F_, 2
@@ -219,9 +217,8 @@ Music_AzaleaTown_branch_f588c: ; f588c
 	intensity $61
 	note C#, 2
 	endchannel
-; f5912
 
-Music_AzaleaTown_branch_f5912: ; f5912
+Music_AzaleaTown_branch_f5912:
 	intensity $61
 	note G#, 8
 	note G#, 8
@@ -230,9 +227,8 @@ Music_AzaleaTown_branch_f5912: ; f5912
 	intensity $a1
 	note A_, 8
 	endchannel
-; f591d
 
-Music_AzaleaTown_Ch2: ; f591d
+Music_AzaleaTown_Ch2:
 	vibrato $12, $23
 	dutycycle $2
 	stereopanning $f0
@@ -268,7 +264,7 @@ Music_AzaleaTown_Ch2: ; f591d
 	dutycycle $1
 	octave 5
 	note C_, 1
-Music_AzaleaTown_branch_f5952: ; f5952
+Music_AzaleaTown_branch_f5952:
 	callchannel Music_AzaleaTown_branch_f59c7
 	note C#, 4
 	note C_, 2
@@ -366,9 +362,8 @@ Music_AzaleaTown_branch_f5952: ; f5952
 	octave 5
 	note C_, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5952
-; f59c7
 
-Music_AzaleaTown_branch_f59c7: ; f59c7
+Music_AzaleaTown_branch_f59c7:
 	note C#, 4
 	octave 4
 	note G#, 2
@@ -420,9 +415,8 @@ Music_AzaleaTown_branch_f59c7: ; f59c7
 	note D#, 12
 	intensity $b4
 	endchannel
-; f5a08
 
-Music_AzaleaTown_Ch3: ; f5a08
+Music_AzaleaTown_Ch3:
 	stereopanning $ff
 	vibrato $6, $26
 	notetype $c, $25
@@ -446,7 +440,7 @@ Music_AzaleaTown_Ch3: ; f5a08
 	note C#, 1
 	note __, 1
 	note G#, 4
-Music_AzaleaTown_branch_f5a24: ; f5a24
+Music_AzaleaTown_branch_f5a24:
 	callchannel Music_AzaleaTown_branch_f5a86
 	note G#, 4
 	note D#, 2
@@ -534,9 +528,8 @@ Music_AzaleaTown_branch_f5a24: ; f5a24
 	octave 3
 	note C_, 1
 	loopchannel 0, Music_AzaleaTown_branch_f5a24
-; f5a86
 
-Music_AzaleaTown_branch_f5a86: ; f5a86
+Music_AzaleaTown_branch_f5a86:
 	note C#, 1
 	note __, 5
 	note C#, 1
@@ -608,9 +601,8 @@ Music_AzaleaTown_branch_f5a86: ; f5a86
 	note C_, 1
 	note __, 1
 	endchannel
-; f5acf
 
-Music_AzaleaTown_branch_f5acf: ; f5acf
+Music_AzaleaTown_branch_f5acf:
 	intensity $35
 	octave 3
 	note F_, 1
@@ -631,13 +623,12 @@ Music_AzaleaTown_branch_f5acf: ; f5acf
 	note F_, 1
 	note __, 1
 	endchannel
-; f5ae5
 
-Music_AzaleaTown_Ch4: ; f5ae5
+Music_AzaleaTown_Ch4:
 	togglenoise $3
 	notetype $c
 	note F_, 2
-Music_AzaleaTown_branch_f5aea: ; f5aea
+Music_AzaleaTown_branch_f5aea:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -660,4 +651,3 @@ Music_AzaleaTown_branch_f5aea: ; f5aea
 	note D_, 2
 	note F#, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5aea
-; f5b03
diff --git a/audio/music/battletowerlobby.asm b/audio/music/battletowerlobby.asm
index fe7cba7a0..2bf38a836 100644
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
@@ -1,11 +1,10 @@
-Music_BattleTowerLobby: ; 17948b
+Music_BattleTowerLobby:
 	musicheader 4, 1, Music_BattleTowerLobby_Ch1
 	musicheader 1, 2, Music_BattleTowerLobby_Ch2
 	musicheader 1, 3, Music_BattleTowerLobby_Ch3
 	musicheader 1, 4, Music_BattleTowerLobby_Ch4
-; 179497
 
-Music_BattleTowerLobby_Ch1: ; 179497
+Music_BattleTowerLobby_Ch1:
 	tempo 152
 	volume $77
 	dutycycle $3
@@ -13,7 +12,7 @@ Music_BattleTowerLobby_Ch1: ; 179497
 	vibrato $8, $22
 	stereopanning $f0
 	notetype $c, $72
-Music_BattleTowerLobby_branch_1794a9: ; 1794a9
+Music_BattleTowerLobby_branch_1794a9:
 	notetype $c, $72
 	octave 3
 	note G#, 2
@@ -116,14 +115,13 @@ Music_BattleTowerLobby_branch_1794a9: ; 1794a9
 	octave 2
 	note B_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_1794a9
-; 17953a
 
-Music_BattleTowerLobby_Ch2: ; 17953a
+Music_BattleTowerLobby_Ch2:
 	dutycycle $2
 	vibrato $10, $34
 	stereopanning $f
 	notetype $c, $82
-Music_BattleTowerLobby_branch_179544: ; 179544
+Music_BattleTowerLobby_branch_179544:
 	notetype $c, $82
 	octave 4
 	note E_, 2
@@ -201,11 +199,10 @@ Music_BattleTowerLobby_branch_179544: ; 179544
 	octave 4
 	note D#, 1
 	loopchannel 0, Music_BattleTowerLobby_branch_179544
-; 1795ae
 
-Music_BattleTowerLobby_Ch3: ; 1795ae
+Music_BattleTowerLobby_Ch3:
 	notetype $c, $11
-Music_BattleTowerLobby_branch_1795b1: ; 1795b1
+Music_BattleTowerLobby_branch_1795b1:
 	octave 2
 	note B_, 2
 	octave 3
@@ -298,11 +295,10 @@ Music_BattleTowerLobby_branch_1795b1: ; 1795b1
 	note D#, 2
 	note F#, 2
 	loopchannel 0, Music_BattleTowerLobby_branch_1795b1
-; 179610
 
-Music_BattleTowerLobby_Ch4: ; 179610
+Music_BattleTowerLobby_Ch4:
 	togglenoise $0
-Music_BattleTowerLobby_branch_179612: ; 179612
+Music_BattleTowerLobby_branch_179612:
 	notetype $c
 	note __, 2
 	note F_, 4
@@ -310,4 +306,3 @@ Music_BattleTowerLobby_branch_179612: ; 179612
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_179612
-; 17961d
diff --git a/audio/music/battletowertheme.asm b/audio/music/battletowertheme.asm
index b9e477de1..18af95866 100644
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@@ -1,18 +1,17 @@
-Music_BattleTowerTheme: ; 178889
+Music_BattleTowerTheme:
 	musicheader 4, 1, Music_BattleTowerTheme_Ch1
 	musicheader 1, 2, Music_BattleTowerTheme_Ch2
 	musicheader 1, 3, Music_BattleTowerTheme_Ch3
 	musicheader 1, 4, Music_BattleTowerTheme_Ch4
-; 178895
 
-Music_BattleTowerTheme_Ch1: ; 178895
+Music_BattleTowerTheme_Ch1:
 	tempo 141
 	volume $77
 	tone $0001
 	vibrato $12, $34
 	stereopanning $f
 	notetype $6, $94
-Music_BattleTowerTheme_branch_1788a5: ; 1788a5
+Music_BattleTowerTheme_branch_1788a5:
 	note __, 16
 	note __, 16
 	note __, 12
@@ -185,9 +184,8 @@ Music_BattleTowerTheme_branch_1788a5: ; 1788a5
 	note E_, 4
 	note __, 12
 	loopchannel 0, Music_BattleTowerTheme_branch_1788a5
-; 17895e
 
-Music_BattleTowerTheme_branch_17895e: ; 17895e
+Music_BattleTowerTheme_branch_17895e:
 	intensity $94
 	note A_, 2
 	note __, 2
@@ -202,11 +200,10 @@ Music_BattleTowerTheme_branch_17895e: ; 17895e
 	note __, 4
 	note A_, 4
 	endchannel
-; 17896d
 
-Music_BattleTowerTheme_Ch2: ; 17896d
+Music_BattleTowerTheme_Ch2:
 	vibrato $12, $34
-Music_BattleTowerTheme_branch_178970: ; 178970
+Music_BattleTowerTheme_branch_178970:
 	dutycycle $3
 	notetype $6, $b8
 	octave 3
@@ -345,9 +342,8 @@ Music_BattleTowerTheme_branch_178970: ; 178970
 	note D_, 2
 	note E_, 4
 	loopchannel 0, Music_BattleTowerTheme_branch_178970
-; 178a15
 
-Music_BattleTowerTheme_branch_178a15: ; 178a15
+Music_BattleTowerTheme_branch_178a15:
 	note F_, 2
 	note __, 2
 	note F_, 8
@@ -359,12 +355,11 @@ Music_BattleTowerTheme_branch_178a15: ; 178a15
 	note A#, 4
 	note A_, 4
 	endchannel
-; 178a20
 
-Music_BattleTowerTheme_Ch3: ; 178a20
+Music_BattleTowerTheme_Ch3:
 	vibrato $12, $34
 	notetype $6, $16
-Music_BattleTowerTheme_branch_178a26: ; 178a26
+Music_BattleTowerTheme_branch_178a26:
 	stereopanning $ff
 	callchannel Music_BattleTowerTheme_branch_178afe
 	note C_, 2
@@ -569,9 +564,8 @@ Music_BattleTowerTheme_branch_178a26: ; 178a26
 	note G_, 4
 	note __, 12
 	loopchannel 0, Music_BattleTowerTheme_branch_178a26
-; 178afe
 
-Music_BattleTowerTheme_branch_178afe: ; 178afe
+Music_BattleTowerTheme_branch_178afe:
 	octave 3
 	note C_, 2
 	note __, 2
@@ -587,12 +581,11 @@ Music_BattleTowerTheme_branch_178afe: ; 178afe
 	note C_, 2
 	note __, 2
 	endchannel
-; 178b0d
 
-Music_BattleTowerTheme_Ch4: ; 178b0d
+Music_BattleTowerTheme_Ch4:
 	togglenoise $3
 	notetype $c
-Music_BattleTowerTheme_branch_178b11: ; 178b11
+Music_BattleTowerTheme_branch_178b11:
 	callchannel Music_BattleTowerTheme_branch_178b58
 	note D_, 2
 	note D_, 4
@@ -603,7 +596,7 @@ Music_BattleTowerTheme_branch_178b11: ; 178b11
 	note C#, 1
 	note D_, 1
 	note C#, 1
-Music_BattleTowerTheme_branch_178b1d: ; 178b1d
+Music_BattleTowerTheme_branch_178b1d:
 	callchannel Music_BattleTowerTheme_branch_178b58
 	callchannel Music_BattleTowerTheme_branch_178b61
 	loopchannel 2, Music_BattleTowerTheme_branch_178b1d
@@ -615,7 +608,7 @@ Music_BattleTowerTheme_branch_178b1d: ; 178b1d
 	note D_, 1
 	note D_, 1
 	note D_, 8
-Music_BattleTowerTheme_branch_178b35: ; 178b35
+Music_BattleTowerTheme_branch_178b35:
 	callchannel Music_BattleTowerTheme_branch_178b76
 	note D_, 2
 	note D_, 2
@@ -641,9 +634,8 @@ Music_BattleTowerTheme_branch_178b35: ; 178b35
 	note D_, 1
 	note C#, 1
 	loopchannel 0, Music_BattleTowerTheme_branch_178b11
-; 178b58
 
-Music_BattleTowerTheme_branch_178b58: ; 178b58
+Music_BattleTowerTheme_branch_178b58:
 	note D_, 2
 	note D_, 4
 	note D_, 1
@@ -653,9 +645,8 @@ Music_BattleTowerTheme_branch_178b58: ; 178b58
 	note D_, 1
 	note D_, 1
 	endchannel
-; 178b61
 
-Music_BattleTowerTheme_branch_178b61: ; 178b61
+Music_BattleTowerTheme_branch_178b61:
 	note D_, 2
 	note D_, 4
 	note D_, 1
@@ -667,9 +658,8 @@ Music_BattleTowerTheme_branch_178b61: ; 178b61
 	note D_, 1
 	note C#, 1
 	endchannel
-; 178b6c
 
-Music_BattleTowerTheme_branch_178b6c: ; 178b6c
+Music_BattleTowerTheme_branch_178b6c:
 	note D_, 2
 	note D_, 4
 	note D_, 1
@@ -680,9 +670,8 @@ Music_BattleTowerTheme_branch_178b6c: ; 178b6c
 	note D_, 1
 	note D_, 1
 	endchannel
-; 178b76
 
-Music_BattleTowerTheme_branch_178b76: ; 178b76
+Music_BattleTowerTheme_branch_178b76:
 	note D_, 2
 	note C#, 2
 	note D_, 2
@@ -694,4 +683,3 @@ Music_BattleTowerTheme_branch_178b76: ; 178b76
 	note D_, 1
 	note C#, 1
 	endchannel
-; 178b81
diff --git a/audio/music/bicycle.asm b/audio/music/bicycle.asm
index 3805627e6..92a19e813 100644
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
@@ -1,11 +1,10 @@
-Music_Bicycle: ; ee119
+Music_Bicycle:
 	musicheader 4, 1, Music_Bicycle_Ch1
 	musicheader 1, 2, Music_Bicycle_Ch2
 	musicheader 1, 3, Music_Bicycle_Ch3
 	musicheader 1, 4, Music_Bicycle_Ch4
-; ee125
 
-Music_Bicycle_Ch1: ; ee125
+Music_Bicycle_Ch1:
 	tempo 140
 	volume $77
 	dutycycle $3
@@ -23,7 +22,7 @@ Music_Bicycle_Ch1: ; ee125
 	note A_, 8
 	intensity $b2
 	note F#, 2
-Music_Bicycle_branch_ee144: ; ee144
+Music_Bicycle_branch_ee144:
 	stereopanning $f
 	intensity $b2
 	note G_, 2
@@ -169,9 +168,8 @@ Music_Bicycle_branch_ee144: ; ee144
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_Bicycle_branch_ee144
-; ee1de
 
-Music_Bicycle_Ch2: ; ee1de
+Music_Bicycle_Ch2:
 	dutycycle $2
 	vibrato $10, $24
 	stereopanning $f0
@@ -195,7 +193,7 @@ Music_Bicycle_Ch2: ; ee1de
 	octave 3
 	note B_, 2
 	note A_, 2
-Music_Bicycle_branch_ee1fd: ; ee1fd
+Music_Bicycle_branch_ee1fd:
 	stereopanning $ff
 	dutycycle $2
 	intensity $c3
@@ -273,9 +271,8 @@ Music_Bicycle_branch_ee1fd: ; ee1fd
 	note G_, 2
 	note F#, 4
 	loopchannel 0, Music_Bicycle_branch_ee1fd
-; ee263
 
-Music_Bicycle_branch_ee263: ; ee263
+Music_Bicycle_branch_ee263:
 	note G_, 6
 	note B_, 6
 	note G_, 4
@@ -286,9 +283,8 @@ Music_Bicycle_branch_ee263: ; ee263
 	note G_, 6
 	note E_, 4
 	endchannel
-; ee26d
 
-Music_Bicycle_Ch3: ; ee26d
+Music_Bicycle_Ch3:
 	notetype $c, $14
 	note __, 16
 	octave 3
@@ -305,7 +301,7 @@ Music_Bicycle_Ch3: ; ee26d
 	octave 3
 	note A_, 1
 	note __, 1
-Music_Bicycle_branch_ee27f: ; ee27f
+Music_Bicycle_branch_ee27f:
 	callchannel Music_Bicycle_branch_ee333
 	note E_, 1
 	note __, 1
@@ -408,7 +404,7 @@ Music_Bicycle_branch_ee27f: ; ee27f
 	note __, 1
 	note A_, 1
 	note __, 1
-Music_Bicycle_branch_ee2e9: ; ee2e9
+Music_Bicycle_branch_ee2e9:
 	note G_, 1
 	note __, 1
 	note B_, 1
@@ -477,9 +473,8 @@ Music_Bicycle_branch_ee2e9: ; ee2e9
 	note __, 1
 	loopchannel 2, Music_Bicycle_branch_ee2e9
 	loopchannel 0, Music_Bicycle_branch_ee27f
-; ee333
 
-Music_Bicycle_branch_ee333: ; ee333
+Music_Bicycle_branch_ee333:
 	octave 3
 	note G_, 1
 	note __, 1
@@ -498,16 +493,15 @@ Music_Bicycle_branch_ee333: ; ee333
 	note B_, 1
 	note __, 1
 	endchannel
-; ee345
 
-Music_Bicycle_Ch4: ; ee345
+Music_Bicycle_Ch4:
 	togglenoise $0
 	notetype $c
 	note __, 16
 	note __, 16
-Music_Bicycle_branch_ee34b: ; ee34b
+Music_Bicycle_branch_ee34b:
 	note __, 2
-Music_Bicycle_branch_ee34c: ; ee34c
+Music_Bicycle_branch_ee34c:
 	stereopanning $f0
 	note F_, 4
 	loopchannel 12, Music_Bicycle_branch_ee34c
@@ -518,4 +512,3 @@ Music_Bicycle_branch_ee34c: ; ee34c
 	note F_, 2
 	note F_, 2
 	loopchannel 0, Music_Bicycle_branch_ee34b
-; ee35e
diff --git a/audio/music/buenaspassword.asm b/audio/music/buenaspassword.asm
index a91999f30..316ec9a0e 100644
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
@@ -1,17 +1,16 @@
-Music_BuenasPassword: ; 178153
+Music_BuenasPassword:
 	musicheader 4, 1, Music_BuenasPassword_Ch1
 	musicheader 1, 2, Music_BuenasPassword_Ch2
 	musicheader 1, 3, Music_BuenasPassword_Ch3
 	musicheader 1, 4, Music_BuenasPassword_Ch4
-; 17815f
 
-Music_BuenasPassword_Ch1: ; 17815f
+Music_BuenasPassword_Ch1:
 	tempo 136
 	volume $77
 	tone $0001
 	notetype $c, $b3
 	note __, 8
-Music_BuenasPassword_branch_17816b: ; 17816b
+Music_BuenasPassword_branch_17816b:
 	stereopanning $ff
 	note __, 16
 	note __, 16
@@ -138,9 +137,8 @@ Music_BuenasPassword_branch_17816b: ; 17816b
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_BuenasPassword_branch_17816b
-; 178204
 
-Music_BuenasPassword_branch_178204: ; 178204
+Music_BuenasPassword_branch_178204:
 	stereopanning $f
 	notetype $6, $84
 	octave 4
@@ -162,9 +160,8 @@ Music_BuenasPassword_branch_178204: ; 178204
 	note __, 1
 	notetype $c, $84
 	endchannel
-; 178222
 
-Music_BuenasPassword_branch_178222: ; 178222
+Music_BuenasPassword_branch_178222:
 	octave 3
 	note D#, 1
 	note __, 1
@@ -180,16 +177,15 @@ Music_BuenasPassword_branch_178222: ; 178222
 	note D#, 1
 	note __, 2
 	endchannel
-; 178231
 
-Music_BuenasPassword_Ch2: ; 178231
+Music_BuenasPassword_Ch2:
 	vibrato $12, $34
 	dutycycle $2
 	notetype $c, $a5
 	note __, 7
 	octave 3
 	note F#, 1
-Music_BuenasPassword_branch_17823c: ; 17823c
+Music_BuenasPassword_branch_17823c:
 	stereopanning $ff
 	callchannel Music_BuenasPassword_branch_1782df
 	callchannel Music_BuenasPassword_branch_1782a4
@@ -274,9 +270,8 @@ Music_BuenasPassword_branch_17823c: ; 17823c
 	note __, 1
 	intensity $a5
 	loopchannel 0, Music_BuenasPassword_branch_17823c
-; 1782a4
 
-Music_BuenasPassword_branch_1782a4: ; 1782a4
+Music_BuenasPassword_branch_1782a4:
 	octave 3
 	note G#, 1
 	note __, 1
@@ -308,9 +303,8 @@ Music_BuenasPassword_branch_1782a4: ; 1782a4
 	note __, 1
 	notetype $c, $a5
 	endchannel
-; 1782cc
 
-Music_BuenasPassword_branch_1782cc: ; 1782cc
+Music_BuenasPassword_branch_1782cc:
 	octave 4
 	note G#, 2
 	note __, 2
@@ -330,9 +324,8 @@ Music_BuenasPassword_branch_1782cc: ; 1782cc
 	note D#, 2
 	note __, 2
 	endchannel
-; 1782df
 
-Music_BuenasPassword_branch_1782df: ; 1782df
+Music_BuenasPassword_branch_1782df:
 	octave 3
 	note G#, 1
 	note __, 1
@@ -383,12 +376,11 @@ Music_BuenasPassword_branch_1782df: ; 1782df
 	note B_, 1
 	note G#, 3
 	endchannel
-; 178311
 
-Music_BuenasPassword_Ch3: ; 178311
+Music_BuenasPassword_Ch3:
 	notetype $c, $14
 	note __, 8
-Music_BuenasPassword_branch_178315: ; 178315
+Music_BuenasPassword_branch_178315:
 	callchannel Music_BuenasPassword_branch_1783a7
 	callchannel Music_BuenasPassword_branch_1783a7
 	callchannel Music_BuenasPassword_branch_1783a7
@@ -519,9 +511,8 @@ Music_BuenasPassword_branch_178315: ; 178315
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_BuenasPassword_branch_178315
-; 1783a7
 
-Music_BuenasPassword_branch_1783a7: ; 1783a7
+Music_BuenasPassword_branch_1783a7:
 	octave 2
 	note G#, 1
 	note __, 1
@@ -543,9 +534,8 @@ Music_BuenasPassword_branch_1783a7: ; 1783a7
 	note F_, 2
 	note C#, 1
 	endchannel
-; 1783bc
 
-Music_BuenasPassword_branch_1783bc: ; 1783bc
+Music_BuenasPassword_branch_1783bc:
 	octave 2
 	note G#, 1
 	note __, 1
@@ -566,9 +556,8 @@ Music_BuenasPassword_branch_1783bc: ; 1783bc
 	octave 2
 	note G#, 2
 	endchannel
-; 1783d0
 
-Music_BuenasPassword_Ch4: ; 1783d0
+Music_BuenasPassword_Ch4:
 	togglenoise $3
 	notetype $c
 	note D#, 2
@@ -576,7 +565,7 @@ Music_BuenasPassword_Ch4: ; 1783d0
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_BuenasPassword_branch_1783d9: ; 1783d9
+Music_BuenasPassword_branch_1783d9:
 	callchannel Music_BuenasPassword_branch_17840c
 	callchannel Music_BuenasPassword_branch_17840c
 	callchannel Music_BuenasPassword_branch_17840c
@@ -602,9 +591,8 @@ Music_BuenasPassword_branch_1783d9: ; 1783d9
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_BuenasPassword_branch_1783d9
-; 17840c
 
-Music_BuenasPassword_branch_17840c: ; 17840c
+Music_BuenasPassword_branch_17840c:
 	stereopanning $ff
 	note D#, 2
 	stereopanning $f0
@@ -622,9 +610,8 @@ Music_BuenasPassword_branch_17840c: ; 17840c
 	stereopanning $f
 	note G_, 2
 	endchannel
-; 178424
 
-Music_BuenasPassword_branch_178424: ; 178424
+Music_BuenasPassword_branch_178424:
 	stereopanning $ff
 	note D#, 2
 	stereopanning $f0
@@ -642,4 +629,3 @@ Music_BuenasPassword_branch_178424: ; 178424
 	note D_, 1
 	note D_, 1
 	endchannel
-; 17843b
diff --git a/audio/music/bugcatchingcontest.asm b/audio/music/bugcatchingcontest.asm
index 6195d664e..e77bf550f 100644
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
@@ -1,11 +1,10 @@
-Music_BugCatchingContest: ; f7c16
+Music_BugCatchingContest:
 	musicheader 4, 1, Music_BugCatchingContest_Ch1
 	musicheader 1, 2, Music_BugCatchingContest_Ch2
 	musicheader 1, 3, Music_BugCatchingContest_Ch3
 	musicheader 1, 4, Music_BugCatchingContest_Ch4
-; f7c22
 
-Music_BugCatchingContest_Ch1: ; f7c22
+Music_BugCatchingContest_Ch1:
 	tempo 144
 	volume $77
 	stereopanning $f
@@ -38,14 +37,14 @@ Music_BugCatchingContest_Ch1: ; f7c22
 	note __, 1
 	note E_, 1
 	note E_, 1
-Music_BugCatchingContest_branch_f7c4b: ; f7c4b
+Music_BugCatchingContest_branch_f7c4b:
 	notetype $c, $b1
-Music_BugCatchingContest_branch_f7c4e: ; f7c4e
+Music_BugCatchingContest_branch_f7c4e:
 	note __, 2
 	octave 2
 	note A_, 2
 	loopchannel 4, Music_BugCatchingContest_branch_f7c4e
-Music_BugCatchingContest_branch_f7c55: ; f7c55
+Music_BugCatchingContest_branch_f7c55:
 	note __, 2
 	note B_, 2
 	loopchannel 8, Music_BugCatchingContest_branch_f7c55
@@ -61,7 +60,7 @@ Music_BugCatchingContest_branch_f7c55: ; f7c55
 	note E_, 1
 	intensity $b1
 	dutycycle $2
-Music_BugCatchingContest_branch_f7c6b: ; f7c6b
+Music_BugCatchingContest_branch_f7c6b:
 	note __, 2
 	octave 2
 	note A_, 2
@@ -91,7 +90,7 @@ Music_BugCatchingContest_branch_f7c6b: ; f7c6b
 	note E_, 4
 	note __, 4
 	note E_, 4
-Music_BugCatchingContest_branch_f7c8e: ; f7c8e
+Music_BugCatchingContest_branch_f7c8e:
 	note __, 4
 	octave 2
 	note A_, 4
@@ -187,15 +186,14 @@ Music_BugCatchingContest_branch_f7c8e: ; f7c8e
 	note E_, 2
 	note E_, 2
 	loopchannel 0, Music_BugCatchingContest_branch_f7c4b
-; f7cf4
 
-Music_BugCatchingContest_Ch2: ; f7cf4
+Music_BugCatchingContest_Ch2:
 	stereopanning $f0
 	vibrato $8, $23
 	dutycycle $1
 	notetype $c, $c7
 	note __, 8
-Music_BugCatchingContest_branch_f7cff: ; f7cff
+Music_BugCatchingContest_branch_f7cff:
 	octave 4
 	note A_, 1
 	note __, 1
@@ -204,7 +202,7 @@ Music_BugCatchingContest_branch_f7cff: ; f7cff
 	note A_, 1
 	note A_, 1
 	loopchannel 4, Music_BugCatchingContest_branch_f7cff
-Music_BugCatchingContest_branch_f7d0a: ; f7d0a
+Music_BugCatchingContest_branch_f7d0a:
 	dutycycle $0
 	callchannel Music_BugCatchingContest_branch_f7d8e
 	octave 2
@@ -328,9 +326,8 @@ Music_BugCatchingContest_branch_f7d0a: ; f7d0a
 	note __, 3
 	note A_, 10
 	loopchannel 0, Music_BugCatchingContest_branch_f7d0a
-; f7d8e
 
-Music_BugCatchingContest_branch_f7d8e: ; f7d8e
+Music_BugCatchingContest_branch_f7d8e:
 	octave 2
 	note D_, 2
 	octave 3
@@ -372,9 +369,8 @@ Music_BugCatchingContest_branch_f7d8e: ; f7d8e
 	note G_, 1
 	note __, 1
 	endchannel
-; f7db7
 
-Music_BugCatchingContest_Ch3: ; f7db7
+Music_BugCatchingContest_Ch3:
 	stereopanning $ff
 	vibrato $10, $23
 	notetype $c, $14
@@ -405,7 +401,7 @@ Music_BugCatchingContest_Ch3: ; f7db7
 	note __, 1
 	note C#, 1
 	note C#, 1
-Music_BugCatchingContest_branch_f7dda: ; f7dda
+Music_BugCatchingContest_branch_f7dda:
 	notetype $c, $14
 	note F#, 5
 	note __, 1
@@ -587,9 +583,8 @@ Music_BugCatchingContest_branch_f7dda: ; f7dda
 	note C#, 2
 	note C#, 2
 	loopchannel 0, Music_BugCatchingContest_branch_f7dda
-; f7e9a
 
-Music_BugCatchingContest_Ch4: ; f7e9a
+Music_BugCatchingContest_Ch4:
 	togglenoise $4
 	notetype $6
 	note C#, 1
@@ -607,7 +602,7 @@ Music_BugCatchingContest_Ch4: ; f7e9a
 	note E_, 2
 	note E_, 2
 	callchannel Music_BugCatchingContest_branch_f7ee2
-Music_BugCatchingContest_branch_f7eaf: ; f7eaf
+Music_BugCatchingContest_branch_f7eaf:
 	note D_, 4
 	note D_, 4
 	note D_, 2
@@ -651,9 +646,8 @@ Music_BugCatchingContest_branch_f7eaf: ; f7eaf
 	note D_, 2
 	callchannel Music_BugCatchingContest_branch_f7ee2
 	loopchannel 0, Music_BugCatchingContest_branch_f7eaf
-; f7ee2
 
-Music_BugCatchingContest_branch_f7ee2: ; f7ee2
+Music_BugCatchingContest_branch_f7ee2:
 	note D_, 4
 	note B_, 8
 	note D_, 2
@@ -671,4 +665,3 @@ Music_BugCatchingContest_branch_f7ee2: ; f7ee2
 	note D_, 2
 	note D_, 2
 	endchannel
-; f7ef3
diff --git a/audio/music/burnedtower.asm b/audio/music/burnedtower.asm
index e06a6a7b9..723e78140 100644
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@@ -1,11 +1,10 @@
-Music_BurnedTower: ; f6a99
+Music_BurnedTower:
 	musicheader 4, 1, Music_BurnedTower_Ch1
 	musicheader 1, 2, Music_BurnedTower_Ch2
 	musicheader 1, 3, Music_BurnedTower_Ch3
 	musicheader 1, 4, Music_BurnedTower_Ch4
-; f6aa5
 
-Music_BurnedTower_Ch1: ; f6aa5
+Music_BurnedTower_Ch1:
 	tempo 168
 	volume $77
 	dutycycle $1
@@ -27,7 +26,7 @@ Music_BurnedTower_Ch1: ; f6aa5
 	note D_, 2
 	intensity $80
 	note C#, 6
-Music_BurnedTower_branch_f6ac8: ; f6ac8
+Music_BurnedTower_branch_f6ac8:
 	intensity $91
 	octave 2
 	note A_, 4
@@ -37,7 +36,7 @@ Music_BurnedTower_branch_f6ac8: ; f6ac8
 	note A#, 6
 	loopchannel 2, Music_BurnedTower_branch_f6ac8
 	tempo 150
-Music_BurnedTower_branch_f6ad8: ; f6ad8
+Music_BurnedTower_branch_f6ad8:
 	intensity $b1
 	octave 2
 	note A_, 4
@@ -87,7 +86,7 @@ Music_BurnedTower_branch_f6ad8: ; f6ad8
 	note E_, 2
 	intensity $a0
 	note D#, 6
-Music_BurnedTower_branch_f6b17: ; f6b17
+Music_BurnedTower_branch_f6b17:
 	intensity $b1
 	octave 2
 	note B_, 4
@@ -98,16 +97,15 @@ Music_BurnedTower_branch_f6b17: ; f6b17
 	note C_, 6
 	loopchannel 2, Music_BurnedTower_branch_f6b17
 	loopchannel 0, Music_BurnedTower_branch_f6ad8
-; f6b29
 
-Music_BurnedTower_Ch2: ; f6b29
+Music_BurnedTower_Ch2:
 	dutycycle $2
 	vibrato $20, $82
 	tone $0002
 	notetype $c, $70
 	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c5
-Music_BurnedTower_branch_f6b39: ; f6b39
+Music_BurnedTower_branch_f6b39:
 	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c1
 	dutycycle $3
@@ -170,9 +168,8 @@ Music_BurnedTower_branch_f6b39: ; f6b39
 	intensity $b7
 	note F#, 16
 	loopchannel 0, Music_BurnedTower_branch_f6b39
-; f6b8e
 
-Music_BurnedTower_branch_f6b8e: ; f6b8e
+Music_BurnedTower_branch_f6b8e:
 	octave 3
 	note E_, 4
 	note D_, 2
@@ -193,9 +190,8 @@ Music_BurnedTower_branch_f6b8e: ; f6b8e
 	note D_, 4
 	note E_, 16
 	endchannel
-; f6ba2
 
-Music_BurnedTower_Ch3: ; f6ba2
+Music_BurnedTower_Ch3:
 	stereopanning $f
 	notetype $c, $14
 	note __, 16
@@ -204,7 +200,7 @@ Music_BurnedTower_Ch3: ; f6ba2
 	note __, 12
 	octave 3
 	note D#, 4
-Music_BurnedTower_branch_f6bad: ; f6bad
+Music_BurnedTower_branch_f6bad:
 	octave 2
 	note A_, 2
 	octave 3
@@ -224,7 +220,7 @@ Music_BurnedTower_branch_f6bad: ; f6bad
 	note E_, 2
 	note D#, 4
 	loopchannel 4, Music_BurnedTower_branch_f6bad
-Music_BurnedTower_branch_f6bc3: ; f6bc3
+Music_BurnedTower_branch_f6bc3:
 	octave 2
 	note B_, 2
 	octave 3
@@ -245,16 +241,15 @@ Music_BurnedTower_branch_f6bc3: ; f6bc3
 	note F_, 4
 	loopchannel 2, Music_BurnedTower_branch_f6bc3
 	loopchannel 0, Music_BurnedTower_branch_f6bad
-; f6bdd
 
-Music_BurnedTower_Ch4: ; f6bdd
+Music_BurnedTower_Ch4:
 	togglenoise $0
 	notetype $c
-Music_BurnedTower_branch_f6be1: ; f6be1
+Music_BurnedTower_branch_f6be1:
 	note __, 16
 	loopchannel 4, Music_BurnedTower_branch_f6be1
 	note __, 2
-Music_BurnedTower_branch_f6be7: ; f6be7
+Music_BurnedTower_branch_f6be7:
 	stereopanning $f0
 	note G_, 2
 	note G#, 2
@@ -262,4 +257,3 @@ Music_BurnedTower_branch_f6be7: ; f6be7
 	note G#, 2
 	note G_, 4
 	loopchannel 0, Music_BurnedTower_branch_f6be7
-; f6bf2
diff --git a/audio/music/celadoncity.asm b/audio/music/celadoncity.asm
index f118d0243..de815cc91 100644
--- a/audio/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
@@ -1,14 +1,13 @@
-Music_CeladonCity: ; f435b
+Music_CeladonCity:
 	musicheader 3, 1, Music_CeladonCity_Ch1
 	musicheader 1, 2, Music_CeladonCity_Ch2
 	musicheader 1, 3, Music_CeladonCity_Ch3
-; f4364
 
-Music_CeladonCity_Ch1: ; f4364
+Music_CeladonCity_Ch1:
 	tempo 146
 	volume $77
 	tone $0001
-Music_CeladonCity_branch_f436c: ; f436c
+Music_CeladonCity_branch_f436c:
 	stereopanning $f
 	notetype $c, $a6
 	octave 3
@@ -20,7 +19,7 @@ Music_CeladonCity_branch_f436c: ; f436c
 	note E_, 2
 	note F#, 2
 	callchannel Music_CeladonCity_branch_f43cc
-Music_CeladonCity_branch_f437d: ; f437d
+Music_CeladonCity_branch_f437d:
 	note D_, 2
 	note F#, 1
 	note A_, 1
@@ -84,9 +83,8 @@ Music_CeladonCity_branch_f437d: ; f437d
 	note G_, 1
 	note A_, 8
 	loopchannel 0, Music_CeladonCity_branch_f436c
-; f43cc
 
-Music_CeladonCity_branch_f43cc: ; f43cc
+Music_CeladonCity_branch_f43cc:
 	note D_, 2
 	note G_, 1
 	note B_, 1
@@ -105,9 +103,8 @@ Music_CeladonCity_branch_f43cc: ; f43cc
 	octave 3
 	note A_, 1
 	endchannel
-; f43e1
 
-Music_CeladonCity_branch_f43e1: ; f43e1
+Music_CeladonCity_branch_f43e1:
 	octave 2
 	note G_, 2
 	note B_, 1
@@ -134,17 +131,15 @@ Music_CeladonCity_branch_f43e1: ; f43e1
 	octave 3
 	note B_, 1
 	endchannel
-; f43fe
 
-Music_CeladonCity_branch_f43fe: ; f43fe
+Music_CeladonCity_branch_f43fe:
 	note D_, 2
 	note F#, 1
 	note A_, 1
 	loopchannel 4, Music_CeladonCity_branch_f43fe
 	endchannel
-; f4406
 
-Music_CeladonCity_Ch2: ; f4406
+Music_CeladonCity_Ch2:
 	vibrato $12, $34
 	dutycycle $2
 	stereopanning $f0
@@ -159,7 +154,7 @@ Music_CeladonCity_Ch2: ; f4406
 	note F#, 1
 	note G_, 1
 	note A_, 8
-Music_CeladonCity_branch_f441a: ; f441a
+Music_CeladonCity_branch_f441a:
 	callchannel Music_CeladonCity_branch_f4463
 	note A_, 4
 	note F#, 4
@@ -218,9 +213,8 @@ Music_CeladonCity_branch_f441a: ; f441a
 	octave 5
 	note D_, 16
 	loopchannel 0, Music_CeladonCity_branch_f441a
-; f4463
 
-Music_CeladonCity_branch_f4463: ; f4463
+Music_CeladonCity_branch_f4463:
 	intensity $b2
 	octave 4
 	note B_, 4
@@ -237,9 +231,8 @@ Music_CeladonCity_branch_f4463: ; f4463
 	note B_, 2
 	note A_, 8
 	endchannel
-; f4474
 
-Music_CeladonCity_branch_f4474: ; f4474
+Music_CeladonCity_branch_f4474:
 	note G_, 3
 	note B_, 1
 	octave 2
@@ -270,11 +263,10 @@ Music_CeladonCity_branch_f4474: ; f4474
 	note D_, 2
 	note F#, 4
 	endchannel
-; f4492
 
-Music_CeladonCity_Ch3: ; f4492
+Music_CeladonCity_Ch3:
 	vibrato $12, $24
-Music_CeladonCity_branch_f4495: ; f4495
+Music_CeladonCity_branch_f4495:
 	notetype $c, $25
 	octave 3
 	note A_, 2
@@ -283,7 +275,7 @@ Music_CeladonCity_branch_f4495: ; f4495
 	note __, 2
 	note D_, 8
 	callchannel Music_CeladonCity_branch_f44fd
-Music_CeladonCity_branch_f44a1: ; f44a1
+Music_CeladonCity_branch_f44a1:
 	octave 2
 	note A_, 2
 	note __, 2
@@ -363,9 +355,8 @@ Music_CeladonCity_branch_f44a1: ; f44a1
 	note D_, 2
 	note __, 6
 	loopchannel 0, Music_CeladonCity_branch_f4495
-; f44fd
 
-Music_CeladonCity_branch_f44fd: ; f44fd
+Music_CeladonCity_branch_f44fd:
 	octave 2
 	note G_, 2
 	note __, 2
@@ -382,9 +373,8 @@ Music_CeladonCity_branch_f44fd: ; f44fd
 	octave 2
 	note G#, 1
 	endchannel
-; f4510
 
-Music_CeladonCity_branch_f4510: ; f4510
+Music_CeladonCity_branch_f4510:
 	octave 5
 	note D_, 8
 	note C_, 2
@@ -393,4 +383,3 @@ Music_CeladonCity_branch_f4510: ; f4510
 	note A_, 2
 	note B_, 2
 	endchannel
-; f4518
diff --git a/audio/music/championbattle.asm b/audio/music/championbattle.asm
index 297325803..e732d39c7 100644
--- a/audio/music/championbattle.asm
+++ b/audio/music/championbattle.asm
@@ -1,10 +1,9 @@
-Music_ChampionBattle: ; ea9c1
+Music_ChampionBattle:
 	musicheader 3, 1, Music_ChampionBattle_Ch1
 	musicheader 1, 2, Music_ChampionBattle_Ch2
 	musicheader 1, 3, Music_ChampionBattle_Ch3
-; ea9ca
 
-Music_ChampionBattle_Ch1: ; ea9ca
+Music_ChampionBattle_Ch1:
 	tempo 98
 	volume $77
 	dutycycle $3
@@ -18,7 +17,7 @@ Music_ChampionBattle_Ch1: ; ea9ca
 	note A#, 4
 	intensity $b7
 	note B_, 4
-Music_ChampionBattle_branch_ea9e2: ; ea9e2
+Music_ChampionBattle_branch_ea9e2:
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
 	note D#, 4
@@ -26,11 +25,11 @@ Music_ChampionBattle_branch_ea9e2: ; ea9e2
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
 	note E_, 4
-Music_ChampionBattle_branch_ea9f0: ; ea9f0
+Music_ChampionBattle_branch_ea9f0:
 	callchannel Music_ChampionBattle_branch_eaafc
 	loopchannel 3, Music_ChampionBattle_branch_ea9f0
 	callchannel Music_ChampionBattle_branch_eab06
-Music_ChampionBattle_branch_ea9fa: ; ea9fa
+Music_ChampionBattle_branch_ea9fa:
 	callchannel Music_ChampionBattle_branch_eaafc
 	loopchannel 7, Music_ChampionBattle_branch_ea9fa
 	callchannel Music_ChampionBattle_branch_eab06
@@ -73,13 +72,13 @@ Music_ChampionBattle_branch_ea9fa: ; ea9fa
 	octave 4
 	note C_, 1
 	note C#, 1
-Music_ChampionBattle_branch_eaa35: ; eaa35
+Music_ChampionBattle_branch_eaa35:
 	callchannel Music_ChampionBattle_branch_eab0f
 	note E_, 2
 	note E_, 2
 	intensity $b7
 	note F#, 4
-Music_ChampionBattle_branch_eaa3d: ; eaa3d
+Music_ChampionBattle_branch_eaa3d:
 	intensity $b2
 	note E_, 2
 	note E_, 2
@@ -167,7 +166,7 @@ Music_ChampionBattle_branch_eaa3d: ; eaa3d
 	intensity $90
 	note D#, 16
 	note C#, 16
-Music_ChampionBattle_branch_eaab1: ; eaab1
+Music_ChampionBattle_branch_eaab1:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -176,7 +175,7 @@ Music_ChampionBattle_branch_eaab1: ; eaab1
 	octave 3
 	note D#, 4
 	loopchannel 4, Music_ChampionBattle_branch_eaab1
-Music_ChampionBattle_branch_eaabe: ; eaabe
+Music_ChampionBattle_branch_eaabe:
 	intensity $b2
 	note C_, 2
 	note C_, 2
@@ -207,9 +206,8 @@ Music_ChampionBattle_branch_eaabe: ; eaabe
 	octave 4
 	note D_, 4
 	loopchannel 0, Music_ChampionBattle_branch_eaa35
-; eaaee
 
-Music_ChampionBattle_branch_eaaee: ; eaaee
+Music_ChampionBattle_branch_eaaee:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -222,9 +220,8 @@ Music_ChampionBattle_branch_eaaee: ; eaaee
 	note A#, 2
 	intensity $b7
 	endchannel
-; eaafc
 
-Music_ChampionBattle_branch_eaafc: ; eaafc
+Music_ChampionBattle_branch_eaafc:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -233,9 +230,8 @@ Music_ChampionBattle_branch_eaafc: ; eaafc
 	octave 3
 	note D#, 4
 	endchannel
-; eab06
 
-Music_ChampionBattle_branch_eab06: ; eab06
+Music_ChampionBattle_branch_eab06:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -243,9 +239,8 @@ Music_ChampionBattle_branch_eab06: ; eab06
 	intensity $b7
 	note B_, 4
 	endchannel
-; eab0f
 
-Music_ChampionBattle_branch_eab0f: ; eab0f
+Music_ChampionBattle_branch_eab0f:
 	intensity $b5
 	octave 3
 	note D#, 2
@@ -265,9 +260,8 @@ Music_ChampionBattle_branch_eab0f: ; eab0f
 	note G_, 2
 	intensity $b2
 	endchannel
-; eab24
 
-Music_ChampionBattle_branch_eab24: ; eab24
+Music_ChampionBattle_branch_eab24:
 	intensity $b2
 	octave 3
 	note A#, 2
@@ -279,9 +273,8 @@ Music_ChampionBattle_branch_eab24: ; eab24
 	note A#, 2
 	intensity $b7
 	endchannel
-; eab31
 
-Music_ChampionBattle_branch_eab31: ; eab31
+Music_ChampionBattle_branch_eab31:
 	intensity $b2
 	note D#, 2
 	note D#, 2
@@ -300,9 +293,8 @@ Music_ChampionBattle_branch_eab31: ; eab31
 	note C#, 4
 	intensity $b2
 	endchannel
-; eab4a
 
-Music_ChampionBattle_Ch2: ; eab4a
+Music_ChampionBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
@@ -357,7 +349,7 @@ Music_ChampionBattle_Ch2: ; eab4a
 	note E_, 8
 	intensity $3c
 	note E_, 8
-Music_ChampionBattle_branch_eab9d: ; eab9d
+Music_ChampionBattle_branch_eab9d:
 	intensity $c5
 	note D#, 6
 	octave 3
@@ -425,7 +417,7 @@ Music_ChampionBattle_branch_eab9d: ; eab9d
 	note F_, 16
 	note F#, 16
 	intensity $c4
-Music_ChampionBattle_branch_eabef: ; eabef
+Music_ChampionBattle_branch_eabef:
 	octave 5
 	note D#, 4
 	note D_, 4
@@ -498,9 +490,8 @@ Music_ChampionBattle_branch_eabef: ; eabef
 	note F#, 8
 	note G#, 8
 	loopchannel 0, Music_ChampionBattle_branch_eab9d
-; eac4f
 
-Music_ChampionBattle_branch_eac4f: ; eac4f
+Music_ChampionBattle_branch_eac4f:
 	intensity $c2
 	note D#, 2
 	note D#, 6
@@ -512,9 +503,8 @@ Music_ChampionBattle_branch_eac4f: ; eac4f
 	note D#, 2
 	intensity $c7
 	endchannel
-; eac5c
 
-Music_ChampionBattle_branch_eac5c: ; eac5c
+Music_ChampionBattle_branch_eac5c:
 	intensity $c2
 	octave 3
 	note D#, 2
@@ -536,9 +526,8 @@ Music_ChampionBattle_branch_eac5c: ; eac5c
 	note D#, 2
 	intensity $c7
 	endchannel
-; eac79
 
-Music_ChampionBattle_branch_eac79: ; eac79
+Music_ChampionBattle_branch_eac79:
 	intensity $c1
 	note D#, 2
 	note D#, 4
@@ -549,11 +538,10 @@ Music_ChampionBattle_branch_eac79: ; eac79
 	note D#, 2
 	intensity $c5
 	endchannel
-; eac85
 
-Music_ChampionBattle_Ch3: ; eac85
+Music_ChampionBattle_Ch3:
 	notetype $c, $14
-Music_ChampionBattle_branch_eac88: ; eac88
+Music_ChampionBattle_branch_eac88:
 	octave 3
 	note D#, 1
 	note __, 7
@@ -601,11 +589,11 @@ Music_ChampionBattle_branch_eac88: ; eac88
 	note A#, 2
 	note F_, 2
 	note A_, 2
-Music_ChampionBattle_branch_eacc6: ; eacc6
+Music_ChampionBattle_branch_eacc6:
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacc6
-Music_ChampionBattle_branch_eaccc: ; eaccc
+Music_ChampionBattle_branch_eaccc:
 	note E_, 2
 	note B_, 2
 	loopchannel 5, Music_ChampionBattle_branch_eaccc
@@ -617,11 +605,11 @@ Music_ChampionBattle_branch_eaccc: ; eaccc
 	note B_, 2
 	note G_, 2
 	note A_, 2
-Music_ChampionBattle_branch_eacda: ; eacda
+Music_ChampionBattle_branch_eacda:
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacda
-Music_ChampionBattle_branch_eace0: ; eace0
+Music_ChampionBattle_branch_eace0:
 	note E_, 2
 	note B_, 2
 	loopchannel 8, Music_ChampionBattle_branch_eace0
@@ -652,7 +640,7 @@ Music_ChampionBattle_branch_eace0: ; eace0
 	note D#, 8
 	note B_, 8
 	note D#, 8
-Music_ChampionBattle_branch_ead05: ; ead05
+Music_ChampionBattle_branch_ead05:
 	note D#, 2
 	note F#, 2
 	loopchannel 16, Music_ChampionBattle_branch_ead05
@@ -670,12 +658,12 @@ Music_ChampionBattle_branch_ead05: ; ead05
 	note D#, 2
 	note E_, 2
 	callchannel Music_ChampionBattle_branch_ead8e
-Music_ChampionBattle_branch_ead1d: ; ead1d
+Music_ChampionBattle_branch_ead1d:
 	octave 3
 	note E_, 2
 	note B_, 2
 	loopchannel 4, Music_ChampionBattle_branch_ead1d
-Music_ChampionBattle_branch_ead24: ; ead24
+Music_ChampionBattle_branch_ead24:
 	note D#, 2
 	note A#, 2
 	loopchannel 5, Music_ChampionBattle_branch_ead24
@@ -687,7 +675,7 @@ Music_ChampionBattle_branch_ead24: ; ead24
 	note __, 2
 	note D#, 2
 	note __, 2
-Music_ChampionBattle_branch_ead32: ; ead32
+Music_ChampionBattle_branch_ead32:
 	note E_, 2
 	note B_, 2
 	loopchannel 5, Music_ChampionBattle_branch_ead32
@@ -699,17 +687,17 @@ Music_ChampionBattle_branch_ead32: ; ead32
 	note __, 2
 	note E_, 2
 	note __, 2
-Music_ChampionBattle_branch_ead40: ; ead40
+Music_ChampionBattle_branch_ead40:
 	note D#, 2
 	note G#, 2
 	loopchannel 8, Music_ChampionBattle_branch_ead40
-Music_ChampionBattle_branch_ead46: ; ead46
+Music_ChampionBattle_branch_ead46:
 	note D#, 2
 	note A#, 2
 	loopchannel 7, Music_ChampionBattle_branch_ead46
 	note B_, 2
 	note A#, 2
-Music_ChampionBattle_branch_ead4e: ; ead4e
+Music_ChampionBattle_branch_ead4e:
 	octave 3
 	note D#, 2
 	note A#, 2
@@ -723,9 +711,8 @@ Music_ChampionBattle_branch_ead4e: ; ead4e
 	note A#, 2
 	note G#, 2
 	loopchannel 0, Music_ChampionBattle_branch_eacc6
-; ead61
 
-Music_ChampionBattle_branch_ead61: ; ead61
+Music_ChampionBattle_branch_ead61:
 	note D#, 1
 	note __, 1
 	note D#, 1
@@ -737,9 +724,8 @@ Music_ChampionBattle_branch_ead61: ; ead61
 	note __, 1
 	note B_, 4
 	endchannel
-; ead6f
 
-Music_ChampionBattle_branch_ead6f: ; ead6f
+Music_ChampionBattle_branch_ead6f:
 	note D#, 1
 	note __, 1
 	note D#, 1
@@ -760,9 +746,8 @@ Music_ChampionBattle_branch_ead6f: ; ead6f
 	note D#, 1
 	note __, 1
 	endchannel
-; ead83
 
-Music_ChampionBattle_branch_ead83: ; ead83
+Music_ChampionBattle_branch_ead83:
 	octave 3
 	note D#, 2
 	note F#, 2
@@ -774,9 +759,8 @@ Music_ChampionBattle_branch_ead83: ; ead83
 	note C#, 2
 	note C_, 2
 	endchannel
-; ead8e
 
-Music_ChampionBattle_branch_ead8e: ; ead8e
+Music_ChampionBattle_branch_ead8e:
 	octave 3
 	note E_, 2
 	note B_, 2
@@ -788,4 +772,3 @@ Music_ChampionBattle_branch_ead8e: ; ead8e
 	note D#, 2
 	note E_, 2
 	endchannel
-; ead99
diff --git a/audio/music/cherrygrovecity.asm b/audio/music/cherrygrovecity.asm
index e327eba1f..9a7e09808 100644
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
@@ -1,11 +1,10 @@
-Music_CherrygroveCity: ; f5b03
+Music_CherrygroveCity:
 	musicheader 4, 1, Music_CherrygroveCity_Ch1
 	musicheader 1, 2, Music_CherrygroveCity_Ch2
 	musicheader 1, 3, Music_CherrygroveCity_Ch3
 	musicheader 1, 4, Music_CherrygroveCity_Ch4
-; f5b0f
 
-Music_CherrygroveCity_Ch1: ; f5b0f
+Music_CherrygroveCity_Ch1:
 	tempo 152
 	volume $77
 	dutycycle $3
@@ -18,7 +17,7 @@ Music_CherrygroveCity_Ch1: ; f5b0f
 	note C_, 2
 	note D_, 2
 	note E_, 2
-Music_CherrygroveCity_branch_f5b26: ; f5b26
+Music_CherrygroveCity_branch_f5b26:
 	note A_, 4
 	note G#, 2
 	note A_, 2
@@ -92,9 +91,8 @@ Music_CherrygroveCity_branch_f5b26: ; f5b26
 	octave 3
 	note C_, 4
 	loopchannel 0, Music_CherrygroveCity_branch_f5b26
-; f5b74
 
-Music_CherrygroveCity_Ch2: ; f5b74
+Music_CherrygroveCity_Ch2:
 	dutycycle $3
 	vibrato $10, $36
 	stereopanning $f
@@ -108,7 +106,7 @@ Music_CherrygroveCity_Ch2: ; f5b74
 	note G_, 2
 	note A_, 2
 	note A#, 2
-Music_CherrygroveCity_branch_f5b87: ; f5b87
+Music_CherrygroveCity_branch_f5b87:
 	intensity $c6
 	octave 4
 	note C_, 6
@@ -173,9 +171,8 @@ Music_CherrygroveCity_branch_f5b87: ; f5b87
 	intensity $a7
 	note F_, 8
 	loopchannel 0, Music_CherrygroveCity_branch_f5b87
-; f5bd8
 
-Music_CherrygroveCity_Ch3: ; f5bd8
+Music_CherrygroveCity_Ch3:
 	notetype $c, $16
 	note __, 4
 	octave 4
@@ -186,7 +183,7 @@ Music_CherrygroveCity_Ch3: ; f5bd8
 	note G_, 2
 	note F_, 2
 	note E_, 2
-Music_CherrygroveCity_branch_f5be4: ; f5be4
+Music_CherrygroveCity_branch_f5be4:
 	note A_, 2
 	note F_, 2
 	note A_, 2
@@ -284,13 +281,12 @@ Music_CherrygroveCity_branch_f5be4: ; f5be4
 	note F_, 2
 	note A_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5be4
-; f5c48
 
-Music_CherrygroveCity_Ch4: ; f5c48
+Music_CherrygroveCity_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 16
-Music_CherrygroveCity_branch_f5c4d: ; f5c4d
+Music_CherrygroveCity_branch_f5c4d:
 	note C#, 2
 	note __, 2
 	note G_, 2
@@ -307,4 +303,3 @@ Music_CherrygroveCity_branch_f5c4d: ; f5c4d
 	note C#, 2
 	note G_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5c4d
-; f5c60
diff --git a/audio/music/clair.asm b/audio/music/clair.asm
index bedfc4dee..90d676cf0 100644
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
@@ -1,11 +1,10 @@
-Music_Clair: ; 1fa8d
+Music_Clair:
 	musicheader 4, 1, Music_Clair_Ch1
 	musicheader 1, 2, Music_Clair_Ch2
 	musicheader 1, 3, Music_Clair_Ch3
 	musicheader 1, 4, Music_Clair_Ch4
-; 1fa99
 
-Music_Clair_Ch1: ; 1fa99
+Music_Clair_Ch1:
 	tempo 136
 	volume $77
 	tone $0001
@@ -13,7 +12,7 @@ Music_Clair_Ch1: ; 1fa99
 	stereopanning $f
 	notetype $c, $93
 	dutycycle $3
-Music_Clair_branch_1faab: ; 1faab
+Music_Clair_branch_1faab:
 	octave 4
 	note F_, 1
 	note F#, 1
@@ -37,7 +36,7 @@ Music_Clair_branch_1faab: ; 1faab
 	note D#, 4
 	note F_, 4
 	note G_, 4
-Music_Clair_branch_1fac9: ; 1fac9
+Music_Clair_branch_1fac9:
 	intensity $93
 	callchannel Music_Clair_branch_1fb12
 	octave 2
@@ -95,9 +94,8 @@ Music_Clair_branch_1fac9: ; 1fac9
 	octave 4
 	note D#, 1
 	loopchannel 0, Music_Clair_branch_1fac9
-; 1fb12
 
-Music_Clair_branch_1fb12: ; 1fb12
+Music_Clair_branch_1fb12:
 	dutycycle $3
 	stereopanning $ff
 	octave 3
@@ -122,9 +120,8 @@ Music_Clair_branch_1fb12: ; 1fb12
 	note C#, 1
 	note __, 1
 	endchannel
-; 1fb2e
 
-Music_Clair_branch_1fb2e: ; 1fb2e
+Music_Clair_branch_1fb2e:
 	octave 4
 	note F#, 1
 	note D#, 1
@@ -144,13 +141,12 @@ Music_Clair_branch_1fb2e: ; 1fb2e
 	note D#, 1
 	note F#, 1
 	endchannel
-; 1fb41
 
-Music_Clair_Ch2: ; 1fb41
+Music_Clair_Ch2:
 	dutycycle $3
 	vibrato $12, $34
 	notetype $6, $b7
-Music_Clair_branch_1fb49: ; 1fb49
+Music_Clair_branch_1fb49:
 	octave 3
 	note A#, 2
 	note B_, 2
@@ -189,7 +185,7 @@ Music_Clair_branch_1fb49: ; 1fb49
 	note G_, 2
 	note A#, 2
 	intensity $b7
-Music_Clair_branch_1fb77: ; 1fb77
+Music_Clair_branch_1fb77:
 	callchannel Music_Clair_branch_1fba6
 	note F#, 2
 	note __, 4
@@ -228,9 +224,8 @@ Music_Clair_branch_1fb77: ; 1fb77
 	note G#, 16
 	note __, 4
 	loopchannel 0, Music_Clair_branch_1fb77
-; 1fba6
 
-Music_Clair_branch_1fba6: ; 1fba6
+Music_Clair_branch_1fba6:
 	octave 4
 	note F#, 2
 	note __, 4
@@ -250,9 +245,8 @@ Music_Clair_branch_1fba6: ; 1fba6
 	note D#, 16
 	note __, 4
 	endchannel
-; 1fbb9
 
-Music_Clair_Ch3: ; 1fbb9
+Music_Clair_Ch3:
 	notetype $c, $14
 	pitchoffset 0, CC
 	octave 3
@@ -274,7 +268,7 @@ Music_Clair_Ch3: ; 1fbb9
 	note A#, 4
 	note G#, 4
 	note G_, 4
-Music_Clair_branch_1fbd1: ; 1fbd1
+Music_Clair_branch_1fbd1:
 	callchannel Music_Clair_branch_1fc3c
 	octave 2
 	note C#, 2
@@ -375,9 +369,8 @@ Music_Clair_branch_1fbd1: ; 1fbd1
 	octave 1
 	note G#, 1
 	loopchannel 0, Music_Clair_branch_1fbd1
-; 1fc3c
 
-Music_Clair_branch_1fc3c: ; 1fc3c
+Music_Clair_branch_1fc3c:
 	octave 1
 	note G#, 2
 	note __, 1
@@ -393,9 +386,8 @@ Music_Clair_branch_1fc3c: ; 1fc3c
 	octave 1
 	note G#, 2
 	endchannel
-; 1fc4b
 
-Music_Clair_Ch4: ; 1fc4b
+Music_Clair_Ch4:
 	togglenoise $3
 	notetype $c
 	stereopanning $f0
@@ -411,7 +403,7 @@ Music_Clair_Ch4: ; 1fc4b
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_Clair_branch_1fc5e: ; 1fc5e
+Music_Clair_branch_1fc5e:
 	stereopanning $ff
 	callchannel Music_Clair_branch_1fc6e
 	note G_, 1
@@ -419,9 +411,8 @@ Music_Clair_branch_1fc5e: ; 1fc5e
 	callchannel Music_Clair_branch_1fc6e
 	note F#, 1
 	loopchannel 0, Music_Clair_branch_1fc5e
-; 1fc6e
 
-Music_Clair_branch_1fc6e: ; 1fc6e
+Music_Clair_branch_1fc6e:
 	note D#, 2
 	stereopanning $f0
 	note G_, 2
@@ -440,4 +431,3 @@ Music_Clair_branch_1fc6e: ; 1fc6e
 	stereopanning $f0
 	note G_, 1
 	endchannel
-; 1fc87
diff --git a/audio/music/contestresults.asm b/audio/music/contestresults.asm
index e6d730daf..85d8291e7 100644
--- a/audio/music/contestresults.asm
+++ b/audio/music/contestresults.asm
@@ -1,15 +1,14 @@
-Music_ContestResults: ; efb3e
+Music_ContestResults:
 	musicheader 4, 1, Music_ContestResults_Ch1
 	musicheader 1, 2, Music_ContestResults_Ch2
 	musicheader 1, 3, Music_ContestResults_Ch3
 	musicheader 1, 4, Music_ContestResults_Ch4
-; efb4a
 
-Music_ContestResults_Ch1: ; efb4a
+Music_ContestResults_Ch1:
 	tempo 144
 	volume $77
 	notetype $c, $51
-Music_ContestResults_branch_efb52: ; efb52
+Music_ContestResults_branch_efb52:
 	note __, 2
 	octave 2
 	note G_, 1
@@ -48,11 +47,10 @@ Music_ContestResults_branch_efb52: ; efb52
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb52
-; efb7b
 
-Music_ContestResults_Ch2: ; efb7b
+Music_ContestResults_Ch2:
 	notetype $c, $61
-Music_ContestResults_branch_efb7e: ; efb7e
+Music_ContestResults_branch_efb7e:
 	octave 2
 	note C_, 2
 	octave 3
@@ -93,7 +91,7 @@ Music_ContestResults_branch_efb7e: ; efb7e
 	octave 3
 	note F_, 1
 	note __, 1
-Music_ContestResults_branch_efba6: ; efba6
+Music_ContestResults_branch_efba6:
 	octave 2
 	note D_, 2
 	octave 3
@@ -126,12 +124,11 @@ Music_ContestResults_branch_efba6: ; efba6
 	note D_, 1
 	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb7e
-; efbcc
 
-Music_ContestResults_Ch3: ; efbcc
+Music_ContestResults_Ch3:
 	vibrato $8, $24
 	notetype $c, $23
-Music_ContestResults_branch_efbd2: ; efbd2
+Music_ContestResults_branch_efbd2:
 	octave 4
 	note E_, 5
 	note __, 1
@@ -152,12 +149,11 @@ Music_ContestResults_branch_efbd2: ; efbd2
 	note A_, 8
 	note G_, 8
 	loopchannel 0, Music_ContestResults_branch_efbd2
-; efbe9
 
-Music_ContestResults_Ch4: ; efbe9
+Music_ContestResults_Ch4:
 	togglenoise $4
 	notetype $6
-Music_ContestResults_branch_efbed: ; efbed
+Music_ContestResults_branch_efbed:
 	note C#, 4
 	note C#, 4
 	note C#, 2
@@ -175,4 +171,3 @@ Music_ContestResults_branch_efbed: ; efbed
 	note G_, 1
 	note G_, 1
 	loopchannel 0, Music_ContestResults_branch_efbed
-; efc01
diff --git a/audio/music/credits.asm b/audio/music/credits.asm
index 708b70ee4..8d862240b 100644
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -1,11 +1,10 @@
-Music_Credits: ; 1f31c
+Music_Credits:
 	musicheader 4, 1, Music_Credits_Ch1
 	musicheader 1, 2, Music_Credits_Ch2
 	musicheader 1, 3, Music_Credits_Ch3
 	musicheader 1, 4, Music_Credits_Ch4
-; 1f328
 
-Music_Credits_Ch1: ; 1f328
+Music_Credits_Ch1:
 	tempo 139
 	volume $77
 	stereopanning $f
@@ -181,7 +180,7 @@ Music_Credits_Ch1: ; 1f328
 	octave 5
 	note C#, 6
 	notetype $c, $a7
-Music_Credits_branch_1f407: ; 1f407
+Music_Credits_branch_1f407:
 	octave 3
 	note A_, 1
 	octave 4
@@ -280,9 +279,8 @@ Music_Credits_branch_1f407: ; 1f407
 	note __, 16
 	note __, 16
 	endchannel
-; 1f483
 
-Music_Credits_branch_1f483: ; 1f483
+Music_Credits_branch_1f483:
 	note C_, 16
 	note F#, 1
 	note G_, 3
@@ -389,9 +387,8 @@ Music_Credits_branch_1f483: ; 1f483
 	note C_, 1
 	note __, 1
 	endchannel
-; 1f4ed
 
-Music_Credits_branch_1f4ed: ; 1f4ed
+Music_Credits_branch_1f4ed:
 	octave 4
 	note C_, 4
 	octave 3
@@ -403,9 +400,8 @@ Music_Credits_branch_1f4ed: ; 1f4ed
 	note C_, 4
 	note D#, 4
 	endchannel
-; 1f4f8
 
-Music_Credits_branch_1f4f8: ; 1f4f8
+Music_Credits_branch_1f4f8:
 	octave 3
 	note A_, 2
 	octave 4
@@ -503,9 +499,8 @@ Music_Credits_branch_1f4f8: ; 1f4f8
 	note C_, 2
 	note F_, 2
 	endchannel
-; 1f559
 
-Music_Credits_branch_1f559: ; 1f559
+Music_Credits_branch_1f559:
 	octave 3
 	note A_, 2
 	octave 4
@@ -547,9 +542,8 @@ Music_Credits_branch_1f559: ; 1f559
 	note A#, 2
 	note A_, 2
 	endchannel
-; 1f582
 
-Music_Credits_branch_1f582: ; 1f582
+Music_Credits_branch_1f582:
 	note __, 6
 	octave 3
 	note D_, 6
@@ -561,9 +555,8 @@ Music_Credits_branch_1f582: ; 1f582
 	note F#, 6
 	note C#, 6
 	endchannel
-; 1f58d
 
-Music_Credits_Ch2: ; 1f58d
+Music_Credits_Ch2:
 	dutycycle $1
 	vibrato $14, $23
 	notetype $c, $2f
@@ -723,7 +716,7 @@ Music_Credits_Ch2: ; 1f58d
 	octave 2
 	note F#, 1
 	note __, 1
-Music_Credits_branch_1f657: ; 1f657
+Music_Credits_branch_1f657:
 	octave 1
 	note G_, 2
 	octave 2
@@ -818,9 +811,8 @@ Music_Credits_branch_1f657: ; 1f657
 	note __, 16
 	note __, 16
 	endchannel
-; 1f6cb
 
-Music_Credits_branch_1f6cb: ; 1f6cb
+Music_Credits_branch_1f6cb:
 	octave 2
 	note C_, 4
 	intensity $b1
@@ -931,9 +923,8 @@ Music_Credits_branch_1f6cb: ; 1f6cb
 	octave 3
 	note C_, 2
 	endchannel
-; 1f73f
 
-Music_Credits_branch_1f73f: ; 1f73f
+Music_Credits_branch_1f73f:
 	octave 1
 	note G_, 4
 	note __, 4
@@ -943,9 +934,8 @@ Music_Credits_branch_1f73f: ; 1f73f
 	note G_, 12
 	note F#, 8
 	endchannel
-; 1f748
 
-Music_Credits_branch_1f748: ; 1f748
+Music_Credits_branch_1f748:
 	octave 4
 	note A_, 8
 	note B_, 8
@@ -980,9 +970,8 @@ Music_Credits_branch_1f748: ; 1f748
 	octave 5
 	note C_, 4
 	endchannel
-; 1f772
 
-Music_Credits_Ch3: ; 1f772
+Music_Credits_Ch3:
 	vibrato $16, $23
 	notetype $c, $34
 	stereopanning $ff
@@ -1238,9 +1227,8 @@ Music_Credits_Ch3: ; 1f772
 	note __, 16
 	note __, 16
 	endchannel
-; 1f8aa
 
-Music_Credits_branch_1f8aa: ; 1f8aa
+Music_Credits_branch_1f8aa:
 	note G_, 16
 	octave 6
 	note C#, 1
@@ -1280,9 +1268,8 @@ Music_Credits_branch_1f8aa: ; 1f8aa
 	notetype $c, $14
 	note D_, 16
 	endchannel
-; 1f8db
 
-Music_Credits_branch_1f8db: ; 1f8db
+Music_Credits_branch_1f8db:
 	notetype $6, $14
 	note F#, 1
 	note G_, 3
@@ -1293,9 +1280,8 @@ Music_Credits_branch_1f8db: ; 1f8db
 	note G_, 12
 	note G#, 8
 	endchannel
-; 1f8e7
 
-Music_Credits_branch_1f8e7: ; 1f8e7
+Music_Credits_branch_1f8e7:
 	octave 3
 	note F_, 4
 	note __, 2
@@ -1373,9 +1359,8 @@ Music_Credits_branch_1f8e7: ; 1f8e7
 	octave 3
 	note G#, 2
 	endchannel
-; 1f934
 
-Music_Credits_branch_1f934: ; 1f934
+Music_Credits_branch_1f934:
 	octave 2
 	note F_, 4
 	note __, 2
@@ -1399,9 +1384,8 @@ Music_Credits_branch_1f934: ; 1f934
 	note E_, 2
 	note F_, 2
 	endchannel
-; 1f94b
 
-Music_Credits_branch_1f94b: ; 1f94b
+Music_Credits_branch_1f94b:
 	octave 2
 	note F#, 4
 	note __, 2
@@ -1442,9 +1426,8 @@ Music_Credits_branch_1f94b: ; 1f94b
 	note G_, 2
 	note D_, 2
 	endchannel
-; 1f973
 
-Music_Credits_Ch4: ; 1f973
+Music_Credits_Ch4:
 	togglenoise $3
 	notetype $c
 	note G#, 1
@@ -1480,7 +1463,7 @@ Music_Credits_Ch4: ; 1f973
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa6d
-Music_Credits_branch_1f9a8: ; 1f9a8
+Music_Credits_branch_1f9a8:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1508,7 +1491,7 @@ Music_Credits_branch_1f9a8: ; 1f9a8
 	note C#, 1
 	note D_, 1
 	note D_, 1
-Music_Credits_branch_1f9c6: ; 1f9c6
+Music_Credits_branch_1f9c6:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1542,7 +1525,7 @@ Music_Credits_branch_1f9c6: ; 1f9c6
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa6d
-Music_Credits_branch_1f9f2: ; 1f9f2
+Music_Credits_branch_1f9f2:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1621,9 +1604,8 @@ Music_Credits_branch_1f9f2: ; 1f9f2
 	note __, 16
 	note __, 16
 	endchannel
-; 1fa4d
 
-Music_Credits_branch_1fa4d: ; 1fa4d
+Music_Credits_branch_1fa4d:
 	note G#, 1
 	note G_, 1
 	note G_, 1
@@ -1656,9 +1638,8 @@ Music_Credits_branch_1fa4d: ; 1fa4d
 	note G_, 1
 	note F#, 2
 	endchannel
-; 1fa6d
 
-Music_Credits_branch_1fa6d: ; 1fa6d
+Music_Credits_branch_1fa6d:
 	note G#, 1
 	note G_, 1
 	note G_, 1
@@ -1691,4 +1672,3 @@ Music_Credits_branch_1fa6d: ; 1fa6d
 	note A#, 1
 	note D_, 1
 	endchannel
-; 1fa8d
diff --git a/audio/music/crystalopening.asm b/audio/music/crystalopening.asm
index e01d57d42..ca2e525de 100644
--- a/audio/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
@@ -1,11 +1,10 @@
-Music_CrystalOpening: ; 1786e8
+Music_CrystalOpening:
 	musicheader 4, 1, Music_CrystalOpening_Ch1
 	musicheader 1, 2, Music_CrystalOpening_Ch2
 	musicheader 1, 3, Music_CrystalOpening_Ch3
 	musicheader 1, 4, Music_CrystalOpening_Ch4
-; 1786f4
 
-Music_CrystalOpening_Ch1: ; 1786f4
+Music_CrystalOpening_Ch1:
 	tempo 136
 	volume $77
 	tone $0002
@@ -121,9 +120,8 @@ Music_CrystalOpening_Ch1: ; 1786f4
 	octave 2
 	note D_, 16
 	endchannel
-; 17877a
 
-Music_CrystalOpening_Ch2: ; 17877a
+Music_CrystalOpening_Ch2:
 	notetype $c, $a2
 	dutycycle $3
 	vibrato $8, $44
@@ -177,9 +175,8 @@ Music_CrystalOpening_Ch2: ; 17877a
 	octave 3
 	note D_, 16
 	endchannel
-; 1787c8
 
-Music_CrystalOpening_Ch3: ; 1787c8
+Music_CrystalOpening_Ch3:
 	notetype $c, $16
 	octave 1
 	note B_, 4
@@ -242,9 +239,8 @@ Music_CrystalOpening_Ch3: ; 1787c8
 	note D_, 1
 	note __, 15
 	endchannel
-; 178810
 
-Music_CrystalOpening_Ch4: ; 178810
+Music_CrystalOpening_Ch4:
 	stereopanning $f
 	togglenoise $3
 	notetype $c
@@ -361,4 +357,3 @@ Music_CrystalOpening_Ch4: ; 178810
 	note __, 16
 	note __, 16
 	endchannel
-; 178889
diff --git a/audio/music/dancinghall.asm b/audio/music/dancinghall.asm
index 1241d6076..6884000b9 100644
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@@ -1,19 +1,18 @@
-Music_DancingHall: ; ef9bc
+Music_DancingHall:
 	musicheader 3, 1, Music_DancingHall_Ch1
 	musicheader 1, 2, Music_DancingHall_Ch2
 	musicheader 1, 3, Music_DancingHall_Ch3
-; ef9c5
 
 	db $3
 
-Music_DancingHall_Ch1: ; ef9c6
+Music_DancingHall_Ch1:
 	tempo 208
 	volume $77
 	stereopanning $f
 	notetype $6, $b7
 	note __, 3
 	dutycycle $0
-Music_DancingHall_branch_ef9d3: ; ef9d3
+Music_DancingHall_branch_ef9d3:
 	notetype $c, $b7
 	callchannel Music_DancingHall_branch_efa17
 	note __, 16
@@ -64,9 +63,8 @@ Music_DancingHall_branch_ef9d3: ; ef9d3
 	note __, 1
 	note F_, 2
 	loopchannel 0, Music_DancingHall_branch_ef9d3
-; efa17
 
-Music_DancingHall_branch_efa17: ; efa17
+Music_DancingHall_branch_efa17:
 	octave 3
 	note B_, 1
 	note __, 1
@@ -88,15 +86,14 @@ Music_DancingHall_branch_efa17: ; efa17
 	note D_, 1
 	note __, 1
 	endchannel
-; efa2c
 
-Music_DancingHall_Ch2: ; efa2c
+Music_DancingHall_Ch2:
 	stereopanning $f0
 	notetype $6, $a1
 	dutycycle $0
 	vibrato $10, $24
 	note __, 3
-Music_DancingHall_branch_efa37: ; efa37
+Music_DancingHall_branch_efa37:
 	notetype $6, $a2
 	callchannel Music_DancingHall_branch_efa7a
 	callchannel Music_DancingHall_branch_efa7a
@@ -144,9 +141,8 @@ Music_DancingHall_branch_efa37: ; efa37
 	note __, 1
 	note D_, 2
 	loopchannel 0, Music_DancingHall_branch_efa37
-; efa7a
 
-Music_DancingHall_branch_efa7a: ; efa7a
+Music_DancingHall_branch_efa7a:
 	intensity $a1
 	octave 4
 	note E_, 4
@@ -222,9 +218,8 @@ Music_DancingHall_branch_efa7a: ; efa7a
 	octave 4
 	note D_, 1
 	endchannel
-; efad6
 
-Music_DancingHall_Ch3: ; efad6
+Music_DancingHall_Ch3:
 	stereopanning $ff
 	vibrato $16, $24
 	notetype $6, $10
@@ -233,7 +228,7 @@ Music_DancingHall_Ch3: ; efad6
 	note B_, 1
 	octave 6
 	note D_, 1
-Music_DancingHall_branch_efae3: ; efae3
+Music_DancingHall_branch_efae3:
 	note E_, 13
 	note D_, 1
 	note E_, 1
@@ -308,4 +303,3 @@ Music_DancingHall_branch_efae3: ; efae3
 	octave 6
 	note D_, 1
 	loopchannel 0, Music_DancingHall_branch_efae3
-; efb3e
diff --git a/audio/music/darkcave.asm b/audio/music/darkcave.asm
index 89f9bc56b..8d2877d06 100644
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
@@ -1,11 +1,10 @@
-Music_DarkCave: ; ea2be
+Music_DarkCave:
 	musicheader 4, 1, Music_DarkCave_Ch1
 	musicheader 1, 2, Music_DarkCave_Ch2
 	musicheader 1, 3, Music_DarkCave_Ch3
 	musicheader 1, 4, Music_DarkCave_Ch4
-; ea2ca
 
-Music_DarkCave_Ch1: ; ea2ca
+Music_DarkCave_Ch1:
 	tempo 128
 	volume $77
 	dutycycle $3
@@ -13,7 +12,7 @@ Music_DarkCave_Ch1: ; ea2ca
 	vibrato $11, $15
 	stereopanning $f0
 	notetype $c, $a7
-Music_DarkCave_branch_ea2dc: ; ea2dc
+Music_DarkCave_branch_ea2dc:
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea2dc
 	octave 3
@@ -22,7 +21,7 @@ Music_DarkCave_branch_ea2dc: ; ea2dc
 	note C#, 16
 	note C_, 16
 	intensity $a3
-Music_DarkCave_branch_ea2e8: ; ea2e8
+Music_DarkCave_branch_ea2e8:
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 3, Music_DarkCave_branch_ea2e8
 	intensity $b7
@@ -43,7 +42,7 @@ Music_DarkCave_branch_ea2e8: ; ea2e8
 	note D#, 8
 	note C_, 8
 	intensity $a3
-Music_DarkCave_branch_ea303: ; ea303
+Music_DarkCave_branch_ea303:
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 2, Music_DarkCave_branch_ea303
 	note __, 16
@@ -74,13 +73,12 @@ Music_DarkCave_branch_ea303: ; ea303
 	note G_, 2
 	note G#, 4
 	intensity $a3
-Music_DarkCave_branch_ea328: ; ea328
+Music_DarkCave_branch_ea328:
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 2, Music_DarkCave_branch_ea328
 	loopchannel 0, Music_DarkCave_branch_ea2e8
-; ea333
 
-Music_DarkCave_branch_ea333: ; ea333
+Music_DarkCave_branch_ea333:
 	octave 4
 	note D#, 2
 	octave 3
@@ -136,14 +134,13 @@ Music_DarkCave_branch_ea333: ; ea333
 	octave 3
 	note A#, 2
 	endchannel
-; ea36a
 
-Music_DarkCave_Ch2: ; ea36a
+Music_DarkCave_Ch2:
 	dutycycle $1
 	vibrato $12, $36
 	stereopanning $f
 	notetype $c, $a7
-Music_DarkCave_branch_ea374: ; ea374
+Music_DarkCave_branch_ea374:
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea374
 	octave 3
@@ -151,7 +148,7 @@ Music_DarkCave_branch_ea374: ; ea374
 	note A#, 16
 	note F_, 16
 	note G_, 16
-Music_DarkCave_branch_ea37e: ; ea37e
+Music_DarkCave_branch_ea37e:
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea37e
 	note __, 8
@@ -347,14 +344,13 @@ Music_DarkCave_branch_ea37e: ; ea37e
 	note F_, 16
 	note D#, 16
 	loopchannel 0, Music_DarkCave_branch_ea37e
-; ea46e
 
-Music_DarkCave_Ch3: ; ea46e
+Music_DarkCave_Ch3:
 	notetype $c, $27
-Music_DarkCave_branch_ea471: ; ea471
+Music_DarkCave_branch_ea471:
 	callchannel Music_DarkCave_branch_ea4ce
 	loopchannel 2, Music_DarkCave_branch_ea471
-Music_DarkCave_branch_ea478: ; ea478
+Music_DarkCave_branch_ea478:
 	callchannel Music_DarkCave_branch_ea4ce
 	loopchannel 7, Music_DarkCave_branch_ea478
 	callchannel Music_DarkCave_branch_ea4c3
@@ -386,9 +382,8 @@ Music_DarkCave_branch_ea478: ; ea478
 	callchannel Music_DarkCave_branch_ea4a7
 	callchannel Music_DarkCave_branch_ea4a7
 	loopchannel 0, Music_DarkCave_branch_ea478
-; ea4a7
 
-Music_DarkCave_branch_ea4a7: ; ea4a7
+Music_DarkCave_branch_ea4a7:
 	octave 3
 	note C_, 4
 	note G_, 2
@@ -417,9 +412,8 @@ Music_DarkCave_branch_ea4a7: ; ea4a7
 	note C_, 2
 	note C#, 4
 	endchannel
-; ea4c3
 
-Music_DarkCave_branch_ea4c3: ; ea4c3
+Music_DarkCave_branch_ea4c3:
 	octave 3
 	note C_, 4
 	note G_, 2
@@ -431,9 +425,8 @@ Music_DarkCave_branch_ea4c3: ; ea4c3
 	octave 2
 	note A#, 12
 	endchannel
-; ea4ce
 
-Music_DarkCave_branch_ea4ce: ; ea4ce
+Music_DarkCave_branch_ea4ce:
 	octave 2
 	note C_, 4
 	note G_, 2
@@ -462,12 +455,11 @@ Music_DarkCave_branch_ea4ce: ; ea4ce
 	note C_, 2
 	note C#, 4
 	endchannel
-; ea4ea
 
-Music_DarkCave_Ch4: ; ea4ea
+Music_DarkCave_Ch4:
 	togglenoise $3
 	notetype $c
-Music_DarkCave_branch_ea4ee: ; ea4ee
+Music_DarkCave_branch_ea4ee:
 	stereopanning $ff
 	note D#, 8
 	note D#, 8
@@ -489,4 +481,3 @@ Music_DarkCave_branch_ea4ee: ; ea4ee
 	note C#, 2
 	note C#, 2
 	loopchannel 0, Music_DarkCave_branch_ea4ee
-; ea50d
diff --git a/audio/music/dragonsden.asm b/audio/music/dragonsden.asm
index 6778a09b2..2dc0ae09a 100644
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@@ -1,18 +1,17 @@
-Music_DragonsDen: ; eece8
+Music_DragonsDen:
 	musicheader 4, 1, Music_DragonsDen_Ch1
 	musicheader 1, 2, Music_DragonsDen_Ch2
 	musicheader 1, 3, Music_DragonsDen_Ch3
 	musicheader 1, 4, Music_DragonsDen_Ch4
-; eecf4
 
-Music_DragonsDen_Ch1: ; eecf4
+Music_DragonsDen_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $0
 	tone $0004
 	stereopanning $f0
 	notetype $c, $80
-Music_DragonsDen_branch_eed03: ; eed03
+Music_DragonsDen_branch_eed03:
 	callchannel Music_DragonsDen_branch_eed1e
 	note __, 16
 	callchannel Music_DragonsDen_branch_eed2d
@@ -25,9 +24,8 @@ Music_DragonsDen_branch_eed03: ; eed03
 	note __, 10
 	notetype $c, $b7
 	loopchannel 0, Music_DragonsDen_branch_eed03
-; eed1e
 
-Music_DragonsDen_branch_eed1e: ; eed1e
+Music_DragonsDen_branch_eed1e:
 	octave 3
 	note A#, 12
 	note A_, 4
@@ -43,9 +41,8 @@ Music_DragonsDen_branch_eed1e: ; eed1e
 	octave 3
 	note G#, 16
 	endchannel
-; eed2d
 
-Music_DragonsDen_branch_eed2d: ; eed2d
+Music_DragonsDen_branch_eed2d:
 	intensity $b1
 	note __, 2
 	octave 4
@@ -60,14 +57,13 @@ Music_DragonsDen_branch_eed2d: ; eed2d
 	note C#, 2
 	note C#, 2
 	endchannel
-; eed3c
 
-Music_DragonsDen_Ch2: ; eed3c
+Music_DragonsDen_Ch2:
 	dutycycle $0
 	tone $0004
 	stereopanning $f
 	notetype $c, $90
-Music_DragonsDen_branch_eed46: ; eed46
+Music_DragonsDen_branch_eed46:
 	callchannel Music_DragonsDen_branch_eed5e
 	note __, 16
 	callchannel Music_DragonsDen_branch_eed6b
@@ -77,9 +73,8 @@ Music_DragonsDen_branch_eed46: ; eed46
 	note __, 16
 	notetype $c, $c7
 	loopchannel 0, Music_DragonsDen_branch_eed46
-; eed5e
 
-Music_DragonsDen_branch_eed5e: ; eed5e
+Music_DragonsDen_branch_eed5e:
 	octave 4
 	note D#, 12
 	note D_, 4
@@ -93,11 +88,10 @@ Music_DragonsDen_branch_eed5e: ; eed5e
 	note G_, 4
 	note C#, 16
 	endchannel
-; eed6b
 
-Music_DragonsDen_branch_eed6b: ; eed6b
+Music_DragonsDen_branch_eed6b:
 	intensity $c1
-Music_DragonsDen_branch_eed6d: ; eed6d
+Music_DragonsDen_branch_eed6d:
 	octave 5
 	note C#, 4
 	octave 4
@@ -106,10 +100,9 @@ Music_DragonsDen_branch_eed6d: ; eed6d
 	note G#, 4
 	loopchannel 2, Music_DragonsDen_branch_eed6d
 	endchannel
-; eed78
 
-Music_DragonsDen_Ch3: ; eed78
-Music_DragonsDen_branch_eed78: ; eed78
+Music_DragonsDen_Ch3:
+Music_DragonsDen_branch_eed78:
 	notetype $c, $14
 	octave 4
 	note C#, 2
@@ -136,7 +129,7 @@ Music_DragonsDen_branch_eed78: ; eed78
 	loopchannel 15, Music_DragonsDen_branch_eed78
 	note __, 16
 	notetype $6, $27
-Music_DragonsDen_branch_eed99: ; eed99
+Music_DragonsDen_branch_eed99:
 	octave 3
 	note C#, 4
 	octave 2
@@ -161,14 +154,13 @@ Music_DragonsDen_branch_eed99: ; eed99
 	note C#, 2
 	loopchannel 16, Music_DragonsDen_branch_eed99
 	loopchannel 0, Music_DragonsDen_branch_eed78
-; eedb7
 
-Music_DragonsDen_Ch4: ; eedb7
+Music_DragonsDen_Ch4:
 	togglenoise $0
 	notetype $c
 	note __, 16
 	note __, 16
-Music_DragonsDen_branch_eedbd: ; eedbd
+Music_DragonsDen_branch_eedbd:
 	stereopanning $f0
 	note F_, 4
 	stereopanning $f
@@ -177,4 +169,3 @@ Music_DragonsDen_branch_eedbd: ; eedbd
 	stereopanning $f0
 	note F#, 4
 	loopchannel 0, Music_DragonsDen_branch_eedbd
-; eedcb
diff --git a/audio/music/ecruteakcity.asm b/audio/music/ecruteakcity.asm
index 77b349295..df60e9eb0 100644
--- a/audio/music/ecruteakcity.asm
+++ b/audio/music/ecruteakcity.asm
@@ -1,16 +1,15 @@
-Music_EcruteakCity: ; ef2d0
+Music_EcruteakCity:
 	musicheader 3, 1, Music_EcruteakCity_Ch1
 	musicheader 1, 2, Music_EcruteakCity_Ch2
 	musicheader 1, 3, Music_EcruteakCity_Ch3
-; ef2d9
 
-Music_EcruteakCity_Ch1: ; ef2d9
+Music_EcruteakCity_Ch1:
 	tempo 197
 	volume $77
 	stereopanning $f
 	vibrato $12, $25
 	dutycycle $2
-Music_EcruteakCity_branch_ef2e5: ; ef2e5
+Music_EcruteakCity_branch_ef2e5:
 	notetype $c, $57
 	note __, 10
 	octave 4
@@ -145,9 +144,8 @@ Music_EcruteakCity_branch_ef2e5: ; ef2e5
 	note C_, 2
 	callchannel Music_EcruteakCity_branch_ef391
 	loopchannel 0, Music_EcruteakCity_branch_ef2e5
-; ef37f
 
-Music_EcruteakCity_branch_ef37f: ; ef37f
+Music_EcruteakCity_branch_ef37f:
 	octave 5
 	note E_, 2
 	note C_, 2
@@ -163,9 +161,8 @@ Music_EcruteakCity_branch_ef37f: ; ef37f
 	note C_, 2
 	loopchannel 2, Music_EcruteakCity_branch_ef37f
 	endchannel
-; ef391
 
-Music_EcruteakCity_branch_ef391: ; ef391
+Music_EcruteakCity_branch_ef391:
 	octave 5
 	note D_, 2
 	octave 4
@@ -211,7 +208,7 @@ Music_EcruteakCity_branch_ef391: ; ef391
 	note C_, 2
 	octave 3
 	note A_, 2
-Music_EcruteakCity_branch_ef3be: ; ef3be
+Music_EcruteakCity_branch_ef3be:
 	octave 4
 	note F_, 2
 	note A_, 2
@@ -227,7 +224,7 @@ Music_EcruteakCity_branch_ef3be: ; ef3be
 	note C_, 2
 	note F_, 2
 	loopchannel 2, Music_EcruteakCity_branch_ef3be
-Music_EcruteakCity_branch_ef3d0: ; ef3d0
+Music_EcruteakCity_branch_ef3d0:
 	octave 4
 	note G_, 2
 	note B_, 2
@@ -249,13 +246,12 @@ Music_EcruteakCity_branch_ef3d0: ; ef3d0
 	note G_, 16
 	dutycycle $2
 	endchannel
-; ef3eb
 
-Music_EcruteakCity_Ch2: ; ef3eb
+Music_EcruteakCity_Ch2:
 	vibrato $12, $25
 	dutycycle $3
 	stereopanning $f0
-Music_EcruteakCity_branch_ef3f2: ; ef3f2
+Music_EcruteakCity_branch_ef3f2:
 	notetype $6, $67
 	note __, 16
 	note __, 5
@@ -472,11 +468,10 @@ Music_EcruteakCity_branch_ef3f2: ; ef3f2
 	note D_, 2
 	note E_, 16
 	loopchannel 0, Music_EcruteakCity_branch_ef3f2
-; ef4e1
 
-Music_EcruteakCity_Ch3: ; ef4e1
+Music_EcruteakCity_Ch3:
 	stereopanning $ff
-Music_EcruteakCity_branch_ef4e3: ; ef4e3
+Music_EcruteakCity_branch_ef4e3:
 	vibrato $12, $25
 	notetype $c, $25
 	octave 3
@@ -598,9 +593,8 @@ Music_EcruteakCity_branch_ef4e3: ; ef4e3
 	note E_, 8
 	note D_, 8
 	loopchannel 0, Music_EcruteakCity_branch_ef4e3
-; ef569
 
-Music_EcruteakCity_branch_ef569: ; ef569
+Music_EcruteakCity_branch_ef569:
 	octave 3
 	note F_, 4
 	note __, 2
@@ -671,4 +665,3 @@ Music_EcruteakCity_branch_ef569: ; ef569
 	note __, 1
 	note B_, 1
 	endchannel
-; ef5b1
diff --git a/audio/music/elmslab.asm b/audio/music/elmslab.asm
index 39bf03a9b..38b04b590 100644
--- a/audio/music/elmslab.asm
+++ b/audio/music/elmslab.asm
@@ -1,11 +1,10 @@
-Music_ElmsLab: ; ea040
+Music_ElmsLab:
 	musicheader 4, 1, Music_ElmsLab_Ch1
 	musicheader 1, 2, Music_ElmsLab_Ch2
 	musicheader 1, 3, Music_ElmsLab_Ch3
 	musicheader 1, 4, Music_ElmsLab_Ch4
-; ea04c
 
-Music_ElmsLab_Ch1: ; ea04c
+Music_ElmsLab_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
@@ -34,7 +33,7 @@ Music_ElmsLab_Ch1: ; ea04c
 	note A_, 4
 	note A_, 4
 	note A_, 2
-Music_ElmsLab_branch_ea075: ; ea075
+Music_ElmsLab_branch_ea075:
 	note __, 2
 	note A_, 2
 	note G#, 2
@@ -182,9 +181,8 @@ Music_ElmsLab_branch_ea075: ; ea075
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea075
-; ea128
 
-Music_ElmsLab_Ch2: ; ea128
+Music_ElmsLab_Ch2:
 	dutycycle $3
 	vibrato $10, $26
 	stereopanning $f
@@ -214,7 +212,7 @@ Music_ElmsLab_Ch2: ; ea128
 	note C_, 4
 	note C_, 2
 	stereopanning $ff
-Music_ElmsLab_branch_ea14f: ; ea14f
+Music_ElmsLab_branch_ea14f:
 	intensity $c6
 	octave 4
 	note F_, 6
@@ -350,9 +348,8 @@ Music_ElmsLab_branch_ea14f: ; ea14f
 	octave 3
 	note E_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea14f
-; ea1fd
 
-Music_ElmsLab_Ch3: ; ea1fd
+Music_ElmsLab_Ch3:
 	stereopanning $f
 	notetype $c, $25
 	note __, 8
@@ -375,7 +372,7 @@ Music_ElmsLab_Ch3: ; ea1fd
 	note C_, 2
 	note D_, 2
 	note E_, 2
-Music_ElmsLab_branch_ea216: ; ea216
+Music_ElmsLab_branch_ea216:
 	note F_, 2
 	note A_, 2
 	note C_, 2
@@ -528,15 +525,13 @@ Music_ElmsLab_branch_ea216: ; ea216
 	note F_, 2
 	note A_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea216
-; ea2b1
 
-Music_ElmsLab_Ch4: ; ea2b1
+Music_ElmsLab_Ch4:
 	stereopanning $f0
 	togglenoise $0
 	notetype $c
 	note __, 16
 	note __, 2
-Music_ElmsLab_branch_ea2b9: ; ea2b9
+Music_ElmsLab_branch_ea2b9:
 	note G_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea2b9
-; ea2be
diff --git a/audio/music/evolution.asm b/audio/music/evolution.asm
index 61f7af716..47e115431 100644
--- a/audio/music/evolution.asm
+++ b/audio/music/evolution.asm
@@ -1,11 +1,10 @@
-Music_Evolution: ; f06e1
+Music_Evolution:
 	musicheader 4, 1, Music_Evolution_Ch1
 	musicheader 1, 2, Music_Evolution_Ch2
 	musicheader 1, 3, Music_Evolution_Ch3
 	musicheader 1, 4, Music_Evolution_Ch4
-; f06ed
 
-Music_Evolution_Ch1: ; f06ed
+Music_Evolution_Ch1:
 	tempo 132
 	volume $77
 	vibrato $6, $34
@@ -24,7 +23,7 @@ Music_Evolution_Ch1: ; f06ed
 	note __, 4
 	dutycycle $3
 	stereopanning $f
-Music_Evolution_branch_f0713: ; f0713
+Music_Evolution_branch_f0713:
 	callchannel Music_Evolution_branch_f0737
 	notetype $c, $a4
 	note F#, 4
@@ -39,9 +38,8 @@ Music_Evolution_branch_f0713: ; f0713
 	notetype $c, $a4
 	note G#, 4
 	loopchannel 0, Music_Evolution_branch_f0713
-; f0737
 
-Music_Evolution_branch_f0737: ; f0737
+Music_Evolution_branch_f0737:
 	notetype $c, $a2
 	octave 3
 	note C_, 4
@@ -52,9 +50,8 @@ Music_Evolution_branch_f0737: ; f0737
 	note G_, 4
 	note C_, 4
 	endchannel
-; f0743
 
-Music_Evolution_branch_f0743: ; f0743
+Music_Evolution_branch_f0743:
 	notetype $c, $a2
 	octave 3
 	note D_, 4
@@ -65,9 +62,8 @@ Music_Evolution_branch_f0743: ; f0743
 	note A_, 4
 	note D_, 4
 	endchannel
-; f074f
 
-Music_Evolution_Ch2: ; f074f
+Music_Evolution_Ch2:
 	dutycycle $2
 	vibrato $8, $25
 	notetype $c, $a2
@@ -79,7 +75,7 @@ Music_Evolution_Ch2: ; f074f
 	note __, 4
 	dutycycle $3
 	stereopanning $f0
-Music_Evolution_branch_f0761: ; f0761
+Music_Evolution_branch_f0761:
 	callchannel Music_Evolution_branch_f0787
 	notetype $c, $b5
 	note A_, 4
@@ -96,9 +92,8 @@ Music_Evolution_branch_f0761: ; f0761
 	note C#, 4
 	octave 3
 	loopchannel 0, Music_Evolution_branch_f0761
-; f0787
 
-Music_Evolution_branch_f0787: ; f0787
+Music_Evolution_branch_f0787:
 	notetype $c, $b2
 	octave 3
 	note G_, 4
@@ -109,9 +104,8 @@ Music_Evolution_branch_f0787: ; f0787
 	note D_, 4
 	note G_, 4
 	endchannel
-; f0793
 
-Music_Evolution_branch_f0793: ; f0793
+Music_Evolution_branch_f0793:
 	notetype $c, $b2
 	octave 3
 	note A_, 4
@@ -122,12 +116,11 @@ Music_Evolution_branch_f0793: ; f0793
 	note E_, 4
 	note A_, 4
 	endchannel
-; f079f
 
-Music_Evolution_Ch3: ; f079f
+Music_Evolution_Ch3:
 	notetype $c, $16
 	note __, 8
-Music_Evolution_branch_f07a3: ; f07a3
+Music_Evolution_branch_f07a3:
 	callchannel Music_Evolution_branch_f07bf
 	octave 3
 	note A_, 4
@@ -142,9 +135,8 @@ Music_Evolution_branch_f07a3: ; f07a3
 	octave 4
 	note C#, 4
 	loopchannel 0, Music_Evolution_branch_f07a3
-; f07bf
 
-Music_Evolution_branch_f07bf: ; f07bf
+Music_Evolution_branch_f07bf:
 	octave 2
 	note A_, 2
 	note __, 2
@@ -167,9 +159,8 @@ Music_Evolution_branch_f07bf: ; f07bf
 	note A_, 2
 	note __, 2
 	endchannel
-; f07d5
 
-Music_Evolution_branch_f07d5: ; f07d5
+Music_Evolution_branch_f07d5:
 	octave 2
 	note B_, 2
 	note __, 2
@@ -192,13 +183,12 @@ Music_Evolution_branch_f07d5: ; f07d5
 	note A_, 2
 	note __, 2
 	endchannel
-; f07eb
 
-Music_Evolution_Ch4: ; f07eb
+Music_Evolution_Ch4:
 	togglenoise $5
 	notetype $c
 	note __, 8
-Music_Evolution_branch_f07f0: ; f07f0
+Music_Evolution_branch_f07f0:
 	stereopanning $f0
 	note A#, 6
 	note A#, 4
@@ -207,4 +197,3 @@ Music_Evolution_branch_f07f0: ; f07f0
 	note E_, 2
 	note E_, 2
 	loopchannel 0, Music_Evolution_branch_f07f0
-; f07fd
diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm
index 844ceee2f..d275bc9a3 100644
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -1,17 +1,16 @@
-Music_GameCorner: ; edd6d
+Music_GameCorner:
 	musicheader 4, 1, Music_GameCorner_Ch1
 	musicheader 1, 2, Music_GameCorner_Ch2
 	musicheader 1, 3, Music_GameCorner_Ch3
 	musicheader 1, 4, Music_GameCorner_Ch4
-; edd79
 
-Music_GameCorner_Ch1: ; edd79
+Music_GameCorner_Ch1:
 	tempo 147
 	volume $77
 	stereopanning $f
 	notetype $c, $91
 	note __, 8
-Music_GameCorner_branch_edd84: ; edd84
+Music_GameCorner_branch_edd84:
 	intensity $91
 	note __, 16
 	note __, 16
@@ -39,7 +38,7 @@ Music_GameCorner_branch_edd84: ; edd84
 	note G#, 2
 	note G_, 2
 	intensity $71
-Music_GameCorner_branch_eddb1: ; eddb1
+Music_GameCorner_branch_eddb1:
 	octave 4
 	note G#, 1
 	octave 5
@@ -47,7 +46,7 @@ Music_GameCorner_branch_eddb1: ; eddb1
 	note F_, 1
 	note C_, 1
 	loopchannel 4, Music_GameCorner_branch_eddb1
-Music_GameCorner_branch_eddbb: ; eddbb
+Music_GameCorner_branch_eddbb:
 	octave 4
 	note A#, 1
 	octave 5
@@ -55,7 +54,7 @@ Music_GameCorner_branch_eddbb: ; eddbb
 	note G_, 1
 	note D_, 1
 	loopchannel 4, Music_GameCorner_branch_eddbb
-Music_GameCorner_branch_eddc5: ; eddc5
+Music_GameCorner_branch_eddc5:
 	octave 4
 	note D#, 1
 	note G_, 1
@@ -64,7 +63,7 @@ Music_GameCorner_branch_eddc5: ; eddc5
 	octave 4
 	note G_, 1
 	loopchannel 4, Music_GameCorner_branch_eddc5
-Music_GameCorner_branch_eddd0: ; eddd0
+Music_GameCorner_branch_eddd0:
 	octave 4
 	note F_, 1
 	note A_, 1
@@ -73,7 +72,7 @@ Music_GameCorner_branch_eddd0: ; eddd0
 	octave 4
 	note A_, 1
 	loopchannel 4, Music_GameCorner_branch_eddd0
-Music_GameCorner_branch_edddb: ; edddb
+Music_GameCorner_branch_edddb:
 	octave 4
 	note G#, 1
 	octave 5
@@ -81,7 +80,7 @@ Music_GameCorner_branch_edddb: ; edddb
 	note F_, 1
 	note C_, 1
 	loopchannel 4, Music_GameCorner_branch_edddb
-Music_GameCorner_branch_edde5: ; edde5
+Music_GameCorner_branch_edde5:
 	octave 4
 	note A#, 1
 	octave 5
@@ -89,7 +88,7 @@ Music_GameCorner_branch_edde5: ; edde5
 	note G_, 1
 	note D_, 1
 	loopchannel 4, Music_GameCorner_branch_edde5
-Music_GameCorner_branch_eddef: ; eddef
+Music_GameCorner_branch_eddef:
 	octave 4
 	note B_, 1
 	octave 5
@@ -104,9 +103,8 @@ Music_GameCorner_branch_eddef: ; eddef
 	note F_, 2
 	note F_, 9
 	loopchannel 0, Music_GameCorner_branch_edd84
-; ede03
 
-Music_GameCorner_branch_ede03: ; ede03
+Music_GameCorner_branch_ede03:
 	note __, 2
 	octave 4
 	note A#, 3
@@ -123,9 +121,8 @@ Music_GameCorner_branch_ede03: ; ede03
 	note G#, 1
 	note A#, 3
 	endchannel
-; ede13
 
-Music_GameCorner_branch_ede13: ; ede13
+Music_GameCorner_branch_ede13:
 	note __, 2
 	octave 4
 	note A#, 3
@@ -135,14 +132,13 @@ Music_GameCorner_branch_ede13: ; ede13
 	note F_, 3
 	note F_, 2
 	endchannel
-; ede1c
 
-Music_GameCorner_Ch2: ; ede1c
+Music_GameCorner_Ch2:
 	stereopanning $ff
 	vibrato $8, $24
 	notetype $c, $a1
 	note __, 8
-Music_GameCorner_branch_ede25: ; ede25
+Music_GameCorner_branch_ede25:
 	intensity $92
 	dutycycle $1
 	callchannel Music_GameCorner_branch_ede75
@@ -207,9 +203,8 @@ Music_GameCorner_branch_ede25: ; ede25
 	note A#, 9
 	intensity $a4
 	loopchannel 0, Music_GameCorner_branch_ede25
-; ede75
 
-Music_GameCorner_branch_ede75: ; ede75
+Music_GameCorner_branch_ede75:
 	octave 1
 	note C_, 2
 	octave 3
@@ -319,13 +314,12 @@ Music_GameCorner_branch_ede75: ; ede75
 	note D_, 2
 	note D#, 2
 	endchannel
-; edee8
 
-Music_GameCorner_Ch3: ; edee8
+Music_GameCorner_Ch3:
 	vibrato $8, $22
 	notetype $c, $14
 	note __, 8
-Music_GameCorner_branch_edeef: ; edeef
+Music_GameCorner_branch_edeef:
 	stereopanning $ff
 	notetype $c, $14
 	callchannel Music_GameCorner_branch_edfdd
@@ -504,9 +498,8 @@ Music_GameCorner_branch_edeef: ; edeef
 	note E_, 1
 	note D_, 1
 	loopchannel 0, Music_GameCorner_branch_edeef
-; edfdd
 
-Music_GameCorner_branch_edfdd: ; edfdd
+Music_GameCorner_branch_edfdd:
 	octave 2
 	note C_, 1
 	octave 3
@@ -534,9 +527,8 @@ Music_GameCorner_branch_edfdd: ; edfdd
 	octave 4
 	note A_, 2
 	endchannel
-; edff8
 
-Music_GameCorner_branch_edff8: ; edff8
+Music_GameCorner_branch_edff8:
 	octave 2
 	note C_, 1
 	octave 3
@@ -557,9 +549,8 @@ Music_GameCorner_branch_edff8: ; edff8
 	note A_, 1
 	note __, 1
 	endchannel
-; ee00c
 
-Music_GameCorner_branch_ee00c: ; ee00c
+Music_GameCorner_branch_ee00c:
 	octave 2
 	note F_, 1
 	octave 3
@@ -584,9 +575,8 @@ Music_GameCorner_branch_ee00c: ; ee00c
 	note C_, 1
 	note D_, 3
 	endchannel
-; ee024
 
-Music_GameCorner_branch_ee024: ; ee024
+Music_GameCorner_branch_ee024:
 	octave 2
 	note F_, 1
 	octave 3
@@ -614,9 +604,8 @@ Music_GameCorner_branch_ee024: ; ee024
 	note F_, 1
 	note __, 1
 	endchannel
-; ee03f
 
-Music_GameCorner_branch_ee03f: ; ee03f
+Music_GameCorner_branch_ee03f:
 	octave 2
 	note F_, 2
 	note __, 1
@@ -665,9 +654,8 @@ Music_GameCorner_branch_ee03f: ; ee03f
 	octave 3
 	note D_, 1
 	endchannel
-; ee06f
 
-Music_GameCorner_Ch4: ; ee06f
+Music_GameCorner_Ch4:
 	togglenoise $3
 	notetype $c
 	notetype $8
@@ -680,9 +668,9 @@ Music_GameCorner_Ch4: ; ee06f
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_GameCorner_branch_ee07f: ; ee07f
+Music_GameCorner_branch_ee07f:
 	callchannel Music_GameCorner_branch_ee106
-Music_GameCorner_branch_ee082: ; ee082
+Music_GameCorner_branch_ee082:
 	note A#, 2
 	note F#, 2
 	note D_, 2
@@ -693,7 +681,7 @@ Music_GameCorner_branch_ee082: ; ee082
 	note F#, 2
 	loopchannel 6, Music_GameCorner_branch_ee082
 	callchannel Music_GameCorner_branch_ee10f
-Music_GameCorner_branch_ee091: ; ee091
+Music_GameCorner_branch_ee091:
 	note A#, 2
 	note F#, 2
 	note D_, 2
@@ -708,7 +696,7 @@ Music_GameCorner_branch_ee091: ; ee091
 	note D_, 1
 	note F#, 2
 	callchannel Music_GameCorner_branch_ee106
-Music_GameCorner_branch_ee0a4: ; ee0a4
+Music_GameCorner_branch_ee0a4:
 	note A#, 2
 	note F#, 2
 	note D_, 2
@@ -719,7 +707,7 @@ Music_GameCorner_branch_ee0a4: ; ee0a4
 	note F#, 2
 	loopchannel 6, Music_GameCorner_branch_ee0a4
 	callchannel Music_GameCorner_branch_ee10f
-Music_GameCorner_branch_ee0b3: ; ee0b3
+Music_GameCorner_branch_ee0b3:
 	note A#, 2
 	note F#, 2
 	note D_, 2
@@ -739,7 +727,7 @@ Music_GameCorner_branch_ee0b3: ; ee0b3
 	note D_, 1
 	note D_, 1
 	note D_, 1
-Music_GameCorner_branch_ee0c9: ; ee0c9
+Music_GameCorner_branch_ee0c9:
 	note A#, 2
 	note F#, 1
 	note D#, 1
@@ -768,7 +756,7 @@ Music_GameCorner_branch_ee0c9: ; ee0c9
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_GameCorner_branch_ee0e8: ; ee0e8
+Music_GameCorner_branch_ee0e8:
 	note A#, 2
 	note F#, 1
 	note D#, 1
@@ -793,9 +781,8 @@ Music_GameCorner_branch_ee0e8: ; ee0e8
 	note D_, 1
 	note D#, 2
 	loopchannel 0, Music_GameCorner_branch_ee07f
-; ee106
 
-Music_GameCorner_branch_ee106: ; ee106
+Music_GameCorner_branch_ee106:
 	note C_, 2
 	note F#, 2
 	note D_, 2
@@ -805,9 +792,8 @@ Music_GameCorner_branch_ee106: ; ee106
 	note D_, 2
 	note F#, 2
 	endchannel
-; ee10f
 
-Music_GameCorner_branch_ee10f: ; ee10f
+Music_GameCorner_branch_ee10f:
 	note A#, 2
 	note F#, 2
 	note D_, 2
@@ -818,4 +804,3 @@ Music_GameCorner_branch_ee10f: ; ee10f
 	note D_, 1
 	note F#, 2
 	endchannel
-; ee119
diff --git a/audio/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm
index d7318310e..42f861e3f 100644
--- a/audio/music/goldenrodcity.asm
+++ b/audio/music/goldenrodcity.asm
@@ -1,11 +1,10 @@
-Music_GoldenrodCity: ; eb453
+Music_GoldenrodCity:
 	musicheader 4, 1, Music_GoldenrodCity_Ch1
 	musicheader 1, 2, Music_GoldenrodCity_Ch2
 	musicheader 1, 3, Music_GoldenrodCity_Ch3
 	musicheader 1, 4, Music_GoldenrodCity_Ch4
-; eb45f
 
-Music_GoldenrodCity_Ch1: ; eb45f
+Music_GoldenrodCity_Ch1:
 	stereopanning $f
 	tempo 176
 	volume $77
@@ -14,7 +13,7 @@ Music_GoldenrodCity_Ch1: ; eb45f
 	note __, 16
 	note __, 16
 	note __, 16
-Music_GoldenrodCity_branch_eb46d: ; eb46d
+Music_GoldenrodCity_branch_eb46d:
 	dutycycle $0
 	callchannel Music_GoldenrodCity_branch_eb4a9
 	octave 3
@@ -56,9 +55,8 @@ Music_GoldenrodCity_branch_eb46d: ; eb46d
 	octave 4
 	note C_, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb46d
-; eb4a9
 
-Music_GoldenrodCity_branch_eb4a9: ; eb4a9
+Music_GoldenrodCity_branch_eb4a9:
 	octave 4
 	note C#, 2
 	octave 3
@@ -99,9 +97,8 @@ Music_GoldenrodCity_branch_eb4a9: ; eb4a9
 	octave 4
 	note C#, 2
 	endchannel
-; eb4d1
 
-Music_GoldenrodCity_branch_eb4d1: ; eb4d1
+Music_GoldenrodCity_branch_eb4d1:
 	octave 4
 	note F_, 1
 	note C#, 1
@@ -174,14 +171,13 @@ Music_GoldenrodCity_branch_eb4d1: ; eb4d1
 	note D#, 1
 	note F#, 1
 	endchannel
-; eb519
 
-Music_GoldenrodCity_Ch2: ; eb519
+Music_GoldenrodCity_Ch2:
 	stereopanning $f0
 	vibrato $12, $23
 	dutycycle $2
 	notetype $c, $97
-Music_GoldenrodCity_branch_eb523: ; eb523
+Music_GoldenrodCity_branch_eb523:
 	intensity $97
 	callchannel Music_GoldenrodCity_branch_eb555
 	octave 4
@@ -216,9 +212,8 @@ Music_GoldenrodCity_branch_eb523: ; eb523
 	octave 4
 	note G#, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb523
-; eb555
 
-Music_GoldenrodCity_branch_eb555: ; eb555
+Music_GoldenrodCity_branch_eb555:
 	octave 4
 	note F_, 4
 	note C#, 4
@@ -247,9 +242,8 @@ Music_GoldenrodCity_branch_eb555: ; eb555
 	note F#, 2
 	dutycycle $1
 	endchannel
-; eb572
 
-Music_GoldenrodCity_branch_eb572: ; eb572
+Music_GoldenrodCity_branch_eb572:
 	note C#, 6
 	note F_, 6
 	note C#, 4
@@ -268,13 +262,12 @@ Music_GoldenrodCity_branch_eb572: ; eb572
 	note C_, 4
 	note D#, 2
 	endchannel
-; eb584
 
-Music_GoldenrodCity_Ch3: ; eb584
+Music_GoldenrodCity_Ch3:
 	stereopanning $ff
 	vibrato $8, $23
 	notetype $c, $25
-Music_GoldenrodCity_branch_eb58c: ; eb58c
+Music_GoldenrodCity_branch_eb58c:
 	callchannel Music_GoldenrodCity_branch_eb5aa
 	callchannel Music_GoldenrodCity_branch_eb5aa
 	callchannel Music_GoldenrodCity_branch_eb5d2
@@ -294,9 +287,8 @@ Music_GoldenrodCity_branch_eb58c: ; eb58c
 	octave 2
 	note G#, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb58c
-; eb5aa
 
-Music_GoldenrodCity_branch_eb5aa: ; eb5aa
+Music_GoldenrodCity_branch_eb5aa:
 	octave 3
 	note C#, 4
 	note __, 2
@@ -337,9 +329,8 @@ Music_GoldenrodCity_branch_eb5aa: ; eb5aa
 	note G#, 1
 	note __, 1
 	endchannel
-; eb5d2
 
-Music_GoldenrodCity_branch_eb5d2: ; eb5d2
+Music_GoldenrodCity_branch_eb5d2:
 	note C#, 1
 	note __, 1
 	octave 4
@@ -392,9 +383,8 @@ Music_GoldenrodCity_branch_eb5d2: ; eb5d2
 	note __, 2
 	note G#, 1
 	endchannel
-; eb606
 
-Music_GoldenrodCity_Ch4: ; eb606
+Music_GoldenrodCity_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 16
@@ -406,7 +396,7 @@ Music_GoldenrodCity_Ch4: ; eb606
 	note D_, 1
 	note D_, 1
 	note F#, 2
-Music_GoldenrodCity_branch_eb613: ; eb613
+Music_GoldenrodCity_branch_eb613:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -447,7 +437,7 @@ Music_GoldenrodCity_branch_eb613: ; eb613
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_GoldenrodCity_branch_eb650: ; eb650
+Music_GoldenrodCity_branch_eb650:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -459,9 +449,8 @@ Music_GoldenrodCity_branch_eb650: ; eb650
 	loopchannel 3, Music_GoldenrodCity_branch_eb650
 	callchannel Music_GoldenrodCity_branch_eb663
 	loopchannel 0, Music_GoldenrodCity_branch_eb613
-; eb663
 
-Music_GoldenrodCity_branch_eb663: ; eb663
+Music_GoldenrodCity_branch_eb663:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -472,9 +461,8 @@ Music_GoldenrodCity_branch_eb663: ; eb663
 	note D_, 1
 	note F#, 2
 	endchannel
-; eb66d
 
-Music_GoldenrodCity_branch_eb66d: ; eb66d
+Music_GoldenrodCity_branch_eb66d:
 	note D#, 2
 	note D_, 1
 	note D#, 3
@@ -484,4 +472,3 @@ Music_GoldenrodCity_branch_eb66d: ; eb66d
 	note G_, 1
 	note G_, 1
 	endchannel
-; eb676
diff --git a/audio/music/goldsilveropening.asm b/audio/music/goldsilveropening.asm
index 9c677f47b..a9359f009 100644
--- a/audio/music/goldsilveropening.asm
+++ b/audio/music/goldsilveropening.asm
@@ -1,10 +1,9 @@
-Music_GoldSilverOpening: ; f7055
+Music_GoldSilverOpening:
 	musicheader 3, 1, Music_GoldSilverOpening_Ch1
 	musicheader 1, 2, Music_GoldSilverOpening_Ch2
 	musicheader 1, 3, Music_GoldSilverOpening_Ch3
-; f705e
 
-Music_GoldSilverOpening_Ch1: ; f705e
+Music_GoldSilverOpening_Ch1:
 	tempo 256
 	volume $77
 	tone $0001
@@ -128,9 +127,8 @@ Music_GoldSilverOpening_Ch1: ; f705e
 	note G_, 2
 	note A_, 16
 	endchannel
-; f70f8
 
-Music_GoldSilverOpening_Ch2: ; f70f8
+Music_GoldSilverOpening_Ch2:
 	tone $0001
 	stereopanning $f
 	notetype $c, $b7
@@ -309,9 +307,8 @@ Music_GoldSilverOpening_Ch2: ; f70f8
 	note C_, 4
 	note D#, 16
 	endchannel
-; f71c8
 
-Music_GoldSilverOpening_Ch3: ; f71c8
+Music_GoldSilverOpening_Ch3:
 	notetype $6, $10
 	octave 2
 	note D_, 4
@@ -616,4 +613,3 @@ Music_GoldSilverOpening_Ch3: ; f71c8
 	note C_, 1
 	note __, 13
 	endchannel
-; f7308
diff --git a/audio/music/goldsilveropening2.asm b/audio/music/goldsilveropening2.asm
index 90b9b511c..2dc43e3b7 100644
--- a/audio/music/goldsilveropening2.asm
+++ b/audio/music/goldsilveropening2.asm
@@ -1,11 +1,10 @@
-Music_GoldSilverOpening2: ; f7308
+Music_GoldSilverOpening2:
 	musicheader 4, 1, Music_GoldSilverOpening2_Ch1
 	musicheader 1, 2, Music_GoldSilverOpening2_Ch2
 	musicheader 1, 3, Music_GoldSilverOpening2_Ch3
 	musicheader 1, 4, Music_GoldSilverOpening2_Ch4
-; f7314
 
-Music_GoldSilverOpening2_Ch1: ; f7314
+Music_GoldSilverOpening2_Ch1:
 	tempo 92
 	volume $77
 	dutycycle $3
@@ -14,7 +13,7 @@ Music_GoldSilverOpening2_Ch1: ; f7314
 	notetype $c, $3d
 	octave 3
 	note D#, 8
-Music_GoldSilverOpening2_branch_f7325: ; f7325
+Music_GoldSilverOpening2_branch_f7325:
 	notetype $c, $c1
 	octave 3
 	note D_, 2
@@ -52,9 +51,8 @@ Music_GoldSilverOpening2_branch_f7325: ; f7325
 	octave 4
 	note D_, 16
 	endchannel
-; f7358
 
-Music_GoldSilverOpening2_Ch2: ; f7358
+Music_GoldSilverOpening2_Ch2:
 	dutycycle $3
 	vibrato $14, $14
 	stereopanning $f0
@@ -105,9 +103,8 @@ Music_GoldSilverOpening2_Ch2: ; f7358
 	intensity $c2
 	note D_, 16
 	endchannel
-; f739c
 
-Music_GoldSilverOpening2_Ch3: ; f739c
+Music_GoldSilverOpening2_Ch3:
 	notetype $c, $17
 	note __, 8
 	octave 2
@@ -184,9 +181,8 @@ Music_GoldSilverOpening2_Ch3: ; f739c
 	note D_, 2
 	note __, 14
 	endchannel
-; f73ea
 
-Music_GoldSilverOpening2_Ch4: ; f73ea
+Music_GoldSilverOpening2_Ch4:
 	togglenoise $0
 	notetype $6
 	note D#, 2
@@ -198,7 +194,7 @@ Music_GoldSilverOpening2_Ch4: ; f73ea
 	note D_, 2
 	note D_, 2
 	notetype $c
-Music_GoldSilverOpening2_branch_f73f8: ; f73f8
+Music_GoldSilverOpening2_branch_f73f8:
 	note D_, 2
 	note D_, 2
 	note D_, 2
@@ -219,4 +215,3 @@ Music_GoldSilverOpening2_branch_f73f8: ; f73f8
 	loopchannel 4, Music_GoldSilverOpening2_branch_f73f8
 	note C_, 16
 	endchannel
-; f7411
diff --git a/audio/music/gym.asm b/audio/music/gym.asm
index 89c145724..acb944adf 100644
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -1,18 +1,17 @@
-Music_Gym: ; f48ae
+Music_Gym:
 	musicheader 4, 1, Music_Gym_Ch1
 	musicheader 1, 2, Music_Gym_Ch2
 	musicheader 1, 3, Music_Gym_Ch3
 	musicheader 1, 4, Music_Gym_Ch4
-; f48ba
 
-Music_Gym_Ch1: ; f48ba
+Music_Gym_Ch1:
 	tempo 156
 	volume $77
 	stereopanning $f
 	vibrato $12, $24
 	dutycycle $1
 	notetype $c, $b7
-Music_Gym_branch_f48c9: ; f48c9
+Music_Gym_branch_f48c9:
 	octave 4
 	note F#, 2
 	octave 2
@@ -189,12 +188,11 @@ Music_Gym_branch_f48c9: ; f48c9
 	note F#, 1
 	note E_, 1
 	loopchannel 0, Music_Gym_branch_f48c9
-; f497c
 
-Music_Gym_Ch2: ; f497c
+Music_Gym_Ch2:
 	dutycycle $1
 	stereopanning $f0
-Music_Gym_branch_f4980: ; f4980
+Music_Gym_branch_f4980:
 	notetype $c, $c3
 	octave 2
 	note D_, 2
@@ -286,9 +284,8 @@ Music_Gym_branch_f4980: ; f4980
 	note F#, 2
 	note D_, 2
 	loopchannel 0, Music_Gym_branch_f4980
-; f49e9
 
-Music_Gym_branch_f49e9: ; f49e9
+Music_Gym_branch_f49e9:
 	octave 3
 	note D_, 3
 	octave 2
@@ -333,9 +330,8 @@ Music_Gym_branch_f49e9: ; f49e9
 	note C_, 1
 	note C_, 2
 	endchannel
-; f4a15
 
-Music_Gym_branch_f4a15: ; f4a15
+Music_Gym_branch_f4a15:
 	octave 2
 	note D_, 4
 	note D_, 2
@@ -370,12 +366,11 @@ Music_Gym_branch_f4a15: ; f4a15
 	note F#, 1
 	note F#, 1
 	endchannel
-; f4a37
 
-Music_Gym_Ch3: ; f4a37
+Music_Gym_Ch3:
 	vibrato $14, $23
 	stereopanning $ff
-Music_Gym_branch_f4a3c: ; f4a3c
+Music_Gym_branch_f4a3c:
 	notetype $c, $14
 	octave 6
 	note D_, 2
@@ -485,9 +480,8 @@ Music_Gym_branch_f4a3c: ; f4a3c
 	note F#, 8
 	note E_, 4
 	loopchannel 0, Music_Gym_branch_f4a3c
-; f4ab3
 
-Music_Gym_branch_f4ab3: ; f4ab3
+Music_Gym_branch_f4ab3:
 	octave 5
 	note A_, 6
 	octave 6
@@ -506,11 +500,10 @@ Music_Gym_branch_f4ab3: ; f4ab3
 	note G_, 1
 	note A_, 4
 	endchannel
-; f4ac5
 
-Music_Gym_Ch4: ; f4ac5
+Music_Gym_Ch4:
 	togglenoise $4
-Music_Gym_branch_f4ac7: ; f4ac7
+Music_Gym_branch_f4ac7:
 	notetype $c
 	note D_, 2
 	note C#, 1
@@ -535,7 +528,7 @@ Music_Gym_branch_f4ac7: ; f4ac7
 	note D_, 1
 	note D_, 1
 	notetype $6
-Music_Gym_branch_f4ae1: ; f4ae1
+Music_Gym_branch_f4ae1:
 	note D_, 6
 	note D_, 6
 	note D_, 4
@@ -558,7 +551,7 @@ Music_Gym_branch_f4ae1: ; f4ae1
 	note D_, 4
 	note B_, 8
 	loopchannel 4, Music_Gym_branch_f4ae1
-Music_Gym_branch_f4afa: ; f4afa
+Music_Gym_branch_f4afa:
 	note D#, 4
 	note F#, 4
 	note D_, 4
@@ -571,4 +564,3 @@ Music_Gym_branch_f4afa: ; f4afa
 	note F#, 4
 	loopchannel 8, Music_Gym_branch_f4afa
 	loopchannel 0, Music_Gym_branch_f4ac7
-; f4b0c
diff --git a/audio/music/gymleadervictory.asm b/audio/music/gymleadervictory.asm
index 28ef43192..d6a1a36ee 100644
--- a/audio/music/gymleadervictory.asm
+++ b/audio/music/gymleadervictory.asm
@@ -1,11 +1,10 @@
-Music_GymLeaderVictory: ; f462c
+Music_GymLeaderVictory:
 	musicheader 4, 1, Music_GymLeaderVictory_Ch1
 	musicheader 1, 2, Music_GymLeaderVictory_Ch2
 	musicheader 1, 3, Music_GymLeaderVictory_Ch3
 	musicheader 1, 4, Music_GymLeaderVictory_Ch4
-; f4638
 
-Music_GymLeaderVictory_Ch1: ; f4638
+Music_GymLeaderVictory_Ch1:
 	tempo 116
 	volume $77
 	vibrato $12, $34
@@ -27,7 +26,7 @@ Music_GymLeaderVictory_Ch1: ; f4638
 	octave 5
 	note D_, 8
 	stereopanning $f
-Music_GymLeaderVictory_branch_f4658: ; f4658
+Music_GymLeaderVictory_branch_f4658:
 	dutycycle $1
 	callchannel Music_GymLeaderVictory_branch_f4689
 	octave 4
@@ -59,9 +58,8 @@ Music_GymLeaderVictory_branch_f4658: ; f4658
 	intensity $87
 	note F#, 16
 	loopchannel 0, Music_GymLeaderVictory_branch_f4658
-; f4689
 
-Music_GymLeaderVictory_branch_f4689: ; f4689
+Music_GymLeaderVictory_branch_f4689:
 	intensity $91
 	octave 3
 	note F#, 2
@@ -84,9 +82,8 @@ Music_GymLeaderVictory_branch_f4689: ; f4689
 	note G_, 1
 	note D_, 1
 	endchannel
-; f46a0
 
-Music_GymLeaderVictory_branch_f46a0: ; f46a0
+Music_GymLeaderVictory_branch_f46a0:
 	intensity $87
 	octave 3
 	note F#, 14
@@ -115,9 +112,8 @@ Music_GymLeaderVictory_branch_f46a0: ; f46a0
 	note C#, 1
 	note E_, 8
 	endchannel
-; f46bd
 
-Music_GymLeaderVictory_Ch2: ; f46bd
+Music_GymLeaderVictory_Ch2:
 	vibrato $12, $34
 	dutycycle $3
 	notetype $c, $d7
@@ -132,7 +128,7 @@ Music_GymLeaderVictory_Ch2: ; f46bd
 	octave 5
 	note D_, 1
 	note F#, 16
-Music_GymLeaderVictory_branch_f46d0: ; f46d0
+Music_GymLeaderVictory_branch_f46d0:
 	dutycycle $3
 	intensity $a1
 	callchannel Music_GymLeaderVictory_branch_f4711
@@ -175,9 +171,8 @@ Music_GymLeaderVictory_branch_f46d0: ; f46d0
 	octave 5
 	note C#, 1
 	loopchannel 0, Music_GymLeaderVictory_branch_f46d0
-; f4711
 
-Music_GymLeaderVictory_branch_f4711: ; f4711
+Music_GymLeaderVictory_branch_f4711:
 	octave 5
 	note D_, 2
 	note C#, 2
@@ -193,9 +188,8 @@ Music_GymLeaderVictory_branch_f4711: ; f4711
 	note G_, 2
 	note F#, 2
 	endchannel
-; f4720
 
-Music_GymLeaderVictory_branch_f4720: ; f4720
+Music_GymLeaderVictory_branch_f4720:
 	intensity $98
 	note A_, 6
 	note F#, 1
@@ -218,9 +212,8 @@ Music_GymLeaderVictory_branch_f4720: ; f4720
 	note C#, 8
 	note C#, 8
 	endchannel
-; f4737
 
-Music_GymLeaderVictory_Ch3: ; f4737
+Music_GymLeaderVictory_Ch3:
 	notetype $c, $25
 	octave 3
 	note F#, 16
@@ -231,7 +224,7 @@ Music_GymLeaderVictory_Ch3: ; f4737
 	octave 3
 	note C#, 2
 	stereopanning $f0
-Music_GymLeaderVictory_branch_f4744: ; f4744
+Music_GymLeaderVictory_branch_f4744:
 	note D_, 2
 	note __, 4
 	octave 2
@@ -312,9 +305,8 @@ Music_GymLeaderVictory_branch_f4744: ; f4744
 	octave 3
 	note C#, 2
 	loopchannel 0, Music_GymLeaderVictory_branch_f4744
-; f479e
 
-Music_GymLeaderVictory_branch_f479e: ; f479e
+Music_GymLeaderVictory_branch_f479e:
 	octave 3
 	note D_, 2
 	note __, 2
@@ -386,14 +378,13 @@ Music_GymLeaderVictory_branch_f479e: ; f479e
 	octave 2
 	note A_, 2
 	endchannel
-; f47e5
 
-Music_GymLeaderVictory_Ch4: ; f47e5
+Music_GymLeaderVictory_Ch4:
 	togglenoise $4
 	notetype $c
 	note B_, 16
 	note B_, 16
-Music_GymLeaderVictory_branch_f47eb: ; f47eb
+Music_GymLeaderVictory_branch_f47eb:
 	callchannel Music_GymLeaderVictory_branch_f480b
 	note D#, 6
 	note D#, 2
@@ -406,7 +397,7 @@ Music_GymLeaderVictory_branch_f47eb: ; f47eb
 	note C#, 1
 	note C#, 1
 	note C#, 1
-Music_GymLeaderVictory_branch_f47fb: ; f47fb
+Music_GymLeaderVictory_branch_f47fb:
 	note D#, 2
 	note G_, 2
 	note D_, 2
@@ -417,9 +408,8 @@ Music_GymLeaderVictory_branch_f47fb: ; f47fb
 	note G_, 2
 	loopchannel 16, Music_GymLeaderVictory_branch_f47fb
 	loopchannel 0, Music_GymLeaderVictory_branch_f47eb
-; f480b
 
-Music_GymLeaderVictory_branch_f480b: ; f480b
+Music_GymLeaderVictory_branch_f480b:
 	note D#, 6
 	note D#, 2
 	note D#, 4
@@ -427,4 +417,3 @@ Music_GymLeaderVictory_branch_f480b: ; f480b
 	note D#, 2
 	loopchannel 3, Music_GymLeaderVictory_branch_f480b
 	endchannel
-; f4815
diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm
index 8abc46f7b..2f4c444d7 100644
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -1,11 +1,10 @@
-Music_HallOfFame: ; f05bf
+Music_HallOfFame:
 	musicheader 4, 1, Music_HallOfFame_Ch1
 	musicheader 1, 2, Music_HallOfFame_Ch2
 	musicheader 1, 3, Music_HallOfFame_Ch3
 	musicheader 1, 4, Music_HallOfFame_Ch4
-; f05cb
 
-Music_HallOfFame_Ch1: ; f05cb
+Music_HallOfFame_Ch1:
 	tempo 112
 	volume $77
 	dutycycle $2
@@ -22,7 +21,7 @@ Music_HallOfFame_Ch1: ; f05cb
 	note E_, 1
 	note F_, 1
 	note F#, 1
-Music_HallOfFame_branch_f05e6: ; f05e6
+Music_HallOfFame_branch_f05e6:
 	intensity $97
 	octave 4
 	note C_, 8
@@ -46,12 +45,11 @@ Music_HallOfFame_branch_f05e6: ; f05e6
 	note __, 16
 	note __, 16
 	loopchannel 0, Music_HallOfFame_branch_f05e6
-; f060b
 
-Music_HallOfFame_Ch2: ; f060b
+Music_HallOfFame_Ch2:
 	vibrato $8, $25
 	dutycycle $3
-Music_HallOfFame_branch_f0610: ; f0610
+Music_HallOfFame_branch_f0610:
 	notetype $c, $c4
 	octave 3
 	note G_, 2
@@ -77,12 +75,11 @@ Music_HallOfFame_branch_f0610: ; f0610
 	note A_, 4
 	note F_, 2
 	loopchannel 0, Music_HallOfFame_branch_f0610
-; f062e
 
-Music_HallOfFame_Ch3: ; f062e
-Music_HallOfFame_branch_f062e: ; f062e
+Music_HallOfFame_Ch3:
+Music_HallOfFame_branch_f062e:
 	notetype $c, $28
-Music_HallOfFame_branch_f0631: ; f0631
+Music_HallOfFame_branch_f0631:
 	octave 3
 	note D_, 2
 	note G_, 2
@@ -137,9 +134,8 @@ Music_HallOfFame_branch_f0631: ; f0631
 	note E_, 4
 	note G_, 4
 	loopchannel 0, Music_HallOfFame_branch_f062e
-; f066d
 
-Music_HallOfFame_Ch4: ; f066d
+Music_HallOfFame_Ch4:
 	togglenoise $5
 	notetype $c
 	note __, 16
@@ -147,7 +143,7 @@ Music_HallOfFame_Ch4: ; f066d
 	note __, 16
 	note __, 16
 	notetype $6
-Music_HallOfFame_branch_f0677: ; f0677
+Music_HallOfFame_branch_f0677:
 	stereopanning $f
 	note A#, 4
 	note A#, 8
@@ -174,4 +170,3 @@ Music_HallOfFame_branch_f0677: ; f0677
 	note A#, 1
 	note A#, 1
 	loopchannel 0, Music_HallOfFame_branch_f0677
-; f0697
diff --git a/audio/music/healpokemon.asm b/audio/music/healpokemon.asm
index 264d3db78..6de58bc5c 100644
--- a/audio/music/healpokemon.asm
+++ b/audio/music/healpokemon.asm
@@ -1,10 +1,9 @@
-Music_HealPokemon: ; f0697
+Music_HealPokemon:
 	musicheader 3, 1, Music_HealPokemon_Ch1
 	musicheader 1, 2, Music_HealPokemon_Ch2
 	musicheader 1, 3, Music_HealPokemon_Ch3
-; f06a0
 
-Music_HealPokemon_Ch1: ; f06a0
+Music_HealPokemon_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $2
@@ -23,9 +22,8 @@ Music_HealPokemon_Ch1: ; f06a0
 	slidepitchto 1, 4, __
 	note B_, 4
 	endchannel
-; f06c4
 
-Music_HealPokemon_Ch2: ; f06c4
+Music_HealPokemon_Ch2:
 	dutycycle $2
 	notetype $c, $c3
 	octave 4
@@ -37,9 +35,8 @@ Music_HealPokemon_Ch2: ; f06c4
 	octave 5
 	note E_, 8
 	endchannel
-; f06d4
 
-Music_HealPokemon_Ch3: ; f06d4
+Music_HealPokemon_Ch3:
 	notetype $c, $10
 	octave 4
 	note E_, 2
@@ -51,4 +48,3 @@ Music_HealPokemon_Ch3: ; f06d4
 	note E_, 6
 	note __, 2
 	endchannel
-; f06e1
diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index 64d19da99..b56f1b388 100644
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -1,17 +1,16 @@
-Music_IndigoPlateau: ; ee852
+Music_IndigoPlateau:
 	musicheader 4, 1, Music_IndigoPlateau_Ch1
 	musicheader 1, 2, Music_IndigoPlateau_Ch2
 	musicheader 1, 3, Music_IndigoPlateau_Ch3
 	musicheader 1, 4, Music_IndigoPlateau_Ch4
-; ee85e
 
-Music_IndigoPlateau_Ch1: ; ee85e
+Music_IndigoPlateau_Ch1:
 	tempo 128
 	volume $77
 	dutycycle $3
 	tone $0002
 	stereopanning $f
-Music_IndigoPlateau_branch_ee86a: ; ee86a
+Music_IndigoPlateau_branch_ee86a:
 	callchannel Music_IndigoPlateau_branch_ee881
 	octave 3
 	note D_, 4
@@ -24,9 +23,8 @@ Music_IndigoPlateau_branch_ee86a: ; ee86a
 	callchannel Music_IndigoPlateau_branch_ee881
 	note A#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee86a
-; ee881
 
-Music_IndigoPlateau_branch_ee881: ; ee881
+Music_IndigoPlateau_branch_ee881:
 	notetype $c, $b6
 	octave 2
 	note A_, 4
@@ -40,13 +38,12 @@ Music_IndigoPlateau_branch_ee881: ; ee881
 	note A_, 2
 	intensity $a0
 	endchannel
-; ee892
 
-Music_IndigoPlateau_Ch2: ; ee892
+Music_IndigoPlateau_Ch2:
 	dutycycle $3
 	vibrato $10, $22
 	stereopanning $f0
-Music_IndigoPlateau_branch_ee899: ; ee899
+Music_IndigoPlateau_branch_ee899:
 	callchannel Music_IndigoPlateau_branch_ee8e9
 	note A_, 4
 	callchannel Music_IndigoPlateau_branch_ee8e9
@@ -100,9 +97,8 @@ Music_IndigoPlateau_branch_ee899: ; ee899
 	callchannel Music_IndigoPlateau_branch_ee8e9
 	note C#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee899
-; ee8e9
 
-Music_IndigoPlateau_branch_ee8e9: ; ee8e9
+Music_IndigoPlateau_branch_ee8e9:
 	notetype $c, $c6
 	octave 3
 	note D_, 4
@@ -116,11 +112,10 @@ Music_IndigoPlateau_branch_ee8e9: ; ee8e9
 	note D_, 2
 	intensity $b0
 	endchannel
-; ee8fa
 
-Music_IndigoPlateau_Ch3: ; ee8fa
+Music_IndigoPlateau_Ch3:
 	notetype $c, $19
-Music_IndigoPlateau_branch_ee8fd: ; ee8fd
+Music_IndigoPlateau_branch_ee8fd:
 	callchannel Music_IndigoPlateau_branch_ee915
 	octave 3
 	note A_, 4
@@ -134,9 +129,8 @@ Music_IndigoPlateau_branch_ee8fd: ; ee8fd
 	octave 3
 	note F#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee8fd
-; ee915
 
-Music_IndigoPlateau_branch_ee915: ; ee915
+Music_IndigoPlateau_branch_ee915:
 	octave 3
 	note D_, 1
 	note __, 3
@@ -152,13 +146,12 @@ Music_IndigoPlateau_branch_ee915: ; ee915
 	note A_, 1
 	note __, 3
 	endchannel
-; ee924
 
-Music_IndigoPlateau_Ch4: ; ee924
+Music_IndigoPlateau_Ch4:
 	stereopanning $f0
 	togglenoise $0
 	notetype $c
-Music_IndigoPlateau_branch_ee92a: ; ee92a
+Music_IndigoPlateau_branch_ee92a:
 	note D#, 4
 	note D_, 2
 	note D#, 2
@@ -187,4 +180,3 @@ Music_IndigoPlateau_branch_ee92a: ; ee92a
 	note D_, 2
 	note C#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee92a
-; ee94b
diff --git a/audio/music/johtogymbattle.asm b/audio/music/johtogymbattle.asm
index 191b62ad9..2b6e82f00 100644
--- a/audio/music/johtogymbattle.asm
+++ b/audio/music/johtogymbattle.asm
@@ -1,24 +1,23 @@
-Music_JohtoGymBattle: ; ea50d
+Music_JohtoGymBattle:
 	musicheader 3, 1, Music_JohtoGymBattle_Ch1
 	musicheader 1, 2, Music_JohtoGymBattle_Ch2
 	musicheader 1, 3, Music_JohtoGymBattle_Ch3
-; ea516
 
-Music_JohtoGymBattle_Ch1: ; ea516
+Music_JohtoGymBattle_Ch1:
 	tempo 101
 	volume $77
 	dutycycle $3
 	tone $0002
 	vibrato $12, $15
 	notetype $c, $b2
-Music_JohtoGymBattle_branch_ea526: ; ea526
+Music_JohtoGymBattle_branch_ea526:
 	octave 3
 	note A#, 1
 	note A_, 1
 	note G#, 1
 	note A_, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea526
-Music_JohtoGymBattle_branch_ea52f: ; ea52f
+Music_JohtoGymBattle_branch_ea52f:
 	note C#, 1
 	note C_, 1
 	octave 2
@@ -58,7 +57,7 @@ Music_JohtoGymBattle_branch_ea52f: ; ea52f
 	octave 3
 	note G#, 2
 	note F_, 2
-Music_JohtoGymBattle_branch_ea55d: ; ea55d
+Music_JohtoGymBattle_branch_ea55d:
 	intensity $b5
 	note D_, 6
 	note G_, 6
@@ -286,21 +285,20 @@ Music_JohtoGymBattle_branch_ea55d: ; ea55d
 	note D#, 2
 	note F#, 2
 	loopchannel 0, Music_JohtoGymBattle_branch_ea55d
-; ea65f
 
-Music_JohtoGymBattle_Ch2: ; ea65f
+Music_JohtoGymBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
 	notetype $c, $c2
-Music_JohtoGymBattle_branch_ea66a: ; ea66a
+Music_JohtoGymBattle_branch_ea66a:
 	octave 4
 	note F#, 1
 	note F_, 1
 	note E_, 1
 	note A#, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea66a
-Music_JohtoGymBattle_branch_ea673: ; ea673
+Music_JohtoGymBattle_branch_ea673:
 	note F#, 1
 	note F_, 1
 	note F#, 1
@@ -397,7 +395,7 @@ Music_JohtoGymBattle_branch_ea673: ; ea673
 	octave 3
 	note G#, 1
 	note A_, 1
-Music_JohtoGymBattle_branch_ea6ee: ; ea6ee
+Music_JohtoGymBattle_branch_ea6ee:
 	intensity $c7
 	note A#, 8
 	intensity $c4
@@ -613,9 +611,8 @@ Music_JohtoGymBattle_branch_ea6ee: ; ea6ee
 	note B_, 16
 	note G_, 16
 	loopchannel 0, Music_JohtoGymBattle_branch_ea6ee
-; ea7f4
 
-Music_JohtoGymBattle_Ch3: ; ea7f4
+Music_JohtoGymBattle_Ch3:
 	notetype $c, $19
 	octave 4
 	note F_, 1
@@ -685,7 +682,7 @@ Music_JohtoGymBattle_Ch3: ; ea7f4
 	octave 3
 	note A#, 2
 	note G#, 2
-Music_JohtoGymBattle_branch_ea83f: ; ea83f
+Music_JohtoGymBattle_branch_ea83f:
 	callchannel Music_JohtoGymBattle_branch_ea963
 	callchannel Music_JohtoGymBattle_branch_ea963
 	callchannel Music_JohtoGymBattle_branch_ea96a
@@ -900,9 +897,8 @@ Music_JohtoGymBattle_branch_ea83f: ; ea83f
 	note F_, 2
 	note D#, 2
 	loopchannel 0, Music_JohtoGymBattle_branch_ea83f
-; ea952
 
-Music_JohtoGymBattle_branch_ea952: ; ea952
+Music_JohtoGymBattle_branch_ea952:
 	note G_, 2
 	note D_, 2
 	note F_, 2
@@ -920,30 +916,26 @@ Music_JohtoGymBattle_branch_ea952: ; ea952
 	note D#, 2
 	note F_, 2
 	endchannel
-; ea963
 
-Music_JohtoGymBattle_branch_ea963: ; ea963
+Music_JohtoGymBattle_branch_ea963:
 	note D_, 2
 	note G_, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea963
 	endchannel
-; ea96a
 
-Music_JohtoGymBattle_branch_ea96a: ; ea96a
+Music_JohtoGymBattle_branch_ea96a:
 	note C#, 2
 	note G#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea96a
 	endchannel
-; ea971
 
-Music_JohtoGymBattle_branch_ea971: ; ea971
+Music_JohtoGymBattle_branch_ea971:
 	note C_, 2
 	note G_, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea971
 	endchannel
-; ea978
 
-Music_JohtoGymBattle_branch_ea978: ; ea978
+Music_JohtoGymBattle_branch_ea978:
 	octave 2
 	note A#, 2
 	octave 3
@@ -955,9 +947,8 @@ Music_JohtoGymBattle_branch_ea978: ; ea978
 	octave 2
 	note A#, 2
 	endchannel
-; ea983
 
-Music_JohtoGymBattle_branch_ea983: ; ea983
+Music_JohtoGymBattle_branch_ea983:
 	octave 3
 	note C_, 2
 	note G_, 2
@@ -971,9 +962,8 @@ Music_JohtoGymBattle_branch_ea983: ; ea983
 	octave 3
 	note C_, 2
 	endchannel
-; ea990
 
-Music_JohtoGymBattle_branch_ea990: ; ea990
+Music_JohtoGymBattle_branch_ea990:
 	note C#, 2
 	note G#, 2
 	octave 4
@@ -986,9 +976,8 @@ Music_JohtoGymBattle_branch_ea990: ; ea990
 	octave 3
 	note C#, 2
 	endchannel
-; ea99c
 
-Music_JohtoGymBattle_branch_ea99c: ; ea99c
+Music_JohtoGymBattle_branch_ea99c:
 	octave 3
 	note D_, 2
 	note A_, 2
@@ -1002,24 +991,21 @@ Music_JohtoGymBattle_branch_ea99c: ; ea99c
 	octave 3
 	note D_, 2
 	endchannel
-; ea9a9
 
-Music_JohtoGymBattle_branch_ea9a9: ; ea9a9
+Music_JohtoGymBattle_branch_ea9a9:
 	octave 3
 	note D#, 2
 	note G#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea9a9
 	endchannel
-; ea9b1
 
-Music_JohtoGymBattle_branch_ea9b1: ; ea9b1
+Music_JohtoGymBattle_branch_ea9b1:
 	note C#, 2
 	note F#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea9b1
 	endchannel
-; ea9b8
 
-Music_JohtoGymBattle_branch_ea9b8: ; ea9b8
+Music_JohtoGymBattle_branch_ea9b8:
 	note F_, 2
 	note C_, 2
 	note D#, 2
@@ -1029,4 +1015,3 @@ Music_JohtoGymBattle_branch_ea9b8: ; ea9b8
 	note F_, 2
 	note D#, 2
 	endchannel
-; ea9c1
diff --git a/audio/music/johtotrainerbattle.asm b/audio/music/johtotrainerbattle.asm
index 52f60502d..c235410a5 100644
--- a/audio/music/johtotrainerbattle.asm
+++ b/audio/music/johtotrainerbattle.asm
@@ -1,10 +1,9 @@
-Music_JohtoTrainerBattle: ; f6096
+Music_JohtoTrainerBattle:
 	musicheader 3, 1, Music_JohtoTrainerBattle_Ch1
 	musicheader 1, 2, Music_JohtoTrainerBattle_Ch2
 	musicheader 1, 3, Music_JohtoTrainerBattle_Ch3
-; f609f
 
-Music_JohtoTrainerBattle_Ch1: ; f609f
+Music_JohtoTrainerBattle_Ch1:
 	tempo 102
 	volume $77
 	dutycycle $3
@@ -86,7 +85,7 @@ Music_JohtoTrainerBattle_Ch1: ; f609f
 	note F_, 6
 	intensity $b7
 	note G_, 4
-Music_JohtoTrainerBattle_branch_f6102: ; f6102
+Music_JohtoTrainerBattle_branch_f6102:
 	intensity $b4
 	callchannel Music_JohtoTrainerBattle_branch_f629f
 	intensity $b7
@@ -243,7 +242,7 @@ Music_JohtoTrainerBattle_branch_f6102: ; f6102
 	intensity $a7
 	note D#, 12
 	note __, 16
-Music_JohtoTrainerBattle_branch_f61bd: ; f61bd
+Music_JohtoTrainerBattle_branch_f61bd:
 	intensity $b7
 	note F_, 8
 	intensity $b4
@@ -428,9 +427,8 @@ Music_JohtoTrainerBattle_branch_f61bd: ; f61bd
 	intensity $a7
 	note F_, 6
 	loopchannel 0, Music_JohtoTrainerBattle_branch_f6102
-; f629f
 
-Music_JohtoTrainerBattle_branch_f629f: ; f629f
+Music_JohtoTrainerBattle_branch_f629f:
 	octave 3
 	note E_, 2
 	note D_, 2
@@ -451,9 +449,8 @@ Music_JohtoTrainerBattle_branch_f629f: ; f629f
 	note F_, 2
 	note D_, 2
 	endchannel
-; f62b3
 
-Music_JohtoTrainerBattle_Ch2: ; f62b3
+Music_JohtoTrainerBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
@@ -547,7 +544,7 @@ Music_JohtoTrainerBattle_Ch2: ; f62b3
 	note E_, 2
 	intensity $c7
 	note B_, 4
-Music_JohtoTrainerBattle_branch_f632a: ; f632a
+Music_JohtoTrainerBattle_branch_f632a:
 	callchannel Music_JohtoTrainerBattle_branch_f64a3
 	intensity $3e
 	note A#, 8
@@ -584,7 +581,7 @@ Music_JohtoTrainerBattle_branch_f632a: ; f632a
 	note A_, 16
 	intensity $b7
 	note A_, 16
-Music_JohtoTrainerBattle_branch_f635a: ; f635a
+Music_JohtoTrainerBattle_branch_f635a:
 	intensity $c3
 	octave 3
 	note A_, 2
@@ -607,7 +604,7 @@ Music_JohtoTrainerBattle_branch_f635a: ; f635a
 	note G_, 2
 	note A_, 2
 	note A#, 2
-Music_JohtoTrainerBattle_branch_f6376: ; f6376
+Music_JohtoTrainerBattle_branch_f6376:
 	note G_, 2
 	note F_, 2
 	note G_, 2
@@ -685,7 +682,7 @@ Music_JohtoTrainerBattle_branch_f6376: ; f6376
 	callchannel Music_JohtoTrainerBattle_branch_f64b6
 	intensity $a2
 	callchannel Music_JohtoTrainerBattle_branch_f64b6
-Music_JohtoTrainerBattle_branch_f63dd: ; f63dd
+Music_JohtoTrainerBattle_branch_f63dd:
 	octave 4
 	note D#, 2
 	octave 3
@@ -829,9 +826,8 @@ Music_JohtoTrainerBattle_branch_f63dd: ; f63dd
 	note D_, 2
 	note F_, 2
 	loopchannel 0, Music_JohtoTrainerBattle_branch_f632a
-; f649a
 
-Music_JohtoTrainerBattle_branch_f649a: ; f649a
+Music_JohtoTrainerBattle_branch_f649a:
 	octave 3
 	note A_, 6
 	note A_, 4
@@ -840,9 +836,8 @@ Music_JohtoTrainerBattle_branch_f649a: ; f649a
 	intensity $c7
 	note A#, 4
 	endchannel
-; f64a3
 
-Music_JohtoTrainerBattle_branch_f64a3: ; f64a3
+Music_JohtoTrainerBattle_branch_f64a3:
 	intensity $c7
 	octave 3
 	note A_, 6
@@ -859,9 +854,8 @@ Music_JohtoTrainerBattle_branch_f64a3: ; f64a3
 	intensity $b7
 	note F_, 8
 	endchannel
-; f64b6
 
-Music_JohtoTrainerBattle_branch_f64b6: ; f64b6
+Music_JohtoTrainerBattle_branch_f64b6:
 	octave 3
 	note A#, 2
 	note D#, 2
@@ -870,9 +864,8 @@ Music_JohtoTrainerBattle_branch_f64b6: ; f64b6
 	octave 3
 	note D#, 2
 	endchannel
-; f64be
 
-Music_JohtoTrainerBattle_branch_f64be: ; f64be
+Music_JohtoTrainerBattle_branch_f64be:
 	intensity $c7
 	octave 4
 	note F_, 4
@@ -891,9 +884,8 @@ Music_JohtoTrainerBattle_branch_f64be: ; f64be
 	note D#, 1
 	note F_, 2
 	endchannel
-; f64d2
 
-Music_JohtoTrainerBattle_branch_f64d2: ; f64d2
+Music_JohtoTrainerBattle_branch_f64d2:
 	intensity $c7
 	octave 4
 	note D#, 6
@@ -905,9 +897,8 @@ Music_JohtoTrainerBattle_branch_f64d2: ; f64d2
 	note F_, 4
 	note D#, 4
 	endchannel
-; f64de
 
-Music_JohtoTrainerBattle_Ch3: ; f64de
+Music_JohtoTrainerBattle_Ch3:
 	notetype $c, $19
 	octave 4
 	note E_, 1
@@ -941,7 +932,7 @@ Music_JohtoTrainerBattle_Ch3: ; f64de
 	note A#, 2
 	note A_, 2
 	note G#, 2
-Music_JohtoTrainerBattle_branch_f6501: ; f6501
+Music_JohtoTrainerBattle_branch_f6501:
 	note A_, 2
 	note E_, 2
 	note F#, 2
@@ -983,7 +974,7 @@ Music_JohtoTrainerBattle_branch_f6501: ; f6501
 	note A_, 2
 	note A#, 2
 	note G_, 2
-Music_JohtoTrainerBattle_branch_f6531: ; f6531
+Music_JohtoTrainerBattle_branch_f6531:
 	callchannel Music_JohtoTrainerBattle_branch_f6681
 	note E_, 2
 	callchannel Music_JohtoTrainerBattle_branch_f6692
@@ -1056,7 +1047,7 @@ Music_JohtoTrainerBattle_branch_f6531: ; f6531
 	note F_, 8
 	note E_, 8
 	note D#, 8
-Music_JohtoTrainerBattle_branch_f6591: ; f6591
+Music_JohtoTrainerBattle_branch_f6591:
 	octave 3
 	note D#, 2
 	note A#, 2
@@ -1079,13 +1070,13 @@ Music_JohtoTrainerBattle_branch_f6591: ; f6591
 	note F_, 2
 	note D#, 2
 	note G_, 2
-Music_JohtoTrainerBattle_branch_f65ac: ; f65ac
+Music_JohtoTrainerBattle_branch_f65ac:
 	note C#, 2
 	note G#, 2
 	loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac
 	note B_, 2
 	note A_, 2
-Music_JohtoTrainerBattle_branch_f65b4: ; f65b4
+Music_JohtoTrainerBattle_branch_f65b4:
 	note D_, 2
 	note A_, 2
 	loopchannel 5, Music_JohtoTrainerBattle_branch_f65b4
@@ -1095,17 +1086,17 @@ Music_JohtoTrainerBattle_branch_f65b4: ; f65b4
 	note F#, 2
 	note G#, 2
 	note A_, 2
-Music_JohtoTrainerBattle_branch_f65c0: ; f65c0
+Music_JohtoTrainerBattle_branch_f65c0:
 	note A#, 4
 	note D#, 4
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0
-Music_JohtoTrainerBattle_branch_f65c6: ; f65c6
+Music_JohtoTrainerBattle_branch_f65c6:
 	octave 4
 	note G_, 4
 	octave 3
 	note A#, 4
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6
-Music_JohtoTrainerBattle_branch_f65ce: ; f65ce
+Music_JohtoTrainerBattle_branch_f65ce:
 	callchannel Music_JohtoTrainerBattle_branch_f66b4
 	note D#, 2
 	note F_, 8
@@ -1179,11 +1170,11 @@ Music_JohtoTrainerBattle_branch_f65ce: ; f65ce
 	note C_, 2
 	octave 3
 	note A#, 2
-Music_JohtoTrainerBattle_branch_f661e: ; f661e
+Music_JohtoTrainerBattle_branch_f661e:
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_JohtoTrainerBattle_branch_f661e
-Music_JohtoTrainerBattle_branch_f6624: ; f6624
+Music_JohtoTrainerBattle_branch_f6624:
 	note C#, 2
 	note G#, 2
 	loopchannel 6, Music_JohtoTrainerBattle_branch_f6624
@@ -1193,11 +1184,11 @@ Music_JohtoTrainerBattle_branch_f6624: ; f6624
 	octave 3
 	note A#, 2
 	note G#, 2
-Music_JohtoTrainerBattle_branch_f6630: ; f6630
+Music_JohtoTrainerBattle_branch_f6630:
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_JohtoTrainerBattle_branch_f6630
-Music_JohtoTrainerBattle_branch_f6636: ; f6636
+Music_JohtoTrainerBattle_branch_f6636:
 	note C#, 2
 	note G#, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f6636
@@ -1256,9 +1247,8 @@ Music_JohtoTrainerBattle_branch_f6636: ; f6636
 	octave 4
 	note D_, 2
 	loopchannel 0, Music_JohtoTrainerBattle_branch_f6531
-; f6676
 
-Music_JohtoTrainerBattle_branch_f6676: ; f6676
+Music_JohtoTrainerBattle_branch_f6676:
 	octave 4
 	note C_, 2
 	octave 3
@@ -1270,9 +1260,8 @@ Music_JohtoTrainerBattle_branch_f6676: ; f6676
 	note A#, 2
 	note G_, 2
 	endchannel
-; f6681
 
-Music_JohtoTrainerBattle_branch_f6681: ; f6681
+Music_JohtoTrainerBattle_branch_f6681:
 	octave 3
 	note E_, 2
 	note A_, 2
@@ -1290,9 +1279,8 @@ Music_JohtoTrainerBattle_branch_f6681: ; f6681
 	note F#, 2
 	note G_, 2
 	endchannel
-; f6692
 
-Music_JohtoTrainerBattle_branch_f6692: ; f6692
+Music_JohtoTrainerBattle_branch_f6692:
 	octave 3
 	note F_, 2
 	note A#, 2
@@ -1304,32 +1292,28 @@ Music_JohtoTrainerBattle_branch_f6692: ; f6692
 	octave 4
 	note D_, 2
 	endchannel
-; f669d
 
-Music_JohtoTrainerBattle_branch_f669d: ; f669d
+Music_JohtoTrainerBattle_branch_f669d:
 	octave 3
 	note E_, 2
 	note A_, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f669d
 	endchannel
-; f66a5
 
-Music_JohtoTrainerBattle_branch_f66a5: ; f66a5
+Music_JohtoTrainerBattle_branch_f66a5:
 	note D_, 2
 	note A_, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f66a5
 	endchannel
-; f66ac
 
-Music_JohtoTrainerBattle_branch_f66ac: ; f66ac
+Music_JohtoTrainerBattle_branch_f66ac:
 	octave 3
 	note C_, 2
 	note G_, 2
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f66ac
 	endchannel
-; f66b4
 
-Music_JohtoTrainerBattle_branch_f66b4: ; f66b4
+Music_JohtoTrainerBattle_branch_f66b4:
 	note A#, 4
 	note D#, 2
 	note A#, 2
@@ -1345,4 +1329,3 @@ Music_JohtoTrainerBattle_branch_f66b4: ; f66b4
 	note G#, 1
 	note A#, 2
 	endchannel
-; f66c3
diff --git a/audio/music/johtowildbattle.asm b/audio/music/johtowildbattle.asm
index bcfde1824..3c104e111 100644
--- a/audio/music/johtowildbattle.asm
+++ b/audio/music/johtowildbattle.asm
@@ -1,16 +1,15 @@
-Music_JohtoWildBattle: ; f5dc5
+Music_JohtoWildBattle:
 	musicheader 3, 1, Music_JohtoWildBattle_Ch1
 	musicheader 1, 2, Music_JohtoWildBattle_Ch2
 	musicheader 1, 3, Music_JohtoWildBattle_Ch3
-; f5dce
 
-Music_JohtoWildBattle_Ch1: ; f5dce
+Music_JohtoWildBattle_Ch1:
 	tempo 104
 	volume $77
 	dutycycle $3
 	tone $0002
 	vibrato $12, $15
-Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb
+Music_JohtoWildBattleNight_branch_f5ddb:
 	notetype $c, $b2
 	octave 4
 	note C_, 1
@@ -87,7 +86,7 @@ Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb
 	note D_, 4
 	intensity $6f
 	note D#, 8
-Music_JohtoWildBattle_branch_f5e2d: ; f5e2d
+Music_JohtoWildBattle_branch_f5e2d:
 	intensity $b6
 	octave 3
 	note D_, 6
@@ -200,9 +199,8 @@ Music_JohtoWildBattle_branch_f5e2d: ; f5e2d
 	note F#, 4
 	note G_, 16
 	loopchannel 0, Music_JohtoWildBattle_branch_f5e2d
-; f5ea2
 
-Music_JohtoWildBattle_Ch2: ; f5ea2
+Music_JohtoWildBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
@@ -210,7 +208,7 @@ Music_JohtoWildBattle_Ch2: ; f5ea2
 	notetype $c, $c2
 	octave 4
 	note G_, 6
-Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2
+Music_JohtoWildBattleNight_branch_f5eb2:
 	octave 3
 	note D_, 6
 	note G_, 4
@@ -239,7 +237,7 @@ Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2
 	note G_, 4
 	intensity $6f
 	note G#, 8
-Music_JohtoWildBattle_branch_f5ed1: ; f5ed1
+Music_JohtoWildBattle_branch_f5ed1:
 	intensity $c4
 	octave 3
 	note G_, 6
@@ -363,10 +361,9 @@ Music_JohtoWildBattle_branch_f5ed1: ; f5ed1
 	note A#, 4
 	note B_, 16
 	loopchannel 0, Music_JohtoWildBattle_branch_f5ed1
-; f5f5d
 
-Music_JohtoWildBattleNight_branch_f5f5d: ; f5f5d
-Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
+Music_JohtoWildBattleNight_branch_f5f5d:
+Music_JohtoWildBattle_branch_f5f5d:
 	notetype $c, $c2
 	octave 4
 	note F_, 1
@@ -417,11 +414,10 @@ Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
 	octave 5
 	note G_, 1
 	endchannel
-; f5f91
 
-Music_JohtoWildBattle_Ch3: ; f5f91
+Music_JohtoWildBattle_Ch3:
 	notetype $c, $14
-Music_JohtoWildBattleNight_branch_f5f94: ; f5f94
+Music_JohtoWildBattleNight_branch_f5f94:
 	octave 4
 	note G_, 2
 	octave 5
@@ -470,7 +466,7 @@ Music_JohtoWildBattleNight_branch_f5f94: ; f5f94
 	note D#, 2
 	note G_, 2
 	note F_, 2
-Music_JohtoWildBattle_branch_f5fc6: ; f5fc6
+Music_JohtoWildBattle_branch_f5fc6:
 	note D_, 2
 	note G_, 2
 	loopchannel 6, Music_JohtoWildBattle_branch_f5fc6
@@ -487,20 +483,20 @@ Music_JohtoWildBattle_branch_f5fc6: ; f5fc6
 	note G_, 2
 	note F_, 2
 	note D#, 2
-Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
+Music_JohtoWildBattle_branch_f5fdb:
 	note D_, 2
 	note G_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f5fdb
 	note F#, 4
 	callchannel Music_JohtoWildBattle_branch_f6055
 	callchannel Music_JohtoWildBattle_branch_f6055
-Music_JohtoWildBattle_branch_f5fe8: ; f5fe8
+Music_JohtoWildBattle_branch_f5fe8:
 	note D_, 2
 	note G_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f5fe8
 	note D_, 2
 	note A_, 2
-Music_JohtoWildBattle_branch_f5ff0: ; f5ff0
+Music_JohtoWildBattle_branch_f5ff0:
 	note C_, 2
 	note F_, 2
 	loopchannel 5, Music_JohtoWildBattle_branch_f5ff0
@@ -518,7 +514,7 @@ Music_JohtoWildBattle_branch_f5ff0: ; f5ff0
 	note D#, 2
 	note G#, 2
 	note G_, 4
-Music_JohtoWildBattle_branch_f6006: ; f6006
+Music_JohtoWildBattle_branch_f6006:
 	note E_, 2
 	note A_, 2
 	loopchannel 8, Music_JohtoWildBattle_branch_f6006
@@ -547,11 +543,11 @@ Music_JohtoWildBattle_branch_f6006: ; f6006
 	note F#, 2
 	note F_, 2
 	note D#, 2
-Music_JohtoWildBattle_branch_f6027: ; f6027
+Music_JohtoWildBattle_branch_f6027:
 	note D_, 2
 	note G_, 2
 	loopchannel 8, Music_JohtoWildBattle_branch_f6027
-Music_JohtoWildBattle_branch_f602d: ; f602d
+Music_JohtoWildBattle_branch_f602d:
 	note C_, 2
 	note F_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f602d
@@ -561,17 +557,17 @@ Music_JohtoWildBattle_branch_f602d: ; f602d
 	note G_, 4
 	note D_, 4
 	note G_, 4
-Music_JohtoWildBattle_branch_f6039: ; f6039
+Music_JohtoWildBattle_branch_f6039:
 	note D_, 2
 	note G_, 2
 	loopchannel 12, Music_JohtoWildBattle_branch_f6039
-Music_JohtoWildBattle_branch_f603f: ; f603f
+Music_JohtoWildBattle_branch_f603f:
 	note C_, 2
 	note E_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f603f
 	note F_, 2
 	note F#, 2
-Music_JohtoWildBattle_branch_f6047: ; f6047
+Music_JohtoWildBattle_branch_f6047:
 	note D_, 2
 	note G_, 2
 	loopchannel 6, Music_JohtoWildBattle_branch_f6047
@@ -580,11 +576,9 @@ Music_JohtoWildBattle_branch_f6047: ; f6047
 	note F#, 2
 	note E_, 2
 	loopchannel 0, Music_JohtoWildBattle_branch_f5fdb
-; f6055
 
-Music_JohtoWildBattle_branch_f6055: ; f6055
+Music_JohtoWildBattle_branch_f6055:
 	note D#, 2
 	note G#, 2
 	loopchannel 4, Music_JohtoWildBattle_branch_f6055
 	endchannel
-; f605c
diff --git a/audio/music/johtowildbattlenight.asm b/audio/music/johtowildbattlenight.asm
index d176a43f3..b4b1651bd 100644
--- a/audio/music/johtowildbattlenight.asm
+++ b/audio/music/johtowildbattlenight.asm
@@ -1,19 +1,17 @@
-Music_JohtoWildBattleNight: ; f605c
+Music_JohtoWildBattleNight:
 	musicheader 3, 1, Music_JohtoWildBattleNight_Ch1
 	musicheader 1, 2, Music_JohtoWildBattleNight_Ch2
 	musicheader 1, 3, Music_JohtoWildBattleNight_Ch3
-; f6065
 
-Music_JohtoWildBattleNight_Ch1: ; f6065
+Music_JohtoWildBattleNight_Ch1:
 	tempo 107
 	volume $77
 	dutycycle $3
 	tone $0002
 	vibrato $10, $25
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb
-; f6076
 
-Music_JohtoWildBattleNight_Ch2: ; f6076
+Music_JohtoWildBattleNight_Ch2:
 	dutycycle $3
 	vibrato $20, $36
 	tone $0001
@@ -24,9 +22,7 @@ Music_JohtoWildBattleNight_Ch2: ; f6076
 	tone $0001
 	dutycycle $2
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2
-; f608f
 
-Music_JohtoWildBattleNight_Ch3: ; f608f
+Music_JohtoWildBattleNight_Ch3:
 	notetype $c, $11
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94
-; f6096
diff --git a/audio/music/kantogymbattle.asm b/audio/music/kantogymbattle.asm
index 99fdab1a6..7ba65a422 100644
--- a/audio/music/kantogymbattle.asm
+++ b/audio/music/kantogymbattle.asm
@@ -1,10 +1,9 @@
-Music_KantoGymBattle: ; ec720
+Music_KantoGymBattle:
 	musicheader 3, 1, Music_KantoGymBattle_Ch1
 	musicheader 1, 2, Music_KantoGymBattle_Ch2
 	musicheader 1, 3, Music_KantoGymBattle_Ch3
-; ec729
 
-Music_KantoGymBattle_Ch1: ; ec729
+Music_KantoGymBattle_Ch1:
 	tempo 101
 	volume $77
 	dutycycle $3
@@ -86,7 +85,7 @@ Music_KantoGymBattle_Ch1: ; ec729
 	note E_, 4
 	note E_, 4
 	note E_, 2
-Music_KantoGymBattle_branch_ec78b: ; ec78b
+Music_KantoGymBattle_branch_ec78b:
 	callchannel Music_KantoGymBattle_branch_ec832
 	octave 2
 	note A#, 2
@@ -229,9 +228,8 @@ Music_KantoGymBattle_branch_ec78b: ; ec78b
 	octave 3
 	note D_, 4
 	loopchannel 0, Music_KantoGymBattle_branch_ec78b
-; ec832
 
-Music_KantoGymBattle_branch_ec832: ; ec832
+Music_KantoGymBattle_branch_ec832:
 	intensity $b5
 	note D#, 2
 	octave 2
@@ -252,14 +250,13 @@ Music_KantoGymBattle_branch_ec832: ; ec832
 	note D#, 2
 	note C#, 2
 	endchannel
-; ec847
 
-Music_KantoGymBattle_Ch2: ; ec847
+Music_KantoGymBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
 	notetype $c, $c2
-Music_KantoGymBattle_branch_ec852: ; ec852
+Music_KantoGymBattle_branch_ec852:
 	octave 4
 	note A#, 1
 	note G#, 1
@@ -268,7 +265,7 @@ Music_KantoGymBattle_branch_ec852: ; ec852
 	note D#, 1
 	loopchannel 8, Music_KantoGymBattle_branch_ec852
 	octave 3
-Music_KantoGymBattle_branch_ec85d: ; ec85d
+Music_KantoGymBattle_branch_ec85d:
 	intensity $c2
 	note D#, 2
 	note D#, 2
@@ -316,7 +313,7 @@ Music_KantoGymBattle_branch_ec85d: ; ec85d
 	intensity $c2
 	octave 4
 	loopchannel 2, Music_KantoGymBattle_branch_ec85d
-Music_KantoGymBattle_branch_ec894: ; ec894
+Music_KantoGymBattle_branch_ec894:
 	callchannel Music_KantoGymBattle_branch_ec907
 	note E_, 8
 	note G#, 8
@@ -405,9 +402,8 @@ Music_KantoGymBattle_branch_ec894: ; ec894
 	octave 3
 	note A_, 4
 	loopchannel 0, Music_KantoGymBattle_branch_ec894
-; ec907
 
-Music_KantoGymBattle_branch_ec907: ; ec907
+Music_KantoGymBattle_branch_ec907:
 	dutycycle $2
 	intensity $d1
 	octave 3
@@ -437,21 +433,20 @@ Music_KantoGymBattle_branch_ec907: ; ec907
 	dutycycle $3
 	intensity $b0
 	endchannel
-; ec92e
 
-Music_KantoGymBattle_Ch3: ; ec92e
+Music_KantoGymBattle_Ch3:
 	notetype $c, $19
 	octave 2
 	note E_, 1
 	note __, 1
-Music_KantoGymBattle_branch_ec934: ; ec934
+Music_KantoGymBattle_branch_ec934:
 	note B_, 3
 	note __, 1
 	loopchannel 6, Music_KantoGymBattle_branch_ec934
 	note B_, 2
 	note G#, 2
 	note B_, 2
-Music_KantoGymBattle_branch_ec93d: ; ec93d
+Music_KantoGymBattle_branch_ec93d:
 	note D#, 1
 	note __, 1
 	note D#, 1
@@ -489,12 +484,12 @@ Music_KantoGymBattle_branch_ec93d: ; ec93d
 	note __, 1
 	note E_, 2
 	loopchannel 2, Music_KantoGymBattle_branch_ec93d
-Music_KantoGymBattle_branch_ec965: ; ec965
+Music_KantoGymBattle_branch_ec965:
 	octave 2
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec965
-Music_KantoGymBattle_branch_ec96c: ; ec96c
+Music_KantoGymBattle_branch_ec96c:
 	note E_, 2
 	note B_, 2
 	loopchannel 4, Music_KantoGymBattle_branch_ec96c
@@ -511,13 +506,13 @@ Music_KantoGymBattle_branch_ec96c: ; ec96c
 	note E_, 2
 	octave 2
 	note B_, 2
-Music_KantoGymBattle_branch_ec97f: ; ec97f
+Music_KantoGymBattle_branch_ec97f:
 	octave 2
 	note F#, 2
 	octave 3
 	note C#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec97f
-Music_KantoGymBattle_branch_ec987: ; ec987
+Music_KantoGymBattle_branch_ec987:
 	octave 2
 	note E_, 2
 	note B_, 2
@@ -526,7 +521,7 @@ Music_KantoGymBattle_branch_ec987: ; ec987
 	note E_, 2
 	octave 2
 	note B_, 2
-Music_KantoGymBattle_branch_ec992: ; ec992
+Music_KantoGymBattle_branch_ec992:
 	note D#, 1
 	note __, 1
 	note D#, 1
@@ -546,7 +541,7 @@ Music_KantoGymBattle_branch_ec992: ; ec992
 	note __, 1
 	note E_, 2
 	loopchannel 2, Music_KantoGymBattle_branch_ec992
-Music_KantoGymBattle_branch_ec9a8: ; ec9a8
+Music_KantoGymBattle_branch_ec9a8:
 	note D#, 2
 	note A#, 2
 	loopchannel 7, Music_KantoGymBattle_branch_ec9a8
@@ -563,12 +558,12 @@ Music_KantoGymBattle_branch_ec9a8: ; ec9a8
 	note B_, 2
 	octave 3
 	note E_, 2
-Music_KantoGymBattle_branch_ec9bb: ; ec9bb
+Music_KantoGymBattle_branch_ec9bb:
 	octave 2
 	note E_, 2
 	note B_, 2
 	loopchannel 5, Music_KantoGymBattle_branch_ec9bb
-Music_KantoGymBattle_branch_ec9c2: ; ec9c2
+Music_KantoGymBattle_branch_ec9c2:
 	octave 2
 	note F#, 2
 	octave 3
@@ -588,16 +583,16 @@ Music_KantoGymBattle_branch_ec9c2: ; ec9c2
 	note F#, 2
 	note E_, 2
 	note C#, 2
-Music_KantoGymBattle_branch_ec9d8: ; ec9d8
+Music_KantoGymBattle_branch_ec9d8:
 	octave 2
 	note D#, 2
 	note A#, 2
 	loopchannel 4, Music_KantoGymBattle_branch_ec9d8
-Music_KantoGymBattle_branch_ec9df: ; ec9df
+Music_KantoGymBattle_branch_ec9df:
 	note C#, 2
 	note G#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec9df
-Music_KantoGymBattle_branch_ec9e5: ; ec9e5
+Music_KantoGymBattle_branch_ec9e5:
 	note D#, 2
 	note A#, 2
 	loopchannel 4, Music_KantoGymBattle_branch_ec9e5
@@ -613,4 +608,3 @@ Music_KantoGymBattle_branch_ec9e5: ; ec9e5
 	note D#, 2
 	note F_, 2
 	loopchannel 0, Music_KantoGymBattle_branch_ec965
-; ec9fa
diff --git a/audio/music/kantotrainerbattle.asm b/audio/music/kantotrainerbattle.asm
index 10c1e7c0e..511763c92 100644
--- a/audio/music/kantotrainerbattle.asm
+++ b/audio/music/kantotrainerbattle.asm
@@ -1,12 +1,11 @@
-Music_KantoTrainerBattle: ; ec9fa
+Music_KantoTrainerBattle:
 	musicheader 3, 1, Music_KantoTrainerBattle_Ch1
 	musicheader 1, 2, Music_KantoTrainerBattle_Ch2
 	musicheader 1, 3, Music_KantoTrainerBattle_Ch3
-; eca03
 
 	db $3
 
-Music_KantoTrainerBattle_Ch1: ; eca04
+Music_KantoTrainerBattle_Ch1:
 	tempo 114
 	volume $77
 	pitchoffset 1, B_
@@ -127,7 +126,7 @@ Music_KantoTrainerBattle_Ch1: ; eca04
 	note D#, 2
 	note F_, 2
 	note F#, 2
-Music_KantoTrainerBattle_branch_eca88: ; eca88
+Music_KantoTrainerBattle_branch_eca88:
 	notetype $c, $b7
 	note D#, 4
 	note __, 2
@@ -464,9 +463,8 @@ Music_KantoTrainerBattle_branch_eca88: ; eca88
 	octave 4
 	note D_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_eca88
-; ecbea
 
-Music_KantoTrainerBattle_Ch2: ; ecbea
+Music_KantoTrainerBattle_Ch2:
 	pitchoffset 1, B_
 	vibrato $6, $36
 	dutycycle $1
@@ -485,7 +483,7 @@ Music_KantoTrainerBattle_Ch2: ; ecbea
 	note F#, 1
 	dutycycle $3
 	intensity $62
-Music_KantoTrainerBattle_branch_ecc04: ; ecc04
+Music_KantoTrainerBattle_branch_ecc04:
 	octave 3
 	note G_, 1
 	note G#, 1
@@ -542,7 +540,7 @@ Music_KantoTrainerBattle_branch_ecc04: ; ecc04
 	octave 3
 	note D_, 1
 	note F_, 1
-Music_KantoTrainerBattle_branch_ecc41: ; ecc41
+Music_KantoTrainerBattle_branch_ecc41:
 	notetype $c, $d7
 	octave 2
 	note C_, 1
@@ -917,9 +915,8 @@ Music_KantoTrainerBattle_branch_ecc41: ; ecc41
 	octave 3
 	note B_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_ecc41
-; ecdd2
 
-Music_KantoTrainerBattle_Ch3: ; ecdd2
+Music_KantoTrainerBattle_Ch3:
 	pitchoffset 1, B_
 	vibrato $12, $23
 	notetype $c, $15
@@ -1050,7 +1047,7 @@ Music_KantoTrainerBattle_Ch3: ; ecdd2
 	note G_, 2
 	note A#, 2
 	note B_, 2
-Music_KantoTrainerBattle_branch_ece5a: ; ece5a
+Music_KantoTrainerBattle_branch_ece5a:
 	notetype $c, $14
 	octave 6
 	note C_, 4
@@ -1537,4 +1534,3 @@ Music_KantoTrainerBattle_branch_ece5a: ; ece5a
 	octave 5
 	note G_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_ece5a
-; ed06d
diff --git a/audio/music/kantowildbattle.asm b/audio/music/kantowildbattle.asm
index 7f4f6e174..c19da00df 100644
--- a/audio/music/kantowildbattle.asm
+++ b/audio/music/kantowildbattle.asm
@@ -1,12 +1,11 @@
-Music_KantoWildBattle: ; ed06d
+Music_KantoWildBattle:
 	musicheader 3, 1, Music_KantoWildBattle_Ch1
 	musicheader 1, 2, Music_KantoWildBattle_Ch2
 	musicheader 1, 3, Music_KantoWildBattle_Ch3
-; ed076
 
 	db $3
 
-Music_KantoWildBattle_Ch1: ; ed077
+Music_KantoWildBattle_Ch1:
 	tempo 112
 	volume $77
 	vibrato $12, $23
@@ -25,7 +24,7 @@ Music_KantoWildBattle_Ch1: ; ed077
 	note G_, 1
 	note F#, 1
 	note F_, 1
-Music_KantoWildBattle_branch_ed091: ; ed091
+Music_KantoWildBattle_branch_ed091:
 	notetype $c, $b7
 	callchannel Music_KantoWildBattle_branch_ed18a
 	octave 4
@@ -208,7 +207,7 @@ Music_KantoWildBattle_branch_ed091: ; ed091
 	note D#, 1
 	note __, 5
 	note C#, 8
-Music_KantoWildBattle_branch_ed15b: ; ed15b
+Music_KantoWildBattle_branch_ed15b:
 	intensity $b1
 	octave 3
 	note C_, 1
@@ -216,34 +215,33 @@ Music_KantoWildBattle_branch_ed15b: ; ed15b
 	note D_, 1
 	note C#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed15b
-Music_KantoWildBattle_branch_ed166: ; ed166
+Music_KantoWildBattle_branch_ed166:
 	note C#, 1
 	note F_, 1
 	note E_, 1
 	note D#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed166
-Music_KantoWildBattle_branch_ed16e: ; ed16e
+Music_KantoWildBattle_branch_ed16e:
 	note C_, 1
 	note D#, 1
 	note D_, 1
 	note C#, 1
 	loopchannel 16, Music_KantoWildBattle_branch_ed16e
-Music_KantoWildBattle_branch_ed176: ; ed176
+Music_KantoWildBattle_branch_ed176:
 	note C#, 1
 	note E_, 1
 	note D#, 1
 	note D_, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed176
-Music_KantoWildBattle_branch_ed17e: ; ed17e
+Music_KantoWildBattle_branch_ed17e:
 	note C_, 1
 	note D#, 1
 	note D_, 1
 	note C#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed17e
 	loopchannel 0, Music_KantoWildBattle_branch_ed091
-; ed18a
 
-Music_KantoWildBattle_branch_ed18a: ; ed18a
+Music_KantoWildBattle_branch_ed18a:
 	octave 4
 	note C_, 1
 	note __, 5
@@ -265,9 +263,8 @@ Music_KantoWildBattle_branch_ed18a: ; ed18a
 	note B_, 1
 	note __, 3
 	endchannel
-; ed19f
 
-Music_KantoWildBattle_Ch2: ; ed19f
+Music_KantoWildBattle_Ch2:
 	dutycycle $1
 	vibrato $12, $23
 	notetype $c, $b1
@@ -304,7 +301,7 @@ Music_KantoWildBattle_Ch2: ; ed19f
 	note D#, 1
 	note D_, 1
 	note C#, 1
-Music_KantoWildBattle_branch_ed1c8: ; ed1c8
+Music_KantoWildBattle_branch_ed1c8:
 	notetype $c, $b7
 	callchannel Music_KantoWildBattle_branch_ed2c6
 	octave 2
@@ -493,9 +490,8 @@ endr
 	note C_, 2
 	note __, 2
 	loopchannel 0, Music_KantoWildBattle_branch_ed1c8
-; ed2c6
 
-Music_KantoWildBattle_branch_ed2c6: ; ed2c6
+Music_KantoWildBattle_branch_ed2c6:
 	octave 2
 	note C_, 1
 	note __, 2
@@ -561,9 +557,8 @@ Music_KantoWildBattle_branch_ed2c6: ; ed2c6
 	octave 1
 	note G_, 2
 	endchannel
-; ed307
 
-Music_KantoWildBattle_branch_ed307: ; ed307
+Music_KantoWildBattle_branch_ed307:
 	octave 2
 	note C_, 2
 	note __, 4
@@ -584,9 +579,8 @@ Music_KantoWildBattle_branch_ed307: ; ed307
 	octave 2
 	note C_, 4
 	endchannel
-; ed31b
 
-Music_KantoWildBattle_branch_ed31b: ; ed31b
+Music_KantoWildBattle_branch_ed31b:
 	octave 2
 	note C_, 2
 	note __, 4
@@ -624,9 +618,8 @@ Music_KantoWildBattle_branch_ed31b: ; ed31b
 	octave 3
 	note C_, 2
 	endchannel
-; ed340
 
-Music_KantoWildBattle_branch_ed340: ; ed340
+Music_KantoWildBattle_branch_ed340:
 	octave 3
 	note G_, 4
 	octave 2
@@ -647,9 +640,8 @@ Music_KantoWildBattle_branch_ed340: ; ed340
 	note C_, 2
 	note __, 2
 	endchannel
-; ed354
 
-Music_KantoWildBattle_branch_ed354: ; ed354
+Music_KantoWildBattle_branch_ed354:
 	note C_, 2
 	note __, 2
 	octave 3
@@ -670,9 +662,8 @@ Music_KantoWildBattle_branch_ed354: ; ed354
 	note C_, 2
 	note __, 2
 	endchannel
-; ed368
 
-Music_KantoWildBattle_Ch3: ; ed368
+Music_KantoWildBattle_Ch3:
 	vibrato $14, $23
 	notetype $c, $14
 	octave 3
@@ -723,7 +714,7 @@ Music_KantoWildBattle_Ch3: ; ed368
 	note G_, 1
 	octave 4
 	note G_, 1
-Music_KantoWildBattle_branch_ed39e: ; ed39e
+Music_KantoWildBattle_branch_ed39e:
 	notetype $c, $14
 	octave 5
 	note G_, 1
@@ -1222,4 +1213,3 @@ Music_KantoWildBattle_branch_ed39e: ; ed39e
 	note G_, 16
 	note G_, 16
 	loopchannel 0, Music_KantoWildBattle_branch_ed39e
-; ed5c6
diff --git a/audio/music/lakeofrage.asm b/audio/music/lakeofrage.asm
index 4bfd8111b..4f7154fd6 100644
--- a/audio/music/lakeofrage.asm
+++ b/audio/music/lakeofrage.asm
@@ -1,11 +1,10 @@
-Music_LakeOfRage: ; ee6c5
+Music_LakeOfRage:
 	musicheader 4, 1, Music_LakeOfRage_Ch1
 	musicheader 1, 2, Music_LakeOfRage_Ch2
 	musicheader 1, 3, Music_LakeOfRage_Ch3
 	musicheader 1, 4, Music_LakeOfRage_Ch4
-; ee6d1
 
-Music_LakeOfRage_Ch1: ; ee6d1
+Music_LakeOfRage_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
@@ -19,7 +18,7 @@ Music_LakeOfRage_Ch1: ; ee6d1
 	note D_, 6
 	note D_, 6
 	note E_, 4
-Music_LakeOfRage_branch_ee6e9: ; ee6e9
+Music_LakeOfRage_branch_ee6e9:
 	intensity $b5
 	note F#, 6
 	note E_, 6
@@ -93,9 +92,8 @@ Music_LakeOfRage_branch_ee6e9: ; ee6e9
 	intensity $a7
 	note D_, 6
 	loopchannel 0, Music_LakeOfRage_branch_ee6e9
-; ee749
 
-Music_LakeOfRage_Ch2: ; ee749
+Music_LakeOfRage_Ch2:
 	dutycycle $3
 	vibrato $20, $44
 	stereopanning $ff
@@ -108,7 +106,7 @@ Music_LakeOfRage_Ch2: ; ee749
 	note A_, 8
 	intensity $a7
 	note A_, 8
-Music_LakeOfRage_branch_ee75e: ; ee75e
+Music_LakeOfRage_branch_ee75e:
 	notetype $8, $c7
 	octave 4
 	note D_, 16
@@ -183,9 +181,8 @@ Music_LakeOfRage_branch_ee75e: ; ee75e
 	notetype $c, $c7
 	note A_, 16
 	loopchannel 0, Music_LakeOfRage_branch_ee75e
-; ee7c1
 
-Music_LakeOfRage_Ch3: ; ee7c1
+Music_LakeOfRage_Ch3:
 	stereopanning $f
 	notetype $c, $16
 	octave 3
@@ -198,7 +195,7 @@ Music_LakeOfRage_Ch3: ; ee7c1
 	note F#, 4
 	note __, 2
 	note E_, 4
-Music_LakeOfRage_branch_ee7d0: ; ee7d0
+Music_LakeOfRage_branch_ee7d0:
 	octave 3
 	note D_, 4
 	octave 2
@@ -297,13 +294,12 @@ Music_LakeOfRage_branch_ee7d0: ; ee7d0
 	octave 2
 	note A_, 2
 	loopchannel 0, Music_LakeOfRage_branch_ee7d0
-; ee835
 
-Music_LakeOfRage_Ch4: ; ee835
+Music_LakeOfRage_Ch4:
 	stereopanning $f0
 	togglenoise $3
 	notetype $c
-Music_LakeOfRage_branch_ee83b: ; ee83b
+Music_LakeOfRage_branch_ee83b:
 	note D_, 2
 	note D_, 1
 	note D_, 1
@@ -324,4 +320,3 @@ Music_LakeOfRage_branch_ee83b: ; ee83b
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_LakeOfRage_branch_ee83b
-; ee852
diff --git a/audio/music/lakeofragerocketradio.asm b/audio/music/lakeofragerocketradio.asm
index ff7176fca..512db764f 100644
--- a/audio/music/lakeofragerocketradio.asm
+++ b/audio/music/lakeofragerocketradio.asm
@@ -1,17 +1,16 @@
-Music_LakeOfRageRocketRadio: ; ef5b1
+Music_LakeOfRageRocketRadio:
 	musicheader 3, 1, Music_LakeOfRageRocketRadio_Ch1
 	musicheader 1, 2, Music_LakeOfRageRocketRadio_Ch2
 	musicheader 1, 3, Music_LakeOfRageRocketRadio_Ch3
-; ef5ba
 
-Music_LakeOfRageRocketRadio_Ch1: ; ef5ba
+Music_LakeOfRageRocketRadio_Ch1:
 	tempo 160
 	volume $77
 	dutycycle $1
 	tone $1118
 	vibrato $0, $f0
 	stereopanning $f0
-Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9
+Music_LakeOfRageRocketRadio_branch_ef5c9:
 	notetype $c, $a7
 	octave 7
 	note G_, 4
@@ -20,20 +19,17 @@ Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9
 	note F#, 4
 	note __, 16
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
-; ef5d6
 
-Music_LakeOfRageRocketRadio_Ch2: ; ef5d6
+Music_LakeOfRageRocketRadio_Ch2:
 	dutycycle $1
 	vibrato $13, $e8
 	notetype $c, $a7
 	note __, 2
 	stereopanning $f
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
-; ef5e5
 
-Music_LakeOfRageRocketRadio_Ch3: ; ef5e5
+Music_LakeOfRageRocketRadio_Ch3:
 	notetype $c, $26
 	vibrato $10, $44
 	note __, 4
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
-; ef5f0
diff --git a/audio/music/lavendertown.asm b/audio/music/lavendertown.asm
index 11608cf9b..6384b7018 100644
--- a/audio/music/lavendertown.asm
+++ b/audio/music/lavendertown.asm
@@ -1,12 +1,11 @@
-Music_LavenderTown: ; ef72f
+Music_LavenderTown:
 	musicheader 3, 1, Music_LavenderTown_Ch1
 	musicheader 1, 2, Music_LavenderTown_Ch2
 	musicheader 1, 3, Music_LavenderTown_Ch3
-; ef738
 
 	db $3
 
-Music_LavenderTown_Ch1: ; ef739
+Music_LavenderTown_Ch1:
 	tempo 160
 	volume $77
 	stereopanning $f
@@ -17,7 +16,7 @@ Music_LavenderTown_Ch1: ; ef739
 	note __, 16
 	note __, 16
 	note __, 16
-Music_LavenderTown_branch_ef74c: ; ef74c
+Music_LavenderTown_branch_ef74c:
 	callchannel Music_LavenderTown_branch_ef7fd
 	intensity $93
 	octave 5
@@ -103,7 +102,7 @@ Music_LavenderTown_branch_ef74c: ; ef74c
 	octave 3
 	note A_, 2
 	note F_, 2
-Music_LavenderTown_branch_ef7ca: ; ef7ca
+Music_LavenderTown_branch_ef7ca:
 	octave 3
 	note C_, 2
 	note E_, 2
@@ -149,9 +148,8 @@ Music_LavenderTown_branch_ef7ca: ; ef7ca
 	note B_, 8
 	note B_, 8
 	loopchannel 0, Music_LavenderTown_branch_ef74c
-; ef7fd
 
-Music_LavenderTown_branch_ef7fd: ; ef7fd
+Music_LavenderTown_branch_ef7fd:
 	intensity $83
 	octave 5
 	note C_, 2
@@ -242,9 +240,8 @@ Music_LavenderTown_branch_ef7fd: ; ef7fd
 	intensity $43
 	note F_, 2
 	endchannel
-; ef87f
 
-Music_LavenderTown_branch_ef87f: ; ef87f
+Music_LavenderTown_branch_ef87f:
 	intensity $93
 	octave 5
 	note G_, 2
@@ -263,13 +260,12 @@ Music_LavenderTown_branch_ef87f: ; ef87f
 	intensity $43
 	note G_, 2
 	endchannel
-; ef899
 
-Music_LavenderTown_Ch2: ; ef899
+Music_LavenderTown_Ch2:
 	dutycycle $1
 	vibrato $8, $24
 	stereopanning $ff
-Music_LavenderTown_branch_ef8a0: ; ef8a0
+Music_LavenderTown_branch_ef8a0:
 	notetype $c, $a3
 	octave 5
 	note C_, 2
@@ -305,7 +301,7 @@ Music_LavenderTown_branch_ef8a0: ; ef8a0
 	note D_, 2
 	intensity $63
 	note D_, 2
-Music_LavenderTown_branch_ef8d7: ; ef8d7
+Music_LavenderTown_branch_ef8d7:
 	intensity $b5
 	callchannel Music_LavenderTown_branch_ef915
 	octave 2
@@ -358,9 +354,8 @@ Music_LavenderTown_branch_ef8d7: ; ef8d7
 	note F_, 1
 	note G_, 6
 	loopchannel 0, Music_LavenderTown_branch_ef8d7
-; ef915
 
-Music_LavenderTown_branch_ef915: ; ef915
+Music_LavenderTown_branch_ef915:
 	octave 2
 	note C_, 4
 	note G_, 4
@@ -390,9 +385,8 @@ Music_LavenderTown_branch_ef915: ; ef915
 	note A_, 4
 	note C_, 4
 	endchannel
-; ef932
 
-Music_LavenderTown_Ch3: ; ef932
+Music_LavenderTown_Ch3:
 	vibrato $12, $24
 	notetype $c, $13
 	stereopanning $f0
@@ -403,7 +397,7 @@ Music_LavenderTown_Ch3: ; ef932
 	octave 5
 	note E_, 4
 	note F_, 4
-Music_LavenderTown_branch_ef941: ; ef941
+Music_LavenderTown_branch_ef941:
 	intensity $12
 	octave 5
 	note G_, 4
@@ -518,4 +512,3 @@ Music_LavenderTown_branch_ef941: ; ef941
 	note E_, 2
 	note F_, 2
 	loopchannel 0, Music_LavenderTown_branch_ef941
-; ef9bc
diff --git a/audio/music/lighthouse.asm b/audio/music/lighthouse.asm
index 0a0dc0637..9846e7ec6 100644
--- a/audio/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
@@ -1,18 +1,17 @@
-Music_Lighthouse: ; ee569
+Music_Lighthouse:
 	musicheader 4, 1, Music_Lighthouse_Ch1
 	musicheader 1, 2, Music_Lighthouse_Ch2
 	musicheader 1, 3, Music_Lighthouse_Ch3
 	musicheader 1, 4, Music_Lighthouse_Ch4
-; ee575
 
-Music_Lighthouse_Ch1: ; ee575
+Music_Lighthouse_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
 	tone $0004
 	vibrato $8, $45
 	stereopanning $f
-Music_Lighthouse_branch_ee584: ; ee584
+Music_Lighthouse_branch_ee584:
 	notetype $c, $b3
 	octave 3
 	note C#, 8
@@ -128,13 +127,12 @@ Music_Lighthouse_branch_ee584: ; ee584
 	note A_, 2
 	note G#, 8
 	loopchannel 0, Music_Lighthouse_branch_ee584
-; ee5fc
 
-Music_Lighthouse_Ch2: ; ee5fc
+Music_Lighthouse_Ch2:
 	dutycycle $3
 	tone $0002
 	vibrato $10, $45
-Music_Lighthouse_branch_ee604: ; ee604
+Music_Lighthouse_branch_ee604:
 	notetype $c, $c5
 	octave 3
 	note G#, 12
@@ -211,12 +209,11 @@ Music_Lighthouse_branch_ee604: ; ee604
 	note C#, 2
 	note C_, 8
 	loopchannel 0, Music_Lighthouse_branch_ee604
-; ee656
 
-Music_Lighthouse_Ch3: ; ee656
+Music_Lighthouse_Ch3:
 	notetype $c, $19
 	stereopanning $f0
-Music_Lighthouse_branch_ee65b: ; ee65b
+Music_Lighthouse_branch_ee65b:
 	octave 2
 	note G#, 2
 	note __, 2
@@ -226,7 +223,7 @@ Music_Lighthouse_branch_ee65b: ; ee65b
 	note __, 2
 	note G_, 2
 	note __, 2
-Music_Lighthouse_branch_ee664: ; ee664
+Music_Lighthouse_branch_ee664:
 	note G#, 2
 	note __, 2
 	note D#, 2
@@ -255,7 +252,7 @@ Music_Lighthouse_branch_ee664: ; ee664
 	octave 3
 	note C_, 2
 	note __, 2
-Music_Lighthouse_branch_ee683: ; ee683
+Music_Lighthouse_branch_ee683:
 	note C#, 2
 	note __, 2
 	octave 2
@@ -277,7 +274,7 @@ Music_Lighthouse_branch_ee683: ; ee683
 	octave 3
 	note D#, 2
 	note F#, 2
-Music_Lighthouse_branch_ee69b: ; ee69b
+Music_Lighthouse_branch_ee69b:
 	note E_, 2
 	note __, 2
 	octave 2
@@ -290,12 +287,11 @@ Music_Lighthouse_branch_ee69b: ; ee69b
 	note __, 2
 	loopchannel 8, Music_Lighthouse_branch_ee69b
 	loopchannel 0, Music_Lighthouse_branch_ee65b
-; ee6ad
 
-Music_Lighthouse_Ch4: ; ee6ad
+Music_Lighthouse_Ch4:
 	togglenoise $0
 	notetype $c
-Music_Lighthouse_branch_ee6b1: ; ee6b1
+Music_Lighthouse_branch_ee6b1:
 	stereopanning $f
 	note G#, 4
 	note F_, 2
@@ -311,4 +307,3 @@ Music_Lighthouse_branch_ee6b1: ; ee6b1
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_Lighthouse_branch_ee6b1
-; ee6c5
diff --git a/audio/music/lookbeauty.asm b/audio/music/lookbeauty.asm
index a7ee254bb..313f23663 100644
--- a/audio/music/lookbeauty.asm
+++ b/audio/music/lookbeauty.asm
@@ -1,11 +1,10 @@
-Music_LookBeauty: ; eee3e
+Music_LookBeauty:
 	musicheader 4, 1, Music_LookBeauty_Ch1
 	musicheader 1, 2, Music_LookBeauty_Ch2
 	musicheader 1, 3, Music_LookBeauty_Ch3
 	musicheader 1, 4, Music_LookBeauty_Ch4
-; eee4a
 
-Music_LookBeauty_Ch1: ; eee4a
+Music_LookBeauty_Ch1:
 	stereopanning $f
 	vibrato $12, $25
 	dutycycle $2
@@ -17,7 +16,7 @@ Music_LookBeauty_Ch1: ; eee4a
 	octave 4
 	note C_, 8
 	dutycycle $3
-Music_LookBeauty_branch_eee5f: ; eee5f
+Music_LookBeauty_branch_eee5f:
 	note __, 4
 	octave 3
 	note D_, 1
@@ -76,9 +75,8 @@ Music_LookBeauty_branch_eee5f: ; eee5f
 	octave 4
 	note C_, 1
 	loopchannel 0, Music_LookBeauty_branch_eee5f
-; eee9c
 
-Music_LookBeauty_Ch2: ; eee9c
+Music_LookBeauty_Ch2:
 	stereopanning $f0
 	vibrato $10, $23
 	dutycycle $2
@@ -113,7 +111,7 @@ Music_LookBeauty_Ch2: ; eee9c
 	note F#, 1
 	note __, 1
 	dutycycle $3
-Music_LookBeauty_branch_eeec5: ; eeec5
+Music_LookBeauty_branch_eeec5:
 	notetype $c, $c7
 	note G_, 16
 	note A_, 8
@@ -154,9 +152,8 @@ Music_LookBeauty_branch_eeec5: ; eeec5
 	note F#, 8
 	note A_, 8
 	loopchannel 0, Music_LookBeauty_branch_eeec5
-; eeefa
 
-Music_LookBeauty_Ch3: ; eeefa
+Music_LookBeauty_Ch3:
 	stereopanning $ff
 	vibrato $8, $12
 	notetype $c, $15
@@ -173,7 +170,7 @@ Music_LookBeauty_Ch3: ; eeefa
 	octave 3
 	note D_, 7
 	note F#, 1
-Music_LookBeauty_branch_eef0f: ; eef0f
+Music_LookBeauty_branch_eef0f:
 	note G_, 4
 	octave 4
 	note B_, 1
@@ -295,22 +292,20 @@ Music_LookBeauty_branch_eef0f: ; eef0f
 	octave 3
 	note D_, 8
 	loopchannel 0, Music_LookBeauty_branch_eef0f
-; eef8b
 
-Music_LookBeauty_Ch4: ; eef8b
+Music_LookBeauty_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 16
 	note __, 16
-Music_LookBeauty_branch_eef91: ; eef91
+Music_LookBeauty_branch_eef91:
 	callchannel Music_LookBeauty_branch_eefa1
 	callchannel Music_LookBeauty_branch_eefa1
 	callchannel Music_LookBeauty_branch_eefa1
 	callchannel Music_LookBeauty_branch_eefa1
 	loopchannel 0, Music_LookBeauty_branch_eef91
-; eefa1
 
-Music_LookBeauty_branch_eefa1: ; eefa1
+Music_LookBeauty_branch_eefa1:
 	note F#, 2
 	note G_, 2
 	note D_, 2
@@ -328,4 +323,3 @@ Music_LookBeauty_branch_eefa1: ; eefa1
 	note D_, 2
 	note G_, 2
 	endchannel
-; eefb2
diff --git a/audio/music/lookhiker.asm b/audio/music/lookhiker.asm
index 0a86a3026..9a394eb7b 100644
--- a/audio/music/lookhiker.asm
+++ b/audio/music/lookhiker.asm
@@ -1,11 +1,10 @@
-Music_LookHiker: ; f7411
+Music_LookHiker:
 	musicheader 4, 1, Music_LookHiker_Ch1
 	musicheader 1, 2, Music_LookHiker_Ch2
 	musicheader 1, 3, Music_LookHiker_Ch3
 	musicheader 1, 4, Music_LookHiker_Ch4
-; f741d
 
-Music_LookHiker_Ch1: ; f741d
+Music_LookHiker_Ch1:
 	tempo 132
 	volume $77
 	tone $0001
@@ -17,7 +16,7 @@ Music_LookHiker_Ch1: ; f741d
 	note F#, 2
 	note F_, 2
 	note F#, 8
-Music_LookHiker_branch_f7433: ; f7433
+Music_LookHiker_branch_f7433:
 	note D_, 2
 	note D#, 2
 	note E_, 2
@@ -31,9 +30,8 @@ Music_LookHiker_branch_f7433: ; f7433
 	note F#, 2
 	note __, 6
 	loopchannel 0, Music_LookHiker_branch_f7433
-; f7443
 
-Music_LookHiker_Ch2: ; f7443
+Music_LookHiker_Ch2:
 	dutycycle $0
 	notetype $c, $a1
 	note __, 4
@@ -50,7 +48,7 @@ Music_LookHiker_Ch2: ; f7443
 	note F#, 1
 	note D_, 1
 	intensity $a1
-Music_LookHiker_branch_f7457: ; f7457
+Music_LookHiker_branch_f7457:
 	octave 1
 	note B_, 1
 	note B_, 2
@@ -68,9 +66,8 @@ Music_LookHiker_branch_f7457: ; f7457
 	note F#, 1
 	note D_, 1
 	loopchannel 0, Music_LookHiker_branch_f7457
-; f746b
 
-Music_LookHiker_Ch3: ; f746b
+Music_LookHiker_Ch3:
 	vibrato $12, $24
 	stereopanning $f0
 	notetype $c, $14
@@ -78,7 +75,7 @@ Music_LookHiker_Ch3: ; f746b
 	note B_, 2
 	note A#, 2
 	note B_, 8
-Music_LookHiker_branch_f7477: ; f7477
+Music_LookHiker_branch_f7477:
 	octave 5
 	note D#, 2
 	note D_, 2
@@ -91,9 +88,8 @@ Music_LookHiker_branch_f7477: ; f7477
 	note A#, 2
 	callchannel Music_LookHiker_branch_f748a
 	loopchannel 0, Music_LookHiker_branch_f7477
-; f748a
 
-Music_LookHiker_branch_f748a: ; f748a
+Music_LookHiker_branch_f748a:
 	octave 4
 	note B_, 2
 	note __, 4
@@ -104,17 +100,15 @@ Music_LookHiker_branch_f748a: ; f748a
 	note B_, 2
 	note __, 6
 	endchannel
-; f7494
 
-Music_LookHiker_Ch4: ; f7494
+Music_LookHiker_Ch4:
 	togglenoise $3
 	notetype $c
 	note F_, 4
 	note __, 16
-Music_LookHiker_branch_f749a: ; f749a
+Music_LookHiker_branch_f749a:
 	note D#, 2
 	note G_, 2
 	note D_, 2
 	note G_, 2
 	loopchannel 0, Music_LookHiker_branch_f749a
-; f74a2
diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm
index 6acbb5ab1..dc1dbee87 100644
--- a/audio/music/lookkimonogirl.asm
+++ b/audio/music/lookkimonogirl.asm
@@ -1,12 +1,11 @@
-Music_LookKimonoGirl: ; f79b8
+Music_LookKimonoGirl:
 	musicheader 3, 1, Music_LookKimonoGirl_Ch1
 	musicheader 1, 2, Music_LookKimonoGirl_Ch2
 	musicheader 1, 3, Music_LookKimonoGirl_Ch3
-; f79c1
 
 	db $3
 
-Music_LookKimonoGirl_Ch1: ; f79c2
+Music_LookKimonoGirl_Ch1:
 	tempo 160
 	volume $77
 	stereopanning $f
@@ -15,7 +14,7 @@ Music_LookKimonoGirl_Ch1: ; f79c2
 	tone $0001
 	callchannel Music_LookKimonoGirl_branch_f7aa8
 	tone 0
-Music_LookKimonoGirl_branch_f79d7: ; f79d7
+Music_LookKimonoGirl_branch_f79d7:
 	notetype $c, $b2
 	callchannel Music_LookKimonoGirl_branch_f7a13
 	callchannel Music_LookKimonoGirl_branch_f7a13
@@ -49,9 +48,8 @@ Music_LookKimonoGirl_branch_f79d7: ; f79d7
 	octave 3
 	note A_, 1
 	loopchannel 0, Music_LookKimonoGirl_branch_f79d7
-; f7a13
 
-Music_LookKimonoGirl_branch_f7a13: ; f7a13
+Music_LookKimonoGirl_branch_f7a13:
 	intensity $b4
 	octave 2
 	note F_, 1
@@ -77,9 +75,8 @@ Music_LookKimonoGirl_branch_f7a13: ; f7a13
 	octave 4
 	note D_, 1
 	endchannel
-; f7a34
 
-Music_LookKimonoGirl_branch_f7a34: ; f7a34
+Music_LookKimonoGirl_branch_f7a34:
 	intensity $b4
 	octave 2
 	note E_, 1
@@ -105,14 +102,13 @@ Music_LookKimonoGirl_branch_f7a34: ; f7a34
 	octave 4
 	note D_, 1
 	endchannel
-; f7a55
 
-Music_LookKimonoGirl_Ch2: ; f7a55
+Music_LookKimonoGirl_Ch2:
 	dutycycle $0
 	notetype $6, $a7
 	stereopanning $f0
 	callchannel Music_LookKimonoGirl_branch_f7aa8
-Music_LookKimonoGirl_branch_f7a5f: ; f7a5f
+Music_LookKimonoGirl_branch_f7a5f:
 	dutycycle $3
 	notetype $c, $91
 	octave 5
@@ -156,9 +152,8 @@ Music_LookKimonoGirl_branch_f7a5f: ; f7a5f
 	note D_, 1
 	callchannel Music_LookKimonoGirl_branch_f7a94
 	loopchannel 0, Music_LookKimonoGirl_branch_f7a5f
-; f7a94
 
-Music_LookKimonoGirl_branch_f7a94: ; f7a94
+Music_LookKimonoGirl_branch_f7a94:
 	octave 5
 	note B_, 1
 	note A_, 1
@@ -179,9 +174,8 @@ Music_LookKimonoGirl_branch_f7a94: ; f7a94
 	note B_, 1
 	note E_, 1
 	endchannel
-; f7aa8
 
-Music_LookKimonoGirl_branch_f7aa8: ; f7aa8
+Music_LookKimonoGirl_branch_f7aa8:
 	octave 4
 	note E_, 1
 	octave 5
@@ -215,9 +209,8 @@ Music_LookKimonoGirl_branch_f7aa8: ; f7aa8
 	note E_, 1
 	note E_, 1
 	endchannel
-; f7ad4
 
-Music_LookKimonoGirl_Ch3: ; f7ad4
+Music_LookKimonoGirl_Ch3:
 	stereopanning $ff
 	vibrato $12, $24
 	notetype $6, $13
@@ -233,7 +226,7 @@ Music_LookKimonoGirl_Ch3: ; f7ad4
 	octave 5
 	note D_, 2
 	note E_, 2
-Music_LookKimonoGirl_branch_f7aec: ; f7aec
+Music_LookKimonoGirl_branch_f7aec:
 	octave 5
 	note D_, 4
 	note E_, 4
@@ -270,4 +263,3 @@ Music_LookKimonoGirl_branch_f7aec: ; f7aec
 	note D_, 8
 	note E_, 8
 	loopchannel 0, Music_LookKimonoGirl_branch_f7aec
-; f7b13
diff --git a/audio/music/looklass.asm b/audio/music/looklass.asm
index 1aecb3e34..802716c14 100644
--- a/audio/music/looklass.asm
+++ b/audio/music/looklass.asm
@@ -1,11 +1,10 @@
-Music_LookLass: ; ed79b
+Music_LookLass:
 	musicheader 4, 1, Music_LookLass_Ch1
 	musicheader 1, 2, Music_LookLass_Ch2
 	musicheader 1, 3, Music_LookLass_Ch3
 	musicheader 1, 4, Music_LookLass_Ch4
-; ed7a7
 
-Music_LookLass_Ch1: ; ed7a7
+Music_LookLass_Ch1:
 	tempo 132
 	volume $77
 	tone $0001
@@ -18,7 +17,7 @@ Music_LookLass_Ch1: ; ed7a7
 	note B_, 14
 	stereopanning $f
 	dutycycle $0
-Music_LookLass_branch_ed7bd: ; ed7bd
+Music_LookLass_branch_ed7bd:
 	intensity $a2
 	octave 3
 	note E_, 4
@@ -29,14 +28,13 @@ Music_LookLass_branch_ed7bd: ; ed7bd
 	intensity $a3
 	note B_, 2
 	loopchannel 0, Music_LookLass_branch_ed7bd
-; ed7cd
 
-Music_LookLass_Ch2: ; ed7cd
+Music_LookLass_Ch2:
 	stereopanning $f0
 	dutycycle $0
 	notetype $c, $83
 	note __, 16
-Music_LookLass_branch_ed7d5: ; ed7d5
+Music_LookLass_branch_ed7d5:
 	intensity $92
 	octave 2
 	note B_, 4
@@ -48,9 +46,8 @@ Music_LookLass_branch_ed7d5: ; ed7d5
 	octave 3
 	note G#, 2
 	loopchannel 0, Music_LookLass_branch_ed7d5
-; ed7e6
 
-Music_LookLass_Ch3: ; ed7e6
+Music_LookLass_Ch3:
 	notetype $c, $10
 	note __, 8
 	octave 6
@@ -58,7 +55,7 @@ Music_LookLass_Ch3: ; ed7e6
 	note D#, 2
 	note C#, 2
 	note C_, 2
-Music_LookLass_branch_ed7ef: ; ed7ef
+Music_LookLass_branch_ed7ef:
 	octave 5
 	note B_, 2
 	note __, 2
@@ -99,13 +96,12 @@ Music_LookLass_branch_ed7ef: ; ed7ef
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_LookLass_branch_ed7ef
-; ed81a
 
-Music_LookLass_Ch4: ; ed81a
+Music_LookLass_Ch4:
 	togglenoise $4
 	notetype $c
 	note C_, 16
-Music_LookLass_branch_ed81f: ; ed81f
+Music_LookLass_branch_ed81f:
 	notetype $6
 	note D_, 8
 	note C#, 8
@@ -116,4 +112,3 @@ Music_LookLass_branch_ed81f: ; ed81f
 	note C#, 1
 	note C#, 1
 	loopchannel 0, Music_LookLass_branch_ed81f
-; ed82d
diff --git a/audio/music/lookmysticalman.asm b/audio/music/lookmysticalman.asm
index 1c0ab67b4..675c937ee 100644
--- a/audio/music/lookmysticalman.asm
+++ b/audio/music/lookmysticalman.asm
@@ -1,11 +1,10 @@
-Music_LookMysticalMan: ; 17843b
+Music_LookMysticalMan:
 	musicheader 4, 1, Music_LookMysticalMan_Ch1
 	musicheader 1, 2, Music_LookMysticalMan_Ch2
 	musicheader 1, 3, Music_LookMysticalMan_Ch3
 	musicheader 1, 4, Music_LookMysticalMan_Ch4
-; 178447
 
-Music_LookMysticalMan_Ch1: ; 178447
+Music_LookMysticalMan_Ch1:
 	tempo 136
 	volume $77
 	vibrato $a, $34
@@ -13,7 +12,7 @@ Music_LookMysticalMan_Ch1: ; 178447
 	stereopanning $f
 	notetype $c, $b3
 	note __, 8
-Music_LookMysticalMan_branch_178458: ; 178458
+Music_LookMysticalMan_branch_178458:
 	dutycycle $3
 	notetype $6, $96
 	octave 3
@@ -94,7 +93,7 @@ Music_LookMysticalMan_branch_178458: ; 178458
 	note A#, 6
 	dutycycle $2
 	intensity $72
-Music_LookMysticalMan_branch_1784b4: ; 1784b4
+Music_LookMysticalMan_branch_1784b4:
 	octave 5
 	note D_, 2
 	octave 4
@@ -124,7 +123,7 @@ Music_LookMysticalMan_branch_1784b4: ; 1784b4
 	note D_, 2
 	note F#, 2
 	note B_, 2
-Music_LookMysticalMan_branch_1784d4: ; 1784d4
+Music_LookMysticalMan_branch_1784d4:
 	octave 5
 	note D_, 2
 	octave 4
@@ -156,9 +155,8 @@ Music_LookMysticalMan_branch_1784d4: ; 1784d4
 	note F#, 2
 	note A#, 2
 	loopchannel 0, Music_LookMysticalMan_branch_178458
-; 1784f9
 
-Music_LookMysticalMan_branch_1784f9: ; 1784f9
+Music_LookMysticalMan_branch_1784f9:
 	note D_, 16
 	octave 4
 	note D_, 2
@@ -192,14 +190,13 @@ Music_LookMysticalMan_branch_1784f9: ; 1784f9
 	note B_, 2
 	note A_, 6
 	endchannel
-; 17851a
 
-Music_LookMysticalMan_Ch2: ; 17851a
+Music_LookMysticalMan_Ch2:
 	dutycycle $3
 	vibrato $a, $34
 	notetype $c, $b3
 	note __, 8
-Music_LookMysticalMan_branch_178523: ; 178523
+Music_LookMysticalMan_branch_178523:
 	stereopanning $f0
 	notetype $6, $b8
 	octave 3
@@ -297,9 +294,8 @@ Music_LookMysticalMan_branch_178523: ; 178523
 	note A#, 16
 	note __, 2
 	loopchannel 0, Music_LookMysticalMan_branch_178523
-; 17859a
 
-Music_LookMysticalMan_branch_17859a: ; 17859a
+Music_LookMysticalMan_branch_17859a:
 	note B_, 2
 	note __, 2
 	octave 4
@@ -343,9 +339,8 @@ Music_LookMysticalMan_branch_17859a: ; 17859a
 	note F#, 2
 	note E_, 6
 	endchannel
-; 1785c8
 
-Music_LookMysticalMan_branch_1785c8: ; 1785c8
+Music_LookMysticalMan_branch_1785c8:
 	note C#, 8
 	intensity $88
 	note C_, 1
@@ -361,12 +356,11 @@ Music_LookMysticalMan_branch_1785c8: ; 1785c8
 	note __, 1
 	intensity $b8
 	endchannel
-; 1785db
 
-Music_LookMysticalMan_Ch3: ; 1785db
+Music_LookMysticalMan_Ch3:
 	notetype $6, $16
 	note __, 16
-Music_LookMysticalMan_branch_1785df: ; 1785df
+Music_LookMysticalMan_branch_1785df:
 	octave 2
 	note B_, 4
 	octave 3
@@ -421,7 +415,7 @@ Music_LookMysticalMan_branch_1785df: ; 1785df
 	note A_, 2
 	octave 3
 	note E_, 2
-Music_LookMysticalMan_branch_178615: ; 178615
+Music_LookMysticalMan_branch_178615:
 	octave 2
 	note F#, 4
 	note A#, 2
@@ -537,9 +531,8 @@ Music_LookMysticalMan_branch_178615: ; 178615
 	note B_, 8
 	note A#, 4
 	loopchannel 0, Music_LookMysticalMan_branch_1785df
-; 17868e
 
-Music_LookMysticalMan_Ch4: ; 17868e
+Music_LookMysticalMan_Ch4:
 	togglenoise $3
 	notetype $c
 	note D#, 2
@@ -547,7 +540,7 @@ Music_LookMysticalMan_Ch4: ; 17868e
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_LookMysticalMan_branch_178697: ; 178697
+Music_LookMysticalMan_branch_178697:
 	callchannel Music_LookMysticalMan_branch_1786d3
 	callchannel Music_LookMysticalMan_branch_1786d9
 	callchannel Music_LookMysticalMan_branch_1786d3
@@ -566,7 +559,7 @@ Music_LookMysticalMan_branch_178697: ; 178697
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_LookMysticalMan_branch_1786ba: ; 1786ba
+Music_LookMysticalMan_branch_1786ba:
 	note D_, 2
 	note D#, 2
 	note D_, 3
@@ -586,27 +579,24 @@ Music_LookMysticalMan_branch_1786ba: ; 1786ba
 	note D_, 1
 	loopchannel 2, Music_LookMysticalMan_branch_1786ba
 	loopchannel 0, Music_LookMysticalMan_branch_178697
-; 1786d3
 
-Music_LookMysticalMan_branch_1786d3: ; 1786d3
+Music_LookMysticalMan_branch_1786d3:
 	note D#, 4
 	note D_, 3
 	note D#, 3
 	note D#, 2
 	note D_, 4
 	endchannel
-; 1786d9
 
-Music_LookMysticalMan_branch_1786d9: ; 1786d9
+Music_LookMysticalMan_branch_1786d9:
 	note D#, 4
 	note D_, 3
 	note D_, 3
 	note D#, 2
 	note D_, 4
 	endchannel
-; 1786df
 
-Music_LookMysticalMan_branch_1786df: ; 1786df
+Music_LookMysticalMan_branch_1786df:
 	note D#, 4
 	note D_, 2
 	note D#, 1
@@ -616,4 +606,3 @@ Music_LookMysticalMan_branch_1786df: ; 1786df
 	note D_, 1
 	note D_, 1
 	endchannel
-; 1786e8
diff --git a/audio/music/lookofficer.asm b/audio/music/lookofficer.asm
index a8667afdb..75e527b75 100644
--- a/audio/music/lookofficer.asm
+++ b/audio/music/lookofficer.asm
@@ -1,10 +1,9 @@
-Music_LookOfficer: ; ed82d
+Music_LookOfficer:
 	musicheader 3, 1, Music_LookOfficer_Ch1
 	musicheader 1, 2, Music_LookOfficer_Ch2
 	musicheader 1, 3, Music_LookOfficer_Ch3
-; ed836
 
-Music_LookOfficer_Ch1: ; ed836
+Music_LookOfficer_Ch1:
 	tempo 116
 	volume $77
 	tone $0001
@@ -21,7 +20,7 @@ Music_LookOfficer_Ch1: ; ed836
 	intensity $2f
 	octave 3
 	note B_, 16
-Music_LookOfficer_branch_ed852: ; ed852
+Music_LookOfficer_branch_ed852:
 	intensity $82
 	note __, 4
 	note B_, 6
@@ -34,9 +33,8 @@ Music_LookOfficer_branch_ed852: ; ed852
 	note A#, 16
 	note A_, 16
 	loopchannel 0, Music_LookOfficer_branch_ed852
-; ed863
 
-Music_LookOfficer_Ch2: ; ed863
+Music_LookOfficer_Ch2:
 	vibrato $12, $34
 	dutycycle $3
 	notetype $c, $b7
@@ -61,7 +59,7 @@ Music_LookOfficer_Ch2: ; ed863
 	note B_, 2
 	octave 2
 	note D#, 2
-Music_LookOfficer_branch_ed882: ; ed882
+Music_LookOfficer_branch_ed882:
 	note E_, 2
 	note G#, 2
 	octave 3
@@ -78,9 +76,8 @@ Music_LookOfficer_branch_ed882: ; ed882
 	pitchoffset 0, C_
 	callchannel Music_LookOfficer_branch_ed89e
 	loopchannel 0, Music_LookOfficer_branch_ed882
-; ed89e
 
-Music_LookOfficer_branch_ed89e: ; ed89e
+Music_LookOfficer_branch_ed89e:
 	octave 1
 	note A_, 2
 	octave 2
@@ -96,9 +93,8 @@ Music_LookOfficer_branch_ed89e: ; ed89e
 	octave 2
 	note C#, 2
 	endchannel
-; ed8ad
 
-Music_LookOfficer_Ch3: ; ed8ad
+Music_LookOfficer_Ch3:
 	vibrato $14, $14
 	stereopanning $f0
 	notetype $c, $14
@@ -120,7 +116,7 @@ Music_LookOfficer_Ch3: ; ed8ad
 	note C#, 2
 	note __, 1
 	note D#, 2
-Music_LookOfficer_branch_ed8c8: ; ed8c8
+Music_LookOfficer_branch_ed8c8:
 	note E_, 6
 	note D#, 6
 	note C#, 4
@@ -139,4 +135,3 @@ Music_LookOfficer_branch_ed8c8: ; ed8c8
 	note E_, 8
 	note C#, 8
 	loopchannel 0, Music_LookOfficer_branch_ed8c8
-; ed8dd
diff --git a/audio/music/lookpokemaniac.asm b/audio/music/lookpokemaniac.asm
index f60d9ca64..4c4f8506e 100644
--- a/audio/music/lookpokemaniac.asm
+++ b/audio/music/lookpokemaniac.asm
@@ -1,10 +1,9 @@
-Music_LookPokemaniac: ; ebde1
+Music_LookPokemaniac:
 	musicheader 3, 1, Music_LookPokemaniac_Ch1
 	musicheader 1, 2, Music_LookPokemaniac_Ch2
 	musicheader 1, 3, Music_LookPokemaniac_Ch3
-; ebdea
 
-Music_LookPokemaniac_Ch1: ; ebdea
+Music_LookPokemaniac_Ch1:
 	stereopanning $f
 	tempo 144
 	volume $77
@@ -12,7 +11,7 @@ Music_LookPokemaniac_Ch1: ; ebdea
 	tone $0002
 	notetype $c, $b3
 	note __, 8
-Music_LookPokemaniac_branch_ebdfb: ; ebdfb
+Music_LookPokemaniac_branch_ebdfb:
 	note __, 4
 	octave 3
 	note A#, 1
@@ -27,9 +26,8 @@ Music_LookPokemaniac_branch_ebdfb: ; ebdfb
 	note __, 3
 	loopchannel 4, Music_LookPokemaniac_branch_ebdfb
 	loopchannel 0, Music_LookPokemaniac_branch_ebdfb
-; ebe12
 
-Music_LookPokemaniac_Ch2: ; ebe12
+Music_LookPokemaniac_Ch2:
 	stereopanning $ff
 	vibrato $2, $33
 	tone $0001
@@ -41,7 +39,7 @@ Music_LookPokemaniac_Ch2: ; ebe12
 	note C_, 1
 	octave 1
 	note A_, 4
-Music_LookPokemaniac_branch_ebe24: ; ebe24
+Music_LookPokemaniac_branch_ebe24:
 	octave 2
 	note C_, 2
 	note __, 2
@@ -59,7 +57,7 @@ Music_LookPokemaniac_branch_ebe24: ; ebe24
 	note D#, 1
 	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe24
-Music_LookPokemaniac_branch_ebe38: ; ebe38
+Music_LookPokemaniac_branch_ebe38:
 	octave 1
 	note A_, 2
 	note __, 2
@@ -79,9 +77,8 @@ Music_LookPokemaniac_branch_ebe38: ; ebe38
 	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe38
 	loopchannel 0, Music_LookPokemaniac_branch_ebe24
-; ebe51
 
-Music_LookPokemaniac_Ch3: ; ebe51
+Music_LookPokemaniac_Ch3:
 	stereopanning $f0
 	vibrato $6, $33
 	notetype $c, $15
@@ -93,15 +90,14 @@ Music_LookPokemaniac_Ch3: ; ebe51
 	octave 5
 	note C_, 4
 	intensity $10
-Music_LookPokemaniac_branch_ebe62: ; ebe62
+Music_LookPokemaniac_branch_ebe62:
 	callchannel Music_LookPokemaniac_branch_ebe70
 	intensity $14
 	callchannel Music_LookPokemaniac_branch_ebe70
 	intensity $10
 	loopchannel 0, Music_LookPokemaniac_branch_ebe62
-; ebe70
 
-Music_LookPokemaniac_branch_ebe70: ; ebe70
+Music_LookPokemaniac_branch_ebe70:
 	note A#, 6
 	note A_, 2
 	note G#, 2
@@ -161,4 +157,3 @@ Music_LookPokemaniac_branch_ebe70: ; ebe70
 	note C_, 1
 	note __, 1
 	endchannel
-; ebeab
diff --git a/audio/music/lookrival.asm b/audio/music/lookrival.asm
index e06852944..5eff9991a 100644
--- a/audio/music/lookrival.asm
+++ b/audio/music/lookrival.asm
@@ -1,11 +1,10 @@
-Music_LookRival: ; f4f79
+Music_LookRival:
 	musicheader 4, 1, Music_LookRival_Ch1
 	musicheader 1, 2, Music_LookRival_Ch2
 	musicheader 1, 3, Music_LookRival_Ch3
 	musicheader 1, 4, Music_LookRival_Ch4
-; f4f85
 
-Music_LookRival_Ch1: ; f4f85
+Music_LookRival_Ch1:
 	tempo 112
 	volume $77
 	dutycycle $1
@@ -34,8 +33,8 @@ Music_LookRival_Ch1: ; f4f85
 	note G#, 8
 	intensity $a6
 	note F#, 8
-Music_AfterTheRivalFight_branch_f4fb1: ; f4fb1
-Music_LookRival_branch_f4fb1: ; f4fb1
+Music_AfterTheRivalFight_branch_f4fb1:
+Music_LookRival_branch_f4fb1:
 	intensity $b5
 	note F_, 4
 	note D#, 2
@@ -99,7 +98,7 @@ Music_LookRival_branch_f4fb1: ; f4fb1
 	note G#, 8
 	note F_, 6
 	note C_, 2
-Music_LookRival_branch_f4ff7: ; f4ff7
+Music_LookRival_branch_f4ff7:
 	intensity $b2
 	note F_, 6
 	intensity $b7
@@ -115,9 +114,8 @@ Music_LookRival_branch_f4ff7: ; f4ff7
 	note G#, 6
 	note F#, 4
 	loopchannel 0, Music_LookRival_branch_f4fb1
-; f5010
 
-Music_LookRival_Ch2: ; f5010
+Music_LookRival_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	stereopanning $f0
@@ -138,8 +136,8 @@ Music_LookRival_Ch2: ; f5010
 	note D#, 10
 	intensity $b7
 	note D#, 16
-Music_AfterTheRivalFight_branch_f502e: ; f502e
-Music_LookRival_branch_f502e: ; f502e
+Music_AfterTheRivalFight_branch_f502e:
+Music_LookRival_branch_f502e:
 	intensity $c7
 	note C_, 12
 	intensity $c4
@@ -192,7 +190,7 @@ Music_LookRival_branch_f502e: ; f502e
 	note D#, 1
 	note D_, 1
 	note D#, 2
-Music_LookRival_branch_f5070: ; f5070
+Music_LookRival_branch_f5070:
 	intensity $c2
 	note C_, 6
 	intensity $c7
@@ -205,9 +203,8 @@ Music_LookRival_branch_f5070: ; f5070
 	intensity $c7
 	note D#, 10
 	loopchannel 0, Music_LookRival_branch_f502e
-; f5086
 
-Music_LookRival_Ch3: ; f5086
+Music_LookRival_Ch3:
 	notetype $c, $28
 	note __, 2
 	octave 4
@@ -229,8 +226,8 @@ Music_LookRival_Ch3: ; f5086
 	note C_, 2
 	note D#, 2
 	note F#, 2
-Music_AfterTheRivalFight_branch_f509d: ; f509d
-Music_LookRival_branch_f509d: ; f509d
+Music_AfterTheRivalFight_branch_f509d:
+Music_LookRival_branch_f509d:
 	callchannel Music_LookRival_branch_f50ef
 	loopchannel 3, Music_LookRival_branch_f509d
 	note F_, 4
@@ -293,9 +290,8 @@ Music_LookRival_branch_f509d: ; f509d
 	note F#, 2
 	note E_, 2
 	loopchannel 0, Music_LookRival_branch_f509d
-; f50ef
 
-Music_LookRival_branch_f50ef: ; f50ef
+Music_LookRival_branch_f50ef:
 	note F_, 2
 	note C_, 2
 	note D_, 2
@@ -304,9 +300,8 @@ Music_LookRival_branch_f50ef: ; f50ef
 	note D_, 2
 	note D#, 2
 	endchannel
-; f50f7
 
-Music_LookRival_branch_f50f7: ; f50f7
+Music_LookRival_branch_f50f7:
 	note A#, 2
 	note F_, 2
 	note G_, 2
@@ -315,9 +310,8 @@ Music_LookRival_branch_f50f7: ; f50f7
 	note G_, 2
 	note G#, 2
 	endchannel
-; f50ff
 
-Music_LookRival_branch_f50ff: ; f50ff
+Music_LookRival_branch_f50ff:
 	note A#, 4
 	note F_, 2
 	note G#, 4
@@ -325,9 +319,8 @@ Music_LookRival_branch_f50ff: ; f50ff
 	note G_, 2
 	note G#, 2
 	endchannel
-; f5106
 
-Music_LookRival_Ch4: ; f5106
+Music_LookRival_Ch4:
 	stereopanning $f0
 	togglenoise $3
 	notetype $c
@@ -343,8 +336,8 @@ Music_LookRival_Ch4: ; f5106
 	note D_, 2
 	note D_, 2
 	note D_, 2
-Music_AfterTheRivalFight_branch_f5118: ; f5118
-Music_LookRival_branch_f5118: ; f5118
+Music_AfterTheRivalFight_branch_f5118:
+Music_LookRival_branch_f5118:
 	note D#, 4
 	note D_, 2
 	note D#, 4
@@ -357,4 +350,3 @@ Music_LookRival_branch_f5118: ; f5118
 	note D_, 2
 	note D_, 2
 	loopchannel 0, Music_LookRival_branch_f5118
-; f5127
diff --git a/audio/music/lookrocket.asm b/audio/music/lookrocket.asm
index 518a9b7e0..bd0c0e434 100644
--- a/audio/music/lookrocket.asm
+++ b/audio/music/lookrocket.asm
@@ -1,11 +1,10 @@
-Music_LookRocket: ; f74a2
+Music_LookRocket:
 	musicheader 4, 1, Music_LookRocket_Ch1
 	musicheader 1, 2, Music_LookRocket_Ch2
 	musicheader 1, 3, Music_LookRocket_Ch3
 	musicheader 1, 4, Music_LookRocket_Ch4
-; f74ae
 
-Music_LookRocket_Ch1: ; f74ae
+Music_LookRocket_Ch1:
 	tempo 123
 	volume $77
 	pitchoffset 0, D_
@@ -18,7 +17,7 @@ Music_LookRocket_Ch1: ; f74ae
 	note D_, 1
 	callchannel Music_LookRocket_branch_f74e6
 	dutycycle $1
-Music_LookRocket_branch_f74c7: ; f74c7
+Music_LookRocket_branch_f74c7:
 	intensity $a8
 	callchannel Music_LookRocket_branch_f74f7
 	callchannel Music_LookRocket_branch_f758a
@@ -33,10 +32,9 @@ Music_LookRocket_branch_f74c7: ; f74c7
 	callchannel Music_LookRocket_branch_f750c
 	note __, 16
 	loopchannel 0, Music_LookRocket_branch_f74c7
-; f74e6
 
-Music_LookRocket_branch_f74e6: ; f74e6
-Music_RocketTheme_branch_f74e6: ; f74e6
+Music_LookRocket_branch_f74e6:
+Music_RocketTheme_branch_f74e6:
 	note D#, 1
 	note __, 1
 	note D_, 1
@@ -54,10 +52,9 @@ Music_RocketTheme_branch_f74e6: ; f74e6
 	note F_, 1
 	note G#, 1
 	endchannel
-; f74f7
 
-Music_LookRocket_branch_f74f7: ; f74f7
-Music_RocketTheme_branch_f74f7: ; f74f7
+Music_LookRocket_branch_f74f7:
+Music_RocketTheme_branch_f74f7:
 	note __, 2
 	octave 3
 	note D#, 1
@@ -79,10 +76,9 @@ Music_RocketTheme_branch_f74f7: ; f74f7
 	note F#, 1
 	note __, 1
 	endchannel
-; f750c
 
-Music_LookRocket_branch_f750c: ; f750c
-Music_RocketTheme_branch_f750c: ; f750c
+Music_LookRocket_branch_f750c:
+Music_RocketTheme_branch_f750c:
 	note __, 2
 	octave 2
 	note B_, 1
@@ -91,9 +87,8 @@ Music_RocketTheme_branch_f750c: ; f750c
 	note C_, 1
 	note __, 5
 	endchannel
-; f7514
 
-Music_LookRocket_Ch2: ; f7514
+Music_LookRocket_Ch2:
 	pitchoffset 0, D_
 	vibrato $4, $64
 	dutycycle $3
@@ -103,7 +98,7 @@ Music_LookRocket_Ch2: ; f7514
 	note C_, 1
 	note D_, 1
 	callchannel Music_LookRocket_branch_f7547
-Music_LookRocket_branch_f7526: ; f7526
+Music_LookRocket_branch_f7526:
 	intensity $b7
 	callchannel Music_LookRocket_branch_f758a
 	octave 5
@@ -118,10 +113,9 @@ Music_LookRocket_branch_f7526: ; f7526
 	callchannel Music_LookRocket_branch_f7568
 	callchannel Music_LookRocket_branch_f756f
 	loopchannel 0, Music_LookRocket_branch_f7526
-; f7547
 
-Music_LookRocket_branch_f7547: ; f7547
-Music_RocketTheme_branch_f7547: ; f7547
+Music_LookRocket_branch_f7547:
+Music_RocketTheme_branch_f7547:
 	note D#, 1
 	note __, 1
 	note D_, 1
@@ -134,10 +128,9 @@ Music_RocketTheme_branch_f7547: ; f7547
 	note B_, 6
 	dutycycle $0
 	endchannel
-; f7554
 
-Music_LookRocket_branch_f7554: ; f7554
-Music_RocketTheme_branch_f7554: ; f7554
+Music_LookRocket_branch_f7554:
+Music_RocketTheme_branch_f7554:
 	note __, 2
 	octave 4
 	note D#, 1
@@ -158,10 +151,9 @@ Music_RocketTheme_branch_f7554: ; f7554
 	note D#, 1
 	note __, 1
 	endchannel
-; f7568
 
-Music_LookRocket_branch_f7568: ; f7568
-Music_RocketTheme_branch_f7568: ; f7568
+Music_LookRocket_branch_f7568:
+Music_RocketTheme_branch_f7568:
 	note __, 2
 	octave 3
 	note F_, 1
@@ -169,10 +161,9 @@ Music_RocketTheme_branch_f7568: ; f7568
 	note F#, 1
 	note __, 5
 	endchannel
-; f756f
 
-Music_LookRocket_branch_f756f: ; f756f
-Music_RocketTheme_branch_f756f: ; f756f
+Music_LookRocket_branch_f756f:
+Music_RocketTheme_branch_f756f:
 	intensity $63
 	note G#, 1
 	note F_, 1
@@ -196,10 +187,9 @@ Music_RocketTheme_branch_f756f: ; f756f
 	note F_, 1
 	note D_, 1
 	endchannel
-; f758a
 
-Music_LookRocket_branch_f758a: ; f758a
-Music_RocketTheme_branch_f758a: ; f758a
+Music_LookRocket_branch_f758a:
+Music_RocketTheme_branch_f758a:
 	octave 3
 	note __, 2
 	note G_, 1
@@ -213,16 +203,15 @@ Music_RocketTheme_branch_f758a: ; f758a
 	note A_, 1
 	note __, 1
 	endchannel
-; f7597
 
-Music_LookRocket_Ch3: ; f7597
+Music_LookRocket_Ch3:
 	pitchoffset 0, D_
 	vibrato $4, $22
 	notetype $c, $14
 	stereopanning $f0
 	note __, 2
 	callchannel Music_LookRocket_branch_f75bf
-Music_LookRocket_branch_f75a5: ; f75a5
+Music_LookRocket_branch_f75a5:
 	callchannel Music_LookRocket_branch_f75fe
 	callchannel Music_LookRocket_branch_f75fe
 	intensity $24
@@ -232,10 +221,9 @@ Music_LookRocket_branch_f75a5: ; f75a5
 	callchannel Music_LookRocket_branch_f7623
 	callchannel Music_LookRocket_branch_f75e1
 	loopchannel 0, Music_LookRocket_branch_f75a5
-; f75bf
 
-Music_LookRocket_branch_f75bf: ; f75bf
-Music_RocketTheme_branch_f75bf: ; f75bf
+Music_LookRocket_branch_f75bf:
+Music_RocketTheme_branch_f75bf:
 	octave 3
 	note F_, 1
 	note __, 1
@@ -249,10 +237,9 @@ Music_RocketTheme_branch_f75bf: ; f75bf
 	octave 3
 	note D_, 6
 	endchannel
-; f75cc
 
-Music_LookRocket_branch_f75cc: ; f75cc
-Music_RocketTheme_branch_f75cc: ; f75cc
+Music_LookRocket_branch_f75cc:
+Music_RocketTheme_branch_f75cc:
 	octave 2
 	note G#, 1
 	note __, 1
@@ -274,10 +261,9 @@ Music_RocketTheme_branch_f75cc: ; f75cc
 	note F#, 1
 	note __, 1
 	endchannel
-; f75e1
 
-Music_LookRocket_branch_f75e1: ; f75e1
-Music_RocketTheme_branch_f75e1: ; f75e1
+Music_LookRocket_branch_f75e1:
+Music_RocketTheme_branch_f75e1:
 	intensity $24
 	octave 2
 	note G#, 1
@@ -305,10 +291,9 @@ Music_RocketTheme_branch_f75e1: ; f75e1
 	note G#, 1
 	note __, 1
 	endchannel
-; f75fe
 
-Music_LookRocket_branch_f75fe: ; f75fe
-Music_RocketTheme_branch_f75fe: ; f75fe
+Music_LookRocket_branch_f75fe:
+Music_RocketTheme_branch_f75fe:
 	note C_, 1
 	note __, 1
 	octave 4
@@ -346,10 +331,9 @@ Music_RocketTheme_branch_f75fe: ; f75fe
 	note A_, 1
 	note __, 1
 	endchannel
-; f7623
 
-Music_LookRocket_branch_f7623: ; f7623
-Music_RocketTheme_branch_f7623: ; f7623
+Music_LookRocket_branch_f7623:
+Music_RocketTheme_branch_f7623:
 	octave 2
 	note G#, 1
 	note __, 1
@@ -371,14 +355,13 @@ Music_RocketTheme_branch_f7623: ; f7623
 	note D#, 1
 	note C_, 1
 	endchannel
-; f7638
 
-Music_LookRocket_Ch4: ; f7638
+Music_LookRocket_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 2
 	callchannel Music_LookRocket_branch_f765c
-Music_LookRocket_branch_f7640: ; f7640
+Music_LookRocket_branch_f7640:
 	callchannel Music_LookRocket_branch_f7664
 	callchannel Music_LookRocket_branch_f7664
 	callchannel Music_LookRocket_branch_f7664
@@ -388,10 +371,9 @@ Music_LookRocket_branch_f7640: ; f7640
 	callchannel Music_LookRocket_branch_f7664
 	callchannel Music_LookRocket_branch_f765c
 	loopchannel 0, Music_LookRocket_branch_f7640
-; f765c
 
-Music_LookRocket_branch_f765c: ; f765c
-Music_RocketTheme_branch_f765c: ; f765c
+Music_LookRocket_branch_f765c:
+Music_RocketTheme_branch_f765c:
 	note C_, 8
 	note D_, 2
 	note D#, 2
@@ -400,10 +382,9 @@ Music_RocketTheme_branch_f765c: ; f765c
 	note D_, 1
 	note D_, 1
 	endchannel
-; f7664
 
-Music_LookRocket_branch_f7664: ; f7664
-Music_RocketTheme_branch_f7664: ; f7664
+Music_LookRocket_branch_f7664:
+Music_RocketTheme_branch_f7664:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -413,4 +394,3 @@ Music_RocketTheme_branch_f7664: ; f7664
 	note D_, 2
 	note F#, 2
 	endchannel
-; f766d
diff --git a/audio/music/looksage.asm b/audio/music/looksage.asm
index 28fa59455..e1b51c397 100644
--- a/audio/music/looksage.asm
+++ b/audio/music/looksage.asm
@@ -1,9 +1,8 @@
-Music_LookSage: ; ee35e
+Music_LookSage:
 	musicheader 2, 1, Music_LookSage_Ch1
 	musicheader 1, 3, Music_LookSage_Ch3
-; ee364
 
-Music_LookSage_Ch1: ; ee364
+Music_LookSage_Ch1:
 	tempo 144
 	stereopanning $f
 	volume $77
@@ -29,7 +28,7 @@ Music_LookSage_Ch1: ; ee364
 	note F_, 2
 	intensity $93
 	note F_, 2
-Music_LookSage_branch_ee38e: ; ee38e
+Music_LookSage_branch_ee38e:
 	intensity $b3
 	note D_, 2
 	intensity $93
@@ -101,9 +100,8 @@ Music_LookSage_branch_ee38e: ; ee38e
 	note B_, 2
 	callchannel Music_LookSage_branch_ee3fa
 	loopchannel 0, Music_LookSage_branch_ee38e
-; ee3fa
 
-Music_LookSage_branch_ee3fa: ; ee3fa
+Music_LookSage_branch_ee3fa:
 	intensity $b3
 	octave 2
 	note E_, 2
@@ -122,9 +120,8 @@ Music_LookSage_branch_ee3fa: ; ee3fa
 	intensity $93
 	note A_, 2
 	endchannel
-; ee414
 
-Music_LookSage_Ch3: ; ee414
+Music_LookSage_Ch3:
 	stereopanning $f0
 	vibrato $16, $23
 	notetype $c, $10
@@ -144,7 +141,7 @@ Music_LookSage_Ch3: ; ee414
 	note E_, 14
 	note G_, 1
 	note G#, 1
-Music_LookSage_branch_ee430: ; ee430
+Music_LookSage_branch_ee430:
 	note A_, 12
 	note B_, 4
 	note D_, 9
@@ -179,4 +176,3 @@ Music_LookSage_branch_ee430: ; ee430
 	note G_, 1
 	note G#, 1
 	loopchannel 0, Music_LookSage_branch_ee430
-; ee45f
diff --git a/audio/music/lookyoungster.asm b/audio/music/lookyoungster.asm
index bcc5d1503..e835d5fe9 100644
--- a/audio/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
@@ -1,10 +1,9 @@
-Music_LookYoungster: ; f66c3
+Music_LookYoungster:
 	musicheader 3, 1, Music_LookYoungster_Ch1
 	musicheader 1, 2, Music_LookYoungster_Ch2
 	musicheader 1, 3, Music_LookYoungster_Ch3
-; f66cc
 
-Music_LookYoungster_Ch1: ; f66cc
+Music_LookYoungster_Ch1:
 	tempo 118
 	volume $77
 	stereopanning $f
@@ -25,7 +24,7 @@ Music_LookYoungster_Ch1: ; f66cc
 	note __, 2
 	note C_, 6
 	intensity $b3
-Music_LookYoungster_branch_f66ea: ; f66ea
+Music_LookYoungster_branch_f66ea:
 	note __, 2
 	octave 3
 	note G_, 1
@@ -59,11 +58,10 @@ Music_LookYoungster_branch_f66ea: ; f66ea
 	note __, 1
 	note __, 16
 	loopchannel 0, Music_LookYoungster_branch_f66ea
-; f670e
 
 	db $ff
 
-Music_LookYoungster_Ch2: ; f670f
+Music_LookYoungster_Ch2:
 	stereopanning $f0
 	vibrato $12, $26
 	dutycycle $1
@@ -84,7 +82,7 @@ Music_LookYoungster_Ch2: ; f670f
 	note F_, 4
 	note __, 2
 	note F#, 6
-Music_LookYoungster_branch_f672f: ; f672f
+Music_LookYoungster_branch_f672f:
 	dutycycle $3
 	intensity $b3
 	note __, 2
@@ -158,11 +156,10 @@ Music_LookYoungster_branch_f672f: ; f672f
 	note C_, 1
 	note __, 1
 	loopchannel 0, Music_LookYoungster_branch_f672f
-; f6783
 
 	db $ff
 
-Music_LookYoungster_Ch3: ; f6784
+Music_LookYoungster_Ch3:
 	stereopanning $ff
 	vibrato $2, $24
 	notetype $c, $25
@@ -198,7 +195,7 @@ Music_LookYoungster_Ch3: ; f6784
 	note __, 2
 	note G#, 6
 	intensity $25
-Music_LookYoungster_branch_f67ae: ; f67ae
+Music_LookYoungster_branch_f67ae:
 	octave 2
 	note G_, 1
 	note __, 1
@@ -294,6 +291,5 @@ Music_LookYoungster_branch_f67ae: ; f67ae
 	note G#, 1
 	note __, 1
 	loopchannel 0, Music_LookYoungster_branch_f67ae
-; f6810
 
 	db $ff
diff --git a/audio/music/magnettrain.asm b/audio/music/magnettrain.asm
index 0b73cf894..fd4229cb4 100644
--- a/audio/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
@@ -1,11 +1,10 @@
-Music_MagnetTrain: ; ef5f0
+Music_MagnetTrain:
 	musicheader 4, 1, Music_MagnetTrain_Ch1
 	musicheader 1, 2, Music_MagnetTrain_Ch2
 	musicheader 1, 3, Music_MagnetTrain_Ch3
 	musicheader 1, 4, Music_MagnetTrain_Ch4
-; ef5fc
 
-Music_MagnetTrain_Ch1: ; ef5fc
+Music_MagnetTrain_Ch1:
 	tempo 110
 	volume $77
 	stereopanning $f
@@ -68,9 +67,8 @@ Music_MagnetTrain_Ch1: ; ef5fc
 	notetype $c, $b7
 	note D_, 16
 	endchannel
-; ef648
 
-Music_MagnetTrain_Ch2: ; ef648
+Music_MagnetTrain_Ch2:
 	vibrato $14, $23
 	dutycycle $1
 	notetype $c, $d2
@@ -107,9 +105,8 @@ Music_MagnetTrain_Ch2: ; ef648
 	notetype $c, $d7
 	note A_, 16
 	endchannel
-; ef67d
 
-Music_MagnetTrain_Ch3: ; ef67d
+Music_MagnetTrain_Ch3:
 	stereopanning $ff
 	vibrato $10, $23
 	notetype $c, $15
@@ -224,9 +221,8 @@ Music_MagnetTrain_Ch3: ; ef67d
 	octave 2
 	note D_, 16
 	endchannel
-; ef6f4
 
-Music_MagnetTrain_Ch4: ; ef6f4
+Music_MagnetTrain_Ch4:
 	togglenoise $3
 	notetype $c
 	note B_, 12
@@ -248,11 +244,9 @@ Music_MagnetTrain_Ch4: ; ef6f4
 	notetype $c
 	note B_, 16
 	endchannel
-; ef711
-
 
 ; unused
-Music_MagnetTrain_branch_ef711: ; ef711
+Music_MagnetTrain_branch_ef711:
 	note G#, 1
 	note G_, 1
 	note G_, 1
@@ -266,10 +260,8 @@ Music_MagnetTrain_branch_ef711: ; ef711
 	note G_, 1
 	note G_, 1
 	endchannel
-; ef71e
-
 
-Music_MagnetTrain_branch_ef71e: ; ef71e
+Music_MagnetTrain_branch_ef71e:
 	note G#, 2
 	note G_, 2
 	note G_, 2
@@ -287,4 +279,3 @@ Music_MagnetTrain_branch_ef71e: ; ef71e
 	note G_, 2
 	note G_, 2
 	endchannel
-; ef72f
diff --git a/audio/music/mainmenu.asm b/audio/music/mainmenu.asm
index 30c389ed3..b787a5ea0 100644
--- a/audio/music/mainmenu.asm
+++ b/audio/music/mainmenu.asm
@@ -1,11 +1,10 @@
-Music_MainMenu: ; f78fd
+Music_MainMenu:
 	musicheader 4, 1, Music_MainMenu_Ch1
 	musicheader 1, 2, Music_MainMenu_Ch2
 	musicheader 1, 3, Music_MainMenu_Ch3
 	musicheader 1, 4, Music_MainMenu_Ch4
-; f7909
 
-Music_MainMenu_Ch1: ; f7909
+Music_MainMenu_Ch1:
 	tempo 160
 	volume $77
 	dutycycle $3
@@ -15,7 +14,7 @@ Music_MainMenu_Ch1: ; f7909
 	notetype $c, $f
 	octave 3
 	note D_, 8
-Music_MainMenu_branch_f791d: ; f791d
+Music_MainMenu_branch_f791d:
 	notetype $c, $92
 	octave 3
 	note C#, 6
@@ -41,15 +40,14 @@ Music_MainMenu_branch_f791d: ; f791d
 	octave 3
 	note C_, 4
 	loopchannel 0, Music_MainMenu_branch_f791d
-; f7940
 
-Music_MainMenu_Ch2: ; f7940
+Music_MainMenu_Ch2:
 	dutycycle $3
 	stereopanning $f
 	notetype $c, $f
 	octave 3
 	note G_, 8
-Music_MainMenu_branch_f7949: ; f7949
+Music_MainMenu_branch_f7949:
 	notetype $c, $a2
 	note F#, 6
 	note F#, 1
@@ -72,13 +70,12 @@ Music_MainMenu_branch_f7949: ; f7949
 	notetype $c, $a4
 	note F_, 4
 	loopchannel 0, Music_MainMenu_branch_f7949
-; f7969
 
-Music_MainMenu_Ch3: ; f7969
+Music_MainMenu_Ch3:
 	stereopanning $f0
 	notetype $c, $25
 	note __, 8
-Music_MainMenu_branch_f796f: ; f796f
+Music_MainMenu_branch_f796f:
 	octave 2
 	note F#, 1
 	note __, 5
@@ -112,9 +109,8 @@ Music_MainMenu_branch_f796f: ; f796f
 	note F_, 1
 	note __, 3
 	loopchannel 0, Music_MainMenu_branch_f796f
-; f7996
 
-Music_MainMenu_Ch4: ; f7996
+Music_MainMenu_Ch4:
 	stereopanning $f
 	togglenoise $3
 	notetype $c
@@ -127,7 +123,7 @@ Music_MainMenu_Ch4: ; f7996
 	note D_, 1
 	note D_, 1
 	note D_, 1
-Music_MainMenu_branch_f79a5: ; f79a5
+Music_MainMenu_branch_f79a5:
 	note D_, 6
 	note D_, 1
 	note D_, 1
@@ -144,4 +140,3 @@ Music_MainMenu_branch_f79a5: ; f79a5
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_MainMenu_branch_f79a5
-; f79b8
diff --git a/audio/music/mobileadapter.asm b/audio/music/mobileadapter.asm
index c94c66ad2..26c64cff8 100644
--- a/audio/music/mobileadapter.asm
+++ b/audio/music/mobileadapter.asm
@@ -1,11 +1,10 @@
-Music_MobileAdapter: ; 1fc87
+Music_MobileAdapter:
 	musicheader 4, 1, Music_MobileAdapter_Ch1
 	musicheader 1, 2, Music_MobileAdapter_Ch2
 	musicheader 1, 3, Music_MobileAdapter_Ch3
 	musicheader 1, 4, Music_MobileAdapter_Ch4
-; 1fc93
 
-Music_MobileAdapter_Ch1: ; 1fc93
+Music_MobileAdapter_Ch1:
 	tempo 132
 	volume $77
 	tone $0001
@@ -23,7 +22,7 @@ Music_MobileAdapter_Ch1: ; 1fc93
 	note D_, 1
 	note __, 1
 	note C#, 4
-Music_MobileAdapter_branch_1fcad: ; 1fcad
+Music_MobileAdapter_branch_1fcad:
 	callchannel Music_MobileAdapter_branch_1fd39
 	note D_, 1
 	note C#, 1
@@ -147,9 +146,8 @@ Music_MobileAdapter_branch_1fcad: ; 1fcad
 	intensity $77
 	callchannel Music_MobileAdapter_branch_1ff09
 	loopchannel 0, Music_MobileAdapter_branch_1fcad
-; 1fd39
 
-Music_MobileAdapter_branch_1fd39: ; 1fd39
+Music_MobileAdapter_branch_1fd39:
 	intensity $94
 	octave 4
 	note F#, 1
@@ -190,9 +188,8 @@ Music_MobileAdapter_branch_1fd39: ; 1fd39
 	octave 4
 	note C#, 1
 	endchannel
-; 1fd63
 
-Music_MobileAdapter_Ch2: ; 1fd63
+Music_MobileAdapter_Ch2:
 	notetype $c, $c1
 	vibrato $10, $23
 	dutycycle $2
@@ -216,7 +213,7 @@ Music_MobileAdapter_Ch2: ; 1fd63
 	octave 4
 	note D_, 1
 	note F#, 1
-Music_MobileAdapter_branch_1fd80: ; 1fd80
+Music_MobileAdapter_branch_1fd80:
 	callchannel Music_MobileAdapter_branch_1fdfe
 	note A_, 4
 	note G_, 4
@@ -324,9 +321,8 @@ Music_MobileAdapter_branch_1fd80: ; 1fd80
 	note D_, 1
 	note F#, 1
 	loopchannel 0, Music_MobileAdapter_branch_1fd80
-; 1fdfe
 
-Music_MobileAdapter_branch_1fdfe: ; 1fdfe
+Music_MobileAdapter_branch_1fdfe:
 	note A_, 1
 	note __, 1
 	note A_, 1
@@ -351,9 +347,8 @@ Music_MobileAdapter_branch_1fdfe: ; 1fdfe
 	octave 4
 	note B_, 2
 	endchannel
-; 1fe16
 
-Music_MobileAdapter_branch_1fe16: ; 1fe16
+Music_MobileAdapter_branch_1fe16:
 	octave 5
 	note F#, 1
 	note D_, 1
@@ -393,9 +388,8 @@ Music_MobileAdapter_branch_1fe16: ; 1fe16
 	octave 5
 	note C#, 4
 	endchannel
-; 1fe3d
 
-Music_MobileAdapter_Ch3: ; 1fe3d
+Music_MobileAdapter_Ch3:
 	notetype $c, $14
 	note __, 2
 	octave 3
@@ -412,7 +406,7 @@ Music_MobileAdapter_Ch3: ; 1fe3d
 	note E_, 1
 	note __, 1
 	note A_, 4
-Music_MobileAdapter_branch_1fe4f: ; 1fe4f
+Music_MobileAdapter_branch_1fe4f:
 	callchannel Music_MobileAdapter_branch_1fecf
 	callchannel Music_MobileAdapter_branch_1fee3
 	callchannel Music_MobileAdapter_branch_1feee
@@ -516,16 +510,15 @@ Music_MobileAdapter_branch_1fe4f: ; 1fe4f
 	note D_, 4
 	callchannel Music_MobileAdapter_branch_1ff09
 	loopchannel 0, Music_MobileAdapter_branch_1fe4f
-; 1fecf
 
-Music_MobileAdapter_branch_1fecf: ; 1fecf
+Music_MobileAdapter_branch_1fecf:
 	octave 3
 	note D_, 1
 	note __, 1
 	note A_, 1
 	note __, 1
 	loopchannel 4, Music_MobileAdapter_branch_1fecf
-Music_MobileAdapter_branch_1fed8: ; 1fed8
+Music_MobileAdapter_branch_1fed8:
 	octave 2
 	note G_, 1
 	note __, 1
@@ -534,9 +527,8 @@ Music_MobileAdapter_branch_1fed8: ; 1fed8
 	note __, 1
 	loopchannel 4, Music_MobileAdapter_branch_1fed8
 	endchannel
-; 1fee3
 
-Music_MobileAdapter_branch_1fee3: ; 1fee3
+Music_MobileAdapter_branch_1fee3:
 	octave 2
 	note A_, 1
 	note __, 1
@@ -545,9 +537,8 @@ Music_MobileAdapter_branch_1fee3: ; 1fee3
 	note __, 1
 	loopchannel 4, Music_MobileAdapter_branch_1fee3
 	endchannel
-; 1feee
 
-Music_MobileAdapter_branch_1feee: ; 1feee
+Music_MobileAdapter_branch_1feee:
 	note D_, 1
 	note __, 1
 	note A_, 1
@@ -557,9 +548,8 @@ Music_MobileAdapter_branch_1feee: ; 1feee
 	note A_, 1
 	note __, 1
 	endchannel
-; 1fef7
 
-Music_MobileAdapter_branch_1fef7: ; 1fef7
+Music_MobileAdapter_branch_1fef7:
 	octave 2
 	note A_, 1
 	note __, 1
@@ -578,9 +568,8 @@ Music_MobileAdapter_branch_1fef7: ; 1fef7
 	octave 2
 	note A_, 4
 	endchannel
-; 1ff09
 
-Music_MobileAdapter_branch_1ff09: ; 1ff09
+Music_MobileAdapter_branch_1ff09:
 	octave 2
 	note A_, 1
 	note __, 1
@@ -613,9 +602,8 @@ Music_MobileAdapter_branch_1ff09: ; 1ff09
 	note __, 6
 	loopchannel 2, Music_MobileAdapter_branch_1ff09
 	endchannel
-; 1ff2c
 
-Music_MobileAdapter_Ch4: ; 1ff2c
+Music_MobileAdapter_Ch4:
 	togglenoise $3
 	stereopanning $f0
 	notetype $c
@@ -625,10 +613,10 @@ Music_MobileAdapter_Ch4: ; 1ff2c
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_MobileAdapter_branch_1ff38: ; 1ff38
+Music_MobileAdapter_branch_1ff38:
 	callchannel Music_MobileAdapter_branch_1ff60
 	callchannel Music_MobileAdapter_branch_1ff60
-Music_MobileAdapter_branch_1ff3e: ; 1ff3e
+Music_MobileAdapter_branch_1ff3e:
 	note __, 4
 	note D_, 8
 	note D_, 8
@@ -637,7 +625,7 @@ Music_MobileAdapter_branch_1ff3e: ; 1ff3e
 	note D_, 3
 	note D_, 4
 	loopchannel 2, Music_MobileAdapter_branch_1ff3e
-Music_MobileAdapter_branch_1ff49: ; 1ff49
+Music_MobileAdapter_branch_1ff49:
 	note __, 4
 	note D_, 4
 	loopchannel 11, Music_MobileAdapter_branch_1ff49
@@ -655,9 +643,8 @@ Music_MobileAdapter_branch_1ff49: ; 1ff49
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_MobileAdapter_branch_1ff38
-; 1ff60
 
-Music_MobileAdapter_branch_1ff60: ; 1ff60
+Music_MobileAdapter_branch_1ff60:
 	note __, 4
 	note D_, 4
 	loopchannel 7, Music_MobileAdapter_branch_1ff60
@@ -667,4 +654,3 @@ Music_MobileAdapter_branch_1ff60: ; 1ff60
 	note D_, 1
 	note D_, 1
 	endchannel
-; 1ff6c
diff --git a/audio/music/mobileadaptermenu.asm b/audio/music/mobileadaptermenu.asm
index 8e9e8aee5..1573076fb 100644
--- a/audio/music/mobileadaptermenu.asm
+++ b/audio/music/mobileadaptermenu.asm
@@ -1,10 +1,9 @@
-Music_MobileAdapterMenu: ; 17801f
+Music_MobileAdapterMenu:
 	musicheader 3, 1, Music_MobileAdapterMenu_Ch1
 	musicheader 1, 2, Music_MobileAdapterMenu_Ch2
 	musicheader 1, 3, Music_MobileAdapterMenu_Ch3
-; 178028
 
-Music_MobileAdapterMenu_Ch1: ; 178028
+Music_MobileAdapterMenu_Ch1:
 	tempo 168
 	volume $77
 	tone $0001
@@ -12,7 +11,7 @@ Music_MobileAdapterMenu_Ch1: ; 178028
 	dutycycle $2
 	notetype $c, $66
 	note __, 2
-Music_MobileAdapterMenu_branch_178038: ; 178038
+Music_MobileAdapterMenu_branch_178038:
 	callchannel Music_MobileAdapterMenu_branch_178057
 	callchannel Music_MobileAdapterMenu_branch_178076
 	octave 3
@@ -33,9 +32,8 @@ Music_MobileAdapterMenu_branch_178038: ; 178038
 	note D#, 8
 	callchannel Music_MobileAdapterMenu_branch_178057
 	loopchannel 0, Music_MobileAdapterMenu_branch_178038
-; 178057
 
-Music_MobileAdapterMenu_branch_178057: ; 178057
+Music_MobileAdapterMenu_branch_178057:
 	octave 3
 	note G#, 7
 	octave 4
@@ -67,9 +65,8 @@ Music_MobileAdapterMenu_branch_178057: ; 178057
 	note A_, 1
 	note G#, 8
 	endchannel
-; 178076
 
-Music_MobileAdapterMenu_branch_178076: ; 178076
+Music_MobileAdapterMenu_branch_178076:
 	note E_, 1
 	note __, 1
 	note A_, 1
@@ -84,16 +81,15 @@ Music_MobileAdapterMenu_branch_178076: ; 178076
 	note __, 1
 	note C#, 4
 	endchannel
-; 178084
 
-Music_MobileAdapterMenu_Ch2: ; 178084
+Music_MobileAdapterMenu_Ch2:
 	stereopanning $f0
 	notetype $c, $84
 	dutycycle $2
 	octave 4
 	note E_, 1
 	note G#, 1
-Music_MobileAdapterMenu_branch_17808e: ; 17808e
+Music_MobileAdapterMenu_branch_17808e:
 	callchannel Music_MobileAdapterMenu_branch_1780ae
 	note E_, 8
 	callchannel Music_MobileAdapterMenu_branch_1780d7
@@ -115,9 +111,8 @@ Music_MobileAdapterMenu_branch_17808e: ; 17808e
 	note E_, 1
 	note G#, 1
 	loopchannel 0, Music_MobileAdapterMenu_branch_17808e
-; 1780ae
 
-Music_MobileAdapterMenu_branch_1780ae: ; 1780ae
+Music_MobileAdapterMenu_branch_1780ae:
 	octave 4
 	note B_, 1
 	note __, 1
@@ -159,9 +154,8 @@ Music_MobileAdapterMenu_branch_1780ae: ; 1780ae
 	note C#, 3
 	note D#, 1
 	endchannel
-; 1780d7
 
-Music_MobileAdapterMenu_branch_1780d7: ; 1780d7
+Music_MobileAdapterMenu_branch_1780d7:
 	note A_, 1
 	note __, 1
 	note A_, 1
@@ -173,13 +167,12 @@ Music_MobileAdapterMenu_branch_1780d7: ; 1780d7
 	note __, 1
 	note E_, 4
 	endchannel
-; 1780e2
 
-Music_MobileAdapterMenu_Ch3: ; 1780e2
+Music_MobileAdapterMenu_Ch3:
 	vibrato $8, $34
 	notetype $c, $25
 	note __, 2
-Music_MobileAdapterMenu_branch_1780e9: ; 1780e9
+Music_MobileAdapterMenu_branch_1780e9:
 	callchannel Music_MobileAdapterMenu_branch_178119
 	octave 2
 	note B_, 1
@@ -217,9 +210,8 @@ Music_MobileAdapterMenu_branch_1780e9: ; 1780e9
 	callchannel Music_MobileAdapterMenu_branch_178119
 	note __, 2
 	loopchannel 0, Music_MobileAdapterMenu_branch_1780e9
-; 178119
 
-Music_MobileAdapterMenu_branch_178119: ; 178119
+Music_MobileAdapterMenu_branch_178119:
 	octave 3
 	note E_, 2
 	note __, 2
@@ -263,9 +255,8 @@ Music_MobileAdapterMenu_branch_178119: ; 178119
 	note E_, 3
 	intensity $25
 	endchannel
-; 178146
 
-Music_MobileAdapterMenu_branch_178146: ; 178146
+Music_MobileAdapterMenu_branch_178146:
 	note A_, 2
 	note __, 2
 	octave 3
@@ -279,4 +270,3 @@ Music_MobileAdapterMenu_branch_178146: ; 178146
 	octave 3
 	note A_, 4
 	endchannel
-; 178153
diff --git a/audio/music/mobilecenter.asm b/audio/music/mobilecenter.asm
index 8a78ea5fa..0f9d3b9ab 100644
--- a/audio/music/mobilecenter.asm
+++ b/audio/music/mobilecenter.asm
@@ -1,11 +1,10 @@
-Music_MobileCenter: ; 17961d
+Music_MobileCenter:
 	musicheader 4, 1, Music_MobileCenter_Ch1
 	musicheader 1, 2, Music_MobileCenter_Ch2
 	musicheader 1, 3, Music_MobileCenter_Ch3
 	musicheader 1, 4, Music_MobileCenter_Ch4
-; 179629
 
-Music_MobileCenter_Ch1: ; 179629
+Music_MobileCenter_Ch1:
 	tempo 160
 	volume $77
 	dutycycle $1
@@ -20,7 +19,7 @@ Music_MobileCenter_Ch1: ; 179629
 	note G_, 2
 	note A_, 2
 	note B_, 4
-Music_MobileCenter_branch_179642: ; 179642
+Music_MobileCenter_branch_179642:
 	octave 3
 	note E_, 2
 	note C_, 2
@@ -156,9 +155,8 @@ Music_MobileCenter_branch_179642: ; 179642
 	note E_, 2
 	note F_, 2
 	loopchannel 0, Music_MobileCenter_branch_179642
-; 1796cc
 
-Music_MobileCenter_Ch2: ; 1796cc
+Music_MobileCenter_Ch2:
 	notetype $c, $c2
 	dutycycle $3
 	note __, 10
@@ -166,7 +164,7 @@ Music_MobileCenter_Ch2: ; 1796cc
 	note G_, 2
 	note A_, 2
 	note B_, 2
-Music_MobileCenter_branch_1796d6: ; 1796d6
+Music_MobileCenter_branch_1796d6:
 	octave 2
 	note C_, 2
 	note E_, 2
@@ -325,9 +323,8 @@ Music_MobileCenter_branch_1796d6: ; 1796d6
 	note E_, 2
 	note D_, 2
 	loopchannel 0, Music_MobileCenter_branch_1796d6
-; 179777
 
-Music_MobileCenter_Ch3: ; 179777
+Music_MobileCenter_Ch3:
 	notetype $c, $24
 	vibrato $10, $34
 	octave 4
@@ -339,7 +336,7 @@ Music_MobileCenter_Ch3: ; 179777
 	note C_, 2
 	note D_, 4
 	notetype $c, $25
-Music_MobileCenter_branch_179788: ; 179788
+Music_MobileCenter_branch_179788:
 	note C_, 2
 	octave 4
 	note G_, 2
@@ -452,9 +449,8 @@ Music_MobileCenter_branch_179788: ; 179788
 	note C_, 8
 	vibrato $10, $34
 	loopchannel 0, Music_MobileCenter_branch_179788
-; 179807
 
-Music_MobileCenter_Ch4: ; 179807
+Music_MobileCenter_Ch4:
 	togglenoise $3
 	stereopanning $f
 	notetype $c
@@ -464,7 +460,7 @@ Music_MobileCenter_Ch4: ; 179807
 	note C#, 1
 	note C#, 1
 	note C#, 1
-Music_MobileCenter_branch_179813: ; 179813
+Music_MobileCenter_branch_179813:
 	note A_, 2
 	note C#, 2
 	note C#, 2
@@ -485,4 +481,3 @@ Music_MobileCenter_branch_179813: ; 179813
 	note C#, 1
 	note C#, 1
 	loopchannel 0, Music_MobileCenter_branch_179813
-; 17982d
diff --git a/audio/music/mom.asm b/audio/music/mom.asm
index 7b65709f8..a9bdef9ca 100644
--- a/audio/music/mom.asm
+++ b/audio/music/mom.asm
@@ -1,10 +1,9 @@
-Music_Mom: ; f6bf2
+Music_Mom:
 	musicheader 3, 2, Music_Mom_Ch2
 	musicheader 1, 3, Music_Mom_Ch3
 	musicheader 1, 4, Music_Mom_Ch4
-; f6bfb
 
-Music_Mom_Ch2: ; f6bfb
+Music_Mom_Ch2:
 	tempo 144
 	volume $77
 	stereopanning $f
@@ -17,7 +16,7 @@ Music_Mom_Ch2: ; f6bfb
 	note G#, 1
 	note A_, 1
 	note B_, 8
-Music_Mom_branch_f6c0e: ; f6c0e
+Music_Mom_branch_f6c0e:
 	notetype $c, $b1
 	note __, 4
 	octave 3
@@ -31,9 +30,8 @@ Music_Mom_branch_f6c0e: ; f6c0e
 	note A#, 2
 	note B_, 2
 	loopchannel 0, Music_Mom_branch_f6c0e
-; f6c20
 
-Music_Mom_Ch3: ; f6c20
+Music_Mom_Ch3:
 	stereopanning $f0
 	notetype $6, $25
 	octave 3
@@ -44,7 +42,7 @@ Music_Mom_Ch3: ; f6c20
 	note G#, 1
 	note E_, 8
 	intensity $23
-Music_Mom_branch_f6c2e: ; f6c2e
+Music_Mom_branch_f6c2e:
 	octave 2
 	note A_, 2
 	note __, 6
@@ -77,13 +75,12 @@ Music_Mom_branch_f6c2e: ; f6c2e
 	note D_, 2
 	note __, 2
 	loopchannel 0, Music_Mom_branch_f6c2e
-; f6c51
 
-Music_Mom_Ch4: ; f6c51
+Music_Mom_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 6
-Music_Mom_branch_f6c56: ; f6c56
+Music_Mom_branch_f6c56:
 	note D#, 1
 	note __, 1
 	note F#, 2
@@ -109,4 +106,3 @@ Music_Mom_branch_f6c56: ; f6c56
 	note D#, 1
 	note __, 1
 	loopchannel 0, Music_Mom_branch_f6c56
-; f6c72
diff --git a/audio/music/mtmoon.asm b/audio/music/mtmoon.asm
index 5b2db6ede..474335f43 100644
--- a/audio/music/mtmoon.asm
+++ b/audio/music/mtmoon.asm
@@ -1,11 +1,10 @@
-Music_MtMoon: ; edb29
+Music_MtMoon:
 	musicheader 4, 1, Music_MtMoon_Ch1
 	musicheader 1, 2, Music_MtMoon_Ch2
 	musicheader 1, 3, Music_MtMoon_Ch3
 	musicheader 1, 4, Music_MtMoon_Ch4
-; edb35
 
-Music_MtMoon_Ch1: ; edb35
+Music_MtMoon_Ch1:
 	tempo 208
 	volume $77
 	dutycycle $2
@@ -15,14 +14,13 @@ Music_MtMoon_Ch1: ; edb35
 	notetype $c, $45
 	note __, 2
 	loopchannel 0, Music_MtMoon_branch_edb56
-; edb4c
 
-Music_MtMoon_Ch2: ; edb4c
+Music_MtMoon_Ch2:
 	vibrato $b, $15
 	dutycycle $2
 	notetype $c, $84
 	stereopanning $f
-Music_MtMoon_branch_edb56: ; edb56
+Music_MtMoon_branch_edb56:
 	octave 4
 	note D#, 6
 	note C#, 6
@@ -72,12 +70,11 @@ Music_MtMoon_branch_edb56: ; edb56
 	note F#, 6
 	note E_, 4
 	loopchannel 0, Music_MtMoon_branch_edb56
-; edb8a
 
-Music_MtMoon_Ch3: ; edb8a
-Music_MtMoon_branch_edb8a: ; edb8a
+Music_MtMoon_Ch3:
+Music_MtMoon_branch_edb8a:
 	notetype $c, $28
-Music_MtMoon_branch_edb8d: ; edb8d
+Music_MtMoon_branch_edb8d:
 	octave 2
 	note B_, 2
 	octave 3
@@ -105,7 +102,7 @@ Music_MtMoon_branch_edb8d: ; edb8d
 	note G_, 2
 	note D#, 2
 	note E_, 2
-Music_MtMoon_branch_edbab: ; edbab
+Music_MtMoon_branch_edbab:
 	note E_, 2
 	note G#, 2
 	octave 4
@@ -120,12 +117,11 @@ Music_MtMoon_branch_edbab: ; edbab
 	note G#, 2
 	loopchannel 4, Music_MtMoon_branch_edbab
 	loopchannel 0, Music_MtMoon_branch_edb8a
-; edbbf
 
-Music_MtMoon_Ch4: ; edbbf
+Music_MtMoon_Ch4:
 	togglenoise $5
 	notetype $c
-Music_MtMoon_branch_edbc3: ; edbc3
+Music_MtMoon_branch_edbc3:
 	stereopanning $f
 	note A#, 4
 	note A#, 8
@@ -140,4 +136,3 @@ Music_MtMoon_branch_edbc3: ; edbc3
 	stereopanning $f0
 	note A#, 8
 	loopchannel 0, Music_MtMoon_branch_edbc3
-; edbd8
diff --git a/audio/music/mtmoonsquare.asm b/audio/music/mtmoonsquare.asm
index 43984784e..57d1b0ddf 100644
--- a/audio/music/mtmoonsquare.asm
+++ b/audio/music/mtmoonsquare.asm
@@ -1,17 +1,16 @@
-Music_MtMoonSquare: ; f4815
+Music_MtMoonSquare:
 	musicheader 2, 1, Music_MtMoonSquare_Ch1
 	musicheader 1, 2, Music_MtMoonSquare_Ch2
-; f481b
 
-Music_MtMoonSquare_Ch1: ; f481b
+Music_MtMoonSquare_Ch1:
 	tempo 112
 	volume $77
 	dutycycle $2
 	tone $0001
 	note __, 1
-Music_MtMoonSquare_branch_f4826: ; f4826
+Music_MtMoonSquare_branch_f4826:
 	notetype $c, $44
-Music_MtMoonSquare_branch_f4829: ; f4829
+Music_MtMoonSquare_branch_f4829:
 	octave 4
 	note D_, 2
 	note E_, 2
@@ -21,7 +20,7 @@ Music_MtMoonSquare_branch_f4829: ; f4829
 	octave 5
 	note D_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4829
-Music_MtMoonSquare_branch_f4835: ; f4835
+Music_MtMoonSquare_branch_f4835:
 	octave 4
 	note E_, 2
 	note F#, 2
@@ -31,7 +30,7 @@ Music_MtMoonSquare_branch_f4835: ; f4835
 	octave 5
 	note E_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4835
-Music_MtMoonSquare_branch_f4841: ; f4841
+Music_MtMoonSquare_branch_f4841:
 	octave 4
 	note C#, 2
 	note D_, 2
@@ -41,7 +40,7 @@ Music_MtMoonSquare_branch_f4841: ; f4841
 	octave 5
 	note C#, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4841
-Music_MtMoonSquare_branch_f484d: ; f484d
+Music_MtMoonSquare_branch_f484d:
 	octave 4
 	note D_, 2
 	note E_, 2
@@ -52,14 +51,13 @@ Music_MtMoonSquare_branch_f484d: ; f484d
 	note D_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f484d
 	loopchannel 0, Music_MtMoonSquare_branch_f4826
-; f485d
 
-Music_MtMoonSquare_Ch2: ; f485d
+Music_MtMoonSquare_Ch2:
 	dutycycle $2
 	vibrato $18, $24
-Music_MtMoonSquare_branch_f4862: ; f4862
+Music_MtMoonSquare_branch_f4862:
 	notetype $c, $82
-Music_MtMoonSquare_branch_f4865: ; f4865
+Music_MtMoonSquare_branch_f4865:
 	octave 4
 	note D_, 2
 	note E_, 2
@@ -71,7 +69,7 @@ Music_MtMoonSquare_branch_f4865: ; f4865
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4865
 	notetype $c, $82
-Music_MtMoonSquare_branch_f4877: ; f4877
+Music_MtMoonSquare_branch_f4877:
 	octave 4
 	note E_, 2
 	note F#, 2
@@ -83,7 +81,7 @@ Music_MtMoonSquare_branch_f4877: ; f4877
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4877
 	notetype $c, $82
-Music_MtMoonSquare_branch_f4889: ; f4889
+Music_MtMoonSquare_branch_f4889:
 	octave 4
 	note C#, 2
 	note D_, 2
@@ -95,7 +93,7 @@ Music_MtMoonSquare_branch_f4889: ; f4889
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4889
 	notetype $c, $82
-Music_MtMoonSquare_branch_f489b: ; f489b
+Music_MtMoonSquare_branch_f489b:
 	octave 4
 	note D_, 2
 	note E_, 2
@@ -107,4 +105,3 @@ Music_MtMoonSquare_branch_f489b: ; f489b
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f489b
 	loopchannel 0, Music_MtMoonSquare_branch_f4862
-; f48ae
diff --git a/audio/music/nationalpark.asm b/audio/music/nationalpark.asm
index 3f845c569..109086386 100644
--- a/audio/music/nationalpark.asm
+++ b/audio/music/nationalpark.asm
@@ -1,11 +1,10 @@
-Music_NationalPark: ; f54e8
+Music_NationalPark:
 	musicheader 4, 1, Music_NationalPark_Ch1
 	musicheader 1, 2, Music_NationalPark_Ch2
 	musicheader 1, 3, Music_NationalPark_Ch3
 	musicheader 1, 4, Music_NationalPark_Ch4
-; f54f4
 
-Music_NationalPark_Ch1: ; f54f4
+Music_NationalPark_Ch1:
 	tempo 192
 	volume $77
 	stereopanning $f
@@ -13,7 +12,7 @@ Music_NationalPark_Ch1: ; f54f4
 	dutycycle $1
 	notetype $c, $77
 	note __, 2
-Music_NationalPark_branch_f5504: ; f5504
+Music_NationalPark_branch_f5504:
 	callchannel Music_NationalPark_branch_f554a
 	callchannel Music_NationalPark_branch_f554a
 	notetype $6, $67
@@ -62,9 +61,8 @@ Music_NationalPark_branch_f5504: ; f5504
 	notetype $c, $77
 	note __, 4
 	loopchannel 0, Music_NationalPark_branch_f5504
-; f554a
 
-Music_NationalPark_branch_f554a: ; f554a
+Music_NationalPark_branch_f554a:
 	octave 2
 	note G#, 6
 	octave 3
@@ -270,9 +268,8 @@ Music_NationalPark_branch_f554a: ; f554a
 	octave 3
 	note A#, 2
 	endchannel
-; f563a
 
-Music_NationalPark_branch_f563a: ; f563a
+Music_NationalPark_branch_f563a:
 	note __, 16
 	note __, 3
 	octave 4
@@ -297,15 +294,14 @@ Music_NationalPark_branch_f563a: ; f563a
 	note A_, 2
 	note __, 4
 	endchannel
-; f5652
 
-Music_NationalPark_Ch2: ; f5652
+Music_NationalPark_Ch2:
 	vibrato $14, $24
 	dutycycle $1
 	notetype $c, $a7
 	note __, 2
 	stereopanning $f0
-Music_NationalPark_branch_f565d: ; f565d
+Music_NationalPark_branch_f565d:
 	notetype $c, $a7
 	callchannel Music_NationalPark_branch_f56b8
 	octave 3
@@ -373,9 +369,8 @@ Music_NationalPark_branch_f565d: ; f565d
 	note D#, 2
 	note D_, 2
 	loopchannel 0, Music_NationalPark_branch_f565d
-; f56b8
 
-Music_NationalPark_branch_f56b8: ; f56b8
+Music_NationalPark_branch_f56b8:
 	octave 2
 	note C#, 6
 	note G#, 2
@@ -437,9 +432,8 @@ Music_NationalPark_branch_f56b8: ; f56b8
 	octave 2
 	note F_, 2
 	endchannel
-; f56f5
 
-Music_NationalPark_branch_f56f5: ; f56f5
+Music_NationalPark_branch_f56f5:
 	octave 4
 	note E_, 1
 	note F_, 5
@@ -482,16 +476,15 @@ Music_NationalPark_branch_f56f5: ; f56f5
 	note D_, 2
 	note C#, 2
 	endchannel
-; f5723
 
-Music_NationalPark_Ch3: ; f5723
+Music_NationalPark_Ch3:
 	vibrato $16, $24
 	notetype $c, $11
 	octave 4
 	note G#, 1
 	note A#, 1
 	stereopanning $ff
-Music_NationalPark_branch_f572e: ; f572e
+Music_NationalPark_branch_f572e:
 	callchannel Music_NationalPark_branch_f5756
 	octave 5
 	note A#, 14
@@ -519,9 +512,8 @@ Music_NationalPark_branch_f572e: ; f572e
 	note G#, 1
 	note A#, 1
 	loopchannel 0, Music_NationalPark_branch_f572e
-; f5756
 
-Music_NationalPark_branch_f5756: ; f5756
+Music_NationalPark_branch_f5756:
 	octave 5
 	note C_, 16
 	note C#, 14
@@ -579,9 +571,8 @@ Music_NationalPark_branch_f5756: ; f5756
 	octave 6
 	note C_, 2
 	endchannel
-; f578f
 
-Music_NationalPark_branch_f578f: ; f578f
+Music_NationalPark_branch_f578f:
 	octave 2
 	note F#, 3
 	octave 3
@@ -623,13 +614,12 @@ Music_NationalPark_branch_f578f: ; f578f
 	note F_, 1
 	note __, 1
 	endchannel
-; f57b8
 
-Music_NationalPark_Ch4: ; f57b8
+Music_NationalPark_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 2
-Music_NationalPark_branch_f57bd: ; f57bd
+Music_NationalPark_branch_f57bd:
 	note __, 16
 	loopchannel 23, Music_NationalPark_branch_f57bd
 	note __, 8
@@ -638,7 +628,7 @@ Music_NationalPark_branch_f57bd: ; f57bd
 	note A#, 1
 	note D_, 1
 	note B_, 2
-Music_NationalPark_branch_f57c8: ; f57c8
+Music_NationalPark_branch_f57c8:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -665,4 +655,3 @@ Music_NationalPark_branch_f57c8: ; f57c8
 	note A#, 1
 	note D#, 1
 	loopchannel 0, Music_NationalPark_branch_f57bd
-; f57e8
diff --git a/audio/music/newbarktown.asm b/audio/music/newbarktown.asm
index bf481f7c3..0e3b92d39 100644
--- a/audio/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
@@ -1,19 +1,18 @@
-Music_NewBarkTown: ; eb2d3
+Music_NewBarkTown:
 	musicheader 3, 1, Music_NewBarkTown_Ch1
 	musicheader 1, 2, Music_NewBarkTown_Ch2
 	musicheader 1, 3, Music_NewBarkTown_Ch3
-; eb2dc
 
 	db $3
 
-Music_NewBarkTown_Ch1: ; eb2dd
+Music_NewBarkTown_Ch1:
 	tempo 187
 	volume $77
 	stereopanning $f
 	vibrato $12, $23
 	notetype $c, $87
 	note __, 4
-Music_NewBarkTown_branch_eb2eb: ; eb2eb
+Music_NewBarkTown_branch_eb2eb:
 	dutycycle $0
 	callchannel Music_NewBarkTown_branch_eb349
 	octave 3
@@ -85,9 +84,8 @@ Music_NewBarkTown_branch_eb2eb: ; eb2eb
 	note B_, 2
 	intensity $87
 	loopchannel 0, Music_NewBarkTown_branch_eb2eb
-; eb349
 
-Music_NewBarkTown_branch_eb349: ; eb349
+Music_NewBarkTown_branch_eb349:
 	octave 3
 	note F#, 1
 	note __, 1
@@ -139,9 +137,8 @@ Music_NewBarkTown_branch_eb349: ; eb349
 	note B_, 1
 	note __, 1
 	endchannel
-; eb37c
 
-Music_NewBarkTown_branch_eb37c: ; eb37c
+Music_NewBarkTown_branch_eb37c:
 	octave 2
 	note G_, 2
 	note B_, 2
@@ -159,14 +156,13 @@ Music_NewBarkTown_branch_eb37c: ; eb37c
 	note A_, 4
 	note E_, 2
 	endchannel
-; eb38d
 
-Music_NewBarkTown_Ch2: ; eb38d
+Music_NewBarkTown_Ch2:
 	stereopanning $ff
 	vibrato $12, $23
 	notetype $6, $a7
 	note __, 8
-Music_NewBarkTown_branch_eb396: ; eb396
+Music_NewBarkTown_branch_eb396:
 	dutycycle $2
 	notetype $6, $a7
 	callchannel Music_NewBarkTown_branch_eb3bf
@@ -190,9 +186,8 @@ Music_NewBarkTown_branch_eb396: ; eb396
 	note D_, 4
 	note E_, 16
 	loopchannel 0, Music_NewBarkTown_branch_eb396
-; eb3bf
 
-Music_NewBarkTown_branch_eb3bf: ; eb3bf
+Music_NewBarkTown_branch_eb3bf:
 	octave 2
 	note D_, 4
 	note __, 8
@@ -244,9 +239,8 @@ Music_NewBarkTown_branch_eb3bf: ; eb3bf
 	octave 2
 	note C#, 4
 	endchannel
-; eb3f2
 
-Music_NewBarkTown_branch_eb3f2: ; eb3f2
+Music_NewBarkTown_branch_eb3f2:
 	notetype $6, $97
 	dutycycle $2
 	octave 4
@@ -256,15 +250,14 @@ Music_NewBarkTown_branch_eb3f2: ; eb3f2
 	notetype $c, $97
 	note E_, 16
 	endchannel
-; eb400
 
-Music_NewBarkTown_Ch3: ; eb400
+Music_NewBarkTown_Ch3:
 	stereopanning $f0
 	notetype $c, $10
 	octave 5
 	note D_, 2
 	note E_, 2
-Music_NewBarkTown_branch_eb408: ; eb408
+Music_NewBarkTown_branch_eb408:
 	vibrato $16, $23
 	note F#, 4
 	note A_, 4
@@ -329,4 +322,3 @@ Music_NewBarkTown_branch_eb408: ; eb408
 	note D_, 1
 	note E_, 1
 	loopchannel 0, Music_NewBarkTown_branch_eb408
-; eb453
diff --git a/audio/music/nothing.asm b/audio/music/nothing.asm
index 7240c5361..596413876 100644
--- a/audio/music/nothing.asm
+++ b/audio/music/nothing.asm
@@ -1,13 +1,11 @@
-Music_Nothing: ; e91a3
+Music_Nothing:
 	musicheader 4, 1, Music_Nothing_Ch1
 	musicheader 1, 2, Music_Nothing_Ch2
 	musicheader 1, 3, Music_Nothing_Ch3
 	musicheader 1, 4, Music_Nothing_Ch4
-; e91af
 
-Music_Nothing_Ch1: ; e91af
-Music_Nothing_Ch2: ; e91af
-Music_Nothing_Ch3: ; e91af
-Music_Nothing_Ch4: ; e91af
+Music_Nothing_Ch1:
+Music_Nothing_Ch2:
+Music_Nothing_Ch3:
+Music_Nothing_Ch4:
 	endchannel
-; e91b0
diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm
index a64fd6b09..68585e473 100644
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -1,16 +1,15 @@
-Music_PalletTown: ; f4b0c
+Music_PalletTown:
 	musicheader 3, 1, Music_PalletTown_Ch1
 	musicheader 1, 2, Music_PalletTown_Ch2
 	musicheader 1, 3, Music_PalletTown_Ch3
-; f4b15
 
-Music_PalletTown_Ch1: ; f4b15
+Music_PalletTown_Ch1:
 	tempo 188
 	volume $77
 	vibrato $12, $24
 	tone $0001
 	stereopanning $f
-Music_PalletTown_branch_f4b22: ; f4b22
+Music_PalletTown_branch_f4b22:
 	dutycycle $2
 	notetype $c, $78
 	octave 3
@@ -60,7 +59,7 @@ Music_PalletTown_branch_f4b22: ; f4b22
 	note B_, 8
 	intensity $77
 	note B_, 8
-Music_PalletTown_branch_f4b59: ; f4b59
+Music_PalletTown_branch_f4b59:
 	dutycycle $3
 	intensity $92
 	note G_, 2
@@ -118,13 +117,12 @@ Music_PalletTown_branch_f4b59: ; f4b59
 	intensity $1f
 	note F#, 8
 	loopchannel 0, Music_PalletTown_branch_f4b22
-; f4ba1
 
-Music_PalletTown_Ch2: ; f4ba1
+Music_PalletTown_Ch2:
 	vibrato $12, $44
 	dutycycle $2
 	stereopanning $f0
-Music_PalletTown_branch_f4ba8: ; f4ba8
+Music_PalletTown_branch_f4ba8:
 	notetype $c, $88
 	octave 1
 	note G_, 2
@@ -184,7 +182,7 @@ Music_PalletTown_branch_f4ba8: ; f4ba8
 	octave 3
 	note C_, 2
 	note D_, 2
-Music_PalletTown_branch_f4be5: ; f4be5
+Music_PalletTown_branch_f4be5:
 	intensity $a2
 	octave 3
 	note E_, 2
@@ -244,11 +242,10 @@ Music_PalletTown_branch_f4be5: ; f4be5
 	note B_, 2
 	note A_, 2
 	loopchannel 0, Music_PalletTown_branch_f4ba8
-; f4c2a
 
-Music_PalletTown_Ch3: ; f4c2a
+Music_PalletTown_Ch3:
 	vibrato $14, $24
-Music_PalletTown_branch_f4c2d: ; f4c2d
+Music_PalletTown_branch_f4c2d:
 	notetype $c, $10
 	octave 6
 	note D_, 2
@@ -358,4 +355,3 @@ Music_PalletTown_branch_f4c2d: ; f4c2d
 	note B_, 8
 	note A_, 8
 	loopchannel 0, Music_PalletTown_branch_f4c2d
-; f4c9f
diff --git a/audio/music/pokeflutechannel.asm b/audio/music/pokeflutechannel.asm
index 3239d782a..e324c5595 100644
--- a/audio/music/pokeflutechannel.asm
+++ b/audio/music/pokeflutechannel.asm
@@ -1,10 +1,9 @@
-Music_PokeFluteChannel: ; f7b13
+Music_PokeFluteChannel:
 	musicheader 3, 1, Music_PokeFluteChannel_Ch1
 	musicheader 1, 2, Music_PokeFluteChannel_Ch2
 	musicheader 1, 3, Music_PokeFluteChannel_Ch3
-; f7b1c
 
-Music_PokeFluteChannel_Ch1: ; f7b1c
+Music_PokeFluteChannel_Ch1:
 	tempo 240
 	volume $77
 	stereopanning $f0
@@ -30,7 +29,7 @@ Music_PokeFluteChannel_Ch1: ; f7b1c
 	octave 2
 	note G_, 4
 	note A_, 8
-Music_PokeFluteChannel_branch_f7b40: ; f7b40
+Music_PokeFluteChannel_branch_f7b40:
 	octave 3
 	note E_, 2
 	note G_, 2
@@ -68,9 +67,8 @@ Music_PokeFluteChannel_branch_f7b40: ; f7b40
 	note G_, 4
 	note A_, 8
 	loopchannel 0, Music_PokeFluteChannel_branch_f7b40
-; f7b68
 
-Music_PokeFluteChannel_Ch2: ; f7b68
+Music_PokeFluteChannel_Ch2:
 	stereopanning $f
 	dutycycle $3
 	tone $0001
@@ -107,7 +105,7 @@ Music_PokeFluteChannel_Ch2: ; f7b68
 	octave 2
 	note E_, 2
 	note G_, 2
-Music_PokeFluteChannel_branch_f7b94: ; f7b94
+Music_PokeFluteChannel_branch_f7b94:
 	octave 3
 	note C_, 2
 	note E_, 2
@@ -170,14 +168,13 @@ Music_PokeFluteChannel_branch_f7b94: ; f7b94
 	note E_, 2
 	note G_, 2
 	loopchannel 0, Music_PokeFluteChannel_branch_f7b94
-; f7bd5
 
-Music_PokeFluteChannel_Ch3: ; f7bd5
+Music_PokeFluteChannel_Ch3:
 	vibrato $10, $14
 	notetype $c, $10
 	callchannel Music_PokeFluteChannel_branch_f7c05
 	callchannel Music_PokeFluteChannel_branch_f7c05
-Music_PokeFluteChannel_branch_f7be1: ; f7be1
+Music_PokeFluteChannel_branch_f7be1:
 	note __, 4
 	octave 4
 	note C_, 2
@@ -209,9 +206,8 @@ Music_PokeFluteChannel_branch_f7be1: ; f7be1
 	note __, 4
 	callchannel Music_PokeFluteChannel_branch_f7c05
 	loopchannel 0, Music_PokeFluteChannel_branch_f7be1
-; f7c05
 
-Music_PokeFluteChannel_branch_f7c05: ; f7c05
+Music_PokeFluteChannel_branch_f7c05:
 	octave 5
 	note E_, 2
 	note F_, 2
@@ -229,4 +225,3 @@ Music_PokeFluteChannel_branch_f7c05: ; f7c05
 	note F_, 2
 	note G_, 4
 	endchannel
-; f7c16
diff --git a/audio/music/pokemoncenter.asm b/audio/music/pokemoncenter.asm
index 32e1a59f4..01865045b 100644
--- a/audio/music/pokemoncenter.asm
+++ b/audio/music/pokemoncenter.asm
@@ -1,17 +1,16 @@
-Music_PokemonCenter: ; ed5c6
+Music_PokemonCenter:
 	musicheader 4, 1, Music_PokemonCenter_Ch1
 	musicheader 1, 2, Music_PokemonCenter_Ch2
 	musicheader 1, 3, Music_PokemonCenter_Ch3
 	musicheader 1, 4, Music_PokemonCenter_Ch4
-; ed5d2
 
-Music_PokemonCenter_Ch1: ; ed5d2
+Music_PokemonCenter_Ch1:
 	tempo 152
 	volume $77
 	dutycycle $2
 	vibrato $a, $14
 	tone $0001
-Music_PokemonCenter_branch_ed5df: ; ed5df
+Music_PokemonCenter_branch_ed5df:
 	stereopanning $f
 	notetype $c, $83
 	octave 3
@@ -149,11 +148,10 @@ Music_PokemonCenter_branch_ed5df: ; ed5df
 	note F#, 2
 	note G_, 2
 	loopchannel 0, Music_PokemonCenter_branch_ed5df
-; ed671
 
-Music_PokemonCenter_Ch2: ; ed671
+Music_PokemonCenter_Ch2:
 	vibrato $10, $25
-Music_PokemonCenter_branch_ed674: ; ed674
+Music_PokemonCenter_branch_ed674:
 	stereopanning $ff
 	callchannel Music_PokemonCenter_branch_ed6d1
 	stereopanning $f
@@ -218,9 +216,8 @@ Music_PokemonCenter_branch_ed674: ; ed674
 	note E_, 2
 	note D_, 8
 	loopchannel 0, Music_PokemonCenter_branch_ed674
-; ed6d1
 
-Music_PokemonCenter_branch_ed6d1: ; ed6d1
+Music_PokemonCenter_branch_ed6d1:
 	dutycycle $2
 	notetype $c, $c2
 	octave 4
@@ -236,9 +233,8 @@ Music_PokemonCenter_branch_ed6d1: ; ed6d1
 	note E_, 2
 	note C#, 6
 	endchannel
-; ed6e4
 
-Music_PokemonCenter_branch_ed6e4: ; ed6e4
+Music_PokemonCenter_branch_ed6e4:
 	notetype $c, $c2
 	octave 4
 	note C#, 2
@@ -251,11 +247,10 @@ Music_PokemonCenter_branch_ed6e4: ; ed6e4
 	note E_, 4
 	note C#, 2
 	endchannel
-; ed6f3
 
-Music_PokemonCenter_Ch3: ; ed6f3
+Music_PokemonCenter_Ch3:
 	notetype $c, $28
-Music_PokemonCenter_branch_ed6f6: ; ed6f6
+Music_PokemonCenter_branch_ed6f6:
 	stereopanning $f0
 	octave 3
 	note D_, 1
@@ -360,9 +355,8 @@ Music_PokemonCenter_branch_ed6f6: ; ed6f6
 	note E_, 1
 	note __, 1
 	loopchannel 0, Music_PokemonCenter_branch_ed6f6
-; ed76f
 
-Music_PokemonCenter_branch_ed76f: ; ed76f
+Music_PokemonCenter_branch_ed76f:
 	note E_, 1
 	note __, 5
 	note A_, 1
@@ -372,9 +366,8 @@ Music_PokemonCenter_branch_ed76f: ; ed76f
 	note A_, 1
 	note __, 1
 	endchannel
-; ed778
 
-Music_PokemonCenter_branch_ed778: ; ed778
+Music_PokemonCenter_branch_ed778:
 	note E_, 1
 	note __, 5
 	note A_, 1
@@ -386,9 +379,8 @@ Music_PokemonCenter_branch_ed778: ; ed778
 	note A_, 1
 	note __, 1
 	endchannel
-; ed783
 
-Music_PokemonCenter_branch_ed783: ; ed783
+Music_PokemonCenter_branch_ed783:
 	note F#, 1
 	note __, 5
 	note A_, 1
@@ -398,17 +390,15 @@ Music_PokemonCenter_branch_ed783: ; ed783
 	note A_, 1
 	note __, 1
 	endchannel
-; ed78c
 
-Music_PokemonCenter_Ch4: ; ed78c
+Music_PokemonCenter_Ch4:
 	togglenoise $3
 	notetype $c
 	stereopanning $ff
-Music_PokemonCenter_branch_ed792: ; ed792
+Music_PokemonCenter_branch_ed792:
 	note G_, 6
 	note G_, 4
 	note G_, 2
 	note G_, 2
 	note G_, 2
 	loopchannel 0, Music_PokemonCenter_branch_ed792
-; ed79b
diff --git a/audio/music/pokemonchannel.asm b/audio/music/pokemonchannel.asm
index b06cc0694..34d642629 100644
--- a/audio/music/pokemonchannel.asm
+++ b/audio/music/pokemonchannel.asm
@@ -1,11 +1,10 @@
-Music_PokemonChannel: ; ee45f
+Music_PokemonChannel:
 	musicheader 4, 1, Music_PokemonChannel_Ch1
 	musicheader 1, 2, Music_PokemonChannel_Ch2
 	musicheader 1, 3, Music_PokemonChannel_Ch3
 	musicheader 1, 4, Music_PokemonChannel_Ch4
-; ee46b
 
-Music_PokemonChannel_Ch1: ; ee46b
+Music_PokemonChannel_Ch1:
 	tempo 128
 	volume $77
 	vibrato $8, $38
@@ -74,9 +73,8 @@ Music_PokemonChannel_Ch1: ; ee46b
 	note D_, 2
 	note __, 6
 	endchannel
-; ee4be
 
-Music_PokemonChannel_Ch2: ; ee4be
+Music_PokemonChannel_Ch2:
 	dutycycle $1
 	vibrato $8, $38
 	stereopanning $ff
@@ -145,9 +143,8 @@ Music_PokemonChannel_Ch2: ; ee4be
 	note G_, 2
 	note __, 6
 	endchannel
-; ee50e
 
-Music_PokemonChannel_Ch3: ; ee50e
+Music_PokemonChannel_Ch3:
 	vibrato $8, $38
 	notetype $c, $25
 	stereopanning $f0
@@ -202,12 +199,11 @@ Music_PokemonChannel_Ch3: ; ee50e
 	note G_, 1
 	note __, 3
 	endchannel
-; ee549
 
-Music_PokemonChannel_Ch4: ; ee549
+Music_PokemonChannel_Ch4:
 	togglenoise $3
 	notetype $c
-Music_PokemonChannel_branch_ee54d: ; ee54d
+Music_PokemonChannel_branch_ee54d:
 	note A#, 3
 	note A#, 1
 	note D_, 2
@@ -233,4 +229,3 @@ Music_PokemonChannel_branch_ee54d: ; ee54d
 	note A#, 4
 	note A#, 4
 	endchannel
-; ee569
diff --git a/audio/music/pokemonlullaby.asm b/audio/music/pokemonlullaby.asm
index 5db53d732..86116a9a9 100644
--- a/audio/music/pokemonlullaby.asm
+++ b/audio/music/pokemonlullaby.asm
@@ -1,15 +1,14 @@
-Music_PokemonLullaby: ; f6d79
+Music_PokemonLullaby:
 	musicheader 3, 1, Music_PokemonLullaby_Ch1
 	musicheader 1, 2, Music_PokemonLullaby_Ch2
 	musicheader 1, 3, Music_PokemonLullaby_Ch3
-; f6d82
 
-Music_PokemonLullaby_Ch1: ; f6d82
+Music_PokemonLullaby_Ch1:
 	tempo 224
 	volume $77
 	dutycycle $3
 	tone $0001
-Music_PokemonLullaby_branch_f6d8c: ; f6d8c
+Music_PokemonLullaby_branch_f6d8c:
 	notetype $c, $a7
 	octave 3
 	note G_, 16
@@ -53,13 +52,12 @@ Music_PokemonLullaby_branch_f6d8c: ; f6d8c
 	octave 3
 	note B_, 8
 	loopchannel 0, Music_PokemonLullaby_branch_f6d8c
-; f6dc4
 
-Music_PokemonLullaby_Ch2: ; f6dc4
+Music_PokemonLullaby_Ch2:
 	vibrato $10, $14
 	dutycycle $0
 	notetype $c, $b4
-Music_PokemonLullaby_branch_f6dcc: ; f6dcc
+Music_PokemonLullaby_branch_f6dcc:
 	note __, 16
 	note __, 10
 	octave 4
@@ -104,11 +102,10 @@ Music_PokemonLullaby_branch_f6dcc: ; f6dcc
 	note E_, 16
 	note __, 14
 	loopchannel 0, Music_PokemonLullaby_branch_f6dcc
-; f6e03
 
-Music_PokemonLullaby_Ch3: ; f6e03
+Music_PokemonLullaby_Ch3:
 	notetype $c, $11
-Music_PokemonLullaby_branch_f6e06: ; f6e06
+Music_PokemonLullaby_branch_f6e06:
 	stereopanning $f0
 	octave 4
 	note C_, 2
@@ -133,4 +130,3 @@ Music_PokemonLullaby_branch_f6e06: ; f6e06
 	note B_, 2
 	note A_, 2
 	loopchannel 0, Music_PokemonLullaby_branch_f6e06
-; f6e23
diff --git a/audio/music/pokemonmarch.asm b/audio/music/pokemonmarch.asm
index 0c776a499..346e042b1 100644
--- a/audio/music/pokemonmarch.asm
+++ b/audio/music/pokemonmarch.asm
@@ -1,11 +1,10 @@
-Music_PokemonMarch: ; f6e23
+Music_PokemonMarch:
 	musicheader 4, 1, Music_PokemonMarch_Ch1
 	musicheader 1, 2, Music_PokemonMarch_Ch2
 	musicheader 1, 3, Music_PokemonMarch_Ch3
 	musicheader 1, 4, Music_PokemonMarch_Ch4
-; f6e2f
 
-Music_PokemonMarch_Ch1: ; f6e2f
+Music_PokemonMarch_Ch1:
 	tempo 144
 	volume $77
 	stereopanning $f0
@@ -21,7 +20,7 @@ Music_PokemonMarch_Ch1: ; f6e2f
 	intensity $a2
 	note D_, 4
 	notetype $8, $a2
-Music_PokemonMarch_branch_f6e4c: ; f6e4c
+Music_PokemonMarch_branch_f6e4c:
 	callchannel Music_PokemonMarch_branch_f6eae
 	note D#, 2
 	note C_, 2
@@ -97,9 +96,8 @@ Music_PokemonMarch_branch_f6e4c: ; f6e4c
 	note G_, 4
 	note A#, 2
 	loopchannel 0, Music_PokemonMarch_branch_f6e4c
-; f6eae
 
-Music_PokemonMarch_branch_f6eae: ; f6eae
+Music_PokemonMarch_branch_f6eae:
 	note __, 4
 	octave 3
 	note D#, 1
@@ -110,9 +108,8 @@ Music_PokemonMarch_branch_f6eae: ; f6eae
 	note D#, 2
 	note __, 2
 	endchannel
-; f6eb8
 
-Music_PokemonMarch_branch_f6eb8: ; f6eb8
+Music_PokemonMarch_branch_f6eb8:
 	note __, 4
 	note F_, 1
 	note E_, 1
@@ -122,9 +119,8 @@ Music_PokemonMarch_branch_f6eb8: ; f6eb8
 	note F_, 2
 	note __, 2
 	endchannel
-; f6ec1
 
-Music_PokemonMarch_Ch2: ; f6ec1
+Music_PokemonMarch_Ch2:
 	dutycycle $2
 	vibrato $10, $22
 	notetype $c, $b2
@@ -133,7 +129,7 @@ Music_PokemonMarch_Ch2: ; f6ec1
 	note G_, 4
 	note G_, 4
 	note G_, 4
-Music_PokemonMarch_branch_f6ece: ; f6ece
+Music_PokemonMarch_branch_f6ece:
 	notetype $c, $b7
 	octave 3
 	note G#, 12
@@ -234,14 +230,13 @@ Music_PokemonMarch_branch_f6ece: ; f6ece
 	note G_, 1
 	note __, 5
 	loopchannel 0, Music_PokemonMarch_branch_f6ece
-; f6f4d
 
-Music_PokemonMarch_Ch3: ; f6f4d
+Music_PokemonMarch_Ch3:
 	stereopanning $f
 	notetype $c, $16
 	note __, 16
 	notetype $8, $16
-Music_PokemonMarch_branch_f6f56: ; f6f56
+Music_PokemonMarch_branch_f6f56:
 	callchannel Music_PokemonMarch_branch_f6fe8
 	note __, 2
 	octave 4
@@ -273,7 +268,7 @@ Music_PokemonMarch_branch_f6f56: ; f6f56
 	note D#, 2
 	note G_, 2
 	note G#, 2
-Music_PokemonMarch_branch_f6f7b: ; f6f7b
+Music_PokemonMarch_branch_f6f7b:
 	octave 3
 	note A#, 2
 	note __, 2
@@ -377,9 +372,8 @@ Music_PokemonMarch_branch_f6f7b: ; f6f7b
 	note __, 2
 	note G#, 2
 	loopchannel 0, Music_PokemonMarch_branch_f6f56
-; f6fe8
 
-Music_PokemonMarch_branch_f6fe8: ; f6fe8
+Music_PokemonMarch_branch_f6fe8:
 	octave 3
 	note G#, 2
 	note __, 2
@@ -398,14 +392,13 @@ Music_PokemonMarch_branch_f6fe8: ; f6fe8
 	octave 3
 	note G_, 2
 	endchannel
-; f6ffa
 
-Music_PokemonMarch_Ch4: ; f6ffa
+Music_PokemonMarch_Ch4:
 	stereopanning $f0
 	togglenoise $5
 	notetype $8
 	callchannel Music_PokemonMarch_branch_f704c
-Music_PokemonMarch_branch_f7003: ; f7003
+Music_PokemonMarch_branch_f7003:
 	callchannel Music_PokemonMarch_branch_f7042
 	note C_, 4
 	note C_, 2
@@ -441,9 +434,8 @@ Music_PokemonMarch_branch_f7003: ; f7003
 	notetype $8
 	callchannel Music_PokemonMarch_branch_f704c
 	loopchannel 0, Music_PokemonMarch_branch_f7003
-; f7042
 
-Music_PokemonMarch_branch_f7042: ; f7042
+Music_PokemonMarch_branch_f7042:
 	note C_, 4
 	note C_, 2
 	note C_, 4
@@ -454,9 +446,8 @@ Music_PokemonMarch_branch_f7042: ; f7042
 	note C#, 2
 	note C#, 2
 	endchannel
-; f704c
 
-Music_PokemonMarch_branch_f704c: ; f704c
+Music_PokemonMarch_branch_f704c:
 	note C_, 4
 	note C_, 2
 	note C_, 4
@@ -466,4 +457,3 @@ Music_PokemonMarch_branch_f704c: ; f704c
 	note D_, 2
 	note C#, 2
 	endchannel
-; f7055
diff --git a/audio/music/postcredits.asm b/audio/music/postcredits.asm
index d998d6212..0997828f8 100644
--- a/audio/music/postcredits.asm
+++ b/audio/music/postcredits.asm
@@ -1,18 +1,17 @@
-Music_PostCredits: ; cfd9e
+Music_PostCredits:
 	musicheader 2, 1, Music_PostCredits_Ch1
 	musicheader 1, 2, Music_PostCredits_Ch2
-; cfda4
 
 	db $2
 
-Music_PostCredits_Ch1: ; cfda5
+Music_PostCredits_Ch1:
 	tempo 271
 	volume $77
 	pitchoffset 0, D#
 	dutycycle $2
 	notetype $c, $93
 	note __, 8
-Music_PostCredits_branch_cfdb2: ; cfdb2
+Music_PostCredits_branch_cfdb2:
 	octave 3
 	note C_, 2
 	note E_, 2
@@ -130,9 +129,8 @@ Music_PostCredits_branch_cfdb2: ; cfdb2
 	octave 2
 	note G_, 2
 	loopchannel 0, Music_PostCredits_branch_cfdb2
-; cfe48
 
-Music_PostCredits_Ch2: ; cfe48
+Music_PostCredits_Ch2:
 	pitchoffset 0, D#
 	dutycycle $2
 	notetype $c, $a3
@@ -144,7 +142,7 @@ Music_PostCredits_Ch2: ; cfe48
 	note F_, 2
 	intensity $73
 	note F_, 2
-Music_PostCredits_branch_cfe5a: ; cfe5a
+Music_PostCredits_branch_cfe5a:
 	intensity $a3
 	note G_, 2
 	intensity $73
@@ -264,4 +262,3 @@ Music_PostCredits_branch_cfe5a: ; cfe5a
 	note E_, 2
 	note F_, 2
 	loopchannel 0, Music_PostCredits_branch_cfe5a
-; cff04
diff --git a/audio/music/printer.asm b/audio/music/printer.asm
index ffda482a0..886f6b766 100644
--- a/audio/music/printer.asm
+++ b/audio/music/printer.asm
@@ -1,8 +1,7 @@
-Music_Printer: ; f07fd
+Music_Printer:
 	musicheader 1, 3, Music_Printer_Ch3
-; f0800
 
-Music_Printer_Ch3: ; f0800
+Music_Printer_Ch3:
 	tempo 256
 	notetype $c, $20
 	octave 4
@@ -34,7 +33,7 @@ Music_Printer_Ch3: ; f0800
 	note __, 1
 	note F#, 1
 	note __, 1
-Music_Printer_branch_f0823: ; f0823
+Music_Printer_branch_f0823:
 	note E_, 1
 	note __, 1
 	note B_, 1
@@ -318,4 +317,3 @@ Music_Printer_branch_f0823: ; f0823
 	note D#, 1
 	note __, 1
 	loopchannel 0, Music_Printer_branch_f0823
-; f0941
diff --git a/audio/music/profoak.asm b/audio/music/profoak.asm
index c24592350..5e34e2c65 100644
--- a/audio/music/profoak.asm
+++ b/audio/music/profoak.asm
@@ -1,10 +1,9 @@
-Music_ProfOak: ; f4dea
+Music_ProfOak:
 	musicheader 3, 1, Music_ProfOak_Ch1
 	musicheader 1, 2, Music_ProfOak_Ch2
 	musicheader 1, 3, Music_ProfOak_Ch3
-; f4df3
 
-Music_ProfOak_Ch1: ; f4df3
+Music_ProfOak_Ch1:
 	tempo 118
 	volume $77
 	vibrato $12, $34
@@ -22,14 +21,14 @@ Music_ProfOak_Ch1: ; f4df3
 	note G#, 8
 	intensity $97
 	note G#, 8
-Music_ProfOak_branch_f4e10: ; f4e10
+Music_ProfOak_branch_f4e10:
 	intensity $91
 	callchannel Music_ProfOak_branch_f4e42
 	callchannel Music_ProfOak_branch_f4e42
 	callchannel Music_ProfOak_branch_f4e4d
 	callchannel Music_ProfOak_branch_f4e4d
 	loopchannel 2, Music_ProfOak_branch_f4e10
-Music_ProfOak_branch_f4e22: ; f4e22
+Music_ProfOak_branch_f4e22:
 	callchannel Music_ProfOak_branch_f4e58
 	callchannel Music_ProfOak_branch_f4e58
 	callchannel Music_ProfOak_branch_f4e6c
@@ -41,9 +40,8 @@ Music_ProfOak_branch_f4e22: ; f4e22
 	callchannel Music_ProfOak_branch_f4e6c
 	callchannel Music_ProfOak_branch_f4e6c
 	loopchannel 0, Music_ProfOak_branch_f4e22
-; f4e42
 
-Music_ProfOak_branch_f4e42: ; f4e42
+Music_ProfOak_branch_f4e42:
 	octave 2
 	note B_, 2
 	octave 3
@@ -55,9 +53,8 @@ Music_ProfOak_branch_f4e42: ; f4e42
 	note G#, 2
 	note E_, 2
 	endchannel
-; f4e4d
 
-Music_ProfOak_branch_f4e4d: ; f4e4d
+Music_ProfOak_branch_f4e4d:
 	octave 2
 	note B_, 2
 	octave 3
@@ -69,9 +66,8 @@ Music_ProfOak_branch_f4e4d: ; f4e4d
 	note F#, 2
 	note D#, 2
 	endchannel
-; f4e58
 
-Music_ProfOak_branch_f4e58: ; f4e58
+Music_ProfOak_branch_f4e58:
 	octave 2
 	note A_, 2
 	octave 3
@@ -88,9 +84,8 @@ Music_ProfOak_branch_f4e58: ; f4e58
 	note E_, 2
 	intensity $91
 	endchannel
-; f4e6c
 
-Music_ProfOak_branch_f4e6c: ; f4e6c
+Music_ProfOak_branch_f4e6c:
 	octave 2
 	note B_, 1
 	octave 3
@@ -105,9 +100,8 @@ Music_ProfOak_branch_f4e6c: ; f4e6c
 	note B_, 4
 	intensity $91
 	endchannel
-; f4e7e
 
-Music_ProfOak_Ch2: ; f4e7e
+Music_ProfOak_Ch2:
 	vibrato $12, $34
 	dutycycle $3
 	notetype $c, $a8
@@ -121,7 +115,7 @@ Music_ProfOak_Ch2: ; f4e7e
 	intensity $a7
 	note B_, 10
 	dutycycle $2
-Music_ProfOak_branch_f4e92: ; f4e92
+Music_ProfOak_branch_f4e92:
 	intensity $b2
 	octave 3
 	note B_, 2
@@ -159,7 +153,7 @@ Music_ProfOak_branch_f4e92: ; f4e92
 	loopchannel 2, Music_ProfOak_branch_f4e92
 	note __, 6
 	intensity $b4
-Music_ProfOak_branch_f4ebf: ; f4ebf
+Music_ProfOak_branch_f4ebf:
 	note C#, 6
 	octave 3
 	note A_, 1
@@ -208,9 +202,8 @@ Music_ProfOak_branch_f4ebf: ; f4ebf
 	note E_, 1
 	note G#, 16
 	loopchannel 0, Music_ProfOak_branch_f4ebf
-; f4ef5
 
-Music_ProfOak_Ch3: ; f4ef5
+Music_ProfOak_Ch3:
 	stereopanning $f
 	notetype $c, $14
 	note __, 4
@@ -230,13 +223,13 @@ Music_ProfOak_Ch3: ; f4ef5
 	note __, 1
 	note E_, 2
 	callchannel Music_ProfOak_branch_f4f3d
-Music_ProfOak_branch_f4f0d: ; f4f0d
+Music_ProfOak_branch_f4f0d:
 	callchannel Music_ProfOak_branch_f4f3d
 	callchannel Music_ProfOak_branch_f4f3d
 	callchannel Music_ProfOak_branch_f4f4c
 	callchannel Music_ProfOak_branch_f4f4c
 	loopchannel 2, Music_ProfOak_branch_f4f0d
-Music_ProfOak_branch_f4f1d: ; f4f1d
+Music_ProfOak_branch_f4f1d:
 	callchannel Music_ProfOak_branch_f4f5a
 	callchannel Music_ProfOak_branch_f4f5a
 	callchannel Music_ProfOak_branch_f4f69
@@ -248,9 +241,8 @@ Music_ProfOak_branch_f4f1d: ; f4f1d
 	callchannel Music_ProfOak_branch_f4f69
 	callchannel Music_ProfOak_branch_f4f69
 	loopchannel 0, Music_ProfOak_branch_f4f1d
-; f4f3d
 
-Music_ProfOak_branch_f4f3d: ; f4f3d
+Music_ProfOak_branch_f4f3d:
 	note E_, 2
 	note __, 2
 	octave 4
@@ -266,9 +258,8 @@ Music_ProfOak_branch_f4f3d: ; f4f3d
 	note __, 1
 	note E_, 2
 	endchannel
-; f4f4c
 
-Music_ProfOak_branch_f4f4c: ; f4f4c
+Music_ProfOak_branch_f4f4c:
 	octave 2
 	note B_, 2
 	note __, 2
@@ -283,9 +274,8 @@ Music_ProfOak_branch_f4f4c: ; f4f4c
 	note __, 1
 	note D#, 2
 	endchannel
-; f4f5a
 
-Music_ProfOak_branch_f4f5a: ; f4f5a
+Music_ProfOak_branch_f4f5a:
 	octave 2
 	note A_, 2
 	note __, 2
@@ -301,9 +291,8 @@ Music_ProfOak_branch_f4f5a: ; f4f5a
 	note __, 1
 	note C#, 2
 	endchannel
-; f4f69
 
-Music_ProfOak_branch_f4f69: ; f4f69
+Music_ProfOak_branch_f4f69:
 	octave 2
 	note G#, 2
 	note __, 2
@@ -320,4 +309,3 @@ Music_ProfOak_branch_f4f69: ; f4f69
 	octave 2
 	note B_, 2
 	endchannel
-; f4f79
diff --git a/audio/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm
index 8907e7614..bd2994660 100644
--- a/audio/music/profoakspokemontalk.asm
+++ b/audio/music/profoakspokemontalk.asm
@@ -1,12 +1,11 @@
-Music_ProfOaksPokemonTalk: ; f4c9f
+Music_ProfOaksPokemonTalk:
 	musicheader 3, 1, Music_ProfOaksPokemonTalk_Ch1
 	musicheader 1, 2, Music_ProfOaksPokemonTalk_Ch2
 	musicheader 1, 3, Music_ProfOaksPokemonTalk_Ch3
-; f4ca8
 
 	db $3
 
-Music_ProfOaksPokemonTalk_Ch1: ; f4ca9
+Music_ProfOaksPokemonTalk_Ch1:
 	tempo 164
 	volume $77
 	stereopanning $f
@@ -24,7 +23,7 @@ Music_ProfOaksPokemonTalk_Ch1: ; f4ca9
 	note D#, 1
 	note E_, 1
 	note F#, 1
-Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3
+Music_ProfOaksPokemonTalk_branch_f4cc3:
 	note D#, 6
 	note C#, 1
 	octave 3
@@ -132,9 +131,8 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3
 	note F#, 1
 	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3
-; f4d31
 
-Music_ProfOaksPokemonTalk_Ch2: ; f4d31
+Music_ProfOaksPokemonTalk_Ch2:
 	vibrato $8, $24
 	dutycycle $3
 	notetype $c, $a7
@@ -157,7 +155,7 @@ Music_ProfOaksPokemonTalk_Ch2: ; f4d31
 	note F#, 1
 	note G#, 1
 	note A#, 1
-Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d
+Music_ProfOaksPokemonTalk_branch_f4d4d:
 	note B_, 6
 	note A#, 1
 	note G#, 1
@@ -208,9 +206,8 @@ Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d
 	note A#, 1
 	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d
-; f4d82
 
-Music_ProfOaksPokemonTalk_Ch3: ; f4d82
+Music_ProfOaksPokemonTalk_Ch3:
 	vibrato $6, $38
 	notetype $c, $25
 	stereopanning $f0
@@ -225,7 +222,7 @@ Music_ProfOaksPokemonTalk_Ch3: ; f4d82
 	note C#, 1
 	octave 2
 	note A#, 1
-Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95
+Music_ProfOaksPokemonTalk_branch_f4d95:
 	note B_, 6
 	octave 3
 	note D#, 1
@@ -308,4 +305,3 @@ Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95
 	note A#, 1
 	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95
-; f4dea
diff --git a/audio/music/rivalbattle.asm b/audio/music/rivalbattle.asm
index 8dc4616a6..4ba8840ba 100644
--- a/audio/music/rivalbattle.asm
+++ b/audio/music/rivalbattle.asm
@@ -1,10 +1,9 @@
-Music_RivalBattle: ; e974f
+Music_RivalBattle:
 	musicheader 3, 1, Music_RivalBattle_Ch1
 	musicheader 1, 2, Music_RivalBattle_Ch2
 	musicheader 1, 3, Music_RivalBattle_Ch3
-; e9758
 
-Music_RivalBattle_Ch1: ; e9758
+Music_RivalBattle_Ch1:
 	tempo 102
 	volume $77
 	dutycycle $3
@@ -23,7 +22,7 @@ Music_RivalBattle_Ch1: ; e9758
 	intensity $b7
 	note C#, 6
 	note E_, 4
-Music_RivalBattle_branch_e9777: ; e9777
+Music_RivalBattle_branch_e9777:
 	intensity $b2
 	octave 2
 	note A#, 6
@@ -40,7 +39,7 @@ Music_RivalBattle_branch_e9777: ; e9777
 	note C#, 4
 	intensity $b7
 	note C#, 10
-Music_RivalBattle_branch_e978f: ; e978f
+Music_RivalBattle_branch_e978f:
 	intensity $b2
 	octave 3
 	note G#, 6
@@ -56,7 +55,7 @@ Music_RivalBattle_branch_e978f: ; e978f
 	note B_, 4
 	intensity $4d
 	note B_, 10
-Music_RivalBattle_branch_e97a6: ; e97a6
+Music_RivalBattle_branch_e97a6:
 	intensity $b7
 	note A#, 6
 	note F#, 6
@@ -179,7 +178,7 @@ Music_RivalBattle_branch_e97a6: ; e97a6
 	note E_, 2
 	note D#, 2
 	note C#, 2
-Music_RivalBattle_branch_e9837: ; e9837
+Music_RivalBattle_branch_e9837:
 	octave 3
 	note A#, 2
 	note E_, 2
@@ -285,9 +284,8 @@ Music_RivalBattle_branch_e9837: ; e9837
 	octave 3
 	note C#, 10
 	loopchannel 0, Music_RivalBattle_branch_e97a6
-; e98af
 
-Music_RivalBattle_Ch2: ; e98af
+Music_RivalBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
@@ -337,7 +335,7 @@ Music_RivalBattle_Ch2: ; e98af
 	note F#, 6
 	intensity $c2
 	note G#, 4
-Music_RivalBattle_branch_e98ea: ; e98ea
+Music_RivalBattle_branch_e98ea:
 	intensity $c2
 	note D#, 6
 	intensity $c7
@@ -354,7 +352,7 @@ Music_RivalBattle_branch_e98ea: ; e98ea
 	note B_, 1
 	octave 4
 	note C_, 1
-Music_RivalBattle_branch_e9903: ; e9903
+Music_RivalBattle_branch_e9903:
 	intensity $c2
 	note C#, 6
 	intensity $c7
@@ -369,7 +367,7 @@ Music_RivalBattle_branch_e9903: ; e9903
 	note E_, 4
 	intensity $b7
 	note E_, 6
-Music_RivalBattle_branch_e991a: ; e991a
+Music_RivalBattle_branch_e991a:
 	callchannel Music_RivalBattle_branch_e99e0
 	intensity $b0
 	note G#, 8
@@ -474,7 +472,7 @@ Music_RivalBattle_branch_e991a: ; e991a
 	note G#, 8
 	intensity $c7
 	note F_, 8
-Music_RivalBattle_branch_e99a6: ; e99a6
+Music_RivalBattle_branch_e99a6:
 	intensity $c2
 	octave 3
 	note A#, 6
@@ -493,7 +491,7 @@ Music_RivalBattle_branch_e99a6: ; e99a6
 	note C#, 6
 	intensity $9a
 	note C#, 4
-Music_RivalBattle_branch_e99c1: ; e99c1
+Music_RivalBattle_branch_e99c1:
 	intensity $c2
 	octave 3
 	note G#, 6
@@ -513,9 +511,8 @@ Music_RivalBattle_branch_e99c1: ; e99c1
 	octave 4
 	note D_, 4
 	loopchannel 0, Music_RivalBattle_branch_e991a
-; e99e0
 
-Music_RivalBattle_branch_e99e0: ; e99e0
+Music_RivalBattle_branch_e99e0:
 	intensity $c7
 	note D#, 10
 	intensity $c4
@@ -536,9 +533,8 @@ Music_RivalBattle_branch_e99e0: ; e99e0
 	intensity $b7
 	note F_, 8
 	endchannel
-; e99fb
 
-Music_RivalBattle_Ch3: ; e99fb
+Music_RivalBattle_Ch3:
 	notetype $c, $19
 	octave 3
 	note F#, 2
@@ -554,7 +550,7 @@ Music_RivalBattle_Ch3: ; e99fb
 	octave 3
 	note C#, 2
 	note D_, 2
-Music_RivalBattle_branch_e9a0c: ; e9a0c
+Music_RivalBattle_branch_e9a0c:
 	note D#, 2
 	note C#, 2
 	note D#, 2
@@ -563,7 +559,7 @@ Music_RivalBattle_branch_e9a0c: ; e9a0c
 	note D#, 2
 	note C#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9a0c
-Music_RivalBattle_branch_e9a17: ; e9a17
+Music_RivalBattle_branch_e9a17:
 	octave 3
 	note C#, 2
 	octave 2
@@ -586,7 +582,7 @@ Music_RivalBattle_branch_e9a17: ; e9a17
 	note C_, 2
 	note C#, 2
 	note D_, 2
-Music_RivalBattle_branch_e9a30: ; e9a30
+Music_RivalBattle_branch_e9a30:
 	callchannel Music_RivalBattle_branch_e9b47
 	octave 2
 	note A#, 2
@@ -633,14 +629,14 @@ Music_RivalBattle_branch_e9a30: ; e9a30
 	octave 3
 	note F_, 2
 	callchannel Music_RivalBattle_branch_e9b50
-Music_RivalBattle_branch_e9a66: ; e9a66
+Music_RivalBattle_branch_e9a66:
 	note C#, 2
 	note G#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9a66
 	callchannel Music_RivalBattle_branch_e9b5c
 	note G#, 2
 	note F#, 2
-Music_RivalBattle_branch_e9a71: ; e9a71
+Music_RivalBattle_branch_e9a71:
 	octave 2
 	note A#, 2
 	octave 3
@@ -698,29 +694,29 @@ Music_RivalBattle_branch_e9a71: ; e9a71
 	note F#, 2
 	note G_, 2
 	note G#, 2
-Music_RivalBattle_branch_e9ab3: ; e9ab3
+Music_RivalBattle_branch_e9ab3:
 	note D#, 2
 	note A#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9ab3
-Music_RivalBattle_branch_e9ab9: ; e9ab9
+Music_RivalBattle_branch_e9ab9:
 	note D#, 2
 	note A_, 2
 	loopchannel 4, Music_RivalBattle_branch_e9ab9
-Music_RivalBattle_branch_e9abf: ; e9abf
+Music_RivalBattle_branch_e9abf:
 	note D#, 2
 	note G#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9abf
-Music_RivalBattle_branch_e9ac5: ; e9ac5
+Music_RivalBattle_branch_e9ac5:
 	note D#, 2
 	note G_, 2
 	loopchannel 12, Music_RivalBattle_branch_e9ac5
-Music_RivalBattle_branch_e9acb: ; e9acb
+Music_RivalBattle_branch_e9acb:
 	octave 2
 	note B_, 2
 	octave 3
 	note D#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9acb
-Music_RivalBattle_branch_e9ad3: ; e9ad3
+Music_RivalBattle_branch_e9ad3:
 	octave 2
 	note B_, 2
 	octave 3
@@ -779,7 +775,7 @@ Music_RivalBattle_branch_e9ad3: ; e9ad3
 	note C#, 8
 	note D#, 8
 	note F_, 8
-Music_RivalBattle_branch_e9b10: ; e9b10
+Music_RivalBattle_branch_e9b10:
 	octave 2
 	note A#, 2
 	octave 3
@@ -787,7 +783,7 @@ Music_RivalBattle_branch_e9b10: ; e9b10
 	loopchannel 7, Music_RivalBattle_branch_e9b10
 	note E_, 2
 	note D#, 2
-Music_RivalBattle_branch_e9b1a: ; e9b1a
+Music_RivalBattle_branch_e9b1a:
 	octave 2
 	note A#, 2
 	octave 3
@@ -799,7 +795,7 @@ Music_RivalBattle_branch_e9b1a: ; e9b1a
 	note F#, 2
 	note F_, 2
 	note E_, 2
-Music_RivalBattle_branch_e9b28: ; e9b28
+Music_RivalBattle_branch_e9b28:
 	octave 2
 	note G#, 2
 	octave 3
@@ -807,7 +803,7 @@ Music_RivalBattle_branch_e9b28: ; e9b28
 	loopchannel 7, Music_RivalBattle_branch_e9b28
 	note D_, 2
 	note C#, 2
-Music_RivalBattle_branch_e9b32: ; e9b32
+Music_RivalBattle_branch_e9b32:
 	octave 2
 	note G#, 2
 	octave 3
@@ -823,18 +819,16 @@ Music_RivalBattle_branch_e9b32: ; e9b32
 	note D#, 2
 	note D_, 2
 	loopchannel 0, Music_RivalBattle_branch_e9a30
-; e9b47
 
-Music_RivalBattle_branch_e9b47: ; e9b47
+Music_RivalBattle_branch_e9b47:
 	octave 2
 	note A#, 2
 	octave 3
 	note D#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9b47
 	endchannel
-; e9b50
 
-Music_RivalBattle_branch_e9b50: ; e9b50
+Music_RivalBattle_branch_e9b50:
 	note C#, 2
 	note G#, 2
 	octave 4
@@ -847,18 +841,16 @@ Music_RivalBattle_branch_e9b50: ; e9b50
 	note C#, 2
 	note G#, 2
 	endchannel
-; e9b5c
 
-Music_RivalBattle_branch_e9b5c: ; e9b5c
+Music_RivalBattle_branch_e9b5c:
 	octave 2
 	note B_, 2
 	octave 3
 	note F#, 2
 	loopchannel 7, Music_RivalBattle_branch_e9b5c
 	endchannel
-; e9b65
 
-Music_RivalBattle_branch_e9b65: ; e9b65
+Music_RivalBattle_branch_e9b65:
 	octave 3
 	note D#, 2
 	note A#, 2
@@ -866,4 +858,3 @@ Music_RivalBattle_branch_e9b65: ; e9b65
 	note D#, 2
 	loopchannel 2, Music_RivalBattle_branch_e9b65
 	endchannel
-; e9b6f
diff --git a/audio/music/rocketbattle.asm b/audio/music/rocketbattle.asm
index b7f27fa4e..30c90b08c 100644
--- a/audio/music/rocketbattle.asm
+++ b/audio/music/rocketbattle.asm
@@ -1,10 +1,9 @@
-Music_RocketBattle: ; e9b6f
+Music_RocketBattle:
 	musicheader 3, 1, Music_RocketBattle_Ch1
 	musicheader 1, 2, Music_RocketBattle_Ch2
 	musicheader 1, 3, Music_RocketBattle_Ch3
-; e9b78
 
-Music_RocketBattle_Ch1: ; e9b78
+Music_RocketBattle_Ch1:
 	tempo 101
 	volume $77
 	dutycycle $3
@@ -48,7 +47,7 @@ Music_RocketBattle_Ch1: ; e9b78
 	note C_, 1
 	octave 2
 	note B_, 1
-Music_RocketBattle_branch_e9bad: ; e9bad
+Music_RocketBattle_branch_e9bad:
 	intensity $b2
 	octave 3
 	note C_, 6
@@ -62,7 +61,7 @@ Music_RocketBattle_branch_e9bad: ; e9bad
 	note C_, 6
 	intensity $b7
 	note D_, 4
-Music_RocketBattle_branch_e9bc1: ; e9bc1
+Music_RocketBattle_branch_e9bc1:
 	intensity $b2
 	octave 4
 	note E_, 6
@@ -116,7 +115,7 @@ Music_RocketBattle_branch_e9bc1: ; e9bc1
 	note D#, 2
 	note D_, 2
 	note F_, 2
-Music_RocketBattle_branch_e9c02: ; e9c02
+Music_RocketBattle_branch_e9c02:
 	octave 4
 	note E_, 2
 	octave 3
@@ -291,7 +290,7 @@ Music_RocketBattle_branch_e9c02: ; e9c02
 	intensity $b7
 	note A#, 2
 	note G_, 4
-Music_RocketBattle_branch_e9cc5: ; e9cc5
+Music_RocketBattle_branch_e9cc5:
 	intensity $b2
 	note F_, 6
 	note F_, 4
@@ -389,9 +388,8 @@ Music_RocketBattle_branch_e9cc5: ; e9cc5
 	note D_, 2
 	note F_, 2
 	loopchannel 0, Music_RocketBattle_branch_e9c02
-; e9d3e
 
-Music_RocketBattle_Ch2: ; e9d3e
+Music_RocketBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
@@ -438,7 +436,7 @@ Music_RocketBattle_Ch2: ; e9d3e
 	note G#, 1
 	note A_, 1
 	note G#, 1
-Music_RocketBattle_branch_e9d7b: ; e9d7b
+Music_RocketBattle_branch_e9d7b:
 	intensity $c2
 	octave 3
 	note A_, 6
@@ -454,7 +452,7 @@ Music_RocketBattle_branch_e9d7b: ; e9d7b
 	note A_, 6
 	intensity $4a
 	note G#, 4
-Music_RocketBattle_branch_e9d91: ; e9d91
+Music_RocketBattle_branch_e9d91:
 	intensity $c2
 	octave 4
 	note A_, 6
@@ -476,7 +474,7 @@ Music_RocketBattle_branch_e9d91: ; e9d91
 	note F_, 16
 	intensity $b7
 	note F_, 16
-Music_RocketBattle_branch_e9db1: ; e9db1
+Music_RocketBattle_branch_e9db1:
 	callchannel Music_RocketBattle_branch_e9ea0
 	intensity $b0
 	note F_, 8
@@ -605,7 +603,7 @@ Music_RocketBattle_branch_e9db1: ; e9db1
 	note G_, 1
 	note G#, 1
 	note A_, 8
-Music_RocketBattle_branch_e9e5a: ; e9e5a
+Music_RocketBattle_branch_e9e5a:
 	intensity $c2
 	octave 3
 	note A#, 6
@@ -657,9 +655,8 @@ Music_RocketBattle_branch_e9e5a: ; e9e5a
 	intensity $c7
 	note A#, 8
 	loopchannel 0, Music_RocketBattle_branch_e9db1
-; e9ea0
 
-Music_RocketBattle_branch_e9ea0: ; e9ea0
+Music_RocketBattle_branch_e9ea0:
 	intensity $c6
 	octave 4
 	note A_, 6
@@ -669,9 +666,8 @@ Music_RocketBattle_branch_e9ea0: ; e9ea0
 	note G#, 6
 	note E_, 4
 	endchannel
-; e9eaa
 
-Music_RocketBattle_Ch3: ; e9eaa
+Music_RocketBattle_Ch3:
 	notetype $c, $19
 	octave 3
 	note A_, 2
@@ -704,7 +700,7 @@ Music_RocketBattle_Ch3: ; e9eaa
 	octave 2
 	note B_, 2
 	note A#, 2
-Music_RocketBattle_branch_e9ecc: ; e9ecc
+Music_RocketBattle_branch_e9ecc:
 	callchannel Music_RocketBattle_branch_e9fe6
 	loopchannel 3, Music_RocketBattle_branch_e9ecc
 	octave 2
@@ -719,7 +715,7 @@ Music_RocketBattle_branch_e9ecc: ; e9ecc
 	note F_, 2
 	note E_, 2
 	note D_, 2
-Music_RocketBattle_branch_e9edf: ; e9edf
+Music_RocketBattle_branch_e9edf:
 	callchannel Music_RocketBattle_branch_e9fe6
 	loopchannel 3, Music_RocketBattle_branch_e9edf
 	octave 2
@@ -740,7 +736,7 @@ Music_RocketBattle_branch_e9edf: ; e9edf
 	octave 3
 	note F_, 2
 	callchannel Music_RocketBattle_branch_ea01d
-Music_RocketBattle_branch_e9efe: ; e9efe
+Music_RocketBattle_branch_e9efe:
 	callchannel Music_RocketBattle_branch_e9ff3
 	callchannel Music_RocketBattle_branch_ea010
 	octave 3
@@ -774,7 +770,7 @@ Music_RocketBattle_branch_e9efe: ; e9efe
 	note A_, 2
 	octave 3
 	note E_, 2
-Music_RocketBattle_branch_e9f25: ; e9f25
+Music_RocketBattle_branch_e9f25:
 	octave 2
 	note A#, 2
 	octave 3
@@ -807,7 +803,7 @@ Music_RocketBattle_branch_e9f25: ; e9f25
 	note D_, 2
 	callchannel Music_RocketBattle_branch_ea02a
 	callchannel Music_RocketBattle_branch_ea02a
-Music_RocketBattle_branch_e9f4e: ; e9f4e
+Music_RocketBattle_branch_e9f4e:
 	octave 2
 	note A_, 2
 	octave 3
@@ -833,7 +829,7 @@ Music_RocketBattle_branch_e9f4e: ; e9f4e
 	note A_, 2
 	note G_, 2
 	note F_, 2
-Music_RocketBattle_branch_e9f6a: ; e9f6a
+Music_RocketBattle_branch_e9f6a:
 	octave 2
 	note A#, 2
 	octave 3
@@ -849,7 +845,7 @@ Music_RocketBattle_branch_e9f6a: ; e9f6a
 	note D_, 2
 	note C#, 2
 	note D_, 2
-Music_RocketBattle_branch_e9f7c: ; e9f7c
+Music_RocketBattle_branch_e9f7c:
 	octave 2
 	note A_, 2
 	octave 3
@@ -863,7 +859,7 @@ Music_RocketBattle_branch_e9f7c: ; e9f7c
 	note C_, 2
 	octave 2
 	note A#, 2
-Music_RocketBattle_branch_e9f8c: ; e9f8c
+Music_RocketBattle_branch_e9f8c:
 	octave 2
 	note A_, 2
 	octave 3
@@ -879,7 +875,7 @@ Music_RocketBattle_branch_e9f8c: ; e9f8c
 	note A_, 2
 	note G_, 2
 	note A#, 2
-Music_RocketBattle_branch_e9f9e: ; e9f9e
+Music_RocketBattle_branch_e9f9e:
 	octave 2
 	note A#, 2
 	octave 3
@@ -887,7 +883,7 @@ Music_RocketBattle_branch_e9f9e: ; e9f9e
 	loopchannel 7, Music_RocketBattle_branch_e9f9e
 	note E_, 2
 	note F_, 2
-Music_RocketBattle_branch_e9fa8: ; e9fa8
+Music_RocketBattle_branch_e9fa8:
 	octave 2
 	note A#, 2
 	octave 3
@@ -932,9 +928,8 @@ Music_RocketBattle_branch_e9fa8: ; e9fa8
 	note F_, 2
 	callchannel Music_RocketBattle_branch_ea01d
 	loopchannel 0, Music_RocketBattle_branch_e9efe
-; e9fe6
 
-Music_RocketBattle_branch_e9fe6: ; e9fe6
+Music_RocketBattle_branch_e9fe6:
 	octave 2
 	note A_, 2
 	octave 3
@@ -948,9 +943,8 @@ Music_RocketBattle_branch_e9fe6: ; e9fe6
 	note G_, 2
 	note F_, 2
 	endchannel
-; e9ff3
 
-Music_RocketBattle_branch_e9ff3: ; e9ff3
+Music_RocketBattle_branch_e9ff3:
 	octave 2
 	note A_, 2
 	octave 3
@@ -980,9 +974,8 @@ Music_RocketBattle_branch_e9ff3: ; e9ff3
 	note D#, 2
 	note D_, 2
 	endchannel
-; ea010
 
-Music_RocketBattle_branch_ea010: ; ea010
+Music_RocketBattle_branch_ea010:
 	octave 2
 	note A#, 2
 	octave 3
@@ -996,9 +989,8 @@ Music_RocketBattle_branch_ea010: ; ea010
 	octave 2
 	note A#, 2
 	endchannel
-; ea01d
 
-Music_RocketBattle_branch_ea01d: ; ea01d
+Music_RocketBattle_branch_ea01d:
 	octave 2
 	note A#, 2
 	octave 3
@@ -1012,18 +1004,16 @@ Music_RocketBattle_branch_ea01d: ; ea01d
 	octave 3
 	note F_, 2
 	endchannel
-; ea02a
 
-Music_RocketBattle_branch_ea02a: ; ea02a
+Music_RocketBattle_branch_ea02a:
 	octave 2
 	note A_, 2
 	octave 3
 	note E_, 2
 	loopchannel 4, Music_RocketBattle_branch_ea02a
 	endchannel
-; ea033
 
-Music_RocketBattle_branch_ea033: ; ea033
+Music_RocketBattle_branch_ea033:
 	octave 2
 	note A_, 2
 	octave 3
@@ -1037,4 +1027,3 @@ Music_RocketBattle_branch_ea033: ; ea033
 	octave 2
 	note A_, 2
 	endchannel
-; ea040
diff --git a/audio/music/rockethideout.asm b/audio/music/rockethideout.asm
index f38ce422b..6c3a116ac 100644
--- a/audio/music/rockethideout.asm
+++ b/audio/music/rockethideout.asm
@@ -1,11 +1,10 @@
-Music_RocketHideout: ; eeb75
+Music_RocketHideout:
 	musicheader 4, 1, Music_RocketHideout_Ch1
 	musicheader 1, 2, Music_RocketHideout_Ch2
 	musicheader 1, 3, Music_RocketHideout_Ch3
 	musicheader 1, 4, Music_RocketHideout_Ch4
-; eeb81
 
-Music_RocketHideout_Ch1: ; eeb81
+Music_RocketHideout_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
@@ -13,10 +12,10 @@ Music_RocketHideout_Ch1: ; eeb81
 	vibrato $10, $44
 	notetype $c, $b3
 	stereopanning $f0
-Music_RocketHideout_branch_eeb93: ; eeb93
+Music_RocketHideout_branch_eeb93:
 	note __, 16
 	loopchannel 4, Music_RocketHideout_branch_eeb93
-Music_RocketHideout_branch_eeb98: ; eeb98
+Music_RocketHideout_branch_eeb98:
 	octave 2
 	note D#, 2
 	note __, 2
@@ -114,19 +113,18 @@ Music_RocketHideout_branch_eeb98: ; eeb98
 	note __, 16
 	note A_, 16
 	intensity $b3
-Music_RocketHideout_branch_eebfe: ; eebfe
+Music_RocketHideout_branch_eebfe:
 	note __, 16
 	loopchannel 4, Music_RocketHideout_branch_eebfe
 	loopchannel 0, Music_RocketHideout_branch_eeb93
-; eec07
 
-Music_RocketHideout_Ch2: ; eec07
+Music_RocketHideout_Ch2:
 	dutycycle $3
 	tone $0002
 	vibrato $0, $f0
 	notetype $c, $c4
 	stereopanning $f
-Music_RocketHideout_branch_eec14: ; eec14
+Music_RocketHideout_branch_eec14:
 	octave 2
 	note D#, 2
 	note __, 2
@@ -221,11 +219,10 @@ Music_RocketHideout_branch_eec14: ; eec14
 	note G_, 2
 	note __, 8
 	loopchannel 0, Music_RocketHideout_branch_eec14
-; eec79
 
-Music_RocketHideout_Ch3: ; eec79
+Music_RocketHideout_Ch3:
 	notetype $c, $19
-Music_RocketHideout_branch_eec7c: ; eec7c
+Music_RocketHideout_branch_eec7c:
 	octave 2
 	note D#, 2
 	note __, 2
@@ -237,7 +234,7 @@ Music_RocketHideout_branch_eec7c: ; eec7c
 	note A_, 2
 	note __, 8
 	loopchannel 6, Music_RocketHideout_branch_eec7c
-Music_RocketHideout_branch_eec8a: ; eec8a
+Music_RocketHideout_branch_eec8a:
 	note F_, 2
 	note __, 2
 	octave 3
@@ -252,7 +249,7 @@ Music_RocketHideout_branch_eec8a: ; eec8a
 	note B_, 2
 	note __, 8
 	loopchannel 2, Music_RocketHideout_branch_eec8a
-Music_RocketHideout_branch_eec9b: ; eec9b
+Music_RocketHideout_branch_eec9b:
 	note C#, 2
 	note __, 2
 	note G#, 4
@@ -261,7 +258,7 @@ Music_RocketHideout_branch_eec9b: ; eec9b
 	octave 3
 	note C#, 16
 	loopchannel 2, Music_RocketHideout_branch_eec9b
-Music_RocketHideout_branch_eeca6: ; eeca6
+Music_RocketHideout_branch_eeca6:
 	octave 2
 	note C#, 2
 	note __, 2
@@ -274,9 +271,8 @@ Music_RocketHideout_branch_eeca6: ; eeca6
 	note __, 8
 	loopchannel 2, Music_RocketHideout_branch_eeca6
 	loopchannel 0, Music_RocketHideout_branch_eec7c
-; eecb8
 
-Music_RocketHideout_Ch4: ; eecb8
+Music_RocketHideout_Ch4:
 	togglenoise $0
 	notetype $c
 	stereopanning $f
@@ -287,7 +283,7 @@ Music_RocketHideout_Ch4: ; eecb8
 	note D#, 1
 	note D#, 1
 	callchannel Music_RocketHideout_branch_eecdb
-Music_RocketHideout_branch_eecc7: ; eecc7
+Music_RocketHideout_branch_eecc7:
 	callchannel Music_RocketHideout_branch_eecdb
 	note E_, 4
 	callchannel Music_RocketHideout_branch_eecdb
@@ -297,9 +293,8 @@ Music_RocketHideout_branch_eecc7: ; eecc7
 	callchannel Music_RocketHideout_branch_eecdb
 	note F#, 4
 	loopchannel 0, Music_RocketHideout_branch_eecc7
-; eecdb
 
-Music_RocketHideout_branch_eecdb: ; eecdb
+Music_RocketHideout_branch_eecdb:
 	stereopanning $f0
 	note D#, 1
 	note D#, 1
@@ -310,4 +305,3 @@ Music_RocketHideout_branch_eecdb: ; eecdb
 	stereopanning $f0
 	note A_, 4
 	endchannel
-; eece8
diff --git a/audio/music/rockettheme.asm b/audio/music/rockettheme.asm
index 90b4869d7..6f13d8b68 100644
--- a/audio/music/rockettheme.asm
+++ b/audio/music/rockettheme.asm
@@ -1,11 +1,10 @@
-Music_RocketTheme: ; f766d
+Music_RocketTheme:
 	musicheader 4, 1, Music_RocketTheme_Ch1
 	musicheader 1, 2, Music_RocketTheme_Ch2
 	musicheader 1, 3, Music_RocketTheme_Ch3
 	musicheader 1, 4, Music_RocketTheme_Ch4
-; f7679
 
-Music_RocketTheme_Ch1: ; f7679
+Music_RocketTheme_Ch1:
 	tempo 128
 	volume $77
 	dutycycle $3
@@ -15,7 +14,7 @@ Music_RocketTheme_Ch1: ; f7679
 	octave 4
 	note C_, 1
 	note D_, 1
-Music_RocketTheme_branch_f768b: ; f768b
+Music_RocketTheme_branch_f768b:
 	dutycycle $3
 	notetype $c, $a8
 	callchannel Music_RocketTheme_branch_f74e6
@@ -87,7 +86,7 @@ Music_RocketTheme_branch_f768b: ; f768b
 	note E_, 2
 	note D#, 2
 	note D_, 2
-Music_RocketTheme_branch_f76ef: ; f76ef
+Music_RocketTheme_branch_f76ef:
 	note __, 4
 	note F_, 2
 	note __, 14
@@ -103,19 +102,19 @@ Music_RocketTheme_branch_f76ef: ; f76ef
 	note __, 2
 	note D#, 2
 	note C_, 2
-Music_RocketTheme_branch_f7701: ; f7701
+Music_RocketTheme_branch_f7701:
 	note F#, 2
 	note A_, 2
 	loopchannel 4, Music_RocketTheme_branch_f7701
-Music_RocketTheme_branch_f7707: ; f7707
+Music_RocketTheme_branch_f7707:
 	note G_, 2
 	note A#, 2
 	loopchannel 4, Music_RocketTheme_branch_f7707
-Music_RocketTheme_branch_f770d: ; f770d
+Music_RocketTheme_branch_f770d:
 	note G#, 2
 	note B_, 2
 	loopchannel 4, Music_RocketTheme_branch_f770d
-Music_RocketTheme_branch_f7713: ; f7713
+Music_RocketTheme_branch_f7713:
 	octave 3
 	note A_, 2
 	octave 4
@@ -128,9 +127,8 @@ Music_RocketTheme_branch_f7713: ; f7713
 	note C_, 1
 	note D_, 1
 	loopchannel 0, Music_RocketTheme_branch_f768b
-; f7727
 
-Music_RocketTheme_branch_f7727: ; f7727
+Music_RocketTheme_branch_f7727:
 	note __, 7
 	note B_, 1
 	octave 4
@@ -154,9 +152,8 @@ Music_RocketTheme_branch_f7727: ; f7727
 	note A#, 2
 	note __, 10
 	endchannel
-; f773e
 
-Music_RocketTheme_Ch2: ; f773e
+Music_RocketTheme_Ch2:
 	stereopanning $ff
 	vibrato $4, $64
 	dutycycle $3
@@ -164,7 +161,7 @@ Music_RocketTheme_Ch2: ; f773e
 	octave 5
 	note C_, 1
 	note D_, 1
-Music_RocketTheme_branch_f774b: ; f774b
+Music_RocketTheme_branch_f774b:
 	notetype $c, $b7
 	callchannel Music_RocketTheme_branch_f7547
 	intensity $b7
@@ -291,9 +288,8 @@ Music_RocketTheme_branch_f774b: ; f774b
 	note C_, 2
 	note D_, 2
 	loopchannel 0, Music_RocketTheme_branch_f774b
-; f7800
 
-Music_RocketTheme_branch_f7800: ; f7800
+Music_RocketTheme_branch_f7800:
 	notetype $6, $b7
 	note __, 7
 	octave 4
@@ -320,9 +316,8 @@ Music_RocketTheme_branch_f7800: ; f7800
 	note D#, 2
 	note __, 2
 	endchannel
-; f781c
 
-Music_RocketTheme_branch_f781c: ; f781c
+Music_RocketTheme_branch_f781c:
 	octave 3
 	note B_, 1
 	octave 4
@@ -333,14 +328,13 @@ Music_RocketTheme_branch_f781c: ; f781c
 	note F_, 8
 	note C_, 4
 	endchannel
-; f7826
 
-Music_RocketTheme_Ch3: ; f7826
+Music_RocketTheme_Ch3:
 	stereopanning $f0
 	vibrato $4, $22
 	notetype $c, $14
 	note __, 2
-Music_RocketTheme_branch_f782f: ; f782f
+Music_RocketTheme_branch_f782f:
 	notetype $c, $14
 	callchannel Music_RocketTheme_branch_f75bf
 	callchannel Music_RocketTheme_branch_f75fe
@@ -447,13 +441,12 @@ Music_RocketTheme_branch_f782f: ; f782f
 	note G#, 1
 	note __, 1
 	loopchannel 0, Music_RocketTheme_branch_f782f
-; f78be
 
-Music_RocketTheme_Ch4: ; f78be
+Music_RocketTheme_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 2
-Music_RocketTheme_branch_f78c3: ; f78c3
+Music_RocketTheme_branch_f78c3:
 	callchannel Music_RocketTheme_branch_f765c
 	callchannel Music_RocketTheme_branch_f7664
 	callchannel Music_RocketTheme_branch_f7664
@@ -463,7 +456,7 @@ Music_RocketTheme_branch_f78c3: ; f78c3
 	callchannel Music_RocketTheme_branch_f7664
 	callchannel Music_RocketTheme_branch_f7664
 	callchannel Music_RocketTheme_branch_f765c
-Music_RocketTheme_branch_f78de: ; f78de
+Music_RocketTheme_branch_f78de:
 	note A#, 2
 	note F#, 2
 	note D_, 2
@@ -479,4 +472,3 @@ Music_RocketTheme_branch_f78de: ; f78de
 	callchannel Music_RocketTheme_branch_f765c
 	callchannel Music_RocketTheme_branch_f765c
 	loopchannel 0, Music_RocketTheme_branch_f78c3
-; f78fd
diff --git a/audio/music/route1.asm b/audio/music/route1.asm
index 1bcbd35a6..8a537b9fd 100644
--- a/audio/music/route1.asm
+++ b/audio/music/route1.asm
@@ -1,12 +1,11 @@
-Music_Route1: ; ec000
+Music_Route1:
 	musicheader 3, 1, Music_Route1_Ch1
 	musicheader 1, 2, Music_Route1_Ch2
 	musicheader 1, 3, Music_Route1_Ch3
-; ec009
 
 	db $3
 
-Music_Route1_Ch1: ; ec00a
+Music_Route1_Ch1:
 	stereopanning $f
 	tempo 184
 	volume $77
@@ -60,7 +59,7 @@ Music_Route1_Ch1: ; ec00a
 	note D_, 2
 	intensity $83
 	note __, 2
-Music_Route1_branch_ec04a: ; ec04a
+Music_Route1_branch_ec04a:
 	intensity $83
 	note __, 2
 	octave 4
@@ -203,9 +202,8 @@ Music_Route1_branch_ec04a: ; ec04a
 	note D_, 2
 	note __, 2
 	loopchannel 0, Music_Route1_branch_ec04a
-; ec0eb
 
-Music_Route1_Ch2: ; ec0eb
+Music_Route1_Ch2:
 	stereopanning $f0
 	vibrato $12, $22
 	dutycycle $2
@@ -232,7 +230,7 @@ Music_Route1_Ch2: ; ec0eb
 	note D_, 1
 	note E_, 1
 	dutycycle $2
-Music_Route1_branch_ec112: ; ec112
+Music_Route1_branch_ec112:
 	intensity $82
 	callchannel Music_Route1_branch_ec188
 	intensity $81
@@ -323,9 +321,8 @@ Music_Route1_branch_ec112: ; ec112
 	note D_, 1
 	note E_, 1
 	loopchannel 0, Music_Route1_branch_ec112
-; ec188
 
-Music_Route1_branch_ec188: ; ec188
+Music_Route1_branch_ec188:
 	note F#, 2
 	note F#, 2
 	note F#, 2
@@ -342,9 +339,8 @@ Music_Route1_branch_ec188: ; ec188
 	note F#, 1
 	note E_, 2
 	endchannel
-; ec198
 
-Music_Route1_branch_ec198: ; ec198
+Music_Route1_branch_ec198:
 	note A_, 2
 	note A_, 2
 	note F#, 2
@@ -363,9 +359,8 @@ Music_Route1_branch_ec198: ; ec198
 	note F#, 1
 	note E_, 2
 	endchannel
-; ec1aa
 
-Music_Route1_branch_ec1aa: ; ec1aa
+Music_Route1_branch_ec1aa:
 	note A_, 2
 	note A_, 2
 	note F#, 2
@@ -380,9 +375,8 @@ Music_Route1_branch_ec1aa: ; ec1aa
 	octave 5
 	note D_, 2
 	endchannel
-; ec1b8
 
-Music_Route1_Ch3: ; ec1b8
+Music_Route1_Ch3:
 	stereopanning $ff
 	vibrato $10, $23
 	notetype $c, $25
@@ -462,7 +456,7 @@ Music_Route1_Ch3: ; ec1b8
 	note __, 1
 	note A_, 1
 	note __, 3
-Music_Route1_branch_ec20c: ; ec20c
+Music_Route1_branch_ec20c:
 	octave 3
 	note D_, 1
 	note __, 1
@@ -650,4 +644,3 @@ Music_Route1_branch_ec20c: ; ec20c
 	note A_, 1
 	note __, 3
 	loopchannel 0, Music_Route1_branch_ec20c
-; ec2ca
diff --git a/audio/music/route12.asm b/audio/music/route12.asm
index c7584096e..d94d88c2f 100644
--- a/audio/music/route12.asm
+++ b/audio/music/route12.asm
@@ -1,11 +1,10 @@
-Music_Route12: ; ec506
+Music_Route12:
 	musicheader 4, 1, Music_Route12_Ch1
 	musicheader 1, 2, Music_Route12_Ch2
 	musicheader 1, 3, Music_Route12_Ch3
 	musicheader 1, 4, Music_Route12_Ch4
-; ec512
 
-Music_Route12_Ch1: ; ec512
+Music_Route12_Ch1:
 	tempo 148
 	volume $77
 	vibrato $12, $34
@@ -29,7 +28,7 @@ Music_Route12_Ch1: ; ec512
 	note E_, 1
 	intensity $97
 	note D#, 12
-Music_Route12_branch_ec535: ; ec535
+Music_Route12_branch_ec535:
 	dutycycle $2
 	intensity $96
 	callchannel Music_Route12_branch_ec5b1
@@ -115,7 +114,7 @@ Music_Route12_branch_ec535: ; ec535
 	note F#, 8
 	note D#, 4
 	note F#, 4
-Music_Route12_branch_ec59b: ; ec59b
+Music_Route12_branch_ec59b:
 	intensity $97
 	note G#, 1
 	note A_, 1
@@ -131,9 +130,8 @@ Music_Route12_branch_ec59b: ; ec59b
 	note G#, 4
 	loopchannel 2, Music_Route12_branch_ec59b
 	loopchannel 0, Music_Route12_branch_ec535
-; ec5b1
 
-Music_Route12_branch_ec5b1: ; ec5b1
+Music_Route12_branch_ec5b1:
 	octave 3
 	note G#, 1
 	note __, 1
@@ -148,9 +146,8 @@ Music_Route12_branch_ec5b1: ; ec5b1
 	note E_, 4
 	note G#, 4
 	endchannel
-; ec5bf
 
-Music_Route12_branch_ec5bf: ; ec5bf
+Music_Route12_branch_ec5bf:
 	note A_, 1
 	note __, 1
 	note F#, 1
@@ -162,9 +159,8 @@ Music_Route12_branch_ec5bf: ; ec5bf
 	note A_, 4
 	note F#, 4
 	endchannel
-; ec5ca
 
-Music_Route12_Ch2: ; ec5ca
+Music_Route12_Ch2:
 	dutycycle $3
 	vibrato $12, $34
 	notetype $c, $b8
@@ -186,7 +182,7 @@ Music_Route12_Ch2: ; ec5ca
 	note B_, 1
 	octave 4
 	note D#, 1
-Music_Route12_branch_ec5e5: ; ec5e5
+Music_Route12_branch_ec5e5:
 	dutycycle $3
 	intensity $b7
 	callchannel Music_Route12_branch_ec647
@@ -264,9 +260,8 @@ Music_Route12_branch_ec5e5: ; ec5e5
 	intensity $a4
 	note E_, 6
 	loopchannel 0, Music_Route12_branch_ec5e5
-; ec647
 
-Music_Route12_branch_ec647: ; ec647
+Music_Route12_branch_ec647:
 	octave 4
 	note E_, 6
 	intensity $b1
@@ -281,9 +276,8 @@ Music_Route12_branch_ec647: ; ec647
 	note G#, 4
 	note F#, 4
 	endchannel
-; ec657
 
-Music_Route12_Ch3: ; ec657
+Music_Route12_Ch3:
 	vibrato $12, $54
 	notetype $c, $16
 	octave 3
@@ -301,7 +295,7 @@ Music_Route12_Ch3: ; ec657
 	note F#, 2
 	note __, 2
 	note D#, 4
-Music_Route12_branch_ec66c: ; ec66c
+Music_Route12_branch_ec66c:
 	callchannel Music_Route12_branch_ec6b4
 	note F#, 1
 	note __, 1
@@ -353,7 +347,7 @@ Music_Route12_branch_ec66c: ; ec66c
 	note E_, 8
 	note F#, 4
 	note D#, 4
-Music_Route12_branch_ec6a3: ; ec6a3
+Music_Route12_branch_ec6a3:
 	note E_, 1
 	note __, 1
 	note E_, 1
@@ -365,9 +359,8 @@ Music_Route12_branch_ec6a3: ; ec6a3
 	note __, 1
 	loopchannel 2, Music_Route12_branch_ec6a3
 	loopchannel 0, Music_Route12_branch_ec66c
-; ec6b4
 
-Music_Route12_branch_ec6b4: ; ec6b4
+Music_Route12_branch_ec6b4:
 	octave 3
 	note E_, 1
 	note __, 1
@@ -394,9 +387,8 @@ Music_Route12_branch_ec6b4: ; ec6b4
 	note G#, 4
 	note E_, 4
 	endchannel
-; ec6ce
 
-Music_Route12_Ch4: ; ec6ce
+Music_Route12_Ch4:
 	togglenoise $4
 	stereopanning $f0
 	notetype $c
@@ -410,7 +402,7 @@ Music_Route12_Ch4: ; ec6ce
 	note D_, 4
 	notetype $6
 	callchannel Music_Route12_branch_ec717
-Music_Route12_branch_ec6e1: ; ec6e1
+Music_Route12_branch_ec6e1:
 	note D_, 4
 	note D_, 8
 	note C#, 2
@@ -418,7 +410,7 @@ Music_Route12_branch_ec6e1: ; ec6e1
 	note D_, 8
 	callchannel Music_Route12_branch_ec717
 	loopchannel 8, Music_Route12_branch_ec6e1
-Music_Route12_branch_ec6ed: ; ec6ed
+Music_Route12_branch_ec6ed:
 	notetype $c
 	note B_, 10
 	note D_, 1
@@ -436,7 +428,7 @@ Music_Route12_branch_ec6ed: ; ec6ed
 	callchannel Music_Route12_branch_ec717
 	callchannel Music_Route12_branch_ec717
 	note B_, 16
-Music_Route12_branch_ec707: ; ec707
+Music_Route12_branch_ec707:
 	note D_, 4
 	note D_, 8
 	note C#, 2
@@ -445,9 +437,8 @@ Music_Route12_branch_ec707: ; ec707
 	callchannel Music_Route12_branch_ec717
 	loopchannel 2, Music_Route12_branch_ec707
 	loopchannel 0, Music_Route12_branch_ec6e1
-; ec717
 
-Music_Route12_branch_ec717: ; ec717
+Music_Route12_branch_ec717:
 	note C#, 1
 	note C#, 1
 	note C#, 1
@@ -457,4 +448,3 @@ Music_Route12_branch_ec717: ; ec717
 	note C#, 1
 	note C#, 1
 	endchannel
-; ec720
diff --git a/audio/music/route2.asm b/audio/music/route2.asm
index eca547e9b..b5ff1feba 100644
--- a/audio/music/route2.asm
+++ b/audio/music/route2.asm
@@ -1,11 +1,10 @@
-Music_Route2: ; ed8dd
+Music_Route2:
 	musicheader 4, 1, Music_Route2_Ch1
 	musicheader 1, 2, Music_Route2_Ch2
 	musicheader 1, 3, Music_Route2_Ch3
 	musicheader 1, 4, Music_Route2_Ch4
-; ed8e9
 
-Music_Route2_Ch1: ; ed8e9
+Music_Route2_Ch1:
 	tempo 151
 	volume $77
 	stereopanning $f
@@ -14,7 +13,7 @@ Music_Route2_Ch1: ; ed8e9
 	note __, 16
 	note __, 16
 	callchannel Music_Route2_branch_ed931
-Music_Route2_branch_ed8fb: ; ed8fb
+Music_Route2_branch_ed8fb:
 	intensity $b1
 	octave 3
 	note B_, 4
@@ -55,9 +54,8 @@ Music_Route2_branch_ed8fb: ; ed8fb
 	note B_, 2
 	note G_, 2
 	loopchannel 0, Music_Route2_branch_ed8fb
-; ed931
 
-Music_Route2_branch_ed931: ; ed931
+Music_Route2_branch_ed931:
 	octave 4
 	note C_, 4
 	note C_, 4
@@ -71,9 +69,8 @@ Music_Route2_branch_ed931: ; ed931
 	note B_, 4
 	intensity $b1
 	endchannel
-; ed940
 
-Music_Route2_branch_ed940: ; ed940
+Music_Route2_branch_ed940:
 	octave 2
 	note B_, 2
 	octave 3
@@ -121,9 +118,8 @@ Music_Route2_branch_ed940: ; ed940
 	note G_, 2
 	intensity $b1
 	endchannel
-; ed971
 
-Music_Route2_branch_ed971: ; ed971
+Music_Route2_branch_ed971:
 	note B_, 2
 	note G_, 2
 	note B_, 2
@@ -161,14 +157,13 @@ Music_Route2_branch_ed971: ; ed971
 	octave 3
 	note A_, 2
 	endchannel
-; ed996
 
-Music_Route2_Ch2: ; ed996
+Music_Route2_Ch2:
 	stereopanning $ff
 	vibrato $8, $24
 	notetype $c, $b2
 	callchannel Music_Route2_branch_ed9ba
-Music_Route2_branch_ed9a1: ; ed9a1
+Music_Route2_branch_ed9a1:
 	intensity $b2
 	callchannel Music_Route2_branch_ed9ba
 	dutycycle $2
@@ -178,9 +173,8 @@ Music_Route2_branch_ed9a1: ; ed9a1
 	callchannel Music_Route2_branch_eda02
 	callchannel Music_Route2_branch_eda02
 	loopchannel 0, Music_Route2_branch_ed9a1
-; ed9ba
 
-Music_Route2_branch_ed9ba: ; ed9ba
+Music_Route2_branch_ed9ba:
 	octave 4
 	note E_, 4
 	note E_, 4
@@ -213,9 +207,8 @@ Music_Route2_branch_ed9ba: ; ed9ba
 	note G_, 4
 	intensity $b2
 	endchannel
-; ed9dc
 
-Music_Route2_branch_ed9dc: ; ed9dc
+Music_Route2_branch_ed9dc:
 	octave 2
 	note C_, 4
 	note __, 2
@@ -254,9 +247,8 @@ Music_Route2_branch_ed9dc: ; ed9dc
 	note F_, 4
 	note D_, 4
 	endchannel
-; eda02
 
-Music_Route2_branch_eda02: ; eda02
+Music_Route2_branch_eda02:
 	octave 2
 	note E_, 4
 	note __, 2
@@ -299,9 +291,8 @@ Music_Route2_branch_eda02: ; eda02
 	note G_, 1
 	note __, 1
 	endchannel
-; eda2c
 
-Music_Route2_Ch3: ; eda2c
+Music_Route2_Ch3:
 	stereopanning $f0
 	vibrato $16, $15
 	notetype $c, $14
@@ -326,7 +317,7 @@ Music_Route2_Ch3: ; eda2c
 	callchannel Music_Route2_branch_eda9e
 	octave 3
 	note D_, 4
-Music_Route2_branch_eda4b: ; eda4b
+Music_Route2_branch_eda4b:
 	notetype $c, $15
 	octave 3
 	note C_, 4
@@ -391,9 +382,8 @@ Music_Route2_branch_eda4b: ; eda4b
 	note G_, 16
 	note G_, 15
 	loopchannel 0, Music_Route2_branch_eda4b
-; eda9e
 
-Music_Route2_branch_eda9e: ; eda9e
+Music_Route2_branch_eda9e:
 	octave 3
 	note F_, 4
 	note __, 2
@@ -411,9 +401,8 @@ Music_Route2_branch_eda9e: ; eda9e
 	note __, 1
 	note F_, 4
 	endchannel
-; edaaf
 
-Music_Route2_branch_edaaf: ; edaaf
+Music_Route2_branch_edaaf:
 	octave 6
 	note E_, 10
 	note D_, 2
@@ -440,9 +429,8 @@ Music_Route2_branch_edaaf: ; edaaf
 	note C_, 4
 	note D_, 4
 	endchannel
-; edacb
 
-Music_Route2_branch_edacb: ; edacb
+Music_Route2_branch_edacb:
 	octave 5
 	note B_, 16
 	note __, 4
@@ -460,12 +448,11 @@ Music_Route2_branch_edacb: ; edacb
 	note E_, 4
 	note F_, 16
 	endchannel
-; edadc
 
-Music_Route2_Ch4: ; edadc
+Music_Route2_Ch4:
 	togglenoise $5
 	notetype $c
-Music_Route2_branch_edae0: ; edae0
+Music_Route2_branch_edae0:
 	note A_, 4
 	note A_, 4
 	note A_, 2
@@ -478,7 +465,7 @@ Music_Route2_branch_edae0: ; edae0
 	note A_, 2
 	note A_, 2
 	note D#, 4
-Music_Route2_branch_edaef: ; edaef
+Music_Route2_branch_edaef:
 	note A_, 4
 	note A_, 4
 	note A_, 2
@@ -486,7 +473,7 @@ Music_Route2_branch_edaef: ; edaef
 	note B_, 2
 	note A_, 2
 	loopchannel 4, Music_Route2_branch_edaef
-Music_Route2_branch_edaf9: ; edaf9
+Music_Route2_branch_edaf9:
 	note B_, 4
 	note A_, 2
 	note B_, 2
@@ -500,7 +487,7 @@ Music_Route2_branch_edaf9: ; edaf9
 	note A_, 2
 	note A_, 2
 	note D#, 4
-Music_Route2_branch_edb09: ; edb09
+Music_Route2_branch_edb09:
 	note B_, 4
 	note C_, 4
 	note B_, 2
@@ -512,7 +499,7 @@ Music_Route2_branch_edb09: ; edb09
 	note C#, 2
 	note C_, 2
 	note C#, 4
-Music_Route2_branch_edb17: ; edb17
+Music_Route2_branch_edb17:
 	note B_, 4
 	note C_, 4
 	note B_, 2
@@ -525,4 +512,3 @@ Music_Route2_branch_edb17: ; edb17
 	note D_, 2
 	note D#, 4
 	loopchannel 0, Music_Route2_branch_edaef
-; edb29
diff --git a/audio/music/route26.asm b/audio/music/route26.asm
index 85f2e0f02..fb1a7a8e0 100644
--- a/audio/music/route26.asm
+++ b/audio/music/route26.asm
@@ -1,11 +1,10 @@
-Music_Route26: ; eefb2
+Music_Route26:
 	musicheader 4, 1, Music_Route26_Ch1
 	musicheader 1, 2, Music_Route26_Ch2
 	musicheader 1, 3, Music_Route26_Ch3
 	musicheader 1, 4, Music_Route26_Ch4
-; eefbe
 
-Music_Route26_Ch1: ; eefbe
+Music_Route26_Ch1:
 	stereopanning $f
 	vibrato $12, $23
 	tempo 151
@@ -27,7 +26,7 @@ Music_Route26_Ch1: ; eefbe
 	octave 3
 	note G#, 2
 	note F#, 2
-Music_Route26_branch_eefe0: ; eefe0
+Music_Route26_branch_eefe0:
 	dutycycle $0
 	notetype $c, $a7
 	octave 3
@@ -194,9 +193,8 @@ Music_Route26_branch_eefe0: ; eefe0
 	note B_, 4
 	note __, 4
 	loopchannel 0, Music_Route26_branch_eefe0
-; ef09d
 
-Music_Route26_Ch2: ; ef09d
+Music_Route26_Ch2:
 	stereopanning $f0
 	vibrato $14, $23
 	dutycycle $2
@@ -234,7 +232,7 @@ Music_Route26_Ch2: ; ef09d
 	octave 2
 	note C_, 2
 	note D#, 2
-Music_Route26_branch_ef0ce: ; ef0ce
+Music_Route26_branch_ef0ce:
 	dutycycle $2
 	notetype $c, $c2
 	octave 2
@@ -283,7 +281,7 @@ Music_Route26_branch_ef0ce: ; ef0ce
 	note D#, 4
 	note D#, 4
 	notetype $8, $c2
-Music_Route26_branch_ef10e: ; ef10e
+Music_Route26_branch_ef10e:
 	octave 2
 	note G#, 2
 	note G#, 2
@@ -339,9 +337,8 @@ Music_Route26_branch_ef10e: ; ef10e
 	note C_, 1
 	note D#, 1
 	loopchannel 0, Music_Route26_branch_ef0ce
-; ef14e
 
-Music_Route26_branch_ef14e: ; ef14e
+Music_Route26_branch_ef14e:
 	note A#, 6
 	note A#, 1
 	octave 2
@@ -354,9 +351,8 @@ Music_Route26_branch_ef14e: ; ef14e
 	octave 1
 	note A#, 2
 	endchannel
-; ef15a
 
-Music_Route26_Ch3: ; ef15a
+Music_Route26_Ch3:
 	stereopanning $ff
 	vibrato $12, $23
 	notetype $c, $14
@@ -392,7 +388,7 @@ Music_Route26_Ch3: ; ef15a
 	note F#, 2
 	note F_, 2
 	note D#, 2
-Music_Route26_branch_ef18a: ; ef18a
+Music_Route26_branch_ef18a:
 	vibrato $18, $23
 	notetype $c, $14
 	octave 5
@@ -538,9 +534,8 @@ Music_Route26_branch_ef18a: ; ef18a
 	octave 3
 	note C_, 1
 	loopchannel 0, Music_Route26_branch_ef18a
-; ef22f
 
-Music_Route26_branch_ef22f: ; ef22f
+Music_Route26_branch_ef22f:
 	octave 5
 	note F_, 8
 	note C#, 2
@@ -550,18 +545,17 @@ Music_Route26_branch_ef22f: ; ef22f
 	note C#, 4
 	note D#, 4
 	endchannel
-; ef238
 
-Music_Route26_Ch4: ; ef238
+Music_Route26_Ch4:
 	togglenoise $4
 	notetype $c
-Music_Route26_branch_ef23c: ; ef23c
+Music_Route26_branch_ef23c:
 	note B_, 6
 	note D_, 1
 	note D_, 1
 	loopchannel 3, Music_Route26_branch_ef23c
 	callchannel Music_Route26_branch_ef2b0
-Music_Route26_branch_ef246: ; ef246
+Music_Route26_branch_ef246:
 	notetype $6
 	callchannel Music_Route26_branch_ef29a
 	callchannel Music_Route26_branch_ef29a
@@ -580,7 +574,7 @@ Music_Route26_branch_ef246: ; ef246
 	callchannel Music_Route26_branch_ef29a
 	callchannel Music_Route26_branch_ef29a
 	notetype $8
-Music_Route26_branch_ef266: ; ef266
+Music_Route26_branch_ef266:
 	note D_, 2
 	note D_, 2
 	note D_, 2
@@ -591,7 +585,7 @@ Music_Route26_branch_ef266: ; ef266
 	callchannel Music_Route26_branch_ef2a8
 	callchannel Music_Route26_branch_ef29a
 	callchannel Music_Route26_branch_ef2a8
-Music_Route26_branch_ef27c: ; ef27c
+Music_Route26_branch_ef27c:
 	notetype $6
 	note D_, 1
 	note D_, 1
@@ -611,9 +605,8 @@ Music_Route26_branch_ef27c: ; ef27c
 	note B_, 16
 	callchannel Music_Route26_branch_ef2b0
 	loopchannel 0, Music_Route26_branch_ef246
-; ef29a
 
-Music_Route26_branch_ef29a: ; ef29a
+Music_Route26_branch_ef29a:
 	note E_, 12
 	note D_, 2
 	note D_, 2
@@ -628,9 +621,8 @@ Music_Route26_branch_ef29a: ; ef29a
 	note C#, 1
 	note C#, 1
 	endchannel
-; ef2a8
 
-Music_Route26_branch_ef2a8: ; ef2a8
+Music_Route26_branch_ef2a8:
 	note E_, 12
 	note D_, 2
 	note D_, 2
@@ -639,9 +631,8 @@ Music_Route26_branch_ef2a8: ; ef2a8
 	note E_, 4
 	note D_, 4
 	endchannel
-; ef2b0
 
-Music_Route26_branch_ef2b0: ; ef2b0
+Music_Route26_branch_ef2b0:
 	notetype $6
 	note C#, 1
 	note C#, 1
@@ -672,4 +663,3 @@ Music_Route26_branch_ef2b0: ; ef2b0
 	note D_, 2
 	note E_, 2
 	endchannel
-; ef2d0
diff --git a/audio/music/route29.asm b/audio/music/route29.asm
index de780ebee..d7cecf4f6 100644
--- a/audio/music/route29.asm
+++ b/audio/music/route29.asm
@@ -1,11 +1,10 @@
-Music_Route29: ; f0386
+Music_Route29:
 	musicheader 4, 1, Music_Route29_Ch1
 	musicheader 1, 2, Music_Route29_Ch2
 	musicheader 1, 3, Music_Route29_Ch3
 	musicheader 1, 4, Music_Route29_Ch4
-; f0392
 
-Music_Route29_Ch1: ; f0392
+Music_Route29_Ch1:
 	tempo 146
 	volume $77
 	dutycycle $3
@@ -14,7 +13,7 @@ Music_Route29_Ch1: ; f0392
 	stereopanning $f
 	notetype $c, $b2
 	note __, 2
-Music_Route29_branch_f03a5: ; f03a5
+Music_Route29_branch_f03a5:
 	note __, 2
 	octave 4
 	note C_, 2
@@ -168,16 +167,15 @@ Music_Route29_branch_f03a5: ; f03a5
 	note G_, 2
 	note G_, 4
 	loopchannel 0, Music_Route29_branch_f03a5
-; f044d
 
-Music_Route29_Ch2: ; f044d
+Music_Route29_Ch2:
 	dutycycle $3
 	vibrato $12, $36
 	notetype $c, $c2
 	octave 4
 	note C_, 1
 	note D_, 1
-Music_Route29_branch_f0458: ; f0458
+Music_Route29_branch_f0458:
 	callchannel Music_Route29_branch_f04de
 	note F_, 1
 	note E_, 1
@@ -301,9 +299,8 @@ Music_Route29_branch_f0458: ; f0458
 	note C_, 1
 	note D_, 1
 	loopchannel 0, Music_Route29_branch_f0458
-; f04de
 
-Music_Route29_branch_f04de: ; f04de
+Music_Route29_branch_f04de:
 	note E_, 2
 	note E_, 2
 	note G_, 2
@@ -333,14 +330,13 @@ Music_Route29_branch_f04de: ; f04de
 	note E_, 2
 	note C_, 2
 	endchannel
-; f04fb
 
-Music_Route29_Ch3: ; f04fb
+Music_Route29_Ch3:
 	stereopanning $f0
 	notetype $c, $25
 	vibrato $9, $27
 	note __, 2
-Music_Route29_branch_f0504: ; f0504
+Music_Route29_branch_f0504:
 	note __, 2
 	octave 3
 	note G_, 1
@@ -503,14 +499,13 @@ Music_Route29_branch_f0504: ; f0504
 	note C_, 1
 	note __, 3
 	loopchannel 0, Music_Route29_branch_f0504
-; f05a9
 
-Music_Route29_Ch4: ; f05a9
+Music_Route29_Ch4:
 	stereopanning $f
 	togglenoise $0
 	notetype $c
 	note __, 2
-Music_Route29_branch_f05b0: ; f05b0
+Music_Route29_branch_f05b0:
 	note __, 2
 	note F_, 2
 	note F_, 6
@@ -523,4 +518,3 @@ Music_Route29_branch_f05b0: ; f05b0
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_Route29_branch_f05b0
-; f05bf
diff --git a/audio/music/route3.asm b/audio/music/route3.asm
index 5e696f4bd..f36dbd53d 100644
--- a/audio/music/route3.asm
+++ b/audio/music/route3.asm
@@ -1,11 +1,10 @@
-Music_Route3: ; ec2ca
+Music_Route3:
 	musicheader 4, 1, Music_Route3_Ch1
 	musicheader 1, 2, Music_Route3_Ch2
 	musicheader 1, 3, Music_Route3_Ch3
 	musicheader 1, 4, Music_Route3_Ch4
-; ec2d6
 
-Music_Route3_Ch1: ; ec2d6
+Music_Route3_Ch1:
 	stereopanning $f
 	tempo 160
 	volume $77
@@ -46,7 +45,7 @@ Music_Route3_Ch1: ; ec2d6
 	note E_, 1
 	note F#, 1
 	note G#, 1
-Music_Route3_branch_ec307: ; ec307
+Music_Route3_branch_ec307:
 	callchannel Music_Route3_branch_ec3a4
 	note G_, 1
 	note D_, 1
@@ -195,9 +194,8 @@ Music_Route3_branch_ec307: ; ec307
 	octave 4
 	note D_, 1
 	loopchannel 0, Music_Route3_branch_ec307
-; ec3a4
 
-Music_Route3_branch_ec3a4: ; ec3a4
+Music_Route3_branch_ec3a4:
 	octave 3
 	note A_, 1
 	note E_, 1
@@ -208,7 +206,7 @@ Music_Route3_branch_ec3a4: ; ec3a4
 	note E_, 1
 	note C#, 1
 	note E_, 1
-Music_Route3_branch_ec3b1: ; ec3b1
+Music_Route3_branch_ec3b1:
 	note A_, 1
 	note E_, 1
 	note C#, 1
@@ -218,7 +216,7 @@ Music_Route3_branch_ec3b1: ; ec3b1
 	note E_, 1
 	note C#, 1
 	note E_, 1
-Music_Route3_branch_ec3bd: ; ec3bd
+Music_Route3_branch_ec3bd:
 	note G_, 1
 	note D_, 1
 	octave 2
@@ -235,9 +233,8 @@ Music_Route3_branch_ec3bd: ; ec3bd
 	octave 3
 	note D_, 1
 	endchannel
-; ec3d0
 
-Music_Route3_Ch2: ; ec3d0
+Music_Route3_Ch2:
 	stereopanning $f0
 	notetype $c, $5e
 	dutycycle $2
@@ -266,7 +263,7 @@ Music_Route3_Ch2: ; ec3d0
 	note C#, 1
 	note E_, 1
 	note G#, 1
-Music_Route3_branch_ec3f5: ; ec3f5
+Music_Route3_branch_ec3f5:
 	intensity $7d
 	callchannel Music_Route3_branch_ec443
 	note G_, 1
@@ -328,9 +325,8 @@ Music_Route3_branch_ec3f5: ; ec3f5
 	note F#, 1
 	note G#, 1
 	loopchannel 0, Music_Route3_branch_ec3f5
-; ec443
 
-Music_Route3_branch_ec443: ; ec443
+Music_Route3_branch_ec443:
 	note A_, 6
 	note E_, 1
 	note A_, 1
@@ -353,9 +349,8 @@ Music_Route3_branch_ec443: ; ec443
 	note G_, 6
 	note D_, 1
 	endchannel
-; ec45b
 
-Music_Route3_Ch3: ; ec45b
+Music_Route3_Ch3:
 	stereopanning $ff
 	vibrato $6, $3
 	notetype $c, $13
@@ -384,7 +379,7 @@ Music_Route3_Ch3: ; ec45b
 	note __, 1
 	note G#, 2
 	callchannel Music_Route3_branch_ec4bd
-Music_Route3_branch_ec47f: ; ec47f
+Music_Route3_branch_ec47f:
 	intensity $14
 	callchannel Music_Route3_branch_ec4bd
 	callchannel Music_Route3_branch_ec4bd
@@ -431,9 +426,8 @@ Music_Route3_branch_ec47f: ; ec47f
 	note F#, 1
 	note G#, 1
 	loopchannel 0, Music_Route3_branch_ec47f
-; ec4bd
 
-Music_Route3_branch_ec4bd: ; ec4bd
+Music_Route3_branch_ec4bd:
 	octave 3
 	note A_, 1
 	note __, 1
@@ -451,9 +445,8 @@ Music_Route3_branch_ec4bd: ; ec4bd
 	octave 2
 	note G#, 2
 	endchannel
-; ec4ce
 
-Music_Route3_branch_ec4ce: ; ec4ce
+Music_Route3_branch_ec4ce:
 	octave 3
 	note G_, 1
 	note __, 1
@@ -483,13 +476,12 @@ Music_Route3_branch_ec4ce: ; ec4ce
 	note G#, 2
 	note B_, 2
 	endchannel
-; ec4eb
 
-Music_Route3_Ch4: ; ec4eb
+Music_Route3_Ch4:
 	togglenoise $4
 	notetype $c
 	note __, 10
-Music_Route3_branch_ec4f0: ; ec4f0
+Music_Route3_branch_ec4f0:
 	notetype $c
 	note D_, 2
 	note D_, 4
@@ -507,4 +499,3 @@ Music_Route3_branch_ec4f0: ; ec4f0
 	note C#, 1
 	note C#, 1
 	loopchannel 0, Music_Route3_branch_ec4f0
-; ec506
diff --git a/audio/music/route30.asm b/audio/music/route30.asm
index 7cae730c1..22623579f 100644
--- a/audio/music/route30.asm
+++ b/audio/music/route30.asm
@@ -1,11 +1,10 @@
-Music_Route30: ; efc01
+Music_Route30:
 	musicheader 4, 1, Music_Route30_Ch1
 	musicheader 1, 2, Music_Route30_Ch2
 	musicheader 1, 3, Music_Route30_Ch3
 	musicheader 1, 4, Music_Route30_Ch4
-; efc0d
 
-Music_Route30_Ch1: ; efc0d
+Music_Route30_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
@@ -27,7 +26,7 @@ Music_Route30_Ch1: ; efc0d
 	note D_, 2
 	intensity $4e
 	note C_, 4
-Music_Route30_branch_efc2e: ; efc2e
+Music_Route30_branch_efc2e:
 	intensity $b6
 	note D_, 6
 	intensity $b4
@@ -183,9 +182,8 @@ Music_Route30_branch_efc2e: ; efc2e
 	octave 4
 	note D_, 2
 	loopchannel 0, Music_Route30_branch_efc2e
-; efcda
 
-Music_Route30_Ch2: ; efcda
+Music_Route30_Ch2:
 	dutycycle $3
 	vibrato $12, $36
 	stereopanning $f
@@ -207,7 +205,7 @@ Music_Route30_Ch2: ; efcda
 	note E_, 1
 	note F_, 1
 	note F#, 1
-Music_Route30_branch_efcf6: ; efcf6
+Music_Route30_branch_efcf6:
 	intensity $c7
 	note G_, 10
 	octave 4
@@ -295,9 +293,8 @@ Music_Route30_branch_efcf6: ; efcf6
 	octave 3
 	note F#, 2
 	loopchannel 0, Music_Route30_branch_efcf6
-; efd5f
 
-Music_Route30_Ch3: ; efd5f
+Music_Route30_Ch3:
 	notetype $c, $27
 	octave 2
 	note G_, 1
@@ -322,7 +319,7 @@ Music_Route30_Ch3: ; efd5f
 	note __, 1
 	note G_, 1
 	note __, 1
-Music_Route30_branch_efd79: ; efd79
+Music_Route30_branch_efd79:
 	note G_, 1
 	note __, 1
 	note B_, 2
@@ -577,14 +574,13 @@ Music_Route30_branch_efd79: ; efd79
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_Route30_branch_efd79
-; efe7a
 
-Music_Route30_Ch4: ; efe7a
+Music_Route30_Ch4:
 	togglenoise $3
 	notetype $c
 	callchannel Music_Route30_branch_efeb8
 	callchannel Music_Route30_branch_efec1
-Music_Route30_branch_efe84: ; efe84
+Music_Route30_branch_efe84:
 	callchannel Music_Route30_branch_efecd
 	callchannel Music_Route30_branch_efed7
 	callchannel Music_Route30_branch_efed7
@@ -602,9 +598,8 @@ Music_Route30_branch_efe84: ; efe84
 	callchannel Music_Route30_branch_efecd
 	callchannel Music_Route30_branch_efee1
 	loopchannel 0, Music_Route30_branch_efe84
-; efeb8
 
-Music_Route30_branch_efeb8: ; efeb8
+Music_Route30_branch_efeb8:
 	note D_, 2
 	note F#, 2
 	note F#, 2
@@ -614,9 +609,8 @@ Music_Route30_branch_efeb8: ; efeb8
 	note D_, 2
 	note D_, 4
 	endchannel
-; efec1
 
-Music_Route30_branch_efec1: ; efec1
+Music_Route30_branch_efec1:
 	note D_, 2
 	note F#, 2
 	note F#, 2
@@ -629,9 +623,8 @@ Music_Route30_branch_efec1: ; efec1
 	note D_, 1
 	note D_, 1
 	endchannel
-; efecd
 
-Music_Route30_branch_efecd: ; efecd
+Music_Route30_branch_efecd:
 	note D_, 2
 	note F#, 2
 	note F#, 2
@@ -642,9 +635,8 @@ Music_Route30_branch_efecd: ; efecd
 	note D_, 2
 	note D_, 2
 	endchannel
-; efed7
 
-Music_Route30_branch_efed7: ; efed7
+Music_Route30_branch_efed7:
 	note D_, 2
 	note F#, 2
 	note F#, 2
@@ -655,9 +647,8 @@ Music_Route30_branch_efed7: ; efed7
 	note D_, 2
 	note D_, 2
 	endchannel
-; efee1
 
-Music_Route30_branch_efee1: ; efee1
+Music_Route30_branch_efee1:
 	note D_, 2
 	note F#, 2
 	note F#, 2
@@ -676,4 +667,3 @@ Music_Route30_branch_efee1: ; efee1
 	note D_, 1
 	notetype $c
 	endchannel
-; efef5
diff --git a/audio/music/route36.asm b/audio/music/route36.asm
index 8c7db70ff..1899116b9 100644
--- a/audio/music/route36.asm
+++ b/audio/music/route36.asm
@@ -1,11 +1,10 @@
-Music_Route36: ; e94e9
+Music_Route36:
 	musicheader 4, 1, Music_Route36_Ch1
 	musicheader 1, 2, Music_Route36_Ch2
 	musicheader 1, 3, Music_Route36_Ch3
 	musicheader 1, 4, Music_Route36_Ch4
-; e94f5
 
-Music_Route36_Ch1: ; e94f5
+Music_Route36_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
@@ -26,7 +25,7 @@ Music_Route36_Ch1: ; e94f5
 	note A_, 1
 	intensity $5d
 	note A#, 4
-Music_Route36_branch_e9517: ; e9517
+Music_Route36_branch_e9517:
 	intensity $b5
 	note F_, 4
 	note A_, 2
@@ -163,9 +162,8 @@ Music_Route36_branch_e9517: ; e9517
 	note D#, 2
 	note E_, 2
 	loopchannel 0, Music_Route36_branch_e9517
-; e95af
 
-Music_Route36_Ch2: ; e95af
+Music_Route36_Ch2:
 	dutycycle $3
 	vibrato $10, $36
 	stereopanning $f0
@@ -188,7 +186,7 @@ Music_Route36_Ch2: ; e95af
 	note F_, 8
 	octave 3
 	note G_, 4
-Music_Route36_branch_e95ce: ; e95ce
+Music_Route36_branch_e95ce:
 	intensity $c7
 	octave 4
 	note C_, 10
@@ -311,9 +309,8 @@ Music_Route36_branch_e95ce: ; e95ce
 	note A_, 1
 	note B_, 1
 	loopchannel 0, Music_Route36_branch_e95ce
-; e966b
 
-Music_Route36_Ch3: ; e966b
+Music_Route36_Ch3:
 	notetype $c, $25
 	octave 3
 	note F_, 1
@@ -337,7 +334,7 @@ Music_Route36_Ch3: ; e966b
 	octave 3
 	note D#, 2
 	note E_, 2
-Music_Route36_branch_e9684: ; e9684
+Music_Route36_branch_e9684:
 	note F_, 4
 	note C_, 2
 	note F_, 4
@@ -468,20 +465,19 @@ Music_Route36_branch_e9684: ; e9684
 	note D#, 2
 	note E_, 2
 	loopchannel 0, Music_Route36_branch_e9684
-; e9709
 
-Music_Route36_Ch4: ; e9709
+Music_Route36_Ch4:
 	togglenoise $1
 	notetype $c
 	callchannel Music_Route36_branch_e9734
 	callchannel Music_Route36_branch_e9741
-Music_Route36_branch_e9713: ; e9713
+Music_Route36_branch_e9713:
 	callchannel Music_Route36_branch_e9734
 	callchannel Music_Route36_branch_e973b
 	callchannel Music_Route36_branch_e9734
 	callchannel Music_Route36_branch_e9741
 	loopchannel 2, Music_Route36_branch_e9713
-Music_Route36_branch_e9723: ; e9723
+Music_Route36_branch_e9723:
 	note A#, 4
 	note A_, 2
 	note F_, 4
@@ -491,9 +487,8 @@ Music_Route36_branch_e9723: ; e9723
 	loopchannel 11, Music_Route36_branch_e9723
 	callchannel Music_Route36_branch_e9741
 	loopchannel 0, Music_Route36_branch_e9713
-; e9734
 
-Music_Route36_branch_e9734: ; e9734
+Music_Route36_branch_e9734:
 	note A_, 4
 	note A_, 6
 	note A#, 1
@@ -501,18 +496,16 @@ Music_Route36_branch_e9734: ; e9734
 	note A_, 2
 	note A#, 2
 	endchannel
-; e973b
 
-Music_Route36_branch_e973b: ; e973b
+Music_Route36_branch_e973b:
 	note A_, 4
 	note A_, 6
 	note B_, 1
 	note A#, 1
 	note A_, 4
 	endchannel
-; e9741
 
-Music_Route36_branch_e9741: ; e9741
+Music_Route36_branch_e9741:
 	note A_, 4
 	note A_, 6
 	note A#, 1
@@ -525,4 +518,3 @@ Music_Route36_branch_e9741: ; e9741
 	note A_, 1
 	notetype $c
 	endchannel
-; e974f
diff --git a/audio/music/route37.asm b/audio/music/route37.asm
index 90a832b3e..000db4e3b 100644
--- a/audio/music/route37.asm
+++ b/audio/music/route37.asm
@@ -1,11 +1,10 @@
-Music_Route37: ; ee94b
+Music_Route37:
 	musicheader 4, 1, Music_Route37_Ch1
 	musicheader 1, 2, Music_Route37_Ch2
 	musicheader 1, 3, Music_Route37_Ch3
 	musicheader 1, 4, Music_Route37_Ch4
-; ee957
 
-Music_Route37_Ch1: ; ee957
+Music_Route37_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
@@ -14,7 +13,7 @@ Music_Route37_Ch1: ; ee957
 	notetype $c, $b3
 	note __, 16
 	note __, 16
-Music_Route37_branch_ee969: ; ee969
+Music_Route37_branch_ee969:
 	intensity $b3
 	note __, 2
 	octave 2
@@ -68,7 +67,7 @@ Music_Route37_branch_ee969: ; ee969
 	note E_, 2
 	note D#, 4
 	stereopanning $f
-Music_Route37_branch_ee9a5: ; ee9a5
+Music_Route37_branch_ee9a5:
 	callchannel Music_Route37_branch_ee9da
 	octave 3
 	note C#, 4
@@ -97,9 +96,8 @@ Music_Route37_branch_ee9a5: ; ee9a5
 	callchannel Music_Route37_branch_ee9e9
 	note __, 4
 	loopchannel 0, Music_Route37_branch_ee969
-; ee9da
 
-Music_Route37_branch_ee9da: ; ee9da
+Music_Route37_branch_ee9da:
 	intensity $c2
 	octave 2
 	note A_, 2
@@ -113,9 +111,8 @@ Music_Route37_branch_ee9da: ; ee9da
 	note A_, 2
 	intensity $b7
 	endchannel
-; ee9e9
 
-Music_Route37_branch_ee9e9: ; ee9e9
+Music_Route37_branch_ee9e9:
 	intensity $c2
 	octave 2
 	note B_, 2
@@ -129,9 +126,8 @@ Music_Route37_branch_ee9e9: ; ee9e9
 	note B_, 2
 	intensity $b7
 	endchannel
-; ee9f8
 
-Music_Route37_Ch2: ; ee9f8
+Music_Route37_Ch2:
 	dutycycle $3
 	vibrato $1c, $12
 	notetype $c, $c2
@@ -162,7 +158,7 @@ Music_Route37_Ch2: ; ee9f8
 	note B_, 1
 	intensity $c2
 	note B_, 2
-Music_Route37_branch_eea24: ; eea24
+Music_Route37_branch_eea24:
 	callchannel Music_Route37_branch_eeab7
 	intensity $c6
 	octave 4
@@ -274,9 +270,8 @@ Music_Route37_branch_eea24: ; eea24
 	intensity $c2
 	note F#, 2
 	loopchannel 0, Music_Route37_branch_eea24
-; eeab7
 
-Music_Route37_branch_eeab7: ; eeab7
+Music_Route37_branch_eeab7:
 	intensity $c7
 	octave 3
 	note F#, 4
@@ -289,17 +284,16 @@ Music_Route37_branch_eeab7: ; eeab7
 	note F#, 2
 	note B_, 2
 	endchannel
-; eeac7
 
-Music_Route37_Ch3: ; eeac7
+Music_Route37_Ch3:
 	stereopanning $f0
 	notetype $c, $14
-Music_Route37_branch_eeacc: ; eeacc
+Music_Route37_branch_eeacc:
 	octave 2
 	note F#, 2
 	note __, 6
 	loopchannel 4, Music_Route37_branch_eeacc
-Music_Route37_branch_eead3: ; eead3
+Music_Route37_branch_eead3:
 	callchannel Music_Route37_branch_eeb32
 	note A_, 2
 	octave 3
@@ -311,7 +305,7 @@ Music_Route37_branch_eead3: ; eead3
 	note A_, 2
 	note F#, 2
 	note E_, 2
-Music_Route37_branch_eeae0: ; eeae0
+Music_Route37_branch_eeae0:
 	note D#, 2
 	note F#, 2
 	loopchannel 4, Music_Route37_branch_eeae0
@@ -330,13 +324,13 @@ Music_Route37_branch_eeae0: ; eeae0
 	octave 2
 	note A_, 2
 	callchannel Music_Route37_branch_eeb32
-Music_Route37_branch_eeafb: ; eeafb
+Music_Route37_branch_eeafb:
 	octave 2
 	note B_, 2
 	octave 3
 	note D#, 2
 	loopchannel 4, Music_Route37_branch_eeafb
-Music_Route37_branch_eeb03: ; eeb03
+Music_Route37_branch_eeb03:
 	octave 2
 	note A_, 2
 	octave 3
@@ -345,13 +339,13 @@ Music_Route37_branch_eeb03: ; eeb03
 	note E_, 2
 	note C#, 2
 	callchannel Music_Route37_branch_eeb3c
-Music_Route37_branch_eeb10: ; eeb10
+Music_Route37_branch_eeb10:
 	octave 2
 	note B_, 2
 	octave 3
 	note F#, 2
 	loopchannel 4, Music_Route37_branch_eeb10
-Music_Route37_branch_eeb18: ; eeb18
+Music_Route37_branch_eeb18:
 	octave 2
 	note A_, 2
 	octave 3
@@ -361,14 +355,13 @@ Music_Route37_branch_eeb18: ; eeb18
 	note C#, 2
 	callchannel Music_Route37_branch_eeb3c
 	callchannel Music_Route37_branch_eeb32
-Music_Route37_branch_eeb28: ; eeb28
+Music_Route37_branch_eeb28:
 	note F#, 2
 	note __, 6
 	loopchannel 4, Music_Route37_branch_eeb28
 	loopchannel 0, Music_Route37_branch_eead3
-; eeb32
 
-Music_Route37_branch_eeb32: ; eeb32
+Music_Route37_branch_eeb32:
 	octave 2
 	note F#, 2
 	note B_, 2
@@ -379,9 +372,8 @@ Music_Route37_branch_eeb32: ; eeb32
 	note F#, 2
 	note B_, 2
 	endchannel
-; eeb3c
 
-Music_Route37_branch_eeb3c: ; eeb3c
+Music_Route37_branch_eeb3c:
 	octave 2
 	note B_, 2
 	octave 3
@@ -399,12 +391,11 @@ Music_Route37_branch_eeb3c: ; eeb3c
 	octave 3
 	note D#, 2
 	endchannel
-; eeb4d
 
-Music_Route37_Ch4: ; eeb4d
+Music_Route37_Ch4:
 	stereopanning $f
 	togglenoise $0
-Music_Route37_branch_eeb51: ; eeb51
+Music_Route37_branch_eeb51:
 	notetype $c
 	callchannel Music_Route37_branch_eeb6b
 	note D_, 1
@@ -422,9 +413,8 @@ Music_Route37_branch_eeb51: ; eeb51
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_Route37_branch_eeb51
-; eeb6b
 
-Music_Route37_branch_eeb6b: ; eeb6b
+Music_Route37_branch_eeb6b:
 	note D_, 2
 	note D#, 1
 	note D#, 1
@@ -435,4 +425,3 @@ Music_Route37_branch_eeb6b: ; eeb6b
 	note D#, 1
 	note D#, 1
 	endchannel
-; eeb75
diff --git a/audio/music/ruinsofalphinterior.asm b/audio/music/ruinsofalphinterior.asm
index 7d7ff5bc9..f353b63a2 100644
--- a/audio/music/ruinsofalphinterior.asm
+++ b/audio/music/ruinsofalphinterior.asm
@@ -1,10 +1,9 @@
-Music_RuinsOfAlphInterior: ; ebd9e
+Music_RuinsOfAlphInterior:
 	musicheader 3, 1, Music_RuinsOfAlphInterior_Ch1
 	musicheader 1, 2, Music_RuinsOfAlphInterior_Ch2
 	musicheader 1, 3, Music_RuinsOfAlphInterior_Ch3
-; ebda7
 
-Music_RuinsOfAlphInterior_Ch1: ; ebda7
+Music_RuinsOfAlphInterior_Ch1:
 	tempo 224
 	volume $77
 	dutycycle $0
@@ -12,14 +11,13 @@ Music_RuinsOfAlphInterior_Ch1: ; ebda7
 	notetype $c, $44
 	note __, 1
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
-; ebdb8
 
-Music_RuinsOfAlphInterior_Ch2: ; ebdb8
+Music_RuinsOfAlphInterior_Ch2:
 	tone $0002
 	dutycycle $0
 	stereopanning $f
 	notetype $c, $a4
-Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2
+Music_RuinsOfAlphInterior_branch_ebdc2:
 	octave 4
 	note C_, 4
 	octave 3
@@ -35,11 +33,10 @@ Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2
 	octave 3
 	note A#, 4
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
-; ebdd4
 
-Music_RuinsOfAlphInterior_Ch3: ; ebdd4
+Music_RuinsOfAlphInterior_Ch3:
 	notetype $c, $10
-Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7
+Music_RuinsOfAlphInterior_branch_ebdd7:
 	octave 2
 	note G#, 2
 	octave 3
@@ -47,4 +44,3 @@ Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7
 	note E_, 2
 	note __, 10
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7
-; ebde1
diff --git a/audio/music/ruinsofalphradio.asm b/audio/music/ruinsofalphradio.asm
index 73ce53c75..5584b279a 100644
--- a/audio/music/ruinsofalphradio.asm
+++ b/audio/music/ruinsofalphradio.asm
@@ -1,17 +1,16 @@
-Music_RuinsOfAlphRadio: ; eedcb
+Music_RuinsOfAlphRadio:
 	musicheader 3, 1, Music_RuinsOfAlphRadio_Ch1
 	musicheader 1, 2, Music_RuinsOfAlphRadio_Ch2
 	musicheader 1, 3, Music_RuinsOfAlphRadio_Ch3
-; eedd4
 
-Music_RuinsOfAlphRadio_Ch1: ; eedd4
+Music_RuinsOfAlphRadio_Ch1:
 	tempo 160
 	volume $77
 	dutycycle $0
 	tone $0118
 	vibrato $0, $f0
 	stereopanning $f0
-Music_RuinsOfAlphRadio_branch_eede3: ; eede3
+Music_RuinsOfAlphRadio_branch_eede3:
 	notetype $6, $71
 	callchannel Music_RuinsOfAlphRadio_branch_eee01
 	notetype $c, $a1
@@ -25,9 +24,8 @@ Music_RuinsOfAlphRadio_branch_eede3: ; eede3
 	notetype $c, $a1
 	note __, 16
 	loopchannel 0, Music_RuinsOfAlphRadio_branch_eede3
-; eee01
 
-Music_RuinsOfAlphRadio_branch_eee01: ; eee01
+Music_RuinsOfAlphRadio_branch_eee01:
 	octave 4
 	note G_, 1
 	note F#, 1
@@ -35,9 +33,8 @@ Music_RuinsOfAlphRadio_branch_eee01: ; eee01
 	note F#, 1
 	note C_, 8
 	endchannel
-; eee08
 
-Music_RuinsOfAlphRadio_branch_eee08: ; eee08
+Music_RuinsOfAlphRadio_branch_eee08:
 	octave 4
 	note G_, 1
 	note F#, 1
@@ -48,12 +45,11 @@ Music_RuinsOfAlphRadio_branch_eee08: ; eee08
 	octave 5
 	note C_, 8
 	endchannel
-; eee12
 
-Music_RuinsOfAlphRadio_Ch2: ; eee12
+Music_RuinsOfAlphRadio_Ch2:
 	dutycycle $1
 	vibrato $1, $e0
-Music_RuinsOfAlphRadio_branch_eee17: ; eee17
+Music_RuinsOfAlphRadio_branch_eee17:
 	stereopanning $f
 	notetype $6, $81
 	callchannel Music_RuinsOfAlphRadio_branch_eee01
@@ -65,15 +61,13 @@ Music_RuinsOfAlphRadio_branch_eee17: ; eee17
 	notetype $c, $a1
 	note __, 16
 	loopchannel 0, Music_RuinsOfAlphRadio_branch_eee17
-; eee32
 
-Music_RuinsOfAlphRadio_Ch3: ; eee32
+Music_RuinsOfAlphRadio_Ch3:
 	notetype $6, $26
-Music_RuinsOfAlphRadio_branch_eee35: ; eee35
+Music_RuinsOfAlphRadio_branch_eee35:
 	octave 2
 	note C_, 1
 	note C#, 1
 	note C_, 1
 	note __, 16
 	loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35
-; eee3e
diff --git a/audio/music/showmearound.asm b/audio/music/showmearound.asm
index f0bed8ef1..344b8fe3a 100644
--- a/audio/music/showmearound.asm
+++ b/audio/music/showmearound.asm
@@ -1,11 +1,10 @@
-Music_ShowMeAround: ; edbd8
+Music_ShowMeAround:
 	musicheader 4, 1, Music_ShowMeAround_Ch1
 	musicheader 1, 2, Music_ShowMeAround_Ch2
 	musicheader 1, 3, Music_ShowMeAround_Ch3
 	musicheader 1, 4, Music_ShowMeAround_Ch4
-; edbe4
 
-Music_ShowMeAround_Ch1: ; edbe4
+Music_ShowMeAround_Ch1:
 	tempo 144
 	volume $77
 	stereopanning $f
@@ -28,7 +27,7 @@ Music_ShowMeAround_Ch1: ; edbe4
 	note D_, 1
 	note E_, 1
 	note G#, 8
-Music_ShowMeAround_branch_edc01: ; edc01
+Music_ShowMeAround_branch_edc01:
 	note __, 16
 	note __, 16
 	note __, 16
@@ -38,9 +37,8 @@ Music_ShowMeAround_branch_edc01: ; edc01
 	callchannel Music_ShowMeAround_branch_edc98
 	callchannel Music_ShowMeAround_branch_edc15
 	loopchannel 0, Music_ShowMeAround_branch_edc01
-; edc15
 
-Music_ShowMeAround_branch_edc15: ; edc15
+Music_ShowMeAround_branch_edc15:
 	note __, 4
 	octave 3
 	note C#, 1
@@ -62,9 +60,8 @@ Music_ShowMeAround_branch_edc15: ; edc15
 	note E_, 1
 	note __, 3
 	endchannel
-; edc2a
 
-Music_ShowMeAround_Ch2: ; edc2a
+Music_ShowMeAround_Ch2:
 	stereopanning $ff
 	dutycycle $2
 	notetype $c, $b1
@@ -86,7 +83,7 @@ Music_ShowMeAround_Ch2: ; edc2a
 	note D_, 1
 	note E_, 8
 	dutycycle $1
-Music_ShowMeAround_branch_edc44: ; edc44
+Music_ShowMeAround_branch_edc44:
 	callchannel Music_ShowMeAround_branch_edc98
 	callchannel Music_ShowMeAround_branch_edc98
 	callchannel Music_ShowMeAround_branch_edc86
@@ -138,9 +135,8 @@ Music_ShowMeAround_branch_edc44: ; edc44
 	note A_, 2
 	note A_, 4
 	loopchannel 0, Music_ShowMeAround_branch_edc44
-; edc86
 
-Music_ShowMeAround_branch_edc86: ; edc86
+Music_ShowMeAround_branch_edc86:
 	octave 3
 	note A_, 2
 	octave 4
@@ -149,9 +145,8 @@ Music_ShowMeAround_branch_edc86: ; edc86
 	note D_, 2
 	note F#, 2
 	endchannel
-; edc8e
 
-Music_ShowMeAround_branch_edc8e: ; edc8e
+Music_ShowMeAround_branch_edc8e:
 	octave 5
 	note C#, 2
 	octave 4
@@ -162,9 +157,8 @@ Music_ShowMeAround_branch_edc8e: ; edc8e
 	octave 4
 	note A_, 2
 	endchannel
-; edc98
 
-Music_ShowMeAround_branch_edc98: ; edc98
+Music_ShowMeAround_branch_edc98:
 	note __, 4
 	octave 3
 	note C#, 1
@@ -182,9 +176,8 @@ Music_ShowMeAround_branch_edc98: ; edc98
 	note B_, 1
 	note __, 1
 	endchannel
-; edca9
 
-Music_ShowMeAround_Ch3: ; edca9
+Music_ShowMeAround_Ch3:
 	stereopanning $f0
 	vibrato $10, $22
 	notetype $6, $25
@@ -226,7 +219,7 @@ Music_ShowMeAround_Ch3: ; edca9
 	note F_, 1
 	note E_, 2
 	intensity $14
-Music_ShowMeAround_branch_edcd9: ; edcd9
+Music_ShowMeAround_branch_edcd9:
 	callchannel Music_ShowMeAround_branch_edcef
 	callchannel Music_ShowMeAround_branch_edcef
 	callchannel Music_ShowMeAround_branch_edcef
@@ -234,9 +227,8 @@ Music_ShowMeAround_branch_edcd9: ; edcd9
 	callchannel Music_ShowMeAround_branch_edcef
 	callchannel Music_ShowMeAround_branch_edd0f
 	loopchannel 0, Music_ShowMeAround_branch_edcd9
-; edcef
 
-Music_ShowMeAround_branch_edcef: ; edcef
+Music_ShowMeAround_branch_edcef:
 	octave 2
 	note A_, 2
 	note __, 6
@@ -269,9 +261,8 @@ Music_ShowMeAround_branch_edcef: ; edcef
 	note D_, 2
 	note __, 2
 	endchannel
-; edd0f
 
-Music_ShowMeAround_branch_edd0f: ; edd0f
+Music_ShowMeAround_branch_edd0f:
 	octave 2
 	note A_, 2
 	note __, 6
@@ -305,9 +296,8 @@ Music_ShowMeAround_branch_edd0f: ; edd0f
 	note A_, 2
 	note __, 6
 	endchannel
-; edd30
 
-Music_ShowMeAround_Ch4: ; edd30
+Music_ShowMeAround_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 16
@@ -315,7 +305,7 @@ Music_ShowMeAround_Ch4: ; edd30
 	note D_, 2
 	note D#, 2
 	note F#, 4
-Music_ShowMeAround_branch_edd39: ; edd39
+Music_ShowMeAround_branch_edd39:
 	callchannel Music_ShowMeAround_branch_edd4f
 	callchannel Music_ShowMeAround_branch_edd4f
 	callchannel Music_ShowMeAround_branch_edd4f
@@ -323,9 +313,8 @@ Music_ShowMeAround_branch_edd39: ; edd39
 	callchannel Music_ShowMeAround_branch_edd4f
 	callchannel Music_ShowMeAround_branch_edd5e
 	loopchannel 0, Music_ShowMeAround_branch_edd39
-; edd4f
 
-Music_ShowMeAround_branch_edd4f: ; edd4f
+Music_ShowMeAround_branch_edd4f:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -341,9 +330,8 @@ Music_ShowMeAround_branch_edd4f: ; edd4f
 	note D_, 2
 	note D#, 2
 	endchannel
-; edd5e
 
-Music_ShowMeAround_branch_edd5e: ; edd5e
+Music_ShowMeAround_branch_edd5e:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -359,4 +347,3 @@ Music_ShowMeAround_branch_edd5e: ; edd5e
 	note D_, 2
 	note F#, 2
 	endchannel
-; edd6d
diff --git a/audio/music/sprouttower.asm b/audio/music/sprouttower.asm
index 60ceb350a..d44de6310 100644
--- a/audio/music/sprouttower.asm
+++ b/audio/music/sprouttower.asm
@@ -1,11 +1,10 @@
-Music_SproutTower: ; f6974
+Music_SproutTower:
 	musicheader 4, 1, Music_SproutTower_Ch1
 	musicheader 1, 2, Music_SproutTower_Ch2
 	musicheader 1, 3, Music_SproutTower_Ch3
 	musicheader 1, 4, Music_SproutTower_Ch4
-; f6980
 
-Music_SproutTower_Ch1: ; f6980
+Music_SproutTower_Ch1:
 	tempo 176
 	volume $77
 	dutycycle $3
@@ -15,7 +14,7 @@ Music_SproutTower_Ch1: ; f6980
 	notetype $c, $a3
 	note __, 16
 	note __, 16
-Music_SproutTower_branch_f6994: ; f6994
+Music_SproutTower_branch_f6994:
 	note __, 6
 	octave 3
 	note F_, 2
@@ -61,9 +60,8 @@ Music_SproutTower_branch_f6994: ; f6994
 	note D#, 4
 	note D#, 4
 	loopchannel 0, Music_SproutTower_branch_f6994
-; f69c8
 
-Music_SproutTower_Ch2: ; f69c8
+Music_SproutTower_Ch2:
 	dutycycle $3
 	tone $0001
 	vibrato $8, $48
@@ -77,7 +75,7 @@ Music_SproutTower_Ch2: ; f69c8
 	note F_, 4
 	note D#, 4
 	note D#, 4
-Music_SproutTower_branch_f69dc: ; f69dc
+Music_SproutTower_branch_f69dc:
 	intensity $b5
 	octave 4
 	note C_, 4
@@ -139,9 +137,8 @@ Music_SproutTower_branch_f69dc: ; f69dc
 	note C_, 16
 	note __, 16
 	loopchannel 0, Music_SproutTower_branch_f69dc
-; f6a25
 
-Music_SproutTower_Ch3: ; f6a25
+Music_SproutTower_Ch3:
 	vibrato $14, $e8
 	notetype $c, $14
 	octave 3
@@ -162,7 +159,7 @@ Music_SproutTower_Ch3: ; f6a25
 	note __, 2
 	note F#, 2
 	stereopanning $f0
-Music_SproutTower_branch_f6a3e: ; f6a3e
+Music_SproutTower_branch_f6a3e:
 	note __, 4
 	note C_, 2
 	note F_, 2
@@ -220,13 +217,12 @@ Music_SproutTower_branch_f6a3e: ; f6a3e
 	note __, 2
 	note F_, 2
 	loopchannel 0, Music_SproutTower_branch_f6a3e
-; f6a7a
 
-Music_SproutTower_Ch4: ; f6a7a
+Music_SproutTower_Ch4:
 	togglenoise $0
 	notetype $c
 	note __, 4
-Music_SproutTower_branch_f6a7f: ; f6a7f
+Music_SproutTower_branch_f6a7f:
 	note F#, 4
 	stereopanning $f0
 	note D#, 4
@@ -244,4 +240,3 @@ Music_SproutTower_branch_f6a7f: ; f6a7f
 	stereopanning $ff
 	note F#, 4
 	loopchannel 0, Music_SproutTower_branch_f6a7f
-; f6a99
diff --git a/audio/music/ssaqua.asm b/audio/music/ssaqua.asm
index 94570eccf..5b06b27b8 100644
--- a/audio/music/ssaqua.asm
+++ b/audio/music/ssaqua.asm
@@ -1,11 +1,10 @@
-Music_SSAqua: ; ead99
+Music_SSAqua:
 	musicheader 4, 1, Music_SSAqua_Ch1
 	musicheader 1, 2, Music_SSAqua_Ch2
 	musicheader 1, 3, Music_SSAqua_Ch3
 	musicheader 1, 4, Music_SSAqua_Ch4
-; eada5
 
-Music_SSAqua_Ch1: ; eada5
+Music_SSAqua_Ch1:
 	tempo 117
 	volume $77
 	stereopanning $f
@@ -18,7 +17,7 @@ Music_SSAqua_Ch1: ; eada5
 	note __, 1
 	note G_, 1
 	note __, 1
-Music_SSAqua_branch_eadbc: ; eadbc
+Music_SSAqua_branch_eadbc:
 	octave 2
 	note G_, 16
 	note __, 8
@@ -248,15 +247,14 @@ Music_SSAqua_branch_eadbc: ; eadbc
 	note F#, 2
 	note A_, 2
 	loopchannel 0, Music_SSAqua_branch_eadbc
-; eaeca
 
-Music_SSAqua_Ch2: ; eaeca
+Music_SSAqua_Ch2:
 	stereopanning $f0
 	dutycycle $2
 	vibrato $8, $33
 	notetype $c, $b7
 	note __, 2
-Music_SSAqua_branch_eaed5: ; eaed5
+Music_SSAqua_branch_eaed5:
 	notetype $c, $b7
 	dutycycle $1
 	intensity $61
@@ -392,9 +390,8 @@ Music_SSAqua_branch_eaed5: ; eaed5
 	note A_, 8
 	note __, 8
 	loopchannel 0, Music_SSAqua_branch_eaed5
-; eaf88
 
-Music_SSAqua_branch_eaf88: ; eaf88
+Music_SSAqua_branch_eaf88:
 	note D_, 6
 	octave 3
 	note B_, 1
@@ -468,9 +465,8 @@ Music_SSAqua_branch_eaf88: ; eaf88
 	note E_, 2
 	note F#, 2
 	endchannel
-; eafd5
 
-Music_SSAqua_branch_eafd5: ; eafd5
+Music_SSAqua_branch_eafd5:
 	notetype $c, $b7
 	note B_, 10
 	note F#, 1
@@ -480,9 +476,8 @@ Music_SSAqua_branch_eafd5: ; eafd5
 	note F#, 1
 	note __, 1
 	endchannel
-; eafe0
 
-Music_SSAqua_branch_eafe0: ; eafe0
+Music_SSAqua_branch_eafe0:
 	octave 3
 	note D_, 10
 	note E_, 1
@@ -504,9 +499,8 @@ Music_SSAqua_branch_eafe0: ; eafe0
 	note A_, 1
 	note __, 1
 	endchannel
-; eaff5
 
-Music_SSAqua_branch_eaff5: ; eaff5
+Music_SSAqua_branch_eaff5:
 	octave 5
 	note G_, 1
 	note D_, 1
@@ -580,9 +574,8 @@ Music_SSAqua_branch_eaff5: ; eaff5
 	note A_, 1
 	note G_, 1
 	endchannel
-; eb03e
 
-Music_SSAqua_branch_eb03e: ; eb03e
+Music_SSAqua_branch_eb03e:
 	octave 5
 	note G_, 1
 	octave 4
@@ -607,9 +600,8 @@ Music_SSAqua_branch_eb03e: ; eb03e
 	octave 3
 	note G_, 1
 	endchannel
-; eb056
 
-Music_SSAqua_Ch3: ; eb056
+Music_SSAqua_Ch3:
 	stereopanning $ff
 	vibrato $8, $34
 	notetype $6, $15
@@ -618,7 +610,7 @@ Music_SSAqua_Ch3: ; eb056
 	note __, 1
 	note G_, 1
 	note __, 1
-Music_SSAqua_branch_eb063: ; eb063
+Music_SSAqua_branch_eb063:
 	note G_, 16
 	note __, 8
 	note G_, 2
@@ -651,7 +643,7 @@ Music_SSAqua_branch_eb063: ; eb063
 	note E_, 1
 	callchannel Music_SSAqua_branch_eb14d
 	callchannel Music_SSAqua_branch_eb14d
-Music_SSAqua_branch_eb08d: ; eb08d
+Music_SSAqua_branch_eb08d:
 	note G_, 2
 	note __, 2
 	octave 3
@@ -830,9 +822,8 @@ Music_SSAqua_branch_eb08d: ; eb08d
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_SSAqua_branch_eb063
-; eb14d
 
-Music_SSAqua_branch_eb14d: ; eb14d
+Music_SSAqua_branch_eb14d:
 	notetype $6, $15
 	octave 2
 	note G_, 2
@@ -868,9 +859,8 @@ Music_SSAqua_branch_eb14d: ; eb14d
 	note G_, 1
 	note __, 1
 	endchannel
-; eb172
 
-Music_SSAqua_branch_eb172: ; eb172
+Music_SSAqua_branch_eb172:
 	octave 2
 	note G_, 2
 	note __, 2
@@ -1061,9 +1051,8 @@ Music_SSAqua_branch_eb172: ; eb172
 	note F#, 1
 	note __, 3
 	endchannel
-; eb230
 
-Music_SSAqua_branch_eb230: ; eb230
+Music_SSAqua_branch_eb230:
 	octave 2
 	note B_, 2
 	note __, 2
@@ -1089,13 +1078,12 @@ Music_SSAqua_branch_eb230: ; eb230
 	note D#, 1
 	note __, 3
 	endchannel
-; eb249
 
-Music_SSAqua_Ch4: ; eb249
+Music_SSAqua_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 2
-Music_SSAqua_branch_eb24e: ; eb24e
+Music_SSAqua_branch_eb24e:
 	note G#, 1
 	note G_, 1
 	note G_, 1
@@ -1138,9 +1126,8 @@ Music_SSAqua_branch_eb24e: ; eb24e
 	callchannel Music_SSAqua_branch_eb2ae
 	callchannel Music_SSAqua_branch_eb2c7
 	loopchannel 0, Music_SSAqua_branch_eb24e
-; eb2ae
 
-Music_SSAqua_branch_eb2ae: ; eb2ae
+Music_SSAqua_branch_eb2ae:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1154,9 +1141,8 @@ Music_SSAqua_branch_eb2ae: ; eb2ae
 	note G_, 1
 	note G_, 1
 	endchannel
-; eb2bb
 
-Music_SSAqua_branch_eb2bb: ; eb2bb
+Music_SSAqua_branch_eb2bb:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1169,9 +1155,8 @@ Music_SSAqua_branch_eb2bb: ; eb2bb
 	note D_, 2
 	note F#, 2
 	endchannel
-; eb2c7
 
-Music_SSAqua_branch_eb2c7: ; eb2c7
+Music_SSAqua_branch_eb2c7:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1184,4 +1169,3 @@ Music_SSAqua_branch_eb2c7: ; eb2c7
 	note D_, 2
 	note C_, 2
 	endchannel
-; eb2d3
diff --git a/audio/music/successfulcapture.asm b/audio/music/successfulcapture.asm
index 3bdb8c9ae..1b53f4a1a 100644
--- a/audio/music/successfulcapture.asm
+++ b/audio/music/successfulcapture.asm
@@ -1,26 +1,22 @@
-Music_SuccessfulCapture: ; f4602
+Music_SuccessfulCapture:
 	musicheader 3, 1, Music_SuccessfulCapture_Ch1
 	musicheader 1, 2, Music_SuccessfulCapture_Ch2
 	musicheader 1, 3, Music_SuccessfulCapture_Ch3
-; f460b
 
-Music_SuccessfulCapture_Ch1: ; f460b
+Music_SuccessfulCapture_Ch1:
 	tempo 126
 	volume $77
 	dutycycle $3
 	tone $0001
 	notetype $c, $a1
 	jumpchannel Music_SuccessfulCapture_branch_f4536
-; f461b
 
-Music_SuccessfulCapture_Ch2: ; f461b
+Music_SuccessfulCapture_Ch2:
 	vibrato $12, $24
 	notetype $c, $c1
 	dutycycle $2
 	jumpchannel Music_SuccessfulCapture_branch_f4585
-; f4626
 
-Music_SuccessfulCapture_Ch3: ; f4626
+Music_SuccessfulCapture_Ch3:
 	notetype $c, $25
 	jumpchannel Music_SuccessfulCapture_branch_f45cf
-; f462c
diff --git a/audio/music/suicunebattle.asm b/audio/music/suicunebattle.asm
index a5819181f..189e6b186 100644
--- a/audio/music/suicunebattle.asm
+++ b/audio/music/suicunebattle.asm
@@ -1,10 +1,9 @@
-Music_SuicuneBattle: ; 178b81
+Music_SuicuneBattle:
 	musicheader 3, 1, Music_SuicuneBattle_Ch1
 	musicheader 1, 2, Music_SuicuneBattle_Ch2
 	musicheader 1, 3, Music_SuicuneBattle_Ch3
-; 178b8a
 
-Music_SuicuneBattle_Ch1: ; 178b8a
+Music_SuicuneBattle_Ch1:
 	tempo 101
 	volume $77
 	dutycycle $3
@@ -95,7 +94,7 @@ Music_SuicuneBattle_Ch1: ; 178b8a
 	octave 3
 	note E_, 1
 	note G#, 1
-Music_SuicuneBattle_branch_178bfc: ; 178bfc
+Music_SuicuneBattle_branch_178bfc:
 	notetype $c, $b4
 	octave 2
 	note A_, 2
@@ -511,9 +510,8 @@ Music_SuicuneBattle_branch_178bfc: ; 178bfc
 	vibrato $12, $15
 	dutycycle $3
 	loopchannel 0, Music_SuicuneBattle_branch_178bfc
-; 178dec
 
-Music_SuicuneBattle_Ch2: ; 178dec
+Music_SuicuneBattle_Ch2:
 	dutycycle $3
 	vibrato $14, $34
 	tone $0001
@@ -591,7 +589,7 @@ Music_SuicuneBattle_Ch2: ; 178dec
 	note E_, 8
 	note E_, 8
 	note E_, 4
-Music_SuicuneBattle_branch_178e4e: ; 178e4e
+Music_SuicuneBattle_branch_178e4e:
 	notetype $c, $c7
 	octave 3
 	note A_, 8
@@ -1187,9 +1185,8 @@ Music_SuicuneBattle_branch_178e4e: ; 178e4e
 	note A_, 2
 	note B_, 2
 	loopchannel 0, Music_SuicuneBattle_branch_178e4e
-; 179122
 
-Music_SuicuneBattle_Ch3: ; 179122
+Music_SuicuneBattle_Ch3:
 	notetype $c, $18
 	note __, 16
 	note __, 4
@@ -1282,7 +1279,7 @@ Music_SuicuneBattle_Ch3: ; 179122
 	note D_, 2
 	note E_, 2
 	notetype $c, $16
-Music_SuicuneBattle_branch_179182: ; 179182
+Music_SuicuneBattle_branch_179182:
 	octave 1
 	note A_, 2
 	octave 2
@@ -2057,4 +2054,3 @@ Music_SuicuneBattle_branch_179182: ; 179182
 	note D_, 2
 	note E_, 2
 	loopchannel 0, Music_SuicuneBattle_branch_179182
-; 17948b
diff --git a/audio/music/surf.asm b/audio/music/surf.asm
index 8a04945d9..c3948f5f7 100644
--- a/audio/music/surf.asm
+++ b/audio/music/surf.asm
@@ -1,17 +1,16 @@
-Music_Surf: ; f518a
+Music_Surf:
 	musicheader 3, 1, Music_Surf_Ch1
 	musicheader 1, 2, Music_Surf_Ch2
 	musicheader 1, 3, Music_Surf_Ch3
-; f5193
 
 	db $3
 
-Music_Surf_Ch1: ; f5194
+Music_Surf_Ch1:
 	tempo 108
 	volume $77
 	notetype $c, $a7
 	stereopanning $f
-Music_Surf_branch_f519e: ; f519e
+Music_Surf_branch_f519e:
 	dutycycle $2
 	vibrato $10, $24
 	intensity $73
@@ -119,9 +118,8 @@ Music_Surf_branch_f519e: ; f519e
 	octave 3
 	note D#, 2
 	loopchannel 0, Music_Surf_branch_f519e
-; f5233
 
-Music_Surf_branch_f5233: ; f5233
+Music_Surf_branch_f5233:
 	notetype $c, $a7
 	octave 3
 	note D#, 4
@@ -214,9 +212,8 @@ Music_Surf_branch_f5233: ; f5233
 	note C#, 4
 	note D_, 4
 	endchannel
-; f5293
 
-Music_Surf_branch_f5293: ; f5293
+Music_Surf_branch_f5293:
 	octave 4
 	note G#, 16
 	note D#, 4
@@ -281,9 +278,8 @@ Music_Surf_branch_f5293: ; f5293
 	octave 3
 	note G_, 2
 	endchannel
-; f52d9
 
-Music_Surf_branch_f52d9: ; f52d9
+Music_Surf_branch_f52d9:
 	octave 3
 	note A#, 3
 	note G_, 3
@@ -341,15 +337,14 @@ Music_Surf_branch_f52d9: ; f52d9
 	octave 2
 	note B_, 8
 	endchannel
-; f5317
 
-Music_Surf_Ch2: ; f5317
-Music_Surf_branch_f5317: ; f5317
+Music_Surf_Ch2:
+Music_Surf_branch_f5317:
 	notetype $c, $c2
 	stereopanning $f0
 	dutycycle $2
 	vibrato $14, $23
-Music_Surf_branch_f5321: ; f5321
+Music_Surf_branch_f5321:
 	octave 1
 	note A#, 4
 	octave 2
@@ -365,7 +360,7 @@ Music_Surf_branch_f5321: ; f5321
 	note __, 3
 	note A#, 1
 	note __, 3
-Music_Surf_branch_f5333: ; f5333
+Music_Surf_branch_f5333:
 	note D#, 4
 	note G_, 2
 	note G#, 2
@@ -448,9 +443,8 @@ Music_Surf_branch_f5333: ; f5333
 	note A#, 4
 	note B_, 4
 	loopchannel 0, Music_Surf_branch_f5317
-; f53b2
 
-Music_Surf_branch_f53b2: ; f53b2
+Music_Surf_branch_f53b2:
 	octave 1
 	note G#, 4
 	octave 3
@@ -487,9 +481,8 @@ Music_Surf_branch_f53b2: ; f53b2
 	note F_, 4
 	note G_, 4
 	endchannel
-; f53d6
 
-Music_Surf_branch_f53d6: ; f53d6
+Music_Surf_branch_f53d6:
 	octave 4
 	note F_, 4
 	note D#, 4
@@ -507,9 +500,8 @@ Music_Surf_branch_f53d6: ; f53d6
 	note B_, 1
 	note A_, 1
 	endchannel
-; f53e8
 
-Music_Surf_branch_f53e8: ; f53e8
+Music_Surf_branch_f53e8:
 	note A#, 7
 	octave 4
 	note C_, 8
@@ -521,9 +513,8 @@ Music_Surf_branch_f53e8: ; f53e8
 	note C_, 16
 	note G_, 8
 	endchannel
-; f53f3
 
-Music_Surf_branch_f53f3: ; f53f3
+Music_Surf_branch_f53f3:
 	note F#, 1
 	note G_, 3
 	note F_, 4
@@ -540,9 +531,8 @@ Music_Surf_branch_f53f3: ; f53f3
 	octave 3
 	note B_, 1
 	endchannel
-; f5404
 
-Music_Surf_branch_f5404: ; f5404
+Music_Surf_branch_f5404:
 	octave 4
 	note C_, 8
 	note G_, 4
@@ -551,10 +541,9 @@ Music_Surf_branch_f5404: ; f5404
 	note G#, 8
 	note D#, 8
 	endchannel
-; f540c
 
-Music_Surf_Ch3: ; f540c
-Music_Surf_branch_f540c: ; f540c
+Music_Surf_Ch3:
+Music_Surf_branch_f540c:
 	stereopanning $ff
 	notetype $c, $15
 	vibrato $16, $23
@@ -697,9 +686,8 @@ Music_Surf_branch_f540c: ; f540c
 	octave 2
 	note B_, 4
 	loopchannel 0, Music_Surf_branch_f540c
-; f54c8
 
-Music_Surf_branch_f54c8: ; f54c8
+Music_Surf_branch_f54c8:
 	octave 3
 	note D#, 4
 	note G_, 1
@@ -732,4 +720,3 @@ Music_Surf_branch_f54c8: ; f54c8
 	note G#, 1
 	note __, 3
 	endchannel
-; f54e8
diff --git a/audio/music/tintower.asm b/audio/music/tintower.asm
index 2c9dd12e0..3871f4eea 100644
--- a/audio/music/tintower.asm
+++ b/audio/music/tintower.asm
@@ -1,17 +1,16 @@
-Music_TinTower: ; f6811
+Music_TinTower:
 	musicheader 4, 1, Music_TinTower_Ch1
 	musicheader 1, 2, Music_TinTower_Ch2
 	musicheader 1, 3, Music_TinTower_Ch3
 	musicheader 1, 4, Music_TinTower_Ch4
-; f681d
 
-Music_TinTower_Ch1: ; f681d
+Music_TinTower_Ch1:
 	tempo 208
 	volume $77
 	dutycycle $3
 	tone $0004
 	vibrato $8, $45
-Music_TinTower_branch_f682a: ; f682a
+Music_TinTower_branch_f682a:
 	stereopanning $f0
 	notetype $c, $a5
 	octave 3
@@ -95,15 +94,14 @@ Music_TinTower_branch_f682a: ; f682a
 	octave 3
 	note A#, 4
 	loopchannel 0, Music_TinTower_branch_f682a
-; f688b
 
-Music_TinTower_Ch2: ; f688b
+Music_TinTower_Ch2:
 	dutycycle $3
 	tone $0002
 	vibrato $18, $44
-Music_TinTower_branch_f6893: ; f6893
+Music_TinTower_branch_f6893:
 	stereopanning $ff
-Music_TinTower_branch_f6895: ; f6895
+Music_TinTower_branch_f6895:
 	notetype $c, $b5
 	octave 4
 	note C_, 4
@@ -185,11 +183,10 @@ Music_TinTower_branch_f6895: ; f6895
 	intensity $95
 	note C#, 2
 	loopchannel 0, Music_TinTower_branch_f6893
-; f68f8
 
-Music_TinTower_Ch3: ; f68f8
+Music_TinTower_Ch3:
 	notetype $c, $14
-Music_TinTower_branch_f68fb: ; f68fb
+Music_TinTower_branch_f68fb:
 	note __, 16
 	note __, 16
 	note __, 16
@@ -260,12 +257,11 @@ Music_TinTower_branch_f68fb: ; f68fb
 	note __, 11
 	stereopanning $ff
 	loopchannel 0, Music_TinTower_branch_f68fb
-; f6948
 
-Music_TinTower_Ch4: ; f6948
+Music_TinTower_Ch4:
 	togglenoise $0
 	notetype $c
-Music_TinTower_branch_f694c: ; f694c
+Music_TinTower_branch_f694c:
 	stereopanning $f
 	note G_, 2
 	stereopanning $f0
@@ -293,4 +289,3 @@ Music_TinTower_branch_f694c: ; f694c
 	note G_, 2
 	note F_, 2
 	loopchannel 0, Music_TinTower_branch_f694c
-; f6974
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index 6e9c488a9..a59608a4b 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -1,11 +1,10 @@
-Music_TitleScreen: ; eb808
+Music_TitleScreen:
 	musicheader 4, 1, Music_TitleScreen_Ch1
 	musicheader 1, 2, Music_TitleScreen_Ch2
 	musicheader 1, 3, Music_TitleScreen_Ch3
 	musicheader 1, 4, Music_TitleScreen_Ch4
-; eb814
 
-Music_TitleScreen_Ch1: ; eb814
+Music_TitleScreen_Ch1:
 	tempo 134
 	volume $77
 	dutycycle $3
@@ -272,12 +271,11 @@ Music_TitleScreen_Ch1: ; eb814
 	note G_, 1
 	note __, 11
 	endchannel
-; eb96d
 
-Music_TitleScreen_branch_eb96d: ; eb96d
+Music_TitleScreen_branch_eb96d:
 	notetype $c, $c3
 	note D_, 1
-Music_TitleScreen_branch_eb971: ; eb971
+Music_TitleScreen_branch_eb971:
 	note __, 1
 	octave 2
 	note D_, 1
@@ -292,9 +290,8 @@ Music_TitleScreen_branch_eb971: ; eb971
 	note A_, 1
 	notetype $8, $b7
 	endchannel
-; eb984
 
-Music_TitleScreen_Ch2: ; eb984
+Music_TitleScreen_Ch2:
 	dutycycle $3
 	vibrato $14, $12
 	notetype $c, $c7
@@ -556,12 +553,11 @@ Music_TitleScreen_Ch2: ; eb984
 	note G_, 1
 	note __, 11
 	endchannel
-; ebae7
 
-Music_TitleScreen_branch_ebae7: ; ebae7
+Music_TitleScreen_branch_ebae7:
 	notetype $c, $b2
 	note D_, 1
-Music_TitleScreen_branch_ebaeb: ; ebaeb
+Music_TitleScreen_branch_ebaeb:
 	octave 3
 	note A_, 1
 	octave 4
@@ -579,9 +575,8 @@ Music_TitleScreen_branch_ebaeb: ; ebaeb
 	note C_, 4
 	note C_, 4
 	endchannel
-; ebb01
 
-Music_TitleScreen_Ch3: ; ebb01
+Music_TitleScreen_Ch3:
 	stereopanning $f
 	vibrato $10, $14
 	tone $0001
@@ -896,9 +891,8 @@ Music_TitleScreen_Ch3: ; ebb01
 	note G_, 1
 	note __, 11
 	endchannel
-; ebc5c
 
-Music_TitleScreen_Ch4: ; ebc5c
+Music_TitleScreen_Ch4:
 	togglenoise $5
 	stereopanning $f0
 	notetype $c
@@ -1081,7 +1075,7 @@ Music_TitleScreen_Ch4: ; ebc5c
 	note C#, 1
 	notetype $c
 	note G#, 16
-Music_TitleScreen_branch_ebd40: ; ebd40
+Music_TitleScreen_branch_ebd40:
 	note __, 16
 	loopchannel 6, Music_TitleScreen_branch_ebd40
 	note __, 12
@@ -1129,9 +1123,8 @@ Music_TitleScreen_branch_ebd40: ; ebd40
 	note C_, 4
 	note B_, 4
 	endchannel
-; ebd77
 
-Music_TitleScreen_branch_ebd77: ; ebd77
+Music_TitleScreen_branch_ebd77:
 	note C_, 2
 	note D#, 2
 	note C_, 2
@@ -1142,9 +1135,8 @@ Music_TitleScreen_branch_ebd77: ; ebd77
 	note C_, 2
 	note D#, 2
 	endchannel
-; ebd81
 
-Music_TitleScreen_branch_ebd81: ; ebd81
+Music_TitleScreen_branch_ebd81:
 	note C_, 2
 	note D#, 2
 	note C_, 2
@@ -1155,17 +1147,15 @@ Music_TitleScreen_branch_ebd81: ; ebd81
 	note C_, 2
 	note D#, 2
 	endchannel
-; ebd8b
 
-Music_TitleScreen_branch_ebd8b: ; ebd8b
+Music_TitleScreen_branch_ebd8b:
 	note C_, 2
 	note C_, 1
 	note C_, 1
 	loopchannel 4, Music_TitleScreen_branch_ebd8b
 	endchannel
-; ebd93
 
-Music_TitleScreen_branch_ebd93: ; ebd93
+Music_TitleScreen_branch_ebd93:
 	note C_, 2
 	note C_, 1
 	note C_, 1
@@ -1176,4 +1166,3 @@ Music_TitleScreen_branch_ebd93: ; ebd93
 	note C_, 4
 	note C_, 4
 	endchannel
-; ebd9e
diff --git a/audio/music/trainervictory.asm b/audio/music/trainervictory.asm
index fe7ffdd89..56b2d847b 100644
--- a/audio/music/trainervictory.asm
+++ b/audio/music/trainervictory.asm
@@ -1,10 +1,9 @@
-Music_TrainerVictory: ; ebeab
+Music_TrainerVictory:
 	musicheader 3, 1, Music_TrainerVictory_Ch1
 	musicheader 1, 2, Music_TrainerVictory_Ch2
 	musicheader 1, 3, Music_TrainerVictory_Ch3
-; ebeb4
 
-Music_TrainerVictory_Ch1: ; ebeb4
+Music_TrainerVictory_Ch1:
 	tempo 120
 	volume $77
 	dutycycle $2
@@ -20,7 +19,7 @@ Music_TrainerVictory_Ch1: ; ebeb4
 	intensity $b6
 	note A_, 12
 	stereopanning $f
-Music_TrainerVictory_branch_ebecd: ; ebecd
+Music_TrainerVictory_branch_ebecd:
 	intensity $72
 	callchannel Music_TrainerVictory_branch_ebf11
 	intensity $51
@@ -48,7 +47,7 @@ Music_TrainerVictory_branch_ebecd: ; ebecd
 	note __, 2
 	note G_, 2
 	note A#, 6
-Music_TrainerVictory_branch_ebef2: ; ebef2
+Music_TrainerVictory_branch_ebef2:
 	intensity $72
 	octave 4
 	note D_, 2
@@ -60,7 +59,7 @@ Music_TrainerVictory_branch_ebef2: ; ebef2
 	note A_, 2
 	octave 4
 	note D_, 2
-Music_TrainerVictory_branch_ebf01: ; ebf01
+Music_TrainerVictory_branch_ebf01:
 	octave 4
 	note C#, 2
 	octave 3
@@ -71,9 +70,8 @@ Music_TrainerVictory_branch_ebf01: ; ebf01
 	note F#, 2
 	note G_, 2
 	loopchannel 0, Music_TrainerVictory_branch_ebecd
-; ebf11
 
-Music_TrainerVictory_branch_ebf11: ; ebf11
+Music_TrainerVictory_branch_ebf11:
 	octave 3
 	note F#, 2
 	note __, 2
@@ -84,9 +82,8 @@ Music_TrainerVictory_branch_ebf11: ; ebf11
 	note E_, 2
 	note G_, 6
 	endchannel
-; ebf1b
 
-Music_TrainerVictory_Ch2: ; ebf1b
+Music_TrainerVictory_Ch2:
 	vibrato $12, $34
 	dutycycle $3
 	notetype $8, $d1
@@ -101,7 +98,7 @@ Music_TrainerVictory_Ch2: ; ebf1b
 	intensity $d6
 	note D_, 12
 	stereopanning $f0
-Music_TrainerVictory_branch_ebf30: ; ebf30
+Music_TrainerVictory_branch_ebf30:
 	notetype $8, $82
 	callchannel Music_TrainerVictory_branch_ebf56
 	note F#, 2
@@ -126,9 +123,8 @@ Music_TrainerVictory_branch_ebf30: ; ebf30
 	note F#, 16
 	note E_, 16
 	loopchannel 0, Music_TrainerVictory_branch_ebf30
-; ebf56
 
-Music_TrainerVictory_branch_ebf56: ; ebf56
+Music_TrainerVictory_branch_ebf56:
 	octave 4
 	note D_, 2
 	note __, 2
@@ -143,9 +139,8 @@ Music_TrainerVictory_branch_ebf56: ; ebf56
 	octave 4
 	note E_, 6
 	endchannel
-; ebf64
 
-Music_TrainerVictory_Ch3: ; ebf64
+Music_TrainerVictory_Ch3:
 	notetype $8, $25
 	octave 3
 	note G_, 6
@@ -160,7 +155,7 @@ Music_TrainerVictory_Ch3: ; ebf64
 	note C#, 2
 	octave 2
 	note B_, 2
-Music_TrainerVictory_branch_ebf74: ; ebf74
+Music_TrainerVictory_branch_ebf74:
 	callchannel Music_TrainerVictory_branch_ebfb1
 	octave 3
 	note C#, 2
@@ -212,9 +207,8 @@ Music_TrainerVictory_branch_ebf74: ; ebf74
 	note E_, 2
 	note C#, 2
 	loopchannel 0, Music_TrainerVictory_branch_ebf74
-; ebfb1
 
-Music_TrainerVictory_branch_ebfb1: ; ebfb1
+Music_TrainerVictory_branch_ebfb1:
 	octave 2
 	note A_, 2
 	note __, 2
@@ -233,4 +227,3 @@ Music_TrainerVictory_branch_ebfb1: ; ebfb1
 	octave 2
 	note B_, 2
 	endchannel
-; ebfc3
diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm
index 4f6430260..94c7aec6e 100644
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -1,23 +1,22 @@
-Music_UnionCave: ; f5c60
+Music_UnionCave:
 	musicheader 4, 1, Music_UnionCave_Ch1
 	musicheader 1, 2, Music_UnionCave_Ch2
 	musicheader 1, 3, Music_UnionCave_Ch3
 	musicheader 1, 4, Music_UnionCave_Ch4
-; f5c6c
 
-Music_UnionCave_Ch1: ; f5c6c
+Music_UnionCave_Ch1:
 	tempo 160
 	volume $77
 	dutycycle $1
 	tone $0002
 	vibrato $18, $34
 	stereopanning $f
-Music_UnionCave_branch_f5c7b: ; f5c7b
+Music_UnionCave_branch_f5c7b:
 	notetype $c, $b3
-Music_UnionCave_branch_f5c7e: ; f5c7e
+Music_UnionCave_branch_f5c7e:
 	callchannel Music_UnionCave_branch_f5ccf
 	loopchannel 4, Music_UnionCave_branch_f5c7e
-Music_UnionCave_branch_f5c85: ; f5c85
+Music_UnionCave_branch_f5c85:
 	octave 2
 	note G#, 2
 	octave 3
@@ -27,7 +26,7 @@ Music_UnionCave_branch_f5c85: ; f5c85
 	note E_, 2
 	note F_, 4
 	loopchannel 8, Music_UnionCave_branch_f5c85
-Music_UnionCave_branch_f5c91: ; f5c91
+Music_UnionCave_branch_f5c91:
 	octave 2
 	note A_, 2
 	octave 3
@@ -64,21 +63,19 @@ Music_UnionCave_branch_f5c91: ; f5c91
 	callchannel Music_UnionCave_branch_f5ccf
 	tone $0002
 	loopchannel 0, Music_UnionCave_branch_f5c7b
-; f5ccf
 
-Music_UnionCave_branch_f5ccf: ; f5ccf
+Music_UnionCave_branch_f5ccf:
 	octave 2
 	note G#, 2
 	octave 3
 	note C#, 2
 	note E_, 12
 	endchannel
-; f5cd5
 
-Music_UnionCave_Ch2: ; f5cd5
+Music_UnionCave_Ch2:
 	dutycycle $3
 	vibrato $8, $24
-Music_UnionCave_branch_f5cda: ; f5cda
+Music_UnionCave_branch_f5cda:
 	notetype $c, $c4
 	callchannel Music_UnionCave_branch_f5d34
 	intensity $c5
@@ -135,9 +132,8 @@ Music_UnionCave_branch_f5cda: ; f5cda
 	callchannel Music_UnionCave_branch_f5d52
 	vibrato $8, $24
 	loopchannel 0, Music_UnionCave_branch_f5cda
-; f5d34
 
-Music_UnionCave_branch_f5d34: ; f5d34
+Music_UnionCave_branch_f5d34:
 	octave 4
 	note C_, 4
 	octave 3
@@ -168,27 +164,25 @@ Music_UnionCave_branch_f5d34: ; f5d34
 	note C#, 4
 	note C_, 4
 	endchannel
-; f5d52
 
-Music_UnionCave_branch_f5d52: ; f5d52
+Music_UnionCave_branch_f5d52:
 	octave 2
 	note G#, 2
 	octave 3
 	note C#, 2
 	note E_, 12
 	endchannel
-; f5d58
 
-Music_UnionCave_Ch3: ; f5d58
+Music_UnionCave_Ch3:
 	notetype $c, $16
 	stereopanning $f0
-Music_UnionCave_branch_f5d5d: ; f5d5d
+Music_UnionCave_branch_f5d5d:
 	note __, 16
 	loopchannel 7, Music_UnionCave_branch_f5d5d
 	note __, 14
 	octave 4
 	note C_, 2
-Music_UnionCave_branch_f5d65: ; f5d65
+Music_UnionCave_branch_f5d65:
 	note __, 2
 	octave 3
 	note E_, 2
@@ -200,7 +194,7 @@ Music_UnionCave_branch_f5d65: ; f5d65
 	octave 4
 	note C_, 2
 	loopchannel 4, Music_UnionCave_branch_f5d65
-Music_UnionCave_branch_f5d73: ; f5d73
+Music_UnionCave_branch_f5d73:
 	note __, 2
 	octave 3
 	note F_, 2
@@ -224,7 +218,7 @@ Music_UnionCave_branch_f5d73: ; f5d73
 	octave 3
 	note B_, 8
 	note A#, 8
-Music_UnionCave_branch_f5d8d: ; f5d8d
+Music_UnionCave_branch_f5d8d:
 	note A_, 4
 	note G_, 4
 	note A#, 2
@@ -237,16 +231,15 @@ Music_UnionCave_branch_f5d8d: ; f5d8d
 	note A_, 4
 	note G_, 4
 	note A#, 8
-Music_UnionCave_branch_f5d9c: ; f5d9c
+Music_UnionCave_branch_f5d9c:
 	note __, 16
 	loopchannel 4, Music_UnionCave_branch_f5d9c
 	loopchannel 0, Music_UnionCave_branch_f5d5d
-; f5da5
 
-Music_UnionCave_Ch4: ; f5da5
+Music_UnionCave_Ch4:
 	togglenoise $1
 	notetype $c
-Music_UnionCave_branch_f5da9: ; f5da9
+Music_UnionCave_branch_f5da9:
 	stereopanning $f0
 	note E_, 4
 	stereopanning $ff
@@ -263,4 +256,3 @@ Music_UnionCave_branch_f5da9: ; f5da9
 	note __, 8
 	loopchannel 0, Music_UnionCave_branch_f5da9
 	loopchannel 0, Music_UnionCave_branch_f5da9 ; unused
-; f5dc5
diff --git a/audio/music/vermilioncity.asm b/audio/music/vermilioncity.asm
index ac4fc3b6d..ec88085e6 100644
--- a/audio/music/vermilioncity.asm
+++ b/audio/music/vermilioncity.asm
@@ -1,12 +1,11 @@
-Music_VermilionCity: ; eb676
+Music_VermilionCity:
 	musicheader 3, 1, Music_VermilionCity_Ch1
 	musicheader 1, 2, Music_VermilionCity_Ch2
 	musicheader 1, 3, Music_VermilionCity_Ch3
-; eb67f
 
 	db $3
 
-Music_VermilionCity_Ch1: ; eb680
+Music_VermilionCity_Ch1:
 	stereopanning $f
 	tempo 176
 	volume $77
@@ -30,7 +29,7 @@ Music_VermilionCity_Ch1: ; eb680
 	octave 5
 	note D_, 1
 	vibrato $10, $23
-Music_VermilionCity_branch_eb6a0: ; eb6a0
+Music_VermilionCity_branch_eb6a0:
 	dutycycle $1
 	notetype $c, $85
 	callchannel Music_VermilionCity_branch_eb6f9
@@ -91,9 +90,8 @@ Music_VermilionCity_branch_eb6a0: ; eb6a0
 	octave 3
 	note D_, 4
 	loopchannel 0, Music_VermilionCity_branch_eb6a0
-; eb6f9
 
-Music_VermilionCity_branch_eb6f9: ; eb6f9
+Music_VermilionCity_branch_eb6f9:
 	octave 3
 	note C#, 4
 	note E_, 4
@@ -102,9 +100,8 @@ Music_VermilionCity_branch_eb6f9: ; eb6f9
 	note E_, 2
 	note G#, 2
 	endchannel
-; eb701
 
-Music_VermilionCity_branch_eb701: ; eb701
+Music_VermilionCity_branch_eb701:
 	note D_, 2
 	note F_, 2
 	note A_, 2
@@ -116,9 +113,8 @@ Music_VermilionCity_branch_eb701: ; eb701
 	note A_, 2
 	note E_, 2
 	endchannel
-; eb70c
 
-Music_VermilionCity_branch_eb70c: ; eb70c
+Music_VermilionCity_branch_eb70c:
 	note __, 2
 	note F#, 2
 	note A_, 2
@@ -140,9 +136,8 @@ Music_VermilionCity_branch_eb70c: ; eb70c
 	note B_, 2
 	note G#, 2
 	endchannel
-; eb721
 
-Music_VermilionCity_Ch2: ; eb721
+Music_VermilionCity_Ch2:
 	stereopanning $ff
 	dutycycle $3
 	notetype $c, $77
@@ -157,7 +152,7 @@ Music_VermilionCity_Ch2: ; eb721
 	note E_, 4
 	note F#, 4
 	note G#, 4
-Music_VermilionCity_branch_eb735: ; eb735
+Music_VermilionCity_branch_eb735:
 	notetype $c, $97
 	callchannel Music_VermilionCity_branch_eb768
 	note G#, 2
@@ -191,9 +186,8 @@ Music_VermilionCity_branch_eb735: ; eb735
 	octave 5
 	note E_, 16
 	loopchannel 0, Music_VermilionCity_branch_eb735
-; eb768
 
-Music_VermilionCity_branch_eb768: ; eb768
+Music_VermilionCity_branch_eb768:
 	octave 1
 	note A_, 8
 	octave 2
@@ -216,9 +210,8 @@ Music_VermilionCity_branch_eb768: ; eb768
 	octave 1
 	note A_, 2
 	endchannel
-; eb77e
 
-Music_VermilionCity_branch_eb77e: ; eb77e
+Music_VermilionCity_branch_eb77e:
 	note F#, 8
 	note B_, 8
 	note A_, 4
@@ -226,9 +219,8 @@ Music_VermilionCity_branch_eb77e: ; eb77e
 	note F#, 4
 	note E_, 4
 	endchannel
-; eb785
 
-Music_VermilionCity_Ch3: ; eb785
+Music_VermilionCity_Ch3:
 	stereopanning $f0
 	vibrato $22, $23
 	notetype $c, $25
@@ -249,7 +241,7 @@ Music_VermilionCity_Ch3: ; eb785
 	note D_, 1
 	octave 2
 	note B_, 1
-Music_VermilionCity_branch_eb79e: ; eb79e
+Music_VermilionCity_branch_eb79e:
 	notetype $c, $22
 	callchannel Music_VermilionCity_branch_eb7de
 	octave 5
@@ -297,9 +289,8 @@ Music_VermilionCity_branch_eb79e: ; eb79e
 	note E_, 1
 	note G#, 1
 	loopchannel 0, Music_VermilionCity_branch_eb79e
-; eb7de
 
-Music_VermilionCity_branch_eb7de: ; eb7de
+Music_VermilionCity_branch_eb7de:
 	octave 5
 	note A_, 8
 	octave 6
@@ -323,9 +314,8 @@ Music_VermilionCity_branch_eb7de: ; eb7de
 	octave 5
 	note B_, 1
 	endchannel
-; eb7f5
 
-Music_VermilionCity_branch_eb7f5: ; eb7f5
+Music_VermilionCity_branch_eb7f5:
 	note A_, 1
 	note __, 1
 	note A_, 2
@@ -345,4 +335,3 @@ Music_VermilionCity_branch_eb7f5: ; eb7f5
 	octave 4
 	note C#, 1
 	endchannel
-; eb808
diff --git a/audio/music/victoryroad.asm b/audio/music/victoryroad.asm
index dbefa5127..ea914865f 100644
--- a/audio/music/victoryroad.asm
+++ b/audio/music/victoryroad.asm
@@ -1,21 +1,20 @@
-Music_VictoryRoad: ; f6c72
+Music_VictoryRoad:
 	musicheader 4, 1, Music_VictoryRoad_Ch1
 	musicheader 1, 2, Music_VictoryRoad_Ch2
 	musicheader 1, 3, Music_VictoryRoad_Ch3
 	musicheader 1, 4, Music_VictoryRoad_Ch4
-; f6c7e
 
-Music_VictoryRoad_Ch1: ; f6c7e
+Music_VictoryRoad_Ch1:
 	tempo 144
 	volume $77
 	stereopanning $f
 	dutycycle $3
 	tone $0002
 	notetype $c, $b3
-Music_VictoryRoad_branch_f6c8d: ; f6c8d
+Music_VictoryRoad_branch_f6c8d:
 	callchannel Music_VictoryRoad_branch_f6cb9
 	loopchannel 6, Music_VictoryRoad_branch_f6c8d
-Music_VictoryRoad_branch_f6c94: ; f6c94
+Music_VictoryRoad_branch_f6c94:
 	intensity $b2
 	octave 2
 	note A_, 1
@@ -37,13 +36,12 @@ Music_VictoryRoad_branch_f6c94: ; f6c94
 	octave 3
 	note G#, 3
 	loopchannel 2, Music_VictoryRoad_branch_f6c94
-Music_VictoryRoad_branch_f6cae: ; f6cae
+Music_VictoryRoad_branch_f6cae:
 	callchannel Music_VictoryRoad_branch_f6cb9
 	loopchannel 2, Music_VictoryRoad_branch_f6cae
 	loopchannel 0, Music_VictoryRoad_branch_f6c8d
-; f6cb9
 
-Music_VictoryRoad_branch_f6cb9: ; f6cb9
+Music_VictoryRoad_branch_f6cb9:
 	intensity $b2
 	octave 2
 	note G_, 1
@@ -63,12 +61,11 @@ Music_VictoryRoad_branch_f6cb9: ; f6cb9
 	octave 3
 	note F#, 3
 	endchannel
-; f6cce
 
-Music_VictoryRoad_Ch2: ; f6cce
+Music_VictoryRoad_Ch2:
 	dutycycle $3
 	vibrato $10, $24
-Music_VictoryRoad_branch_f6cd3: ; f6cd3
+Music_VictoryRoad_branch_f6cd3:
 	notetype $c, $c2
 	callchannel Music_VictoryRoad_branch_f6d1e
 	note __, 2
@@ -119,9 +116,8 @@ Music_VictoryRoad_branch_f6cd3: ; f6cd3
 	note C#, 1
 	note D_, 16
 	loopchannel 0, Music_VictoryRoad_branch_f6cd3
-; f6d1e
 
-Music_VictoryRoad_branch_f6d1e: ; f6d1e
+Music_VictoryRoad_branch_f6d1e:
 	octave 3
 	note E_, 1
 	note __, 1
@@ -136,15 +132,14 @@ Music_VictoryRoad_branch_f6d1e: ; f6d1e
 	note A_, 1
 	note A_, 1
 	endchannel
-; f6d2c
 
-Music_VictoryRoad_Ch3: ; f6d2c
+Music_VictoryRoad_Ch3:
 	stereopanning $f0
 	notetype $c, $28
-Music_VictoryRoad_branch_f6d31: ; f6d31
+Music_VictoryRoad_branch_f6d31:
 	callchannel Music_VictoryRoad_branch_f6d52
 	loopchannel 6, Music_VictoryRoad_branch_f6d31
-Music_VictoryRoad_branch_f6d38: ; f6d38
+Music_VictoryRoad_branch_f6d38:
 	note D_, 1
 	note __, 1
 	note B_, 1
@@ -157,13 +152,12 @@ Music_VictoryRoad_branch_f6d38: ; f6d38
 	note D_, 1
 	note B_, 3
 	loopchannel 2, Music_VictoryRoad_branch_f6d38
-Music_VictoryRoad_branch_f6d47: ; f6d47
+Music_VictoryRoad_branch_f6d47:
 	callchannel Music_VictoryRoad_branch_f6d52
 	loopchannel 2, Music_VictoryRoad_branch_f6d47
 	loopchannel 0, Music_VictoryRoad_branch_f6d31
-; f6d52
 
-Music_VictoryRoad_branch_f6d52: ; f6d52
+Music_VictoryRoad_branch_f6d52:
 	octave 3
 	note C_, 1
 	note __, 1
@@ -177,12 +171,11 @@ Music_VictoryRoad_branch_f6d52: ; f6d52
 	note C_, 1
 	note A_, 3
 	endchannel
-; f6d5f
 
-Music_VictoryRoad_Ch4: ; f6d5f
+Music_VictoryRoad_Ch4:
 	togglenoise $0
 	notetype $c
-Music_VictoryRoad_branch_f6d63: ; f6d63
+Music_VictoryRoad_branch_f6d63:
 	note D_, 2
 	note D_, 2
 	note D#, 1
@@ -202,4 +195,3 @@ Music_VictoryRoad_branch_f6d63: ; f6d63
 	note D_, 2
 	note D#, 1
 	loopchannel 0, Music_VictoryRoad_branch_f6d63
-; f6d79
diff --git a/audio/music/violetcity.asm b/audio/music/violetcity.asm
index 6ccb874f1..a8a89c3c2 100644
--- a/audio/music/violetcity.asm
+++ b/audio/music/violetcity.asm
@@ -1,11 +1,10 @@
-Music_VioletCity: ; f0000
+Music_VioletCity:
 	musicheader 4, 1, Music_VioletCity_Ch1
 	musicheader 1, 2, Music_VioletCity_Ch2
 	musicheader 1, 3, Music_VioletCity_Ch3
 	musicheader 1, 4, Music_VioletCity_Ch4
-; f000c
 
-Music_VioletCity_Ch1: ; f000c
+Music_VioletCity_Ch1:
 	tempo 164
 	volume $77
 	vibrato $12, $25
@@ -65,7 +64,7 @@ Music_VioletCity_Ch1: ; f000c
 	octave 3
 	note C#, 12
 	note __, 8
-Music_VioletCity_branch_f0056: ; f0056
+Music_VioletCity_branch_f0056:
 	notetype $6, $95
 	note __, 4
 	octave 2
@@ -296,9 +295,8 @@ Music_VioletCity_branch_f0056: ; f0056
 	note C#, 4
 	note __, 4
 	loopchannel 0, Music_VioletCity_branch_f0056
-; f0162
 
-Music_VioletCity_Ch2: ; f0162
+Music_VioletCity_Ch2:
 	vibrato $12, $24
 	dutycycle $2
 	notetype $c, $c7
@@ -349,7 +347,7 @@ Music_VioletCity_Ch2: ; f0162
 	note __, 2
 	note D#, 1
 	note E_, 1
-Music_VioletCity_branch_f0199: ; f0199
+Music_VioletCity_branch_f0199:
 	intensity $b7
 	note F#, 4
 	note __, 2
@@ -503,9 +501,8 @@ Music_VioletCity_branch_f0199: ; f0199
 	note D#, 1
 	note E_, 1
 	loopchannel 0, Music_VioletCity_branch_f0199
-; f0247
 
-Music_VioletCity_Ch3: ; f0247
+Music_VioletCity_Ch3:
 	notetype $c, $25
 	note __, 16
 	note __, 6
@@ -530,7 +527,7 @@ Music_VioletCity_Ch3: ; f0247
 	note F#, 2
 	octave 2
 	note A#, 2
-Music_VioletCity_branch_f0261: ; f0261
+Music_VioletCity_branch_f0261:
 	notetype $c, $25
 	note B_, 1
 	note __, 5
@@ -692,9 +689,8 @@ Music_VioletCity_branch_f0261: ; f0261
 	octave 2
 	note A#, 4
 	loopchannel 0, Music_VioletCity_branch_f0261
-; f0311
 
-Music_VioletCity_branch_f0311: ; f0311
+Music_VioletCity_branch_f0311:
 	note G_, 2
 	note __, 10
 	note G_, 2
@@ -708,9 +704,8 @@ Music_VioletCity_branch_f0311: ; f0311
 	octave 2
 	note A_, 4
 	endchannel
-; f031e
 
-Music_VioletCity_Ch4: ; f031e
+Music_VioletCity_Ch4:
 	togglenoise $3
 	notetype $c
 	note D#, 2
@@ -729,7 +724,7 @@ Music_VioletCity_Ch4: ; f031e
 	note D_, 2
 	note C_, 8
 	note D#, 2
-Music_VioletCity_branch_f0338: ; f0338
+Music_VioletCity_branch_f0338:
 	callchannel Music_VioletCity_branch_f037a
 	callchannel Music_VioletCity_branch_f037a
 	callchannel Music_VioletCity_branch_f037a
@@ -747,9 +742,8 @@ Music_VioletCity_branch_f0338: ; f0338
 	callchannel Music_VioletCity_branch_f037a
 	callchannel Music_VioletCity_branch_f037a
 	loopchannel 0, Music_VioletCity_branch_f0338
-; f036c
 
-Music_VioletCity_branch_f036c: ; f036c
+Music_VioletCity_branch_f036c:
 	note D_, 1
 	note D_, 1
 	note D#, 1
@@ -764,9 +758,8 @@ Music_VioletCity_branch_f036c: ; f036c
 	note G_, 1
 	note G_, 1
 	endchannel
-; f037a
 
-Music_VioletCity_branch_f037a: ; f037a
+Music_VioletCity_branch_f037a:
 	note D#, 2
 	note G_, 1
 	note G_, 1
@@ -779,4 +772,3 @@ Music_VioletCity_branch_f037a: ; f037a
 	note D_, 2
 	note D#, 2
 	endchannel
-; f0386
diff --git a/audio/music/viridiancity.asm b/audio/music/viridiancity.asm
index 7196882cf..ea38a0e6d 100644
--- a/audio/music/viridiancity.asm
+++ b/audio/music/viridiancity.asm
@@ -1,11 +1,10 @@
-Music_ViridianCity: ; f4000
+Music_ViridianCity:
 	musicheader 4, 1, Music_ViridianCity_Ch1
 	musicheader 1, 2, Music_ViridianCity_Ch2
 	musicheader 1, 3, Music_ViridianCity_Ch3
 	musicheader 1, 4, Music_ViridianCity_Ch4
-; f400c
 
-Music_ViridianCity_Ch1: ; f400c
+Music_ViridianCity_Ch1:
 	tempo 157
 	volume $77
 	stereopanning $f
@@ -42,7 +41,7 @@ Music_ViridianCity_Ch1: ; f400c
 	note __, 4
 	note G_, 8
 	note __, 4
-Music_ViridianCity_branch_f4039: ; f4039
+Music_ViridianCity_branch_f4039:
 	callchannel Music_ViridianCity_branch_f40c5
 	note __, 4
 	callchannel Music_ViridianCity_branch_f40c5
@@ -170,9 +169,8 @@ Music_ViridianCity_branch_f4039: ; f4039
 	note G_, 8
 	note A#, 4
 	loopchannel 0, Music_ViridianCity_branch_f4039
-; f40c5
 
-Music_ViridianCity_branch_f40c5: ; f40c5
+Music_ViridianCity_branch_f40c5:
 	octave 3
 	note A_, 1
 	note __, 3
@@ -247,9 +245,8 @@ Music_ViridianCity_branch_f40c5: ; f40c5
 	note __, 4
 	note G_, 8
 	endchannel
-; f410f
 
-Music_ViridianCity_branch_f410f: ; f410f
+Music_ViridianCity_branch_f410f:
 	octave 3
 	note B_, 2
 	note D_, 2
@@ -272,9 +269,8 @@ Music_ViridianCity_branch_f410f: ; f410f
 	note G_, 1
 	note __, 1
 	endchannel
-; f4125
 
-Music_ViridianCity_Ch2: ; f4125
+Music_ViridianCity_Ch2:
 	vibrato $10, $46
 	dutycycle $1
 	notetype $c, $b7
@@ -308,7 +304,7 @@ Music_ViridianCity_Ch2: ; f4125
 	note __, 4
 	note E_, 8
 	note __, 4
-Music_ViridianCity_branch_f414c: ; f414c
+Music_ViridianCity_branch_f414c:
 	callchannel Music_ViridianCity_branch_f41c0
 	note __, 4
 	callchannel Music_ViridianCity_branch_f41c0
@@ -406,9 +402,8 @@ Music_ViridianCity_branch_f414c: ; f414c
 	octave 1
 	note A_, 4
 	loopchannel 0, Music_ViridianCity_branch_f414c
-; f41c0
 
-Music_ViridianCity_branch_f41c0: ; f41c0
+Music_ViridianCity_branch_f41c0:
 	octave 2
 	note D_, 4
 	note __, 2
@@ -474,9 +469,8 @@ Music_ViridianCity_branch_f41c0: ; f41c0
 	note __, 4
 	note E_, 8
 	endchannel
-; f4201
 
-Music_ViridianCity_branch_f4201: ; f4201
+Music_ViridianCity_branch_f4201:
 	note G_, 4
 	note __, 2
 	octave 3
@@ -487,9 +481,8 @@ Music_ViridianCity_branch_f4201: ; f4201
 	note F_, 2
 	note F#, 2
 	endchannel
-; f420b
 
-Music_ViridianCity_branch_f420b: ; f420b
+Music_ViridianCity_branch_f420b:
 	note F#, 4
 	note __, 2
 	octave 3
@@ -500,9 +493,8 @@ Music_ViridianCity_branch_f420b: ; f420b
 	note E_, 2
 	note F_, 2
 	endchannel
-; f4215
 
-Music_ViridianCity_branch_f4215: ; f4215
+Music_ViridianCity_branch_f4215:
 	octave 2
 	note E_, 4
 	note __, 2
@@ -512,9 +504,8 @@ Music_ViridianCity_branch_f4215: ; f4215
 	note D_, 2
 	note D#, 2
 	endchannel
-; f421e
 
-Music_ViridianCity_Ch3: ; f421e
+Music_ViridianCity_Ch3:
 	vibrato $12, $24
 	notetype $c, $13
 	stereopanning $ff
@@ -550,7 +541,7 @@ Music_ViridianCity_Ch3: ; f421e
 	note D_, 8
 	note F#, 2
 	note G_, 2
-Music_ViridianCity_branch_f4246: ; f4246
+Music_ViridianCity_branch_f4246:
 	intensity $13
 	callchannel Music_ViridianCity_branch_f42a2
 	octave 5
@@ -632,9 +623,8 @@ Music_ViridianCity_branch_f4246: ; f4246
 	note D_, 8
 	note E_, 4
 	loopchannel 0, Music_ViridianCity_branch_f4246
-; f42a2
 
-Music_ViridianCity_branch_f42a2: ; f42a2
+Music_ViridianCity_branch_f42a2:
 	octave 5
 	note A_, 2
 	note __, 2
@@ -696,14 +686,13 @@ Music_ViridianCity_branch_f42a2: ; f42a2
 	note __, 4
 	note D_, 8
 	endchannel
-; f42df
 
-Music_ViridianCity_Ch4: ; f42df
+Music_ViridianCity_Ch4:
 	togglenoise $3
 	notetype $c
 	callchannel Music_ViridianCity_branch_f431d
 	callchannel Music_ViridianCity_branch_f432c
-Music_ViridianCity_branch_f42e9: ; f42e9
+Music_ViridianCity_branch_f42e9:
 	callchannel Music_ViridianCity_branch_f431d
 	callchannel Music_ViridianCity_branch_f431d
 	callchannel Music_ViridianCity_branch_f431d
@@ -721,9 +710,8 @@ Music_ViridianCity_branch_f42e9: ; f42e9
 	callchannel Music_ViridianCity_branch_f433b
 	callchannel Music_ViridianCity_branch_f433b
 	loopchannel 0, Music_ViridianCity_branch_f42e9
-; f431d
 
-Music_ViridianCity_branch_f431d: ; f431d
+Music_ViridianCity_branch_f431d:
 	note E_, 2
 	note E_, 2
 	note D_, 2
@@ -739,9 +727,8 @@ Music_ViridianCity_branch_f431d: ; f431d
 	note E_, 2
 	note F#, 2
 	endchannel
-; f432c
 
-Music_ViridianCity_branch_f432c: ; f432c
+Music_ViridianCity_branch_f432c:
 	note E_, 2
 	note E_, 2
 	note D_, 2
@@ -757,9 +744,8 @@ Music_ViridianCity_branch_f432c: ; f432c
 	note A#, 2
 	note A#, 2
 	endchannel
-; f433b
 
-Music_ViridianCity_branch_f433b: ; f433b
+Music_ViridianCity_branch_f433b:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -776,9 +762,8 @@ Music_ViridianCity_branch_f433b: ; f433b
 	note D_, 2
 	note D#, 2
 	endchannel
-; f434b
 
-Music_ViridianCity_branch_f434b: ; f434b
+Music_ViridianCity_branch_f434b:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -795,4 +780,3 @@ Music_ViridianCity_branch_f434b: ; f434b
 	note D_, 2
 	note F#, 2
 	endchannel
-; f435b
diff --git a/audio/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm
index fc95e111e..f1438dc69 100644
--- a/audio/music/wildpokemonvictory.asm
+++ b/audio/music/wildpokemonvictory.asm
@@ -1,10 +1,9 @@
-Music_WildPokemonVictory: ; f4518
+Music_WildPokemonVictory:
 	musicheader 3, 1, Music_WildPokemonVictory_Ch1
 	musicheader 1, 2, Music_WildPokemonVictory_Ch2
 	musicheader 1, 3, Music_WildPokemonVictory_Ch3
-; f4521
 
-Music_WildPokemonVictory_Ch1: ; f4521
+Music_WildPokemonVictory_Ch1:
 	tempo 126
 	volume $77
 	dutycycle $3
@@ -17,9 +16,9 @@ Music_WildPokemonVictory_Ch1: ; f4521
 	note F#, 1
 	intensity $b6
 	note E_, 12
-Music_SuccessfulCapture_branch_f4536: ; f4536
+Music_SuccessfulCapture_branch_f4536:
 	stereopanning $f
-Music_WildPokemonVictory_branch_f4538: ; f4538
+Music_WildPokemonVictory_branch_f4538:
 	callchannel Music_WildPokemonVictory_branch_f455c
 	note F#, 2
 	note F#, 2
@@ -41,9 +40,8 @@ Music_WildPokemonVictory_branch_f4538: ; f4538
 	octave 3
 	note F#, 4
 	loopchannel 0, Music_WildPokemonVictory_branch_f4538
-; f455c
 
-Music_WildPokemonVictory_branch_f455c: ; f455c
+Music_WildPokemonVictory_branch_f455c:
 	intensity $71
 	octave 3
 	note G#, 1
@@ -68,9 +66,8 @@ Music_WildPokemonVictory_branch_f455c: ; f455c
 	note E_, 2
 	note A_, 2
 	endchannel
-; f4575
 
-Music_WildPokemonVictory_Ch2: ; f4575
+Music_WildPokemonVictory_Ch2:
 	vibrato $12, $24
 	dutycycle $2
 	notetype $c, $d1
@@ -81,9 +78,9 @@ Music_WildPokemonVictory_Ch2: ; f4575
 	note A_, 1
 	intensity $d6
 	note B_, 12
-Music_SuccessfulCapture_branch_f4585: ; f4585
+Music_SuccessfulCapture_branch_f4585:
 	stereopanning $f0
-Music_WildPokemonVictory_branch_f4587: ; f4587
+Music_WildPokemonVictory_branch_f4587:
 	callchannel Music_WildPokemonVictory_branch_f45b5
 	octave 4
 	note B_, 2
@@ -115,9 +112,8 @@ Music_WildPokemonVictory_branch_f4587: ; f4587
 	note F#, 1
 	note A_, 1
 	loopchannel 0, Music_WildPokemonVictory_branch_f4587
-; f45b5
 
-Music_WildPokemonVictory_branch_f45b5: ; f45b5
+Music_WildPokemonVictory_branch_f45b5:
 	intensity $81
 	octave 4
 	note B_, 2
@@ -132,9 +128,8 @@ Music_WildPokemonVictory_branch_f45b5: ; f45b5
 	note C#, 2
 	note C#, 4
 	endchannel
-; f45c4
 
-Music_WildPokemonVictory_Ch3: ; f45c4
+Music_WildPokemonVictory_Ch3:
 	notetype $c, $20
 	note __, 6
 	octave 6
@@ -144,8 +139,8 @@ Music_WildPokemonVictory_Ch3: ; f45c4
 	note __, 3
 	note E_, 1
 	note __, 3
-Music_SuccessfulCapture_branch_f45cf: ; f45cf
-Music_WildPokemonVictory_branch_f45cf: ; f45cf
+Music_SuccessfulCapture_branch_f45cf:
+Music_WildPokemonVictory_branch_f45cf:
 	callchannel Music_WildPokemonVictory_branch_f45f4
 	note D#, 2
 	note C#, 2
@@ -170,9 +165,8 @@ Music_WildPokemonVictory_branch_f45cf: ; f45cf
 	octave 2
 	note B_, 4
 	loopchannel 0, Music_WildPokemonVictory_branch_f45cf
-; f45f4
 
-Music_WildPokemonVictory_branch_f45f4: ; f45f4
+Music_WildPokemonVictory_branch_f45f4:
 	intensity $25
 	octave 3
 	note E_, 2
@@ -186,4 +180,3 @@ Music_WildPokemonVictory_branch_f45f4: ; f45f4
 	note __, 4
 	note C#, 2
 	endchannel
-; f4602
diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm
index eb6869896..192962735 100644
--- a/audio/music_pointers.asm
+++ b/audio/music_pointers.asm
@@ -1,112 +1,108 @@
 ; See song sections in audio.asm.
 
-Music: ; e906e
+Music:
 ; entries correspond to MUSIC_* constants
-
-	dba Music_Nothing ; 0xe91a3
-	dba Music_TitleScreen ; 0xeb808
-	dba Music_Route1 ; 0xec000
-	dba Music_Route3 ; 0xec2ca
-	dba Music_Route12 ; 0xec506
-	dba Music_MagnetTrain ; 0xef5f0
-	dba Music_KantoGymBattle ; 0xec720
-	dba Music_KantoTrainerBattle ; 0xec9fa
-	dba Music_KantoWildBattle ; 0xed06d
-	dba Music_PokemonCenter ; 0xed5c6
-	dba Music_LookHiker ; 0xf7411
-	dba Music_LookLass ; 0xed79b
-	dba Music_LookOfficer ; 0xed82d
-	dba Music_HealPokemon ; 0xf0697
-	dba Music_LavenderTown ; 0xef72f
-	dba Music_Route2 ; 0xed8dd
-	dba Music_MtMoon ; 0xedb29
-	dba Music_ShowMeAround ; 0xedbd8
-	dba Music_GameCorner ; 0xedd6d
-	dba Music_Bicycle ; 0xee119
-	dba Music_HallOfFame ; 0xf05bf
-	dba Music_ViridianCity ; 0xf4000
-	dba Music_CeladonCity ; 0xf435b
-	dba Music_TrainerVictory ; 0xebeab
-	dba Music_WildPokemonVictory ; 0xf4518
-	dba Music_GymLeaderVictory ; 0xf462c
-	dba Music_MtMoonSquare ; 0xf4815
-	dba Music_Gym ; 0xf48ae
-	dba Music_PalletTown ; 0xf4b0c
-	dba Music_ProfOaksPokemonTalk ; 0xf4c9f
-	dba Music_ProfOak ; 0xf4dea
-	dba Music_LookRival ; 0xf4f79
-	dba Music_AfterTheRivalFight ; 0xf5127
-	dba Music_Surf ; 0xf518a
-	dba Music_Evolution ; 0xf06e1
-	dba Music_NationalPark ; 0xf54e8
-	dba Music_Credits ; 0x1f31c
-	dba Music_AzaleaTown ; 0xf57e8
-	dba Music_CherrygroveCity ; 0xf5b03
-	dba Music_LookKimonoGirl ; 0xf79b8
-	dba Music_UnionCave ; 0xf5c60
-	dba Music_JohtoWildBattle ; 0xf5dc5
-	dba Music_JohtoTrainerBattle ; 0xf6096
-	dba Music_Route30 ; 0xefc01
-	dba Music_EcruteakCity ; 0xef2d0
-	dba Music_VioletCity ; 0xf0000
-	dba Music_JohtoGymBattle ; 0xea50d
-	dba Music_ChampionBattle ; 0xea9c1
-	dba Music_RivalBattle ; 0xe974f
-	dba Music_RocketBattle ; 0xe9b6f
-	dba Music_ElmsLab ; 0xea040
-	dba Music_DarkCave ; 0xea2be
-	dba Music_Route29 ; 0xf0386
-	dba Music_Route36 ; 0xe94e9
-	dba Music_SSAqua ; 0xead99
-	dba Music_LookYoungster ; 0xf66c3
-	dba Music_LookBeauty ; 0xeee3e
-	dba Music_LookRocket ; 0xf74a2
-	dba Music_LookPokemaniac ; 0xebde1
-	dba Music_LookSage ; 0xee35e
-	dba Music_NewBarkTown ; 0xeb2d3
-	dba Music_GoldenrodCity ; 0xeb453
-	dba Music_VermilionCity ; 0xeb676
-	dba Music_PokemonChannel ; 0xee45f
-	dba Music_PokeFluteChannel ; 0xf7b13
-	dba Music_TinTower ; 0xf6811
-	dba Music_SproutTower ; 0xf6974
-	dba Music_BurnedTower ; 0xf6a99
-	dba Music_Lighthouse ; 0xee569
-	dba Music_LakeOfRage ; 0xee6c5
-	dba Music_IndigoPlateau ; 0xee852
-	dba Music_Route37 ; 0xee94b
-	dba Music_RocketHideout ; 0xeeb75
-	dba Music_DragonsDen ; 0xeece8
-	dba Music_JohtoWildBattleNight ; 0xf605c
-	dba Music_RuinsOfAlphRadio ; 0xeedcb
-	dba Music_SuccessfulCapture ; 0xf4602
-	dba Music_Route26 ; 0xeefb2
-	dba Music_Mom ; 0xf6bf2
-	dba Music_VictoryRoad ; 0xf6c72
-	dba Music_PokemonLullaby ; 0xf6d79
-	dba Music_PokemonMarch ; 0xf6e23
-	dba Music_GoldSilverOpening ; 0xf7055
-	dba Music_GoldSilverOpening2 ; 0xf7308
-	dba Music_MainMenu ; 0xf78fd
-	dba Music_RuinsOfAlphInterior ; 0xebd9e
-	dba Music_RocketTheme ; 0xf766d
-	dba Music_DancingHall ; 0xef9bc
-	dba Music_ContestResults ; 0xefb3e
-	dba Music_BugCatchingContest ; 0xf7c16
-	dba Music_LakeOfRageRocketRadio ; 0xef5b1
-	dba Music_Printer ; 0xf07fd
-	dba Music_PostCredits ; 0xcfd9e
-
-; Crystal adds the following songs:
-
-	dba Music_Clair ; 0x1fa8d
-	dba Music_MobileAdapterMenu ; 0x17801f
-	dba Music_MobileAdapter ; 0x1fc87
-	dba Music_BuenasPassword ; 0x178153
-	dba Music_LookMysticalMan ; 0x17843b
-	dba Music_CrystalOpening ; 0x1786e8
-	dba Music_BattleTowerTheme ; 0x178889
-	dba Music_SuicuneBattle ; 0x178b81
-	dba Music_BattleTowerLobby ; 0x17948b
-	dba Music_MobileCenter ; 0x17961d
-; e91a3
+	dba Music_Nothing
+	dba Music_TitleScreen
+	dba Music_Route1
+	dba Music_Route3
+	dba Music_Route12
+	dba Music_MagnetTrain
+	dba Music_KantoGymBattle
+	dba Music_KantoTrainerBattle
+	dba Music_KantoWildBattle
+	dba Music_PokemonCenter
+	dba Music_LookHiker
+	dba Music_LookLass
+	dba Music_LookOfficer
+	dba Music_HealPokemon
+	dba Music_LavenderTown
+	dba Music_Route2
+	dba Music_MtMoon
+	dba Music_ShowMeAround
+	dba Music_GameCorner
+	dba Music_Bicycle
+	dba Music_HallOfFame
+	dba Music_ViridianCity
+	dba Music_CeladonCity
+	dba Music_TrainerVictory
+	dba Music_WildPokemonVictory
+	dba Music_GymLeaderVictory
+	dba Music_MtMoonSquare
+	dba Music_Gym
+	dba Music_PalletTown
+	dba Music_ProfOaksPokemonTalk
+	dba Music_ProfOak
+	dba Music_LookRival
+	dba Music_AfterTheRivalFight
+	dba Music_Surf
+	dba Music_Evolution
+	dba Music_NationalPark
+	dba Music_Credits
+	dba Music_AzaleaTown
+	dba Music_CherrygroveCity
+	dba Music_LookKimonoGirl
+	dba Music_UnionCave
+	dba Music_JohtoWildBattle
+	dba Music_JohtoTrainerBattle
+	dba Music_Route30
+	dba Music_EcruteakCity
+	dba Music_VioletCity
+	dba Music_JohtoGymBattle
+	dba Music_ChampionBattle
+	dba Music_RivalBattle
+	dba Music_RocketBattle
+	dba Music_ElmsLab
+	dba Music_DarkCave
+	dba Music_Route29
+	dba Music_Route36
+	dba Music_SSAqua
+	dba Music_LookYoungster
+	dba Music_LookBeauty
+	dba Music_LookRocket
+	dba Music_LookPokemaniac
+	dba Music_LookSage
+	dba Music_NewBarkTown
+	dba Music_GoldenrodCity
+	dba Music_VermilionCity
+	dba Music_PokemonChannel
+	dba Music_PokeFluteChannel
+	dba Music_TinTower
+	dba Music_SproutTower
+	dba Music_BurnedTower
+	dba Music_Lighthouse
+	dba Music_LakeOfRage
+	dba Music_IndigoPlateau
+	dba Music_Route37
+	dba Music_RocketHideout
+	dba Music_DragonsDen
+	dba Music_JohtoWildBattleNight
+	dba Music_RuinsOfAlphRadio
+	dba Music_SuccessfulCapture
+	dba Music_Route26
+	dba Music_Mom
+	dba Music_VictoryRoad
+	dba Music_PokemonLullaby
+	dba Music_PokemonMarch
+	dba Music_GoldSilverOpening
+	dba Music_GoldSilverOpening2
+	dba Music_MainMenu
+	dba Music_RuinsOfAlphInterior
+	dba Music_RocketTheme
+	dba Music_DancingHall
+	dba Music_ContestResults
+	dba Music_BugCatchingContest
+	dba Music_LakeOfRageRocketRadio
+	dba Music_Printer
+	dba Music_PostCredits
+; new to Crystal
+	dba Music_Clair
+	dba Music_MobileAdapterMenu
+	dba Music_MobileAdapter
+	dba Music_BuenasPassword
+	dba Music_LookMysticalMan
+	dba Music_CrystalOpening
+	dba Music_BattleTowerTheme
+	dba Music_SuicuneBattle
+	dba Music_BattleTowerLobby
+	dba Music_MobileCenter
diff --git a/audio/notes.asm b/audio/notes.asm
index 543672a4a..eeb84959b 100644
--- a/audio/notes.asm
+++ b/audio/notes.asm
@@ -1,4 +1,4 @@
-FrequencyTable: ; e8d80
+FrequencyTable:
 	dw 0     ; __
 	dw $f82c ; C_
 	dw $f89d ; C#
@@ -24,4 +24,3 @@ FrequencyTable: ; e8d80
 	dw $fdac ; A_
 	dw $fdcd ; A#
 	dw $fded ; B_
-; e8db2
diff --git a/audio/sfx.asm b/audio/sfx.asm
index 864e56558..9da38234f 100644
--- a/audio/sfx.asm
+++ b/audio/sfx.asm
@@ -1,143 +1,110 @@
-Sfx_PokeballsPlacedOnTable: ; f0941
+Sfx_PokeballsPlacedOnTable:
 	musicheader 1, 5, Sfx_PokeballsPlacedOnTable_Ch5
-; f0944
 
-Sfx_BallWobble: ; f0944
+Sfx_BallWobble:
 	musicheader 1, 5, Sfx_BallWobble_Ch5
-; f0947
 
-Sfx_Potion: ; f0947
+Sfx_Potion:
 	musicheader 1, 5, Sfx_Potion_Ch5
-; f094a
 
-Sfx_FullHeal: ; f094a
+Sfx_FullHeal:
 	musicheader 1, 5, Sfx_FullHeal_Ch5
-; f094d
 
-Sfx_Menu: ; f094d
+Sfx_Menu:
 	musicheader 1, 8, Sfx_Menu_Ch8
-; f0950
 
-Sfx_ReadText2: ; f0950
-Sfx_ReadText: ; f0950
+Sfx_ReadText2:
+Sfx_ReadText:
 	musicheader 1, 5, Sfx_ReadText2_Ch5
-; f0953
 
-Sfx_Poison: ; f0953
+Sfx_Poison:
 	musicheader 1, 5, Sfx_Poison_Ch5
-; f0956
 
-Sfx_GotSafariBalls: ; f0956
+Sfx_GotSafariBalls:
 	musicheader 1, 5, Sfx_GotSafariBalls_Ch5
-; f0959
 
-Sfx_BootPc: ; f0959
+Sfx_BootPc:
 	musicheader 1, 5, Sfx_BootPc_Ch5
-; f095c
 
-Sfx_ShutDownPc: ; f095c
+Sfx_ShutDownPc:
 	musicheader 1, 5, Sfx_ShutDownPc_Ch5
-; f095f
 
-Sfx_ChoosePcOption: ; f095f
+Sfx_ChoosePcOption:
 	musicheader 1, 5, Sfx_ChoosePcOption_Ch5
-; f0962
 
-Sfx_EscapeRope: ; f0962
+Sfx_EscapeRope:
 	musicheader 1, 5, Sfx_EscapeRope_Ch5
-; f0965
 
-Sfx_PushButton: ; f0965
+Sfx_PushButton:
 	musicheader 1, 5, Sfx_PushButton_Ch5
-; f0968
 
-Sfx_SecondPartOfItemfinder: ; f0968
+Sfx_SecondPartOfItemfinder:
 	musicheader 1, 5, Sfx_SecondPartOfItemfinder_Ch5
-; f096b
 
-Sfx_WarpTo: ; f096b
+Sfx_WarpTo:
 	musicheader 1, 5, Sfx_WarpTo_Ch5
-; f096e
 
-Sfx_WarpFrom: ; f096e
+Sfx_WarpFrom:
 	musicheader 1, 5, Sfx_WarpFrom_Ch5
-; f0971
 
-Sfx_ChangeDexMode: ; f0971
+Sfx_ChangeDexMode:
 	musicheader 1, 5, Sfx_ChangeDexMode_Ch5
-; f0974
 
-Sfx_JumpOverLedge: ; f0974
+Sfx_JumpOverLedge:
 	musicheader 1, 5, Sfx_JumpOverLedge_Ch5
-; f0977
 
-Sfx_GrassRustle: ; f0977
+Sfx_GrassRustle:
 	musicheader 1, 8, Sfx_GrassRustle_Ch8
-; f097a
 
-Sfx_Fly: ; f097a
+Sfx_Fly:
 	musicheader 1, 8, Sfx_Fly_Ch8
-; f097d
 
-Sfx_Wrong: ; f097d
+Sfx_Wrong:
 	musicheader 2, 5, Sfx_Wrong_Ch5
 	musicheader 1, 6, Sfx_Wrong_Ch6
-; f0983
 
-Sfx_Squeak: ; f0983
+Sfx_Squeak:
 	musicheader 1, 5, Sfx_Squeak_Ch5
-; f0986
 
-Sfx_Strength: ; f0986
+Sfx_Strength:
 	musicheader 1, 8, Sfx_Strength_Ch8
-; f0989
 
-Sfx_Boat: ; f0989
+Sfx_Boat:
 	musicheader 2, 5, Sfx_Boat_Ch5
 	musicheader 1, 6, Sfx_Boat_Ch6
-; f098f
 
-Sfx_WallOpen: ; f098f
+Sfx_WallOpen:
 	musicheader 1, 5, Sfx_WallOpen_Ch5
-; f0992
 
-Sfx_PlacePuzzlePieceDown: ; f0992
+Sfx_PlacePuzzlePieceDown:
 	musicheader 1, 8, Sfx_PlacePuzzlePieceDown_Ch8
-; f0995
 
-Sfx_EnterDoor: ; f0995
+Sfx_EnterDoor:
 	musicheader 1, 8, Sfx_EnterDoor_Ch8
-; f0998
 
-Sfx_SwitchPokemon: ; f0998
+Sfx_SwitchPokemon:
 	musicheader 2, 5, Sfx_SwitchPokemon_Ch5
 	musicheader 1, 6, Sfx_SwitchPokemon_Ch6
-; f099e
 
-Sfx_Tally: ; f099e
+Sfx_Tally:
 	musicheader 2, 5, Sfx_Tally_Ch5
 	musicheader 1, 6, Sfx_Tally_Ch6
-; f09a4
 
-Sfx_Transaction: ; f09a4
+Sfx_Transaction:
 	musicheader 2, 5, Sfx_Transaction_Ch5
 	musicheader 1, 6, Sfx_Transaction_Ch6
-; f09aa
 
-Sfx_Bump: ; f09aa
+Sfx_Bump:
 	musicheader 1, 5, Sfx_Bump_Ch5
-; f09ad
 
-Sfx_ExitBuilding: ; f09ad
+Sfx_ExitBuilding:
 	musicheader 1, 8, Sfx_ExitBuilding_Ch8
-; f09b0
 
-Sfx_Save: ; f09b0
+Sfx_Save:
 	musicheader 2, 5, Sfx_Save_Ch5
 	musicheader 1, 6, Sfx_Save_Ch6
-; f09b6
 
-Sfx_Save_Ch5: ; f09b6
+Sfx_Save_Ch5:
 	dutycycle $2
 	sound __,  3, $f1, $0700
 	sound __,  2, $e1, $0600
@@ -147,9 +114,8 @@ Sfx_Save_Ch5: ; f09b6
 	sound __,  3, $e1, $07c0
 	sound __, 16, $f2, $07e0
 	endchannel
-; f09d5
 
-Sfx_Save_Ch6: ; f09d5
+Sfx_Save_Ch6:
 	dutycycle $2
 	sound __,  3, $8, 0
 	sound __,  3, $a1, $0701
@@ -160,341 +126,269 @@ Sfx_Save_Ch6: ; f09d5
 	sound __,  3, $91, $07c1
 	sound __, 16, $d2, $07e1
 	endchannel
-; f09f8
 
-Sfx_Pokeflute: ; f09f8
+Sfx_Pokeflute:
 	musicheader 1, 7, Sfx_Pokeflute_Ch7
-; f09fb
 
-Sfx_ElevatorEnd: ; f09fb
+Sfx_ElevatorEnd:
 	musicheader 1, 5, Sfx_ElevatorEnd_Ch5
-; f09fe
 
-Sfx_ThrowBall: ; f09fe
+Sfx_ThrowBall:
 	musicheader 2, 5, Sfx_ThrowBall_Ch5
 	musicheader 1, 6, Sfx_ThrowBall_Ch6
-; f0a04
 
-Sfx_BallPoof: ; f0a04
+Sfx_BallPoof:
 	musicheader 2, 5, Sfx_BallPoof_Ch5
 	musicheader 1, 8, Sfx_BallPoof_Ch8
-; f0a0a
 
-Sfx_Unknown3A: ; f0a0a
+Sfx_Unknown3A:
 	musicheader 2, 5, Sfx_Unknown3A_Ch5
 	musicheader 1, 8, Sfx_Unknown3A_Ch8
-; f0a10
 
-Sfx_Run: ; f0a10
+Sfx_Run:
 	musicheader 1, 8, Sfx_Run_Ch8
-; f0a13
 
-Sfx_SlotMachineStart: ; f0a13
+Sfx_SlotMachineStart:
 	musicheader 2, 5, Sfx_SlotMachineStart_Ch5
 	musicheader 1, 6, Sfx_SlotMachineStart_Ch6
-; f0a19
 
-Sfx_Call: ; f0a19
+Sfx_Call:
 	musicheader 1, 5, Sfx_Call_Ch5
-; f0a1c
 
-Sfx_Unknown60: ; f0a1c
+Sfx_Unknown60:
 	musicheader 1, 8, Sfx_Unknown60_Ch8
-; f0a1f
 
-Sfx_Unknown61: ; f0a1f
+Sfx_Unknown61:
 	musicheader 1, 8, Sfx_Unknown61_Ch8
-; f0a22
 
-Sfx_SwitchPockets: ; f0a22
+Sfx_SwitchPockets:
 	musicheader 1, 8, Sfx_SwitchPockets_Ch8
-; f0a25
 
-Sfx_Unknown63: ; f0a25
+Sfx_Unknown63:
 	musicheader 1, 8, Sfx_Unknown63_Ch8
-; f0a28
 
-Sfx_Burn: ; f0a28
+Sfx_Burn:
 	musicheader 1, 8, Sfx_Burn_Ch8
-; f0a2b
 
-Sfx_TitleScreenEntrance: ; f0a2b
+Sfx_TitleScreenEntrance:
 	musicheader 1, 8, Sfx_TitleScreenEntrance_Ch8
-; f0a2e
 
-Sfx_Unknown66: ; f0a2e
+Sfx_Unknown66:
 	musicheader 1, 5, Sfx_Unknown66_Ch5
-; f0a31
 
-Sfx_GetCoinFromSlots: ; f0a31
+Sfx_GetCoinFromSlots:
 	musicheader 1, 5, Sfx_GetCoinFromSlots_Ch5
-; f0a34
 
-Sfx_PayDay: ; f0a34
+Sfx_PayDay:
 	musicheader 2, 5, Sfx_PayDay_Ch5
 	musicheader 1, 6, Sfx_PayDay_Ch6
-; f0a3a
 
-Sfx_Metronome: ; f0a3a
+Sfx_Metronome:
 	musicheader 1, 5, Sfx_Metronome_Ch5
-; f0a3d
 
-Sfx_Peck: ; f0a3d
+Sfx_Peck:
 	musicheader 1, 8, Sfx_Peck_Ch8
-; f0a40
 
-Sfx_Kinesis: ; f0a40
+Sfx_Kinesis:
 	musicheader 1, 5, Sfx_Kinesis_Ch5
-; f0a43
 
-Sfx_Lick: ; f0a43
+Sfx_Lick:
 	musicheader 1, 5, Sfx_Lick_Ch5
-; f0a46
 
-Sfx_Pound: ; f0a46
+Sfx_Pound:
 	musicheader 1, 8, Sfx_Pound_Ch8
-; f0a49
 
-Sfx_MovePuzzlePiece: ; f0a49
+Sfx_MovePuzzlePiece:
 	musicheader 1, 8, Sfx_MovePuzzlePiece_Ch8
-; f0a4c
 
-Sfx_CometPunch: ; f0a4c
+Sfx_CometPunch:
 	musicheader 1, 8, Sfx_CometPunch_Ch8
-; f0a4f
 
-Sfx_MegaPunch: ; f0a4f
+Sfx_MegaPunch:
 	musicheader 1, 8, Sfx_MegaPunch_Ch8
-; f0a52
 
-Sfx_Scratch: ; f0a52
+Sfx_Scratch:
 	musicheader 1, 8, Sfx_Scratch_Ch8
-; f0a55
 
-Sfx_Vicegrip: ; f0a55
+Sfx_Vicegrip:
 	musicheader 1, 8, Sfx_Vicegrip_Ch8
-; f0a58
 
-Sfx_RazorWind: ; f0a58
+Sfx_RazorWind:
 	musicheader 1, 8, Sfx_RazorWind_Ch8
-; f0a5b
 
-Sfx_Cut: ; f0a5b
+Sfx_Cut:
 	musicheader 1, 8, Sfx_Cut_Ch8
-; f0a5e
 
-Sfx_WingAttack: ; f0a5e
+Sfx_WingAttack:
 	musicheader 1, 8, Sfx_WingAttack_Ch8
-; f0a61
 
-Sfx_Whirlwind: ; f0a61
+Sfx_Whirlwind:
 	musicheader 1, 8, Sfx_Whirlwind_Ch8
-; f0a64
 
-Sfx_Bind: ; f0a64
+Sfx_Bind:
 	musicheader 1, 8, Sfx_Bind_Ch8
-; f0a67
 
-Sfx_VineWhip: ; f0a67
+Sfx_VineWhip:
 	musicheader 1, 8, Sfx_VineWhip_Ch8
-; f0a6a
 
-Sfx_DoubleKick: ; f0a6a
+Sfx_DoubleKick:
 	musicheader 1, 8, Sfx_DoubleKick_Ch8
-; f0a6d
 
-Sfx_MegaKick: ; f0a6d
+Sfx_MegaKick:
 	musicheader 1, 8, Sfx_MegaKick_Ch8
-; f0a70
 
-Sfx_Headbutt: ; f0a70
+Sfx_Headbutt:
 	musicheader 1, 8, Sfx_Headbutt_Ch8
-; f0a73
 
-Sfx_HornAttack: ; f0a73
+Sfx_HornAttack:
 	musicheader 1, 8, Sfx_HornAttack_Ch8
-; f0a76
 
-Sfx_Tackle: ; f0a76
+Sfx_Tackle:
 	musicheader 1, 8, Sfx_Tackle_Ch8
-; f0a79
 
-Sfx_PoisonSting: ; f0a79
+Sfx_PoisonSting:
 	musicheader 1, 8, Sfx_PoisonSting_Ch8
-; f0a7c
 
-Sfx_Powder: ; f0a7c
+Sfx_Powder:
 	musicheader 1, 8, Sfx_Powder_Ch8
-; f0a7f
 
-Sfx_Doubleslap: ; f0a7f
+Sfx_Doubleslap:
 	musicheader 1, 8, Sfx_Doubleslap_Ch8
-; f0a82
 
-Sfx_Bite: ; f0a82
+Sfx_Bite:
 	musicheader 2, 5, Sfx_Bite_Ch5
 	musicheader 1, 8, Sfx_Bite_Ch8
-; f0a88
 
-Sfx_JumpKick: ; f0a88
+Sfx_JumpKick:
 	musicheader 1, 8, Sfx_JumpKick_Ch8
-; f0a8b
 
-Sfx_Stomp: ; f0a8b
+Sfx_Stomp:
 	musicheader 1, 8, Sfx_Stomp_Ch8
-; f0a8e
 
-Sfx_TailWhip: ; f0a8e
+Sfx_TailWhip:
 	musicheader 1, 8, Sfx_TailWhip_Ch8
-; f0a91
 
-Sfx_KarateChop: ; f0a91
+Sfx_KarateChop:
 	musicheader 1, 8, Sfx_KarateChop_Ch8
-; f0a94
 
-Sfx_Submission: ; f0a94
+Sfx_Submission:
 	musicheader 1, 8, Sfx_Submission_Ch8
-; f0a97
 
-Sfx_WaterGun: ; f0a97
+Sfx_WaterGun:
 	musicheader 2, 5, Sfx_WaterGun_Ch5
 	musicheader 1, 8, Sfx_WaterGun_Ch8
-; f0a9d
 
-Sfx_SwordsDance: ; f0a9d
+Sfx_SwordsDance:
 	musicheader 1, 8, Sfx_SwordsDance_Ch8
-; f0aa0
 
-Sfx_Thunder: ; f0aa0
+Sfx_Thunder:
 	musicheader 1, 8, Sfx_Thunder_Ch8
-; f0aa3
 
-Sfx_Supersonic: ; f0aa3
+Sfx_Supersonic:
 	musicheader 3, 5, Sfx_Supersonic_Ch5
 	musicheader 1, 6, Sfx_Supersonic_Ch6
 	musicheader 1, 8, Sfx_Supersonic_Ch8
-; f0aac
 
-Sfx_Leer: ; f0aac
+Sfx_Leer:
 	musicheader 3, 5, Sfx_Leer_Ch5
 	musicheader 1, 6, Sfx_Leer_Ch6
 	musicheader 1, 8, Sfx_Leer_Ch8
-; f0ab5
 
-Sfx_Ember: ; f0ab5
+Sfx_Ember:
 	musicheader 2, 5, Sfx_Ember_Ch5
 	musicheader 1, 8, Sfx_Ember_Ch8
-; f0abb
 
-Sfx_Bubblebeam: ; f0abb
+Sfx_Bubblebeam:
 	musicheader 3, 5, Sfx_Bubblebeam_Ch5
 	musicheader 1, 6, Sfx_Bubblebeam_Ch6
 	musicheader 1, 8, Sfx_Bubblebeam_Ch8
-; f0ac4
 
-Sfx_HydroPump: ; f0ac4
+Sfx_HydroPump:
 	musicheader 2, 5, Sfx_HydroPump_Ch5
 	musicheader 1, 8, Sfx_HydroPump_Ch8
-; f0aca
 
-Sfx_Surf: ; f0aca
+Sfx_Surf:
 	musicheader 3, 5, Sfx_Surf_Ch5
 	musicheader 1, 6, Sfx_Surf_Ch6
 	musicheader 1, 8, Sfx_Surf_Ch8
-; f0ad3
 
-Sfx_Psybeam: ; f0ad3
+Sfx_Psybeam:
 	musicheader 3, 5, Sfx_Psybeam_Ch5
 	musicheader 1, 6, Sfx_Psybeam_Ch6
 	musicheader 1, 8, Sfx_Psybeam_Ch8
-; f0adc
 
-Sfx_Charge: ; f0adc
+Sfx_Charge:
 	musicheader 3, 5, Sfx_Charge_Ch5
 	musicheader 1, 6, Sfx_Charge_Ch6
 	musicheader 1, 8, Sfx_Charge_Ch8
-; f0ae5
 
-Sfx_Thundershock: ; f0ae5
+Sfx_Thundershock:
 	musicheader 3, 5, Sfx_Thundershock_Ch5
 	musicheader 1, 6, Sfx_Thundershock_Ch6
 	musicheader 1, 8, Sfx_Thundershock_Ch8
-; f0aee
 
-Sfx_Psychic: ; f0aee
+Sfx_Psychic:
 	musicheader 3, 5, Sfx_Psychic_Ch5
 	musicheader 1, 6, Sfx_Psychic_Ch6
 	musicheader 1, 8, Sfx_Psychic_Ch8
-; f0af7
 
-Sfx_Screech: ; f0af7
+Sfx_Screech:
 	musicheader 2, 5, Sfx_Screech_Ch5
 	musicheader 1, 6, Sfx_Screech_Ch6
-; f0afd
 
-Sfx_BoneClub: ; f0afd
+Sfx_BoneClub:
 	musicheader 2, 5, Sfx_BoneClub_Ch5
 	musicheader 1, 6, Sfx_BoneClub_Ch6
-; f0b03
 
-Sfx_Sharpen: ; f0b03
+Sfx_Sharpen:
 	musicheader 2, 5, Sfx_Sharpen_Ch5
 	musicheader 1, 6, Sfx_Sharpen_Ch6
-; f0b09
 
-Sfx_EggBomb: ; f0b09
+Sfx_EggBomb:
 	musicheader 3, 5, Sfx_EggBomb_Ch5
 	musicheader 1, 6, Sfx_EggBomb_Ch6
 	musicheader 1, 8, Sfx_EggBomb_Ch8
-; f0b12
 
-Sfx_Sing: ; f0b12
+Sfx_Sing:
 	musicheader 2, 5, Sfx_Sing_Ch5
 	musicheader 1, 6, Sfx_Sing_Ch6
-; f0b18
 
-Sfx_HyperBeam: ; f0b18
+Sfx_HyperBeam:
 	musicheader 3, 5, Sfx_HyperBeam_Ch5
 	musicheader 1, 6, Sfx_HyperBeam_Ch6
 	musicheader 1, 8, Sfx_HyperBeam_Ch8
-; f0b21
 
-Sfx_Shine: ; f0b21
+Sfx_Shine:
 	musicheader 1, 5, Sfx_Shine_Ch5
-; f0b24
 
-Sfx_Unknown5F: ; f0b24
+Sfx_Unknown5F:
 	musicheader 3, 5, Sfx_Unknown5F_Ch5
 	musicheader 1, 6, Sfx_Unknown5F_Ch6
-Sfx_Sandstorm: ; f0b2a
+
+Sfx_Sandstorm:
 	musicheader 1, 8, Sfx_Sandstorm_Ch8
-; f0b2d
 
-Sfx_HangUp: ; f0b2d
+Sfx_HangUp:
 	musicheader 1, 5, Sfx_HangUp_Ch5
-; f0b30
 
-Sfx_NoSignal: ; f0b30
+Sfx_NoSignal:
 	musicheader 1, 5, Sfx_NoSignal_Ch5
-; f0b33
 
-Sfx_Elevator: ; f0b33
+Sfx_Elevator:
 	musicheader 4, 5, Sfx_Elevator_Ch5
 	musicheader 1, 6, Sfx_Elevator_Ch6
 	musicheader 1, 7, Sfx_Elevator_Ch7
 	musicheader 1, 8, Sfx_Elevator_Ch8
-; f0b3f
 
-Sfx_DexFanfare5079: ; f0b3f
-Sfx_LevelUp: ; f0b3f
+Sfx_DexFanfare5079:
+Sfx_LevelUp:
 	musicheader 4, 5, Sfx_DexFanfare5079_Ch5
 	musicheader 1, 6, Sfx_DexFanfare5079_Ch6
 	musicheader 1, 7, Sfx_DexFanfare5079_Ch7
 	musicheader 1, 8, Sfx_DexFanfare5079_Ch8
-; f0b4b
 
-Sfx_DexFanfare5079_Ch5: ; f0b4b
-Sfx_LevelUp_Ch5: ; f0b4b
+Sfx_DexFanfare5079_Ch5:
+Sfx_LevelUp_Ch5:
 	togglesfx
 	tempo 120
 	volume $77
@@ -508,10 +402,9 @@ Sfx_LevelUp_Ch5: ; f0b4b
 	octave 4
 	note G#, 12
 	endchannel
-; f0b5f
 
-Sfx_DexFanfare5079_Ch6: ; f0b5f
-Sfx_LevelUp_Ch6: ; f0b5f
+Sfx_DexFanfare5079_Ch6:
+Sfx_LevelUp_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $8, $c1
@@ -522,10 +415,9 @@ Sfx_LevelUp_Ch6: ; f0b5f
 	intensity $c3
 	note B_, 12
 	endchannel
-; f0b6d
 
-Sfx_DexFanfare5079_Ch7: ; f0b6d
-Sfx_LevelUp_Ch7: ; f0b6d
+Sfx_DexFanfare5079_Ch7:
+Sfx_LevelUp_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 4
@@ -541,25 +433,22 @@ Sfx_LevelUp_Ch7: ; f0b6d
 	note E_, 3
 	note __, 4
 	endchannel
-; f0b7f
 
-Sfx_DexFanfare5079_Ch8: ; f0b7f
-Sfx_LevelUp_Ch8: ; f0b7f
+Sfx_DexFanfare5079_Ch8:
+Sfx_LevelUp_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
 	note C_, 12
 	endchannel
-; f0b86
 
-Sfx_KeyItem: ; f0b86
+Sfx_KeyItem:
 	musicheader 4, 5, Sfx_KeyItem_Ch5
 	musicheader 1, 6, Sfx_KeyItem_Ch6
 	musicheader 1, 7, Sfx_KeyItem_Ch7
 	musicheader 1, 8, Sfx_KeyItem_Ch8
-; f0b92
 
-Sfx_KeyItem_Ch5: ; f0b92
+Sfx_KeyItem_Ch5:
 	togglesfx
 	tempo 120
 	volume $77
@@ -575,9 +464,8 @@ Sfx_KeyItem_Ch5: ; f0b92
 	intensity $b3
 	note G#, 16
 	endchannel
-; f0ba8
 
-Sfx_KeyItem_Ch6: ; f0ba8
+Sfx_KeyItem_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $6, $c1
@@ -590,9 +478,8 @@ Sfx_KeyItem_Ch6: ; f0ba8
 	intensity $c3
 	note B_, 16
 	endchannel
-; f0bb8
 
-Sfx_KeyItem_Ch7: ; f0bb8
+Sfx_KeyItem_Ch7:
 	togglesfx
 	notetype $6, $25
 	octave 4
@@ -612,24 +499,21 @@ Sfx_KeyItem_Ch7: ; f0bb8
 	note E_, 4
 	note __, 4
 	endchannel
-; f0bce
 
-Sfx_KeyItem_Ch8: ; f0bce
+Sfx_KeyItem_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
 	note C_, 16
 	endchannel
-; f0bd5
 
-Sfx_DexFanfare2049: ; f0bd5
+Sfx_DexFanfare2049:
 	musicheader 4, 5, Sfx_DexFanfare2049_Ch5
 	musicheader 1, 6, Sfx_DexFanfare2049_Ch6
 	musicheader 1, 7, Sfx_DexFanfare2049_Ch7
 	musicheader 1, 8, Sfx_DexFanfare2049_Ch8
-; f0be1
 
-Sfx_DexFanfare2049_Ch5: ; f0be1
+Sfx_DexFanfare2049_Ch5:
 	togglesfx
 	tempo 104
 	volume $77
@@ -653,9 +537,8 @@ Sfx_DexFanfare2049_Ch5: ; f0be1
 	note A_, 2
 	note __, 6
 	endchannel
-; f0bfe
 
-Sfx_DexFanfare2049_Ch6: ; f0bfe
+Sfx_DexFanfare2049_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $c, $c1
@@ -674,9 +557,8 @@ Sfx_DexFanfare2049_Ch6: ; f0bfe
 	note G_, 4
 	note F_, 8
 	endchannel
-; f0c13
 
-Sfx_DexFanfare2049_Ch7: ; f0c13
+Sfx_DexFanfare2049_Ch7:
 	togglesfx
 	notetype $c, $25
 	octave 4
@@ -695,25 +577,22 @@ Sfx_DexFanfare2049_Ch7: ; f0c13
 	note F_, 2
 	note __, 6
 	endchannel
-; f0c27
 
-Sfx_DexFanfare2049_Ch8: ; f0c27
+Sfx_DexFanfare2049_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
 	note C_, 16
 	note __, 16
 	endchannel
-; f0c2f
 
-Sfx_Item: ; f0c2f
+Sfx_Item:
 	musicheader 4, 5, Sfx_Item_Ch5
 	musicheader 1, 6, Sfx_Item_Ch6
 	musicheader 1, 7, Sfx_Item_Ch7
 	musicheader 1, 8, Sfx_Item_Ch8
-; f0c3b
 
-Sfx_Item_Ch5: ; f0c3b
+Sfx_Item_Ch5:
 	togglesfx
 	tempo 108
 	volume $77
@@ -731,9 +610,8 @@ Sfx_Item_Ch5: ; f0c3b
 	note F_, 12
 	note __, 12
 	endchannel
-; f0c54
 
-Sfx_Item_Ch6: ; f0c54
+Sfx_Item_Ch6:
 	togglesfx
 	vibrato $8, $27
 	dutycycle $2
@@ -749,9 +627,8 @@ Sfx_Item_Ch6: ; f0c54
 	note A_, 12
 	note __, 12
 	endchannel
-; f0c68
 
-Sfx_Item_Ch7: ; f0c68
+Sfx_Item_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 4
@@ -774,25 +651,22 @@ Sfx_Item_Ch7: ; f0c68
 	note F_, 4
 	note __, 14
 	endchannel
-; f0c81
 
-Sfx_Item_Ch8: ; f0c81
+Sfx_Item_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
 	note C_, 16
 	note __, 16
 	endchannel
-; f0c89
 
-Sfx_CaughtMon: ; f0c89
+Sfx_CaughtMon:
 	musicheader 4, 5, Sfx_CaughtMon_Ch5
 	musicheader 1, 6, Sfx_CaughtMon_Ch6
 	musicheader 1, 7, Sfx_CaughtMon_Ch7
 	musicheader 1, 8, Sfx_CaughtMon_Ch8
-; f0c95
 
-Sfx_CaughtMon_Ch5: ; f0c95
+Sfx_CaughtMon_Ch5:
 	togglesfx
 	tempo 112
 	volume $77
@@ -815,9 +689,8 @@ Sfx_CaughtMon_Ch5: ; f0c95
 	intensity $b3
 	note F_, 12
 	endchannel
-; f0cb5
 
-Sfx_CaughtMon_Ch6: ; f0cb5
+Sfx_CaughtMon_Ch6:
 	togglesfx
 	dutycycle $2
 	vibrato $8, $27
@@ -836,9 +709,8 @@ Sfx_CaughtMon_Ch6: ; f0cb5
 	intensity $c3
 	note A_, 12
 	endchannel
-; f0cce
 
-Sfx_CaughtMon_Ch7: ; f0cce
+Sfx_CaughtMon_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 3
@@ -856,25 +728,22 @@ Sfx_CaughtMon_Ch7: ; f0cce
 	note A_, 3
 	note __, 3
 	endchannel
-; f0ce2
 
-Sfx_CaughtMon_Ch8: ; f0ce2
+Sfx_CaughtMon_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
 	note C_, 16
 	note __, 16
 	endchannel
-; f0cea
 
-Sfx_DexFanfare80109: ; f0cea
+Sfx_DexFanfare80109:
 	musicheader 4, 5, Sfx_DexFanfare80109_Ch5
 	musicheader 1, 6, Sfx_DexFanfare80109_Ch6
 	musicheader 1, 7, Sfx_DexFanfare80109_Ch7
 	musicheader 1, 8, Sfx_DexFanfare80109_Ch8
-; f0cf6
 
-Sfx_DexFanfare80109_Ch5: ; f0cf6
+Sfx_DexFanfare80109_Ch5:
 	togglesfx
 	tempo 112
 	volume $77
@@ -899,9 +768,8 @@ Sfx_DexFanfare80109_Ch5: ; f0cf6
 	intensity $a5
 	note A#, 16
 	endchannel
-; f0d17
 
-Sfx_DexFanfare80109_Ch6: ; f0d17
+Sfx_DexFanfare80109_Ch6:
 	togglesfx
 	vibrato $8, $27
 	dutycycle $2
@@ -923,9 +791,8 @@ Sfx_DexFanfare80109_Ch6: ; f0d17
 	octave 5
 	note D#, 16
 	endchannel
-; f0d32
 
-Sfx_DexFanfare80109_Ch7: ; f0d32
+Sfx_DexFanfare80109_Ch7:
 	togglesfx
 	notetype $c, $25
 	octave 4
@@ -951,31 +818,27 @@ Sfx_DexFanfare80109_Ch7: ; f0d32
 	note D#, 3
 	note __, 9
 	endchannel
-; f0d4e
 
-Sfx_DexFanfare80109_Ch8: ; f0d4e
+Sfx_DexFanfare80109_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
 	note C_, 16
 	note __, 16
 	endchannel
-; f0d56
 
-Sfx_Fanfare2: ; f0d56
+Sfx_Fanfare2:
 	musicheader 3, 5, Sfx_Fanfare2_Ch5
 	musicheader 1, 6, Sfx_Fanfare2_Ch6
 	musicheader 1, 8, Sfx_Fanfare2_Ch8
-; f0d5f
 
-UnusedSfx: ; f0d5f
+UnusedSfx:
 	musicheader 4, 5, UnusedSfx_Ch5
 	musicheader 1, 6, UnusedSfx_Ch6
 	musicheader 1, 7, UnusedSfx_Ch7
 	musicheader 1, 8, UnusedSfx_Ch8
-; f0d6b
 
-UnusedSfx_Ch5: ; f0d6b
+UnusedSfx_Ch5:
 	togglesfx
 	tempo 124
 	volume $77
@@ -998,9 +861,8 @@ UnusedSfx_Ch5: ; f0d6b
 	intensity $a5
 	note F_, 16
 	endchannel
-; f0d8a
 
-UnusedSfx_Ch6: ; f0d8a
+UnusedSfx_Ch6:
 	togglesfx
 	vibrato $8, $27
 	dutycycle $2
@@ -1023,9 +885,8 @@ UnusedSfx_Ch6: ; f0d8a
 	intensity $b5
 	note A_, 16
 	endchannel
-; f0da6
 
-UnusedSfx_Ch7: ; f0da6
+UnusedSfx_Ch7:
 	togglesfx
 	notetype $c, $25
 	octave 4
@@ -1039,31 +900,27 @@ UnusedSfx_Ch7: ; f0da6
 	note A_, 3
 	note __, 9
 	endchannel
-; f0db6
 
-UnusedSfx_Ch8: ; f0db6
+UnusedSfx_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
 	note C_, 16
 	note __, 16
 	endchannel
-; f0dbe
 
-Sfx_Fanfare: ; f0dbe
+Sfx_Fanfare:
 	musicheader 3, 5, Sfx_Fanfare_Ch5
 	musicheader 1, 6, Sfx_Fanfare_Ch6
 	musicheader 1, 8, Sfx_Fanfare_Ch8
-; f0dc7
 
-Sfx_RegisterPhoneNumber: ; f0dc7
+Sfx_RegisterPhoneNumber:
 	musicheader 4, 5, Sfx_RegisterPhoneNumber_Ch5
 	musicheader 1, 6, Sfx_RegisterPhoneNumber_Ch6
 	musicheader 1, 7, Sfx_RegisterPhoneNumber_Ch7
 	musicheader 1, 8, Sfx_RegisterPhoneNumber_Ch8
-; f0dd3
 
-Sfx_RegisterPhoneNumber_Ch5: ; f0dd3
+Sfx_RegisterPhoneNumber_Ch5:
 	togglesfx
 	tempo 124
 	volume $77
@@ -1086,11 +943,10 @@ Sfx_RegisterPhoneNumber_Ch5: ; f0dd3
 	note C_, 2
 	note __, 8
 	endchannel
-; f0def
 
 	togglesfx
 
-Sfx_RegisterPhoneNumber_Ch6: ; f0df0
+Sfx_RegisterPhoneNumber_Ch6:
 	togglesfx
 	dutycycle $3
 	notetype $c, $c2
@@ -1111,11 +967,10 @@ Sfx_RegisterPhoneNumber_Ch6: ; f0df0
 	note G#, 2
 	note __, 8
 	endchannel
-; f0e07
 
 	togglesfx
 
-Sfx_RegisterPhoneNumber_Ch7: ; f0e08
+Sfx_RegisterPhoneNumber_Ch7:
 	togglesfx
 	notetype $c, $25
 	note __, 2
@@ -1133,11 +988,10 @@ Sfx_RegisterPhoneNumber_Ch7: ; f0e08
 	note G#, 2
 	note __, 8
 	endchannel
-; f0e1b
 
 	togglesfx
 
-Sfx_RegisterPhoneNumber_Ch8: ; f0e1c
+Sfx_RegisterPhoneNumber_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
@@ -1145,17 +999,15 @@ Sfx_RegisterPhoneNumber_Ch8: ; f0e1c
 	note __, 16
 	note __, 16
 	endchannel
-; f0e25
 
 	togglesfx
 
-Sfx_3RdPlace: ; f0e26
+Sfx_3RdPlace:
 	musicheader 3, 5, Sfx_3RdPlace_Ch5
 	musicheader 1, 6, Sfx_3RdPlace_Ch6
 	musicheader 1, 7, Sfx_3RdPlace_Ch7
-; f0e2f
 
-Sfx_3RdPlace_Ch5: ; f0e2f
+Sfx_3RdPlace_Ch5:
 	togglesfx
 	tempo 120
 	volume $77
@@ -1171,11 +1023,10 @@ Sfx_3RdPlace_Ch5: ; f0e2f
 	note C_, 1
 	note D_, 6
 	endchannel
-; f0e44
 
 	togglesfx
 
-Sfx_3RdPlace_Ch6: ; f0e45
+Sfx_3RdPlace_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $c, $b4
@@ -1189,11 +1040,10 @@ Sfx_3RdPlace_Ch6: ; f0e45
 	note F_, 1
 	note G_, 6
 	endchannel
-; f0e55
 
 	togglesfx
 
-Sfx_3RdPlace_Ch7: ; f0e56
+Sfx_3RdPlace_Ch7:
 	togglesfx
 	notetype $c, $25
 	octave 3
@@ -1207,20 +1057,18 @@ Sfx_3RdPlace_Ch7: ; f0e56
 	note A_, 1
 	note B_, 6
 	endchannel
-; f0e65
 
 	togglesfx
 
-Sfx_GetEggFromDayCareLady: ; f0e66
-Sfx_GetEggFromDayCareMan: ; f0e66
+Sfx_GetEggFromDayCareLady:
+Sfx_GetEggFromDayCareMan:
 	musicheader 4, 5, Sfx_GetEggFromDayCareLady_Ch5
 	musicheader 1, 6, Sfx_GetEggFromDayCareLady_Ch6
 	musicheader 1, 7, Sfx_GetEggFromDayCareLady_Ch7
 	musicheader 1, 8, Sfx_GetEggFromDayCareLady_Ch8
-; f0e72
 
-Sfx_GetEggFromDayCareLady_Ch5: ; f0e72
-Sfx_GetEggFromDayCareMan_Ch5: ; f0e72
+Sfx_GetEggFromDayCareLady_Ch5:
+Sfx_GetEggFromDayCareMan_Ch5:
 	togglesfx
 	tempo 120
 	volume $77
@@ -1249,12 +1097,11 @@ Sfx_GetEggFromDayCareMan_Ch5: ; f0e72
 	note F_, 9
 	note __, 9
 	endchannel
-; f0e9a
 
 	togglesfx
 
-Sfx_GetEggFromDayCareLady_Ch6: ; f0e9b
-Sfx_GetEggFromDayCareMan_Ch6: ; f0e9b
+Sfx_GetEggFromDayCareLady_Ch6:
+Sfx_GetEggFromDayCareMan_Ch6:
 	togglesfx
 	vibrato $12, $34
 	dutycycle $3
@@ -1280,12 +1127,11 @@ Sfx_GetEggFromDayCareMan_Ch6: ; f0e9b
 	note A_, 9
 	note __, 9
 	endchannel
-; f0ebd
 
 	togglesfx
 
-Sfx_GetEggFromDayCareLady_Ch7: ; f0ebe
-Sfx_GetEggFromDayCareMan_Ch7: ; f0ebe
+Sfx_GetEggFromDayCareLady_Ch7:
+Sfx_GetEggFromDayCareMan_Ch7:
 	togglesfx
 	notetype $8, $25
 	note __, 2
@@ -1301,12 +1147,11 @@ Sfx_GetEggFromDayCareMan_Ch7: ; f0ebe
 	note A_, 9
 	note __, 9
 	endchannel
-; f0ecf
 
 	togglesfx
 
-Sfx_GetEggFromDayCareLady_Ch8: ; f0ed0
-Sfx_GetEggFromDayCareMan_Ch8: ; f0ed0
+Sfx_GetEggFromDayCareLady_Ch8:
+Sfx_GetEggFromDayCareMan_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $8
@@ -1315,18 +1160,16 @@ Sfx_GetEggFromDayCareMan_Ch8: ; f0ed0
 	note __, 16
 	note __, 12
 	endchannel
-; f0edb
 
 	togglesfx
 
-Sfx_MoveDeleted: ; f0edc
+Sfx_MoveDeleted:
 	musicheader 4, 5, Sfx_MoveDeleted_Ch5
 	musicheader 1, 6, Sfx_MoveDeleted_Ch6
 	musicheader 1, 7, Sfx_MoveDeleted_Ch7
 	musicheader 1, 8, Sfx_MoveDeleted_Ch8
-; f0ee8
 
-Sfx_MoveDeleted_Ch5: ; f0ee8
+Sfx_MoveDeleted_Ch5:
 	togglesfx
 	tempo 116
 	volume $77
@@ -1353,11 +1196,10 @@ Sfx_MoveDeleted_Ch5: ; f0ee8
 	note D_, 10
 	note __, 6
 	endchannel
-; f0f0c
 
 	togglesfx
 
-Sfx_MoveDeleted_Ch6: ; f0f0d
+Sfx_MoveDeleted_Ch6:
 	togglesfx
 	dutycycle $3
 	vibrato $c, $44
@@ -1390,11 +1232,10 @@ Sfx_MoveDeleted_Ch6: ; f0f0d
 	note F_, 16
 	note __, 6
 	endchannel
-; f0f36
 
 	togglesfx
 
-Sfx_MoveDeleted_Ch7: ; f0f37
+Sfx_MoveDeleted_Ch7:
 	togglesfx
 	notetype $6, $25
 	octave 2
@@ -1418,11 +1259,10 @@ Sfx_MoveDeleted_Ch7: ; f0f37
 	note B_, 16
 	note __, 6
 	endchannel
-; f0f52
 
 	togglesfx
 
-Sfx_MoveDeleted_Ch8: ; f0f53
+Sfx_MoveDeleted_Ch8:
 	togglesfx
 	sfxtogglenoise $3
 	notetype $c
@@ -1431,18 +1271,16 @@ Sfx_MoveDeleted_Ch8: ; f0f53
 	note __, 16
 	note __, 6
 	endchannel
-; f0f5d
 
 	togglesfx
 
-Sfx_2ndPlace: ; f0f5e
+Sfx_2ndPlace:
 	musicheader 4, 5, Sfx_2ndPlace_Ch5
 	musicheader 1, 6, Sfx_2ndPlace_Ch6
 	musicheader 1, 7, Sfx_2ndPlace_Ch7
 	musicheader 1, 8, Sfx_2ndPlace_Ch8
-; f0f6a
 
-Sfx_2ndPlace_Ch5: ; f0f6a
+Sfx_2ndPlace_Ch5:
 	togglesfx
 	tempo 116
 	volume $77
@@ -1473,11 +1311,10 @@ Sfx_2ndPlace_Ch5: ; f0f6a
 	note B_, 12
 	note __, 6
 	endchannel
-; f0f91
 
 	togglesfx
 
-Sfx_2ndPlace_Ch6: ; f0f92
+Sfx_2ndPlace_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $8, $b1
@@ -1498,11 +1335,10 @@ Sfx_2ndPlace_Ch6: ; f0f92
 	note D_, 12
 	note __, 6
 	endchannel
-; f0fac
 
 	togglesfx
 
-Sfx_2ndPlace_Ch7: ; f0fad
+Sfx_2ndPlace_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 3
@@ -1537,34 +1373,31 @@ Sfx_2ndPlace_Ch7: ; f0fad
 	note G_, 12
 	note __, 6
 	endchannel
-; f0fd1
 
 	togglesfx
 
-Sfx_2ndPlace_Ch8: ; f0fd2
+Sfx_2ndPlace_Ch8:
 	togglesfx
 	sfxtogglenoise $3
 	notetype $8
-Sfx_2ndPlace_branch_f0fd7: ; f0fd7
+.loop
 	note C#, 1
-	loopchannel 6, Sfx_2ndPlace_branch_f0fd7
+	loopchannel 6, .loop
 	note B_, 12
 	note B_, 12
 	note B_, 12
 	note __, 6
 	endchannel
-; f0fe1
 
 	togglesfx
 
-Sfx_1stPlace: ; f0fe2
+Sfx_1stPlace:
 	musicheader 4, 5, Sfx_1stPlace_Ch5
 	musicheader 1, 6, Sfx_1stPlace_Ch6
 	musicheader 1, 7, Sfx_1stPlace_Ch7
 	musicheader 1, 8, Sfx_1stPlace_Ch8
-; f0fee
 
-Sfx_1stPlace_Ch5: ; f0fee
+Sfx_1stPlace_Ch5:
 	togglesfx
 	tempo 124
 	volume $77
@@ -1602,11 +1435,10 @@ Sfx_1stPlace_Ch5: ; f0fee
 	note A_, 10
 	note __, 6
 	endchannel
-; f101f
 
 	togglesfx
 
-Sfx_1stPlace_Ch6: ; f1020
+Sfx_1stPlace_Ch6:
 	togglesfx
 	dutycycle $3
 	vibrato $c, $34
@@ -1627,11 +1459,10 @@ Sfx_1stPlace_Ch6: ; f1020
 	note D_, 10
 	note __, 6
 	endchannel
-; f103c
 
 	togglesfx
 
-Sfx_1stPlace_Ch7: ; f103d
+Sfx_1stPlace_Ch7:
 	togglesfx
 	notetype $c, $25
 	octave 2
@@ -1652,11 +1483,10 @@ Sfx_1stPlace_Ch7: ; f103d
 	note D_, 10
 	note __, 6
 	endchannel
-; f1053
 
 	togglesfx
 
-Sfx_1stPlace_Ch8: ; f1054
+Sfx_1stPlace_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $6
@@ -1674,18 +1504,16 @@ Sfx_1stPlace_Ch8: ; f1054
 	note B_, 10
 	note __, 6
 	endchannel
-; f1068
 
 	togglesfx
 
-Sfx_ChooseACard: ; f1069
+Sfx_ChooseACard:
 	musicheader 4, 5, Sfx_ChooseACard_Ch5
 	musicheader 1, 6, Sfx_ChooseACard_Ch6
 	musicheader 1, 7, Sfx_ChooseACard_Ch7
 	musicheader 1, 8, Sfx_ChooseACard_Ch8
-; f1075
 
-Sfx_ChooseACard_Ch5: ; f1075
+Sfx_ChooseACard_Ch5:
 	togglesfx
 	tempo 152
 	volume $77
@@ -1728,11 +1556,10 @@ Sfx_ChooseACard_Ch5: ; f1075
 	note E_, 4
 	note __, 12
 	endchannel
-; f10a8
 
 	togglesfx
 
-Sfx_ChooseACard_Ch6: ; f10a9
+Sfx_ChooseACard_Ch6:
 	togglesfx
 	dutycycle $3
 	notetype $6, $b4
@@ -1761,11 +1588,10 @@ Sfx_ChooseACard_Ch6: ; f10a9
 	note A_, 4
 	note __, 12
 	endchannel
-; f10c8
 
 	togglesfx
 
-Sfx_ChooseACard_Ch7: ; f10c9
+Sfx_ChooseACard_Ch7:
 	togglesfx
 	notetype $6, $25
 	octave 3
@@ -1798,11 +1624,10 @@ Sfx_ChooseACard_Ch7: ; f10c9
 	note A_, 4
 	note __, 12
 	endchannel
-; f10eb
 
 	togglesfx
 
-Sfx_ChooseACard_Ch8: ; f10ec
+Sfx_ChooseACard_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $6
@@ -1824,18 +1649,16 @@ Sfx_ChooseACard_Ch8: ; f10ec
 	note D_, 2
 	note B_, 16
 	endchannel
-; f1103
 
 	togglesfx
 
-Sfx_GetTm: ; f1104
+Sfx_GetTm:
 	musicheader 4, 5, Sfx_GetTm_Ch5
 	musicheader 1, 6, Sfx_GetTm_Ch6
 	musicheader 1, 7, Sfx_GetTm_Ch7
 	musicheader 1, 8, Sfx_GetTm_Ch8
-; f1110
 
-Sfx_GetTm_Ch5: ; f1110
+Sfx_GetTm_Ch5:
 	togglesfx
 	tempo 144
 	volume $77
@@ -1858,11 +1681,10 @@ Sfx_GetTm_Ch5: ; f1110
 	note F#, 8
 	note __, 6
 	endchannel
-; f1130
 
 	togglesfx
 
-Sfx_GetTm_Ch6: ; f1131
+Sfx_GetTm_Ch6:
 	togglesfx
 	dutycycle $3
 	vibrato $8, $24
@@ -1882,11 +1704,10 @@ Sfx_GetTm_Ch6: ; f1131
 	note D_, 8
 	note __, 6
 	endchannel
-; f114b
 
 	togglesfx
 
-Sfx_GetTm_Ch7: ; f114c
+Sfx_GetTm_Ch7:
 	togglesfx
 	notetype $6, $25
 	octave 2
@@ -1914,11 +1735,10 @@ Sfx_GetTm_Ch7: ; f114c
 	note A_, 16
 	note __, 6
 	endchannel
-; f1169
 
 	togglesfx
 
-Sfx_GetTm_Ch8: ; f116a
+Sfx_GetTm_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $6
@@ -1935,18 +1755,16 @@ Sfx_GetTm_Ch8: ; f116a
 	note B_, 16
 	note __, 6
 	endchannel
-; f117c
 
 	togglesfx
 
-Sfx_GetBadge: ; f117d
+Sfx_GetBadge:
 	musicheader 4, 5, Sfx_GetBadge_Ch5
 	musicheader 1, 6, Sfx_GetBadge_Ch6
 	musicheader 1, 7, Sfx_GetBadge_Ch7
 	musicheader 1, 8, Sfx_GetBadge_Ch8
-; f1189
 
-Sfx_GetBadge_Ch5: ; f1189
+Sfx_GetBadge_Ch5:
 	togglesfx
 	tempo 120
 	volume $77
@@ -1964,11 +1782,10 @@ Sfx_GetBadge_Ch5: ; f1189
 	note A_, 16
 	note __, 6
 	endchannel
-; f11a9
 
 	togglesfx
 
-Sfx_GetBadge_branch_f11aa: ; f11aa
+Sfx_GetBadge_branch_f11aa:
 	note __, 5
 	octave 3
 	note F_, 2
@@ -1989,9 +1806,8 @@ Sfx_GetBadge_branch_f11aa: ; f11aa
 	note C#, 2
 	note F_, 2
 	endchannel
-; f11be
 
-Sfx_GetBadge_Ch6: ; f11be
+Sfx_GetBadge_Ch6:
 	togglesfx
 	dutycycle $3
 	vibrato $8, $24
@@ -2037,11 +1853,10 @@ Sfx_GetBadge_Ch6: ; f11be
 	note F_, 16
 	note __, 6
 	endchannel
-; f11f4
 
 	togglesfx
 
-Sfx_GetBadge_Ch7: ; f11f5
+Sfx_GetBadge_Ch7:
 	togglesfx
 	notetype $6, $25
 	octave 2
@@ -2077,15 +1892,14 @@ Sfx_GetBadge_Ch7: ; f11f5
 	note F_, 16
 	note __, 6
 	endchannel
-; f121a
 
 	togglesfx
 
-Sfx_GetBadge_Ch8: ; f121b
+Sfx_GetBadge_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $6
-Sfx_GetBadge_branch_f1220: ; f1220
+.loop
 	note B_, 12
 	note D_, 1
 	note D_, 1
@@ -2100,22 +1914,20 @@ Sfx_GetBadge_branch_f1220: ; f1220
 	note C#, 1
 	note C#, 1
 	note C#, 1
-	loopchannel 2, Sfx_GetBadge_branch_f1220
+	loopchannel 2, .loop
 	note B_, 16
 	note __, 6
 	endchannel
-; f1235
 
 	togglesfx
 
-Sfx_QuitSlots: ; f1236
+Sfx_QuitSlots:
 	musicheader 4, 5, Sfx_QuitSlots_Ch5
 	musicheader 1, 6, Sfx_QuitSlots_Ch6
 	musicheader 1, 7, Sfx_QuitSlots_Ch7
 	musicheader 1, 8, Sfx_QuitSlots_Ch8
-; f1242
 
-Sfx_QuitSlots_Ch5: ; f1242
+Sfx_QuitSlots_Ch5:
 	togglesfx
 	tempo 144
 	volume $77
@@ -2144,11 +1956,10 @@ Sfx_QuitSlots_Ch5: ; f1242
 	note G#, 14
 	note __, 6
 	endchannel
-; f1265
 
 	togglesfx
 
-Sfx_QuitSlots_Ch6: ; f1266
+Sfx_QuitSlots_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $8, $b3
@@ -2172,11 +1983,10 @@ Sfx_QuitSlots_Ch6: ; f1266
 	note F_, 14
 	note __, 6
 	endchannel
-; f1282
 
 	togglesfx
 
-Sfx_QuitSlots_Ch7: ; f1283
+Sfx_QuitSlots_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 3
@@ -2204,11 +2014,10 @@ Sfx_QuitSlots_Ch7: ; f1283
 	note C#, 14
 	note __, 6
 	endchannel
-; f12a0
 
 	togglesfx
 
-Sfx_QuitSlots_Ch8: ; f12a1
+Sfx_QuitSlots_Ch8:
 	togglesfx
 	sfxtogglenoise $3
 	notetype $8
@@ -2225,20 +2034,18 @@ Sfx_QuitSlots_Ch8: ; f12a1
 	note B_, 14
 	note __, 6
 	endchannel
-; f12b3
 
 	togglesfx
 
-Sfx_Protect: ; f12b4
+Sfx_Protect:
 	musicheader 2, 5, Sfx_Protect_Ch5
 	musicheader 1, 8, Sfx_Protect_Ch8
-; f12ba
 
-Sfx_Protect_Ch5: ; f12ba
+Sfx_Protect_Ch5:
 	togglesfx
 	notetype $1, $f1
 	dutycycle $0
-Sfx_Protect_branch_f12c0: ; f12c0
+.loop
 	octave 5
 	note F_, 5
 	note A_, 5
@@ -2251,7 +2058,7 @@ Sfx_Protect_branch_f12c0: ; f12c0
 	octave 6
 	note C#, 5
 	note E_, 5
-	loopchannel 3, Sfx_Protect_branch_f12c0
+	loopchannel 3, .loop
 	intensity $c1
 	octave 5
 	note F_, 5
@@ -2269,144 +2076,120 @@ Sfx_Protect_branch_f12c0: ; f12c0
 	note C#, 5
 	note E_, 5
 	endchannel
-; f12e5
 
-Sfx_Protect_Ch8: ; f12e5
-Sfx_Protect_branch_f12e5: ; f12e5
+Sfx_Protect_Ch8:
 	noise __, 10, $9e, $0
 	noise __, 10, $be, $11
-	loopchannel 6, Sfx_Protect_branch_f12e5
+	loopchannel 6, Sfx_Protect_Ch8
 	noise __, 10, $a7, $0
 	noise C_,  1, $75, $11
 	endchannel
-; f12f6
 
-Sfx_Sketch: ; f12f6
+Sfx_Sketch:
 	musicheader 1, 5, Sfx_Sketch_Ch5
-; f12f9
 
-Sfx_Sketch_Ch5: ; f12f9
+Sfx_Sketch_Ch5:
 	dutycycle $1
 	soundinput $a5
-Sfx_Sketch_branch_f12fd: ; f12fd
+.loop
 	sound __,  3, $f1, $06e0
 	sound __, 14, $af, $05b0
 	sound __,  5, $0, 0
 	sound __, 10, $f4, $0718
-	loopchannel 3, Sfx_Sketch_branch_f12fd
+	loopchannel 3, .loop
 	soundinput $8
 	endchannel
-; f1314
 
-Sfx_RainDance: ; f1314
+Sfx_RainDance:
 	musicheader 1, 8, Sfx_RainDance_Ch8
-; f1317
 
-Sfx_RainDance_Ch8: ; f1317
-Sfx_RainDance_branch_f1317: ; f1317
+Sfx_RainDance_Ch8:
 	noise __, 12, $7d, $50
 	noise __,  7, $7d, $4f
 	noise __, 12, $7f, $47
 	noise __, 16, $6e, $22
-	loopchannel 3, Sfx_RainDance_branch_f1317
+	loopchannel 3, Sfx_RainDance_Ch8
 	noise __,  7, $6d, $50
 	noise __,  6, $5d, $4f
 	noise __,  6, $4f, $47
 	noise __, 11, $32, $46
 	endchannel
-; f1334
 
-Sfx_Aeroblast: ; f1334
+Sfx_Aeroblast:
 	musicheader 2, 5, Sfx_Aeroblast_Ch5
 	musicheader 1, 8, Sfx_Aeroblast_Ch8
-; f133a
 
-Sfx_Aeroblast_Ch5: ; f133a
+Sfx_Aeroblast_Ch5:
 	sound_duty 2, 0, 3, 3
 	soundinput $f5
 	sound C_, 13, $f8, $0580
 	soundinput $8
 	endchannel
-; f1345
 
-Sfx_Aeroblast_Ch8: ; f1345
+Sfx_Aeroblast_Ch8:
 	noise __,  5, $f8, $6c
 	noise __,  5, $c8, $5c
 	noise __,  5, $78, $5b
 	noise C_,  1, $31, $5a
 	endchannel
-; f1352
 
-Sfx_Spark: ; f1352
+Sfx_Spark:
 	musicheader 1, 8, Sfx_Spark_Ch8
-; f1355
 
-Sfx_Spark_Ch8: ; f1355
-Sfx_Spark_branch_f1355: ; f1355
+Sfx_Spark_Ch8:
 	noise __,  5, $f8, $5d
 	noise __,  5, $d8, $6f
-	loopchannel 2, Sfx_Spark_branch_f1355
+	loopchannel 2, Sfx_Spark_Ch8
 	endchannel
-; f1360
 
-Sfx_Curse: ; f1360
+Sfx_Curse:
 	musicheader 2, 5, Sfx_Curse_Ch5
 	musicheader 1, 8, Sfx_Curse_Ch8
-; f1366
 
-Sfx_Curse_Ch5: ; f1366
+Sfx_Curse_Ch5:
 	dutycycle $3
 	sound __,  5, $f2, $0483
 	sound __,  5, $f2, $0511
 	sound __,  5, $f2, $0589
 	sound __,  5, $f2, $05ed
 	endchannel
-; f1379
 
-Sfx_Curse_Ch8: ; f1379
+Sfx_Curse_Ch8:
 	noise C_,  5, $9a, $9
 	endchannel
-; f137d
 
-Sfx_Rage: ; f137d
+Sfx_Rage:
 	musicheader 2, 5, Sfx_Rage_Ch5
 	musicheader 1, 8, Sfx_Rage_Ch8
-; f1383
 
-Sfx_Rage_Ch5: ; f1383
+Sfx_Rage_Ch5:
 	dutycycle $0
 	sound __,  4, $d1, $07b0
 	sound __,  4, $d1, $07c2
 	sound C_,  9, $d2, $07d5
 	endchannel
-; f1392
 
-Sfx_Rage_Ch8: ; f1392
+Sfx_Rage_Ch8:
 	noise __,  4, $f4, $1a
 	noise __,  4, $f4, $19
 	noise C_,  9, $f2, $18
 	endchannel
-; f139c
 
-Sfx_Thief: ; f139c
+Sfx_Thief:
 	musicheader 1, 8, Sfx_Thief_Ch8
-; f139f
 
-Sfx_Thief_Ch8: ; f139f
-Sfx_Thief_branch_f139f: ; f139f
+Sfx_Thief_Ch8:
 	noise __,  1, $0, $0
 	noise __,  5, $e1, $12
 	noise __,  1, $0, $0
 	noise __,  3, $b1, $22
-	loopchannel 2, Sfx_Thief_branch_f139f
+	loopchannel 2, Sfx_Thief_Ch8
 	endchannel
-; f13b0
 
-Sfx_Thief2: ; f13b0
+Sfx_Thief2:
 	musicheader 1, 5, Sfx_Thief2_Ch5
-; f13b3
 
-Sfx_Thief2_Ch5: ; f13b3
+Sfx_Thief2_Ch5:
 	togglesfx
 	notetype $2, $f4
 	dutycycle $0
@@ -2424,14 +2207,12 @@ Sfx_Thief2_Ch5: ; f13b3
 	note A_, 3
 	togglesfx
 	endchannel
-; f13ca
 
-Sfx_SpiderWeb: ; f13ca
+Sfx_SpiderWeb:
 	musicheader 2, 5, Sfx_SpiderWeb_Ch5
 	musicheader 1, 8, Sfx_SpiderWeb_Ch8
-; f13d0
 
-Sfx_SpiderWeb_Ch5: ; f13d0
+Sfx_SpiderWeb_Ch5:
 	dutycycle $0
 	sound C#,  1, $7f, $0720
 	soundinput $95
@@ -2443,19 +2224,16 @@ Sfx_SpiderWeb_Ch5: ; f13d0
 	sound __,  5, $51, $0640
 	soundinput $8
 	endchannel
-; f13f3
 
-Sfx_SpiderWeb_Ch8: ; f13f3
+Sfx_SpiderWeb_Ch8:
 	noise C#,  1, $ef, $0
 	endchannel
-; f13f7
 
-Sfx_MindReader: ; f13f7
+Sfx_MindReader:
 	musicheader 2, 5, Sfx_MindReader_Ch5
 	musicheader 1, 8, Sfx_MindReader_Ch8
-; f13fd
 
-Sfx_MindReader_Ch5: ; f13fd
+Sfx_MindReader_Ch5:
 	togglesfx
 	dutycycle $2
 	notetype $2, $f1
@@ -2473,22 +2251,19 @@ Sfx_MindReader_Ch5: ; f13fd
 	note D_, 3
 	togglesfx
 	endchannel
-; f1416
 
-Sfx_MindReader_Ch8: ; f1416
+Sfx_MindReader_Ch8:
 	noise C_,  2, $af, $19
 	noise C_,  3, $af, $18
 	endchannel
-; f141d
 
-Sfx_Nightmare: ; f141d
+Sfx_Nightmare:
 	musicheader 1, 5, Sfx_Nightmare_Ch5
-; f1420
 
-Sfx_Nightmare_Ch5: ; f1420
+Sfx_Nightmare_Ch5:
 	dutycycle $0
 	soundinput $34
-Sfx_Nightmare_branch_f1424: ; f1424
+.loop
 	sound __,  4, $ba, $0631
 	sound __,  3, $0, 0
 	sound __,  4, $f8, $0621
@@ -2499,16 +2274,14 @@ Sfx_Nightmare_branch_f1424: ; f1424
 	sound __,  3, $0, 0
 	sound __,  4, $e8, $05f1
 	sound __,  3, $0, 0
-	loopchannel 2, Sfx_Nightmare_branch_f1424
+	loopchannel 2, .loop
 	soundinput $8
 	endchannel
-; f1453
 
-Sfx_Snore: ; f1453
+Sfx_Snore:
 	musicheader 1, 8, Sfx_Snore_Ch8
-; f1456
 
-Sfx_Snore_Ch8: ; f1456
+Sfx_Snore_Ch8:
 	noise __,  3, $ea, $4b
 	noise __,  3, $ea, $5b
 	noise __,  3, $0, $0
@@ -2516,27 +2289,23 @@ Sfx_Snore_Ch8: ; f1456
 	noise __,  5, $ee, $46
 	noise __,  5, $ee, $45
 	endchannel
-; f1469
 
-Sfx_SweetKiss: ; f1469
+Sfx_SweetKiss:
 	musicheader 1, 5, Sfx_SweetKiss_Ch5
-; f146c
 
-Sfx_SweetKiss_Ch5: ; f146c
+Sfx_SweetKiss_Ch5:
 	dutycycle $2
-Sfx_SweetKiss_branch_f146e: ; f146e
+.loop
 	sound __,  3, $c1, $07c8
 	sound __,  3, $d1, $07da
-	loopchannel 2, Sfx_SweetKiss_branch_f146e
+	loopchannel 2, .loop
 	sound C_, 11, $f1, $07e2
 	endchannel
-; f147f
 
-Sfx_SweetKiss2: ; f147f
+Sfx_SweetKiss2:
 	musicheader 1, 5, Sfx_SweetKiss2_Ch5
-; f1482
 
-Sfx_SweetKiss2_Ch5: ; f1482
+Sfx_SweetKiss2_Ch5:
 	dutycycle $0
 	soundinput $97
 	sound __,  3, $f4, $0772
@@ -2548,31 +2317,26 @@ Sfx_SweetKiss2_Ch5: ; f1482
 	sound __,  3, $a1, $0772
 	soundinput $8
 	endchannel
-; f14a5
 
-Sfx_BellyDrum: ; f14a5
+Sfx_BellyDrum:
 	musicheader 2, 5, Sfx_BellyDrum_Ch5
 	musicheader 1, 8, Sfx_BellyDrum_Ch8
-; f14ab
 
-Sfx_BellyDrum_Ch5: ; f14ab
+Sfx_BellyDrum_Ch5:
 	dutycycle $2
 	soundinput $ac
 	sound __, 13, $f1, $05a3
 	soundinput $8
 	endchannel
-; f14b6
 
-Sfx_BellyDrum_Ch8: ; f14b6
+Sfx_BellyDrum_Ch8:
 	noise __, 13, $b1, $6c
 	endchannel
-; f14ba
 
-Sfx_Unknown7F: ; f14ba
+Sfx_Unknown7F:
 	musicheader 1, 5, Sfx_Unknown7F_Ch5
-; f14bd
 
-Sfx_Unknown7F_Ch5: ; f14bd
+Sfx_Unknown7F_Ch5:
 	dutycycle $2
 	soundinput $95
 	sound __,  3, $c9, $03b3
@@ -2580,14 +2344,12 @@ Sfx_Unknown7F_Ch5: ; f14bd
 	sound __,  5, $d1, $0543
 	soundinput $8
 	endchannel
-; f14d0
 
-Sfx_SludgeBomb: ; f14d0
+Sfx_SludgeBomb:
 	musicheader 2, 5, Sfx_SludgeBomb_Ch5
 	musicheader 1, 8, Sfx_SludgeBomb_Ch8
-; f14d6
 
-Sfx_SludgeBomb_Ch5: ; f14d6
+Sfx_SludgeBomb_Ch5:
 	dutycycle $2
 	soundinput $c5
 	sound __,  4, $f8, $0581
@@ -2596,20 +2358,17 @@ Sfx_SludgeBomb_Ch5: ; f14d6
 	sound C_,  1, $f2, $05d1
 	soundinput $8
 	endchannel
-; f14eb
 
-Sfx_SludgeBomb_Ch8: ; f14eb
+Sfx_SludgeBomb_Ch8:
 	noise __,  4, $e2, $6e
 	noise __,  2, $0, $0
 	noise C_,  1, $e2, $6d
 	endchannel
-; f14f5
 
-Sfx_Foresight: ; f14f5
+Sfx_Foresight:
 	musicheader 1, 5, Sfx_Foresight_Ch5
-; f14f8
 
-Sfx_Foresight_Ch5: ; f14f8
+Sfx_Foresight_Ch5:
 	sound __,  4, $f4, $07b5
 	sound __,  4, $f5, $07c8
 	sound __,  9, $f4, $07da
@@ -2618,13 +2377,11 @@ Sfx_Foresight_Ch5: ; f14f8
 	sound __,  3, $0, 0
 	sound __,  9, $91, $07da
 	endchannel
-; f1515
 
-Sfx_Spite: ; f1515
+Sfx_Spite:
 	musicheader 1, 5, Sfx_Spite_Ch5
-; f1518
 
-Sfx_Spite_Ch5: ; f1518
+Sfx_Spite_Ch5:
 	togglesfx
 	vibrato $0, $12
 	dutycycle $3
@@ -2649,27 +2406,23 @@ Sfx_Spite_Ch5: ; f1518
 	soundinput $8
 	togglesfx
 	endchannel
-; f153a
 
-Sfx_Outrage: ; f153a
+Sfx_Outrage:
 	musicheader 1, 8, Sfx_Outrage_Ch8
-; f153d
 
-Sfx_Outrage_Ch8: ; f153d
+Sfx_Outrage_Ch8:
 	noise __, 12, $ea, $6c
 	noise __, 12, $ea, $6b
 	noise __, 12, $ea, $6a
 	noise __, 12, $ea, $69
 	noise __, 12, $e1, $59
 	endchannel
-; f154d
 
-Sfx_PerishSong: ; f154d
+Sfx_PerishSong:
 	musicheader 2, 5, Sfx_PerishSong_Ch5
 	musicheader 1, 6, Sfx_PerishSong_Ch6
-; f1553
 
-Sfx_PerishSong_Ch5: ; f1553
+Sfx_PerishSong_Ch5:
 	togglesfx
 	dutycycle $0
 	vibrato $12, $53
@@ -2679,9 +2432,8 @@ Sfx_PerishSong_Ch5: ; f1553
 	note G#, 9
 	togglesfx
 	endchannel
-; f1561
 
-Sfx_PerishSong_Ch6: ; f1561
+Sfx_PerishSong_Ch6:
 	togglesfx
 	dutycycle $0
 	vibrato $12, $53
@@ -2692,14 +2444,12 @@ Sfx_PerishSong_Ch6: ; f1561
 	note B_, 9
 	togglesfx
 	endchannel
-; f1570
 
-Sfx_GigaDrain: ; f1570
+Sfx_GigaDrain:
 	musicheader 2, 5, Sfx_GigaDrain_Ch5
 	musicheader 1, 8, Sfx_GigaDrain_Ch8
-; f1576
 
-Sfx_GigaDrain_Ch5: ; f1576
+Sfx_GigaDrain_Ch5:
 	dutycycle $2
 	soundinput $97
 	sound __,  5, $f8, $0680
@@ -2713,9 +2463,8 @@ Sfx_GigaDrain_Ch5: ; f1576
 	sound C_,  5, $88, $0511
 	soundinput $8
 	endchannel
-; f15a1
 
-Sfx_GigaDrain_Ch8: ; f15a1
+Sfx_GigaDrain_Ch8:
 	noise __,  5, $c8, $44
 	noise C_,  5, $c8, $50
 	noise C_,  5, $c8, $52
@@ -2723,13 +2472,11 @@ Sfx_GigaDrain_Ch8: ; f15a1
 	noise C_,  5, $c8, $56
 	noise D#,  1, $c7, $57
 	endchannel
-; f15b4
 
-Sfx_Attract: ; f15b4
+Sfx_Attract:
 	musicheader 1, 5, Sfx_Attract_Ch5
-; f15b7
 
-Sfx_Attract_Ch5: ; f15b7
+Sfx_Attract_Ch5:
 	dutycycle $0
 	soundinput $77
 	sound __,  5, $a9, $06f0
@@ -2738,45 +2485,38 @@ Sfx_Attract_Ch5: ; f15b7
 	sound __,  9, $f1, $0740
 	soundinput $8
 	endchannel
-; f15cc
 
-Sfx_Kinesis2: ; f15cc
+Sfx_Kinesis2:
 	musicheader 1, 5, Sfx_Kinesis2_Ch5
-; f15cf
 
-Sfx_Kinesis2_Ch5: ; f15cf
+Sfx_Kinesis2_Ch5:
 	dutycycle $0
 	sound __,  3, $f3, $0796
 	sound __,  3, $23, $0796
 	sound C_,  5, $f1, $07c4
 	endchannel
-; f15de
 
-Sfx_ZapCannon: ; f15de
+Sfx_ZapCannon:
 	musicheader 1, 8, Sfx_ZapCannon_Ch8
-; f15e1
 
-Sfx_ZapCannon_Ch8: ; f15e1
-Sfx_ZapCannon_branch_f15e1: ; f15e1
+Sfx_ZapCannon_Ch8:
 	noise __,  3, $e1, $49
 	noise __,  1, $0, $0
-	loopchannel 8, Sfx_ZapCannon_branch_f15e1
+	loopchannel 8, Sfx_ZapCannon_Ch8
 	noise __,  9, $e1, $49
 	endchannel
-; f15ef
 
-Sfx_MeanLook: ; f15ef
+Sfx_MeanLook:
 	musicheader 1, 5, Sfx_MeanLook_Ch5
-; f15f2
 
-Sfx_MeanLook_Ch5: ; f15f2
+Sfx_MeanLook_Ch5:
 	soundinput $77
 	dutycycle $3
 	sound __,  3, $f8, $0720
-Sfx_MeanLook_branch_f15fa: ; f15fa
+.loop
 	sound __,  2, $88, $0660
 	sound __,  3, $f8, $0790
-	loopchannel 5, Sfx_MeanLook_branch_f15fa
+	loopchannel 5, .loop
 	sound __, 13, $f8, $0700
 	sound __, 13, $c8, $0720
 	sound __, 13, $a8, $0700
@@ -2785,43 +2525,37 @@ Sfx_MeanLook_branch_f15fa: ; f15fa
 	sound __, 13, $28, $0720
 	soundinput $8
 	endchannel
-; f1621
 
-Sfx_HealBell: ; f1621
+Sfx_HealBell:
 	musicheader 1, 5, Sfx_HealBell_Ch5
-; f1624
 
-Sfx_HealBell_Ch5: ; f1624
+Sfx_HealBell_Ch5:
 	dutycycle $1
 	sound __,  2, $f1, $07da
 	sound __,  2, $d1, $07d9
 	sound __,  2, $f1, $07da
 	sound __,  9, $d1, $07db
 	endchannel
-; f1637
 
-Sfx_Return: ; f1637
+Sfx_Return:
 	musicheader 1, 5, Sfx_Return_Ch5
-; f163a
 
-Sfx_Return_Ch5: ; f163a
+Sfx_Return_Ch5:
 	dutycycle $0
-Sfx_Return_branch_f163c: ; f163c
+.loop
 	soundinput $bf
 	sound __,  9, $f1, $0759
 	soundinput $57
 	sound __,  9, $f1, $0759
 	sound C_,  1, $0, 0
-	loopchannel 2, Sfx_Return_branch_f163c
+	loopchannel 2, .loop
 	soundinput $8
 	endchannel
-; f1653
 
-Sfx_ExpBar: ; f1653
+Sfx_ExpBar:
 	musicheader 1, 5, Sfx_ExpBar_Ch5
-; f1656
 
-Sfx_ExpBar_Ch5: ; f1656
+Sfx_ExpBar_Ch5:
 	dutycycle $2
 	soundinput $d7
 	sound __,  9, $e1, $0750
@@ -2835,117 +2569,102 @@ Sfx_ExpBar_Ch5: ; f1656
 	sound C_,  1, $a8, $0770
 	soundinput $8
 	endchannel
-; f167f
 
-Sfx_MilkDrink: ; f167f
+Sfx_MilkDrink:
 	musicheader 1, 5, Sfx_MilkDrink_Ch5
-; f1682
 
-Sfx_MilkDrink_Ch5: ; f1682
+Sfx_MilkDrink_Ch5:
 	dutycycle $2
-Sfx_MilkDrink_branch_f1684: ; f1684
+.loop
 	soundinput $a4
 	sound __,  3, $ea, $04e0
 	sound __, 14, $f7, $0290
 	soundinput $9e
 	sound __,  5, $c9, $05e1
 	sound __,  3, $0, 0
-	loopchannel 6, Sfx_MilkDrink_branch_f1684
+	loopchannel 6, .loop
 	soundinput $8
 	endchannel
-; f169f
 
-Sfx_Present: ; f169f
+Sfx_Present:
 	musicheader 1, 5, Sfx_Present_Ch5
-; f16a2
 
-Sfx_Present_Ch5: ; f16a2
+Sfx_Present_Ch5:
 	dutycycle $2
 	soundinput $d6
-Sfx_Present_branch_f16a6: ; f16a6
+.loop
 	sound __,  3, $f1, $0740
 	sound __,  2, $0, 0
-	loopchannel 3, Sfx_Present_branch_f16a6
+	loopchannel 3, .loop
 	sound C_,  1, $f1, $0780
 	soundinput $8
 	endchannel
-; f16b9
 
-Sfx_MorningSun: ; f16b9
+Sfx_MorningSun:
 	musicheader 1, 5, Sfx_MorningSun_Ch5
-; f16bc
 
-Sfx_MorningSun_Ch5: ; f16bc
+Sfx_MorningSun_Ch5:
 	dutycycle $3
-Sfx_MorningSun_branch_f16be: ; f16be
+.loop
 	sound __,  3, $f1, $07e4
 	sound __,  3, $f1, $07e0
 	sound __,  6, $f2, $07e7
-	loopchannel 3, Sfx_MorningSun_branch_f16be
+	loopchannel 3, .loop
 	sound __,  2, $0, 0
 	sound __,  9, $c2, $07e7
 	sound __,  2, $0, 0
 	sound __,  9, $82, $07e7
 	endchannel
-; f16df
 
-Sfx_Moonlight: ; f16df
+Sfx_Moonlight:
 	musicheader 1, 5, Sfx_Moonlight_Ch5
-; f16e2
 
-Sfx_Moonlight_Ch5: ; f16e2
+Sfx_Moonlight_Ch5:
 	dutycycle $2
-Sfx_Moonlight_branch_f16e4: ; f16e4
+.loop
 	sound __,  2, $f8, $07d0
 	sound __,  5, $f1, $07e0
-	loopchannel 2, Sfx_Moonlight_branch_f16e4
+	loopchannel 2, .loop
 	sound C_,  1, $f1, $07e0
 	sound C_,  1, $d1, $07e0
 	sound C_,  1, $81, $07e0
 	endchannel
-; f16fd
 
-Sfx_Encore: ; f16fd
+Sfx_Encore:
 	musicheader 2, 5, Sfx_Encore_Ch5
 	musicheader 1, 8, Sfx_Encore_Ch8
-; f1703
 
-Sfx_Encore_Ch5: ; f1703
+Sfx_Encore_Ch5:
 	dutycycle $2
 	soundinput $ce
 	sound C_,  1, $0, 0
-Sfx_Encore_branch_f170b: ; f170b
+.loop
 	sound __,  3, $f8, $0774
 	sound C#,  5, $0, 0
-	loopchannel 2, Sfx_Encore_branch_f170b
+	loopchannel 2, .loop
 	soundinput $8
 	endchannel
-; f171a
 
-Sfx_Encore_Ch8: ; f171a
+Sfx_Encore_Ch8:
 	noise D_,  1, $1f, $36
 	noise D_,  1, $76, $36
 	endchannel
-; f1721
 
-Sfx_BeatUp: ; f1721
+Sfx_BeatUp:
 	musicheader 1, 8, Sfx_BeatUp_Ch8
-; f1724
 
-Sfx_BeatUp_Ch8: ; f1724
+Sfx_BeatUp_Ch8:
 	noise __,  3, $e8, $69
 	noise __,  7, $d8, $24
 	noise __,  3, $e8, $6c
 	noise __,  5, $c8, $46
 	noise __,  7, $d1, $24
 	endchannel
-; f1734
 
-Sfx_SweetScent: ; f1734
+Sfx_SweetScent:
 	musicheader 1, 5, Sfx_SweetScent_Ch5
-; f1737
 
-Sfx_SweetScent_Ch5: ; f1737
+Sfx_SweetScent_Ch5:
 	dutycycle $2
 	soundinput $96
 	sound __,  7, $f8, $0760
@@ -2954,14 +2673,12 @@ Sfx_SweetScent_Ch5: ; f1737
 	sound C_,  7, $f1, $0730
 	soundinput $8
 	endchannel
-; f174c
 
-Sfx_BatonPass: ; f174c
+Sfx_BatonPass:
 	musicheader 2, 5, Sfx_BatonPass_Ch5
 	musicheader 1, 8, Sfx_BatonPass_Ch8
-; f1752
 
-Sfx_BatonPass_Ch5: ; f1752
+Sfx_BatonPass_Ch5:
 	dutycycle $2
 	soundinput $f7
 	sound C#,  1, $f2, $0680
@@ -2972,18 +2689,15 @@ Sfx_BatonPass_Ch5: ; f1752
 	sound __,  2, $f1, $0760
 	soundinput $8
 	endchannel
-; f1771
 
-Sfx_BatonPass_Ch8: ; f1771
+Sfx_BatonPass_Ch8:
 	noise C#,  1, $f2, $20
 	endchannel
-; f1775
 
-Sfx_EggCrack: ; f1775
+Sfx_EggCrack:
 	musicheader 1, 5, Sfx_EggCrack_Ch5
-; f1778
 
-Sfx_EggCrack_Ch5: ; f1778
+Sfx_EggCrack_Ch5:
 	togglesfx
 	notetype $1, $f1
 	dutycycle $0
@@ -2993,13 +2707,11 @@ Sfx_EggCrack_Ch5: ; f1778
 	note __, 1
 	note F#, 1
 	endchannel
-; f1784
 
-Sfx_Evolved: ; f1784
+Sfx_Evolved:
 	musicheader 1, 5, Sfx_Evolved_Ch5
-; f1787
 
-Sfx_Evolved_Ch5: ; f1787
+Sfx_Evolved_Ch5:
 	togglesfx
 	notetype $1, $c1
 	octave 4
@@ -3018,13 +2730,11 @@ Sfx_Evolved_Ch5: ; f1787
 	octave 7
 	note C_, 16
 	endchannel
-; f179b
 
-Sfx_MasterBall: ; f179b
+Sfx_MasterBall:
 	musicheader 1, 5, Sfx_MasterBall_Ch5
-; f179e
 
-Sfx_MasterBall_Ch5: ; f179e
+Sfx_MasterBall_Ch5:
 	togglesfx
 	dutycycle $1
 	notetype $2, $e1
@@ -3053,13 +2763,11 @@ Sfx_MasterBall_Ch5: ; f179e
 	note C#, 2
 	note C_, 2
 	endchannel
-; f17c0
 
-Sfx_EggHatch: ; f17c0
+Sfx_EggHatch:
 	musicheader 1, 5, Sfx_EggHatch_Ch5
-; f17c3
 
-Sfx_EggHatch_Ch5: ; f17c3
+Sfx_EggHatch_Ch5:
 	togglesfx
 	notetype $2, $f1
 	dutycycle $2
@@ -3076,33 +2784,29 @@ Sfx_EggHatch_Ch5: ; f17c3
 	intensity $42
 	note B_, 7
 	endchannel
-; f17d9
 
-Sfx_GsIntroCharizardFireball: ; f17d9
+Sfx_GsIntroCharizardFireball:
 	musicheader 1, 8, Sfx_GsIntroCharizardFireball_Ch8
-; f17dc
 
-Sfx_GsIntroCharizardFireball_Ch8: ; f17dc
+Sfx_GsIntroCharizardFireball_Ch8:
 	noise __,  9, $cf, $4d
 	noise __,  9, $f1, $37
-Sfx_GsIntroCharizardFireball_branch_f17e2: ; f17e2
+.loop
 	noise __,  2, $f8, $4f
 	noise __,  1, $c8, $26
 	noise __,  2, $d8, $5f
 	noise __,  1, $a8, $37
-	loopchannel 12, Sfx_GsIntroCharizardFireball_branch_f17e2
+	loopchannel 12, .loop
 	noise __,  4, $f8, $6f
 	noise __,  5, $d8, $5f
 	noise __, 13, $d8, $5c
 	noise C#,  9, $d3, $4f
 	endchannel
-; f17ff
 
-Sfx_GsIntroPokemonAppears: ; f17ff
+Sfx_GsIntroPokemonAppears:
 	musicheader 1, 8, Sfx_GsIntroPokemonAppears_Ch8
-; f1802
 
-Sfx_GsIntroPokemonAppears_Ch8: ; f1802
+Sfx_GsIntroPokemonAppears_Ch8:
 	noise __,  2, $88, $4f
 	noise __,  3, $8f, $2
 	noise __,  3, $5f, $12
@@ -3111,13 +2815,11 @@ Sfx_GsIntroPokemonAppears_Ch8: ; f1802
 	noise __,  2, $f8, $4f
 	noise __,  9, $f1, $0
 	endchannel
-; f1818
 
-Sfx_Flash: ; f1818
+Sfx_Flash:
 	musicheader 1, 5, Sfx_Flash_Ch5
-; f181b
 
-Sfx_Flash_Ch5: ; f181b
+Sfx_Flash_Ch5:
 	dutycycle $1
 	soundinput $ef
 	sound __,  2, $40, $07e8
@@ -3131,13 +2833,11 @@ Sfx_Flash_Ch5: ; f181b
 	sound __, 16, $12, $07e8
 	soundinput $8
 	endchannel
-; f1846
 
-Sfx_GameFreakLogoGs: ; f1846
+Sfx_GameFreakLogoGs:
 	musicheader 1, 5, Sfx_GameFreakLogoGs_Ch5
-; f1849
 
-Sfx_GameFreakLogoGs_Ch5: ; f1849
+Sfx_GameFreakLogoGs_Ch5:
 	dutycycle $3
 	soundinput $7f
 	sound __,  5, $55, $07e2
@@ -3152,16 +2852,14 @@ Sfx_GameFreakLogoGs_Ch5: ; f1849
 	sound __, 11, $15, $07e2
 	soundinput $8
 	endchannel
-; f1878
 
-Sfx_DexFanfareLessThan20: ; f1878
+Sfx_DexFanfareLessThan20:
 	musicheader 4, 5, Sfx_DexFanfareLessThan20_Ch5
 	musicheader 1, 6, Sfx_DexFanfareLessThan20_Ch6
 	musicheader 1, 7, Sfx_DexFanfareLessThan20_Ch7
 	musicheader 1, 8, Sfx_DexFanfareLessThan20_Ch8
-; f1884
 
-Sfx_DexFanfareLessThan20_Ch5: ; f1884
+Sfx_DexFanfareLessThan20_Ch5:
 	togglesfx
 	tempo 124
 	volume $77
@@ -3179,11 +2877,10 @@ Sfx_DexFanfareLessThan20_Ch5: ; f1884
 	note E_, 2
 	note D_, 6
 	endchannel
-; f189a
 
 	togglesfx
 
-Sfx_DexFanfareLessThan20_Ch6: ; f189b
+Sfx_DexFanfareLessThan20_Ch6:
 	togglesfx
 	notetype $8, $c1
 	octave 3
@@ -3199,11 +2896,10 @@ Sfx_DexFanfareLessThan20_Ch6: ; f189b
 	note G_, 2
 	note F#, 6
 	endchannel
-; f18ac
 
 	togglesfx
 
-Sfx_DexFanfareLessThan20_Ch7: ; f18ad
+Sfx_DexFanfareLessThan20_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 4
@@ -3228,11 +2924,10 @@ Sfx_DexFanfareLessThan20_Ch7: ; f18ad
 	note A_, 2
 	note __, 6
 	endchannel
-; f18c7
 
 	togglesfx
 
-Sfx_DexFanfareLessThan20_Ch8: ; f18c8
+Sfx_DexFanfareLessThan20_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
@@ -3240,18 +2935,16 @@ Sfx_DexFanfareLessThan20_Ch8: ; f18c8
 	note __, 16
 	note __, 12
 	endchannel
-; f18d1
 
 	togglesfx
 
-Sfx_DexFanfare140169: ; f18d2
+Sfx_DexFanfare140169:
 	musicheader 4, 5, Sfx_DexFanfare140169_Ch5
 	musicheader 1, 6, Sfx_DexFanfare140169_Ch6
 	musicheader 1, 7, Sfx_DexFanfare140169_Ch7
 	musicheader 1, 8, Sfx_DexFanfare140169_Ch8
-; f18de
 
-Sfx_DexFanfare140169_Ch5: ; f18de
+Sfx_DexFanfare140169_Ch5:
 	togglesfx
 	tempo 120
 	volume $77
@@ -3277,11 +2970,10 @@ Sfx_DexFanfare140169_Ch5: ; f18de
 	note B_, 8
 	note __, 8
 	endchannel
-; f1900
 
 	togglesfx
 
-Sfx_DexFanfare140169_Ch6: ; f1901
+Sfx_DexFanfare140169_Ch6:
 	togglesfx
 	dutycycle $2
 	vibrato $12, $34
@@ -3304,11 +2996,10 @@ Sfx_DexFanfare140169_Ch6: ; f1901
 	note G_, 8
 	note __, 8
 	endchannel
-; f191d
 
 	togglesfx
 
-Sfx_DexFanfare140169_Ch7: ; f191e
+Sfx_DexFanfare140169_Ch7:
 	togglesfx
 	notetype $c, $25
 	note __, 4
@@ -3339,36 +3030,33 @@ Sfx_DexFanfare140169_Ch7: ; f191e
 	note G_, 4
 	note __, 4
 	endchannel
-; f193e
 
 	togglesfx
 
-Sfx_DexFanfare140169_Ch8: ; f193f
+Sfx_DexFanfare140169_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
 	note C_, 4
-Sfx_DexFanfare140169_branch_f1945: ; f1945
+.loop
 	note D_, 4
 	note C#, 1
 	note C#, 1
 	note C#, 1
 	note C#, 1
-	loopchannel 3, Sfx_DexFanfare140169_branch_f1945
+	loopchannel 3, .loop
 	note D_, 8
 	endchannel
-; f1950
 
 	togglesfx
 
-Sfx_DexFanfare170199: ; f1951
+Sfx_DexFanfare170199:
 	musicheader 4, 5, Sfx_DexFanfare170199_Ch5
 	musicheader 1, 6, Sfx_DexFanfare170199_Ch6
 	musicheader 1, 7, Sfx_DexFanfare170199_Ch7
 	musicheader 1, 8, Sfx_DexFanfare170199_Ch8
-; f195d
 
-Sfx_DexFanfare170199_Ch5: ; f195d
+Sfx_DexFanfare170199_Ch5:
 	togglesfx
 	tempo 112
 	volume $77
@@ -3394,11 +3082,10 @@ Sfx_DexFanfare170199_Ch5: ; f195d
 	note A#, 12
 	note __, 4
 	endchannel
-; f1981
 
 	togglesfx
 
-Sfx_DexFanfare170199_Ch6: ; f1982
+Sfx_DexFanfare170199_Ch6:
 	togglesfx
 	vibrato $12, $34
 	dutycycle $3
@@ -3423,11 +3110,10 @@ Sfx_DexFanfare170199_Ch6: ; f1982
 	note D_, 12
 	note __, 4
 	endchannel
-; f19a2
 
 	togglesfx
 
-Sfx_DexFanfare170199_Ch7: ; f19a3
+Sfx_DexFanfare170199_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 3
@@ -3452,11 +3138,10 @@ Sfx_DexFanfare170199_Ch7: ; f19a3
 	note A#, 12
 	note __, 4
 	endchannel
-; f19bf
 
 	togglesfx
 
-Sfx_DexFanfare170199_Ch8: ; f19c0
+Sfx_DexFanfare170199_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $8
@@ -3475,18 +3160,16 @@ Sfx_DexFanfare170199_Ch8: ; f19c0
 	notetype $c
 	note B_, 16
 	endchannel
-; f19d5
 
 	db $fd
 
-Sfx_DexFanfare200229: ; f19d6
+Sfx_DexFanfare200229:
 	musicheader 4, 5, Sfx_DexFanfare200229_Ch5
 	musicheader 1, 6, Sfx_DexFanfare200229_Ch6
 	musicheader 1, 7, Sfx_DexFanfare200229_Ch7
 	musicheader 1, 8, Sfx_DexFanfare200229_Ch8
-; f19e2
 
-Sfx_DexFanfare200229_Ch5: ; f19e2
+Sfx_DexFanfare200229_Ch5:
 	togglesfx
 	tempo 124
 	volume $77
@@ -3510,11 +3193,10 @@ Sfx_DexFanfare200229_Ch5: ; f19e2
 	note F#, 12
 	note __, 4
 	endchannel
-; f1a03
 
 	togglesfx
 
-Sfx_DexFanfare200229_Ch6: ; f1a04
+Sfx_DexFanfare200229_Ch6:
 	togglesfx
 	vibrato $12, $34
 	dutycycle $3
@@ -3534,11 +3216,10 @@ Sfx_DexFanfare200229_Ch6: ; f1a04
 	note A_, 12
 	note __, 4
 	endchannel
-; f1a1e
 
 	togglesfx
 
-Sfx_DexFanfare200229_Ch7: ; f1a1f
+Sfx_DexFanfare200229_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 3
@@ -3579,11 +3260,10 @@ Sfx_DexFanfare200229_Ch7: ; f1a1f
 	note D_, 6
 	note __, 6
 	endchannel
-; f1a49
 
 	togglesfx
 
-Sfx_DexFanfare200229_Ch8: ; f1a4a
+Sfx_DexFanfare200229_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $8
@@ -3609,18 +3289,16 @@ Sfx_DexFanfare200229_Ch8: ; f1a4a
 	note D_, 2
 	note B_, 12
 	endchannel
-; f1a65
 
 	togglesfx
 
-Sfx_DexFanfare230Plus: ; f1a66
+Sfx_DexFanfare230Plus:
 	musicheader 4, 5, Sfx_DexFanfare230Plus_Ch5
 	musicheader 1, 6, Sfx_DexFanfare230Plus_Ch6
 	musicheader 1, 7, Sfx_DexFanfare230Plus_Ch7
 	musicheader 1, 8, Sfx_DexFanfare230Plus_Ch8
-; f1a72
 
-Sfx_DexFanfare230Plus_Ch5: ; f1a72
+Sfx_DexFanfare230Plus_Ch5:
 	togglesfx
 	tempo 112
 	volume $77
@@ -3665,11 +3343,10 @@ Sfx_DexFanfare230Plus_Ch5: ; f1a72
 	note A_, 14
 	note __, 2
 	endchannel
-; f1ab1
 
 	togglesfx
 
-Sfx_DexFanfare230Plus_Ch6: ; f1ab2
+Sfx_DexFanfare230Plus_Ch6:
 	togglesfx
 	vibrato $12, $34
 	dutycycle $3
@@ -3701,11 +3378,10 @@ Sfx_DexFanfare230Plus_Ch6: ; f1ab2
 	note F#, 14
 	note __, 2
 	endchannel
-; f1ad9
 
 	togglesfx
 
-Sfx_DexFanfare230Plus_Ch7: ; f1ada
+Sfx_DexFanfare230Plus_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 3
@@ -3751,18 +3427,17 @@ Sfx_DexFanfare230Plus_Ch7: ; f1ada
 	note D_, 14
 	note __, 2
 	endchannel
-; f1b0b
 
 	togglesfx
 
-Sfx_DexFanfare230Plus_Ch8: ; f1b0c
+Sfx_DexFanfare230Plus_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $8
 	note D_, 2
 	note D_, 2
 	note D_, 2
-Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14
+.loop1
 	note D_, 6
 	note D_, 2
 	note D_, 2
@@ -3774,7 +3449,7 @@ Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14
 	note C#, 1
 	note C#, 1
 	note C#, 1
-	loopchannel 2, Sfx_DexFanfare230Plus_branch_f1b14
+	loopchannel 2, .loop1
 	note D_, 6
 	note D_, 2
 	note D_, 2
@@ -3783,57 +3458,49 @@ Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14
 	note D_, 4
 	note D_, 4
 	note D_, 4
-Sfx_DexFanfare230Plus_branch_f1b2b: ; f1b2b
+.loop2
 	note C#, 1
-	loopchannel 18, Sfx_DexFanfare230Plus_branch_f1b2b
+	loopchannel 18, .loop2
 	note D_, 6
 	endchannel
-; f1b32
 
 	togglesfx
 
-Sfx_NotVeryEffective: ; f1b33
+Sfx_NotVeryEffective:
 	musicheader 1, 8, Sfx_NotVeryEffective_Ch8
-; f1b36
 
-Sfx_NotVeryEffective_Ch8: ; f1b36
+Sfx_NotVeryEffective_Ch8:
 	noise __,  5, $f1, $5f
 	noise __,  2, $a0, $42
 	noise C_,  1, $f1, $53
 	endchannel
-; f1b40
 
-Sfx_Damage: ; f1b40
+Sfx_Damage:
 	musicheader 1, 8, Sfx_Damage_Ch8
-; f1b43
 
-Sfx_Damage_Ch8: ; f1b43
+Sfx_Damage_Ch8:
 	noise __,  5, $f1, $5e
 	noise __,  2, $a0, $12
 	noise __,  5, $f0, $32
 	noise C_,  1, $f1, $44
 	endchannel
-; f1b50
 
-Sfx_SuperEffective: ; f1b50
+Sfx_SuperEffective:
 	musicheader 1, 8, Sfx_SuperEffective_Ch8
-; f1b53
 
-Sfx_SuperEffective_Ch8: ; f1b53
+Sfx_SuperEffective_Ch8:
 	noise __,  4, $f1, $4f
 	noise __,  2, $c8, $22
 	noise __,  3, $f8, $3f
 	noise __,  4, $d0, $15
 	noise C#,  1, $f2, $35
 	endchannel
-; f1b63
 
-Sfx_BallBounce: ; f1b63
+Sfx_BallBounce:
 	musicheader 2, 5, Sfx_BallBounce_Ch5
 	musicheader 1, 6, Sfx_BallBounce_Ch6
-; f1b69
 
-Sfx_BallBounce_Ch5: ; f1b69
+Sfx_BallBounce_Ch5:
 	dutycycle $2
 	sound __,  9, $e1, $0740
 	sound C_,  8, $0, 0
@@ -3844,9 +3511,8 @@ Sfx_BallBounce_Ch5: ; f1b69
 	sound __,  9, $51, $0740
 	sound C_,  8, $0, 0
 	endchannel
-; f1b8c
 
-Sfx_BallBounce_Ch6: ; f1b8c
+Sfx_BallBounce_Ch6:
 	dutycycle $2
 	sound __,  3, $8, 0
 	sound __,  9, $b1, $0741
@@ -3858,14 +3524,12 @@ Sfx_BallBounce_Ch6: ; f1b8c
 	sound __,  9, $21, $0741
 	sound C_,  8, $0, 0
 	endchannel
-; f1bb3
 
-Sfx_SweetScent2: ; f1bb3
+Sfx_SweetScent2:
 	musicheader 2, 5, Sfx_SweetScent2_Ch5
 	musicheader 1, 8, Sfx_SweetScent2_Ch8
-; f1bb9
 
-Sfx_SweetScent2_Ch5: ; f1bb9
+Sfx_SweetScent2_Ch5:
 	soundinput $af
 	dutycycle $1
 	sound __,  7, $f8, $05f0
@@ -3873,49 +3537,43 @@ Sfx_SweetScent2_Ch5: ; f1bb9
 	sound C_,  1, $f1, $0650
 	soundinput $8
 	endchannel
-; f1bcc
 
-Sfx_SweetScent2_Ch8: ; f1bcc
+Sfx_SweetScent2_Ch8:
 	noise __,  3, $e8, $22
 	noise C_,  2, $aa, $0
-Sfx_SweetScent2_branch_f1bd2: ; f1bd2
+.loop
 	noise __,  5, $d9, $10
 	noise __,  9, $91, $0
 	noise __,  3, $61, $7
-	loopchannel 5, Sfx_SweetScent2_branch_f1bd2
+	loopchannel 5, .loop
 	noise __,  5, $99, $0
 	noise __, 11, $61, $0
 	noise __,  7, $59, $0
 	noise __,  3, $21, $7
 	endchannel
-; f1bec
 
-Sfx_HitEndOfExpBar: ; f1bec
+Sfx_HitEndOfExpBar:
 	musicheader 2, 5, Sfx_HitEndOfExpBar_Ch5
 	musicheader 1, 6, Sfx_HitEndOfExpBar_Ch6
-; f1bf2
 
-Sfx_HitEndOfExpBar_Ch5: ; f1bf2
+Sfx_HitEndOfExpBar_Ch5:
 	dutycycle $2
 	sound __,  2, $e1, $0789
 	sound __,  2, $e1, $07a2
 	sound C_,  1, $e1, $07b1
 	endchannel
-; f1c01
 
-Sfx_HitEndOfExpBar_Ch6: ; f1c01
+Sfx_HitEndOfExpBar_Ch6:
 	dutycycle $2
 	sound __,  2, $e1, $07a2
 	sound __,  2, $e1, $07b1
 	sound C_,  1, $e1, $07c4
 	endchannel
-; f1c10
 
-Sfx_GiveTrademon: ; f1c10
+Sfx_GiveTrademon:
 	musicheader 1, 5, Sfx_GiveTrademon_Ch5
-; f1c13
 
-Sfx_GiveTrademon_Ch5: ; f1c13
+Sfx_GiveTrademon_Ch5:
 	sound C#,  1, $0, 0
 	dutycycle $1
 	soundinput $a7
@@ -3929,13 +3587,11 @@ Sfx_GiveTrademon_Ch5: ; f1c13
 	sound C_, 12, $14, $0750
 	soundinput $8
 	endchannel
-; f1c3e
 
-Sfx_GetTrademon: ; f1c3e
+Sfx_GetTrademon:
 	musicheader 1, 5, Sfx_GetTrademon_Ch5
-; f1c41
 
-Sfx_GetTrademon_Ch5: ; f1c41
+Sfx_GetTrademon_Ch5:
 	sound C#,  1, $0, 0
 	dutycycle $2
 	soundinput $bf
@@ -3949,18 +3605,16 @@ Sfx_GetTrademon_Ch5: ; f1c41
 	sound C_, 12, $f4, $07bc
 	soundinput $8
 	endchannel
-; f1c6c
 
-Sfx_TrainArrived: ; f1c6c
+Sfx_TrainArrived:
 	musicheader 3, 5, Sfx_TrainArrived_Ch5
 	musicheader 1, 6, Sfx_TrainArrived_Ch6
 	musicheader 1, 8, Sfx_TrainArrived_Ch8
-; f1c75
 
-Sfx_TrainArrived_Ch6: ; f1c75
+Sfx_TrainArrived_Ch6:
 	tone $0008
 	sound __,  9, $0, 0
-Sfx_TrainArrived_Ch5: ; f1c7c
+Sfx_TrainArrived_Ch5:
 	dutycycle $2
 	sound __,  5, $5f, $0691
 	sound __,  5, $6f, $0694
@@ -3970,9 +3624,8 @@ Sfx_TrainArrived_Ch5: ; f1c7c
 	sound C_,  1, $6f, $06ab
 	sound F_,  9, $65, $06a8
 	endchannel
-; f1c9b
 
-Sfx_TrainArrived_Ch8: ; f1c9b
+Sfx_TrainArrived_Ch8:
 	noise __,  6, $af, $10
 	noise __,  5, $9f, $20
 	noise __,  5, $8f, $21
@@ -3982,36 +3635,31 @@ Sfx_TrainArrived_Ch8: ; f1c9b
 	noise __,  5, $9f, $10
 	noise F_,  9, $a3, $0
 	endchannel
-; f1cb4
 
-Sfx_2Boops: ; f1cb4
+Sfx_2Boops:
 	musicheader 1, 5, Sfx_2Boops_Ch5
-; f1cb7
 
-Sfx_2Boops_Ch5: ; f1cb7
+Sfx_2Boops_Ch5:
 	dutycycle $2
-Sfx_2Boops_branch_f1cb9: ; f1cb9
+.loop
 	soundinput $79
 	sound __,  2, $99, $0563
 	sound __,  5, $f2, $04b5
 	soundinput $43
 	sound C_,  1, $f8, $05cd
-	loopchannel 2, Sfx_2Boops_branch_f1cb9
+	loopchannel 2, .loop
 	soundinput $8
 	endchannel
-; f1cd0
 
-Sfx_UnknownCB: ; f1cd0
-	musicheader 1, 8, Sfx_UnknownCB_Ch8
-; f1cd3
+Sfx_IntroWhoosh:
+	musicheader 1, 8, Sfx_IntroWhoosh_Ch8
 
-Sfx_Menu_Ch8: ; f1cd3
+Sfx_Menu_Ch8:
 	noise __,  2, $e2, $33
 	noise __,  9, $e1, $22
 	endchannel
-; f1cda
 
-Sfx_Pokeflute_Ch7: ; f1cda
+Sfx_Pokeflute_Ch7:
 	tempo 256
 	volume $77
 	togglesfx
@@ -4035,37 +3683,32 @@ Sfx_Pokeflute_Ch7: ; f1cda
 	note G_, 8
 	note __, 12
 	endchannel
-; f1cf8
 
-Sfx_PlacePuzzlePieceDown_Ch8: ; f1cf8
+Sfx_PlacePuzzlePieceDown_Ch8:
 	noise __,  3, $f7, $24
 	noise __,  3, $f7, $34
 	noise __,  5, $f7, $44
 	noise __,  9, $f4, $55
 	noise __,  9, $f1, $44
 	endchannel
-; f1d08
 
-Sfx_EnterDoor_Ch8: ; f1d08
+Sfx_EnterDoor_Ch8:
 	noise __, 10, $f1, $44
 	noise __,  9, $d1, $43
 	endchannel
-; f1d0f
 
-Sfx_SwitchPokemon_Ch5: ; f1d0f
+Sfx_SwitchPokemon_Ch5:
 	dutycycle $2
 	sound __,  9, $e1, $0740
 	endchannel
-; f1d16
 
-Sfx_SwitchPokemon_Ch6: ; f1d16
+Sfx_SwitchPokemon_Ch6:
 	dutycycle $2
 	sound __,  3, $8, 0
 	sound __,  9, $b1, $0741
 	endchannel
-; f1d21
 
-Sfx_PokeballsPlacedOnTable_Ch5: ; f1d21
+Sfx_PokeballsPlacedOnTable_Ch5:
 	dutycycle $2
 	soundinput $3a
 	sound __,  5, $f2, $0200
@@ -4073,9 +3716,8 @@ Sfx_PokeballsPlacedOnTable_Ch5: ; f1d21
 	sound __,  9, $e2, $0200
 	soundinput $8
 	endchannel
-; f1d32
 
-Sfx_BallWobble_Ch5: ; f1d32
+Sfx_BallWobble_Ch5:
 	dutycycle $2
 	soundinput $3a
 	sound __,  5, $f2, $0400
@@ -4083,84 +3725,73 @@ Sfx_BallWobble_Ch5: ; f1d32
 	sound __,  9, $e2, $0400
 	soundinput $8
 	endchannel
-; f1d43
 
-Sfx_Tally_Ch5: ; f1d43
+Sfx_Tally_Ch5:
 	dutycycle $2
 	sound __,  5, $f1, $0780
 	endchannel
-; f1d4a
 
-Sfx_Tally_Ch6: ; f1d4a
+Sfx_Tally_Ch6:
 	dutycycle $2
 	sound __,  2, $8, 0
 	sound __,  5, $a1, $0761
 	endchannel
-; f1d55
 
-Sfx_Transaction_Ch5: ; f1d55
+Sfx_Transaction_Ch5:
 	dutycycle $2
 	sound __,  5, $e1, $0700
 	sound C_,  9, $f2, $07e0
 	endchannel
-; f1d60
 
-Sfx_Transaction_Ch6: ; f1d60
+Sfx_Transaction_Ch6:
 	dutycycle $2
 	sound __,  2, $8, 0
 	sound __,  5, $91, $06c1
 	sound C_,  9, $a2, $07a1
 	endchannel
-; f1d6f
 
-Sfx_Bump_Ch5: ; f1d6f
+Sfx_Bump_Ch5:
 	dutycycle $2
 	soundinput $5a
 	sound __, 16, $f1, $0300
 	soundinput $8
 	endchannel
-; f1d7a
 
-Sfx_ExitBuilding_Ch8: ; f1d7a
+Sfx_ExitBuilding_Ch8:
 	noise __,  3, $f1, $54
 	noise __, 13, $71, $23
 	noise __,  3, $b1, $54
 	noise __, 13, $61, $23
 	noise __,  7, $41, $54
 	endchannel
-; f1d8a
 
-Sfx_ReadText2_Ch5: ; f1d8a
-Sfx_ReadText_Ch5: ; f1d8a
+Sfx_ReadText2_Ch5:
+Sfx_ReadText_Ch5:
 	dutycycle $2
 	sound __,  1, $91, $07c0
 	sound __,  1, $81, $07d0
 	sound __,  1, $91, $07c0
 	sound __, 13, $a1, $07d0
 	endchannel
-; f1d9d
 
-Sfx_Potion_Ch5: ; f1d9d
+Sfx_Potion_Ch5:
 	dutycycle $2
 	soundinput $17
 	sound __, 16, $f0, $04f0
 	sound __, 16, $f2, $0650
 	soundinput $8
 	endchannel
-; f1dac
 
-Sfx_Poison_Ch5: ; f1dac
-Sfx_Poison_branch_f1dac: ; f1dac
+Sfx_Poison_Ch5:
 	dutycycle $0
 	soundinput $14
 	sound __,  5, $f2, $0600
-	loopchannel 4, Sfx_Poison_branch_f1dac
+	loopchannel 4, Sfx_Poison_Ch5
 	sound __, 16, $f3, $0600
 	soundinput $8
 	endchannel
-; f1dbf
 
-Sfx_FullHeal_Ch5: ; f1dbf
+Sfx_FullHeal_Ch5:
 	dutycycle $2
 	soundinput $14
 	sound __,  5, $f2, $0600
@@ -4169,18 +3800,16 @@ Sfx_FullHeal_Ch5: ; f1dbf
 	sound __, 16, $f2, $0600
 	soundinput $8
 	endchannel
-; f1dd4
 
-Sfx_GotSafariBalls_Ch5: ; f1dd4
+Sfx_GotSafariBalls_Ch5:
 	dutycycle $2
 	soundinput $15
 	sound __, 16, $f0, $04f0
 	sound __, 16, $f2, $0650
 	soundinput $8
 	endchannel
-; f1de3
 
-Sfx_BootPc_Ch5: ; f1de3
+Sfx_BootPc_Ch5:
 	dutycycle $2
 	sound __, 16, $f2, $07c0
 	sound __, 16, $0, 0
@@ -4193,27 +3822,24 @@ Sfx_BootPc_Ch5: ; f1de3
 	sound __,  4, $a1, $07c0
 	sound __,  9, $a1, $0700
 	endchannel
-; f1e0e
 
-Sfx_ShutDownPc_Ch5: ; f1e0e
+Sfx_ShutDownPc_Ch5:
 	dutycycle $2
 	sound __,  5, $f0, $0600
 	sound __,  5, $f0, $0400
 	sound __,  5, $f0, $0200
 	sound __,  2, $0, 0
 	endchannel
-; f1e21
 
-Sfx_ChoosePcOption_Ch5: ; f1e21
+Sfx_ChoosePcOption_Ch5:
 	dutycycle $2
 	sound __,  7, $f0, $0700
 	sound __,  5, $0, 0
 	sound __,  7, $f0, $0700
 	sound __,  2, $0, 0
 	endchannel
-; f1e34
 
-Sfx_EscapeRope_Ch5: ; f1e34
+Sfx_EscapeRope_Ch5:
 	dutycycle $1
 	soundinput $17
 	sound __, 16, $d7, $0600
@@ -4223,9 +3849,8 @@ Sfx_EscapeRope_Ch5: ; f1e34
 	sound __, 16, $17, $0400
 	soundinput $8
 	endchannel
-; f1e4f
 
-Sfx_PushButton_Ch5: ; f1e4f
+Sfx_PushButton_Ch5:
 	dutycycle $2
 	sound __,  5, $0, 0
 	sound __,  3, $f1, $0680
@@ -4233,9 +3858,8 @@ Sfx_PushButton_Ch5: ; f1e4f
 	sound __,  5, $f1, $0780
 	sound __,  5, $0, 0
 	endchannel
-; f1e66
 
-Sfx_SecondPartOfItemfinder_Ch5: ; f1e66
+Sfx_SecondPartOfItemfinder_Ch5:
 	dutycycle $2
 	soundinput $2c
 	sound __,  5, $f2, $0500
@@ -4244,9 +3868,8 @@ Sfx_SecondPartOfItemfinder_Ch5: ; f1e66
 	soundinput $8
 	sound __,  2, $0, 0
 	endchannel
-; f1e7b
 
-Sfx_WarpTo_Ch5: ; f1e7b
+Sfx_WarpTo_Ch5:
 	dutycycle $1
 	soundinput $17
 	sound __, 16, $d7, $0500
@@ -4256,9 +3879,8 @@ Sfx_WarpTo_Ch5: ; f1e7b
 	sound __, 16, $17, $0700
 	soundinput $8
 	endchannel
-; f1e96
 
-Sfx_WarpFrom_Ch5: ; f1e96
+Sfx_WarpFrom_Ch5:
 	dutycycle $1
 	soundinput $17
 	sound __, 16, $d7, $0700
@@ -4268,33 +3890,29 @@ Sfx_WarpFrom_Ch5: ; f1e96
 	sound __, 16, $17, $0500
 	soundinput $8
 	endchannel
-; f1eb1
 
-Sfx_ChangeDexMode_Ch5: ; f1eb1
+Sfx_ChangeDexMode_Ch5:
 	dutycycle $1
 	soundinput $16
 	sound __, 16, $d2, $0500
 	soundinput $8
 	endchannel
-; f1ebc
 
-Sfx_JumpOverLedge_Ch5: ; f1ebc
+Sfx_JumpOverLedge_Ch5:
 	dutycycle $2
 	soundinput $95
 	sound __, 16, $f2, $0400
 	soundinput $8
 	endchannel
-; f1ec7
 
-Sfx_GrassRustle_Ch8: ; f1ec7
+Sfx_GrassRustle_Ch8:
 	noise __,  3, $f1, $32
 	noise __,  3, $0, $0
 	noise __,  3, $f1, $22
 	noise __,  2, $0, $0
 	endchannel
-; f1ed4
 
-Sfx_Fly_Ch8: ; f1ed4
+Sfx_Fly_Ch8:
 	noise __,  3, $f1, $12
 	noise __,  3, $0, $0
 	noise __,  3, $a1, $12
@@ -4312,9 +3930,8 @@ Sfx_Fly_Ch8: ; f1ed4
 	noise __,  3, $41, $12
 	noise __,  3, $0, $0
 	endchannel
-; f1f05
 
-Sfx_Wrong_Ch5: ; f1f05
+Sfx_Wrong_Ch5:
 	dutycycle $3
 	soundinput $5a
 	sound __,  5, $f0, $0500
@@ -4323,26 +3940,23 @@ Sfx_Wrong_Ch5: ; f1f05
 	sound __, 16, $f0, $0500
 	sound __,  2, $0, 0
 	endchannel
-; f1f1c
 
-Sfx_Wrong_Ch6: ; f1f1c
+Sfx_Wrong_Ch6:
 	dutycycle $3
 	sound __,  5, $f0, $0401
 	sound __,  5, $0, 0
 	sound __, 16, $f0, $0401
 	sound __,  2, $0, 0
 	endchannel
-; f1f2f
 
-Sfx_Squeak_Ch5: ; f1f2f
+Sfx_Squeak_Ch5:
 	dutycycle $0
 	soundinput $17
 	sound __, 16, $d2, $0700
 	soundinput $8
 	endchannel
-; f1f3a
 
-Sfx_Strength_Ch8: ; f1f3a
+Sfx_Strength_Ch8:
 	noise __,  5, $a2, $23
 	noise __,  9, $f1, $34
 	noise __, 16, $0, $0
@@ -4352,9 +3966,8 @@ Sfx_Strength_Ch8: ; f1f3a
 	noise __,  9, $f4, $55
 	noise __,  9, $f1, $44
 	endchannel
-; f1f53
 
-Sfx_Boat_Ch5: ; f1f53
+Sfx_Boat_Ch5:
 	dutycycle $2
 	sound __, 16, $f0, $0500
 	sound __,  5, $0, 0
@@ -4364,9 +3977,8 @@ Sfx_Boat_Ch5: ; f1f53
 	sound __, 16, $f0, $0500
 	sound __, 16, $f2, $0500
 	endchannel
-; f1f72
 
-Sfx_Boat_Ch6: ; f1f72
+Sfx_Boat_Ch6:
 	dutycycle $3
 	sound __, 16, $f0, $0482
 	sound __,  5, $0, 0
@@ -4376,9 +3988,8 @@ Sfx_Boat_Ch6: ; f1f72
 	sound __, 16, $f0, $0482
 	sound __, 16, $f2, $0482
 	endchannel
-; f1f91
 
-Sfx_WallOpen_Ch5: ; f1f91
+Sfx_WallOpen_Ch5:
 	dutycycle $1
 	soundinput $3a
 	sound __,  5, $f2, $0500
@@ -4390,9 +4001,8 @@ Sfx_WallOpen_Ch5: ; f1f91
 	sound __, 16, $e2, $0700
 	soundinput $8
 	endchannel
-; f1fae
 
-Sfx_ElevatorEnd_Ch5: ; f1fae
+Sfx_ElevatorEnd_Ch5:
 	dutycycle $2
 	sound __, 16, $f3, $0730
 	sound __,  9, $65, $0730
@@ -4401,22 +4011,19 @@ Sfx_ElevatorEnd_Ch5: ; f1fae
 	sound __, 16, $44, $0700
 	sound __, 16, $24, $0700
 	endchannel
-; f1fc9
 
-Sfx_ThrowBall_Ch5: ; f1fc9
+Sfx_ThrowBall_Ch5:
 	dutycycle $2
 	soundinput $2f
 	sound __, 16, $f2, $0780
 	endchannel
-; f1fd2
 
-Sfx_ThrowBall_Ch6: ; f1fd2
+Sfx_ThrowBall_Ch6:
 	dutycycle $2
 	sound __, 16, $c2, $0782
 	endchannel
-; f1fd9
 
-Sfx_Shine_Ch5: ; f1fd9
+Sfx_Shine_Ch5:
 	dutycycle $0
 	sound __,  1, $d2, $0700
 	sound __,  1, $d2, $0740
@@ -4425,35 +4032,30 @@ Sfx_Shine_Ch5: ; f1fd9
 	sound __, 11, $e1, $07e0
 	sound __,  2, $0, 0
 	endchannel
-; f1ff4
 
-Sfx_BallPoof_Ch5: ; f1ff4
+Sfx_BallPoof_Ch5:
 	dutycycle $2
 	soundinput $16
 	sound __, 16, $f2, $0400
 	soundinput $8
 	endchannel
-; f1fff
 
-Sfx_BallPoof_Ch8: ; f1fff
+Sfx_BallPoof_Ch8:
 	noise __, 16, $a2, $22
 	endchannel
-; f2003
 
-Sfx_Unknown3A_Ch5: ; f2003
+Sfx_Unknown3A_Ch5:
 	sound __, 16, $d1, $0200
 	soundinput $8
 	endchannel
-; f200a
 
-Sfx_Unknown3A_Ch8: ; f200a
+Sfx_Unknown3A_Ch8:
 	noise __,  5, $f5, $33
 	noise __,  9, $f4, $22
 	noise __, 16, $f2, $21
 	endchannel
-; f2014
 
-Sfx_Run_Ch8: ; f2014
+Sfx_Run_Ch8:
 	noise __,  3, $61, $23
 	noise __,  3, $a1, $33
 	noise __,  3, $c1, $33
@@ -4466,9 +4068,8 @@ Sfx_Run_Ch8: ; f2014
 	noise __,  3, $31, $11
 	noise __,  9, $41, $33
 	endchannel
-; f2036
 
-Sfx_SlotMachineStart_Ch5: ; f2036
+Sfx_SlotMachineStart_Ch5:
 	dutycycle $2
 	soundinput $44
 	sound __, 16, $f0, $04f0
@@ -4476,16 +4077,14 @@ Sfx_SlotMachineStart_Ch5: ; f2036
 	sound __, 16, $f2, $0650
 	soundinput $8
 	endchannel
-; f2047
 
-Sfx_SlotMachineStart_Ch6: ; f2047
+Sfx_SlotMachineStart_Ch6:
 	dutycycle $2
 	sound __, 16, $92, $0600
 	sound __, 16, $92, $0782
 	endchannel
-; f2052
 
-Sfx_Call_Ch5: ; f2052
+Sfx_Call_Ch5:
 	soundinput $67
 	sound __,  5, $f7, $07a0
 	sound __,  5, $f7, $07a0
@@ -4495,108 +4094,92 @@ Sfx_Call_Ch5: ; f2052
 	soundinput $8
 	sound __,  5, $0, 0
 	endchannel
-; f206f
 
-Sfx_Peck_Ch8: ; f206f
+Sfx_Peck_Ch8:
 	noise __,  3, $a1, $12
 	endchannel
-; f2073
 
-Sfx_Kinesis_Ch5: ; f2073
+Sfx_Kinesis_Ch5:
 	dutycycle $1
 	soundinput $af
 	sound __, 16, $f2, $0780
 	soundinput $8
 	endchannel
-; f207e
 
-Sfx_Lick_Ch5: ; f207e
+Sfx_Lick_Ch5:
 	dutycycle $1
 	soundinput $97
 	sound __, 16, $f2, $0500
 	soundinput $8
 	endchannel
-; f2089
 
-Sfx_Pound_Ch8: ; f2089
+Sfx_Pound_Ch8:
 	noise __,  3, $a1, $22
 	endchannel
-; f208d
 
-Sfx_MovePuzzlePiece_Ch8: ; f208d
+Sfx_MovePuzzlePiece_Ch8:
 	noise __,  9, $f1, $54
 	endchannel
-; f2091
 
-Sfx_CometPunch_Ch8: ; f2091
+Sfx_CometPunch_Ch8:
 	noise __, 16, $8f, $11
 	noise __,  5, $ff, $12
 	noise __, 11, $f1, $55
 	endchannel
-; f209b
 
-Sfx_MegaPunch_Ch8: ; f209b
+Sfx_MegaPunch_Ch8:
 	noise __, 16, $8f, $34
 	noise __,  9, $f2, $35
 	noise __, 11, $f1, $55
 	endchannel
-; f20a5
 
-Sfx_Scratch_Ch8: ; f20a5
+Sfx_Scratch_Ch8:
 	noise __, 16, $9f, $23
 	noise __,  9, $f1, $21
 	endchannel
-; f20ac
 
-Sfx_Vicegrip_Ch8: ; f20ac
+Sfx_Vicegrip_Ch8:
 	noise __,  3, $e1, $4b
 	noise __, 11, $f1, $44
 	noise __,  3, $e1, $3a
 	noise __,  7, $f1, $34
 	endchannel
-; f20b9
 
-Sfx_RazorWind_Ch8: ; f20b9
+Sfx_RazorWind_Ch8:
 	noise __,  3, $f4, $44
 	noise __,  3, $f4, $14
 	noise __, 16, $f1, $32
 	endchannel
-; f20c3
 
-Sfx_Cut_Ch8: ; f20c3
+Sfx_Cut_Ch8:
 	noise __,  5, $8f, $55
 	noise __,  3, $f4, $44
 	noise __,  9, $f4, $22
 	noise __, 16, $f2, $21
 	endchannel
-; f20d0
 
-Sfx_WingAttack_Ch8: ; f20d0
-Sfx_WingAttack_branch_f20d0: ; f20d0
+Sfx_WingAttack_Ch8:
 	noise __,  9, $4f, $23
 	noise __,  5, $c4, $22
 	noise __,  7, $f2, $23
-	loopchannel 4, Sfx_WingAttack_branch_f20d0
+	loopchannel 4, Sfx_WingAttack_Ch8
 	endchannel
-; f20de
 
-Sfx_Whirlwind_Ch8: ; f20de
+Sfx_Whirlwind_Ch8:
 	noise __,  9, $4f, $33
 	noise __,  5, $c4, $22
 	noise __,  7, $f2, $23
 	noise __, 16, $f2, $22
 	endchannel
-; f20eb
 
-Sfx_Bind_Ch8: ; f20eb
+Sfx_Bind_Ch8:
 	noise __,  9, $ff, $32
 	noise __,  9, $f4, $43
 	noise __,  9, $f2, $54
 	noise __,  9, $f1, $65
 	endchannel
-; f20f8
 
-Sfx_VineWhip_Ch8: ; f20f8
+Sfx_VineWhip_Ch8:
 	noise __,  2, $c2, $33
 	noise __,  3, $f2, $21
 	noise __,  2, $e2, $33
@@ -4606,62 +4189,53 @@ Sfx_VineWhip_Ch8: ; f20f8
 	noise __, 13, $91, $10
 	noise __,  9, $f2, $41
 	endchannel
-; f2111
 
-Sfx_DoubleKick_Ch8: ; f2111
+Sfx_DoubleKick_Ch8:
 	noise __,  2, $94, $23
 	noise __,  2, $b4, $22
 	noise __,  9, $f1, $44
 	endchannel
-; f211b
 
-Sfx_MegaKick_Ch8: ; f211b
+Sfx_MegaKick_Ch8:
 	noise __,  3, $94, $33
 	noise __,  5, $b4, $22
 	noise __,  5, $f1, $44
 	noise __,  9, $f1, $55
 	endchannel
-; f2128
 
-Sfx_Headbutt_Ch8: ; f2128
+Sfx_Headbutt_Ch8:
 	noise __,  5, $ff, $55
 	noise __,  9, $f1, $65
 	endchannel
-; f212f
 
-Sfx_HornAttack_Ch8: ; f212f
+Sfx_HornAttack_Ch8:
 	noise __,  3, $84, $43
 	noise __,  3, $c4, $22
 	noise __,  9, $f2, $34
 	endchannel
-; f2139
 
-Sfx_Tackle_Ch8: ; f2139
+Sfx_Tackle_Ch8:
 	noise __,  5, $f1, $34
 	noise __, 16, $f2, $64
 	endchannel
-; f2140
 
-Sfx_PoisonSting_Ch8: ; f2140
+Sfx_PoisonSting_Ch8:
 	noise __,  3, $f1, $22
 	noise __, 16, $f2, $12
 	endchannel
-; f2147
 
-Sfx_Powder_Ch8: ; f2147
+Sfx_Powder_Ch8:
 	noise __,  3, $c2, $1
 	noise __, 16, $f4, $1
 	noise __, 16, $f2, $1
 	endchannel
-; f2151
 
-Sfx_Doubleslap_Ch8: ; f2151
+Sfx_Doubleslap_Ch8:
 	noise __,  9, $f1, $32
 	noise __,  9, $f1, $33
 	endchannel
-; f2158
 
-Sfx_Bite_Ch5: ; f2158
+Sfx_Bite_Ch5:
 	dutycycle $0
 	soundinput $3a
 	sound __,  5, $f2, $0200
@@ -4669,78 +4243,68 @@ Sfx_Bite_Ch5: ; f2158
 	sound __,  9, $e2, $0200
 	soundinput $8
 	endchannel
-; f2169
 
-Sfx_Bite_Ch8: ; f2169
+Sfx_Bite_Ch8:
 	noise __,  1, $d1, $42
 	noise __,  5, $a1, $32
 	noise __,  1, $d1, $22
 	noise __,  7, $a1, $32
 	endchannel
-; f2176
 
-Sfx_JumpKick_Ch8: ; f2176
+Sfx_JumpKick_Ch8:
 	noise __,  4, $92, $31
 	noise __,  4, $b2, $32
 	noise __,  4, $c2, $33
 	noise __,  9, $f1, $54
 	endchannel
-; f2183
 
-Sfx_Stomp_Ch8: ; f2183
+Sfx_Stomp_Ch8:
 	noise __, 13, $f1, $54
 	noise __,  9, $f1, $64
 	endchannel
-; f218a
 
-Sfx_TailWhip_Ch8: ; f218a
+Sfx_TailWhip_Ch8:
 	noise __,  3, $f1, $33
 	noise __,  3, $c1, $32
 	noise __,  3, $a1, $31
 	noise __, 16, $82, $32
 	noise __,  9, $f1, $34
 	endchannel
-; f219a
 
-Sfx_KarateChop_Ch8: ; f219a
+Sfx_KarateChop_Ch8:
 	noise __,  3, $d2, $32
 	noise __, 16, $f2, $43
 	endchannel
-; f21a1
 
-Sfx_Submission_Ch8: ; f21a1
+Sfx_Submission_Ch8:
 	noise __,  3, $f2, $43
 	noise __,  5, $b5, $32
 	noise __, 10, $86, $31
 	noise __,  8, $64, $0
 	noise __, 16, $f2, $55
 	endchannel
-; f21b1
 
-Sfx_WaterGun_Ch5: ; f21b1
+Sfx_WaterGun_Ch5:
 	dutycycle $1
 	soundinput $97
 	sound __, 16, $f2, $0700
 	soundinput $8
 	endchannel
-; f21bc
 
-Sfx_WaterGun_Ch8: ; f21bc
+Sfx_WaterGun_Ch8:
 	noise __, 16, $3f, $22
 	noise __, 16, $f2, $21
 	endchannel
-; f21c3
 
-Sfx_SwordsDance_Ch8: ; f21c3
+Sfx_SwordsDance_Ch8:
 	noise __, 16, $4f, $41
 	noise __,  9, $8f, $41
 	noise __,  9, $cf, $41
 	noise __,  9, $f2, $42
 	noise __, 16, $f2, $41
 	endchannel
-; f21d3
 
-Sfx_Thunder_Ch8: ; f21d3
+Sfx_Thunder_Ch8:
 	noise __, 11, $ff, $50
 	noise __, 16, $ff, $51
 	noise __,  9, $f2, $51
@@ -4749,261 +4313,212 @@ Sfx_Thunder_Ch8: ; f21d3
 	noise __,  9, $ff, $54
 	noise __, 16, $f2, $54
 	endchannel
-; f21e9
 
-Sfx_Supersonic_Ch5: ; f21e9
+Sfx_Supersonic_Ch5:
 	dutycycle $2
 	sound __, 16, $3f, $07c0
-Sfx_Supersonic_branch_f21ef: ; f21ef
+.loop
 	sound __, 16, $df, $07c0
-	loopchannel 4, Sfx_Supersonic_branch_f21ef
+	loopchannel 4, .loop
 	sound __, 16, $d1, $07c0
 	endchannel
-; f21fc
 
-Sfx_Supersonic_Ch6: ; f21fc
+Sfx_Supersonic_Ch6:
 	sound_duty 3, 0, 3, 2
 	sound __, 16, $2f, $07c8
-Sfx_Supersonic_branch_f2202: ; f2202
+.loop
 	sound __, 16, $cf, $07c7
-	loopchannel 4, Sfx_Supersonic_branch_f2202
+	loopchannel 4, .loop
 	sound __, 16, $c1, $07c8
 	endchannel
-; f220f
 
-Sfx_Supersonic_Ch8: ; f220f
-Sfx_Supersonic_branch_f220f: ; f220f
+Sfx_Supersonic_Ch8:
 	noise __,  4, $97, $12
 	noise __,  4, $a1, $11
-	loopchannel 10, Sfx_Supersonic_branch_f220f
+	loopchannel 10, Sfx_Supersonic_Ch8
 	endchannel
-; f221a
 
-Sfx_Leer_Ch5: ; f221a
-Sfx_Leer_branch_f221a: ; f221a
+Sfx_Leer_Ch5:
 	dutycycle $0
 	sound __,  1, $f1, $07c0
 	sound __,  1, $f1, $0700
-	loopchannel 12, Sfx_Leer_branch_f221a
+	loopchannel 12, Sfx_Leer_Ch5
 	endchannel
-; f2229
 
-Sfx_Leer_Ch6: ; f2229
-Sfx_Leer_branch_f2229: ; f2229
+Sfx_Leer_Ch6:
 	sound_duty 3, 0, 3, 2
 	sound __,  1, $e1, $07c1
 	sound __,  1, $e1, $0701
-	loopchannel 12, Sfx_Leer_branch_f2229
+	loopchannel 12, Sfx_Leer_Ch6
 	endchannel
-; f2238
 
-Sfx_Leer_Ch8: ; f2238
-Sfx_Leer_branch_f2238: ; f2238
+Sfx_Leer_Ch8:
 	noise __,  2, $d1, $49
 	noise __,  2, $d1, $29
-	loopchannel 6, Sfx_Leer_branch_f2238
+	loopchannel 6, Sfx_Leer_Ch8
 	endchannel
-; f2243
 
-Sfx_Ember_Ch5: ; f2243
-Sfx_Ember_branch_f2243: ; f2243
+Sfx_Ember_Ch5:
 	sound_duty 1, 2, 0, 3
 	sound __, 12, $f3, $0120
 	sound __, 10, $d3, $0150
-	loopchannel 5, Sfx_Ember_branch_f2243
+	loopchannel 5, Sfx_Ember_Ch5
 	sound __,  9, $e3, $0130
 	sound __, 16, $c2, $0110
 	endchannel
-; f225a
 
-Sfx_Ember_Ch8: ; f225a
-Sfx_Ember_branch_f225a: ; f225a
+Sfx_Ember_Ch8:
 	noise __, 11, $f3, $35
 	noise __, 15, $f6, $45
-	loopchannel 4, Sfx_Ember_branch_f225a
+	loopchannel 4, Sfx_Ember_Ch8
 	noise __, 13, $f4, $bc
 	noise __, 13, $f5, $9c
 	noise __, 16, $f4, $ac
 	endchannel
-; f226e
 
-Sfx_Bubblebeam_Ch5: ; f226e
-Sfx_Bubblebeam_branch_f226e: ; f226e
+Sfx_Bubblebeam_Ch5:
 	sound_duty 1, 2, 3, 0
 	sound __,  5, $f4, $0600
 	sound __,  4, $c4, $0500
 	sound __,  6, $b5, $0600
 	sound __, 14, $e2, $06c0
-	loopchannel 3, Sfx_Bubblebeam_branch_f226e
+	loopchannel 3, Sfx_Bubblebeam_Ch5
 	sound __,  9, $d1, $0600
 	endchannel
-; f2289
 
-Sfx_Bubblebeam_Ch6: ; f2289
-Sfx_Bubblebeam_branch_f2289: ; f2289
+Sfx_Bubblebeam_Ch6:
 	sound_duty 1, 3, 0, 2
 	sound __,  6, $e4, $05e0
 	sound __,  5, $b4, $04e0
 	sound __,  7, $a5, $05e8
 	sound __, 15, $d1, $06a0
-	loopchannel 3, Sfx_Bubblebeam_branch_f2289
+	loopchannel 3, Sfx_Bubblebeam_Ch6
 	endchannel
-; f22a0
 
-Sfx_Bubblebeam_Ch8: ; f22a0
-Sfx_Bubblebeam_branch_f22a0: ; f22a0
+Sfx_Bubblebeam_Ch8:
 	noise __,  6, $c3, $33
 	noise __,  4, $92, $43
 	noise __, 11, $b5, $33
 	noise __, 16, $c3, $32
-	loopchannel 2, Sfx_Bubblebeam_branch_f22a0
+	loopchannel 2, Sfx_Bubblebeam_Ch8
 	endchannel
-; f22b1
 
-Sfx_HydroPump_Ch5: ; f22b1
-Sfx_HydroPump_branch_f22b1: ; f22b1
+Sfx_HydroPump_Ch5:
 	sound_duty 2, 0, 1, 3
 	sound __,  4, $81, $0300
 	sound __,  4, $c1, $0400
 	sound __,  4, $f1, $0500
 	sound __,  4, $b1, $0400
 	sound __,  4, $71, $0300
-	loopchannel 5, Sfx_HydroPump_branch_f22b1
+	loopchannel 5, Sfx_HydroPump_Ch5
 	sound __,  9, $81, $0400
 	endchannel
-; f22d0
 
-Sfx_HydroPump_Ch8: ; f22d0
-Sfx_HydroPump_branch_f22d0: ; f22d0
+Sfx_HydroPump_Ch8:
 	noise __,  4, $62, $22
 	noise __,  4, $a2, $32
 	noise __,  4, $d2, $33
 	noise __,  4, $92, $23
 	noise __,  4, $52, $12
-	loopchannel 5, Sfx_HydroPump_branch_f22d0
+	loopchannel 5, Sfx_HydroPump_Ch8
 	noise __,  9, $81, $12
 	endchannel
-; f22e7
 
-Sfx_Surf_Ch5: ; f22e7
-Sfx_Surf_branch_f22e7: ; f22e7
+Sfx_Surf_Ch5:
 	sound_duty 1, 2, 3, 0
 	sound __, 16, $f4, $0500
 	sound __, 16, $c4, $0400
 	sound __, 16, $e2, $05c0
-	loopchannel 3, Sfx_Surf_branch_f22e7
+	loopchannel 3, Sfx_Surf_Ch5
 	endchannel
-; f22fa
 
-Sfx_Surf_Ch6: ; f22fa
-Sfx_Surf_branch_f22fa: ; f22fa
+Sfx_Surf_Ch6:
 	sound_duty 1, 3, 0, 2
 	sound __,  8, $e4, $0430
 	sound __, 16, $b4, $0330
 	sound __, 16, $a2, $0438
-	loopchannel 4, Sfx_Surf_branch_f22fa
+	loopchannel 4, Sfx_Surf_Ch6
 	endchannel
-; f230d
 
-Sfx_Surf_Ch8: ; f230d
-Sfx_Surf_branch_f230d: ; f230d
+Sfx_Surf_Ch8:
 	noise __, 10, $f4, $44
 	noise __, 10, $f2, $43
 	noise __, 16, $f4, $42
 	noise __, 16, $f4, $41
-	loopchannel 3, Sfx_Surf_branch_f230d
+	loopchannel 3, Sfx_Surf_Ch8
 	endchannel
-; f231e
 
-Sfx_Psybeam_Ch5: ; f231e
-Sfx_Psybeam_branch_f231e: ; f231e
+Sfx_Psybeam_Ch5:
 	sound_duty 1, 0, 2, 2
 	sound __, 11, $f1, $0640
 	sound __, 11, $f3, $0680
 	sound __, 11, $f2, $0620
-	loopchannel 4, Sfx_Psybeam_branch_f231e
+	loopchannel 4, Sfx_Psybeam_Ch5
 	sound __, 11, $f1, $0640
 	endchannel
-; f2335
 
-Sfx_Psybeam_Ch6: ; f2335
-Sfx_Psybeam_branch_f2335: ; f2335
+Sfx_Psybeam_Ch6:
 	sound_duty 3, 0, 3, 2
 	sound __, 11, $f3, $0571
 	sound __,  8, $e3, $0531
 	sound __, 11, $f1, $0551
-	loopchannel 4, Sfx_Psybeam_branch_f2335
+	loopchannel 4, Sfx_Psybeam_Ch6
 	sound __, 11, $f1, $0571
 	endchannel
-; f234c
 
-Sfx_Psybeam_Ch8: ; f234c
-Sfx_Psybeam_branch_f234c: ; f234c
+Sfx_Psybeam_Ch8:
 	noise __,  3, $d1, $4a
 	noise __,  3, $d2, $2a
-	loopchannel 21, Sfx_Psybeam_branch_f234c
+	loopchannel 21, Sfx_Psybeam_Ch8
 	endchannel
-; f2357
 
-Sfx_Charge_Ch5: ; f2357
-Sfx_Charge_branch_f2357: ; f2357
+Sfx_Charge_Ch5:
 	dutycycle $0
 	sound __,  3, $f1, $0200
 	sound __,  4, $f1, $0700
 	sound __,  5, $f1, $0500
 	sound __,  6, $f1, $07f0
-	loopchannel 8, Sfx_Charge_branch_f2357
+	loopchannel 8, Sfx_Charge_Ch5
 	endchannel
-; f236e
 
-Sfx_Charge_Ch6: ; f236e
-Sfx_Charge_branch_f236e: ; f236e
+Sfx_Charge_Ch6:
 	sound_duty 3, 0, 3, 2
 	sound __,  3, $e1, $0302
 	sound __,  4, $e1, $07f2
 	sound __,  5, $e1, $0602
 	sound __,  6, $e1, $0702
-	loopchannel 8, Sfx_Charge_branch_f236e
+	loopchannel 8, Sfx_Charge_Ch6
 	endchannel
-; f2385
 
-Sfx_Charge_Ch8: ; f2385
-Sfx_Charge_branch_f2385: ; f2385
+Sfx_Charge_Ch8:
 	noise __,  3, $d3, $10
 	noise __,  4, $d3, $11
 	noise __,  3, $d2, $10
 	noise __,  6, $d2, $12
-	loopchannel 9, Sfx_Charge_branch_f2385
+	loopchannel 9, Sfx_Charge_Ch8
 	endchannel
-; f2396
 
-Sfx_Thundershock_Ch5: ; f2396
-Sfx_Thundershock_branch_f2396: ; f2396
+Sfx_Thundershock_Ch5:
 	sound_duty 3, 2, 2, 0
 	sound __,  4, $f1, $07f0
 	sound __,  5, $f2, $0200
-	loopchannel 8, Sfx_Thundershock_branch_f2396
+	loopchannel 8, Sfx_Thundershock_Ch5
 	endchannel
-; f23a5
 
-Sfx_Thundershock_Ch6: ; f23a5
-Sfx_Thundershock_branch_f23a5: ; f23a5
+Sfx_Thundershock_Ch6:
 	sound_duty 3, 0, 3, 2
 	sound __,  5, $e2, $0202
 	sound __,  5, $e1, $07e2
-	loopchannel 9, Sfx_Thundershock_branch_f23a5
+	loopchannel 9, Sfx_Thundershock_Ch6
 	endchannel
-; f23b4
 
-Sfx_Thundershock_Ch8: ; f23b4
-Sfx_Thundershock_branch_f23b4: ; f23b4
+Sfx_Thundershock_Ch8:
 	noise __,  5, $ff, $43
 	noise __,  5, $f2, $44
-	loopchannel 9, Sfx_Thundershock_branch_f23b4
+	loopchannel 9, Sfx_Thundershock_Ch8
 	endchannel
-; f23bf
 
-Sfx_Psychic_Ch5: ; f23bf
+Sfx_Psychic_Ch5:
 	dutycycle $2
 	soundinput $f7
 	sound __,  9, $c4, $07bd
@@ -5014,9 +4529,8 @@ Sfx_Psychic_Ch5: ; f23bf
 	sound __, 16, $f2, $07c0
 	soundinput $8
 	endchannel
-; f23de
 
-Sfx_Psychic_Ch6: ; f23de
+Sfx_Psychic_Ch6:
 	dutycycle $2
 	sound __,  9, $c4, $0770
 	sound __,  9, $c4, $0761
@@ -5025,9 +4539,8 @@ Sfx_Psychic_Ch6: ; f23de
 	sound __, 16, $c4, $0764
 	sound __, 16, $f2, $0764
 	endchannel
-; f23f9
 
-Sfx_Psychic_Ch8: ; f23f9
+Sfx_Psychic_Ch8:
 	noise __, 16, $3f, $14
 	noise __, 16, $cf, $13
 	noise __, 16, $cf, $12
@@ -5035,9 +4548,8 @@ Sfx_Psychic_Ch8: ; f23f9
 	noise __, 16, $cf, $10
 	noise __, 16, $c2, $10
 	endchannel
-; f240c
 
-Sfx_Screech_Ch5: ; f240c
+Sfx_Screech_Ch5:
 	dutycycle $2
 	sound __, 16, $ff, $07e0
 	sound __, 16, $ff, $07e0
@@ -5045,9 +4557,8 @@ Sfx_Screech_Ch5: ; f240c
 	sound __, 16, $ff, $07e0
 	sound __, 16, $f2, $07e0
 	endchannel
-; f2423
 
-Sfx_Screech_Ch6: ; f2423
+Sfx_Screech_Ch6:
 	dutycycle $3
 	sound __, 16, $ff, $07e2
 	sound __, 16, $ff, $07e1
@@ -5055,23 +4566,20 @@ Sfx_Screech_Ch6: ; f2423
 	sound __, 16, $ff, $07e1
 	sound __, 16, $f2, $07e2
 	endchannel
-; f243a
 
-Sfx_BoneClub_Ch5: ; f243a
+Sfx_BoneClub_Ch5:
 	dutycycle $2
 	soundinput $af
 	sound __,  9, $f1, $0700
 	soundinput $8
 	endchannel
-; f2445
 
-Sfx_BoneClub_Ch6: ; f2445
+Sfx_BoneClub_Ch6:
 	dutycycle $3
 	sound __,  9, $f1, $0701
 	endchannel
-; f244c
 
-Sfx_Sharpen_Ch5: ; f244c
+Sfx_Sharpen_Ch5:
 	dutycycle $2
 	sound __,  7, $f1, $0500
 	sound __,  7, $f1, $0580
@@ -5079,9 +4587,8 @@ Sfx_Sharpen_Ch5: ; f244c
 	sound __,  7, $f1, $0680
 	sound __,  9, $f1, $0700
 	endchannel
-; f2463
 
-Sfx_Sharpen_Ch6: ; f2463
+Sfx_Sharpen_Ch6:
 	dutycycle $3
 	sound __,  7, $e1, $0510
 	sound __,  7, $e1, $0590
@@ -5089,33 +4596,29 @@ Sfx_Sharpen_Ch6: ; f2463
 	sound __,  7, $e1, $0690
 	sound __,  9, $e1, $0710
 	endchannel
-; f247a
 
-Sfx_EggBomb_Ch5: ; f247a
+Sfx_EggBomb_Ch5:
 	sound_duty 1, 3, 2, 3
 	sound __,  9, $ff, $03f8
 	sound __, 16, $ff, $0400
 	sound __, 16, $f3, $0400
 	endchannel
-; f2489
 
-Sfx_EggBomb_Ch6: ; f2489
+Sfx_EggBomb_Ch6:
 	sound_duty 0, 1, 3, 2
 	sound __,  9, $ef, $03c0
 	sound __, 16, $ef, $03c0
 	sound __, 16, $e3, $03c0
 	endchannel
-; f2498
 
-Sfx_EggBomb_Ch8: ; f2498
+Sfx_EggBomb_Ch8:
 	noise __,  5, $ff, $51
 	noise __,  9, $ff, $54
 	noise __, 16, $ff, $55
 	noise __, 16, $f3, $56
 	endchannel
-; f24a5
 
-Sfx_Sing_Ch5: ; f24a5
+Sfx_Sing_Ch5:
 	togglesfx
 	vibrato $a, $24
 	dutycycle $2
@@ -5128,9 +4631,8 @@ Sfx_Sing_Ch5: ; f24a5
 	octave 5
 	note G_, 8
 	endchannel
-; f24b6
 
-Sfx_Sing_Ch6: ; f24b6
+Sfx_Sing_Ch6:
 	togglesfx
 	vibrato $a, $23
 	dutycycle $2
@@ -5144,9 +4646,8 @@ Sfx_Sing_Ch6: ; f24b6
 	octave 5
 	note G_, 8
 	endchannel
-; f24ca
 
-Sfx_HyperBeam_Ch5: ; f24ca
+Sfx_HyperBeam_Ch5:
 	dutycycle $0
 	sound __,  3, $f1, $0780
 	sound __,  3, $f1, $0700
@@ -5159,15 +4660,14 @@ Sfx_HyperBeam_Ch5: ; f24ca
 	sound __,  3, $f1, $07c0
 	sound __,  3, $f1, $0700
 	sound __,  3, $f1, $07d0
-Sfx_HyperBeam_branch_f24f8: ; f24f8
+.loop
 	sound __,  3, $f1, $0700
 	sound __,  3, $f1, $07e0
-	loopchannel 12, Sfx_HyperBeam_branch_f24f8
+	loopchannel 12, .loop
 	sound __, 16, $f1, $0700
 	endchannel
-; f2509
 
-Sfx_HyperBeam_Ch6: ; f2509
+Sfx_HyperBeam_Ch6:
 	sound_duty 3, 0, 3, 2
 	sound __,  3, $f1, $0781
 	sound __,  3, $f1, $0701
@@ -5180,23 +4680,20 @@ Sfx_HyperBeam_Ch6: ; f2509
 	sound __,  3, $f1, $07c1
 	sound __,  3, $f1, $0701
 	sound __,  3, $f1, $07d1
-Sfx_HyperBeam_branch_f2537: ; f2537
+.loop
 	sound __,  3, $f1, $0701
 	sound __,  3, $f1, $07e1
-	loopchannel 12, Sfx_HyperBeam_branch_f2537
+	loopchannel 12, .loop
 	sound __, 16, $f1, $0701
 	endchannel
-; f2548
 
-Sfx_HyperBeam_Ch8: ; f2548
-Sfx_HyperBeam_branch_f2548: ; f2548
+Sfx_HyperBeam_Ch8:
 	noise __,  2, $d1, $49
 	noise __,  2, $d1, $29
-	loopchannel 26, Sfx_HyperBeam_branch_f2548
+	loopchannel 26, Sfx_HyperBeam_Ch8
 	endchannel
-; f2553
 
-Sfx_Unknown60_Ch8: ; f2553
+Sfx_Unknown60_Ch8:
 	noise __,  7, $20, $10
 	noise __,  7, $2f, $40
 	noise __,  7, $4f, $41
@@ -5206,9 +4703,8 @@ Sfx_Unknown60_Ch8: ; f2553
 	noise __, 16, $e7, $43
 	noise __, 16, $f2, $43
 	endchannel
-; f256c
 
-Sfx_UnknownCB_Ch8: ; f256c
+Sfx_IntroWhoosh_Ch8:
 	noise __,  2, $10, $10
 	noise __,  3, $20, $10
 	noise __,  3, $30, $20
@@ -5219,32 +4715,27 @@ Sfx_UnknownCB_Ch8: ; f256c
 	noise __,  9, $80, $22
 	noise __, 16, $94, $22
 	endchannel
-; f2588
 
-Sfx_Unknown61_Ch8: ; f2588
+Sfx_Unknown61_Ch8:
 	noise __,  5, $d1, $41
 	endchannel
-; f258c
 
-Sfx_SwitchPockets_Ch8: ; f258c
+Sfx_SwitchPockets_Ch8:
 	noise __,  5, $c1, $42
 	endchannel
-; f2590
 
-Sfx_Unknown63_Ch8: ; f2590
+Sfx_Unknown63_Ch8:
 	noise __,  3, $6f, $21
 	noise __,  3, $af, $31
 	noise __, 16, $f2, $41
 	endchannel
-; f259a
 
-Sfx_Burn_Ch8: ; f259a
+Sfx_Burn_Ch8:
 	noise __,  3, $d2, $32
 	noise __, 16, $f2, $43
 	endchannel
-; f25a1
 
-Sfx_TitleScreenEntrance_Ch8: ; f25a1
+Sfx_TitleScreenEntrance_Ch8:
 	noise __,  3, $70, $22
 	noise __,  3, $80, $23
 	noise __,  3, $90, $24
@@ -5252,40 +4743,35 @@ Sfx_TitleScreenEntrance_Ch8: ; f25a1
 	noise __,  3, $b0, $26
 	noise __, 16, $c2, $26
 	endchannel
-; f25b4
 
-Sfx_Unknown66_Ch5: ; f25b4
+Sfx_Unknown66_Ch5:
 	dutycycle $2
 	sound __,  2, $f2, $06a0
 	sound __,  2, $f2, $06e0
 	sound __,  9, $f1, $0700
 	endchannel
-; f25c3
 
-Sfx_GetCoinFromSlots_Ch5: ; f25c3
+Sfx_GetCoinFromSlots_Ch5:
 	dutycycle $2
 	sound __,  3, $f1, $0700
 	sound __,  9, $81, $07e0
 	endchannel
-; f25ce
 
-Sfx_PayDay_Ch5: ; f25ce
+Sfx_PayDay_Ch5:
 	dutycycle $3
 	sound __,  6, $e1, $0700
 	sound __,  3, $e1, $0780
 	sound __, 16, $f1, $07c0
 	endchannel
-; f25dd
 
-Sfx_PayDay_Ch6: ; f25dd
+Sfx_PayDay_Ch6:
 	dutycycle $2
 	sound __,  5, $c1, $06c1
 	sound __,  3, $c1, $0741
 	sound __, 16, $d1, $0781
 	endchannel
-; f25ec
 
-Sfx_Metronome_Ch5: ; f25ec
+Sfx_Metronome_Ch5:
 	dutycycle $2
 	soundinput $5f
 	sound __,  5, $40, $07e0
@@ -5299,25 +4785,21 @@ Sfx_Metronome_Ch5: ; f25ec
 	sound __, 16, $12, $07e0
 	soundinput $8
 	endchannel
-; f2617
 
-Sfx_Unknown5F_Ch5: ; f2617
-Sfx_Unknown5F_branch_f2617: ; f2617
+Sfx_Unknown5F_Ch5:
 	sound __,  3, $f7, $0601
 	sound __,  3, $f7, $0701
-	loopchannel 8, Sfx_Unknown5F_branch_f2617
+	loopchannel 8, Sfx_Unknown5F_Ch5
 	endchannel
-; f2624
 
-Sfx_Unknown5F_Ch6: ; f2624
+Sfx_Unknown5F_Ch6:
 	sound __,  2, $f7, $ffff
 	sound __,  3, $f7, $0602
 	sound __,  3, $f7, $0702
-	loopchannel 8, Sfx_Unknown5F_branch_f2617
+	loopchannel 8, Sfx_Unknown5F_Ch5
 	endchannel
-; f2635
 
-Sfx_Fanfare2_Ch5: ; f2635
+Sfx_Fanfare2_Ch5:
 	togglesfx
 	sfxpriorityon
 	tempo 256
@@ -5341,9 +4823,8 @@ Sfx_Fanfare2_Ch5: ; f2635
 	note C#, 12
 	sfxpriorityoff
 	endchannel
-; f2658
 
-Sfx_Fanfare2_Ch6: ; f2658
+Sfx_Fanfare2_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $6, $c5
@@ -5362,9 +4843,8 @@ Sfx_Fanfare2_Ch6: ; f2658
 	notetype $4, $c6
 	note F_, 12
 	endchannel
-; f2673
 
-Sfx_Fanfare2_Ch8: ; f2673
+Sfx_Fanfare2_Ch8:
 	togglesfx
 	notetype $6
 	note C_, 1
@@ -5383,9 +4863,8 @@ Sfx_Fanfare2_Ch8: ; f2673
 	note F_, 2
 	note G#, 6
 	endchannel
-; f2687
 
-Sfx_Fanfare_Ch5: ; f2687
+Sfx_Fanfare_Ch5:
 	togglesfx
 	sfxpriorityon
 	tempo 256
@@ -5414,9 +4893,8 @@ Sfx_Fanfare_Ch5: ; f2687
 	note C#, 12
 	sfxpriorityoff
 	endchannel
-; f26af
 
-Sfx_Fanfare_Ch6: ; f26af
+Sfx_Fanfare_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $6, $c4
@@ -5451,9 +4929,8 @@ Sfx_Fanfare_Ch6: ; f26af
 	notetype $4, $c6
 	note F#, 12
 	endchannel
-; f26d8
 
-Sfx_Fanfare_Ch8: ; f26d8
+Sfx_Fanfare_Ch8:
 	togglesfx
 	notetype $6
 	note C_, 1
@@ -5477,42 +4954,35 @@ Sfx_Fanfare_Ch8: ; f26d8
 	note F_, 4
 	note F#, 6
 	endchannel
-; f26f1
 
-Sfx_HangUp_Ch5: ; f26f1
+Sfx_HangUp_Ch5:
 	dutycycle $2
 	sound __,  5, $b8, $077b
 	sound __,  3, $21, $077b
 	sound C_,  1, $0, 0
-Sfx_HangUp_branch_f26ff: ; f26ff
-Sfx_NoSignal_Ch5: ; f26ff
-Sfx_NoSignal_branch_f26ff: ; f26ff
+Sfx_NoSignal_Ch5:
 	dutycycle $2
 	sound C_,  5, $e8, $070b
 	sound C_, 13, $0, 0
-	loopchannel 3, Sfx_HangUp_branch_f26ff
+	loopchannel 3, Sfx_NoSignal_Ch5
 	endchannel
-; f270e
 
-Sfx_Sandstorm_Ch8: ; f270e
-Sfx_Sandstorm_branch_f270e: ; f270e
-Sfx_Unknown5F_Ch8: ; f270e
-Sfx_Unknown5F_branch_f270e: ; f270e
+Sfx_Sandstorm_Ch8:
+Sfx_Unknown5F_Ch8:
 	noise __,  2, $f8, $41
 	noise __,  3, $9c, $24
 	noise __,  1, $0, $0
 	noise __,  4, $59, $16
 	noise __,  3, $0, $0
-	loopchannel 3, Sfx_Sandstorm_branch_f270e
+	loopchannel 3, Sfx_Sandstorm_Ch8
 	endchannel
-; f2722
 
-Sfx_Elevator_Ch5: ; f2722
+Sfx_Elevator_Ch5:
 	dutycycle $2
 	soundinput $5a
-Sfx_Elevator_branch_f2726: ; f2726
+.loop
 	sound __,  3, $f1, $0300
-	loopchannel 48, Sfx_Elevator_branch_f2726
+	loopchannel 48, .loop
 	soundinput $8
 	dutycycle $2
 	sound __, 16, $f3, $0730
@@ -5522,55 +4992,45 @@ Sfx_Elevator_branch_f2726: ; f2726
 	sound __, 16, $44, $0700
 	sound __, 16, $24, $0700
 	endchannel
-; f274b
 
-Sfx_Elevator_Ch6: ; f274b
-Sfx_Elevator_Ch7: ; f274b
+Sfx_Elevator_Ch6:
+Sfx_Elevator_Ch7:
 	sound F_,  1, $0, 0
 	sound E_,  4, $0, 0
 	endchannel
-; f2754
 
-Sfx_Elevator_Ch8: ; f2754
+Sfx_Elevator_Ch8:
 	noise F_,  1, $0, $0
 	noise E_,  4, $0, $0
 	endchannel
-; f275b
 
-Sfx_StopSlot: ; f275b
+Sfx_StopSlot:
 	musicheader 1, 5, Sfx_StopSlot_Ch5
-; f275e
 
-Sfx_StopSlot_Ch5: ; f275e
+Sfx_StopSlot_Ch5:
 	dutycycle $2
 	sound __,  2, $f8, $0760
 	sound __,  5, $82, $0760
 	endchannel
-; f2769
 
-Sfx_GlassTing: ; f2769
+Sfx_GlassTing:
 	musicheader 1, 5, Sfx_GlassTing_Ch5
-; f276c
 
-Sfx_GlassTing_Ch5: ; f276c
+Sfx_GlassTing_Ch5:
 	dutycycle $2
 	sound C#,  1, $d1, $07dc
 	endchannel
-; f2773
 
-Sfx_GlassTing2: ; f2773
+Sfx_GlassTing2:
 	musicheader 2, 5, Sfx_GlassTing2_Ch5
 	musicheader 1, 6, Sfx_GlassTing2_Ch6
-; f2779
 
-Sfx_GlassTing2_Ch5: ; f2779
+Sfx_GlassTing2_Ch5:
 	dutycycle $2
 	sound C_,  1, $f1, $07dc
 	endchannel
-; f2780
 
-Sfx_GlassTing2_Ch6: ; f2780
+Sfx_GlassTing2_Ch6:
 	dutycycle $2
 	sound C_,  1, $d1, $07dd
 	endchannel
-; f2787
diff --git a/audio/sfx_crystal.asm b/audio/sfx_crystal.asm
index 178d4b560..0c283123d 100644
--- a/audio/sfx_crystal.asm
+++ b/audio/sfx_crystal.asm
@@ -1,32 +1,27 @@
-Sfx_IntroUnown1: ; 17982d
+Sfx_IntroUnown1:
 	musicheader 1, 5, Sfx_IntroUnown1_Ch5
-; 179830
 
-Sfx_IntroUnown1_Ch5: ; 179830
+Sfx_IntroUnown1_Ch5:
 	vibrato $1, $a3
 	dutycycle $2
 	sound __,  9, $39, $0705
 	sound C#,  1, $e2, $0705
 	endchannel
-; 17983e
 
-Sfx_IntroUnown2: ; 17983e
+Sfx_IntroUnown2:
 	musicheader 1, 6, Sfx_IntroUnown2_Ch6
-; 179841
 
-Sfx_IntroUnown2_Ch6: ; 179841
+Sfx_IntroUnown2_Ch6:
 	vibrato $1, $73
 	dutycycle $2
 	sound __,  9, $39, $0758
 	sound C#,  1, $e2, $0758
 	endchannel
-; 17984f
 
-Sfx_IntroUnown3: ; 17984f
+Sfx_IntroUnown3:
 	musicheader 1, 7, Sfx_IntroUnown3_Ch7
-; 179852
 
-Sfx_IntroUnown3_Ch7: ; 179852
+Sfx_IntroUnown3_Ch7:
 	vibrato $1, $53
 	sound __,  4, $32, $07c2
 	sound __,  4, $22, $07c2
@@ -35,13 +30,11 @@ Sfx_IntroUnown3_Ch7: ; 179852
 	sound __,  7, $22, $07c2
 	sound __,  7, $32, $07c2
 	endchannel
-; 17986e
 
-Sfx_DittoPopUp: ; 17986e
+Sfx_DittoPopUp:
 	musicheader 1, 5, Sfx_DittoPopUp_Ch5
-; 179871
 
-Sfx_DittoPopUp_Ch5: ; 179871
+Sfx_DittoPopUp_Ch5:
 	dutycycle $2
 	soundinput $1e
 	sound __,  4, $82, $0700
@@ -50,13 +43,11 @@ Sfx_DittoPopUp_Ch5: ; 179871
 	sound __,  5, $b1, $0640
 	sound C_,  1, $31, $0641
 	endchannel
-; 179888
 
-Sfx_DittoTransform: ; 179888
+Sfx_DittoTransform:
 	musicheader 1, 5, Sfx_DittoTransform_Ch5
-; 17988b
 
-Sfx_DittoTransform_Ch5: ; 17988b
+Sfx_DittoTransform_Ch5:
 	dutycycle $1
 	soundinput $26
 	sound C_,  5, $3b, $0440
@@ -64,23 +55,19 @@ Sfx_DittoTransform_Ch5: ; 17988b
 	sound __,  5, $67, $04c1
 	sound __,  5, $42, $04c2
 	endchannel
-; 1798a0
 
-Sfx_IntroSuicune1: ; 1798a0
+Sfx_IntroSuicune1:
 	musicheader 1, 8, Sfx_IntroSuicune1_Ch8
-; 1798a3
 
-Sfx_IntroSuicune1_Ch8: ; 1798a3
+Sfx_IntroSuicune1_Ch8:
 	noise __,  2, $58, $59
 	noise __,  3, $91, $23
 	endchannel
-; 1798aa
 
-Sfx_IntroPichu: ; 1798aa
+Sfx_IntroPichu:
 	musicheader 1, 5, Sfx_IntroPichu_Ch5
-; 1798ad
 
-Sfx_IntroPichu_Ch5: ; 1798ad
+Sfx_IntroPichu_Ch5:
 	dutycycle $3
 	soundinput $4d
 	sound __,  2, $88, $0770
@@ -88,13 +75,11 @@ Sfx_IntroPichu_Ch5: ; 1798ad
 	soundinput $17
 	sound __,  3, $88, $0776
 	endchannel
-; 1798c0
 
-Sfx_IntroSuicune2: ; 1798c0
+Sfx_IntroSuicune2:
 	musicheader 1, 8, Sfx_IntroSuicune2_Ch8
-; 1798c3
 
-Sfx_IntroSuicune2_Ch8: ; 1798c3
+Sfx_IntroSuicune2_Ch8:
 	noise __,  2, $a7, $31
 	noise __,  2, $91, $0
 	noise __,  2, $92, $21
@@ -112,26 +97,22 @@ Sfx_IntroSuicune2_Ch8: ; 1798c3
 	noise __,  2, $23, $0
 	noise __,  2, $13, $10
 	endchannel
-; 1798f4
 
-Sfx_IntroSuicune3: ; 1798f4
+Sfx_IntroSuicune3:
 	musicheader 1, 8, Sfx_IntroSuicune3_Ch8
-; 1798f7
 
-Sfx_IntroSuicune3_Ch8: ; 1798f7
+Sfx_IntroSuicune3_Ch8:
 	noise __,  2, $88, $31
 	noise __,  9, $39, $11
 	noise __,  5, $a4, $10
 	noise __,  5, $44, $10
 	noise __,  5, $24, $10
 	endchannel
-; 179907
 
-Sfx_DittoBounce: ; 179907
+Sfx_DittoBounce:
 	musicheader 1, 5, Sfx_DittoBounce_Ch5
-; 17990a
 
-Sfx_DittoBounce_Ch5: ; 17990a
+Sfx_DittoBounce_Ch5:
 	dutycycle $2
 	soundinput $2c
 	sound __,  3, $82, $04b0
@@ -139,13 +120,11 @@ Sfx_DittoBounce_Ch5: ; 17990a
 	soundinput $34
 	sound C_,  1, $b1, $0420
 	endchannel
-; 17991d
 
-Sfx_IntroSuicune4: ; 17991d
+Sfx_IntroSuicune4:
 	musicheader 1, 8, Sfx_IntroSuicune4_Ch8
-; 179920
 
-Sfx_IntroSuicune4_Ch8: ; 179920
+Sfx_IntroSuicune4_Ch8:
 	noise __,  2, $a1, $5c
 	noise __,  1, $0, $0
 	noise __,  2, $c1, $4d
@@ -158,13 +137,11 @@ Sfx_IntroSuicune4_Ch8: ; 179920
 	noise __,  1, $0, $0
 	noise C#,  1, $72, $0
 	endchannel
-; 179942
 
-Sfx_GameFreakPresents: ; 179942
+Sfx_GameFreakPresents:
 	musicheader 1, 5, Sfx_GameFreakPresents_Ch5
-; 179945
 
-Sfx_GameFreakPresents_Ch5: ; 179945
+Sfx_GameFreakPresents_Ch5:
 	togglesfx
 	dutycycle $2
 	notetype $2, $b1
@@ -185,18 +162,16 @@ Sfx_GameFreakPresents_Ch5: ; 179945
 	intensity $31
 	note G_, 3
 	endchannel
-; 179961
 
-Sfx_Tingle: ; 179961
+Sfx_Tingle:
 	musicheader 1, 5, Sfx_Tingle_Ch5
-; 179964
 
-Sfx_Tingle_Ch5: ; 179964
+Sfx_Tingle_Ch5:
 	togglesfx
 	dutycycle $1
 	pitchoffset 0, B_
 	notetype $1, $b1
-Sfx_Tingle_branch_17996c: ; 17996c
+.loop
 	octave 5
 	note C_, 3
 	octave 6
@@ -204,33 +179,29 @@ Sfx_Tingle_branch_17996c: ; 17996c
 	octave 5
 	note C_, 3
 	note __, 2
-	loopchannel 2, Sfx_Tingle_branch_17996c
+	loopchannel 2, .loop
 	note C_, 2
 	intensity $a1
 	note G_, 13
 	endchannel
-; 17997c
 
-Sfx_TwoPcBeeps: ; 17997c
+Sfx_TwoPcBeeps:
 	musicheader 1, 5, Sfx_TwoPcBeeps_Ch5
-; 17997f
 
-Sfx_TwoPcBeeps_Ch5: ; 17997f
+Sfx_TwoPcBeeps_Ch5:
 	dutycycle $2
 	sound __,  3, $e8, $07c2
 	sound __,  3, $28, $07c2
 	sound __,  3, $e8, $07c2
 	sound __,  3, $28, $07c2
 	endchannel
-; 179992
 
-Sfx_4NoteDitty: ; 179992
+Sfx_4NoteDitty:
 	musicheader 3, 5, Sfx_4NoteDitty_Ch5
 	musicheader 1, 6, Sfx_4NoteDitty_Ch6
 	musicheader 1, 7, Sfx_4NoteDitty_Ch7
-; 17999b
 
-Sfx_4NoteDitty_Ch5: ; 17999b
+Sfx_4NoteDitty_Ch5:
 	togglesfx
 	dutycycle $2
 	notetype $2, $e8
@@ -254,29 +225,25 @@ Sfx_4NoteDitty_Ch5: ; 17999b
 	intensity $43
 	note C_, 16
 	endchannel
-; 1799bd
 
-Sfx_4NoteDitty_Ch6: ; 1799bd
+Sfx_4NoteDitty_Ch6:
 	togglesfx
 	notetype $2, $b8
 	note __, 9
 	note __, 16
 	endchannel
-; 1799c4
 
-Sfx_4NoteDitty_Ch7: ; 1799c4
+Sfx_4NoteDitty_Ch7:
 	togglesfx
 	notetype $2, $b8
 	note __, 9
 	note __, 16
 	endchannel
-; 1799cb
 
-Sfx_Twinkle: ; 1799cb
+Sfx_Twinkle:
 	musicheader 1, 5, Sfx_Twinkle_Ch5
-; 1799ce
 
-Sfx_Twinkle_Ch5: ; 1799ce
+Sfx_Twinkle_Ch5:
 	togglesfx
 	dutycycle $0
 	pitchoffset 0, D_
@@ -300,4 +267,3 @@ Sfx_Twinkle_Ch5: ; 1799ce
 	octave 5
 	note G_, 6
 	endchannel
-; 1799ef
diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm
index 9cbe1d0eb..0e066c60a 100644
--- a/audio/sfx_pointers.asm
+++ b/audio/sfx_pointers.asm
@@ -1,6 +1,5 @@
-SFX: ; e927c
+SFX:
 ; entries correspond to SFX_* constants
-
 	dba Sfx_DexFanfare5079
 	dba Sfx_Item
 	dba Sfx_CaughtMon
@@ -191,9 +190,7 @@ SFX: ; e927c
 	dba Sfx_2Boops
 	dba Sfx_GlassTing
 	dba Sfx_GlassTing2
-
-; Crystal adds the following SFX:
-
+; new to Crystal
 	dba Sfx_IntroUnown1
 	dba Sfx_IntroUnown2
 	dba Sfx_IntroUnown3
@@ -207,8 +204,7 @@ SFX: ; e927c
 	dba Sfx_IntroSuicune4
 	dba Sfx_GameFreakPresents
 	dba Sfx_Tingle
-	dba Sfx_UnknownCB
+	dba Sfx_IntroWhoosh
 	dba Sfx_TwoPcBeeps
 	dba Sfx_4NoteDitty
 	dba Sfx_Twinkle
-; e94e9
diff --git a/audio/wave_samples.asm b/audio/wave_samples.asm
index d48259888..81fee2119 100644
--- a/audio/wave_samples.asm
+++ b/audio/wave_samples.asm
@@ -1,6 +1,6 @@
-WaveSamples: ; e8db2
-	; these are streams of 32 4-bit values used as wavepatterns
-	; nothing interesting here!
+WaveSamples:
+	; These are streams of 32 nybbles (4-bit values) used as wave patterns.
+	; Plot them as a line chart to see the wave's shape.
 	dn  0,  2,  4,  6,  8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10,  9,  8,  7,  6,  5,  4,  4,  3,  3,  2,  2,  1,  1
 	dn  0,  2,  4,  6,  8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10,  9,  8,  7,  6,  5,  4,  3,  2,  2,  1,  1
 	dn  1,  3,  6,  9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11,  9,  6,  3,  1
@@ -11,4 +11,3 @@ WaveSamples: ; e8db2
 	dn 12,  0, 10,  9,  8,  7, 15,  5, 15, 15, 15, 14, 14, 13, 13, 12,  4,  4,  3,  3,  2,  2, 15,  1,  0,  2,  4,  6,  8, 10, 12, 14
 	dn  4,  4,  3,  3,  2,  2,  1, 15,  0,  0,  4,  6,  8, 10, 12, 14, 15,  8, 15, 14, 14, 13, 13, 12, 12, 11, 10,  9,  8,  7,  6,  5
 	dn  1,  1,  0,  0,  0,  0,  0,  8,  0,  0,  1,  3,  5,  7,  9, 10, 11,  4, 11, 10, 10,  9,  9,  8,  8,  7,  6,  5,  4,  3,  2,  1
-; e8e52
diff --git a/charmap.asm b/charmap.asm
index bd5813b00..d5bd2bcf1 100644
--- a/charmap.asm
+++ b/charmap.asm
@@ -2,9 +2,12 @@
 
 ; Control characters (see home/text.asm)
 
+	charmap "<NULL>",    $00
 	charmap "<PLAY_G>",  $14 ; "<PLAYER>くん" or "<PLAYER>ちゃん"; same as "<PLAYER>" in English
+	charmap "<MOBILE>",  $15
+	charmap "<CR>",      $16
 	charmap "¯",         $1f ; soft linebreak
-	charmap "<LNBRK>",   $22
+	charmap "<LF>",      $22
 	charmap "<POKE>",    $24 ; "<PO><KE>"
 	charmap "%",         $25 ; soft linebreak in landmark names
 	charmap "<RED>",     $38 ; wRedsName
@@ -86,7 +89,7 @@
 	charmap "▲",         $61 ; gfx/font/up_arrow.png
 	charmap "☎",         $62 ; gfx/font/phone_icon.2bpp
 
-	; needed for Special_MagikarpHouseSign (see engine/events/magikarp.asm)
+	; needed for MagikarpHouseSign (see engine/events/magikarp.asm)
 	charmap "′",         $6e ; gfx/font/feet_inches.png
 	charmap "″",         $6f ; gfx/font/feet_inches.png
 
diff --git a/constants.asm b/constants.asm
index 4931bdd5f..28736a1a9 100644
--- a/constants.asm
+++ b/constants.asm
@@ -5,48 +5,51 @@ INCLUDE "macros.asm"
 INCLUDE "hram.asm"
 
 INCLUDE "constants/hardware_constants.asm"
+INCLUDE "constants/deco_constants.asm"
 INCLUDE "constants/wram_constants.asm"
-INCLUDE "constants/pokemon_constants.asm"
-INCLUDE "constants/type_constants.asm"
-INCLUDE "constants/move_constants.asm"
-INCLUDE "constants/move_effect_constants.asm"
-INCLUDE "constants/battle_constants.asm"
+INCLUDE "constants/misc_constants.asm"
+INCLUDE "constants/input_constants.asm"
+INCLUDE "constants/gfx_constants.asm"
+INCLUDE "constants/text_constants.asm"
+INCLUDE "constants/audio_constants.asm"
 INCLUDE "constants/battle_anim_constants.asm"
+INCLUDE "constants/battle_constants.asm"
+INCLUDE "constants/battle_tower_constants.asm"
+INCLUDE "constants/collision_constants.asm"
+INCLUDE "constants/credits_constants.asm"
+INCLUDE "constants/cry_constants.asm"
+INCLUDE "constants/engine_flags.asm"
+INCLUDE "constants/event_flags.asm"
+INCLUDE "constants/icon_constants.asm"
+INCLUDE "constants/item_constants.asm"
+INCLUDE "constants/item_data_constants.asm"
+INCLUDE "constants/landmark_constants.asm"
 INCLUDE "constants/map_constants.asm"
 INCLUDE "constants/map_data_constants.asm"
+INCLUDE "constants/map_object_constants.asm"
 INCLUDE "constants/map_setup_constants.asm"
-INCLUDE "constants/landmark_constants.asm"
-INCLUDE "constants/item_constants.asm"
-INCLUDE "constants/item_data_constants.asm"
-INCLUDE "constants/trainer_constants.asm"
-INCLUDE "constants/trainer_data_constants.asm"
-INCLUDE "constants/script_constants.asm"
-INCLUDE "constants/event_flags.asm"
-INCLUDE "constants/engine_flags.asm"
+INCLUDE "constants/mart_constants.asm"
+INCLUDE "constants/menu_constants.asm"
+INCLUDE "constants/mobile_constants.asm"
+INCLUDE "constants/move_constants.asm"
+INCLUDE "constants/move_effect_constants.asm"
 INCLUDE "constants/music_constants.asm"
-INCLUDE "constants/sfx_constants.asm"
+INCLUDE "constants/npc_trade_constants.asm"
 INCLUDE "constants/phone_constants.asm"
-INCLUDE "constants/credits_constants.asm"
-INCLUDE "constants/gfx_constants.asm"
-INCLUDE "constants/input_constants.asm"
+INCLUDE "constants/pokemon_constants.asm"
 INCLUDE "constants/pokemon_data_constants.asm"
-INCLUDE "constants/icon_constants.asm"
-INCLUDE "constants/serial_constants.asm"
-INCLUDE "constants/mobile_constants.asm"
-INCLUDE "constants/text_constants.asm"
-INCLUDE "constants/misc_constants.asm"
-INCLUDE "constants/std_constants.asm"
-INCLUDE "constants/deco_constants.asm"
+INCLUDE "constants/printer_constants.asm"
 INCLUDE "constants/radio_constants.asm"
-INCLUDE "constants/npctrade_constants.asm"
+INCLUDE "constants/scgb_constants.asm"
+INCLUDE "constants/scene_constants.asm"
+INCLUDE "constants/script_constants.asm"
+INCLUDE "constants/serial_constants.asm"
+INCLUDE "constants/sfx_constants.asm"
+INCLUDE "constants/sprite_anim_constants.asm"
 INCLUDE "constants/sprite_constants.asm"
 INCLUDE "constants/sprite_data_constants.asm"
-INCLUDE "constants/sprite_anim_constants.asm"
+INCLUDE "constants/std_constants.asm"
 INCLUDE "constants/tileset_constants.asm"
-INCLUDE "constants/collision_constants.asm"
-INCLUDE "constants/scgb_constants.asm"
-INCLUDE "constants/battle_tower_constants.asm"
-INCLUDE "constants/cry_constants.asm"
-INCLUDE "constants/audio_constants.asm"
-INCLUDE "constants/printer_constants.asm"
-INCLUDE "constants/menu_constants.asm"
+INCLUDE "constants/trainer_constants.asm"
+INCLUDE "constants/trainer_data_constants.asm"
+INCLUDE "constants/type_constants.asm"
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm
index 7aa0895a3..ec8311dfe 100755..100644
--- a/constants/audio_constants.asm
+++ b/constants/audio_constants.asm
@@ -17,7 +17,7 @@
 	const CC ; d (used for pitchoffset)
 
 ; channel
-; ChannelPointers indexes (see engine/audio.asm)
+; ChannelPointers indexes (see audio/engine.asm)
 	const_def
 	const CHAN1 ; 0
 	const CHAN2 ; 1
@@ -31,6 +31,48 @@ NUM_NOISE_CHANS EQU const_value
 	const CHAN8 ; 7
 NUM_CHANNELS EQU const_value
 
+; channel_struct members (see macros/wram.asm)
+CHANNEL_MUSIC_ID                    EQUS "(wChannel1MusicID - wChannel1)"
+CHANNEL_MUSIC_BANK                  EQUS "(wChannel1MusicBank - wChannel1)"
+CHANNEL_FLAGS1                      EQUS "(wChannel1Flags1 - wChannel1)"
+CHANNEL_FLAGS2                      EQUS "(wChannel1Flags2 - wChannel1)"
+CHANNEL_FLAGS3                      EQUS "(wChannel1Flags3 - wChannel1)"
+CHANNEL_MUSIC_ADDRESS               EQUS "(wChannel1MusicAddress - wChannel1)"
+CHANNEL_LAST_MUSIC_ADDRESS          EQUS "(wChannel1LastMusicAddress - wChannel1)"
+CHANNEL_NOTE_FLAGS                  EQUS "(wChannel1NoteFlags - wChannel1)"
+CHANNEL_CONDITION                   EQUS "(wChannel1Condition - wChannel1)"
+CHANNEL_DUTY_CYCLE                  EQUS "(wChannel1DutyCycle - wChannel1)"
+CHANNEL_INTENSITY                   EQUS "(wChannel1Intensity - wChannel1)"
+CHANNEL_FREQUENCY                   EQUS "(wChannel1Frequency - wChannel1)"
+CHANNEL_PITCH                       EQUS "(wChannel1Pitch - wChannel1)"
+CHANNEL_OCTAVE                      EQUS "(wChannel1Octave - wChannel1)"
+CHANNEL_PITCH_OFFSET                EQUS "(wChannel1PitchOffset - wChannel1)"
+CHANNEL_NOTE_DURATION               EQUS "(wChannel1NoteDuration - wChannel1)"
+CHANNEL_FIELD16                     EQUS "(wChannel1Field16 - wChannel1)"
+CHANNEL_LOOP_COUNT                  EQUS "(wChannel1LoopCount - wChannel1)"
+CHANNEL_TEMPO                       EQUS "(wChannel1Tempo - wChannel1)"
+CHANNEL_TRACKS                      EQUS "(wChannel1Tracks - wChannel1)"
+CHANNEL_SFX_DUTY_LOOP               EQUS "(wChannel1SFXDutyLoop - wChannel1)"
+CHANNEL_VIBRATO_DELAY_COUNT         EQUS "(wChannel1VibratoDelayCount - wChannel1)"
+CHANNEL_VIBRATO_DELAY               EQUS "(wChannel1VibratoDelay - wChannel1)"
+CHANNEL_VIBRATO_EXTENT              EQUS "(wChannel1VibratoExtent - wChannel1)"
+CHANNEL_VIBRATO_RATE                EQUS "(wChannel1VibratoRate - wChannel1)"
+CHANNEL_PITCH_WHEEL_TARGET          EQUS "(wChannel1PitchWheelTarget - wChannel1)"
+CHANNEL_PITCH_WHEEL_AMOUNT          EQUS "(wChannel1PitchWheelAmount - wChannel1)"
+CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION EQUS "(wChannel1PitchWheelAmountFraction - wChannel1)"
+CHANNEL_FIELD25                     EQUS "(wChannel1Field25 - wChannel1)"
+CHANNEL_CRY_PITCH                   EQUS "(wChannel1CryPitch - wChannel1)"
+CHANNEL_FIELD29                     EQUS "(wChannel1Field29 - wChannel1)"
+CHANNEL_FIELD2A                     EQUS "(wChannel1Field2a - wChannel1)"
+CHANNEL_FIELD2C                     EQUS "(wChannel1Field2c - wChannel1)"
+CHANNEL_NOTE_LENGTH                 EQUS "(wChannel1NoteLength - wChannel1)"
+CHANNEL_FIELD2E                     EQUS "(wChannel1Field2e - wChannel1)"
+CHANNEL_FIELD2F                     EQUS "(wChannel1Field2f - wChannel1)"
+CHANNEL_FIELD30                     EQUS "(wChannel1Field30 - wChannel1)"
+CHANNEL_STRUCT_LENGTH               EQUS "(wChannel2 - wChannel1)"
+
+NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7
+
 ; Flags1
 	const_def
 	const SOUND_CHANNEL_ON ; 0
@@ -67,11 +109,11 @@ NUM_CHANNELS EQU const_value
 	const NOTE_VIBRATO_OVERRIDE ; 6
 
 ; wVolume
-VOLUME_SO1_F EQU 3
-VOLUME_SO2_F EQU 7
+VOLUME_SO1_F     EQU 3
+VOLUME_SO2_F     EQU 7
 VOLUME_SO1_LEVEL EQU %00000111
 VOLUME_SO2_LEVEL EQU %01110000
-MAX_VOLUME EQU $77
+MAX_VOLUME       EQU $77
 
 ; wSoundInput
 SOUND_INPUT_CH1_F    EQU 0
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm
index c55d4e9d6..58e19462e 100644
--- a/constants/battle_anim_constants.asm
+++ b/constants/battle_anim_constants.asm
@@ -708,7 +708,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
 	const BATTLEANIMOAMSET_D7
 
 ; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm)
-const_value set 1
+	const_def 1
 	const ANIM_BG_FLASH_INVERTED
 	const ANIM_BG_FLASH_WHITE
 	const ANIM_BG_WHITE_HUES
@@ -764,7 +764,7 @@ const_value set 1
 	const ANIM_BG_35
 
 ; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm)
-const_value set 1
+	const_def 1
 	const ANIM_GFX_HIT
 	const ANIM_GFX_CUT
 	const ANIM_GFX_FIRE
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index 2355cc5d1..e9fe6acbd 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -55,12 +55,13 @@ MOVE_LENGTH EQU const_value
 ; indexes for:
 ; - wPlayerStats and wEnemyStats (see wram.asm)
 ; - party_struct and battle_struct members (see macros/wram.asm)
-const_value set 1
+	const_def 1
 	const STAT_HP
 	const STAT_ATK
 	const STAT_DEF
 	const STAT_SPD
 	const STAT_SATK
+NUM_EXP_STATS EQU const_value + -1
 	const STAT_SDEF
 NUM_STATS EQU const_value
 STAT_SPC EQU STAT_SATK
@@ -76,7 +77,7 @@ ATKDEFDV_SHINY EQU $EA
 SPDSPCDV_SHINY EQU $AA
 
 ; battle classes (wBattleMode values)
-const_value set 1
+	const_def 1
 	const WILD_BATTLE
 	const TRAINER_BATTLE
 
@@ -96,7 +97,7 @@ const_value set 1
 	const BATTLETYPE_CELEBI
 	const BATTLETYPE_SUICUNE
 
-; GetBattleVar and GetBattleVarAddr arguments (see home/battle.asm)
+; BattleVarPairs indexes (see home/battle.asm)
 	const_def
 	const BATTLE_VARS_SUBSTATUS1
 	const BATTLE_VARS_SUBSTATUS2
@@ -120,7 +121,7 @@ const_value set 1
 	const BATTLE_VARS_LAST_MOVE
 	const BATTLE_VARS_LAST_MOVE_OPP
 
-; GetBattleVar and GetBattleVarAddr internal indexes (see home/battle.asm)
+; BattleVarLocations indexes (see home/battle.asm)
 	const_def
 	const PLAYER_SUBSTATUS_1
 	const ENEMY_SUBSTATUS_1
@@ -151,13 +152,13 @@ const_value set 1
 
 ; status condition bit flags
 SLP EQU %111 ; 0-7 turns
-const_value set 3
+	const_def 3
 	const PSN
 	const BRN
 	const FRZ
 	const PAR
 
-ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP
+ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP
 
 ; wPlayerSubStatus1 or wEnemySubStatus1 bit flags
 	enum_start 7, -1
@@ -248,3 +249,7 @@ SUBSTATUS_CURLED EQU 0
 	const WIN
 	const LOSE
 	const DRAW
+
+BATTLERESULT_CAUGHT_CELEBI EQU 6
+BATTLERESULT_BOX_FULL EQU 7
+BATTLERESULT_BITMASK EQU (1 << BATTLERESULT_CAUGHT_CELEBI) | (1 << BATTLERESULT_BOX_FULL)
diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm
index 71b8de8be..0965d626a 100755..100644
--- a/constants/battle_tower_constants.asm
+++ b/constants/battle_tower_constants.asm
@@ -1,7 +1,7 @@
 BATTLETOWER_PARTY_LENGTH EQU 3
 BATTLETOWER_STREAK_LENGTH EQU 7
 
-BATTLETOWER_NUM_UNIQUE_PKMN EQU 21
+BATTLETOWER_NUM_UNIQUE_MON EQU 21
 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70
 
 BATTLETOWER_TRAINERDATALENGTH EQU $24
@@ -47,7 +47,7 @@ BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * (P
 MOBILE_EVENT_OBJECT_GS_BALL EQU $b
 
 ; BattleTowerText arguments (see engine/events/battle_tower/trainer_text.asm)
-const_value set 1
+	const_def 1
 	const BATTLETOWERTEXT_INTRO
 	const BATTLETOWERTEXT_WIN_TEXT
 	const BATTLETOWERTEXT_LOSS_TEXT
diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm
index 86fdf9384..b693dc8f8 100644
--- a/constants/collision_constants.asm
+++ b/constants/collision_constants.asm
@@ -113,3 +113,5 @@ HI_NYBBLE_WALK       EQU $40
 HI_NYBBLE_WALK_ALT   EQU $50
 HI_NYBBLE_WARPS      EQU $70
 HI_NYBBLE_LEDGES     EQU $a0
+HI_NYBBLE_SIDE_WALLS EQU $b0
+HI_NYBBLE_UNUSED_C0  EQU $c0
diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm
index fba7583c0..7b23e11e1 100644
--- a/constants/credits_constants.asm
+++ b/constants/credits_constants.asm
@@ -105,7 +105,7 @@
 	const PAAD_TESTING
 
 ; CreditsScript indexes (see data/credits_script.asm)
-const_value set -7
+	const_def -7
 	const CREDITS_THEEND
 	const CREDITS_WAIT2
 	const CREDITS_MUSIC
diff --git a/constants/cry_constants.asm b/constants/cry_constants.asm
index 654aac523..654aac523 100755..100644
--- a/constants/cry_constants.asm
+++ b/constants/cry_constants.asm
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm
index 84fcdb94d..f385e7cd7 100644
--- a/constants/deco_constants.asm
+++ b/constants/deco_constants.asm
@@ -35,7 +35,7 @@ const_value = 1
 	const YELLOW_CARPET
 	const GREEN_CARPET
 
-; DoDecorationAction2.DecoActions indexes (see engine/decorations.asm)
+; DoDecorationAction2.DecoActions indexes (see engine/overworld/decorations.asm)
 const_value = 1
 	const SET_UP_BED
 	const PUT_AWAY_BED
@@ -64,41 +64,41 @@ ENDM
 ; - DecorationIDs (see data/decorations/decorations.asm)
 const_value = 1
 __enum__ = 0
-; FindOwnedBeds.beds values (see engine/decorations.asm)
+; FindOwnedBeds.beds values (see engine/overworld/decorations.asm)
 	const BEDS
 	deco  FEATHERY_BED
 	deco  PINK_BED
 	deco  POLKADOT_BED
 	deco  PIKACHU_BED
-; FindOwnedCarpets.carpets values (see engine/decorations.asm)
+; FindOwnedCarpets.carpets values (see engine/overworld/decorations.asm)
 	const CARPETS
 	deco  RED_CARPET
 	deco  BLUE_CARPET
 	deco  YELLOW_CARPET
 	deco  GREEN_CARPET
-; FindOwnedPlants.plants values (see engine/decorations.asm)
+; FindOwnedPlants.plants values (see engine/overworld/decorations.asm)
 	const PLANTS
 	deco  MAGNAPLANT
 	deco  TROPICPLANT
 	deco  JUMBOPLANT
-; FindOwnedPosters.posters values (see engine/decorations.asm)
+; FindOwnedPosters.posters values (see engine/overworld/decorations.asm)
 	const POSTERS
 	deco  TOWN_MAP
 	deco  PIKACHU_POSTER
 	deco  CLEFAIRY_POSTER
 	deco  JIGGLYPUFF_POSTER
-; FindOwnedConsoles.consoles values (see engine/decorations.asm)
+; FindOwnedConsoles.consoles values (see engine/overworld/decorations.asm)
 	const CONSOLES
 	deco  FAMICOM
 	deco  SNES
 	deco  N64
 	deco  VIRTUAL_BOY
-; FindOwnedBigDolls.big_dolls values (see engine/decorations.asm)
+; FindOwnedBigDolls.big_dolls values (see engine/overworld/decorations.asm)
 	const BIG_DOLLS
 	deco  BIG_SNORLAX_DOLL
 	deco  BIG_ONIX_DOLL
 	deco  BIG_LAPRAS_DOLL
-; FindOwnedOrnaments.ornaments values (see engine/decorations.asm)
+; FindOwnedOrnaments.ornaments values (see engine/overworld/decorations.asm)
 	const DOLLS
 	deco  PIKACHU_DOLL
 	deco  SURF_PIKACHU_DOLL
@@ -121,8 +121,7 @@ __enum__ = 0
 	deco  GEODUDE_DOLL
 	deco  MACHOP_DOLL
 	deco  TENTACOOL_DOLL
+NUM_NON_TROPHY_DECOS = __enum__
 	deco  GOLD_TROPHY_DOLL
 	deco  SILVER_TROPHY_DOLL
-
 NUM_DECOS = __enum__
-NUM_NON_TROPHY_DECOS = NUM_DECOS +- 2
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm
index ad8632db0..518edf806 100644
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -1,4 +1,4 @@
-; EngineFlags indexes (see engine/engine_flasg.asm)
+; EngineFlags indexes (see engine/engine_flags.asm)
 	const_def
 ; wPokegearFlags
 	const ENGINE_RADIO_CARD
@@ -13,23 +13,23 @@
 	const ENGINE_DAY_CARE_LADY_HAS_MON
 ; wMomSavingMoney
 	const ENGINE_MOM_SAVING_MONEY
-	const ENGINE_DST
+	const ENGINE_MOM_ACTIVE
 ; wUnusedTwoDayTimerOn
 	const ENGINE_0A
 ; wStatusFlags
 	const ENGINE_POKEDEX
 	const ENGINE_UNOWN_DEX
-	const ENGINE_POKERUS
+	const ENGINE_CAUGHT_POKERUS
 	const ENGINE_ROCKET_SIGNAL_ON_CH20
 	const ENGINE_CREDITS_SKIP
-	const ENGINE_BUG_CONTEST_ON ; 10
+	const ENGINE_MAIN_MENU_MOBILE_CHOICES ; 10
 ; wStatusFlags2
 	const ENGINE_BUG_CONTEST_TIMER
 	const ENGINE_SAFARI_ZONE
 	const ENGINE_ROCKETS_IN_RADIO_TOWER
 	const ENGINE_BIKE_SHOP_CALL_ENABLED
-	const ENGINE_GIVE_POKERUS
-	const ENGINE_FLORIA
+	const ENGINE_15
+	const ENGINE_REACHED_GOLDENROD
 	const ENGINE_ROCKETS_IN_MAHOGANY
 ; wBikeFlags
 	const ENGINE_STRENGTH_ACTIVE
@@ -54,16 +54,16 @@
 	const ENGINE_VOLCANOBADGE
 	const ENGINE_EARTHBADGE
 ; wUnlockedUnowns
-	const ENGINE_UNLOCKED_UNOWNS_1
-	const ENGINE_UNLOCKED_UNOWNS_2
-	const ENGINE_UNLOCKED_UNOWNS_3
-	const ENGINE_UNLOCKED_UNOWNS_4
-	const ENGINE_UNLOCKED_UNOWNS_5
-	const ENGINE_UNLOCKED_UNOWNS_6 ; 30
-	const ENGINE_UNLOCKED_UNOWNS_7
-	const ENGINE_UNLOCKED_UNOWNS_8
+	const ENGINE_UNLOCKED_UNOWNS_A_TO_K
+	const ENGINE_UNLOCKED_UNOWNS_L_TO_R
+	const ENGINE_UNLOCKED_UNOWNS_S_TO_W
+	const ENGINE_UNLOCKED_UNOWNS_X_TO_Z
+	const ENGINE_UNLOCKED_UNOWNS_UNUSED_4
+	const ENGINE_UNLOCKED_UNOWNS_UNUSED_5 ; 30
+	const ENGINE_UNLOCKED_UNOWNS_UNUSED_6
+	const ENGINE_UNLOCKED_UNOWNS_UNUSED_7
 ; wVisitedSpawns
-	const ENGINE_FLYPOINT_KRISS_HOUSE
+	const ENGINE_FLYPOINT_PLAYERS_HOUSE
 	const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER
 	const ENGINE_FLYPOINT_PALLET
 	const ENGINE_FLYPOINT_VIRIDIAN
@@ -97,18 +97,18 @@
 ; wDailyFlags
 	const ENGINE_KURT_MAKING_BALLS ; 50
 	const ENGINE_DAILY_BUG_CONTEST
-	const ENGINE_SPECIAL_WILDDATA
+	const ENGINE_FISH_SWARM
 	const ENGINE_TIME_CAPSULE
 	const ENGINE_ALL_FRUIT_TREES
-	const ENGINE_SHUCKLE_GIVEN
+	const ENGINE_GOT_SHUCKIE_TODAY
 	const ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
 	const ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
 ; wWeeklyFlags
 	const ENGINE_MT_MOON_SQUARE_CLEFAIRY
 	const ENGINE_UNION_CAVE_LAPRAS
 	const ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
-	const ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
-	const ENGINE_TEA_IN_BLUES_HOUSE
+	const ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
+	const ENGINE_DAISYS_GROOMING
 	const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
 	const ENGINE_DAILY_MOVE_TUTOR
 	const ENGINE_BUENAS_PASSWORD
@@ -120,7 +120,7 @@
 ; wPlayerGender
 	const ENGINE_PLAYER_IS_FEMALE
 ; wCelebiEvent
-	const ENGINE_HAVE_EXAMINED_GS_BALL
+	const ENGINE_FOREST_IS_RESTLESS
 ; wDailyRematchFlags
 	const ENGINE_JACK
 	const ENGINE_HUEY
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index 9ee7ff40a..879f12852 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -1,14 +1,14 @@
 ; wEventFlags bit flags
 	const_def
 ; The first eight flags are reset upon reloading the map
-	const EVENT_GAVE_KURT_APRICORNS ; 000
-	const EVENT_RECEIVED_BALLS_FROM_KURT
-	const EVENT_DRAGON_SHRINE_QUESTION_2
-	const EVENT_DRAGON_SHRINE_QUESTION_3
-	const EVENT_DRAGON_SHRINE_QUESTION_4
-	const EVENT_DRAGON_SHRINE_QUESTION_5
-	const EVENT_JUST_RECEIVED_DRATINI
-	const EVENT_IN_YOUR_ROOM
+	const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 ; 000
+	const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
+	const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
+	const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
+	const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
+	const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7
+	const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
 ; Johto Gym Leader TM gifts
 	const EVENT_GOT_TM31_MUD_SLAP
 	const EVENT_GOT_TM49_FURY_CUTTER
@@ -730,7 +730,7 @@
 	const EVENT_DECO_GEODUDE_DOLL
 	const EVENT_DECO_MACHOP_DOLL
 	const EVENT_DECO_TENTACOOL_DOLL
-	const EVENT_KRISS_ROOM_POSTER
+	const EVENT_PLAYERS_ROOM_POSTER
 	const EVENT_DECO_GOLD_TROPHY
 	const EVENT_DECO_SILVER_TROPHY
 	const EVENT_DECO_BIG_SNORLAX_DOLL
@@ -1806,8 +1806,8 @@
 	const EVENT_RIVAL_SPROUT_TOWER
 	const EVENT_RIVAL_BURNED_TOWER
 	const EVENT_RIVAL_DRAGONS_DEN
-	const EVENT_KRISS_HOUSE_MOM_1
-	const EVENT_KRISS_HOUSE_MOM_2
+	const EVENT_PLAYERS_HOUSE_MOM_1
+	const EVENT_PLAYERS_HOUSE_MOM_2
 	const EVENT_MR_POKEMONS_HOUSE_OAK
 	const EVENT_VIOLET_CITY_EARL
 	const EVENT_EARLS_ACADEMY_EARL
@@ -1928,10 +1928,10 @@
 	const EVENT_KURTS_HOUSE_KURT_1
 	const EVENT_KURTS_HOUSE_KURT_2
 	const EVENT_SLOWPOKE_WELL_KURT ; 740
-	const EVENT_KRISS_HOUSE_2F_CONSOLE
-	const EVENT_KRISS_HOUSE_2F_DOLL_1
-	const EVENT_KRISS_HOUSE_2F_DOLL_2
-	const EVENT_KRISS_HOUSE_2F_BIG_DOLL
+	const EVENT_PLAYERS_HOUSE_2F_CONSOLE
+	const EVENT_PLAYERS_HOUSE_2F_DOLL_1
+	const EVENT_PLAYERS_HOUSE_2F_DOLL_2
+	const EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
 	const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
 	const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
 	const EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
@@ -2012,8 +2012,8 @@
 	const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
 	const EVENT_DRAGON_SHRINE_CLAIR ; 790
 	const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
-	const EVENT_KRISS_HOUSE_1F_NEIGHBOR
-	const EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
+	const EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
+	const EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
 	const EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
 	const EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
 	const EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
@@ -2043,7 +2043,7 @@
 	const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
 	const EVENT_SAW_SUICUNE_ON_ROUTE_42
 	const EVENT_SAW_SUICUNE_ON_ROUTE_36 ; 7b0
-	const EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
+	const EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
 	const EVENT_TIN_TOWER_1F_SUICUNE
 	const EVENT_TIN_TOWER_1F_ENTEI
 	const EVENT_TIN_TOWER_1F_RAIKOU
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm
index 6ac7dbba4..41a67a648 100644
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -3,6 +3,8 @@ LEN_1BPP_TILE EQU 1 * TILE_WIDTH ; bytes
 LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes
 
 NUM_PAL_COLORS EQU 4
+PAL_COLOR_SIZE EQU 2
+PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE
 
 PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff
 
@@ -13,14 +15,23 @@ SCREEN_HEIGHT_PX EQU SCREEN_HEIGHT * TILE_WIDTH ; pixels
 
 BG_MAP_WIDTH  EQU 32 ; tiles
 BG_MAP_HEIGHT EQU 32 ; tiles
-WMISC_WIDTH   EQU 6 * 4
-WMISC_HEIGHT  EQU 5 * 4
+
+METATILE_WIDTH EQU 4 ; tiles
+SCREEN_META_WIDTH EQU 6 ; metatiles
+SCREEN_META_HEIGHT EQU 5 ; metatiles
+SURROUNDING_WIDTH  EQU SCREEN_META_WIDTH * METATILE_WIDTH ; tiles
+SURROUNDING_HEIGHT EQU SCREEN_META_HEIGHT * METATILE_WIDTH ; tiles
 
 HP_BAR_LENGTH  EQU 6 ; tiles
 EXP_BAR_LENGTH EQU 8 ; tiles
 HP_BAR_LENGTH_PX  EQU HP_BAR_LENGTH  * TILE_WIDTH ; pixels
 EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels
 
+; GetHPPal return values (see home.asm)
+HP_GREEN  EQU 0
+HP_YELLOW EQU 1
+HP_RED    EQU 2
+
 ; sprite_oam_struct members (see macros/wram.asm)
 	const_def
 	const SPRITEOAMSTRUCT_YCOORD     ; 0
@@ -29,3 +40,15 @@ EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels
 	const SPRITEOAMSTRUCT_ATTRIBUTES ; 3
 SPRITEOAMSTRUCT_LENGTH EQU const_value
 NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM
+
+; PokeAnims indexes (see engine/gfx/pic_animation.asm)
+	const_def
+	const ANIM_MON_SLOW
+	const ANIM_MON_NORMAL
+	const ANIM_MON_MENU
+	const ANIM_MON_TRADE
+	const ANIM_MON_EVOLVE
+	const ANIM_MON_HATCH
+	const ANIM_MON_UNUSED
+	const ANIM_MON_EGG1
+	const ANIM_MON_EGG2
diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm
index d96672c3a..34c7d6813 100644
--- a/constants/hardware_constants.asm
+++ b/constants/hardware_constants.asm
@@ -58,10 +58,6 @@ X_FLIP       EQU 1 << OAM_X_FLIP    ; $20
 Y_FLIP       EQU 1 << OAM_Y_FLIP    ; $40
 PRIORITY     EQU 1 << OAM_PRIORITY  ; $80
 
-; Other useful constants
-LCDC_DEFAULT EQU %11100011
-LY_VBLANK    EQU 144
-
 ; Hardware registers
 rJOYP       EQU $ff00 ; Joypad (R/W)
 rSB         EQU $ff01 ; Serial transfer data (R/W)
@@ -119,14 +115,20 @@ rWave_d     EQU $ff3d
 rWave_e     EQU $ff3e
 rWave_f     EQU $ff3f
 rLCDC       EQU $ff40 ; LCD Control (R/W)
+rLCDC_BG_PRIORITY    EQU 0 ; 0=Off, 1=On
 rLCDC_SPRITES_ENABLE EQU 1 ; 0=Off, 1=On
 rLCDC_SPRITE_SIZE    EQU 2 ; 0=8x8, 1=8x16
+rLCDC_BG_TILEMAP     EQU 3 ; 0=9800-9BFF, 1=9C00-9FFF
+rLCDC_TILE_DATA      EQU 4 ; 0=8800-97FF, 1=8000-8FFF
+rLCDC_WINDOW_ENABLE  EQU 5 ; 0=Off, 1=On
 rLCDC_WINDOW_TILEMAP EQU 6 ; 0=9800-9BFF, 1=9C00-9FFF
 rLCDC_ENABLE         EQU 7 ; 0=Off, 1=On
+LCDC_DEFAULT EQU (1 << rLCDC_ENABLE) | (1 << rLCDC_WINDOW_TILEMAP) | (1 << rLCDC_WINDOW_ENABLE) | (1 << rLCDC_SPRITES_ENABLE) | (1 << rLCDC_BG_PRIORITY)
 rSTAT       EQU $ff41 ; LCDC Status (R/W)
 rSCY        EQU $ff42 ; Scroll Y (R/W)
 rSCX        EQU $ff43 ; Scroll X (R/W)
 rLY         EQU $ff44 ; LCDC Y-Coordinate (R)
+LY_VBLANK EQU 144
 rLYC        EQU $ff45 ; LY Compare (R/W)
 rDMA        EQU $ff46 ; DMA Transfer and Start Address (W)
 rBGP        EQU $ff47 ; BG Palette Data (R/W) - Non CGB Mode Only
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 0914e7ab6..ec70ebf01 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -3,7 +3,7 @@
 ; - ItemNames (see data/items/names.asm)
 ; - ItemDescriptions (see data/items/descriptions.asm)
 ; - ItemAttributes (see data/items/attributes.asm)
-; - ItemEffects (see engine/item_effects.asm)
+; - ItemEffects (see engine/items/item_effects.asm)
 	const_def
 	const NO_ITEM      ; 00
 	const MASTER_BALL  ; 01
@@ -207,19 +207,6 @@ endc
 	enum \1_TMNUM
 ENDM
 
-add_hm: MACRO
-if !DEF(HM01)
-HM01 = const_value
-endc
-	define _\@_1, "HM_\1"
-	const _\@_1
-	enum \1_TMNUM
-ENDM
-
-add_mt: MACRO
-	enum \1_TMNUM
-ENDM
-
 ; see data/moves/tmhm_moves.asm for moves
 	add_tm DYNAMICPUNCH ; bf
 	add_tm HEADBUTT     ; c0
@@ -275,6 +262,15 @@ ENDM
 	add_tm NIGHTMARE    ; f2
 NUM_TMS = const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC
 
+add_hm: MACRO
+if !DEF(HM01)
+HM01 = const_value
+endc
+	define _\@_1, "HM_\1"
+	const _\@_1
+	enum \1_TMNUM
+ENDM
+
 	add_hm CUT          ; f3
 	add_hm FLY          ; f4
 	add_hm SURF         ; f5
@@ -283,12 +279,17 @@ NUM_TMS = const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC
 	add_hm WHIRLPOOL    ; f8
 	add_hm WATERFALL    ; f9
 NUM_HMS = const_value - HM01
-	const ITEM_FA       ; fa
+
+add_mt: MACRO
+	enum \1_TMNUM
+ENDM
 
 	add_mt FLAMETHROWER
 	add_mt THUNDERBOLT
 	add_mt ICE_BEAM
-NUM_TM_HM_TUTOR = __enum__ +- 1
+NUM_TM_HM_TUTOR = __enum__ + -1
+
+	const ITEM_FA       ; fa
 
 USE_SCRIPT_VAR EQU $00
 ITEM_FROM_MEM  EQU $ff
diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm
index b3a35d72b..5040ab047 100644
--- a/constants/item_data_constants.asm
+++ b/constants/item_data_constants.asm
@@ -10,23 +10,27 @@
 ITEMATTR_STRUCT_LENGTH EQU const_value
 
 ; item types
-const_value set 1
+	const_def 1
 	const ITEM     ; 1
 	const KEY_ITEM ; 2
 	const BALL     ; 3
 	const TM_HM    ; 4
 
 ; item menu types
-; UseItem.dw indexes (see engine/pack.asm)
+; UseItem.dw indexes (see engine/items/pack.asm)
+; UseRegisteredItem.SwitchTo indexes (see engine/overworld/select_menu.asm)
 ITEMMENU_NOUSE   EQU 0
 ITEMMENU_CURRENT EQU 4
 ITEMMENU_PARTY   EQU 5
 ITEMMENU_CLOSE   EQU 6
 
 ; item actions
-CANT_SELECT EQU 1 << 6
-CANT_TOSS   EQU 1 << 7
+CANT_SELECT_F EQU 6
+CANT_TOSS_F   EQU 7
 
+NO_LIMITS   EQU 0
+CANT_SELECT EQU 1 << CANT_SELECT_F
+CANT_TOSS   EQU 1 << CANT_TOSS_F
 
 ; pack pockets
 	const_def
@@ -34,21 +38,19 @@ CANT_TOSS   EQU 1 << 7
 	const BALL_POCKET     ; 1
 	const KEY_ITEM_POCKET ; 2
 	const TM_HM_POCKET    ; 3
-NUM_POCKETS EQU const_value +- 1
+NUM_POCKETS EQU const_value
 
 MAX_ITEMS     EQU 20
 MAX_BALLS     EQU 12
 MAX_KEY_ITEMS EQU 25
 MAX_PC_ITEMS  EQU 50
 
-
 ; mail
 MAIL_LINE_LENGTH   EQU $10
 MAIL_MSG_LENGTH    EQU $20
 MAILBOX_CAPACITY   EQU 10
 MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
 
-
 ; held item effects
 	const_def
 	const HELD_NONE
@@ -61,7 +63,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
 	const HELD_7
 	const HELD_CLEANSE_TAG
 
-const_value set 10
+	const_def 10
 	const HELD_HEAL_POISON
 	const HELD_HEAL_FREEZE
 	const HELD_HEAL_BURN
@@ -70,7 +72,7 @@ const_value set 10
 	const HELD_HEAL_STATUS
 	const HELD_HEAL_CONFUSION
 
-const_value set 20
+	const_def 20
 	const HELD_PREVENT_POISON
 	const HELD_PREVENT_BURN
 	const HELD_PREVENT_FREEZE
@@ -78,7 +80,7 @@ const_value set 20
 	const HELD_PREVENT_PARALYZE
 	const HELD_PREVENT_CONFUSE
 
-const_value set 30
+	const_def 30
 	const HELD_30
 	const HELD_ATTACK_UP
 	const HELD_DEFENSE_UP
@@ -89,12 +91,12 @@ const_value set 30
 	const HELD_EVASION_UP
 	const HELD_38
 
-const_value set 40
+	const_def 40
 	const HELD_40
 	const HELD_41
 	const HELD_METAL_POWDER
 
-const_value set 50
+	const_def 50
 	const HELD_NORMAL_BOOST
 	const HELD_FIGHTING_BOOST
 	const HELD_FLYING_BOOST
@@ -113,7 +115,7 @@ const_value set 50
 	const HELD_DARK_BOOST
 	const HELD_STEEL_BOOST
 
-const_value set 70
+	const_def 70
 	const HELD_CATCH_CHANCE
 	const HELD_71
 	const HELD_ESCAPE
@@ -124,75 +126,3 @@ const_value set 70
 	const HELD_BRIGHTPOWDER
 	const HELD_78
 	const HELD_FOCUS_BAND
-
-
-; mart types (see engine/mart.asm)
-	const_def
-	const MARTTYPE_STANDARD
-	const MARTTYPE_BITTER
-	const MARTTYPE_BARGAIN
-	const MARTTYPE_PHARMACY
-	const MARTTYPE_ROOFTOP
-
-; Marts indexes (see data/items/marts.asm)
-	const_def
-	const MART_CHERRYGROVE
-	const MART_CHERRYGROVE_DEX
-	const MART_VIOLET
-	const MART_AZALEA
-	const MART_CIANWOOD
-	const MART_GOLDENROD_2F_1
-	const MART_GOLDENROD_2F_2
-	const MART_GOLDENROD_3F
-	const MART_GOLDENROD_4F
-	const MART_GOLDENROD_5F_1
-	const MART_GOLDENROD_5F_2
-	const MART_GOLDENROD_5F_3
-	const MART_GOLDENROD_5F_4
-	const MART_OLIVINE
-	const MART_ECRUTEAK
-	const MART_MAHOGANY_1
-	const MART_MAHOGANY_2
-	const MART_BLACKTHORN
-	const MART_VIRIDIAN
-	const MART_PEWTER
-	const MART_CERULEAN
-	const MART_LAVENDER
-	const MART_VERMILION
-	const MART_CELADON_2F_1
-	const MART_CELADON_2F_2
-	const MART_CELADON_3F
-	const MART_CELADON_4F
-	const MART_CELADON_5F_1
-	const MART_CELADON_5F_2
-	const MART_FUCHSIA
-	const MART_SAFFRON
-	const MART_MT_MOON
-	const MART_INDIGO_PLATEAU
-	const MART_UNDERGROUND
-
-
-; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm)
-	const_def
-	const PARTYMENUACTION_CHOOSE_POKEMON
-	const PARTYMENUACTION_HEALING_ITEM
-	const PARTYMENUACTION_SWITCH
-	const PARTYMENUACTION_TEACH_TMHM
-	const PARTYMENUACTION_MOVE
-	const PARTYMENUACTION_EVO_STONE
-	const PARTYMENUACTION_GIVE_MON
-	const PARTYMENUACTION_GIVE_MON_FEMALE ; unused
-	const PARTYMENUACTION_GIVE_ITEM
-	const PARTYMENUACTION_MOBILE ; mobile
-; PrintPartyMenuActionText arguments (see engine/party_menu.asm)
-const_value set $f0
-	const PARTYMENUTEXT_HEAL_PSN
-	const PARTYMENUTEXT_HEAL_BRN
-	const PARTYMENUTEXT_HEAL_FRZ
-	const PARTYMENUTEXT_HEAL_SLP
-	const PARTYMENUTEXT_HEAL_PAR
-	const PARTYMENUTEXT_HEAL_HP
-	const PARTYMENUTEXT_HEAL_ALL
-	const PARTYMENUTEXT_REVIVE
-	const PARTYMENUTEXT_LEVEL_UP
-	const PARTYMENUTEXT_HEAL_CONFUSION
diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm
index 5f74b3386..a07af44f8 100644
--- a/constants/landmark_constants.asm
+++ b/constants/landmark_constants.asm
@@ -105,7 +105,6 @@ KANTO_LANDMARK EQU const_value
 GIFT_LOCATION  EQU $7e
 EVENT_LOCATION EQU $7f
 
-
 ; Regions
 	const_def
 	const JOHTO_REGION ; 0
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 204b2cf20..7c07c9e9e 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -3,487 +3,491 @@ const_value = const_value + 1
 	enum_start 1
 ENDM
 
-mapconst: MACRO
+map_const: MACRO
 ;\1: map id
-;\2: height: in blocks
-;\3: width: in blocks
+;\2: width: in blocks
+;\3: height: in blocks
 GROUP_\1 EQU const_value
 	enum MAP_\1
-\1_HEIGHT EQU \2
-\1_WIDTH EQU \3
+\1_WIDTH EQU \2
+\1_HEIGHT EQU \3
 ENDM
 
 ; map group ids
 ; `newgroup` indexes are for:
-; - MapGroupPointers (see data/maps/definitions.asm)
+; - MapGroupPointers (see data/maps/maps.asm)
 ; - MapGroupRoofs (see data/maps/roofs.asm)
 ; - OutdoorSprites (see data/maps/outdoor_sprites.asm)
 ; - RoofPals (see gfx/tilesets/roofs.pal)
-; `mapconst` indexes are for the sub-tables of MapGroupPointers (see data/maps/definitions.asm)
+; `map_const` indexes are for the sub-tables of MapGroupPointers (see data/maps/maps.asm)
+; Each map also has associated data:
+; - attributes (see data/maps/attributes.asm)
+; - blocks (see data/maps/blocks.asm)
+; - scripts and events (see data/maps/scripts.asm)
 	const_def
 
-	newgroup                                                     ;  1
-
-	mapconst OLIVINE_POKECENTER_1F,                        4,  5 ;  1
-	mapconst OLIVINE_GYM,                                  8,  5 ;  2
-	mapconst OLIVINE_TIMS_HOUSE,                           4,  4 ;  3
-	mapconst OLIVINE_HOUSE_BETA,                           4,  4 ;  4
-	mapconst OLIVINE_PUNISHMENT_SPEECH_HOUSE,              4,  4 ;  5
-	mapconst OLIVINE_GOOD_ROD_HOUSE,                       4,  4 ;  6
-	mapconst OLIVINE_CAFE,                                 4,  4 ;  7
-	mapconst OLIVINE_MART,                                 4,  6 ;  8
-	mapconst ROUTE_38_ECRUTEAK_GATE,                       4,  5 ;  9
-	mapconst ROUTE_39_BARN,                                4,  4 ; 10
-	mapconst ROUTE_39_FARMHOUSE,                           4,  4 ; 11
-	mapconst ROUTE_38,                                     9, 20 ; 12
-	mapconst ROUTE_39,                                    18, 10 ; 13
-	mapconst OLIVINE_CITY,                                18, 20 ; 14
-
-	newgroup                                                     ;  2
-
-	mapconst MAHOGANY_RED_GYARADOS_SPEECH_HOUSE,           4,  4 ;  1
-	mapconst MAHOGANY_GYM,                                 9,  5 ;  2
-	mapconst MAHOGANY_POKECENTER_1F,                       4,  5 ;  3
-	mapconst ROUTE_42_ECRUTEAK_GATE,                       4,  5 ;  4
-	mapconst ROUTE_42,                                     9, 30 ;  5
-	mapconst ROUTE_44,                                     9, 30 ;  6
-	mapconst MAHOGANY_TOWN,                                9, 10 ;  7
-
-	newgroup                                                     ;  3
-
-	mapconst SPROUT_TOWER_1F,                              8, 10 ;  1
-	mapconst SPROUT_TOWER_2F,                              8, 10 ;  2
-	mapconst SPROUT_TOWER_3F,                              8, 10 ;  3
-	mapconst TIN_TOWER_1F,                                 9, 10 ;  4
-	mapconst TIN_TOWER_2F,                                 9, 10 ;  5
-	mapconst TIN_TOWER_3F,                                 9, 10 ;  6
-	mapconst TIN_TOWER_4F,                                 9, 10 ;  7
-	mapconst TIN_TOWER_5F,                                 9, 10 ;  8
-	mapconst TIN_TOWER_6F,                                 9, 10 ;  9
-	mapconst TIN_TOWER_7F,                                 9, 10 ; 10
-	mapconst TIN_TOWER_8F,                                 9, 10 ; 11
-	mapconst TIN_TOWER_9F,                                 9, 10 ; 12
-	mapconst BURNED_TOWER_1F,                              9, 10 ; 13
-	mapconst BURNED_TOWER_B1F,                             9, 10 ; 14
-	mapconst NATIONAL_PARK,                               27, 20 ; 15
-	mapconst NATIONAL_PARK_BUG_CONTEST,                   27, 20 ; 16
-	mapconst RADIO_TOWER_1F,                               4,  9 ; 17
-	mapconst RADIO_TOWER_2F,                               4,  9 ; 18
-	mapconst RADIO_TOWER_3F,                               4,  9 ; 19
-	mapconst RADIO_TOWER_4F,                               4,  9 ; 20
-	mapconst RADIO_TOWER_5F,                               4,  9 ; 21
-	mapconst RUINS_OF_ALPH_OUTSIDE,                       18, 10 ; 22
-	mapconst RUINS_OF_ALPH_HO_OH_CHAMBER,                  5,  4 ; 23
-	mapconst RUINS_OF_ALPH_KABUTO_CHAMBER,                 5,  4 ; 24
-	mapconst RUINS_OF_ALPH_OMANYTE_CHAMBER,                5,  4 ; 25
-	mapconst RUINS_OF_ALPH_AERODACTYL_CHAMBER,             5,  4 ; 26
-	mapconst RUINS_OF_ALPH_INNER_CHAMBER,                 14, 10 ; 27
-	mapconst RUINS_OF_ALPH_RESEARCH_CENTER,                4,  4 ; 28
-	mapconst RUINS_OF_ALPH_HO_OH_ITEM_ROOM,                5,  4 ; 29
-	mapconst RUINS_OF_ALPH_KABUTO_ITEM_ROOM,               5,  4 ; 30
-	mapconst RUINS_OF_ALPH_OMANYTE_ITEM_ROOM,              5,  4 ; 31
-	mapconst RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM,           5,  4 ; 32
-	mapconst RUINS_OF_ALPH_HO_OH_WORD_ROOM,               12, 10 ; 33
-	mapconst RUINS_OF_ALPH_KABUTO_WORD_ROOM,               7, 10 ; 34
-	mapconst RUINS_OF_ALPH_OMANYTE_WORD_ROOM,              8, 10 ; 35
-	mapconst RUINS_OF_ALPH_AERODACTYL_WORD_ROOM,           7, 10 ; 36
-	mapconst UNION_CAVE_1F,                               18, 10 ; 37
-	mapconst UNION_CAVE_B1F,                              18, 10 ; 38
-	mapconst UNION_CAVE_B2F,                              18, 10 ; 39
-	mapconst SLOWPOKE_WELL_B1F,                            9, 10 ; 40
-	mapconst SLOWPOKE_WELL_B2F,                            9, 10 ; 41
-	mapconst OLIVINE_LIGHTHOUSE_1F,                        9, 10 ; 42
-	mapconst OLIVINE_LIGHTHOUSE_2F,                        9, 10 ; 43
-	mapconst OLIVINE_LIGHTHOUSE_3F,                        9, 10 ; 44
-	mapconst OLIVINE_LIGHTHOUSE_4F,                        9, 10 ; 45
-	mapconst OLIVINE_LIGHTHOUSE_5F,                        9, 10 ; 46
-	mapconst OLIVINE_LIGHTHOUSE_6F,                        9, 10 ; 47
-	mapconst MAHOGANY_MART_1F,                             4,  4 ; 48
-	mapconst TEAM_ROCKET_BASE_B1F,                         9, 15 ; 49
-	mapconst TEAM_ROCKET_BASE_B2F,                         9, 15 ; 50
-	mapconst TEAM_ROCKET_BASE_B3F,                         9, 15 ; 51
-	mapconst ILEX_FOREST,                                 27, 15 ; 52
-	mapconst GOLDENROD_UNDERGROUND,                       18, 15 ; 53
-	mapconst GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 18, 15 ; 54
-	mapconst GOLDENROD_DEPT_STORE_B1F,                     9, 10 ; 55
-	mapconst GOLDENROD_UNDERGROUND_WAREHOUSE,              9, 10 ; 56
-	mapconst MOUNT_MORTAR_1F_OUTSIDE,                     18, 20 ; 57
-	mapconst MOUNT_MORTAR_1F_INSIDE,                      27, 20 ; 58
-	mapconst MOUNT_MORTAR_2F_INSIDE,                      18, 20 ; 59
-	mapconst MOUNT_MORTAR_B1F,                            18, 20 ; 60
-	mapconst ICE_PATH_1F,                                 18, 20 ; 61
-	mapconst ICE_PATH_B1F,                                18, 10 ; 62
-	mapconst ICE_PATH_B2F_MAHOGANY_SIDE,                   9, 10 ; 63
-	mapconst ICE_PATH_B2F_BLACKTHORN_SIDE,                 9,  5 ; 64
-	mapconst ICE_PATH_B3F,                                 9, 10 ; 65
-	mapconst WHIRL_ISLAND_NW,                              9,  5 ; 66
-	mapconst WHIRL_ISLAND_NE,                              9, 10 ; 67
-	mapconst WHIRL_ISLAND_SW,                              9, 10 ; 68
-	mapconst WHIRL_ISLAND_CAVE,                            9,  5 ; 69
-	mapconst WHIRL_ISLAND_SE,                              9,  5 ; 70
-	mapconst WHIRL_ISLAND_B1F,                            18, 20 ; 71
-	mapconst WHIRL_ISLAND_B2F,                            18, 10 ; 72
-	mapconst WHIRL_ISLAND_LUGIA_CHAMBER,                   9, 10 ; 73
-	mapconst SILVER_CAVE_ROOM_1,                          18, 10 ; 74
-	mapconst SILVER_CAVE_ROOM_2,                          18, 15 ; 75
-	mapconst SILVER_CAVE_ROOM_3,                          18, 10 ; 76
-	mapconst SILVER_CAVE_ITEM_ROOMS,                       9, 10 ; 77
-	mapconst DARK_CAVE_VIOLET_ENTRANCE,                   18, 20 ; 78
-	mapconst DARK_CAVE_BLACKTHORN_ENTRANCE,               18, 15 ; 79
-	mapconst DRAGONS_DEN_1F,                               9,  5 ; 80
-	mapconst DRAGONS_DEN_B1F,                             18, 20 ; 81
-	mapconst DRAGON_SHRINE,                                5,  5 ; 82
-	mapconst TOHJO_FALLS,                                  9, 15 ; 83
-	mapconst DIGLETTS_CAVE,                               18, 10 ; 84
-	mapconst MOUNT_MOON,                                   9, 15 ; 85
-	mapconst UNDERGROUND_PATH,                            14,  3 ; 86
-	mapconst ROCK_TUNNEL_1F,                              18, 15 ; 87
-	mapconst ROCK_TUNNEL_B1F,                             18, 15 ; 88
-	mapconst SAFARI_ZONE_FUCHSIA_GATE_BETA,                4,  5 ; 89
-	mapconst SAFARI_ZONE_BETA,                            18, 10 ; 90
-	mapconst VICTORY_ROAD,                                36, 10 ; 91
-
-	newgroup                                                     ;  4
-
-	mapconst ECRUTEAK_HOUSE,                               9, 10 ;  1
-	mapconst WISE_TRIOS_ROOM,                              4,  4 ;  2
-	mapconst ECRUTEAK_POKECENTER_1F,                       4,  5 ;  3
-	mapconst ECRUTEAK_LUGIA_SPEECH_HOUSE,                  4,  4 ;  4
-	mapconst DANCE_THEATRE,                                7,  6 ;  5
-	mapconst ECRUTEAK_MART,                                4,  6 ;  6
-	mapconst ECRUTEAK_GYM,                                 9,  5 ;  7
-	mapconst ECRUTEAK_ITEMFINDER_HOUSE,                    4,  4 ;  8
-	mapconst ECRUTEAK_CITY,                               18, 20 ;  9
-
-	newgroup                                                     ;  5
-
-	mapconst BLACKTHORN_GYM_1F,                            9,  5 ;  1
-	mapconst BLACKTHORN_GYM_2F,                            9,  5 ;  2
-	mapconst BLACKTHORN_DRAGON_SPEECH_HOUSE,               4,  4 ;  3
-	mapconst BLACKTHORN_EMYS_HOUSE,                        4,  4 ;  4
-	mapconst BLACKTHORN_MART,                              4,  6 ;  5
-	mapconst BLACKTHORN_POKECENTER_1F,                     4,  5 ;  6
-	mapconst MOVE_DELETERS_HOUSE,                          4,  4 ;  7
-	mapconst ROUTE_45,                                    45, 10 ;  8
-	mapconst ROUTE_46,                                    18, 10 ;  9
-	mapconst BLACKTHORN_CITY,                             18, 20 ; 10
-
-	newgroup                                                     ;  6
-
-	mapconst CINNABAR_POKECENTER_1F,                       4,  5 ;  1
-	mapconst CINNABAR_POKECENTER_2F_BETA,                  4,  8 ;  2
-	mapconst ROUTE_19_FUCHSIA_GATE,                        4,  5 ;  3
-	mapconst SEAFOAM_GYM,                                  4,  5 ;  4
-	mapconst ROUTE_19,                                    18, 10 ;  5
-	mapconst ROUTE_20,                                     9, 30 ;  6
-	mapconst ROUTE_21,                                    18, 10 ;  7
-	mapconst CINNABAR_ISLAND,                              9, 10 ;  8
-
-	newgroup                                                     ;  7
-
-	mapconst CERULEAN_GYM_BADGE_SPEECH_HOUSE,              4,  4 ;  1
-	mapconst CERULEAN_POLICE_STATION,                      4,  4 ;  2
-	mapconst CERULEAN_TRADE_SPEECH_HOUSE,                  4,  4 ;  3
-	mapconst CERULEAN_POKECENTER_1F,                       4,  5 ;  4
-	mapconst CERULEAN_POKECENTER_2F_BETA,                  4,  8 ;  5
-	mapconst CERULEAN_GYM,                                 8,  5 ;  6
-	mapconst CERULEAN_MART,                                4,  6 ;  7
-	mapconst ROUTE_10_POKECENTER_1F,                       4,  5 ;  8
-	mapconst ROUTE_10_POKECENTER_2F_BETA,                  4,  8 ;  9
-	mapconst POWER_PLANT,                                  9, 10 ; 10
-	mapconst BILLS_HOUSE,                                  4,  4 ; 11
-	mapconst ROUTE_4,                                      9, 20 ; 12
-	mapconst ROUTE_9,                                      9, 30 ; 13
-	mapconst ROUTE_10_NORTH,                               9, 10 ; 14
-	mapconst ROUTE_24,                                     9, 10 ; 15
-	mapconst ROUTE_25,                                     9, 30 ; 16
-	mapconst CERULEAN_CITY,                               18, 20 ; 17
-
-	newgroup                                                     ;  8
-
-	mapconst AZALEA_POKECENTER_1F,                         4,  5 ;  1
-	mapconst CHARCOAL_KILN,                                4,  4 ;  2
-	mapconst AZALEA_MART,                                  4,  6 ;  3
-	mapconst KURTS_HOUSE,                                  4,  8 ;  4
-	mapconst AZALEA_GYM,                                   8,  5 ;  5
-	mapconst ROUTE_33,                                     9, 10 ;  6
-	mapconst AZALEA_TOWN,                                  9, 20 ;  7
-
-	newgroup                                                     ;  9
-
-	mapconst LAKE_OF_RAGE_HIDDEN_POWER_HOUSE,              4,  4 ;  1
-	mapconst LAKE_OF_RAGE_MAGIKARP_HOUSE,                  4,  4 ;  2
-	mapconst ROUTE_43_MAHOGANY_GATE,                       4,  5 ;  3
-	mapconst ROUTE_43_GATE,                                4,  5 ;  4
-	mapconst ROUTE_43,                                    27, 10 ;  5
-	mapconst LAKE_OF_RAGE,                                18, 20 ;  6
-
-	newgroup                                                     ; 10
-
-	mapconst ROUTE_32,                                    45, 10 ;  1
-	mapconst ROUTE_35,                                    18, 10 ;  2
-	mapconst ROUTE_36,                                     9, 30 ;  3
-	mapconst ROUTE_37,                                     9, 10 ;  4
-	mapconst VIOLET_CITY,                                 18, 20 ;  5
-	mapconst VIOLET_MART,                                  4,  6 ;  6
-	mapconst VIOLET_GYM,                                   8,  5 ;  7
-	mapconst EARLS_POKEMON_ACADEMY,                        8,  4 ;  8
-	mapconst VIOLET_NICKNAME_SPEECH_HOUSE,                 4,  4 ;  9
-	mapconst VIOLET_POKECENTER_1F,                         4,  5 ; 10
-	mapconst VIOLET_KYLES_HOUSE,                           4,  4 ; 11
-	mapconst ROUTE_32_RUINS_OF_ALPH_GATE,                  4,  5 ; 12
-	mapconst ROUTE_32_POKECENTER_1F,                       4,  5 ; 13
-	mapconst ROUTE_35_GOLDENROD_GATE,                      4,  5 ; 14
-	mapconst ROUTE_35_NATIONAL_PARK_GATE,                  4,  4 ; 15
-	mapconst ROUTE_36_RUINS_OF_ALPH_GATE,                  4,  5 ; 16
-	mapconst ROUTE_36_NATIONAL_PARK_GATE,                  4,  5 ; 17
-
-	newgroup                                                     ; 11
-
-	mapconst ROUTE_34,                                    27, 10 ;  1
-	mapconst GOLDENROD_CITY,                              18, 20 ;  2
-	mapconst GOLDENROD_GYM,                                9, 10 ;  3
-	mapconst GOLDENROD_BIKE_SHOP,                          4,  4 ;  4
-	mapconst GOLDENROD_HAPPINESS_RATER,                    4,  4 ;  5
-	mapconst GOLDENROD_BILLS_HOUSE,                        4,  4 ;  6
-	mapconst GOLDENROD_MAGNET_TRAIN_STATION,               9, 10 ;  7
-	mapconst GOLDENROD_FLOWER_SHOP,                        4,  4 ;  8
-	mapconst GOLDENROD_PP_SPEECH_HOUSE,                    4,  4 ;  9
-	mapconst GOLDENROD_NAME_RATER,                         4,  4 ; 10
-	mapconst GOLDENROD_DEPT_STORE_1F,                      4,  8 ; 11
-	mapconst GOLDENROD_DEPT_STORE_2F,                      4,  8 ; 12
-	mapconst GOLDENROD_DEPT_STORE_3F,                      4,  8 ; 13
-	mapconst GOLDENROD_DEPT_STORE_4F,                      4,  8 ; 14
-	mapconst GOLDENROD_DEPT_STORE_5F,                      4,  8 ; 15
-	mapconst GOLDENROD_DEPT_STORE_6F,                      4,  8 ; 16
-	mapconst GOLDENROD_DEPT_STORE_ELEVATOR,                2,  2 ; 17
-	mapconst GOLDENROD_DEPT_STORE_ROOF,                    4,  8 ; 18
-	mapconst GOLDENROD_GAME_CORNER,                        7, 10 ; 19
-	mapconst GOLDENROD_POKECENTER_1F,                      4,  5 ; 20
-	mapconst GOLDENROD_POKECOM_CENTER_2F_MOBILE,          16, 16 ; 21
-	mapconst ILEX_FOREST_AZALEA_GATE,                      4,  5 ; 22
-	mapconst ROUTE_34_ILEX_FOREST_GATE,                    4,  5 ; 23
-	mapconst DAY_CARE,                                     4,  5 ; 24
-
-	newgroup                                                     ; 12
-
-	mapconst ROUTE_6,                                      9, 10 ;  1
-	mapconst ROUTE_11,                                     9, 20 ;  2
-	mapconst VERMILION_CITY,                              18, 20 ;  3
-	mapconst VERMILION_HOUSE_FISHING_SPEECH_HOUSE,         4,  4 ;  4
-	mapconst VERMILION_POKECENTER_1F,                      4,  5 ;  5
-	mapconst VERMILION_POKECENTER_2F_BETA,                 4,  8 ;  6
-	mapconst POKEMON_FAN_CLUB,                             4,  5 ;  7
-	mapconst VERMILION_MAGNET_TRAIN_SPEECH_HOUSE,          4,  4 ;  8
-	mapconst VERMILION_MART,                               4,  6 ;  9
-	mapconst VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE,   4,  4 ; 10
-	mapconst VERMILION_GYM,                                9,  5 ; 11
-	mapconst ROUTE_6_SAFFRON_GATE,                         4,  5 ; 12
-	mapconst ROUTE_6_UNDERGROUND_PATH_ENTRANCE,            4,  4 ; 13
-
-	newgroup                                                     ; 13
-
-	mapconst ROUTE_1,                                     18, 10 ;  1
-	mapconst PALLET_TOWN,                                  9, 10 ;  2
-	mapconst REDS_HOUSE_1F,                                4,  4 ;  3
-	mapconst REDS_HOUSE_2F,                                4,  4 ;  4
-	mapconst BLUES_HOUSE,                                  4,  4 ;  5
-	mapconst OAKS_LAB,                                     6,  5 ;  6
-
-	newgroup                                                     ; 14
-
-	mapconst ROUTE_3,                                      9, 30 ;  1
-	mapconst PEWTER_CITY,                                 18, 20 ;  2
-	mapconst PEWTER_NIDORAN_SPEECH_HOUSE,                  4,  4 ;  3
-	mapconst PEWTER_GYM,                                   7,  5 ;  4
-	mapconst PEWTER_MART,                                  4,  6 ;  5
-	mapconst PEWTER_POKECENTER_1F,                         4,  5 ;  6
-	mapconst PEWTER_POKECENTER_2F_BETA,                    4,  8 ;  7
-	mapconst PEWTER_SNOOZE_SPEECH_HOUSE,                   4,  4 ;  8
-
-	newgroup                                                     ; 15
-
-	mapconst OLIVINE_PORT,                                18, 10 ;  1
-	mapconst VERMILION_PORT,                              18, 10 ;  2
-	mapconst FAST_SHIP_1F,                                 9, 16 ;  3
-	mapconst FAST_SHIP_CABINS_NNW_NNE_NE,                 16,  4 ;  4
-	mapconst FAST_SHIP_CABINS_SW_SSW_NW,                  16,  4 ;  5
-	mapconst FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN,      17,  5 ;  6
-	mapconst FAST_SHIP_B1F,                                8, 16 ;  7
-	mapconst OLIVINE_PORT_PASSAGE,                         9, 10 ;  8
-	mapconst VERMILION_PORT_PASSAGE,                       9, 10 ;  9
-	mapconst MOUNT_MOON_SQUARE,                            9, 15 ; 10
-	mapconst MOUNT_MOON_GIFT_SHOP,                         4,  4 ; 11
-	mapconst TIN_TOWER_ROOF,                               9, 10 ; 12
-
-	newgroup                                                     ; 16
-
-	mapconst ROUTE_23,                                     9, 10 ;  1
-	mapconst INDIGO_PLATEAU_POKECENTER_1F,                 7,  9 ;  2
-	mapconst WILLS_ROOM,                                   9,  5 ;  3
-	mapconst KOGAS_ROOM,                                   9,  5 ;  4
-	mapconst BRUNOS_ROOM,                                  9,  5 ;  5
-	mapconst KARENS_ROOM,                                  9,  5 ;  6
-	mapconst LANCES_ROOM,                                 12,  5 ;  7
-	mapconst HALL_OF_FAME,                                 7,  5 ;  8
-
-	newgroup                                                     ; 17
-
-	mapconst ROUTE_13,                                     9, 30 ;  1
-	mapconst ROUTE_14,                                    18, 10 ;  2
-	mapconst ROUTE_15,                                     9, 20 ;  3
-	mapconst ROUTE_18,                                     9, 10 ;  4
-	mapconst FUCHSIA_CITY,                                18, 20 ;  5
-	mapconst FUCHSIA_MART,                                 4,  6 ;  6
-	mapconst SAFARI_ZONE_MAIN_OFFICE,                      4,  4 ;  7
-	mapconst FUCHSIA_GYM,                                  9,  5 ;  8
-	mapconst FUCHSIA_BILL_SPEECH_HOUSE,                    4,  4 ;  9
-	mapconst FUCHSIA_POKECENTER_1F,                        4,  5 ; 10
-	mapconst FUCHSIA_POKECENTER_2F_BETA,                   4,  8 ; 11
-	mapconst SAFARI_ZONE_WARDENS_HOME,                     4,  5 ; 12
-	mapconst ROUTE_15_FUCHSIA_GATE,                        4,  5 ; 13
-
-	newgroup                                                     ; 18
-
-	mapconst ROUTE_8,                                      9, 20 ;  1
-	mapconst ROUTE_12,                                    27, 10 ;  2
-	mapconst ROUTE_10_SOUTH,                               9, 10 ;  3
-	mapconst LAVENDER_TOWN,                                9, 10 ;  4
-	mapconst LAVENDER_POKECENTER_1F,                       4,  5 ;  5
-	mapconst LAVENDER_POKECENTER_2F_BETA,                  4,  8 ;  6
-	mapconst MR_FUJIS_HOUSE,                               4,  5 ;  7
-	mapconst LAVENDER_SPEECH_HOUSE,                        4,  4 ;  8
-	mapconst LAVENDER_NAME_RATER,                          4,  4 ;  9
-	mapconst LAVENDER_MART,                                4,  6 ; 10
-	mapconst SOUL_HOUSE,                                   4,  5 ; 11
-	mapconst LAV_RADIO_TOWER_1F,                           4, 10 ; 12
-	mapconst ROUTE_8_SAFFRON_GATE,                         4,  5 ; 13
-	mapconst ROUTE_12_SUPER_ROD_HOUSE,                     4,  4 ; 14
-
-	newgroup                                                     ; 19
-
-	mapconst ROUTE_28,                                     9, 20 ;  1
-	mapconst SILVER_CAVE_OUTSIDE,                         18, 20 ;  2
-	mapconst SILVER_CAVE_POKECENTER_1F,                    4,  5 ;  3
-	mapconst ROUTE_28_FAMOUS_SPEECH_HOUSE,                 4,  4 ;  4
-
-	newgroup                                                     ; 20
-
-	mapconst POKECENTER_2F,                                4,  8 ;  1
-	mapconst TRADE_CENTER,                                 4,  5 ;  2
-	mapconst COLOSSEUM,                                    4,  5 ;  3
-	mapconst TIME_CAPSULE,                                 4,  5 ;  4
-	mapconst MOBILE_TRADE_ROOM_MOBILE,                     4,  5 ;  5
-	mapconst MOBILE_BATTLE_ROOM,                           4,  5 ;  6
-
-	newgroup                                                     ; 21
-
-	mapconst ROUTE_7,                                      9, 10 ;  1
-	mapconst ROUTE_16,                                     9, 10 ;  2
-	mapconst ROUTE_17,                                    45, 10 ;  3
-	mapconst CELADON_CITY,                                18, 20 ;  4
-	mapconst CELADON_DEPT_STORE_1F,                        4,  8 ;  5
-	mapconst CELADON_DEPT_STORE_2F,                        4,  8 ;  6
-	mapconst CELADON_DEPT_STORE_3F,                        4,  8 ;  7
-	mapconst CELADON_DEPT_STORE_4F,                        4,  8 ;  8
-	mapconst CELADON_DEPT_STORE_5F,                        4,  8 ;  9
-	mapconst CELADON_DEPT_STORE_6F,                        4,  8 ; 10
-	mapconst CELADON_DEPT_STORE_ELEVATOR,                  2,  2 ; 11
-	mapconst CELADON_MANSION_1F,                           5,  4 ; 12
-	mapconst CELADON_MANSION_2F,                           5,  4 ; 13
-	mapconst CELADON_MANSION_3F,                           5,  4 ; 14
-	mapconst CELADON_MANSION_ROOF,                         5,  4 ; 15
-	mapconst CELADON_MANSION_ROOF_HOUSE,                   4,  4 ; 16
-	mapconst CELADON_POKECENTER_1F,                        4,  5 ; 17
-	mapconst CELADON_POKECENTER_2F_BETA,                   4,  8 ; 18
-	mapconst CELADON_GAME_CORNER,                          7, 10 ; 19
-	mapconst CELADON_GAME_CORNER_PRIZE_ROOM,               3,  3 ; 20
-	mapconst CELADON_GYM,                                  9,  5 ; 21
-	mapconst CELADON_CAFE,                                 4,  6 ; 22
-	mapconst ROUTE_16_FUCHSIA_SPEECH_HOUSE,                4,  4 ; 23
-	mapconst ROUTE_16_GATE,                                4,  5 ; 24
-	mapconst ROUTE_7_SAFFRON_GATE,                         4,  5 ; 25
-	mapconst ROUTE_17_ROUTE_18_GATE,                       4,  5 ; 26
-
-	newgroup                                                     ; 22
-
-	mapconst ROUTE_40,                                    18, 10 ;  1
-	mapconst ROUTE_41,                                    27, 25 ;  2
-	mapconst CIANWOOD_CITY,                               27, 15 ;  3
-	mapconst MANIAS_HOUSE,                                 4,  4 ;  4
-	mapconst CIANWOOD_GYM,                                 9,  5 ;  5
-	mapconst CIANWOOD_POKECENTER_1F,                       4,  5 ;  6
-	mapconst CIANWOOD_PHARMACY,                            4,  4 ;  7
-	mapconst CIANWOOD_PHOTO_STUDIO,                        4,  4 ;  8
-	mapconst CIANWOOD_LUGIA_SPEECH_HOUSE,                  4,  4 ;  9
-	mapconst POKE_SEERS_HOUSE,                             4,  4 ; 10
-	mapconst BATTLE_TOWER_1F,                              5,  8 ; 11
-	mapconst BATTLE_TOWER_BATTLE_ROOM,                     4,  4 ; 12
-	mapconst BATTLE_TOWER_ELEVATOR,                        2,  2 ; 13
-	mapconst BATTLE_TOWER_HALLWAY,                         2, 11 ; 14
-	mapconst ROUTE_40_BATTLE_TOWER_GATE,                   4,  5 ; 15
-	mapconst BATTLE_TOWER_OUTSIDE,                        14, 10 ; 16
-
-	newgroup                                                     ; 23
-
-	mapconst ROUTE_2,                                     27, 10 ;  1
-	mapconst ROUTE_22,                                     9, 20 ;  2
-	mapconst VIRIDIAN_CITY,                               18, 20 ;  3
-	mapconst VIRIDIAN_GYM,                                 9,  5 ;  4
-	mapconst VIRIDIAN_NICKNAME_SPEECH_HOUSE,               4,  4 ;  5
-	mapconst TRAINER_HOUSE_1F,                             7,  5 ;  6
-	mapconst TRAINER_HOUSE_B1F,                            8,  5 ;  7
-	mapconst VIRIDIAN_MART,                                4,  6 ;  8
-	mapconst VIRIDIAN_POKECENTER_1F,                       4,  5 ;  9
-	mapconst VIRIDIAN_POKECENTER_2F_BETA,                  4,  8 ; 10
-	mapconst ROUTE_2_NUGGET_SPEECH_HOUSE,                  4,  4 ; 11
-	mapconst ROUTE_2_GATE,                                 4,  5 ; 12
-	mapconst VICTORY_ROAD_GATE,                            9, 10 ; 13
-
-	newgroup                                                     ; 24
-
-	mapconst ROUTE_26,                                    54, 10 ;  1
-	mapconst ROUTE_27,                                     9, 40 ;  2
-	mapconst ROUTE_29,                                     9, 30 ;  3
-	mapconst NEW_BARK_TOWN,                                9, 10 ;  4
-	mapconst ELMS_LAB,                                     6,  5 ;  5
-	mapconst KRISS_HOUSE_1F,                               4,  5 ;  6
-	mapconst KRISS_HOUSE_2F,                               3,  4 ;  7
-	mapconst KRISS_NEIGHBORS_HOUSE,                        4,  4 ;  8
-	mapconst ELMS_HOUSE,                                   4,  4 ;  9
-	mapconst ROUTE_26_HEAL_SPEECH_HOUSE,                   4,  4 ; 10
-	mapconst ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE,          4,  4 ; 11
-	mapconst ROUTE_27_SANDSTORM_HOUSE,                     4,  4 ; 12
-	mapconst ROUTE_29_ROUTE_46_GATE,                       4,  5 ; 13
-
-	newgroup                                                     ; 25
-
-	mapconst ROUTE_5,                                      9, 10 ;  1
-	mapconst SAFFRON_CITY,                                18, 20 ;  2
-	mapconst FIGHTING_DOJO,                                6,  5 ;  3
-	mapconst SAFFRON_GYM,                                  9, 10 ;  4
-	mapconst SAFFRON_MART,                                 4,  6 ;  5
-	mapconst SAFFRON_POKECENTER_1F,                        4,  5 ;  6
-	mapconst SAFFRON_POKECENTER_2F_BETA,                   4,  8 ;  7
-	mapconst MR_PSYCHICS_HOUSE,                            4,  4 ;  8
-	mapconst SAFFRON_MAGNET_TRAIN_STATION,                 9, 10 ;  9
-	mapconst SILPH_CO_1F,                                  4,  8 ; 10
-	mapconst COPYCATS_HOUSE_1F,                            4,  4 ; 11
-	mapconst COPYCATS_HOUSE_2F,                            3,  5 ; 12
-	mapconst ROUTE_5_UNDERGROUND_PATH_ENTRANCE,            4,  4 ; 13
-	mapconst ROUTE_5_SAFFRON_GATE,                         4,  5 ; 14
-	mapconst ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE,             4,  4 ; 15
-
-	newgroup                                                     ; 26
-
-	mapconst ROUTE_30,                                    27, 10 ;  1
-	mapconst ROUTE_31,                                     9, 20 ;  2
-	mapconst CHERRYGROVE_CITY,                             9, 20 ;  3
-	mapconst CHERRYGROVE_MART,                             4,  6 ;  4
-	mapconst CHERRYGROVE_POKECENTER_1F,                    4,  5 ;  5
-	mapconst CHERRYGROVE_GYM_SPEECH_HOUSE,                 4,  4 ;  6
-	mapconst GUIDE_GENTS_HOUSE,                            4,  4 ;  7
-	mapconst CHERRYGROVE_EVOLUTION_SPEECH_HOUSE,           4,  4 ;  8
-	mapconst ROUTE_30_BERRY_SPEECH_HOUSE,                  4,  4 ;  9
-	mapconst MR_POKEMONS_HOUSE,                            4,  4 ; 10
-	mapconst ROUTE_31_VIOLET_GATE,                         4,  5 ; 11
+	newgroup                                                      ;  1
+
+	map_const OLIVINE_POKECENTER_1F,                        5,  4 ;  1
+	map_const OLIVINE_GYM,                                  5,  8 ;  2
+	map_const OLIVINE_TIMS_HOUSE,                           4,  4 ;  3
+	map_const OLIVINE_HOUSE_BETA,                           4,  4 ;  4
+	map_const OLIVINE_PUNISHMENT_SPEECH_HOUSE,              4,  4 ;  5
+	map_const OLIVINE_GOOD_ROD_HOUSE,                       4,  4 ;  6
+	map_const OLIVINE_CAFE,                                 4,  4 ;  7
+	map_const OLIVINE_MART,                                 6,  4 ;  8
+	map_const ROUTE_38_ECRUTEAK_GATE,                       5,  4 ;  9
+	map_const ROUTE_39_BARN,                                4,  4 ; 10
+	map_const ROUTE_39_FARMHOUSE,                           4,  4 ; 11
+	map_const ROUTE_38,                                    20,  9 ; 12
+	map_const ROUTE_39,                                    10, 18 ; 13
+	map_const OLIVINE_CITY,                                20, 18 ; 14
+
+	newgroup                                                      ;  2
+
+	map_const MAHOGANY_RED_GYARADOS_SPEECH_HOUSE,           4,  4 ;  1
+	map_const MAHOGANY_GYM,                                 5,  9 ;  2
+	map_const MAHOGANY_POKECENTER_1F,                       5,  4 ;  3
+	map_const ROUTE_42_ECRUTEAK_GATE,                       5,  4 ;  4
+	map_const ROUTE_42,                                    30,  9 ;  5
+	map_const ROUTE_44,                                    30,  9 ;  6
+	map_const MAHOGANY_TOWN,                               10,  9 ;  7
+
+	newgroup                                                      ;  3
+
+	map_const SPROUT_TOWER_1F,                             10,  8 ;  1
+	map_const SPROUT_TOWER_2F,                             10,  8 ;  2
+	map_const SPROUT_TOWER_3F,                             10,  8 ;  3
+	map_const TIN_TOWER_1F,                                10,  9 ;  4
+	map_const TIN_TOWER_2F,                                10,  9 ;  5
+	map_const TIN_TOWER_3F,                                10,  9 ;  6
+	map_const TIN_TOWER_4F,                                10,  9 ;  7
+	map_const TIN_TOWER_5F,                                10,  9 ;  8
+	map_const TIN_TOWER_6F,                                10,  9 ;  9
+	map_const TIN_TOWER_7F,                                10,  9 ; 10
+	map_const TIN_TOWER_8F,                                10,  9 ; 11
+	map_const TIN_TOWER_9F,                                10,  9 ; 12
+	map_const BURNED_TOWER_1F,                             10,  9 ; 13
+	map_const BURNED_TOWER_B1F,                            10,  9 ; 14
+	map_const NATIONAL_PARK,                               20, 27 ; 15
+	map_const NATIONAL_PARK_BUG_CONTEST,                   20, 27 ; 16
+	map_const RADIO_TOWER_1F,                               9,  4 ; 17
+	map_const RADIO_TOWER_2F,                               9,  4 ; 18
+	map_const RADIO_TOWER_3F,                               9,  4 ; 19
+	map_const RADIO_TOWER_4F,                               9,  4 ; 20
+	map_const RADIO_TOWER_5F,                               9,  4 ; 21
+	map_const RUINS_OF_ALPH_OUTSIDE,                       10, 18 ; 22
+	map_const RUINS_OF_ALPH_HO_OH_CHAMBER,                  4,  5 ; 23
+	map_const RUINS_OF_ALPH_KABUTO_CHAMBER,                 4,  5 ; 24
+	map_const RUINS_OF_ALPH_OMANYTE_CHAMBER,                4,  5 ; 25
+	map_const RUINS_OF_ALPH_AERODACTYL_CHAMBER,             4,  5 ; 26
+	map_const RUINS_OF_ALPH_INNER_CHAMBER,                 10, 14 ; 27
+	map_const RUINS_OF_ALPH_RESEARCH_CENTER,                4,  4 ; 28
+	map_const RUINS_OF_ALPH_HO_OH_ITEM_ROOM,                4,  5 ; 29
+	map_const RUINS_OF_ALPH_KABUTO_ITEM_ROOM,               4,  5 ; 30
+	map_const RUINS_OF_ALPH_OMANYTE_ITEM_ROOM,              4,  5 ; 31
+	map_const RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM,           4,  5 ; 32
+	map_const RUINS_OF_ALPH_HO_OH_WORD_ROOM,               10, 12 ; 33
+	map_const RUINS_OF_ALPH_KABUTO_WORD_ROOM,              10,  7 ; 34
+	map_const RUINS_OF_ALPH_OMANYTE_WORD_ROOM,             10,  8 ; 35
+	map_const RUINS_OF_ALPH_AERODACTYL_WORD_ROOM,          10,  7 ; 36
+	map_const UNION_CAVE_1F,                               10, 18 ; 37
+	map_const UNION_CAVE_B1F,                              10, 18 ; 38
+	map_const UNION_CAVE_B2F,                              10, 18 ; 39
+	map_const SLOWPOKE_WELL_B1F,                           10,  9 ; 40
+	map_const SLOWPOKE_WELL_B2F,                           10,  9 ; 41
+	map_const OLIVINE_LIGHTHOUSE_1F,                       10,  9 ; 42
+	map_const OLIVINE_LIGHTHOUSE_2F,                       10,  9 ; 43
+	map_const OLIVINE_LIGHTHOUSE_3F,                       10,  9 ; 44
+	map_const OLIVINE_LIGHTHOUSE_4F,                       10,  9 ; 45
+	map_const OLIVINE_LIGHTHOUSE_5F,                       10,  9 ; 46
+	map_const OLIVINE_LIGHTHOUSE_6F,                       10,  9 ; 47
+	map_const MAHOGANY_MART_1F,                             4,  4 ; 48
+	map_const TEAM_ROCKET_BASE_B1F,                        15,  9 ; 49
+	map_const TEAM_ROCKET_BASE_B2F,                        15,  9 ; 50
+	map_const TEAM_ROCKET_BASE_B3F,                        15,  9 ; 51
+	map_const ILEX_FOREST,                                 15, 27 ; 52
+	map_const GOLDENROD_UNDERGROUND,                       15, 18 ; 53
+	map_const GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 15, 18 ; 54
+	map_const GOLDENROD_DEPT_STORE_B1F,                    10,  9 ; 55
+	map_const GOLDENROD_UNDERGROUND_WAREHOUSE,             10,  9 ; 56
+	map_const MOUNT_MORTAR_1F_OUTSIDE,                     20, 18 ; 57
+	map_const MOUNT_MORTAR_1F_INSIDE,                      20, 27 ; 58
+	map_const MOUNT_MORTAR_2F_INSIDE,                      20, 18 ; 59
+	map_const MOUNT_MORTAR_B1F,                            20, 18 ; 60
+	map_const ICE_PATH_1F,                                 20, 18 ; 61
+	map_const ICE_PATH_B1F,                                10, 18 ; 62
+	map_const ICE_PATH_B2F_MAHOGANY_SIDE,                  10,  9 ; 63
+	map_const ICE_PATH_B2F_BLACKTHORN_SIDE,                 5,  9 ; 64
+	map_const ICE_PATH_B3F,                                10,  9 ; 65
+	map_const WHIRL_ISLAND_NW,                              5,  9 ; 66
+	map_const WHIRL_ISLAND_NE,                             10,  9 ; 67
+	map_const WHIRL_ISLAND_SW,                             10,  9 ; 68
+	map_const WHIRL_ISLAND_CAVE,                            5,  9 ; 69
+	map_const WHIRL_ISLAND_SE,                              5,  9 ; 70
+	map_const WHIRL_ISLAND_B1F,                            20, 18 ; 71
+	map_const WHIRL_ISLAND_B2F,                            10, 18 ; 72
+	map_const WHIRL_ISLAND_LUGIA_CHAMBER,                  10,  9 ; 73
+	map_const SILVER_CAVE_ROOM_1,                          10, 18 ; 74
+	map_const SILVER_CAVE_ROOM_2,                          15, 18 ; 75
+	map_const SILVER_CAVE_ROOM_3,                          10, 18 ; 76
+	map_const SILVER_CAVE_ITEM_ROOMS,                      10,  9 ; 77
+	map_const DARK_CAVE_VIOLET_ENTRANCE,                   20, 18 ; 78
+	map_const DARK_CAVE_BLACKTHORN_ENTRANCE,               15, 18 ; 79
+	map_const DRAGONS_DEN_1F,                               5,  9 ; 80
+	map_const DRAGONS_DEN_B1F,                             20, 18 ; 81
+	map_const DRAGON_SHRINE,                                5,  5 ; 82
+	map_const TOHJO_FALLS,                                 15,  9 ; 83
+	map_const DIGLETTS_CAVE,                               10, 18 ; 84
+	map_const MOUNT_MOON,                                  15,  9 ; 85
+	map_const UNDERGROUND_PATH,                             3, 14 ; 86
+	map_const ROCK_TUNNEL_1F,                              15, 18 ; 87
+	map_const ROCK_TUNNEL_B1F,                             15, 18 ; 88
+	map_const SAFARI_ZONE_FUCHSIA_GATE_BETA,                5,  4 ; 89
+	map_const SAFARI_ZONE_BETA,                            10, 18 ; 90
+	map_const VICTORY_ROAD,                                10, 36 ; 91
+
+	newgroup                                                      ;  4
+
+	map_const ECRUTEAK_TIN_TOWER_ENTRANCE,                 10,  9 ;  1
+	map_const WISE_TRIOS_ROOM,                              4,  4 ;  2
+	map_const ECRUTEAK_POKECENTER_1F,                       5,  4 ;  3
+	map_const ECRUTEAK_LUGIA_SPEECH_HOUSE,                  4,  4 ;  4
+	map_const DANCE_THEATRE,                                6,  7 ;  5
+	map_const ECRUTEAK_MART,                                6,  4 ;  6
+	map_const ECRUTEAK_GYM,                                 5,  9 ;  7
+	map_const ECRUTEAK_ITEMFINDER_HOUSE,                    4,  4 ;  8
+	map_const ECRUTEAK_CITY,                               20, 18 ;  9
+
+	newgroup                                                      ;  5
+
+	map_const BLACKTHORN_GYM_1F,                            5,  9 ;  1
+	map_const BLACKTHORN_GYM_2F,                            5,  9 ;  2
+	map_const BLACKTHORN_DRAGON_SPEECH_HOUSE,               4,  4 ;  3
+	map_const BLACKTHORN_EMYS_HOUSE,                        4,  4 ;  4
+	map_const BLACKTHORN_MART,                              6,  4 ;  5
+	map_const BLACKTHORN_POKECENTER_1F,                     5,  4 ;  6
+	map_const MOVE_DELETERS_HOUSE,                          4,  4 ;  7
+	map_const ROUTE_45,                                    10, 45 ;  8
+	map_const ROUTE_46,                                    10, 18 ;  9
+	map_const BLACKTHORN_CITY,                             20, 18 ; 10
+
+	newgroup                                                      ;  6
+
+	map_const CINNABAR_POKECENTER_1F,                       5,  4 ;  1
+	map_const CINNABAR_POKECENTER_2F_BETA,                  8,  4 ;  2
+	map_const ROUTE_19_FUCHSIA_GATE,                        5,  4 ;  3
+	map_const SEAFOAM_GYM,                                  5,  4 ;  4
+	map_const ROUTE_19,                                    10, 18 ;  5
+	map_const ROUTE_20,                                    30,  9 ;  6
+	map_const ROUTE_21,                                    10, 18 ;  7
+	map_const CINNABAR_ISLAND,                             10,  9 ;  8
+
+	newgroup                                                      ;  7
+
+	map_const CERULEAN_GYM_BADGE_SPEECH_HOUSE,              4,  4 ;  1
+	map_const CERULEAN_POLICE_STATION,                      4,  4 ;  2
+	map_const CERULEAN_TRADE_SPEECH_HOUSE,                  4,  4 ;  3
+	map_const CERULEAN_POKECENTER_1F,                       5,  4 ;  4
+	map_const CERULEAN_POKECENTER_2F_BETA,                  8,  4 ;  5
+	map_const CERULEAN_GYM,                                 5,  8 ;  6
+	map_const CERULEAN_MART,                                6,  4 ;  7
+	map_const ROUTE_10_POKECENTER_1F,                       5,  4 ;  8
+	map_const ROUTE_10_POKECENTER_2F_BETA,                  8,  4 ;  9
+	map_const POWER_PLANT,                                 10,  9 ; 10
+	map_const BILLS_HOUSE,                                  4,  4 ; 11
+	map_const ROUTE_4,                                     20,  9 ; 12
+	map_const ROUTE_9,                                     30,  9 ; 13
+	map_const ROUTE_10_NORTH,                              10,  9 ; 14
+	map_const ROUTE_24,                                    10,  9 ; 15
+	map_const ROUTE_25,                                    30,  9 ; 16
+	map_const CERULEAN_CITY,                               20, 18 ; 17
+
+	newgroup                                                      ;  8
+
+	map_const AZALEA_POKECENTER_1F,                         5,  4 ;  1
+	map_const CHARCOAL_KILN,                                4,  4 ;  2
+	map_const AZALEA_MART,                                  6,  4 ;  3
+	map_const KURTS_HOUSE,                                  8,  4 ;  4
+	map_const AZALEA_GYM,                                   5,  8 ;  5
+	map_const ROUTE_33,                                    10,  9 ;  6
+	map_const AZALEA_TOWN,                                 20,  9 ;  7
+
+	newgroup                                                      ;  9
+
+	map_const LAKE_OF_RAGE_HIDDEN_POWER_HOUSE,              4,  4 ;  1
+	map_const LAKE_OF_RAGE_MAGIKARP_HOUSE,                  4,  4 ;  2
+	map_const ROUTE_43_MAHOGANY_GATE,                       5,  4 ;  3
+	map_const ROUTE_43_GATE,                                5,  4 ;  4
+	map_const ROUTE_43,                                    10, 27 ;  5
+	map_const LAKE_OF_RAGE,                                20, 18 ;  6
+
+	newgroup                                                      ; 10
+
+	map_const ROUTE_32,                                    10, 45 ;  1
+	map_const ROUTE_35,                                    10, 18 ;  2
+	map_const ROUTE_36,                                    30,  9 ;  3
+	map_const ROUTE_37,                                    10,  9 ;  4
+	map_const VIOLET_CITY,                                 20, 18 ;  5
+	map_const VIOLET_MART,                                  6,  4 ;  6
+	map_const VIOLET_GYM,                                   5,  8 ;  7
+	map_const EARLS_POKEMON_ACADEMY,                        4,  8 ;  8
+	map_const VIOLET_NICKNAME_SPEECH_HOUSE,                 4,  4 ;  9
+	map_const VIOLET_POKECENTER_1F,                         5,  4 ; 10
+	map_const VIOLET_KYLES_HOUSE,                           4,  4 ; 11
+	map_const ROUTE_32_RUINS_OF_ALPH_GATE,                  5,  4 ; 12
+	map_const ROUTE_32_POKECENTER_1F,                       5,  4 ; 13
+	map_const ROUTE_35_GOLDENROD_GATE,                      5,  4 ; 14
+	map_const ROUTE_35_NATIONAL_PARK_GATE,                  4,  4 ; 15
+	map_const ROUTE_36_RUINS_OF_ALPH_GATE,                  5,  4 ; 16
+	map_const ROUTE_36_NATIONAL_PARK_GATE,                  5,  4 ; 17
+
+	newgroup                                                      ; 11
+
+	map_const ROUTE_34,                                    10, 27 ;  1
+	map_const GOLDENROD_CITY,                              20, 18 ;  2
+	map_const GOLDENROD_GYM,                               10,  9 ;  3
+	map_const GOLDENROD_BIKE_SHOP,                          4,  4 ;  4
+	map_const GOLDENROD_HAPPINESS_RATER,                    4,  4 ;  5
+	map_const BILLS_FAMILYS_HOUSE,                          4,  4 ;  6
+	map_const GOLDENROD_MAGNET_TRAIN_STATION,              10,  9 ;  7
+	map_const GOLDENROD_FLOWER_SHOP,                        4,  4 ;  8
+	map_const GOLDENROD_PP_SPEECH_HOUSE,                    4,  4 ;  9
+	map_const GOLDENROD_NAME_RATER,                         4,  4 ; 10
+	map_const GOLDENROD_DEPT_STORE_1F,                      8,  4 ; 11
+	map_const GOLDENROD_DEPT_STORE_2F,                      8,  4 ; 12
+	map_const GOLDENROD_DEPT_STORE_3F,                      8,  4 ; 13
+	map_const GOLDENROD_DEPT_STORE_4F,                      8,  4 ; 14
+	map_const GOLDENROD_DEPT_STORE_5F,                      8,  4 ; 15
+	map_const GOLDENROD_DEPT_STORE_6F,                      8,  4 ; 16
+	map_const GOLDENROD_DEPT_STORE_ELEVATOR,                2,  2 ; 17
+	map_const GOLDENROD_DEPT_STORE_ROOF,                    8,  4 ; 18
+	map_const GOLDENROD_GAME_CORNER,                       10,  7 ; 19
+	map_const GOLDENROD_POKECENTER_1F,                      5,  4 ; 20
+	map_const POKECOM_CENTER_ADMIN_OFFICE_MOBILE,          16, 16 ; 21
+	map_const ILEX_FOREST_AZALEA_GATE,                      5,  4 ; 22
+	map_const ROUTE_34_ILEX_FOREST_GATE,                    5,  4 ; 23
+	map_const DAY_CARE,                                     5,  4 ; 24
+
+	newgroup                                                      ; 12
+
+	map_const ROUTE_6,                                     10,  9 ;  1
+	map_const ROUTE_11,                                    20,  9 ;  2
+	map_const VERMILION_CITY,                              20, 18 ;  3
+	map_const VERMILION_FISHING_SPEECH_HOUSE,               4,  4 ;  4
+	map_const VERMILION_POKECENTER_1F,                      5,  4 ;  5
+	map_const VERMILION_POKECENTER_2F_BETA,                 8,  4 ;  6
+	map_const POKEMON_FAN_CLUB,                             5,  4 ;  7
+	map_const VERMILION_MAGNET_TRAIN_SPEECH_HOUSE,          4,  4 ;  8
+	map_const VERMILION_MART,                               6,  4 ;  9
+	map_const VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE,         4,  4 ; 10
+	map_const VERMILION_GYM,                                5,  9 ; 11
+	map_const ROUTE_6_SAFFRON_GATE,                         5,  4 ; 12
+	map_const ROUTE_6_UNDERGROUND_PATH_ENTRANCE,            4,  4 ; 13
+
+	newgroup                                                      ; 13
+
+	map_const ROUTE_1,                                     10, 18 ;  1
+	map_const PALLET_TOWN,                                 10,  9 ;  2
+	map_const REDS_HOUSE_1F,                                4,  4 ;  3
+	map_const REDS_HOUSE_2F,                                4,  4 ;  4
+	map_const BLUES_HOUSE,                                  4,  4 ;  5
+	map_const OAKS_LAB,                                     5,  6 ;  6
+
+	newgroup                                                      ; 14
+
+	map_const ROUTE_3,                                     30,  9 ;  1
+	map_const PEWTER_CITY,                                 20, 18 ;  2
+	map_const PEWTER_NIDORAN_SPEECH_HOUSE,                  4,  4 ;  3
+	map_const PEWTER_GYM,                                   5,  7 ;  4
+	map_const PEWTER_MART,                                  6,  4 ;  5
+	map_const PEWTER_POKECENTER_1F,                         5,  4 ;  6
+	map_const PEWTER_POKECENTER_2F_BETA,                    8,  4 ;  7
+	map_const PEWTER_SNOOZE_SPEECH_HOUSE,                   4,  4 ;  8
+
+	newgroup                                                      ; 15
+
+	map_const OLIVINE_PORT,                                10, 18 ;  1
+	map_const VERMILION_PORT,                              10, 18 ;  2
+	map_const FAST_SHIP_1F,                                16,  9 ;  3
+	map_const FAST_SHIP_CABINS_NNW_NNE_NE,                  4, 16 ;  4
+	map_const FAST_SHIP_CABINS_SW_SSW_NW,                   4, 16 ;  5
+	map_const FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN,       5, 17 ;  6
+	map_const FAST_SHIP_B1F,                               16,  8 ;  7
+	map_const OLIVINE_PORT_PASSAGE,                        10,  9 ;  8
+	map_const VERMILION_PORT_PASSAGE,                      10,  9 ;  9
+	map_const MOUNT_MOON_SQUARE,                           15,  9 ; 10
+	map_const MOUNT_MOON_GIFT_SHOP,                         4,  4 ; 11
+	map_const TIN_TOWER_ROOF,                              10,  9 ; 12
+
+	newgroup                                                      ; 16
+
+	map_const ROUTE_23,                                    10,  9 ;  1
+	map_const INDIGO_PLATEAU_POKECENTER_1F,                 9,  7 ;  2
+	map_const WILLS_ROOM,                                   5,  9 ;  3
+	map_const KOGAS_ROOM,                                   5,  9 ;  4
+	map_const BRUNOS_ROOM,                                  5,  9 ;  5
+	map_const KARENS_ROOM,                                  5,  9 ;  6
+	map_const LANCES_ROOM,                                  5, 12 ;  7
+	map_const HALL_OF_FAME,                                 5,  7 ;  8
+
+	newgroup                                                      ; 17
+
+	map_const ROUTE_13,                                    30,  9 ;  1
+	map_const ROUTE_14,                                    10, 18 ;  2
+	map_const ROUTE_15,                                    20,  9 ;  3
+	map_const ROUTE_18,                                    10,  9 ;  4
+	map_const FUCHSIA_CITY,                                20, 18 ;  5
+	map_const FUCHSIA_MART,                                 6,  4 ;  6
+	map_const SAFARI_ZONE_MAIN_OFFICE,                      4,  4 ;  7
+	map_const FUCHSIA_GYM,                                  5,  9 ;  8
+	map_const BILLS_BROTHERS_HOUSE,                         4,  4 ;  9
+	map_const FUCHSIA_POKECENTER_1F,                        5,  4 ; 10
+	map_const FUCHSIA_POKECENTER_2F_BETA,                   8,  4 ; 11
+	map_const SAFARI_ZONE_WARDENS_HOME,                     5,  4 ; 12
+	map_const ROUTE_15_FUCHSIA_GATE,                        5,  4 ; 13
+
+	newgroup                                                      ; 18
+
+	map_const ROUTE_8,                                     20,  9 ;  1
+	map_const ROUTE_12,                                    10, 27 ;  2
+	map_const ROUTE_10_SOUTH,                              10,  9 ;  3
+	map_const LAVENDER_TOWN,                               10,  9 ;  4
+	map_const LAVENDER_POKECENTER_1F,                       5,  4 ;  5
+	map_const LAVENDER_POKECENTER_2F_BETA,                  8,  4 ;  6
+	map_const MR_FUJIS_HOUSE,                               5,  4 ;  7
+	map_const LAVENDER_SPEECH_HOUSE,                        4,  4 ;  8
+	map_const LAVENDER_NAME_RATER,                          4,  4 ;  9
+	map_const LAVENDER_MART,                                6,  4 ; 10
+	map_const SOUL_HOUSE,                                   5,  4 ; 11
+	map_const LAV_RADIO_TOWER_1F,                          10,  4 ; 12
+	map_const ROUTE_8_SAFFRON_GATE,                         5,  4 ; 13
+	map_const ROUTE_12_SUPER_ROD_HOUSE,                     4,  4 ; 14
+
+	newgroup                                                      ; 19
+
+	map_const ROUTE_28,                                    20,  9 ;  1
+	map_const SILVER_CAVE_OUTSIDE,                         20, 18 ;  2
+	map_const SILVER_CAVE_POKECENTER_1F,                    5,  4 ;  3
+	map_const ROUTE_28_STEEL_WING_HOUSE,                    4,  4 ;  4
+
+	newgroup                                                      ; 20
+
+	map_const POKECENTER_2F,                                8,  4 ;  1
+	map_const TRADE_CENTER,                                 5,  4 ;  2
+	map_const COLOSSEUM,                                    5,  4 ;  3
+	map_const TIME_CAPSULE,                                 5,  4 ;  4
+	map_const MOBILE_TRADE_ROOM,                            5,  4 ;  5
+	map_const MOBILE_BATTLE_ROOM,                           5,  4 ;  6
+
+	newgroup                                                      ; 21
+
+	map_const ROUTE_7,                                     10,  9 ;  1
+	map_const ROUTE_16,                                    10,  9 ;  2
+	map_const ROUTE_17,                                    10, 45 ;  3
+	map_const CELADON_CITY,                                20, 18 ;  4
+	map_const CELADON_DEPT_STORE_1F,                        8,  4 ;  5
+	map_const CELADON_DEPT_STORE_2F,                        8,  4 ;  6
+	map_const CELADON_DEPT_STORE_3F,                        8,  4 ;  7
+	map_const CELADON_DEPT_STORE_4F,                        8,  4 ;  8
+	map_const CELADON_DEPT_STORE_5F,                        8,  4 ;  9
+	map_const CELADON_DEPT_STORE_6F,                        8,  4 ; 10
+	map_const CELADON_DEPT_STORE_ELEVATOR,                  2,  2 ; 11
+	map_const CELADON_MANSION_1F,                           4,  5 ; 12
+	map_const CELADON_MANSION_2F,                           4,  5 ; 13
+	map_const CELADON_MANSION_3F,                           4,  5 ; 14
+	map_const CELADON_MANSION_ROOF,                         4,  5 ; 15
+	map_const CELADON_MANSION_ROOF_HOUSE,                   4,  4 ; 16
+	map_const CELADON_POKECENTER_1F,                        5,  4 ; 17
+	map_const CELADON_POKECENTER_2F_BETA,                   8,  4 ; 18
+	map_const CELADON_GAME_CORNER,                         10,  7 ; 19
+	map_const CELADON_GAME_CORNER_PRIZE_ROOM,               3,  3 ; 20
+	map_const CELADON_GYM,                                  5,  9 ; 21
+	map_const CELADON_CAFE,                                 6,  4 ; 22
+	map_const ROUTE_16_FUCHSIA_SPEECH_HOUSE,                4,  4 ; 23
+	map_const ROUTE_16_GATE,                                5,  4 ; 24
+	map_const ROUTE_7_SAFFRON_GATE,                         5,  4 ; 25
+	map_const ROUTE_17_ROUTE_18_GATE,                       5,  4 ; 26
+
+	newgroup                                                      ; 22
+
+	map_const ROUTE_40,                                    10, 18 ;  1
+	map_const ROUTE_41,                                    25, 27 ;  2
+	map_const CIANWOOD_CITY,                               15, 27 ;  3
+	map_const MANIAS_HOUSE,                                 4,  4 ;  4
+	map_const CIANWOOD_GYM,                                 5,  9 ;  5
+	map_const CIANWOOD_POKECENTER_1F,                       5,  4 ;  6
+	map_const CIANWOOD_PHARMACY,                            4,  4 ;  7
+	map_const CIANWOOD_PHOTO_STUDIO,                        4,  4 ;  8
+	map_const CIANWOOD_LUGIA_SPEECH_HOUSE,                  4,  4 ;  9
+	map_const POKE_SEERS_HOUSE,                             4,  4 ; 10
+	map_const BATTLE_TOWER_1F,                              8,  5 ; 11
+	map_const BATTLE_TOWER_BATTLE_ROOM,                     4,  4 ; 12
+	map_const BATTLE_TOWER_ELEVATOR,                        2,  2 ; 13
+	map_const BATTLE_TOWER_HALLWAY,                        11,  2 ; 14
+	map_const ROUTE_40_BATTLE_TOWER_GATE,                   5,  4 ; 15
+	map_const BATTLE_TOWER_OUTSIDE,                        10, 14 ; 16
+
+	newgroup                                                      ; 23
+
+	map_const ROUTE_2,                                     10, 27 ;  1
+	map_const ROUTE_22,                                    20,  9 ;  2
+	map_const VIRIDIAN_CITY,                               20, 18 ;  3
+	map_const VIRIDIAN_GYM,                                 5,  9 ;  4
+	map_const VIRIDIAN_NICKNAME_SPEECH_HOUSE,               4,  4 ;  5
+	map_const TRAINER_HOUSE_1F,                             5,  7 ;  6
+	map_const TRAINER_HOUSE_B1F,                            5,  8 ;  7
+	map_const VIRIDIAN_MART,                                6,  4 ;  8
+	map_const VIRIDIAN_POKECENTER_1F,                       5,  4 ;  9
+	map_const VIRIDIAN_POKECENTER_2F_BETA,                  8,  4 ; 10
+	map_const ROUTE_2_NUGGET_HOUSE,                         4,  4 ; 11
+	map_const ROUTE_2_GATE,                                 5,  4 ; 12
+	map_const VICTORY_ROAD_GATE,                           10,  9 ; 13
+
+	newgroup                                                      ; 24
+
+	map_const ROUTE_26,                                    10, 54 ;  1
+	map_const ROUTE_27,                                    40,  9 ;  2
+	map_const ROUTE_29,                                    30,  9 ;  3
+	map_const NEW_BARK_TOWN,                               10,  9 ;  4
+	map_const ELMS_LAB,                                     5,  6 ;  5
+	map_const PLAYERS_HOUSE_1F,                             5,  4 ;  6
+	map_const PLAYERS_HOUSE_2F,                             4,  3 ;  7
+	map_const PLAYERS_NEIGHBORS_HOUSE,                      4,  4 ;  8
+	map_const ELMS_HOUSE,                                   4,  4 ;  9
+	map_const ROUTE_26_HEAL_HOUSE,                          4,  4 ; 10
+	map_const DAY_OF_WEEK_SIBLINGS_HOUSE,                   4,  4 ; 11
+	map_const ROUTE_27_SANDSTORM_HOUSE,                     4,  4 ; 12
+	map_const ROUTE_29_ROUTE_46_GATE,                       5,  4 ; 13
+
+	newgroup                                                      ; 25
+
+	map_const ROUTE_5,                                     10,  9 ;  1
+	map_const SAFFRON_CITY,                                20, 18 ;  2
+	map_const FIGHTING_DOJO,                                5,  6 ;  3
+	map_const SAFFRON_GYM,                                 10,  9 ;  4
+	map_const SAFFRON_MART,                                 6,  4 ;  5
+	map_const SAFFRON_POKECENTER_1F,                        5,  4 ;  6
+	map_const SAFFRON_POKECENTER_2F_BETA,                   8,  4 ;  7
+	map_const MR_PSYCHICS_HOUSE,                            4,  4 ;  8
+	map_const SAFFRON_MAGNET_TRAIN_STATION,                10,  9 ;  9
+	map_const SILPH_CO_1F,                                  8,  4 ; 10
+	map_const COPYCATS_HOUSE_1F,                            4,  4 ; 11
+	map_const COPYCATS_HOUSE_2F,                            5,  3 ; 12
+	map_const ROUTE_5_UNDERGROUND_PATH_ENTRANCE,            4,  4 ; 13
+	map_const ROUTE_5_SAFFRON_GATE,                         5,  4 ; 14
+	map_const ROUTE_5_CLEANSE_TAG_HOUSE,                    4,  4 ; 15
+
+	newgroup                                                      ; 26
+
+	map_const ROUTE_30,                                    10, 27 ;  1
+	map_const ROUTE_31,                                    20,  9 ;  2
+	map_const CHERRYGROVE_CITY,                            20,  9 ;  3
+	map_const CHERRYGROVE_MART,                             6,  4 ;  4
+	map_const CHERRYGROVE_POKECENTER_1F,                    5,  4 ;  5
+	map_const CHERRYGROVE_GYM_SPEECH_HOUSE,                 4,  4 ;  6
+	map_const GUIDE_GENTS_HOUSE,                            4,  4 ;  7
+	map_const CHERRYGROVE_EVOLUTION_SPEECH_HOUSE,           4,  4 ;  8
+	map_const ROUTE_30_BERRY_HOUSE,                         4,  4 ;  9
+	map_const MR_POKEMONS_HOUSE,                            4,  4 ; 10
+	map_const ROUTE_31_VIOLET_GATE,                         5,  4 ; 11
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index 2f1b690c3..5098e28df 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -3,22 +3,20 @@ MAP_N_A    EQU -1
 GROUP_NONE EQU 0
 MAP_NONE   EQU 0
 
-
-; map header struct members (see data/maps/definitions.asm)
+; map struct members (see data/maps/maps.asm)
 	const_def
-	const MAPDEF_MAPDATA_BANK ; 0
-	const MAPDEF_TILESET      ; 1
-	const MAPDEF_ENVIRONMENT  ; 2
-	const MAPDEF_MAPDATA      ; 3
-	const MAPDEF_MAPDATA_HI   ; 4
-	const MAPDEF_LOCATION     ; 5
-	const MAPDEF_MUSIC        ; 6
-	const MAPDEF_PALETTE      ; 7
-	const MAPDEF_FISHGROUP    ; 8
-NUM_MAPDEF_ATTRIBUTES EQU const_value
+	const MAP_MAPATTRIBUTES_BANK ; 0
+	const MAP_TILESET            ; 1
+	const MAP_ENVIRONMENT        ; 2
+	const MAP_MAPATTRIBUTES      ; 3
+	const MAP_MAPATTRIBUTES_HI   ; 4
+	const MAP_LOCATION           ; 5
+	const MAP_MUSIC              ; 6
+	const MAP_PALETTE            ; 7
+	const MAP_FISHGROUP          ; 8
 
 ; map environments (wEnvironment)
-const_value set 1
+	const_def 1
 	const TOWN
 	const ROUTE
 	const INDOOR
@@ -35,7 +33,7 @@ const_value set 1
 	const PALETTE_MORN
 	const PALETTE_DARK
 
-; fish groups
+; FishGroups indexes (see data/wild/fish.asm)
 	const_def
 	const FISHGROUP_NONE
 	const FISHGROUP_SHORE
@@ -52,7 +50,6 @@ const_value set 1
 	const FISHGROUP_REMORAID
 	const FISHGROUP_QWILFISH_NO_SWARM
 
-
 ; connection directions (see data/maps/data.asm)
 	const_def
 	const EAST_F
@@ -67,7 +64,6 @@ const_value set 1
 	shift_const SOUTH
 	shift_const NORTH
 
-
 ; SpawnPoints indexes (see data/maps/spawn_points.asm)
 const_value = -1
 	const SPAWN_N_A
@@ -97,89 +93,12 @@ const_value = -1
 	const SPAWN_OLIVINE
 	const SPAWN_ECRUTEAK
 	const SPAWN_MAHOGANY
-	const SPAWN_LAKE
+	const SPAWN_LAKE_OF_RAGE
 	const SPAWN_BLACKTHORN
 	const SPAWN_MT_SILVER
 	const SPAWN_FAST_SHIP
 NUM_SPAWNS EQU const_value
 
-
-; outdoor sprite limits (see engine/overworld.asm)
+; outdoor sprite limits (see engine/overworld/overworld.asm)
 MAX_OUTDOOR_SPRITES EQU 23
 SPRITE_GFX_LIST_CAPACITY EQU $20
-
-
-; map_object struct members (see macros/wram.asm)
-	const_def
-	const MAPOBJECT_OBJECT_STRUCT_ID ; 0
-	const MAPOBJECT_SPRITE ; 1
-	const MAPOBJECT_Y_COORD ; 2
-	const MAPOBJECT_X_COORD ; 3
-	const MAPOBJECT_MOVEMENT ; 4
-	const MAPOBJECT_RADIUS ; 5
-	const MAPOBJECT_HOUR ; 6
-	const MAPOBJECT_TIMEOFDAY ; 7
-	const MAPOBJECT_COLOR ; 8
-	const MAPOBJECT_RANGE ; 9
-	const MAPOBJECT_SCRIPT_POINTER ; a
-	const MAPOBJECT_POINTER_HI ; b
-	const MAPOBJECT_EVENT_FLAG ; c
-	const MAPOBJECT_FLAG_HI ; d
-	const MAPOBJECT_E ; unused
-	const MAPOBJECT_F ; unused
-OBJECT_LENGTH EQU const_value
-
-MAPOBJECT_SCREEN_HEIGHT EQU 11
-MAPOBJECT_SCREEN_WIDTH EQU 12
-
-
-; object_struct members (see macros/wram.asm)
-	const_def
-	const OBJECT_SPRITE              ; 00
-	const OBJECT_MAP_OBJECT_INDEX    ; 01
-	const OBJECT_SPRITE_TILE         ; 02
-	const OBJECT_MOVEMENTTYPE        ; 03
-	const OBJECT_FLAGS1              ; 04
-	const OBJECT_FLAGS2              ; 05
-	const OBJECT_PALETTE             ; 06
-	const OBJECT_DIRECTION_WALKING   ; 07
-	const OBJECT_FACING              ; 08
-	const OBJECT_STEP_TYPE           ; 09
-	const OBJECT_STEP_DURATION       ; 0a
-	const OBJECT_ACTION              ; 0b
-	const OBJECT_STEP_FRAME          ; 0c
-	const OBJECT_FACING_STEP         ; 0d
-	const OBJECT_NEXT_TILE           ; 0e
-	const OBJECT_STANDING_TILE       ; 0f
-	const OBJECT_NEXT_MAP_X          ; 10
-	const OBJECT_NEXT_MAP_Y          ; 11
-	const OBJECT_MAP_X               ; 12
-	const OBJECT_MAP_Y               ; 13
-	const OBJECT_INIT_X              ; 14
-	const OBJECT_INIT_Y              ; 15
-	const OBJECT_RADIUS              ; 16
-	const OBJECT_SPRITE_X            ; 17
-	const OBJECT_SPRITE_Y            ; 18
-	const OBJECT_SPRITE_X_OFFSET     ; 19
-	const OBJECT_SPRITE_Y_OFFSET     ; 1a
-	const OBJECT_MOVEMENT_BYTE_INDEX ; 1b
-	const OBJECT_1C                  ; 1c
-	const OBJECT_1D                  ; 1d
-	const OBJECT_1E                  ; 1e
-	const OBJECT_1F                  ; 1f
-	const OBJECT_RANGE               ; 20
-	; 21-27 are not used
-OBJECT_STRUCT_LENGTH EQU 40
-NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs
-
-; object_struct OBJECT_FACING values
-OW_DOWN  EQU DOWN  << 2
-OW_UP    EQU UP    << 2
-OW_LEFT  EQU LEFT  << 2
-OW_RIGHT EQU RIGHT << 2
-
-; object_struct OBJECT_FLAGS1 bit flags
-INVISIBLE    EQU 0
-FIXED_FACING EQU 2
-SLIDING      EQU 3
-EMOTE_OBJECT EQU 7
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm
new file mode 100644
index 000000000..55a3f358b
--- /dev/null
+++ b/constants/map_object_constants.asm
@@ -0,0 +1,294 @@
+; object_struct members (see macros/wram.asm)
+	const_def
+	const OBJECT_SPRITE              ; 00
+	const OBJECT_MAP_OBJECT_INDEX    ; 01
+	const OBJECT_SPRITE_TILE         ; 02
+	const OBJECT_MOVEMENTTYPE        ; 03
+	const OBJECT_FLAGS1              ; 04
+	const OBJECT_FLAGS2              ; 05
+	const OBJECT_PALETTE             ; 06
+	const OBJECT_DIRECTION_WALKING   ; 07
+	const OBJECT_FACING              ; 08
+	const OBJECT_STEP_TYPE           ; 09
+	const OBJECT_STEP_DURATION       ; 0a
+	const OBJECT_ACTION              ; 0b
+	const OBJECT_STEP_FRAME          ; 0c
+	const OBJECT_FACING_STEP         ; 0d
+	const OBJECT_NEXT_TILE           ; 0e
+	const OBJECT_STANDING_TILE       ; 0f
+	const OBJECT_NEXT_MAP_X          ; 10
+	const OBJECT_NEXT_MAP_Y          ; 11
+	const OBJECT_MAP_X               ; 12
+	const OBJECT_MAP_Y               ; 13
+	const OBJECT_INIT_X              ; 14
+	const OBJECT_INIT_Y              ; 15
+	const OBJECT_RADIUS              ; 16
+	const OBJECT_SPRITE_X            ; 17
+	const OBJECT_SPRITE_Y            ; 18
+	const OBJECT_SPRITE_X_OFFSET     ; 19
+	const OBJECT_SPRITE_Y_OFFSET     ; 1a
+	const OBJECT_MOVEMENT_BYTE_INDEX ; 1b
+	const OBJECT_1C                  ; 1c
+	const OBJECT_1D                  ; 1d
+	const OBJECT_1E                  ; 1e
+	const OBJECT_1F                  ; 1f
+	const OBJECT_RANGE               ; 20
+	; 21-27 are not used
+OBJECT_STRUCT_LENGTH EQU 40
+NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs
+
+; object_struct OBJECT_FACING values
+OW_DOWN  EQU DOWN  << 2
+OW_UP    EQU UP    << 2
+OW_LEFT  EQU LEFT  << 2
+OW_RIGHT EQU RIGHT << 2
+
+; object_struct OBJECT_FLAGS1 bit flags
+	const_def
+	const INVISIBLE_F     ; 0
+	const WONT_DELETE_F   ; 1
+	const FIXED_FACING_F  ; 2
+	const SLIDING_F       ; 3
+	const NOCLIP_TILES_F  ; 4
+	const MOVE_ANYWHERE_F ; 5
+	const NOCLIP_OBJS_F   ; 6
+	const EMOTE_OBJECT_F  ; 7
+
+INVISIBLE     EQU 1 << INVISIBLE_F
+WONT_DELETE   EQU 1 << WONT_DELETE_F
+FIXED_FACING  EQU 1 << FIXED_FACING_F
+SLIDING       EQU 1 << SLIDING_F
+NOCLIP_TILES  EQU 1 << NOCLIP_TILES_F
+MOVE_ANYWHERE EQU 1 << MOVE_ANYWHERE_F
+NOCLIP_OBJS   EQU 1 << NOCLIP_OBJS_F
+EMOTE_OBJECT  EQU 1 << EMOTE_OBJECT_F
+
+; object_struct OBJECT_FLAGS2 bit flags
+	const_def
+	const LOW_PRIORITY_F  ; 0
+	const HIGH_PRIORITY_F ; 1
+	const OBJ_FLAGS2_2    ; 2
+	const OVERHEAD_F      ; 3
+	const USE_OBP1_F      ; 4
+
+LOW_PRIORITY  EQU 1 << LOW_PRIORITY_F
+HIGH_PRIORITY EQU 1 << HIGH_PRIORITY_F
+OVERHEAD      EQU 1 << OVERHEAD_F
+USE_OBP1      EQU 1 << USE_OBP1_F
+
+; object_struct OBJECT_PALETTE bit flags
+	const_def 5
+	const SWIMMING_F         ; 5
+	const STRENGTH_BOULDER_F ; 6
+	const BIG_OBJECT_F       ; 7
+
+SWIMMING         EQU 1 << SWIMMING_F
+STRENGTH_BOULDER EQU 1 << STRENGTH_BOULDER_F
+BIG_OBJECT       EQU 1 << BIG_OBJECT_F
+
+; facing attribute bit flags
+RELATIVE_ATTRIBUTES_F EQU 1
+ABSOLUTE_TILE_ID_F    EQU 2
+
+RELATIVE_ATTRIBUTES EQU 1 << RELATIVE_ATTRIBUTES_F
+ABSOLUTE_TILE_ID    EQU 1 << ABSOLUTE_TILE_ID_F
+
+; map_object struct members (see macros/wram.asm)
+	const_def
+	const MAPOBJECT_OBJECT_STRUCT_ID ; 0
+	const MAPOBJECT_SPRITE ; 1
+	const MAPOBJECT_Y_COORD ; 2
+	const MAPOBJECT_X_COORD ; 3
+	const MAPOBJECT_MOVEMENT ; 4
+	const MAPOBJECT_RADIUS ; 5
+	const MAPOBJECT_HOUR ; 6
+	const MAPOBJECT_TIMEOFDAY ; 7
+	const MAPOBJECT_COLOR ; 8
+	const MAPOBJECT_RANGE ; 9
+	const MAPOBJECT_SCRIPT_POINTER ; a
+	const MAPOBJECT_POINTER_HI ; b
+	const MAPOBJECT_EVENT_FLAG ; c
+	const MAPOBJECT_FLAG_HI ; d
+	const MAPOBJECT_E ; unused
+	const MAPOBJECT_F ; unused
+OBJECT_LENGTH EQU const_value
+
+; SpriteMovementData struct members (see data/sprites/map_objects.asm)
+	const_def
+	const SPRITEMOVEATTR_MOVEMENT ; 0
+	const SPRITEMOVEATTR_FACING   ; 1
+	const SPRITEMOVEATTR_ACTION   ; 2
+	const SPRITEMOVEATTR_FLAGS1   ; 3
+	const SPRITEMOVEATTR_FLAGS2   ; 4
+	const SPRITEMOVEATTR_PALFLAGS ; 5
+NUM_SPRITEMOVEDATA_FIELDS EQU const_value
+
+MAPOBJECT_SCREEN_WIDTH  EQU (SCREEN_WIDTH / 2) + 2
+MAPOBJECT_SCREEN_HEIGHT EQU (SCREEN_HEIGHT / 2) + 2
+
+; SpriteMovementData indexes (see data/sprites/map_objects.asm)
+	const_def
+	const SPRITEMOVEDATA_00                   ; 00
+	const SPRITEMOVEDATA_STILL                ; 01
+	const SPRITEMOVEDATA_WANDER               ; 02
+	const SPRITEMOVEDATA_SPINRANDOM_SLOW      ; 03
+	const SPRITEMOVEDATA_WALK_UP_DOWN         ; 04
+	const SPRITEMOVEDATA_WALK_LEFT_RIGHT      ; 05
+	const SPRITEMOVEDATA_STANDING_DOWN        ; 06
+	const SPRITEMOVEDATA_STANDING_UP          ; 07
+	const SPRITEMOVEDATA_STANDING_LEFT        ; 08
+	const SPRITEMOVEDATA_STANDING_RIGHT       ; 09
+	const SPRITEMOVEDATA_SPINRANDOM_FAST      ; 0a
+	const SPRITEMOVEDATA_PLAYER               ; 0b
+	const SPRITEMOVEDATA_0C                   ; 0c
+	const SPRITEMOVEDATA_0D                   ; 0d
+	const SPRITEMOVEDATA_0E                   ; 0e
+	const SPRITEMOVEDATA_0F                   ; 0f
+	const SPRITEMOVEDATA_10                   ; 10
+	const SPRITEMOVEDATA_11                   ; 11
+	const SPRITEMOVEDATA_12                   ; 12
+	const SPRITEMOVEDATA_FOLLOWING            ; 13
+	const SPRITEMOVEDATA_SCRIPTED             ; 14
+	const SPRITEMOVEDATA_BIGDOLLSYM           ; 15
+	const SPRITEMOVEDATA_POKEMON              ; 16
+	const SPRITEMOVEDATA_SUDOWOODO            ; 17
+	const SPRITEMOVEDATA_SMASHABLE_ROCK       ; 18
+	const SPRITEMOVEDATA_STRENGTH_BOULDER     ; 19
+	const SPRITEMOVEDATA_FOLLOWNOTEXACT       ; 1a
+	const SPRITEMOVEDATA_SHADOW               ; 1b
+	const SPRITEMOVEDATA_EMOTE                ; 1c
+	const SPRITEMOVEDATA_SCREENSHAKE          ; 1d
+	const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE ; 1e
+	const SPRITEMOVEDATA_SPINCLOCKWISE        ; 1f
+	const SPRITEMOVEDATA_BIGDOLLASYM          ; 20
+	const SPRITEMOVEDATA_BIGDOLL              ; 21
+	const SPRITEMOVEDATA_BOULDERDUST          ; 22
+	const SPRITEMOVEDATA_GRASS                ; 23
+	const SPRITEMOVEDATA_SWIM_WANDER          ; 24
+NUM_SPRITEMOVEDATA EQU const_value
+
+; MapObjectMovementPattern.Pointers indexes (see engine/overworld/map_objects.asm)
+	const_def
+	const SPRITEMOVEFN_00                    ; 00
+	const SPRITEMOVEFN_RANDOM_WALK_Y         ; 01
+	const SPRITEMOVEFN_RANDOM_WALK_X         ; 02
+	const SPRITEMOVEFN_RANDOM_WALK_XY        ; 03
+	const SPRITEMOVEFN_SLOW_RANDOM_SPIN      ; 04
+	const SPRITEMOVEFN_FAST_RANDOM_SPIN      ; 05
+	const SPRITEMOVEFN_STANDING              ; 06
+	const SPRITEMOVEFN_OBEY_DPAD             ; 07
+	const SPRITEMOVEFN_08                    ; 08
+	const SPRITEMOVEFN_09                    ; 09
+	const SPRITEMOVEFN_0A                    ; 0a
+	const SPRITEMOVEFN_0B                    ; 0b
+	const SPRITEMOVEFN_0C                    ; 0c
+	const SPRITEMOVEFN_0D                    ; 0d
+	const SPRITEMOVEFN_0E                    ; 0e
+	const SPRITEMOVEFN_FOLLOW                ; 0f
+	const SPRITEMOVEFN_SCRIPTED              ; 10
+	const SPRITEMOVEFN_STRENGTH              ; 11
+	const SPRITEMOVEFN_FOLLOWNOTEXACT        ; 12
+	const SPRITEMOVEFN_SHADOW                ; 13
+	const SPRITEMOVEFN_EMOTE                 ; 14
+	const SPRITEMOVEFN_BIG_SNORLAX           ; 15
+	const SPRITEMOVEFN_BOUNCE                ; 16
+	const SPRITEMOVEFN_SCREENSHAKE           ; 17
+	const SPRITEMOVEFN_SPIN_CLOCKWISE        ; 18
+	const SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE ; 19
+	const SPRITEMOVEFN_BOULDERDUST           ; 1a
+	const SPRITEMOVEFN_GRASS                 ; 1b
+
+; StepTypesJumptable indexes (see engine/overworld/map_objects.asm)
+	const_def
+	const STEP_TYPE_00              ; 00
+	const STEP_TYPE_SLEEP           ; 01
+	const STEP_TYPE_NPC_WALK        ; 02
+	const STEP_TYPE_03              ; 03
+	const STEP_TYPE_04              ; 04
+	const STEP_TYPE_05              ; 05
+	const STEP_TYPE_PLAYER_WALK     ; 06
+	const STEP_TYPE_07              ; 07
+	const STEP_TYPE_NPC_JUMP        ; 08
+	const STEP_TYPE_PLAYER_JUMP     ; 09
+	const STEP_TYPE_HALF_STEP       ; 0a
+	const STEP_TYPE_BUMP            ; 0b
+	const STEP_TYPE_TELEPORT_FROM   ; 0c
+	const STEP_TYPE_TELEPORT_TO     ; 0d
+	const STEP_TYPE_SKYFALL         ; 0e
+	const STEP_TYPE_0F              ; 0f
+	const STEP_TYPE_GOT_BITE        ; 10
+	const STEP_TYPE_ROCK_SMASH      ; 11
+	const STEP_TYPE_RETURN_DIG      ; 12
+	const STEP_TYPE_TRACKING_OBJECT ; 13
+	const STEP_TYPE_14              ; 14
+	const STEP_TYPE_15              ; 15
+	const STEP_TYPE_16              ; 16
+	const STEP_TYPE_17              ; 17
+	const STEP_TYPE_18              ; 18
+	const STEP_TYPE_SKYFALL_TOP     ; 19
+
+; ObjectActionPairPointers indexes (see engine/overworld/map_object_action.asm)
+	const_def
+	const OBJECT_ACTION_00            ; 00
+	const OBJECT_ACTION_STAND         ; 01
+	const OBJECT_ACTION_STEP          ; 02
+	const OBJECT_ACTION_BUMP          ; 03
+	const OBJECT_ACTION_SPIN          ; 04
+	const OBJECT_ACTION_SPIN_FLICKER  ; 05
+	const OBJECT_ACTION_FISHING       ; 06
+	const OBJECT_ACTION_SHADOW        ; 07
+	const OBJECT_ACTION_EMOTE         ; 08
+	const OBJECT_ACTION_BIG_DOLL_SYM  ; 09
+	const OBJECT_ACTION_BOUNCE        ; 0a
+	const OBJECT_ACTION_WEIRD_TREE    ; 0b
+	const OBJECT_ACTION_BIG_DOLL_ASYM ; 0c
+	const OBJECT_ACTION_BIG_DOLL      ; 0d
+	const OBJECT_ACTION_BOULDER_DUST  ; 0e
+	const OBJECT_ACTION_GRASS_SHAKE   ; 0f
+	const OBJECT_ACTION_SKYFALL       ; 10
+
+; Facings indexes (see data/sprites/facings.asm)
+	const_def
+	const FACING_STEP_DOWN_0    ; 00
+	const FACING_STEP_DOWN_1    ; 01
+	const FACING_STEP_DOWN_2    ; 02
+	const FACING_STEP_DOWN_3    ; 03
+	const FACING_STEP_UP_0      ; 04
+	const FACING_STEP_UP_1      ; 05
+	const FACING_STEP_UP_2      ; 06
+	const FACING_STEP_UP_3      ; 07
+	const FACING_STEP_LEFT_0    ; 08
+	const FACING_STEP_LEFT_1    ; 09
+	const FACING_STEP_LEFT_2    ; 0a
+	const FACING_STEP_LEFT_3    ; 0b
+	const FACING_STEP_RIGHT_0   ; 0c
+	const FACING_STEP_RIGHT_1   ; 0d
+	const FACING_STEP_RIGHT_2   ; 0e
+	const FACING_STEP_RIGHT_3   ; 0f
+	const FACING_FISH_DOWN      ; 10
+	const FACING_FISH_UP        ; 11
+	const FACING_FISH_LEFT      ; 12
+	const FACING_FISH_RIGHT     ; 13
+	const FACING_EMOTE          ; 14
+	const FACING_SHADOW         ; 15
+	const FACING_BIG_DOLL_ASYM  ; 16
+	const FACING_BIG_DOLL_SYM   ; 17
+	const FACING_WEIRD_TREE_0   ; 18
+	const FACING_WEIRD_TREE_1   ; 19
+	const FACING_WEIRD_TREE_2   ; 1a
+	const FACING_WEIRD_TREE_3   ; 1b
+	const FACING_BOULDER_DUST_1 ; 1c
+	const FACING_BOULDER_DUST_2 ; 1d
+	const FACING_GRASS_1        ; 1e
+	const FACING_GRASS_2        ; 1f
+
+; DoPlayerMovement.DoStep arguments (see engine/overworld/player_movement.asm)
+	const_def
+	const STEP_SLOW          ; 0
+	const STEP_WALK          ; 1
+	const STEP_BIKE          ; 2
+	const STEP_LEDGE         ; 3
+	const STEP_ICE           ; 4
+	const STEP_TURN          ; 5
+	const STEP_BACK_LEDGE    ; 6
+	const STEP_WALK_IN_PLACE ; 7
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index d9abd6e9b..426cbb298 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -1,6 +1,6 @@
 ; hMapEntryMethod values
 ; MapSetupScripts indexes (see data/maps/setup_scripts.asm)
-const_value set $f1
+	const_def $f1
 	const MAPSETUP_WARP       ; f1
 	const MAPSETUP_CONTINUE   ; f2
 	const MAPSETUP_RELOADMAP  ; f3
@@ -14,7 +14,7 @@ const_value set $f1
 	const MAPSETUP_BADWARP    ; fb
 	const MAPSETUP_FLY        ; fc
 
-; MapSetupCommands indexes (see engine/map_setup.asm)
+; MapSetupCommands indexes (see engine/overworld/map_setup.asm)
 ; Names taken from Condensation water's scripting compendium
 ; https://hax.iimarck.us/files/scriptingcodes_eng.htm
 	const_def
@@ -44,8 +44,8 @@ const_value set $f1
 	const map_load_spawn          ; 17
 	const map_load_connection     ; 18
 	const map_load_warp           ; 19
-	const map_attributes          ; 1a
-	const map_attributes_2        ; 1b
+	const map_load_attributes     ; 1a
+	const map_load_attributes_2   ; 1b
 	const map_clear_bg_palettes   ; 1c
 	const map_fade_out_palettes   ; 1d
 	const map_fade_in_palettes    ; 1e
@@ -67,7 +67,7 @@ const_value set $f1
 map_end EQU -1
 
 ; callback types
-const_value set 1
+	const_def 1
 	const MAPCALLBACK_TILES
 	const MAPCALLBACK_OBJECTS
 	const MAPCALLBACK_CMDQUEUE
diff --git a/constants/mart_constants.asm b/constants/mart_constants.asm
new file mode 100644
index 000000000..c4834f524
--- /dev/null
+++ b/constants/mart_constants.asm
@@ -0,0 +1,44 @@
+; mart types (see engine/items/mart.asm)
+	const_def
+	const MARTTYPE_STANDARD
+	const MARTTYPE_BITTER
+	const MARTTYPE_BARGAIN
+	const MARTTYPE_PHARMACY
+	const MARTTYPE_ROOFTOP
+
+; Marts indexes (see data/items/marts.asm)
+	const_def
+	const MART_CHERRYGROVE
+	const MART_CHERRYGROVE_DEX
+	const MART_VIOLET
+	const MART_AZALEA
+	const MART_CIANWOOD
+	const MART_GOLDENROD_2F_1
+	const MART_GOLDENROD_2F_2
+	const MART_GOLDENROD_3F
+	const MART_GOLDENROD_4F
+	const MART_GOLDENROD_5F_1
+	const MART_GOLDENROD_5F_2
+	const MART_GOLDENROD_5F_3
+	const MART_GOLDENROD_5F_4
+	const MART_OLIVINE
+	const MART_ECRUTEAK
+	const MART_MAHOGANY_1
+	const MART_MAHOGANY_2
+	const MART_BLACKTHORN
+	const MART_VIRIDIAN
+	const MART_PEWTER
+	const MART_CERULEAN
+	const MART_LAVENDER
+	const MART_VERMILION
+	const MART_CELADON_2F_1
+	const MART_CELADON_2F_2
+	const MART_CELADON_3F
+	const MART_CELADON_4F
+	const MART_CELADON_5F_1
+	const MART_CELADON_5F_2
+	const MART_FUCHSIA
+	const MART_SAFFRON
+	const MART_MT_MOON
+	const MART_INDIGO_PLATEAU
+	const MART_UNDERGROUND
diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm
index 9174159ea..7c5f23377 100644
--- a/constants/menu_constants.asm
+++ b/constants/menu_constants.asm
@@ -1,4 +1,4 @@
-; MenuDataHeader flags
+; MenuHeader flags
 	const_def
 	shift_const MENU_RESTORE_TILES ; Will be set if MENU_BACKUP_TILES(_2) is set.
 	shift_const MENU_UNUSED_1
@@ -9,7 +9,7 @@
 	shift_const MENU_BACKUP_TILES
 	shift_const MENU_BACKUP_TILES_2
 
-; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuDataHeader2 flags
+; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuData flags
 ; Per flag the comment specifies which menus actually implement it
 	const_def
 	shift_const STATICMENU_DISABLE_B ; VerticalMenu/_2DMenu
@@ -21,7 +21,7 @@
 	shift_const STATICMENU_NO_TOP_SPACING ; VerticalMenu/_2DMenu
 	shift_const STATICMENU_CURSOR ; VerticalMenu/_2DMenu
 
-; ScrollingMenu MenuDataHeader2 flags
+; ScrollingMenu MenuData flags
 	const_def
 	shift_const SCROLLINGMENU_CALL_FUNCTION1_CANCEL
 	shift_const SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH
@@ -31,3 +31,65 @@
 	shift_const SCROLLINGMENU_ENABLE_FUNCTION3
 	shift_const SCROLLINGMENU_ENABLE_START
 	shift_const SCROLLINGMENU_ENABLE_SELECT
+
+; MonMenuOptions indexes (see data/mon_menu.asm)
+; used by PokemonActionSubmenu (see engine/menus/start_menu.asm)
+	const_def 1
+	; moves
+	const MONMENUITEM_CUT        ; 1
+	const MONMENUITEM_FLY        ; 2
+	const MONMENUITEM_SURF       ; 3
+	const MONMENUITEM_STRENGTH   ; 4
+	const MONMENUITEM_WATERFALL  ; 5
+	const MONMENUITEM_FLASH      ; 6
+	const MONMENUITEM_WHIRLPOOL  ; 7
+	const MONMENUITEM_DIG        ; 8
+	const MONMENUITEM_TELEPORT   ; 9
+	const MONMENUITEM_SOFTBOILED ; 10
+	const MONMENUITEM_HEADBUTT   ; 11
+	const MONMENUITEM_ROCKSMASH  ; 12
+	const MONMENUITEM_MILKDRINK  ; 13
+	const MONMENUITEM_SWEETSCENT ; 14
+	; options
+	const MONMENUITEM_STATS      ; 15
+	const MONMENUITEM_SWITCH     ; 16
+	const MONMENUITEM_ITEM       ; 17
+	const MONMENUITEM_CANCEL     ; 18
+	const MONMENUITEM_MOVE       ; 19
+	const MONMENUITEM_MAIL       ; 20
+	const MONMENUITEM_ERROR      ; 21
+
+; MonMenuOptions categories
+MONMENU_FIELD_MOVE EQU 0
+MONMENU_MENUOPTION EQU 1
+
+NUM_MONMENU_ITEMS EQU 8
+
+; start/select menu return values
+HMENURETURN_SCRIPT EQU %10000000
+HMENURETURN_ASM    EQU %11111111
+
+; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm)
+	const_def
+	const PARTYMENUACTION_CHOOSE_POKEMON
+	const PARTYMENUACTION_HEALING_ITEM
+	const PARTYMENUACTION_SWITCH
+	const PARTYMENUACTION_TEACH_TMHM
+	const PARTYMENUACTION_MOVE
+	const PARTYMENUACTION_EVO_STONE
+	const PARTYMENUACTION_GIVE_MON
+	const PARTYMENUACTION_GIVE_MON_FEMALE ; unused
+	const PARTYMENUACTION_GIVE_ITEM
+	const PARTYMENUACTION_MOBILE ; mobile
+; PrintPartyMenuActionText arguments (see engine/pokemon/party_menu.asm)
+	const_def $f0
+	const PARTYMENUTEXT_HEAL_PSN
+	const PARTYMENUTEXT_HEAL_BRN
+	const PARTYMENUTEXT_HEAL_FRZ
+	const PARTYMENUTEXT_HEAL_SLP
+	const PARTYMENUTEXT_HEAL_PAR
+	const PARTYMENUTEXT_HEAL_HP
+	const PARTYMENUTEXT_HEAL_ALL
+	const PARTYMENUTEXT_REVIVE
+	const PARTYMENUTEXT_LEVEL_UP
+	const PARTYMENUTEXT_HEAL_CONFUSION
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index adcaf9a49..03911c50a 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -11,11 +11,6 @@ RESET_FLAG EQU 0
 SET_FLAG   EQU 1
 CHECK_FLAG EQU 2
 
-; GetHPPal return values (see home.asm)
-HP_GREEN  EQU 0
-HP_YELLOW EQU 1
-HP_RED    EQU 2
-
 ; G/S version ID: 0 = Gold, 1 = Silver (used by checkver)
 GS_VERSION EQU 0
 
@@ -23,21 +18,6 @@ GS_VERSION EQU 0
 SAVE_CHECK_VALUE_1 EQU 99
 SAVE_CHECK_VALUE_2 EQU 127
 
-; hMenuReturn
-HMENURETURN_SCRIPT EQU %10000000
-HMENURETURN_ASM    EQU %11111111
-
-; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm)
-	const_def
-	const STEP_SLOW          ; 0
-	const STEP_WALK          ; 1
-	const STEP_BIKE          ; 2
-	const STEP_LEDGE         ; 3
-	const STEP_ICE           ; 4
-	const STEP_TURN          ; 5
-	const STEP_BACK_LEDGE    ; 6
-	const STEP_WALK_IN_PLACE ; 7
-
 ; time of day boundaries
 MORN_HOUR EQU 4  ; 4 AM
 DAY_HOUR  EQU 10 ; 10 AM
@@ -45,48 +25,21 @@ NITE_HOUR EQU 18 ; 6 PM
 NOON_HOUR EQU 12 ; 12 PM
 MAX_HOUR  EQU 24 ; 12 AM
 
-; boxes
-MONS_PER_BOX EQU 20
-NUM_BOXES    EQU 14
-
-; hall of fame
-HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH +- 1) ; species, id, dvs, level, nick
-HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator
-NUM_HOF_TEAMS = 30
-
-MAX_LINK_RECORD EQU 9999
-
 ; significant money values
 START_MONEY EQU 3000
 MOM_MONEY   EQU 2300
 MAX_MONEY   EQU 999999
 MAX_COINS   EQU 9999
 
-; ChangeHappiness arguments (see data/happiness_changes.asm)
-const_value = 1
-	const HAPPINESS_GAINLEVEL         ; 01
-	const HAPPINESS_USEDITEM          ; 02
-	const HAPPINESS_USEDXITEM         ; 03
-	const HAPPINESS_GYMBATTLE         ; 04
-	const HAPPINESS_LEARNMOVE         ; 05
-	const HAPPINESS_FAINTED           ; 06
-	const HAPPINESS_POISONFAINT       ; 07
-	const HAPPINESS_BEATENBYSTRONGFOE ; 08
-	const HAPPINESS_YOUNGCUT1         ; 09
-	const HAPPINESS_YOUNGCUT2         ; 0a
-	const HAPPINESS_YOUNGCUT3         ; 0b
-	const HAPPINESS_OLDERCUT1         ; 0c
-	const HAPPINESS_OLDERCUT2         ; 0d
-	const HAPPINESS_OLDERCUT3         ; 0e
-	const HAPPINESS_BITTERPOWDER      ; 0f
-	const HAPPINESS_ENERGYROOT        ; 10
-	const HAPPINESS_REVIVALHERB       ; 11
-	const HAPPINESS_MASSAGE           ; 12
-	const HAPPINESS_GAINLEVELATHOME   ; 13
+; link record
+MAX_LINK_RECORD EQU 9999
 
 ; day-care
 MAX_DAY_CARE_EXP EQU $500000
 
+; hall of fame
+HOF_MASTER_COUNT EQU 200
+
 ; bug-catching contest
 BUG_CONTEST_MINUTES EQU 20
 BUG_CONTEST_SECONDS EQU 0
diff --git a/constants/npc_trade_constants.asm b/constants/npc_trade_constants.asm
new file mode 100644
index 000000000..f84db5df4
--- /dev/null
+++ b/constants/npc_trade_constants.asm
@@ -0,0 +1,45 @@
+	; npctrade struct members (see data/events/npc_trades.asm)
+NPCTRADE_DIALOG  EQU  0 ; db
+NPCTRADE_GIVEMON EQU  1 ; db
+NPCTRADE_GETMON  EQU  2 ; db
+NPCTRADE_NICK    EQU  3 ; ds MON_NAME_LENGTH
+NPCTRADE_DVS     EQU 14 ; dw
+NPCTRADE_ITEM    EQU 16 ; db
+NPCTRADE_OT_ID   EQU 17 ; dw
+NPCTRADE_OT_NAME EQU 19 ; ds NAME_LENGTH
+NPCTRADE_GENDER  EQU 30 ; db
+NPCTRADE_PADDING EQU 31 ; db
+
+; NPCTrades indexes (see data/events/npc_trades.asm)
+	const_def
+	const NPC_TRADE_MIKE   ; 0
+	const NPC_TRADE_KYLE   ; 1
+	const NPC_TRADE_TIM    ; 2
+	const NPC_TRADE_EMY    ; 3
+	const NPC_TRADE_CHRIS  ; 4
+	const NPC_TRADE_KIM    ; 5
+	const NPC_TRADE_FOREST ; 6
+NUM_NPC_TRADES EQU const_value
+
+; trade gender limits
+	const_def
+	const TRADE_GENDER_EITHER
+	const TRADE_GENDER_MALE
+	const TRADE_GENDER_FEMALE
+
+; TradeTexts indexes (see engine/events/npc_trade.asm)
+
+; trade dialogs
+	const_def
+	const TRADE_DIALOG_INTRO
+	const TRADE_DIALOG_CANCEL
+	const TRADE_DIALOG_WRONG
+	const TRADE_DIALOG_COMPLETE
+	const TRADE_DIALOG_AFTER
+
+; trade dialog sets
+	const_def
+	const TRADE_DIALOGSET_COLLECTOR
+	const TRADE_DIALOGSET_HAPPY
+	const TRADE_DIALOGSET_NEWBIE
+	const TRADE_DIALOGSET_GIRL
diff --git a/constants/npctrade_constants.asm b/constants/npctrade_constants.asm
deleted file mode 100644
index 5464e4dbb..000000000
--- a/constants/npctrade_constants.asm
+++ /dev/null
@@ -1,43 +0,0 @@
-; npctrade struct members (see data/npc_trades.asm)
-TRADE_DIALOG  EQU 0
-TRADE_GIVEMON EQU 1
-TRADE_GETMON  EQU 2
-TRADE_NICK    EQU 3
-TRADE_DVS     EQU 14
-TRADE_ITEM    EQU 16
-TRADE_OT_ID   EQU 17
-TRADE_OT_NAME EQU 19
-TRADE_GENDER  EQU 30
-TRADE_PADDING EQU 31
-
-; NPCTrades indexes (see data/npc_trades.asm)
-	const_def
-	const NPCTRADE_MIKE   ; 0
-	const NPCTRADE_KYLE   ; 1
-	const NPCTRADE_TIM    ; 2
-	const NPCTRADE_EMY    ; 3
-	const NPCTRADE_CHRIS  ; 4
-	const NPCTRADE_KIM    ; 5
-	const NPCTRADE_FOREST ; 6
-
-; trade gender limits
-TRADE_EITHER_GENDER EQU 0
-TRADE_MALE_ONLY     EQU 1
-TRADE_FEMALE_ONLY   EQU 2
-
-; TradeTexts indexes (see engine/npctrade.asm)
-
-; trade dialogs
-	const_def
-	const TRADE_INTRO
-	const TRADE_CANCEL
-	const TRADE_WRONG
-	const TRADE_COMPLETE
-	const TRADE_AFTER
-
-; trade dialog sets
-	const_def
-	const TRADE_DIALOG_COLLECTOR
-	const TRADE_DIALOG_HAPPY
-	const TRADE_DIALOG_NEWBIE
-	const TRADE_DIALOG_GIRL
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index d4c49c5f5..939ac72f2 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -12,13 +12,13 @@
 ; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm)
 ; - EZChat_SortedPokemon (see data/pokemon/ezchat_order.asm)
 ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
-; - Pokered_MonIndices (see data/pokemon/rby_order.asm)
+; - Pokered_MonIndices (see data/pokemon/gen1_order.asm)
 ; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
 ; - AnimationIdlePointers (see gfx/pokemon/idle_pointers.asm)
 ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
 ; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
 ; - Footprints (see gfx/footprints.asm)
-const_value set 1
+	const_def 1
 	const BULBASAUR  ; 01
 	const IVYSAUR    ; 02
 	const VENUSAUR   ; 03
@@ -271,10 +271,44 @@ JOHTO_POKEMON EQU const_value
 	const LUGIA      ; f9
 	const HO_OH      ; fa
 	const CELEBI     ; fb
-NUM_POKEMON EQU const_value +- 1
+NUM_POKEMON EQU const_value + -1
 	const MON_FC     ; fc
 	const EGG        ; fd
 	const MON_FE     ; fe
 
-; number of Unown forms
-NUM_UNOWN EQU 26
+; Unown forms
+; indexes for:
+; - UnownWords (see data/pokemon/unown_words.asm)
+; - UnownPicPointers (see data/pokemon/unown_pic_pointers.asm)
+; - UnownAnimationPointers (see gfx/pokemon/unown_anim_pointers.asm)
+; - UnownAnimationIdlePointers (see gfx/pokemon/unown_idle_pointers.asm)
+; - UnownBitmasksPointers (see gfx/pokemon/unown_bitmask_pointers.asm)
+; - UnownFramesPointers (see gfx/pokemon/unown_frame_pointers.asm)
+	const_def 1
+	const UNOWN_A ;  1
+	const UNOWN_B ;  2
+	const UNOWN_C ;  3
+	const UNOWN_D ;  4
+	const UNOWN_E ;  5
+	const UNOWN_F ;  6
+	const UNOWN_G ;  7
+	const UNOWN_H ;  8
+	const UNOWN_I ;  9
+	const UNOWN_J ; 10
+	const UNOWN_K ; 11
+	const UNOWN_L ; 12
+	const UNOWN_M ; 13
+	const UNOWN_N ; 14
+	const UNOWN_O ; 15
+	const UNOWN_P ; 16
+	const UNOWN_Q ; 17
+	const UNOWN_R ; 18
+	const UNOWN_S ; 19
+	const UNOWN_T ; 20
+	const UNOWN_U ; 21
+	const UNOWN_V ; 22
+	const UNOWN_W ; 23
+	const UNOWN_X ; 24
+	const UNOWN_Y ; 25
+	const UNOWN_Z ; 26
+NUM_UNOWN EQU const_value + -1 ; 26
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 65015da69..1aedf20cb 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -26,47 +26,45 @@ BASE_TMHM        EQUS "(wBaseTMHM - wCurBaseData)"
 BASE_DATA_SIZE   EQUS "(wCurBaseDataEnd - wCurBaseData)"
 
 ; gender ratio constants
-GENDER_F0    EQU 0 percent
-GENDER_F12_5 EQU 31 ; 12.5 percent
-GENDER_F25   EQU 25 percent
-GENDER_F50   EQU 50 percent
-GENDER_F75   EQU 75 percent
-GENDER_F100  EQU 254 ; 100 percent
-GENDERLESS   EQU 255
+GENDER_F0      EQU 0 percent
+GENDER_F12_5   EQU 12 percent + 1
+GENDER_F25     EQU 25 percent
+GENDER_F50     EQU 50 percent
+GENDER_F75     EQU 75 percent
+GENDER_F100    EQU 100 percent - 1
+GENDER_UNKNOWN EQU -1
 
 ; wBaseGrowthRate values
 ; GrowthRates indexes (see data/growth_rates.asm)
 	const_def
-	const MEDIUM_FAST
-	const SLIGHTLY_FAST
-	const SLIGHTLY_SLOW
-	const MEDIUM_SLOW
-	const FAST
-	const SLOW
+	const GROWTH_MEDIUM_FAST
+	const GROWTH_SLIGHTLY_FAST
+	const GROWTH_SLIGHTLY_SLOW
+	const GROWTH_MEDIUM_SLOW
+	const GROWTH_FAST
+	const GROWTH_SLOW
 
 ; wBaseEggGroups values
-const_value set 1
-	const MONSTER      ; 1
-	const AMPHIBIAN    ; 2
-	const INSECT       ; 3
-	const AVIAN        ; 4
-	const FIELD        ; 5
-	const FAIRY        ; 6
-	const PLANT        ; 7
-	const HUMANSHAPE   ; 8
-	const INVERTEBRATE ; 9
-	const INANIMATE    ; a
-	const AMORPHOUS    ; b
-	const FISH         ; c
-	const LADIES_MAN   ; d
-	const REPTILE      ; e
-	const NO_EGGS      ; f
-
+	const_def 1
+	const EGG_MONSTER       ; 1
+	const EGG_WATER_1       ; 2 (Amphibian)
+	const EGG_BUG           ; 3
+	const EGG_FLYING        ; 4
+	const EGG_GROUND        ; 5 (Field)
+	const EGG_FAIRY         ; 6
+	const EGG_PLANT         ; 7 (Grass)
+	const EGG_HUMANSHAPE    ; 8 (Human-Like)
+	const EGG_WATER_3       ; 9 (Invertebrate)
+	const EGG_MINERAL       ; a
+	const EGG_INDETERMINATE ; b (Amorphous)
+	const EGG_WATER_2       ; c (Fish)
+	const EGG_DITTO         ; d
+	const EGG_DRAGON        ; e
+	const EGG_NONE          ; f (Undiscovered)
 
 ; pokedex entries (see data/pokemon/dex_entries.asm)
 NUM_DEX_ENTRY_BANKS EQU 4
 
-
 ; party_struct members (see macros/wram.asm)
 MON_SPECIES            EQUS "(wPartyMon1Species - wPartyMon1)"
 MON_ITEM               EQUS "(wPartyMon1Item - wPartyMon1)"
@@ -101,7 +99,6 @@ BOXMON_STRUCT_LENGTH   EQUS "(wPartyMon1End - wPartyMon1)"
 PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)"
 REDMON_STRUCT_LENGTH EQU 44
 
-
 ; caught data
 
 CAUGHT_TIME_MASK  EQU %11000000
@@ -116,13 +113,20 @@ CAUGHT_BY_BOY     EQU 2
 
 CAUGHT_EGG_LEVEL EQU 1
 
-
 ; maximum number of party pokemon
 PARTY_LENGTH EQU 6
 
+; boxes
+MONS_PER_BOX EQU 20
+NUM_BOXES    EQU 14
+
+; hall of fame
+HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, level, nick
+HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator
+NUM_HOF_TEAMS = 30
 
 ; evolution types (used in data/pokemon/evos_attacks.asm)
-const_value set 1
+	const_def 1
 	const EVOLVE_LEVEL
 	const EVOLVE_ITEM
 	const EVOLVE_TRADE
@@ -130,70 +134,34 @@ const_value set 1
 	const EVOLVE_STAT
 
 ; EVOLVE_HAPPINESS triggers
-const_value set 1
+	const_def 1
 	const TR_ANYTIME
 	const TR_MORNDAY
 	const TR_NITE
 
 ; EVOLVE_STAT triggers
-const_value set 1
+	const_def 1
 	const ATK_GT_DEF
 	const ATK_LT_DEF
 	const ATK_EQ_DEF
 
+; wild data
 
-; PokeAnims indexes (see engine/pic_animation.asm)
-	const_def
-	const ANIM_MON_SLOW
-	const ANIM_MON_NORMAL
-	const ANIM_MON_MENU
-	const ANIM_MON_TRADE
-	const ANIM_MON_EVOLVE
-	const ANIM_MON_HATCH
-	const ANIM_MON_UNUSED
-	const ANIM_MON_EGG1
-	const ANIM_MON_EGG2
-
-
-; MonMenuOptions indexes (see engine/mon_menu.asm)
-const_value set 1
-; moves
-	const MONMENU_CUT        ; 1
-	const MONMENU_FLY        ; 2
-	const MONMENU_SURF       ; 3
-	const MONMENU_STRENGTH   ; 4
-	const MONMENU_WATERFALL  ; 5
-	const MONMENU_FLASH      ; 6
-	const MONMENU_WHIRLPOOL  ; 7
-	const MONMENU_DIG        ; 8
-	const MONMENU_TELEPORT   ; 9
-	const MONMENU_SOFTBOILED ; 10
-	const MONMENU_HEADBUTT   ; 11
-	const MONMENU_ROCKSMASH  ; 12
-	const MONMENU_MILKDRINK  ; 13
-	const MONMENU_SWEETSCENT ; 14
-; options
-	const MONMENU_STATS      ; 15
-	const MONMENU_SWITCH     ; 16
-	const MONMENU_ITEM       ; 17
-	const MONMENU_CANCEL     ; 18
-	const MONMENU_MOVE       ; 19
-	const MONMENU_MAIL       ; 20
-	const MONMENU_ERROR      ; 21
-
-; MonMenuOptions types
-MONMENU_FIELD_MOVE EQU 0
-MONMENU_MENUOPTION EQU 1
-
-NUM_MONMENU_ITEMS EQU 8
+NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
+NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size
 
+GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2
+WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2
+FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3
+
+NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
 
 ; treemon sets
 ; TreeMons indexes (see data/wild/treemons.asm)
 	const_def
 	const TREEMON_SET_CITY
 	const TREEMON_SET_CANYON
-	const TREEMON_SET_AZALEA
+	const TREEMON_SET_TOWN
 	const TREEMON_SET_ROUTE
 	const TREEMON_SET_KANTO
 	const TREEMON_SET_LAKE
@@ -207,26 +175,27 @@ NUM_TREEMON_SETS EQU const_value
 	const TREEMON_SCORE_GOOD ; 1
 	const TREEMON_SCORE_RARE ; 2
 
-
-; wild data
-
-NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
-NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size
-
-GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2
-WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2
-
-NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
-
-
-; swarms
-
-SWARM_DUNSPARCE EQU 0
-SWARM_YANMA     EQU 1
-
-FISHSWARM_QWILFISH EQU 1
-FISHSWARM_REMORAID EQU 2
-
+; ChangeHappiness arguments (see data/happiness_changes.asm)
+const_value = 1
+	const HAPPINESS_GAINLEVEL         ; 01
+	const HAPPINESS_USEDITEM          ; 02
+	const HAPPINESS_USEDXITEM         ; 03
+	const HAPPINESS_GYMBATTLE         ; 04
+	const HAPPINESS_LEARNMOVE         ; 05
+	const HAPPINESS_FAINTED           ; 06
+	const HAPPINESS_POISONFAINT       ; 07
+	const HAPPINESS_BEATENBYSTRONGFOE ; 08
+	const HAPPINESS_YOUNGCUT1         ; 09
+	const HAPPINESS_YOUNGCUT2         ; 0a
+	const HAPPINESS_YOUNGCUT3         ; 0b
+	const HAPPINESS_OLDERCUT1         ; 0c
+	const HAPPINESS_OLDERCUT2         ; 0d
+	const HAPPINESS_OLDERCUT3         ; 0e
+	const HAPPINESS_BITTERPOWDER      ; 0f
+	const HAPPINESS_ENERGYROOT        ; 10
+	const HAPPINESS_REVIVALHERB       ; 11
+	const HAPPINESS_GROOMING          ; 12
+	const HAPPINESS_GAINLEVELATHOME   ; 13
 
 ; significant happiness values
 BASE_HAPPINESS        EQU 70
@@ -235,7 +204,6 @@ HAPPINESS_TO_EVOLVE   EQU 220
 HAPPINESS_THRESHOLD_1 EQU 100
 HAPPINESS_THRESHOLD_2 EQU 200
 
-
 ; PP
 PP_UP_MASK EQU %11000000
 PP_UP_ONE  EQU %01000000
diff --git a/constants/printer_constants.asm b/constants/printer_constants.asm
index b6b5da7e7..f0b8b4818 100755..100644
--- a/constants/printer_constants.asm
+++ b/constants/printer_constants.asm
@@ -1,5 +1,5 @@
 ; wPrinterStatus
-const_value set 1
+	const_def 1
 	const PRINTER_STATUS_CHECKING
 	const PRINTER_STATUS_TRANSMITTING
 	const PRINTER_STATUS_PRINTING
diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm
index d3f14e34c..537b3289e 100644
--- a/constants/radio_constants.asm
+++ b/constants/radio_constants.asm
@@ -1,8 +1,8 @@
 ; radio channel ids
 ; indexes for:
 ; - RadioChannelSongs (see data/radio/channel_music.asm)
-; - PlayRadioShow/RadioJumptable (see engine/radio.asm)
-; - RadioChannels (see engine/radio.asm)
+; - PlayRadioShow/RadioJumptable (see engine/pokegear/radio.asm)
+; - RadioChannels (see engine/pokegear/radio.asm)
 	const_def
 	const OAKS_POKEMON_TALK      ; 00
 	const POKEDEX_SHOW           ; 01
@@ -94,10 +94,10 @@
 	const POKEDEX_SHOW_7         ; 56
 	const POKEDEX_SHOW_8         ; 57
 
-; PlayRadio.StationPointers indexes (see engine/pokegear.asm)
+; PlayRadio.StationPointers indexes (see engine/pokegear/pokegear.asm)
 	const_def
 	const MAPRADIO_POKEMON_CHANNEL
-	const MAPRADIO_OAKS_MON_TALK
+	const MAPRADIO_OAKS_POKEMON_TALK
 	const MAPRADIO_POKEDEX_SHOW
 	const MAPRADIO_POKEMON_MUSIC
 	const MAPRADIO_LUCKY_CHANNEL
@@ -106,10 +106,10 @@
 	const MAPRADIO_LETS_ALL_SING
 	const MAPRADIO_ROCKET
 
-; These tables in engine/radio.asm are all sized to a power of 2
+; These tables in engine/pokegear/radio.asm are all sized to a power of 2
 ; so there's no need for a rejection sampling loop
-NUM_OAKS_MON_TALK_ADVERBS    EQU 16 ; OaksPkmnTalk8.Adverbs
-NUM_OAKS_MON_TALK_ADJECTIVES EQU 16 ; OaksPkmnTalk9.Adjectives
+NUM_OAKS_POKEMON_TALK_ADVERBS    EQU 16 ; OaksPKMNTalk8.Adverbs
+NUM_OAKS_POKEMON_TALK_ADJECTIVES EQU 16 ; OaksPKMNTalk9.Adjectives
 NUM_PNP_PEOPLE_ADJECTIVES    EQU 16 ; PeoplePlaces5.Adjectives
 NUM_PNP_PLACES_ADJECTIVES    EQU 16 ; PeoplePlaces7.Adjectives
 
@@ -117,7 +117,7 @@ NUM_PNP_PLACES_ADJECTIVES    EQU 16 ; PeoplePlaces7.Adjectives
 NUM_PASSWORD_CATEGORIES    EQU 11
 NUM_PASSWORDS_PER_CATEGORY EQU  3
 
-; GetBuenasPassword.StringFunctionJumpTable indexes (see engine/radio.asm)
+; GetBuenasPassword.StringFunctionJumpTable indexes (see engine/pokegear/radio.asm)
 	const_def
 	const BUENA_MON
 	const BUENA_ITEM
diff --git a/constants/scene_constants.asm b/constants/scene_constants.asm
new file mode 100644
index 000000000..67a0351ce
--- /dev/null
+++ b/constants/scene_constants.asm
@@ -0,0 +1,157 @@
+; See data/maps/scenes.asm for which maps have scene variables.
+; Each scene_script and coord_event is associated with a current scene ID.
+
+; Scene variables default to 0.
+SCENE_DEFAULT  EQU 0
+; Often a map will have a one-time default event for scene 0, and switch to a
+; do-nothing scene 1 when the event finishes.
+SCENE_FINISHED EQU 1
+
+; wPokecenter2FSceneID
+	const_def 1
+	const SCENE_POKECENTER2F_LEAVE_TRADE_CENTER       ; 1
+	const SCENE_POKECENTER2F_LEAVE_COLOSSEUM          ; 2
+	const SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE       ; 3
+	const SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM  ; 4
+	const SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM ; 5
+
+; wPowerPlantSceneID
+	const_def
+	const SCENE_POWERPLANT_NOTHING               ; 0
+	const SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL ; 1
+
+; wCeruleanGymSceneID
+	const_def
+	const SCENE_CERULEANGYM_NOTHING        ; 0
+	const SCENE_CERULEANGYM_GRUNT_RUNS_OUT ; 1
+
+; wRoute25SceneID
+	const_def
+	const SCENE_ROUTE25_NOTHING     ; 0
+	const SCENE_ROUTE25_MISTYS_DATE ; 1
+
+; wLancesRoomSceneID
+	const_def 1
+	const SCENE_LANCESROOM_APPROACH_LANCE ; 1
+
+; wElmsLabSceneID
+	const_def 1
+	const SCENE_ELMSLAB_CANT_LEAVE            ; 1
+	const SCENE_ELMSLAB_NOTHING               ; 2
+	const SCENE_ELMSLAB_MEET_OFFICER          ; 3
+	const SCENE_ELMSLAB_UNUSED                ; 4
+	const SCENE_ELMSLAB_AIDE_GIVES_POTION     ; 5
+	const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS ; 6
+
+; wRoute29SceneID
+	const_def
+	const SCENE_ROUTE29_NOTHING        ; 0
+	const SCENE_ROUTE29_CATCH_TUTORIAL ; 1
+
+; wCherrygroveCitySceneID
+	const_def
+	const SCENE_CHERRYGROVECITY_NOTHING    ; 0
+	const SCENE_CHERRYGROVECITY_MEET_RIVAL ; 1
+
+; wRoute32SceneID
+	const_def 1
+	const SCENE_ROUTE32_OFFER_SLOWPOKETAIL ; 1
+	const SCENE_ROUTE32_NOTHING            ; 2
+
+; wRoute35NationalParkGateSceneID
+	const_def
+	const SCENE_ROUTE35NATIONALPARKGATE_NOTHING             ; 0
+	const SCENE_ROUTE35NATIONALPARKGATE_UNUSED              ; 1
+	const SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY ; 2
+
+; wRoute36SceneID
+	const_def
+	const SCENE_ROUTE36_NOTHING ; 0
+	const SCENE_ROUTE36_SUICUNE ; 1
+
+; wRoute36NationalParkGateSceneID
+	const_def
+	const SCENE_ROUTE36NATIONALPARKGATE_NOTHING             ; 0
+	const SCENE_ROUTE36NATIONALPARKGATE_UNUSED              ; 1
+	const SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY ; 2
+
+; wAzaleaTownSceneID
+	const_def
+	const SCENE_AZALEATOWN_NOTHING              ; 0
+	const SCENE_AZALEATOWN_RIVAL_BATTLE         ; 1
+	const SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL ; 2
+
+; wGoldenrodGymSceneID
+	const_def
+	const SCENE_GOLDENRODGYM_NOTHING              ; 0
+	const SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING ; 1
+
+; wRoute42SceneID
+	const_def
+	const SCENE_ROUTE42_NOTHING ; 0
+	const SCENE_ROUTE42_SUICUNE ; 1
+
+; wCianwoodCitySceneID
+	const_def
+	const SCENE_CIANWOODCITY_NOTHING            ; 0
+	const SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE ; 1
+
+; wBurnedTower1FSceneID
+	const_def 1
+	const SCENE_BURNEDTOWER1F_RIVAL_BATTLE ; 1
+	const SCENE_BURNEDTOWER1F_NOTHING      ; 2
+
+; wRadioTower5FSceneID
+	const_def 1
+	const SCENE_RADIOTOWER5F_ROCKET_BOSS ; 1
+	const SCENE_RADIOTOWER5F_NOTHING     ; 2
+
+; wRuinsOfAlphOutsideSceneID
+	const_def
+	const SCENE_RUINSOFALPHOUTSIDE_NOTHING       ; 0
+	const SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX ; 1
+
+; wRuinsOfAlphResearchCenterSceneID
+	const_def
+	const SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING       ; 0
+	const SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX ; 1
+
+; wRuinsOfAlphInnerChamberSceneID
+	const_def
+	const SCENE_RUINSOFALPHINNERCHAMBER_NOTHING          ; 0
+	const SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE ; 1
+
+; wMahoganyMart1FSceneID
+	const_def
+	const SCENE_MAHOGANYMART1F_NOTHING               ; 0
+	const SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS ; 1
+
+; wTeamRocketBaseB2FSceneID
+	const_def 1
+	const SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS ; 1
+	const SCENE_TEAMROCKETBASEB2F_ELECTRODES  ; 2
+	const SCENE_TEAMROCKETBASEB2F_NOTHING     ; 3
+
+; wTeamRocketBaseB3FSceneID
+	const_def 1
+	const SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER ; 1
+	const SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS     ; 2
+	const SCENE_TEAMROCKETBASEB3F_NOTHING         ; 3
+
+; wDragonsDenB1FSceneID
+	const_def
+	const SCENE_DRAGONSDENB1F_NOTHING        ; 0
+	const SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM ; 1
+
+; wOlivinePortSceneID
+	const_def 1
+	const SCENE_OLIVINEPORT_LEAVE_SHIP ; 1
+
+; wVermilionPortSceneID
+	const_def 1
+	const SCENE_VERMILIONPORT_LEAVE_SHIP ; 1
+
+; wFastShip1FSceneID
+	const_def 1
+	const SCENE_FASTSHIP1F_ENTER_SHIP   ; 1
+	const SCENE_FASTSHIP1F_MEET_GRANDPA ; 2
diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm
index e31a2139f..807b5003c 100755..100644
--- a/constants/scgb_constants.asm
+++ b/constants/scgb_constants.asm
@@ -1,4 +1,4 @@
-; GetSGBLayout arguments (see engine/cgb_layouts.asm and engine/sgb_layouts.asm)
+; GetSGBLayout arguments (see engine/gfx/cgb_layouts.asm and engine/gfx/sgb_layouts.asm)
 	const_def
 	const SCGB_BATTLE_GRAYSCALE
 	const SCGB_BATTLE_COLORS
@@ -15,9 +15,9 @@
 	const SCGB_GS_TITLE_SCREEN
 	const SCGB_0D
 	const SCGB_MOVE_LIST
-	const SCGB_0F
+	const SCGB_BETA_PIKACHU_MINIGAME
 	const SCGB_POKEDEX_SEARCH_OPTION
-	const SCGB_11
+	const SCGB_BETA_POKER
 	const SCGB_POKEPIC
 	const SCGB_13
 	const SCGB_PACKPALS
@@ -36,7 +36,7 @@ SCGB_PARTY_MENU_HP_PALS  EQU -4
 SCGB_RAM EQU -1
 
 ; PredefPals indexes (see gfx/sgb/predef.pal)
-; GetPredefPal arguments (see engine/color.asm)
+; GetPredefPal arguments (see engine/gfx/color.asm)
 	const_def
 	const PREDEFPAL_00
 	const PREDEFPAL_PALLET
@@ -75,40 +75,40 @@ SCGB_RAM EQU -1
 	const PREDEFPAL_RB_PINKMON
 	const PREDEFPAL_RB_YELLOWMON
 	const PREDEFPAL_CGB_BADGE ; RB_GREYMON
-	const PREDEFPAL_MEWMON_NITE
-	const PREDEFPAL_BLUEMON_NITE
-	const PREDEFPAL_REDMON_NITE
-	const PREDEFPAL_CYANMON_NITE
-	const PREDEFPAL_PURPLEMON_NITE
-	const PREDEFPAL_BROWNMON_NITE
-	const PREDEFPAL_GREENMON_NITE
-	const PREDEFPAL_PINKMON_NITE
-	const PREDEFPAL_YELLOWMON_NITE
-	const PREDEFPAL_PARTY_ICON ; GREYMON_NITE
+	const PREDEFPAL_BETA_SHINY_MEWMON
+	const PREDEFPAL_BETA_SHINY_BLUEMON
+	const PREDEFPAL_BETA_SHINY_REDMON
+	const PREDEFPAL_BETA_SHINY_CYANMON
+	const PREDEFPAL_BETA_SHINY_PURPLEMON
+	const PREDEFPAL_BETA_SHINY_BROWNMON
+	const PREDEFPAL_BETA_SHINY_GREENMON
+	const PREDEFPAL_BETA_SHINY_PINKMON
+	const PREDEFPAL_BETA_SHINY_YELLOWMON
+	const PREDEFPAL_PARTY_ICON ; BETA_SHINY_GREYMON
 	const PREDEFPAL_HP_GREEN
 	const PREDEFPAL_HP_YELLOW
 	const PREDEFPAL_HP_RED
 	const PREDEFPAL_POKEGEAR
-	const PREDEFPAL_33
-	const PREDEFPAL_34
+	const PREDEFPAL_BETA_LOGO_1
+	const PREDEFPAL_BETA_LOGO_2
 	const PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO
 	const PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS
-	const PREDEFPAL_37
+	const PREDEFPAL_BETA_INTRO_LAPRAS
 	const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
 	const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
 	const PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
-	const PREDEFPAL_3B
+	const PREDEFPAL_BETA_INTRO_VENUSAUR
 	const PREDEFPAL_PACK ; GS_INTRO_CHARIZARD
 	const PREDEFPAL_SLOT_MACHINE_0
 	const PREDEFPAL_SLOT_MACHINE_1
 	const PREDEFPAL_SLOT_MACHINE_2
 	const PREDEFPAL_SLOT_MACHINE_3
-	const PREDEFPAL_SCGB_11_0
-	const PREDEFPAL_SCGB_11_1
-	const PREDEFPAL_SCGB_11_2
-	const PREDEFPAL_SCGB_11_3
-	const PREDEFPAL_45
-	const PREDEFPAL_46
+	const PREDEFPAL_BETA_POKER_0
+	const PREDEFPAL_BETA_POKER_1
+	const PREDEFPAL_BETA_POKER_2
+	const PREDEFPAL_BETA_POKER_3
+	const PREDEFPAL_BETA_RADIO
+	const PREDEFPAL_BETA_POKEGEAR
 	const PREDEFPAL_47
 	const PREDEFPAL_GS_TITLE_SCREEN_0
 	const PREDEFPAL_GS_TITLE_SCREEN_1
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index b72e50c1b..a31394a36 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -1,8 +1,7 @@
-; script vars
+; person constants
 PLAYER      EQU  0
 LAST_TALKED EQU -2
 
-
 ; memory constants
 	const_def
 	const MEM_BUFFER_0 ; use wStringBuffer3
@@ -10,7 +9,6 @@ LAST_TALKED EQU -2
 	const MEM_BUFFER_2 ; use wStringBuffer5
 NUM_MEM_BUFFERS EQU const_value
 
-
 ; checkmoney/takemoney accounts
 	const_def
 	const YOUR_MONEY ; 0
@@ -22,7 +20,7 @@ NUM_MEM_BUFFERS EQU const_value
 	const HAVE_AMOUNT ; 1
 	const HAVE_LESS   ; 2
 
-; checkpokeitem return values
+; checkpokemail return values
 	const_def
 	const POKEMAIL_WRONG_MAIL ; 0
 	const POKEMAIL_CORRECT    ; 1
@@ -36,9 +34,8 @@ NUM_MEM_BUFFERS EQU const_value
 	const PHONE_CONTACTS_FULL   ; 1
 	const PHONE_CONTACT_REFUSED ; 2
 
-
 ; writecode/checkcode arguments
-; _GetVarAction.VarActionTable indexes (see engine/variables.asm)
+; _GetVarAction.VarActionTable indexes (see engine/overworld/variables.asm)
 	const_def
 	const VAR_STRINGBUFFER2    ; 00
 	const VAR_PARTYCOUNT       ; 01
@@ -74,9 +71,8 @@ RETVAR_STRBUF2 EQU (0 << 6)
 RETVAR_ADDR_DE EQU (1 << 6)
 RETVAR_EXECUTE EQU (2 << 6)
 
-
-; PlayerEventScriptPointers indexes (see engine/events.asm)
-const_value set -1
+; PlayerEventScriptPointers indexes (see engine/overworld/events.asm)
+	const_def -1
 	const PLAYEREVENT_MAPSCRIPT
 	const PLAYEREVENT_NONE
 	const PLAYEREVENT_SEENBYTRAINER
@@ -90,8 +86,8 @@ const_value set -1
 	const PLAYEREVENT_JOYCHANGEFACING
 NUM_PLAYER_EVENTS EQU const_value
 
-
-; TryBGEvent arguments (see engine/events.asm)
+; bg_event types
+; TryBGEvent arguments (see engine/overworld/events.asm)
 	const_def
 	const BGEVENT_READ
 	const BGEVENT_UP
@@ -104,7 +100,7 @@ NUM_PLAYER_EVENTS EQU const_value
 	const BGEVENT_COPY
 
 ; object_event types
-; TryObjectEvent arguments (see engine/events.asm)
+; TryObjectEvent arguments (see engine/overworld/events.asm)
 	const_def
 	const OBJECTTYPE_SCRIPT
 	const OBJECTTYPE_ITEMBALL
@@ -114,6 +110,43 @@ NUM_PLAYER_EVENTS EQU const_value
 	const OBJECTTYPE_5
 	const OBJECTTYPE_6
 
+; command queue members
+CMDQUEUE_TYPE  EQU 0
+CMDQUEUE_ADDR  EQU 1
+CMDQUEUE_03    EQU 3
+CMDQUEUE_04    EQU 4
+CMDQUEUE_05    EQU 5
+CMDQUEUE_ENTRY_SIZE EQU 6
+CMDQUEUE_CAPACITY EQU 4
+
+; HandleQueuedCommand.Jumptable indexes (see engine/overworld/events.asm)
+	const_def
+	const CMDQUEUE_NULL
+	const CMDQUEUE_NULL2
+	const CMDQUEUE_STONETABLE
+	const CMDQUEUE_TYPE3
+	const CMDQUEUE_TYPE4
+NUM_CMDQUEUE_TYPES EQU const_value
+
+; elevfloor macro values
+; ElevatorFloorNames indexes (see data/events/elevator_floors.asm)
+	const_def
+	const FLOOR_B4F
+	const FLOOR_B3F
+	const FLOOR_B2F
+	const FLOOR_B1F
+	const FLOOR_1F
+	const FLOOR_2F
+	const FLOOR_3F
+	const FLOOR_4F
+	const FLOOR_5F
+	const FLOOR_6F
+	const FLOOR_7F
+	const FLOOR_8F
+	const FLOOR_9F
+	const FLOOR_10F
+	const FLOOR_11F
+	const FLOOR_ROOF
 
 ; showemote arguments
 ; Emotes indexes (see data/sprites/emotes.asm)
@@ -132,10 +165,9 @@ NUM_PLAYER_EVENTS EQU const_value
 	const EMOTE_GRASS_RUSTLE ; 11
 EMOTE_MEM EQU -1
 
-
 ; fruittree arguments
 ; FruitTreeItems indexes (see data/items/fruit_trees.asm)
-const_value set 1
+	const_def 1
 	const FRUITTREE_ROUTE_29      ; 01
 	const FRUITTREE_ROUTE_30_1    ; 02
 	const FRUITTREE_ROUTE_38      ; 03
@@ -166,11 +198,10 @@ const_value set 1
 	const FRUITTREE_PEWTER_CITY_1 ; 1c
 	const FRUITTREE_PEWTER_CITY_2 ; 1d
 	const FRUITTREE_FUCHSIA_CITY  ; 1e
-NUM_FRUIT_TREES EQU const_value +- 1
-
+NUM_FRUIT_TREES EQU const_value + -1
 
 ; describedecoration arguments
-; DescribeDecoration.JumpTable indexes (see engine/decorations.asm)
+; DescribeDecoration.JumpTable indexes (see engine/overworld/decorations.asm)
 	const_def
 	const DECODESC_POSTER     ; 0
 	const DECODESC_LEFT_DOLL  ; 1
@@ -178,40 +209,17 @@ NUM_FRUIT_TREES EQU const_value +- 1
 	const DECODESC_BIG_DOLL   ; 3
 	const DECODESC_CONSOLE    ; 4
 
-
-; elevfloor macro values
-; ElevatorFloorNames indexes (see data/elevator_floors.asm)
+; swarm arguments
+; StoreSwarmMapIndices arguments
 	const_def
-	const FLOOR_B4F
-	const FLOOR_B3F
-	const FLOOR_B2F
-	const FLOOR_B1F
-	const FLOOR_1F
-	const FLOOR_2F
-	const FLOOR_3F
-	const FLOOR_4F
-	const FLOOR_5F
-	const FLOOR_6F
-	const FLOOR_7F
-	const FLOOR_8F
-	const FLOOR_9F
-	const FLOOR_10F
-	const FLOOR_11F
-	const FLOOR_ROOF
-
-
-; command queue members
-CMDQUEUE_TYPE  EQU 0
-CMDQUEUE_ADDR  EQU 1
-CMDQUEUE_03    EQU 3
-CMDQUEUE_04    EQU 4
-CMDQUEUE_05    EQU 5
-CMDQUEUE_ENTRY_SIZE EQU 6
-CMDQUEUE_CAPACITY EQU 4
-
-; command queue types
-CMDQUEUE_STONETABLE EQU 2
+	const SWARM_DUNSPARCE ; 0
+	const SWARM_YANMA     ; 1
 
+; ActivateFishingSwarm writebyte arguments
+	const_def
+	const FISHSWARM_NONE     ; 0
+	const FISHSWARM_QWILFISH ; 1
+	const FISHSWARM_REMORAID ; 2
 
 ; SpecialGameboyCheck return values
 	const_def
@@ -219,7 +227,7 @@ CMDQUEUE_STONETABLE EQU 2
 	const GBCHECK_SGB ; 1
 	const GBCHECK_CGB ; 2
 
-; Special_CheckMagikarpLength return values
+; CheckMagikarpLength return values
 	const_def
 	const MAGIKARPLENGTH_NOT_MAGIKARP ; 0
 	const MAGIKARPLENGTH_REFUSED      ; 1
@@ -247,8 +255,8 @@ CMDQUEUE_STONETABLE EQU 2
 	const HEALMACHINE_ELMS_LAB     ; 1
 	const HEALMACHINE_HALL_OF_FAME ; 2
 
-; Special_UnownPuzzle writebyte arguments
-; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/unown_puzzle.asm)
+; UnownPuzzle writebyte arguments
+; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/games/unown_puzzle.asm)
 	const_def
 	const UNOWNPUZZLE_KABUTO     ; 0
 	const UNOWNPUZZLE_OMANYTE    ; 1
@@ -256,16 +264,16 @@ CMDQUEUE_STONETABLE EQU 2
 	const UNOWNPUZZLE_HO_OH      ; 3
 NUM_UNOWN_PUZZLES EQU const_value
 
-; Special_DisplayUnownWords writebyte arguments
-; UnownWalls and MenuDataHeaders_UnownWalls indexes (see data/unown_walls.asm)
+; DisplayUnownWords writebyte arguments
+; UnownWalls and MenuHeaders_UnownWalls indexes (see data/events/unown_walls.asm)
 	const_def
 	const UNOWNWORDS_ESCAPE ; 0
 	const UNOWNWORDS_LIGHT  ; 1
 	const UNOWNWORDS_WATER  ; 2
 	const UNOWNWORDS_HO_OH  ; 3
 
-; Special_MoveTutor writebyte arguments
-const_value set 1
+; MoveTutor writebyte arguments
+	const_def 1
 	const MOVETUTOR_FLAMETHROWER ; 1
 	const MOVETUTOR_THUNDERBOLT  ; 2
 	const MOVETUTOR_ICE_BEAM     ; 3
diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm
index 9d98e147d..37fd908db 100644
--- a/constants/sfx_constants.asm
+++ b/constants/sfx_constants.asm
@@ -128,7 +128,7 @@
 	const SFX_SWEET_KISS                  ; 7c
 	const SFX_SWEET_KISS_2                ; 7d
 	const SFX_BELLY_DRUM                  ; 7e
-	const SFX_UNKNOWN_7F                  ; 7f
+	const SFX_TOXIC                       ; 7f
 	const SFX_SLUDGE_BOMB                 ; 80
 	const SFX_FORESIGHT                   ; 81
 	const SFX_SPITE                       ; 82
@@ -206,7 +206,7 @@
 	const SFX_INTRO_SUICUNE_4             ; c8
 	const SFX_GAME_FREAK_PRESENTS         ; c9
 	const SFX_TINGLE                      ; ca
-	const SFX_UNKNOWN_CB                  ; cb
+	const SFX_INTRO_WHOOSH                ; cb
 	const SFX_TWO_PC_BEEPS                ; cc
 	const SFX_4_NOTE_DITTY                ; cd
 	const SFX_TWINKLE                     ; ce
diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm
index 8be0f312a..0fbc4d849 100644
--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@@ -67,7 +67,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
 	const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY       ; 2b
 	const SPRITE_ANIM_INDEX_CELEBI                   ; 2c
 
-; DoAnimFrame.Jumptable indexes (see engine/sprite_anims.asm)
+; DoAnimFrame.Jumptable indexes (see engine/gfx/sprite_anims.asm)
 	const_def
 	const SPRITE_ANIM_SEQ_NULL                    ; 00
 	const SPRITE_ANIM_SEQ_PARTY_MON               ; 01
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index 180be3323..caa6743c2 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -1,5 +1,5 @@
 ; sprite ids
-; OverworldSprites indexes (see data/sprites.asm)
+; OverworldSprites indexes (see data/sprites/sprites.asm)
 	const_def
 	const SPRITE_NONE ; 00
 	const SPRITE_CHRIS ; 01
@@ -106,7 +106,7 @@
 	const SPRITE_STANDING_YOUNGSTER ; 66
 
 ; SpriteMons indexes (see data/sprites/sprite_mons.asm)
-const_value set $80
+	const_def $80
 SPRITE_POKEMON EQU const_value
 	const SPRITE_UNOWN ; 80
 	const SPRITE_GEODUDE ; 81
@@ -144,13 +144,13 @@ SPRITE_POKEMON EQU const_value
 	const SPRITE_LUGIA ; a1
 	const SPRITE_HO_OH ; a2
 
-; special GetMonSprite values (see engine/overworld.asm)
-const_value set $e0
+; special GetMonSprite values (see engine/overworld/overworld.asm)
+	const_def $e0
 	const SPRITE_DAY_CARE_MON_1 ; e0
 	const SPRITE_DAY_CARE_MON_2 ; e1
 
 ; wVariableSprites indexes (see wram.asm)
-const_value set $f0
+	const_def $f0
 SPRITE_VARS EQU const_value
 	const SPRITE_CONSOLE ; f0
 	const SPRITE_DOLL_1 ; f1
diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm
index db53c3ca1..329833b1e 100644
--- a/constants/sprite_data_constants.asm
+++ b/constants/sprite_data_constants.asm
@@ -9,7 +9,7 @@
 NUM_SPRITEDATA_FIELDS EQU const_value
 
 ; sprite types
-const_value set 1
+	const_def 1
 	const WALKING_SPRITE  ; 1
 	const STANDING_SPRITE ; 2
 	const STILL_SPRITE    ; 3
@@ -27,7 +27,7 @@ const_value set 1
 
 ; object_events set bit 3 so as not to use the sprite's default palette
 ; MapObjectPals indexes (see gfx/overworld/npc_sprites.pal)
-const_value set (1 << 3)
+	const_def 1 << 3
 	const PAL_NPC_RED    ; 8
 	const PAL_NPC_BLUE   ; 9
 	const PAL_NPC_GREEN  ; a
@@ -36,160 +36,3 @@ const_value set (1 << 3)
 	const PAL_NPC_SILVER ; d
 	const PAL_NPC_TREE   ; e
 	const PAL_NPC_ROCK   ; f
-
-; SpriteMovementData indexes (see data/sprites/map_objects.asm)
-	const_def
-	const SPRITEMOVEDATA_00                   ; 00
-	const SPRITEMOVEDATA_ITEM_TREE            ; 01
-	const SPRITEMOVEDATA_WANDER               ; 02
-	const SPRITEMOVEDATA_SPINRANDOM_SLOW      ; 03
-	const SPRITEMOVEDATA_WALK_UP_DOWN         ; 04
-	const SPRITEMOVEDATA_WALK_LEFT_RIGHT      ; 05
-	const SPRITEMOVEDATA_STANDING_DOWN        ; 06
-	const SPRITEMOVEDATA_STANDING_UP          ; 07
-	const SPRITEMOVEDATA_STANDING_LEFT        ; 08
-	const SPRITEMOVEDATA_STANDING_RIGHT       ; 09
-	const SPRITEMOVEDATA_SPINRANDOM_FAST      ; 0a
-	const SPRITEMOVEDATA_PLAYER               ; 0b
-	const SPRITEMOVEDATA_0C                   ; 0c
-	const SPRITEMOVEDATA_0D                   ; 0d
-	const SPRITEMOVEDATA_0E                   ; 0e
-	const SPRITEMOVEDATA_0F                   ; 0f
-	const SPRITEMOVEDATA_10                   ; 10
-	const SPRITEMOVEDATA_11                   ; 11
-	const SPRITEMOVEDATA_12                   ; 12
-	const SPRITEMOVEDATA_FOLLOWING            ; 13
-	const SPRITEMOVEDATA_SCRIPTED             ; 14
-	const SPRITEMOVEDATA_SNORLAX              ; 15
-	const SPRITEMOVEDATA_POKEMON              ; 16
-	const SPRITEMOVEDATA_SUDOWOODO            ; 17
-	const SPRITEMOVEDATA_SMASHABLE_ROCK       ; 18
-	const SPRITEMOVEDATA_STRENGTH_BOULDER     ; 19
-	const SPRITEMOVEDATA_FOLLOWNOTEXACT       ; 1a
-	const SPRITEMOVEDATA_SHADOW               ; 1b
-	const SPRITEMOVEDATA_EMOTE                ; 1c
-	const SPRITEMOVEDATA_SCREENSHAKE          ; 1d
-	const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE ; 1e
-	const SPRITEMOVEDATA_SPINCLOCKWISE        ; 1f
-	const SPRITEMOVEDATA_20                   ; 20
-	const SPRITEMOVEDATA_BIGDOLL              ; 21
-	const SPRITEMOVEDATA_BOULDERDUST          ; 22
-	const SPRITEMOVEDATA_GRASS                ; 23
-	const SPRITEMOVEDATA_LAPRAS               ; 24
-NUM_SPRITEMOVEDATA EQU const_value
-SPRITEMOVEDATA_FIELDS EQU 6
-
-; MapObjectMovementPattern.Pointers indexes (see engine/map_objects.asm)
-	const_def
-	const SPRITEMOVEFN_00                    ; 00
-	const SPRITEMOVEFN_RANDOM_WALK_Y         ; 01
-	const SPRITEMOVEFN_RANDOM_WALK_X         ; 02
-	const SPRITEMOVEFN_RANDOM_WALK_XY        ; 03
-	const SPRITEMOVEFN_SLOW_RANDOM_SPIN      ; 04
-	const SPRITEMOVEFN_FAST_RANDOM_SPIN      ; 05
-	const SPRITEMOVEFN_STANDING              ; 06
-	const SPRITEMOVEFN_OBEY_DPAD             ; 07
-	const SPRITEMOVEFN_08                    ; 08
-	const SPRITEMOVEFN_09                    ; 09
-	const SPRITEMOVEFN_0A                    ; 0a
-	const SPRITEMOVEFN_0B                    ; 0b
-	const SPRITEMOVEFN_0C                    ; 0c
-	const SPRITEMOVEFN_0D                    ; 0d
-	const SPRITEMOVEFN_0E                    ; 0e
-	const SPRITEMOVEFN_FOLLOW                ; 0f
-	const SPRITEMOVEFN_SCRIPTED              ; 10
-	const SPRITEMOVEFN_STRENGTH              ; 11
-	const SPRITEMOVEFN_FOLLOWNOTEXACT        ; 12
-	const SPRITEMOVEFN_SHADOW                ; 13
-	const SPRITEMOVEFN_EMOTE                 ; 14
-	const SPRITEMOVEFN_BIG_SNORLAX           ; 15
-	const SPRITEMOVEFN_BOUNCE                ; 16
-	const SPRITEMOVEFN_SCREENSHAKE           ; 17
-	const SPRITEMOVEFN_SPIN_CLOCKWISE        ; 18
-	const SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE ; 19
-	const SPRITEMOVEFN_BOULDERDUST           ; 1a
-	const SPRITEMOVEFN_GRASS                 ; 1b
-
-; StepTypesJumptable indexes (see engine/map_objects.asm)
-	const_def
-	const STEP_TYPE_00              ; 00
-	const STEP_TYPE_SLEEP           ; 01
-	const STEP_TYPE_NPC_WALK        ; 02
-	const STEP_TYPE_03              ; 03
-	const STEP_TYPE_04              ; 04
-	const STEP_TYPE_05              ; 05
-	const STEP_TYPE_PLAYER_WALK     ; 06
-	const STEP_TYPE_07              ; 07
-	const STEP_TYPE_NPC_JUMP        ; 08
-	const STEP_TYPE_PLAYER_JUMP     ; 09
-	const STEP_TYPE_HALF_STEP       ; 0a
-	const STEP_TYPE_BUMP            ; 0b
-	const STEP_TYPE_TELEPORT_FROM   ; 0c
-	const STEP_TYPE_TELEPORT_TO     ; 0d
-	const STEP_TYPE_SKYFALL         ; 0e
-	const STEP_TYPE_0F              ; 0f
-	const STEP_TYPE_GOT_BITE        ; 10
-	const STEP_TYPE_ROCK_SMASH      ; 11
-	const STEP_TYPE_RETURN_DIG      ; 12
-	const STEP_TYPE_TRACKING_OBJECT ; 13
-	const STEP_TYPE_14              ; 14
-	const STEP_TYPE_15              ; 15
-	const STEP_TYPE_16              ; 16
-	const STEP_TYPE_17              ; 17
-	const STEP_TYPE_18              ; 18
-	const STEP_TYPE_SKYFALL_TOP     ; 19
-
-; ObjectActionPairPointers indexes (see engine/map_object_action.asm)
-	const_def
-	const OBJECT_ACTION_00           ; 00
-	const OBJECT_ACTION_STAND        ; 01
-	const OBJECT_ACTION_STEP         ; 02
-	const OBJECT_ACTION_BUMP         ; 03
-	const OBJECT_ACTION_SPIN         ; 04
-	const OBJECT_ACTION_SPIN_FLICKER ; 05
-	const OBJECT_ACTION_FISHING      ; 06
-	const OBJECT_ACTION_SHADOW       ; 07
-	const OBJECT_ACTION_EMOTE        ; 08
-	const OBJECT_ACTION_BIG_SNORLAX  ; 09
-	const OBJECT_ACTION_BOUNCE       ; 0a
-	const OBJECT_ACTION_WEIRD_TREE   ; 0b
-	const OBJECT_ACTION_BIG_LAPRAS   ; 0c
-	const OBJECT_ACTION_BIG_DOLL     ; 0d
-	const OBJECT_ACTION_BOULDER_DUST ; 0e
-	const OBJECT_ACTION_GRASS_SHAKE  ; 0f
-	const OBJECT_ACTION_SKYFALL      ; 10
-
-; Facings indexes (see data/sprites/facings.asm)
-	const_def
-	const FACING_STEP_DOWN_0    ; 00
-	const FACING_STEP_DOWN_1    ; 01
-	const FACING_STEP_DOWN_2    ; 02
-	const FACING_STEP_DOWN_3    ; 03
-	const FACING_STEP_UP_0      ; 04
-	const FACING_STEP_UP_1      ; 05
-	const FACING_STEP_UP_2      ; 06
-	const FACING_STEP_UP_3      ; 07
-	const FACING_STEP_LEFT_0    ; 08
-	const FACING_STEP_LEFT_1    ; 09
-	const FACING_STEP_LEFT_2    ; 0a
-	const FACING_STEP_LEFT_3    ; 0b
-	const FACING_STEP_RIGHT_0   ; 0c
-	const FACING_STEP_RIGHT_1   ; 0d
-	const FACING_STEP_RIGHT_2   ; 0e
-	const FACING_STEP_RIGHT_3   ; 0f
-	const FACING_FISH_DOWN      ; 10
-	const FACING_FISH_UP        ; 11
-	const FACING_FISH_LEFT      ; 12
-	const FACING_FISH_RIGHT     ; 13
-	const FACING_EMOTE          ; 14
-	const FACING_SHADOW         ; 15
-	const FACING_BIG_DOLL_ASYM  ; 16
-	const FACING_BIG_DOLL_SYM   ; 17
-	const FACING_WEIRD_TREE_0   ; 18
-	const FACING_WEIRD_TREE_1   ; 19
-	const FACING_WEIRD_TREE_2   ; 1a
-	const FACING_WEIRD_TREE_3   ; 1b
-	const FACING_BOULDER_DUST_1 ; 1c
-	const FACING_BOULDER_DUST_2 ; 1d
-	const FACING_GRASS_1        ; 1e
-	const FACING_GRASS_2        ; 1f
diff --git a/constants/std_constants.asm b/constants/std_constants.asm
index 06b0b4f2d..18e64f450 100644
--- a/constants/std_constants.asm
+++ b/constants/std_constants.asm
@@ -1,5 +1,5 @@
 ; StdScripts indexes (see engine/events/std_scripts.asm)
-; also used in TileCollisionStdScripts (see data/collision_stdscripts.asm)
+; also used in TileCollisionStdScripts (see data/events/collision_stdscripts.asm)
 	enum_start
 	enum pokecenternurse
 	enum difficultbookshelf
diff --git a/constants/text_constants.asm b/constants/text_constants.asm
index a6052065c..ee5589561 100644
--- a/constants/text_constants.asm
+++ b/constants/text_constants.asm
@@ -9,7 +9,7 @@ TRAINER_CLASS_NAME_LENGTH EQU 13
 NAME_LENGTH_JAPANESE EQU 6
 
 ; GetName types (see home/names.asm)
-const_value set 1
+	const_def 1
 	const MON_NAME              ; 1
 	const MOVE_NAME             ; 2
 	const DUMMY_NAME            ; 3
@@ -31,12 +31,12 @@ TEXTBOX_Y      EQU SCREEN_HEIGHT - TEXTBOX_HEIGHT
 TEXTBOX_INNERY EQU TEXTBOX_Y + 2
 
 ; PrintNum bit flags
-const_value set 5
+	const_def 5
 	const PRINTNUM_MONEY_F        ; 5
 	const PRINTNUM_RIGHTALIGN_F   ; 6
 	const PRINTNUM_LEADINGZEROS_F ; 7
 
-; PrintNum arguments (see engine/printnum.asm)
+; PrintNum arguments (see engine/math/print_num.asm)
 PRINTNUM_MONEY          EQU 1 << PRINTNUM_MONEY_F
 PRINTNUM_RIGHTALIGN     EQU 1 << PRINTNUM_RIGHTALIGN_F
 PRINTNUM_LEADINGZEROS   EQU 1 << PRINTNUM_LEADINGZEROS_F
diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index 5fda5bd5b..e89714fee 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -1,5 +1,5 @@
 ; Tilesets indexes (see data/tilesets.asm)
-const_value set 1
+	const_def 1
 	const TILESET_JOHTO                ; 01
 	const TILESET_JOHTO_MODERN         ; 02
 	const TILESET_KANTO                ; 03
diff --git a/constants/trainer_data_constants.asm b/constants/trainer_data_constants.asm
index 2d87d8764..00c1c6c38 100644
--- a/constants/trainer_data_constants.asm
+++ b/constants/trainer_data_constants.asm
@@ -10,6 +10,7 @@
 NUM_TRAINER_ATTRIBUTES EQU const_value
 
 ; TRNATTR_AI_MOVE_WEIGHTS bit flags (wEnemyTrainerAIFlags)
+; AIScoringPointers indexes (see engine/battle/ai/move.asm)
 	const_def
 	const       NO_AI
 const_value = 0
diff --git a/constants/type_constants.asm b/constants/type_constants.asm
index 6587c3a70..c3524e9d9 100644
--- a/constants/type_constants.asm
+++ b/constants/type_constants.asm
@@ -2,7 +2,8 @@
 ; also used in:
 ; - PokedexTypeSearchConversionTable (see data/types/search_types.asm)
 ; - PokedexTypeSearchStrings (see data/types/search_strings.asm)
-; - TypeMatchups (see data/battle/type_matchups.asm)
+; - TypeMatchups (see data/types/type_matchups.asm)
+; - TypeBoostItems (see data/types/type_boost_items.asm)
 	const_def
 
 PHYSICAL EQU const_value
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 074f8a7de..5889ca7a6 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -1,4 +1,14 @@
-; wMonType: ; cf5f
+; wInputType:: ; c2c7
+AUTO_INPUT EQU $ff
+
+; wCurrentDexMode:: ; c7d4
+	const_def
+	const DEXMODE_NEW
+	const DEXMODE_OLD
+	const DEXMODE_ABC
+	const DEXMODE_UNOWN
+
+; wMonType:: ; cf5f
 	const_def
 	const PARTYMON   ; 0
 	const OTPARTYMON ; 1
@@ -6,19 +16,23 @@
 	const TEMPMON    ; 3
 	const WILDMON    ; 4
 
-; wOptions: (bits) ; cfcc
-const_value set 4
+; wGameTimerPause:: ; cfbc
+GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0
+GAMETIMERPAUSE_MOBILE_7_F     EQU 7
+
+; wOptions:: ; cfcc
+TEXT_DELAY_MASK EQU %111
+	const_def 4
 	const NO_TEXT_SCROLL ; 4
 	const STEREO         ; 5
 	const BATTLE_SHIFT   ; 6
 	const BATTLE_SCENE   ; 7
 
-; wOptions: (bits 0-2)
-TEXT_DELAY_FAST EQU 1
-TEXT_DELAY_MED  EQU 3
-TEXT_DELAY_SLOW EQU 5
+TEXT_DELAY_FAST EQU %001 ; 1
+TEXT_DELAY_MED  EQU %011 ; 3
+TEXT_DELAY_SLOW EQU %101 ; 5
 
-; wTextBoxFrame: ; cfce
+; wTextBoxFrame:: ; cfce
 	const_def
 	const FRAME_1 ; 0
 	const FRAME_2 ; 1
@@ -30,24 +44,24 @@ TEXT_DELAY_SLOW EQU 5
 	const FRAME_8 ; 7
 NUM_FRAMES EQU const_value
 
-; wTextBoxFlags:
+; wTextBoxFlags:: ; cfcf
 	const_def
 	const FAST_TEXT_DELAY_F ; 0
 	const NO_TEXT_DELAY_F   ; 1
 
-; wOptions2:
-	const_def
-	const MENU_ACCOUNT ; 0
-
-; wGBPrinter:
+; wGBPrinter:: ; cfd0
 GBPRINTER_LIGHTEST EQU $00
 GBPRINTER_LIGHTER  EQU $20
 GBPRINTER_NORMAL   EQU $40
 GBPRINTER_DARKER   EQU $60
 GBPRINTER_DARKEST  EQU $7f
 
-; wWalkingDirection: ; d043
-const_value set -1
+; wOptions2:: ; cfd1
+	const_def
+	const MENU_ACCOUNT ; 0
+
+; wWalkingDirection:: ; d043
+	const_def -1
 	const STANDING ; -1
 	const DOWN     ; 0
 	const UP       ; 1
@@ -60,14 +74,29 @@ UP_MASK    EQU 1 << UP
 LEFT_MASK  EQU 1 << LEFT
 RIGHT_MASK EQU 1 << RIGHT
 
-; wFacingDirection: ; d044
+; wFacingDirection:: ; d044
 FACE_CURRENT EQU 0
-FACE_DOWN  EQU 8
-FACE_UP    EQU 4
-FACE_LEFT  EQU 2
-FACE_RIGHT EQU 1
+FACE_DOWN    EQU 8
+FACE_UP      EQU 4
+FACE_LEFT    EQU 2
+FACE_RIGHT   EQU 1
+
+; wPokemonWithdrawDepositParameter:: ; d10b
+PC_WITHDRAW       EQU 0
+PC_DEPOSIT        EQU 1
+REMOVE_PARTY      EQU 0
+REMOVE_BOX        EQU 1
+DAY_CARE_WITHDRAW EQU 2
+DAY_CARE_DEPOSIT  EQU 3
+
+; wInitListType:: ; d263
+INIT_ENEMYOT_LIST    EQU 1
+INIT_BAG_ITEM_LIST   EQU 2
+INIT_OTHER_ITEM_LIST EQU 3
+INIT_PLAYEROT_LIST   EQU 4
+INIT_MON_LIST        EQU 5
 
-; wTimeOfDay: ; d269
+; wTimeOfDay:: ; d269
 	const_def
 	const MORN_F     ; 0
 	const DAY_F      ; 1
@@ -82,16 +111,30 @@ DARKNESS EQU 1 << DARKNESS_F
 
 ANYTIME EQU MORN | DAY | NITE
 
-; wScriptFlags: ; d434
+; wPlayerSpriteSetupFlags:: ; d45b
+PLAYERSPRITESETUP_FACING_MASK       EQU %11
+PLAYERSPRITESETUP_FEMALE_TO_MALE_F  EQU 2
+PLAYERSPRITESETUP_CUSTOM_FACING_F   EQU 5
+PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F EQU 6
+PLAYERSPRITESETUP_RESET_ACTION_F    EQU 7
+
+; wPlayerGender:: ; d472
+PLAYERGENDER_FEMALE_F EQU 0
+
+; wScriptFlags:: ; d434
 SCRIPT_RUNNING EQU 2
 
-; wScriptMode: ; d437
+; wScriptMode:: ; d437
 SCRIPT_OFF EQU 0
 SCRIPT_READ EQU 1
 SCRIPT_WAIT_MOVEMENT EQU 2
 SCRIPT_WAIT EQU 3
 
-; wCurDay: ; d4cb
+; wSpawnAfterChampion:: ; d4b5
+SPAWN_LANCE EQU 1
+SPAWN_RED   EQU 2
+
+; wCurDay:: ; d4cb
 	const_def
 	const SUNDAY    ; 0
 	const MONDAY    ; 1
@@ -101,44 +144,41 @@ SCRIPT_WAIT EQU 3
 	const FRIDAY    ; 5
 	const SATURDAY  ; 6
 
-; wMapObjects: ; d71e
-
+; wMapObjects:: ; d71e
 PLAYER_OBJECT EQU 0
-
 NUM_OBJECTS   EQU $10
 
-; wInputType: ; c2c7
-AUTO_INPUT EQU $ff
-
-; wWhichRegisteredItem: ; d95b
-REGISTERED_POCKET EQU %11000000
-REGISTERED_NUMBER EQU %00111111
-
-; wPlayerState: ; d95d
-PLAYER_NORMAL    EQU 0
-PLAYER_BIKE      EQU 1
-PLAYER_SKATE     EQU 2
-PLAYER_SURF      EQU 4
-PLAYER_SURF_PIKA EQU 8
+; wStatusFlags:: ; d84c
+	const_def
+	const STATUSFLAGS_POKEDEX_F                  ; 0
+	const STATUSFLAGS_UNOWN_DEX_F                ; 1
+	const STATUSFLAGS_FLASH_F                    ; 2
+	const STATUSFLAGS_CAUGHT_POKERUS_F           ; 3
+	const STATUSFLAGS_ROCKET_SIGNAL_F            ; 4
+	const STATUSFLAGS_NO_WILD_ENCOUNTERS_F       ; 5
+	const STATUSFLAGS_HALL_OF_FAME_F             ; 6
+	const STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F ; 7
 
-; After-Champion Spawn
-SPAWN_LANCE EQU 1
-SPAWN_RED   EQU 2
+; wStatusFlags2:: ; d84d
+	const_def
+	const STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F ; 0
+	const STATUSFLAGS2_SAFARI_GAME_F            ; 1
+	const STATUSFLAGS2_BUG_CONTEST_TIMER_F      ; 2
+	const STATUSFLAGS2_UNUSED_3_F               ; 3
+	const STATUSFLAGS2_BIKE_SHOP_CALL_F         ; 4
+	const STATUSFLAGS2_UNUSED_5_F               ; 5
+	const STATUSFLAGS2_REACHED_GOLDENROD_F      ; 6
+	const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F    ; 7
 
-; wPokemonWithdrawDepositParameter
-PC_WITHDRAW       EQU 0
-PC_DEPOSIT        EQU 1
-DAY_CARE_WITHDRAW EQU 2
-DAY_CARE_DEPOSIT  EQU 3
+; wMomSavingMoney:: ; d854
+MOM_SAVING_SOME_MONEY_F EQU 0
+MOM_SAVING_HALF_MONEY_F EQU 1
+MOM_SAVING_ALL_MONEY_F  EQU 2
+MOM_ACTIVE_F            EQU 7
 
-; wCurrentDexMode
-	const_def
-	const DEXMODE_NEW
-	const DEXMODE_OLD
-	const DEXMODE_ABC
-	const DEXMODE_UNOWN
+MOM_SAVING_MONEY_MASK EQU (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF_MONEY_F) | (1 << MOM_SAVING_ALL_MONEY_F)
 
-; wJohtoBadges:
+; wJohtoBadges:: ; d857
 	const_def
 	const ZEPHYRBADGE
 	const HIVEBADGE
@@ -150,7 +190,7 @@ DAY_CARE_DEPOSIT  EQU 3
 	const RISINGBADGE
 NUM_JOHTO_BADGES EQU const_value
 
-; wKantoBadges:
+; wKantoBadges:: ; d858
 	const_def
 	const BOULDERBADGE
 	const CASCADEBADGE
@@ -163,9 +203,74 @@ NUM_JOHTO_BADGES EQU const_value
 NUM_KANTO_BADGES EQU const_value
 NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
 
-; wInitListType:
-INIT_ENEMYOT_LIST    EQU 1
-INIT_BAG_ITEM_LIST   EQU 2
-INIT_OTHER_ITEM_LIST EQU 3
-INIT_PLAYEROT_LIST   EQU 4
-INIT_MON_LIST        EQU 5
+; wPokegearFlags:: ; d957
+	const_def
+	const POKEGEAR_MAP_CARD_F   ; 0
+	const POKEGEAR_RADIO_CARD_F ; 1
+	const POKEGEAR_PHONE_CARD_F ; 2
+	const POKEGEAR_EXPN_CARD_F  ; 3
+
+POKEGEAR_OBTAINED_F EQU 7
+
+; wWhichRegisteredItem:: ; d95b
+REGISTERED_POCKET EQU %11000000
+REGISTERED_NUMBER EQU %00111111
+
+; wPlayerState:: ; d95d
+PLAYER_NORMAL    EQU 0
+PLAYER_BIKE      EQU 1
+PLAYER_SKATE     EQU 2
+PLAYER_SURF      EQU 4
+PLAYER_SURF_PIKA EQU 8
+
+; wCelebiEvent:: ; dbf3
+CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2
+
+; wBikeFlags:: ; dbf5
+	const_def
+	const BIKEFLAGS_STRENGTH_ACTIVE_F ; 0
+	const BIKEFLAGS_ALWAYS_ON_BIKE_F  ; 1
+	const BIKEFLAGS_DOWNHILL_F        ; 2
+
+; wDailyFlags:: ; dc1e
+	const_def
+	const DAILYFLAGS_KURT_MAKING_BALLS_F             ; 0
+	const DAILYFLAGS_BUG_CONTEST_F                   ; 1
+	const DAILYFLAGS_FISH_SWARM_F                    ; 2
+	const DAILYFLAGS_TIME_CAPSULE_F                  ; 3
+	const DAILYFLAGS_ALL_FRUIT_TREES_F               ; 4
+	const DAILYFLAGS_GOT_SHUCKIE_TODAY_F             ; 5
+	const DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F ; 6
+	const DAILYFLAGS_TRAINER_HOUSE_F                 ; 7
+
+; wWeeklyFlags:: ; dc1f
+	const_def
+	const WEEKLYFLAGS_MT_MOON_SQUARE_CLEFAIRY_F ; 0
+	const WEEKLYFLAGS_UNION_CAVE_LAPRAS_F ; 1
+	const WEEKLYFLAGS_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F ; 2
+	const WEEKLYFLAGS_GOLDENROD_DEPT_STORE_TM27_RETURN_F ; 3
+	const WEEKLYFLAGS_DAISYS_GROOMING_F ; 4
+	const WEEKLYFLAGS_INDIGO_PLATEAU_RIVAL_FIGHT_F ; 5
+	const WEEKLYFLAGS_DAILY_MOVE_TUTOR_F ; 6
+	const WEEKLYFLAGS_BUENAS_PASSWORD_F ; 7
+
+; wSwarmFlags:: ; dc20
+	const_def
+	const SWARMFLAGS_BUENAS_PASSWORD_F           ; 0
+	const SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F ; 1
+	const SWARMFLAGS_DUNSPARCE_SWARM_F           ; 2
+	const SWARMFLAGS_YANMA_SWARM_F               ; 3
+	const SWARMFLAGS_MOBILE_4_F                  ; 4
+
+; wLuckyNumberShowFlag:: ; dc9d
+LUCKYNUMBERSHOW_GAME_OVER_F EQU 0
+
+; wDayCareMan:: ; def5
+DAYCAREMAN_HAS_MON_F         EQU 0
+DAYCAREMAN_MONS_COMPATIBLE_F EQU 5
+DAYCAREMAN_HAS_EGG_F         EQU 6
+DAYCAREMAN_ACTIVE_F          EQU 7
+
+; wDayCareLady:: ; df2c
+DAYCARELADY_HAS_MON_F        EQU 0
+DAYCARELADY_ACTIVE_F         EQU 7
diff --git a/data/battle/accuracy_multipliers.asm b/data/battle/accuracy_multipliers.asm
index a5a309bbd..4b52a0909 100644
--- a/data/battle/accuracy_multipliers.asm
+++ b/data/battle/accuracy_multipliers.asm
@@ -1,5 +1,5 @@
 ; Multiplier ratios for accuracy from modifier -6 to +6
-; (for other stats, see data/battle/stat_multipliers.asm)
+; (for other stats, see data/battle/stat_multipliers.asm).
 
 AccuracyLevelMultipliers:
 	db  33, 100 ; -6 =  33%
diff --git a/data/battle/ai/constant_damage_effects.asm b/data/battle/ai/constant_damage_effects.asm
new file mode 100644
index 000000000..cd812d415
--- /dev/null
+++ b/data/battle/ai/constant_damage_effects.asm
@@ -0,0 +1,10 @@
+; AIDamageCalc uses BattleCommand_ConstantDamage
+; to calculate damage for these instead of
+; BattleCommand_DamageCalc and BattleCommand_Stab.
+
+ConstantDamageEffects:
+	db EFFECT_SUPER_FANG
+	db EFFECT_STATIC_DAMAGE
+	db EFFECT_LEVEL_DAMAGE
+	db EFFECT_PSYWAVE
+	db -1 ; end
diff --git a/data/battle/ai/encore_moves.asm b/data/battle/ai/encore_moves.asm
new file mode 100644
index 000000000..03e028bd1
--- /dev/null
+++ b/data/battle/ai/encore_moves.asm
@@ -0,0 +1,34 @@
+; AI_SMART encourages these moves with Encore.
+
+EncoreMoves:
+	db SWORDS_DANCE
+	db WHIRLWIND
+	db LEER
+	db ROAR
+	db DISABLE
+	db MIST
+	db LEECH_SEED
+	db GROWTH
+	db POISONPOWDER
+	db STRING_SHOT
+	db MEDITATE
+	db AGILITY
+	db TELEPORT
+	db SCREECH
+	db HAZE
+	db FOCUS_ENERGY
+	db DREAM_EATER
+	db POISON_GAS
+	db SPLASH
+	db SHARPEN
+	db CONVERSION
+	db SUPER_FANG
+	db SUBSTITUTE
+	db TRIPLE_KICK
+	db SPIDER_WEB
+	db MIND_READER
+	db FLAME_WHEEL
+	db AEROBLAST
+	db COTTON_SPORE
+	db POWDER_SNOW
+	db -1 ; end
diff --git a/data/battle/ai/rain_dance_moves.asm b/data/battle/ai/rain_dance_moves.asm
new file mode 100644
index 000000000..c00e0b60a
--- /dev/null
+++ b/data/battle/ai/rain_dance_moves.asm
@@ -0,0 +1,15 @@
+; AI_SMART prefers these moves during rain.
+
+RainDanceMoves:
+	db WATER_GUN
+	db HYDRO_PUMP
+	db SURF
+	db BUBBLEBEAM
+	db THUNDER
+	db WATERFALL
+	db CLAMP
+	db BUBBLE
+	db CRABHAMMER
+	db OCTAZOOKA
+	db WHIRLPOOL
+	db -1 ; end
diff --git a/data/battle/ai/reckless_moves.asm b/data/battle/ai/reckless_moves.asm
new file mode 100644
index 000000000..67252979b
--- /dev/null
+++ b/data/battle/ai/reckless_moves.asm
@@ -0,0 +1,9 @@
+; AI_AGGRESSIVE does not discourage these moves
+; even if a stronger one is available.
+
+RecklessMoves:
+	db EFFECT_SELFDESTRUCT
+	db EFFECT_RAMPAGE
+	db EFFECT_MULTI_HIT
+	db EFFECT_DOUBLE_HIT
+	db -1 ; end
diff --git a/data/battle/ai/residual_moves.asm b/data/battle/ai/residual_moves.asm
new file mode 100644
index 000000000..c99ac0f5e
--- /dev/null
+++ b/data/battle/ai/residual_moves.asm
@@ -0,0 +1,16 @@
+; AI_CAUTIOUS discourages these moves after the first turn.
+
+ResidualMoves:
+	db MIST
+	db LEECH_SEED
+	db POISONPOWDER
+	db STUN_SPORE
+	db THUNDER_WAVE
+	db FOCUS_ENERGY
+	db BIDE
+	db POISON_GAS
+	db TRANSFORM
+	db CONVERSION
+	db SUBSTITUTE
+	db SPIKES
+	db -1 ; end
diff --git a/data/battle/ai/risky_effects.asm b/data/battle/ai/risky_effects.asm
new file mode 100644
index 000000000..529436c48
--- /dev/null
+++ b/data/battle/ai/risky_effects.asm
@@ -0,0 +1,7 @@
+; AI_RISKY will not use these effects at max HP
+; even if they would KO the player.
+
+RiskyEffects:
+	db EFFECT_SELFDESTRUCT
+	db EFFECT_OHKO
+	db -1 ; end
diff --git a/data/battle/ai/stall_moves.asm b/data/battle/ai/stall_moves.asm
new file mode 100644
index 000000000..65838e0f0
--- /dev/null
+++ b/data/battle/ai/stall_moves.asm
@@ -0,0 +1,37 @@
+; AI_OPPORTUNIST discourages these moves
+; when the player's HP is low.
+
+StallMoves:
+	db SWORDS_DANCE
+	db TAIL_WHIP
+	db LEER
+	db GROWL
+	db DISABLE
+	db MIST
+	db COUNTER
+	db LEECH_SEED
+	db GROWTH
+	db STRING_SHOT
+	db MEDITATE
+	db AGILITY
+	db RAGE
+	db MIMIC
+	db SCREECH
+	db HARDEN
+	db WITHDRAW
+	db DEFENSE_CURL
+	db BARRIER
+	db LIGHT_SCREEN
+	db HAZE
+	db REFLECT
+	db FOCUS_ENERGY
+	db BIDE
+	db AMNESIA
+	db TRANSFORM
+	db SPLASH
+	db ACID_ARMOR
+	db SHARPEN
+	db CONVERSION
+	db SUBSTITUTE
+	db FLAME_WHEEL
+	db -1 ; end
diff --git a/data/battle/ai/status_only_effects.asm b/data/battle/ai/status_only_effects.asm
new file mode 100644
index 000000000..8748d93b3
--- /dev/null
+++ b/data/battle/ai/status_only_effects.asm
@@ -0,0 +1,9 @@
+; AI_BASIC discourages these effects if the player
+; already has a status condition.
+
+StatusOnlyEffects:
+	db EFFECT_SLEEP
+	db EFFECT_TOXIC
+	db EFFECT_POISON
+	db EFFECT_PARALYZE
+	db -1 ; end
diff --git a/data/battle/ai/sunny_day_moves.asm b/data/battle/ai/sunny_day_moves.asm
new file mode 100644
index 000000000..38d6a8ee7
--- /dev/null
+++ b/data/battle/ai/sunny_day_moves.asm
@@ -0,0 +1,12 @@
+; AI_SMART prefers these moves during harsh sunlight.
+
+SunnyDayMoves:
+	db FIRE_PUNCH
+	db EMBER
+	db FLAMETHROWER
+	db FIRE_SPIN
+	db FIRE_BLAST
+	db SACRED_FIRE
+	db MORNING_SUN
+	db SYNTHESIS
+	db -1 ; end
diff --git a/data/battle/ai/useful_moves.asm b/data/battle/ai/useful_moves.asm
new file mode 100644
index 000000000..456bda2da
--- /dev/null
+++ b/data/battle/ai/useful_moves.asm
@@ -0,0 +1,23 @@
+; AI_SMART knows these moves are usable all-around.
+
+UsefulMoves:
+	db DOUBLE_EDGE
+	db SING
+	db FLAMETHROWER
+	db HYDRO_PUMP
+	db SURF
+	db ICE_BEAM
+	db BLIZZARD
+	db HYPER_BEAM
+	db SLEEP_POWDER
+	db THUNDERBOLT
+	db THUNDER
+	db EARTHQUAKE
+	db TOXIC
+	db PSYCHIC_M
+	db HYPNOSIS
+	db RECOVER
+	db FIRE_BLAST
+	db SOFTBOILED
+	db SUPER_FANG
+	db -1 ; end
diff --git a/data/battle/critical_hits.asm b/data/battle/critical_hit_chances.asm
index 5800d57f4..0128f1a1e 100644
--- a/data/battle/critical_hits.asm
+++ b/data/battle/critical_hit_chances.asm
@@ -1,13 +1,3 @@
-CriticalHitMoves:
-	db KARATE_CHOP
-	db RAZOR_WIND
-	db RAZOR_LEAF
-	db CRABHAMMER
-	db SLASH
-	db AEROBLAST
-	db CROSS_CHOP
-	db -1
-
 CriticalHitChances:
 	db  7 percent     ;  0
 	db 12 percent + 2 ; +1
diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm
index b3eeea273..1b06eefe7 100644
--- a/data/battle/effect_command_pointers.asm
+++ b/data/battle/effect_command_pointers.asm
@@ -2,181 +2,180 @@
 
 	dw 0 ; padding
 
-BattleCommandPointers: ; 3fd28
+BattleCommandPointers:
 ; entries correspond to macros/scripts/battle_commands.asm
-	dw BattleCommand_CheckTurn ; 34084
-	dw BattleCommand_CheckObedience ; 343db
-	dw BattleCommand_UsedMoveText ; 34541
-	dw BattleCommand_DoTurn ; 34555
-	dw BattleCommand_Critical ; 34631
-	dw BattleCommand_DamageStats ; 352dc
-	dw BattleCommand_Stab ; 346d2 - 07
-	dw BattleCommand_DamageVariation ; 34cfd
-	dw BattleCommand_CheckHit ; 34d32
-	dw BattleCommand_LowerSub ; 34eee
-	dw BattleCommand_HitTargetNoSub ; 34f60
-	dw BattleCommand_RaiseSub ; 35004
-	dw BattleCommand_FailureText ; 35023
-	dw BattleCommand_CheckFaint ; 3505e
-	dw BattleCommand_CriticalText ; 35175
-	dw BattleCommand_SuperEffectiveText ; 351ad
-	dw BattleCommand_CheckDestinyBond ; 351c0
-	dw BattleCommand_BuildOpponentRage ; 35250
-	dw BattleCommand_PoisonTarget ; 35eee
-	dw BattleCommand_SleepTarget ; 35e5c
-	dw BattleCommand_DrainTarget ; 35fff
-	dw BattleCommand_EatDream ; 36008
-	dw BattleCommand_BurnTarget ; 3608c
-	dw BattleCommand_FreezeTarget ; 36102
-	dw BattleCommand_ParalyzeTarget ; 36165
-	dw BattleCommand_Selfdestruct ; 37380
-	dw BattleCommand_MirrorMove ; 373c9
-	dw BattleCommand_StatUp ; 361e4
-	dw BattleCommand_StatDown ; 362e3
-	dw BattleCommand_PayDay ; 3705c
-	dw BattleCommand_Conversion ; 3707f
-	dw BattleCommand_ResetStats ; 3710e
-	dw BattleCommand_StoreEnergy ; 36671
-	dw BattleCommand_UnleashEnergy ; 366e5
-	dw BattleCommand_ForceSwitch ; 3680f
-	dw BattleCommand_EndLoop ; 369b6
-	dw BattleCommand_FlinchTarget ; 36aa0
-	dw BattleCommand_OHKO ; 36af3
-	dw BattleCommand_Recoil ; 36cb2
-	dw BattleCommand_Mist ; 36c7e
-	dw BattleCommand_FocusEnergy ; 36c98
-	dw BattleCommand_Confuse ; 36d3b
-	dw BattleCommand_ConfuseTarget ; 36d1d
-	dw BattleCommand_Heal ; 3713e
-	dw BattleCommand_Transform ; 371cd
-	dw BattleCommand_Screen ; 372fc
-	dw BattleCommand_Poison ; 35f2c
-	dw BattleCommand_Paralyze ; 36dc7
-	dw BattleCommand_Substitute ; 36e7c
-	dw BattleCommand_RechargeNextTurn ; 36f0b
-	dw BattleCommand_Mimic ; 36f46
-	dw BattleCommand_Metronome ; 37418
-	dw BattleCommand_LeechSeed ; 36f9d
-	dw BattleCommand_Splash ; 36fe1
-	dw BattleCommand_Disable ; 36fed
-	dw BattleCommand_ClearText ; 37e85
-	dw BattleCommand_Charge ; 36b4d
-	dw BattleCommand_CheckCharge ; 36b3a
-	dw BattleCommand_TrapTarget ; 36c2d
-	dw BattleCommand3c ; 36c2c
-	dw BattleCommand_Rampage ; 36751
-	dw BattleCommand_CheckRampage ; 3671a
-	dw BattleCommand_ConstantDamage ; 35726
-	dw BattleCommand_Counter ; 35813
-	dw BattleCommand_Encore ; 35864
-	dw BattleCommand_PainSplit ; 35926
-	dw BattleCommand_Snore ; 359d0
-	dw BattleCommand_Conversion2 ; 359e6
-	dw BattleCommand_LockOn ; 35a53
-	dw BattleCommand_Sketch ; 35a74
-	dw BattleCommand_DefrostOpponent ; 35b16
-	dw BattleCommand_SleepTalk ; 35b33
-	dw BattleCommand_DestinyBond ; 35bff
-	dw BattleCommand_Spite ; 35c0f
-	dw BattleCommand_FalseSwipe ; 35c94
-	dw BattleCommand_HealBell ; 35cc9
-	dw BattleCommand_HeldFlinch ; 36ac9
-	dw BattleCommand_TripleKick ; 346b2
-	dw BattleCommand_KickCounter ; 346cd
-	dw BattleCommand_Thief ; 37492
-	dw BattleCommand_ArenaTrap ; 37517
-	dw BattleCommand_Nightmare ; 37536
-	dw BattleCommand_Defrost ; 37563
-	dw BattleCommand_Curse ; 37588
-	dw BattleCommand_Protect ; 37618
-	dw BattleCommand_Spikes ; 37683
-	dw BattleCommand_Foresight ; 376a0
-	dw BattleCommand_PerishSong ; 376c2
-	dw BattleCommand_StartSandstorm ; 376f8
-	dw BattleCommand_Endure ; 3766f
-	dw BattleCommand_CheckCurl ; 37718
-	dw BattleCommand_RolloutPower ; 37734
-	dw BattleCommand5d ; 37791
-	dw BattleCommand_FuryCutter ; 37792
-	dw BattleCommand_Attract ; 377ce
-	dw BattleCommand_HappinessPower ; 3784b
-	dw BattleCommand_Present ; 37874
-	dw BattleCommand_DamageCalc ; 35612 - 62
-	dw BattleCommand_FrustrationPower ; 3790e
-	dw BattleCommand_Safeguard ; 37939
-	dw BattleCommand_CheckSafeguard ; 37972
-	dw BattleCommand_GetMagnitude ; 37991
-	dw BattleCommand_BatonPass ; 379c9
-	dw BattleCommand_Pursuit ; 37b1d
-	dw BattleCommand_ClearHazards ; 37b39
-	dw BattleCommand_HealMorn ; 37b74
-	dw BattleCommand_HealDay ; 37b78
-	dw BattleCommand_HealNite ; 37b7c
-	dw BattleCommand_HiddenPower ; 37be8
-	dw BattleCommand_StartRain ; 37bf4
-	dw BattleCommand_StartSun ; 37c07
-	dw BattleCommand_AttackUp ; 361ac
-	dw BattleCommand_DefenseUp ; 361b0
-	dw BattleCommand_SpeedUp ; 361b4
-	dw BattleCommand_SpecialAttackUp ; 361b8
-	dw BattleCommand_SpecialDefenseUp ; 361bc
-	dw BattleCommand_AccuracyUp ; 361c0
-	dw BattleCommand_EvasionUp ; 361c4
-	dw BattleCommand_AttackUp2 ; 361c8
-	dw BattleCommand_DefenseUp2 ; 361cc
-	dw BattleCommand_SpeedUp2 ; 361d0
-	dw BattleCommand_SpecialAttackUp2 ; 361d4
-	dw BattleCommand_SpecialDefenseUp2 ; 361d8
-	dw BattleCommand_AccuracyUp2 ; 361dc
-	dw BattleCommand_EvasionUp2 ; 361e0
-	dw BattleCommand_AttackDown ; 362ad
-	dw BattleCommand_DefenseDown ; 362b1
-	dw BattleCommand_SpeedDown ; 362b5
-	dw BattleCommand_SpecialAttackDown ; 362b9
-	dw BattleCommand_SpecialDefenseDown ; 362bd
-	dw BattleCommand_AccuracyDown ; 362c1
-	dw BattleCommand_EvasionDown ; 362c5
-	dw BattleCommand_AttackDown2 ; 362c9
-	dw BattleCommand_DefenseDown2 ; 362cd
-	dw BattleCommand_SpeedDown2 ; 362d1
-	dw BattleCommand_SpecialAttackDown2 ; 362d5
-	dw BattleCommand_SpecialDefenseDown2 ; 362d9
-	dw BattleCommand_AccuracyDown2 ; 362dd
-	dw BattleCommand_EvasionDown2 ; 362e1
-	dw BattleCommand_StatUpMessage ; 363b8
-	dw BattleCommand_StatDownMessage ; 363e9
-	dw BattleCommand_StatUpFailText ; 3644c
-	dw BattleCommand_StatDownFailText ; 3646a
-	dw BattleCommand_EffectChance ; 34ecc
-	dw BattleCommand_StatDownAnim ; 34fdb
-	dw BattleCommand_StatUpAnim ; 34fd1
-	dw BattleCommand_SwitchTurn ; 34ffd - 93
-	dw BattleCommand_FakeOut ; 36a82
-	dw BattleCommand_BellyDrum ; 37c1a
-	dw BattleCommand_PsychUp ; 37c55
-	dw BattleCommand_Rage ; 36f1d
-	dw BattleCommand_DoubleFlyingDamage ; 36f25
-	dw BattleCommand_DoubleUndergroundDamage ; 36f2f
-	dw BattleCommand_MirrorCoat ; 37c95
-	dw BattleCommand_CheckFutureSight ; 37d0d
-	dw BattleCommand_FutureSight ; 37d34
-	dw BattleCommand_DoubleMinimizeDamage ; 37ce6
-	dw BattleCommand_SkipSunCharge ; 37d02
-	dw BattleCommand_ThunderAccuracy ; 37d94
-	dw BattleCommand_Teleport ; 36778
-	dw BattleCommand_BeatUp ; 35461
-	dw BattleCommand_RageDamage ; 3527b
-	dw BattleCommand_ResetTypeMatchup ; 34833
-	dw BattleCommand_AllStatsUp ; 36500
-	dw BattleCommanda5 ; 35165
-	dw BattleCommand_RaiseSubNoAnim ; 365af
-	dw BattleCommand_LowerSubNoAnim ; 365c3
-	dw BattleCommanda8 ; 355b5
-	dw BattleCommand_ClearMissDamage ; 355d5 - a9
-	dw BattleCommand_MoveDelay ; 37e80
-	dw BattleCommand_HitTarget ; 34f57
-	dw BattleCommand_TriStatusChance ; 3658f
-	dw BattleCommand_SuperEffectiveLoopText ; 351a5
-	dw BattleCommand_StartLoop ; 35197
-	dw BattleCommand_Curl ; 365a7
-; 3fe86
+	dw BattleCommand_CheckTurn
+	dw BattleCommand_CheckObedience
+	dw BattleCommand_UsedMoveText
+	dw BattleCommand_DoTurn
+	dw BattleCommand_Critical
+	dw BattleCommand_DamageStats
+	dw BattleCommand_Stab
+	dw BattleCommand_DamageVariation
+	dw BattleCommand_CheckHit
+	dw BattleCommand_LowerSub
+	dw BattleCommand_MoveAnimNoSub
+	dw BattleCommand_RaiseSub
+	dw BattleCommand_FailureText
+	dw BattleCommand_ApplyDamage
+	dw BattleCommand_CriticalText
+	dw BattleCommand_SuperEffectiveText
+	dw BattleCommand_CheckDestinyBond
+	dw BattleCommand_BuildOpponentRage
+	dw BattleCommand_PoisonTarget
+	dw BattleCommand_SleepTarget
+	dw BattleCommand_DrainTarget
+	dw BattleCommand_EatDream
+	dw BattleCommand_BurnTarget
+	dw BattleCommand_FreezeTarget
+	dw BattleCommand_ParalyzeTarget
+	dw BattleCommand_Selfdestruct
+	dw BattleCommand_MirrorMove
+	dw BattleCommand_StatUp
+	dw BattleCommand_StatDown
+	dw BattleCommand_PayDay
+	dw BattleCommand_Conversion
+	dw BattleCommand_ResetStats
+	dw BattleCommand_StoreEnergy
+	dw BattleCommand_UnleashEnergy
+	dw BattleCommand_ForceSwitch
+	dw BattleCommand_EndLoop
+	dw BattleCommand_FlinchTarget
+	dw BattleCommand_OHKO
+	dw BattleCommand_Recoil
+	dw BattleCommand_Mist
+	dw BattleCommand_FocusEnergy
+	dw BattleCommand_Confuse
+	dw BattleCommand_ConfuseTarget
+	dw BattleCommand_Heal
+	dw BattleCommand_Transform
+	dw BattleCommand_Screen
+	dw BattleCommand_Poison
+	dw BattleCommand_Paralyze
+	dw BattleCommand_Substitute
+	dw BattleCommand_RechargeNextTurn
+	dw BattleCommand_Mimic
+	dw BattleCommand_Metronome
+	dw BattleCommand_LeechSeed
+	dw BattleCommand_Splash
+	dw BattleCommand_Disable
+	dw BattleCommand_ClearText
+	dw BattleCommand_Charge
+	dw BattleCommand_CheckCharge
+	dw BattleCommand_TrapTarget
+	dw BattleCommand3c
+	dw BattleCommand_Rampage
+	dw BattleCommand_CheckRampage
+	dw BattleCommand_ConstantDamage
+	dw BattleCommand_Counter
+	dw BattleCommand_Encore
+	dw BattleCommand_PainSplit
+	dw BattleCommand_Snore
+	dw BattleCommand_Conversion2
+	dw BattleCommand_LockOn
+	dw BattleCommand_Sketch
+	dw BattleCommand_DefrostOpponent
+	dw BattleCommand_SleepTalk
+	dw BattleCommand_DestinyBond
+	dw BattleCommand_Spite
+	dw BattleCommand_FalseSwipe
+	dw BattleCommand_HealBell
+	dw BattleCommand_HeldFlinch
+	dw BattleCommand_TripleKick
+	dw BattleCommand_KickCounter
+	dw BattleCommand_Thief
+	dw BattleCommand_ArenaTrap
+	dw BattleCommand_Nightmare
+	dw BattleCommand_Defrost
+	dw BattleCommand_Curse
+	dw BattleCommand_Protect
+	dw BattleCommand_Spikes
+	dw BattleCommand_Foresight
+	dw BattleCommand_PerishSong
+	dw BattleCommand_StartSandstorm
+	dw BattleCommand_Endure
+	dw BattleCommand_CheckCurl
+	dw BattleCommand_RolloutPower
+	dw BattleCommand5d
+	dw BattleCommand_FuryCutter
+	dw BattleCommand_Attract
+	dw BattleCommand_HappinessPower
+	dw BattleCommand_Present
+	dw BattleCommand_DamageCalc
+	dw BattleCommand_FrustrationPower
+	dw BattleCommand_Safeguard
+	dw BattleCommand_CheckSafeguard
+	dw BattleCommand_GetMagnitude
+	dw BattleCommand_BatonPass
+	dw BattleCommand_Pursuit
+	dw BattleCommand_ClearHazards
+	dw BattleCommand_HealMorn
+	dw BattleCommand_HealDay
+	dw BattleCommand_HealNite
+	dw BattleCommand_HiddenPower
+	dw BattleCommand_StartRain
+	dw BattleCommand_StartSun
+	dw BattleCommand_AttackUp
+	dw BattleCommand_DefenseUp
+	dw BattleCommand_SpeedUp
+	dw BattleCommand_SpecialAttackUp
+	dw BattleCommand_SpecialDefenseUp
+	dw BattleCommand_AccuracyUp
+	dw BattleCommand_EvasionUp
+	dw BattleCommand_AttackUp2
+	dw BattleCommand_DefenseUp2
+	dw BattleCommand_SpeedUp2
+	dw BattleCommand_SpecialAttackUp2
+	dw BattleCommand_SpecialDefenseUp2
+	dw BattleCommand_AccuracyUp2
+	dw BattleCommand_EvasionUp2
+	dw BattleCommand_AttackDown
+	dw BattleCommand_DefenseDown
+	dw BattleCommand_SpeedDown
+	dw BattleCommand_SpecialAttackDown
+	dw BattleCommand_SpecialDefenseDown
+	dw BattleCommand_AccuracyDown
+	dw BattleCommand_EvasionDown
+	dw BattleCommand_AttackDown2
+	dw BattleCommand_DefenseDown2
+	dw BattleCommand_SpeedDown2
+	dw BattleCommand_SpecialAttackDown2
+	dw BattleCommand_SpecialDefenseDown2
+	dw BattleCommand_AccuracyDown2
+	dw BattleCommand_EvasionDown2
+	dw BattleCommand_StatUpMessage
+	dw BattleCommand_StatDownMessage
+	dw BattleCommand_StatUpFailText
+	dw BattleCommand_StatDownFailText
+	dw BattleCommand_EffectChance
+	dw BattleCommand_StatDownAnim
+	dw BattleCommand_StatUpAnim
+	dw BattleCommand_SwitchTurn
+	dw BattleCommand_FakeOut
+	dw BattleCommand_BellyDrum
+	dw BattleCommand_PsychUp
+	dw BattleCommand_Rage
+	dw BattleCommand_DoubleFlyingDamage
+	dw BattleCommand_DoubleUndergroundDamage
+	dw BattleCommand_MirrorCoat
+	dw BattleCommand_CheckFutureSight
+	dw BattleCommand_FutureSight
+	dw BattleCommand_DoubleMinimizeDamage
+	dw BattleCommand_SkipSunCharge
+	dw BattleCommand_ThunderAccuracy
+	dw BattleCommand_Teleport
+	dw BattleCommand_BeatUp
+	dw BattleCommand_RageDamage
+	dw BattleCommand_ResetTypeMatchup
+	dw BattleCommand_AllStatsUp
+	dw BattleCommand_BideFailText
+	dw BattleCommand_RaiseSubNoAnim
+	dw BattleCommand_LowerSubNoAnim
+	dw BattleCommand_BeatUpFailText
+	dw BattleCommand_ClearMissDamage
+	dw BattleCommand_MoveDelay
+	dw BattleCommand_MoveAnim
+	dw BattleCommand_TriStatusChance
+	dw BattleCommand_SuperEffectiveLoopText
+	dw BattleCommand_StartLoop
+	dw BattleCommand_Curl
diff --git a/data/battle/held_consumables.asm b/data/battle/held_consumables.asm
new file mode 100644
index 000000000..bd47c1d83
--- /dev/null
+++ b/data/battle/held_consumables.asm
@@ -0,0 +1,25 @@
+; Held item effects that are consumed on use
+
+ConsumableEffects:
+	db HELD_BERRY
+	db HELD_2
+	db HELD_5
+	db HELD_HEAL_POISON
+	db HELD_HEAL_FREEZE
+	db HELD_HEAL_BURN
+	db HELD_HEAL_SLEEP
+	db HELD_HEAL_PARALYZE
+	db HELD_HEAL_STATUS
+	db HELD_30
+	db HELD_ATTACK_UP
+	db HELD_DEFENSE_UP
+	db HELD_SPEED_UP
+	db HELD_SP_ATTACK_UP
+	db HELD_SP_DEFENSE_UP
+	db HELD_ACCURACY_UP
+	db HELD_EVASION_UP
+	db HELD_38
+	db HELD_71
+	db HELD_ESCAPE
+	db HELD_CRITICAL_UP
+	db -1
diff --git a/data/battle/held_heal_status.asm b/data/battle/held_heal_status.asm
new file mode 100644
index 000000000..ac11b645b
--- /dev/null
+++ b/data/battle/held_heal_status.asm
@@ -0,0 +1,10 @@
+; See also data/items/heal_status.asm
+
+HeldStatusHealingEffects:
+	db HELD_HEAL_POISON,   1 << PSN
+	db HELD_HEAL_FREEZE,   1 << FRZ
+	db HELD_HEAL_BURN,     1 << BRN
+	db HELD_HEAL_SLEEP,    SLP
+	db HELD_HEAL_PARALYZE, 1 << PAR
+	db HELD_HEAL_STATUS,   ALL_STATUS
+	db -1 ; end
diff --git a/data/battle/held_stat_up.asm b/data/battle/held_stat_up.asm
new file mode 100644
index 000000000..4f28c0d08
--- /dev/null
+++ b/data/battle/held_stat_up.asm
@@ -0,0 +1,9 @@
+HeldStatUpItems:
+	dbw HELD_ATTACK_UP,     BattleCommand_AttackUp
+	dbw HELD_DEFENSE_UP,    BattleCommand_DefenseUp
+	dbw HELD_SPEED_UP,      BattleCommand_SpeedUp
+	dbw HELD_SP_ATTACK_UP,  BattleCommand_SpecialAttackUp
+	dbw HELD_SP_DEFENSE_UP, BattleCommand_SpecialDefenseUp
+	dbw HELD_ACCURACY_UP,   BattleCommand_AccuracyUp
+	dbw HELD_EVASION_UP,    BattleCommand_EvasionUp
+	db -1 ; end
diff --git a/data/battle/stat_multipliers.asm b/data/battle/stat_multipliers.asm
index e7cf8e472..1b9b08588 100644
--- a/data/battle/stat_multipliers.asm
+++ b/data/battle/stat_multipliers.asm
@@ -1,5 +1,8 @@
 ; Multiplier ratios for all stats from modifier -6 to +6
-; (except accuracy, see data/battle/accuracy_multipliers.asm)
+; (except accuracy, see data/battle/accuracy_multipliers.asm).
+
+; This table is identical to data/battle/stat_multipliers_2.asm.
+; This one is used by CalcStats.
 
 StatLevelMultipliers:
 	db  25, 100 ; -6 =  25%
diff --git a/data/battle/stat_multipliers_2.asm b/data/battle/stat_multipliers_2.asm
new file mode 100644
index 000000000..3f3dc2348
--- /dev/null
+++ b/data/battle/stat_multipliers_2.asm
@@ -0,0 +1,20 @@
+; Multiplier ratios for all stats from modifier -6 to +6
+; (except accuracy, see data/battle/accuracy_multipliers.asm).
+
+; This table is identical to data/battle/stat_multipliers.asm.
+; This one is used by ApplyStatLevelMultiplier.
+
+StatLevelMultipliers_Applied:
+	db  25, 100 ; -6 =  25%
+	db  28, 100 ; -5 =  28%
+	db  33, 100 ; -4 =  33%
+	db  40, 100 ; -3 =  40%
+	db  50, 100 ; -2 =  50%
+	db  66, 100 ; -1 =  66%
+	db   1,   1 ;  0 = 100%
+	db  15,  10 ; +1 = 150%
+	db   2,   1 ; +2 = 200%
+	db  25,  10 ; +3 = 250%
+	db   3,   1 ; +4 = 300%
+	db  35,  10 ; +5 = 350%
+	db   4,   1 ; +6 = 400%
diff --git a/data/battle/weather_modifiers.asm b/data/battle/weather_modifiers.asm
new file mode 100644
index 000000000..d0acdc25f
--- /dev/null
+++ b/data/battle/weather_modifiers.asm
@@ -0,0 +1,10 @@
+WeatherTypeModifiers:
+	db WEATHER_RAIN, WATER, MORE_EFFECTIVE
+	db WEATHER_RAIN, FIRE,  NOT_VERY_EFFECTIVE
+	db WEATHER_SUN,  FIRE,  MORE_EFFECTIVE
+	db WEATHER_SUN,  WATER, NOT_VERY_EFFECTIVE
+	db -1 ; end
+
+WeatherMoveModifiers:
+	db WEATHER_RAIN, EFFECT_SOLARBEAM, NOT_VERY_EFFECTIVE
+	db -1 ; end
diff --git a/data/battle/wobble_probabilities.asm b/data/battle/wobble_probabilities.asm
new file mode 100644
index 000000000..38e9a12c6
--- /dev/null
+++ b/data/battle/wobble_probabilities.asm
@@ -0,0 +1,27 @@
+WobbleProbabilities:
+; catch rate, chance of wobbling / 255
+; nLeft/255 = (nRight/255) ** 4
+	db   1,  63
+	db   2,  75
+	db   3,  84
+	db   4,  90
+	db   5,  95
+	db   7, 103
+	db  10, 113
+	db  15, 126
+	db  20, 134
+	db  30, 149
+	db  40, 160
+	db  50, 169
+	db  60, 177
+	db  80, 191
+	db 100, 201
+	db 120, 211
+	db 140, 220
+	db 160, 227
+	db 180, 234
+	db 200, 240
+	db 220, 246
+	db 240, 251
+	db 254, 253
+	db 255, 255
diff --git a/data/battle_anims/ball_colors.asm b/data/battle_anims/ball_colors.asm
index c3ba9d2b4..0453c14b7 100644
--- a/data/battle_anims/ball_colors.asm
+++ b/data/battle_anims/ball_colors.asm
@@ -1,6 +1,6 @@
 ; colors of balls thrown in battle
 
-BallColors: ; cd26c (33:526c)
+BallColors:
 	db MASTER_BALL, PAL_BATTLE_OB_GREEN
 	db ULTRA_BALL,  PAL_BATTLE_OB_YELLOW
 	db GREAT_BALL,  PAL_BATTLE_OB_BLUE
@@ -13,4 +13,3 @@ BallColors: ; cd26c (33:526c)
 	db MOON_BALL,   PAL_BATTLE_OB_GRAY
 	db LOVE_BALL,   PAL_BATTLE_OB_RED
 	db -1,          PAL_BATTLE_OB_GRAY
-; cd284
diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm
index 905597cfa..e0fe57007 100755..100644
--- a/data/battle_anims/framesets.asm
+++ b/data/battle_anims/framesets.asm
@@ -1,4 +1,4 @@
-BattleAnimFrameData: ; ce85e
+BattleAnimFrameData:
 ; entries correspond to BATTLEANIMFRAMESET_* constants
 	dw .Frameset_00 ; BATTLEANIMFRAMESET_00
 	dw .Frameset_01 ; BATTLEANIMFRAMESET_01
@@ -1266,5 +1266,3 @@ BattleAnimFrameData: ; ce85e
 .Frameset_b8:
 	frame BATTLEANIMOAMSET_D7,  8
 	endanim
-
-; ceeae
diff --git a/data/battle_anims/oam.asm b/data/battle_anims/oam.asm
index d4b0b6978..1beca2937 100755..100644
--- a/data/battle_anims/oam.asm
+++ b/data/battle_anims/oam.asm
@@ -1,4 +1,4 @@
-BattleAnimOAMData: ; ceeae
+BattleAnimOAMData:
 ; entries correspond to BATTLEANIMOAMSET_* constants
 	; vtile offset, length, pointer
 	dbbw $00, 16, .OAMData_00 ; BATTLEANIMOAMSET_00
@@ -1083,4 +1083,3 @@ BattleAnimOAMData: ; ceeae
 	dsprite  -2, 0,   6, 4, $00, $0
 	dsprite  -4, 0,   8, 4, $00, $0
 	dsprite  -2, 0,  10, 4, $00, $0
-; cfcf6
diff --git a/data/battle_anims/object_gfx.asm b/data/battle_anims/object_gfx.asm
index 133298d13..432e513dd 100755..100644
--- a/data/battle_anims/object_gfx.asm
+++ b/data/battle_anims/object_gfx.asm
@@ -1,10 +1,10 @@
 anim_obj_gfx: MACRO
 ; # tiles, label
-	db  \1
+	db \1
 	dba \2
 ENDM
 
-AnimObjGFX: ; cfcf6
+AnimObjGFX:
 ; entries correspond to ANIM_GFX_* constants
 	anim_obj_gfx  0, AnimObj00GFX
 	anim_obj_gfx 21, AnimObjHitGFX
@@ -48,4 +48,3 @@ AnimObjGFX: ; cfcf6
 	anim_obj_gfx 24, AnimObjAeroblastGFX
 	anim_obj_gfx  1, NULL
 	anim_obj_gfx  1, NULL
-; cfd9e
diff --git a/data/battle_anims/objects.asm b/data/battle_anims/objects.asm
index 3d46ae2d7..0cd19ae0d 100755..100644
--- a/data/battle_anims/objects.asm
+++ b/data/battle_anims/objects.asm
@@ -16,7 +16,7 @@ battleanimobj: MACRO
 	db \6 ; tile offset
 ENDM
 
-BattleAnimObjects: ; ccb56
+BattleAnimObjects:
 ; entries correspond to ANIM_OBJ_* constants
 	battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_00
 	battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_01
@@ -206,4 +206,3 @@ BattleAnimObjects: ; ccb56
 	battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B6, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ANIM_OBJ_ENEMYFEETFOLLOW
 	battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B7, BATTLEANIMFUNC_00, PAL_BATTLE_OB_ENEMY, $28 ; ANIM_OBJ_PLAYERHEADFOLLOW
 	battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ANIM_OBJ_ENEMYHEADFOLLOW
-; ccfbe
diff --git a/data/battle_tower/classes.asm b/data/battle_tower/classes.asm
index 5a148e6ec..c53197548 100644
--- a/data/battle_tower/classes.asm
+++ b/data/battle_tower/classes.asm
@@ -1,4 +1,4 @@
-BattleTowerTrainers: ; 1f814e
+BattleTowerTrainers:
 ; The trainer class is not used in Crystal 1.0 due to a bug.
 ; Instead, the sixth character in the trainer's name is used.
 ; See BattleTowerText in engine/events/battle_tower/trainer_text.asm.
@@ -73,4 +73,3 @@ BattleTowerTrainers: ; 1f814e
 	db "DYKSTRA@@@", SWIMMERF
 	db "EATON@@@@@", BIKER
 	db "WONG@@@@@@", FIREBREATHER
-; 1f8450
diff --git a/data/battle_tower/parties.asm b/data/battle_tower/parties.asm
index c7008a247..e0d2b4dec 100644
--- a/data/battle_tower/parties.asm
+++ b/data/battle_tower/parties.asm
@@ -1,7 +1,6 @@
-BattleTowerMons: ; 1f8450
+BattleTowerMons:
 ; 10 groups of 21 mons.
 
-
 BattleTowerMons1:
 
 	db JOLTEON
@@ -15,7 +14,7 @@ BattleTowerMons1:
 	bigdw 40000
 	bigdw 35000
 	bigdw 40000
-	db $dd, $bd ; DVs
+	dn 13, 13, 11, 13 ; DVs
 	db 15, 5, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -30,7 +29,6 @@ BattleTowerMons1:
 	bigdw 31 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db ESPEON
 	db LEFTOVERS
 	db MUD_SLAP, PSYCHIC_M, PSYCH_UP, TOXIC
@@ -42,7 +40,7 @@ BattleTowerMons1:
 	bigdw 35000
 	bigdw 40000
 	bigdw 40000
-	db $ed, $fb ; DVs
+	dn 14, 13, 15, 11 ; DVs
 	db 10, 10, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -57,7 +55,6 @@ BattleTowerMons1:
 	bigdw 31 ; SDef
 	db "E-HUi@@@@@@"
 
-
 	db UMBREON
 	db GOLD_BERRY
 	db SHADOW_BALL, IRON_TAIL, PSYCH_UP, TOXIC
@@ -69,7 +66,7 @@ BattleTowerMons1:
 	bigdw 45000
 	bigdw 50000
 	bigdw 40000
-	db $db, $ef ; DVs
+	dn 13, 11, 14, 15 ; DVs
 	db 15, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -84,7 +81,6 @@ BattleTowerMons1:
 	bigdw 39 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db WOBBUFFET
 	db FOCUS_BAND
 	db COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND
@@ -96,7 +92,7 @@ BattleTowerMons1:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $7f, $d7 ; DVs
+	dn 7, 15, 13, 7 ; DVs
 	db 20, 20, 25, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -111,7 +107,6 @@ BattleTowerMons1:
 	bigdw 23 ; SDef
 	db "SO-NANSU@@@"
 
-
 	db KANGASKHAN
 	db MIRACLEBERRY
 	db REVERSAL, HYPER_BEAM, EARTHQUAKE, ATTRACT
@@ -123,7 +118,7 @@ BattleTowerMons1:
 	bigdw 40000
 	bigdw 30000
 	bigdw 30000
-	db $ef, $cf ; DVs
+	dn 14, 15, 12, 15 ; DVs
 	db 15, 5, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -138,7 +133,6 @@ BattleTowerMons1:
 	bigdw 28 ; SDef
 	db "GARU-RA@@@@"
 
-
 	db CORSOLA
 	db SCOPE_LENS
 	db SURF, PSYCHIC_M, RECOVER, ANCIENTPOWER
@@ -150,7 +144,7 @@ BattleTowerMons1:
 	bigdw 33300
 	bigdw 30000
 	bigdw 30000
-	db $fe, $fd ; DVs
+	dn 15, 14, 15, 13 ; DVs
 	db 15, 10, 20, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -165,7 +159,6 @@ BattleTowerMons1:
 	bigdw 28 ; SDef
 	db "SANI-GO@@@@"
 
-
 	db MILTANK
 	db GOLD_BERRY
 	db BLIZZARD, EARTHQUAKE, HYPER_BEAM, TOXIC
@@ -177,7 +170,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 35000
-	db $bb, $df ; DVs
+	dn 11, 11, 13, 15 ; DVs
 	db 5, 10, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -192,7 +185,6 @@ BattleTowerMons1:
 	bigdw 26 ; SDef
 	db "MIRUTANKU@@"
 
-
 	db AERODACTYL
 	db LEFTOVERS
 	db HYPER_BEAM, SUPERSONIC, EARTHQUAKE, BITE
@@ -204,7 +196,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $db, $fb ; DVs
+	dn 13, 11, 15, 11 ; DVs
 	db 5, 20, 10, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -219,7 +211,6 @@ BattleTowerMons1:
 	bigdw 26 ; SDef
 	db "PUTERA@@@@@"
 
-
 	db LAPRAS
 	db MIRACLEBERRY
 	db BLIZZARD, SURF, THUNDERBOLT, PSYCHIC_M
@@ -231,7 +222,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 5, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -246,7 +237,6 @@ BattleTowerMons1:
 	bigdw 30 ; SDef
 	db "RAPURASU@@@"
 
-
 	db SNEASEL
 	db GOLD_BERRY
 	db SLASH, FAINT_ATTACK, SURF, BLIZZARD
@@ -258,7 +248,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $fb, $bf ; DVs
+	dn 15, 11, 11, 15 ; DVs
 	db 20, 20, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -273,7 +263,6 @@ BattleTowerMons1:
 	bigdw 27 ; SDef
 	db "NIyu-RA@@@@"
 
-
 	db PORYGON2
 	db BRIGHTPOWDER
 	db PSYCHIC_M, BLIZZARD, HYPER_BEAM, TRI_ATTACK
@@ -285,7 +274,7 @@ BattleTowerMons1:
 	bigdw 40000
 	bigdw 30000
 	bigdw 30000
-	db $fb, $de ; DVs
+	dn 15, 11, 13, 14 ; DVs
 	db 10, 5, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -300,7 +289,6 @@ BattleTowerMons1:
 	bigdw 31 ; SDef
 	db "PORIGON2@@@"
 
-
 	db MISDREAVUS
 	db FOCUS_BAND
 	db PERISH_SONG, MEAN_LOOK, PAIN_SPLIT, SHADOW_BALL
@@ -312,7 +300,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $ef, $df ; DVs
+	dn 14, 15, 13, 15 ; DVs
 	db 5, 5, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -327,7 +315,6 @@ BattleTowerMons1:
 	bigdw 29 ; SDef
 	db "MUUMA@@@@@@"
 
-
 	db HOUNDOUR
 	db GOLD_BERRY
 	db FAINT_ATTACK, SOLARBEAM, ROAR, SUNNY_DAY
@@ -339,7 +326,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 33000
 	bigdw 30000
-	db $fd, $fe ; DVs
+	dn 15, 13, 15, 14 ; DVs
 	db 20, 10, 20, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -354,7 +341,6 @@ BattleTowerMons1:
 	bigdw 22 ; SDef
 	db "DERUBIRU@@@"
 
-
 	db GIRAFARIG
 	db KINGS_ROCK
 	db PSYBEAM, MUD_SLAP, SHADOW_BALL, AGILITY
@@ -366,7 +352,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $ed, $fd ; DVs
+	dn 14, 13, 15, 13 ; DVs
 	db 20, 10, 15, 30 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -381,7 +367,6 @@ BattleTowerMons1:
 	bigdw 24 ; SDef
 	db "KIRINRIKI@@"
 
-
 	db BLISSEY
 	db QUICK_CLAW
 	db HEADBUTT, SOLARBEAM, ROLLOUT, STRENGTH
@@ -393,7 +378,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $df, $ce ; DVs
+	dn 13, 15, 12, 14 ; DVs
 	db 15, 10, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -408,7 +393,6 @@ BattleTowerMons1:
 	bigdw 39 ; SDef
 	db "HAPINASU@@@"
 
-
 	db SNORLAX
 	db MIRACLEBERRY
 	db HEADBUTT, PROTECT, SNORE, SURF
@@ -420,7 +404,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $ef, $f7 ; DVs
+	dn 14, 15, 15, 7 ; DVs
 	db 15, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -435,7 +419,6 @@ BattleTowerMons1:
 	bigdw 32 ; SDef
 	db "KABIGON@@@@"
 
-
 	db EXEGGUTOR
 	db KINGS_ROCK
 	db TOXIC, GIGA_DRAIN, THIEF, CONFUSION
@@ -447,7 +430,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 10, 5, 10, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -462,7 +445,6 @@ BattleTowerMons1:
 	bigdw 25 ; SDef
 	db "NAtuSI-@@@@"
 
-
 	db HERACROSS
 	db GOLD_BERRY
 	db REVERSAL, ENDURE, COUNTER, ROCK_SMASH
@@ -474,7 +456,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $f7, $f7 ; DVs
+	dn 15, 7, 15, 7 ; DVs
 	db 15, 10, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -489,7 +471,6 @@ BattleTowerMons1:
 	bigdw 29 ; SDef
 	db "HERAKUROSU@"
 
-
 	db UNOWN
 	db BERRY
 	db HIDDEN_POWER, 0, 0, 0
@@ -501,7 +482,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $ff, $ff ; DVs
+	dn 15, 15, 15, 15 ; DVs
 	db 15, 0, 0, 0 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -516,7 +497,6 @@ BattleTowerMons1:
 	bigdw 21 ; SDef
 	db "ANNO-N@@@@@"
 
-
 	db TAUROS
 	db KINGS_ROCK
 	db HEADBUTT, SWAGGER, TAIL_WHIP, ICY_WIND
@@ -528,7 +508,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $65, $57 ; DVs
+	dn 6, 5, 5, 7 ; DVs
 	db 15, 15, 30, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -543,7 +523,6 @@ BattleTowerMons1:
 	bigdw 24 ; SDef
 	db "KENTAROSU@@"
 
-
 	db MR__MIME
 	db QUICK_CLAW
 	db TOXIC, PSYCH_UP, FIRE_PUNCH, HEADBUTT
@@ -555,7 +534,7 @@ BattleTowerMons1:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $73, $67 ; DVs
+	dn 7, 3, 6, 7 ; DVs
 	db 10, 10, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -571,8 +550,6 @@ BattleTowerMons1:
 	db "BARIYA-DO@@"
 
 
-
-
 BattleTowerMons2:
 
 	db UMBREON
@@ -586,7 +563,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $cf, $bc ; DVs
+	dn 12, 15, 11, 12 ; DVs
 	db 10, 10, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -601,7 +578,6 @@ BattleTowerMons2:
 	bigdw 72 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db STARMIE
 	db GOLD_BERRY
 	db RECOVER, PSYCHIC_M, SURF, PSYCH_UP
@@ -613,7 +589,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $db, $db ; DVs
+	dn 13, 11, 13, 11 ; DVs
 	db 20, 10, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -628,7 +604,6 @@ BattleTowerMons2:
 	bigdw 54 ; SDef
 	db "SUTA-MI-@@@"
 
-
 	db GYARADOS
 	db MIRACLEBERRY
 	db HYPER_BEAM, DRAGON_RAGE, THUNDERBOLT, FIRE_BLAST
@@ -640,7 +615,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fa, $fd ; DVs
+	dn 15, 10, 15, 13 ; DVs
 	db 5, 10, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -655,7 +630,6 @@ BattleTowerMons2:
 	bigdw 61 ; SDef
 	db "GIyaRADOSU@"
 
-
 	db STEELIX
 	db GOLD_BERRY
 	db ROAR, IRON_TAIL, SWAGGER, EARTHQUAKE
@@ -667,7 +641,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 30000
 	bigdw 50000
-	db $ff, $ff ; DVs
+	dn 15, 15, 15, 15 ; DVs
 	db 20, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -682,7 +656,6 @@ BattleTowerMons2:
 	bigdw 48 ; SDef
 	db "HAGANE-RU@@"
 
-
 	db ALAKAZAM
 	db BERRY_JUICE
 	db PSYCHIC_M, PSYCH_UP, TOXIC, THUNDERPUNCH
@@ -694,7 +667,7 @@ BattleTowerMons2:
 	bigdw 30000
 	bigdw 50000
 	bigdw 40000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 10, 10, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -709,7 +682,6 @@ BattleTowerMons2:
 	bigdw 55 ; SDef
 	db "HU-DEiN@@@@"
 
-
 	db ARCANINE
 	db BRIGHTPOWDER
 	db FLAMETHROWER, ROAR, HYPER_BEAM, IRON_TAIL
@@ -721,7 +693,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $db, $fb ; DVs
+	dn 13, 11, 15, 11 ; DVs
 	db 15, 20, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -736,7 +708,6 @@ BattleTowerMons2:
 	bigdw 52 ; SDef
 	db "UINDEi@@@@@"
 
-
 	db HERACROSS
 	db FOCUS_BAND
 	db ENDURE, REVERSAL, MEGAHORN, EARTHQUAKE
@@ -748,7 +719,7 @@ BattleTowerMons2:
 	bigdw 45000
 	bigdw 30000
 	bigdw 45000
-	db $df, $de ; DVs
+	dn 13, 15, 13, 14 ; DVs
 	db 10, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -763,7 +734,6 @@ BattleTowerMons2:
 	bigdw 59 ; SDef
 	db "HERAKUROSU@"
 
-
 	db EXEGGUTOR
 	db LEFTOVERS
 	db HYPER_BEAM, PSYCHIC_M, TOXIC, DREAM_EATER
@@ -775,7 +745,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 5, 10, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -790,7 +760,6 @@ BattleTowerMons2:
 	bigdw 46 ; SDef
 	db "NAtuSI-@@@@"
 
-
 	db AERODACTYL
 	db GOLD_BERRY
 	db REST, HYPER_BEAM, EARTHQUAKE, DRAGON_RAGE
@@ -802,7 +771,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $fb, $bb ; DVs
+	dn 15, 11, 11, 11 ; DVs
 	db 10, 5, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -817,7 +786,6 @@ BattleTowerMons2:
 	bigdw 50 ; SDef
 	db "PUTERA@@@@@"
 
-
 	db BLISSEY
 	db BRIGHTPOWDER
 	db PSYCHIC_M, SUBMISSION, SOFTBOILED, COUNTER
@@ -829,7 +797,7 @@ BattleTowerMons2:
 	bigdw 30000
 	bigdw 30000
 	bigdw 50000
-	db $bd, $fe ; DVs
+	dn 11, 13, 15, 14 ; DVs
 	db 10, 25, 10, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -844,7 +812,6 @@ BattleTowerMons2:
 	bigdw 75 ; SDef
 	db "HAPINASU@@@"
 
-
 	db LAPRAS
 	db GOLD_BERRY
 	db PSYCHIC_M, THUNDERBOLT, BLIZZARD, CONFUSE_RAY
@@ -856,7 +823,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 55000
 	bigdw 30000
-	db $fe, $d7 ; DVs
+	dn 15, 14, 13, 7 ; DVs
 	db 10, 15, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -871,7 +838,6 @@ BattleTowerMons2:
 	bigdw 54 ; SDef
 	db "RAPURASU@@@"
 
-
 	db PIKACHU
 	db LIGHT_BALL
 	db THUNDERBOLT, THUNDER_WAVE, STRENGTH, TOXIC
@@ -883,7 +849,7 @@ BattleTowerMons2:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $fc, $fe ; DVs
+	dn 15, 12, 15, 14 ; DVs
 	db 15, 20, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -898,7 +864,6 @@ BattleTowerMons2:
 	bigdw 37 ; SDef
 	db "PIKATIyuU@@"
 
-
 	db SCIZOR
 	db FOCUS_BAND
 	db STEEL_WING, SLASH, TOXIC, SANDSTORM
@@ -910,7 +875,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 45000
 	bigdw 50000
-	db $fd, $fe ; DVs
+	dn 15, 13, 15, 14 ; DVs
 	db 25, 20, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -925,7 +890,6 @@ BattleTowerMons2:
 	bigdw 53 ; SDef
 	db "HAtuSAMU@@@"
 
-
 	db HITMONCHAN
 	db GOLD_BERRY
 	db THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MEGA_PUNCH
@@ -937,7 +901,7 @@ BattleTowerMons2:
 	bigdw 35000
 	bigdw 50000
 	bigdw 30000
-	db $fb, $fd ; DVs
+	dn 15, 11, 15, 13 ; DVs
 	db 15, 15, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -952,7 +916,6 @@ BattleTowerMons2:
 	bigdw 62 ; SDef
 	db "EBIWARA-@@@"
 
-
 	db TAUROS
 	db BRIGHTPOWDER
 	db THUNDERBOLT, EARTHQUAKE, HYPER_BEAM, BLIZZARD
@@ -964,7 +927,7 @@ BattleTowerMons2:
 	bigdw 50000
 	bigdw 30000
 	bigdw 30000
-	db $fb, $ef ; DVs
+	dn 15, 11, 14, 15 ; DVs
 	db 15, 10, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -979,7 +942,6 @@ BattleTowerMons2:
 	bigdw 47 ; SDef
 	db "KENTAROSU@@"
 
-
 	db AZUMARILL
 	db MYSTIC_WATER
 	db SURF, BLIZZARD, ATTRACT, RAIN_DANCE
@@ -991,7 +953,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $ed, $f7 ; DVs
+	dn 14, 13, 15, 7 ; DVs
 	db 15, 5, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1006,7 +968,6 @@ BattleTowerMons2:
 	bigdw 49 ; SDef
 	db "MARIRURI@@@"
 
-
 	db MILTANK
 	db KINGS_ROCK
 	db EARTHQUAKE, THUNDER, ATTRACT, SURF
@@ -1018,7 +979,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $df, $fe ; DVs
+	dn 13, 15, 15, 14 ; DVs
 	db 10, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1033,7 +994,6 @@ BattleTowerMons2:
 	bigdw 48 ; SDef
 	db "MIRUTANKU@@"
 
-
 	db WIGGLYTUFF
 	db GOLD_BERRY
 	db HYPER_BEAM, BLIZZARD, FIRE_BLAST, ATTRACT
@@ -1045,7 +1005,7 @@ BattleTowerMons2:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $c7, $fe ; DVs
+	dn 12, 7, 15, 14 ; DVs
 	db 5, 5, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1060,7 +1020,6 @@ BattleTowerMons2:
 	bigdw 40 ; SDef
 	db "PUKURIN@@@@"
 
-
 	db WIGGLYTUFF
 	db PINK_BOW
 	db PSYCHIC_M, SWAGGER, PSYCH_UP, HEADBUTT
@@ -1072,7 +1031,7 @@ BattleTowerMons2:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $c7, $77 ; DVs
+	dn 12, 7, 7, 7 ; DVs
 	db 10, 15, 10, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1087,7 +1046,6 @@ BattleTowerMons2:
 	bigdw 36 ; SDef
 	db "PUKURIN@@@@"
 
-
 	db NIDOKING
 	db BERRY
 	db BLIZZARD, EARTHQUAKE, SURF, THUNDERPUNCH
@@ -1099,7 +1057,7 @@ BattleTowerMons2:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $56, $46 ; DVs
+	dn 5, 6, 4, 6 ; DVs
 	db 5, 10, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1114,7 +1072,6 @@ BattleTowerMons2:
 	bigdw 46 ; SDef
 	db "NIDOKINGU@@"
 
-
 	db QUAGSIRE
 	db QUICK_CLAW
 	db AMNESIA, EARTHQUAKE, SURF, RAIN_DANCE
@@ -1126,7 +1083,7 @@ BattleTowerMons2:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $55, $47 ; DVs
+	dn 5, 5, 4, 7 ; DVs
 	db 20, 10, 15, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1142,8 +1099,6 @@ BattleTowerMons2:
 	db "NUO-@@@@@@@"
 
 
-
-
 BattleTowerMons3:
 
 	db JOLTEON
@@ -1157,7 +1112,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 50000
 	bigdw 55000
-	db $db, $ed ; DVs
+	dn 13, 11, 14, 13 ; DVs
 	db 15, 20, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1172,7 +1127,6 @@ BattleTowerMons3:
 	bigdw 87 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db POLIWRATH
 	db BRIGHTPOWDER
 	db DOUBLE_TEAM, SURF, FISSURE, SUBMISSION
@@ -1184,7 +1138,7 @@ BattleTowerMons3:
 	bigdw 55000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $fb ; DVs
+	dn 13, 13, 15, 11 ; DVs
 	db 15, 15, 5, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1199,7 +1153,6 @@ BattleTowerMons3:
 	bigdw 82 ; SDef
 	db "NIyoROBON@@"
 
-
 	db STARMIE
 	db LEFTOVERS
 	db THUNDER_WAVE, PSYCHIC_M, RECOVER, SURF
@@ -1211,7 +1164,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ff, $ff ; DVs
+	dn 15, 15, 15, 15 ; DVs
 	db 20, 10, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1226,7 +1179,6 @@ BattleTowerMons3:
 	bigdw 81 ; SDef
 	db "SUTA-MI-@@@"
 
-
 	db JYNX
 	db GOLD_BERRY
 	db BLIZZARD, LOVELY_KISS, DREAM_EATER, ATTRACT
@@ -1238,7 +1190,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 30000
 	bigdw 50000
-	db $fb, $ee ; DVs
+	dn 15, 11, 14, 14 ; DVs
 	db 5, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1253,7 +1205,6 @@ BattleTowerMons3:
 	bigdw 86 ; SDef
 	db "RU-ZIyuRA@@"
 
-
 	db DUGTRIO
 	db KINGS_ROCK
 	db EARTHQUAKE, SLUDGE_BOMB, SLASH, MUD_SLAP
@@ -1265,7 +1216,7 @@ BattleTowerMons3:
 	bigdw 30000
 	bigdw 50000
 	bigdw 50000
-	db $ef, $ff ; DVs
+	dn 14, 15, 15, 15 ; DVs
 	db 10, 10, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1280,7 +1231,6 @@ BattleTowerMons3:
 	bigdw 72 ; SDef
 	db "DAGUTORIO@@"
 
-
 	db BELLOSSOM
 	db BRIGHTPOWDER
 	db GIGA_DRAIN, SUNNY_DAY, SOLARBEAM, DOUBLE_TEAM
@@ -1292,7 +1242,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $df, $db ; DVs
+	dn 13, 15, 13, 11 ; DVs
 	db 5, 5, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1307,7 +1257,6 @@ BattleTowerMons3:
 	bigdw 88 ; SDef
 	db "KIREIHANA@@"
 
-
 	db BLISSEY
 	db LEFTOVERS
 	db TOXIC, REFLECT, SOFTBOILED, PROTECT
@@ -1319,7 +1268,7 @@ BattleTowerMons3:
 	bigdw 45000
 	bigdw 30000
 	bigdw 45000
-	db $fb, $ed ; DVs
+	dn 15, 11, 14, 13 ; DVs
 	db 10, 20, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1334,7 +1283,6 @@ BattleTowerMons3:
 	bigdw 109 ; SDef
 	db "HAPINASU@@@"
 
-
 	db HOUNDOOM
 	db CHARCOAL
 	db FLAMETHROWER, CRUNCH, SHADOW_BALL, DREAM_EATER
@@ -1346,7 +1294,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 15, 15, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1361,7 +1309,6 @@ BattleTowerMons3:
 	bigdw 76 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db MACHAMP
 	db MIRACLEBERRY
 	db CROSS_CHOP, ICE_PUNCH, EARTHQUAKE, FIRE_BLAST
@@ -1373,7 +1320,7 @@ BattleTowerMons3:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $fd, $be ; DVs
+	dn 15, 13, 11, 14 ; DVs
 	db 5, 15, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1388,7 +1335,6 @@ BattleTowerMons3:
 	bigdw 80 ; SDef
 	db "KAIRIKI-@@@"
 
-
 	db CROBAT
 	db GOLD_BERRY
 	db ATTRACT, CONFUSE_RAY, TOXIC, WING_ATTACK
@@ -1400,7 +1346,7 @@ BattleTowerMons3:
 	bigdw 30000
 	bigdw 30000
 	bigdw 50000
-	db $ef, $dc ; DVs
+	dn 14, 15, 13, 12 ; DVs
 	db 15, 10, 10, 35 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1415,7 +1361,6 @@ BattleTowerMons3:
 	bigdw 76 ; SDef
 	db "KUROBAtuTO@"
 
-
 	db PORYGON2
 	db BRIGHTPOWDER
 	db PSYCHIC_M, RECOVER, HYPER_BEAM, TRI_ATTACK
@@ -1427,7 +1372,7 @@ BattleTowerMons3:
 	bigdw 40000
 	bigdw 55000
 	bigdw 30000
-	db $df, $db ; DVs
+	dn 13, 15, 13, 11 ; DVs
 	db 10, 20, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1442,7 +1387,6 @@ BattleTowerMons3:
 	bigdw 81 ; SDef
 	db "PORIGON2@@@"
 
-
 	db MAROWAK
 	db THICK_CLUB
 	db EARTHQUAKE, RETURN, HYPER_BEAM, BONEMERANG
@@ -1454,7 +1398,7 @@ BattleTowerMons3:
 	bigdw 45000
 	bigdw 50000
 	bigdw 30000
-	db $dd, $eb ; DVs
+	dn 13, 13, 14, 11 ; DVs
 	db 10, 20, 5, 10 ; PP
 	db 255 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1469,7 +1413,6 @@ BattleTowerMons3:
 	bigdw 72 ; SDef
 	db "GARAGARA@@@"
 
-
 	db ELECTRODE
 	db BRIGHTPOWDER
 	db LIGHT_SCREEN, THUNDERBOLT, PROTECT, THUNDER
@@ -1481,7 +1424,7 @@ BattleTowerMons3:
 	bigdw 40000
 	bigdw 45000
 	bigdw 50000
-	db $bd, $ef ; DVs
+	dn 11, 13, 14, 15 ; DVs
 	db 30, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1496,7 +1439,6 @@ BattleTowerMons3:
 	bigdw 78 ; SDef
 	db "MARUMAIN@@@"
 
-
 	db LAPRAS
 	db LEFTOVERS
 	db RAIN_DANCE, WATER_GUN, ICY_WIND, STRENGTH
@@ -1508,7 +1450,7 @@ BattleTowerMons3:
 	bigdw 35000
 	bigdw 50000
 	bigdw 30000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 5, 25, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1523,7 +1465,6 @@ BattleTowerMons3:
 	bigdw 81 ; SDef
 	db "RAPURASU@@@"
 
-
 	db LANTURN
 	db GOLD_BERRY
 	db RAIN_DANCE, THUNDER, SURF, FLAIL
@@ -1535,7 +1476,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 30000
 	bigdw 30000
-	db $dd, $eb ; DVs
+	dn 13, 13, 14, 11 ; DVs
 	db 5, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1550,7 +1491,6 @@ BattleTowerMons3:
 	bigdw 70 ; SDef
 	db "RANTA-N@@@@"
 
-
 	db ESPEON
 	db MIRACLEBERRY
 	db CONFUSION, SWIFT, TOXIC, PSYCH_UP
@@ -1562,7 +1502,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ef, $f7 ; DVs
+	dn 14, 15, 15, 7 ; DVs
 	db 25, 20, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1577,7 +1517,6 @@ BattleTowerMons3:
 	bigdw 82 ; SDef
 	db "E-HUi@@@@@@"
 
-
 	db TENTACRUEL
 	db KINGS_ROCK
 	db WRAP, TOXIC, SLUDGE_BOMB, BUBBLEBEAM
@@ -1589,7 +1528,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 47000
 	bigdw 45000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 20, 10, 10, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1604,7 +1543,6 @@ BattleTowerMons3:
 	bigdw 101 ; SDef
 	db "DOKUKURAGE@"
 
-
 	db GENGAR
 	db GOLD_BERRY
 	db THIEF, LICK, NIGHT_SHADE, GIGA_DRAIN
@@ -1616,7 +1554,7 @@ BattleTowerMons3:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $f7, $f7 ; DVs
+	dn 15, 7, 15, 7 ; DVs
 	db 10, 30, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1631,7 +1569,6 @@ BattleTowerMons3:
 	bigdw 70 ; SDef
 	db "GENGA-@@@@@"
 
-
 	db URSARING
 	db GOLD_BERRY
 	db HEADBUTT, PROTECT, ROAR, LEER
@@ -1643,7 +1580,7 @@ BattleTowerMons3:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $77, $45 ; DVs
+	dn 7, 7, 4, 5 ; DVs
 	db 15, 10, 20, 30 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1658,7 +1595,6 @@ BattleTowerMons3:
 	bigdw 65 ; SDef
 	db "RINGUMA@@@@"
 
-
 	db FEAROW
 	db BRIGHTPOWDER
 	db MIRROR_MOVE, PURSUIT, PECK, SWIFT
@@ -1670,7 +1606,7 @@ BattleTowerMons3:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $67, $77 ; DVs
+	dn 6, 7, 7, 7 ; DVs
 	db 20, 20, 35, 20 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1685,7 +1621,6 @@ BattleTowerMons3:
 	bigdw 58 ; SDef
 	db "ONIDORIRU@@"
 
-
 	db PRIMEAPE
 	db MIRACLEBERRY
 	db LOW_KICK, KARATE_CHOP, REVERSAL, FOCUS_ENERGY
@@ -1697,7 +1632,7 @@ BattleTowerMons3:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $77, $67 ; DVs
+	dn 7, 7, 6, 7 ; DVs
 	db 20, 25, 15, 30 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1713,8 +1648,6 @@ BattleTowerMons3:
 	db "OKORIZARU@@"
 
 
-
-
 BattleTowerMons4:
 
 	db TAUROS
@@ -1728,7 +1661,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $fe ; DVs
+	dn 15, 13, 15, 14 ; DVs
 	db 20, 5, 10, 15 ; PP
 	db 255 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1743,7 +1676,6 @@ BattleTowerMons4:
 	bigdw 94 ; SDef
 	db "KENTAROSU@@"
 
-
 	db KINGDRA
 	db LEFTOVERS
 	db SURF, DRAGONBREATH, HYPER_BEAM, BLIZZARD
@@ -1755,7 +1687,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 15, 20, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1770,7 +1702,6 @@ BattleTowerMons4:
 	bigdw 115 ; SDef
 	db "KINGUDORA@@"
 
-
 	db SNORLAX
 	db QUICK_CLAW
 	db ATTRACT, BODY_SLAM, PSYCH_UP, EARTHQUAKE
@@ -1782,7 +1713,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ed, $dd ; DVs
+	dn 14, 13, 13, 13 ; DVs
 	db 15, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1797,7 +1728,6 @@ BattleTowerMons4:
 	bigdw 125 ; SDef
 	db "KABIGON@@@@"
 
-
 	db LAPRAS
 	db LEFTOVERS
 	db THUNDERBOLT, ICE_BEAM, CONFUSE_RAY, SURF
@@ -1809,7 +1739,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 15, 10, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1824,7 +1754,6 @@ BattleTowerMons4:
 	bigdw 111 ; SDef
 	db "RAPURASU@@@"
 
-
 	db STEELIX
 	db GOLD_BERRY
 	db SANDSTORM, IRON_TAIL, EARTHQUAKE, TOXIC
@@ -1836,7 +1765,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ef, $db ; DVs
+	dn 14, 15, 13, 11 ; DVs
 	db 10, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1851,7 +1780,6 @@ BattleTowerMons4:
 	bigdw 87 ; SDef
 	db "HAGANE-RU@@"
 
-
 	db ALAKAZAM
 	db KINGS_ROCK
 	db PSYCHIC_M, THUNDERPUNCH, RECOVER, FIRE_PUNCH
@@ -1863,7 +1791,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $ef ; DVs
+	dn 13, 13, 14, 15 ; DVs
 	db 10, 15, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1878,7 +1806,6 @@ BattleTowerMons4:
 	bigdw 107 ; SDef
 	db "HU-DEiN@@@@"
 
-
 	db STARMIE
 	db LEFTOVERS
 	db BLIZZARD, THUNDERBOLT, SURF, PSYCHIC_M
@@ -1890,7 +1817,7 @@ BattleTowerMons4:
 	bigdw 45000
 	bigdw 50000
 	bigdw 45000
-	db $fd, $be ; DVs
+	dn 15, 13, 11, 14 ; DVs
 	db 5, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1905,7 +1832,6 @@ BattleTowerMons4:
 	bigdw 105 ; SDef
 	db "SUTA-MI-@@@"
 
-
 	db WOBBUFFET
 	db GOLD_BERRY
 	db COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND
@@ -1917,7 +1843,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $bf, $e7 ; DVs
+	dn 11, 15, 14, 7 ; DVs
 	db 20, 20, 25, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1932,7 +1858,6 @@ BattleTowerMons4:
 	bigdw 79 ; SDef
 	db "SO-NANSU@@@"
 
-
 	db GOLEM
 	db FOCUS_BAND
 	db EXPLOSION, EARTHQUAKE, MEGA_PUNCH, ROCK_SLIDE
@@ -1944,7 +1869,7 @@ BattleTowerMons4:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $dd, $ed ; DVs
+	dn 13, 13, 14, 13 ; DVs
 	db 5, 10, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1959,7 +1884,6 @@ BattleTowerMons4:
 	bigdw 88 ; SDef
 	db "GORO-NIya@@"
 
-
 	db SCIZOR
 	db SCOPE_LENS
 	db SLASH, STEEL_WING, PURSUIT, HYPER_BEAM
@@ -1971,7 +1895,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 40000
 	bigdw 50000
-	db $bd, $fe ; DVs
+	dn 11, 13, 15, 14 ; DVs
 	db 20, 25, 20, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -1986,7 +1910,6 @@ BattleTowerMons4:
 	bigdw 102 ; SDef
 	db "HAtuSAMU@@@"
 
-
 	db DUGTRIO
 	db KINGS_ROCK
 	db EARTHQUAKE, HYPER_BEAM, SLUDGE_BOMB, MUD_SLAP
@@ -1998,7 +1921,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $bb ; DVs
+	dn 15, 14, 11, 11 ; DVs
 	db 10, 5, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2013,7 +1936,6 @@ BattleTowerMons4:
 	bigdw 91 ; SDef
 	db "DAGUTORIO@@"
 
-
 	db SLOWBRO
 	db MIRACLEBERRY
 	db SURF, PSYCHIC_M, EARTHQUAKE, BLIZZARD
@@ -2025,7 +1947,7 @@ BattleTowerMons4:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $bf, $cf ; DVs
+	dn 11, 15, 12, 15 ; DVs
 	db 15, 10, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2040,7 +1962,6 @@ BattleTowerMons4:
 	bigdw 103 ; SDef
 	db "YADORAN@@@@"
 
-
 	db PORYGON2
 	db NO_ITEM
 	db CONVERSION2, CONVERSION, PSYBEAM, THIEF
@@ -2052,7 +1973,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $bc, $ef ; DVs
+	dn 11, 12, 14, 15 ; DVs
 	db 30, 30, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2067,7 +1988,6 @@ BattleTowerMons4:
 	bigdw 115 ; SDef
 	db "PORIGON2@@@"
 
-
 	db ARCANINE
 	db CHARCOAL
 	db FLAME_WHEEL, LEER, BODY_SLAM, ROAR
@@ -2079,7 +1999,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $bb ; DVs
+	dn 15, 14, 11, 11 ; DVs
 	db 25, 30, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2094,7 +2014,6 @@ BattleTowerMons4:
 	bigdw 99 ; SDef
 	db "UINDEi@@@@@"
 
-
 	db FORRETRESS
 	db LEFTOVERS
 	db RAPID_SPIN, PROTECT, TOXIC, SANDSTORM
@@ -2106,7 +2025,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fa, $7f ; DVs
+	dn 15, 10, 7, 15 ; DVs
 	db 40, 10, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2121,7 +2040,6 @@ BattleTowerMons4:
 	bigdw 87 ; SDef
 	db "HUoRETOSU@@"
 
-
 	db OMASTAR
 	db GOLD_BERRY
 	db CURSE, WATER_GUN, ANCIENTPOWER, ROCK_SMASH
@@ -2133,7 +2051,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ef, $f7 ; DVs
+	dn 14, 15, 15, 7 ; DVs
 	db 10, 25, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2148,7 +2066,6 @@ BattleTowerMons4:
 	bigdw 88 ; SDef
 	db "OMUSUTA-@@@"
 
-
 	db CHARIZARD
 	db KINGS_ROCK
 	db FIRE_SPIN, DRAGON_RAGE, FLY, SLASH
@@ -2160,7 +2077,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 15, 10, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2175,7 +2092,6 @@ BattleTowerMons4:
 	bigdw 106 ; SDef
 	db "RIZA-DON@@@"
 
-
 	db EXEGGUTOR
 	db BRIGHTPOWDER
 	db EGG_BOMB, STOMP, PSYCH_UP, CONFUSION
@@ -2187,7 +2103,7 @@ BattleTowerMons4:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $f7, $e7 ; DVs
+	dn 15, 7, 14, 7 ; DVs
 	db 10, 20, 10, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2202,7 +2118,6 @@ BattleTowerMons4:
 	bigdw 84 ; SDef
 	db "NAtuSI-@@@@"
 
-
 	db HYPNO
 	db BRIGHTPOWDER
 	db CONFUSION, THUNDERPUNCH, HEADBUTT, DISABLE
@@ -2214,7 +2129,7 @@ BattleTowerMons4:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $77, $7a ; DVs
+	dn 7, 7, 7, 10 ; DVs
 	db 25, 15, 15, 20 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2229,7 +2144,6 @@ BattleTowerMons4:
 	bigdw 122 ; SDef
 	db "SURI-PA-@@@"
 
-
 	db MUK
 	db QUICK_CLAW
 	db SCREECH, TOXIC, SLUDGE, HARDEN
@@ -2241,7 +2155,7 @@ BattleTowerMons4:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $75, $6b ; DVs
+	dn 7, 5, 6, 11 ; DVs
 	db 40, 10, 20, 30 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2256,7 +2170,6 @@ BattleTowerMons4:
 	bigdw 111 ; SDef
 	db "BETOBETON@@"
 
-
 	db ELECTABUZZ
 	db KINGS_ROCK
 	db LIGHT_SCREEN, THUNDERPUNCH, SWIFT, SNORE
@@ -2268,7 +2181,7 @@ BattleTowerMons4:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $65, $77 ; DVs
+	dn 6, 5, 7, 7 ; DVs
 	db 30, 15, 20, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2284,8 +2197,6 @@ BattleTowerMons4:
 	db "EREBU-@@@@@"
 
 
-
-
 BattleTowerMons5:
 
 	db KINGDRA
@@ -2299,7 +2210,7 @@ BattleTowerMons5:
 	bigdw 60000
 	bigdw 50000
 	bigdw 55000
-	db $dd, $ff ; DVs
+	dn 13, 13, 15, 15 ; DVs
 	db 15, 5, 5, 20 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2314,7 +2225,6 @@ BattleTowerMons5:
 	bigdw 144 ; SDef
 	db "KINGUDORA@@"
 
-
 	db HOUNDOOM
 	db MIRACLEBERRY
 	db REST, CRUNCH, DREAM_EATER, FLAMETHROWER
@@ -2326,7 +2236,7 @@ BattleTowerMons5:
 	bigdw 60000
 	bigdw 60000
 	bigdw 60000
-	db $dd, $fc ; DVs
+	dn 13, 13, 15, 12 ; DVs
 	db 10, 15, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2341,7 +2251,6 @@ BattleTowerMons5:
 	bigdw 127 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db SHUCKLE
 	db LEFTOVERS
 	db SANDSTORM, REST, TOXIC, WRAP
@@ -2353,7 +2262,7 @@ BattleTowerMons5:
 	bigdw 60000
 	bigdw 60000
 	bigdw 55000
-	db $fd, $cf ; DVs
+	dn 15, 13, 12, 15 ; DVs
 	db 10, 10, 10, 20 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2368,7 +2277,6 @@ BattleTowerMons5:
 	bigdw 279 ; SDef
 	db "TUBOTUBO@@@"
 
-
 	db SNORLAX
 	db LEFTOVERS
 	db HYPER_BEAM, EARTHQUAKE, SURF, PSYCH_UP
@@ -2380,7 +2288,7 @@ BattleTowerMons5:
 	bigdw 55000
 	bigdw 60000
 	bigdw 55000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 5, 10, 15, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2395,7 +2303,6 @@ BattleTowerMons5:
 	bigdw 159 ; SDef
 	db "KABIGON@@@@"
 
-
 	db LAPRAS
 	db GOLD_BERRY
 	db THUNDERBOLT, SURF, CONFUSE_RAY, BLIZZARD
@@ -2407,7 +2314,7 @@ BattleTowerMons5:
 	bigdw 60000
 	bigdw 55000
 	bigdw 60000
-	db $dd, $dd ; DVs
+	dn 13, 13, 13, 13 ; DVs
 	db 15, 15, 10, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2422,7 +2329,6 @@ BattleTowerMons5:
 	bigdw 143 ; SDef
 	db "RAPURASU@@@"
 
-
 	db JOLTEON
 	db KINGS_ROCK
 	db THUNDERBOLT, THUNDER_WAVE, SHADOW_BALL, HIDDEN_POWER
@@ -2434,7 +2340,7 @@ BattleTowerMons5:
 	bigdw 57000
 	bigdw 55000
 	bigdw 55000
-	db $ed, $ff ; DVs
+	dn 14, 13, 15, 15 ; DVs
 	db 15, 20, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2449,7 +2355,6 @@ BattleTowerMons5:
 	bigdw 144 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db SCIZOR
 	db LEFTOVERS
 	db HYPER_BEAM, SLASH, AGILITY, METAL_CLAW
@@ -2461,7 +2366,7 @@ BattleTowerMons5:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $df, $ed ; DVs
+	dn 13, 15, 14, 13 ; DVs
 	db 5, 20, 30, 35 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2476,7 +2381,6 @@ BattleTowerMons5:
 	bigdw 124 ; SDef
 	db "HAtuSAMU@@@"
 
-
 	db SLOWKING
 	db MINT_BERRY
 	db REST, SURF, PSYCHIC_M, AMNESIA
@@ -2488,7 +2392,7 @@ BattleTowerMons5:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $df, $de ; DVs
+	dn 13, 15, 13, 14 ; DVs
 	db 10, 15, 10, 20 ; PP
 	db 15 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2503,7 +2407,6 @@ BattleTowerMons5:
 	bigdw 156 ; SDef
 	db "YADOKINGU@@"
 
-
 	db MACHAMP
 	db GOLD_BERRY
 	db CROSS_CHOP, EARTHQUAKE, FIRE_BLAST, THUNDERPUNCH
@@ -2515,7 +2418,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 40000
 	bigdw 44000
-	db $ff, $ec ; DVs
+	dn 15, 15, 14, 12 ; DVs
 	db 5, 10, 5, 15 ; PP
 	db 13 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2530,7 +2433,6 @@ BattleTowerMons5:
 	bigdw 128 ; SDef
 	db "KAIRIKI-@@@"
 
-
 	db STARMIE
 	db SCOPE_LENS
 	db THUNDER_WAVE, RECOVER, THUNDERBOLT, SURF
@@ -2542,7 +2444,7 @@ BattleTowerMons5:
 	bigdw 40000
 	bigdw 45000
 	bigdw 40000
-	db $ff, $ff ; DVs
+	dn 15, 15, 15, 15 ; DVs
 	db 20, 20, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2557,7 +2459,6 @@ BattleTowerMons5:
 	bigdw 130 ; SDef
 	db "SUTA-MI-@@@"
 
-
 	db DUGTRIO
 	db KINGS_ROCK
 	db EARTHQUAKE, SLASH, HYPER_BEAM, SLUDGE_BOMB
@@ -2569,7 +2470,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 45000
 	bigdw 50000
-	db $f7, $fe ; DVs
+	dn 15, 7, 15, 14 ; DVs
 	db 10, 20, 5, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2584,7 +2485,6 @@ BattleTowerMons5:
 	bigdw 116 ; SDef
 	db "DAGUTORIO@@"
 
-
 	db ELECTRODE
 	db MIRACLEBERRY
 	db THUNDERBOLT, EXPLOSION, MIRROR_COAT, REST
@@ -2596,7 +2496,7 @@ BattleTowerMons5:
 	bigdw 54000
 	bigdw 40000
 	bigdw 50000
-	db $7d, $fe ; DVs
+	dn 7, 13, 15, 14 ; DVs
 	db 15, 5, 20, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2611,7 +2511,6 @@ BattleTowerMons5:
 	bigdw 126 ; SDef
 	db "MARUMAIN@@@"
 
-
 	db AERODACTYL
 	db KINGS_ROCK
 	db HYPER_BEAM, EARTHQUAKE, FIRE_BLAST, IRON_TAIL
@@ -2623,7 +2522,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $fd, $dd ; DVs
+	dn 15, 13, 13, 13 ; DVs
 	db 5, 10, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2638,7 +2537,6 @@ BattleTowerMons5:
 	bigdw 119 ; SDef
 	db "PUTERA@@@@@"
 
-
 	db CROBAT
 	db LEFTOVERS
 	db CONFUSE_RAY, ATTRACT, HYPER_BEAM, TOXIC
@@ -2650,7 +2548,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 40000
 	bigdw 50000
-	db $ef, $ff ; DVs
+	dn 14, 15, 15, 15 ; DVs
 	db 10, 15, 5, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2665,7 +2563,6 @@ BattleTowerMons5:
 	bigdw 127 ; SDef
 	db "KUROBAtuTO@"
 
-
 	db ZAPDOS
 	db MIRACLEBERRY
 	db DRILL_PECK, THUNDERBOLT, THUNDER_WAVE, HYPER_BEAM
@@ -2677,7 +2574,7 @@ BattleTowerMons5:
 	bigdw 45000
 	bigdw 40000
 	bigdw 50000
-	db $fd, $de ; DVs
+	dn 15, 13, 13, 14 ; DVs
 	db 20, 15, 20, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2692,7 +2589,6 @@ BattleTowerMons5:
 	bigdw 136 ; SDef
 	db "SANDA-@@@@@"
 
-
 	db SKARMORY
 	db GOLD_BERRY
 	db SANDSTORM, FLY, STEEL_WING, TOXIC
@@ -2704,7 +2600,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 50000
 	bigdw 40000
-	db $d7, $ed ; DVs
+	dn 13, 7, 14, 13 ; DVs
 	db 10, 15, 25, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2719,7 +2615,6 @@ BattleTowerMons5:
 	bigdw 113 ; SDef
 	db "EA-MUDO@@@@"
 
-
 	db FORRETRESS
 	db LEFTOVERS
 	db SANDSTORM, TOXIC, EXPLOSION, SWAGGER
@@ -2731,7 +2626,7 @@ BattleTowerMons5:
 	bigdw 55000
 	bigdw 45000
 	bigdw 40000
-	db $cf, $dd ; DVs
+	dn 12, 15, 13, 13 ; DVs
 	db 10, 10, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2746,7 +2641,6 @@ BattleTowerMons5:
 	bigdw 103 ; SDef
 	db "HUoRETOSU@@"
 
-
 	db STEELIX
 	db MIRACLEBERRY
 	db SANDSTORM, IRON_TAIL, REST, EARTHQUAKE
@@ -2758,7 +2652,7 @@ BattleTowerMons5:
 	bigdw 50000
 	bigdw 40000
 	bigdw 45000
-	db $dd, $dd ; DVs
+	dn 13, 13, 13, 13 ; DVs
 	db 10, 15, 10, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2773,7 +2667,6 @@ BattleTowerMons5:
 	bigdw 109 ; SDef
 	db "HAGANE-RU@@"
 
-
 	db GIRAFARIG
 	db SCOPE_LENS
 	db DREAM_EATER, CRUNCH, PSYCHIC_M, EARTHQUAKE
@@ -2785,7 +2678,7 @@ BattleTowerMons5:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $45, $56 ; DVs
+	dn 4, 5, 5, 6 ; DVs
 	db 15, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2800,7 +2693,6 @@ BattleTowerMons5:
 	bigdw 101 ; SDef
 	db "KIRINRIKI@@"
 
-
 	db GYARADOS
 	db MIRACLEBERRY
 	db HYPER_BEAM, SURF, RAIN_DANCE, ZAP_CANNON
@@ -2812,7 +2704,7 @@ BattleTowerMons5:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $75, $65 ; DVs
+	dn 7, 5, 6, 5 ; DVs
 	db 5, 15, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2827,7 +2719,6 @@ BattleTowerMons5:
 	bigdw 135 ; SDef
 	db "GIyaRADOSU@"
 
-
 	db ARTICUNO
 	db GOLD_BERRY
 	db BLIZZARD, HYPER_BEAM, ROAR, ICY_WIND
@@ -2839,7 +2730,7 @@ BattleTowerMons5:
 	bigdw 40000
 	bigdw 40000
 	bigdw 40000
-	db $45, $56 ; DVs
+	dn 4, 5, 5, 6 ; DVs
 	db 5, 5, 20, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2855,8 +2746,6 @@ BattleTowerMons5:
 	db "HURI-ZA-@@@"
 
 
-
-
 BattleTowerMons6:
 
 	db KINGDRA
@@ -2870,7 +2759,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 60000
 	bigdw 60000
-	db $dd, $fe ; DVs
+	dn 13, 13, 15, 14 ; DVs
 	db 20, 15, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2885,7 +2774,6 @@ BattleTowerMons6:
 	bigdw 172 ; SDef
 	db "KINGUDORA@@"
 
-
 	db TYRANITAR
 	db GOLD_BERRY
 	db CRUNCH, EARTHQUAKE, ROCK_SLIDE, HYPER_BEAM
@@ -2897,7 +2785,7 @@ BattleTowerMons6:
 	bigdw 55000
 	bigdw 60000
 	bigdw 55000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 15, 10, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2912,7 +2800,6 @@ BattleTowerMons6:
 	bigdw 175 ; SDef
 	db "BANGIRASU@@"
 
-
 	db HOUNDOOM
 	db MIRACLEBERRY
 	db FLAMETHROWER, CRUNCH, DREAM_EATER, REST
@@ -2924,7 +2811,7 @@ BattleTowerMons6:
 	bigdw 55000
 	bigdw 60000
 	bigdw 55000
-	db $fb, $ef ; DVs
+	dn 15, 11, 14, 15 ; DVs
 	db 15, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2939,7 +2826,6 @@ BattleTowerMons6:
 	bigdw 153 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db PORYGON2
 	db LEFTOVERS
 	db BLIZZARD, RECOVER, TOXIC, PSYCHIC_M
@@ -2951,7 +2837,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 55000
-	db $dd, $de ; DVs
+	dn 13, 13, 13, 14 ; DVs
 	db 5, 20, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2966,7 +2852,6 @@ BattleTowerMons6:
 	bigdw 170 ; SDef
 	db "PORIGON2@@@"
 
-
 	db MACHAMP
 	db QUICK_CLAW
 	db FIRE_PUNCH, CROSS_CHOP, THUNDERPUNCH, EARTHQUAKE
@@ -2978,7 +2863,7 @@ BattleTowerMons6:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 15, 5, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -2993,7 +2878,6 @@ BattleTowerMons6:
 	bigdw 158 ; SDef
 	db "KAIRIKI-@@@"
 
-
 	db ZAPDOS
 	db MINT_BERRY
 	db REST, DRILL_PECK, THUNDERBOLT, THUNDER_WAVE
@@ -3005,7 +2889,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $fd ; DVs
+	dn 13, 13, 15, 13 ; DVs
 	db 10, 20, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3020,7 +2904,6 @@ BattleTowerMons6:
 	bigdw 161 ; SDef
 	db "SANDA-@@@@@"
 
-
 	db WOBBUFFET
 	db GOLD_BERRY
 	db COUNTER, MIRROR_COAT, DESTINY_BOND, SAFEGUARD
@@ -3032,7 +2915,7 @@ BattleTowerMons6:
 	bigdw 45000
 	bigdw 50000
 	bigdw 45000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 20, 20, 5, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3047,7 +2930,6 @@ BattleTowerMons6:
 	bigdw 122 ; SDef
 	db "SO-NANSU@@@"
 
-
 	db AERODACTYL
 	db LEFTOVERS
 	db HYPER_BEAM, SUPERSONIC, EARTHQUAKE, BITE
@@ -3059,7 +2941,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $fd, $dd ; DVs
+	dn 15, 13, 13, 13 ; DVs
 	db 5, 20, 10, 25 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3074,7 +2956,6 @@ BattleTowerMons6:
 	bigdw 142 ; SDef
 	db "PUTERA@@@@@"
 
-
 	db DRAGONITE
 	db MIRACLEBERRY
 	db HYPER_BEAM, ICY_WIND, THUNDERBOLT, SURF
@@ -3086,7 +2967,7 @@ BattleTowerMons6:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $dd, $fd ; DVs
+	dn 13, 13, 15, 13 ; DVs
 	db 5, 15, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3101,7 +2982,6 @@ BattleTowerMons6:
 	bigdw 172 ; SDef
 	db "KAIRIyu-@@@"
 
-
 	db UMBREON
 	db GOLD_BERRY
 	db MUD_SLAP, MOONLIGHT, PSYCHIC_M, FAINT_ATTACK
@@ -3113,7 +2993,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 10, 5, 10, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3128,7 +3008,6 @@ BattleTowerMons6:
 	bigdw 212 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db ARCANINE
 	db CHARCOAL
 	db FLAMETHROWER, CRUNCH, EXTREMESPEED, IRON_TAIL
@@ -3140,7 +3019,7 @@ BattleTowerMons6:
 	bigdw 40000
 	bigdw 55000
 	bigdw 50000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 15, 15, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3155,7 +3034,6 @@ BattleTowerMons6:
 	bigdw 149 ; SDef
 	db "UINDEi@@@@@"
 
-
 	db SKARMORY
 	db MIRACLEBERRY
 	db STEEL_WING, FLY, TOXIC, PROTECT
@@ -3167,7 +3045,7 @@ BattleTowerMons6:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $fb, $eb ; DVs
+	dn 15, 11, 14, 11 ; DVs
 	db 25, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3182,7 +3060,6 @@ BattleTowerMons6:
 	bigdw 135 ; SDef
 	db "EA-MUDO@@@@"
 
-
 	db BLISSEY
 	db LEFTOVERS
 	db SOFTBOILED, TOXIC, PROTECT, PSYCHIC_M
@@ -3194,7 +3071,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 45000
 	bigdw 50000
-	db $fb, $cd ; DVs
+	dn 15, 11, 12, 13 ; DVs
 	db 10, 10, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3209,7 +3086,6 @@ BattleTowerMons6:
 	bigdw 215 ; SDef
 	db "HAPINASU@@@"
 
-
 	db SNORLAX
 	db PINK_BOW
 	db ROCK_SLIDE, SURF, BODY_SLAM, EARTHQUAKE
@@ -3221,7 +3097,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fa, $fc ; DVs
+	dn 15, 10, 15, 12 ; DVs
 	db 10, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3236,7 +3112,6 @@ BattleTowerMons6:
 	bigdw 184 ; SDef
 	db "KABIGON@@@@"
 
-
 	db HERACROSS
 	db FOCUS_BAND
 	db REVERSAL, MEGAHORN, EARTHQUAKE, COUNTER
@@ -3248,7 +3123,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $df, $ed ; DVs
+	dn 13, 15, 14, 13 ; DVs
 	db 15, 10, 10, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3263,7 +3138,6 @@ BattleTowerMons6:
 	bigdw 167 ; SDef
 	db "HERAKUROSU@"
 
-
 	db JYNX
 	db MIRACLEBERRY
 	db BLIZZARD, PSYCHIC_M, SHADOW_BALL, ICY_WIND
@@ -3275,7 +3149,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ff, $eb ; DVs
+	dn 15, 15, 14, 11 ; DVs
 	db 5, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3290,7 +3164,6 @@ BattleTowerMons6:
 	bigdw 165 ; SDef
 	db "RU-ZIyuRA@@"
 
-
 	db BLASTOISE
 	db GOLD_BERRY
 	db SURF, EARTHQUAKE, RAPID_SPIN, BLIZZARD
@@ -3302,7 +3175,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 15, 10, 40, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3317,7 +3190,6 @@ BattleTowerMons6:
 	bigdw 180 ; SDef
 	db "KAMEtuKUSU@"
 
-
 	db RHYDON
 	db QUICK_CLAW
 	db EARTHQUAKE, SURF, IRON_TAIL, ROCK_SLIDE
@@ -3329,7 +3201,7 @@ BattleTowerMons6:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fb, $fa ; DVs
+	dn 15, 11, 15, 10 ; DVs
 	db 10, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3344,7 +3216,6 @@ BattleTowerMons6:
 	bigdw 104 ; SDef
 	db "SAIDON@@@@@"
 
-
 	db SANDSLASH
 	db SCOPE_LENS
 	db EARTHQUAKE, SLASH, HYPER_BEAM, SNORE
@@ -3356,7 +3227,7 @@ BattleTowerMons6:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $b7, $67 ; DVs
+	dn 11, 7, 6, 7 ; DVs
 	db 10, 20, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3371,7 +3242,6 @@ BattleTowerMons6:
 	bigdw 105 ; SDef
 	db "SANDOPAN@@@"
 
-
 	db PARASECT
 	db GOLD_BERRY
 	db SPORE, GIGA_DRAIN, HYPER_BEAM, SLUDGE_BOMB
@@ -3383,7 +3253,7 @@ BattleTowerMons6:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $66, $5f ; DVs
+	dn 6, 6, 5, 15 ; DVs
 	db 15, 5, 5, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3398,7 +3268,6 @@ BattleTowerMons6:
 	bigdw 144 ; SDef
 	db "PARASEKUTO@"
 
-
 	db GOLEM
 	db BRIGHTPOWDER
 	db EXPLOSION, EARTHQUAKE, FIRE_PUNCH, FRUSTRATION
@@ -3410,7 +3279,7 @@ BattleTowerMons6:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $76, $57 ; DVs
+	dn 7, 6, 5, 7 ; DVs
 	db 5, 10, 15, 20 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3426,8 +3295,6 @@ BattleTowerMons6:
 	db "GORO-NIya@@"
 
 
-
-
 BattleTowerMons7:
 
 	db JOLTEON
@@ -3441,7 +3308,7 @@ BattleTowerMons7:
 	bigdw 55000
 	bigdw 50000
 	bigdw 60000
-	db $fb, $ef ; DVs
+	dn 15, 11, 14, 15 ; DVs
 	db 15, 5, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3456,7 +3323,6 @@ BattleTowerMons7:
 	bigdw 201 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db VAPOREON
 	db LEFTOVERS
 	db BLIZZARD, SHADOW_BALL, SURF, MUD_SLAP
@@ -3468,7 +3334,7 @@ BattleTowerMons7:
 	bigdw 60000
 	bigdw 60000
 	bigdw 50000
-	db $bf, $ef ; DVs
+	dn 11, 15, 14, 15 ; DVs
 	db 5, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3483,7 +3349,6 @@ BattleTowerMons7:
 	bigdw 197 ; SDef
 	db "SIyaWA-ZU@@"
 
-
 	db UMBREON
 	db GOLD_BERRY
 	db FAINT_ATTACK, MOONLIGHT, PSYCH_UP, TOXIC
@@ -3495,7 +3360,7 @@ BattleTowerMons7:
 	bigdw 55000
 	bigdw 50000
 	bigdw 58000
-	db $dd, $dd ; DVs
+	dn 13, 13, 13, 13 ; DVs
 	db 20, 5, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3510,7 +3375,6 @@ BattleTowerMons7:
 	bigdw 247 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db BLISSEY
 	db GOLD_BERRY
 	db COUNTER, SOFTBOILED, SHADOW_BALL, THUNDERBOLT
@@ -3522,7 +3386,7 @@ BattleTowerMons7:
 	bigdw 55000
 	bigdw 58000
 	bigdw 50000
-	db $df, $ed ; DVs
+	dn 13, 15, 14, 13 ; DVs
 	db 20, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3537,7 +3401,6 @@ BattleTowerMons7:
 	bigdw 250 ; SDef
 	db "HAPINASU@@@"
 
-
 	db SNORLAX
 	db LEFTOVERS
 	db ROCK_SLIDE, EARTHQUAKE, BLIZZARD, SHADOW_BALL
@@ -3549,7 +3412,7 @@ BattleTowerMons7:
 	bigdw 60000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $dd ; DVs
+	dn 13, 13, 13, 13 ; DVs
 	db 10, 10, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3564,7 +3427,6 @@ BattleTowerMons7:
 	bigdw 215 ; SDef
 	db "KABIGON@@@@"
 
-
 	db HOUNDOOM
 	db KINGS_ROCK
 	db CRUNCH, FLAMETHROWER, FAINT_ATTACK, ROAR
@@ -3576,7 +3438,7 @@ BattleTowerMons7:
 	bigdw 55000
 	bigdw 60000
 	bigdw 55000
-	db $dd, $cd ; DVs
+	dn 13, 13, 12, 13 ; DVs
 	db 15, 15, 20, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3591,7 +3453,6 @@ BattleTowerMons7:
 	bigdw 175 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db TYRANITAR
 	db LEFTOVERS
 	db EARTHQUAKE, CRUNCH, ROCK_SLIDE, HYPER_BEAM
@@ -3603,7 +3464,7 @@ BattleTowerMons7:
 	bigdw 45000
 	bigdw 50000
 	bigdw 45000
-	db $db, $df ; DVs
+	dn 13, 11, 13, 15 ; DVs
 	db 10, 15, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3618,7 +3479,6 @@ BattleTowerMons7:
 	bigdw 203 ; SDef
 	db "BANGIRASU@@"
 
-
 	db ZAPDOS
 	db GOLD_BERRY
 	db THUNDERBOLT, DRILL_PECK, THUNDER_WAVE, HYPER_BEAM
@@ -3630,7 +3490,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $db, $df ; DVs
+	dn 13, 11, 13, 15 ; DVs
 	db 15, 20, 20, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3645,7 +3505,6 @@ BattleTowerMons7:
 	bigdw 189 ; SDef
 	db "SANDA-@@@@@"
 
-
 	db EXEGGUTOR
 	db MIRACLEBERRY
 	db REST, EXPLOSION, PSYCHIC_M, GIGA_DRAIN
@@ -3657,7 +3516,7 @@ BattleTowerMons7:
 	bigdw 40000
 	bigdw 50000
 	bigdw 45000
-	db $dd, $ed ; DVs
+	dn 13, 13, 14, 13 ; DVs
 	db 10, 5, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3672,7 +3531,6 @@ BattleTowerMons7:
 	bigdw 151 ; SDef
 	db "NAtuSI-@@@@"
 
-
 	db UMBREON
 	db GOLD_BERRY
 	db MOONLIGHT, FAINT_ATTACK, PSYCHIC_M, SHADOW_BALL
@@ -3684,7 +3542,7 @@ BattleTowerMons7:
 	bigdw 45000
 	bigdw 45000
 	bigdw 50000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 5, 20, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3699,7 +3557,6 @@ BattleTowerMons7:
 	bigdw 240 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db GYARADOS
 	db BRIGHTPOWDER
 	db SURF, THUNDERBOLT, HYPER_BEAM, ROAR
@@ -3711,7 +3568,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $db, $ef ; DVs
+	dn 13, 11, 14, 15 ; DVs
 	db 15, 15, 5, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3726,7 +3583,6 @@ BattleTowerMons7:
 	bigdw 204 ; SDef
 	db "GIyaRADOSU@"
 
-
 	db QUAGSIRE
 	db MIRACLEBERRY
 	db EARTHQUAKE, SURF, SLUDGE_BOMB, IRON_TAIL
@@ -3738,7 +3594,7 @@ BattleTowerMons7:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $de, $dd ; DVs
+	dn 13, 14, 13, 13 ; DVs
 	db 10, 15, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3753,7 +3609,6 @@ BattleTowerMons7:
 	bigdw 152 ; SDef
 	db "NUO-@@@@@@@"
 
-
 	db URSARING
 	db SCOPE_LENS
 	db SLASH, EARTHQUAKE, HYPER_BEAM, THUNDERPUNCH
@@ -3765,7 +3620,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 45000
 	bigdw 50000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 20, 10, 5, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3780,7 +3635,6 @@ BattleTowerMons7:
 	bigdw 166 ; SDef
 	db "RINGUMA@@@@"
 
-
 	db MR__MIME
 	db KINGS_ROCK
 	db REFLECT, FIRE_PUNCH, PSYCHIC_M, ENCORE
@@ -3792,7 +3646,7 @@ BattleTowerMons7:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $bd, $fb ; DVs
+	dn 11, 13, 15, 11 ; DVs
 	db 20, 15, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3807,7 +3661,6 @@ BattleTowerMons7:
 	bigdw 226 ; SDef
 	db "BARIYA-DO@@"
 
-
 	db PRIMEAPE
 	db QUICK_CLAW
 	db CROSS_CHOP, ICE_PUNCH, THUNDERPUNCH, ROCK_SLIDE
@@ -3819,7 +3672,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $bd, $ef ; DVs
+	dn 11, 13, 14, 15 ; DVs
 	db 5, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3834,7 +3687,6 @@ BattleTowerMons7:
 	bigdw 162 ; SDef
 	db "OKORIZARU@@"
 
-
 	db GIRAFARIG
 	db GOLD_BERRY
 	db AGILITY, BATON_PASS, CRUNCH, EARTHQUAKE
@@ -3846,7 +3698,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fd ; DVs
+	dn 15, 14, 15, 13 ; DVs
 	db 30, 40, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3861,7 +3713,6 @@ BattleTowerMons7:
 	bigdw 152 ; SDef
 	db "KIRINRIKI@@"
 
-
 	db HITMONLEE
 	db FOCUS_BAND
 	db REVERSAL, ENDURE, BODY_SLAM, MEGA_KICK
@@ -3873,7 +3724,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 15, 10, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3888,7 +3739,6 @@ BattleTowerMons7:
 	bigdw 217 ; SDef
 	db "SAWAMURA-@@"
 
-
 	db HERACROSS
 	db BRIGHTPOWDER
 	db REVERSAL, ENDURE, MEGAHORN, EARTHQUAKE
@@ -3900,7 +3750,7 @@ BattleTowerMons7:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $f7, $f7 ; DVs
+	dn 15, 7, 15, 7 ; DVs
 	db 15, 10, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3915,7 +3765,6 @@ BattleTowerMons7:
 	bigdw 186 ; SDef
 	db "HERAKUROSU@"
 
-
 	db VENUSAUR
 	db BRIGHTPOWDER
 	db SUNNY_DAY, SOLARBEAM, SYNTHESIS, HYPER_BEAM
@@ -3927,7 +3776,7 @@ BattleTowerMons7:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $76, $44 ; DVs
+	dn 7, 6, 4, 4 ; DVs
 	db 5, 10, 5, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3942,7 +3791,6 @@ BattleTowerMons7:
 	bigdw 180 ; SDef
 	db "HUSIGIBANA@"
 
-
 	db CHARIZARD
 	db SCOPE_LENS
 	db SLASH, EARTHQUAKE, HYPER_BEAM, FLAMETHROWER
@@ -3954,7 +3802,7 @@ BattleTowerMons7:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $56, $44 ; DVs
+	dn 5, 6, 4, 4 ; DVs
 	db 20, 10, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3969,7 +3817,6 @@ BattleTowerMons7:
 	bigdw 159 ; SDef
 	db "RIZA-DON@@@"
 
-
 	db BLASTOISE
 	db QUICK_CLAW
 	db HYDRO_PUMP, ICE_PUNCH, HYPER_BEAM, IRON_TAIL
@@ -3981,7 +3828,7 @@ BattleTowerMons7:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $76, $64 ; DVs
+	dn 7, 6, 6, 4 ; DVs
 	db 5, 15, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -3997,8 +3844,6 @@ BattleTowerMons7:
 	db "KAMEtuKUSU@"
 
 
-
-
 BattleTowerMons8:
 
 	db JOLTEON
@@ -4012,7 +3857,7 @@ BattleTowerMons8:
 	bigdw 60000
 	bigdw 55000
 	bigdw 55000
-	db $fd, $eb ; DVs
+	dn 15, 13, 14, 11 ; DVs
 	db 20, 15, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4027,7 +3872,6 @@ BattleTowerMons8:
 	bigdw 221 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db SNORLAX
 	db LEFTOVERS
 	db REST, BELLY_DRUM, SNORE, EARTHQUAKE
@@ -4039,7 +3883,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 55500
 	bigdw 60000
-	db $db, $ed ; DVs
+	dn 13, 11, 14, 13 ; DVs
 	db 10, 10, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4054,7 +3898,6 @@ BattleTowerMons8:
 	bigdw 250 ; SDef
 	db "KABIGON@@@@"
 
-
 	db HOUNDOOM
 	db MINT_BERRY
 	db REST, CRUNCH, FLAMETHROWER, SUNNY_DAY
@@ -4066,7 +3909,7 @@ BattleTowerMons8:
 	bigdw 55000
 	bigdw 55000
 	bigdw 55000
-	db $fd, $db ; DVs
+	dn 15, 13, 13, 11 ; DVs
 	db 10, 15, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4081,7 +3924,6 @@ BattleTowerMons8:
 	bigdw 197 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db TAUROS
 	db GOLD_BERRY
 	db EARTHQUAKE, BODY_SLAM, IRON_TAIL, HYPER_BEAM
@@ -4093,7 +3935,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 30000
 	bigdw 50000
-	db $fd, $de ; DVs
+	dn 15, 13, 13, 14 ; DVs
 	db 10, 15, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4108,7 +3950,6 @@ BattleTowerMons8:
 	bigdw 183 ; SDef
 	db "KENTAROSU@@"
 
-
 	db LAPRAS
 	db MINT_BERRY
 	db REST, SURF, CONFUSE_RAY, PSYCHIC_M
@@ -4120,7 +3961,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $df, $db ; DVs
+	dn 13, 15, 13, 11 ; DVs
 	db 10, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4135,7 +3976,6 @@ BattleTowerMons8:
 	bigdw 218 ; SDef
 	db "RAPURASU@@@"
 
-
 	db TYRANITAR
 	db MIRACLEBERRY
 	db REST, CRUNCH, EARTHQUAKE, ROCK_SLIDE
@@ -4147,7 +3987,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $df, $db ; DVs
+	dn 13, 15, 13, 11 ; DVs
 	db 10, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4162,7 +4002,6 @@ BattleTowerMons8:
 	bigdw 226 ; SDef
 	db "BANGIRASU@@"
 
-
 	db GENGAR
 	db NO_ITEM
 	db THUNDERBOLT, SHADOW_BALL, CONFUSE_RAY, THIEF
@@ -4174,7 +4013,7 @@ BattleTowerMons8:
 	bigdw 45000
 	bigdw 55000
 	bigdw 50000
-	db $de, $dd ; DVs
+	dn 13, 14, 13, 13 ; DVs
 	db 15, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4189,7 +4028,6 @@ BattleTowerMons8:
 	bigdw 189 ; SDef
 	db "GENGA-@@@@@"
 
-
 	db FORRETRESS
 	db LEFTOVERS
 	db EXPLOSION, TOXIC, SOLARBEAM, SWAGGER
@@ -4201,7 +4039,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 45000
 	bigdw 50000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 5, 10, 10, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4216,7 +4054,6 @@ BattleTowerMons8:
 	bigdw 165 ; SDef
 	db "HUoRETOSU@@"
 
-
 	db KINGDRA
 	db MINT_BERRY
 	db REST, SURF, BLIZZARD, DRAGONBREATH
@@ -4228,7 +4065,7 @@ BattleTowerMons8:
 	bigdw 40000
 	bigdw 55000
 	bigdw 50000
-	db $fb, $ed ; DVs
+	dn 15, 11, 14, 13 ; DVs
 	db 10, 15, 5, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4243,7 +4080,6 @@ BattleTowerMons8:
 	bigdw 221 ; SDef
 	db "KINGUDORA@@"
 
-
 	db DRAGONITE
 	db GOLD_BERRY
 	db THUNDER_WAVE, SURF, THUNDERBOLT, OUTRAGE
@@ -4255,7 +4091,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 50000
 	bigdw 45000
-	db $dd, $dd ; DVs
+	dn 13, 13, 13, 13 ; DVs
 	db 20, 15, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4270,7 +4106,6 @@ BattleTowerMons8:
 	bigdw 228 ; SDef
 	db "KAIRIyu-@@@"
 
-
 	db PORYGON2
 	db LEFTOVERS
 	db PSYCHIC_M, RECOVER, HYPER_BEAM, TRI_ATTACK
@@ -4282,7 +4117,7 @@ BattleTowerMons8:
 	bigdw 40000
 	bigdw 55000
 	bigdw 50000
-	db $df, $ed ; DVs
+	dn 13, 15, 14, 13 ; DVs
 	db 10, 20, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4297,7 +4132,6 @@ BattleTowerMons8:
 	bigdw 221 ; SDef
 	db "PORIGON2@@@"
 
-
 	db JYNX
 	db QUICK_CLAW
 	db LOVELY_KISS, BLIZZARD, DREAM_EATER, PSYCHIC_M
@@ -4309,7 +4143,7 @@ BattleTowerMons8:
 	bigdw 45000
 	bigdw 50000
 	bigdw 50000
-	db $df, $df ; DVs
+	dn 13, 15, 13, 15 ; DVs
 	db 10, 5, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4324,7 +4158,6 @@ BattleTowerMons8:
 	bigdw 225 ; SDef
 	db "RU-ZIyuRA@@"
 
-
 	db MANTINE
 	db GOLD_BERRY
 	db SURF, CONFUSE_RAY, BLIZZARD, WING_ATTACK
@@ -4336,7 +4169,7 @@ BattleTowerMons8:
 	bigdw 40000
 	bigdw 45000
 	bigdw 50000
-	db $df, $dc ; DVs
+	dn 13, 15, 13, 12 ; DVs
 	db 15, 10, 5, 35 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4351,7 +4184,6 @@ BattleTowerMons8:
 	bigdw 292 ; SDef
 	db "MANTAIN@@@@"
 
-
 	db SKARMORY
 	db QUICK_CLAW
 	db STEEL_WING, FLY, MUD_SLAP, TOXIC
@@ -4363,7 +4195,7 @@ BattleTowerMons8:
 	bigdw 35000
 	bigdw 50000
 	bigdw 50000
-	db $dd, $ef ; DVs
+	dn 13, 13, 14, 15 ; DVs
 	db 25, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4378,7 +4210,6 @@ BattleTowerMons8:
 	bigdw 185 ; SDef
 	db "EA-MUDO@@@@"
 
-
 	db MOLTRES
 	db CHARCOAL
 	db FLAMETHROWER, SKY_ATTACK, STEEL_WING, HYPER_BEAM
@@ -4390,7 +4221,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 40000
 	bigdw 50000
-	db $dd, $fe ; DVs
+	dn 13, 13, 15, 14 ; DVs
 	db 15, 5, 25, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4405,7 +4236,6 @@ BattleTowerMons8:
 	bigdw 207 ; SDef
 	db "HUaIYA-@@@@"
 
-
 	db AERODACTYL
 	db MIRACLEBERRY
 	db HYPER_BEAM, REST, EARTHQUAKE, ROAR
@@ -4417,7 +4247,7 @@ BattleTowerMons8:
 	bigdw 50000
 	bigdw 40000
 	bigdw 50000
-	db $ff, $ed ; DVs
+	dn 15, 15, 14, 13 ; DVs
 	db 5, 10, 10, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4432,7 +4262,6 @@ BattleTowerMons8:
 	bigdw 189 ; SDef
 	db "PUTERA@@@@@"
 
-
 	db ELECTRODE
 	db KINGS_ROCK
 	db THUNDERBOLT, EXPLOSION, MIRROR_COAT, TOXIC
@@ -4444,7 +4273,7 @@ BattleTowerMons8:
 	bigdw 40000
 	bigdw 40000
 	bigdw 50000
-	db $ff, $ef ; DVs
+	dn 15, 15, 14, 15 ; DVs
 	db 15, 5, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4459,7 +4288,6 @@ BattleTowerMons8:
 	bigdw 201 ; SDef
 	db "MARUMAIN@@@"
 
-
 	db DUGTRIO
 	db SCOPE_LENS
 	db SLASH, EARTHQUAKE, THIEF, MUD_SLAP
@@ -4471,7 +4299,7 @@ BattleTowerMons8:
 	bigdw 40000
 	bigdw 50000
 	bigdw 40000
-	db $fd, $dd ; DVs
+	dn 15, 13, 13, 13 ; DVs
 	db 20, 10, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4486,7 +4314,6 @@ BattleTowerMons8:
 	bigdw 177 ; SDef
 	db "DAGUTORIO@@"
 
-
 	db VICTREEBEL
 	db QUICK_CLAW
 	db GIGA_DRAIN, SLUDGE_BOMB, HYPER_BEAM, TOXIC
@@ -4498,7 +4325,7 @@ BattleTowerMons8:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $65, $65 ; DVs
+	dn 6, 5, 6, 5 ; DVs
 	db 5, 10, 5, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4513,7 +4340,6 @@ BattleTowerMons8:
 	bigdw 143 ; SDef
 	db "UTUBOtuTO@@"
 
-
 	db PINSIR
 	db GOLD_BERRY
 	db HYPER_BEAM, SUBMISSION, STRENGTH, TOXIC
@@ -4525,7 +4351,7 @@ BattleTowerMons8:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $74, $64 ; DVs
+	dn 7, 4, 6, 4 ; DVs
 	db 5, 25, 15, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4540,7 +4366,6 @@ BattleTowerMons8:
 	bigdw 157 ; SDef
 	db "KAIROSU@@@@"
 
-
 	db GRANBULL
 	db BRIGHTPOWDER
 	db ROAR, SHADOW_BALL, HYPER_BEAM, THUNDERPUNCH
@@ -4552,7 +4377,7 @@ BattleTowerMons8:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $76, $57 ; DVs
+	dn 7, 6, 5, 7 ; DVs
 	db 20, 15, 5, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4568,8 +4393,6 @@ BattleTowerMons8:
 	db "GURANBURU@@"
 
 
-
-
 BattleTowerMons9:
 
 	db UMBREON
@@ -4583,7 +4406,7 @@ BattleTowerMons9:
 	bigdw 55000
 	bigdw 60000
 	bigdw 55000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 20, 10, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4598,7 +4421,6 @@ BattleTowerMons9:
 	bigdw 314 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db DRAGONITE
 	db QUICK_CLAW
 	db FIRE_BLAST, HYPER_BEAM, OUTRAGE, BLIZZARD
@@ -4610,7 +4432,7 @@ BattleTowerMons9:
 	bigdw 56000
 	bigdw 60000
 	bigdw 60000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 5, 5, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4625,7 +4447,6 @@ BattleTowerMons9:
 	bigdw 263 ; SDef
 	db "KAIRIyu-@@@"
 
-
 	db STARMIE
 	db LEFTOVERS
 	db RECOVER, THUNDERBOLT, SURF, PSYCHIC_M
@@ -4637,7 +4458,7 @@ BattleTowerMons9:
 	bigdw 60000
 	bigdw 55000
 	bigdw 60000
-	db $df, $dd ; DVs
+	dn 13, 15, 13, 13 ; DVs
 	db 20, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4652,7 +4473,6 @@ BattleTowerMons9:
 	bigdw 236 ; SDef
 	db "SUTA-MI-@@@"
 
-
 	db CLOYSTER
 	db LEFTOVERS
 	db EXPLOSION, BLIZZARD, SURF, ICY_WIND
@@ -4664,7 +4484,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $db, $df ; DVs
+	dn 13, 11, 13, 15 ; DVs
 	db 5, 5, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4679,7 +4499,6 @@ BattleTowerMons9:
 	bigdw 162 ; SDef
 	db "PARUSIeN@@@"
 
-
 	db CROBAT
 	db GOLD_BERRY
 	db WING_ATTACK, HAZE, HYPER_BEAM, GIGA_DRAIN
@@ -4691,7 +4510,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $cf ; DVs
+	dn 15, 13, 12, 15 ; DVs
 	db 35, 30, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4706,7 +4525,6 @@ BattleTowerMons9:
 	bigdw 225 ; SDef
 	db "KUROBAtuTO@"
 
-
 	db PORYGON2
 	db QUICK_CLAW
 	db TOXIC, PSYCHIC_M, RECOVER, PROTECT
@@ -4718,7 +4536,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 10, 10, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4733,7 +4551,6 @@ BattleTowerMons9:
 	bigdw 248 ; SDef
 	db "PORIGON2@@@"
 
-
 	db KINGDRA
 	db LEFTOVERS
 	db DRAGONBREATH, SURF, HYPER_BEAM, BLIZZARD
@@ -4745,7 +4562,7 @@ BattleTowerMons9:
 	bigdw 55000
 	bigdw 50000
 	bigdw 45000
-	db $df, $de ; DVs
+	dn 13, 15, 13, 14 ; DVs
 	db 20, 15, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4760,7 +4577,6 @@ BattleTowerMons9:
 	bigdw 248 ; SDef
 	db "KINGUDORA@@"
 
-
 	db TYRANITAR
 	db QUICK_CLAW
 	db HYPER_BEAM, CRUNCH, EARTHQUAKE, ROCK_SLIDE
@@ -4772,7 +4588,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 45000
 	bigdw 50000
-	db $df, $de ; DVs
+	dn 13, 15, 13, 14 ; DVs
 	db 5, 15, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4787,7 +4603,6 @@ BattleTowerMons9:
 	bigdw 259 ; SDef
 	db "BANGIRASU@@"
 
-
 	db LAPRAS
 	db MINT_BERRY
 	db REST, SURF, THUNDERBOLT, PSYCHIC_M
@@ -4799,7 +4614,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 55000
-	db $bd, $ef ; DVs
+	dn 11, 13, 14, 15 ; DVs
 	db 10, 15, 15, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4814,7 +4629,6 @@ BattleTowerMons9:
 	bigdw 255 ; SDef
 	db "RAPURASU@@@"
 
-
 	db ESPEON
 	db GOLD_BERRY
 	db PSYCHIC_M, SHADOW_BALL, SUNNY_DAY, MORNING_SUN
@@ -4826,7 +4640,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $fe ; DVs
+	dn 13, 13, 15, 14 ; DVs
 	db 10, 15, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4841,7 +4655,6 @@ BattleTowerMons9:
 	bigdw 250 ; SDef
 	db "E-HUi@@@@@@"
 
-
 	db MACHAMP
 	db QUICK_CLAW
 	db CROSS_CHOP, VITAL_THROW, FIRE_BLAST, EARTHQUAKE
@@ -4853,7 +4666,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $ed ; DVs
+	dn 13, 13, 14, 13 ; DVs
 	db 5, 10, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4868,7 +4681,6 @@ BattleTowerMons9:
 	bigdw 230 ; SDef
 	db "KAIRIKI-@@@"
 
-
 	db SNORLAX
 	db MIRACLEBERRY
 	db FIRE_BLAST, SURF, EARTHQUAKE, HYPER_BEAM
@@ -4880,7 +4692,7 @@ BattleTowerMons9:
 	bigdw 55000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fd ; DVs
+	dn 15, 14, 15, 13 ; DVs
 	db 5, 15, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4895,7 +4707,6 @@ BattleTowerMons9:
 	bigdw 275 ; SDef
 	db "KABIGON@@@@"
 
-
 	db ARCANINE
 	db MINT_BERRY
 	db SUNNY_DAY, FLAMETHROWER, EXTREMESPEED, REST
@@ -4907,7 +4718,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 45000
 	bigdw 55000
-	db $df, $de ; DVs
+	dn 13, 15, 13, 14 ; DVs
 	db 5, 15, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4922,7 +4733,6 @@ BattleTowerMons9:
 	bigdw 226 ; SDef
 	db "UINDEi@@@@@"
 
-
 	db BLISSEY
 	db LEFTOVERS
 	db SOLARBEAM, SUNNY_DAY, SOFTBOILED, FIRE_BLAST
@@ -4934,7 +4744,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $bd, $fe ; DVs
+	dn 11, 13, 15, 14 ; DVs
 	db 10, 5, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4949,7 +4759,6 @@ BattleTowerMons9:
 	bigdw 322 ; SDef
 	db "HAPINASU@@@"
 
-
 	db HOUNDOOM
 	db BRIGHTPOWDER
 	db FLAMETHROWER, CRUNCH, SUNNY_DAY, SOLARBEAM
@@ -4961,7 +4770,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $db, $fe ; DVs
+	dn 13, 11, 15, 14 ; DVs
 	db 15, 15, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -4976,7 +4785,6 @@ BattleTowerMons9:
 	bigdw 223 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db SKARMORY
 	db QUICK_CLAW
 	db SANDSTORM, STEEL_WING, TOXIC, RETURN
@@ -4988,7 +4796,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $ef, $f7 ; DVs
+	dn 14, 15, 15, 7 ; DVs
 	db 10, 25, 10, 20 ; PP
 	db 255 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5003,7 +4811,6 @@ BattleTowerMons9:
 	bigdw 193 ; SDef
 	db "EA-MUDO@@@@"
 
-
 	db SHUCKLE
 	db LEFTOVERS
 	db TOXIC, WRAP, PROTECT, ENCORE
@@ -5015,7 +4822,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 10, 20, 10, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5030,7 +4837,6 @@ BattleTowerMons9:
 	bigdw 493 ; SDef
 	db "TUBOTUBO@@@"
 
-
 	db FLAREON
 	db MINT_BERRY
 	db HYPER_BEAM, FLAMETHROWER, SHADOW_BALL, ROAR
@@ -5042,7 +4848,7 @@ BattleTowerMons9:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $f7, $f7 ; DVs
+	dn 15, 7, 15, 7 ; DVs
 	db 5, 15, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5057,7 +4863,6 @@ BattleTowerMons9:
 	bigdw 265 ; SDef
 	db "BU-SUTA-@@@"
 
-
 	db MILTANK
 	db LEFTOVERS
 	db MILK_DRINK, EARTHQUAKE, ATTRACT, BODY_SLAM
@@ -5069,7 +4874,7 @@ BattleTowerMons9:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $47, $57 ; DVs
+	dn 4, 7, 5, 7 ; DVs
 	db 10, 10, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5084,7 +4889,6 @@ BattleTowerMons9:
 	bigdw 182 ; SDef
 	db "MIRUTANKU@@"
 
-
 	db TAUROS
 	db PINK_BOW
 	db THUNDERBOLT, HYPER_BEAM, ATTRACT, EARTHQUAKE
@@ -5096,7 +4900,7 @@ BattleTowerMons9:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $65, $76 ; DVs
+	dn 6, 5, 7, 6 ; DVs
 	db 15, 5, 15, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5111,7 +4915,6 @@ BattleTowerMons9:
 	bigdw 180 ; SDef
 	db "KENTAROSU@@"
 
-
 	db MUK
 	db QUICK_CLAW
 	db TOXIC, SLUDGE_BOMB, ATTRACT, GIGA_DRAIN
@@ -5123,7 +4926,7 @@ BattleTowerMons9:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $54, $44 ; DVs
+	dn 5, 4, 4, 4 ; DVs
 	db 10, 10, 15, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5139,8 +4942,6 @@ BattleTowerMons9:
 	db "BETOBETON@@"
 
 
-
-
 BattleTowerMons10:
 
 	db HOUNDOOM
@@ -5154,7 +4955,7 @@ BattleTowerMons10:
 	bigdw 60000
 	bigdw 60000
 	bigdw 60000
-	db $fd, $ed ; DVs
+	dn 15, 13, 14, 13 ; DVs
 	db 15, 15, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5169,7 +4970,6 @@ BattleTowerMons10:
 	bigdw 252 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db MACHAMP
 	db QUICK_CLAW
 	db CROSS_CHOP, EARTHQUAKE, HYPER_BEAM, VITAL_THROW
@@ -5181,7 +4981,7 @@ BattleTowerMons10:
 	bigdw 60000
 	bigdw 60000
 	bigdw 60000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 5, 10, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5196,7 +4996,6 @@ BattleTowerMons10:
 	bigdw 266 ; SDef
 	db "KAIRIKI-@@@"
 
-
 	db KINGDRA
 	db LEFTOVERS
 	db SURF, DRAGONBREATH, REST, TOXIC
@@ -5208,7 +5007,7 @@ BattleTowerMons10:
 	bigdw 60000
 	bigdw 60000
 	bigdw 60000
-	db $df, $fe ; DVs
+	dn 13, 15, 15, 14 ; DVs
 	db 15, 20, 10, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5223,7 +5022,6 @@ BattleTowerMons10:
 	bigdw 284 ; SDef
 	db "KINGUDORA@@"
 
-
 	db JOLTEON
 	db BRIGHTPOWDER
 	db THUNDERBOLT, ROAR, THUNDER_WAVE, IRON_TAIL
@@ -5235,7 +5033,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 30000
 	bigdw 50000
-	db $fd, $fe ; DVs
+	dn 15, 13, 15, 14 ; DVs
 	db 15, 20, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5250,7 +5048,6 @@ BattleTowerMons10:
 	bigdw 278 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db TAUROS
 	db KINGS_ROCK
 	db HYPER_BEAM, EARTHQUAKE, IRON_TAIL, THUNDERBOLT
@@ -5262,7 +5059,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 5, 10, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5277,7 +5074,6 @@ BattleTowerMons10:
 	bigdw 230 ; SDef
 	db "KENTAROSU@@"
 
-
 	db ARCANINE
 	db LEFTOVERS
 	db FLAMETHROWER, EXTREMESPEED, IRON_TAIL, HYPER_BEAM
@@ -5289,7 +5085,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $dd, $ef ; DVs
+	dn 13, 13, 14, 15 ; DVs
 	db 15, 5, 15, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5304,7 +5100,6 @@ BattleTowerMons10:
 	bigdw 250 ; SDef
 	db "UINDEi@@@@@"
 
-
 	db CHARIZARD
 	db SCOPE_LENS
 	db FLAMETHROWER, EARTHQUAKE, SLASH, FLY
@@ -5316,7 +5111,7 @@ BattleTowerMons10:
 	bigdw 55000
 	bigdw 55000
 	bigdw 55000
-	db $fe, $df ; DVs
+	dn 15, 14, 13, 15 ; DVs
 	db 15, 10, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5331,7 +5126,6 @@ BattleTowerMons10:
 	bigdw 263 ; SDef
 	db "RIZA-DON@@@"
 
-
 	db ELECTRODE
 	db BRIGHTPOWDER
 	db THUNDER_WAVE, THUNDERBOLT, EXPLOSION, MIRROR_COAT
@@ -5343,7 +5137,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 45000
 	bigdw 45000
-	db $fb, $ef ; DVs
+	dn 15, 11, 14, 15 ; DVs
 	db 20, 15, 5, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5358,7 +5152,6 @@ BattleTowerMons10:
 	bigdw 248 ; SDef
 	db "MARUMAIN@@@"
 
-
 	db RHYDON
 	db MIRACLEBERRY
 	db SURF, EARTHQUAKE, HYPER_BEAM, ROCK_SLIDE
@@ -5370,7 +5163,7 @@ BattleTowerMons10:
 	bigdw 55000
 	bigdw 50000
 	bigdw 45000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 15, 10, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5385,7 +5178,6 @@ BattleTowerMons10:
 	bigdw 178 ; SDef
 	db "SAIDON@@@@@"
 
-
 	db STEELIX
 	db LEFTOVERS
 	db EARTHQUAKE, HYPER_BEAM, SWAGGER, CRUNCH
@@ -5397,7 +5189,7 @@ BattleTowerMons10:
 	bigdw 55000
 	bigdw 60000
 	bigdw 50000
-	db $fd, $de ; DVs
+	dn 15, 13, 13, 14 ; DVs
 	db 10, 5, 15, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5412,7 +5204,6 @@ BattleTowerMons10:
 	bigdw 218 ; SDef
 	db "HAGANE-RU@@"
 
-
 	db FEAROW
 	db KINGS_ROCK
 	db DRILL_PECK, STEEL_WING, HYPER_BEAM, MUD_SLAP
@@ -5424,7 +5215,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 55000
 	bigdw 50000
-	db $fd, $cf ; DVs
+	dn 15, 13, 12, 15 ; DVs
 	db 20, 25, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5439,7 +5230,6 @@ BattleTowerMons10:
 	bigdw 212 ; SDef
 	db "ONIDORIRU@@"
 
-
 	db MISDREAVUS
 	db FOCUS_BAND
 	db PERISH_SONG, MEAN_LOOK, PAIN_SPLIT, SHADOW_BALL
@@ -5451,7 +5241,7 @@ BattleTowerMons10:
 	bigdw 55000
 	bigdw 50000
 	bigdw 55000
-	db $bd, $ef ; DVs
+	dn 11, 13, 14, 15 ; DVs
 	db 5, 5, 20, 15 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5466,7 +5256,6 @@ BattleTowerMons10:
 	bigdw 263 ; SDef
 	db "MUUMA@@@@@@"
 
-
 	db SNEASEL
 	db SCOPE_LENS
 	db SLASH, BLIZZARD, DREAM_EATER, FAINT_ATTACK
@@ -5478,7 +5267,7 @@ BattleTowerMons10:
 	bigdw 48000
 	bigdw 45000
 	bigdw 50000
-	db $fd, $ef ; DVs
+	dn 15, 13, 14, 15 ; DVs
 	db 20, 5, 15, 20 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5493,7 +5282,6 @@ BattleTowerMons10:
 	bigdw 240 ; SDef
 	db "NIyu-RA@@@@"
 
-
 	db SCIZOR
 	db QUICK_CLAW
 	db STEEL_WING, HYPER_BEAM, SLASH, TOXIC
@@ -5505,7 +5293,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 50000
 	bigdw 45000
-	db $fb, $fe ; DVs
+	dn 15, 11, 15, 14 ; DVs
 	db 25, 5, 20, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5520,7 +5308,6 @@ BattleTowerMons10:
 	bigdw 246 ; SDef
 	db "HAtuSAMU@@@"
 
-
 	db BLISSEY
 	db LEFTOVERS
 	db THUNDERBOLT, BLIZZARD, FIRE_BLAST, SOFTBOILED
@@ -5532,7 +5319,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 30000
 	bigdw 30000
-	db $dd, $fe ; DVs
+	dn 13, 13, 15, 14 ; DVs
 	db 15, 5, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5547,7 +5334,6 @@ BattleTowerMons10:
 	bigdw 346 ; SDef
 	db "HAPINASU@@@"
 
-
 	db PILOSWINE
 	db MINT_BERRY
 	db REST, BLIZZARD, HYPER_BEAM, EARTHQUAKE
@@ -5559,7 +5345,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $f7 ; DVs
+	dn 15, 14, 15, 7 ; DVs
 	db 10, 5, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5574,7 +5360,6 @@ BattleTowerMons10:
 	bigdw 194 ; SDef
 	db "INOMU-@@@@@"
 
-
 	db EXEGGUTOR
 	db QUICK_CLAW
 	db PSYCHIC_M, TOXIC, EXPLOSION, GIGA_DRAIN
@@ -5586,7 +5371,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fe, $fe ; DVs
+	dn 15, 14, 15, 14 ; DVs
 	db 10, 10, 5, 5 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5601,7 +5386,6 @@ BattleTowerMons10:
 	bigdw 218 ; SDef
 	db "NAtuSI-@@@@"
 
-
 	db OMASTAR
 	db LEFTOVERS
 	db SURF, ANCIENTPOWER, BLIZZARD, TOXIC
@@ -5613,7 +5397,7 @@ BattleTowerMons10:
 	bigdw 50000
 	bigdw 50000
 	bigdw 50000
-	db $fb, $e7 ; DVs
+	dn 15, 11, 14, 7 ; DVs
 	db 15, 5, 5, 10 ; PP
 	db 100 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5628,7 +5412,6 @@ BattleTowerMons10:
 	bigdw 214 ; SDef
 	db "OMUSUTA-@@@"
 
-
 	db GOLEM
 	db BRIGHTPOWDER
 	db EXPLOSION, EARTHQUAKE, ROCK_SLIDE, FIRE_BLAST
@@ -5640,7 +5423,7 @@ BattleTowerMons10:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $74, $46 ; DVs
+	dn 7, 4, 4, 6 ; DVs
 	db 5, 10, 10, 5 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5655,7 +5438,6 @@ BattleTowerMons10:
 	bigdw 190 ; SDef
 	db "GORO-NIya@@"
 
-
 	db HITMONCHAN
 	db FOCUS_BAND
 	db COUNTER, FIRE_PUNCH, THUNDERPUNCH, ICE_PUNCH
@@ -5667,7 +5449,7 @@ BattleTowerMons10:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $67, $76 ; DVs
+	dn 6, 7, 7, 6 ; DVs
 	db 20, 15, 15, 15 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -5682,7 +5464,6 @@ BattleTowerMons10:
 	bigdw 280 ; SDef
 	db "EBIWARA-@@@"
 
-
 	db LANTURN
 	db QUICK_CLAW
 	db SURF, RAIN_DANCE, ZAP_CANNON, CONFUSE_RAY
@@ -5694,7 +5475,7 @@ BattleTowerMons10:
 	bigdw 30000
 	bigdw 30000
 	bigdw 30000
-	db $76, $57 ; DVs
+	dn 7, 6, 5, 7 ; DVs
 	db 15, 5, 5, 10 ; PP
 	db 0 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
diff --git a/data/battle_tower/trainer_text.asm b/data/battle_tower/trainer_text.asm
index 1601028a6..9937f8bf9 100644
--- a/data/battle_tower/trainer_text.asm
+++ b/data/battle_tower/trainer_text.asm
@@ -1,743 +1,623 @@
-BattleTowerText_0x1ec000: ; 0x1ec000
+BattleTowerText_0x1ec000:
 	text "Hello, glad to"
 	line "meet you!"
 
 	para "I do hope we have"
 	line "a good battle."
 	done
-; 0x1ec03b
 
-BattleTowerText_0x1ec03b: ; 0x1ec03b
+BattleTowerText_0x1ec03b:
 	text "Thank you! A most"
 	line "enjoyable battle!"
 	done
-; 0x1ec060
 
-UnknownText_0x1ec060: ; 0x1ec060
+UnknownText_0x1ec060:
 	text "Thank you. You are"
 	line "formidable."
 	done
-; 0x1ec080
 
-BattleTowerText_0x1ec080: ; 0x1ec080
+BattleTowerText_0x1ec080:
 	text "Work, work, work…"
 	line "I'm always busy!"
 	done
-; 0x1ec0a3
 
-UnknownText_0x1ec0a3: ; 0x1ec0a3
+UnknownText_0x1ec0a3:
 	text "But, I work hard"
 	line "in battle too!"
 	done
-; 0x1ec0c4
 
-UnknownText_0x1ec0c4: ; 0x1ec0c4
+UnknownText_0x1ec0c4:
 	text "I'm too busy to be"
 	line "battling!"
 	done
-; 0x1ec0e1
 
-UnknownText_0x1ec0e1: ; 0x1ec0e1
+UnknownText_0x1ec0e1:
 	text "Brace yourself for"
 	line "my all-out attack!"
 	done
-; 0x1ec108
 
-UnknownText_0x1ec108: ; 0x1ec108
+UnknownText_0x1ec108:
 	text "What a cakewalk!"
 	line "You're too easy!"
 	done
-; 0x1ec12a
 
-UnknownText_0x1ec12a: ; 0x1ec12a
+UnknownText_0x1ec12a:
 	text "I won't lose next"
 	line "time, all right?"
 	done
-; 0x1ec14d
 
-UnknownText_0x1ec14d: ; 0x1ec14d
+UnknownText_0x1ec14d:
 	text "Heh, your #MON"
 	line "look pretty cool."
 	done
-; 0x1ec16f
 
-UnknownText_0x1ec16f: ; 0x1ec16f
+UnknownText_0x1ec16f:
 	text "Hey, hey, no way!"
 	line "You won't win!"
 	done
-; 0x1ec190
 
-UnknownText_0x1ec190: ; 0x1ec190
+UnknownText_0x1ec190:
 	text "You serious?"
 	line "This is brutal!"
 	done
-; 0x1ec1ae
 
-UnknownText_0x1ec1ae: ; 0x1ec1ae
+UnknownText_0x1ec1ae:
 	text "#MON every day!"
 	line "I love battling!"
 	done
-; 0x1ec1d0
 
-UnknownText_0x1ec1d0: ; 0x1ec1d0
+UnknownText_0x1ec1d0:
 	text "I'm on top of my"
 	line "game, but not you!"
 	done
-; 0x1ec1f4
 
-UnknownText_0x1ec1f4: ; 0x1ec1f4
+UnknownText_0x1ec1f4:
 	text "I don't care that"
 	line "I lost, really!"
 	done
-; 0x1ec216
 
-UnknownText_0x1ec216: ; 0x1ec216
+UnknownText_0x1ec216:
 	text "Hi, there! Let's"
 	line "keep this clean!"
 	done
-; 0x1ec238
 
-UnknownText_0x1ec238: ; 0x1ec238
+UnknownText_0x1ec238:
 	text "Whoops, sorry for"
 	line "that wipeout!"
 	done
-; 0x1ec259
 
-UnknownText_0x1ec259: ; 0x1ec259
+UnknownText_0x1ec259:
 	text "Whoops! Come on,"
 	line "let me win one!"
 	done
-; 0x1ec27b
 
-UnknownText_0x1ec27b: ; 0x1ec27b
+UnknownText_0x1ec27b:
 	text "Do you want to see"
 	line "my battle level?"
 	done
-; 0x1ec2a0
 
-UnknownText_0x1ec2a0: ; 0x1ec2a0
+UnknownText_0x1ec2a0:
 	text "Hehehe, I know"
 	line "your level now!"
 	done
-; 0x1ec2c0
 
-UnknownText_0x1ec2c0: ; 0x1ec2c0
+UnknownText_0x1ec2c0:
 	text "Ouch… I'm just too"
 	line "weak…"
 	done
-; 0x1ec2d9
 
-UnknownText_0x1ec2d9: ; 0x1ec2d9
+UnknownText_0x1ec2d9:
 	text "Hey, let's battle."
 	line "I'm your opponent."
 	done
-; 0x1ec2fe
 
-UnknownText_0x1ec2fe: ; 0x1ec2fe
+UnknownText_0x1ec2fe:
 	text "Wow, you're not"
 	line "serious about it!"
 	done
-; 0x1ec320
 
-UnknownText_0x1ec320: ; 0x1ec320
+UnknownText_0x1ec320:
 	text "…Urgh… Nothing"
 	line "positive here…"
 	done
-; 0x1ec33f
 
-UnknownText_0x1ec33f: ; 0x1ec33f
+UnknownText_0x1ec33f:
 	text "I'm your"
 	line "opponent."
 
 	para "Get ready to be"
 	line "hammered."
 	done
-; 0x1ec36c
 
-UnknownText_0x1ec36c: ; 0x1ec36c
+UnknownText_0x1ec36c:
 	text "Hahah! That was a"
 	line "pushover!"
 	done
-; 0x1ec389
 
-UnknownText_0x1ec389: ; 0x1ec389
+UnknownText_0x1ec389:
 	text "No way! There has"
 	line "to be a mistake!"
 	done
-; 0x1ec3ad
 
-UnknownText_0x1ec3ad: ; 0x1ec3ad
+UnknownText_0x1ec3ad:
 	text "Hah!"
 	line "Let's get rolling!"
 	done
-; 0x1ec3c5
 
-UnknownText_0x1ec3c5: ; 0x1ec3c5
+UnknownText_0x1ec3c5:
 	text "Wahahaha! Didn't"
 	line "break a sweat!"
 	done
-; 0x1ec3e5
 
-UnknownText_0x1ec3e5: ; 0x1ec3e5
+UnknownText_0x1ec3e5:
 	text "Tough! I'm no"
 	line "match for you!"
 	done
-; 0x1ec402
 
-UnknownText_0x1ec402: ; 0x1ec402
+UnknownText_0x1ec402:
 	text "<……><……><……>"
 	line "<……><……>Battle?"
 	done
-; 0x1ec411
 
-UnknownText_0x1ec411: ; 0x1ec411
+UnknownText_0x1ec411:
 	text "<……><……><……>"
 	line "<……><……>I won?"
 	done
-; 0x1ec41f
 
-UnknownText_0x1ec41f: ; 0x1ec41f
+UnknownText_0x1ec41f:
 	text "<……><……><……>"
 	line "<……><……>I lost?"
 	done
-; 0x1ec42e
 
-UnknownText_0x1ec42e: ; 0x1ec42e
+UnknownText_0x1ec42e:
 	text "You want to be a"
 	line "leader?"
 
 	para "Let me battle you,"
 	line "then!"
 	done
-; 0x1ec461
 
-UnknownText_0x1ec461: ; 0x1ec461
+UnknownText_0x1ec461:
 	text "You need another"
 	line "ten years of"
 
 	para "training to get"
 	line "better, I'd say."
 	done
-; 0x1ec4a0
 
-UnknownText_0x1ec4a0: ; 0x1ec4a0
+UnknownText_0x1ec4a0:
 	text "You're incredibly"
 	line "talented."
 
 	para "No one can touch"
 	line "you now!"
 	done
-; 0x1ec4d6
 
-UnknownText_0x1ec4d6: ; 0x1ec4d6
+UnknownText_0x1ec4d6:
 	text "Today, I'm going"
 	line "to whomp you."
 	done
-; 0x1ec4f5
 
-UnknownText_0x1ec4f5: ; 0x1ec4f5
+UnknownText_0x1ec4f5:
 	text "I knew I'd win."
 	line "I'm so great!"
 	done
-; 0x1ec512
 
-UnknownText_0x1ec512: ; 0x1ec512
+UnknownText_0x1ec512:
 	text "Uh? My plans are"
 	line "out of whack…"
 	done
-; 0x1ec532
 
-UnknownText_0x1ec532: ; 0x1ec532
+UnknownText_0x1ec532:
 	text "I bet you can't"
 	line "beat me!"
 	done
-; 0x1ec54b
 
-UnknownText_0x1ec54b: ; 0x1ec54b
+UnknownText_0x1ec54b:
 	text "Those #MON"
 	line "aren't enough!"
 	done
-; 0x1ec565
 
-UnknownText_0x1ec565: ; 0x1ec565
+UnknownText_0x1ec565:
 	text "I want your"
 	line "#MON. Please?"
 	done
-; 0x1ec580
 
-UnknownText_0x1ec580: ; 0x1ec580
+UnknownText_0x1ec580:
 	text "I'll show you a"
 	line "real battle!"
 	done
-; 0x1ec59d
 
-UnknownText_0x1ec59d: ; 0x1ec59d
+UnknownText_0x1ec59d:
 	text "This battle…"
 	line "I'm bored!"
 	done
-; 0x1ec5b5
 
-UnknownText_0x1ec5b5: ; 0x1ec5b5
+UnknownText_0x1ec5b5:
 	text "…I won't turn tail"
 	line "in battle!"
 	done
-; 0x1ec5d3
 
-UnknownText_0x1ec5d3: ; 0x1ec5d3
+UnknownText_0x1ec5d3:
 	text "Let's go!"
 	line "No holds barred!"
 	done
-; 0x1ec5ee
 
-UnknownText_0x1ec5ee: ; 0x1ec5ee
+UnknownText_0x1ec5ee:
 	text "Sorry! I wanted"
 	line "the win more!"
 	done
-; 0x1ec60d
 
-UnknownText_0x1ec60d: ; 0x1ec60d
+UnknownText_0x1ec60d:
 	text "Wahah! Congrats!"
 	line "I can't do better!"
 	done
-; 0x1ec631
 
-UnknownText_0x1ec631: ; 0x1ec631
+UnknownText_0x1ec631:
 	text "My #MON skills"
 	line "are phenomenal!"
 	done
-; 0x1ec651
 
-UnknownText_0x1ec651: ; 0x1ec651
+UnknownText_0x1ec651:
 	text "You've got a long"
 	line "way to go."
 
 	para "Well, keep trying!"
 	line "Best of luck!"
 	done
-; 0x1ec68f
 
-UnknownText_0x1ec68f: ; 0x1ec68f
+UnknownText_0x1ec68f:
 	text "Aww… Don't lose"
 	line "after beating me."
 	done
-; 0x1ec6b1
 
-UnknownText_0x1ec6b1: ; 0x1ec6b1
+UnknownText_0x1ec6b1:
 	text "Who are you?"
 	line "I don't know you…"
 	done
-; 0x1ec6d0
 
-UnknownText_0x1ec6d0: ; 0x1ec6d0
+UnknownText_0x1ec6d0:
 	text "I must've imagined"
 	line "that."
 
 	para "There seems to be"
 	line "no one here…"
 	done
-; 0x1ec708
 
-UnknownText_0x1ec708: ; 0x1ec708
+UnknownText_0x1ec708:
 	text "Who am I?"
 	line "I don't know…"
 	done
-; 0x1ec720
 
-UnknownText_0x1ec720: ; 0x1ec720
+UnknownText_0x1ec720:
 	text "Um… Are you that…"
 	line "um…person?"
 	done
-; 0x1ec73e
 
-UnknownText_0x1ec73e: ; 0x1ec73e
+UnknownText_0x1ec73e:
 	text "It doesn't appear"
 	line "to be you…"
 	done
-; 0x1ec75b
 
-UnknownText_0x1ec75b: ; 0x1ec75b
+UnknownText_0x1ec75b:
 	text "Then you really"
 	line "are the legendary…"
 	done
-; 0x1ec77f
 
-UnknownText_0x1ec77f: ; 0x1ec77f
+UnknownText_0x1ec77f:
 	text "I heard that"
 	line "you're hot!"
 	done
-; 0x1ec798
 
-UnknownText_0x1ec798: ; 0x1ec798
+UnknownText_0x1ec798:
 	text "Not bad. I was"
 	line "just a bit better."
 	done
-; 0x1ec7bb
 
-UnknownText_0x1ec7bb: ; 0x1ec7bb
+UnknownText_0x1ec7bb:
 	text "Eh, you're not"
 	line "that special."
 	done
-; 0x1ec7d8
 
-UnknownText_0x1ec7d8: ; 0x1ec7d8
+UnknownText_0x1ec7d8:
 	text "I'm scared about"
 	line "what might happen."
 
 	para "My #MON are way"
 	line "too strong."
 	done
-; 0x1ec818
 
-UnknownText_0x1ec818: ; 0x1ec818
+UnknownText_0x1ec818:
 	text "See? My #MON"
 	line "were too strong."
 	done
-; 0x1ec837
 
-UnknownText_0x1ec837: ; 0x1ec837
+UnknownText_0x1ec837:
 	text "Graa! My #MON"
 	line "were total wimps!"
 	done
-; 0x1ec858
 
-UnknownText_0x1ec858: ; 0x1ec858
+UnknownText_0x1ec858:
 	text "Hey, there!"
 	line "I'll take you on!"
 	done
-; 0x1ec876
 
-UnknownText_0x1ec876: ; 0x1ec876
+UnknownText_0x1ec876:
 	text "Don't you have a"
 	line "better strategy?"
 	done
-; 0x1ec898
 
-UnknownText_0x1ec898: ; 0x1ec898
+UnknownText_0x1ec898:
 	text "You've got decent"
 	line "style!"
 	done
-; 0x1ec8b1
 
-UnknownText_0x1ec8b1: ; 0x1ec8b1
+UnknownText_0x1ec8b1:
 	text "I wonder if I can"
 	line "battle properly…"
 	done
-; 0x1ec8d5
 
-UnknownText_0x1ec8d5: ; 0x1ec8d5
+UnknownText_0x1ec8d5:
 	text "Um… Sorry…"
 	line "I think I won."
 	done
-; 0x1ec8f0
 
-UnknownText_0x1ec8f0: ; 0x1ec8f0
+UnknownText_0x1ec8f0:
 	text "I guess I'm not"
 	line "good enough yet…"
 	done
-; 0x1ec911
 
-UnknownText_0x1ec911: ; 0x1ec911
+UnknownText_0x1ec911:
 	text "Wrrooar!"
 	line "I won't lose!"
 	done
-; 0x1ec928
 
-UnknownText_0x1ec928: ; 0x1ec928
+UnknownText_0x1ec928:
 	text "Wrrooar! I knew"
 	line "I was a genius!"
 	done
-; 0x1ec949
 
-UnknownText_0x1ec949: ; 0x1ec949
+UnknownText_0x1ec949:
 	text "Arrooh! I hate it"
 	line "when I lose!"
 	done
-; 0x1ec969
 
-UnknownText_0x1ec969: ; 0x1ec969
+UnknownText_0x1ec969:
 	text "Sorry, but I'm"
 	line "going to win."
 	done
-; 0x1ec986
 
-UnknownText_0x1ec986: ; 0x1ec986
+UnknownText_0x1ec986:
 	text "Yeah! My #MON"
 	line "rule!"
 	done
-; 0x1ec99b
 
-UnknownText_0x1ec99b: ; 0x1ec99b
+UnknownText_0x1ec99b:
 	text "Oh, close! I lost"
 	line "by just a bit!"
 	done
-; 0x1ec9bd
 
-UnknownText_0x1ec9bd: ; 0x1ec9bd
+UnknownText_0x1ec9bd:
 	text "OK, I'm not"
 	line "fooling around!"
 	done
-; 0x1ec9d9
 
-UnknownText_0x1ec9d9: ; 0x1ec9d9
+UnknownText_0x1ec9d9:
 	text "Yay! Too easy!"
 	line "Like, no way!"
 	done
-; 0x1ec9f7
 
-UnknownText_0x1ec9f7: ; 0x1ec9f7
+UnknownText_0x1ec9f7:
 	text "No!"
 	line "Like, no way!"
 	done
-; 0x1eca0a
 
-UnknownText_0x1eca0a: ; 0x1eca0a
+UnknownText_0x1eca0a:
 	text "Look! My #MON"
 	line "are really cute!"
 	done
-; 0x1eca2a
 
-UnknownText_0x1eca2a: ; 0x1eca2a
+UnknownText_0x1eca2a:
 	text "Aren't they really"
 	line "adorable?"
 	done
-; 0x1eca47
 
-UnknownText_0x1eca47: ; 0x1eca47
+UnknownText_0x1eca47:
 	text "I'm sorry, it's"
 	line "all my fault!"
 	done
-; 0x1eca64
 
-UnknownText_0x1eca64: ; 0x1eca64
+UnknownText_0x1eca64:
 	text "Let's get our"
 	line "battle started!"
 	done
-; 0x1eca82
 
-UnknownText_0x1eca82: ; 0x1eca82
+UnknownText_0x1eca82:
 	text "Was I too strong"
 	line "for you?"
 	done
-; 0x1eca9d
 
-UnknownText_0x1eca9d: ; 0x1eca9d
+UnknownText_0x1eca9d:
 	text "Ooh, you're in a"
 	line "different class."
 	done
-; 0x1ecabf
 
-UnknownText_0x1ecabf: ; 0x1ecabf
+UnknownText_0x1ecabf:
 	text "Are we going to"
 	line "battle? Let's!"
 	done
-; 0x1ecade
 
-UnknownText_0x1ecade: ; 0x1ecade
+UnknownText_0x1ecade:
 	text "Oh, you're too"
 	line "weak. Shame."
 	done
-; 0x1ecafa
 
-UnknownText_0x1ecafa: ; 0x1ecafa
+UnknownText_0x1ecafa:
 	text "Wow! Are you quite"
 	line "satisfied?"
 	done
-; 0x1ecb19
 
-UnknownText_0x1ecb19: ; 0x1ecb19
+UnknownText_0x1ecb19:
 	text "Oh, you have some"
 	line "rare #MON."
 	done
-; 0x1ecb37
 
-UnknownText_0x1ecb37: ; 0x1ecb37
+UnknownText_0x1ecb37:
 	text "May I have one of"
 	line "your #MON?"
 	done
-; 0x1ecb55
 
-UnknownText_0x1ecb55: ; 0x1ecb55
+UnknownText_0x1ecb55:
 	text "…I want one of"
 	line "your #MON."
 	done
-; 0x1ecb70
 
-UnknownText_0x1ecb70: ; 0x1ecb70
+UnknownText_0x1ecb70:
 	text "Want to hear about"
 	line "my cute #MON?"
 	done
-; 0x1ecb92
 
-UnknownText_0x1ecb92: ; 0x1ecb92
+UnknownText_0x1ecb92:
 	text "What do you think"
 	line "about my cuties?"
 	done
-; 0x1ecbb6
 
-UnknownText_0x1ecbb6: ; 0x1ecbb6
+UnknownText_0x1ecbb6:
 	text "Oh! My! You're a"
 	line "dreadful trainer!"
 	done
-; 0x1ecbd9
 
-UnknownText_0x1ecbd9: ; 0x1ecbd9
+UnknownText_0x1ecbd9:
 	text "Battle? Sure!"
 	line "Right now!"
 	done
-; 0x1ecbf3
 
-UnknownText_0x1ecbf3: ; 0x1ecbf3
+UnknownText_0x1ecbf3:
 	text "Oh, I love it!"
 	line "Battling is wild!"
 	done
-; 0x1ecc15
 
-UnknownText_0x1ecc15: ; 0x1ecc15
+UnknownText_0x1ecc15:
 	text "Oh, how rude! Wait"
 	line "till next time!"
 	done
-; 0x1ecc39
 
-UnknownText_0x1ecc39: ; 0x1ecc39
+UnknownText_0x1ecc39:
 	text "Please let me win!"
 	line "Please?"
 	done
-; 0x1ecc55
 
-UnknownText_0x1ecc55: ; 0x1ecc55
+UnknownText_0x1ecc55:
 	text "Wow, thank you!"
 	line "You're so nice!"
 	done
-; 0x1ecc75
 
-UnknownText_0x1ecc75: ; 0x1ecc75
+UnknownText_0x1ecc75:
 	text "You're mean!"
 	line "I hate meanies!"
 	done
-; 0x1ecc92
 
-UnknownText_0x1ecc92: ; 0x1ecc92
+UnknownText_0x1ecc92:
 	text "Well, can we"
 	line "begin?"
 	done
-; 0x1ecca7
 
-UnknownText_0x1ecca7: ; 0x1ecca7
+UnknownText_0x1ecca7:
 	text "Well, I beg your"
 	line "pardon…"
 	done
-; 0x1eccc1
 
-UnknownText_0x1eccc1: ; 0x1eccc1
+UnknownText_0x1eccc1:
 	text "Sob… That's not"
 	line "fair!"
 	done
-; 0x1eccd7
 
-UnknownText_0x1eccd7: ; 0x1eccd7
+UnknownText_0x1eccd7:
 	text "I'm good!"
 	line "You can't win."
 	done
-; 0x1eccef
 
-UnknownText_0x1eccef: ; 0x1eccef
+UnknownText_0x1eccef:
 	text "Giving up? You're"
 	line "pretty weak!"
 	done
-; 0x1ecd0e
 
-UnknownText_0x1ecd0e: ; 0x1ecd0e
+UnknownText_0x1ecd0e:
 	text "I won't accept"
 	line "this… No way!"
 	done
-; 0x1ecd2b
 
-UnknownText_0x1ecd2b: ; 0x1ecd2b
+UnknownText_0x1ecd2b:
 	text "Are you treating"
 	line "this seriously?"
 	done
-; 0x1ecd4d
 
-UnknownText_0x1ecd4d: ; 0x1ecd4d
+UnknownText_0x1ecd4d:
 	text "Oh, sorry! Looks"
 	line "like I won!"
 	done
-; 0x1ecd6b
 
-UnknownText_0x1ecd6b: ; 0x1ecd6b
+UnknownText_0x1ecd6b:
 	text "Oh, how nasty!"
 	line "You were serious!"
 	done
-; 0x1ecd8d
 
-UnknownText_0x1ecd8d: ; 0x1ecd8d
+UnknownText_0x1ecd8d:
 	text "Ahahah! I'll take"
 	line "it easy on you!"
 	done
-; 0x1ecdaf
 
-UnknownText_0x1ecdaf: ; 0x1ecdaf
+UnknownText_0x1ecdaf:
 	text "Oops, sorry! But"
 	line "I'm happy too!"
 	done
-; 0x1ecdcf
 
-UnknownText_0x1ecdcf: ; 0x1ecdcf
+UnknownText_0x1ecdcf:
 	text "Oh, oh, I lost!"
 	line "Thanks. Bye!"
 	done
-; 0x1ecded
 
-UnknownText_0x1ecded: ; 0x1ecded
+UnknownText_0x1ecded:
 	text "BATTLE TOWER is a"
 	line "tough place!"
 	done
-; 0x1ece0d
 
-UnknownText_0x1ece0d: ; 0x1ece0d
+UnknownText_0x1ece0d:
 	text "You might have a"
 	line "hard time."
 	done
-; 0x1ece2a
 
-UnknownText_0x1ece2a: ; 0x1ece2a
+UnknownText_0x1ece2a:
 	text "Ooh, you might"
 	line "make a run here!"
 	done
-; 0x1ece4b
 
-UnknownText_0x1ece4b: ; 0x1ece4b
+UnknownText_0x1ece4b:
 	text "I want to see your"
 	line "style in action!"
 	done
-; 0x1ece70
 
-UnknownText_0x1ece70: ; 0x1ece70
+UnknownText_0x1ece70:
 	text "Every battle is a"
 	line "drama!"
 	done
-; 0x1ece8a
 
-UnknownText_0x1ece8a: ; 0x1ece8a
+UnknownText_0x1ece8a:
 	text "Oh… Want to trade"
 	line "something?"
 	done
-; 0x1ecea8
 
-UnknownText_0x1ecea8: ; 0x1ecea8
+UnknownText_0x1ecea8:
 	text "OK, here goes!"
 	line "I have momentum!"
 	done
-; 0x1ecec9
 
-UnknownText_0x1ecec9: ; 0x1ecec9
+UnknownText_0x1ecec9:
 	text "See, I rolled"
 	line "right over you!"
 	done
-; 0x1ecee8
 
-UnknownText_0x1ecee8: ; 0x1ecee8
+UnknownText_0x1ecee8:
 	text "No! This did not"
 	line "happen!"
 	done
-; 0x1ecf02
diff --git a/data/battle_tower/unknown.asm b/data/battle_tower/unknown.asm
index 81c9515fb..81c9515fb 100755..100644
--- a/data/battle_tower/unknown.asm
+++ b/data/battle_tower/unknown.asm
diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm
index 867bacbb0..2307ec98a 100644
--- a/data/collision_permissions.asm
+++ b/data/collision_permissions.asm
@@ -1,7 +1,7 @@
 NONTALKABLE EQUS "db"
 TALKABLE    EQUS "db TALK +"
 
-TileCollisionTable:: ; 4ce1f
+TileCollisionTable::
 ; entries correspond to COLL_* constants
 	NONTALKABLE  LANDTILE ; COLL_FLOOR
 	NONTALKABLE  LANDTILE ; COLL_01
@@ -259,4 +259,3 @@ TileCollisionTable:: ; 4ce1f
 	NONTALKABLE  LANDTILE ; fd
 	NONTALKABLE  LANDTILE ; fe
 	NONTALKABLE  WALLTILE ; COLL_FF
-; 4cf1f
diff --git a/data/common_text/common_text.asm b/data/common_text/common_text.asm
deleted file mode 100644
index 2f88b4e9d..000000000
--- a/data/common_text/common_text.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDE "constants.asm"
-
-
-SECTION "Text 1", ROMX
-
-INCLUDE "data/common_text/common_text_1.asm"
-
-
-SECTION "Text 2", ROMX
-
-INCLUDE "data/common_text/common_text_2.asm"
-
-
-SECTION "Text 3", ROMX
-
-INCLUDE "data/common_text/common_text_3.asm"
diff --git a/data/credits_script.asm b/data/credits_script.asm
index 810e61c83..7f349aaad 100644
--- a/data/credits_script.asm
+++ b/data/credits_script.asm
@@ -1,4 +1,4 @@
-CreditsScript: ; 10acb4
+CreditsScript:
 
 ; Clear the banner.
 	db CREDITS_CLEAR
@@ -284,4 +284,3 @@ CreditsScript: ; 10acb4
 	db CREDITS_WAIT, 20
 
 	db CREDITS_END
-; 10ae13
diff --git a/data/credits_strings.asm b/data/credits_strings.asm
index f23fe3723..7d1996a4c 100644
--- a/data/credits_strings.asm
+++ b/data/credits_strings.asm
@@ -188,7 +188,7 @@ CreditsStrings:
 .MonsterDesign:       db "   MONSTER DESIGN@"         ; "#　デザイン@"
 .GraphicsDesign:      db "  GRAPHICS DESIGN@"         ; "グラフィック　デザイン@"
 .Music:               db "       MUSIC@"              ; "おんがく@"
-.SoundEffects:        db "   SOUND EFFECTS@"          ; "サウンド　エフ→クト@"
+.SoundEffects:        db "   SOUND EFFECTS@"          ; "サウンド　エフェクト@"
 .GameDesign:          db "    GAME DESIGN@"           ; "ゲームデザイン@"
 .GameScenario:        db "   GAME SCENARIO@"          ; "シナりオ@"
 .ToolProgramming:     db "  TOOL PROGRAMMING@"        ; "ツール　プログラム@"
@@ -202,7 +202,7 @@ CreditsStrings:
 .ExecutiveProducer:   db " EXECUTIVE PRODUCER@"       ; "エグゼクティブ　プロデューサー@"
 .PokemonAnimation:    db " #MON ANIMATION@"           ; "#　アニメーション@"
 .PokedexText:         db "    #DEX TEXT@"             ; "ずかん　テキスト@"
-.MobilePrjLeader:     db " MOBILE PRJ. LEADER@"       ; "モバイルプロジ→クト　りーダー@"
+.MobilePrjLeader:     db " MOBILE PRJ. LEADER@"       ; "モバイルプロジェクト　りーダー@"
 .MobileSystemAd:      db " MOBILE SYSTEM AD.@"        ; "モバイル　システムアドバイザー@"
 .MobileStadiumDir:    db "MOBILE STADIUM DIR.@"       ; "モバイルスタジアム　ディレクター@"
 .Coordination:        db "    COORDINATION@"          ; "コーディネーター@"
diff --git a/data/decorations/attributes.asm b/data/decorations/attributes.asm
index 209662a6f..1be457395 100644
--- a/data/decorations/attributes.asm
+++ b/data/decorations/attributes.asm
@@ -5,38 +5,38 @@ decoration: MACRO
 	db \5
 ENDM
 
-DecorationAttributes: ; 26a4f
+DecorationAttributes:
 ; entries correspond to deco constants
-	decoration DECO_PLANT,   $00,            $0,                EVENT_GAVE_KURT_APRICORNS,       $00
-	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_BED,      EVENT_GAVE_KURT_APRICORNS,       $00
+	decoration DECO_PLANT,   $00,            $0,                EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1,       $00
+	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_BED,      EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1,       $00
 	decoration DECO_BED,     FEATHERY_BED,   SET_UP_BED,        EVENT_DECO_BED_1,                $1b
 	decoration DECO_BED,     PINK_BED,       SET_UP_BED,        EVENT_DECO_BED_2,                $1c
 	decoration DECO_BED,     POLKADOT_BED,   SET_UP_BED,        EVENT_DECO_BED_3,                $1d
 	decoration DECO_BED,     PIKACHU_BED,    SET_UP_BED,        EVENT_DECO_BED_4,                $1e
-	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_CARPET,   EVENT_GAVE_KURT_APRICORNS,       $00
+	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_CARPET,   EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1,       $00
 	decoration DECO_CARPET,  RED_CARPET,     SET_UP_CARPET,     EVENT_DECO_CARPET_1,             $08
 	decoration DECO_CARPET,  BLUE_CARPET,    SET_UP_CARPET,     EVENT_DECO_CARPET_2,             $0b
 	decoration DECO_CARPET,  YELLOW_CARPET,  SET_UP_CARPET,     EVENT_DECO_CARPET_3,             $0e
 	decoration DECO_CARPET,  GREEN_CARPET,   SET_UP_CARPET,     EVENT_DECO_CARPET_4,             $11
-	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_PLANT,    EVENT_GAVE_KURT_APRICORNS,       $00
+	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_PLANT,    EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1,       $00
 	decoration DECO_PLANT,   MAGNAPLANT,     SET_UP_PLANT,      EVENT_DECO_PLANT_1,              $20
 	decoration DECO_PLANT,   TROPICPLANT,    SET_UP_PLANT,      EVENT_DECO_PLANT_2,              $21
 	decoration DECO_PLANT,   JUMBOPLANT,     SET_UP_PLANT,      EVENT_DECO_PLANT_3,              $22
-	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_POSTER,   EVENT_GAVE_KURT_APRICORNS,       $00
+	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_POSTER,   EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1,       $00
 	decoration DECO_PLANT,   TOWN_MAP_D,     SET_UP_POSTER,     EVENT_DECO_PLANT_4,              $1f
 	decoration DECO_POSTER,  PIKACHU,        SET_UP_POSTER,     EVENT_DECO_POSTER_1,             $23
 	decoration DECO_POSTER,  CLEFAIRY,       SET_UP_POSTER,     EVENT_DECO_POSTER_2,             $24
 	decoration DECO_POSTER,  JIGGLYPUFF,     SET_UP_POSTER,     EVENT_DECO_POSTER_3,             $25
-	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_CONSOLE,  EVENT_GAVE_KURT_APRICORNS,       $00
+	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_CONSOLE,  EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1,       $00
 	decoration DECO_PLANT,   FAMICOM,        SET_UP_CONSOLE,    EVENT_DECO_FAMICOM,              SPRITE_FAMICOM
 	decoration DECO_PLANT,   SUPER_NES,      SET_UP_CONSOLE,    EVENT_DECO_SNES,                 SPRITE_SNES
 	decoration DECO_PLANT,   NINTENDO_64,    SET_UP_CONSOLE,    EVENT_DECO_N64,                  SPRITE_N64
 	decoration DECO_PLANT,   VIRTUAL_BOY,    SET_UP_CONSOLE,    EVENT_DECO_VIRTUAL_BOY,          SPRITE_VIRTUAL_BOY
-	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_BIG_DOLL, EVENT_GAVE_KURT_APRICORNS,       $00
+	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_BIG_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1,       $00
 	decoration DECO_BIGDOLL, SNORLAX,        SET_UP_BIG_DOLL,   EVENT_DECO_BIG_SNORLAX_DOLL,     SPRITE_BIG_SNORLAX
 	decoration DECO_BIGDOLL, ONIX,           SET_UP_BIG_DOLL,   EVENT_DECO_BIG_ONIX_DOLL,        SPRITE_BIG_ONIX
 	decoration DECO_BIGDOLL, LAPRAS,         SET_UP_BIG_DOLL,   EVENT_DECO_BIG_LAPRAS_DOLL,      SPRITE_BIG_LAPRAS
-	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_DOLL,     EVENT_GAVE_KURT_APRICORNS,       $00
+	decoration DECO_PLANT,   PUT_IT_AWAY,    PUT_AWAY_DOLL,     EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1,       $00
 	decoration DECO_DOLL,    PIKACHU,        SET_UP_DOLL,       EVENT_DECO_PIKACHU_DOLL,         SPRITE_PIKACHU
 	decoration DECO_PLANT,   SURF_PIKA_DOLL, SET_UP_DOLL,       EVENT_DECO_SURFING_PIKACHU_DOLL, SPRITE_SURFING_PIKACHU
 	decoration DECO_DOLL,    CLEFAIRY,       SET_UP_DOLL,       EVENT_DECO_CLEFAIRY_DOLL,        SPRITE_CLEFAIRY
@@ -60,4 +60,3 @@ DecorationAttributes: ; 26a4f
 	decoration DECO_DOLL,    TENTACOOL,      SET_UP_DOLL,       EVENT_DECO_TENTACOOL_DOLL,       SPRITE_TENTACOOL
 	decoration DECO_PLANT,   GOLD_TROPHY,    SET_UP_DOLL,       EVENT_DECO_GOLD_TROPHY,          SPRITE_GOLD_TROPHY
 	decoration DECO_PLANT,   SILVER_TROPHY,  SET_UP_DOLL,       EVENT_DECO_SILVER_TROPHY,        SPRITE_SILVER_TROPHY
-; 26b8d
diff --git a/data/decorations/decorations.asm b/data/decorations/decorations.asm
index 7b76b8f6a..947bca1b9 100644
--- a/data/decorations/decorations.asm
+++ b/data/decorations/decorations.asm
@@ -1,4 +1,4 @@
-DecorationIDs: ; 26f2b
+DecorationIDs:
 ; see constants/deco_constants.asm
 	db DECO_FEATHERY_BED ; 2
 	db DECO_PINK_BED ; 3
@@ -52,4 +52,3 @@ TrophyIDs:
 	db DECO_GOLD_TROPHY_DOLL ; 33
 	db DECO_SILVER_TROPHY_DOLL ; 34
 	db -1
-; 26f59
diff --git a/data/decorations/mystery_gift_decos.asm b/data/decorations/mystery_gift_decos.asm
index bdd4694c6..3b75c0a58 100644
--- a/data/decorations/mystery_gift_decos.asm
+++ b/data/decorations/mystery_gift_decos.asm
@@ -1,4 +1,4 @@
-MysteryGiftDecos: ; 2c74a
+MysteryGiftDecos:
 	db DECOFLAG_PIKACHU_DOLL
 	db DECOFLAG_BULBASAUR_DOLL
 	db DECOFLAG_CHARMANDER_DOLL
@@ -36,5 +36,4 @@ MysteryGiftDecos: ; 2c74a
 	db DECOFLAG_PIKACHU_BED
 	db DECOFLAG_GRIMER_DOLL
 	db DECOFLAG_UNOWN_DOLL
-MysteryGiftDecosEnd
-; 2c76f
+.End
diff --git a/data/decorations/names.asm b/data/decorations/names.asm
index 21f7eb2a0..1e3a00140 100644
--- a/data/decorations/names.asm
+++ b/data/decorations/names.asm
@@ -1,4 +1,4 @@
-DecorationNames: ; 26b8d
+DecorationNames:
 ; entries correspond to constants/deco_constants.asm
 	db "CANCEL@"
 	db "PUT IT AWAY@"
@@ -26,4 +26,3 @@ DecorationNames: ; 26b8d
 	db "BLUE@"
 	db "YELLOW@"
 	db "GREEN@"
-; 26c72
diff --git a/data/default_options.asm b/data/default_options.asm
index 7a4f77128..333f7ef02 100644
--- a/data/default_options.asm
+++ b/data/default_options.asm
@@ -1,8 +1,8 @@
-DefaultOptions: ; 14f7c
+DefaultOptions:
 ; wOptions: med text speed
 	db TEXT_DELAY_MED
 ; wSaveFileExists: no
-	db $00
+	db FALSE
 ; wTextBoxFrame: frame 1
 	db FRAME_1
 ; wTextBoxFlags: use text speed
@@ -14,4 +14,3 @@ DefaultOptions: ; 14f7c
 
 	db $00
 	db $00
-; 14f84
diff --git a/data/engine_flags.asm b/data/engine_flags.asm
index 9c2dda5a6..21f8ca0fe 100644
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -1,206 +1,199 @@
 engine_flag: MACRO
-	dwb \1, 1 << \2
+; location, bit
+; (all locations are in WRAM bank 1)
+	dwb \1 + (\2 / 8), 1 << (\2 % 8)
 ENDM
 
-EngineFlags: ; 80462
-	; location, bit
-	; (all locations are in WRAM bank 1)
+EngineFlags:
+; entries correspond to ENGINE_* constants
 
 	; pokegear
-	engine_flag wPokegearFlags, 1 ; radio card       ; $0
-	engine_flag wPokegearFlags, 0 ; map card
-	engine_flag wPokegearFlags, 2 ; phone card
-	engine_flag wPokegearFlags, 3 ; expn card
-	engine_flag wPokegearFlags, 7 ; on/off
+	engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F ; $0
+	engine_flag wPokegearFlags, POKEGEAR_MAP_CARD_F
+	engine_flag wPokegearFlags, POKEGEAR_PHONE_CARD_F
+	engine_flag wPokegearFlags, POKEGEAR_EXPN_CARD_F
+	engine_flag wPokegearFlags, POKEGEAR_OBTAINED_F
 
-	;   wDayCareMan, 7 ; day-care 1 on
-	engine_flag wDayCareMan, 6 ; egg is ready
-	;   wDayCareMan, 5 ; monster 1 and 2 are compatible
-	engine_flag wDayCareMan, 0 ; monster 1 in day-care
+	; day-care
+	engine_flag wDayCareMan, DAYCAREMAN_HAS_EGG_F
+	engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F
+	engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F
 
-	;   wDayCareLady, 7 = day-care 2 on
-	engine_flag wDayCareLady, 0 ; monster 2 in day-care
-
-	engine_flag wMomSavingMoney, 0 ; mom saving money ; $8
-	engine_flag wMomSavingMoney, 7 ; dst
+	engine_flag wMomSavingMoney, MOM_SAVING_SOME_MONEY_F ; $8
+	engine_flag wMomSavingMoney, MOM_ACTIVE_F
 
 	engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer
 
-	engine_flag wStatusFlags, 0 ; pokedex
-	engine_flag wStatusFlags, 1 ; unown dex
-	engine_flag wStatusFlags, 3 ; pokerus
-	engine_flag wStatusFlags, 4 ; rocket signal on ch20
-	engine_flag wStatusFlags, 6 ; credits skip
-	engine_flag wStatusFlags, 7 ; bug contest on   ; $10
-	engine_flag wStatusFlags2, 2 ; bug contest timer
-	engine_flag wStatusFlags2, 1 ; safari zone?
-	engine_flag wStatusFlags2, 0 ; rockets in radio tower
-	engine_flag wStatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd)
-	engine_flag wStatusFlags2, 5 ; give pokerus
-	engine_flag wStatusFlags2, 6 ; berry -> berry juice when trading?
-	engine_flag wStatusFlags2, 7 ; rockets in mahogany
-
-	engine_flag wBikeFlags, 0 ; strength active  ; $18
-	engine_flag wBikeFlags, 1 ; always on bike (cant surf)
-	engine_flag wBikeFlags, 2 ; downhill (cycling road)
-
-	engine_flag wJohtoBadges, 0 ; zephyrbadge
-	engine_flag wJohtoBadges, 1 ; hivebadge
-	engine_flag wJohtoBadges, 2 ; plainbadge
-	engine_flag wJohtoBadges, 3 ; fogbadge
-	engine_flag wJohtoBadges, 4 ; mineralbadge
-	engine_flag wJohtoBadges, 5 ; stormbadge ; $20
-	engine_flag wJohtoBadges, 6 ; glacierbadge
-	engine_flag wJohtoBadges, 7 ; risingbadge
-
-	engine_flag wKantoBadges, 0 ; boulderbadge
-	engine_flag wKantoBadges, 1 ; cascadebadge
-	engine_flag wKantoBadges, 2 ; thunderbadge
-	engine_flag wKantoBadges, 3 ; rainbowbadge
-	engine_flag wKantoBadges, 4 ; soulbadge
-	engine_flag wKantoBadges, 5 ; marshbadge ; $28
-	engine_flag wKantoBadges, 6 ; volcanobadge
-	engine_flag wKantoBadges, 7 ; earthbadge
-
-	; unown sets
-	engine_flag wUnlockedUnowns, 0 ; 1
-	engine_flag wUnlockedUnowns, 1 ; 2
-	engine_flag wUnlockedUnowns, 2 ; 3
-	engine_flag wUnlockedUnowns, 3 ; 4
-	engine_flag wUnlockedUnowns, 4 ; 5
-	engine_flag wUnlockedUnowns, 5 ; 6       ; $30
-	engine_flag wUnlockedUnowns, 6 ; 7
-	engine_flag wUnlockedUnowns, 7 ; 8
+	engine_flag wStatusFlags, STATUSFLAGS_POKEDEX_F
+	engine_flag wStatusFlags, STATUSFLAGS_UNOWN_DEX_F
+	engine_flag wStatusFlags, STATUSFLAGS_CAUGHT_POKERUS_F
+	engine_flag wStatusFlags, STATUSFLAGS_ROCKET_SIGNAL_F
+	engine_flag wStatusFlags, STATUSFLAGS_HALL_OF_FAME_F
+	engine_flag wStatusFlags, STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F
+
+	engine_flag wStatusFlags2, STATUSFLAGS2_BUG_CONTEST_TIMER_F
+	engine_flag wStatusFlags2, STATUSFLAGS2_SAFARI_GAME_F
+	engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F
+	engine_flag wStatusFlags2, STATUSFLAGS2_BIKE_SHOP_CALL_F
+	engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_5_F
+	engine_flag wStatusFlags2, STATUSFLAGS2_REACHED_GOLDENROD_F
+	engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F
+
+	engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F ; $18
+	engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F
+	engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F
+
+	engine_flag wJohtoBadges, ZEPHYRBADGE
+	engine_flag wJohtoBadges, HIVEBADGE
+	engine_flag wJohtoBadges, PLAINBADGE
+	engine_flag wJohtoBadges, FOGBADGE
+	engine_flag wJohtoBadges, MINERALBADGE
+	engine_flag wJohtoBadges, STORMBADGE ; $20
+	engine_flag wJohtoBadges, GLACIERBADGE
+	engine_flag wJohtoBadges, RISINGBADGE
+
+	engine_flag wKantoBadges, BOULDERBADGE
+	engine_flag wKantoBadges, CASCADEBADGE
+	engine_flag wKantoBadges, THUNDERBADGE
+	engine_flag wKantoBadges, RAINBOWBADGE
+	engine_flag wKantoBadges, SOULBADGE
+	engine_flag wKantoBadges, MARSHBADGE ; $28
+	engine_flag wKantoBadges, VOLCANOBADGE
+	engine_flag wKantoBadges, EARTHBADGE
+
+	; unown sets (see data/wild/unlocked_unowns.asm)
+	engine_flag wUnlockedUnowns, 0 ; A-K
+	engine_flag wUnlockedUnowns, 1 ; L-R
+	engine_flag wUnlockedUnowns, 2 ; S-W
+	engine_flag wUnlockedUnowns, 3 ; X-Z
+	engine_flag wUnlockedUnowns, 4 ; unused
+	engine_flag wUnlockedUnowns, 5 ; unused ; $30
+	engine_flag wUnlockedUnowns, 6 ; unused
+	engine_flag wUnlockedUnowns, 7 ; unused
 
 	; fly
-	engine_flag wVisitedSpawns, 0     ; your house
-	engine_flag wVisitedSpawns, 1     ; viridian pokecenter
-	engine_flag wVisitedSpawns, 2     ; pallet
-	engine_flag wVisitedSpawns, 3     ; viridian
-	engine_flag wVisitedSpawns, 4     ; pewter
-	engine_flag wVisitedSpawns, 5     ; cerulean ; $38
-	engine_flag wVisitedSpawns, 6     ; rock tunnel
-	engine_flag wVisitedSpawns, 7     ; vermilion
-	engine_flag wVisitedSpawns + 1, 0 ; lavender
-	engine_flag wVisitedSpawns + 1, 1 ; saffron
-	engine_flag wVisitedSpawns + 1, 2 ; celadon
-	engine_flag wVisitedSpawns + 1, 3 ; fuchsia
-	engine_flag wVisitedSpawns + 1, 4 ; cinnabar
-	engine_flag wVisitedSpawns + 1, 5 ; indigo plateau ; $40
-	engine_flag wVisitedSpawns + 1, 6 ; new bark
-	engine_flag wVisitedSpawns + 1, 7 ; cherrygrove
-	engine_flag wVisitedSpawns + 2, 0 ; violet
-	                                  ; union cave
-	engine_flag wVisitedSpawns + 2, 2 ; azalea
-	engine_flag wVisitedSpawns + 2, 3 ; cianwood
-	engine_flag wVisitedSpawns + 2, 4 ; goldenrod
-	engine_flag wVisitedSpawns + 2, 5 ; olivine
-	engine_flag wVisitedSpawns + 2, 6 ; ecruteak  ; $48
-	engine_flag wVisitedSpawns + 2, 7 ; mahogany
-	engine_flag wVisitedSpawns + 3, 0 ; lake of rage
-	engine_flag wVisitedSpawns + 3, 1 ; blackthorn
-	engine_flag wVisitedSpawns + 3, 2 ; silver cave
-	                                  ; fast ship
-	engine_flag wVisitedSpawns + 3, 4 ; unused
-
-	engine_flag wLuckyNumberShowFlag, 0 ; lucky number show
-	engine_flag wStatusFlags2, 3 ; ????
-
-	engine_flag wDailyFlags, 0 ; kurt making balls  ; $50
-	engine_flag wDailyFlags, 1 ; ????
-	engine_flag wDailyFlags, 2 ; special wilddata?
-	engine_flag wDailyFlags, 3 ; time capsule (24h wait)
-	engine_flag wDailyFlags, 4 ; all fruit trees
-	engine_flag wDailyFlags, 5 ; shuckle given
-	engine_flag wDailyFlags, 6 ; goldenrod underground merchant closed
-	engine_flag wDailyFlags, 7 ; fought in trainer hall today
-
-	engine_flag wWeeklyFlags, 0 ; mt moon square clefairy  ; $58
-	engine_flag wWeeklyFlags, 1 ; union cave lapras
-	engine_flag wWeeklyFlags, 2 ; goldenrod underground haircut used
-	engine_flag wWeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07
-	engine_flag wWeeklyFlags, 4 ; tea in blues house
-	engine_flag wWeeklyFlags, 5 ; indigo plateau rival fight
-	engine_flag wWeeklyFlags, 6 ; move tutor
-	engine_flag wWeeklyFlags, 7 ; buenas password
-
-	engine_flag wSwarmFlags, 0 ; buenas password 2
-	engine_flag wSwarmFlags, 1 ; goldenrod dept store sale is on
-
-	engine_flag wGameTimerPause, 7 ; $62
-
-	engine_flag wPlayerGender, 0 ; player is female
-
-	engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it
+	engine_flag wVisitedSpawns, SPAWN_HOME
+	engine_flag wVisitedSpawns, SPAWN_DEBUG
+	engine_flag wVisitedSpawns, SPAWN_PALLET
+	engine_flag wVisitedSpawns, SPAWN_VIRIDIAN
+	engine_flag wVisitedSpawns, SPAWN_PEWTER
+	engine_flag wVisitedSpawns, SPAWN_CERULEAN ; $38
+	engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL
+	engine_flag wVisitedSpawns, SPAWN_VERMILION
+	engine_flag wVisitedSpawns, SPAWN_LAVENDER
+	engine_flag wVisitedSpawns, SPAWN_SAFFRON
+	engine_flag wVisitedSpawns, SPAWN_CELADON
+	engine_flag wVisitedSpawns, SPAWN_FUCHSIA
+	engine_flag wVisitedSpawns, SPAWN_CINNABAR
+	engine_flag wVisitedSpawns, SPAWN_INDIGO ; $40
+	engine_flag wVisitedSpawns, SPAWN_NEW_BARK
+	engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE
+	engine_flag wVisitedSpawns, SPAWN_VIOLET
+	engine_flag wVisitedSpawns, SPAWN_AZALEA
+	engine_flag wVisitedSpawns, SPAWN_CIANWOOD
+	engine_flag wVisitedSpawns, SPAWN_GOLDENROD
+	engine_flag wVisitedSpawns, SPAWN_OLIVINE
+	engine_flag wVisitedSpawns, SPAWN_ECRUTEAK ; $48
+	engine_flag wVisitedSpawns, SPAWN_MAHOGANY
+	engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE
+	engine_flag wVisitedSpawns, SPAWN_BLACKTHORN
+	engine_flag wVisitedSpawns, SPAWN_MT_SILVER
+	engine_flag wVisitedSpawns, NUM_SPAWNS ; unused
+
+	engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F
+
+	engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F
+
+	engine_flag wDailyFlags, DAILYFLAGS_KURT_MAKING_BALLS_F ; $50
+	engine_flag wDailyFlags, DAILYFLAGS_BUG_CONTEST_F
+	engine_flag wDailyFlags, DAILYFLAGS_FISH_SWARM_F
+	engine_flag wDailyFlags, DAILYFLAGS_TIME_CAPSULE_F
+	engine_flag wDailyFlags, DAILYFLAGS_ALL_FRUIT_TREES_F
+	engine_flag wDailyFlags, DAILYFLAGS_GOT_SHUCKIE_TODAY_F
+	engine_flag wDailyFlags, DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F
+	engine_flag wDailyFlags, DAILYFLAGS_TRAINER_HOUSE_F
+
+	engine_flag wWeeklyFlags, WEEKLYFLAGS_MT_MOON_SQUARE_CLEFAIRY_F ; $58
+	engine_flag wWeeklyFlags, WEEKLYFLAGS_UNION_CAVE_LAPRAS_F
+	engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F
+	engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_DEPT_STORE_TM27_RETURN_F
+	engine_flag wWeeklyFlags, WEEKLYFLAGS_DAISYS_GROOMING_F
+	engine_flag wWeeklyFlags, WEEKLYFLAGS_INDIGO_PLATEAU_RIVAL_FIGHT_F
+	engine_flag wWeeklyFlags, WEEKLYFLAGS_DAILY_MOVE_TUTOR_F
+	engine_flag wWeeklyFlags, WEEKLYFLAGS_BUENAS_PASSWORD_F
+
+	engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F ; $60
+	engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F
+
+	engine_flag wGameTimerPause, GAMETIMERPAUSE_MOBILE_7_F
+
+	engine_flag wPlayerGender, PLAYERGENDER_FEMALE_F
+
+	engine_flag wCelebiEvent, CELEBIEVENT_FOREST_IS_RESTLESS_F
 
 	; rematches
-	engine_flag wDailyRematchFlags, 0 ; jack
-	engine_flag wDailyRematchFlags, 1 ; huey
-	engine_flag wDailyRematchFlags, 2 ; gaven
-	engine_flag wDailyRematchFlags, 3 ; beth  ; $68
-	engine_flag wDailyRematchFlags, 4 ; jose
-	engine_flag wDailyRematchFlags, 5 ; reena
-	engine_flag wDailyRematchFlags, 6 ; joey
-	engine_flag wDailyRematchFlags, 7 ; wade
-	engine_flag wDailyRematchFlags + 1, 0 ; ralph
-	engine_flag wDailyRematchFlags + 1, 1 ; liz
-	engine_flag wDailyRematchFlags + 1, 2 ; anthony
-	engine_flag wDailyRematchFlags + 1, 3 ; todd  ; $70
-	engine_flag wDailyRematchFlags + 1, 4 ; gina
-	engine_flag wDailyRematchFlags + 1, 5 ; arnie
-	engine_flag wDailyRematchFlags + 1, 6 ; alan
-	engine_flag wDailyRematchFlags + 1, 7 ; dana
-	engine_flag wDailyRematchFlags + 2, 0 ; chad
-	engine_flag wDailyRematchFlags + 2, 1 ; tully
-	engine_flag wDailyRematchFlags + 2, 2 ; brent
-	engine_flag wDailyRematchFlags + 2, 3 ; tiffany  ; $78
-	engine_flag wDailyRematchFlags + 2, 4 ; vance
-	engine_flag wDailyRematchFlags + 2, 5 ; wilton
-	engine_flag wDailyRematchFlags + 2, 6 ; parry
-	engine_flag wDailyRematchFlags + 2, 7 ; erin
+	engine_flag wDailyRematchFlags,  0 ; jack
+	engine_flag wDailyRematchFlags,  1 ; huey
+	engine_flag wDailyRematchFlags,  2 ; gaven
+	engine_flag wDailyRematchFlags,  3 ; beth ; $68
+	engine_flag wDailyRematchFlags,  4 ; jose
+	engine_flag wDailyRematchFlags,  5 ; reena
+	engine_flag wDailyRematchFlags,  6 ; joey
+	engine_flag wDailyRematchFlags,  7 ; wade
+	engine_flag wDailyRematchFlags,  8 ; ralph
+	engine_flag wDailyRematchFlags,  9 ; liz
+	engine_flag wDailyRematchFlags, 10 ; anthony
+	engine_flag wDailyRematchFlags, 11 ; todd ; $70
+	engine_flag wDailyRematchFlags, 12 ; gina
+	engine_flag wDailyRematchFlags, 13 ; arnie
+	engine_flag wDailyRematchFlags, 14 ; alan
+	engine_flag wDailyRematchFlags, 15 ; dana
+	engine_flag wDailyRematchFlags, 16 ; chad
+	engine_flag wDailyRematchFlags, 17 ; tully
+	engine_flag wDailyRematchFlags, 18 ; brent
+	engine_flag wDailyRematchFlags, 19 ; tiffany ; $78
+	engine_flag wDailyRematchFlags, 20 ; vance
+	engine_flag wDailyRematchFlags, 21 ; wilton
+	engine_flag wDailyRematchFlags, 22 ; parry
+	engine_flag wDailyRematchFlags, 23 ; erin
 
 	engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget
 	engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece
 	engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see EVENT_WADE_HAS_*** in constants/event_flags.asm)
-	engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone  ; $80
+	engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80
 	engine_flag wDailyPhoneItemFlags, 4 ; alan has fire stone
 	engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone
 	engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget
 	engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone
-
-	engine_flag wDailyPhoneItemFlags + 1, 0 ; tiffany has pink bow
-	engine_flag wDailyPhoneItemFlags + 1, 1 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm)
-
-	engine_flag wDailyPhoneTimeOfDayFlags, 0
-	engine_flag wDailyPhoneTimeOfDayFlags, 1  ; $88
-	engine_flag wDailyPhoneTimeOfDayFlags, 2
-	engine_flag wDailyPhoneTimeOfDayFlags, 3
-	engine_flag wDailyPhoneTimeOfDayFlags, 4
-	engine_flag wDailyPhoneTimeOfDayFlags, 5
-	engine_flag wDailyPhoneTimeOfDayFlags, 6
-	engine_flag wDailyPhoneTimeOfDayFlags, 7
-
-	engine_flag wDailyPhoneTimeOfDayFlags + 1, 0
-	engine_flag wDailyPhoneTimeOfDayFlags + 1, 1  ; $90
-	engine_flag wDailyPhoneTimeOfDayFlags + 1, 2
-	engine_flag wDailyPhoneTimeOfDayFlags + 1, 3
-	engine_flag wDailyPhoneTimeOfDayFlags + 1, 4
-	engine_flag wDailyPhoneTimeOfDayFlags + 1, 5
-	engine_flag wDailyPhoneTimeOfDayFlags + 1, 6
-	engine_flag wDailyPhoneTimeOfDayFlags + 1, 7
-
-	engine_flag wDailyPhoneTimeOfDayFlags + 2, 0
-	engine_flag wDailyPhoneTimeOfDayFlags + 2, 1  ; $98
-	engine_flag wDailyPhoneTimeOfDayFlags + 2, 2
-	engine_flag wDailyPhoneTimeOfDayFlags + 2, 3
-	engine_flag wDailyPhoneTimeOfDayFlags + 2, 4
-	engine_flag wDailyPhoneTimeOfDayFlags + 2, 5
-	engine_flag wDailyPhoneTimeOfDayFlags + 2, 6
-	engine_flag wDailyPhoneTimeOfDayFlags + 2, 7
-
-	engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male
-
-	engine_flag wSwarmFlags, 2 ; dunsparce swarm   ; $a0
-	engine_flag wSwarmFlags, 3 ; yanma swarm
-
-; 80648
+	engine_flag wDailyPhoneItemFlags, 8 ; tiffany has pink bow
+	engine_flag wDailyPhoneItemFlags, 9 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm)
+
+	engine_flag wDailyPhoneTimeOfDayFlags,  0 ; jack
+	engine_flag wDailyPhoneTimeOfDayFlags,  1 ; huey ; $88
+	engine_flag wDailyPhoneTimeOfDayFlags,  2 ; gaven
+	engine_flag wDailyPhoneTimeOfDayFlags,  3 ; beth
+	engine_flag wDailyPhoneTimeOfDayFlags,  4 ; jose
+	engine_flag wDailyPhoneTimeOfDayFlags,  5 ; reena
+	engine_flag wDailyPhoneTimeOfDayFlags,  6 ; joey
+	engine_flag wDailyPhoneTimeOfDayFlags,  7 ; wade
+	engine_flag wDailyPhoneTimeOfDayFlags,  8 ; ralph
+	engine_flag wDailyPhoneTimeOfDayFlags,  9 ; liz ; $90
+	engine_flag wDailyPhoneTimeOfDayFlags, 10 ; anthony
+	engine_flag wDailyPhoneTimeOfDayFlags, 11 ; todd
+	engine_flag wDailyPhoneTimeOfDayFlags, 12 ; gina
+	engine_flag wDailyPhoneTimeOfDayFlags, 13 ; arnie
+	engine_flag wDailyPhoneTimeOfDayFlags, 14 ; alan
+	engine_flag wDailyPhoneTimeOfDayFlags, 15 ; dana
+	engine_flag wDailyPhoneTimeOfDayFlags, 16 ; chad
+	engine_flag wDailyPhoneTimeOfDayFlags, 17 ; tully ; $98
+	engine_flag wDailyPhoneTimeOfDayFlags, 18 ; brent
+	engine_flag wDailyPhoneTimeOfDayFlags, 19 ; tiffany
+	engine_flag wDailyPhoneTimeOfDayFlags, 20 ; vance
+	engine_flag wDailyPhoneTimeOfDayFlags, 21 ; wilton
+	engine_flag wDailyPhoneTimeOfDayFlags, 22 ; parry
+	engine_flag wDailyPhoneTimeOfDayFlags, 23 ; erin
+
+	engine_flag wPlayerSpriteSetupFlags, PLAYERSPRITESETUP_FEMALE_TO_MALE_F
+
+	engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F ; $a0
+	engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F
diff --git a/data/bug_contest_flags.asm b/data/events/bug_contest_flags.asm
index 04d748270..734bf11f8 100644
--- a/data/bug_contest_flags.asm
+++ b/data/events/bug_contest_flags.asm
@@ -1,4 +1,4 @@
-BugCatchingContestantEventFlagTable: ; 139fe
+BugCatchingContestantEventFlagTable:
 ; there are NUM_BUG_CONTESTANTS entries
 	dw EVENT_BUG_CATCHING_CONTESTANT_1A
 	dw EVENT_BUG_CATCHING_CONTESTANT_2A
@@ -10,4 +10,3 @@ BugCatchingContestantEventFlagTable: ; 139fe
 	dw EVENT_BUG_CATCHING_CONTESTANT_8A
 	dw EVENT_BUG_CATCHING_CONTESTANT_9A
 	dw EVENT_BUG_CATCHING_CONTESTANT_10A
-; 13a12
diff --git a/data/bug_contest_winners.asm b/data/events/bug_contest_winners.asm
index 7a465edf5..e29ce0436 100644
--- a/data/bug_contest_winners.asm
+++ b/data/events/bug_contest_winners.asm
@@ -1,4 +1,4 @@
-BugContestantPointers: ; 13783
+BugContestantPointers:
 ; there are NUM_BUG_CONTESTANTS + 1 entries
 	dw BugContestant_BugCatcherDon ; this reverts back to the player
 	dw BugContestant_BugCatcherDon
@@ -11,7 +11,6 @@ BugContestantPointers: ; 13783
 	dw BugContestant_BugCatcherJosh
 	dw BugContestant_YoungsterSamuel
 	dw BugContestant_SchoolboyKipp
-; 13799
 
 ; contestant format:
 ;   db class, id
@@ -78,4 +77,3 @@ BugContestant_SchoolboyKipp:
 	dbw VENONAT,    267
 	dbw PARAS,      254
 	dbw KAKUNA,     259
-; 13807
diff --git a/data/collision_stdscripts.asm b/data/events/collision_stdscripts.asm
index 8156d039d..dff26dd85 100644
--- a/data/collision_stdscripts.asm
+++ b/data/events/collision_stdscripts.asm
@@ -10,4 +10,4 @@ TileCollisionStdScripts:
 	dbw COLL_TV,             tv
 	dbw COLL_WINDOW,         window
 	dbw COLL_INCENSE_BURNER, incenseburner
-	db   -1 ; end
+	db -1 ; end
diff --git a/data/elevator_floors.asm b/data/events/elevator_floors.asm
index abc793cf2..abc793cf2 100644
--- a/data/elevator_floors.asm
+++ b/data/events/elevator_floors.asm
diff --git a/data/field_move_blocks.asm b/data/events/field_move_blocks.asm
index d97fdc995..fea80f537 100644
--- a/data/field_move_blocks.asm
+++ b/data/events/field_move_blocks.asm
@@ -1,4 +1,4 @@
-CutTreeBlockPointers: ; c862
+CutTreeBlockPointers:
 ; tileset, block list pointer
 	dbw TILESET_JOHTO,        .johto
 	dbw TILESET_JOHTO_MODERN, .johto_modern
@@ -42,8 +42,7 @@ CutTreeBlockPointers: ; c862
 	db $0f, $17, 0
 	db -1 ; end
 
-
-WhirlpoolBlockPointers: ; c8a4
+WhirlpoolBlockPointers:
 	dbw TILESET_JOHTO, .johto
 	db -1 ; end
 
diff --git a/data/happiness_changes.asm b/data/events/happiness_changes.asm
index de60ea32d..de60ea32d 100644
--- a/data/happiness_changes.asm
+++ b/data/events/happiness_changes.asm
diff --git a/data/events/happiness_probabilities.asm b/data/events/happiness_probabilities.asm
new file mode 100644
index 000000000..0dc08ac7e
--- /dev/null
+++ b/data/events/happiness_probabilities.asm
@@ -0,0 +1,12 @@
+HappinessData_YoungerHaircutBrother:
+	db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance
+	db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance
+	db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance
+
+HappinessData_OlderHaircutBrother:
+	db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance
+	db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance
+	db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance
+
+HappinessData_DaisysGrooming:
+	db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance
diff --git a/data/events/magikarp_lengths.asm b/data/events/magikarp_lengths.asm
new file mode 100644
index 000000000..1a1040d6c
--- /dev/null
+++ b/data/events/magikarp_lengths.asm
@@ -0,0 +1,20 @@
+MagikarpLengths:
+; [wMagikarpLength] = z * 100 + (bc - x) / y
+; First argument is the bc threshold as well as x.
+; Second argument is y.
+; In reality, due to the bug at .BCLessThanDE,
+; the threshold is determined by only register b.
+	dwb   110, 1 ; not used unless the bug is fixed
+	dwb   310, 2
+	dwb   710, 4
+	dwb  2710, 20
+	dwb  7710, 50
+	dwb 17710, 100
+	dwb 32710, 150
+	dwb 47710, 150
+	dwb 57710, 100
+	dwb 62710, 50
+	dwb 64710, 20
+	dwb 65210, 5
+	dwb 65410, 2
+	dwb 65510, 1 ; not used
diff --git a/data/events/npc_trades.asm b/data/events/npc_trades.asm
new file mode 100644
index 000000000..03d409571
--- /dev/null
+++ b/data/events/npc_trades.asm
@@ -0,0 +1,17 @@
+npctrade: MACRO
+; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested
+	db \1, \2, \3, \4, \5, \6, \7
+	shift
+	dw \7
+	db \8, \9, 0
+ENDM
+
+NPCTrades:
+; entries correspond to NPCTRADE_* constants
+	npctrade TRADE_DIALOGSET_COLLECTOR, ABRA,       MACHOP,     "MUSCLE@@@@@", $37, $66, GOLD_BERRY,   37460, "MIKE@@@@@@@", TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_COLLECTOR, BELLSPROUT, ONIX,       "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_HAPPY,     KRABBY,     VOLTORB,    "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_GIRL,      DRAGONAIR,  DODRIO,     "DORIS@@@@@@", $77, $66, SMOKE_BALL,   00283, "EMY@@@@@@@@", TRADE_GENDER_FEMALE
+	npctrade TRADE_DIALOGSET_NEWBIE,    HAUNTER,    XATU,       "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_GIRL,      CHANSEY,    AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY,   26491, "KIM@@@@@@@@", TRADE_GENDER_EITHER
+	npctrade TRADE_DIALOGSET_COLLECTOR, DUGTRIO,    MAGNETON,   "MAGGIE@@@@@", $96, $66, METAL_COAT,   50082, "FOREST@@@@@", TRADE_GENDER_EITHER
diff --git a/data/odd_eggs.asm b/data/events/odd_eggs.asm
index aa7e8176b..dd3dc3bbf 100644
--- a/data/odd_eggs.asm
+++ b/data/events/odd_eggs.asm
@@ -26,10 +26,8 @@ prob_total = 0
 ; Tyrogue
 	prob 10
 	prob 1
-; 1fb56e
 
-
-OddEggs: ; 1fb56e
+OddEggs:
 
 OddEgg1:
 	db PICHU
@@ -43,7 +41,7 @@ OddEgg1:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $0, $0 ; DVs
+	dn 0, 0, 0, 0 ; DVs
 	db 30, 20, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -57,8 +55,8 @@ OddEgg1:
 	bigdw 8 ; SAtk
 	bigdw 8 ; SDef
 	db "EGG@@@@@@@@"
+OddEgg1End:
 
-OddEgg2:
 	db PICHU
 	db NO_ITEM
 	db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
@@ -70,7 +68,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 30, 20, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -122,7 +120,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 35, 20, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -174,7 +172,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 15, 20, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -226,7 +224,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 35, 30, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -278,7 +276,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 25, 10, 0, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -330,7 +328,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 30, 30, 10, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
@@ -382,7 +380,7 @@ OddEgg2:
 	bigdw 0
 	bigdw 0
 	bigdw 0
-	db $2a, $aa ; DVs
+	dn 2, 10, 10, 10 ; DVs
 	db 35, 10, 0, 0 ; PP
 	db 20 ; Happiness
 	db 0, 0, 0 ; Pokerus, Caught data
diff --git a/data/events/pokedex_ratings.asm b/data/events/pokedex_ratings.asm
new file mode 100644
index 000000000..2a0488603
--- /dev/null
+++ b/data/events/pokedex_ratings.asm
@@ -0,0 +1,27 @@
+rating: MACRO
+; count, sfx, text
+	dbww \1, \2, \3
+ENDM
+
+OakRatings:
+; if you caught at most this many, play this sound, load this text
+; (text is defined in engine/events/prof_oaks_pc.asm)
+	rating   9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01
+	rating  19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02
+	rating  34, SFX_DEX_FANFARE_20_49,        OakRating03
+	rating  49, SFX_DEX_FANFARE_20_49,        OakRating04
+	rating  64, SFX_DEX_FANFARE_50_79,        OakRating05
+	rating  79, SFX_DEX_FANFARE_50_79,        OakRating06
+	rating  94, SFX_DEX_FANFARE_80_109,       OakRating07
+	rating 109, SFX_DEX_FANFARE_80_109,       OakRating08
+	rating 124, SFX_CAUGHT_MON,               OakRating09
+	rating 139, SFX_CAUGHT_MON,               OakRating10
+	rating 154, SFX_DEX_FANFARE_140_169,      OakRating11
+	rating 169, SFX_DEX_FANFARE_140_169,      OakRating12
+	rating 184, SFX_DEX_FANFARE_170_199,      OakRating13
+	rating 199, SFX_DEX_FANFARE_170_199,      OakRating14
+	rating 214, SFX_DEX_FANFARE_200_229,      OakRating15
+	rating 229, SFX_DEX_FANFARE_200_229,      OakRating16
+	rating 239, SFX_DEX_FANFARE_230_PLUS,     OakRating17
+	rating 248, SFX_DEX_FANFARE_230_PLUS,     OakRating18
+	rating 255, SFX_DEX_FANFARE_230_PLUS,     OakRating19
diff --git a/data/unown_walls.asm b/data/events/unown_walls.asm
index eae376730..624b1e678 100644
--- a/data/unown_walls.asm
+++ b/data/events/unown_walls.asm
@@ -2,43 +2,36 @@ unownwall: MACRO
 rept _NARG
 if \1 == "-"
 x = $64
-else
-if \1 >= "Y"
+elif \1 >= "Y"
 x = 2 * (\1 - "Y") + $60
-else
-if \1 >= "Q"
+elif \1 >= "Q"
 x = 2 * (\1 - "Q") + $40
-else
-if \1 >= "I"
+elif \1 >= "I"
 x = 2 * (\1 - "I") + $20
 else
 x = 2 * (\1 - "A")
 endc
-endc
-endc
-endc
 	db x
-shift
+	shift
 endr
 	db -1 ; end
 ENDM
 
-UnownWalls: ; 8aebc
+UnownWalls:
 ; UNOWNWORDS_ESCAPE
-	; db      $08, $44, $04, $00, $2e, $08, $ff
+	; db      $08, $44, $04, $00, $2e, $08, -1
 	unownwall "E", "S", "C", "A", "P", "E"
 ; UNOWNWORDS_LIGHT
-	; db      $26, $20, $0c, $0e, $46, $ff
+	; db      $26, $20, $0c, $0e, $46, -1
 	unownwall "L", "I", "G", "H", "T"
 ; UNOWNWORDS_WATER
-	; db      $4c, $00, $46, $08, $42, $ff
+	; db      $4c, $00, $46, $08, $42, -1
 	unownwall "W", "A", "T", "E", "R"
 ; UNOWNWORDS_HO_OH
-	; db      $0e, $2c, $64, $2c, $0e, $ff
+	; db      $0e, $2c, $64, $2c, $0e, -1
 	unownwall "H", "O", "-", "O", "H"
-; 8aed5
 
-MenuDataHeaders_UnownWalls: ; 0x8aed5
+MenuHeaders_UnownWalls:
 ; UNOWNWORDS_ESCAPE
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 3, 4, 16, 9
@@ -51,4 +44,3 @@ MenuDataHeaders_UnownWalls: ; 0x8aed5
 ; UNOWNWORDS_HO_OH
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 4, 4, 15, 9
-; 8aee9
diff --git a/data/growth_rates.asm b/data/growth_rates.asm
index 4a1564515..aee2a16e7 100644
--- a/data/growth_rates.asm
+++ b/data/growth_rates.asm
@@ -9,12 +9,11 @@ growth_rate: MACRO
 	db \4, \5
 ENDM
 
-GrowthRates: ; 50efa
-; entries correspond to base growth rate constants (see constants/pokemon_data_constants.asm)
+GrowthRates:
+; entries correspond to GROWTH_* (see constants/pokemon_data_constants.asm)
 	growth_rate 1, 1,   0,   0,   0 ; Medium Fast
 	growth_rate 3, 4,  10,   0,  30 ; Slightly Fast
 	growth_rate 3, 4,  20,   0,  70 ; Slightly Slow
 	growth_rate 6, 5, -15, 100, 140 ; Medium Slow
 	growth_rate 4, 5,   0,   0,   0 ; Fast
 	growth_rate 5, 4,   0,   0,   0 ; Slow
-; 50f12
diff --git a/data/items/apricorn_balls.asm b/data/items/apricorn_balls.asm
index 57e7d04bb..814aeab2f 100644
--- a/data/items/apricorn_balls.asm
+++ b/data/items/apricorn_balls.asm
@@ -1,4 +1,4 @@
-ApricornBalls: ; 24ca0
+ApricornBalls:
 	;  apricorn,     ball
 	db RED_APRICORN, LEVEL_BALL
 	db BLU_APRICORN, LURE_BALL
@@ -8,4 +8,3 @@ ApricornBalls: ; 24ca0
 	db BLK_APRICORN, HEAVY_BALL
 	db PNK_APRICORN, LOVE_BALL
 	db -1
-; 24caf
diff --git a/data/items/attributes.asm b/data/items/attributes.asm
index 5212be6d2..806a2ef28 100644
--- a/data/items/attributes.asm
+++ b/data/items/attributes.asm
@@ -5,158 +5,158 @@ item_attribute: MACRO
 	dn \6, \7
 ENDM
 
-ItemAttributes: ; 67c1
-; entries correspond to constants/item_constants.asm
+ItemAttributes:
+; entries correspond to item ids
 ; MASTER_BALL
-	item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; ULTRA_BALL
-	item_attribute 1200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 1200, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; BRIGHTPOWDER
 	item_attribute 10, HELD_BRIGHTPOWDER, 20, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; GREAT_BALL
-	item_attribute 600, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 600, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; POKE_BALL
-	item_attribute 200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; TOWN_MAP
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BICYCLE
-	item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
 ; MOON_STONE
-	item_attribute 0, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; ANTIDOTE
-	item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; BURN_HEAL
-	item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 250, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; ICE_HEAL
-	item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 250, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; AWAKENING
-	item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 250, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; PARLYZ_HEAL
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; FULL_RESTORE
-	item_attribute 3000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 3000, HELD_NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; MAX_POTION
-	item_attribute 2500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 2500, HELD_NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; HYPER_POTION
-	item_attribute 1200, 0, 200, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 1200, HELD_NONE, 200, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; SUPER_POTION
-	item_attribute 700, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 700, HELD_NONE, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; POTION
-	item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 300, HELD_NONE, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; ESCAPE_ROPE
-	item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+	item_attribute 550, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
 ; REPEL
-	item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+	item_attribute 350, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
 ; MAX_ELIXER
-	item_attribute 4500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 4500, HELD_NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; FIRE_STONE
-	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; THUNDERSTONE
-	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; WATER_STONE
-	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; ITEM_19
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; HP_UP
-	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; PROTEIN
-	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; IRON
-	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; CARBOS
-	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; LUCKY_PUNCH
-	item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 10, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; CALCIUM
-	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; RARE_CANDY
-	item_attribute 4800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 4800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; X_ACCURACY
-	item_attribute 950, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 950, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; LEAF_STONE
-	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; METAL_POWDER
 	item_attribute 10, HELD_METAL_POWDER, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; NUGGET
-	item_attribute 10000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 10000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; POKE_DOLL
-	item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; FULL_HEAL
-	item_attribute 600, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 600, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; REVIVE
-	item_attribute 1500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 1500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; MAX_REVIVE
-	item_attribute 4000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 4000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; GUARD_SPEC
-	item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 700, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; SUPER_REPEL
-	item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+	item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
 ; MAX_REPEL
-	item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+	item_attribute 700, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
 ; DIRE_HIT
-	item_attribute 650, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 650, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; ITEM_2D
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; FRESH_WATER
-	item_attribute 200, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 200, HELD_NONE, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; SODA_POP
-	item_attribute 300, 0, 60, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 300, HELD_NONE, 60, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; LEMONADE
-	item_attribute 350, 0, 80, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 350, HELD_NONE, 80, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; X_ATTACK
-	item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; ITEM_32
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; X_DEFEND
-	item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 550, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; X_SPEED
-	item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 350, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; X_SPECIAL
-	item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 350, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; COIN_CASE
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
 ; ITEMFINDER
-	item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
 ; POKE_FLUTE
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; EXP_SHARE
-	item_attribute 3000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; OLD_ROD
-	item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
 ; GOOD_ROD
-	item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
 ; SILVER_LEAF
-	item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SUPER_ROD
-	item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
 ; PP_UP
-	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; ETHER
-	item_attribute 1200, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 1200, HELD_NONE, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; MAX_ETHER
-	item_attribute 2000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 2000, HELD_NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; ELIXER
-	item_attribute 3000, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 3000, HELD_NONE, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; RED_SCALE
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SECRETPOTION
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; S_S_TICKET
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; MYSTERY_EGG
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; CLEAR_BELL
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SILVER_WING
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; MOOMOO_MILK
-	item_attribute 500, 0, 100, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 500, HELD_NONE, 100, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; QUICK_CLAW
 	item_attribute 100, HELD_QUICK_CLAW, 60, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; PSNCUREBERRY
 	item_attribute 10, HELD_HEAL_POISON, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; GOLD_LEAF
-	item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SOFT_SAND
 	item_attribute 100, HELD_GROUND_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SHARP_BEAK
@@ -176,23 +176,23 @@ ItemAttributes: ; 67c1
 ; MINT_BERRY
 	item_attribute 10, HELD_HEAL_SLEEP, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; RED_APRICORN
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; TINYMUSHROOM
-	item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BIG_MUSHROOM
-	item_attribute 5000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 5000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SILVERPOWDER
 	item_attribute 100, HELD_BUG_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BLU_APRICORN
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_5A
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; AMULET_COIN
 	item_attribute 100, HELD_AMULET_COIN, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; YLW_APRICORN
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; GRN_APRICORN
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; CLEANSE_TAG
 	item_attribute 200, HELD_CLEANSE_TAG, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; MYSTIC_WATER
@@ -200,23 +200,23 @@ ItemAttributes: ; 67c1
 ; TWISTEDSPOON
 	item_attribute 100, HELD_PSYCHIC_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; WHT_APRICORN
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BLACKBELT
 	item_attribute 100, HELD_FIGHTING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BLK_APRICORN
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_64
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; PNK_APRICORN
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BLACKGLASSES
 	item_attribute 100, HELD_DARK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SLOWPOKETAIL
-	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; PINK_BOW
 	item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; STICK
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SMOKE_BALL
 	item_attribute 200, HELD_ESCAPE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; NEVERMELTICE
@@ -226,61 +226,61 @@ ItemAttributes: ; 67c1
 ; MIRACLEBERRY
 	item_attribute 10, HELD_HEAL_STATUS, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; PEARL
-	item_attribute 1400, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 1400, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BIG_PEARL
-	item_attribute 7500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 7500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; EVERSTONE
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SPELL_TAG
 	item_attribute 100, HELD_GHOST_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; RAGECANDYBAR
-	item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 300, HELD_NONE, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; GS_BALL
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BLUE_CARD
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
 ; MIRACLE_SEED
 	item_attribute 100, HELD_GRASS_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; THICK_CLUB
-	item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; FOCUS_BAND
 	item_attribute 200, HELD_FOCUS_BAND, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_78
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ENERGYPOWDER
-	item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; ENERGY_ROOT
-	item_attribute 800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; HEAL_POWDER
-	item_attribute 450, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 450, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; REVIVAL_HERB
-	item_attribute 2800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
+	item_attribute 2800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; HARD_STONE
 	item_attribute 100, HELD_ROCK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; LUCKY_EGG
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; CARD_KEY
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
 ; MACHINE_PART
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; EGG_TICKET
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; LOST_ITEM
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; STARDUST
-	item_attribute 2000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
-; STAR PIECE
-	item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; STAR_PIECE
+	item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BASEMENT_KEY
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
 ; PASS
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_87
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_88
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_89
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; CHARCOAL
 	item_attribute 9800, HELD_FIRE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BERRY_JUICE
@@ -288,234 +288,234 @@ ItemAttributes: ; 67c1
 ; SCOPE_LENS
 	item_attribute 200, HELD_CRITICAL_UP, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_8D
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_8E
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; METAL_COAT
 	item_attribute 100, HELD_STEEL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; DRAGON_FANG
-	item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_91
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; LEFTOVERS
 	item_attribute 200, HELD_LEFTOVERS, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_93
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_94
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_95
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; MYSTERYBERRY
 	item_attribute 10, HELD_RESTORE_PP, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; DRAGON_SCALE
 	item_attribute 2100, HELD_DRAGON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BERSERK_GENE
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_99
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_9A
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_9B
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SACRED_ASH
-	item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
 ; HEAVY_BALL
-	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; FLOWER_MAIL
-	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; LEVEL_BALL
-	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; LURE_BALL
-	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; FAST_BALL
-	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; ITEM_A2
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; LIGHT_BALL
-	item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; FRIEND_BALL
-	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; MOON_BALL
-	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; LOVE_BALL
-	item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; NORMAL_BOX
-	item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+	item_attribute 10, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
 ; GORGEOUS_BOX
-	item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
+	item_attribute 10, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
 ; SUN_STONE
-	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; POLKADOT_BOW
 	item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_AB
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; UP_GRADE
-	item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BERRY
 	item_attribute 10, HELD_BERRY, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; GOLD_BERRY
 	item_attribute 10, HELD_BERRY, 30, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
 ; SQUIRTBOTTLE
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
 ; ITEM_B0
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; PARK_BALL
-	item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
 ; RAINBOW_WING
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_B3
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BRICK_PIECE
-	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SURF_MAIL
-	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; LITEBLUEMAIL
-	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; PORTRAITMAIL
-	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; LOVELY_MAIL
-	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; EON_MAIL
-	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; MORPH_MAIL
-	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BLUESKY_MAIL
-	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; MUSIC_MAIL
-	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; MIRAGE_MAIL
-	item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_BE
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; TM01
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM02
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM03
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM04
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; ITEM_C3
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; TM05
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM06
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM07
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM08
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM09
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM10
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM11
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM12
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM13
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM14
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM15
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM16
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM17
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM18
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM19
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM20
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM21
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM22
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM23
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM24
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM25
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM26
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM27
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM28
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; ITEM_DC
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; TM29
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM30
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM31
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM32
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM33
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM34
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM35
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM36
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM37
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM38
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM39
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM40
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM41
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM42
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM43
-	item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM44
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM45
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM46
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM47
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM48
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM49
-	item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; TM50
-	item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; HM01
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; HM02
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; HM03
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; HM04
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; HM05
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; HM06
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; HM07
-	item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
+	item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; ITEM_FA
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; $fb
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; $fc
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; $fd
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; $fe
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; $ff
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; $00
-	item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
diff --git a/data/items/bargain_shop.asm b/data/items/bargain_shop.asm
index e4da96210..a17db6550 100644
--- a/data/items/bargain_shop.asm
+++ b/data/items/bargain_shop.asm
@@ -1,4 +1,4 @@
-BargainShopData: ; 15c51
+BargainShopData:
 	db 5
 	dbw NUGGET,     4500
 	dbw PEARL,       650
@@ -6,4 +6,3 @@ BargainShopData: ; 15c51
 	dbw STARDUST,    900
 	dbw STAR_PIECE, 4600
 	db -1
-; 15c62
diff --git a/data/items/buena_prizes.asm b/data/items/buena_prizes.asm
index d0a0e6b88..b0737aee2 100644
--- a/data/items/buena_prizes.asm
+++ b/data/items/buena_prizes.asm
@@ -1,4 +1,4 @@
-BuenaPrizeItems: ; 8b15e
+BuenaPrizeItems:
 ; there are NUM_BUENA_PRIZES items (see engine/events/buena.asm)
 	db ULTRA_BALL,   2
 	db FULL_RESTORE, 2
@@ -9,5 +9,4 @@ BuenaPrizeItems: ; 8b15e
 	db CARBOS,       5
 	db CALCIUM,      5
 	db HP_UP,        5
-BuenaPrizeItemsEnd:
-; 8b170
+.End
diff --git a/data/items/catch_rate_items.asm b/data/items/catch_rate_items.asm
index fbab7d434..9c39afac3 100644
--- a/data/items/catch_rate_items.asm
+++ b/data/items/catch_rate_items.asm
@@ -2,7 +2,7 @@
 ; catch rate as an item. However, if the catch rate appears in this table, the
 ; item associated with the table entry is used instead.
 
-TimeCapsule_CatchRateItems: ; 28785
+TimeCapsule_CatchRateItems:
 	db ITEM_19, LEFTOVERS
 	db ITEM_2D, BITTER_BERRY
 	db ITEM_32, GOLD_BERRY
@@ -15,5 +15,4 @@ TimeCapsule_CatchRateItems: ; 28785
 	db ITEM_DC, BERRY
 	db ITEM_FA, BERRY
 	db -1,      BERRY
-	db  0 ; end
-; 2879e
+	db 0 ; end
diff --git a/data/items/descriptions.asm b/data/items/descriptions.asm
index 20542b9e0..e0f009047 100644
--- a/data/items/descriptions.asm
+++ b/data/items/descriptions.asm
@@ -1,4 +1,5 @@
 ItemDescriptions:
+; entries correspond to item ids
 	dw MasterBallDesc
 	dw UltraBallDesc
 	dw BrightpowderDesc
diff --git a/data/items/fruit_trees.asm b/data/items/fruit_trees.asm
index 67b8f51ad..9c4e4793d 100644
--- a/data/items/fruit_trees.asm
+++ b/data/items/fruit_trees.asm
@@ -1,4 +1,4 @@
-FruitTreeItems: ; 44097
+FruitTreeItems:
 ; entries correspond to FRUITTREE_* constants
 	db BERRY        ; ROUTE_29
 	db BERRY        ; ROUTE_30_1
@@ -30,4 +30,3 @@ FruitTreeItems: ; 44097
 	db ICE_BERRY    ; PEWTER_CITY_1
 	db MINT_BERRY   ; PEWTER_CITY_2
 	db BURNT_BERRY  ; FUCHSIA_CITY
-; 440b5
diff --git a/data/items/heal_hp.asm b/data/items/heal_hp.asm
index a84670450..cc3da2367 100644
--- a/data/items/heal_hp.asm
+++ b/data/items/heal_hp.asm
@@ -1,4 +1,4 @@
-HealingHPAmounts: ; f3af
+HealingHPAmounts:
 	dbw FRESH_WATER,   50
 	dbw SODA_POP,      60
 	dbw LEMONADE,      80
@@ -15,4 +15,3 @@ HealingHPAmounts: ; f3af
 	dbw RAGECANDYBAR,  20
 	dbw BERRY_JUICE,   20
 	dbw -1, 0 ; end
-; f3df
diff --git a/data/items/heal_status.asm b/data/items/heal_status.asm
index f0b0148bb..b39f2f80d 100644
--- a/data/items/heal_status.asm
+++ b/data/items/heal_status.asm
@@ -1,4 +1,6 @@
-StatusHealingActions: ; f071
+; See also data/battle/held_heal_status.asm
+
+StatusHealingActions:
 	;  item,         party menu action text, status
 	db ANTIDOTE,     PARTYMENUTEXT_HEAL_PSN, 1 << PSN
 	db BURN_HEAL,    PARTYMENUTEXT_HEAL_BRN, 1 << BRN
@@ -15,4 +17,3 @@ StatusHealingActions: ; f071
 	db MINT_BERRY,   PARTYMENUTEXT_HEAL_SLP, SLP
 	db MIRACLEBERRY, PARTYMENUTEXT_HEAL_ALL, %11111111
 	db -1, 0, 0 ; end
-; f09e
diff --git a/data/items/mail_items.asm b/data/items/mail_items.asm
index 64b4216ca..388613d98 100644
--- a/data/items/mail_items.asm
+++ b/data/items/mail_items.asm
@@ -1,4 +1,4 @@
-MailItems: ; b9e80
+MailItems:
 	db FLOWER_MAIL
 	db SURF_MAIL
 	db LITEBLUEMAIL
@@ -10,4 +10,3 @@ MailItems: ; b9e80
 	db MUSIC_MAIL
 	db MIRAGE_MAIL
 	db -1
-; b9e8b
diff --git a/data/items/marts.asm b/data/items/marts.asm
index fd156225d..1d48ea532 100644
--- a/data/items/marts.asm
+++ b/data/items/marts.asm
@@ -1,4 +1,4 @@
-Marts: ; 160a9
+Marts:
 ; entries correspond to MART_* constants
 	dw MartCherrygrove
 	dw MartCherrygroveDex
@@ -34,20 +34,17 @@ Marts: ; 160a9
 	dw MartMtMoon
 	dw MartIndigoPlateau
 	dw MartUnderground
-MartsEnd
-; 160ed
+.End
 
-
-MartCherrygrove: ; 160ed
+MartCherrygrove:
 	db 4 ; # items
 	db POTION
 	db ANTIDOTE
 	db PARLYZ_HEAL
 	db AWAKENING
 	db -1 ; end
-; 160f3
 
-MartCherrygroveDex: ; 160f3
+MartCherrygroveDex:
 	db 5 ; # items
 	db POKE_BALL
 	db POTION
@@ -55,9 +52,8 @@ MartCherrygroveDex: ; 160f3
 	db PARLYZ_HEAL
 	db AWAKENING
 	db -1 ; end
-; 160fa
 
-MartViolet: ; 160fa
+MartViolet:
 	db 10 ; # items
 	db POKE_BALL
 	db POTION
@@ -70,9 +66,8 @@ MartViolet: ; 160fa
 	db X_SPEED
 	db FLOWER_MAIL
 	db -1 ; end
-; 16106
 
-MartAzalea: ; 16106
+MartAzalea:
 	db 9 ; # items
 	db CHARCOAL
 	db POKE_BALL
@@ -84,9 +79,8 @@ MartAzalea: ; 16106
 	db PARLYZ_HEAL
 	db FLOWER_MAIL
 	db -1 ; end
-; 16111
 
-MartCianwood: ; 16111
+MartCianwood:
 	db 5 ; # items
 	db POTION
 	db SUPER_POTION
@@ -94,9 +88,8 @@ MartCianwood: ; 16111
 	db FULL_HEAL
 	db REVIVE
 	db -1 ; end
-; 16118
 
-MartGoldenrod2F1: ; 16118
+MartGoldenrod2F1:
 	db 7 ; # items
 	db POTION
 	db SUPER_POTION
@@ -106,9 +99,8 @@ MartGoldenrod2F1: ; 16118
 	db BURN_HEAL
 	db ICE_HEAL
 	db -1 ; end
-; 16121
 
-MartGoldenrod2F2: ; 16121
+MartGoldenrod2F2:
 	db 8 ; # items
 	db POKE_BALL
 	db GREAT_BALL
@@ -119,9 +111,8 @@ MartGoldenrod2F2: ; 16121
 	db POKE_DOLL
 	db FLOWER_MAIL
 	db -1 ; end
-; 1612b
 
-MartGoldenrod3F: ; 1612b
+MartGoldenrod3F:
 	db 7 ; # items
 	db X_SPEED
 	db X_SPECIAL
@@ -131,9 +122,8 @@ MartGoldenrod3F: ; 1612b
 	db GUARD_SPEC
 	db X_ACCURACY
 	db -1 ; end
-; 16134
 
-MartGoldenrod4F: ; 16134
+MartGoldenrod4F:
 	db 5 ; # items
 	db PROTEIN
 	db IRON
@@ -141,35 +131,31 @@ MartGoldenrod4F: ; 16134
 	db CALCIUM
 	db HP_UP
 	db -1 ; end
-; 1613b
 
-MartGoldenrod5F1: ; 1613b
+MartGoldenrod5F1:
 	db 3 ; # items
 	db TM_THUNDERPUNCH
 	db TM_FIRE_PUNCH
 	db TM_ICE_PUNCH
 	db -1 ; end
-; 16140
 
-MartGoldenrod5F2: ; 16140
+MartGoldenrod5F2:
 	db 4 ; # items
 	db TM_THUNDERPUNCH
 	db TM_FIRE_PUNCH
 	db TM_ICE_PUNCH
 	db TM_HEADBUTT
 	db -1 ; end
-; 16146
 
-MartGoldenrod5F3: ; 16146
+MartGoldenrod5F3:
 	db 4 ; # items
 	db TM_THUNDERPUNCH
 	db TM_FIRE_PUNCH
 	db TM_ICE_PUNCH
 	db TM_ROCK_SMASH
 	db -1 ; end
-; 1614c
 
-MartGoldenrod5F4: ; 1614c
+MartGoldenrod5F4:
 	db 5 ; # items
 	db TM_THUNDERPUNCH
 	db TM_FIRE_PUNCH
@@ -177,9 +163,8 @@ MartGoldenrod5F4: ; 1614c
 	db TM_HEADBUTT
 	db TM_ROCK_SMASH
 	db -1 ; end
-; 16153
 
-MartOlivine: ; 16153
+MartOlivine:
 	db 9 ; # items
 	db GREAT_BALL
 	db SUPER_POTION
@@ -191,9 +176,8 @@ MartOlivine: ; 16153
 	db SUPER_REPEL
 	db SURF_MAIL
 	db -1 ; end
-; 1615e
 
-MartEcruteak: ; 1615e
+MartEcruteak:
 	db 10 ; # items
 	db POKE_BALL
 	db GREAT_BALL
@@ -206,18 +190,16 @@ MartEcruteak: ; 1615e
 	db ICE_HEAL
 	db REVIVE
 	db -1 ; end
-; 1616a
 
-MartMahogany1: ; 1616a
+MartMahogany1:
 	db 4 ; # items
 	db TINYMUSHROOM
 	db SLOWPOKETAIL
 	db POKE_BALL
 	db POTION
 	db -1 ; end
-; 16170
 
-MartMahogany2: ; 16170
+MartMahogany2:
 	db 9 ; # items
 	db RAGECANDYBAR
 	db GREAT_BALL
@@ -229,9 +211,8 @@ MartMahogany2: ; 16170
 	db REVIVE
 	db FLOWER_MAIL
 	db -1 ; end
-; 1617b
 
-MartBlackthorn: ; 1617b
+MartBlackthorn:
 	db 9 ; # items
 	db GREAT_BALL
 	db ULTRA_BALL
@@ -243,9 +224,8 @@ MartBlackthorn: ; 1617b
 	db X_DEFEND
 	db X_ATTACK
 	db -1 ; end
-; 16186
 
-MartViridian: ; 16186
+MartViridian:
 	db 9 ; # items
 	db ULTRA_BALL
 	db HYPER_POTION
@@ -257,9 +237,8 @@ MartViridian: ; 16186
 	db BURN_HEAL
 	db FLOWER_MAIL
 	db -1 ; end
-; 16191
 
-MartPewter: ; 16191
+MartPewter:
 	db 7 ; # items
 	db GREAT_BALL
 	db SUPER_POTION
@@ -269,9 +248,8 @@ MartPewter: ; 16191
 	db AWAKENING
 	db BURN_HEAL
 	db -1 ; end
-; 1619a
 
-MartCerulean: ; 1619a
+MartCerulean:
 	db 9 ; # items
 	db GREAT_BALL
 	db ULTRA_BALL
@@ -283,9 +261,8 @@ MartCerulean: ; 1619a
 	db DIRE_HIT
 	db SURF_MAIL
 	db -1 ; end
-; 161a5
 
-MartLavender: ; 161a5
+MartLavender:
 	db 8 ; # items
 	db GREAT_BALL
 	db POTION
@@ -296,9 +273,8 @@ MartLavender: ; 161a5
 	db AWAKENING
 	db BURN_HEAL
 	db -1 ; end
-; 161af
 
-MartVermilion: ; 161af
+MartVermilion:
 	db 8 ; # items
 	db ULTRA_BALL
 	db SUPER_POTION
@@ -309,9 +285,8 @@ MartVermilion: ; 161af
 	db BURN_HEAL
 	db LITEBLUEMAIL
 	db -1 ; end
-; 161b9
 
-MartCeladon2F1: ; 161b9
+MartCeladon2F1:
 	db 7 ; # items
 	db POTION
 	db SUPER_POTION
@@ -321,9 +296,8 @@ MartCeladon2F1: ; 161b9
 	db SUPER_REPEL
 	db MAX_REPEL
 	db -1 ; end
-; 161c2
 
-MartCeladon2F2: ; 161c2
+MartCeladon2F2:
 	db 10 ; # items
 	db POKE_BALL
 	db GREAT_BALL
@@ -336,9 +310,8 @@ MartCeladon2F2: ; 161c2
 	db AWAKENING
 	db PARLYZ_HEAL
 	db -1 ; end
-; 161ce
 
-MartCeladon3F: ; 161ce
+MartCeladon3F:
 	db 5 ; # items
 	db TM_HIDDEN_POWER
 	db TM_SUNNY_DAY
@@ -346,17 +319,15 @@ MartCeladon3F: ; 161ce
 	db TM_RAIN_DANCE
 	db TM_SANDSTORM
 	db -1 ; end
-; 161d5
 
-MartCeladon4F: ; 161d5
+MartCeladon4F:
 	db 3 ; # items
 	db POKE_DOLL
 	db LOVELY_MAIL
 	db SURF_MAIL
 	db -1 ; end
-; 161da
 
-MartCeladon5F1: ; 161da
+MartCeladon5F1:
 	db 5 ; # items
 	db HP_UP
 	db PROTEIN
@@ -364,9 +335,8 @@ MartCeladon5F1: ; 161da
 	db CARBOS
 	db CALCIUM
 	db -1 ; end
-; 161e1
 
-MartCeladon5F2: ; 161e1
+MartCeladon5F2:
 	db 7 ; # items
 	db X_ACCURACY
 	db GUARD_SPEC
@@ -376,9 +346,8 @@ MartCeladon5F2: ; 161e1
 	db X_SPEED
 	db X_SPECIAL
 	db -1 ; end
-; 161ea
 
-MartFuchsia: ; 161ea
+MartFuchsia:
 	db 7 ; # items
 	db GREAT_BALL
 	db ULTRA_BALL
@@ -388,9 +357,8 @@ MartFuchsia: ; 161ea
 	db MAX_REPEL
 	db FLOWER_MAIL
 	db -1 ; end
-; 161f3
 
-MartSaffron: ; 161f3
+MartSaffron:
 	db 8 ; # items
 	db GREAT_BALL
 	db ULTRA_BALL
@@ -401,9 +369,8 @@ MartSaffron: ; 161f3
 	db X_DEFEND
 	db FLOWER_MAIL
 	db -1 ; end
-; 161fd
 
-MartMtMoon: ; 161fd
+MartMtMoon:
 	db 6 ; # items
 	db POKE_DOLL
 	db FRESH_WATER
@@ -412,9 +379,8 @@ MartMtMoon: ; 161fd
 	db REPEL
 	db PORTRAITMAIL
 	db -1 ; end
-; 16205
 
-MartIndigoPlateau: ; 16205
+MartIndigoPlateau:
 	db 7 ; # items
 	db ULTRA_BALL
 	db MAX_REPEL
@@ -424,20 +390,17 @@ MartIndigoPlateau: ; 16205
 	db REVIVE
 	db FULL_HEAL
 	db -1 ; end
-; 1620e
 
-MartUnderground: ; 1620e
+MartUnderground:
 	db 4 ; # items
 	db ENERGYPOWDER
 	db ENERGY_ROOT
 	db HEAL_POWDER
 	db REVIVAL_HERB
 	db -1 ; end
-; 16214
 
-DefaultMart: ; 16214
+DefaultMart:
 	db 2 ; # items
 	db POKE_BALL
 	db POTION
 	db -1 ; end
-; 16218
diff --git a/data/items/mom_phone.asm b/data/items/mom_phone.asm
index 288a14acc..407a9a016 100644
--- a/data/items/mom_phone.asm
+++ b/data/items/mom_phone.asm
@@ -5,15 +5,15 @@ momitem: MACRO
 	db \3, \4
 ENDM
 
-MomItems_1: ; fd136
+MomItems_1:
 	momitem      0,   600, MOM_ITEM, SUPER_POTION
 	momitem      0,    90, MOM_ITEM, ANTIDOTE
 	momitem      0,   180, MOM_ITEM, POKE_BALL
 	momitem      0,   450, MOM_ITEM, ESCAPE_ROPE
 	momitem      0,   500, MOM_ITEM, GREAT_BALL
-MomItems_1End: ; fd15e
+.End
 
-MomItems_2: ; fd15e
+MomItems_2:
 	momitem    900,   600, MOM_ITEM, SUPER_POTION
 	momitem   4000,   270, MOM_ITEM, REPEL
 	momitem   7000,   600, MOM_ITEM, SUPER_POTION
@@ -24,4 +24,4 @@ MomItems_2: ; fd15e
 	momitem  40000,   900, MOM_ITEM, HYPER_POTION
 	momitem  50000,  8000, MOM_DOLL, DECO_PIKACHU_DOLL
 	momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL
-MomItems_2End: ; fd1ae
+.End
diff --git a/data/items/mystery_gift_items.asm b/data/items/mystery_gift_items.asm
index b2379071e..242035eac 100644
--- a/data/items/mystery_gift_items.asm
+++ b/data/items/mystery_gift_items.asm
@@ -1,4 +1,4 @@
-MysteryGiftItems: ; 2c725
+MysteryGiftItems:
 	db BERRY
 	db PRZCUREBERRY
 	db MINT_BERRY
@@ -36,5 +36,4 @@ MysteryGiftItems: ; 2c725
 	db RARE_CANDY
 	db BLUESKY_MAIL
 	db MIRAGE_MAIL
-MysteryGiftItemsEnd:
-; 2c74a
+.End
diff --git a/data/items/pocket_names.asm b/data/items/pocket_names.asm
new file mode 100644
index 000000000..880e08fe3
--- /dev/null
+++ b/data/items/pocket_names.asm
@@ -0,0 +1,11 @@
+ItemPocketNames:
+; entries correspond to item type constants
+	dw .Item
+	dw .Key
+	dw .Ball
+	dw .TM
+
+.Item: db "ITEM POCKET@"
+.Key:  db "KEY POCKET@"
+.Ball: db "BALL POCKET@"
+.TM:   db "TM POCKET@"
diff --git a/data/items/rooftop_sale.asm b/data/items/rooftop_sale.asm
index b16724cdc..9606ef21e 100644
--- a/data/items/rooftop_sale.asm
+++ b/data/items/rooftop_sale.asm
@@ -1,4 +1,4 @@
-RooftopSaleData1: ; 15aee
+RooftopSaleMart1:
 	db 5
 	dbw POKE_BALL,     150
 	dbw GREAT_BALL,    500
@@ -7,7 +7,7 @@ RooftopSaleData1: ; 15aee
 	dbw REVIVE,       1200
 	db -1
 
-RooftopSaleData2: ; 15aff
+RooftopSaleMart2:
 	db 5
 	dbw HYPER_POTION, 1000
 	dbw FULL_RESTORE, 2000
@@ -15,4 +15,3 @@ RooftopSaleData2: ; 15aff
 	dbw ULTRA_BALL,   1000
 	dbw PROTEIN,      7800
 	db -1
-; 15b10
diff --git a/data/items/x_stats.asm b/data/items/x_stats.asm
index ac2d0ad27..255542098 100644
--- a/data/items/x_stats.asm
+++ b/data/items/x_stats.asm
@@ -1,7 +1,6 @@
-XItemStats: ; f504
+XItemStats:
 	;  item,      stat
 	db X_ATTACK,  ATTACK
 	db X_DEFEND,  DEFENSE
 	db X_SPEED,   SPEED
 	db X_SPECIAL, SP_ATTACK
-; f50c
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
new file mode 100644
index 000000000..fa42c461e
--- /dev/null
+++ b/data/maps/attributes.asm
@@ -0,0 +1,663 @@
+map_attributes: MACRO
+;\1: map name
+;\2: map id
+;\3: border block
+;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none
+CURRENT_MAP_WIDTH = \2_WIDTH
+CURRENT_MAP_HEIGHT = \2_HEIGHT
+\1_MapAttributes::
+	db \3
+	db CURRENT_MAP_HEIGHT, CURRENT_MAP_WIDTH
+	db BANK(\1_Blocks)
+	dw \1_Blocks
+	db BANK(\1_MapScripts) ; BANK(\1_MapEvents)
+	dw \1_MapScripts
+	dw \1_MapEvents
+	db \4
+ENDM
+
+; Connections go in order: north, south, west, east
+connection: MACRO
+;\1: direction
+;\2: map name
+;\3: map id
+;\4: x offset for east/west, y offset for north/south
+;\5: distance offset?
+;\6: strip length
+if "\1" == "north"
+	map_id \3
+	dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5
+	dw wOverworldMapBlocks + \4 + 3
+	db \6
+	db \3_WIDTH
+	db \3_HEIGHT * 2 - 1
+	db (\4 - \5) * -2
+	dw wOverworldMapBlocks + \3_HEIGHT * (\3_WIDTH + 6) + 1
+elif "\1" == "south"
+	map_id \3
+	dw \2_Blocks + \5
+	dw wOverworldMapBlocks + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3
+	db \6
+	db \3_WIDTH
+	db 0
+	db (\4 - \5) * -2
+	dw wOverworldMapBlocks + \3_WIDTH + 7
+elif "\1" == "west"
+	map_id \3
+	dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3
+	dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3)
+	db \6
+	db \3_WIDTH
+	db (\4 - \5) * -2
+	db \3_WIDTH * 2 - 1
+	dw wOverworldMapBlocks + \3_WIDTH * 2 + 6
+elif "\1" == "east"
+	map_id \3
+	dw \2_Blocks + (\3_WIDTH * \5)
+	dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3
+	db \6
+	db \3_WIDTH
+	db (\4 - \5) * -2
+	db 0
+	dw wOverworldMapBlocks + \3_WIDTH + 7
+endc
+ENDM
+
+	map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST
+	connection west, Route29, ROUTE_29, 0, 0, 9
+	connection east, Route27, ROUTE_27, 0, 0, 9
+
+	map_attributes CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST
+	connection north, Route30, ROUTE_30, 5, 0, 10
+	connection east, Route29, ROUTE_29, 0, 0, 9
+
+	map_attributes VioletCity, VIOLET_CITY, $05, SOUTH | WEST | EAST
+	connection south, Route32, ROUTE_32, 0, 0, 10
+	connection west, Route36, ROUTE_36, 0, 0, 9
+	connection east, Route31, ROUTE_31, 9, 0, 9
+
+	map_attributes AzaleaTown, AZALEA_TOWN, $05, WEST | EAST
+	connection west, Route34, ROUTE_34, -3, 15, 12
+	connection east, Route33, ROUTE_33, 0, 0, 9
+
+	map_attributes CianwoodCity, CIANWOOD_CITY, $35, EAST
+	connection east, Route41, ROUTE_41, 0, 0, 27
+
+	map_attributes GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH
+	connection north, Route35, ROUTE_35, 5, 0, 10
+	connection south, Route34, ROUTE_34, 5, 0, 10
+
+	map_attributes OlivineCity, OLIVINE_CITY, $35, NORTH | WEST
+	connection north, Route39, ROUTE_39, 5, 0, 10
+	connection west, Route40, ROUTE_40, 9, 0, 12
+
+	map_attributes EcruteakCity, ECRUTEAK_CITY, $05, SOUTH | WEST | EAST
+	connection south, Route37, ROUTE_37, 5, 0, 10
+	connection west, Route38, ROUTE_38, 5, 0, 9
+	connection east, Route42, ROUTE_42, 9, 0, 9
+
+	map_attributes MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST
+	connection north, Route43, ROUTE_43, 0, 0, 10
+	connection west, Route42, ROUTE_42, 0, 0, 9
+	connection east, Route44, ROUTE_44, 0, 0, 9
+
+	map_attributes LakeOfRage, LAKE_OF_RAGE, $05, SOUTH
+	connection south, Route43, ROUTE_43, 5, 0, 10
+
+	map_attributes BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST
+	connection south, Route45, ROUTE_45, 0, 0, 10
+	connection west, Route44, ROUTE_44, 9, 0, 9
+
+	map_attributes SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST
+	connection east, Route28, ROUTE_28, 9, 0, 9
+
+	map_attributes Route26, ROUTE_26, $05, WEST
+	connection west, Route27, ROUTE_27, 45, 0, 9
+
+	map_attributes Route27, ROUTE_27, $35, WEST | EAST
+	connection west, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9
+	connection east, Route26, ROUTE_26, -3, 42, 12
+
+	map_attributes Route28, ROUTE_28, $2c, WEST
+	connection west, SilverCaveOutside, SILVER_CAVE_OUTSIDE, -3, 6, 12
+
+	map_attributes Route29, ROUTE_29, $05, NORTH | WEST | EAST
+	connection north, Route46, ROUTE_46, 10, 0, 10
+	connection west, CherrygroveCity, CHERRYGROVE_CITY, 0, 0, 9
+	connection east, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9
+
+	map_attributes Route30, ROUTE_30, $05, NORTH | SOUTH
+	connection north, Route31, ROUTE_31, -3, 7, 13
+	connection south, CherrygroveCity, CHERRYGROVE_CITY, -3, 2, 16
+
+	map_attributes Route31, ROUTE_31, $05, SOUTH | WEST
+	connection south, Route30, ROUTE_30, 10, 0, 10
+	connection west, VioletCity, VIOLET_CITY, -3, 6, 12
+
+	map_attributes Route32, ROUTE_32, $05, NORTH | SOUTH
+	connection north, VioletCity, VIOLET_CITY, 0, 0, 13
+	connection south, Route33, ROUTE_33, 0, 0, 10
+
+	map_attributes Route33, ROUTE_33, $05, NORTH | WEST
+	connection north, Route32, ROUTE_32, 0, 0, 10
+	connection west, AzaleaTown, AZALEA_TOWN, 0, 0, 9
+
+	map_attributes Route34, ROUTE_34, $05, NORTH | EAST
+	connection north, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16
+	connection east, AzaleaTown, AZALEA_TOWN, 18, 0, 9
+
+	map_attributes Route35, ROUTE_35, $05, NORTH | SOUTH
+	connection north, Route36, ROUTE_36, 0, 0, 13
+	connection south, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16
+
+	map_attributes Route36, ROUTE_36, $05, NORTH | SOUTH | EAST
+	connection north, Route37, ROUTE_37, 10, 0, 10
+	connection south, Route35, ROUTE_35, 0, 0, 10
+	connection east, VioletCity, VIOLET_CITY, 0, 0, 12
+
+	map_attributes Route37, ROUTE_37, $05, NORTH | SOUTH
+	connection north, EcruteakCity, ECRUTEAK_CITY, -3, 2, 16
+	connection south, Route36, ROUTE_36, -3, 7, 16
+
+	map_attributes Route38, ROUTE_38, $05, WEST | EAST
+	connection west, Route39, ROUTE_39, 0, 0, 12
+	connection east, EcruteakCity, ECRUTEAK_CITY, -3, 2, 15
+
+	map_attributes Route39, ROUTE_39, $05, SOUTH | EAST
+	connection south, OlivineCity, OLIVINE_CITY, -3, 2, 16
+	connection east, Route38, ROUTE_38, 0, 0, 9
+
+	map_attributes Route40, ROUTE_40, $35, SOUTH | EAST
+	connection south, Route41, ROUTE_41, -3, 12, 13
+	connection east, OlivineCity, OLIVINE_CITY, -3, 6, 12
+
+	map_attributes Route41, ROUTE_41, $35, NORTH | WEST
+	connection north, Route40, ROUTE_40, 15, 0, 10
+	connection west, CianwoodCity, CIANWOOD_CITY, 0, 0, 27
+
+	map_attributes Route42, ROUTE_42, $05, WEST | EAST
+	connection west, EcruteakCity, ECRUTEAK_CITY, -3, 6, 12
+	connection east, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9
+
+	map_attributes Route43, ROUTE_43, $05, NORTH | SOUTH
+	connection north, LakeOfRage, LAKE_OF_RAGE, -3, 2, 16
+	connection south, MahoganyTown, MAHOGANY_TOWN, 0, 0, 10
+
+	map_attributes Route44, ROUTE_44, $71, WEST | EAST
+	connection west, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9
+	connection east, BlackthornCity, BLACKTHORN_CITY, -3, 6, 12
+
+	map_attributes Route45, ROUTE_45, $71, NORTH | WEST
+	connection north, BlackthornCity, BLACKTHORN_CITY, 0, 0, 13
+	connection west, Route46, ROUTE_46, 36, 0, 12
+
+	map_attributes Route46, ROUTE_46, $05, SOUTH | EAST
+	connection south, Route29, ROUTE_29, -3, 7, 16
+	connection east, Route45, ROUTE_45, -3, 33, 12
+
+	map_attributes PewterCity, PEWTER_CITY, $0f, SOUTH | EAST
+	connection south, Route2, ROUTE_2, 5, 0, 10
+	connection east, Route3, ROUTE_3, 5, 0, 9
+
+	map_attributes Route2, ROUTE_2, $0f, NORTH | SOUTH
+	connection north, PewterCity, PEWTER_CITY, -3, 2, 16
+	connection south, ViridianCity, VIRIDIAN_CITY, -3, 2, 16
+
+	map_attributes ViridianCity, VIRIDIAN_CITY, $0f, NORTH | SOUTH | WEST
+	connection north, Route2, ROUTE_2, 5, 0, 10
+	connection south, Route1, ROUTE_1, 10, 0, 10
+	connection west, Route22, ROUTE_22, 4, 0, 9
+
+	map_attributes Route22, ROUTE_22, $2c, EAST
+	connection east, ViridianCity, VIRIDIAN_CITY, -3, 1, 15
+
+	map_attributes Route1, ROUTE_1, $0f, NORTH | SOUTH
+	connection north, ViridianCity, VIRIDIAN_CITY, -3, 7, 13
+	connection south, PalletTown, PALLET_TOWN, 0, 0, 10
+
+	map_attributes PalletTown, PALLET_TOWN, $0f, NORTH | SOUTH
+	connection north, Route1, ROUTE_1, 0, 0, 10
+	connection south, Route21, ROUTE_21, 0, 0, 10
+
+	map_attributes Route21, ROUTE_21, $43, NORTH | SOUTH
+	connection north, PalletTown, PALLET_TOWN, 0, 0, 10
+	connection south, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 10
+
+	map_attributes CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST
+	connection north, Route21, ROUTE_21, 0, 0, 10
+	connection east, Route20, ROUTE_20, 0, 0, 9
+
+	map_attributes Route20, ROUTE_20, $43, WEST | EAST
+	connection west, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 9
+	connection east, Route19, ROUTE_19, -3, 6, 12
+
+	map_attributes Route19, ROUTE_19, $43, NORTH | WEST
+	connection north, FuchsiaCity, FUCHSIA_CITY, 0, 0, 13
+	connection west, Route20, ROUTE_20, 9, 0, 9
+
+	map_attributes FuchsiaCity, FUCHSIA_CITY, $0f, SOUTH | WEST | EAST
+	connection south, Route19, ROUTE_19, 0, 0, 10
+	connection west, Route18, ROUTE_18, 7, 0, 9
+	connection east, Route15, ROUTE_15, 9, 0, 9
+
+	map_attributes Route18, ROUTE_18, $43, WEST | EAST
+	connection west, Route17, ROUTE_17, -3, 35, 10
+	connection east, FuchsiaCity, FUCHSIA_CITY, -3, 4, 14
+
+	map_attributes Route17, ROUTE_17, $43, NORTH | EAST
+	connection north, Route16, ROUTE_16, 0, 0, 10
+	connection east, Route18, ROUTE_18, 38, 0, 9
+
+	map_attributes Route16, ROUTE_16, $0f, SOUTH | EAST
+	connection south, Route17, ROUTE_17, 0, 0, 10
+	connection east, CeladonCity, CELADON_CITY, -3, 6, 12
+
+	map_attributes CeladonCity, CELADON_CITY, $0f, WEST | EAST
+	connection west, Route16, ROUTE_16, 9, 0, 9
+	connection east, Route7, ROUTE_7, 5, 0, 9
+
+	map_attributes Route7, ROUTE_7, $0f, WEST | EAST
+	connection west, CeladonCity, CELADON_CITY, -3, 2, 15
+	connection east, SaffronCity, SAFFRON_CITY, -3, 6, 12
+
+	map_attributes Route15, ROUTE_15, $0f, WEST | EAST
+	connection west, FuchsiaCity, FUCHSIA_CITY, -3, 6, 12
+	connection east, Route14, ROUTE_14, -3, 6, 12
+
+	map_attributes Route14, ROUTE_14, $43, NORTH | WEST
+	connection north, Route13, ROUTE_13, 0, 0, 13
+	connection west, Route15, ROUTE_15, 9, 0, 9
+
+	map_attributes Route13, ROUTE_13, $43, NORTH | SOUTH
+	connection north, Route12, ROUTE_12, 20, 0, 10
+	connection south, Route14, ROUTE_14, 0, 0, 10
+
+	map_attributes Route12, ROUTE_12, $43, NORTH | SOUTH | WEST
+	connection north, LavenderTown, LAVENDER_TOWN, 0, 0, 10
+	connection south, Route13, ROUTE_13, -3, 17, 13
+	connection west, Route11, ROUTE_11, 9, 0, 9
+
+	map_attributes Route11, ROUTE_11, $0f, WEST | EAST
+	connection west, VermilionCity, VERMILION_CITY, 0, 0, 12
+	connection east, Route12, ROUTE_12, -3, 6, 15
+
+	map_attributes LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST
+	connection north, Route10South, ROUTE_10_SOUTH, 0, 0, 10
+	connection south, Route12, ROUTE_12, 0, 0, 10
+	connection west, Route8, ROUTE_8, 0, 0, 9
+
+	map_attributes VermilionCity, VERMILION_CITY, $43, NORTH | EAST
+	connection north, Route6, ROUTE_6, 5, 0, 10
+	connection east, Route11, ROUTE_11, 0, 0, 9
+
+	map_attributes Route6, ROUTE_6, $0f, NORTH | SOUTH
+	connection north, SaffronCity, SAFFRON_CITY, -3, 2, 16
+	connection south, VermilionCity, VERMILION_CITY, -3, 2, 16
+
+	map_attributes SaffronCity, SAFFRON_CITY, $0f, NORTH | SOUTH | WEST | EAST
+	connection north, Route5, ROUTE_5, 5, 0, 10
+	connection south, Route6, ROUTE_6, 5, 0, 10
+	connection west, Route7, ROUTE_7, 9, 0, 9
+	connection east, Route8, ROUTE_8, 9, 0, 9
+
+	map_attributes Route5, ROUTE_5, $0f, NORTH | SOUTH
+	connection north, CeruleanCity, CERULEAN_CITY, -3, 2, 16
+	connection south, SaffronCity, SAFFRON_CITY, -3, 2, 16
+
+	map_attributes CeruleanCity, CERULEAN_CITY, $0f, NORTH | SOUTH | WEST | EAST
+	connection north, Route24, ROUTE_24, 6, 0, 10
+	connection south, Route5, ROUTE_5, 5, 0, 10
+	connection west, Route4, ROUTE_4, 5, 0, 9
+	connection east, Route9, ROUTE_9, 9, 0, 9
+
+	map_attributes Route9, ROUTE_9, $2c, SOUTH | WEST
+	connection south, Route10North, ROUTE_10_NORTH, 20, 0, 10
+	connection west, CeruleanCity, CERULEAN_CITY, -3, 6, 12
+
+	map_attributes Route24, ROUTE_24, $2c, NORTH | SOUTH
+	connection north, Route25, ROUTE_25, 0, 0, 13
+	connection south, CeruleanCity, CERULEAN_CITY, -3, 3, 16
+
+	map_attributes Route25, ROUTE_25, $2c, SOUTH
+	connection south, Route24, ROUTE_24, 0, 0, 10
+
+	map_attributes Route3, ROUTE_3, $2c, WEST | EAST
+	connection west, PewterCity, PEWTER_CITY, -3, 2, 15
+	connection east, Route4, ROUTE_4, 0, 0, 9
+
+	map_attributes Route4, ROUTE_4, $2c, WEST | EAST
+	connection west, Route3, ROUTE_3, 0, 0, 9
+	connection east, CeruleanCity, CERULEAN_CITY, -3, 2, 15
+
+	map_attributes Route8, ROUTE_8, $2c, WEST | EAST
+	connection west, SaffronCity, SAFFRON_CITY, -3, 6, 12
+	connection east, LavenderTown, LAVENDER_TOWN, 0, 0, 9
+
+	map_attributes Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH
+	connection north, Route9, ROUTE_9, -3, 17, 13
+	connection south, Route10South, ROUTE_10_SOUTH, 0, 0, 10
+
+	map_attributes Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH
+	connection north, Route10North, ROUTE_10_NORTH, 0, 0, 10
+	connection south, LavenderTown, LAVENDER_TOWN, 0, 0, 10
+
+	map_attributes Route23, ROUTE_23, $0f, 0
+	map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0
+	map_attributes SproutTower2F, SPROUT_TOWER_2F, $00, 0
+	map_attributes SproutTower3F, SPROUT_TOWER_3F, $00, 0
+	map_attributes TinTower1F, TIN_TOWER_1F, $00, 0
+	map_attributes TinTower2F, TIN_TOWER_2F, $00, 0
+	map_attributes TinTower3F, TIN_TOWER_3F, $00, 0
+	map_attributes TinTower4F, TIN_TOWER_4F, $00, 0
+	map_attributes TinTower5F, TIN_TOWER_5F, $00, 0
+	map_attributes TinTower6F, TIN_TOWER_6F, $00, 0
+	map_attributes TinTower7F, TIN_TOWER_7F, $00, 0
+	map_attributes TinTower8F, TIN_TOWER_8F, $00, 0
+	map_attributes TinTower9F, TIN_TOWER_9F, $00, 0
+	map_attributes BurnedTower1F, BURNED_TOWER_1F, $00, 0
+	map_attributes BurnedTowerB1F, BURNED_TOWER_B1F, $09, 0
+	map_attributes NationalPark, NATIONAL_PARK, $00, 0
+	map_attributes NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $00, 0
+	map_attributes RadioTower1F, RADIO_TOWER_1F, $00, 0
+	map_attributes RadioTower2F, RADIO_TOWER_2F, $00, 0
+	map_attributes RadioTower3F, RADIO_TOWER_3F, $00, 0
+	map_attributes RadioTower4F, RADIO_TOWER_4F, $00, 0
+	map_attributes RadioTower5F, RADIO_TOWER_5F, $00, 0
+	map_attributes RuinsOfAlphOutside, RUINS_OF_ALPH_OUTSIDE, $05, 0
+	map_attributes RuinsOfAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $00, 0
+	map_attributes RuinsOfAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $00, 0
+	map_attributes RuinsOfAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $00, 0
+	map_attributes RuinsOfAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $00, 0
+	map_attributes RuinsOfAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $00, 0
+	map_attributes RuinsOfAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $00, 0
+	map_attributes RuinsOfAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $00, 0
+	map_attributes RuinsOfAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $00, 0
+	map_attributes RuinsOfAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $00, 0
+	map_attributes RuinsOfAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $00, 0
+	map_attributes RuinsOfAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $00, 0
+	map_attributes RuinsOfAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $00, 0
+	map_attributes RuinsOfAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $00, 0
+	map_attributes RuinsOfAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $00, 0
+	map_attributes UnionCave1F, UNION_CAVE_1F, $09, 0
+	map_attributes UnionCaveB1F, UNION_CAVE_B1F, $09, 0
+	map_attributes UnionCaveB2F, UNION_CAVE_B2F, $09, 0
+	map_attributes SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $09, 0
+	map_attributes SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $09, 0
+	map_attributes OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $00, 0
+	map_attributes OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $00, 0
+	map_attributes OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $00, 0
+	map_attributes OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $00, 0
+	map_attributes OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $00, 0
+	map_attributes OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $00, 0
+	map_attributes MahoganyMart1F, MAHOGANY_MART_1F, $00, 0
+	map_attributes TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $00, 0
+	map_attributes TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $00, 0
+	map_attributes TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $00, 0
+	map_attributes IlexForest, ILEX_FOREST, $05, 0
+	map_attributes GoldenrodUnderground, GOLDENROD_UNDERGROUND, $00, 0
+	map_attributes GoldenrodUndergroundSwitchRoomEntrances, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, $00, 0
+	map_attributes GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $00, 0
+	map_attributes GoldenrodUndergroundWarehouse, GOLDENROD_UNDERGROUND_WAREHOUSE, $00, 0
+	map_attributes MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $09, 0
+	map_attributes MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $09, 0
+	map_attributes MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $09, 0
+	map_attributes MountMortarB1F, MOUNT_MORTAR_B1F, $09, 0
+	map_attributes IcePath1F, ICE_PATH_1F, $09, 0
+	map_attributes IcePathB1F, ICE_PATH_B1F, $19, 0
+	map_attributes IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, 0
+	map_attributes IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, 0
+	map_attributes IcePathB3F, ICE_PATH_B3F, $19, 0
+	map_attributes WhirlIslandNW, WHIRL_ISLAND_NW, $09, 0
+	map_attributes WhirlIslandNE, WHIRL_ISLAND_NE, $09, 0
+	map_attributes WhirlIslandSW, WHIRL_ISLAND_SW, $09, 0
+	map_attributes WhirlIslandCave, WHIRL_ISLAND_CAVE, $09, 0
+	map_attributes WhirlIslandSE, WHIRL_ISLAND_SE, $0f, 0
+	map_attributes WhirlIslandB1F, WHIRL_ISLAND_B1F, $09, 0
+	map_attributes WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, 0
+	map_attributes WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $0f, 0
+	map_attributes SilverCaveRoom1, SILVER_CAVE_ROOM_1, $09, 0
+	map_attributes SilverCaveRoom2, SILVER_CAVE_ROOM_2, $09, 0
+	map_attributes SilverCaveRoom3, SILVER_CAVE_ROOM_3, $09, 0
+	map_attributes SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $09, 0
+	map_attributes DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $09, 0
+	map_attributes DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $09, 0
+	map_attributes DragonsDen1F, DRAGONS_DEN_1F, $09, 0
+	map_attributes DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0
+	map_attributes DragonShrine, DRAGON_SHRINE, $00, 0
+	map_attributes TohjoFalls, TOHJO_FALLS, $09, 0
+	map_attributes OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $00, 0
+	map_attributes OlivineGym, OLIVINE_GYM, $00, 0
+	map_attributes OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $00, 0
+	map_attributes OlivineHouseBeta, OLIVINE_HOUSE_BETA, $00, 0
+	map_attributes OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $00, 0
+	map_attributes OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $00, 0
+	map_attributes OlivineCafe, OLIVINE_CAFE, $00, 0
+	map_attributes OlivineMart, OLIVINE_MART, $00, 0
+	map_attributes Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $00, 0
+	map_attributes Route39Barn, ROUTE_39_BARN, $00, 0
+	map_attributes Route39Farmhouse, ROUTE_39_FARMHOUSE, $00, 0
+	map_attributes MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $00, 0
+	map_attributes MahoganyGym, MAHOGANY_GYM, $00, 0
+	map_attributes MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $00, 0
+	map_attributes Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $00, 0
+	map_attributes DiglettsCave, DIGLETTS_CAVE, $09, 0
+	map_attributes MountMoon, MOUNT_MOON, $09, 0
+	map_attributes UndergroundPath, UNDERGROUND_PATH, $00, 0
+	map_attributes RockTunnel1F, ROCK_TUNNEL_1F, $09, 0
+	map_attributes RockTunnelB1F, ROCK_TUNNEL_B1F, $09, 0
+	map_attributes SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0
+	map_attributes SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0
+	map_attributes VictoryRoad, VICTORY_ROAD, $1d, 0
+	map_attributes EcruteakTinTowerEntrance, ECRUTEAK_TIN_TOWER_ENTRANCE, $00, 0
+	map_attributes WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0
+	map_attributes EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0
+	map_attributes EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0
+	map_attributes DanceTheatre, DANCE_THEATRE, $00, 0
+	map_attributes EcruteakMart, ECRUTEAK_MART, $00, 0
+	map_attributes EcruteakGym, ECRUTEAK_GYM, $00, 0
+	map_attributes EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $00, 0
+	map_attributes BlackthornGym1F, BLACKTHORN_GYM_1F, $00, 0
+	map_attributes BlackthornGym2F, BLACKTHORN_GYM_2F, $00, 0
+	map_attributes BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $00, 0
+	map_attributes BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $00, 0
+	map_attributes BlackthornMart, BLACKTHORN_MART, $00, 0
+	map_attributes BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $00, 0
+	map_attributes MoveDeletersHouse, MOVE_DELETERS_HOUSE, $00, 0
+	map_attributes CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $00, 0
+	map_attributes CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $00, 0
+	map_attributes Route19FuchsiaGate, ROUTE_19_FUCHSIA_GATE, $00, 0
+	map_attributes SeafoamGym, SEAFOAM_GYM, $09, 0
+	map_attributes CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $00, 0
+	map_attributes CeruleanPoliceStation, CERULEAN_POLICE_STATION, $00, 0
+	map_attributes CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $00, 0
+	map_attributes CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $00, 0
+	map_attributes CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $00, 0
+	map_attributes CeruleanGym, CERULEAN_GYM, $00, 0
+	map_attributes CeruleanMart, CERULEAN_MART, $00, 0
+	map_attributes Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $00, 0
+	map_attributes Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $00, 0
+	map_attributes PowerPlant, POWER_PLANT, $00, 0
+	map_attributes BillsHouse, BILLS_HOUSE, $00, 0
+	map_attributes AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $00, 0
+	map_attributes CharcoalKiln, CHARCOAL_KILN, $00, 0
+	map_attributes AzaleaMart, AZALEA_MART, $00, 0
+	map_attributes KurtsHouse, KURTS_HOUSE, $00, 0
+	map_attributes AzaleaGym, AZALEA_GYM, $00, 0
+	map_attributes LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $00, 0
+	map_attributes LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $00, 0
+	map_attributes Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $00, 0
+	map_attributes Route43Gate, ROUTE_43_GATE, $00, 0
+	map_attributes VioletMart, VIOLET_MART, $00, 0
+	map_attributes VioletGym, VIOLET_GYM, $00, 0
+	map_attributes EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $00, 0
+	map_attributes VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $00, 0
+	map_attributes VioletPokecenter1F, VIOLET_POKECENTER_1F, $00, 0
+	map_attributes VioletKylesHouse, VIOLET_KYLES_HOUSE, $00, 0
+	map_attributes Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $00, 0
+	map_attributes Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $00, 0
+	map_attributes Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $00, 0
+	map_attributes Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $00, 0
+	map_attributes Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $00, 0
+	map_attributes Route36NationalParkGate, ROUTE_36_NATIONAL_PARK_GATE, $00, 0
+	map_attributes GoldenrodGym, GOLDENROD_GYM, $00, 0
+	map_attributes GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $00, 0
+	map_attributes GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $00, 0
+	map_attributes BillsFamilysHouse, BILLS_FAMILYS_HOUSE, $00, 0
+	map_attributes GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $00, 0
+	map_attributes GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $00, 0
+	map_attributes GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $00, 0
+	map_attributes GoldenrodNameRater, GOLDENROD_NAME_RATER, $00, 0
+	map_attributes GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $00, 0
+	map_attributes GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $00, 0
+	map_attributes GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $00, 0
+	map_attributes GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $00, 0
+	map_attributes GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $00, 0
+	map_attributes GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $00, 0
+	map_attributes GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $00, 0
+	map_attributes GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
+	map_attributes GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0
+	map_attributes GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0
+	map_attributes PokecomCenterAdminOfficeMobile, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, $00, 0
+	map_attributes IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0
+	map_attributes Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0
+	map_attributes DayCare, DAY_CARE, $00, 0
+	map_attributes VermilionFishingSpeechHouse, VERMILION_FISHING_SPEECH_HOUSE, $00, 0
+	map_attributes VermilionPokecenter1F, VERMILION_POKECENTER_1F, $00, 0
+	map_attributes VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $00, 0
+	map_attributes PokemonFanClub, POKEMON_FAN_CLUB, $00, 0
+	map_attributes VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $00, 0
+	map_attributes VermilionMart, VERMILION_MART, $00, 0
+	map_attributes VermilionDiglettsCaveSpeechHouse, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0
+	map_attributes VermilionGym, VERMILION_GYM, $00, 0
+	map_attributes Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $00, 0
+	map_attributes Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $00, 0
+	map_attributes RedsHouse1F, REDS_HOUSE_1F, $00, 0
+	map_attributes RedsHouse2F, REDS_HOUSE_2F, $00, 0
+	map_attributes BluesHouse, BLUES_HOUSE, $00, 0
+	map_attributes OaksLab, OAKS_LAB, $00, 0
+	map_attributes PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $00, 0
+	map_attributes PewterGym, PEWTER_GYM, $00, 0
+	map_attributes PewterMart, PEWTER_MART, $00, 0
+	map_attributes PewterPokecenter1F, PEWTER_POKECENTER_1F, $00, 0
+	map_attributes PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $00, 0
+	map_attributes PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $00, 0
+	map_attributes OlivinePort, OLIVINE_PORT, $0a, 0
+	map_attributes VermilionPort, VERMILION_PORT, $0a, 0
+	map_attributes FastShip1F, FAST_SHIP_1F, $00, 0
+	map_attributes FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $00, 0
+	map_attributes FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $00, 0
+	map_attributes FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $00, 0
+	map_attributes FastShipB1F, FAST_SHIP_B1F, $00, 0
+	map_attributes OlivinePortPassage, OLIVINE_PORT_PASSAGE, $00, 0
+	map_attributes VermilionPortPassage, VERMILION_PORT_PASSAGE, $00, 0
+	map_attributes MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0
+	map_attributes MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $00, 0
+	map_attributes TinTowerRoof, TIN_TOWER_ROOF, $00, 0
+	map_attributes IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $00, 0
+	map_attributes WillsRoom, WILLS_ROOM, $00, 0
+	map_attributes KogasRoom, KOGAS_ROOM, $00, 0
+	map_attributes BrunosRoom, BRUNOS_ROOM, $00, 0
+	map_attributes KarensRoom, KARENS_ROOM, $00, 0
+	map_attributes LancesRoom, LANCES_ROOM, $00, 0
+	map_attributes HallOfFame, HALL_OF_FAME, $00, 0
+	map_attributes FuchsiaMart, FUCHSIA_MART, $00, 0
+	map_attributes SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0
+	map_attributes FuchsiaGym, FUCHSIA_GYM, $00, 0
+	map_attributes BillsBrothersHouse, BILLS_BROTHERS_HOUSE, $00, 0
+	map_attributes FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0
+	map_attributes FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0
+	map_attributes SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0
+	map_attributes Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $00, 0
+	map_attributes LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $00, 0
+	map_attributes LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $00, 0
+	map_attributes MrFujisHouse, MR_FUJIS_HOUSE, $00, 0
+	map_attributes LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $00, 0
+	map_attributes LavenderNameRater, LAVENDER_NAME_RATER, $00, 0
+	map_attributes LavenderMart, LAVENDER_MART, $00, 0
+	map_attributes SoulHouse, SOUL_HOUSE, $00, 0
+	map_attributes LavRadioTower1F, LAV_RADIO_TOWER_1F, $00, 0
+	map_attributes Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0
+	map_attributes Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $00, 0
+	map_attributes SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $00, 0
+	map_attributes Route28SteelWingHouse, ROUTE_28_STEEL_WING_HOUSE, $00, 0
+	map_attributes Pokecenter2F, POKECENTER_2F, $00, 0
+	map_attributes TradeCenter, TRADE_CENTER, $00, 0
+	map_attributes Colosseum, COLOSSEUM, $00, 0
+	map_attributes TimeCapsule, TIME_CAPSULE, $00, 0
+	map_attributes MobileTradeRoom, MOBILE_TRADE_ROOM, $00, 0
+	map_attributes MobileBattleRoom, MOBILE_BATTLE_ROOM, $00, 0
+	map_attributes CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $00, 0
+	map_attributes CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $00, 0
+	map_attributes CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $00, 0
+	map_attributes CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $00, 0
+	map_attributes CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $00, 0
+	map_attributes CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $00, 0
+	map_attributes CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $00, 0
+	map_attributes CeladonMansion1F, CELADON_MANSION_1F, $00, 0
+	map_attributes CeladonMansion2F, CELADON_MANSION_2F, $00, 0
+	map_attributes CeladonMansion3F, CELADON_MANSION_3F, $00, 0
+	map_attributes CeladonMansionRoof, CELADON_MANSION_ROOF, $01, 0
+	map_attributes CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $00, 0
+	map_attributes CeladonPokecenter1F, CELADON_POKECENTER_1F, $00, 0
+	map_attributes CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $00, 0
+	map_attributes CeladonGameCorner, CELADON_GAME_CORNER, $00, 0
+	map_attributes CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $00, 0
+	map_attributes CeladonGym, CELADON_GYM, $00, 0
+	map_attributes CeladonCafe, CELADON_CAFE, $00, 0
+	map_attributes Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $00, 0
+	map_attributes Route16Gate, ROUTE_16_GATE, $00, 0
+	map_attributes Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $00, 0
+	map_attributes Route17Route18Gate, ROUTE_17_ROUTE_18_GATE, $00, 0
+	map_attributes ManiasHouse, MANIAS_HOUSE, $00, 0
+	map_attributes CianwoodGym, CIANWOOD_GYM, $00, 0
+	map_attributes CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $00, 0
+	map_attributes CianwoodPharmacy, CIANWOOD_PHARMACY, $00, 0
+	map_attributes CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $00, 0
+	map_attributes CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $00, 0
+	map_attributes PokeSeersHouse, POKE_SEERS_HOUSE, $00, 0
+	map_attributes BattleTower1F, BATTLE_TOWER_1F, $00, 0
+	map_attributes BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $00, 0
+	map_attributes BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $00, 0
+	map_attributes BattleTowerHallway, BATTLE_TOWER_HALLWAY, $00, 0
+	map_attributes Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $00, 0
+	map_attributes BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $05, 0
+	map_attributes ViridianGym, VIRIDIAN_GYM, $00, 0
+	map_attributes ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $00, 0
+	map_attributes TrainerHouse1F, TRAINER_HOUSE_1F, $00, 0
+	map_attributes TrainerHouseB1F, TRAINER_HOUSE_B1F, $00, 0
+	map_attributes ViridianMart, VIRIDIAN_MART, $00, 0
+	map_attributes ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $00, 0
+	map_attributes ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $00, 0
+	map_attributes Route2NuggetHouse, ROUTE_2_NUGGET_HOUSE, $00, 0
+	map_attributes Route2Gate, ROUTE_2_GATE, $00, 0
+	map_attributes VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0
+	map_attributes ElmsLab, ELMS_LAB, $00, 0
+	map_attributes PlayersHouse1F, PLAYERS_HOUSE_1F, $00, 0
+	map_attributes PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0
+	map_attributes PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0
+	map_attributes ElmsHouse, ELMS_HOUSE, $00, 0
+	map_attributes Route26HealHouse, ROUTE_26_HEAL_HOUSE, $00, 0
+	map_attributes DayOfWeekSiblingsHouse, DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0
+	map_attributes Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0
+	map_attributes Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0
+	map_attributes FightingDojo, FIGHTING_DOJO, $00, 0
+	map_attributes SaffronGym, SAFFRON_GYM, $00, 0
+	map_attributes SaffronMart, SAFFRON_MART, $00, 0
+	map_attributes SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $00, 0
+	map_attributes SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $00, 0
+	map_attributes MrPsychicsHouse, MR_PSYCHICS_HOUSE, $00, 0
+	map_attributes SaffronMagnetTrainStation, SAFFRON_MAGNET_TRAIN_STATION, $00, 0
+	map_attributes SilphCo1F, SILPH_CO_1F, $00, 0
+	map_attributes CopycatsHouse1F, COPYCATS_HOUSE_1F, $00, 0
+	map_attributes CopycatsHouse2F, COPYCATS_HOUSE_2F, $00, 0
+	map_attributes Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $00, 0
+	map_attributes Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $00, 0
+	map_attributes Route5CleanseTagHouse, ROUTE_5_CLEANSE_TAG_HOUSE, $00, 0
+	map_attributes CherrygroveMart, CHERRYGROVE_MART, $00, 0
+	map_attributes CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $00, 0
+	map_attributes CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $00, 0
+	map_attributes GuideGentsHouse, GUIDE_GENTS_HOUSE, $00, 0
+	map_attributes CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $00, 0
+	map_attributes Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0
+	map_attributes MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
+	map_attributes Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
index 7f008b5b2..c4f180b8f 100644
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -165,20 +165,20 @@ CharcoalKiln_Blocks:
 LakeOfRageHiddenPowerHouse_Blocks:
 LakeOfRageMagikarpHouse_Blocks:
 GoldenrodHappinessRater_Blocks:
-GoldenrodBillsHouse_Blocks:
+BillsFamilysHouse_Blocks:
 GoldenrodPPSpeechHouse_Blocks:
 GoldenrodNameRater_Blocks:
-VermilionHouseFishingSpeechHouse_Blocks:
+VermilionFishingSpeechHouse_Blocks:
 VermilionMagnetTrainSpeechHouse_Blocks:
-VermilionHouseDiglettsCaveSpeechHouse_Blocks:
+VermilionDiglettsCaveSpeechHouse_Blocks:
 BluesHouse_Blocks:
 PewterNidoranSpeechHouse_Blocks:
 PewterSnoozeSpeechHouse_Blocks:
-FuchsiaBillSpeechHouse_Blocks:
+BillsBrothersHouse_Blocks:
 LavenderSpeechHouse_Blocks:
 LavenderNameRater_Blocks:
 Route12SuperRodHouse_Blocks:
-Route28FamousSpeechHouse_Blocks:
+Route28SteelWingHouse_Blocks:
 CeladonMansionRoofHouse_Blocks:
 Route16FuchsiaSpeechHouse_Blocks:
 ManiasHouse_Blocks:
@@ -187,17 +187,17 @@ CianwoodPhotoStudio_Blocks:
 CianwoodLugiaSpeechHouse_Blocks:
 PokeSeersHouse_Blocks:
 ViridianNicknameSpeechHouse_Blocks:
-Route2NuggetSpeechHouse_Blocks:
-KrissNeighborsHouse_Blocks:
-Route26HealSpeechHouse_Blocks:
-Route26DayofWeekSiblingsHouse_Blocks:
+Route2NuggetHouse_Blocks:
+PlayersNeighborsHouse_Blocks:
+Route26HealHouse_Blocks:
+DayOfWeekSiblingsHouse_Blocks:
 Route27SandstormHouse_Blocks:
 MrPsychicsHouse_Blocks:
-Route5CleanseTagSpeechHouse_Blocks:
+Route5CleanseTagHouse_Blocks:
 CherrygroveGymSpeechHouse_Blocks:
 GuideGentsHouse_Blocks:
 CherrygroveEvolutionSpeechHouse_Blocks:
-Route30BerrySpeechHouse_Blocks:
+Route30BerryHouse_Blocks:
 	INCBIN "maps/House1.blk"
 
 SafariZoneFuchsiaGateBeta_Blocks:
@@ -265,8 +265,8 @@ Route43_Blocks:
 Route39_Blocks:
 	INCBIN "maps/Route39.blk"
 
-KrissHouse1F_Blocks:
-	INCBIN "maps/KrissHouse1F.blk"
+PlayersHouse1F_Blocks:
+	INCBIN "maps/PlayersHouse1F.blk"
 
 Route38EcruteakGate_Blocks:
 Route42EcruteakGate_Blocks:
@@ -806,8 +806,8 @@ GoldenrodBikeShop_Blocks:
 DanceTheatre_Blocks:
 	INCBIN "maps/DanceTheatre.blk"
 
-EcruteakHouse_Blocks:
-	INCBIN "maps/EcruteakHouse.blk"
+EcruteakTinTowerEntrance_Blocks:
+	INCBIN "maps/EcruteakTinTowerEntrance.blk"
 
 GoldenrodGameCorner_Blocks:
 	INCBIN "maps/GoldenrodGameCorner.blk"
@@ -846,8 +846,8 @@ OlivineCafe_Blocks:
 SafariZoneMainOffice_Blocks:
 	INCBIN "maps/OlivineCafe.blk"
 
-KrissHouse2F_Blocks:
-	INCBIN "maps/KrissHouse2F.blk"
+PlayersHouse2F_Blocks:
+	INCBIN "maps/PlayersHouse2F.blk"
 
 SaffronMagnetTrainStation_Blocks:
 	INCBIN "maps/SaffronMagnetTrainStation.blk"
@@ -1022,11 +1022,11 @@ BattleTower1F_Blocks:
 BattleTowerBattleRoom_Blocks:
 	INCBIN "maps/BattleTowerBattleRoom.blk"
 
-GoldenrodPokeComCenter2FMobile_Blocks:
-	INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk"
+PokecomCenterAdminOfficeMobile_Blocks:
+	INCBIN "maps/PokecomCenterAdminOfficeMobile.blk"
 
-MobileTradeRoomMobile_Blocks:
-	INCBIN "maps/MobileTradeRoomMobile.blk"
+MobileTradeRoom_Blocks:
+	INCBIN "maps/MobileTradeRoom.blk"
 
 MobileBattleRoom_Blocks:
 	INCBIN "maps/MobileBattleRoom.blk"
diff --git a/data/maps/data.asm b/data/maps/data.asm
deleted file mode 100644
index 6344f0572..000000000
--- a/data/maps/data.asm
+++ /dev/null
@@ -1,685 +0,0 @@
-map_data: MACRO
-;\1: map name
-;\2: map id
-;\3: border block
-;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none
-\1_MapData::
-	db \3
-	db \2_HEIGHT, \2_WIDTH
-	db BANK(\1_Blocks)
-	dw \1_Blocks
-	db BANK(\1_MapScripts)
-	dw \1_MapScripts
-	dw \1_MapEvents
-	db \4
-ENDM
-
-connection: MACRO
-if "\1" == "north"
-;\2: map id
-;\3: map name (eventually will be rolled into map id)
-;\4: x
-;\5: offset?
-;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_Blocks + \2_WIDTH * (\2_HEIGHT - 3) + \5
-	dw wOverworldMap + \4 + 3
-	db \6
-	db \2_WIDTH
-	db \2_HEIGHT * 2 - 1
-	db (\4 - \5) * -2
-	dw wOverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1
-endc
-
-if "\1" == "south"
-;\2: map id
-;\3: map name (eventually will be rolled into map id)
-;\4: x
-;\5: offset?
-;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_Blocks + \5
-	dw wOverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3
-	db \6
-	db \2_WIDTH
-	db 0
-	db (\4 - \5) * -2
-	dw wOverworldMap + \2_WIDTH + 7
-endc
-
-if "\1" == "west"
-;\2: map id
-;\3: map name (eventually will be rolled into map id)
-;\4: y
-;\5: offset?
-;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_Blocks + (\2_WIDTH * \5) + \2_WIDTH - 3
-	dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3)
-	db \6
-	db \2_WIDTH
-	db (\4 - \5) * -2
-	db \2_WIDTH * 2 - 1
-	dw wOverworldMap + \2_WIDTH * 2 + 6
-endc
-
-if "\1" == "east"
-;\2: map id
-;\3: map name (eventually will be rolled into map id)
-;\4: y
-;\5: offset?
-;\6: strip length
-;\7: this map id
-	map \2
-	dw \3_Blocks + (\2_WIDTH * \5)
-	dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3
-	db \6
-	db \2_WIDTH
-	db (\4 - \5) * -2
-	db 0
-	dw wOverworldMap + \2_WIDTH + 7
-endc
-ENDM
-
-
-	map_data NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST
-	connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN
-	connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN
-
-	map_data CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST
-	connection north, ROUTE_30, Route30, 5, 0, 10, CHERRYGROVE_CITY
-	connection east, ROUTE_29, Route29, 0, 0, 9, CHERRYGROVE_CITY
-
-	map_data VioletCity, VIOLET_CITY, $05, SOUTH | WEST | EAST
-	connection south, ROUTE_32, Route32, 0, 0, 10, VIOLET_CITY
-	connection west, ROUTE_36, Route36, 0, 0, 9, VIOLET_CITY
-	connection east, ROUTE_31, Route31, 9, 0, 9, VIOLET_CITY
-
-	map_data AzaleaTown, AZALEA_TOWN, $05, WEST | EAST
-	connection west, ROUTE_34, Route34, -3, 15, 12, AZALEA_TOWN
-	connection east, ROUTE_33, Route33, 0, 0, 9, AZALEA_TOWN
-
-	map_data CianwoodCity, CIANWOOD_CITY, $35, EAST
-	connection east, ROUTE_41, Route41, 0, 0, 27, CIANWOOD_CITY
-
-	map_data GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH
-	connection north, ROUTE_35, Route35, 5, 0, 10, GOLDENROD_CITY
-	connection south, ROUTE_34, Route34, 5, 0, 10, GOLDENROD_CITY
-
-	map_data OlivineCity, OLIVINE_CITY, $35, NORTH | WEST
-	connection north, ROUTE_39, Route39, 5, 0, 10, OLIVINE_CITY
-	connection west, ROUTE_40, Route40, 9, 0, 12, OLIVINE_CITY
-
-	map_data EcruteakCity, ECRUTEAK_CITY, $05, SOUTH | WEST | EAST
-	connection south, ROUTE_37, Route37, 5, 0, 10, ECRUTEAK_CITY
-	connection west, ROUTE_38, Route38, 5, 0, 9, ECRUTEAK_CITY
-	connection east, ROUTE_42, Route42, 9, 0, 9, ECRUTEAK_CITY
-
-	map_data MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST
-	connection north, ROUTE_43, Route43, 0, 0, 10, MAHOGANY_TOWN
-	connection west, ROUTE_42, Route42, 0, 0, 9, MAHOGANY_TOWN
-	connection east, ROUTE_44, Route44, 0, 0, 9, MAHOGANY_TOWN
-
-	map_data LakeOfRage, LAKE_OF_RAGE, $05, SOUTH
-	connection south, ROUTE_43, Route43, 5, 0, 10, LAKE_OF_RAGE
-
-	map_data BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST
-	connection south, ROUTE_45, Route45, 0, 0, 10, BLACKTHORN_CITY
-	connection west, ROUTE_44, Route44, 9, 0, 9, BLACKTHORN_CITY
-
-	map_data SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST
-	connection east, ROUTE_28, Route28, 9, 0, 9, SILVER_CAVE_OUTSIDE
-
-	map_data Route26, ROUTE_26, $05, WEST
-	connection west, ROUTE_27, Route27, 45, 0, 9, ROUTE_26
-
-	map_data Route27, ROUTE_27, $35, WEST | EAST
-	connection west, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_27
-	connection east, ROUTE_26, Route26, -3, 42, 12, ROUTE_27
-
-	map_data Route28, ROUTE_28, $2c, WEST
-	connection west, SILVER_CAVE_OUTSIDE, SilverCaveOutside, -3, 6, 12, ROUTE_28
-
-	map_data Route29, ROUTE_29, $05, NORTH | WEST | EAST
-	connection north, ROUTE_46, Route46, 10, 0, 10, ROUTE_29
-	connection west, CHERRYGROVE_CITY, CherrygroveCity, 0, 0, 9, ROUTE_29
-	connection east, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_29
-
-	map_data Route30, ROUTE_30, $05, NORTH | SOUTH
-	connection north, ROUTE_31, Route31, -3, 7, 13, ROUTE_30
-	connection south, CHERRYGROVE_CITY, CherrygroveCity, -3, 2, 16, ROUTE_30
-
-	map_data Route31, ROUTE_31, $05, SOUTH | WEST
-	connection south, ROUTE_30, Route30, 10, 0, 10, ROUTE_31
-	connection west, VIOLET_CITY, VioletCity, -3, 6, 12, ROUTE_31
-
-	map_data Route32, ROUTE_32, $05, NORTH | SOUTH
-	connection north, VIOLET_CITY, VioletCity, 0, 0, 13, ROUTE_32
-	connection south, ROUTE_33, Route33, 0, 0, 10, ROUTE_32
-
-	map_data Route33, ROUTE_33, $05, NORTH | WEST
-	connection north, ROUTE_32, Route32, 0, 0, 10, ROUTE_33
-	connection west, AZALEA_TOWN, AzaleaTown, 0, 0, 9, ROUTE_33
-
-	map_data Route34, ROUTE_34, $05, NORTH | EAST
-	connection north, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_34
-	connection east, AZALEA_TOWN, AzaleaTown, 18, 0, 9, ROUTE_34
-
-	map_data Route35, ROUTE_35, $05, NORTH | SOUTH
-	connection north, ROUTE_36, Route36, 0, 0, 13, ROUTE_35
-	connection south, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_35
-
-	map_data Route36, ROUTE_36, $05, NORTH | SOUTH | EAST
-	connection north, ROUTE_37, Route37, 10, 0, 10, ROUTE_36
-	connection south, ROUTE_35, Route35, 0, 0, 10, ROUTE_36
-	connection east, VIOLET_CITY, VioletCity, 0, 0, 12, ROUTE_36
-
-	map_data Route37, ROUTE_37, $05, NORTH | SOUTH
-	connection north, ECRUTEAK_CITY, EcruteakCity, -3, 2, 16, ROUTE_37
-	connection south, ROUTE_36, Route36, -3, 7, 16, ROUTE_37
-
-	map_data Route38, ROUTE_38, $05, WEST | EAST
-	connection west, ROUTE_39, Route39, 0, 0, 12, ROUTE_38
-	connection east, ECRUTEAK_CITY, EcruteakCity, -3, 2, 15, ROUTE_38
-
-	map_data Route39, ROUTE_39, $05, SOUTH | EAST
-	connection south, OLIVINE_CITY, OlivineCity, -3, 2, 16, ROUTE_39
-	connection east, ROUTE_38, Route38, 0, 0, 9, ROUTE_39
-
-	map_data Route40, ROUTE_40, $35, SOUTH | EAST
-	connection south, ROUTE_41, Route41, -3, 12, 13, ROUTE_40
-	connection east, OLIVINE_CITY, OlivineCity, -3, 6, 12, ROUTE_40
-
-	map_data Route41, ROUTE_41, $35, NORTH | WEST
-	connection north, ROUTE_40, Route40, 15, 0, 10, ROUTE_41
-	connection west, CIANWOOD_CITY, CianwoodCity, 0, 0, 27, ROUTE_41
-
-	map_data Route42, ROUTE_42, $05, WEST | EAST
-	connection west, ECRUTEAK_CITY, EcruteakCity, -3, 6, 12, ROUTE_42
-	connection east, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_42
-
-	map_data Route43, ROUTE_43, $05, NORTH | SOUTH
-	connection north, LAKE_OF_RAGE, LakeOfRage, -3, 2, 16, ROUTE_43
-	connection south, MAHOGANY_TOWN, MahoganyTown, 0, 0, 10, ROUTE_43
-
-	map_data Route44, ROUTE_44, $71, WEST | EAST
-	connection west, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_44
-	connection east, BLACKTHORN_CITY, BlackthornCity, -3, 6, 12, ROUTE_44
-
-	map_data Route45, ROUTE_45, $71, NORTH | WEST
-	connection north, BLACKTHORN_CITY, BlackthornCity, 0, 0, 13, ROUTE_45
-	connection west, ROUTE_46, Route46, 36, 0, 12, ROUTE_45
-
-	map_data Route46, ROUTE_46, $05, SOUTH | EAST
-	connection south, ROUTE_29, Route29, -3, 7, 16, ROUTE_46
-	connection east, ROUTE_45, Route45, -3, 33, 12, ROUTE_46
-
-	map_data PewterCity, PEWTER_CITY, $0f, SOUTH | EAST
-	connection south, ROUTE_2, Route2, 5, 0, 10, PEWTER_CITY
-	connection east, ROUTE_3, Route3, 5, 0, 9, PEWTER_CITY
-
-	map_data Route2, ROUTE_2, $0f, NORTH | SOUTH
-	connection north, PEWTER_CITY, PewterCity, -3, 2, 16, ROUTE_2
-	connection south, VIRIDIAN_CITY, ViridianCity, -3, 2, 16, ROUTE_2
-
-	map_data ViridianCity, VIRIDIAN_CITY, $0f, NORTH | SOUTH | WEST
-	connection north, ROUTE_2, Route2, 5, 0, 10, VIRIDIAN_CITY
-	connection south, ROUTE_1, Route1, 10, 0, 10, VIRIDIAN_CITY
-	connection west, ROUTE_22, Route22, 4, 0, 9, VIRIDIAN_CITY
-
-	map_data Route22, ROUTE_22, $2c, EAST
-	connection east, VIRIDIAN_CITY, ViridianCity, -3, 1, 15, ROUTE_22
-
-	map_data Route1, ROUTE_1, $0f, NORTH | SOUTH
-	connection north, VIRIDIAN_CITY, ViridianCity, -3, 7, 13, ROUTE_1
-	connection south, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_1
-
-	map_data PalletTown, PALLET_TOWN, $0f, NORTH | SOUTH
-	connection north, ROUTE_1, Route1, 0, 0, 10, PALLET_TOWN
-	connection south, ROUTE_21, Route21, 0, 0, 10, PALLET_TOWN
-
-	map_data Route21, ROUTE_21, $43, NORTH | SOUTH
-	connection north, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_21
-	connection south, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 10, ROUTE_21
-
-	map_data CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST
-	connection north, ROUTE_21, Route21, 0, 0, 10, CINNABAR_ISLAND
-	connection east, ROUTE_20, Route20, 0, 0, 9, CINNABAR_ISLAND
-
-	map_data Route20, ROUTE_20, $43, WEST | EAST
-	connection west, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 9, ROUTE_20
-	connection east, ROUTE_19, Route19, -3, 6, 12, ROUTE_20
-
-	map_data Route19, ROUTE_19, $43, NORTH | WEST
-	connection north, FUCHSIA_CITY, FuchsiaCity, 0, 0, 13, ROUTE_19
-	connection west, ROUTE_20, Route20, 9, 0, 9, ROUTE_19
-
-	map_data FuchsiaCity, FUCHSIA_CITY, $0f, SOUTH | WEST | EAST
-	connection south, ROUTE_19, Route19, 0, 0, 10, FUCHSIA_CITY
-	connection west, ROUTE_18, Route18, 7, 0, 9, FUCHSIA_CITY
-	connection east, ROUTE_15, Route15, 9, 0, 9, FUCHSIA_CITY
-
-	map_data Route18, ROUTE_18, $43, WEST | EAST
-	connection west, ROUTE_17, Route17, -3, 35, 10, ROUTE_18
-	connection east, FUCHSIA_CITY, FuchsiaCity, -3, 4, 14, ROUTE_18
-
-	map_data Route17, ROUTE_17, $43, NORTH | EAST
-	connection north, ROUTE_16, Route16, 0, 0, 10, ROUTE_17
-	connection east, ROUTE_18, Route18, 38, 0, 9, ROUTE_17
-
-	map_data Route16, ROUTE_16, $0f, SOUTH | EAST
-	connection south, ROUTE_17, Route17, 0, 0, 10, ROUTE_16
-	connection east, CELADON_CITY, CeladonCity, -3, 6, 12, ROUTE_16
-
-	map_data CeladonCity, CELADON_CITY, $0f, WEST | EAST
-	connection west, ROUTE_16, Route16, 9, 0, 9, CELADON_CITY
-	connection east, ROUTE_7, Route7, 5, 0, 9, CELADON_CITY
-
-	map_data Route7, ROUTE_7, $0f, WEST | EAST
-	connection west, CELADON_CITY, CeladonCity, -3, 2, 15, ROUTE_7
-	connection east, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_7
-
-	map_data Route15, ROUTE_15, $0f, WEST | EAST
-	connection west, FUCHSIA_CITY, FuchsiaCity, -3, 6, 12, ROUTE_15
-	connection east, ROUTE_14, Route14, -3, 6, 12, ROUTE_15
-
-	map_data Route14, ROUTE_14, $43, NORTH | WEST
-	connection north, ROUTE_13, Route13, 0, 0, 13, ROUTE_14
-	connection west, ROUTE_15, Route15, 9, 0, 9, ROUTE_14
-
-	map_data Route13, ROUTE_13, $43, NORTH | SOUTH
-	connection north, ROUTE_12, Route12, 20, 0, 10, ROUTE_13
-	connection south, ROUTE_14, Route14, 0, 0, 10, ROUTE_13
-
-	map_data Route12, ROUTE_12, $43, NORTH | SOUTH | WEST
-	connection north, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_12
-	connection south, ROUTE_13, Route13, -3, 17, 13, ROUTE_12
-	connection west, ROUTE_11, Route11, 9, 0, 9, ROUTE_12
-
-	map_data Route11, ROUTE_11, $0f, WEST | EAST
-	connection west, VERMILION_CITY, VermilionCity, 0, 0, 12, ROUTE_11
-	connection east, ROUTE_12, Route12, -3, 6, 15, ROUTE_11
-
-	map_data LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST
-	connection north, ROUTE_10_SOUTH, Route10South, 0, 0, 10, LAVENDER_TOWN
-	connection south, ROUTE_12, Route12, 0, 0, 10, LAVENDER_TOWN
-	connection west, ROUTE_8, Route8, 0, 0, 9, LAVENDER_TOWN
-
-	map_data VermilionCity, VERMILION_CITY, $43, NORTH | EAST
-	connection north, ROUTE_6, Route6, 5, 0, 10, VERMILION_CITY
-	connection east, ROUTE_11, Route11, 0, 0, 9, VERMILION_CITY
-
-	map_data Route6, ROUTE_6, $0f, NORTH | SOUTH
-	connection north, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_6
-	connection south, VERMILION_CITY, VermilionCity, -3, 2, 16, ROUTE_6
-
-	map_data SaffronCity, SAFFRON_CITY, $0f, NORTH | SOUTH | WEST | EAST
-	connection north, ROUTE_5, Route5, 5, 0, 10, SAFFRON_CITY
-	connection south, ROUTE_6, Route6, 5, 0, 10, SAFFRON_CITY
-	connection west, ROUTE_7, Route7, 9, 0, 9, SAFFRON_CITY
-	connection east, ROUTE_8, Route8, 9, 0, 9, SAFFRON_CITY
-
-	map_data Route5, ROUTE_5, $0f, NORTH | SOUTH
-	connection north, CERULEAN_CITY, CeruleanCity, -3, 2, 16, ROUTE_5
-	connection south, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_5
-
-	map_data CeruleanCity, CERULEAN_CITY, $0f, NORTH | SOUTH | WEST | EAST
-	connection north, ROUTE_24, Route24, 6, 0, 10, CERULEAN_CITY
-	connection south, ROUTE_5, Route5, 5, 0, 10, CERULEAN_CITY
-	connection west, ROUTE_4, Route4, 5, 0, 9, CERULEAN_CITY
-	connection east, ROUTE_9, Route9, 9, 0, 9, CERULEAN_CITY
-
-	map_data Route9, ROUTE_9, $2c, SOUTH | WEST
-	connection south, ROUTE_10_NORTH, Route10North, 20, 0, 10, ROUTE_9
-	connection west, CERULEAN_CITY, CeruleanCity, -3, 6, 12, ROUTE_9
-
-	map_data Route24, ROUTE_24, $2c, NORTH | SOUTH
-	connection north, ROUTE_25, Route25, 0, 0, 13, ROUTE_24
-	connection south, CERULEAN_CITY, CeruleanCity, -3, 3, 16, ROUTE_24
-
-	map_data Route25, ROUTE_25, $2c, SOUTH
-	connection south, ROUTE_24, Route24, 0, 0, 10, ROUTE_25
-
-	map_data Route3, ROUTE_3, $2c, WEST | EAST
-	connection west, PEWTER_CITY, PewterCity, -3, 2, 15, ROUTE_3
-	connection east, ROUTE_4, Route4, 0, 0, 9, ROUTE_3
-
-	map_data Route4, ROUTE_4, $2c, WEST | EAST
-	connection west, ROUTE_3, Route3, 0, 0, 9, ROUTE_4
-	connection east, CERULEAN_CITY, CeruleanCity, -3, 2, 15, ROUTE_4
-
-	map_data Route8, ROUTE_8, $2c, WEST | EAST
-	connection west, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_8
-	connection east, LAVENDER_TOWN, LavenderTown, 0, 0, 9, ROUTE_8
-
-	map_data Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH
-	connection north, ROUTE_9, Route9, -3, 17, 13, ROUTE_10_NORTH
-	connection south, ROUTE_10_SOUTH, Route10South, 0, 0, 10, ROUTE_10_NORTH
-
-	map_data Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH
-	connection north, ROUTE_10_NORTH, Route10North, 0, 0, 10, ROUTE_10_SOUTH
-	connection south, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_10_SOUTH
-
-	map_data Route23, ROUTE_23, $0f, 0
-	map_data SproutTower1F, SPROUT_TOWER_1F, $00, 0
-	map_data SproutTower2F, SPROUT_TOWER_2F, $00, 0
-	map_data SproutTower3F, SPROUT_TOWER_3F, $00, 0
-	map_data TinTower1F, TIN_TOWER_1F, $00, 0
-	map_data TinTower2F, TIN_TOWER_2F, $00, 0
-	map_data TinTower3F, TIN_TOWER_3F, $00, 0
-	map_data TinTower4F, TIN_TOWER_4F, $00, 0
-	map_data TinTower5F, TIN_TOWER_5F, $00, 0
-	map_data TinTower6F, TIN_TOWER_6F, $00, 0
-	map_data TinTower7F, TIN_TOWER_7F, $00, 0
-	map_data TinTower8F, TIN_TOWER_8F, $00, 0
-	map_data TinTower9F, TIN_TOWER_9F, $00, 0
-	map_data BurnedTower1F, BURNED_TOWER_1F, $00, 0
-	map_data BurnedTowerB1F, BURNED_TOWER_B1F, $09, 0
-	map_data NationalPark, NATIONAL_PARK, $00, 0
-	map_data NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $00, 0
-	map_data RadioTower1F, RADIO_TOWER_1F, $00, 0
-	map_data RadioTower2F, RADIO_TOWER_2F, $00, 0
-	map_data RadioTower3F, RADIO_TOWER_3F, $00, 0
-	map_data RadioTower4F, RADIO_TOWER_4F, $00, 0
-	map_data RadioTower5F, RADIO_TOWER_5F, $00, 0
-	map_data RuinsOfAlphOutside, RUINS_OF_ALPH_OUTSIDE, $05, 0
-	map_data RuinsOfAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $00, 0
-	map_data RuinsOfAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $00, 0
-	map_data RuinsOfAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $00, 0
-	map_data RuinsOfAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $00, 0
-	map_data RuinsOfAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $00, 0
-	map_data RuinsOfAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $00, 0
-	map_data RuinsOfAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $00, 0
-	map_data RuinsOfAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $00, 0
-	map_data RuinsOfAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $00, 0
-	map_data RuinsOfAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $00, 0
-	map_data RuinsOfAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $00, 0
-	map_data RuinsOfAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $00, 0
-	map_data RuinsOfAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $00, 0
-	map_data RuinsOfAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $00, 0
-	map_data UnionCave1F, UNION_CAVE_1F, $09, 0
-	map_data UnionCaveB1F, UNION_CAVE_B1F, $09, 0
-	map_data UnionCaveB2F, UNION_CAVE_B2F, $09, 0
-	map_data SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $09, 0
-	map_data SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $09, 0
-	map_data OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $00, 0
-	map_data OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $00, 0
-	map_data OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $00, 0
-	map_data OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $00, 0
-	map_data OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $00, 0
-	map_data OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $00, 0
-	map_data MahoganyMart1F, MAHOGANY_MART_1F, $00, 0
-	map_data TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $00, 0
-	map_data TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $00, 0
-	map_data TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $00, 0
-	map_data IlexForest, ILEX_FOREST, $05, 0
-	map_data GoldenrodUnderground, GOLDENROD_UNDERGROUND, $00, 0
-	map_data GoldenrodUndergroundSwitchRoomEntrances, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, $00, 0
-	map_data GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $00, 0
-	map_data GoldenrodUndergroundWarehouse, GOLDENROD_UNDERGROUND_WAREHOUSE, $00, 0
-	map_data MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $09, 0
-	map_data MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $09, 0
-	map_data MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $09, 0
-	map_data MountMortarB1F, MOUNT_MORTAR_B1F, $09, 0
-	map_data IcePath1F, ICE_PATH_1F, $09, 0
-	map_data IcePathB1F, ICE_PATH_B1F, $19, 0
-	map_data IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, 0
-	map_data IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, 0
-	map_data IcePathB3F, ICE_PATH_B3F, $19, 0
-	map_data WhirlIslandNW, WHIRL_ISLAND_NW, $09, 0
-	map_data WhirlIslandNE, WHIRL_ISLAND_NE, $09, 0
-	map_data WhirlIslandSW, WHIRL_ISLAND_SW, $09, 0
-	map_data WhirlIslandCave, WHIRL_ISLAND_CAVE, $09, 0
-	map_data WhirlIslandSE, WHIRL_ISLAND_SE, $0f, 0
-	map_data WhirlIslandB1F, WHIRL_ISLAND_B1F, $09, 0
-	map_data WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, 0
-	map_data WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $0f, 0
-	map_data SilverCaveRoom1, SILVER_CAVE_ROOM_1, $09, 0
-	map_data SilverCaveRoom2, SILVER_CAVE_ROOM_2, $09, 0
-	map_data SilverCaveRoom3, SILVER_CAVE_ROOM_3, $09, 0
-	map_data SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $09, 0
-	map_data DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $09, 0
-	map_data DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $09, 0
-	map_data DragonsDen1F, DRAGONS_DEN_1F, $09, 0
-	map_data DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0
-	map_data DragonShrine, DRAGON_SHRINE, $00, 0
-	map_data TohjoFalls, TOHJO_FALLS, $09, 0
-	map_data OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $00, 0
-	map_data OlivineGym, OLIVINE_GYM, $00, 0
-	map_data OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $00, 0
-	map_data OlivineHouseBeta, OLIVINE_HOUSE_BETA, $00, 0
-	map_data OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $00, 0
-	map_data OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $00, 0
-	map_data OlivineCafe, OLIVINE_CAFE, $00, 0
-	map_data OlivineMart, OLIVINE_MART, $00, 0
-	map_data Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $00, 0
-	map_data Route39Barn, ROUTE_39_BARN, $00, 0
-	map_data Route39Farmhouse, ROUTE_39_FARMHOUSE, $00, 0
-	map_data MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $00, 0
-	map_data MahoganyGym, MAHOGANY_GYM, $00, 0
-	map_data MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $00, 0
-	map_data Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $00, 0
-	map_data DiglettsCave, DIGLETTS_CAVE, $09, 0
-	map_data MountMoon, MOUNT_MOON, $09, 0
-	map_data UndergroundPath, UNDERGROUND_PATH, $00, 0
-	map_data RockTunnel1F, ROCK_TUNNEL_1F, $09, 0
-	map_data RockTunnelB1F, ROCK_TUNNEL_B1F, $09, 0
-	map_data SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0
-	map_data SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0
-	map_data VictoryRoad, VICTORY_ROAD, $1d, 0
-	map_data EcruteakHouse, ECRUTEAK_HOUSE, $00, 0
-	map_data WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0
-	map_data EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0
-	map_data EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0
-	map_data DanceTheatre, DANCE_THEATRE, $00, 0
-	map_data EcruteakMart, ECRUTEAK_MART, $00, 0
-	map_data EcruteakGym, ECRUTEAK_GYM, $00, 0
-	map_data EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $00, 0
-	map_data BlackthornGym1F, BLACKTHORN_GYM_1F, $00, 0
-	map_data BlackthornGym2F, BLACKTHORN_GYM_2F, $00, 0
-	map_data BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $00, 0
-	map_data BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $00, 0
-	map_data BlackthornMart, BLACKTHORN_MART, $00, 0
-	map_data BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $00, 0
-	map_data MoveDeletersHouse, MOVE_DELETERS_HOUSE, $00, 0
-	map_data CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $00, 0
-	map_data CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $00, 0
-	map_data Route19FuchsiaGate, ROUTE_19_FUCHSIA_GATE, $00, 0
-	map_data SeafoamGym, SEAFOAM_GYM, $09, 0
-	map_data CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $00, 0
-	map_data CeruleanPoliceStation, CERULEAN_POLICE_STATION, $00, 0
-	map_data CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $00, 0
-	map_data CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $00, 0
-	map_data CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $00, 0
-	map_data CeruleanGym, CERULEAN_GYM, $00, 0
-	map_data CeruleanMart, CERULEAN_MART, $00, 0
-	map_data Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $00, 0
-	map_data Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $00, 0
-	map_data PowerPlant, POWER_PLANT, $00, 0
-	map_data BillsHouse, BILLS_HOUSE, $00, 0
-	map_data AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $00, 0
-	map_data CharcoalKiln, CHARCOAL_KILN, $00, 0
-	map_data AzaleaMart, AZALEA_MART, $00, 0
-	map_data KurtsHouse, KURTS_HOUSE, $00, 0
-	map_data AzaleaGym, AZALEA_GYM, $00, 0
-	map_data LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $00, 0
-	map_data LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $00, 0
-	map_data Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $00, 0
-	map_data Route43Gate, ROUTE_43_GATE, $00, 0
-	map_data VioletMart, VIOLET_MART, $00, 0
-	map_data VioletGym, VIOLET_GYM, $00, 0
-	map_data EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $00, 0
-	map_data VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $00, 0
-	map_data VioletPokecenter1F, VIOLET_POKECENTER_1F, $00, 0
-	map_data VioletKylesHouse, VIOLET_KYLES_HOUSE, $00, 0
-	map_data Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $00, 0
-	map_data Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $00, 0
-	map_data Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $00, 0
-	map_data Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $00, 0
-	map_data Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $00, 0
-	map_data Route36NationalParkGate, ROUTE_36_NATIONAL_PARK_GATE, $00, 0
-	map_data GoldenrodGym, GOLDENROD_GYM, $00, 0
-	map_data GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $00, 0
-	map_data GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $00, 0
-	map_data GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $00, 0
-	map_data GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $00, 0
-	map_data GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $00, 0
-	map_data GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $00, 0
-	map_data GoldenrodNameRater, GOLDENROD_NAME_RATER, $00, 0
-	map_data GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $00, 0
-	map_data GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $00, 0
-	map_data GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $00, 0
-	map_data GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $00, 0
-	map_data GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $00, 0
-	map_data GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $00, 0
-	map_data GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $00, 0
-	map_data GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
-	map_data GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0
-	map_data GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0
-	map_data GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $00, 0
-	map_data IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0
-	map_data Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0
-	map_data DayCare, DAY_CARE, $00, 0
-	map_data VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $00, 0
-	map_data VermilionPokecenter1F, VERMILION_POKECENTER_1F, $00, 0
-	map_data VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $00, 0
-	map_data PokemonFanClub, POKEMON_FAN_CLUB, $00, 0
-	map_data VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $00, 0
-	map_data VermilionMart, VERMILION_MART, $00, 0
-	map_data VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0
-	map_data VermilionGym, VERMILION_GYM, $00, 0
-	map_data Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $00, 0
-	map_data Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $00, 0
-	map_data RedsHouse1F, REDS_HOUSE_1F, $00, 0
-	map_data RedsHouse2F, REDS_HOUSE_2F, $00, 0
-	map_data BluesHouse, BLUES_HOUSE, $00, 0
-	map_data OaksLab, OAKS_LAB, $00, 0
-	map_data PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $00, 0
-	map_data PewterGym, PEWTER_GYM, $00, 0
-	map_data PewterMart, PEWTER_MART, $00, 0
-	map_data PewterPokecenter1F, PEWTER_POKECENTER_1F, $00, 0
-	map_data PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $00, 0
-	map_data PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $00, 0
-	map_data OlivinePort, OLIVINE_PORT, $0a, 0
-	map_data VermilionPort, VERMILION_PORT, $0a, 0
-	map_data FastShip1F, FAST_SHIP_1F, $00, 0
-	map_data FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $00, 0
-	map_data FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $00, 0
-	map_data FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $00, 0
-	map_data FastShipB1F, FAST_SHIP_B1F, $00, 0
-	map_data OlivinePortPassage, OLIVINE_PORT_PASSAGE, $00, 0
-	map_data VermilionPortPassage, VERMILION_PORT_PASSAGE, $00, 0
-	map_data MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0
-	map_data MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $00, 0
-	map_data TinTowerRoof, TIN_TOWER_ROOF, $00, 0
-	map_data IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $00, 0
-	map_data WillsRoom, WILLS_ROOM, $00, 0
-	map_data KogasRoom, KOGAS_ROOM, $00, 0
-	map_data BrunosRoom, BRUNOS_ROOM, $00, 0
-	map_data KarensRoom, KARENS_ROOM, $00, 0
-	map_data LancesRoom, LANCES_ROOM, $00, 0
-	map_data HallOfFame, HALL_OF_FAME, $00, 0
-	map_data FuchsiaMart, FUCHSIA_MART, $00, 0
-	map_data SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0
-	map_data FuchsiaGym, FUCHSIA_GYM, $00, 0
-	map_data FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $00, 0
-	map_data FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0
-	map_data FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0
-	map_data SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0
-	map_data Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $00, 0
-	map_data LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $00, 0
-	map_data LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $00, 0
-	map_data MrFujisHouse, MR_FUJIS_HOUSE, $00, 0
-	map_data LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $00, 0
-	map_data LavenderNameRater, LAVENDER_NAME_RATER, $00, 0
-	map_data LavenderMart, LAVENDER_MART, $00, 0
-	map_data SoulHouse, SOUL_HOUSE, $00, 0
-	map_data LavRadioTower1F, LAV_RADIO_TOWER_1F, $00, 0
-	map_data Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0
-	map_data Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $00, 0
-	map_data SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $00, 0
-	map_data Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $00, 0
-	map_data Pokecenter2F, POKECENTER_2F, $00, 0
-	map_data TradeCenter, TRADE_CENTER, $00, 0
-	map_data Colosseum, COLOSSEUM, $00, 0
-	map_data TimeCapsule, TIME_CAPSULE, $00, 0
-	map_data MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $00, 0
-	map_data MobileBattleRoom, MOBILE_BATTLE_ROOM, $00, 0
-	map_data CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $00, 0
-	map_data CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $00, 0
-	map_data CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $00, 0
-	map_data CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $00, 0
-	map_data CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $00, 0
-	map_data CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $00, 0
-	map_data CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $00, 0
-	map_data CeladonMansion1F, CELADON_MANSION_1F, $00, 0
-	map_data CeladonMansion2F, CELADON_MANSION_2F, $00, 0
-	map_data CeladonMansion3F, CELADON_MANSION_3F, $00, 0
-	map_data CeladonMansionRoof, CELADON_MANSION_ROOF, $01, 0
-	map_data CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $00, 0
-	map_data CeladonPokecenter1F, CELADON_POKECENTER_1F, $00, 0
-	map_data CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $00, 0
-	map_data CeladonGameCorner, CELADON_GAME_CORNER, $00, 0
-	map_data CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $00, 0
-	map_data CeladonGym, CELADON_GYM, $00, 0
-	map_data CeladonCafe, CELADON_CAFE, $00, 0
-	map_data Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $00, 0
-	map_data Route16Gate, ROUTE_16_GATE, $00, 0
-	map_data Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $00, 0
-	map_data Route17Route18Gate, ROUTE_17_ROUTE_18_GATE, $00, 0
-	map_data ManiasHouse, MANIAS_HOUSE, $00, 0
-	map_data CianwoodGym, CIANWOOD_GYM, $00, 0
-	map_data CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $00, 0
-	map_data CianwoodPharmacy, CIANWOOD_PHARMACY, $00, 0
-	map_data CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $00, 0
-	map_data CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $00, 0
-	map_data PokeSeersHouse, POKE_SEERS_HOUSE, $00, 0
-	map_data BattleTower1F, BATTLE_TOWER_1F, $00, 0
-	map_data BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $00, 0
-	map_data BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $00, 0
-	map_data BattleTowerHallway, BATTLE_TOWER_HALLWAY, $00, 0
-	map_data Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $00, 0
-	map_data BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $05, 0
-	map_data ViridianGym, VIRIDIAN_GYM, $00, 0
-	map_data ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $00, 0
-	map_data TrainerHouse1F, TRAINER_HOUSE_1F, $00, 0
-	map_data TrainerHouseB1F, TRAINER_HOUSE_B1F, $00, 0
-	map_data ViridianMart, VIRIDIAN_MART, $00, 0
-	map_data ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $00, 0
-	map_data ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $00, 0
-	map_data Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $00, 0
-	map_data Route2Gate, ROUTE_2_GATE, $00, 0
-	map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0
-	map_data ElmsLab, ELMS_LAB, $00, 0
-	map_data KrissHouse1F, KRISS_HOUSE_1F, $00, 0
-	map_data KrissHouse2F, KRISS_HOUSE_2F, $00, 0
-	map_data KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $00, 0
-	map_data ElmsHouse, ELMS_HOUSE, $00, 0
-	map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0
-	map_data Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0
-	map_data Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0
-	map_data Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0
-	map_data FightingDojo, FIGHTING_DOJO, $00, 0
-	map_data SaffronGym, SAFFRON_GYM, $00, 0
-	map_data SaffronMart, SAFFRON_MART, $00, 0
-	map_data SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $00, 0
-	map_data SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $00, 0
-	map_data MrPsychicsHouse, MR_PSYCHICS_HOUSE, $00, 0
-	map_data SaffronMagnetTrainStation, SAFFRON_MAGNET_TRAIN_STATION, $00, 0
-	map_data SilphCo1F, SILPH_CO_1F, $00, 0
-	map_data CopycatsHouse1F, COPYCATS_HOUSE_1F, $00, 0
-	map_data CopycatsHouse2F, COPYCATS_HOUSE_2F, $00, 0
-	map_data Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $00, 0
-	map_data Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $00, 0
-	map_data Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $00, 0
-	map_data CherrygroveMart, CHERRYGROVE_MART, $00, 0
-	map_data CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $00, 0
-	map_data CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $00, 0
-	map_data GuideGentsHouse, GUIDE_GENTS_HOUSE, $00, 0
-	map_data CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $00, 0
-	map_data Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $00, 0
-	map_data MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
-	map_data Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm
deleted file mode 100644
index 44cb85ac6..000000000
--- a/data/maps/definitions.asm
+++ /dev/null
@@ -1,485 +0,0 @@
-map_def: MACRO
-;\1: map name: for the MapData pointer (see data/maps/data.asm)
-;\2: tileset: a TILESET_* constant
-;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON
-;\4: location: from constants/landmark_constants.asm
-;\5: music: a MUSIC_* constant
-;\6: phone service flag: TRUE to prevent phone calls
-;\7: time of day: a PALETTE_* constant
-;\8: fishing group: a FISHGROUP_* constant
-	db BANK(\1_MapData), \2, \3
-	dw \1_MapData
-	db \4, \5
-	dn \6, \7
-	db \8
-ENDM
-
-MapGroupPointers::
-; pointers to the first map header of each map group
-	dw MapGroup_Olivine     ;  1
-	dw MapGroup_Mahogany    ;  2
-	dw MapGroup_Dungeons    ;  3
-	dw MapGroup_Ecruteak    ;  4
-	dw MapGroup_Blackthorn  ;  5
-	dw MapGroup_Cinnabar    ;  6
-	dw MapGroup_Cerulean    ;  7
-	dw MapGroup_Azalea      ;  8
-	dw MapGroup_LakeOfRage  ;  9
-	dw MapGroup_Violet      ; 10
-	dw MapGroup_Goldenrod   ; 11
-	dw MapGroup_Vermilion   ; 12
-	dw MapGroup_Pallet      ; 13
-	dw MapGroup_Pewter      ; 14
-	dw MapGroup_FastShip    ; 15
-	dw MapGroup_Indigo      ; 16
-	dw MapGroup_Fuchsia     ; 17
-	dw MapGroup_Lavender    ; 18
-	dw MapGroup_Silver      ; 19
-	dw MapGroup_CableClub   ; 20
-	dw MapGroup_Celadon     ; 21
-	dw MapGroup_Cianwood    ; 22
-	dw MapGroup_Viridian    ; 23
-	dw MapGroup_NewBark     ; 24
-	dw MapGroup_Saffron     ; 25
-	dw MapGroup_Cherrygrove ; 26
-
-
-MapGroup_Olivine:
-	map_def OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineTimsHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineHouseBeta, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivinePunishmentSpeechHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineGoodRodHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route39Barn, TILESET_TRADITIONAL_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route39Farmhouse, TILESET_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route38, TILESET_JOHTO, ROUTE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route39, TILESET_JOHTO, ROUTE, ROUTE_39, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def OlivineCity, TILESET_JOHTO, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-MapGroup_Mahogany:
-	map_def MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MahoganyGym, TILESET_ELITE_FOUR_ROOM, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route42, TILESET_JOHTO, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def Route44, TILESET_JOHTO, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def MahoganyTown, TILESET_JOHTO, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-MapGroup_Dungeons:
-	map_def SproutTower1F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SproutTower2F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SproutTower3F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower1F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower2F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower3F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower4F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower5F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower6F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower7F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower8F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTower9F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BurnedTower1F, TILESET_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphOutside, TILESET_JOHTO, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphResearchCenter, TILESET_FACILITY, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RuinsOfAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def UnionCave1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def UnionCaveB1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def UnionCaveB2F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def SlowpokeWellB1F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def SlowpokeWellB2F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def OlivineLighthouse1F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineLighthouse2F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineLighthouse3F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MahoganyMart1F, TILESET_TRADITIONAL_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TeamRocketBaseB2F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TeamRocketBaseB3F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def IlexForest, TILESET_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_NITE, FISHGROUP_POND
-	map_def GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodUndergroundSwitchRoomEntrances, TILESET_ELITE_FOUR_ROOM, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MountMortar1FOutside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def MountMortar1FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def MountMortar2FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def MountMortarB1F, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def IcePath1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def IcePathB1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def IcePathB2FMahoganySide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def IcePathB2FBlackthornSide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def IcePathB3F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def WhirlIslandNW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandNE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandSW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandCave, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandSE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandB1F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandB2F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def WhirlIslandLugiaChamber, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
-	map_def SilverCaveRoom1, TILESET_DARK_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
-	map_def SilverCaveRoom2, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def SilverCaveRoom3, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DAY, FISHGROUP_LAKE
-	map_def SilverCaveItemRooms, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def DarkCaveVioletEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
-	map_def DarkCaveBlackthornEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
-	map_def DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def DragonsDenB1F, TILESET_JOHTO, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
-	map_def DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
-	map_def DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, FALSE, PALETTE_NITE, FISHGROUP_SHORE
-	map_def RockTunnel1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
-	map_def RockTunnelB1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
-	map_def SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SafariZoneBeta, TILESET_PARK, CAVE, FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE
-
-MapGroup_Ecruteak:
-	map_def EcruteakHouse, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def DanceTheatre, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakGym, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EcruteakCity, TILESET_JOHTO, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
-
-MapGroup_Blackthorn:
-	map_def BlackthornGym1F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BlackthornGym2F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BlackthornDragonSpeechHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BlackthornEmysHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MoveDeletersHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route45, TILESET_JOHTO, ROUTE, ROUTE_45, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI_2
-	map_def Route46, TILESET_JOHTO, ROUTE, ROUTE_46, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def BlackthornCity, TILESET_JOHTO, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_POND
-
-MapGroup_Cinnabar:
-	map_def CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route20, TILESET_KANTO, ROUTE, ROUTE_20, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def Route21, TILESET_KANTO, ROUTE, ROUTE_21, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-
-MapGroup_Cerulean:
-	map_def CeruleanGymBadgeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeruleanPoliceStation, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeruleanTradeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_NONE
-	map_def CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PowerPlant, TILESET_FACILITY, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BillsHouse, TILESET_HOUSE, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-	map_def Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def Route24, TILESET_KANTO, ROUTE, ROUTE_24, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def Route25, TILESET_KANTO, ROUTE, ROUTE_25, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-
-MapGroup_Azalea:
-	map_def AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CharcoalKiln, TILESET_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def KurtsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def AzaleaGym, TILESET_ELITE_FOUR_ROOM, INDOOR, AZALEA_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route33, TILESET_JOHTO_MODERN, ROUTE, ROUTE_33, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def AzaleaTown, TILESET_JOHTO_MODERN, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-MapGroup_LakeOfRage:
-	map_def LakeOfRageHiddenPowerHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LakeOfRageMagikarpHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route43, TILESET_JOHTO, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def LakeOfRage, TILESET_JOHTO, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
-
-MapGroup_Violet:
-	map_def Route32, TILESET_JOHTO, ROUTE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH
-	map_def Route35, TILESET_JOHTO, ROUTE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def Route36, TILESET_JOHTO, ROUTE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route37, TILESET_JOHTO, ROUTE, ROUTE_37, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def VioletCity, TILESET_JOHTO, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VioletGym, TILESET_ELITE_FOUR_ROOM, INDOOR, VIOLET_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VioletNicknameSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VioletKylesHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Goldenrod:
-	map_def Route34, TILESET_JOHTO_MODERN, ROUTE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def GoldenrodCity, TILESET_JOHTO_MODERN, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodBikeShop, TILESET_CHAMPIONS_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodHappinessRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodBillsHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodNameRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore4F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore5F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStore6F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Vermilion:
-	map_def Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def VermilionHouseFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PokemonFanClub, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionMagnetTrainSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Pallet:
-	map_def Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BluesHouse, TILESET_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Pewter:
-	map_def Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def PewterNidoranSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PewterGym, TILESET_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PewterSnoozeSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_FastShip:
-	map_def OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def VermilionPort, TILESET_PORT, ROUTE, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def FastShip1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FastShipCabins_NNW_NNE_NE, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FastShipCabins_SW_SSW_NW, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FastShipCabins_SE_SSE_CaptainsCabin, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FastShipB1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def MountMoonGiftShop, TILESET_TRADITIONAL_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TinTowerRoof, TILESET_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-MapGroup_Indigo:
-	map_def Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def WillsRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def KogasRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BrunosRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def KarensRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LancesRoom, TILESET_CHAMPIONS_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Fuchsia:
-	map_def Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
-	map_def Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route18, TILESET_KANTO, ROUTE, ROUTE_18, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def FuchsiaCity, TILESET_KANTO, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
-	map_def FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FuchsiaBillSpeechHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SafariZoneWardensHome, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Lavender:
-	map_def Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
-	map_def Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
-	map_def LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MrFujisHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LavenderSpeechHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LavenderNameRater, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SoulHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route8SaffronGate, TILESET_GATE, GATE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route12SuperRodHouse, TILESET_HOUSE, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Silver:
-	map_def Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route28FamousSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_CableClub:
-	map_def Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MobileTradeRoomMobile, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MobileBattleRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Celadon:
-	map_def Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-	map_def CeladonCity, TILESET_KANTO, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-	map_def CeladonDeptStore1F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStore2F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStore3F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStore4F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStore5F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStore6F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonDeptStoreElevator, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonMansion1F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonMansion2F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonMansion3F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonMansionRoof, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonMansionRoofHouse, TILESET_HOUSE, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CeladonCafe, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route16FuchsiaSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Cianwood:
-	map_def Route40, TILESET_JOHTO, ROUTE, ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route41, TILESET_JOHTO, ROUTE, ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def CianwoodCity, TILESET_JOHTO, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def ManiasHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CianwoodGym, TILESET_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CianwoodPharmacy, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-
-MapGroup_Viridian:
-	map_def Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def ViridianNicknameSpeechHouse, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TrainerHouse1F, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def TrainerHouseB1F, TILESET_FACILITY, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route2NuggetSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_NewBark:
-	map_def Route26, TILESET_JOHTO, ROUTE, ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def Route27, TILESET_JOHTO, ROUTE, ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map_def ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def KrissHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def KrissNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Saffron:
-	map_def Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MrPsychicsHouse, TILESET_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SaffronMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def SilphCo1F, TILESET_FACILITY, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route5CleanseTagSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-
-MapGroup_Cherrygrove:
-	map_def Route30, TILESET_JOHTO, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def Route31, TILESET_JOHTO, ROUTE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map_def CherrygroveCity, TILESET_JOHTO, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map_def CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def GuideGentsHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def CherrygroveEvolutionSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route30BerrySpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def MrPokemonsHouse, TILESET_FACILITY, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/data/maps/environment_colors.asm b/data/maps/environment_colors.asm
index aeddb83bc..3497b2b93 100644
--- a/data/maps/environment_colors.asm
+++ b/data/maps/environment_colors.asm
@@ -9,7 +9,7 @@ EnvironmentColorsPointers:
 	dw .IndoorColors  ; GATE
 	dw .DungeonColors ; DUNGEON
 
-; Valid indices: $00 - $29
+; Valid indices: $00 - $29 (see gfx/tilesets/bg_tiles.pal)
 .OutdoorColors:
 	db $00, $01, $02, $28, $04, $05, $06, $07 ; morn
 	db $08, $09, $0a, $28, $0c, $0d, $0e, $0f ; day
diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm
index b41db0ea1..007b59073 100644
--- a/data/maps/flypoints.asm
+++ b/data/maps/flypoints.asm
@@ -3,36 +3,35 @@ flypoint: MACRO
 	db \2, SPAWN_\1
 ENDM
 
-Flypoints: ; 91c5e
+Flypoints:
 ; landmark, spawn point
 	const_def
 ; Johto
-	flypoint NEW_BARK,    NEW_BARK_TOWN
-	flypoint CHERRYGROVE, CHERRYGROVE_CITY
-	flypoint VIOLET,      VIOLET_CITY
-	flypoint AZALEA,      AZALEA_TOWN
-	flypoint GOLDENROD,   GOLDENROD_CITY
-	flypoint ECRUTEAK,    ECRUTEAK_CITY
-	flypoint OLIVINE,     OLIVINE_CITY
-	flypoint CIANWOOD,    CIANWOOD_CITY
-	flypoint MAHOGANY,    MAHOGANY_TOWN
-	flypoint LAKE,        LAKE_OF_RAGE
-	flypoint BLACKTHORN,  BLACKTHORN_CITY
-	flypoint MT_SILVER,   SILVER_CAVE
+	flypoint NEW_BARK,     NEW_BARK_TOWN
+	flypoint CHERRYGROVE,  CHERRYGROVE_CITY
+	flypoint VIOLET,       VIOLET_CITY
+	flypoint AZALEA,       AZALEA_TOWN
+	flypoint GOLDENROD,    GOLDENROD_CITY
+	flypoint ECRUTEAK,     ECRUTEAK_CITY
+	flypoint OLIVINE,      OLIVINE_CITY
+	flypoint CIANWOOD,     CIANWOOD_CITY
+	flypoint MAHOGANY,     MAHOGANY_TOWN
+	flypoint LAKE_OF_RAGE, LAKE_OF_RAGE
+	flypoint BLACKTHORN,   BLACKTHORN_CITY
+	flypoint MT_SILVER,    SILVER_CAVE
 
 ; Kanto
 KANTO_FLYPOINT EQU const_value
-	flypoint PALLET,      PALLET_TOWN
-	flypoint VIRIDIAN,    VIRIDIAN_CITY
-	flypoint PEWTER,      PEWTER_CITY
-	flypoint CERULEAN,    CERULEAN_CITY
-	flypoint VERMILION,   VERMILION_CITY
-	flypoint ROCK_TUNNEL, ROCK_TUNNEL
-	flypoint LAVENDER,    LAVENDER_TOWN
-	flypoint CELADON,     CELADON_CITY
-	flypoint SAFFRON,     SAFFRON_CITY
-	flypoint FUCHSIA,     FUCHSIA_CITY
-	flypoint CINNABAR,    CINNABAR_ISLAND
-	flypoint INDIGO,      INDIGO_PLATEAU
+	flypoint PALLET,       PALLET_TOWN
+	flypoint VIRIDIAN,     VIRIDIAN_CITY
+	flypoint PEWTER,       PEWTER_CITY
+	flypoint CERULEAN,     CERULEAN_CITY
+	flypoint VERMILION,    VERMILION_CITY
+	flypoint ROCK_TUNNEL,  ROCK_TUNNEL
+	flypoint LAVENDER,     LAVENDER_TOWN
+	flypoint CELADON,      CELADON_CITY
+	flypoint SAFFRON,      SAFFRON_CITY
+	flypoint FUCHSIA,      FUCHSIA_CITY
+	flypoint CINNABAR,     CINNABAR_ISLAND
+	flypoint INDIGO,       INDIGO_PLATEAU
 	db -1
-; 91c8f
diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm
index 0b927aaf6..d34b85987 100644
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@@ -1,108 +1,107 @@
 landmark: MACRO
 ; x, y, name
-	db \1, \2
+	db \1 + 8, \2 + 16
 	dw \3
 ENDM
 
-Landmarks: ; 0x1ca8c3
+Landmarks:
 ; entries correspond to constants/landmark_constants.asm
-	landmark   0,   0, SpecialMapName
-	landmark 148, 116, NewBarkTownName
-	landmark 136, 116, Route29Name
-	landmark 108, 116, CherrygroveCityName
-	landmark 108,  96, Route30Name
-	landmark 104,  76, Route31Name
-	landmark  92,  76, VioletCityName
-	landmark  93,  74, SproutTowerName
-	landmark  92, 108, Route32Name
-	landmark  84,  92, RuinsOfAlphName
-	landmark  92, 140, UnionCaveName
-	landmark  90, 140, Route33Name
-	landmark  76, 140, AzaleaTownName
-	landmark  78, 138, SlowpokeWellName
-	landmark  60, 136, IlexForestName
-	landmark  60, 128, Route34Name
-	landmark  60, 108, GoldenrodCityName
-	landmark  58, 108, RadioTowerName
-	landmark  60,  92, Route35Name
-	landmark  60,  76, NationalParkName
-	landmark  72,  76, Route36Name
-	landmark  76,  68, Route37Name
-	landmark  76,  60, EcruteakCityName
-	landmark  78,  58, TinTowerName
-	landmark  74,  58, BurnedTowerName
-	landmark  60,  60, Route38Name
-	landmark  44,  64, Route39Name
-	landmark  44,  76, OlivineCityName
-	landmark  46,  78, LighthouseName
-	landmark  36,  72, BattleTowerName
-	landmark  36,  80, Route40Name
-	landmark  36, 108, WhirlIslandsName
-	landmark  36, 116, Route41Name
-	landmark  28, 116, CianwoodCityName
-	landmark 100,  60, Route42Name
-	landmark  92,  60, MtMortarName
-	landmark 116,  60, MahoganyTownName
-	landmark 116,  52, Route43Name
-	landmark 116,  44, LakeOfRageName
-	landmark 128,  60, Route44Name
-	landmark 138,  54, IcePathName
-	landmark 140,  60, BlackthornCityName
-	landmark 140,  52, DragonsDenName
-	landmark 140,  80, Route45Name
-	landmark 120,  88, DarkCaveName
-	landmark 132, 104, Route46Name
-	landmark 156,  84, SilverCaveName
-	landmark  60, 124, PalletTownName
-	landmark  60, 108, Route1Name
-	landmark  60,  92, ViridianCityName
-	landmark  60,  80, Route2Name
-	landmark  60,  68, PewterCityName
-	landmark  72,  68, Route3Name
-	landmark  84,  68, MtMoonName
-	landmark  96,  68, Route4Name
-	landmark 108,  68, CeruleanCityName
-	landmark 108,  60, Route24Name
-	landmark 116,  52, Route25Name
-	landmark 108,  76, Route5Name
-	landmark 116,  92, UndergroundName
-	landmark 108,  92, Route6Name
-	landmark 108, 100, VermilionCityName
-	landmark  96,  76, DiglettsCaveName
-	landmark  96,  84, Route7Name
-	landmark 124,  84, Route8Name
-	landmark 124,  68, Route9Name
-	landmark 140,  68, RockTunnelName
-	landmark 140,  72, Route10Name
-	landmark 140,  76, PowerPlantName
-	landmark 140,  84, LavenderTownName
-	landmark 148,  84, LavRadioTowerName
-	landmark  84,  84, CeladonCityName
-	landmark 108,  84, SaffronCityName
-	landmark 124, 100, Route11Name
-	landmark 140,  96, Route12Name
-	landmark 132, 116, Route13Name
-	landmark 124, 128, Route14Name
-	landmark 112, 132, Route15Name
-	landmark  76,  84, Route16Name
-	landmark  76, 108, Route17Name
-	landmark  88, 132, Route18Name
-	landmark 100, 132, FuchsiaCityName
-	landmark 100, 144, Route19Name
-	landmark  84, 148, Route20Name
-	landmark  76, 148, SeafoamIslandsName
-	landmark  60, 148, CinnabarIslandName
-	landmark  60, 136, Route21Name
-	landmark  44,  84, Route22Name
-	landmark  36,  68, VictoryRoadName
-	landmark  36,  60, Route23Name
-	landmark  36,  52, IndigoPlateauName
-	landmark  36, 108, Route26Name
-	landmark  28, 116, Route27Name
-	landmark  20, 116, TohjoFallsName
-	landmark  28,  84, Route28Name
-	landmark 148, 132, FastShipName
-; 0x1caa43
+	dbbw       0,   0, SpecialMapName
+	landmark 140, 100, NewBarkTownName
+	landmark 128, 100, Route29Name
+	landmark 100, 100, CherrygroveCityName
+	landmark 100,  80, Route30Name
+	landmark  96,  60, Route31Name
+	landmark  84,  60, VioletCityName
+	landmark  85,  58, SproutTowerName
+	landmark  84,  92, Route32Name
+	landmark  76,  76, RuinsOfAlphName
+	landmark  84, 124, UnionCaveName
+	landmark  82, 124, Route33Name
+	landmark  68, 124, AzaleaTownName
+	landmark  70, 122, SlowpokeWellName
+	landmark  52, 120, IlexForestName
+	landmark  52, 112, Route34Name
+	landmark  52,  92, GoldenrodCityName
+	landmark  50,  92, RadioTowerName
+	landmark  52,  76, Route35Name
+	landmark  52,  60, NationalParkName
+	landmark  64,  60, Route36Name
+	landmark  68,  52, Route37Name
+	landmark  68,  44, EcruteakCityName
+	landmark  70,  42, TinTowerName
+	landmark  66,  42, BurnedTowerName
+	landmark  52,  44, Route38Name
+	landmark  36,  48, Route39Name
+	landmark  36,  60, OlivineCityName
+	landmark  38,  62, LighthouseName
+	landmark  28,  56, BattleTowerName
+	landmark  28,  64, Route40Name
+	landmark  28,  92, WhirlIslandsName
+	landmark  28, 100, Route41Name
+	landmark  20, 100, CianwoodCityName
+	landmark  92,  44, Route42Name
+	landmark  84,  44, MtMortarName
+	landmark 108,  44, MahoganyTownName
+	landmark 108,  36, Route43Name
+	landmark 108,  28, LakeOfRageName
+	landmark 120,  44, Route44Name
+	landmark 130,  38, IcePathName
+	landmark 132,  44, BlackthornCityName
+	landmark 132,  36, DragonsDenName
+	landmark 132,  64, Route45Name
+	landmark 112,  72, DarkCaveName
+	landmark 124,  88, Route46Name
+	landmark 148,  68, SilverCaveName
+	landmark  52, 108, PalletTownName
+	landmark  52,  92, Route1Name
+	landmark  52,  76, ViridianCityName
+	landmark  52,  64, Route2Name
+	landmark  52,  52, PewterCityName
+	landmark  64,  52, Route3Name
+	landmark  76,  52, MtMoonName
+	landmark  88,  52, Route4Name
+	landmark 100,  52, CeruleanCityName
+	landmark 100,  44, Route24Name
+	landmark 108,  36, Route25Name
+	landmark 100,  60, Route5Name
+	landmark 108,  76, UndergroundName
+	landmark 100,  76, Route6Name
+	landmark 100,  84, VermilionCityName
+	landmark  88,  60, DiglettsCaveName
+	landmark  88,  68, Route7Name
+	landmark 116,  68, Route8Name
+	landmark 116,  52, Route9Name
+	landmark 132,  52, RockTunnelName
+	landmark 132,  56, Route10Name
+	landmark 132,  60, PowerPlantName
+	landmark 132,  68, LavenderTownName
+	landmark 140,  68, LavRadioTowerName
+	landmark  76,  68, CeladonCityName
+	landmark 100,  68, SaffronCityName
+	landmark 116,  84, Route11Name
+	landmark 132,  80, Route12Name
+	landmark 124, 100, Route13Name
+	landmark 116, 112, Route14Name
+	landmark 104, 116, Route15Name
+	landmark  68,  68, Route16Name
+	landmark  68,  92, Route17Name
+	landmark  80, 116, Route18Name
+	landmark  92, 116, FuchsiaCityName
+	landmark  92, 128, Route19Name
+	landmark  76, 132, Route20Name
+	landmark  68, 132, SeafoamIslandsName
+	landmark  52, 132, CinnabarIslandName
+	landmark  52, 120, Route21Name
+	landmark  36,  68, Route22Name
+	landmark  28,  52, VictoryRoadName
+	landmark  28,  44, Route23Name
+	landmark  28,  36, IndigoPlateauName
+	landmark  28,  92, Route26Name
+	landmark  20, 100, Route27Name
+	landmark  12, 100, TohjoFallsName
+	landmark  20,  68, Route28Name
+	landmark 140, 116, FastShipName
 
 NewBarkTownName:     db "NEW BARK¯TOWN@"
 CherrygroveCityName: db "CHERRYGROVE¯CITY@"
@@ -129,7 +128,7 @@ WhirlIslandsName:    db "WHIRL¯ISLANDS@"
 MtMortarName:        db "MT.MORTAR@"
 DragonsDenName:      db "DRAGON'S¯DEN@"
 IcePathName:         db "ICE PATH@"
-NotApplicableName:   db "N/A@"
+NotApplicableName:   db "N/A@" ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
 PalletTownName:      db "PALLET TOWN@"
 ViridianCityName:    db "VIRIDIAN¯CITY@"
 PewterCityName:      db "PEWTER CITY@"
diff --git a/data/maps/map_data.asm b/data/maps/map_data.asm
new file mode 100644
index 000000000..15ff249fe
--- /dev/null
+++ b/data/maps/map_data.asm
@@ -0,0 +1,11 @@
+INCLUDE "constants.asm"
+
+
+SECTION "Maps", ROMX
+
+INCLUDE "data/maps/maps.asm"
+INCLUDE "data/maps/attributes.asm"
+
+INCLUDE "data/maps/blocks.asm"
+
+INCLUDE "data/maps/scripts.asm"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index 56958ccfc..1cc528738 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -1,12 +1,484 @@
-INCLUDE "constants.asm"
+map: MACRO
+;\1: map name: for the MapAttributes pointer (see data/maps/attributes.asm)
+;\2: tileset: a TILESET_* constant
+;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON
+;\4: location: from constants/landmark_constants.asm
+;\5: music: a MUSIC_* constant
+;\6: phone service flag: TRUE to prevent phone calls
+;\7: time of day: a PALETTE_* constant
+;\8: fishing group: a FISHGROUP_* constant
+	db BANK(\1_MapAttributes), \2, \3
+	dw \1_MapAttributes
+	db \4, \5
+	dn \6, \7
+	db \8
+ENDM
 
+MapGroupPointers::
+; pointers to the first map of each map group
+	dw MapGroup_Olivine     ;  1
+	dw MapGroup_Mahogany    ;  2
+	dw MapGroup_Dungeons    ;  3
+	dw MapGroup_Ecruteak    ;  4
+	dw MapGroup_Blackthorn  ;  5
+	dw MapGroup_Cinnabar    ;  6
+	dw MapGroup_Cerulean    ;  7
+	dw MapGroup_Azalea      ;  8
+	dw MapGroup_LakeOfRage  ;  9
+	dw MapGroup_Violet      ; 10
+	dw MapGroup_Goldenrod   ; 11
+	dw MapGroup_Vermilion   ; 12
+	dw MapGroup_Pallet      ; 13
+	dw MapGroup_Pewter      ; 14
+	dw MapGroup_FastShip    ; 15
+	dw MapGroup_Indigo      ; 16
+	dw MapGroup_Fuchsia     ; 17
+	dw MapGroup_Lavender    ; 18
+	dw MapGroup_Silver      ; 19
+	dw MapGroup_CableClub   ; 20
+	dw MapGroup_Celadon     ; 21
+	dw MapGroup_Cianwood    ; 22
+	dw MapGroup_Viridian    ; 23
+	dw MapGroup_NewBark     ; 24
+	dw MapGroup_Saffron     ; 25
+	dw MapGroup_Cherrygrove ; 26
 
-SECTION "Maps", ROMX
+MapGroup_Olivine:
+	map OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineTimsHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineHouseBeta, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivinePunishmentSpeechHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineGoodRodHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route39Barn, TILESET_TRADITIONAL_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route39Farmhouse, TILESET_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route38, TILESET_JOHTO, ROUTE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route39, TILESET_JOHTO, ROUTE, ROUTE_39, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map OlivineCity, TILESET_JOHTO, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 
-INCLUDE "data/maps/definitions.asm"
-INCLUDE "data/maps/data.asm"
+MapGroup_Mahogany:
+	map MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MahoganyGym, TILESET_ELITE_FOUR_ROOM, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route42, TILESET_JOHTO, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map Route44, TILESET_JOHTO, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map MahoganyTown, TILESET_JOHTO, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 
+MapGroup_Dungeons:
+	map SproutTower1F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SproutTower2F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SproutTower3F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower1F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower2F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower3F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower4F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower5F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower6F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower7F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower8F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTower9F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BurnedTower1F, TILESET_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphOutside, TILESET_JOHTO, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphResearchCenter, TILESET_FACILITY, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map RuinsOfAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map UnionCave1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map UnionCaveB1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map UnionCaveB2F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map SlowpokeWellB1F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map SlowpokeWellB2F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map OlivineLighthouse1F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineLighthouse2F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineLighthouse3F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MahoganyMart1F, TILESET_TRADITIONAL_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map TeamRocketBaseB2F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map TeamRocketBaseB3F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map IlexForest, TILESET_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_NITE, FISHGROUP_POND
+	map GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodUndergroundSwitchRoomEntrances, TILESET_ELITE_FOUR_ROOM, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map MountMortar1FOutside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map MountMortar1FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map MountMortar2FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map MountMortarB1F, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map IcePath1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map IcePathB1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map IcePathB2FMahoganySide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map IcePathB2FBlackthornSide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map IcePathB3F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map WhirlIslandNW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandNE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandSW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandCave, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandSE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandB1F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandB2F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map WhirlIslandLugiaChamber, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS
+	map SilverCaveRoom1, TILESET_DARK_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
+	map SilverCaveRoom2, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map SilverCaveRoom3, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DAY, FISHGROUP_LAKE
+	map SilverCaveItemRooms, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map DarkCaveVioletEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
+	map DarkCaveBlackthornEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE
+	map DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map DragonsDenB1F, TILESET_JOHTO, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI
+	map DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
+	map DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE
+	map UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, FALSE, PALETTE_NITE, FISHGROUP_SHORE
+	map RockTunnel1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
+	map RockTunnelB1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE
+	map SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SafariZoneBeta, TILESET_PARK, CAVE, FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE
 
-INCLUDE "data/maps/blocks.asm"
+MapGroup_Ecruteak:
+	map EcruteakTinTowerEntrance, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map DanceTheatre, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakGym, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map EcruteakCity, TILESET_JOHTO, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
 
-INCLUDE "data/maps/scripts.asm"
+MapGroup_Blackthorn:
+	map BlackthornGym1F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BlackthornGym2F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BlackthornDragonSpeechHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BlackthornEmysHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MoveDeletersHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route45, TILESET_JOHTO, ROUTE, ROUTE_45, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI_2
+	map Route46, TILESET_JOHTO, ROUTE, ROUTE_46, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map BlackthornCity, TILESET_JOHTO, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_POND
+
+MapGroup_Cinnabar:
+	map CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route20, TILESET_KANTO, ROUTE, ROUTE_20, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map Route21, TILESET_KANTO, ROUTE, ROUTE_21, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+
+MapGroup_Cerulean:
+	map CeruleanGymBadgeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeruleanPoliceStation, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeruleanTradeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_NONE
+	map CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PowerPlant, TILESET_FACILITY, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BillsHouse, TILESET_HOUSE, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+	map Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map Route24, TILESET_KANTO, ROUTE, ROUTE_24, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map Route25, TILESET_KANTO, ROUTE, ROUTE_25, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+
+MapGroup_Azalea:
+	map AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CharcoalKiln, TILESET_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map KurtsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map AzaleaGym, TILESET_ELITE_FOUR_ROOM, INDOOR, AZALEA_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route33, TILESET_JOHTO_MODERN, ROUTE, ROUTE_33, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map AzaleaTown, TILESET_JOHTO_MODERN, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+
+MapGroup_LakeOfRage:
+	map LakeOfRageHiddenPowerHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LakeOfRageMagikarpHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route43, TILESET_JOHTO, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map LakeOfRage, TILESET_JOHTO, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
+
+MapGroup_Violet:
+	map Route32, TILESET_JOHTO, ROUTE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH
+	map Route35, TILESET_JOHTO, ROUTE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map Route36, TILESET_JOHTO, ROUTE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route37, TILESET_JOHTO, ROUTE, ROUTE_37, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map VioletCity, TILESET_JOHTO, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VioletGym, TILESET_ELITE_FOUR_ROOM, INDOOR, VIOLET_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VioletNicknameSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VioletKylesHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Goldenrod:
+	map Route34, TILESET_JOHTO_MODERN, ROUTE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map GoldenrodCity, TILESET_JOHTO_MODERN, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodBikeShop, TILESET_CHAMPIONS_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodHappinessRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BillsFamilysHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodNameRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore4F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore5F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStore6F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PokecomCenterAdminOfficeMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Vermilion:
+	map Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map VermilionFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PokemonFanClub, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionMagnetTrainSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Pallet:
+	map Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BluesHouse, TILESET_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Pewter:
+	map Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map PewterNidoranSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PewterGym, TILESET_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PewterSnoozeSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_FastShip:
+	map OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map VermilionPort, TILESET_PORT, ROUTE, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map FastShip1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FastShipCabins_NNW_NNE_NE, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FastShipCabins_SW_SSW_NW, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FastShipCabins_SE_SSE_CaptainsCabin, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FastShipB1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map MountMoonGiftShop, TILESET_TRADITIONAL_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TinTowerRoof, TILESET_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+
+MapGroup_Indigo:
+	map Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map WillsRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map KogasRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BrunosRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map KarensRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map LancesRoom, TILESET_CHAMPIONS_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Fuchsia:
+	map Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
+	map Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route18, TILESET_KANTO, ROUTE, ROUTE_18, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FuchsiaCity, TILESET_KANTO, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS
+	map FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BillsBrothersHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SafariZoneWardensHome, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Lavender:
+	map Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
+	map Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
+	map LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MrFujisHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LavenderSpeechHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LavenderNameRater, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SoulHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route8SaffronGate, TILESET_GATE, GATE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route12SuperRodHouse, TILESET_HOUSE, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Silver:
+	map Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route28SteelWingHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_CableClub:
+	map Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map MobileTradeRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map MobileBattleRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Celadon:
+	map Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+	map CeladonCity, TILESET_KANTO, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
+	map CeladonDeptStore1F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStore2F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStore3F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStore4F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStore5F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStore6F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonDeptStoreElevator, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonMansion1F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonMansion2F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonMansion3F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonMansionRoof, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonMansionRoofHouse, TILESET_HOUSE, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map CeladonCafe, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route16FuchsiaSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Cianwood:
+	map Route40, TILESET_JOHTO, ROUTE, ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route41, TILESET_JOHTO, ROUTE, ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map CianwoodCity, TILESET_JOHTO, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map ManiasHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CianwoodGym, TILESET_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CianwoodPharmacy, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+
+MapGroup_Viridian:
+	map Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map ViridianNicknameSpeechHouse, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TrainerHouse1F, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map TrainerHouseB1F, TILESET_FACILITY, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route2NuggetHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_NewBark:
+	map Route26, TILESET_JOHTO, ROUTE, ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map Route27, TILESET_JOHTO, ROUTE, ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PlayersHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route26HealHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map DayOfWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Saffron:
+	map Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
+	map SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MrPsychicsHouse, TILESET_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SaffronMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map SilphCo1F, TILESET_FACILITY, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route5CleanseTagHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+
+MapGroup_Cherrygrove:
+	map Route30, TILESET_JOHTO, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map Route31, TILESET_JOHTO, ROUTE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
+	map CherrygroveCity, TILESET_JOHTO, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map GuideGentsHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map CherrygroveEvolutionSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route30BerryHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map MrPokemonsHouse, TILESET_FACILITY, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm
index c7e30114a..03f4076f9 100644
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@@ -1,7 +1,7 @@
 ; Valid sprite IDs for each map group.
 ; Maps with environment ROUTE or TOWN can only use these sprites.
 
-OutdoorSprites: ; 144b8
+OutdoorSprites:
 ; entries correspond to map groups
 	dw OlivineGroupSprites
 	dw MahoganyGroupSprites
@@ -29,10 +29,8 @@ OutdoorSprites: ; 144b8
 	dw NewBarkGroupSprites
 	dw SaffronGroupSprites
 	dw CherrygroveGroupSprites
-; 144ec
 
-
-PalletGroupSprites: ; 144ec
+PalletGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -56,9 +54,8 @@ PalletGroupSprites: ; 144ec
 	db SPRITE_SWIMMER_GUY
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14503
 
-ViridianGroupSprites: ; 14503
+ViridianGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -82,9 +79,8 @@ ViridianGroupSprites: ; 14503
 	db SPRITE_SWIMMER_GUY
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 1451a
 
-PewterGroupSprites: ; 1451a
+PewterGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -108,9 +104,8 @@ PewterGroupSprites: ; 1451a
 	db SPRITE_SWIMMER_GUY
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14531
 
-CinnabarGroupSprites: ; 14531
+CinnabarGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -134,9 +129,8 @@ CinnabarGroupSprites: ; 14531
 	db SPRITE_SWIMMER_GUY
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14548
 
-CeruleanGroupSprites: ; 14548
+CeruleanGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -160,9 +154,8 @@ CeruleanGroupSprites: ; 14548
 	db SPRITE_MISTY
 	db SPRITE_POKE_BALL
 	db SPRITE_SLOWPOKE
-; 1455f
 
-SaffronGroupSprites: ; 1455f
+SaffronGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -186,9 +179,8 @@ SaffronGroupSprites: ; 1455f
 	db SPRITE_MISTY
 	db SPRITE_POKE_BALL
 	db SPRITE_SLOWPOKE
-; 14576
 
-CeladonGroupSprites: ; 14576
+CeladonGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -212,9 +204,8 @@ CeladonGroupSprites: ; 14576
 	db SPRITE_BLUE
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 1458d
 
-LavenderGroupSprites: ; 1458d
+LavenderGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -238,9 +229,8 @@ LavenderGroupSprites: ; 1458d
 	db SPRITE_BIKER
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 145a4
 
-VermilionGroupSprites: ; 145a4
+VermilionGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -264,9 +254,8 @@ VermilionGroupSprites: ; 145a4
 	db SPRITE_BIKER
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 145bb
 
-FuchsiaGroupSprites: ; 145bb
+FuchsiaGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -290,9 +279,8 @@ FuchsiaGroupSprites: ; 145bb
 	db SPRITE_BIKER
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 145d2
 
-IndigoGroupSprites: ; 145d2
+IndigoGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -316,9 +304,8 @@ IndigoGroupSprites: ; 145d2
 	db SPRITE_BIKER
 	db SPRITE_POKE_BALL
 	db SPRITE_BOULDER
-; 145e9
 
-NewBarkGroupSprites: ; 145e9
+NewBarkGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -342,9 +329,8 @@ NewBarkGroupSprites: ; 145e9
 	db SPRITE_COOLTRAINER_F
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14600
 
-CherrygroveGroupSprites: ; 14600
+CherrygroveGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -368,9 +354,8 @@ CherrygroveGroupSprites: ; 14600
 	db SPRITE_COOLTRAINER_F
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14617
 
-SilverGroupSprites: ; 14617
+SilverGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -394,9 +379,8 @@ SilverGroupSprites: ; 14617
 	db SPRITE_COOLTRAINER_F
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 1462e
 
-VioletGroupSprites: ; 1462e
+VioletGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -420,9 +404,8 @@ VioletGroupSprites: ; 1462e
 	db SPRITE_WEIRD_TREE
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14645
 
-EcruteakGroupSprites: ; 14645
+EcruteakGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -446,9 +429,8 @@ EcruteakGroupSprites: ; 14645
 	db SPRITE_WEIRD_TREE
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 1465c
 
-AzaleaGroupSprites: ; 1465c
+AzaleaGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -472,9 +454,8 @@ AzaleaGroupSprites: ; 1465c
 	db SPRITE_SILVER
 	db SPRITE_FRUIT_TREE
 	db SPRITE_SLOWPOKE
-; 14673
 
-GoldenrodGroupSprites: ; 14673
+GoldenrodGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_POKE_BALL
@@ -498,9 +479,8 @@ GoldenrodGroupSprites: ; 14673
 	db SPRITE_DAY_CARE_MON_2
 	db SPRITE_FRUIT_TREE
 	db SPRITE_SLOWPOKE
-; 1468a
 
-CianwoodGroupSprites: ; 1468a
+CianwoodGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -524,9 +504,8 @@ CianwoodGroupSprites: ; 1468a
 	db SPRITE_TAUROS
 	db SPRITE_FRUIT_TREE
 	db SPRITE_ROCK
-; 146a1
 
-OlivineGroupSprites: ; 146a1
+OlivineGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -550,9 +529,8 @@ OlivineGroupSprites: ; 146a1
 	db SPRITE_TAUROS
 	db SPRITE_FRUIT_TREE
 	db SPRITE_ROCK
-; 146b8
 
-LakeOfRageGroupSprites: ; 146b8
+LakeOfRageGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -576,9 +554,8 @@ LakeOfRageGroupSprites: ; 146b8
 	db SPRITE_GYARADOS
 	db SPRITE_FRUIT_TREE
 	db SPRITE_POKE_BALL
-; 146cf
 
-MahoganyGroupSprites: ; 146cf
+MahoganyGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -602,9 +579,8 @@ MahoganyGroupSprites: ; 146cf
 	db SPRITE_FISHER
 	db SPRITE_FRUIT_TREE
 	db SPRITE_POKE_BALL
-; 146e6
 
-BlackthornGroupSprites: ; 146e6
+BlackthornGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -628,9 +604,8 @@ BlackthornGroupSprites: ; 146e6
 	db SPRITE_FISHER
 	db SPRITE_FRUIT_TREE
 	db SPRITE_POKE_BALL
-; 146fd
 
-DungeonsGroupSprites: ; 146fd
+DungeonsGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -654,9 +629,8 @@ DungeonsGroupSprites: ; 146fd
 	db SPRITE_SCIENTIST
 	db SPRITE_POKE_BALL
 	db SPRITE_BOULDER
-; 14714
 
-FastShipGroupSprites: ; 14714
+FastShipGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -680,9 +654,8 @@ FastShipGroupSprites: ; 14714
 	db SPRITE_FAIRY
 	db SPRITE_POKE_BALL
 	db SPRITE_ROCK
-; 1472b
 
-CableClubGroupSprites: ; 1472b
+CableClubGroupSprites:
 	db SPRITE_OAK
 	db SPRITE_FISHER
 	db SPRITE_TEACHER
@@ -694,4 +667,3 @@ CableClubGroupSprites: ; 1472b
 	db SPRITE_FISHING_GURU
 	db SPRITE_POKE_BALL
 	db SPRITE_POKEDEX
-; 14736
diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm
index 2a1b8d3eb..0a27e97ca 100644
--- a/data/maps/roofs.asm
+++ b/data/maps/roofs.asm
@@ -1,39 +1,46 @@
-MapGroupRoofs: ; 1c021i
+; MapGroupRoofs values; Roofs indexes
+	const_def
+	const ROOF_NEW_BARK  ; 0
+	const ROOF_VIOLET    ; 1
+	const ROOF_AZALEA    ; 2
+	const ROOF_OLIVINE   ; 3
+	const ROOF_GOLDENROD ; 4
+
+MapGroupRoofs:
 ; entries correspond to map groups
 ; values are indexes for Roofs (see below)
-	db -1 ; group 0 (unused)
-	db  3 ; group 1 (Olivine)
-	db  2 ; group 2 (Mahogany)
-	db -1 ; group 3
-	db  1 ; group 4 (Ecruteak)
-	db  2 ; group 5 (Blackthorn)
-	db -1 ; group 6
-	db -1 ; group 7
-	db  2 ; group 8 (Azalea)
-	db  2 ; group 9 (Lake of Rage)
-	db  1 ; group 10 (Violet)
-	db  4 ; group 11 (Goldenrod)
-	db -1 ; group 12
-	db -1 ; group 13
-	db -1 ; group 14
-	db -1 ; group 15
-	db -1 ; group 16
-	db -1 ; group 17
-	db -1 ; group 18
-	db  0 ; group 19 (Silver Cave)
-	db -1 ; group 20
-	db -1 ; group 21
-	db  3 ; group 22 (Cianwood)
-	db -1 ; group 23
-	db  0 ; group 24 (New Bark)
-	db -1 ; group 25
-	db  0 ; group 26 (Cherrygrove)
-; 1c03c
+	db -1             ;  0
+	db ROOF_OLIVINE   ;  1 (Olivine)
+	db ROOF_AZALEA    ;  2 (Mahogany)
+	db -1             ;  3
+	db ROOF_VIOLET    ;  4 (Ecruteak)
+	db ROOF_AZALEA    ;  5 (Blackthorn)
+	db -1             ;  6
+	db -1             ;  7
+	db ROOF_AZALEA    ;  8 (Azalea)
+	db ROOF_AZALEA    ;  9 (Lake of Rage)
+	db ROOF_VIOLET    ; 10 (Violet)
+	db ROOF_GOLDENROD ; 11 (Goldenrod)
+	db -1             ; 12
+	db -1             ; 13
+	db -1             ; 14
+	db -1             ; 15
+	db -1             ; 16
+	db -1             ; 17
+	db -1             ; 18
+	db ROOF_NEW_BARK  ; 19 (Silver Cave)
+	db -1             ; 20
+	db -1             ; 21
+	db ROOF_OLIVINE   ; 22 (Cianwood)
+	db -1             ; 23
+	db ROOF_NEW_BARK  ; 24 (New Bark)
+	db -1             ; 25
+	db ROOF_NEW_BARK  ; 26 (Cherrygrove)
 
-Roofs: ; 1c03c
+Roofs:
+; entries correspond to ROOF_* constants
 INCBIN "gfx/tilesets/roofs/0.2bpp"
 INCBIN "gfx/tilesets/roofs/1.2bpp"
 INCBIN "gfx/tilesets/roofs/2.2bpp"
 INCBIN "gfx/tilesets/roofs/3.2bpp"
 INCBIN "gfx/tilesets/roofs/4.2bpp"
-; 1c30c
diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm
index a835d4895..9c820f9a6 100644
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@@ -1,89 +1,87 @@
-scene_def: MACRO
-; db group, map
-; dw address
-	map \1
+scene_var: MACRO
+; map, variable
+	map_id \1
 	dw \2
 ENDM
 
-MapScenes:: ; 4d01e
-	scene_def POKECENTER_2F,                               wPokecenter2FSceneID
-	scene_def TRADE_CENTER,                                wTradeCenterSceneID
-	scene_def COLOSSEUM,                                   wColosseumSceneID
-	scene_def TIME_CAPSULE,                                wTimeCapsuleSceneID
-	scene_def POWER_PLANT,                                 wPowerPlantSceneID
-	scene_def CERULEAN_GYM,                                wCeruleanGymSceneID
-	scene_def ROUTE_25,                                    wRoute25SceneID
-	scene_def TRAINER_HOUSE_B1F,                           wTrainerHouseB1FSceneID
-	scene_def VICTORY_ROAD_GATE,                           wVictoryRoadGateSceneID
-	scene_def SAFFRON_MAGNET_TRAIN_STATION,                wSaffronMagnetTrainStationSceneID
-	scene_def ROUTE_16_GATE,                               wRoute16GateSceneID
-	scene_def ROUTE_17_ROUTE_18_GATE,                      wRoute17Route18GateSceneID
-	scene_def INDIGO_PLATEAU_POKECENTER_1F,                wIndigoPlateauPokecenter1FSceneID
-	scene_def WILLS_ROOM,                                  wWillsRoomSceneID
-	scene_def KOGAS_ROOM,                                  wKogasRoomSceneID
-	scene_def BRUNOS_ROOM,                                 wBrunosRoomSceneID
-	scene_def KARENS_ROOM,                                 wKarensRoomSceneID
-	scene_def LANCES_ROOM,                                 wLancesRoomSceneID
-	scene_def HALL_OF_FAME,                                wHallOfFameSceneID
-	scene_def ROUTE_27,                                    wRoute27SceneID
-	scene_def NEW_BARK_TOWN,                               wNewBarkTownSceneID
-	scene_def ELMS_LAB,                                    wElmsLabSceneID
-	scene_def KRISS_HOUSE_1F,                              wKrissHouse1FSceneID
-	scene_def ROUTE_29,                                    wRoute29SceneID
-	scene_def CHERRYGROVE_CITY,                            wCherrygroveCitySceneID
-	scene_def MR_POKEMONS_HOUSE,                           wMrPokemonsHouseSceneID
-	scene_def ROUTE_32,                                    wRoute32SceneID
-	scene_def ROUTE_35_NATIONAL_PARK_GATE,                 wRoute35NationalParkGateSceneID
-	scene_def ROUTE_36,                                    wRoute36SceneID
-	scene_def ROUTE_36_NATIONAL_PARK_GATE,                 wRoute36NationalParkGateSceneID
-	scene_def AZALEA_TOWN,                                 wAzaleaTownSceneID
-	scene_def GOLDENROD_GYM,                               wGoldenrodGymSceneID
-	scene_def GOLDENROD_MAGNET_TRAIN_STATION,              wGoldenrodMagnetTrainStationSceneID
-	scene_def GOLDENROD_POKECENTER_1F,                     wGoldenrodPokecenter1FSceneID
-	scene_def OLIVINE_CITY,                                wOlivineCitySceneID
-	scene_def ROUTE_34,                                    wRoute34SceneID
-	scene_def ROUTE_34_ILEX_FOREST_GATE,                   wRoute34IlexForestGateSceneID
-	scene_def ECRUTEAK_HOUSE,                              wEcruteakHouseSceneID
-	scene_def WISE_TRIOS_ROOM,                             wWiseTriosRoomSceneID
-	scene_def ECRUTEAK_POKECENTER_1F,                      wEcruteakPokecenter1FSceneID
-	scene_def ECRUTEAK_GYM,                                wEcruteakGymSceneID
-	scene_def MAHOGANY_TOWN,                               wMahoganyTownSceneID
-	scene_def ROUTE_42,                                    wRoute42SceneID
-	scene_def CIANWOOD_CITY,                               wCianwoodCitySceneID
-	scene_def BATTLE_TOWER_1F,                             wBattleTower1FSceneID
-	scene_def BATTLE_TOWER_BATTLE_ROOM,                    wBattleTowerBattleRoomSceneID
-	scene_def BATTLE_TOWER_ELEVATOR,                       wBattleTowerElevatorSceneID
-	scene_def BATTLE_TOWER_HALLWAY,                        wBattleTowerHallwaySceneID
-	scene_def BATTLE_TOWER_OUTSIDE,                        wBattleTowerOutsideSceneID
-	scene_def ROUTE_43_GATE,                               wRoute43GateSceneID
-	scene_def MOUNT_MOON,                                  wMountMoonSceneID
-	scene_def SPROUT_TOWER_3F,                             wSproutTower3FSceneID
-	scene_def TIN_TOWER_1F,                                wTinTower1FSceneID
-	scene_def BURNED_TOWER_1F,                             wBurnedTower1FSceneID
-	scene_def BURNED_TOWER_B1F,                            wBurnedTowerB1FSceneID
-	scene_def RADIO_TOWER_5F,                              wRadioTower5FSceneID
-	scene_def RUINS_OF_ALPH_OUTSIDE,                       wRuinsOfAlphOutsideSceneID
-	scene_def RUINS_OF_ALPH_RESEARCH_CENTER,               wRuinsOfAlphResearchCenterSceneID
-	scene_def RUINS_OF_ALPH_HO_OH_CHAMBER,                 wRuinsOfAlphHoOhChamberSceneID
-	scene_def RUINS_OF_ALPH_KABUTO_CHAMBER,                wRuinsOfAlphKabutoChamberSceneID
-	scene_def RUINS_OF_ALPH_OMANYTE_CHAMBER,               wRuinsOfAlphOmanyteChamberSceneID
-	scene_def RUINS_OF_ALPH_AERODACTYL_CHAMBER,            wRuinsOfAlphAerodactylChamberSceneID
-	scene_def RUINS_OF_ALPH_INNER_CHAMBER,                 wRuinsOfAlphInnerChamberSceneID
-	scene_def MAHOGANY_MART_1F,                            wMahoganyMart1FSceneID
-	scene_def TEAM_ROCKET_BASE_B1F,                        wTeamRocketBaseB1FSceneID
-	scene_def TEAM_ROCKET_BASE_B2F,                        wTeamRocketBaseB2FSceneID
-	scene_def TEAM_ROCKET_BASE_B3F,                        wTeamRocketBaseB3FSceneID
-	scene_def GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID
-	scene_def SILVER_CAVE_ROOM_3,                          wSilverCaveRoom3SceneID
-	scene_def VICTORY_ROAD,                                wVictoryRoadSceneID
-	scene_def DRAGONS_DEN_B1F,                             wDragonsDenB1FSceneID
-	scene_def DRAGON_SHRINE,                               wDragonShrineSceneID
-	scene_def OLIVINE_PORT,                                wOlivinePortSceneID
-	scene_def VERMILION_PORT,                              wVermilionPortSceneID
-	scene_def FAST_SHIP_1F,                                wFastShip1FSceneID
-	scene_def FAST_SHIP_B1F,                               wFastShipB1FSceneID
-	scene_def MOUNT_MOON_SQUARE,                           wMountMoonSquareSceneID
-	scene_def MOBILE_TRADE_ROOM_MOBILE,                    wMobileTradeRoomMobileSceneID
-	scene_def MOBILE_BATTLE_ROOM,                          wMobileBattleRoomSceneID
+MapScenes::
+	scene_var POKECENTER_2F,                               wPokecenter2FSceneID
+	scene_var TRADE_CENTER,                                wTradeCenterSceneID
+	scene_var COLOSSEUM,                                   wColosseumSceneID
+	scene_var TIME_CAPSULE,                                wTimeCapsuleSceneID
+	scene_var POWER_PLANT,                                 wPowerPlantSceneID
+	scene_var CERULEAN_GYM,                                wCeruleanGymSceneID
+	scene_var ROUTE_25,                                    wRoute25SceneID
+	scene_var TRAINER_HOUSE_B1F,                           wTrainerHouseB1FSceneID
+	scene_var VICTORY_ROAD_GATE,                           wVictoryRoadGateSceneID
+	scene_var SAFFRON_MAGNET_TRAIN_STATION,                wSaffronMagnetTrainStationSceneID
+	scene_var ROUTE_16_GATE,                               wRoute16GateSceneID
+	scene_var ROUTE_17_ROUTE_18_GATE,                      wRoute17Route18GateSceneID
+	scene_var INDIGO_PLATEAU_POKECENTER_1F,                wIndigoPlateauPokecenter1FSceneID
+	scene_var WILLS_ROOM,                                  wWillsRoomSceneID
+	scene_var KOGAS_ROOM,                                  wKogasRoomSceneID
+	scene_var BRUNOS_ROOM,                                 wBrunosRoomSceneID
+	scene_var KARENS_ROOM,                                 wKarensRoomSceneID
+	scene_var LANCES_ROOM,                                 wLancesRoomSceneID
+	scene_var HALL_OF_FAME,                                wHallOfFameSceneID
+	scene_var ROUTE_27,                                    wRoute27SceneID
+	scene_var NEW_BARK_TOWN,                               wNewBarkTownSceneID
+	scene_var ELMS_LAB,                                    wElmsLabSceneID
+	scene_var PLAYERS_HOUSE_1F,                            wPlayersHouse1FSceneID
+	scene_var ROUTE_29,                                    wRoute29SceneID
+	scene_var CHERRYGROVE_CITY,                            wCherrygroveCitySceneID
+	scene_var MR_POKEMONS_HOUSE,                           wMrPokemonsHouseSceneID
+	scene_var ROUTE_32,                                    wRoute32SceneID
+	scene_var ROUTE_35_NATIONAL_PARK_GATE,                 wRoute35NationalParkGateSceneID
+	scene_var ROUTE_36,                                    wRoute36SceneID
+	scene_var ROUTE_36_NATIONAL_PARK_GATE,                 wRoute36NationalParkGateSceneID
+	scene_var AZALEA_TOWN,                                 wAzaleaTownSceneID
+	scene_var GOLDENROD_GYM,                               wGoldenrodGymSceneID
+	scene_var GOLDENROD_MAGNET_TRAIN_STATION,              wGoldenrodMagnetTrainStationSceneID
+	scene_var GOLDENROD_POKECENTER_1F,                     wGoldenrodPokecenter1FSceneID
+	scene_var OLIVINE_CITY,                                wOlivineCitySceneID
+	scene_var ROUTE_34,                                    wRoute34SceneID ; unused
+	scene_var ROUTE_34_ILEX_FOREST_GATE,                   wRoute34IlexForestGateSceneID ; unused
+	scene_var ECRUTEAK_TIN_TOWER_ENTRANCE,                 wEcruteakTinTowerEntranceSceneID
+	scene_var WISE_TRIOS_ROOM,                             wWiseTriosRoomSceneID
+	scene_var ECRUTEAK_POKECENTER_1F,                      wEcruteakPokecenter1FSceneID
+	scene_var ECRUTEAK_GYM,                                wEcruteakGymSceneID
+	scene_var MAHOGANY_TOWN,                               wMahoganyTownSceneID
+	scene_var ROUTE_42,                                    wRoute42SceneID
+	scene_var CIANWOOD_CITY,                               wCianwoodCitySceneID
+	scene_var BATTLE_TOWER_1F,                             wBattleTower1FSceneID
+	scene_var BATTLE_TOWER_BATTLE_ROOM,                    wBattleTowerBattleRoomSceneID
+	scene_var BATTLE_TOWER_ELEVATOR,                       wBattleTowerElevatorSceneID
+	scene_var BATTLE_TOWER_HALLWAY,                        wBattleTowerHallwaySceneID
+	scene_var BATTLE_TOWER_OUTSIDE,                        wBattleTowerOutsideSceneID ; unused
+	scene_var ROUTE_43_GATE,                               wRoute43GateSceneID
+	scene_var MOUNT_MOON,                                  wMountMoonSceneID
+	scene_var SPROUT_TOWER_3F,                             wSproutTower3FSceneID
+	scene_var TIN_TOWER_1F,                                wTinTower1FSceneID
+	scene_var BURNED_TOWER_1F,                             wBurnedTower1FSceneID
+	scene_var BURNED_TOWER_B1F,                            wBurnedTowerB1FSceneID
+	scene_var RADIO_TOWER_5F,                              wRadioTower5FSceneID
+	scene_var RUINS_OF_ALPH_OUTSIDE,                       wRuinsOfAlphOutsideSceneID
+	scene_var RUINS_OF_ALPH_RESEARCH_CENTER,               wRuinsOfAlphResearchCenterSceneID
+	scene_var RUINS_OF_ALPH_HO_OH_CHAMBER,                 wRuinsOfAlphHoOhChamberSceneID
+	scene_var RUINS_OF_ALPH_KABUTO_CHAMBER,                wRuinsOfAlphKabutoChamberSceneID
+	scene_var RUINS_OF_ALPH_OMANYTE_CHAMBER,               wRuinsOfAlphOmanyteChamberSceneID
+	scene_var RUINS_OF_ALPH_AERODACTYL_CHAMBER,            wRuinsOfAlphAerodactylChamberSceneID
+	scene_var RUINS_OF_ALPH_INNER_CHAMBER,                 wRuinsOfAlphInnerChamberSceneID
+	scene_var MAHOGANY_MART_1F,                            wMahoganyMart1FSceneID
+	scene_var TEAM_ROCKET_BASE_B1F,                        wTeamRocketBaseB1FSceneID
+	scene_var TEAM_ROCKET_BASE_B2F,                        wTeamRocketBaseB2FSceneID
+	scene_var TEAM_ROCKET_BASE_B3F,                        wTeamRocketBaseB3FSceneID
+	scene_var GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID
+	scene_var SILVER_CAVE_ROOM_3,                          wSilverCaveRoom3SceneID ; unused
+	scene_var VICTORY_ROAD,                                wVictoryRoadSceneID
+	scene_var DRAGONS_DEN_B1F,                             wDragonsDenB1FSceneID
+	scene_var DRAGON_SHRINE,                               wDragonShrineSceneID
+	scene_var OLIVINE_PORT,                                wOlivinePortSceneID
+	scene_var VERMILION_PORT,                              wVermilionPortSceneID
+	scene_var FAST_SHIP_1F,                                wFastShip1FSceneID
+	scene_var FAST_SHIP_B1F,                               wFastShipB1FSceneID
+	scene_var MOUNT_MOON_SQUARE,                           wMountMoonSquareSceneID
+	scene_var MOBILE_TRADE_ROOM,                           wMobileTradeRoomSceneID
+	scene_var MOBILE_BATTLE_ROOM,                          wMobileBattleRoomSceneID
 	db -1
-; 4d15b
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
index 51725fb4f..ff9974833 100644
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -3,7 +3,7 @@ SECTION "Map Scripts 1", ROMX
 INCLUDE "maps/GoldenrodGym.asm"
 INCLUDE "maps/GoldenrodBikeShop.asm"
 INCLUDE "maps/GoldenrodHappinessRater.asm"
-INCLUDE "maps/GoldenrodBillsHouse.asm"
+INCLUDE "maps/BillsFamilysHouse.asm"
 INCLUDE "maps/GoldenrodMagnetTrainStation.asm"
 INCLUDE "maps/GoldenrodFlowerShop.asm"
 INCLUDE "maps/GoldenrodPPSpeechHouse.asm"
@@ -63,7 +63,7 @@ INCLUDE "maps/RadioTower5F.asm"
 INCLUDE "maps/OlivineLighthouse5F.asm"
 INCLUDE "maps/OlivineLighthouse6F.asm"
 INCLUDE "maps/GoldenrodPokecenter1F.asm"
-INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm"
+INCLUDE "maps/PokecomCenterAdminOfficeMobile.asm"
 INCLUDE "maps/IlexForestAzaleaGate.asm"
 INCLUDE "maps/Route34IlexForestGate.asm"
 INCLUDE "maps/DayCare.asm"
@@ -151,12 +151,12 @@ SECTION "Map Scripts 9", ROMX
 
 INCLUDE "maps/Route34.asm"
 INCLUDE "maps/ElmsLab.asm"
-INCLUDE "maps/KrissHouse1F.asm"
-INCLUDE "maps/KrissHouse2F.asm"
-INCLUDE "maps/KrissNeighborsHouse.asm"
+INCLUDE "maps/PlayersHouse1F.asm"
+INCLUDE "maps/PlayersHouse2F.asm"
+INCLUDE "maps/PlayersNeighborsHouse.asm"
 INCLUDE "maps/ElmsHouse.asm"
-INCLUDE "maps/Route26HealSpeechHouse.asm"
-INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm"
+INCLUDE "maps/Route26HealHouse.asm"
+INCLUDE "maps/DayOfWeekSiblingsHouse.asm"
 INCLUDE "maps/Route27SandstormHouse.asm"
 INCLUDE "maps/Route29Route46Gate.asm"
 
@@ -191,7 +191,7 @@ INCLUDE "maps/Route12SuperRodHouse.asm"
 
 SECTION "Map Scripts 11", ROMX
 
-INCLUDE "maps/EcruteakHouse.asm"
+INCLUDE "maps/EcruteakTinTowerEntrance.asm"
 INCLUDE "maps/WiseTriosRoom.asm"
 INCLUDE "maps/EcruteakPokecenter1F.asm"
 INCLUDE "maps/EcruteakLugiaSpeechHouse.asm"
@@ -206,7 +206,7 @@ INCLUDE "maps/TrainerHouseB1F.asm"
 INCLUDE "maps/ViridianMart.asm"
 INCLUDE "maps/ViridianPokecenter1F.asm"
 INCLUDE "maps/ViridianPokecenter2FBeta.asm"
-INCLUDE "maps/Route2NuggetSpeechHouse.asm"
+INCLUDE "maps/Route2NuggetHouse.asm"
 INCLUDE "maps/Route2Gate.asm"
 INCLUDE "maps/VictoryRoadGate.asm"
 
@@ -294,7 +294,7 @@ INCLUDE "maps/CopycatsHouse1F.asm"
 INCLUDE "maps/CopycatsHouse2F.asm"
 INCLUDE "maps/Route5UndergroundPathEntrance.asm"
 INCLUDE "maps/Route5SaffronGate.asm"
-INCLUDE "maps/Route5CleanseTagSpeechHouse.asm"
+INCLUDE "maps/Route5CleanseTagHouse.asm"
 
 
 SECTION "Map Scripts 16", ROMX
@@ -329,13 +329,13 @@ SECTION "Map Scripts 17", ROMX
 
 INCLUDE "maps/MahoganyTown.asm"
 INCLUDE "maps/Route32.asm"
-INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm"
+INCLUDE "maps/VermilionFishingSpeechHouse.asm"
 INCLUDE "maps/VermilionPokecenter1F.asm"
 INCLUDE "maps/VermilionPokecenter2FBeta.asm"
 INCLUDE "maps/PokemonFanClub.asm"
 INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm"
 INCLUDE "maps/VermilionMart.asm"
-INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm"
+INCLUDE "maps/VermilionDiglettsCaveSpeechHouse.asm"
 INCLUDE "maps/VermilionGym.asm"
 INCLUDE "maps/Route6SaffronGate.asm"
 INCLUDE "maps/Route6UndergroundPathEntrance.asm"
@@ -343,7 +343,7 @@ INCLUDE "maps/Pokecenter2F.asm"
 INCLUDE "maps/TradeCenter.asm"
 INCLUDE "maps/Colosseum.asm"
 INCLUDE "maps/TimeCapsule.asm"
-INCLUDE "maps/MobileTradeRoomMobile.asm"
+INCLUDE "maps/MobileTradeRoom.asm"
 INCLUDE "maps/MobileBattleRoom.asm"
 
 
@@ -361,7 +361,7 @@ INCLUDE "maps/MoveDeletersHouse.asm"
 INCLUDE "maps/FuchsiaMart.asm"
 INCLUDE "maps/SafariZoneMainOffice.asm"
 INCLUDE "maps/FuchsiaGym.asm"
-INCLUDE "maps/FuchsiaBillSpeechHouse.asm"
+INCLUDE "maps/BillsBrothersHouse.asm"
 INCLUDE "maps/FuchsiaPokecenter1F.asm"
 INCLUDE "maps/FuchsiaPokecenter2FBeta.asm"
 INCLUDE "maps/SafariZoneWardensHome.asm"
@@ -371,7 +371,7 @@ INCLUDE "maps/CherrygrovePokecenter1F.asm"
 INCLUDE "maps/CherrygroveGymSpeechHouse.asm"
 INCLUDE "maps/GuideGentsHouse.asm"
 INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm"
-INCLUDE "maps/Route30BerrySpeechHouse.asm"
+INCLUDE "maps/Route30BerryHouse.asm"
 INCLUDE "maps/MrPokemonsHouse.asm"
 INCLUDE "maps/Route31VioletGate.asm"
 
@@ -477,7 +477,7 @@ INCLUDE "maps/Route4.asm"
 INCLUDE "maps/Route10South.asm"
 INCLUDE "maps/Route23.asm"
 INCLUDE "maps/SilverCavePokecenter1F.asm"
-INCLUDE "maps/Route28FamousSpeechHouse.asm"
+INCLUDE "maps/Route28SteelWingHouse.asm"
 
 
 SECTION "Map Scripts 25", ROMX
diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm
index 47895b609..218c81e06 100644
--- a/data/maps/setup_scripts.asm
+++ b/data/maps/setup_scripts.asm
@@ -1,4 +1,4 @@
-MapSetupScripts: ; 15377
+MapSetupScripts:
 ; entries correspond to MAPSETUP_* constants (see constants/map_setup_constants.asm)
 	dw MapSetupScript_Warp
 	dw MapSetupScript_Continue
@@ -12,18 +12,17 @@ MapSetupScripts: ; 15377
 	dw MapSetupScript_Submenu
 	dw MapSetupScript_BadWarp
 	dw MapSetupScript_Fly
-; 1538f
 
-MapSetupScript_Teleport: ; 1538f
+MapSetupScript_Teleport:
 	db map_prolong_sprites
-MapSetupScript_Fly: ; 15390
+MapSetupScript_Fly:
 	db map_fade_out_palettes
 	db map_keep_roam
-MapSetupScript_Warp: ; 15392
+MapSetupScript_Warp:
 	db map_lcd_off
 	db map_sound_off
 	db map_load_spawn
-	db map_attributes
+	db map_load_attributes
 	db map_change_callback
 	db map_spawn_coord
 	db map_player_coord
@@ -44,9 +43,9 @@ MapSetupScript_Warp: ; 15392
 	db map_wildmons
 	db map_end
 
-MapSetupScript_BadWarp: ; 153a9
+MapSetupScript_BadWarp:
 	db map_load_spawn
-	db map_attributes
+	db map_load_attributes
 	db map_change_callback
 	db map_spawn_coord
 	db map_player_coord
@@ -68,10 +67,10 @@ MapSetupScript_BadWarp: ; 153a9
 	db map_wildmons
 	db map_end
 
-MapSetupScript_Connection: ; 153bf
+MapSetupScript_Connection:
 	db map_animations_off
 	db map_load_connection
-	db map_attributes
+	db map_load_attributes
 	db map_change_callback
 	db map_player_coord
 	db map_load_blocks
@@ -87,13 +86,13 @@ MapSetupScript_Connection: ; 153bf
 	db map_animations_on
 	db map_end
 
-MapSetupScript_Fall: ; 153d0
+MapSetupScript_Fall:
 	db map_prolong_sprites
-MapSetupScript_Door: ; 153d1
+MapSetupScript_Door:
 	db map_fade_out_palettes
-MapSetupScript_Train: ; 153d2
+MapSetupScript_Train:
 	db map_load_warp
-	db map_attributes
+	db map_load_attributes
 	db map_warp_face
 	db map_change_callback
 	db map_player_coord
@@ -114,7 +113,7 @@ MapSetupScript_Train: ; 153d2
 	db map_update_roam
 	db map_end
 
-MapSetupScript_ReloadMap: ; 153e7
+MapSetupScript_ReloadMap:
 	db map_fade
 	db map_clear_bg_palettes
 	db map_lcd_off
@@ -132,7 +131,7 @@ MapSetupScript_ReloadMap: ; 153e7
 	db map_wildmons
 	db map_end
 
-MapSetupScript_LinkReturn: ; 153f7
+MapSetupScript_LinkReturn:
 	db map_fade
 	db map_lcd_off
 	db map_sound_off
@@ -151,10 +150,10 @@ MapSetupScript_LinkReturn: ; 153f7
 	db map_text_scroll_off
 	db map_end
 
-MapSetupScript_Continue: ; 15408
+MapSetupScript_Continue:
 	db map_lcd_off
 	db map_sound_off
-	db map_attributes_2
+	db map_load_attributes_2
 	db map_anchor_screen
 	db map_start_callback
 	db map_load_blocks
@@ -171,7 +170,7 @@ MapSetupScript_Continue: ; 15408
 	db map_wildmons
 	db map_end
 
-MapSetupScript_Submenu: ; 1541a
+MapSetupScript_Submenu:
 	db map_load_blocks
 	db map_connection_blocks
 	db map_end
diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm
index c56ddaf7d..4b117fe67 100644
--- a/data/maps/sgb_roof_pal_inds.asm
+++ b/data/maps/sgb_roof_pal_inds.asm
@@ -1,6 +1,6 @@
 ; Crystal does not support SGB, so this is unused.
 
-MapGroupRoofSGBPalInds: ; 8a45
+MapGroupRoofSGBPalInds:
 ; entries correspond to map groups
 	db PREDEFPAL_00
 	db PREDEFPAL_OLIVINE
@@ -29,4 +29,3 @@ MapGroupRoofSGBPalInds: ; 8a45
 	db PREDEFPAL_NEW_BARK
 	db PREDEFPAL_SAFFRON
 	db PREDEFPAL_CHERRYGROVE
-; 8a60
diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm
index e0f913fab..9ac3e8d07 100644
--- a/data/maps/spawn_points.asm
+++ b/data/maps/spawn_points.asm
@@ -1,13 +1,13 @@
 spawn: MACRO
 ; map, x, y
-	map \1
+	map_id \1
 	db \2, \3
 ENDM
 
-SpawnPoints: ; 0x152ab
+SpawnPoints:
 ; entries correspond to SPAWN_* constants
 
-	spawn KRISS_HOUSE_2F,              3,  3
+	spawn PLAYERS_HOUSE_2F,            3,  3
 	spawn VIRIDIAN_POKECENTER_1F,      5,  3
 
 	spawn PALLET_TOWN,                 5,  6
@@ -38,4 +38,3 @@ SpawnPoints: ; 0x152ab
 	spawn SILVER_CAVE_OUTSIDE,        23, 20
 	spawn FAST_SHIP_CABINS_SW_SSW_NW,  6,  2
 	spawn N_A,                        -1, -1
-; 1531f
diff --git a/data/mon_menu.asm b/data/mon_menu.asm
new file mode 100644
index 000000000..b6130a199
--- /dev/null
+++ b/data/mon_menu.asm
@@ -0,0 +1,46 @@
+; MonMenuOptionStrings indexes
+	const_def 1
+	const MONMENUVALUE_STATS  ; 1
+	const MONMENUVALUE_SWITCH ; 2
+	const MONMENUVALUE_ITEM   ; 3
+	const MONMENUVALUE_CANCEL ; 4
+	const MONMENUVALUE_MOVE   ; 5
+	const MONMENUVALUE_MAIL   ; 6
+	const MONMENUVALUE_ERROR  ; 7
+
+MonMenuOptionStrings:
+; entries correspond to MONMENUVALUE_* constants
+	db "STATS@"
+	db "SWITCH@"
+	db "ITEM@"
+	db "CANCEL@"
+	db "MOVE@"
+	db "MAIL@"
+	db "ERROR!@"
+
+MonMenuOptions:
+; category, item, value; actions are in PokemonActionSubmenu (see engine/start_menu.asm)
+; moves
+	db MONMENU_FIELD_MOVE, MONMENUITEM_CUT,        CUT
+	db MONMENU_FIELD_MOVE, MONMENUITEM_FLY,        FLY
+	db MONMENU_FIELD_MOVE, MONMENUITEM_SURF,       SURF
+	db MONMENU_FIELD_MOVE, MONMENUITEM_STRENGTH,   STRENGTH
+	db MONMENU_FIELD_MOVE, MONMENUITEM_FLASH,      FLASH
+	db MONMENU_FIELD_MOVE, MONMENUITEM_WATERFALL,  WATERFALL
+	db MONMENU_FIELD_MOVE, MONMENUITEM_WHIRLPOOL,  WHIRLPOOL
+	db MONMENU_FIELD_MOVE, MONMENUITEM_DIG,        DIG
+	db MONMENU_FIELD_MOVE, MONMENUITEM_TELEPORT,   TELEPORT
+	db MONMENU_FIELD_MOVE, MONMENUITEM_SOFTBOILED, SOFTBOILED
+	db MONMENU_FIELD_MOVE, MONMENUITEM_HEADBUTT,   HEADBUTT
+	db MONMENU_FIELD_MOVE, MONMENUITEM_ROCKSMASH,  ROCK_SMASH
+	db MONMENU_FIELD_MOVE, MONMENUITEM_MILKDRINK,  MILK_DRINK
+	db MONMENU_FIELD_MOVE, MONMENUITEM_SWEETSCENT, SWEET_SCENT
+; options
+	db MONMENU_MENUOPTION, MONMENUITEM_STATS,      MONMENUVALUE_STATS
+	db MONMENU_MENUOPTION, MONMENUITEM_SWITCH,     MONMENUVALUE_SWITCH
+	db MONMENU_MENUOPTION, MONMENUITEM_ITEM,       MONMENUVALUE_ITEM
+	db MONMENU_MENUOPTION, MONMENUITEM_CANCEL,     MONMENUVALUE_CANCEL
+	db MONMENU_MENUOPTION, MONMENUITEM_MOVE,       MONMENUVALUE_MOVE
+	db MONMENU_MENUOPTION, MONMENUITEM_MAIL,       MONMENUVALUE_MAIL
+	db MONMENU_MENUOPTION, MONMENUITEM_ERROR,      MONMENUVALUE_ERROR
+	db -1
diff --git a/data/moves/animations.asm b/data/moves/animations.asm
index 030aa2fa3..95518af3d 100644
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -1,4 +1,4 @@
-BattleAnimations:: ; c906f
+BattleAnimations::
 ; entries correspond to constants/move_constants.asm
 	dw BattleAnim_0
 	dw BattleAnim_Pound
@@ -279,17 +279,15 @@ BattleAnimations:: ; c906f
 	dw BattleAnim_Wobble
 	dw BattleAnim_Shake
 	dw BattleAnim_HitConfusion
-; c929b
 
-BattleAnim_0: ; c929b
-BattleAnim_252: ; c929b
-BattleAnim_253: ; c929b
-BattleAnim_254: ; c929b
-BattleAnim_MirrorMove: ; c929b
+BattleAnim_0:
+BattleAnim_252:
+BattleAnim_253:
+BattleAnim_254:
+BattleAnim_MirrorMove:
 	anim_ret
-; c929c
 
-BattleAnim_SweetScent2: ; c929c
+BattleAnim_SweetScent2:
 	anim_2gfx ANIM_GFX_FLOWER, ANIM_GFX_MISC
 	anim_obj ANIM_OBJ_FLOWER, 64, 96, $2
 	anim_wait 2
@@ -301,9 +299,8 @@ BattleAnim_SweetScent2: ; c929c
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_wait 128
 	anim_ret
-; c92c1
 
-BattleAnim_ThrowPokeBall
+BattleAnim_ThrowPokeBall:
 	anim_if_param_equal NO_ITEM, .TheTrainerBlockedTheBall
 	anim_if_param_equal MASTER_BALL, .MasterBall
 	anim_if_param_equal ULTRA_BALL, .UltraBall
@@ -320,7 +317,6 @@ BattleAnim_ThrowPokeBall
 	anim_obj ANIM_OBJ_BALL_POOF, 136, 64, $10
 	anim_wait 16
 	anim_jump .Shake
-; c92f2
 
 .TheTrainerBlockedTheBall:
 	anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_HIT
@@ -330,7 +326,6 @@ BattleAnim_ThrowPokeBall
 	anim_obj ANIM_OBJ_01, 112, 40, $0
 	anim_wait 32
 	anim_ret
-; c9305
 
 .UltraBall:
 	anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE
@@ -344,7 +339,6 @@ BattleAnim_ThrowPokeBall
 	anim_obj ANIM_OBJ_BALL_POOF, 136, 64, $10
 	anim_wait 16
 	anim_jump .Shake
-; c9326
 
 .GreatBall:
 	anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE
@@ -358,7 +352,6 @@ BattleAnim_ThrowPokeBall
 	anim_obj ANIM_OBJ_BALL_POOF, 136, 64, $10
 	anim_wait 16
 	anim_jump .Shake
-; c9347
 
 .MasterBall:
 	anim_3gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE, ANIM_GFX_SPEED
@@ -403,12 +396,10 @@ BattleAnim_ThrowPokeBall
 	anim_incobj  1
 	anim_sound 0, 1, SFX_BALL_WOBBLE
 	anim_jump .Loop
-; c93bc
 
 .Click:
 	anim_clearsprites
 	anim_ret
-; c93be
 
 .BreakFree:
 	anim_setobj $1, $b
@@ -418,9 +409,8 @@ BattleAnim_ThrowPokeBall
 	anim_bgeffect ANIM_BG_ENTER_MON, $0, $0, $0
 	anim_wait 32
 	anim_ret
-; c93d1
 
-BattleAnim_SendOutMon: ; c93d1
+BattleAnim_SendOutMon:
 	anim_if_param_equal $0, .Normal
 	anim_if_param_equal $1, .Shiny
 	anim_if_param_equal $2, .Unknown
@@ -488,17 +478,15 @@ BattleAnim_SendOutMon: ; c93d1
 	anim_bgeffect ANIM_BG_ENTER_MON, $0, $1, $0
 	anim_wait 32
 	anim_ret
-; c9483
 
-BattleAnim_ReturnMon: ; c9483
+BattleAnim_ReturnMon:
 	anim_sound 0, 0, SFX_BALL_POOF
-BattleAnim_BatonPass_branch_c9486: ; c9486
+BattleAnim_BatonPass_branch_c9486:
 	anim_bgeffect ANIM_BG_RETURN_MON, $0, $1, $0
 	anim_wait 32
 	anim_ret
-; c948d
 
-BattleAnim_Confused: ; c948d
+BattleAnim_Confused:
 	anim_1gfx ANIM_GFX_STATUS
 	anim_sound 0, 0, SFX_KINESIS
 	anim_obj ANIM_OBJ_CHICK, 44, 56, $15
@@ -506,9 +494,8 @@ BattleAnim_Confused: ; c948d
 	anim_obj ANIM_OBJ_CHICK, 44, 56, $bf
 	anim_wait 96
 	anim_ret
-; c94a3
 
-BattleAnim_Slp: ; c94a3
+BattleAnim_Slp:
 	anim_1gfx ANIM_GFX_STATUS
 	anim_sound 0, 0, SFX_TAIL_WHIP
 .loop
@@ -517,9 +504,8 @@ BattleAnim_Slp: ; c94a3
 	anim_loop 3, .loop
 	anim_wait 32
 	anim_ret
-; c94b4
 
-BattleAnim_Brn: ; c94b4
+BattleAnim_Brn:
 	anim_1gfx ANIM_GFX_FIRE
 .loop
 	anim_sound 0, 0, SFX_BURN
@@ -528,9 +514,8 @@ BattleAnim_Brn: ; c94b4
 	anim_loop 3, .loop
 	anim_wait 6
 	anim_ret
-; c94c5
 
-BattleAnim_Psn: ; c94c5
+BattleAnim_Psn:
 	anim_1gfx ANIM_GFX_POISON
 	anim_sound 0, 0, SFX_POISON
 	anim_obj ANIM_OBJ_SKULL, 64, 56, $0
@@ -539,9 +524,8 @@ BattleAnim_Psn: ; c94c5
 	anim_obj ANIM_OBJ_SKULL, 48, 56, $0
 	anim_wait 8
 	anim_ret
-; c94da
 
-BattleAnim_Sap: ; c94da
+BattleAnim_Sap:
 	anim_1gfx ANIM_GFX_CHARGE
 	anim_sound 6, 3, SFX_WATER_GUN
 	anim_obj ANIM_OBJ_ABSORB, 128, 48, $2
@@ -553,9 +537,8 @@ BattleAnim_Sap: ; c94da
 	anim_obj ANIM_OBJ_ABSORB, 136, 32, $4
 	anim_wait 16
 	anim_ret
-; c94f8
 
-BattleAnim_Frz: ; c94f8
+BattleAnim_Frz:
 	anim_1gfx ANIM_GFX_ICE
 	anim_obj ANIM_OBJ_FROZEN, 44, 110, $0
 	anim_sound 0, 0, SFX_SHINE
@@ -563,9 +546,8 @@ BattleAnim_Frz: ; c94f8
 	anim_sound 0, 0, SFX_SHINE
 	anim_wait 16
 	anim_ret
-; c9508
 
-BattleAnim_Par: ; c9508
+BattleAnim_Par:
 	anim_1gfx ANIM_GFX_STATUS
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_sound 0, 0, SFX_THUNDERSHOCK
@@ -573,9 +555,8 @@ BattleAnim_Par: ; c9508
 	anim_obj ANIM_OBJ_PARALYZED, 76, 88, $c2
 	anim_wait 128
 	anim_ret
-; c951e
 
-BattleAnim_InLove: ; c951e
+BattleAnim_InLove:
 	anim_1gfx ANIM_GFX_OBJECTS
 	anim_sound 0, 0, SFX_LICK
 	anim_obj ANIM_OBJ_HEART, 64, 76, $0
@@ -584,9 +565,8 @@ BattleAnim_InLove: ; c951e
 	anim_obj ANIM_OBJ_HEART, 36, 72, $0
 	anim_wait 32
 	anim_ret
-; c9533
 
-BattleAnim_InSandstorm: ; c9533
+BattleAnim_InSandstorm:
 	anim_1gfx ANIM_GFX_POWDER
 	anim_obj ANIM_OBJ_SANDSTORM, 88, 0, $0
 	anim_wait 8
@@ -599,17 +579,15 @@ BattleAnim_InSandstorm: ; c9533
 	anim_loop 6, .loop
 	anim_wait 8
 	anim_ret
-; c9550
 
-BattleAnim_InNightmare: ; c9550
+BattleAnim_InNightmare:
 	anim_1gfx ANIM_GFX_ANGELS
 	anim_sound 0, 0, SFX_BUBBLEBEAM
 	anim_obj ANIM_OBJ_IN_NIGHTMARE, 68, 80, $0
 	anim_wait 40
 	anim_ret
-; c955c
 
-BattleAnim_InWhirlpool: ; c955c
+BattleAnim_InWhirlpool:
 	anim_1gfx ANIM_GFX_WIND
 	anim_bgeffect ANIM_BG_WHIRLPOOL, $0, $0, $0
 	anim_sound 0, 1, SFX_SURF
@@ -620,21 +598,18 @@ BattleAnim_InWhirlpool: ; c955c
 	anim_incbgeffect ANIM_BG_WHIRLPOOL
 	anim_wait 1
 	anim_ret
-; c9574
 
-BattleAnim_HitConfusion: ; c9574
+BattleAnim_HitConfusion:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 0, SFX_POUND
 	anim_obj ANIM_OBJ_04, 44, 96, $0
 	anim_wait 16
 	anim_ret
-; c9580
 
-BattleAnim_Miss: ; c9580
+BattleAnim_Miss:
 	anim_ret
-; c9581
 
-BattleAnim_EnemyDamage: ; c9581
+BattleAnim_EnemyDamage:
 .loop
 	anim_bgeffect ANIM_BG_HIDE_MON, $0, $0, $0
 	anim_wait 5
@@ -642,45 +617,39 @@ BattleAnim_EnemyDamage: ; c9581
 	anim_wait 5
 	anim_loop 3, .loop
 	anim_ret
-; c9592
 
-BattleAnim_EnemyStatDown: ; c9592
+BattleAnim_EnemyStatDown:
 	anim_call BattleAnim_FollowEnemyFeet_1
 	anim_bgeffect ANIM_BG_VIBRATE_MON, $0, $0, $0
 	anim_wait 40
 	anim_call BattleAnim_ShowMon_1
 	anim_wait 1
 	anim_ret
-; c95a0
 
-BattleAnim_PlayerStatDown: ; c95a0
+BattleAnim_PlayerStatDown:
 	anim_call BattleAnim_FollowEnemyFeet_1
 	anim_bgeffect ANIM_BG_WOBBLE_MON, $0, $0, $0
 	anim_wait 40
 	anim_call BattleAnim_ShowMon_1
 	anim_wait 1
 	anim_ret
-; c95ae
 
-BattleAnim_PlayerDamage: ; c95ae
+BattleAnim_PlayerDamage:
 	anim_bgeffect ANIM_BG_20, $20, $2, $20
 	anim_wait 40
 	anim_ret
-; c95b5
 
-BattleAnim_Wobble: ; c95b5
+BattleAnim_Wobble:
 	anim_bgeffect ANIM_BG_35, $0, $0, $0
 	anim_wait 40
 	anim_ret
-; c95bc
 
-BattleAnim_Shake: ; c95bc
+BattleAnim_Shake:
 	anim_bgeffect ANIM_BG_1F, $20, $2, $40
 	anim_wait 40
 	anim_ret
-; c95c3
 
-BattleAnim_Pound: ; c95c3
+BattleAnim_Pound:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_POUND
 	anim_obj ANIM_OBJ_08, 136, 56, $0
@@ -688,9 +657,8 @@ BattleAnim_Pound: ; c95c3
 	anim_obj ANIM_OBJ_01, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; c95d5
 
-BattleAnim_KarateChop: ; c95d5
+BattleAnim_KarateChop:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_KARATE_CHOP
 	anim_obj ANIM_OBJ_08, 136, 40, $0
@@ -708,9 +676,8 @@ BattleAnim_KarateChop: ; c95d5
 	anim_obj ANIM_OBJ_01, 136, 48, $0
 	anim_wait 16
 	anim_ret
-; c9605
 
-BattleAnim_Doubleslap: ; c9605
+BattleAnim_Doubleslap:
 	anim_1gfx ANIM_GFX_HIT
 	anim_if_param_equal $1, BattleAnim_Doubleslap_branch_c961b
 	anim_sound 0, 1, SFX_DOUBLESLAP
@@ -719,18 +686,16 @@ BattleAnim_Doubleslap: ; c9605
 	anim_obj ANIM_OBJ_01, 144, 48, $0
 	anim_wait 8
 	anim_ret
-; c961b
 
-BattleAnim_Doubleslap_branch_c961b: ; c961b
+BattleAnim_Doubleslap_branch_c961b:
 	anim_sound 0, 1, SFX_DOUBLESLAP
 	anim_obj ANIM_OBJ_08, 120, 48, $0
 	anim_wait 6
 	anim_obj ANIM_OBJ_01, 120, 48, $0
 	anim_wait 8
 	anim_ret
-; c962b
 
-BattleAnim_CometPunch: ; c962b
+BattleAnim_CometPunch:
 	anim_1gfx ANIM_GFX_HIT
 	anim_if_param_equal $1, BattleAnim_CometPunch_branch_c9641
 	anim_sound 0, 1, SFX_COMET_PUNCH
@@ -739,19 +704,17 @@ BattleAnim_CometPunch: ; c962b
 	anim_obj ANIM_OBJ_01, 144, 48, $0
 	anim_wait 8
 	anim_ret
-; c9641
 
-BattleAnim_CometPunch_branch_c9641: ; c9641
+BattleAnim_CometPunch_branch_c9641:
 	anim_sound 0, 1, SFX_COMET_PUNCH
 	anim_obj ANIM_OBJ_06, 120, 64, $0
 	anim_wait 6
 	anim_obj ANIM_OBJ_01, 120, 64, $0
 	anim_wait 8
 	anim_ret
-; c9651
 
-BattleAnim_Bide_branch_c9651: ; c9651
-BattleAnim_MegaPunch: ; c9651
+BattleAnim_Bide_branch_c9651:
+BattleAnim_MegaPunch:
 	anim_1gfx ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_1F, $40, $2, $0
 	anim_wait 48
@@ -765,9 +728,8 @@ BattleAnim_MegaPunch: ; c9651
 	anim_wait 6
 	anim_loop 3, .loop
 	anim_ret
-; c9677
 
-BattleAnim_Stomp: ; c9677
+BattleAnim_Stomp:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_STOMP
 	anim_obj ANIM_OBJ_07, 136, 40, $0
@@ -785,9 +747,8 @@ BattleAnim_Stomp: ; c9677
 	anim_obj ANIM_OBJ_01, 136, 48, $0
 	anim_wait 16
 	anim_ret
-; c96a7
 
-BattleAnim_DoubleKick: ; c96a7
+BattleAnim_DoubleKick:
 	anim_1gfx ANIM_GFX_HIT
 	anim_if_param_equal $1, BattleAnim_DoubleKick_branch_c96bd
 	anim_sound 0, 1, SFX_DOUBLE_KICK
@@ -796,18 +757,16 @@ BattleAnim_DoubleKick: ; c96a7
 	anim_obj ANIM_OBJ_01, 144, 48, $0
 	anim_wait 8
 	anim_ret
-; c96bd
 
-BattleAnim_DoubleKick_branch_c96bd: ; c96bd
+BattleAnim_DoubleKick_branch_c96bd:
 	anim_sound 0, 1, SFX_DOUBLE_KICK
 	anim_obj ANIM_OBJ_07, 120, 64, $0
 	anim_wait 6
 	anim_obj ANIM_OBJ_01, 120, 64, $0
 	anim_wait 8
 	anim_ret
-; c96cd
 
-BattleAnim_JumpKick: ; c96cd
+BattleAnim_JumpKick:
 	anim_1gfx ANIM_GFX_HIT
 	anim_if_param_equal $1, BattleAnim_JumpKick_branch_c96f1
 	anim_sound 0, 1, SFX_JUMP_KICK
@@ -820,17 +779,15 @@ BattleAnim_JumpKick: ; c96cd
 	anim_obj ANIM_OBJ_04, 136, 48, $0
 	anim_wait 16
 	anim_ret
-; c96f1
 
-BattleAnim_JumpKick_branch_c96f1: ; c96f1
+BattleAnim_JumpKick_branch_c96f1:
 	anim_wait 8
 	anim_sound 0, 0, SFX_DOUBLE_KICK
 	anim_obj ANIM_OBJ_04, 44, 88, $0
 	anim_wait 16
 	anim_ret
-; c96fc
 
-BattleAnim_HiJumpKick: ; c96fc
+BattleAnim_HiJumpKick:
 	anim_1gfx ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_1F, $40, $2, $0
 	anim_if_param_equal $1, BattleAnim_HiJumpKick_branch_c971e
@@ -843,17 +800,15 @@ BattleAnim_HiJumpKick: ; c96fc
 	anim_obj ANIM_OBJ_04, 136, 48, $0
 	anim_wait 16
 	anim_ret
-; c971e
 
-BattleAnim_HiJumpKick_branch_c971e: ; c971e
+BattleAnim_HiJumpKick_branch_c971e:
 	anim_wait 16
 	anim_sound 0, 0, SFX_DOUBLE_KICK
 	anim_obj ANIM_OBJ_04, 44, 88, $0
 	anim_wait 16
 	anim_ret
-; c9729
 
-BattleAnim_RollingKick: ; c9729
+BattleAnim_RollingKick:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_DOUBLE_KICK
 	anim_obj ANIM_OBJ_07, 112, 56, $0
@@ -862,9 +817,8 @@ BattleAnim_RollingKick: ; c9729
 	anim_obj ANIM_OBJ_01, 136, 48, $0
 	anim_wait 16
 	anim_ret
-; c973e
 
-BattleAnim_MegaKick: ; c973e
+BattleAnim_MegaKick:
 	anim_1gfx ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_1F, $40, $2, $0
 	anim_wait 67
@@ -878,9 +832,8 @@ BattleAnim_MegaKick: ; c973e
 	anim_wait 6
 	anim_loop 3, .loop
 	anim_ret
-; c9764
 
-BattleAnim_HyperFang: ; c9764
+BattleAnim_HyperFang:
 	anim_1gfx ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_1F, $20, $1, $0
 	anim_sound 0, 1, SFX_BITE
@@ -889,9 +842,8 @@ BattleAnim_HyperFang: ; c9764
 	anim_obj ANIM_OBJ_01, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; c977b
 
-BattleAnim_SuperFang: ; c977b
+BattleAnim_SuperFang:
 	anim_1gfx ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_1F, $40, $2, $0
 	anim_wait 48
@@ -905,9 +857,8 @@ BattleAnim_SuperFang: ; c977b
 	anim_wait 6
 	anim_loop 3, .loop
 	anim_ret
-; c97a1
 
-BattleAnim_Ember: ; c97a1
+BattleAnim_Ember:
 	anim_1gfx ANIM_GFX_FIRE
 	anim_sound 6, 2, SFX_EMBER
 	anim_obj ANIM_OBJ_EMBER, 64, 96, $12
@@ -927,17 +878,15 @@ BattleAnim_Ember: ; c97a1
 	anim_obj ANIM_OBJ_EMBER, 144, 68, $30
 	anim_wait 32
 	anim_ret
-; c97d8
 
-BattleAnim_FirePunch: ; c97d8
+BattleAnim_FirePunch:
 	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_FIRE
 	anim_obj ANIM_OBJ_0A, 136, 56, $43
 	anim_call BattleAnim_FirePunch_branch_cbbcc
 	anim_wait 16
 	anim_ret
-; c97e5
 
-BattleAnim_FireSpin: ; c97e5
+BattleAnim_FireSpin:
 	anim_1gfx ANIM_GFX_FIRE
 .loop
 	anim_sound 6, 2, SFX_EMBER
@@ -955,9 +904,8 @@ BattleAnim_FireSpin: ; c97e5
 	anim_loop 2, .loop
 	anim_wait 96
 	anim_ret
-; c9811
 
-BattleAnim_DragonRage: ; c9811
+BattleAnim_DragonRage:
 	anim_1gfx ANIM_GFX_FIRE
 .loop
 	anim_sound 6, 2, SFX_EMBER
@@ -966,9 +914,8 @@ BattleAnim_DragonRage: ; c9811
 	anim_loop 16, .loop
 	anim_wait 64
 	anim_ret
-; c9822
 
-BattleAnim_Flamethrower: ; c9822
+BattleAnim_Flamethrower:
 	anim_1gfx ANIM_GFX_FIRE
 	anim_sound 6, 2, SFX_EMBER
 	anim_obj ANIM_OBJ_FLAMETHROWER, 64, 92, $3
@@ -993,9 +940,8 @@ BattleAnim_Flamethrower: ; c9822
 	anim_loop 6, .loop
 	anim_wait 16
 	anim_ret
-; c9861
 
-BattleAnim_FireBlast: ; c9861
+BattleAnim_FireBlast:
 	anim_1gfx ANIM_GFX_FIRE
 .loop1
 	anim_sound 6, 2, SFX_EMBER
@@ -1028,17 +974,15 @@ BattleAnim_FireBlast: ; c9861
 	anim_loop 2, .loop3
 	anim_wait 32
 	anim_ret
-; c98b0
 
-BattleAnim_IcePunch: ; c98b0
+BattleAnim_IcePunch:
 	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_ICE
 	anim_obj ANIM_OBJ_0A, 136, 56, $43
 	anim_call BattleAnim_IcePunch_branch_cbbdf
 	anim_wait 32
 	anim_ret
-; c98bd
 
-BattleAnim_IceBeam: ; c98bd
+BattleAnim_IceBeam:
 	anim_1gfx ANIM_GFX_ICE
 .loop
 	anim_sound 6, 2, SFX_SHINE
@@ -1057,9 +1001,8 @@ BattleAnim_IceBeam: ; c98bd
 	anim_sound 0, 1, SFX_SHINE
 	anim_wait 8
 	anim_ret
-; c98e8
 
-BattleAnim_Blizzard: ; c98e8
+BattleAnim_Blizzard:
 	anim_1gfx ANIM_GFX_ICE
 .loop
 	anim_sound 6, 2, SFX_SHINE
@@ -1081,9 +1024,8 @@ BattleAnim_Blizzard: ; c98e8
 	anim_sound 0, 1, SFX_SHINE
 	anim_wait 24
 	anim_ret
-; c991e
 
-BattleAnim_Bubble: ; c991e
+BattleAnim_Bubble:
 	anim_1gfx ANIM_GFX_BUBBLE
 	anim_sound 32, 2, SFX_WATER_GUN
 	anim_obj ANIM_OBJ_BUBBLE, 64, 92, $c1
@@ -1096,9 +1038,8 @@ BattleAnim_Bubble: ; c991e
 	anim_wait 128
 	anim_wait 32
 	anim_ret
-; c993d
 
-BattleAnim_Bubblebeam: ; c993d
+BattleAnim_Bubblebeam:
 	anim_1gfx ANIM_GFX_BUBBLE
 .loop
 	anim_sound 16, 2, SFX_BUBBLEBEAM
@@ -1122,9 +1063,8 @@ BattleAnim_Bubblebeam: ; c993d
 	anim_bgeffect ANIM_BG_32, $0, $0, $0
 	anim_wait 8
 	anim_ret
-; c9979
 
-BattleAnim_WaterGun: ; c9979
+BattleAnim_WaterGun:
 	anim_bgeffect ANIM_BG_30, $0, $0, $0
 	anim_1gfx ANIM_GFX_WATER
 	anim_call BattleAnim_FollowPlayerHead_1
@@ -1145,9 +1085,8 @@ BattleAnim_WaterGun: ; c9979
 	anim_bgeffect ANIM_BG_32, $0, $0, $0
 	anim_wait 16
 	anim_ret
-; c99b4
 
-BattleAnim_HydroPump: ; c99b4
+BattleAnim_HydroPump:
 	anim_bgeffect ANIM_BG_30, $0, $0, $0
 	anim_1gfx ANIM_GFX_WATER
 	anim_call BattleAnim_FollowPlayerHead_1
@@ -1183,9 +1122,8 @@ BattleAnim_HydroPump: ; c99b4
 	anim_bgeffect ANIM_BG_32, $0, $0, $0
 	anim_wait 16
 	anim_ret
-; c9a2a
 
-BattleAnim_Surf: ; c9a2a
+BattleAnim_Surf:
 	anim_1gfx ANIM_GFX_BUBBLE
 	anim_bgeffect ANIM_BG_SURF, $0, $0, $0
 	anim_obj ANIM_OBJ_SURF, 88, 104, $8
@@ -1196,9 +1134,8 @@ BattleAnim_Surf: ; c9a2a
 	anim_incobj  1
 	anim_wait 56
 	anim_ret
-; c9a42
 
-BattleAnim_VineWhip: ; c9a42
+BattleAnim_VineWhip:
 	anim_1gfx ANIM_GFX_WHIP
 	anim_sound 0, 1, SFX_VINE_WHIP
 	anim_obj ANIM_OBJ_40, 116, 52, $80
@@ -1209,9 +1146,8 @@ BattleAnim_VineWhip: ; c9a42
 	anim_incobj  1
 	anim_wait 4
 	anim_ret
-; c9a5a
 
-BattleAnim_LeechSeed: ; c9a5a
+BattleAnim_LeechSeed:
 	anim_1gfx ANIM_GFX_PLANT
 	anim_sound 16, 2, SFX_VINE_WHIP
 	anim_obj ANIM_OBJ_LEECH_SEED, 48, 80, $20
@@ -1225,9 +1161,8 @@ BattleAnim_LeechSeed: ; c9a5a
 	anim_sound 0, 1, SFX_CHARGE
 	anim_wait 128
 	anim_ret
-; c9a7c
 
-BattleAnim_RazorLeaf: ; c9a7c
+BattleAnim_RazorLeaf:
 	anim_1gfx ANIM_GFX_PLANT
 	anim_sound 0, 0, SFX_VINE_WHIP
 	anim_obj ANIM_OBJ_RAZOR_LEAF, 48, 80, $28
@@ -1273,9 +1208,8 @@ BattleAnim_RazorLeaf: ; c9a7c
 	anim_incobj 10
 	anim_wait 64
 	anim_ret
-; c9af2
 
-BattleAnim_Solarbeam: ; c9af2
+BattleAnim_Solarbeam:
 	anim_if_param_equal $0, .FireSolarBeam
 	; charge turn
 	anim_1gfx ANIM_GFX_CHARGE
@@ -1293,7 +1227,6 @@ BattleAnim_Solarbeam: ; c9af2
 	anim_bgeffect ANIM_BG_FLASH_WHITE, $0, $4, $2
 	anim_wait 64
 	anim_ret
-; c9b30
 
 .FireSolarBeam
 	anim_1gfx ANIM_GFX_BEAM
@@ -1301,9 +1234,8 @@ BattleAnim_Solarbeam: ; c9af2
 	anim_call BattleAnim_Solarbeam_branch_cbb39
 	anim_wait 48
 	anim_ret
-; c9b3c
 
-BattleAnim_Thunderpunch: ; c9b3c
+BattleAnim_Thunderpunch:
 	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_LIGHTNING
 	anim_obj ANIM_OBJ_0A, 136, 56, $43
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $2
@@ -1311,9 +1243,8 @@ BattleAnim_Thunderpunch: ; c9b3c
 	anim_obj ANIM_OBJ_2F, 152, 68, $0
 	anim_wait 64
 	anim_ret
-; c9b53
 
-BattleAnim_Thundershock: ; c9b53
+BattleAnim_Thundershock:
 	anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_EXPLOSION
 	anim_obj ANIM_OBJ_34, 136, 56, $2
 	anim_wait 16
@@ -1321,9 +1252,8 @@ BattleAnim_Thundershock: ; c9b53
 	anim_obj ANIM_OBJ_33, 136, 56, $0
 	anim_wait 96
 	anim_ret
-; c9b66
 
-BattleAnim_Thunderbolt: ; c9b66
+BattleAnim_Thunderbolt:
 	anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_EXPLOSION
 	anim_obj ANIM_OBJ_LIGHTNING_BOLT, 136, 56, $2
 	anim_wait 16
@@ -1334,9 +1264,8 @@ BattleAnim_Thunderbolt: ; c9b66
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $2
 	anim_wait 64
 	anim_ret
-; c9b84
 
-BattleAnim_ThunderWave: ; c9b84
+BattleAnim_ThunderWave:
 	anim_1gfx ANIM_GFX_LIGHTNING
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $3
 	anim_sound 0, 1, SFX_THUNDERSHOCK
@@ -1346,9 +1275,8 @@ BattleAnim_ThunderWave: ; c9b84
 	anim_incobj  1
 	anim_wait 96
 	anim_ret
-; c9b9a
 
-BattleAnim_Thunder: ; c9b9a
+BattleAnim_Thunder:
 	anim_1gfx ANIM_GFX_LIGHTNING
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $6, $20
 	anim_sound 0, 1, SFX_THUNDER
@@ -1361,9 +1289,8 @@ BattleAnim_Thunder: ; c9b9a
 	anim_obj ANIM_OBJ_2D, 136, 68, $0
 	anim_wait 48
 	anim_ret
-; c9bbd
 
-BattleAnim_RazorWind: ; c9bbd
+BattleAnim_RazorWind:
 	anim_if_param_equal $1, BattleAnim_RazorWind_branch_c9fb5
 	anim_1gfx ANIM_GFX_WHIP
 	anim_bgeffect ANIM_BG_06, $0, $1, $0
@@ -1387,9 +1314,8 @@ BattleAnim_RazorWind: ; c9bbd
 	anim_loop 3, .loop
 	anim_wait 24
 	anim_ret
-; c9c00
 
-BattleAnim_Sonicboom_JP: ; c9c00
+BattleAnim_Sonicboom_JP:
 	anim_2gfx ANIM_GFX_WHIP, ANIM_GFX_HIT
 .loop
 	anim_sound 3, 0, SFX_RAZOR_WIND
@@ -1412,10 +1338,9 @@ BattleAnim_Sonicboom_JP: ; c9c00
 	anim_obj ANIM_OBJ_01, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; c9c36
 
-BattleAnim_Gust: ; c9c36
-BattleAnim_Sonicboom: ; c9c36
+BattleAnim_Gust:
+BattleAnim_Sonicboom:
 	anim_2gfx ANIM_GFX_WIND, ANIM_GFX_HIT
 .loop
 	anim_sound 0, 1, SFX_RAZOR_WIND
@@ -1427,16 +1352,14 @@ BattleAnim_Sonicboom: ; c9c36
 	anim_obj ANIM_OBJ_01, 128, 32, $18
 	anim_wait 16
 	anim_ret
-; c9c53
 
-BattleAnim_Selfdestruct: ; c9c53
+BattleAnim_Selfdestruct:
 	anim_1gfx ANIM_GFX_EXPLOSION
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $24
 	anim_if_param_equal $1, .loop
 	anim_call BattleAnim_Selfdestruct_branch_cbb8f
 	anim_wait 16
 	anim_ret
-; c9c63
 
 .loop
 	anim_call BattleAnim_Selfdestruct_branch_cbb62
@@ -1445,9 +1368,8 @@ BattleAnim_Selfdestruct: ; c9c53
 	anim_loop 2, .loop
 	anim_wait 16
 	anim_ret
-; c9c72
 
-BattleAnim_Explosion: ; c9c72
+BattleAnim_Explosion:
 	anim_1gfx ANIM_GFX_EXPLOSION
 	anim_bgeffect ANIM_BG_1F, $60, $4, $10
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $24
@@ -1455,7 +1377,6 @@ BattleAnim_Explosion: ; c9c72
 	anim_call BattleAnim_Explosion_branch_cbb8f
 	anim_wait 16
 	anim_ret
-; c9c87
 
 .loop
 	anim_call BattleAnim_Explosion_branch_cbb62
@@ -1464,16 +1385,14 @@ BattleAnim_Explosion: ; c9c72
 	anim_loop 2, .loop
 	anim_wait 16
 	anim_ret
-; c9c96
 
-BattleAnim_Acid: ; c9c96
+BattleAnim_Acid:
 	anim_1gfx ANIM_GFX_POISON
 	anim_call BattleAnim_Acid_branch_cbc35
 	anim_wait 64
 	anim_ret
-; c9c9d
 
-BattleAnim_RockThrow: ; c9c9d
+BattleAnim_RockThrow:
 	anim_1gfx ANIM_GFX_ROCKS
 	anim_bgeffect ANIM_BG_1F, $60, $1, $0
 	anim_sound 0, 1, SFX_STRENGTH
@@ -1492,9 +1411,8 @@ BattleAnim_RockThrow: ; c9c9d
 	anim_obj ANIM_OBJ_SMALL_ROCK, 136, 68, $30
 	anim_wait 96
 	anim_ret
-; c9cd2
 
-BattleAnim_RockSlide: ; c9cd2
+BattleAnim_RockSlide:
 	anim_1gfx ANIM_GFX_ROCKS
 	anim_bgeffect ANIM_BG_1F, $c0, $1, $0
 .loop
@@ -1516,9 +1434,8 @@ BattleAnim_RockSlide: ; c9cd2
 	anim_loop 4, .loop
 	anim_wait 96
 	anim_ret
-; c9d0c
 
-BattleAnim_Sing: ; c9d0c
+BattleAnim_Sing:
 	anim_1gfx ANIM_GFX_NOISE
 	anim_sound 16, 2, SFX_SING
 .loop
@@ -1535,12 +1452,11 @@ BattleAnim_Sing: ; c9d0c
 	anim_loop 4, .loop
 	anim_wait 64
 	anim_ret
-; c9d35
 
-BattleAnim_Poisonpowder: ; c9d35
-BattleAnim_SleepPowder: ; c9d35
-BattleAnim_Spore: ; c9d35
-BattleAnim_StunSpore: ; c9d35
+BattleAnim_Poisonpowder:
+BattleAnim_SleepPowder:
+BattleAnim_Spore:
+BattleAnim_StunSpore:
 	anim_1gfx ANIM_GFX_POWDER
 .loop
 	anim_sound 0, 1, SFX_POWDER
@@ -1561,9 +1477,8 @@ BattleAnim_StunSpore: ; c9d35
 	anim_loop 2, .loop
 	anim_wait 96
 	anim_ret
-; c9d6a
 
-BattleAnim_HyperBeam: ; c9d6a
+BattleAnim_HyperBeam:
 	anim_1gfx ANIM_GFX_BEAM
 	anim_bgeffect ANIM_BG_1F, $30, $4, $10
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $40
@@ -1571,9 +1486,8 @@ BattleAnim_HyperBeam: ; c9d6a
 	anim_call BattleAnim_HyperBeam_branch_cbb39
 	anim_wait 48
 	anim_ret
-; c9d80
 
-BattleAnim_AuroraBeam: ; c9d80
+BattleAnim_AuroraBeam:
 	anim_1gfx ANIM_GFX_BEAM
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0
@@ -1583,18 +1497,16 @@ BattleAnim_AuroraBeam: ; c9d80
 	anim_incobj  5
 	anim_wait 64
 	anim_ret
-; c9d95
 
-BattleAnim_Vicegrip: ; c9d95
+BattleAnim_Vicegrip:
 	anim_1gfx ANIM_GFX_CUT
 	anim_sound 0, 1, SFX_VICEGRIP
 	anim_obj ANIM_OBJ_37, 152, 40, $0
 	anim_obj ANIM_OBJ_39, 120, 72, $0
 	anim_wait 32
 	anim_ret
-; c9da6
 
-BattleAnim_Scratch: ; c9da6
+BattleAnim_Scratch:
 	anim_1gfx ANIM_GFX_CUT
 	anim_sound 0, 1, SFX_SCRATCH
 	anim_obj ANIM_OBJ_37, 144, 48, $0
@@ -1602,9 +1514,8 @@ BattleAnim_Scratch: ; c9da6
 	anim_obj ANIM_OBJ_37, 136, 40, $0
 	anim_wait 32
 	anim_ret
-; c9dbc
 
-BattleAnim_FurySwipes: ; c9dbc
+BattleAnim_FurySwipes:
 	anim_1gfx ANIM_GFX_CUT
 	anim_if_param_equal $1, BattleAnim_FurySwipes_branch_c9dd9
 	anim_sound 0, 1, SFX_SCRATCH
@@ -1614,9 +1525,8 @@ BattleAnim_FurySwipes: ; c9dbc
 	anim_sound 0, 1, SFX_SCRATCH
 	anim_wait 32
 	anim_ret
-; c9dd9
 
-BattleAnim_FurySwipes_branch_c9dd9: ; c9dd9
+BattleAnim_FurySwipes_branch_c9dd9:
 	anim_sound 0, 1, SFX_SCRATCH
 	anim_obj ANIM_OBJ_38, 120, 48, $0
 	anim_obj ANIM_OBJ_38, 124, 44, $0
@@ -1624,26 +1534,23 @@ BattleAnim_FurySwipes_branch_c9dd9: ; c9dd9
 	anim_sound 0, 1, SFX_SCRATCH
 	anim_wait 32
 	anim_ret
-; c9df0
 
-BattleAnim_Cut: ; c9df0
+BattleAnim_Cut:
 	anim_1gfx ANIM_GFX_CUT
 	anim_sound 0, 1, SFX_CUT
 	anim_obj ANIM_OBJ_3A, 152, 40, $0
 	anim_wait 32
 	anim_ret
-; c9dfc
 
-BattleAnim_Slash: ; c9dfc
+BattleAnim_Slash:
 	anim_1gfx ANIM_GFX_CUT
 	anim_sound 0, 1, SFX_CUT
 	anim_obj ANIM_OBJ_3A, 152, 40, $0
 	anim_obj ANIM_OBJ_3A, 148, 36, $0
 	anim_wait 32
 	anim_ret
-; c9e0d
 
-BattleAnim_Clamp: ; c9e0d
+BattleAnim_Clamp:
 	anim_2gfx ANIM_GFX_CUT, ANIM_GFX_HIT
 	anim_obj ANIM_OBJ_CLAMP, 136, 56, $a0
 	anim_obj ANIM_OBJ_CLAMP, 136, 56, $20
@@ -1655,9 +1562,8 @@ BattleAnim_Clamp: ; c9e0d
 	anim_obj ANIM_OBJ_01, 128, 64, $18
 	anim_wait 16
 	anim_ret
-; c9e2e
 
-BattleAnim_Bite: ; c9e2e
+BattleAnim_Bite:
 	anim_2gfx ANIM_GFX_CUT, ANIM_GFX_HIT
 	anim_obj ANIM_OBJ_BITE, 136, 56, $98
 	anim_obj ANIM_OBJ_BITE, 136, 56, $18
@@ -1669,9 +1575,8 @@ BattleAnim_Bite: ; c9e2e
 	anim_obj ANIM_OBJ_01, 128, 64, $18
 	anim_wait 8
 	anim_ret
-; c9e4f
 
-BattleAnim_Teleport: ; c9e4f
+BattleAnim_Teleport:
 	anim_1gfx ANIM_GFX_SPEED
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_TELEPORT, $0, $1, $0
@@ -1684,31 +1589,28 @@ BattleAnim_Teleport: ; c9e4f
 	anim_call BattleAnim_Teleport_branch_cbb12
 	anim_wait 64
 	anim_ret
-; c9e6f
 
-BattleAnim_Fly: ; c9e6f
+BattleAnim_Fly:
 	anim_if_param_equal $1, BattleAnim_Fly_branch_c9e89
 	anim_if_param_equal $2, BattleAnim_Fly_branch_c9e82
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_WING_ATTACK
 	anim_obj ANIM_OBJ_01, 136, 56, $0
 	anim_wait 32
-BattleAnim_Fly_branch_c9e82: ; c9e82
+BattleAnim_Fly_branch_c9e82:
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0
 	anim_wait 32
 	anim_ret
-; c9e89
 
-BattleAnim_Fly_branch_c9e89: ; c9e89
+BattleAnim_Fly_branch_c9e89:
 	anim_1gfx ANIM_GFX_SPEED
 	anim_bgeffect ANIM_BG_06, $0, $1, $0
 	anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0
 	anim_call BattleAnim_Fly_branch_cbb12
 	anim_wait 64
 	anim_ret
-; c9e9a
 
-BattleAnim_DoubleTeam: ; c9e9a
+BattleAnim_DoubleTeam:
 	anim_call BattleAnim_FollowPlayerHead_0
 	anim_sound 0, 0, SFX_PSYBEAM
 	anim_bgeffect ANIM_BG_DOUBLE_TEAM, $0, $1, $0
@@ -1718,9 +1620,8 @@ BattleAnim_DoubleTeam: ; c9e9a
 	anim_incbgeffect ANIM_BG_DOUBLE_TEAM
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; c9eaf
 
-BattleAnim_Recover: ; c9eaf
+BattleAnim_Recover:
 	anim_1gfx ANIM_GFX_BUBBLE
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_sound 0, 0, SFX_FULL_HEAL
@@ -1737,9 +1638,8 @@ BattleAnim_Recover: ; c9eaf
 	anim_incbgeffect ANIM_BG_18
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; c9eeb
 
-BattleAnim_Absorb: ; c9eeb
+BattleAnim_Absorb:
 	anim_1gfx ANIM_GFX_CHARGE
 	anim_obj ANIM_OBJ_3D, 44, 88, $0
 .loop
@@ -1755,9 +1655,8 @@ BattleAnim_Absorb: ; c9eeb
 	anim_loop 5, .loop
 	anim_wait 32
 	anim_ret
-; c9f13
 
-BattleAnim_MegaDrain: ; c9f13
+BattleAnim_MegaDrain:
 	anim_1gfx ANIM_GFX_CHARGE
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_1C, $0, $0, $10
@@ -1776,21 +1675,18 @@ BattleAnim_MegaDrain: ; c9f13
 	anim_if_var_equal $7, .done
 	anim_if_var_equal $2, .spawn
 	anim_jump .loop
-; c9f46
 
 .spawn
 	anim_obj ANIM_OBJ_3D, 44, 88, $0
 	anim_jump .loop
-; c9f4e
 
 .done
 	anim_wait 32
 	anim_incbgeffect ANIM_BG_1C
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; c9f55
 
-BattleAnim_EggBomb: ; c9f55
+BattleAnim_EggBomb:
 	anim_2gfx ANIM_GFX_EGG, ANIM_GFX_EXPLOSION
 	anim_sound 0, 0, SFX_SWITCH_POKEMON
 	anim_obj ANIM_OBJ_EGG, 44, 104, $1
@@ -1808,9 +1704,8 @@ BattleAnim_EggBomb: ; c9f55
 	anim_obj ANIM_OBJ_18, 136, 72, $0
 	anim_wait 24
 	anim_ret
-; c9f85
 
-BattleAnim_Softboiled: ; c9f85
+BattleAnim_Softboiled:
 	anim_2gfx ANIM_GFX_EGG, ANIM_GFX_BUBBLE
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_sound 0, 0, SFX_SWITCH_POKEMON
@@ -1829,12 +1724,11 @@ BattleAnim_Softboiled: ; c9f85
 	anim_incbgeffect ANIM_BG_18
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; c9fb5
 
-BattleAnim_FocusEnergy: ; c9fb5
-BattleAnim_RazorWind_branch_c9fb5: ; c9fb5
-BattleAnim_SkullBash_branch_c9fb5: ; c9fb5
-BattleAnim_SkyAttack_branch_c9fb5: ; c9fb5
+BattleAnim_FocusEnergy:
+BattleAnim_RazorWind_branch_c9fb5:
+BattleAnim_SkullBash_branch_c9fb5:
+BattleAnim_SkyAttack_branch_c9fb5:
 	anim_1gfx ANIM_GFX_SPEED
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_16, $0, $1, $40
@@ -1860,9 +1754,8 @@ BattleAnim_SkyAttack_branch_c9fb5: ; c9fb5
 	anim_incbgeffect ANIM_BG_16
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; c9ffc
 
-BattleAnim_Bide: ; c9ffc
+BattleAnim_Bide:
 	anim_if_param_equal $0, BattleAnim_Bide_branch_c9651
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowEnemyFeet_0
@@ -1872,9 +1765,8 @@ BattleAnim_Bide: ; c9ffc
 	anim_incbgeffect ANIM_BG_1A
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca014
 
-BattleAnim_Bind: ; ca014
+BattleAnim_Bind:
 	anim_1gfx ANIM_GFX_ROPE
 	anim_sound 0, 1, SFX_BIND
 	anim_obj ANIM_OBJ_48, 132, 64, $0
@@ -1889,9 +1781,8 @@ BattleAnim_Bind: ; ca014
 	anim_incobj  3
 	anim_wait 96
 	anim_ret
-; ca036
 
-BattleAnim_Wrap: ; ca036
+BattleAnim_Wrap:
 	anim_1gfx ANIM_GFX_ROPE
 	anim_sound 0, 1, SFX_BIND
 	anim_obj ANIM_OBJ_48, 132, 64, $0
@@ -1906,9 +1797,8 @@ BattleAnim_Wrap: ; ca036
 	anim_incobj  3
 	anim_wait 96
 	anim_ret
-; ca058
 
-BattleAnim_Confusion: ; ca058
+BattleAnim_Confusion:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowPlayerHead_1
 	anim_sound 0, 1, SFX_PSYCHIC
@@ -1917,9 +1807,8 @@ BattleAnim_Confusion: ; ca058
 	anim_incbgeffect ANIM_BG_NIGHT_SHADE
 	anim_call BattleAnim_ShowMon_1
 	anim_ret
-; ca06c
 
-BattleAnim_Constrict: ; ca06c
+BattleAnim_Constrict:
 	anim_1gfx ANIM_GFX_ROPE
 	anim_sound 0, 1, SFX_BIND
 	anim_obj ANIM_OBJ_49, 132, 64, $0
@@ -1931,18 +1820,16 @@ BattleAnim_Constrict: ; ca06c
 	anim_obj ANIM_OBJ_48, 132, 56, $0
 	anim_wait 64
 	anim_ret
-; ca08a
 
-BattleAnim_Earthquake: ; ca08a
+BattleAnim_Earthquake:
 	anim_bgeffect ANIM_BG_1F, $60, $4, $10
 .loop
 	anim_sound 0, 1, SFX_EMBER
 	anim_wait 24
 	anim_loop 4, .loop
 	anim_ret
-; ca098
 
-BattleAnim_Fissure: ; ca098
+BattleAnim_Fissure:
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $40
 	anim_bgeffect ANIM_BG_1F, $60, $4, $0
 .loop
@@ -1950,9 +1837,8 @@ BattleAnim_Fissure: ; ca098
 	anim_wait 24
 	anim_loop 4, .loop
 	anim_ret
-; ca0ab
 
-BattleAnim_Growl: ; ca0ab
+BattleAnim_Growl:
 	anim_1gfx ANIM_GFX_NOISE
 	anim_enemyfeetobj
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
@@ -1973,9 +1859,8 @@ BattleAnim_Growl: ; ca0ab
 	anim_incobj 10
 	anim_wait 8
 	anim_ret
-; ca0d7
 
-BattleAnim_Roar: ; ca0d7
+BattleAnim_Roar:
 	anim_1gfx ANIM_GFX_NOISE
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_cry $1
@@ -1989,9 +1874,8 @@ BattleAnim_Roar: ; ca0d7
 	anim_wait 64
 .done
 	anim_ret
-; ca0f4
 
-BattleAnim_Supersonic: ; ca0f4
+BattleAnim_Supersonic:
 	anim_1gfx ANIM_GFX_PSYCHIC
 .loop
 	anim_sound 6, 2, SFX_SUPERSONIC
@@ -2000,9 +1884,8 @@ BattleAnim_Supersonic: ; ca0f4
 	anim_loop 10, .loop
 	anim_wait 64
 	anim_ret
-; ca105
 
-BattleAnim_Screech: ; ca105
+BattleAnim_Screech:
 	anim_1gfx ANIM_GFX_PSYCHIC
 	anim_bgeffect ANIM_BG_1F, $8, $1, $20
 	anim_sound 6, 2, SFX_SCREECH
@@ -2012,9 +1895,8 @@ BattleAnim_Screech: ; ca105
 	anim_loop 2, .loop
 	anim_wait 64
 	anim_ret
-; ca11b
 
-BattleAnim_ConfuseRay: ; ca11b
+BattleAnim_ConfuseRay:
 	anim_1gfx ANIM_GFX_SPEED
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_bgeffect ANIM_BG_08, $0, $4, $0
@@ -2033,17 +1915,15 @@ BattleAnim_ConfuseRay: ; ca11b
 	anim_loop 8, .loop
 	anim_wait 32
 	anim_ret
-; ca15e
 
-BattleAnim_Leer: ; ca15e
+BattleAnim_Leer:
 	anim_1gfx ANIM_GFX_BEAM
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_call BattleAnim_Leer_branch_cbadc
 	anim_wait 16
 	anim_ret
-; ca16a
 
-BattleAnim_Reflect: ; ca16a
+BattleAnim_Reflect:
 	anim_1gfx ANIM_GFX_REFLECT
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $2
@@ -2055,9 +1935,8 @@ BattleAnim_Reflect: ; ca16a
 	anim_obj ANIM_OBJ_SCREEN, 72, 80, $0
 	anim_wait 64
 	anim_ret
-; ca18e
 
-BattleAnim_LightScreen: ; ca18e
+BattleAnim_LightScreen:
 	anim_2gfx ANIM_GFX_SPEED, ANIM_GFX_REFLECT
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_sound 0, 0, SFX_FLASH
@@ -2081,9 +1960,8 @@ BattleAnim_LightScreen: ; ca18e
 	anim_obj ANIM_OBJ_SHINY, 72, 80, $38
 	anim_wait 64
 	anim_ret
-; ca1d5
 
-BattleAnim_Amnesia: ; ca1d5
+BattleAnim_Amnesia:
 	anim_1gfx ANIM_GFX_STATUS
 	anim_sound 0, 0, SFX_LICK
 	anim_obj ANIM_OBJ_AMNESIA, 64, 80, $2
@@ -2093,9 +1971,8 @@ BattleAnim_Amnesia: ; ca1d5
 	anim_obj ANIM_OBJ_AMNESIA, 72, 80, $0
 	anim_wait 64
 	anim_ret
-; ca1ed
 
-BattleAnim_DizzyPunch: ; ca1ed
+BattleAnim_DizzyPunch:
 	anim_2gfx ANIM_GFX_STATUS, ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_MEGA_PUNCH
 	anim_obj ANIM_OBJ_00, 136, 40, $0
@@ -2107,9 +1984,8 @@ BattleAnim_DizzyPunch: ; ca1ed
 	anim_obj ANIM_OBJ_CHICK, 136, 24, $bf
 	anim_wait 96
 	anim_ret
-; ca212
 
-BattleAnim_Rest: ; ca212
+BattleAnim_Rest:
 	anim_1gfx ANIM_GFX_STATUS
 	anim_sound 0, 0, SFX_TAIL_WHIP
 .loop
@@ -2118,9 +1994,8 @@ BattleAnim_Rest: ; ca212
 	anim_loop 3, .loop
 	anim_wait 32
 	anim_ret
-; ca223
 
-BattleAnim_AcidArmor: ; ca223
+BattleAnim_AcidArmor:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowPlayerHead_0
 	anim_bgeffect ANIM_BG_ACID_ARMOR, $0, $1, $8
@@ -2129,9 +2004,8 @@ BattleAnim_AcidArmor: ; ca223
 	anim_incbgeffect ANIM_BG_ACID_ARMOR
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca237
 
-BattleAnim_Splash: ; ca237
+BattleAnim_Splash:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 0, SFX_VICEGRIP
 	anim_call BattleAnim_FollowPlayerHead_0
@@ -2140,9 +2014,8 @@ BattleAnim_Splash: ; ca237
 	anim_incbgeffect ANIM_BG_BOUNCE_DOWN
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca24b
 
-BattleAnim_Dig: ; ca24b
+BattleAnim_Dig:
 	anim_2gfx ANIM_GFX_SAND, ANIM_GFX_HIT
 	anim_if_param_equal $0, .hit
 	anim_if_param_equal $2, .fail
@@ -2169,15 +2042,13 @@ BattleAnim_Dig: ; ca24b
 	anim_bgeffect ANIM_BG_ENTER_MON, $0, $1, $0
 	anim_wait 32
 	anim_ret
-; ca28d
 
-BattleAnim_SandAttack: ; ca28d
+BattleAnim_SandAttack:
 	anim_1gfx ANIM_GFX_SAND
 	anim_call BattleAnim_SandAttack_branch_cbc5b
 	anim_ret
-; ca293
 
-BattleAnim_StringShot: ; ca293
+BattleAnim_StringShot:
 	anim_1gfx ANIM_GFX_WEB
 	anim_bgeffect ANIM_BG_07, $0, $2, $0
 	anim_sound 6, 2, SFX_MENU
@@ -2199,9 +2070,8 @@ BattleAnim_StringShot: ; ca293
 	anim_obj ANIM_OBJ_STRING_SHOT, 132, 56, $2
 	anim_wait 64
 	anim_ret
-; ca2d1
 
-BattleAnim_Headbutt: ; ca2d1
+BattleAnim_Headbutt:
 	anim_1gfx ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_1F, $14, $2, $0
 	anim_wait 32
@@ -2213,9 +2083,8 @@ BattleAnim_Headbutt: ; ca2d1
 	anim_wait 8
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca2ef
 
-BattleAnim_Tackle: ; ca2ef
+BattleAnim_Tackle:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowPlayerHead_0
 	anim_bgeffect ANIM_BG_TACKLE, $0, $1, $0
@@ -2225,9 +2094,8 @@ BattleAnim_Tackle: ; ca2ef
 	anim_wait 8
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca307
 
-BattleAnim_BodySlam: ; ca307
+BattleAnim_BodySlam:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowPlayerHead_0
 	anim_bgeffect ANIM_BG_BOUNCE_DOWN, $0, $1, $0
@@ -2244,9 +2112,8 @@ BattleAnim_BodySlam: ; ca307
 	anim_wait 3
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca331
 
-BattleAnim_TakeDown: ; ca331
+BattleAnim_TakeDown:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_TACKLE, $0, $1, $0
@@ -2261,9 +2128,8 @@ BattleAnim_TakeDown: ; ca331
 	anim_wait 3
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca35c
 
-BattleAnim_DoubleEdge: ; ca35c
+BattleAnim_DoubleEdge:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $10
@@ -2277,9 +2143,8 @@ BattleAnim_DoubleEdge: ; ca35c
 	anim_wait 3
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca382
 
-BattleAnim_Submission: ; ca382
+BattleAnim_Submission:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowEnemyFeet_1
 	anim_bgeffect ANIM_BG_26, $0, $0, $0
@@ -2294,9 +2159,8 @@ BattleAnim_Submission: ; ca382
 	anim_incbgeffect ANIM_BG_26
 	anim_call BattleAnim_ShowMon_1
 	anim_ret
-; ca3a8
 
-BattleAnim_Whirlwind: ; ca3a8
+BattleAnim_Whirlwind:
 	anim_1gfx ANIM_GFX_WIND
 .loop
 	anim_sound 0, 0, SFX_RAZOR_WIND
@@ -2319,9 +2183,8 @@ BattleAnim_Whirlwind: ; ca3a8
 	anim_wait 64
 .done
 	anim_ret
-; ca3d8
 
-BattleAnim_Hypnosis: ; ca3d8
+BattleAnim_Hypnosis:
 	anim_1gfx ANIM_GFX_PSYCHIC
 .loop
 	anim_sound 6, 2, SFX_SUPERSONIC
@@ -2331,9 +2194,8 @@ BattleAnim_Hypnosis: ; ca3d8
 	anim_loop 3, .loop
 	anim_wait 56
 	anim_ret
-; ca3ee
 
-BattleAnim_Haze: ; ca3ee
+BattleAnim_Haze:
 	anim_1gfx ANIM_GFX_HAZE
 	anim_sound 0, 1, SFX_SURF
 .loop
@@ -2343,9 +2205,8 @@ BattleAnim_Haze: ; ca3ee
 	anim_loop 5, .loop
 	anim_wait 96
 	anim_ret
-; ca404
 
-BattleAnim_Mist: ; ca404
+BattleAnim_Mist:
 	anim_obp0 $54
 	anim_1gfx ANIM_GFX_HAZE
 	anim_sound 0, 0, SFX_SURF
@@ -2355,9 +2216,8 @@ BattleAnim_Mist: ; ca404
 	anim_loop 10, .loop
 	anim_wait 96
 	anim_ret
-; ca417
 
-BattleAnim_Smog: ; ca417
+BattleAnim_Smog:
 	anim_1gfx ANIM_GFX_HAZE
 	anim_sound 0, 1, SFX_BUBBLEBEAM
 .loop
@@ -2366,9 +2226,8 @@ BattleAnim_Smog: ; ca417
 	anim_loop 10, .loop
 	anim_wait 96
 	anim_ret
-; ca428
 
-BattleAnim_PoisonGas: ; ca428
+BattleAnim_PoisonGas:
 	anim_1gfx ANIM_GFX_HAZE
 	anim_sound 16, 2, SFX_BUBBLEBEAM
 .loop
@@ -2377,9 +2236,8 @@ BattleAnim_PoisonGas: ; ca428
 	anim_loop 10, .loop
 	anim_wait 128
 	anim_ret
-; ca439
 
-BattleAnim_HornAttack: ; ca439
+BattleAnim_HornAttack:
 	anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT
 	anim_obj ANIM_OBJ_HORN, 72, 80, $1
 	anim_wait 16
@@ -2387,9 +2245,8 @@ BattleAnim_HornAttack: ; ca439
 	anim_obj ANIM_OBJ_01, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; ca44c
 
-BattleAnim_FuryAttack: ; ca44c
+BattleAnim_FuryAttack:
 	anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT
 	anim_obj ANIM_OBJ_HORN, 72, 72, $2
 	anim_wait 8
@@ -2407,9 +2264,8 @@ BattleAnim_FuryAttack: ; ca44c
 	anim_obj ANIM_OBJ_04, 132, 48, $0
 	anim_wait 8
 	anim_ret
-; ca47d
 
-BattleAnim_HornDrill: ; ca47d
+BattleAnim_HornDrill:
 	anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $40
 	anim_obj ANIM_OBJ_HORN, 72, 80, $3
@@ -2429,9 +2285,8 @@ BattleAnim_HornDrill: ; ca47d
 	anim_wait 8
 	anim_loop 3, .loop
 	anim_ret
-; ca4b4
 
-BattleAnim_PoisonSting: ; ca4b4
+BattleAnim_PoisonSting:
 	anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT
 	anim_obj ANIM_OBJ_60, 64, 92, $14
 	anim_wait 16
@@ -2439,9 +2294,8 @@ BattleAnim_PoisonSting: ; ca4b4
 	anim_obj ANIM_OBJ_05, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; ca4c7
 
-BattleAnim_Twineedle: ; ca4c7
+BattleAnim_Twineedle:
 	anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_POISON_STING
 	anim_obj ANIM_OBJ_60, 64, 92, $14
@@ -2452,9 +2306,8 @@ BattleAnim_Twineedle: ; ca4c7
 	anim_obj ANIM_OBJ_05, 128, 48, $0
 	anim_wait 16
 	anim_ret
-; ca4e7
 
-BattleAnim_PinMissile: ; ca4e7
+BattleAnim_PinMissile:
 	anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT
 .loop
 	anim_obj ANIM_OBJ_60, 64, 92, $28
@@ -2472,9 +2325,8 @@ BattleAnim_PinMissile: ; ca4e7
 	anim_loop 3, .loop
 	anim_wait 16
 	anim_ret
-; ca51a
 
-BattleAnim_SpikeCannon: ; ca51a
+BattleAnim_SpikeCannon:
 	anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT
 .loop
 	anim_obj ANIM_OBJ_60, 64, 92, $18
@@ -2492,9 +2344,8 @@ BattleAnim_SpikeCannon: ; ca51a
 	anim_loop 3, .loop
 	anim_wait 16
 	anim_ret
-; ca54d
 
-BattleAnim_Transform: ; ca54d
+BattleAnim_Transform:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowPlayerHead_0
 	anim_transform
@@ -2506,9 +2357,8 @@ BattleAnim_Transform: ; ca54d
 	anim_wait 48
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca564
 
-BattleAnim_PetalDance: ; ca564
+BattleAnim_PetalDance:
 	anim_sound 0, 0, SFX_MENU
 	anim_2gfx ANIM_GFX_FLOWER, ANIM_GFX_HIT
 .loop
@@ -2521,9 +2371,8 @@ BattleAnim_PetalDance: ; ca564
 	anim_obj ANIM_OBJ_00, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; ca580
 
-BattleAnim_Barrage: ; ca580
+BattleAnim_Barrage:
 	anim_2gfx ANIM_GFX_EGG, ANIM_GFX_EXPLOSION
 	anim_sound 6, 2, SFX_THROW_BALL
 	anim_obj ANIM_OBJ_SLUDGE_BOMB, 64, 92, $10
@@ -2532,9 +2381,8 @@ BattleAnim_Barrage: ; ca580
 	anim_obj ANIM_OBJ_18, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; ca596
 
-BattleAnim_PayDay: ; ca596
+BattleAnim_PayDay:
 	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_STATUS
 	anim_sound 0, 1, SFX_POUND
 	anim_obj ANIM_OBJ_01, 128, 56, $0
@@ -2543,9 +2391,8 @@ BattleAnim_PayDay: ; ca596
 	anim_obj ANIM_OBJ_PAY_DAY, 120, 76, $1
 	anim_wait 64
 	anim_ret
-; ca5ac
 
-BattleAnim_Mimic: ; ca5ac
+BattleAnim_Mimic:
 	anim_1gfx ANIM_GFX_SPEED
 	anim_obp0 $fc
 	anim_sound 63, 3, SFX_LICK
@@ -2560,9 +2407,8 @@ BattleAnim_Mimic: ; ca5ac
 	anim_wait 128
 	anim_wait 48
 	anim_ret
-; ca5de
 
-BattleAnim_LovelyKiss: ; ca5de
+BattleAnim_LovelyKiss:
 	anim_2gfx ANIM_GFX_OBJECTS, ANIM_GFX_ANGELS
 	anim_bgeffect ANIM_BG_07, $0, $2, $0
 	anim_obj ANIM_OBJ_LOVELY_KISS, 152, 40, $0
@@ -2571,9 +2417,8 @@ BattleAnim_LovelyKiss: ; ca5de
 	anim_obj ANIM_OBJ_HEART, 128, 40, $0
 	anim_wait 40
 	anim_ret
-; ca5f6
 
-BattleAnim_Bonemerang: ; ca5f6
+BattleAnim_Bonemerang:
 	anim_2gfx ANIM_GFX_MISC, ANIM_GFX_HIT
 	anim_sound 6, 2, SFX_HYDRO_PUMP
 	anim_obj ANIM_OBJ_BONEMERANG, 88, 56, $1c
@@ -2582,9 +2427,8 @@ BattleAnim_Bonemerang: ; ca5f6
 	anim_obj ANIM_OBJ_01, 136, 56, $0
 	anim_wait 24
 	anim_ret
-; ca60c
 
-BattleAnim_Swift: ; ca60c
+BattleAnim_Swift:
 	anim_1gfx ANIM_GFX_OBJECTS
 	anim_sound 6, 2, SFX_METRONOME
 	anim_obj ANIM_OBJ_SWIFT, 64, 88, $4
@@ -2594,9 +2438,8 @@ BattleAnim_Swift: ; ca60c
 	anim_obj ANIM_OBJ_SWIFT, 64, 76, $4
 	anim_wait 64
 	anim_ret
-; ca624
 
-BattleAnim_Crabhammer: ; ca624
+BattleAnim_Crabhammer:
 	anim_1gfx ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_1F, $40, $2, $0
 	anim_wait 48
@@ -2607,9 +2450,8 @@ BattleAnim_Crabhammer: ; ca624
 	anim_wait 12
 	anim_loop 3, .loop
 	anim_ret
-; ca63f
 
-BattleAnim_SkullBash: ; ca63f
+BattleAnim_SkullBash:
 	anim_if_param_equal $1, BattleAnim_SkullBash_branch_c9fb5
 	anim_1gfx ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_1F, $14, $2, $0
@@ -2625,9 +2467,8 @@ BattleAnim_SkullBash: ; ca63f
 	anim_loop 3, .loop
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca66a
 
-BattleAnim_Kinesis: ; ca66a
+BattleAnim_Kinesis:
 	anim_2gfx ANIM_GFX_MISC, ANIM_GFX_NOISE
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_obj ANIM_OBJ_KINESIS, 80, 76, $0
@@ -2641,9 +2482,8 @@ BattleAnim_Kinesis: ; ca66a
 	anim_sound 0, 0, SFX_KINESIS_2
 	anim_wait 32
 	anim_ret
-; ca68b
 
-BattleAnim_Peck: ; ca68b
+BattleAnim_Peck:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_PECK
 	anim_obj ANIM_OBJ_02, 128, 48, $0
@@ -2652,9 +2492,8 @@ BattleAnim_Peck: ; ca68b
 	anim_obj ANIM_OBJ_02, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; ca6a0
 
-BattleAnim_DrillPeck: ; ca6a0
+BattleAnim_DrillPeck:
 	anim_1gfx ANIM_GFX_HIT
 .loop
 	anim_sound 0, 1, SFX_PECK
@@ -2672,9 +2511,8 @@ BattleAnim_DrillPeck: ; ca6a0
 	anim_loop 5, .loop
 	anim_wait 16
 	anim_ret
-; ca6cc
 
-BattleAnim_Guillotine: ; ca6cc
+BattleAnim_Guillotine:
 	anim_1gfx ANIM_GFX_CUT
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $10
 	anim_bgeffect ANIM_BG_1F, $40, $2, $0
@@ -2688,9 +2526,8 @@ BattleAnim_Guillotine: ; ca6cc
 	anim_obj ANIM_OBJ_39, 120, 72, $0
 	anim_wait 32
 	anim_ret
-; ca700
 
-BattleAnim_Flash: ; ca700
+BattleAnim_Flash:
 	anim_1gfx ANIM_GFX_SPEED
 	anim_sound 0, 1, SFX_FLASH
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $6, $20
@@ -2712,9 +2549,8 @@ BattleAnim_Flash: ; ca700
 	anim_obj ANIM_OBJ_FLASH, 136, 56, $38
 	anim_wait 32
 	anim_ret
-; ca73c
 
-BattleAnim_Substitute: ; ca73c
+BattleAnim_Substitute:
 	anim_sound 0, 0, SFX_SURF
 	anim_if_param_equal $3, BattleAnim_Substitute_branch_ca77c
 	anim_if_param_equal $2, BattleAnim_Substitute_branch_ca76e
@@ -2727,36 +2563,32 @@ BattleAnim_Substitute: ; ca73c
 	anim_bgeffect ANIM_BG_ENTER_MON, $0, $1, $0
 	anim_wait 32
 	anim_ret
-; ca760
 
-BattleAnim_Substitute_branch_ca760: ; ca760
+BattleAnim_Substitute_branch_ca760:
 	anim_bgeffect ANIM_BG_27, $0, $1, $0
 	anim_wait 48
 	anim_dropsub
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0
 	anim_wait 32
 	anim_ret
-; ca76e
 
-BattleAnim_Substitute_branch_ca76e: ; ca76e
+BattleAnim_Substitute_branch_ca76e:
 	anim_bgeffect ANIM_BG_27, $0, $1, $0
 	anim_wait 48
 	anim_raisesub
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0
 	anim_wait 32
 	anim_ret
-; ca77c
 
-BattleAnim_Substitute_branch_ca77c: ; ca77c
+BattleAnim_Substitute_branch_ca77c:
 	anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0
 	anim_wait 48
 	anim_dropsub
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0
 	anim_wait 32
 	anim_ret
-; ca78a
 
-BattleAnim_Minimize: ; ca78a
+BattleAnim_Minimize:
 	anim_sound 0, 0, SFX_SURF
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowPlayerHead_0
@@ -2768,9 +2600,8 @@ BattleAnim_Minimize: ; ca78a
 	anim_wait 48
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca7a1
 
-BattleAnim_SkyAttack: ; ca7a1
+BattleAnim_SkyAttack:
 	anim_if_param_equal $1, BattleAnim_SkyAttack_branch_c9fb5
 	anim_1gfx ANIM_GFX_SKY_ATTACK
 	anim_bgeffect ANIM_BG_27, $0, $1, $0
@@ -2788,9 +2619,8 @@ BattleAnim_SkyAttack: ; ca7a1
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0
 	anim_wait 16
 	anim_ret
-; ca7cc
 
-BattleAnim_NightShade: ; ca7cc
+BattleAnim_NightShade:
 	anim_1gfx ANIM_GFX_HIT
 	anim_bgp $1b
 	anim_obp1 $1b
@@ -2802,17 +2632,15 @@ BattleAnim_NightShade: ; ca7cc
 	anim_incbgeffect ANIM_BG_NIGHT_SHADE
 	anim_call BattleAnim_ShowMon_1
 	anim_ret
-; ca7e5
 
-BattleAnim_Lick: ; ca7e5
+BattleAnim_Lick:
 	anim_1gfx ANIM_GFX_WATER
 	anim_sound 0, 1, SFX_LICK
 	anim_obj ANIM_OBJ_LICK, 136, 56, $0
 	anim_wait 64
 	anim_ret
-; ca7f1
 
-BattleAnim_TriAttack: ; ca7f1
+BattleAnim_TriAttack:
 	anim_3gfx ANIM_GFX_FIRE, ANIM_GFX_ICE, ANIM_GFX_LIGHTNING
 	anim_call BattleAnim_TriAttack_branch_cbbcc
 	anim_wait 16
@@ -2823,9 +2651,8 @@ BattleAnim_TriAttack: ; ca7f1
 	anim_obj ANIM_OBJ_2F, 152, 68, $0
 	anim_wait 16
 	anim_ret
-; ca80c
 
-BattleAnim_Withdraw: ; ca80c
+BattleAnim_Withdraw:
 	anim_1gfx ANIM_GFX_REFLECT
 	anim_call BattleAnim_FollowPlayerHead_0
 	anim_bgeffect ANIM_BG_WITHDRAW, $0, $1, $50
@@ -2838,9 +2665,8 @@ BattleAnim_Withdraw: ; ca80c
 	anim_incbgeffect ANIM_BG_WITHDRAW
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca829
 
-BattleAnim_Psybeam: ; ca829
+BattleAnim_Psybeam:
 	anim_1gfx ANIM_GFX_PSYCHIC
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_bgeffect ANIM_BG_08, $0, $4, $0
@@ -2851,9 +2677,8 @@ BattleAnim_Psybeam: ; ca829
 	anim_loop 10, .loop
 	anim_wait 48
 	anim_ret
-; ca844
 
-BattleAnim_DreamEater: ; ca844
+BattleAnim_DreamEater:
 	anim_1gfx ANIM_GFX_BUBBLE
 	anim_bgp $1b
 	anim_obp0 $27
@@ -2862,27 +2687,24 @@ BattleAnim_DreamEater: ; ca844
 	anim_wait 128
 	anim_wait 48
 	anim_ret
-; ca853
 
-BattleAnim_LeechLife: ; ca853
+BattleAnim_LeechLife:
 	anim_1gfx ANIM_GFX_BUBBLE
 	anim_sound 6, 3, SFX_WATER_GUN
 	anim_call BattleAnim_LeechLife_branch_cbab3
 	anim_wait 128
 	anim_wait 48
 	anim_ret
-; ca85e
 
-BattleAnim_Harden: ; ca85e
+BattleAnim_Harden:
 	anim_1gfx ANIM_GFX_REFLECT
 	anim_obp0 $0
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_call BattleAnim_Harden_branch_cbc43
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca86c
 
-BattleAnim_Psywave: ; ca86c
+BattleAnim_Psywave:
 	anim_1gfx ANIM_GFX_PSYCHIC
 	anim_bgeffect ANIM_BG_PSYCHIC, $0, $0, $0
 .loop
@@ -2900,18 +2722,16 @@ BattleAnim_Psywave: ; ca86c
 	anim_incbgeffect ANIM_BG_PSYCHIC
 	anim_wait 4
 	anim_ret
-; ca897
 
-BattleAnim_Glare: ; ca897
+BattleAnim_Glare:
 	anim_1gfx ANIM_GFX_BEAM
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $20
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_call BattleAnim_Glare_branch_cbadc
 	anim_wait 16
 	anim_ret
-; ca8a8
 
-BattleAnim_Thrash: ; ca8a8
+BattleAnim_Thrash:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_POUND
 	anim_obj ANIM_OBJ_08, 120, 72, $0
@@ -2926,9 +2746,8 @@ BattleAnim_Thrash: ; ca8a8
 	anim_obj ANIM_OBJ_00, 152, 40, $0
 	anim_wait 16
 	anim_ret
-; ca8d5
 
-BattleAnim_Growth: ; ca8d5
+BattleAnim_Growth:
 	anim_bgeffect ANIM_BG_WHITE_HUES, $0, $8, $0
 	anim_1gfx ANIM_GFX_CHARGE
 	anim_sound 0, 0, SFX_SWORDS_DANCE
@@ -2942,9 +2761,8 @@ BattleAnim_Growth: ; ca8d5
 	anim_obj ANIM_OBJ_GROWTH, 48, 108, $38
 	anim_wait 64
 	anim_ret
-; ca909
 
-BattleAnim_Conversion2: ; ca909
+BattleAnim_Conversion2:
 	anim_1gfx ANIM_GFX_EXPLOSION
 	anim_sound 63, 3, SFX_SHARPEN
 	anim_obj ANIM_OBJ_CONVERSION2, 132, 44, $0
@@ -2958,9 +2776,8 @@ BattleAnim_Conversion2: ; ca909
 	anim_wait 128
 	anim_wait 48
 	anim_ret
-; ca939
 
-BattleAnim_Smokescreen: ; ca939
+BattleAnim_Smokescreen:
 	anim_3gfx ANIM_GFX_HAZE, ANIM_GFX_EGG, ANIM_GFX_SMOKE
 	anim_sound 6, 2, SFX_THROW_BALL
 	anim_obj ANIM_OBJ_SMOKESCREEN, 64, 92, $6c
@@ -2976,9 +2793,8 @@ BattleAnim_Smokescreen: ; ca939
 	anim_loop 5, .loop
 	anim_wait 128
 	anim_ret
-; ca960
 
-BattleAnim_Strength: ; ca960
+BattleAnim_Strength:
 	anim_2gfx ANIM_GFX_ROCKS, ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_20, $10, $1, $20
 	anim_sound 0, 0, SFX_STRENGTH
@@ -2990,9 +2806,8 @@ BattleAnim_Strength: ; ca960
 	anim_obj ANIM_OBJ_00, 132, 40, $0
 	anim_wait 16
 	anim_ret
-; ca97e
 
-BattleAnim_SwordsDance: ; ca97e
+BattleAnim_SwordsDance:
 	anim_1gfx ANIM_GFX_WHIP
 	anim_sound 0, 0, SFX_SWORDS_DANCE
 	anim_obj ANIM_OBJ_SWORDS_DANCE, 48, 108, $0
@@ -3002,9 +2817,8 @@ BattleAnim_SwordsDance: ; ca97e
 	anim_obj ANIM_OBJ_SWORDS_DANCE, 48, 108, $34
 	anim_wait 56
 	anim_ret
-; ca99e
 
-BattleAnim_QuickAttack: ; ca99e
+BattleAnim_QuickAttack:
 	anim_2gfx ANIM_GFX_SPEED, ANIM_GFX_HIT
 	anim_sound 0, 0, SFX_MENU
 	anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0
@@ -3021,9 +2835,8 @@ BattleAnim_QuickAttack: ; ca99e
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0
 	anim_wait 16
 	anim_ret
-; ca9d8
 
-BattleAnim_Meditate: ; ca9d8
+BattleAnim_Meditate:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_sound 0, 0, SFX_PSYBEAM
@@ -3033,9 +2846,8 @@ BattleAnim_Meditate: ; ca9d8
 	anim_wait 48
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; ca9ed
 
-BattleAnim_Sharpen: ; ca9ed
+BattleAnim_Sharpen:
 	anim_1gfx ANIM_GFX_SHAPES
 	anim_obp0 $e4
 	anim_call BattleAnim_FollowEnemyFeet_0
@@ -3047,9 +2859,8 @@ BattleAnim_Sharpen: ; ca9ed
 	anim_incbgeffect ANIM_BG_18
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; caa0a
 
-BattleAnim_DefenseCurl: ; caa0a
+BattleAnim_DefenseCurl:
 	anim_1gfx ANIM_GFX_SHAPES
 	anim_obp0 $e4
 	anim_call BattleAnim_FollowEnemyFeet_0
@@ -3061,9 +2872,8 @@ BattleAnim_DefenseCurl: ; caa0a
 	anim_incbgeffect ANIM_BG_18
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; caa27
 
-BattleAnim_SeismicToss: ; caa27
+BattleAnim_SeismicToss:
 	anim_2gfx ANIM_GFX_GLOBE, ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_20, $10, $1, $20
 	anim_sound 0, 0, SFX_STRENGTH
@@ -3075,9 +2885,8 @@ BattleAnim_SeismicToss: ; caa27
 	anim_obj ANIM_OBJ_00, 132, 40, $0
 	anim_wait 16
 	anim_ret
-; caa45
 
-BattleAnim_Rage: ; caa45
+BattleAnim_Rage:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_1A, $0, $1, $20
@@ -3095,9 +2904,8 @@ BattleAnim_Rage: ; caa45
 	anim_obj ANIM_OBJ_00, 152, 40, $0
 	anim_wait 16
 	anim_ret
-; caa74
 
-BattleAnim_Agility: ; caa74
+BattleAnim_Agility:
 	anim_1gfx ANIM_GFX_WIND
 	anim_obp0 $fc
 	anim_call BattleAnim_FollowEnemyFeet_0
@@ -3117,9 +2925,8 @@ BattleAnim_Agility: ; caa74
 	anim_incbgeffect ANIM_BG_18
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; caab2
 
-BattleAnim_BoneClub: ; caab2
+BattleAnim_BoneClub:
 	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_MISC
 	anim_obj ANIM_OBJ_BONE_CLUB, 64, 88, $2
 	anim_wait 32
@@ -3127,9 +2934,8 @@ BattleAnim_BoneClub: ; caab2
 	anim_obj ANIM_OBJ_01, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; caac5
 
-BattleAnim_Barrier: ; caac5
+BattleAnim_Barrier:
 	anim_1gfx ANIM_GFX_REFLECT
 	anim_enemyfeetobj
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
@@ -3141,9 +2947,8 @@ BattleAnim_Barrier: ; caac5
 	anim_obj ANIM_OBJ_SCREEN, 72, 80, $0
 	anim_wait 32
 	anim_ret
-; caae1
 
-BattleAnim_Waterfall: ; caae1
+BattleAnim_Waterfall:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowPlayerHead_0
 	anim_bgeffect ANIM_BG_25, $0, $1, $0
@@ -3165,9 +2970,8 @@ BattleAnim_Waterfall: ; caae1
 	anim_obj ANIM_OBJ_01, 136, 24, $0
 	anim_wait 8
 	anim_ret
-; cab1d
 
-BattleAnim_PsychicM: ; cab1d
+BattleAnim_PsychicM:
 	anim_1gfx ANIM_GFX_PSYCHIC
 	anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0
 	anim_bgeffect ANIM_BG_PSYCHIC, $0, $0, $0
@@ -3180,16 +2984,14 @@ BattleAnim_PsychicM: ; cab1d
 	anim_incbgeffect ANIM_BG_PSYCHIC
 	anim_wait 4
 	anim_ret
-; cab3b
 
-BattleAnim_Sludge: ; cab3b
+BattleAnim_Sludge:
 	anim_1gfx ANIM_GFX_POISON
 	anim_call BattleAnim_Sludge_branch_cbc15
 	anim_wait 56
 	anim_ret
-; cab42
 
-BattleAnim_Toxic: ; cab42
+BattleAnim_Toxic:
 	anim_1gfx ANIM_GFX_POISON
 	anim_bgeffect ANIM_BG_BLACK_HUES, $0, $8, $0
 	anim_call BattleAnim_Toxic_branch_cbc35
@@ -3197,9 +2999,8 @@ BattleAnim_Toxic: ; cab42
 	anim_call BattleAnim_Toxic_branch_cbc15
 	anim_wait 64
 	anim_ret
-; cab52
 
-BattleAnim_Metronome: ; cab52
+BattleAnim_Metronome:
 	anim_2gfx ANIM_GFX_MISC, ANIM_GFX_SPEED
 	anim_sound 0, 0, SFX_METRONOME
 	anim_obj ANIM_OBJ_7A, 72, 88, $0
@@ -3209,9 +3010,8 @@ BattleAnim_Metronome: ; cab52
 	anim_loop 5, .loop
 	anim_wait 48
 	anim_ret
-; cab69
 
-BattleAnim_Counter: ; cab69
+BattleAnim_Counter:
 	anim_1gfx ANIM_GFX_HIT
 .loop
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $6, $2
@@ -3232,9 +3032,8 @@ BattleAnim_Counter: ; cab69
 	anim_loop 3, .loop
 	anim_wait 16
 	anim_ret
-; cabaa
 
-BattleAnim_LowKick: ; cabaa
+BattleAnim_LowKick:
 	anim_1gfx ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $2
 	anim_sound 0, 1, SFX_DOUBLE_KICK
@@ -3252,9 +3051,8 @@ BattleAnim_LowKick: ; cabaa
 	anim_obj ANIM_OBJ_00, 140, 64, $0
 	anim_wait 16
 	anim_ret
-; cabe6
 
-BattleAnim_WingAttack: ; cabe6
+BattleAnim_WingAttack:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_WING_ATTACK
 	anim_obj ANIM_OBJ_01, 148, 56, $0
@@ -3269,18 +3067,16 @@ BattleAnim_WingAttack: ; cabe6
 	anim_obj ANIM_OBJ_01, 124, 56, $0
 	anim_wait 16
 	anim_ret
-; cac13
 
-BattleAnim_Slam: ; cac13
+BattleAnim_Slam:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_WING_ATTACK
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $2
 	anim_obj ANIM_OBJ_01, 124, 40, $0
 	anim_wait 16
 	anim_ret
-; cac24
 
-BattleAnim_Disable: ; cac24
+BattleAnim_Disable:
 	anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_STATUS
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_obj ANIM_OBJ_DISABLE, 132, 56, $0
@@ -3290,9 +3086,8 @@ BattleAnim_Disable: ; cac24
 	anim_obj ANIM_OBJ_PARALYZED, 160, 56, $c2
 	anim_wait 96
 	anim_ret
-; cac41
 
-BattleAnim_TailWhip: ; cac41
+BattleAnim_TailWhip:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowPlayerHead_0
 	anim_sound 0, 0, SFX_TAIL_WHIP
@@ -3301,17 +3096,15 @@ BattleAnim_TailWhip: ; cac41
 	anim_incbgeffect ANIM_BG_26
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; cac55
 
-BattleAnim_Struggle: ; cac55
+BattleAnim_Struggle:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_POUND
 	anim_obj ANIM_OBJ_01, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; cac61
 
-BattleAnim_Sketch: ; cac61
+BattleAnim_Sketch:
 	anim_1gfx ANIM_GFX_OBJECTS
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_1A, $0, $1, $20
@@ -3322,9 +3115,8 @@ BattleAnim_Sketch: ; cac61
 	anim_call BattleAnim_ShowMon_0
 	anim_wait 1
 	anim_ret
-; cac7b
 
-BattleAnim_TripleKick: ; cac7b
+BattleAnim_TripleKick:
 	anim_1gfx ANIM_GFX_HIT
 	anim_if_param_equal $1, BattleAnim_TripleKick_branch_cac95
 	anim_if_param_equal $2, BattleAnim_TripleKick_branch_caca5
@@ -3334,27 +3126,24 @@ BattleAnim_TripleKick: ; cac7b
 	anim_obj ANIM_OBJ_01, 144, 48, $0
 	anim_wait 8
 	anim_ret
-; cac95
 
-BattleAnim_TripleKick_branch_cac95: ; cac95
+BattleAnim_TripleKick_branch_cac95:
 	anim_sound 0, 1, SFX_DOUBLE_KICK
 	anim_obj ANIM_OBJ_07, 120, 64, $0
 	anim_wait 6
 	anim_obj ANIM_OBJ_01, 120, 64, $0
 	anim_wait 8
 	anim_ret
-; caca5
 
-BattleAnim_TripleKick_branch_caca5: ; caca5
+BattleAnim_TripleKick_branch_caca5:
 	anim_sound 0, 1, SFX_DOUBLE_KICK
 	anim_obj ANIM_OBJ_07, 132, 32, $0
 	anim_wait 6
 	anim_obj ANIM_OBJ_01, 132, 32, $0
 	anim_wait 8
 	anim_ret
-; cacb5
 
-BattleAnim_Thief: ; cacb5
+BattleAnim_Thief:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_TACKLE, $0, $1, $0
@@ -3369,9 +3158,8 @@ BattleAnim_Thief: ; cacb5
 	anim_obj ANIM_OBJ_THIEF, 120, 76, $1
 	anim_wait 64
 	anim_ret
-; cacd9
 
-BattleAnim_SpiderWeb: ; cacd9
+BattleAnim_SpiderWeb:
 	anim_1gfx ANIM_GFX_WEB
 	anim_bgeffect ANIM_BG_07, $0, $2, $0
 	anim_obj ANIM_OBJ_SPIDER_WEB, 132, 48, $0
@@ -3383,9 +3171,8 @@ BattleAnim_SpiderWeb: ; cacd9
 	anim_obj ANIM_OBJ_STRING_SHOT, 64, 84, $0
 	anim_wait 64
 	anim_ret
-; cacfb
 
-BattleAnim_MindReader: ; cacfb
+BattleAnim_MindReader:
 	anim_1gfx ANIM_GFX_MISC
 	anim_sound 0, 1, SFX_MIND_READER
 .loop
@@ -3397,9 +3184,8 @@ BattleAnim_MindReader: ; cacfb
 	anim_loop 2, .loop
 	anim_wait 32
 	anim_ret
-; cad1b
 
-BattleAnim_Nightmare: ; cad1b
+BattleAnim_Nightmare:
 	anim_1gfx ANIM_GFX_ANGELS
 	anim_bgp $1b
 	anim_obp0 $f
@@ -3408,9 +3194,8 @@ BattleAnim_Nightmare: ; cad1b
 	anim_sound 0, 1, SFX_NIGHTMARE
 	anim_wait 96
 	anim_ret
-; cad30
 
-BattleAnim_FlameWheel: ; cad30
+BattleAnim_FlameWheel:
 	anim_1gfx ANIM_GFX_FIRE
 .loop
 	anim_sound 0, 0, SFX_EMBER
@@ -3432,9 +3217,8 @@ BattleAnim_FlameWheel: ; cad30
 	anim_incobj  9
 	anim_wait 8
 	anim_ret
-; cad6b
 
-BattleAnim_Snore: ; cad6b
+BattleAnim_Snore:
 	anim_2gfx ANIM_GFX_STATUS, ANIM_GFX_NOISE
 	anim_obj ANIM_OBJ_ASLEEP, 64, 80, $0
 	anim_wait 32
@@ -3446,9 +3230,8 @@ BattleAnim_Snore: ; cad6b
 	anim_loop 2, .loop
 	anim_wait 8
 	anim_ret
-; cad86
 
-BattleAnim_Curse: ; cad86
+BattleAnim_Curse:
 	anim_if_param_equal $1, .NotGhost
 	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_OBJECTS
 	anim_obj ANIM_OBJ_CURSE, 68, 72, $0
@@ -3460,9 +3243,8 @@ BattleAnim_Curse: ; cad86
 	anim_obj ANIM_OBJ_04, 44, 96, $0
 	anim_wait 16
 	anim_ret
-; cada3
 
-.NotGhost: ; cada3
+.NotGhost:
 	anim_1gfx ANIM_GFX_SPEED
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_19, $0, $1, $40
@@ -3492,9 +3274,8 @@ BattleAnim_Curse: ; cad86
 	anim_incbgeffect ANIM_BG_16
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; cadf1
 
-BattleAnim_Flail: ; cadf1
+BattleAnim_Flail:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_sound 0, 0, SFX_SUBMISSION
@@ -3509,9 +3290,8 @@ BattleAnim_Flail: ; cadf1
 	anim_incbgeffect ANIM_BG_2C
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; cae17
 
-BattleAnim_Conversion: ; cae17
+BattleAnim_Conversion:
 	anim_1gfx ANIM_GFX_EXPLOSION
 	anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0
 	anim_sound 63, 3, SFX_SHARPEN
@@ -3525,9 +3305,8 @@ BattleAnim_Conversion: ; cae17
 	anim_obj ANIM_OBJ_CONVERSION, 48, 88, $38
 	anim_wait 128
 	anim_ret
-; cae4b
 
-BattleAnim_Aeroblast: ; cae4b
+BattleAnim_Aeroblast:
 	anim_2gfx ANIM_GFX_BEAM, ANIM_GFX_AEROBLAST
 	anim_bgp $1b
 	anim_bgeffect ANIM_BG_1F, $50, $4, $10
@@ -3546,21 +3325,19 @@ BattleAnim_Aeroblast: ; cae4b
 	anim_obj ANIM_OBJ_28, 126, 62, $0
 	anim_wait 48
 	anim_ret
-; cae84
 
-BattleAnim_CottonSpore: ; cae84
+BattleAnim_CottonSpore:
 	anim_obp0 $54
 	anim_1gfx ANIM_GFX_MISC
 	anim_sound 0, 1, SFX_POWDER
-.loop ; cae8b
+.loop
 	anim_obj ANIM_OBJ_COTTON_SPORE, 132, 32, $0
 	anim_wait 8
 	anim_loop 5, .loop
 	anim_wait 96
 	anim_ret
-; cae97
 
-BattleAnim_Reversal: ; cae97
+BattleAnim_Reversal:
 	anim_2gfx ANIM_GFX_SHINE, ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_07, $0, $0, $0
 	anim_sound 0, 1, SFX_MEGA_PUNCH
@@ -3582,19 +3359,17 @@ BattleAnim_Reversal: ; cae97
 	anim_obj ANIM_OBJ_FORESIGHT, 152, 40, $0
 	anim_wait 24
 	anim_ret
-; caed6
 
-BattleAnim_Spite: ; caed6
+BattleAnim_Spite:
 	anim_1gfx ANIM_GFX_ANGELS
 	anim_obj ANIM_OBJ_SPITE, 132, 16, $0
 	anim_sound 0, 1, SFX_SPITE
 	anim_wait 96
 	anim_ret
-; caee2
 
-BattleAnim_PowderSnow: ; caee2
+BattleAnim_PowderSnow:
 	anim_1gfx ANIM_GFX_ICE
-.loop ; caee4
+.loop
 	anim_sound 6, 2, SFX_SHINE
 	anim_obj ANIM_OBJ_POWDER_SNOW, 64, 88, $23
 	anim_wait 2
@@ -3610,9 +3385,8 @@ BattleAnim_PowderSnow: ; caee2
 	anim_call BattleAnim_PowderSnow_branch_cbbdf
 	anim_wait 32
 	anim_ret
-; caf0e
 
-BattleAnim_Protect: ; caf0e
+BattleAnim_Protect:
 	anim_1gfx ANIM_GFX_OBJECTS
 	anim_bgeffect ANIM_BG_07, $0, $2, $0
 	anim_obj ANIM_OBJ_PROTECT, 80, 80, $0
@@ -3623,9 +3397,8 @@ BattleAnim_Protect: ; caf0e
 	anim_sound 0, 0, SFX_PROTECT
 	anim_wait 96
 	anim_ret
-; caf33
 
-BattleAnim_MachPunch: ; caf33
+BattleAnim_MachPunch:
 	anim_2gfx ANIM_GFX_SPEED, ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0
 	anim_sound 0, 0, SFX_MENU
@@ -3644,18 +3417,16 @@ BattleAnim_MachPunch: ; caf33
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0
 	anim_wait 16
 	anim_ret
-; caf73
 
-BattleAnim_ScaryFace: ; caf73
+BattleAnim_ScaryFace:
 	anim_1gfx ANIM_GFX_BEAM
 	anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_call BattleAnim_ScaryFace_branch_cbadc
 	anim_wait 64
 	anim_ret
-; caf84
 
-BattleAnim_FaintAttack: ; caf84
+BattleAnim_FaintAttack:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 0, SFX_CURSE
 	anim_call BattleAnim_FollowEnemyFeet_0
@@ -3674,9 +3445,8 @@ BattleAnim_FaintAttack: ; caf84
 	anim_call BattleAnim_ShowMon_0
 	anim_wait 4
 	anim_ret
-; cafb4
 
-BattleAnim_SweetKiss: ; cafb4
+BattleAnim_SweetKiss:
 	anim_2gfx ANIM_GFX_OBJECTS, ANIM_GFX_ANGELS
 	anim_bgeffect ANIM_BG_07, $0, $2, $0
 	anim_obj ANIM_OBJ_SWEET_KISS, 96, 40, $0
@@ -3686,9 +3456,8 @@ BattleAnim_SweetKiss: ; cafb4
 	anim_obj ANIM_OBJ_HEART, 120, 40, $0
 	anim_wait 40
 	anim_ret
-; cafcf
 
-BattleAnim_BellyDrum: ; cafcf
+BattleAnim_BellyDrum:
 	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_NOISE
 	anim_sound 0, 0, SFX_BELLY_DRUM
 	anim_obj ANIM_OBJ_AA, 64, 104, $0
@@ -3727,9 +3496,8 @@ BattleAnim_BellyDrum: ; cafcf
 	anim_obj ANIM_OBJ_AB, 64, 92, $f8
 	anim_wait 12
 	anim_ret
-; cb051
 
-BattleAnim_SludgeBomb: ; cb051
+BattleAnim_SludgeBomb:
 	anim_2gfx ANIM_GFX_EGG, ANIM_GFX_POISON
 	anim_bgeffect ANIM_BG_BLACK_HUES, $0, $8, $0
 	anim_sound 6, 2, SFX_SLUDGE_BOMB
@@ -3738,16 +3506,14 @@ BattleAnim_SludgeBomb: ; cb051
 	anim_call BattleAnim_SludgeBomb_branch_cbc15
 	anim_wait 64
 	anim_ret
-; cb067
 
-BattleAnim_MudSlap: ; cb067
+BattleAnim_MudSlap:
 	anim_1gfx ANIM_GFX_SAND
 	anim_obp0 $fc
 	anim_call BattleAnim_MudSlap_branch_cbc5b
 	anim_ret
-; cb06f
 
-BattleAnim_Octazooka: ; cb06f
+BattleAnim_Octazooka:
 	anim_3gfx ANIM_GFX_HAZE, ANIM_GFX_EGG, ANIM_GFX_SMOKE
 	anim_sound 6, 2, SFX_SLUDGE_BOMB
 	anim_obj ANIM_OBJ_OCTAZOOKA, 64, 92, $4
@@ -3762,9 +3528,8 @@ BattleAnim_Octazooka: ; cb06f
 	anim_wait 128
 .done
 	anim_ret
-; cb092
 
-BattleAnim_Spikes: ; cb092
+BattleAnim_Spikes:
 	anim_1gfx ANIM_GFX_MISC
 	anim_sound 6, 2, SFX_MENU
 	anim_obj ANIM_OBJ_SPIKES, 48, 88, $20
@@ -3776,9 +3541,8 @@ BattleAnim_Spikes: ; cb092
 	anim_obj ANIM_OBJ_SPIKES, 48, 88, $28
 	anim_wait 64
 	anim_ret
-; cb0b0
 
-BattleAnim_ZapCannon: ; cb0b0
+BattleAnim_ZapCannon:
 	anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_EXPLOSION
 	anim_bgp $1b
 	anim_obp0 $30
@@ -3791,9 +3555,8 @@ BattleAnim_ZapCannon: ; cb0b0
 	anim_obj ANIM_OBJ_31, 136, 56, $0
 	anim_wait 128
 	anim_ret
-; cb0d0
 
-BattleAnim_Foresight: ; cb0d0
+BattleAnim_Foresight:
 	anim_1gfx ANIM_GFX_SHINE
 	anim_call BattleAnim_FollowEnemyFeet_1
 	anim_bgeffect ANIM_BG_07, $0, $0, $0
@@ -3806,9 +3569,8 @@ BattleAnim_Foresight: ; cb0d0
 	anim_call BattleAnim_ShowMon_1
 	anim_wait 8
 	anim_ret
-; cb0f0
 
-BattleAnim_DestinyBond: ; cb0f0
+BattleAnim_DestinyBond:
 	anim_1gfx ANIM_GFX_ANGELS
 	anim_bgp $1b
 	anim_obp0 $0
@@ -3817,17 +3579,15 @@ BattleAnim_DestinyBond: ; cb0f0
 	anim_obj ANIM_OBJ_DESTINY_BOND, 44, 120, $2
 	anim_wait 128
 	anim_ret
-; cb104
 
-BattleAnim_DestinyBond_branch_cb104: ; cb104
+BattleAnim_DestinyBond_branch_cb104:
 	anim_obj ANIM_OBJ_DESTINY_BOND, 132, 76, $0
 	anim_sound 0, 1, SFX_KINESIS
 	anim_bgeffect ANIM_BG_RETURN_MON, $0, $0, $0
 	anim_wait 32
 	anim_ret
-; cb113
 
-BattleAnim_PerishSong: ; cb113
+BattleAnim_PerishSong:
 	anim_1gfx ANIM_GFX_NOISE
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0
@@ -3842,9 +3602,8 @@ BattleAnim_PerishSong: ; cb113
 	anim_obj ANIM_OBJ_PERISH_SONG, 88, 0, $38
 	anim_wait 112
 	anim_ret
-; cb14c
 
-BattleAnim_IcyWind: ; cb14c
+BattleAnim_IcyWind:
 	anim_1gfx ANIM_GFX_SPEED
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0
@@ -3870,18 +3629,16 @@ BattleAnim_IcyWind: ; cb14c
 	anim_incobj  7
 	anim_wait 1
 	anim_ret
-; cb18c
 
-BattleAnim_Detect: ; cb18c
+BattleAnim_Detect:
 	anim_1gfx ANIM_GFX_SHINE
 	anim_bgeffect ANIM_BG_07, $0, $0, $0
 	anim_sound 0, 0, SFX_FORESIGHT
 	anim_obj ANIM_OBJ_FORESIGHT, 64, 88, $0
 	anim_wait 24
 	anim_ret
-; cb19d
 
-BattleAnim_BoneRush: ; cb19d
+BattleAnim_BoneRush:
 	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_MISC
 	anim_sound 0, 1, SFX_BONE_CLUB
 	anim_obj ANIM_OBJ_BONE_RUSH, 132, 56, $2
@@ -3893,9 +3650,8 @@ BattleAnim_BoneRush: ; cb19d
 	anim_obj ANIM_OBJ_01, 144, 64, $0
 	anim_wait 16
 	anim_ret
-; cb1bc
 
-BattleAnim_LockOn: ; cb1bc
+BattleAnim_LockOn:
 	anim_1gfx ANIM_GFX_MISC
 	anim_sound 0, 1, SFX_MIND_READER
 .loop
@@ -3907,9 +3663,8 @@ BattleAnim_LockOn: ; cb1bc
 	anim_loop 2, .loop
 	anim_wait 32
 	anim_ret
-; cb1dc
 
-BattleAnim_Outrage: ; cb1dc
+BattleAnim_Outrage:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_1A, $0, $1, $20
@@ -3928,9 +3683,8 @@ BattleAnim_Outrage: ; cb1dc
 	anim_obj ANIM_OBJ_00, 152, 40, $0
 	anim_wait 16
 	anim_ret
-; cb210
 
-BattleAnim_Sandstorm: ; cb210
+BattleAnim_Sandstorm:
 	anim_1gfx ANIM_GFX_POWDER
 	anim_obj ANIM_OBJ_SANDSTORM, 88, 0, $0
 	anim_wait 8
@@ -3943,9 +3697,8 @@ BattleAnim_Sandstorm: ; cb210
 	anim_loop 16, .loop
 	anim_wait 8
 	anim_ret
-; cb22d
 
-BattleAnim_GigaDrain: ; cb22d
+BattleAnim_GigaDrain:
 	anim_2gfx ANIM_GFX_BUBBLE, ANIM_GFX_CHARGE
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_1C, $0, $0, $10
@@ -3973,9 +3726,8 @@ BattleAnim_GigaDrain: ; cb22d
 	anim_loop 2, .loop
 	anim_wait 32
 	anim_ret
-; cb274
 
-BattleAnim_Endure: ; cb274
+BattleAnim_Endure:
 	anim_1gfx ANIM_GFX_SPEED
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_1A, $0, $1, $20
@@ -4001,9 +3753,8 @@ BattleAnim_Endure: ; cb274
 	anim_incbgeffect ANIM_BG_1A
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; cb2bb
 
-BattleAnim_Charm: ; cb2bb
+BattleAnim_Charm:
 	anim_1gfx ANIM_GFX_OBJECTS
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_26, $0, $1, $0
@@ -4014,9 +3765,8 @@ BattleAnim_Charm: ; cb2bb
 	anim_call BattleAnim_ShowMon_0
 	anim_wait 4
 	anim_ret
-; cb2d5
 
-BattleAnim_Rollout: ; cb2d5
+BattleAnim_Rollout:
 	anim_1gfx ANIM_GFX_HIT
 	anim_sound 0, 0, SFX_SPARK
 	anim_call BattleAnim_FollowPlayerHead_0
@@ -4028,9 +3778,8 @@ BattleAnim_Rollout: ; cb2d5
 	anim_wait 8
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; cb2f5
 
-BattleAnim_FalseSwipe: ; cb2f5
+BattleAnim_FalseSwipe:
 	anim_2gfx ANIM_GFX_SHINE, ANIM_GFX_CUT
 	anim_bgeffect ANIM_BG_07, $0, $0, $0
 	anim_sound 0, 1, SFX_CUT
@@ -4039,9 +3788,8 @@ BattleAnim_FalseSwipe: ; cb2f5
 	anim_obj ANIM_OBJ_GLIMMER, 136, 40, $0
 	anim_wait 32
 	anim_ret
-; cb30d
 
-BattleAnim_Swagger: ; cb30d
+BattleAnim_Swagger:
 	anim_2gfx ANIM_GFX_MISC, ANIM_GFX_WIND
 .loop
 	anim_sound 0, 0, SFX_MENU
@@ -4053,9 +3801,8 @@ BattleAnim_Swagger: ; cb30d
 	anim_obj ANIM_OBJ_ANGER, 104, 40, $0
 	anim_wait 40
 	anim_ret
-; cb328
 
-BattleAnim_MilkDrink: ; cb328
+BattleAnim_MilkDrink:
 	anim_2gfx ANIM_GFX_MISC, ANIM_GFX_BUBBLE
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_obj ANIM_OBJ_MILK_DRINK, 74, 104, $0
@@ -4070,9 +3817,8 @@ BattleAnim_MilkDrink: ; cb328
 	anim_incbgeffect ANIM_BG_18
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; cb34d
 
-BattleAnim_Spark: ; cb34d
+BattleAnim_Spark:
 	anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_EXPLOSION
 	anim_sound 0, 0, SFX_ZAP_CANNON
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $3
@@ -4093,9 +3839,8 @@ BattleAnim_Spark: ; cb34d
 	anim_obj ANIM_OBJ_33, 136, 56, $0
 	anim_wait 32
 	anim_ret
-; cb386
 
-BattleAnim_FuryCutter: ; cb386
+BattleAnim_FuryCutter:
 	anim_1gfx ANIM_GFX_CUT
 .loop
 	anim_sound 0, 1, SFX_CUT
@@ -4109,9 +3854,8 @@ BattleAnim_FuryCutter: ; cb386
 	anim_wait 16
 	anim_jumpuntil .loop
 	anim_ret
-; cb3a1
 
-BattleAnim_SteelWing: ; cb3a1
+BattleAnim_SteelWing:
 	anim_1gfx ANIM_GFX_REFLECT
 	anim_obp0 $0
 	anim_sound 0, 0, SFX_RAGE
@@ -4133,9 +3877,8 @@ BattleAnim_SteelWing: ; cb3a1
 	anim_obj ANIM_OBJ_01, 124, 56, $0
 	anim_wait 16
 	anim_ret
-; cb3df
 
-BattleAnim_MeanLook: ; cb3df
+BattleAnim_MeanLook:
 	anim_1gfx ANIM_GFX_PSYCHIC
 	anim_obp0 $e0
 	anim_sound 0, 1, SFX_MEAN_LOOK
@@ -4150,9 +3893,8 @@ BattleAnim_MeanLook: ; cb3df
 	anim_obj ANIM_OBJ_MEAN_LOOK, 132, 48, $0
 	anim_wait 128
 	anim_ret
-; cb405
 
-BattleAnim_Attract: ; cb405
+BattleAnim_Attract:
 	anim_1gfx ANIM_GFX_OBJECTS
 .loop
 	anim_sound 0, 0, SFX_ATTRACT
@@ -4162,9 +3904,8 @@ BattleAnim_Attract: ; cb405
 	anim_wait 128
 	anim_wait 64
 	anim_ret
-; cb417
 
-BattleAnim_SleepTalk: ; cb417
+BattleAnim_SleepTalk:
 	anim_1gfx ANIM_GFX_STATUS
 .loop
 	anim_sound 0, 0, SFX_STRENGTH
@@ -4173,9 +3914,8 @@ BattleAnim_SleepTalk: ; cb417
 	anim_loop 2, .loop
 	anim_wait 32
 	anim_ret
-; cb428
 
-BattleAnim_HealBell: ; cb428
+BattleAnim_HealBell:
 	anim_2gfx ANIM_GFX_MISC, ANIM_GFX_NOISE
 	anim_obj ANIM_OBJ_84, 72, 56, $0
 	anim_wait 32
@@ -4198,9 +3938,8 @@ BattleAnim_HealBell: ; cb428
 	anim_loop 4, .loop
 	anim_wait 64
 	anim_ret
-; cb464
 
-BattleAnim_Return: ; cb464
+BattleAnim_Return:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowPlayerHead_0
 	anim_bgeffect ANIM_BG_BOUNCE_DOWN, $0, $1, $0
@@ -4215,9 +3954,8 @@ BattleAnim_Return: ; cb464
 	anim_wait 8
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; cb488
 
-BattleAnim_Present: ; cb488
+BattleAnim_Present:
 	anim_2gfx ANIM_GFX_STATUS, ANIM_GFX_BUBBLE
 	anim_sound 0, 1, SFX_PRESENT
 	anim_obj ANIM_OBJ_PRESENT, 64, 88, $6c
@@ -4244,9 +3982,8 @@ BattleAnim_Present: ; cb488
 	anim_loop 8, .loop2
 	anim_wait 128
 	anim_ret
-; cb4c1
 
-BattleAnim_Frustration: ; cb4c1
+BattleAnim_Frustration:
 	anim_1gfx ANIM_GFX_MISC
 	anim_sound 0, 0, SFX_KINESIS_2
 	anim_obj ANIM_OBJ_ANGER, 72, 80, $0
@@ -4268,9 +4005,8 @@ BattleAnim_Frustration: ; cb4c1
 	anim_wait 1
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; cb4f9
 
-BattleAnim_Safeguard: ; cb4f9
+BattleAnim_Safeguard:
 	anim_1gfx ANIM_GFX_MISC
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_obj ANIM_OBJ_SAFEGUARD, 80, 80, $0
@@ -4281,9 +4017,8 @@ BattleAnim_Safeguard: ; cb4f9
 	anim_sound 0, 0, SFX_PROTECT
 	anim_wait 96
 	anim_ret
-; cb51e
 
-BattleAnim_PainSplit: ; cb51e
+BattleAnim_PainSplit:
 	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_OBJECTS
 	anim_call BattleAnim_FollowPlayerHead_0
 	anim_bgeffect ANIM_BG_25, $0, $1, $0
@@ -4295,9 +4030,8 @@ BattleAnim_PainSplit: ; cb51e
 	anim_call BattleAnim_ShowMon_0
 	anim_wait 1
 	anim_ret
-; cb53d
 
-BattleAnim_SacredFire: ; cb53d
+BattleAnim_SacredFire:
 	anim_1gfx ANIM_GFX_FIRE
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0
@@ -4320,9 +4054,8 @@ BattleAnim_SacredFire: ; cb53d
 	anim_incobj  9
 	anim_wait 8
 	anim_ret
-; cb57d
 
-BattleAnim_Magnitude: ; cb57d
+BattleAnim_Magnitude:
 	anim_1gfx ANIM_GFX_ROCKS
 .loop
 	anim_bgeffect ANIM_BG_1F, $e, $4, $0
@@ -4340,9 +4073,8 @@ BattleAnim_Magnitude: ; cb57d
 	anim_jumpuntil .loop
 	anim_wait 96
 	anim_ret
-; cb5aa
 
-BattleAnim_Dynamicpunch: ; cb5aa
+BattleAnim_Dynamicpunch:
 	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_EXPLOSION
 	anim_sound 0, 1, SFX_COMET_PUNCH
 	anim_obj ANIM_OBJ_0A, 136, 56, $43
@@ -4351,9 +4083,8 @@ BattleAnim_Dynamicpunch: ; cb5aa
 	anim_call BattleAnim_Dynamicpunch_branch_cbb8f
 	anim_wait 16
 	anim_ret
-; cb5c0
 
-BattleAnim_Megahorn: ; cb5c0
+BattleAnim_Megahorn:
 	anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT
 	anim_bgeffect ANIM_BG_1F, $40, $2, $0
 	anim_wait 48
@@ -4364,9 +4095,8 @@ BattleAnim_Megahorn: ; cb5c0
 	anim_obj ANIM_OBJ_00, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; cb5de
 
-BattleAnim_Dragonbreath: ; cb5de
+BattleAnim_Dragonbreath:
 	anim_1gfx ANIM_GFX_FIRE
 	anim_sound 6, 2, SFX_EMBER
 .loop
@@ -4375,18 +4105,16 @@ BattleAnim_Dragonbreath: ; cb5de
 	anim_loop 10, .loop
 	anim_wait 64
 	anim_ret
-; cb5ef
 
-BattleAnim_BatonPass: ; cb5ef
+BattleAnim_BatonPass:
 	anim_1gfx ANIM_GFX_MISC
 	anim_obj ANIM_OBJ_BATON_PASS, 44, 104, $20
 	anim_sound 0, 0, SFX_BATON_PASS
 	anim_call BattleAnim_BatonPass_branch_c9486
 	anim_wait 64
 	anim_ret
-; cb5fe
 
-BattleAnim_Encore: ; cb5fe
+BattleAnim_Encore:
 	anim_1gfx ANIM_GFX_OBJECTS
 	anim_obj ANIM_OBJ_99, 64, 80, $90
 	anim_obj ANIM_OBJ_99, 64, 80, $10
@@ -4397,18 +4125,16 @@ BattleAnim_Encore: ; cb5fe
 	anim_obj ANIM_OBJ_9A, 64, 72, $34
 	anim_wait 16
 	anim_ret
-; cb61b
 
-BattleAnim_Pursuit: ; cb61b
+BattleAnim_Pursuit:
 	anim_1gfx ANIM_GFX_HIT
 	anim_if_param_equal $1, BattleAnim_Pursuit_branch_cb62b
 	anim_sound 0, 1, SFX_COMET_PUNCH
 	anim_obj ANIM_OBJ_01, 136, 56, $0
 	anim_wait 16
 	anim_ret
-; cb62b
 
-BattleAnim_Pursuit_branch_cb62b: ; cb62b
+BattleAnim_Pursuit_branch_cb62b:
 	anim_bgeffect ANIM_BG_HIDE_MON, $0, $0, $0
 	anim_wait 4
 	anim_call BattleAnim_FollowEnemyFeet_1
@@ -4427,9 +4153,8 @@ BattleAnim_Pursuit_branch_cb62b: ; cb62b
 	anim_call BattleAnim_ShowMon_1
 	anim_wait 1
 	anim_ret
-; cb65e
 
-BattleAnim_RapidSpin: ; cb65e
+BattleAnim_RapidSpin:
 	anim_2gfx ANIM_GFX_WIND, ANIM_GFX_HIT
 	anim_obp0 $e4
 .loop
@@ -4450,9 +4175,8 @@ BattleAnim_RapidSpin: ; cb65e
 	anim_incobj  6
 	anim_wait 1
 	anim_ret
-; cb68e
 
-BattleAnim_SweetScent: ; cb68e
+BattleAnim_SweetScent:
 	anim_2gfx ANIM_GFX_FLOWER, ANIM_GFX_MISC
 	anim_sound 0, 0, SFX_SWEET_SCENT
 	anim_obj ANIM_OBJ_FLOWER, 64, 96, $2
@@ -4466,9 +4190,8 @@ BattleAnim_SweetScent: ; cb68e
 	anim_obj ANIM_OBJ_COTTON, 136, 40, $3f
 	anim_wait 128
 	anim_ret
-; cb6b6
 
-BattleAnim_IronTail: ; cb6b6
+BattleAnim_IronTail:
 	anim_1gfx ANIM_GFX_REFLECT
 	anim_obp0 $0
 	anim_sound 0, 0, SFX_RAGE
@@ -4485,9 +4208,8 @@ BattleAnim_IronTail: ; cb6b6
 	anim_incbgeffect ANIM_BG_26
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; cb6dc
 
-BattleAnim_MetalClaw: ; cb6dc
+BattleAnim_MetalClaw:
 	anim_1gfx ANIM_GFX_REFLECT
 	anim_obp0 $0
 	anim_sound 0, 0, SFX_RAGE
@@ -4502,9 +4224,8 @@ BattleAnim_MetalClaw: ; cb6dc
 	anim_obj ANIM_OBJ_37, 136, 40, $0
 	anim_wait 32
 	anim_ret
-; cb703
 
-BattleAnim_VitalThrow: ; cb703
+BattleAnim_VitalThrow:
 	anim_1gfx ANIM_GFX_HIT
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_2F, $0, $1, $0
@@ -4525,9 +4246,8 @@ BattleAnim_VitalThrow: ; cb703
 	anim_obj ANIM_OBJ_03, 132, 56, $0
 	anim_wait 16
 	anim_ret
-; cb739
 
-BattleAnim_MorningSun: ; cb739
+BattleAnim_MorningSun:
 	anim_1gfx ANIM_GFX_SHINE
 	anim_bgeffect ANIM_BG_07, $0, $0, $0
 	anim_sound 0, 0, SFX_MORNING_SUN
@@ -4539,14 +4259,12 @@ BattleAnim_MorningSun: ; cb739
 	anim_if_param_equal 0, .zero
 	anim_call BattleAnim_MorningSun_branch_cbc6a
 	anim_ret
-; cb756
 
 .zero
 	anim_call BattleAnim_MorningSun_branch_cbc80
 	anim_ret
-; cb75a
 
-BattleAnim_Synthesis: ; cb75a
+BattleAnim_Synthesis:
 	anim_1gfx ANIM_GFX_SHINE
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_18, $0, $1, $40
@@ -4558,14 +4276,12 @@ BattleAnim_Synthesis: ; cb75a
 	anim_if_param_equal $1, .one
 	anim_call BattleAnim_Synthesis_branch_cbc6a
 	anim_ret
-; cb77a
 
 .one
 	anim_call BattleAnim_Synthesis_branch_cbc80
 	anim_ret
-; cb77e
 
-BattleAnim_Crunch: ; cb77e
+BattleAnim_Crunch:
 	anim_2gfx ANIM_GFX_CUT, ANIM_GFX_HIT
 	anim_bgp $1b
 	anim_obp0 $c0
@@ -4580,9 +4296,8 @@ BattleAnim_Crunch: ; cb77e
 	anim_obj ANIM_OBJ_00, 128, 64, $18
 	anim_wait 8
 	anim_ret
-; cb7a8
 
-BattleAnim_Moonlight: ; cb7a8
+BattleAnim_Moonlight:
 	anim_1gfx ANIM_GFX_SHINE
 	anim_bgp $1b
 	anim_bgeffect ANIM_BG_07, $0, $0, $0
@@ -4601,9 +4316,8 @@ BattleAnim_Moonlight: ; cb7a8
 .three
 	anim_call BattleAnim_Moonlight_branch_cbc80
 	anim_ret
-; cb7db
 
-BattleAnim_HiddenPower: ; cb7db
+BattleAnim_HiddenPower:
 	anim_1gfx ANIM_GFX_CHARGE
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_1A, $0, $1, $20
@@ -4636,9 +4350,8 @@ BattleAnim_HiddenPower: ; cb7db
 	anim_obj ANIM_OBJ_00, 136, 56, $0
 	anim_wait 32
 	anim_ret
-; cb83a
 
-BattleAnim_CrossChop: ; cb83a
+BattleAnim_CrossChop:
 	anim_1gfx ANIM_GFX_CUT
 	anim_sound 0, 1, SFX_CUT
 	anim_obj ANIM_OBJ_A0, 152, 40, $0
@@ -4650,9 +4363,8 @@ BattleAnim_CrossChop: ; cb83a
 	anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $10
 	anim_wait 16
 	anim_ret
-; cb85a
 
-BattleAnim_Twister: ; cb85a
+BattleAnim_Twister:
 	anim_2gfx ANIM_GFX_WIND, ANIM_GFX_HIT
 .loop1
 	anim_sound 0, 0, SFX_RAZOR_WIND
@@ -4694,9 +4406,8 @@ BattleAnim_Twister: ; cb85a
 	anim_incobj  9
 	anim_wait 32
 	anim_ret
-; cb8b3
 
-BattleAnim_RainDance: ; cb8b3
+BattleAnim_RainDance:
 	anim_1gfx ANIM_GFX_WATER
 	anim_bgp $f8
 	anim_obp0 $7c
@@ -4708,9 +4419,8 @@ BattleAnim_RainDance: ; cb8b3
 	anim_obj ANIM_OBJ_RAIN, 88, 0, $2
 	anim_wait 128
 	anim_ret
-; cb8cf
 
-BattleAnim_SunnyDay: ; cb8cf
+BattleAnim_SunnyDay:
 	anim_1gfx ANIM_GFX_WATER
 	anim_bgp $90
 	anim_sound 0, 1, SFX_MORNING_SUN
@@ -4721,9 +4431,8 @@ BattleAnim_SunnyDay: ; cb8cf
 	anim_obj ANIM_OBJ_RAIN, 88, 0, $2
 	anim_wait 128
 	anim_ret
-; cb8e9
 
-BattleAnim_MirrorCoat: ; cb8e9
+BattleAnim_MirrorCoat:
 	anim_2gfx ANIM_GFX_REFLECT, ANIM_GFX_SPEED
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 .loop
@@ -4740,9 +4449,8 @@ BattleAnim_MirrorCoat: ; cb8e9
 	anim_loop 3, .loop
 	anim_wait 32
 	anim_ret
-; cb917
 
-BattleAnim_PsychUp: ; cb917
+BattleAnim_PsychUp:
 	anim_1gfx ANIM_GFX_STATUS
 	anim_call BattleAnim_FollowEnemyFeet_0
 	anim_bgeffect ANIM_BG_1A, $0, $1, $20
@@ -4756,9 +4464,8 @@ BattleAnim_PsychUp: ; cb917
 	anim_call BattleAnim_ShowMon_0
 	anim_wait 16
 	anim_ret
-; cb940
 
-BattleAnim_Extremespeed: ; cb940
+BattleAnim_Extremespeed:
 	anim_2gfx ANIM_GFX_SPEED, ANIM_GFX_CUT
 	anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0
 	anim_sound 0, 0, SFX_MENU
@@ -4775,9 +4482,8 @@ BattleAnim_Extremespeed: ; cb940
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0
 	anim_wait 16
 	anim_ret
-; cb97a
 
-BattleAnim_Ancientpower: ; cb97a
+BattleAnim_Ancientpower:
 	anim_2gfx ANIM_GFX_ROCKS, ANIM_GFX_HIT
 	anim_sound 0, 0, SFX_SPARK
 	anim_obj ANIM_OBJ_ANCIENTPOWER, 64, 108, $20
@@ -4804,9 +4510,8 @@ BattleAnim_Ancientpower: ; cb97a
 	anim_obj ANIM_OBJ_00, 136, 56, $0
 	anim_wait 6
 	anim_ret
-; cb9c6
 
-BattleAnim_ShadowBall: ; cb9c6
+BattleAnim_ShadowBall:
 	anim_2gfx ANIM_GFX_EGG, ANIM_GFX_SMOKE
 	anim_bgp $1b
 	anim_sound 6, 2, SFX_SLUDGE_BOMB
@@ -4815,9 +4520,8 @@ BattleAnim_ShadowBall: ; cb9c6
 	anim_obj ANIM_OBJ_BALL_POOF, 132, 56, $10
 	anim_wait 24
 	anim_ret
-; cb9db
 
-BattleAnim_FutureSight: ; cb9db
+BattleAnim_FutureSight:
 	anim_1gfx ANIM_GFX_WIND
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0
@@ -4836,9 +4540,8 @@ BattleAnim_FutureSight: ; cb9db
 	anim_loop 4, .loop
 	anim_incbgeffect ANIM_BG_PSYCHIC
 	anim_ret
-; cba1b
 
-BattleAnim_RockSmash: ; cba1b
+BattleAnim_RockSmash:
 	anim_2gfx ANIM_GFX_ROCKS, ANIM_GFX_HIT
 	anim_sound 0, 1, SFX_SPARK
 	anim_obj ANIM_OBJ_01, 128, 56, $0
@@ -4860,9 +4563,8 @@ BattleAnim_RockSmash: ; cba1b
 	anim_obj ANIM_OBJ_ROCK_SMASH, 128, 64, $90
 	anim_wait 32
 	anim_ret
-; cba6a
 
-BattleAnim_Whirlpool: ; cba6a
+BattleAnim_Whirlpool:
 	anim_1gfx ANIM_GFX_WIND
 	anim_bgeffect ANIM_BG_WHIRLPOOL, $0, $0, $0
 	anim_sound 0, 1, SFX_SURF
@@ -4875,9 +4577,8 @@ BattleAnim_Whirlpool: ; cba6a
 	anim_incbgeffect ANIM_BG_WHIRLPOOL
 	anim_wait 1
 	anim_ret
-; cba84
 
-BattleAnim_BeatUp: ; cba84
+BattleAnim_BeatUp:
 	anim_if_param_equal $0, .current_mon
 	anim_sound 0, 0, SFX_BALL_POOF
 	anim_bgeffect ANIM_BG_RETURN_MON, $0, $1, $0
@@ -4896,11 +4597,10 @@ BattleAnim_BeatUp: ; cba84
 	anim_wait 8
 	anim_call BattleAnim_ShowMon_0
 	anim_ret
-; cbab3
 
-BattleAnim_DreamEater_branch_cbab3: ; cbab3
-BattleAnim_GigaDrain_branch_cbab3: ; cbab3
-BattleAnim_LeechLife_branch_cbab3: ; cbab3
+BattleAnim_DreamEater_branch_cbab3:
+BattleAnim_GigaDrain_branch_cbab3:
+BattleAnim_LeechLife_branch_cbab3:
 	anim_obj ANIM_OBJ_71, 132, 44, $0
 	anim_obj ANIM_OBJ_71, 132, 44, $8
 	anim_obj ANIM_OBJ_71, 132, 44, $10
@@ -4910,11 +4610,10 @@ BattleAnim_LeechLife_branch_cbab3: ; cbab3
 	anim_obj ANIM_OBJ_71, 132, 44, $30
 	anim_obj ANIM_OBJ_71, 132, 44, $38
 	anim_ret
-; cbadc
 
-BattleAnim_Glare_branch_cbadc: ; cbadc
-BattleAnim_Leer_branch_cbadc: ; cbadc
-BattleAnim_ScaryFace_branch_cbadc: ; cbadc
+BattleAnim_Glare_branch_cbadc:
+BattleAnim_Leer_branch_cbadc:
+BattleAnim_ScaryFace_branch_cbadc:
 	anim_sound 6, 2, SFX_LEER
 	anim_obj ANIM_OBJ_4E, 72, 84, $0
 	anim_obj ANIM_OBJ_4E, 64, 80, $0
@@ -4927,10 +4626,9 @@ BattleAnim_ScaryFace_branch_cbadc: ; cbadc
 	anim_obj ANIM_OBJ_4F, 130, 54, $0
 	anim_obj ANIM_OBJ_4F, 122, 50, $0
 	anim_ret
-; cbb12
 
-BattleAnim_Fly_branch_cbb12: ; cbb12
-BattleAnim_Teleport_branch_cbb12: ; cbb12
+BattleAnim_Fly_branch_cbb12:
+BattleAnim_Teleport_branch_cbb12:
 	anim_sound 0, 0, SFX_WARP_TO
 	anim_obj ANIM_OBJ_44, 44, 108, $0
 	anim_obj ANIM_OBJ_44, 44, 100, $0
@@ -4940,11 +4638,10 @@ BattleAnim_Teleport_branch_cbb12: ; cbb12
 	anim_obj ANIM_OBJ_44, 44, 68, $0
 	anim_obj ANIM_OBJ_44, 44, 60, $0
 	anim_ret
-; cbb39
 
-BattleAnim_AuroraBeam_branch_cbb39: ; cbb39
-BattleAnim_HyperBeam_branch_cbb39: ; cbb39
-BattleAnim_Solarbeam_branch_cbb39: ; cbb39
+BattleAnim_AuroraBeam_branch_cbb39:
+BattleAnim_HyperBeam_branch_cbb39:
+BattleAnim_Solarbeam_branch_cbb39:
 	anim_sound 0, 0, SFX_HYPER_BEAM
 	anim_obj ANIM_OBJ_27, 64, 92, $0
 	anim_wait 4
@@ -4958,10 +4655,9 @@ BattleAnim_Solarbeam_branch_cbb39: ; cbb39
 	anim_obj ANIM_OBJ_27, 112, 68, $0
 	anim_obj ANIM_OBJ_28, 126, 62, $0
 	anim_ret
-; cbb62
 
-BattleAnim_Explosion_branch_cbb62: ; cbb62
-BattleAnim_Selfdestruct_branch_cbb62: ; cbb62
+BattleAnim_Explosion_branch_cbb62:
+BattleAnim_Selfdestruct_branch_cbb62:
 	anim_sound 0, 0, SFX_EGG_BOMB
 	anim_obj ANIM_OBJ_17, 24, 64, $0
 	anim_wait 5
@@ -4977,12 +4673,11 @@ BattleAnim_Selfdestruct_branch_cbb62: ; cbb62
 	anim_sound 0, 0, SFX_EGG_BOMB
 	anim_obj ANIM_OBJ_17, 40, 84, $0
 	anim_ret
-; cbb8f
 
-BattleAnim_Dynamicpunch_branch_cbb8f: ; cbb8f
-BattleAnim_Explosion_branch_cbb8f: ; cbb8f
-BattleAnim_Present_branch_cbb8f: ; cbb8f
-BattleAnim_Selfdestruct_branch_cbb8f: ; cbb8f
+BattleAnim_Dynamicpunch_branch_cbb8f:
+BattleAnim_Explosion_branch_cbb8f:
+BattleAnim_Present_branch_cbb8f:
+BattleAnim_Selfdestruct_branch_cbb8f:
 	anim_sound 0, 1, SFX_EGG_BOMB
 	anim_obj ANIM_OBJ_17, 148, 32, $0
 	anim_wait 5
@@ -4998,19 +4693,17 @@ BattleAnim_Selfdestruct_branch_cbb8f: ; cbb8f
 	anim_sound 0, 1, SFX_EGG_BOMB
 	anim_obj ANIM_OBJ_17, 132, 52, $0
 	anim_ret
-; cbbbc
 
-BattleAnim_Growl_branch_cbbbc: ; cbbbc
-BattleAnim_Roar_branch_cbbbc: ; cbbbc
-BattleAnim_Snore_branch_cbbbc: ; cbbbc
+BattleAnim_Growl_branch_cbbbc:
+BattleAnim_Roar_branch_cbbbc:
+BattleAnim_Snore_branch_cbbbc:
 	anim_obj ANIM_OBJ_4B, 64, 76, $0
 	anim_obj ANIM_OBJ_4B, 64, 88, $1
 	anim_obj ANIM_OBJ_4B, 64, 100, $2
 	anim_ret
-; cbbcc
 
-BattleAnim_FirePunch_branch_cbbcc: ; cbbcc
-BattleAnim_TriAttack_branch_cbbcc: ; cbbcc
+BattleAnim_FirePunch_branch_cbbcc:
+BattleAnim_TriAttack_branch_cbbcc:
 	anim_sound 0, 1, SFX_EMBER
 .loop
 	anim_obj ANIM_OBJ_BURNED, 136, 56, $10
@@ -5018,11 +4711,10 @@ BattleAnim_TriAttack_branch_cbbcc: ; cbbcc
 	anim_wait 4
 	anim_loop 4, .loop
 	anim_ret
-; cbbdf
 
-BattleAnim_IcePunch_branch_cbbdf: ; cbbdf
-BattleAnim_PowderSnow_branch_cbbdf: ; cbbdf
-BattleAnim_TriAttack_branch_cbbdf: ; cbbdf
+BattleAnim_IcePunch_branch_cbbdf:
+BattleAnim_PowderSnow_branch_cbbdf:
+BattleAnim_TriAttack_branch_cbbdf:
 	anim_sound 0, 1, SFX_SHINE
 	anim_obj ANIM_OBJ_12, 128, 42, $0
 	anim_wait 6
@@ -5041,39 +4733,36 @@ BattleAnim_TriAttack_branch_cbbdf: ; cbbdf
 	anim_sound 0, 1, SFX_SHINE
 	anim_obj ANIM_OBJ_12, 128, 70, $0
 	anim_ret
-; cbc15
 
-BattleAnim_SludgeBomb_branch_cbc15: ; cbc15
-BattleAnim_Sludge_branch_cbc15: ; cbc15
-BattleAnim_Toxic_branch_cbc15: ; cbc15
+BattleAnim_SludgeBomb_branch_cbc15:
+BattleAnim_Sludge_branch_cbc15:
+BattleAnim_Toxic_branch_cbc15:
 .loop
-	anim_sound 0, 1, SFX_UNKNOWN_7F
+	anim_sound 0, 1, SFX_TOXIC
 	anim_obj ANIM_OBJ_1A, 132, 72, $0
 	anim_wait 8
-	anim_sound 0, 1, SFX_UNKNOWN_7F
+	anim_sound 0, 1, SFX_TOXIC
 	anim_obj ANIM_OBJ_1A, 116, 72, $0
 	anim_wait 8
-	anim_sound 0, 1, SFX_UNKNOWN_7F
+	anim_sound 0, 1, SFX_TOXIC
 	anim_obj ANIM_OBJ_1A, 148, 72, $0
 	anim_wait 8
 	anim_loop 5, .loop
 	anim_ret
-; cbc35
 
-BattleAnim_Acid_branch_cbc35: ; cbc35
-BattleAnim_Toxic_branch_cbc35: ; cbc35
+BattleAnim_Acid_branch_cbc35:
+BattleAnim_Toxic_branch_cbc35:
 .loop
 	anim_sound 6, 2, SFX_BUBBLEBEAM
 	anim_obj ANIM_OBJ_19, 64, 92, $10
 	anim_wait 5
 	anim_loop 8, .loop
 	anim_ret
-; cbc43
 
-BattleAnim_Harden_branch_cbc43: ; cbc43
-BattleAnim_IronTail_branch_cbc43: ; cbc43
-BattleAnim_MetalClaw_branch_cbc43: ; cbc43
-BattleAnim_SteelWing_branch_cbc43: ; cbc43
+BattleAnim_Harden_branch_cbc43:
+BattleAnim_IronTail_branch_cbc43:
+BattleAnim_MetalClaw_branch_cbc43:
+BattleAnim_SteelWing_branch_cbc43:
 	anim_sound 0, 0, SFX_SHINE
 	anim_bgeffect ANIM_BG_17, $0, $1, $40
 	anim_wait 8
@@ -5083,10 +4772,9 @@ BattleAnim_SteelWing_branch_cbc43: ; cbc43
 	anim_wait 64
 	anim_incbgeffect ANIM_BG_17
 	anim_ret
-; cbc5b
 
-BattleAnim_MudSlap_branch_cbc5b: ; cbc5b
-BattleAnim_SandAttack_branch_cbc5b: ; cbc5b
+BattleAnim_MudSlap_branch_cbc5b:
+BattleAnim_SandAttack_branch_cbc5b:
 .loop
 	anim_sound 6, 2, SFX_MENU
 	anim_obj ANIM_OBJ_58, 64, 92, $4
@@ -5094,11 +4782,10 @@ BattleAnim_SandAttack_branch_cbc5b: ; cbc5b
 	anim_loop 8, .loop
 	anim_wait 32
 	anim_ret
-; cbc6a
 
-BattleAnim_Moonlight_branch_cbc6a: ; cbc6a
-BattleAnim_MorningSun_branch_cbc6a: ; cbc6a
-BattleAnim_Synthesis_branch_cbc6a: ; cbc6a
+BattleAnim_Moonlight_branch_cbc6a:
+BattleAnim_MorningSun_branch_cbc6a:
+BattleAnim_Synthesis_branch_cbc6a:
 	anim_sound 0, 0, SFX_METRONOME
 	anim_obj ANIM_OBJ_GLIMMER, 44, 64, $0
 	anim_wait 5
@@ -5107,11 +4794,10 @@ BattleAnim_Synthesis_branch_cbc6a: ; cbc6a
 	anim_obj ANIM_OBJ_GLIMMER, 56, 104, $0
 	anim_wait 21
 	anim_ret
-; cbc80
 
-BattleAnim_Moonlight_branch_cbc80: ; cbc80
-BattleAnim_MorningSun_branch_cbc80: ; cbc80
-BattleAnim_Synthesis_branch_cbc80: ; cbc80
+BattleAnim_Moonlight_branch_cbc80:
+BattleAnim_MorningSun_branch_cbc80:
+BattleAnim_Synthesis_branch_cbc80:
 	anim_sound 0, 0, SFX_METRONOME
 .loop
 	anim_obj ANIM_OBJ_GLIMMER, 24, 64, $0
@@ -5127,50 +4813,43 @@ BattleAnim_Synthesis_branch_cbc80: ; cbc80
 	anim_loop 2, .loop
 	anim_wait 16
 	anim_ret
-; cbca7
 
-BattleAnim_FollowEnemyFeet_0: ; cbca7
+BattleAnim_FollowEnemyFeet_0:
 	anim_enemyfeetobj
 	anim_bgeffect ANIM_BG_FEET_FOLLOW, $0, $0, $0
 	anim_wait 6
 	anim_ret
-; cbcaf
 
-BattleAnim_FollowPlayerHead_0: ; cbcaf
+BattleAnim_FollowPlayerHead_0:
 	anim_playerheadobj
 	anim_bgeffect ANIM_BG_HEAD_FOLLOW, $0, $0, $0
 	anim_wait 6
 	anim_ret
-; cbcb7
 
-BattleAnim_ShowMon_0: ; cbcb7
+BattleAnim_ShowMon_0:
 	anim_wait 1
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, $0, $0
 	anim_wait 5
 	anim_incobj  1
 	anim_wait 1
 	anim_ret
-; cbcc2
 
-BattleAnim_FollowEnemyFeet_1: ; cbcc2
+BattleAnim_FollowEnemyFeet_1:
 	anim_enemyfeetobj
 	anim_bgeffect ANIM_BG_FEET_FOLLOW, $0, $1, $0
 	anim_wait 6
 	anim_ret
-; cbcca
 
-BattleAnim_FollowPlayerHead_1: ; cbcca
+BattleAnim_FollowPlayerHead_1:
 	anim_playerheadobj
 	anim_bgeffect ANIM_BG_HEAD_FOLLOW, $0, $1, $0
 	anim_wait 4
 	anim_ret
-; cbcd2
 
-BattleAnim_ShowMon_1: ; cbcd2
+BattleAnim_ShowMon_1:
 	anim_wait 1
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0
 	anim_wait 4
 	anim_incobj  1
 	anim_wait 1
 	anim_ret
-; cbcdd
diff --git a/data/moves/critical_hit_moves.asm b/data/moves/critical_hit_moves.asm
new file mode 100644
index 000000000..4a4730574
--- /dev/null
+++ b/data/moves/critical_hit_moves.asm
@@ -0,0 +1,9 @@
+CriticalHitMoves:
+	db KARATE_CHOP
+	db RAZOR_WIND
+	db RAZOR_LEAF
+	db CRABHAMMER
+	db SLASH
+	db AEROBLAST
+	db CROSS_CHOP
+	db -1
diff --git a/data/moves/descriptions.asm b/data/moves/descriptions.asm
index d86ceea37..1d2e5b37f 100644
--- a/data/moves/descriptions.asm
+++ b/data/moves/descriptions.asm
@@ -1,4 +1,4 @@
-MoveDescriptions:: ; 2cb52
+MoveDescriptions::
 ; entries correspond to move ids (see constants/move_constants.asm)
 	dw PoundDescription
 	dw KarateChopDescription
@@ -256,7 +256,6 @@ MoveDescriptions:: ; 2cb52
 	dw MoveFEDescription
 	dw MoveFFDescription
 	dw Move00Description
-; 2cd52
 
 MoveFCDescription:
 MoveFDDescription:
@@ -836,6 +835,7 @@ LovelyKissDescription:
 SkyAttackDescription:
 	db   "1st turn: Prepare"
 	next "2nd turn: Attack@"
+
 TransformDescription:
 	db   "The user assumes"
 	next "the foe's guise.@"
@@ -1267,4 +1267,3 @@ WhirlpoolDescription:
 BeatUpDescription:
 	db   "Party #MON join"
 	next "in the attack.@"
-; 2ed44
diff --git a/data/moves/effects.asm b/data/moves/effects.asm
index c56ff2560..81bd89f5f 100644
--- a/data/moves/effects.asm
+++ b/data/moves/effects.asm
@@ -1,4 +1,6 @@
-MoveEffects: ; 2732e
+INCLUDE "data/moves/effects_pointers.asm"
+
+MoveEffects: ; used only for BANK(MoveEffects)
 
 NormalHit:
 	checkobedience
@@ -10,9 +12,9 @@ NormalHit:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -40,9 +42,9 @@ PoisonHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -60,9 +62,9 @@ LeechHit:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	draintarget
@@ -82,9 +84,9 @@ BurnHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -103,9 +105,9 @@ FreezeHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -124,9 +126,9 @@ ParalyzeHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -145,9 +147,9 @@ Selfdestruct:
 	damagevariation
 	checkhit
 	selfdestruct
-	hittargetnosub
+	moveanimnosub
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -165,9 +167,9 @@ DreamEater:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	eatdream
@@ -544,9 +546,9 @@ AttackDownHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -566,9 +568,9 @@ DefenseDownHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -589,9 +591,9 @@ SpeedDownHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -611,9 +613,9 @@ SpecialAttackDownHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -633,9 +635,9 @@ SpecialDefenseDownHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -655,9 +657,9 @@ AccuracyDownHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -677,9 +679,9 @@ EvasionDownHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -699,9 +701,9 @@ DefenseUpHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -721,9 +723,9 @@ AttackUpHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -743,9 +745,9 @@ AllUpHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -763,9 +765,9 @@ PayDay:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	payday
@@ -796,9 +798,9 @@ Bide:
 	unleashenergy
 	resettypematchup
 	checkhit
-	hittarget
-	effect0xa5
-	checkfaint
+	moveanim
+	bidefailtext
+	applydamage
 	checkdestinybond
 	buildopponentrage
 	kingsrock
@@ -817,9 +819,9 @@ Rampage:
 	stab
 	damagevariation
 	clearmissdamage
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -848,9 +850,9 @@ MultiHit:
 	stab
 	damagevariation
 	clearmissdamage
-	hittargetnosub
+	moveanimnosub
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	cleartext
 	supereffectivelooptext
@@ -875,9 +877,9 @@ PoisonMultiHit:
 	stab
 	damagevariation
 	clearmissdamage
-	hittargetnosub
+	moveanimnosub
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	cleartext
 	supereffectivelooptext
@@ -900,9 +902,9 @@ FlinchHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -916,9 +918,9 @@ OHKOHit:
 	doturn
 	stab
 	ohko
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -935,9 +937,9 @@ RecoilHit:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	recoil
@@ -980,9 +982,9 @@ ConfuseHit:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1022,9 +1024,9 @@ TriAttack:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1066,9 +1068,9 @@ SkyAttack:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1094,9 +1096,9 @@ HyperBeam:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	rechargenextturn
@@ -1115,10 +1117,10 @@ Rage:
 	checkhit
 	ragedamage
 	damagevariation
-	hittarget
+	moveanim
 	failuretext
 	rage
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1176,9 +1178,9 @@ RazorWind:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1198,10 +1200,10 @@ Fly:
 	stab
 	damagevariation
 	checkhit
-	hittargetnosub
+	moveanimnosub
 	raisesub
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1220,9 +1222,9 @@ TrapTarget:
 	stab
 	damagevariation
 	clearmissdamage
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1239,9 +1241,9 @@ StaticDamage:
 	constantdamage
 	checkhit
 	resettypematchup
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	checkdestinybond
 	buildopponentrage
 	kingsrock
@@ -1254,9 +1256,9 @@ Reversal:
 	constantdamage
 	stab
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	supereffectivetext
 	checkdestinybond
 	buildopponentrage
@@ -1268,9 +1270,9 @@ Counter:
 	usedmovetext
 	doturn
 	counter
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	checkdestinybond
 	buildopponentrage
 	kingsrock
@@ -1304,9 +1306,9 @@ Snore:
 	checkhit
 	effectchance
 	snore
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1378,9 +1380,9 @@ FalseSwipe:
 	damagevariation
 	falseswipe
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1409,9 +1411,9 @@ TripleKick:
 	stab
 	damagevariation
 	clearmissdamage
-	hittargetnosub
+	moveanimnosub
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	cleartext
 	supereffectivelooptext
@@ -1434,9 +1436,9 @@ Thief:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	thief
@@ -1470,9 +1472,9 @@ FlameWheel:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	defrost
@@ -1543,9 +1545,9 @@ Rollout:
 	checkhit
 	rolloutpower
 	damagevariation
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1582,9 +1584,9 @@ FuryCutter:
 	checkhit
 	furycutter
 	damagevariation
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1611,9 +1613,9 @@ Return:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1634,7 +1636,7 @@ Present:
 	damagevariation
 	clearmissdamage
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1653,9 +1655,9 @@ Frustration:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1681,9 +1683,9 @@ SacredFire:
 	damagevariation
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	defrost
@@ -1704,9 +1706,9 @@ Magnitude:
 	damagevariation
 	checkhit
 	doubleundergrounddamage
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1732,9 +1734,9 @@ Pursuit:
 	damagevariation
 	pursuit
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1752,9 +1754,9 @@ RapidSpin:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	clearhazards
@@ -1794,9 +1796,9 @@ HiddenPower:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1824,7 +1826,7 @@ FakeOut:
 	doturn
 	checkhit
 	fakeout
-	hittarget
+	moveanim
 	failuretext
 	endmove
 
@@ -1847,9 +1849,9 @@ MirrorCoat:
 	usedmovetext
 	doturn
 	mirrorcoat
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	checkdestinybond
 	buildopponentrage
 	kingsrock
@@ -1867,9 +1869,9 @@ SkullBash:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1892,9 +1894,9 @@ Twister:
 	doubleflyingdamage
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1914,9 +1916,9 @@ Earthquake:
 	doubleundergrounddamage
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1933,9 +1935,9 @@ FutureSight:
 	futuresight
 	damagevariation ; skip here if last turn
 	checkhit
-	hittargetnosub
+	moveanimnosub
 	failuretext
-	checkfaint
+	applydamage
 	checkdestinybond
 	buildopponentrage
 	endmove
@@ -1951,9 +1953,9 @@ Gust:
 	damagevariation
 	doubleflyingdamage
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1972,9 +1974,9 @@ Stomp:
 	doubleminimizedamage
 	checkhit
 	effectchance
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -1995,9 +1997,9 @@ Solarbeam:
 	stab
 	damagevariation
 	checkhit
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -2017,9 +2019,9 @@ Thunder:
 	effectchance
 	stab
 	damagevariation
-	hittarget
+	moveanim
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	supereffectivetext
 	checkdestinybond
@@ -2047,16 +2049,16 @@ BeatUp:
 	damagecalc
 	damagevariation
 	clearmissdamage
-	hittargetnosub
+	moveanimnosub
 	failuretext
-	checkfaint
+	applydamage
 	criticaltext
 	cleartext
 	supereffectivetext
 	checkdestinybond
 	buildopponentrage
 	endloop
-	effect0xa8
+	beatupfailtext
 	raisesub
 	kingsrock
 	endmove
diff --git a/data/moves/effects_pointers.asm b/data/moves/effects_pointers.asm
index a12092881..94834de71 100644
--- a/data/moves/effects_pointers.asm
+++ b/data/moves/effects_pointers.asm
@@ -1,4 +1,4 @@
-MoveEffectsPointers: ; 271f4
+MoveEffectsPointers:
 ; entries correspond to EFFECT_* constants
 	dw NormalHit
 	dw DoSleep
diff --git a/data/moves/effects_priorities.asm b/data/moves/effects_priorities.asm
index 6faa6d032..dfdb636a7 100644
--- a/data/moves/effects_priorities.asm
+++ b/data/moves/effects_priorities.asm
@@ -1,4 +1,4 @@
-MoveEffectPriorities: ; 3c5df
+MoveEffectPriorities:
 	db EFFECT_PROTECT,      3
 	db EFFECT_ENDURE,       3
 	db EFFECT_PRIORITY_HIT, 2
@@ -6,4 +6,3 @@ MoveEffectPriorities: ; 3c5df
 	db EFFECT_COUNTER,      0
 	db EFFECT_MIRROR_COAT,  0
 	db -1
-; 3c5ec
diff --git a/data/moves/flail_reversal_power.asm b/data/moves/flail_reversal_power.asm
new file mode 100644
index 000000000..fb915905e
--- /dev/null
+++ b/data/moves/flail_reversal_power.asm
@@ -0,0 +1,8 @@
+FlailReversalPower:
+	; hp bar pixels, power
+	db HP_BAR_LENGTH_PX / 48,   200
+	db HP_BAR_LENGTH_PX / 12,   150
+	db HP_BAR_LENGTH_PX / 5,    100
+	db HP_BAR_LENGTH_PX / 3,     80
+	db HP_BAR_LENGTH_PX * 2 / 3, 40
+	db HP_BAR_LENGTH_PX,         20
diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm
index fe637180c..f24748083 100644
--- a/data/moves/grammar.asm
+++ b/data/moves/grammar.asm
@@ -2,7 +2,7 @@
 ; Each move is given an identifier for what usedmovetext to use (0-4).
 ; Made redundant in English localization, where all are just "[mon]¯used [move]!"
 
-MoveGrammar: ; 105e7a
+MoveGrammar:
 ; 0: originally "[mon]の¯[move]¯つかった!" ("[mon]¯used¯[move]!")
 	db SWORDS_DANCE
 	db GROWTH
@@ -99,4 +99,3 @@ MoveGrammar: ; 105e7a
 ; 4: originally "[mon]の¯[move]!" ("[mon]'s¯[move]!")
 ; Any move not listed above uses this grammar.
 	db -1 ; end
-; 105ed0
diff --git a/data/moves/magnitude_power.asm b/data/moves/magnitude_power.asm
new file mode 100644
index 000000000..7359bdb10
--- /dev/null
+++ b/data/moves/magnitude_power.asm
@@ -0,0 +1,9 @@
+MagnitudePower:
+	; chance, power, magnitude #
+	db  13,  10,  4
+	db  38,  30,  5
+	db  89,  50,  6
+	db 166,  70,  7
+	db 217,  90,  8
+	db 242, 110,  9
+	db 255, 150, 10
diff --git a/data/moves/metronome_exception_moves.asm b/data/moves/metronome_exception_moves.asm
new file mode 100644
index 000000000..a5aa44132
--- /dev/null
+++ b/data/moves/metronome_exception_moves.asm
@@ -0,0 +1,17 @@
+; Metronome cannot turn into these moves.
+
+MetronomeExcepts:
+	db NO_MOVE
+	db METRONOME
+	db STRUGGLE
+	db SKETCH
+	db MIMIC
+	db COUNTER
+	db MIRROR_COAT
+	db PROTECT
+	db DETECT
+	db ENDURE
+	db DESTINY_BOND
+	db SLEEP_TALK
+	db THIEF
+	db -1
diff --git a/data/moves/moves.asm b/data/moves/moves.asm
index b576fbaff..b310ba000 100644
--- a/data/moves/moves.asm
+++ b/data/moves/moves.asm
@@ -10,7 +10,7 @@ move: MACRO
 	db \7 percent ; effect chance
 ENDM
 
-Moves: ; 41afb
+Moves:
 ; entries correspond to constants/move_constants.asm
 	move POUND,        EFFECT_NORMAL_HIT,         40, NORMAL,   100, 35,   0
 	move KARATE_CHOP,  EFFECT_NORMAL_HIT,         50, FIGHTING, 100, 25,   0
diff --git a/data/moves/present_power.asm b/data/moves/present_power.asm
new file mode 100644
index 000000000..885e9c692
--- /dev/null
+++ b/data/moves/present_power.asm
@@ -0,0 +1,6 @@
+PresentPower:
+	; chance, power
+	db 40 percent,     40 ; 40%
+	db 70 percent + 1, 80 ; 30%
+	db 80 percent,    120 ; 10%
+	db -1                 ; 20% chance to heal instead
diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm
index fea29780c..339f6a5a6 100644
--- a/data/moves/tmhm_moves.asm
+++ b/data/moves/tmhm_moves.asm
@@ -1,4 +1,5 @@
-TMHMMoves: ; 1167a
+TMHMMoves:
+; entries correspond to *_TMNUM enums (see constants/item_constants.asm)
 ; TMs
 	db DYNAMICPUNCH
 	db HEADBUTT
@@ -63,4 +64,3 @@ TMHMMoves: ; 1167a
 	db THUNDERBOLT
 	db ICE_BEAM
 	db 0 ; end
-; 116b7
diff --git a/data/npc_trades.asm b/data/npc_trades.asm
deleted file mode 100644
index d16670984..000000000
--- a/data/npc_trades.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-npctrade: MACRO
-; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested
-	db \1, \2, \3, \4, \5, \6, \7
-	shift
-	dw \7
-	db \8, \9, 0
-ENDM
-
-NPCTrades: ; fce58
-; entries correspond to NPCTRADE_* constants
-	npctrade TRADE_DIALOG_COLLECTOR, ABRA,       MACHOP,     "MUSCLE@@@@@", $37, $66, GOLD_BERRY,   37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER
-	npctrade TRADE_DIALOG_COLLECTOR, BELLSPROUT, ONIX,       "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER
-	npctrade TRADE_DIALOG_HAPPY,     KRABBY,     VOLTORB,    "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER
-	npctrade TRADE_DIALOG_GIRL,      DRAGONAIR,  DODRIO,     "DORIS@@@@@@", $77, $66, SMOKE_BALL,   00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY
-	npctrade TRADE_DIALOG_NEWBIE,    HAUNTER,    XATU,       "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER
-	npctrade TRADE_DIALOG_GIRL,      CHANSEY,    AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY,   26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER
-	npctrade TRADE_DIALOG_COLLECTOR, DUGTRIO,    MAGNETON,   "MAGGIE@@@@@", $96, $66, METAL_COAT,   50082, "FOREST@@@@@", TRADE_EITHER_GENDER
-; fcf38
diff --git a/data/party_menu_qualities.asm b/data/party_menu_qualities.asm
index 9ccc9745d..b488f4eb1 100644
--- a/data/party_menu_qualities.asm
+++ b/data/party_menu_qualities.asm
@@ -13,13 +13,12 @@
 partymenuqualities: MACRO
 rept _NARG
 	db PARTYMENUQUALITY_\1
-shift
+	shift
 endr
 	db -1 ; end
 ENDM
 
-
-PartyMenuQualityPointers: ; 503b2
+PartyMenuQualityPointers:
 ; entries correspond to PARTYMENUACTION_* constants
 	dw .Default  ; PARTYMENUACTION_CHOOSE_POKEMON
 	dw .Default  ; PARTYMENUACTION_HEALING_ITEM
@@ -31,11 +30,9 @@ PartyMenuQualityPointers: ; 503b2
 	dw .Gender   ; PARTYMENUACTION_GIVE_MON_FEMALE
 	dw .Default  ; PARTYMENUACTION_GIVE_ITEM
 	dw .Mobile   ; PARTYMENUACTION_MOBILE
-; 503c6
 
 .Default:  partymenuqualities NICKNAMES, HP_BAR, HP_DIGITS, LEVEL, STATUS
 .TMHM:     partymenuqualities NICKNAMES, TMHM_COMPAT,       LEVEL, STATUS
 .EvoStone: partymenuqualities NICKNAMES, EVO_STONE_COMPAT,  LEVEL, STATUS
 .Gender:   partymenuqualities NICKNAMES, GENDER,            LEVEL, STATUS
 .Mobile:   partymenuqualities NICKNAMES, MOBILE_SELECTION,  LEVEL, STATUS
-; 503e0
diff --git a/data/phone/non_trainer_names.asm b/data/phone/non_trainer_names.asm
new file mode 100644
index 000000000..1792c506a
--- /dev/null
+++ b/data/phone/non_trainer_names.asm
@@ -0,0 +1,15 @@
+NonTrainerCallerNames:
+; entries correspond to PHONECONTACT_* constants
+	dw .none
+	dw .mom
+	dw .bikeshop
+	dw .bill
+	dw .elm
+	dw .buena
+
+.none:     db "----------@"
+.mom:      db "MOM:@"
+.bill:     db "BILL:@"
+.elm:      db "PROF.ELM:@"
+.bikeshop: db "BIKE SHOP:@"
+.buena:    db "BUENA:<LF>   DISC JOCKEY@"
diff --git a/data/phone/permanent_numbers.asm b/data/phone/permanent_numbers.asm
index a5101f2b6..98c6212db 100644
--- a/data/phone/permanent_numbers.asm
+++ b/data/phone/permanent_numbers.asm
@@ -1,5 +1,4 @@
-PermanentNumbers: ; 90066
+PermanentNumbers:
 	db PHONECONTACT_MOM
 	db PHONECONTACT_ELM
 	db -1 ; end
-; 90069
diff --git a/data/phone/phone_contacts.asm b/data/phone/phone_contacts.asm
index bec40a12a..a7a774507 100644
--- a/data/phone/phone_contacts.asm
+++ b/data/phone/phone_contacts.asm
@@ -1,51 +1,50 @@
 phone: MACRO
 ; trainer class, trainer id, map, time 1, script 1, time 2, script 2
 	db \1, \2
-	map \3
+	map_id \3
 	db \4
 	dba \5
 	db \6
 	dba \7
 ENDM
 
-PhoneContacts: ; 9045f
+PhoneContacts:
 ; entries correspond to PHONE_* constants
-	phone TRAINER_NONE, PHONE_00,           N_A,            0,       UnusedPhoneScript,   0,       UnusedPhoneScript
-	phone TRAINER_NONE, PHONECONTACT_MOM,   KRISS_HOUSE_1F, ANYTIME, MomPhoneScript,      0,       UnusedPhoneScript
-	phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB,    0,       UnusedPhoneScript,   0,       UnusedPhoneScript
-	phone TRAINER_NONE, PHONECONTACT_BILL,  N_A,            ANYTIME, BillPhoneScript1,    0,       BillPhoneScript2
-	phone TRAINER_NONE, PHONECONTACT_ELM,   ELMS_LAB,       ANYTIME, ElmPhoneScript1,     0,       ElmPhoneScript2
-	phone SCHOOLBOY,    JACK1,              NATIONAL_PARK,  ANYTIME, JackPhoneScript1,    ANYTIME, JackPhoneScript2
-	phone POKEFANF,     BEVERLY1,           NATIONAL_PARK,  ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2
+	phone TRAINER_NONE, PHONE_00,           N_A,              0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONECONTACT_MOM,   PLAYERS_HOUSE_1F, ANYTIME, MomPhoneScript,      0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB,      0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONECONTACT_BILL,  N_A,              ANYTIME, BillPhoneScript1,    0,       BillPhoneScript2
+	phone TRAINER_NONE, PHONECONTACT_ELM,   ELMS_LAB,         ANYTIME, ElmPhoneScript1,     0,       ElmPhoneScript2
+	phone SCHOOLBOY,    JACK1,              NATIONAL_PARK,    ANYTIME, JackPhoneScript1,    ANYTIME, JackPhoneScript2
+	phone POKEFANF,     BEVERLY1,           NATIONAL_PARK,    ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2
 	phone SAILOR,       HUEY1,              OLIVINE_LIGHTHOUSE_2F, ANYTIME, HueyPhoneScript1, ANYTIME, HueyPhoneScript2
-	phone TRAINER_NONE, PHONE_00,           N_A,            0,       UnusedPhoneScript,   0,       UnusedPhoneScript
-	phone TRAINER_NONE, PHONE_00,           N_A,            0,       UnusedPhoneScript,   0,       UnusedPhoneScript
-	phone TRAINER_NONE, PHONE_00,           N_A,            0,       UnusedPhoneScript,   0,       UnusedPhoneScript
-	phone COOLTRAINERM, GAVEN3,             ROUTE_26,       ANYTIME, GavenPhoneScript1,   ANYTIME, GavenPhoneScript2
-	phone COOLTRAINERF, BETH1,              ROUTE_26,       ANYTIME, BethPhoneScript1,    ANYTIME, BethPhoneScript2
-	phone BIRD_KEEPER,  JOSE2,              ROUTE_27,       ANYTIME, JosePhoneScript1,    ANYTIME, JosePhoneScript2
-	phone COOLTRAINERF, REENA1,             ROUTE_27,       ANYTIME, ReenaPhoneScript1,   ANYTIME, ReenaPhoneScript2
-	phone YOUNGSTER,    JOEY1,              ROUTE_30,       ANYTIME, JoeyPhoneScript1,    ANYTIME, JoeyPhoneScript2
-	phone BUG_CATCHER,  WADE1,              ROUTE_31,       ANYTIME, WadePhoneScript1,    ANYTIME, WadePhoneScript2
-	phone FISHER,       RALPH1,             ROUTE_32,       ANYTIME, RalphPhoneScript1,   ANYTIME, RalphPhoneScript2
-	phone PICNICKER,    LIZ1,               ROUTE_32,       ANYTIME, LizPhoneScript1,     ANYTIME, LizPhoneScript2
-	phone HIKER,        ANTHONY2,           ROUTE_33,       ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2
-	phone CAMPER,       TODD1,              ROUTE_34,       ANYTIME, ToddPhoneScript1,    ANYTIME, ToddPhoneScript2
-	phone PICNICKER,    GINA1,              ROUTE_34,       ANYTIME, GinaPhoneScript1,    ANYTIME, GinaPhoneScript2
-	phone JUGGLER,      IRWIN1,             ROUTE_35,       ANYTIME, IrwinPhoneScript1,   ANYTIME, IrwinPhoneScript2
-	phone BUG_CATCHER,  ARNIE1,             ROUTE_35,       ANYTIME, ArniePhoneScript1,   ANYTIME, ArniePhoneScript2
-	phone SCHOOLBOY,    ALAN1,              ROUTE_36,       ANYTIME, AlanPhoneScript1,    ANYTIME, AlanPhoneScript2
-	phone TRAINER_NONE, PHONE_00,           N_A,            0,       UnusedPhoneScript,   0,       UnusedPhoneScript
-	phone LASS,         DANA1,              ROUTE_38,       ANYTIME, DanaPhoneScript1,    ANYTIME, DanaPhoneScript2
-	phone SCHOOLBOY,    CHAD1,              ROUTE_38,       ANYTIME, ChadPhoneScript1,    ANYTIME, ChadPhoneScript2
-	phone POKEFANM,     DEREK1,             ROUTE_39,       ANYTIME, DerekPhoneScript1,   ANYTIME, DerekPhoneScript2
-	phone FISHER,       TULLY1,             ROUTE_42,       ANYTIME, TullyPhoneScript1,   ANYTIME, TullyPhoneScript2
-	phone POKEMANIAC,   BRENT1,             ROUTE_43,       ANYTIME, BrentPhoneScript1,   ANYTIME, BrentPhoneScript2
-	phone PICNICKER,    TIFFANY3,           ROUTE_43,       ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2
-	phone BIRD_KEEPER,  VANCE1,             ROUTE_44,       ANYTIME, VancePhoneScript1,   ANYTIME, VancePhoneScript2
-	phone FISHER,       WILTON1,            ROUTE_44,       ANYTIME, WiltonPhoneScript1,  ANYTIME, WiltonPhoneScript2
-	phone BLACKBELT_T,  KENJI3,             ROUTE_45,       ANYTIME, KenjiPhoneScript1,   ANYTIME, KenjiPhoneScript2
-	phone HIKER,        PARRY1,             ROUTE_45,       ANYTIME, ParryPhoneScript1,   ANYTIME, ParryPhoneScript2
-	phone PICNICKER,    ERIN1,              ROUTE_46,       ANYTIME, ErinPhoneScript1,    ANYTIME, ErinPhoneScript2
+	phone TRAINER_NONE, PHONE_00,           N_A,              0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONE_00,           N_A,              0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONE_00,           N_A,              0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone COOLTRAINERM, GAVEN3,             ROUTE_26,         ANYTIME, GavenPhoneScript1,   ANYTIME, GavenPhoneScript2
+	phone COOLTRAINERF, BETH1,              ROUTE_26,         ANYTIME, BethPhoneScript1,    ANYTIME, BethPhoneScript2
+	phone BIRD_KEEPER,  JOSE2,              ROUTE_27,         ANYTIME, JosePhoneScript1,    ANYTIME, JosePhoneScript2
+	phone COOLTRAINERF, REENA1,             ROUTE_27,         ANYTIME, ReenaPhoneScript1,   ANYTIME, ReenaPhoneScript2
+	phone YOUNGSTER,    JOEY1,              ROUTE_30,         ANYTIME, JoeyPhoneScript1,    ANYTIME, JoeyPhoneScript2
+	phone BUG_CATCHER,  WADE1,              ROUTE_31,         ANYTIME, WadePhoneScript1,    ANYTIME, WadePhoneScript2
+	phone FISHER,       RALPH1,             ROUTE_32,         ANYTIME, RalphPhoneScript1,   ANYTIME, RalphPhoneScript2
+	phone PICNICKER,    LIZ1,               ROUTE_32,         ANYTIME, LizPhoneScript1,     ANYTIME, LizPhoneScript2
+	phone HIKER,        ANTHONY2,           ROUTE_33,         ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2
+	phone CAMPER,       TODD1,              ROUTE_34,         ANYTIME, ToddPhoneScript1,    ANYTIME, ToddPhoneScript2
+	phone PICNICKER,    GINA1,              ROUTE_34,         ANYTIME, GinaPhoneScript1,    ANYTIME, GinaPhoneScript2
+	phone JUGGLER,      IRWIN1,             ROUTE_35,         ANYTIME, IrwinPhoneScript1,   ANYTIME, IrwinPhoneScript2
+	phone BUG_CATCHER,  ARNIE1,             ROUTE_35,         ANYTIME, ArniePhoneScript1,   ANYTIME, ArniePhoneScript2
+	phone SCHOOLBOY,    ALAN1,              ROUTE_36,         ANYTIME, AlanPhoneScript1,    ANYTIME, AlanPhoneScript2
+	phone TRAINER_NONE, PHONE_00,           N_A,              0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone LASS,         DANA1,              ROUTE_38,         ANYTIME, DanaPhoneScript1,    ANYTIME, DanaPhoneScript2
+	phone SCHOOLBOY,    CHAD1,              ROUTE_38,         ANYTIME, ChadPhoneScript1,    ANYTIME, ChadPhoneScript2
+	phone POKEFANM,     DEREK1,             ROUTE_39,         ANYTIME, DerekPhoneScript1,   ANYTIME, DerekPhoneScript2
+	phone FISHER,       TULLY1,             ROUTE_42,         ANYTIME, TullyPhoneScript1,   ANYTIME, TullyPhoneScript2
+	phone POKEMANIAC,   BRENT1,             ROUTE_43,         ANYTIME, BrentPhoneScript1,   ANYTIME, BrentPhoneScript2
+	phone PICNICKER,    TIFFANY3,           ROUTE_43,         ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2
+	phone BIRD_KEEPER,  VANCE1,             ROUTE_44,         ANYTIME, VancePhoneScript1,   ANYTIME, VancePhoneScript2
+	phone FISHER,       WILTON1,            ROUTE_44,         ANYTIME, WiltonPhoneScript1,  ANYTIME, WiltonPhoneScript2
+	phone BLACKBELT_T,  KENJI3,             ROUTE_45,         ANYTIME, KenjiPhoneScript1,   ANYTIME, KenjiPhoneScript2
+	phone HIKER,        PARRY1,             ROUTE_45,         ANYTIME, ParryPhoneScript1,   ANYTIME, ParryPhoneScript2
+	phone PICNICKER,    ERIN1,              ROUTE_46,         ANYTIME, ErinPhoneScript1,    ANYTIME, ErinPhoneScript2
 	phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, ANYTIME, BuenaPhoneScript1, ANYTIME, BuenaPhoneScript2
-; 90627
diff --git a/data/phone/special_calls.asm b/data/phone/special_calls.asm
index 03c27743a..224ca2258 100644
--- a/data/phone/special_calls.asm
+++ b/data/phone/special_calls.asm
@@ -5,14 +5,13 @@ specialcall: MACRO
 	dba \3
 ENDM
 
-SpecialPhoneCallList: ; 90627
+SpecialPhoneCallList:
 ; entries correspond to SPECIALCALL_* constants
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
-	specialcall SpecialCallWhereverYouAre,  PHONE_ELM, ElmPhoneScript2
-	specialcall SpecialCallWhereverYouAre,  PHONE_OAK, BikeShopPhoneScript
-	specialcall SpecialCallWhereverYouAre,  PHONE_MOM, MomPhoneLectureScript
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
-; 90657
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
+	specialcall SpecialCallWhereverYouAre,  PHONECONTACT_ELM,      ElmPhoneScript2
+	specialcall SpecialCallWhereverYouAre,  PHONECONTACT_BIKESHOP, BikeShopPhoneScript
+	specialcall SpecialCallWhereverYouAre,  PHONECONTACT_MOM,      MomPhoneLectureScript
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
diff --git a/data/phone/text/bill.asm b/data/phone/text/bill.asm
index 2eed7d98c..0db92c198 100644
--- a/data/phone/text/bill.asm
+++ b/data/phone/text/bill.asm
@@ -1,4 +1,4 @@
-BillPhoneMornGreetingText: ; 0x1b4427
+BillPhoneMornGreetingText:
 	text "Good morning!"
 
 	para "This is the #-"
@@ -8,7 +8,7 @@ BillPhoneMornGreetingText: ; 0x1b4427
 	line "SERVICE."
 	done
 
-BillPhoneDayGreetingText: ; 0x1b4470
+BillPhoneDayGreetingText:
 	text "Good day!"
 
 	para "This is the #-"
@@ -18,7 +18,7 @@ BillPhoneDayGreetingText: ; 0x1b4470
 	line "SERVICE."
 	done
 
-BillPhoneNiteGreetingText: ; 0x1b44b5
+BillPhoneNiteGreetingText:
 	text "Good evening!"
 
 	para "This is the #-"
@@ -28,7 +28,7 @@ BillPhoneNiteGreetingText: ; 0x1b44b5
 	line "SERVICE."
 	done
 
-BillPhoneGeneriText: ; 0x1b44fe
+BillPhoneGenericText:
 	text "Who's calling?"
 
 	para "<PLAY_G>, is it?"
@@ -38,7 +38,7 @@ BillPhoneGeneriText: ; 0x1b44fe
 	line $56
 	done
 
-BillPhoneNotFullText: ; 0x1b452a
+BillPhoneNotFullText:
 	text "Thanks for"
 	line "waiting!"
 
@@ -52,7 +52,7 @@ BillPhoneNotFullText: ; 0x1b452a
 	line "fill it up!"
 	done
 
-BillPhoneNearlyFullText: ; 0x1b4587
+BillPhoneNearlyFullText:
 	text "Thanks for"
 	line "waiting!"
 
@@ -66,7 +66,7 @@ BillPhoneNearlyFullText: ; 0x1b4587
 	line "switch your BOX."
 	done
 
-BillPhoneFullText: ; 0x1b45ed
+BillPhoneFullText:
 	text "Thanks for"
 	line "waiting!"
 
@@ -80,7 +80,7 @@ BillPhoneFullText: ; 0x1b45ed
 	line "more #MON."
 	done
 
-BillPhoneNewlyFullText: ; 0x1b4652
+BillPhoneNewlyFullText:
 	text "Hi, <PLAY_G>?"
 	line "It's me, BILL!"
 
diff --git a/data/phone/text/buena.asm b/data/phone/text/buena.asm
index d3df60110..951a0a9b8 100644
--- a/data/phone/text/buena.asm
+++ b/data/phone/text/buena.asm
@@ -1,4 +1,4 @@
-UnknownText_0xa0c28: ; 0xa0c28
+UnknownText_0xa0c28:
 	text "Hi, this is BUENA…"
 
 	para "Oh! Good morning,"
@@ -7,18 +7,16 @@ UnknownText_0xa0c28: ; 0xa0c28
 	para "I'm kind of foggy"
 	line "in the morning…"
 	done
-; 0xa0c72
 
-UnknownText_0xa0c72: ; 0xa0c72
+UnknownText_0xa0c72:
 	text "Hi, this is BUENA…"
 	line "Oh! Hi, <PLAY_G>!"
 
 	para "Do you tune into"
 	line "BUENA's show?"
 	done
-; 0xa0caf
 
-UnknownText_0xa0caf: ; 0xa0caf
+UnknownText_0xa0caf:
 	text "This is BUENA."
 	line "I can't come to"
 
@@ -34,9 +32,8 @@ UnknownText_0xa0caf: ; 0xa0caf
 	para "give me a call"
 	line "after midnight!"
 	done
-; 0xa0d42
 
-UnknownText_0xa0d42: ; 0xa0d42
+UnknownText_0xa0d42:
 	text "Hi, this is BUENA…"
 	line "Oh! Hi, <PLAY_G>!"
 
@@ -46,45 +43,40 @@ UnknownText_0xa0d42: ; 0xa0d42
 	para "Let me tell you,"
 	line "I'm exhausted!"
 	done
-; 0xa0d96
 
-UnknownText_0xa0d96: ; 0xa0d96
+UnknownText_0xa0d96:
 	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"
 
 	para "I got up early, so"
 	line "I decided to call!"
 	done
-; 0xa0dcf
 
-UnknownText_0xa0dcf: ; 0xa0dcf
+UnknownText_0xa0dcf:
 	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"
 
 	para "I needed someone"
 	line "to chat with!"
 	done
-; 0xa0e01
 
-UnknownText_0xa0e01: ; 0xa0e01
+UnknownText_0xa0e01:
 	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"
 
 	para "I'm just on my"
 	line "break."
 	done
-; 0xa0e29
 
-UnknownText_0xa0e29: ; 0xa0e29
+UnknownText_0xa0e29:
 	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"
 
 	para "I couldn't sleep,"
 	line "so I called you."
 	done
-; 0xa0e5e
 
-UnknownText_0xa0e5e: ; 0xa0e5e
+UnknownText_0xa0e5e:
 	text "Oh. Hi, <PLAY_G>!"
 
 	para "You are how?"
@@ -101,9 +93,8 @@ UnknownText_0xa0e5e: ; 0xa0e5e
 	para "<PLAY_G>, you'd"
 	line "better be careful!"
 	done
-; 0xa0efb
 
-UnknownText_0xa0efb: ; 0xa0efb
+UnknownText_0xa0efb:
 	text "The other day, I"
 	line "went out to eat"
 
@@ -125,9 +116,8 @@ UnknownText_0xa0efb: ; 0xa0efb
 	para "show! I'll catch"
 	line "you later!"
 	done
-; 0xa0fcf
 
-UnknownText_0xa0fcf: ; 0xa0fcf
+UnknownText_0xa0fcf:
 	text "You know the"
 	line "receptionist at"
 	cont "the RADIO TOWER?"
@@ -149,9 +139,8 @@ UnknownText_0xa0fcf: ; 0xa0fcf
 
 	para "Catch you later!"
 	done
-; 0xa109d
 
-UnknownText_0xa109d: ; 0xa109d
+UnknownText_0xa109d:
 	text "Tell me, <PLAY_G>."
 	line "Have you ever won"
 
@@ -167,9 +156,8 @@ UnknownText_0xa109d: ; 0xa109d
 
 	para "Let's chat again!"
 	done
-; 0xa1143
 
-UnknownText_0xa1143: ; 0xa1143
+UnknownText_0xa1143:
 	text "You know, last"
 	line "night…"
 
@@ -198,9 +186,8 @@ UnknownText_0xa1143: ; 0xa1143
 	para "Uh… Um… I… Sorry,"
 	line "wrong number!"
 	done
-; 0xa1244
 
-UnknownText_0xa1244: ; 0xa1244
+UnknownText_0xa1244:
 	text "Yesterday, PROF."
 	line "OAK was in the"
 
@@ -221,9 +208,8 @@ UnknownText_0xa1244: ; 0xa1244
 
 	para "Catch you later!"
 	done
-; 0xa1318
 
-UnknownText_0xa1318: ; 0xa1318
+UnknownText_0xa1318:
 	text "…Cough, cough!"
 
 	para "Uhm sorry uh got"
@@ -242,9 +228,8 @@ UnknownText_0xa1318: ; 0xa1318
 	line "the fly. This has"
 	cont "been BUENA!"
 	done
-; 0xa13d8
 
-UnknownText_0xa13d8: ; 0xa13d8
+UnknownText_0xa13d8:
 	text "Hey, <PLAY_G>."
 	line "You won that RADIO"
 
@@ -263,9 +248,8 @@ UnknownText_0xa13d8: ; 0xa13d8
 	para "Well, let's chat"
 	line "again!"
 	done
-; 0xa1488
 
-UnknownText_0xa1488: ; 0xa1488
+UnknownText_0xa1488:
 	text "I'm elated that"
 	line "more people are"
 
@@ -298,9 +282,8 @@ UnknownText_0xa1488: ; 0xa1488
 
 	para "Let's chat again!"
 	done
-; 0xa15de
 
-UnknownText_0xa15de: ; 0xa15de
+UnknownText_0xa15de:
 	text "Guess what?"
 	line "The RADIO TOWER's"
 
@@ -331,9 +314,8 @@ UnknownText_0xa15de: ; 0xa15de
 	para "Later! Tune into"
 	line "my show!"
 	done
-; 0xa1717
 
-UnknownText_0xa1717: ; 0xa1717
+UnknownText_0xa1717:
 	text "<PLAY_G>, tell me."
 
 	para "When do you relax"
@@ -364,9 +346,8 @@ UnknownText_0xa1717: ; 0xa1717
 	para "Please forget this"
 	line "happened! Later!"
 	done
-; 0xa183d
 
-UnknownText_0xa183d: ; 0xa183d
+UnknownText_0xa183d:
 	text "<PLAY_G>, what was"
 	line "the first #MON"
 	cont "you ever caught?"
@@ -405,9 +386,8 @@ UnknownText_0xa183d: ; 0xa183d
 
 	para "Bye-bye!"
 	done
-; 0xa19b1
 
-UnknownText_0xa19b1: ; 0xa19b1
+UnknownText_0xa19b1:
 	text "Guess what? All of"
 	line "us from the RADIO"
 
@@ -434,9 +414,8 @@ UnknownText_0xa19b1: ; 0xa19b1
 
 	para "Bye-bye!"
 	done
-; 0xa1ac0
 
-UnknownText_0xa1ac0: ; 0xa1ac0
+UnknownText_0xa1ac0:
 	text "Did you know…?"
 
 	para "BEN and FERN talk"
@@ -465,9 +444,8 @@ UnknownText_0xa1ac0: ; 0xa1ac0
 
 	para "Let's chat again!"
 	done
-; 0xa1bed
 
-UnknownText_0xa1bed: ; 0xa1bed
+UnknownText_0xa1bed:
 	text "I'm going shopping"
 	line "with MARY and LILY"
 	cont "soon."
@@ -483,9 +461,8 @@ UnknownText_0xa1bed: ; 0xa1bed
 
 	para "Catch you later!"
 	done
-; 0xa1c88
 
-UnknownText_0xa1c88: ; 0xa1c88
+UnknownText_0xa1c88:
 	text "I'm thinking of"
 	line "going to the GAME"
 
@@ -506,9 +483,8 @@ UnknownText_0xa1c88: ; 0xa1c88
 
 	para "Catch you later!"
 	done
-; 0xa1d5f
 
-UnknownText_0xa1d5f: ; 0xa1d5f
+UnknownText_0xa1d5f:
 	text "Hey, <PLAY_G>. You"
 	line "use your #GEAR"
 
@@ -530,9 +506,8 @@ UnknownText_0xa1d5f: ; 0xa1d5f
 	para "Anyway, thanks for"
 	line "calling! Later!"
 	done
-; 0xa1e2f
 
-UnknownText_0xa1e2f: ; 0xa1e2f
+UnknownText_0xa1e2f:
 	text "Is it sunny"
 	line "outside today?"
 
@@ -547,4 +522,3 @@ UnknownText_0xa1e2f: ; 0xa1e2f
 
 	para "Please call again!"
 	done
-; 0xa1eca
diff --git a/data/phone/text/elm.asm b/data/phone/text/elm.asm
index cea36061f..0e4dc5bc3 100644
--- a/data/phone/text/elm.asm
+++ b/data/phone/text/elm.asm
@@ -1,4 +1,4 @@
-ElmPhoneStartText: ; 0x1b46fc
+ElmPhoneStartText:
 	text "Hello, <PLAY_G>?"
 
 	para "Try not to overdo"
@@ -9,7 +9,7 @@ ElmPhoneStartText: ; 0x1b46fc
 	cont "they are hurt."
 	done
 
-ElmPhoneSawMrPokemonText: ; 0x1b4749
+ElmPhoneSawMrPokemonText:
 	text "Hello, <PLAY_G>?"
 
 	para "Did you meet MR."
@@ -17,7 +17,7 @@ ElmPhoneSawMrPokemonText: ; 0x1b4749
 	cont "Come back safely!"
 	done
 
-ElmPhonePokemonStolenText: ; 0x1b4784
+ElmPhonePokemonStolenText:
 	text "<PLAY_G>? I'm very"
 	line "upset now."
 
@@ -28,7 +28,7 @@ ElmPhonePokemonStolenText: ; 0x1b4784
 	line "do that?"
 	done
 
-ElmPhoneCheckingEggText: ; 0x1b47d5
+ElmPhoneCheckingEggText:
 	text "Hello, <PLAY_G>?"
 
 	para "We're checking the"
@@ -38,7 +38,7 @@ ElmPhoneCheckingEggText: ; 0x1b47d5
 	line "#MON EGG."
 	done
 
-ElmPhoneAssistantText: ; 0x1b481c
+ElmPhoneAssistantText:
 	text "Hello, <PLAY_G>?"
 
 	para "Did you see my"
@@ -48,7 +48,7 @@ ElmPhoneAssistantText: ; 0x1b481c
 	line "in VIOLET CITY."
 	done
 
-ElmPhoneEggUnhatchedText: ; 0x1b4868
+ElmPhoneEggUnhatchedText:
 	text "Hello, <PLAY_G>?"
 
 	para "How's the EGG? Has"
@@ -58,7 +58,7 @@ ElmPhoneEggUnhatchedText: ; 0x1b4868
 	line "pens, please call."
 	done
 
-ElmPhoneEggHatchedText: ; 0x1b48bb
+ElmPhoneEggHatchedText:
 	text "Hello, <PLAY_G>?"
 	line "How is the EGG?"
 
@@ -70,7 +70,7 @@ ElmPhoneEggHatchedText: ; 0x1b48bb
 	line "me now!"
 	done
 
-ElmPhoneDiscovery1Text: ; 0x1b491f
+ElmPhoneDiscovery1Text:
 	text "Hello, <PLAY_G>?"
 
 	para "I just made a new"
@@ -83,7 +83,7 @@ ElmPhoneDiscovery1Text: ; 0x1b491f
 	line "the #MON."
 	done
 
-ElmPhoneDiscovery2Text: ; 0x1b4982
+ElmPhoneDiscovery2Text:
 	text "Hello, <PLAY_G>?"
 
 	para "It's still a"
@@ -96,7 +96,7 @@ ElmPhoneDiscovery2Text: ; 0x1b4982
 	line "ing that now."
 	done
 
-ElmPhonePokerusText: ; 0x1b49e7
+ElmPhonePokerusText:
 	text "Hello, <PLAY_G>?"
 
 	para "I discovered an"
@@ -129,7 +129,7 @@ ElmPhonePokerusText: ; 0x1b49e7
 	cont "about. Bye!"
 	done
 
-ElmPhoneDisasterText: ; 0x1b4b17
+ElmPhoneDisasterText:
 	text "H-hello? <PLAY_G>?"
 	line "It's a disaster!"
 
@@ -143,7 +143,7 @@ ElmPhoneDisasterText: ; 0x1b4b17
 	line "here now!"
 	done
 
-ElmPhoneEggAssistantText: ; 0x1b4b87
+ElmPhoneEggAssistantText:
 	text "Hello, <PLAY_G>? We"
 	line "discovered some-"
 
@@ -158,7 +158,7 @@ ElmPhoneEggAssistantText: ; 0x1b4b87
 	cont "him?"
 	done
 
-ElmPhoneRocketText: ; 0x1b4c06
+ElmPhoneRocketText:
 	text "<PLAY_G>, how are"
 	line "things going?"
 
@@ -185,7 +185,7 @@ ElmPhoneRocketText: ; 0x1b4c06
 	line "Take care!"
 	done
 
-ElmPhoneGiftText: ; 0x1b4d09
+ElmPhoneGiftText:
 	text "Hello, <PLAY_G>?"
 
 	para "I have something"
@@ -197,7 +197,7 @@ ElmPhoneGiftText: ; 0x1b4d09
 	para "See you later!"
 	done
 
-ElmPhoneUnusedText: ; 0x1b4d5d
+ElmPhoneUnusedText:
 	text "Hello, <PLAY_G>?"
 	line "How's it going?"
 
diff --git a/data/phone/text/extra.asm b/data/phone/text/extra.asm
index b4ae1d0c5..101f46ba9 100644
--- a/data/phone/text/extra.asm
+++ b/data/phone/text/extra.asm
@@ -1,13 +1,12 @@
 
-UnknownText_0x64000: ; 0x64000
+UnknownText_0x64000:
 	text "I hate having to"
 	line "hang up on you!"
 
 	para "Call you later!"
 	done
-; 0x64032
 
-UnknownText_0x64032: ; 0x64032
+UnknownText_0x64032:
 	text "<PLAY_G>, have you"
 	line "heard?"
 
@@ -20,9 +19,8 @@ UnknownText_0x64032: ; 0x64032
 	para "…Um… What's TEAM"
 	line "ROCKET?"
 	done
-; 0x64099
 
-UnknownText_0x64099: ; 0x64099
+UnknownText_0x64099:
 	text "<PLAY_G>, I heard!"
 
 	para "You defeated that"
@@ -31,9 +29,8 @@ UnknownText_0x64099: ; 0x64099
 	para "It makes me proud"
 	line "to be your friend!"
 	done
-; 0x640e6
 
-UnknownText_0x640e6: ; 0x640e6
+UnknownText_0x640e6:
 	text "Hey, I heard about"
 	line "you!"
 
@@ -49,9 +46,8 @@ UnknownText_0x640e6: ; 0x640e6
 	para "when I'm sick in"
 	line "bed with a cold!"
 	done
-; 0x6416d
 
-UnknownText_0x6416d: ; 0x6416d
+UnknownText_0x6416d:
 	text "I heard, I heard,"
 	line "I heard!"
 
@@ -64,9 +60,8 @@ UnknownText_0x6416d: ; 0x6416d
 	para "But um… What was"
 	line "TEAM ROCKET?"
 	done
-; 0x641e8
 
-UnknownText_0x641e8: ; 0x641e8
+UnknownText_0x641e8:
 	text "I heard, I heard,"
 	line "I heard!"
 
@@ -76,9 +71,8 @@ UnknownText_0x641e8: ; 0x641e8
 	para "RADIO TOWER! You"
 	line "rock so hard!"
 	done
-; 0x64247
 
-UnknownText_0x64247: ; 0x64247
+UnknownText_0x64247:
 	text "I saw, I saw!"
 
 	para "I saw you go into"
@@ -90,9 +84,8 @@ UnknownText_0x64247: ; 0x64247
 	para "need to be modest!"
 	line "You can't fail!"
 	done
-; 0x642bb
 
-UnknownText_0x642bb: ; 0x642bb
+UnknownText_0x642bb:
 	text "Yesterday, I went"
 	line "out to NEW BARK"
 
@@ -120,9 +113,8 @@ UnknownText_0x642bb: ; 0x642bb
 	para "if I were your"
 	line "mom, believe me!"
 	done
-; 0x643d4
 
-UnknownText_0x643d4: ; 0x643d4
+UnknownText_0x643d4:
 	text "I saw, I saw,"
 	line "I saw!"
 
@@ -135,9 +127,8 @@ UnknownText_0x643d4: ; 0x643d4
 	para "with the sea as"
 	line "your backdrop!"
 	done
-; 0x64448
 
-UnknownText_0x64448: ; 0x64448
+UnknownText_0x64448:
 	text "I heard, I heard!"
 
 	para "You got a MAGNET"
@@ -164,9 +155,8 @@ UnknownText_0x64448: ; 0x64448
 	para "What do you mean"
 	line "by FLY?"
 	done
-; 0x6455b
 
-UnknownText_0x6455b: ; 0x6455b
+UnknownText_0x6455b:
 	text "I saw, I saw!"
 
 	para "You waking up"
@@ -184,9 +174,8 @@ UnknownText_0x6455b: ; 0x6455b
 	para "Wow! That's like"
 	line "magic!"
 	done
-; 0x645ff
 
-UnknownText_0x645ff: ; 0x645ff
+UnknownText_0x645ff:
 	text "I hear rumors"
 	line "about you all over"
 	cont "the place."
@@ -203,18 +192,16 @@ UnknownText_0x645ff: ; 0x645ff
 	para "I'll always be"
 	line "cheering you on!"
 	done
-; 0x646a3
 
-IrwinCalledRightAwayText: ; 0x646a3
+IrwinCalledRightAwayText:
 	text "Hehe, I called"
 	line "right away!"
 
 	para "I think we can be"
 	line "good friends!"
 	done
-; 0x646df
 
-UnknownText_0x646df: ; 0x646df
+UnknownText_0x646df:
 	text "I saw, I heard!"
 
 	para "You beat MORTY of"
@@ -238,9 +225,8 @@ UnknownText_0x646df: ; 0x646df
 	para "chickened out and"
 	line "took off for home…"
 	done
-; 0x647d8
 
-UnknownText_0x647d8: ; 0x647d8
+UnknownText_0x647d8:
 	text "<PLAY_G>, I heard!"
 
 	para "You're kicking up"
@@ -254,18 +240,16 @@ UnknownText_0x647d8: ; 0x647d8
 
 	para "You so rock!"
 	done
-; 0x64846
 
-UnknownText_0x64846: ; 0x64846
+UnknownText_0x64846:
 	text "Hearing about your"
 	line "escapades rocks my"
 
 	para "soul!"
 	line "It sure does!"
 	done
-; 0x64881
 
-UnknownText_0x64881: ; 0x64881
+UnknownText_0x64881:
 	text "I'm so glad you"
 	line "called!"
 
@@ -275,9 +259,8 @@ UnknownText_0x64881: ; 0x64881
 	para "I guess we must be"
 	line "a good match!"
 	done
-; 0x648dc
 
-UnknownText_0x648dc: ; 0x648dc
+UnknownText_0x648dc:
 	text "How are you?"
 
 	para "What are you"
@@ -305,9 +288,8 @@ UnknownText_0x648dc: ; 0x648dc
 	para "chat about! This"
 	line "is going nowhere!"
 	done
-; 0x649dc
 
-ArnieLovesTheCuteText: ; 0x649dc
+ArnieLovesTheCuteText:
 	text "I'm always with my"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -316,9 +298,8 @@ ArnieLovesTheCuteText: ; 0x649dc
 	para "It's so cute!"
 	line "I just love it!"
 	done
-; 0x64a13
 
-UnknownText_0x64a13: ; 0x64a13
+UnknownText_0x64a13:
 	text "Changing the topic"
 	line "here, I saw this"
 
@@ -330,9 +311,8 @@ UnknownText_0x64a13: ; 0x64a13
 	para "It was easy to"
 	line "beat, actually."
 	done
-; 0x64a71
 
-UnknownText_0x64a71: ; 0x64a71
+UnknownText_0x64a71:
 	text "I was wondering,"
 	line "do you happen to"
 	cont "have @"
@@ -345,9 +325,8 @@ UnknownText_0x64a71: ; 0x64a71
 	para "its weakness, I"
 	line "wonder."
 	done
-; 0x64ada
 
-UnknownText_0x64ada: ; 0x64ada
+UnknownText_0x64ada:
 	text "Hey, let's battle"
 	line "our #MON!"
 
@@ -362,15 +341,13 @@ UnknownText_0x64ada: ; 0x64ada
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x64b48
 
-UnknownText_0x64b48: ; 0x64b48
+UnknownText_0x64b48:
 	text "Let's talk again,"
 	line "huh?"
 	done
-; 0x64b5f
 
-UnknownText_0x64b5f: ; 0x64b5f
+UnknownText_0x64b5f:
 	text "Boy, am I glad I"
 	line "caught you!"
 
@@ -387,9 +364,8 @@ UnknownText_0x64b5f: ; 0x64b5f
 	para "You have to see"
 	line "this!"
 	done
-; 0x64bc6
 
-UnknownText_0x64bc6: ; 0x64bc6
+UnknownText_0x64bc6:
 	text "I haven't had any"
 	line "luck seeing rare"
 	cont "#MON lately…"
@@ -397,9 +373,8 @@ UnknownText_0x64bc6: ; 0x64bc6
 	para "But I know they're"
 	line "out there!"
 	done
-; 0x64c13
 
-UnknownText_0x64c13: ; 0x64c13
+UnknownText_0x64c13:
 	text "Hey, where are you"
 	line "now?"
 
@@ -409,9 +384,8 @@ UnknownText_0x64c13: ; 0x64c13
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x64c5a
 
-UnknownText_0x64c5a: ; 0x64c5a
+UnknownText_0x64c5a:
 	text "Hello? Are you"
 	line "coming or what?"
 
@@ -421,9 +395,8 @@ UnknownText_0x64c5a: ; 0x64c5a
 	para "Get down to ROUTE"
 	line "35 right now!"
 	done
-; 0x64cbd
 
-AlanGettingStrongerText: ; 0x64cbd
+AlanGettingStrongerText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -432,9 +405,8 @@ AlanGettingStrongerText: ; 0x64cbd
 	para "exactly as I"
 	line "calculated!"
 	done
-; 0x64cf3
 
-UnknownText_0x64cf3: ; 0x64cf3
+UnknownText_0x64cf3:
 	text "By the way, we"
 	line "knocked out a wild"
 
@@ -446,9 +418,8 @@ UnknownText_0x64cf3: ; 0x64cf3
 	para "Studying up in"
 	line "advance worked!"
 	done
-; 0x64d4f
 
-UnknownText_0x64d4f: ; 0x64d4f
+UnknownText_0x64d4f:
 	text "By the way, a wild"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -458,9 +429,8 @@ UnknownText_0x64d4f: ; 0x64d4f
 	para "A computational"
 	line "error on my part…"
 	done
-; 0x64da4
 
-UnknownText_0x64da4: ; 0x64da4
+UnknownText_0x64da4:
 	text "I've studied quite"
 	line "a bit since then,"
 
@@ -475,14 +445,12 @@ UnknownText_0x64da4: ; 0x64da4
 	para "Can you come down"
 	line "for a battle?"
 	done
-; 0x64e1f
 
-UnknownText_0x64e1f: ; 0x64e1f
+UnknownText_0x64e1f:
 	text "See you later!"
 	done
-; 0x64e2f
 
-UnknownText_0x64e2f: ; 0x64e2f
+UnknownText_0x64e2f:
 	text "Hehehe, I picked"
 	line "up something nice!"
 
@@ -494,18 +462,16 @@ UnknownText_0x64e2f: ; 0x64e2f
 	text_start
 	line "and pick it up?"
 	done
-; 0x64e90
 
-UnknownText_0x64e90: ; 0x64e90
+UnknownText_0x64e90:
 	text "I haven't picked"
 	line "up anything yet."
 
 	para "I'll call you if I"
 	line "find something."
 	done
-; 0x64ed4
 
-UnknownText_0x64ed4: ; 0x64ed4
+UnknownText_0x64ed4:
 	text "If we don't battle"
 	line "soon, I'll forget"
 	cont "my strategy!"
@@ -515,9 +481,8 @@ UnknownText_0x64ed4: ; 0x64ed4
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x64f1a
 
-UnknownText_0x64f1a: ; 0x64f1a
+UnknownText_0x64f1a:
 	text "I have to do my"
 	line "homework, so can"
 
@@ -529,9 +494,8 @@ UnknownText_0x64f1a: ; 0x64f1a
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x64f74
 
-UnknownText_0x64f74: ; 0x64f74
+UnknownText_0x64f74:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text " is"
@@ -540,9 +504,8 @@ UnknownText_0x64f74: ; 0x64f74
 	para "I've been taking"
 	line "photos galore!"
 	done
-; 0x64fb2
 
-UnknownText_0x64fb2: ; 0x64fb2
+UnknownText_0x64fb2:
 	text "It took only an"
 	line "instant to KO a"
 	cont "wild @"
@@ -555,9 +518,8 @@ UnknownText_0x64fb2: ; 0x64fb2
 	para "battling tips last"
 	line "time."
 	done
-; 0x6501c
 
-UnknownText_0x6501c: ; 0x6501c
+UnknownText_0x6501c:
 	text "You know what?"
 	line "A wild @"
 	text_from_ram wStringBuffer4
@@ -571,9 +533,8 @@ UnknownText_0x6501c: ; 0x6501c
 	para "little bit more,"
 	line "and I would've…"
 	done
-; 0x65091
 
-UnknownText_0x65091: ; 0x65091
+UnknownText_0x65091:
 	text "Right now, I'm on"
 	line "@"
 	text_from_ram wStringBuffer5
@@ -585,14 +546,12 @@ UnknownText_0x65091: ; 0x65091
 	para "I'll be waiting"
 	line "for you!"
 	done
-; 0x650e2
 
-UnknownText_0x650e2: ; 0x650e2
+UnknownText_0x650e2:
 	text "See you!"
 	done
-; 0x650ec
 
-UnknownText_0x650ec: ; 0x650ec
+UnknownText_0x650ec:
 	text "You know what?"
 	line "I got a good gift!"
 
@@ -607,9 +566,8 @@ UnknownText_0x650ec: ; 0x650ec
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x65161
 
-UnknownText_0x65161: ; 0x65161
+UnknownText_0x65161:
 	text "Oh! You wanted a"
 	line "gift, right?"
 
@@ -619,9 +577,8 @@ UnknownText_0x65161: ; 0x65161
 	para "Can you wait a bit"
 	line "longer?"
 	done
-; 0x651bf
 
-UnknownText_0x651bf: ; 0x651bf
+UnknownText_0x651bf:
 	text "Hi! You haven't"
 	line "forgotten about"
 
@@ -633,9 +590,8 @@ UnknownText_0x651bf: ; 0x651bf
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x6520f
 
-UnknownText_0x6520f: ; 0x6520f
+UnknownText_0x6520f:
 	text "Hello?"
 
 	para "If you don't come"
@@ -649,9 +605,8 @@ UnknownText_0x6520f: ; 0x6520f
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x65271
 
-ChadObservingWildText: ; 0x65271
+ChadObservingWildText:
 	text "I recently began"
 	line "observing wild"
 	cont "@"
@@ -670,9 +625,8 @@ ChadObservingWildText: ; 0x65271
 	para "researcher like"
 	line "PROF.OAK soon."
 	done
-; 0x65318
 
-UnknownText_0x65318: ; 0x65318
+UnknownText_0x65318:
 	text "Oh yes, I managed"
 	line "to knock out a"
 
@@ -687,9 +641,8 @@ UnknownText_0x65318: ; 0x65318
 	para "do every day, it"
 	line "was inevitable."
 	done
-; 0x65399
 
-UnknownText_0x65399: ; 0x65399
+UnknownText_0x65399:
 	text "Oh yes, I came"
 	line "close to catching"
 
@@ -706,9 +659,8 @@ UnknownText_0x65399: ; 0x65399
 	text_from_ram wStringBuffer4
 	text ". Rats…"
 	done
-; 0x65419
 
-UnknownText_0x65419: ; 0x65419
+UnknownText_0x65419:
 	text "Want to battle?"
 	line "I have to battle"
 
@@ -720,14 +672,12 @@ UnknownText_0x65419: ; 0x65419
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x65471
 
-UnknownText_0x65471: ; 0x65471
+UnknownText_0x65471:
 	text "See you later!"
 	done
-; 0x65481
 
-ChadBlueGossipText: ; 0x65481
+ChadBlueGossipText:
 	text "Do you know BLUE?"
 
 	para "He's PROF.OAK's"
@@ -739,9 +689,8 @@ ChadBlueGossipText: ; 0x65481
 	para "He's one super"
 	line "#MON trainer!"
 	done
-; 0x654ea
 
-ChadDaisyGossipText: ; 0x654ea
+ChadDaisyGossipText:
 	text "PROF.OAK has a"
 	line "granddaughter"
 	cont "named DAISY."
@@ -752,9 +701,8 @@ ChadDaisyGossipText: ; 0x654ea
 	para "ferocious #MON"
 	line "calm right down."
 	done
-; 0x65555
 
-ChadProfElmGossipText: ; 0x65555
+ChadProfElmGossipText:
 	text "Everyone's talking"
 	line "about PROF.ELM."
 
@@ -765,9 +713,8 @@ ChadProfElmGossipText: ; 0x65555
 	para "That is so cool!"
 	line "I envy him!"
 	done
-; 0x655c7
 
-ChadDreamGossipText: ; 0x655c7
+ChadDreamGossipText:
 	text "PROF.OAK's dream"
 	line "is to compile a"
 
@@ -778,9 +725,8 @@ ChadDreamGossipText: ; 0x655c7
 	line "taking part in"
 	cont "that project…"
 	done
-; 0x65628
 
-ChadKurtGossipText: ; 0x65628
+ChadKurtGossipText:
 	text "Do you know KURT,"
 	line "the BALL creator?"
 
@@ -791,9 +737,8 @@ ChadKurtGossipText: ; 0x65628
 	line "people attract one"
 	cont "another!"
 	done
-; 0x6569b
 
-ChadLeagueGossipText: ; 0x6569b
+ChadLeagueGossipText:
 	text "#MON LEAGUE is"
 	line "the great gather-"
 	cont "ing place for all"
@@ -810,9 +755,8 @@ ChadLeagueGossipText: ; 0x6569b
 	para "He really is a"
 	line "great man."
 	done
-; 0x6574a
 
-ChadRadioShowGossipText: ; 0x6574a
+ChadRadioShowGossipText:
 	text "PROF.OAK'S #MON"
 	line "TALK is a popular"
 	cont "radio show, right?"
@@ -830,9 +774,8 @@ ChadRadioShowGossipText: ; 0x6574a
 	para "So we have MARY to"
 	line "thank for it!"
 	done
-; 0x65810
 
-ChadBattlingGossipText: ; 0x65810
+ChadBattlingGossipText:
 	text "PROF.OAK used to"
 	line "be a trainer a"
 	cont "long time ago."
@@ -849,9 +792,8 @@ ChadBattlingGossipText: ; 0x65810
 	para "focus on becoming"
 	line "a researcher."
 	done
-; 0x658c6
 
-ChadDaisyTeaGossipText: ; 0x658c6
+ChadDaisyTeaGossipText:
 	text "PROF.OAK has a"
 	line "granddaughter"
 	cont "named DAISY."
@@ -868,9 +810,8 @@ ChadDaisyTeaGossipText: ; 0x658c6
 	para "and chat about"
 	line "PROF.OAK."
 	done
-; 0x65969
 
-ChadTravelGossipText: ; 0x65969
+ChadTravelGossipText:
 	text "Did you know?"
 	line "PROF.OAK traveled"
 
@@ -889,18 +830,16 @@ ChadTravelGossipText: ; 0x65969
 	para "and learn about"
 	line "things too…"
 	done
-; 0x65a23
 
-UnknownText_0x65a23: ; 0x65a23
+UnknownText_0x65a23:
 	text "I'm going to study"
 	line "hard so PROF.OAK"
 
 	para "will make me his"
 	line "assistant!"
 	done
-; 0x65a63
 
-UnknownText_0x65a63: ; 0x65a63
+UnknownText_0x65a63:
 	text "Do you remember"
 	line "about our battle?"
 
@@ -912,9 +851,8 @@ UnknownText_0x65a63: ; 0x65a63
 	para "Hurry over--I'm"
 	line "waiting."
 	done
-; 0x65ab2
 
-DerekCheekPincherText: ; 0x65ab2
+DerekCheekPincherText:
 	text "Listen to this."
 	line "My @"
 	text_from_ram wStringBuffer4
@@ -927,9 +865,8 @@ DerekCheekPincherText: ; 0x65ab2
 
 	para "I must be special."
 	done
-; 0x65b29
 
-UnknownText_0x65b29: ; 0x65b29
+UnknownText_0x65b29:
 	text "Oh, and recently,"
 	line "my PIKACHU beat a"
 	cont "wild @"
@@ -950,9 +887,8 @@ UnknownText_0x65b29: ; 0x65b29
 	para "My PIKACHU is the"
 	line "greatest!"
 	done
-; 0x65bc8
 
-UnknownText_0x65bc8: ; 0x65bc8
+UnknownText_0x65bc8:
 	text "Oh, and I saw a"
 	line "wild @"
 	text_from_ram wStringBuffer4
@@ -968,15 +904,13 @@ UnknownText_0x65bc8: ; 0x65bc8
 	para "cute. They're no"
 	line "good otherwise."
 	done
-; 0x65c4e
 
-UnknownText_0x65c4e: ; 0x65c4e
+UnknownText_0x65c4e:
 	text "Well, let's talk"
 	line "again!"
 	done
-; 0x65c66
 
-DerekBugCatchingContestText: ; 0x65c66
+DerekBugCatchingContestText:
 	text "Did you remember?"
 	line "The Bug-Catching"
 	cont "Contest is today."
@@ -990,9 +924,8 @@ DerekBugCatchingContestText: ; 0x65c66
 	para "PIKACHU to show"
 	line "off its cuteness."
 	done
-; 0x65cf9
 
-UnknownText_0x65cf9: ; 0x65cf9
+UnknownText_0x65cf9:
 	text "I'd like you to"
 	line "have a NUGGET."
 
@@ -1003,9 +936,8 @@ UnknownText_0x65cf9: ; 0x65cf9
 	line "PIKACHU will love"
 	cont "it too!"
 	done
-; 0x65d5c
 
-UnknownText_0x65d5c: ; 0x65d5c
+UnknownText_0x65d5c:
 	text "How is your"
 	line "PIKACHU doing?"
 
@@ -1013,9 +945,8 @@ UnknownText_0x65d5c: ; 0x65d5c
 	line "and brag about our"
 	cont "PIKACHU!"
 	done
-; 0x65da6
 
-UnknownText_0x65da6: ; 0x65da6
+UnknownText_0x65da6:
 	text "What's wrong?"
 
 	para "I'm waiting on"
@@ -1026,9 +957,8 @@ UnknownText_0x65da6: ; 0x65da6
 	para "Come pick this up"
 	line "anytime."
 	done
-; 0x65de4
 
-TullyGrownText: ; 0x65de4
+TullyGrownText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text " has"
@@ -1040,9 +970,8 @@ TullyGrownText: ; 0x65de4
 	para "caught it, but now"
 	line "it's way bigger."
 	done
-; 0x65e42
 
-UnknownText_0x65e42: ; 0x65e42
+UnknownText_0x65e42:
 	text "Oh yeah, I KO'd a"
 	line "wild @"
 	text_from_ram wStringBuffer4
@@ -1055,9 +984,8 @@ UnknownText_0x65e42: ; 0x65e42
 	line "can't tell over"
 	cont "the phone…"
 	done
-; 0x65eac
 
-UnknownText_0x65eac: ; 0x65eac
+UnknownText_0x65eac:
 	text "Oh yeah, I lost a"
 	line "wild @"
 	text_from_ram wStringBuffer4
@@ -1070,9 +998,8 @@ UnknownText_0x65eac: ; 0x65eac
 	line "can't tell over"
 	cont "the phone…"
 	done
-; 0x65f17
 
-UnknownText_0x65f17: ; 0x65f17
+UnknownText_0x65f17:
 	text "We should get a"
 	line "battle going!"
 
@@ -1084,15 +1011,13 @@ UnknownText_0x65f17: ; 0x65f17
 	para "Swing by if you"
 	line "have the time."
 	done
-; 0x65f6e
 
-UnknownText_0x65f6e: ; 0x65f6e
+UnknownText_0x65f6e:
 	text "Well, I'll be"
 	line "seeing you."
 	done
-; 0x65f88
 
-UnknownText_0x65f88: ; 0x65f88
+UnknownText_0x65f88:
 	text "I picked up a good"
 	line "little thing at"
 	cont "the water's edge."
@@ -1105,9 +1030,8 @@ UnknownText_0x65f88: ; 0x65f88
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x65ff2
 
-UnknownText_0x65ff2: ; 0x65ff2
+UnknownText_0x65ff2:
 	text "Have I found"
 	line "anything good?"
 
@@ -1116,9 +1040,8 @@ UnknownText_0x65ff2: ; 0x65ff2
 	para "It's like fishing,"
 	line "you need patience."
 	done
-; 0x66043
 
-UnknownText_0x66043: ; 0x66043
+UnknownText_0x66043:
 	text "Yup, TULLY here…"
 
 	para "<PLAY_G>? What?"
@@ -1129,9 +1052,8 @@ UnknownText_0x66043: ; 0x66043
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x66087
 
-UnknownText_0x66087: ; 0x66087
+UnknownText_0x66087:
 	text "I've got something"
 	line "good for you."
 
@@ -1140,9 +1062,8 @@ UnknownText_0x66087: ; 0x66087
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x660be
 
-BrentRareTradeText: ; 0x660be
+BrentRareTradeText:
 	text "Oh yeah, I got an"
 	line "extremely rare"
 
@@ -1155,9 +1076,8 @@ BrentRareTradeText: ; 0x660be
 	para "Hehe, I'm keeping"
 	line "it a secret!"
 	done
-; 0x6613c
 
-UnknownText_0x6613c: ; 0x6613c
+UnknownText_0x6613c:
 	text "Oh yeah, I took"
 	line "down this wild"
 
@@ -1169,9 +1089,8 @@ UnknownText_0x6613c: ; 0x6613c
 	para "enough to bother"
 	line "catching."
 	done
-; 0x6618c
 
-UnknownText_0x6618c: ; 0x6618c
+UnknownText_0x6618c:
 	text "Oh yeah, I saw a"
 	line "rare #MON about"
 	cont "an hour ago."
@@ -1185,9 +1104,8 @@ UnknownText_0x6618c: ; 0x6618c
 	para "Would BILL laugh"
 	line "at my mistakes?"
 	done
-; 0x66214
 
-UnknownText_0x66214: ; 0x66214
+UnknownText_0x66214:
 	text "You've got time"
 	line "like usual, right?"
 
@@ -1205,102 +1123,90 @@ UnknownText_0x66214: ; 0x66214
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x662a9
 
-UnknownText_0x662a9: ; 0x662a9
+UnknownText_0x662a9:
 	text "So that's it then."
 	done
-; 0x662bc
 
-UnknownText_0x662bc: ; 0x662bc
+UnknownText_0x662bc:
 	text "Did you know…?"
 	line "BILL's father is"
 
 	para "supposed to be a"
 	line "great #MANIAC."
 	done
-; 0x662fc
 
-UnknownText_0x662fc: ; 0x662fc
+UnknownText_0x662fc:
 	text "Did you know…?"
 	line "Apparently BILL's"
 
 	para "grandpa isn't a"
 	line "#MANIAC."
 	done
-; 0x66335
 
-UnknownText_0x66335: ; 0x66335
+UnknownText_0x66335:
 	text "Did you know…?"
 	line "BILL's originally"
 	cont "from GOLDENROD."
 	done
-; 0x66366
 
-UnknownText_0x66366: ; 0x66366
+UnknownText_0x66366:
 	text "Did you know…?"
 	line "BILL evidently"
 
 	para "lives on ROUTE 25"
 	line "in KANTO."
 	done
-; 0x663a1
 
-UnknownText_0x663a1: ; 0x663a1
+UnknownText_0x663a1:
 	text "Did you know…?"
 	line "ABRA was the first"
 
 	para "#MON that BILL"
 	line "ostensibly caught."
 	done
-; 0x663e6
 
-UnknownText_0x663e6: ; 0x663e6
+UnknownText_0x663e6:
 	text "Did you know…?"
 	line "BILL's younger"
 
 	para "sister apparently"
 	line "can't wink."
 	done
-; 0x66421
 
-UnknownText_0x66421: ; 0x66421
+UnknownText_0x66421:
 	text "Did you know…?"
 	line "BILL supposedly"
 
 	para "hates milk and"
 	line "can't drink it."
 	done
-; 0x6645f
 
-UnknownText_0x6645f: ; 0x6645f
+UnknownText_0x6645f:
 	text "Did you know…?"
 	line "Evidently, BILL"
 
 	para "isn't very good at"
 	line "battling."
 	done
-; 0x6649b
 
-UnknownText_0x6649b: ; 0x6649b
+UnknownText_0x6649b:
 	text "Did you know…?"
 	line "BILL appears to"
 
 	para "like the lady at"
 	line "the FLOWER SHOP."
 	done
-; 0x664dd
 
-UnknownText_0x664dd: ; 0x664dd
+UnknownText_0x664dd:
 	text "Did you know…?"
 	line "BILL's mother is"
 
 	para "said to have been"
 	line "a KIMONO GIRL."
 	done
-; 0x6651e
 
-UnknownText_0x6651e: ; 0x6651e
+UnknownText_0x6651e:
 	text "You wanted to hear"
 	line "about BILL?"
 
@@ -1310,9 +1216,8 @@ UnknownText_0x6651e: ; 0x6651e
 	para "I'll call when I"
 	line "have time."
 	done
-; 0x66579
 
-UnknownText_0x66579: ; 0x66579
+UnknownText_0x66579:
 	text "You want to see my"
 	line "rare #MON."
 
@@ -1321,9 +1226,8 @@ UnknownText_0x66579: ; 0x66579
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x665ad
 
-UnknownText_0x665ad: ; 0x665ad
+UnknownText_0x665ad:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -1335,9 +1239,8 @@ UnknownText_0x665ad: ; 0x665ad
 	para "with it--it's so"
 	line "fluffy and warm!"
 	done
-; 0x66605
 
-UnknownText_0x66605: ; 0x66605
+UnknownText_0x66605:
 	text "Oh, and we had to"
 	line "battle a wild"
 
@@ -1356,9 +1259,8 @@ UnknownText_0x66605: ; 0x66605
 	text_from_ram wStringBuffer4
 	text "!"
 	done
-; 0x66688
 
-UnknownText_0x66688: ; 0x66688
+UnknownText_0x66688:
 	text "Oh, and we had to"
 	line "battle a wild"
 
@@ -1377,9 +1279,8 @@ UnknownText_0x66688: ; 0x66688
 	line "feeling protective"
 	cont "of my CLEFAIRY."
 	done
-; 0x66730
 
-UnknownText_0x66730: ; 0x66730
+UnknownText_0x66730:
 	text "I know this might"
 	line "surprise you, but"
 
@@ -1392,9 +1293,8 @@ UnknownText_0x66730: ; 0x66730
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x66796
 
-TiffanyItsAwfulText: ; 0x66796
+TiffanyItsAwfulText:
 	text_from_ram wStringBuffer4
 	text "!"
 
@@ -1409,14 +1309,12 @@ TiffanyItsAwfulText: ; 0x66796
 	para "I have to go!"
 	line "Bye-bye!"
 	done
-; 0x667f7
 
-UnknownText_0x667f7: ; 0x667f7
+UnknownText_0x667f7:
 	text "Bye-bye!"
 	done
-; 0x66801
 
-UnknownText_0x66801: ; 0x66801
+UnknownText_0x66801:
 	text "I bought some PINK"
 	line "BOWS at GOLDENROD"
 
@@ -1431,15 +1329,13 @@ UnknownText_0x66801: ; 0x66801
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x66882
 
-UnknownText_0x66882: ; 0x66882
+UnknownText_0x66882:
 	text "I love dressing up"
 	line "my CLEFAIRY!"
 	done
-; 0x668a3
 
-UnknownText_0x668a3: ; 0x668a3
+UnknownText_0x668a3:
 	text "What's wrong?"
 	line "Can't you visit?"
 
@@ -1454,9 +1350,8 @@ UnknownText_0x668a3: ; 0x668a3
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x6691d
 
-UnknownText_0x6691d: ; 0x6691d
+UnknownText_0x6691d:
 	text "What's wrong?"
 	line "Can't you visit?"
 
@@ -1469,9 +1364,8 @@ UnknownText_0x6691d: ; 0x6691d
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x66980
 
-VanceLiftoffText: ; 0x66980
+VanceLiftoffText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -1480,9 +1374,8 @@ VanceLiftoffText: ; 0x66980
 	para "We've achieved"
 	line "liftoff!"
 	done
-; 0x669b2
 
-UnknownText_0x669b2: ; 0x669b2
+UnknownText_0x669b2:
 	text "We can easily beat"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -1491,9 +1384,8 @@ UnknownText_0x669b2: ; 0x669b2
 	para "…Huh? You too?"
 	line "Isn't that great?"
 	done
-; 0x669ed
 
-UnknownText_0x669ed: ; 0x669ed
+UnknownText_0x669ed:
 	text "But get this, a"
 	line "wild @"
 	text_from_ram wStringBuffer4
@@ -1504,9 +1396,8 @@ UnknownText_0x669ed: ; 0x669ed
 	para "I wanted to FLY"
 	line "after it…"
 	done
-; 0x66a3a
 
-UnknownText_0x66a3a: ; 0x66a3a
+UnknownText_0x66a3a:
 	text "Right now, I'm on"
 	line "@"
 	text_from_ram wStringBuffer5
@@ -1518,21 +1409,18 @@ UnknownText_0x66a3a: ; 0x66a3a
 	para "Want to battle?"
 	line "I'll wait here."
 	done
-; 0x66a93
 
-UnknownText_0x66a93: ; 0x66a93
+UnknownText_0x66a93:
 	text "OK, bye for now!"
 	done
-; 0x66aa5
 
-VanceLookingForwardText: ; 0x66aa5
+VanceLookingForwardText:
 	text "I'll be looking"
 	line "forward to our"
 	cont "next battle!"
 	done
-; 0x66ad1
 
-VanceHurryHurryText: ; 0x66ad1
+VanceHurryHurryText:
 	text "Oh, <PLAY_G>!"
 	line "Hurry, hurry!"
 
@@ -1541,9 +1429,8 @@ VanceHurryHurryText: ; 0x66ad1
 	text "!"
 	line "FLY over now!"
 	done
-; 0x66afc
 
-WiltonGrownText: ; 0x66afc
+WiltonGrownText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -1552,9 +1439,8 @@ WiltonGrownText: ; 0x66afc
 	para "My fishing skills"
 	line "have improved too!"
 	done
-; 0x66b3e
 
-UnknownText_0x66b3e: ; 0x66b3e
+UnknownText_0x66b3e:
 	text "We beat a wild"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -1566,9 +1452,8 @@ UnknownText_0x66b3e: ; 0x66b3e
 	para "than beating wild"
 	line "#MON."
 	done
-; 0x66b8f
 
-UnknownText_0x66b8f: ; 0x66b8f
+UnknownText_0x66b8f:
 	text "But a while back,"
 	line "we came this close"
 
@@ -1580,9 +1465,8 @@ UnknownText_0x66b8f: ; 0x66b8f
 	para "I tell you, it was"
 	line "huge. Believe me."
 	done
-; 0x66bf3
 
-UnknownText_0x66bf3: ; 0x66bf3
+UnknownText_0x66bf3:
 	text "I'm fishing on"
 	line "@"
 	text_from_ram wStringBuffer5
@@ -1595,14 +1479,12 @@ UnknownText_0x66bf3: ; 0x66bf3
 	line "time away, come"
 	cont "over for a battle."
 	done
-; 0x66c58
 
-UnknownText_0x66c58: ; 0x66c58
+UnknownText_0x66c58:
 	text "All right, later."
 	done
-; 0x66c6b
 
-UnknownText_0x66c6b: ; 0x66c6b
+UnknownText_0x66c6b:
 	text "I snagged an item"
 	line "while fishing."
 
@@ -1611,9 +1493,8 @@ UnknownText_0x66c6b: ; 0x66c6b
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x66ca7
 
-WiltonHaventFoundAnythingText: ; 0x66ca7
+WiltonHaventFoundAnythingText:
 	text "Nah, I haven't"
 	line "found anything"
 
@@ -1623,9 +1504,8 @@ WiltonHaventFoundAnythingText: ; 0x66ca7
 	para "You have to have"
 	line "patience."
 	done
-; 0x66cf7
 
-WiltonNotBitingText: ; 0x66cf7
+WiltonNotBitingText:
 	text "Sigh…"
 	line "They're not biting"
 
@@ -1637,9 +1517,8 @@ WiltonNotBitingText: ; 0x66cf7
 	para "You have to come"
 	line "for a battle!"
 	done
-; 0x66d45
 
-WiltonWantThisText: ; 0x66d45
+WiltonWantThisText:
 	text "Don't you want"
 	line "this item?"
 
@@ -1654,15 +1533,13 @@ WiltonWantThisText: ; 0x66d45
 	para "MAHOGANY toward"
 	line "BLACKTHORN!"
 	done
-; 0x66dab
 
-UnknownText_0x66dab: ; 0x66dab
+UnknownText_0x66dab:
 	text "Anyway, we'll chat"
 	line "again!"
 	done
-; 0x66dc5
 
-UnknownText_0x66dc5: ; 0x66dc5
+UnknownText_0x66dc5:
 	text "Are you still on"
 	line "your journey?"
 
@@ -1671,9 +1548,8 @@ UnknownText_0x66dc5: ; 0x66dc5
 
 	para "Oooooaaarrrgh!"
 	done
-; 0x66e17
 
-UnknownText_0x66e17: ; 0x66e17
+UnknownText_0x66e17:
 	text "I'm in training"
 	line "now. I apologize,"
 
@@ -1682,9 +1558,8 @@ UnknownText_0x66e17: ; 0x66e17
 
 	para "Oooooaaarrrgh!"
 	done
-; 0x66e67
 
-UnknownText_0x66e67: ; 0x66e67
+UnknownText_0x66e67:
 	text "I apologize, but I"
 	line "don't have time to"
 
@@ -1696,27 +1571,24 @@ UnknownText_0x66e67: ; 0x66e67
 
 	para "Yiiihah!"
 	done
-; 0x66ed3
 
-UnknownText_0x66ed3: ; 0x66ed3
+UnknownText_0x66ed3:
 	text "I plan to take a"
 	line "lunch break, so"
 
 	para "come see me then!"
 	line "Ayiiiyah!"
 	done
-; 0x66f11
 
-KenjiBreakText: ; 0x66f11
+KenjiBreakText:
 	text "I'm taking a break"
 	line "on ROUTE 45!"
 
 	para "Why not drop by if"
 	line "you are free?"
 	done
-; 0x66f52
 
-UnknownText_0x66f52: ; 0x66f52
+UnknownText_0x66f52:
 	text "I rested up over"
 	line "my lunch break."
 
@@ -1725,17 +1597,15 @@ UnknownText_0x66f52: ; 0x66f52
 
 	para "Oooryaah!"
 	done
-; 0x66f9f
 
-ParryNoMatchText: ; 0x66f9f
+ParryNoMatchText:
 	text "Nothing can match"
 	line "my @"
 	text_from_ram wStringBuffer4
 	text " now."
 	done
-; 0x66fc0
 
-UnknownText_0x66fc0: ; 0x66fc0
+UnknownText_0x66fc0:
 	text "Yeah, we KO'd a"
 	line "wild @"
 	text_from_ram wStringBuffer4
@@ -1744,9 +1614,8 @@ UnknownText_0x66fc0: ; 0x66fc0
 	para "That was OK, but I"
 	line "wanted to get it…"
 	done
-; 0x67001
 
-UnknownText_0x67001: ; 0x67001
+UnknownText_0x67001:
 	text "And yesterday, we"
 	line "spotted a wild"
 
@@ -1764,9 +1633,8 @@ UnknownText_0x67001: ; 0x67001
 	para "caught it!"
 	line "How about that!"
 	done
-; 0x67096
 
-UnknownText_0x67096: ; 0x67096
+UnknownText_0x67096:
 	text "You're thinking"
 	line "you'd like to"
 
@@ -1778,21 +1646,18 @@ UnknownText_0x67096: ; 0x67096
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x670eb
 
-UnknownText_0x670eb: ; 0x670eb
+UnknownText_0x670eb:
 	text "OK, give me a call"
 	line "again!"
 	done
-; 0x67106
 
-ParryBattleWithMeText: ; 0x67106
+ParryBattleWithMeText:
 	text "You'll battle with"
 	line "me again, right?"
 	done
-; 0x6712a
 
-ParryHaventYouGottenToText: ; 0x6712a
+ParryHaventYouGottenToText:
 	text "Haven't you gotten"
 	line "to @"
 	text_from_ram wStringBuffer5
@@ -1802,9 +1667,8 @@ ParryHaventYouGottenToText: ; 0x6712a
 	line "bad, but I'd sure"
 	cont "like to battle!"
 	done
-; 0x6717a
 
-UnknownText_0x6717a: ; 0x6717a
+UnknownText_0x6717a:
 	text_from_ram wStringBuffer3
 	text "'s @"
 	text_from_ram wStringBuffer4
@@ -1812,9 +1676,8 @@ UnknownText_0x6717a: ; 0x6717a
 	line "is much stronger"
 	cont "than before!"
 	done
-; 0x671a4
 
-UnknownText_0x671a4: ; 0x671a4
+UnknownText_0x671a4:
 	text "And, and…"
 	line "I just battled and"
 	cont "beat @"
@@ -1824,9 +1687,8 @@ UnknownText_0x671a4: ; 0x671a4
 	para "I've raised my"
 	line "#MON properly!"
 	done
-; 0x671eb
 
-UnknownText_0x671eb: ; 0x671eb
+UnknownText_0x671eb:
 	text "But, but…"
 
 	para "A wild @"
@@ -1837,9 +1699,8 @@ UnknownText_0x671eb: ; 0x671eb
 	para "again. It's just"
 	line "not fair!"
 	done
-; 0x6722e
 
-UnknownText_0x6722e: ; 0x6722e
+UnknownText_0x6722e:
 	text "I'm ERIN. Want to"
 	line "battle me again?"
 
@@ -1851,14 +1712,12 @@ UnknownText_0x6722e: ; 0x6722e
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x67281
 
-UnknownText_0x67281: ; 0x67281
+UnknownText_0x67281:
 	text "See you. Bye-bye!"
 	done
-; 0x67294
 
-ErinWorkingHardText: ; 0x67294
+ErinWorkingHardText:
 	text "I'm working hard"
 	line "to raise my"
 	cont "#MON!"
@@ -1866,9 +1725,8 @@ ErinWorkingHardText: ; 0x67294
 	para "Come back for"
 	line "another battle!"
 	done
-; 0x672d5
 
-ErinComeBattleText: ; 0x672d5
+ErinComeBattleText:
 	text "Oh, <PLAY_G>!"
 	line "Come battle ERIN!"
 
@@ -1877,4 +1735,3 @@ ErinComeBattleText: ; 0x672d5
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x67308
diff --git a/data/phone/text/extra2.asm b/data/phone/text/extra2.asm
index 887353536..e14378832 100644
--- a/data/phone/text/extra2.asm
+++ b/data/phone/text/extra2.asm
@@ -1,4 +1,4 @@
-UnknownText_0x174000: ; 0x174000
+UnknownText_0x174000:
 	text "Hi, <PLAY_G>!"
 	line "Our BICYCLE sales"
 
@@ -17,9 +17,8 @@ UnknownText_0x174000: ; 0x174000
 	para "keep that BICYCLE."
 	line "Thanks again!"
 	done
-; 0x1740c0
 
-JackIntelligenceText: ; 0x1740c0
+JackIntelligenceText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -29,9 +28,8 @@ JackIntelligenceText: ; 0x1740c0
 	line "be smarter than"
 	cont "yours!"
 	done
-; 0x174106
 
-JackDefeatedMonText: ; 0x174106
+JackDefeatedMonText:
 	text "The other day, I"
 	line "easily defeated a"
 	cont "@"
@@ -42,9 +40,8 @@ JackDefeatedMonText: ; 0x174106
 	line "tips with you is"
 	cont "starting to help."
 	done
-; 0x174165
 
-UnknownText_0x174165: ; 0x174165
+UnknownText_0x174165:
 	text "Oh, and listen."
 	line "I missed catching"
 
@@ -59,9 +56,8 @@ UnknownText_0x174165: ; 0x174165
 	para "sure I would've"
 	line "caught it…"
 	done
-; 0x1741e1
 
-UnknownText_0x1741e1: ; 0x1741e1
+UnknownText_0x1741e1:
 	text "Do you want to"
 	line "battle? I'll show"
 
@@ -76,23 +72,20 @@ UnknownText_0x1741e1: ; 0x1741e1
 	para "Give me a shout if"
 	line "you're nearby."
 	done
-; 0x174251
 
-UnknownText_0x174251: ; 0x174251
+UnknownText_0x174251:
 	text "See you later!"
 	done
-; 0x174261
 
-JackThunderTriviaText: ; 0x174261
+JackThunderTriviaText:
 	text "Did you know?"
 
 	para "When it's raining,"
 	line "THUNDER is sure to"
 	cont "strike."
 	done
-; 0x17429d
 
-JackRolloutTriviaText: ; 0x17429d
+JackRolloutTriviaText:
 	text "Did you know…?"
 
 	para "If you use DEFENSE"
@@ -101,9 +94,8 @@ JackRolloutTriviaText: ; 0x17429d
 	para "power goes way up"
 	line "past normal."
 	done
-; 0x1742ee
 
-JackSolarbeamTriviaText: ; 0x1742ee
+JackSolarbeamTriviaText:
 	text "Did you know…?"
 
 	para "If the sunlight is"
@@ -112,9 +104,8 @@ JackSolarbeamTriviaText: ; 0x1742ee
 	para "doesn't need to be"
 	line "charged up."
 	done
-; 0x174340
 
-JackStompTriviaText: ; 0x174340
+JackStompTriviaText:
 	text "Did you know…?"
 
 	para "If the opponent"
@@ -123,9 +114,8 @@ JackStompTriviaText: ; 0x174340
 	para "your STOMP becomes"
 	line "more powerful."
 	done
-; 0x174391
 
-JackGustTriviaText: ; 0x174391
+JackGustTriviaText:
 	text "Did you know…?"
 
 	para "If your opponent"
@@ -134,9 +124,8 @@ JackGustTriviaText: ; 0x174391
 	para "GUST becomes much"
 	line "more powerful."
 	done
-; 0x1743e3
 
-JackTwisterTriviaText: ; 0x1743e3
+JackTwisterTriviaText:
 	text "Did you know…?"
 
 	para "If your opponent"
@@ -145,9 +134,8 @@ JackTwisterTriviaText: ; 0x1743e3
 	para "TWISTER becomes"
 	line "more powerful."
 	done
-; 0x174433
 
-JackEarthquakeTriviaText: ; 0x174433
+JackEarthquakeTriviaText:
 	text "Did you know…?"
 
 	para "If your opponent"
@@ -156,9 +144,8 @@ JackEarthquakeTriviaText: ; 0x174433
 	para "EARTHQUAKE becomes"
 	line "more powerful."
 	done
-; 0x174485
 
-JackMagnitudeTriviaText: ; 0x174485
+JackMagnitudeTriviaText:
 	text "Did you know…?"
 
 	para "If your opponent"
@@ -167,9 +154,8 @@ JackMagnitudeTriviaText: ; 0x174485
 	para "MAGNITUDE becomes"
 	line "more powerful."
 	done
-; 0x1744d6
 
-JackSandstormTriviaText: ; 0x1744d6
+JackSandstormTriviaText:
 	text "Did you know…?"
 
 	para "The rock, ground"
@@ -178,9 +164,8 @@ JackSandstormTriviaText: ; 0x1744d6
 	para "can't be hurt by"
 	line "SANDSTORM."
 	done
-; 0x174522
 
-JackSunnyDayTriviaText: ; 0x174522
+JackSunnyDayTriviaText:
 	text "Did you know…?"
 
 	para "If the sunlight is"
@@ -189,9 +174,8 @@ JackSunnyDayTriviaText: ; 0x174522
 	para "moves become much"
 	line "weaker."
 	done
-; 0x174571
 
-JackRainDanceTriviaText: ; 0x174571
+JackRainDanceTriviaText:
 	text "Did you know…?"
 
 	para "When it's raining,"
@@ -200,9 +184,8 @@ JackRainDanceTriviaText: ; 0x174571
 	para "become much weaker"
 	line "than usual."
 	done
-; 0x1745c2
 
-UnknownText_0x1745c2: ; 0x1745c2
+UnknownText_0x1745c2:
 	text "My friend heard"
 	line "some great tips."
 
@@ -213,9 +196,8 @@ UnknownText_0x1745c2: ; 0x1745c2
 	line "I'll call right"
 	cont "away and tell you."
 	done
-; 0x174638
 
-UnknownText_0x174638: ; 0x174638
+UnknownText_0x174638:
 	text "Hey, <PLAY_G>!"
 
 	para "Do you remember"
@@ -229,9 +211,8 @@ UnknownText_0x174638: ; 0x174638
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x174688
 
-UnknownText_0x174688: ; 0x174688
+UnknownText_0x174688:
 	text "I fancied up my"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -240,9 +221,8 @@ UnknownText_0x174688: ; 0x174688
 	para "made it even cuter"
 	line "than before!"
 	done
-; 0x1746c3
 
-UnknownText_0x1746c3: ; 0x1746c3
+UnknownText_0x1746c3:
 	text "I happened to come"
 	line "across a wild"
 	cont "SNUBBULL recently."
@@ -253,9 +233,8 @@ UnknownText_0x1746c3: ; 0x1746c3
 	para "far cuter than the"
 	line "wild one."
 	done
-; 0x174734
 
-UnknownText_0x174734: ; 0x174734
+UnknownText_0x174734:
 	text "I happened to see"
 	line "a wild MARILL the"
 
@@ -270,15 +249,13 @@ UnknownText_0x174734: ; 0x174734
 	text ". I was"
 	line "quite miffed."
 	done
-; 0x1747ac
 
-UnknownText_0x1747ac: ; 0x1747ac
+UnknownText_0x1747ac:
 	text "You can expect a"
 	line "call from me."
 	done
-; 0x1747cc
 
-BeverlyFoundNuggetText: ; 0x1747cc
+BeverlyFoundNuggetText:
 	text "My husband got"
 	line "some NUGGETS."
 
@@ -296,18 +273,16 @@ BeverlyFoundNuggetText: ; 0x1747cc
 	para "Please come see me"
 	line "when you can."
 	done
-; 0x17485b
 
-UnknownText_0x17485b: ; 0x17485b
+UnknownText_0x17485b:
 	text "Are your #MON"
 	line "in prime form?"
 
 	para "Let's chat about"
 	line "#MON again."
 	done
-; 0x174895
 
-UnknownText_0x174895: ; 0x174895
+UnknownText_0x174895:
 	text "Pardon?"
 	line "Oh, the NUGGET?"
 
@@ -319,9 +294,8 @@ UnknownText_0x174895: ; 0x174895
 	text_start
 	line "when you can."
 	done
-; 0x1748ea
 
-UnknownText_0x1748ea: ; 0x1748ea
+UnknownText_0x1748ea:
 	text "Hey, I challenge"
 	line "you to a battle!"
 
@@ -336,14 +310,12 @@ UnknownText_0x1748ea: ; 0x1748ea
 	para "for you. Hustle"
 	line "over here pronto!"
 	done
-; 0x174962
 
-UnknownText_0x174962: ; 0x174962
+UnknownText_0x174962:
 	text "See ya!"
 	done
-; 0x17496b
 
-UnknownText_0x17496b: ; 0x17496b
+UnknownText_0x17496b:
 	text "We have to battle"
 	line "again sometime."
 
@@ -353,9 +325,8 @@ UnknownText_0x17496b: ; 0x17496b
 	para "challenging you"
 	line "till I win."
 	done
-; 0x1749c7
 
-UnknownText_0x1749c7: ; 0x1749c7
+UnknownText_0x1749c7:
 	text "Hey, you'd better"
 	line "not have forgotten"
 	cont "about our battle!"
@@ -367,9 +338,8 @@ UnknownText_0x1749c7: ; 0x1749c7
 	para "Hustle over quick!"
 	line "I'm waiting!"
 	done
-; 0x174a24
 
-GavenGreaterText: ; 0x174a24
+GavenGreaterText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text_start
@@ -382,9 +352,8 @@ GavenGreaterText: ; 0x174a24
 	text " that's"
 	cont "better than mine."
 	done
-; 0x174a80
 
-UnknownText_0x174a80: ; 0x174a80
+UnknownText_0x174a80:
 	text "Oh, and I managed"
 	line "to barely defeat"
 
@@ -406,9 +375,8 @@ UnknownText_0x174a80: ; 0x174a80
 	line "#MON you're"
 	cont "used to seeing."
 	done
-; 0x174b2d
 
-UnknownText_0x174b2d: ; 0x174b2d
+UnknownText_0x174b2d:
 	text "And a while back,"
 	line "I tried to catch a"
 	cont "wild @"
@@ -424,9 +392,8 @@ UnknownText_0x174b2d: ; 0x174b2d
 	para "failure… You ought"
 	line "to be careful too."
 	done
-; 0x174bc5
 
-UnknownText_0x174bc5: ; 0x174bc5
+UnknownText_0x174bc5:
 	text "Let's battle!"
 
 	para "I'll be waiting on"
@@ -437,21 +404,18 @@ UnknownText_0x174bc5: ; 0x174bc5
 	para "Give me a shout"
 	line "when you're close."
 	done
-; 0x174c0e
 
-UnknownText_0x174c0e: ; 0x174c0e
+UnknownText_0x174c0e:
 	text "OK, I'll talk to"
 	line "you soon!"
 	done
-; 0x174c29
 
-UnknownText_0x174c29: ; 0x174c29
+UnknownText_0x174c29:
 	text "I obsess over how"
 	line "to beat you."
 	done
-; 0x174c49
 
-UnknownText_0x174c49: ; 0x174c49
+UnknownText_0x174c49:
 	text "<PLAY_G>, why"
 	line "aren't you here?"
 
@@ -460,9 +424,8 @@ UnknownText_0x174c49: ; 0x174c49
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x174c7f
 
-UnknownText_0x174c7f: ; 0x174c7f
+UnknownText_0x174c7f:
 	text "Do you remember my"
 	line "sweet @"
 	text_from_ram wStringBuffer4
@@ -479,9 +442,8 @@ UnknownText_0x174c7f: ; 0x174c7f
 	para "back when it"
 	line "really gets going."
 	done
-; 0x174cf6
 
-UnknownText_0x174cf6: ; 0x174cf6
+UnknownText_0x174cf6:
 	text "Oh, have you ever"
 	line "seen a @"
 	text_from_ram wStringBuffer4
@@ -500,9 +462,8 @@ UnknownText_0x174cf6: ; 0x174cf6
 	para "I still won, of"
 	line "course."
 	done
-; 0x174d86
 
-UnknownText_0x174d86: ; 0x174d86
+UnknownText_0x174d86:
 	text "Oh, I just saw a"
 	line "wild @"
 	text_from_ram wStringBuffer4
@@ -524,9 +485,8 @@ UnknownText_0x174d86: ; 0x174d86
 	para "I hope you learn"
 	line "from my mistake."
 	done
-; 0x174e4e
 
-UnknownText_0x174e4e: ; 0x174e4e
+UnknownText_0x174e4e:
 	text "Do you want to"
 	line "battle? I'm going"
 	cont "to win this time!"
@@ -539,20 +499,17 @@ UnknownText_0x174e4e: ; 0x174e4e
 	text "."
 	line "Look for me, OK?"
 	done
-; 0x174eb7
 
-UnknownText_0x174eb7: ; 0x174eb7
+UnknownText_0x174eb7:
 	text "OK, bye-bye!"
 	done
-; 0x174ec5
 
-UnknownText_0x174ec5: ; 0x174ec5
+UnknownText_0x174ec5:
 	text "Let's battle again"
 	line "sometime!"
 	done
-; 0x174ee2
 
-BethForgetDealText: ; 0x174ee2
+BethForgetDealText:
 	text "Um… <PLAY_G>?"
 	line "What's wrong?"
 
@@ -566,9 +523,8 @@ BethForgetDealText: ; 0x174ee2
 	para "That's where I'm"
 	line "waiting."
 	done
-; 0x174f2f
 
-JoseAromaText: ; 0x174f2f
+JoseAromaText:
 	text "Hey listen, my"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -580,9 +536,8 @@ JoseAromaText: ; 0x174f2f
 	para "That aroma gets my"
 	line "appetite going!"
 	done
-; 0x174f90
 
-UnknownText_0x174f90: ; 0x174f90
+UnknownText_0x174f90:
 	text "A while ago, my"
 	line "FARFETCH'D KO'd"
 	cont "this @"
@@ -595,9 +550,8 @@ UnknownText_0x174f90: ; 0x174f90
 	para "wield that stick."
 	line "Amazing stuff!"
 	done
-; 0x174ffd
 
-UnknownText_0x174ffd: ; 0x174ffd
+UnknownText_0x174ffd:
 	text "I ran into a wild"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -612,9 +566,8 @@ UnknownText_0x174ffd: ; 0x174ffd
 	para "would. It was a"
 	line "bit disappointing."
 	done
-; 0x17507d
 
-UnknownText_0x17507d: ; 0x17507d
+UnknownText_0x17507d:
 	text "Want to battle"
 	line "again?"
 
@@ -632,14 +585,12 @@ UnknownText_0x17507d: ; 0x17507d
 	para "Keep an eye out"
 	line "for me, OK?"
 	done
-; 0x175106
 
-UnknownText_0x175106: ; 0x175106
+UnknownText_0x175106:
 	text "Be seeing you!"
 	done
-; 0x175116
 
-JoseFoundSomethingText: ; 0x175116
+JoseFoundSomethingText:
 	text "My FARFETCH'D had"
 	line "something pretty"
 	cont "in its beak."
@@ -655,9 +606,8 @@ JoseFoundSomethingText: ; 0x175116
 	para "and I'll let you"
 	line "have it."
 	done
-; 0x17519b
 
-UnknownText_0x17519b: ; 0x17519b
+UnknownText_0x17519b:
 	text "I haven't gotten"
 	line "what I promised"
 	cont "you yet."
@@ -668,9 +618,8 @@ UnknownText_0x17519b: ; 0x17519b
 	para "so could you wait"
 	line "a little longer?"
 	done
-; 0x17520a
 
-UnknownText_0x17520a: ; 0x17520a
+UnknownText_0x17520a:
 	text "<PLAY_G>, could you"
 	line "hurry over?"
 
@@ -690,9 +639,8 @@ UnknownText_0x17520a: ; 0x17520a
 	para "Please come as"
 	line "soon as you can!"
 	done
-; 0x17529c
 
-UnknownText_0x17529c: ; 0x17529c
+UnknownText_0x17529c:
 	text "What's wrong?"
 
 	para "Don't you want"
@@ -706,9 +654,8 @@ UnknownText_0x17529c: ; 0x17529c
 	para "and I'll let you"
 	line "have it."
 	done
-; 0x1752f5
 
-UnknownText_0x1752f5: ; 0x1752f5
+UnknownText_0x1752f5:
 	text "Listen, dear…"
 
 	para "Do you recall my"
@@ -725,9 +672,8 @@ UnknownText_0x1752f5: ; 0x1752f5
 	line "it's a perfect"
 	cont "match for me?"
 	done
-; 0x17536b
 
-UnknownText_0x17536b: ; 0x17536b
+UnknownText_0x17536b:
 	text "Have I ever faced"
 	line "a wild @"
 	text_from_ram wStringBuffer4
@@ -741,9 +687,8 @@ UnknownText_0x17536b: ; 0x17536b
 	line "beaten on numerous"
 	cont "occasions!"
 	done
-; 0x1753c5
 
-UnknownText_0x1753c5: ; 0x1753c5
+UnknownText_0x1753c5:
 	text "Have I ever failed"
 	line "to catch a wild"
 	cont "#MON?"
@@ -758,9 +703,8 @@ UnknownText_0x1753c5: ; 0x1753c5
 	text "…"
 	line "Oh! Never mind!"
 	done
-; 0x17543a
 
-UnknownText_0x17543a: ; 0x17543a
+UnknownText_0x17543a:
 	text "We are going to"
 	line "battle!"
 
@@ -772,14 +716,12 @@ UnknownText_0x17543a: ; 0x17543a
 	para "Don't make me"
 	line "wait! Got it?"
 	done
-; 0x175488
 
-UnknownText_0x175488: ; 0x175488
+UnknownText_0x175488:
 	text "Fine, you may go."
 	done
-; 0x17549b
 
-UnknownText_0x17549b: ; 0x17549b
+UnknownText_0x17549b:
 	text "Don't be too proud"
 	line "just because you"
 
@@ -788,9 +730,8 @@ UnknownText_0x17549b: ; 0x17549b
 
 	para "It was a fluke!"
 	done
-; 0x1754e5
 
-UnknownText_0x1754e5: ; 0x1754e5
+UnknownText_0x1754e5:
 	text "What are you"
 	line "doing?"
 
@@ -802,9 +743,8 @@ UnknownText_0x1754e5: ; 0x1754e5
 	text "!"
 	line "Don't try to run!"
 	done
-; 0x175530
 
-JoeySharperText: ; 0x175530
+JoeySharperText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -817,9 +757,8 @@ JoeySharperText: ; 0x175530
 	para "this guy in your"
 	line "party!"
 	done
-; 0x175591
 
-UnknownText_0x175591: ; 0x175591
+UnknownText_0x175591:
 	text "Oh yeah, I took"
 	line "down a @"
 	text_from_ram wStringBuffer4
@@ -833,9 +772,8 @@ UnknownText_0x175591: ; 0x175591
 	para "can't be helped,"
 	line "us being so tough."
 	done
-; 0x175611
 
-UnknownText_0x175611: ; 0x175611
+UnknownText_0x175611:
 	text "Oh yeah, I saw a"
 	line "wild @"
 	text_from_ram wStringBuffer4
@@ -850,9 +788,8 @@ UnknownText_0x175611: ; 0x175611
 	para "only right to the"
 	line "extreme end."
 	done
-; 0x175693
 
-UnknownText_0x175693: ; 0x175693
+UnknownText_0x175693:
 	text "Let's get together"
 	line "and battle!"
 
@@ -867,14 +804,12 @@ UnknownText_0x175693: ; 0x175693
 	para "Give me a shout"
 	line "when you come."
 	done
-; 0x17570a
 
-UnknownText_0x17570a: ; 0x17570a
+UnknownText_0x17570a:
 	text "All right. Later!"
 	done
-; 0x17571d
 
-UnknownText_0x17571d: ; 0x17571d
+UnknownText_0x17571d:
 	text "I'm checking out"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -887,9 +822,8 @@ UnknownText_0x17571d: ; 0x17571d
 	line "with a good one,"
 	cont "let's battle!"
 	done
-; 0x175786
 
-UnknownText_0x175786: ; 0x175786
+UnknownText_0x175786:
 	text "What's keeping"
 	line "you, <PLAYER>!"
 
@@ -901,9 +835,8 @@ UnknownText_0x175786: ; 0x175786
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x1757d4
 
-WadeAreYouGrowingText: ; 0x1757d4
+WadeAreYouGrowingText:
 	text "Are your #MON"
 	line "growing?"
 
@@ -921,9 +854,8 @@ WadeAreYouGrowingText: ; 0x1757d4
 	para "quickly. I think"
 	line "it'll get tough."
 	done
-; 0x175869
 
-UnknownText_0x175869: ; 0x175869
+UnknownText_0x175869:
 	text "Oh yeah, we KO'd a"
 	line "wild @"
 	text_from_ram wStringBuffer4
@@ -937,9 +869,8 @@ UnknownText_0x175869: ; 0x175869
 	para "little sorry for"
 	line "the poor thing."
 	done
-; 0x1758e4
 
-UnknownText_0x1758e4: ; 0x1758e4
+UnknownText_0x1758e4:
 	text "Oh yeah, a wild"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -957,9 +888,8 @@ UnknownText_0x1758e4: ; 0x1758e4
 	para "away when I almost"
 	line "had it."
 	done
-; 0x175976
 
-UnknownText_0x175976: ; 0x175976
+UnknownText_0x175976:
 	text "Do you feel like a"
 	line "#MON battle?"
 
@@ -974,14 +904,12 @@ UnknownText_0x175976: ; 0x175976
 	para "Let me know when"
 	line "you get there."
 	done
-; 0x1759e7
 
-UnknownText_0x1759e7: ; 0x1759e7
+UnknownText_0x1759e7:
 	text "See you later!"
 	done
-; 0x1759f7
 
-WadeBugCatchingContestText: ; 0x1759f7
+WadeBugCatchingContestText:
 	text "The Bug-Catching"
 	line "Contest is at the"
 
@@ -994,9 +922,8 @@ WadeBugCatchingContestText: ; 0x1759f7
 	para "I'm trying to make"
 	line "up my mind."
 	done
-; 0x175a60
 
-WadeFoundBerryText: ; 0x175a60
+WadeFoundBerryText:
 	text "I found all kinds"
 	line "of BERRIES. If you"
 
@@ -1008,9 +935,8 @@ WadeFoundBerryText: ; 0x175a60
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x175abe
 
-UnknownText_0x175abe: ; 0x175abe
+UnknownText_0x175abe:
 	text "Huh? BERRIES?"
 
 	para "Sorry, I haven't"
@@ -1020,9 +946,8 @@ UnknownText_0x175abe: ; 0x175abe
 	line "find any. Will you"
 	cont "please wait?"
 	done
-; 0x175b1e
 
-UnknownText_0x175b1e: ; 0x175b1e
+UnknownText_0x175b1e:
 	text "Let's battle"
 	line "already!"
 
@@ -1034,9 +959,8 @@ UnknownText_0x175b1e: ; 0x175b1e
 	para "Please get here as"
 	line "soon as you can!"
 	done
-; 0x175b6d
 
-UnknownText_0x175b6d: ; 0x175b6d
+UnknownText_0x175b6d:
 	text "How come you're"
 	line "not here yet?"
 
@@ -1048,9 +972,8 @@ UnknownText_0x175b6d: ; 0x175b6d
 	para "Please get here as"
 	line "soon as you can!"
 	done
-; 0x175bc4
 
-RalphNeglectingKidsText: ; 0x175bc4
+RalphNeglectingKidsText:
 	text "I've been spending"
 	line "more time with my"
 
@@ -1062,9 +985,8 @@ RalphNeglectingKidsText: ; 0x175bc4
 	para "That's a bit sad,"
 	line "actually."
 	done
-; 0x175c24
 
-UnknownText_0x175c24: ; 0x175c24
+UnknownText_0x175c24:
 	text "I just beat a wild"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -1079,9 +1001,8 @@ UnknownText_0x175c24: ; 0x175c24
 	para "Boy, has he gotten"
 	line "cocky…"
 	done
-; 0x175c9f
 
-UnknownText_0x175c9f: ; 0x175c9f
+UnknownText_0x175c9f:
 	text "Yesterday a wild"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -1099,9 +1020,8 @@ UnknownText_0x175c9f: ; 0x175c9f
 	para "Hahah, that sure"
 	line "made my day!"
 	done
-; 0x175d40
 
-UnknownText_0x175d40: ; 0x175d40
+UnknownText_0x175d40:
 	text "What do you say to"
 	line "a battle with me?"
 
@@ -1116,15 +1036,13 @@ UnknownText_0x175d40: ; 0x175d40
 	text " is"
 	line "the spot!"
 	done
-; 0x175db7
 
-UnknownText_0x175db7: ; 0x175db7
+UnknownText_0x175db7:
 	text "You call your mom"
 	line "sometimes too!"
 	done
-; 0x175dd9
 
-UnknownText_0x175dd9: ; 0x175dd9
+UnknownText_0x175dd9:
 	text "Listen, I… Yowch!"
 
 	para "Uh, sorry! See,"
@@ -1152,9 +1070,8 @@ UnknownText_0x175dd9: ; 0x175dd9
 	para "sight! Get ready"
 	line "to fish!"
 	done
-; 0x175eaf
 
-UnknownText_0x175eaf: ; 0x175eaf
+UnknownText_0x175eaf:
 	text "Yeah, I know."
 
 	para "You're looking for"
@@ -1164,9 +1081,8 @@ UnknownText_0x175eaf: ; 0x175eaf
 	line "been catching are"
 	cont "MAGIKARP, though…"
 	done
-; 0x175f11
 
-UnknownText_0x175f11: ; 0x175f11
+UnknownText_0x175f11:
 	text "So where are you?"
 	line "I'm waiting for"
 
@@ -1178,9 +1094,8 @@ UnknownText_0x175f11: ; 0x175f11
 	para "You shouldn't make"
 	line "your elders wait!"
 	done
-; 0x175f70
 
-UnknownText_0x175f70: ; 0x175f70
+UnknownText_0x175f70:
 	text "Hey, what's the"
 	line "matter with you?"
 
@@ -1191,9 +1106,8 @@ UnknownText_0x175f70: ; 0x175f70
 	para "I'm on ROUTE 32,"
 	line "so hurry up!"
 	done
-; 0x175fda
 
-UnknownText_0x175fda: ; 0x175fda
+UnknownText_0x175fda:
 	text "Oh, you have to"
 	line "hear this."
 
@@ -1205,9 +1119,8 @@ UnknownText_0x175fda: ; 0x175fda
 	para "It always wants to"
 	line "nuzzle me!"
 	done
-; 0x17602d
 
-UnknownText_0x17602d: ; 0x17602d
+UnknownText_0x17602d:
 	text "And, and! Um…"
 
 	para "We beat a wild"
@@ -1221,9 +1134,8 @@ UnknownText_0x17602d: ; 0x17602d
 	para "We felt sorry for"
 	line "it, though."
 	done
-; 0x176095
 
-UnknownText_0x176095: ; 0x176095
+UnknownText_0x176095:
 	text "And, and! Uh…"
 
 	para "We just saw a"
@@ -1238,9 +1150,8 @@ UnknownText_0x176095: ; 0x176095
 	para "away. It made us"
 	line "really angry!"
 	done
-; 0x17610a
 
-UnknownText_0x17610a: ; 0x17610a
+UnknownText_0x17610a:
 	text "Hi! Do you have"
 	line "some free time?"
 
@@ -1258,9 +1169,8 @@ UnknownText_0x17610a: ; 0x17610a
 	para "Let me know when"
 	line "you get here!"
 	done
-; 0x1761a7
 
-LizHiTaniaText: ; 0x1761a7
+LizHiTaniaText:
 	text "Hi, TANIA. How are"
 	line "you? This is LIZ."
 
@@ -1270,15 +1180,13 @@ LizHiTaniaText: ; 0x1761a7
 	para "Huh… Wrong number?"
 	line "Oops! Sorry!"
 	done
-; 0x17620a
 
-UnknownText_0x17620a: ; 0x17620a
+UnknownText_0x17620a:
 	text "OK, I'll call you"
 	line "later!"
 	done
-; 0x176223
 
-UnknownText_0x176223: ; 0x176223
+UnknownText_0x176223:
 	text "Listen, listen!"
 
 	para "I was listening to"
@@ -1293,9 +1201,8 @@ UnknownText_0x176223: ; 0x176223
 	para "I wonder what it"
 	line "was. So strange!"
 	done
-; 0x1762c3
 
-UnknownText_0x1762c3: ; 0x1762c3
+UnknownText_0x1762c3:
 	text "Listen, listen!"
 
 	para "Don't you think"
@@ -1316,9 +1223,8 @@ UnknownText_0x1762c3: ; 0x1762c3
 	para "I wish I could"
 	line "meet him!"
 	done
-; 0x17638a
 
-UnknownText_0x17638a: ; 0x17638a
+UnknownText_0x17638a:
 	text "Listen, listen!"
 
 	para "Do you know EARL,"
@@ -1333,9 +1239,8 @@ UnknownText_0x17638a: ; 0x17638a
 	para "he was running. It"
 	line "was wildly funny!"
 	done
-; 0x176424
 
-UnknownText_0x176424: ; 0x176424
+UnknownText_0x176424:
 	text "Listen, listen!"
 
 	para "I collect #MON"
@@ -1354,9 +1259,8 @@ UnknownText_0x176424: ; 0x176424
 	line "brag about it if"
 	cont "you had one."
 	done
-; 0x1764eb
 
-UnknownText_0x1764eb: ; 0x1764eb
+UnknownText_0x1764eb:
 	text "Listen, listen!"
 
 	para "Do you know about"
@@ -1374,9 +1278,8 @@ UnknownText_0x1764eb: ; 0x1764eb
 	para "try some. I bet"
 	line "it's delicious!"
 	done
-; 0x176599
 
-UnknownText_0x176599: ; 0x176599
+UnknownText_0x176599:
 	text "Listen, listen!"
 
 	para "There's a #MON"
@@ -1403,9 +1306,8 @@ UnknownText_0x176599: ; 0x176599
 	para "trying to decide"
 	line "whom I should use…"
 	done
-; 0x1766ac
 
-UnknownText_0x1766ac: ; 0x1766ac
+UnknownText_0x1766ac:
 	text "Listen, listen!"
 
 	para "GOLDENROD GYM's"
@@ -1421,9 +1323,8 @@ UnknownText_0x1766ac: ; 0x1766ac
 	para "I bet she must be"
 	line "totally talented."
 	done
-; 0x17674f
 
-UnknownText_0x17674f: ; 0x17674f
+UnknownText_0x17674f:
 	text "Listen, listen!"
 
 	para "Have you ever"
@@ -1443,9 +1344,8 @@ UnknownText_0x17674f: ; 0x17674f
 	line "CATERPIE. Isn't"
 	cont "that great?"
 	done
-; 0x176816
 
-UnknownText_0x176816: ; 0x176816
+UnknownText_0x176816:
 	text "Listen, listen!"
 
 	para "I saw a beautiful"
@@ -1459,9 +1359,8 @@ UnknownText_0x176816: ; 0x176816
 	text_from_ram wStringBuffer4
 	text " too."
 	done
-; 0x17686d
 
-UnknownText_0x17686d: ; 0x17686d
+UnknownText_0x17686d:
 	text "Listen, listen!"
 
 	para "Uh… Um… Whoops!"
@@ -1469,9 +1368,8 @@ UnknownText_0x17686d: ; 0x17686d
 	para "I forgot what I"
 	line "was going to say!"
 	done
-; 0x1768b0
 
-UnknownText_0x1768b0: ; 0x1768b0
+UnknownText_0x1768b0:
 	text "Listen, listen!"
 
 	para "My @"
@@ -1504,9 +1402,8 @@ UnknownText_0x1768b0: ; 0x1768b0
 	para "time!"
 	line "I love chatting!"
 	done
-; 0x1769da
 
-UnknownText_0x1769da: ; 0x1769da
+UnknownText_0x1769da:
 	text "I've got too much"
 	line "time on my hands!"
 
@@ -1518,9 +1415,8 @@ UnknownText_0x1769da: ; 0x1769da
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x176a2f
 
-AnthonyAteBerriesText: ; 0x176a2f
+AnthonyAteBerriesText:
 	text "The other day, I"
 	line "was watching my"
 
@@ -1541,9 +1437,8 @@ AnthonyAteBerriesText: ; 0x176a2f
 	para "that stuff, but it"
 	line "was delicious!"
 	done
-; 0x176aef
 
-UnknownText_0x176aef: ; 0x176aef
+UnknownText_0x176aef:
 	text "Lately, I've been"
 	line "running across"
 
@@ -1555,9 +1450,8 @@ UnknownText_0x176aef: ; 0x176aef
 	para "They're easily"
 	line "taken care of."
 	done
-; 0x176b45
 
-UnknownText_0x176b45: ; 0x176b45
+UnknownText_0x176b45:
 	text "Oh yeah, I was"
 	line "battling this"
 
@@ -1576,9 +1470,8 @@ UnknownText_0x176b45: ; 0x176b45
 	para "stay focused on"
 	line "the job at hand!"
 	done
-; 0x176bee
 
-UnknownText_0x176bee: ; 0x176bee
+UnknownText_0x176bee:
 	text "Come on--let's"
 	line "battle right now!"
 
@@ -1590,15 +1483,13 @@ UnknownText_0x176bee: ; 0x176bee
 	para "Come on down if"
 	line "you feel up to it!"
 	done
-; 0x176c47
 
-UnknownText_0x176c47: ; 0x176c47
+UnknownText_0x176c47:
 	text "All right then!"
 	line "Be good!"
 	done
-; 0x176c61
 
-UnknownText_0x176c61: ; 0x176c61
+UnknownText_0x176c61:
 	text "<PLAYER>! It's"
 	line "mind-blowing!"
 
@@ -1625,9 +1516,8 @@ UnknownText_0x176c61: ; 0x176c61
 	para "where there are"
 	line "strong #MON."
 	done
-; 0x176d32
 
-UnknownText_0x176d32: ; 0x176d32
+UnknownText_0x176d32:
 	text "Rare #MON?"
 
 	para "Hey, sorry! I was"
@@ -1636,9 +1526,8 @@ UnknownText_0x176d32: ; 0x176d32
 	para "hike, so I wasn't"
 	line "paying attention."
 	done
-; 0x176d85
 
-UnknownText_0x176d85: ; 0x176d85
+UnknownText_0x176d85:
 	text "Hello! You haven't"
 	line "forgotten about"
 
@@ -1650,9 +1539,8 @@ UnknownText_0x176d85: ; 0x176d85
 	text "!"
 	line "I'm waiting!"
 	done
-; 0x176dd1
 
-UnknownText_0x176dd1: ; 0x176dd1
+UnknownText_0x176dd1:
 	text "Hello? What? Where"
 	line "is DUNSPARCE?"
 
@@ -1667,9 +1555,8 @@ UnknownText_0x176dd1: ; 0x176dd1
 	para "are strong #MON"
 	line "around."
 	done
-; 0x176e5d
 
-ToddLooksCuteLikeMeText: ; 0x176e5d
+ToddLooksCuteLikeMeText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text " is"
@@ -1678,9 +1565,8 @@ ToddLooksCuteLikeMeText: ; 0x176e5d
 	para "more like me. It's"
 	line "getting cuter!"
 	done
-; 0x176e9c
 
-UnknownText_0x176e9c: ; 0x176e9c
+UnknownText_0x176e9c:
 	text "And, you know?"
 
 	para "Now we can KO"
@@ -1691,9 +1577,8 @@ UnknownText_0x176e9c: ; 0x176e9c
 	para "I should challenge"
 	line "the GOLDENROD GYM."
 	done
-; 0x176eee
 
-UnknownText_0x176eee: ; 0x176eee
+UnknownText_0x176eee:
 	text "And, you know?"
 	line "We just failed to"
 
@@ -1708,9 +1593,8 @@ UnknownText_0x176eee: ; 0x176eee
 	para "aren't high enough"
 	line "yet…"
 	done
-; 0x176f60
 
-UnknownText_0x176f60: ; 0x176f60
+UnknownText_0x176f60:
 	text "You must be a lot"
 	line "better now, huh?"
 
@@ -1725,14 +1609,12 @@ UnknownText_0x176f60: ; 0x176f60
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x176fdb
 
-UnknownText_0x176fdb: ; 0x176fdb
+UnknownText_0x176fdb:
 	text "See you later!"
 	done
-; 0x176feb
 
-UnknownText_0x176feb: ; 0x176feb
+UnknownText_0x176feb:
 	text "This is it--the"
 	line "one we've all been"
 	cont "waiting for!"
@@ -1757,18 +1639,16 @@ UnknownText_0x176feb: ; 0x176feb
 	line "to get there as"
 	cont "soon as you can!"
 	done
-; 0x1770fb
 
-UnknownText_0x1770fb: ; 0x1770fb
+UnknownText_0x1770fb:
 	text "I'm saving up for"
 	line "the next bargain"
 
 	para "sale. When's the"
 	line "next one?"
 	done
-; 0x177138
 
-UnknownText_0x177138: ; 0x177138
+UnknownText_0x177138:
 	text "Where are you?"
 
 	para "Let's have our"
@@ -1779,9 +1659,8 @@ UnknownText_0x177138: ; 0x177138
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x17717c
 
-UnknownText_0x17717c: ; 0x17717c
+UnknownText_0x17717c:
 	text "Haven't you gone"
 	line "to GOLDENROD DEPT."
 
@@ -1794,9 +1673,8 @@ UnknownText_0x17717c: ; 0x17717c
 	para "You should get"
 	line "there quickly."
 	done
-; 0x1771fd
 
-UnknownText_0x1771fd: ; 0x1771fd
+UnknownText_0x1771fd:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text " and"
@@ -1805,9 +1683,8 @@ UnknownText_0x1771fd: ; 0x1771fd
 	para "in sync with each"
 	line "other."
 	done
-; 0x177237
 
-UnknownText_0x177237: ; 0x177237
+UnknownText_0x177237:
 	text "We battled a wild"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -1819,9 +1696,8 @@ UnknownText_0x177237: ; 0x177237
 	para "We're getting into"
 	line "the groove!"
 	done
-; 0x177297
 
-UnknownText_0x177297: ; 0x177297
+UnknownText_0x177297:
 	text "But, you know?"
 
 	para "I still haven't"
@@ -1832,9 +1708,8 @@ UnknownText_0x177297: ; 0x177297
 	para "It's getting past"
 	line "frustrating…"
 	done
-; 0x1772e2
 
-UnknownText_0x1772e2: ; 0x1772e2
+UnknownText_0x1772e2:
 	text "Would you be my"
 	line "practice partner"
 	cont "again sometime?"
@@ -1848,15 +1723,13 @@ UnknownText_0x1772e2: ; 0x1772e2
 	line "a little easier on"
 	cont "me next time?"
 	done
-; 0x177361
 
-UnknownText_0x177361: ; 0x177361
+UnknownText_0x177361:
 	text "Bye! Let's chat"
 	line "again!"
 	done
-; 0x177378
 
-UnknownText_0x177378: ; 0x177378
+UnknownText_0x177378:
 	text "Have you heard"
 	line "about TEAM ROCKET?"
 
@@ -1867,9 +1740,8 @@ UnknownText_0x177378: ; 0x177378
 	para "Are the people"
 	line "inside safe?"
 	done
-; 0x1773e7
 
-UnknownText_0x1773e7: ; 0x1773e7
+UnknownText_0x1773e7:
 	text "I picked up some-"
 	line "thing nice today."
 
@@ -1884,9 +1756,8 @@ UnknownText_0x1773e7: ; 0x1773e7
 	text " is"
 	line "where I am."
 	done
-; 0x177465
 
-UnknownText_0x177465: ; 0x177465
+UnknownText_0x177465:
 	text "Sorry, I haven't"
 	line "found anything"
 
@@ -1896,9 +1767,8 @@ UnknownText_0x177465: ; 0x177465
 	para "find anything, you"
 	line "can have it!"
 	done
-; 0x1774c1
 
-UnknownText_0x1774c1: ; 0x1774c1
+UnknownText_0x1774c1:
 	text "Oh, <PLAY_G>!"
 	line "How soon can I"
 
@@ -1910,9 +1780,8 @@ UnknownText_0x1774c1: ; 0x1774c1
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x17750e
 
-UnknownText_0x17750e: ; 0x17750e
+UnknownText_0x17750e:
 	text "I'm getting really"
 	line "impatient, waiting"
 
@@ -1924,4 +1793,3 @@ UnknownText_0x17750e: ; 0x17750e
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x177561
diff --git a/data/phone/text/mom.asm b/data/phone/text/mom.asm
index ddec4cf77..e392a609e 100644
--- a/data/phone/text/mom.asm
+++ b/data/phone/text/mom.asm
@@ -1,11 +1,11 @@
-MomPhoneGreetingText: ; 0x1b4000
+MomPhoneGreetingText:
 	text "Hello?"
 
 	para "Oh, hi, <PLAYER>!"
 	line "Working hard?"
 	done
 
-MomPhoneLandmarkText: ; 0x1b4021
+MomPhoneLandmarkText:
 	text "Oh, so you're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -19,7 +19,7 @@ MomPhoneLandmarkText: ; 0x1b4021
 	line "take a look?"
 	done
 
-MomPhoneGenericAreaText: ; 0x1b406b
+MomPhoneGenericAreaText:
 	text "Really, you're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -30,7 +30,7 @@ MomPhoneGenericAreaText: ; 0x1b406b
 	cont "of neat, <PLAYER>."
 	done
 
-MomPhoneNewBarkText: ; 0x1b40b1
+MomPhoneNewBarkText:
 	text "What? You're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -40,7 +40,7 @@ MomPhoneNewBarkText: ; 0x1b40b1
 	line "sometime!"
 	done
 
-MomPhoneCherrygroveText: ; 0x1b40e4
+MomPhoneCherrygroveText:
 	text "You're visiting"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -50,7 +50,7 @@ MomPhoneCherrygroveText: ; 0x1b40e4
 	line "home for a bit?"
 	done
 
-MomOtherAreaText: ; 0x1b411c
+MomOtherAreaText:
 	text "Wow, you're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -60,7 +60,7 @@ MomOtherAreaText: ; 0x1b411c
 	line "#MON quest!"
 	done
 
-MomDeterminedText: ; 0x1b4150
+MomDeterminedText:
 	text "That sounds really"
 	line "tough."
 
@@ -71,7 +71,7 @@ MomDeterminedText: ; 0x1b4150
 	line "be OK, right?"
 	done
 
-MomCheckBalanceText: ; 0x1b41a7
+MomCheckBalanceText:
 	text "By the way, you've"
 	line "saved up ¥@"
 	text_from_ram wStringBuffer3
@@ -81,12 +81,12 @@ MomCheckBalanceText: ; 0x1b41a7
 	line "keep on saving?"
 	done
 
-MomImportantToSaveText: ; 0x1b41ea
+MomImportantToSaveText:
 	text "It's important to"
 	line "save your money."
 	done
 
-MomYoureNotSavingText: ; 0x1b420d
+MomYoureNotSavingText:
 	text "Oh, <PLAYER>,"
 	line "you're not saving"
 
@@ -94,7 +94,7 @@ MomYoureNotSavingText: ; 0x1b420d
 	line "you like to save?"
 	done
 
-MomYouveSavedText: ; 0x1b4249
+MomYouveSavedText:
 	text "By the way, you've"
 	line "saved up ¥@"
 	text_from_ram wStringBuffer3
@@ -104,23 +104,23 @@ MomYouveSavedText: ; 0x1b4249
 	line "saving again?"
 	done
 
-MomOKIllSaveText: ; 0x1b4289
+MomOKIllSaveText:
 	text "OK. I'll save your"
 	line "money."
 	done
 
-MomPhoneWontSaveMoneyText: ; 0x1b42a3
+MomPhoneWontSaveMoneyText:
 	text "OK. I won't save"
 	line "your money."
 	done
 
-MomPhoneHangUpText: ; 0x1b42c0
+MomPhoneHangUpText:
 	text "<PLAYER>, keep it"
 	line "up! I'm rooting"
 	cont "for you, baby!"
 	done
 
-MomPhoneNoPokemonText: ; 0x1b42ea
+MomPhoneNoPokemonText:
 	text "Hello?"
 
 	para "Oh, hi, <PLAYER>!"
@@ -128,7 +128,7 @@ MomPhoneNoPokemonText: ; 0x1b42ea
 	cont "waiting for you?"
 	done
 
-MomPhoneNoPokedexText: ; 0x1b431d
+MomPhoneNoPokedexText:
 	text "Hello?"
 
 	para "Oh, hi, <PLAYER>!"
@@ -138,7 +138,7 @@ MomPhoneNoPokedexText: ; 0x1b431d
 	line "ELM? Be good!"
 	done
 
-MomPhoneNoGymQuestText: ; 0x1b435f
+MomPhoneNoGymQuestText:
 	text "Hello?"
 
 	para "Hi, <PLAYER>! If"
@@ -148,7 +148,7 @@ MomPhoneNoGymQuestText: ; 0x1b435f
 	line "on home, dear."
 	done
 
-MomPhoneLectureText: ; 0x1b43a1
+MomPhoneLectureText:
 	text "Hello?"
 
 	para "…… <PLAYER>?"
diff --git a/data/phone/text/trainers1.asm b/data/phone/text/trainers.asm
index e5dcccddf..a907f62fe 100644
--- a/data/phone/text/trainers1.asm
+++ b/data/phone/text/trainers.asm
@@ -1,4 +1,4 @@
-UnknownText_0x1b4dc5: ; 0x1b4dc5
+UnknownText_0x1b4dc5:
 	text "Hello. This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -8,7 +8,7 @@ UnknownText_0x1b4dc5: ; 0x1b4dc5
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b4ded: ; 0x1b4ded
+UnknownText_0x1b4ded:
 	text "Hello. This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -18,7 +18,7 @@ UnknownText_0x1b4ded: ; 0x1b4ded
 	line "<PLAY_G>?"
 	done
 
-UnknownText_0x1b4e16: ; 0x1b4e16
+UnknownText_0x1b4e16:
 	text "Hello. This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -28,7 +28,7 @@ UnknownText_0x1b4e16: ; 0x1b4e16
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b4e3e: ; 0x1b4e3e
+UnknownText_0x1b4e3e:
 	text "<PLAY_G>, good"
 	line "morning!"
 
@@ -38,7 +38,7 @@ UnknownText_0x1b4e3e: ; 0x1b4e3e
 	line "How are you doing?"
 	done
 
-UnknownText_0x1b4e72: ; 0x1b4e72
+UnknownText_0x1b4e72:
 	text "<PLAY_G>, howdy!"
 
 	para "It's me, @"
@@ -47,7 +47,7 @@ UnknownText_0x1b4e72: ; 0x1b4e72
 	line "Isn't it nice out?"
 	done
 
-UnknownText_0x1b4e9e: ; 0x1b4e9e
+UnknownText_0x1b4e9e:
 	text "<PLAY_G>, good"
 	line "evening!"
 
@@ -57,7 +57,7 @@ UnknownText_0x1b4e9e: ; 0x1b4e9e
 	line "Got a minute?"
 	done
 
-UnknownText_0x1b4ecd: ; 0x1b4ecd
+UnknownText_0x1b4ecd:
 	text "How are your"
 	line "#MON doing?"
 
@@ -70,7 +70,7 @@ UnknownText_0x1b4ecd: ; 0x1b4ecd
 	line "it's like me…"
 	done
 
-UnknownText_0x1b4f21: ; 0x1b4f21
+UnknownText_0x1b4f21:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -80,7 +80,7 @@ UnknownText_0x1b4f21: ; 0x1b4f21
 	line "<PLAYER>."
 	done
 
-UnknownText_0x1b4f4d: ; 0x1b4f4d
+UnknownText_0x1b4f4d:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -90,7 +90,7 @@ UnknownText_0x1b4f4d: ; 0x1b4f4d
 	line "<PLAYER>."
 	done
 
-UnknownText_0x1b4f75: ; 0x1b4f75
+UnknownText_0x1b4f75:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -100,7 +100,7 @@ UnknownText_0x1b4f75: ; 0x1b4f75
 	line "<PLAYER>."
 	done
 
-UnknownText_0x1b4fa1: ; 0x1b4fa1
+UnknownText_0x1b4fa1:
 	text "Hello, <PLAYER>."
 	line "Good morning."
 
@@ -110,7 +110,7 @@ UnknownText_0x1b4fa1: ; 0x1b4fa1
 	line "Were you asleep?"
 	done
 
-UnknownText_0x1b4fda: ; 0x1b4fda
+UnknownText_0x1b4fda:
 	text "Hi, <PLAYER>."
 	line "This is @"
 	text_from_ram wStringBuffer3
@@ -119,7 +119,7 @@ UnknownText_0x1b4fda: ; 0x1b4fda
 	para "How are you doing?"
 	done
 
-UnknownText_0x1b5004: ; 0x1b5004
+UnknownText_0x1b5004:
 	text "Hi, <PLAYER>."
 	line "This is @"
 	text_from_ram wStringBuffer3
@@ -128,7 +128,7 @@ UnknownText_0x1b5004: ; 0x1b5004
 	para "Were you awake?"
 	done
 
-UnknownText_0x1b502b: ; 0x1b502b
+UnknownText_0x1b502b:
 	text "Keeping your"
 	line "#MON happy?"
 
@@ -139,7 +139,7 @@ UnknownText_0x1b502b: ; 0x1b502b
 	cont "lot every day."
 	done
 
-UnknownText_0x1b5073: ; 0x1b5073
+UnknownText_0x1b5073:
 	text "Yeah, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -149,7 +149,7 @@ UnknownText_0x1b5073: ; 0x1b5073
 	line "<PLAYER>?"
 	done
 
-UnknownText_0x1b509b: ; 0x1b509b
+UnknownText_0x1b509b:
 	text "Yeah, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -159,7 +159,7 @@ UnknownText_0x1b509b: ; 0x1b509b
 	line "<PLAYER>?"
 	done
 
-UnknownText_0x1b50c2: ; 0x1b50c2
+UnknownText_0x1b50c2:
 	text "Yeah, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -169,7 +169,7 @@ UnknownText_0x1b50c2: ; 0x1b50c2
 	line "<PLAYER>?"
 	done
 
-UnknownText_0x1b50e9: ; 0x1b50e9
+UnknownText_0x1b50e9:
 	text "Yo, <PLAYER>!"
 	line "You awake?"
 
@@ -179,7 +179,7 @@ UnknownText_0x1b50e9: ; 0x1b50e9
 	line "How's it going?"
 	done
 
-UnknownText_0x1b511a: ; 0x1b511a
+UnknownText_0x1b511a:
 	text "Yo, <PLAYER>! You"
 	line "free right now?"
 
@@ -189,7 +189,7 @@ UnknownText_0x1b511a: ; 0x1b511a
 	line "How's it going?"
 	done
 
-UnknownText_0x1b5154: ; 0x1b5154
+UnknownText_0x1b5154:
 	text "Yo, <PLAYER>!"
 	line "Were you asleep?"
 
@@ -199,7 +199,7 @@ UnknownText_0x1b5154: ; 0x1b5154
 	line "How's it going?"
 	done
 
-UnknownText_0x1b518b: ; 0x1b518b
+UnknownText_0x1b518b:
 	text "How are your"
 	line "#MON doing?"
 
@@ -219,7 +219,7 @@ UnknownText_0x1b518b: ; 0x1b518b
 	line "bit much for me!"
 	done
 
-UnknownText_0x1b522b: ; 0x1b522b
+UnknownText_0x1b522b:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -230,7 +230,7 @@ UnknownText_0x1b522b: ; 0x1b522b
 	line "tougher than me!"
 	done
 
-UnknownText_0x1b5270: ; 0x1b5270
+UnknownText_0x1b5270:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -240,7 +240,7 @@ UnknownText_0x1b5270: ; 0x1b5270
 	line "Good morning!"
 	done
 
-UnknownText_0x1b52a5: ; 0x1b52a5
+UnknownText_0x1b52a5:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -249,7 +249,7 @@ UnknownText_0x1b52a5: ; 0x1b52a5
 	para "Hi, <PLAY_G>!"
 	done
 
-UnknownText_0x1b52cc: ; 0x1b52cc
+UnknownText_0x1b52cc:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -259,7 +259,7 @@ UnknownText_0x1b52cc: ; 0x1b52cc
 	line "Good evening!"
 	done
 
-UnknownText_0x1b5301: ; 0x1b5301
+UnknownText_0x1b5301:
 	text "<PLAY_G>, good"
 	line "morning!"
 
@@ -269,7 +269,7 @@ UnknownText_0x1b5301: ; 0x1b5301
 	line "How are you doing?"
 	done
 
-UnknownText_0x1b5335: ; 0x1b5335
+UnknownText_0x1b5335:
 	text "Hi, <PLAY_G>!"
 
 	para "It's me, @"
@@ -278,7 +278,7 @@ UnknownText_0x1b5335: ; 0x1b5335
 	line "How are you doing?"
 	done
 
-UnknownText_0x1b535f: ; 0x1b535f
+UnknownText_0x1b535f:
 	text "<PLAY_G>, good"
 	line "evening!"
 
@@ -288,7 +288,7 @@ UnknownText_0x1b535f: ; 0x1b535f
 	line "How are you doing?"
 	done
 
-UnknownText_0x1b5393: ; 0x1b5393
+UnknownText_0x1b5393:
 	text "How are your"
 	line "#MON doing?"
 
@@ -303,7 +303,7 @@ UnknownText_0x1b5393: ; 0x1b5393
 	cont "CHAMPS!"
 	done
 
-UnknownText_0x1b53f7: ; 0x1b53f7
+UnknownText_0x1b53f7:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -315,7 +315,7 @@ UnknownText_0x1b53f7: ; 0x1b53f7
 	para ""
 	done
 
-UnknownText_0x1b5424: ; 0x1b5424
+UnknownText_0x1b5424:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -324,7 +324,7 @@ UnknownText_0x1b5424: ; 0x1b5424
 	para "Oh. Hi, <PLAY_G>."
 	done
 
-UnknownText_0x1b5446: ; 0x1b5446
+UnknownText_0x1b5446:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -334,7 +334,7 @@ UnknownText_0x1b5446: ; 0x1b5446
 	line "Good evening."
 	done
 
-UnknownText_0x1b5472: ; 0x1b5472
+UnknownText_0x1b5472:
 	text "Good morning,"
 	line "<PLAY_G>!"
 
@@ -344,7 +344,7 @@ UnknownText_0x1b5472: ; 0x1b5472
 	line "Were you sleeping?"
 	done
 
-UnknownText_0x1b54a6: ; 0x1b54a6
+UnknownText_0x1b54a6:
 	text "<PLAY_G>, hi!"
 	line "This is @"
 	text_from_ram wStringBuffer3
@@ -354,7 +354,7 @@ UnknownText_0x1b54a6: ; 0x1b54a6
 	line "time?"
 	done
 
-UnknownText_0x1b54d4: ; 0x1b54d4
+UnknownText_0x1b54d4:
 	text "Hi, <PLAY_G>."
 	line "Good evening."
 
@@ -366,7 +366,7 @@ UnknownText_0x1b54d4: ; 0x1b54d4
 	line "awake."
 	done
 
-UnknownText_0x1b5510: ; 0x1b5510
+UnknownText_0x1b5510:
 	text "Are you the kind"
 	line "of person who goes"
 
@@ -383,7 +383,7 @@ UnknownText_0x1b5510: ; 0x1b5510
 	line "#MON trainer."
 	done
 
-UnknownText_0x1b55ae: ; 0x1b55ae
+UnknownText_0x1b55ae:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -393,7 +393,7 @@ UnknownText_0x1b55ae: ; 0x1b55ae
 	line "Good morning!"
 	done
 
-UnknownText_0x1b55da: ; 0x1b55da
+UnknownText_0x1b55da:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -402,7 +402,7 @@ UnknownText_0x1b55da: ; 0x1b55da
 	para "Oh, <PLAY_G>? Hi!"
 	done
 
-UnknownText_0x1b55fc: ; 0x1b55fc
+UnknownText_0x1b55fc:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -412,7 +412,7 @@ UnknownText_0x1b55fc: ; 0x1b55fc
 	line "Good evening!"
 	done
 
-UnknownText_0x1b5628: ; 0x1b5628
+UnknownText_0x1b5628:
 	text "Oh, <PLAY_G>?"
 
 	para "Tweet! Yeah, it's"
@@ -421,7 +421,7 @@ UnknownText_0x1b5628: ; 0x1b5628
 	text "."
 	done
 
-UnknownText_0x1b564c: ; 0x1b564c
+UnknownText_0x1b564c:
 	text "Oh, <PLAY_G>?"
 
 	para "Tweet! Yeah, it's"
@@ -430,7 +430,7 @@ UnknownText_0x1b564c: ; 0x1b564c
 	text "."
 	done
 
-UnknownText_0x1b5670: ; 0x1b5670
+UnknownText_0x1b5670:
 	text "Oh, <PLAY_G>?"
 
 	para "Tweet! Yeah, it's"
@@ -439,7 +439,7 @@ UnknownText_0x1b5670: ; 0x1b5670
 	text "."
 	done
 
-UnknownText_0x1b5694: ; 0x1b5694
+UnknownText_0x1b5694:
 	text "Are your #MON"
 	line "still cooking?"
 
@@ -453,7 +453,7 @@ UnknownText_0x1b5694: ; 0x1b5694
 	cont "for a while."
 	done
 
-UnknownText_0x1b5702: ; 0x1b5702
+UnknownText_0x1b5702:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -463,7 +463,7 @@ UnknownText_0x1b5702: ; 0x1b5702
 	line "What's up?"
 	done
 
-UnknownText_0x1b572e: ; 0x1b572e
+UnknownText_0x1b572e:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -473,7 +473,7 @@ UnknownText_0x1b572e: ; 0x1b572e
 	line "what's up?"
 	done
 
-UnknownText_0x1b575a: ; 0x1b575a
+UnknownText_0x1b575a:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -483,7 +483,7 @@ UnknownText_0x1b575a: ; 0x1b575a
 	line "what's up?"
 	done
 
-UnknownText_0x1b5786: ; 0x1b5786
+UnknownText_0x1b5786:
 	text "You're slow! Hurry"
 	line "up and answer!"
 
@@ -492,7 +492,7 @@ UnknownText_0x1b5786: ; 0x1b5786
 	text "!"
 	done
 
-UnknownText_0x1b57b7: ; 0x1b57b7
+UnknownText_0x1b57b7:
 	text "You're slow! Hurry"
 	line "up and answer!"
 
@@ -501,7 +501,7 @@ UnknownText_0x1b57b7: ; 0x1b57b7
 	text "!"
 	done
 
-UnknownText_0x1b57e8: ; 0x1b57e8
+UnknownText_0x1b57e8:
 	text "You're slow! Hurry"
 	line "up and answer!"
 
@@ -510,7 +510,7 @@ UnknownText_0x1b57e8: ; 0x1b57e8
 	text "!"
 	done
 
-UnknownText_0x1b5819: ; 0x1b5819
+UnknownText_0x1b5819:
 	text "Hey, how are your"
 	line "#MON doing?"
 
@@ -526,7 +526,7 @@ UnknownText_0x1b5819: ; 0x1b5819
 	line "is that?"
 	done
 
-UnknownText_0x1b589a: ; 0x1b589a
+UnknownText_0x1b589a:
 	text "Hi, @"
 	text_from_ram wStringBuffer3
 	text " here!"
@@ -535,7 +535,7 @@ UnknownText_0x1b589a: ; 0x1b589a
 	line "doing well?"
 	done
 
-UnknownText_0x1b58c2: ; 0x1b58c2
+UnknownText_0x1b58c2:
 	text "Hi, @"
 	text_from_ram wStringBuffer3
 	text " here!"
@@ -544,7 +544,7 @@ UnknownText_0x1b58c2: ; 0x1b58c2
 	line "doing well?"
 	done
 
-UnknownText_0x1b58ea: ; 0x1b58ea
+UnknownText_0x1b58ea:
 	text "Hi, @"
 	text_from_ram wStringBuffer3
 	text " here!"
@@ -553,7 +553,7 @@ UnknownText_0x1b58ea: ; 0x1b58ea
 	line "doing well?"
 	done
 
-UnknownText_0x1b5912: ; 0x1b5912
+UnknownText_0x1b5912:
 	text "Yo, <PLAYER>!"
 	line "How're you doing?"
 
@@ -563,7 +563,7 @@ UnknownText_0x1b5912: ; 0x1b5912
 	line "got a minute?"
 	done
 
-UnknownText_0x1b5948: ; 0x1b5948
+UnknownText_0x1b5948:
 	text "Yo, <PLAYER>! How's"
 	line "it going?"
 
@@ -573,7 +573,7 @@ UnknownText_0x1b5948: ; 0x1b5948
 	line "Got a minute?"
 	done
 
-UnknownText_0x1b597c: ; 0x1b597c
+UnknownText_0x1b597c:
 	text "Yo, <PLAYER>!"
 	line "How're you doing?"
 
@@ -583,7 +583,7 @@ UnknownText_0x1b597c: ; 0x1b597c
 	line "got a minute?"
 	done
 
-UnknownText_0x1b59b2: ; 0x1b59b2
+UnknownText_0x1b59b2:
 	text "How are your"
 	line "#MON doing?"
 
@@ -600,7 +600,7 @@ UnknownText_0x1b59b2: ; 0x1b59b2
 	line "trainer with it!"
 	done
 
-UnknownText_0x1b5a3b: ; 0x1b5a3b
+UnknownText_0x1b5a3b:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -610,7 +610,7 @@ UnknownText_0x1b5a3b: ; 0x1b5a3b
 	line "Good morning!"
 	done
 
-UnknownText_0x1b5a74: ; 0x1b5a74
+UnknownText_0x1b5a74:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -619,7 +619,7 @@ UnknownText_0x1b5a74: ; 0x1b5a74
 	para "Oh, hi, <PLAY_G>!"
 	done
 
-UnknownText_0x1b5a9f: ; 0x1b5a9f
+UnknownText_0x1b5a9f:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -629,7 +629,7 @@ UnknownText_0x1b5a9f: ; 0x1b5a9f
 	line "Good evening!"
 	done
 
-UnknownText_0x1b5ad8: ; 0x1b5ad8
+UnknownText_0x1b5ad8:
 	text "<PLAY_G>, good"
 	line "morning!"
 
@@ -639,7 +639,7 @@ UnknownText_0x1b5ad8: ; 0x1b5ad8
 	line "Isn't it nice out?"
 	done
 
-UnknownText_0x1b5b0b: ; 0x1b5b0b
+UnknownText_0x1b5b0b:
 	text "<PLAY_G>, howdy!"
 
 	para "It's me, @"
@@ -648,7 +648,7 @@ UnknownText_0x1b5b0b: ; 0x1b5b0b
 	line "Isn't it nice out?"
 	done
 
-UnknownText_0x1b5b37: ; 0x1b5b37
+UnknownText_0x1b5b37:
 	text "Good evening,"
 	line "<PLAY_G>!"
 
@@ -658,7 +658,7 @@ UnknownText_0x1b5b37: ; 0x1b5b37
 	line "Were you awake?"
 	done
 
-UnknownText_0x1b5b68: ; 0x1b5b68
+UnknownText_0x1b5b68:
 	text "How are your"
 	line "#MON doing?"
 
@@ -678,7 +678,7 @@ UnknownText_0x1b5b68: ; 0x1b5b68
 	line "exhausting."
 	done
 
-UnknownText_0x1b5c10: ; 0x1b5c10
+UnknownText_0x1b5c10:
 	text "Yes? Ah, <PLAY_G>."
 
 	para "You're courteous"
@@ -688,7 +688,7 @@ UnknownText_0x1b5c10: ; 0x1b5c10
 	line "call on the phone."
 	done
 
-UnknownText_0x1b5c63: ; 0x1b5c63
+UnknownText_0x1b5c63:
 	text "Yes? Ah, <PLAY_G>."
 
 	para "You're courteous"
@@ -698,7 +698,7 @@ UnknownText_0x1b5c63: ; 0x1b5c63
 	line "call on the phone."
 	done
 
-UnknownText_0x1b5cb6: ; 0x1b5cb6
+UnknownText_0x1b5cb6:
 	text "Yes? Ah, <PLAY_G>."
 
 	para "You're courteous"
@@ -708,28 +708,28 @@ UnknownText_0x1b5cb6: ; 0x1b5cb6
 	line "call on the phone."
 	done
 
-UnknownText_0x1b5d09: ; 0x1b5d09
+UnknownText_0x1b5d09:
 	text "Hiya, it's Uncle"
 	line "@"
 	text_from_ram wStringBuffer3
 	text "."
 	done
 
-UnknownText_0x1b5d21: ; 0x1b5d21
+UnknownText_0x1b5d21:
 	text "Hiya, it's Uncle"
 	line "@"
 	text_from_ram wStringBuffer3
 	text "."
 	done
 
-UnknownText_0x1b5d39: ; 0x1b5d39
+UnknownText_0x1b5d39:
 	text "Hiya, it's Uncle"
 	line "@"
 	text_from_ram wStringBuffer3
 	text "."
 	done
 
-UnknownText_0x1b5d51: ; 0x1b5d51
+UnknownText_0x1b5d51:
 	text "Are you taking"
 	line "good care of your"
 
@@ -738,7 +738,7 @@ UnknownText_0x1b5d51: ; 0x1b5d51
 	cont "partners!"
 	done
 
-UnknownText_0x1b5d9f: ; 0x1b5d9f
+UnknownText_0x1b5d9f:
 	text "Hello, @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -748,7 +748,7 @@ UnknownText_0x1b5d9f: ; 0x1b5d9f
 	line "Good morning."
 	done
 
-UnknownText_0x1b5dcc: ; 0x1b5dcc
+UnknownText_0x1b5dcc:
 	text "Hello, @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -758,7 +758,7 @@ UnknownText_0x1b5dcc: ; 0x1b5dcc
 	line "How are you?"
 	done
 
-UnknownText_0x1b5df8: ; 0x1b5df8
+UnknownText_0x1b5df8:
 	text "Hello, @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -768,7 +768,7 @@ UnknownText_0x1b5df8: ; 0x1b5df8
 	line "Good evening."
 	done
 
-UnknownText_0x1b5e25: ; 0x1b5e25
+UnknownText_0x1b5e25:
 	text "Good morning,"
 	line "<PLAY_G>."
 
@@ -778,7 +778,7 @@ UnknownText_0x1b5e25: ; 0x1b5e25
 	line "Were you sleeping?"
 	done
 
-UnknownText_0x1b5e59: ; 0x1b5e59
+UnknownText_0x1b5e59:
 	text "Hi, <PLAY_G>."
 	line "This is @"
 	text_from_ram wStringBuffer3
@@ -788,7 +788,7 @@ UnknownText_0x1b5e59: ; 0x1b5e59
 	line "going for you?"
 	done
 
-UnknownText_0x1b5e8e: ; 0x1b5e8e
+UnknownText_0x1b5e8e:
 	text "Good evening,"
 	line "<PLAY_G>."
 
@@ -798,7 +798,7 @@ UnknownText_0x1b5e8e: ; 0x1b5e8e
 	line "Are you awake?"
 	done
 
-UnknownText_0x1b5ebe: ; 0x1b5ebe
+UnknownText_0x1b5ebe:
 	text "I had some time,"
 	line "so I called you."
 
@@ -820,7 +820,7 @@ UnknownText_0x1b5ebe: ; 0x1b5ebe
 	line "the receptionist!"
 	done
 
-UnknownText_0x1b5f7a: ; 0x1b5f7a
+UnknownText_0x1b5f7a:
 	text "Yeah, @"
 	text_from_ram wStringBuffer3
 	text " the"
@@ -829,7 +829,7 @@ UnknownText_0x1b5f7a: ; 0x1b5f7a
 	para "Ah, <PLAYER>!"
 	done
 
-UnknownText_0x1b5f9e: ; 0x1b5f9e
+UnknownText_0x1b5f9e:
 	text "Yeah, @"
 	text_from_ram wStringBuffer3
 	text " the"
@@ -839,7 +839,7 @@ UnknownText_0x1b5f9e: ; 0x1b5f9e
 	line "right?"
 	done
 
-UnknownText_0x1b5fc9: ; 0x1b5fc9
+UnknownText_0x1b5fc9:
 	text "Yeah, @"
 	text_from_ram wStringBuffer3
 	text " the"
@@ -849,7 +849,7 @@ UnknownText_0x1b5fc9: ; 0x1b5fc9
 	line "it?"
 	done
 
-UnknownText_0x1b5ff6: ; 0x1b5ff6
+UnknownText_0x1b5ff6:
 	text "Yo, <PLAYER>?"
 
 	para "This is @"
@@ -858,7 +858,7 @@ UnknownText_0x1b5ff6: ; 0x1b5ff6
 	line "the HIKER!"
 	done
 
-UnknownText_0x1b6017: ; 0x1b6017
+UnknownText_0x1b6017:
 	text "Hey, is this"
 	line "<PLAYER>?"
 
@@ -868,7 +868,7 @@ UnknownText_0x1b6017: ; 0x1b6017
 	line "the HIKER!"
 	done
 
-UnknownText_0x1b6041: ; 0x1b6041
+UnknownText_0x1b6041:
 	text "<PLAYER>, you still"
 	line "awake?"
 
@@ -878,7 +878,7 @@ UnknownText_0x1b6041: ; 0x1b6041
 	line "the HIKER!"
 	done
 
-UnknownText_0x1b606f: ; 0x1b606f
+UnknownText_0x1b606f:
 	text "Are your #MON"
 	line "as feisty as ever?"
 
@@ -894,7 +894,7 @@ UnknownText_0x1b606f: ; 0x1b606f
 	line "all our energy."
 	done
 
-UnknownText_0x1b60f5: ; 0x1b60f5
+UnknownText_0x1b60f5:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -903,7 +903,7 @@ UnknownText_0x1b60f5: ; 0x1b60f5
 	para "Hey, <PLAY_G>!"
 	done
 
-UnknownText_0x1b611b: ; 0x1b611b
+UnknownText_0x1b611b:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -913,7 +913,7 @@ UnknownText_0x1b611b: ; 0x1b611b
 	line "<PLAY_G>."
 	done
 
-UnknownText_0x1b6149: ; 0x1b6149
+UnknownText_0x1b6149:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -922,7 +922,7 @@ UnknownText_0x1b6149: ; 0x1b6149
 	para "Ah, <PLAY_G>!"
 	done
 
-UnknownText_0x1b616e: ; 0x1b616e
+UnknownText_0x1b616e:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -931,7 +931,7 @@ UnknownText_0x1b616e: ; 0x1b616e
 	para "<PLAY_G>, right?"
 	done
 
-UnknownText_0x1b618f: ; 0x1b618f
+UnknownText_0x1b618f:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -941,7 +941,7 @@ UnknownText_0x1b618f: ; 0x1b618f
 	line "you doing?"
 	done
 
-UnknownText_0x1b61bd: ; 0x1b61bd
+UnknownText_0x1b61bd:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -951,7 +951,7 @@ UnknownText_0x1b61bd: ; 0x1b61bd
 	line "call you so late."
 	done
 
-UnknownText_0x1b61f2: ; 0x1b61f2
+UnknownText_0x1b61f2:
 	text "How do you raise"
 	line "your #MON?"
 
@@ -965,7 +965,7 @@ UnknownText_0x1b61f2: ; 0x1b61f2
 	line "with items."
 	done
 
-UnknownText_0x1b626a: ; 0x1b626a
+UnknownText_0x1b626a:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -975,7 +975,7 @@ UnknownText_0x1b626a: ; 0x1b626a
 	line "Good morning!"
 	done
 
-UnknownText_0x1b6296: ; 0x1b6296
+UnknownText_0x1b6296:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -985,7 +985,7 @@ UnknownText_0x1b6296: ; 0x1b6296
 	line "Hi, how are you?"
 	done
 
-UnknownText_0x1b62c5: ; 0x1b62c5
+UnknownText_0x1b62c5:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -995,7 +995,7 @@ UnknownText_0x1b62c5: ; 0x1b62c5
 	line "Good evening!"
 	done
 
-UnknownText_0x1b62f1: ; 0x1b62f1
+UnknownText_0x1b62f1:
 	text "<PLAY_G>?"
 
 	para "It's @"
@@ -1004,7 +1004,7 @@ UnknownText_0x1b62f1: ; 0x1b62f1
 	line "Good morning!"
 	done
 
-UnknownText_0x1b630e: ; 0x1b630e
+UnknownText_0x1b630e:
 	text "<PLAY_G>?"
 
 	para "It's @"
@@ -1013,7 +1013,7 @@ UnknownText_0x1b630e: ; 0x1b630e
 	line "this a bad time?"
 	done
 
-UnknownText_0x1b6331: ; 0x1b6331
+UnknownText_0x1b6331:
 	text "<PLAY_G>?"
 
 	para "It's @"
@@ -1022,7 +1022,7 @@ UnknownText_0x1b6331: ; 0x1b6331
 	line "Got time to chat?"
 	done
 
-UnknownText_0x1b6352: ; 0x1b6352
+UnknownText_0x1b6352:
 	text "Are your #MON"
 	line "still tough?"
 
@@ -1032,7 +1032,7 @@ UnknownText_0x1b6352: ; 0x1b6352
 	text "."
 	done
 
-UnknownText_0x1b638c: ; 0x1b638c
+UnknownText_0x1b638c:
 	text "Hello? @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -1041,7 +1041,7 @@ UnknownText_0x1b638c: ; 0x1b638c
 	para "Hey, <PLAY_G>!"
 	done
 
-UnknownText_0x1b63a8: ; 0x1b63a8
+UnknownText_0x1b63a8:
 	text "Hello? @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -1050,7 +1050,7 @@ UnknownText_0x1b63a8: ; 0x1b63a8
 	para "Wow, <PLAY_G>!"
 	done
 
-UnknownText_0x1b63c4: ; 0x1b63c4
+UnknownText_0x1b63c4:
 	text "Hello? @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -1059,7 +1059,7 @@ UnknownText_0x1b63c4: ; 0x1b63c4
 	para "Yippee, <PLAY_G>!"
 	done
 
-UnknownText_0x1b63e3: ; 0x1b63e3
+UnknownText_0x1b63e3:
 	text "Uh, hello."
 	line "<PLAY_G>?"
 
@@ -1069,7 +1069,7 @@ UnknownText_0x1b63e3: ; 0x1b63e3
 	text "!"
 	done
 
-UnknownText_0x1b6407: ; 0x1b6407
+UnknownText_0x1b6407:
 	text "Uh, hello,"
 	line "<PLAY_G>?"
 
@@ -1079,7 +1079,7 @@ UnknownText_0x1b6407: ; 0x1b6407
 	text "!"
 	done
 
-UnknownText_0x1b642c: ; 0x1b642c
+UnknownText_0x1b642c:
 	text "Uh, hello,"
 	line "<PLAY_G>?"
 
@@ -1089,7 +1089,7 @@ UnknownText_0x1b642c: ; 0x1b642c
 	text "!"
 	done
 
-UnknownText_0x1b6454: ; 0x1b6454
+UnknownText_0x1b6454:
 	text "Yeah, hello."
 	line "This is @"
 	text_from_ram wStringBuffer3
@@ -1098,7 +1098,7 @@ UnknownText_0x1b6454: ; 0x1b6454
 	para "…Huh, <PLAY_G>? Yo!"
 	done
 
-UnknownText_0x1b647e: ; 0x1b647e
+UnknownText_0x1b647e:
 	text "Yeah, hello, you"
 	line "got @"
 	text_from_ram wStringBuffer3
@@ -1107,7 +1107,7 @@ UnknownText_0x1b647e: ; 0x1b647e
 	para "…Huh, <PLAY_G>? Yo!"
 	done
 
-UnknownText_0x1b64a8: ; 0x1b64a8
+UnknownText_0x1b64a8:
 	text "Yeah, hello, you"
 	line "got @"
 	text_from_ram wStringBuffer3
@@ -1116,7 +1116,7 @@ UnknownText_0x1b64a8: ; 0x1b64a8
 	para "…Huh, <PLAY_G>? Yo!"
 	done
 
-UnknownText_0x1b64d2: ; 0x1b64d2
+UnknownText_0x1b64d2:
 	text "Yeah, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1126,7 +1126,7 @@ UnknownText_0x1b64d2: ; 0x1b64d2
 	line "to, <PLAY_G>?"
 	done
 
-UnknownText_0x1b6506: ; 0x1b6506
+UnknownText_0x1b6506:
 	text "Yeah, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1136,7 +1136,7 @@ UnknownText_0x1b6506: ; 0x1b6506
 	line "<PLAY_G>?"
 	done
 
-UnknownText_0x1b6539: ; 0x1b6539
+UnknownText_0x1b6539:
 	text "Yeah, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1146,13 +1146,13 @@ UnknownText_0x1b6539: ; 0x1b6539
 	line "<PLAY_G>?"
 	done
 
-UnknownText_0x1b656c: ; 0x1b656c
+UnknownText_0x1b656c:
 	text "I bet your #MON"
 	line "are a lot stronger"
 	cont "than before."
 	done
 
-UnknownText_0x1b659d: ; 0x1b659d
+UnknownText_0x1b659d:
 	text "Yup, it's @"
 	text_from_ram wStringBuffer3
 	text "!"
@@ -1161,7 +1161,7 @@ UnknownText_0x1b659d: ; 0x1b659d
 	line "Good morning!"
 	done
 
-UnknownText_0x1b65c7: ; 0x1b65c7
+UnknownText_0x1b65c7:
 	text "Yup, it's @"
 	text_from_ram wStringBuffer3
 	text "!"
@@ -1169,7 +1169,7 @@ UnknownText_0x1b65c7: ; 0x1b65c7
 	para "Is that <PLAY_G>?"
 	done
 
-UnknownText_0x1b65e3: ; 0x1b65e3
+UnknownText_0x1b65e3:
 	text "Yup, it's @"
 	text_from_ram wStringBuffer3
 	text "!"
@@ -1178,28 +1178,28 @@ UnknownText_0x1b65e3: ; 0x1b65e3
 	line "Good evening!"
 	done
 
-UnknownText_0x1b660d: ; 0x1b660d
+UnknownText_0x1b660d:
 	text "Hello! It's me,"
 	line "@"
 	text_from_ram wStringBuffer3
 	text "!"
 	done
 
-UnknownText_0x1b6624: ; 0x1b6624
+UnknownText_0x1b6624:
 	text "Hello! It's me,"
 	line "@"
 	text_from_ram wStringBuffer3
 	text "!"
 	done
 
-UnknownText_0x1b663b: ; 0x1b663b
+UnknownText_0x1b663b:
 	text "Hello! It's me,"
 	line "@"
 	text_from_ram wStringBuffer3
 	text "!"
 	done
 
-UnknownText_0x1b6652: ; 0x1b6652
+UnknownText_0x1b6652:
 	text "<PLAY_G>, are you"
 	line "raising your"
 	cont "#MON properly?"
@@ -1212,7 +1212,7 @@ UnknownText_0x1b6652: ; 0x1b6652
 	cont "love and care."
 	done
 
-UnknownText_0x1b66c8: ; 0x1b66c8
+UnknownText_0x1b66c8:
 	text "Hi, @"
 	text_from_ram wStringBuffer3
 	text " on the"
@@ -1221,7 +1221,7 @@ UnknownText_0x1b66c8: ; 0x1b66c8
 	para "Hey! It's <PLAY_G>!"
 	done
 
-UnknownText_0x1b66ec: ; 0x1b66ec
+UnknownText_0x1b66ec:
 	text "Hi, @"
 	text_from_ram wStringBuffer3
 	text " on the"
@@ -1231,7 +1231,7 @@ UnknownText_0x1b66ec: ; 0x1b66ec
 	line "It's <PLAY_G>!"
 	done
 
-UnknownText_0x1b6713: ; 0x1b6713
+UnknownText_0x1b6713:
 	text "Hi, @"
 	text_from_ram wStringBuffer3
 	text " on the"
@@ -1241,7 +1241,7 @@ UnknownText_0x1b6713: ; 0x1b6713
 	line "What's up?"
 	done
 
-UnknownText_0x1b6738: ; 0x1b6738
+UnknownText_0x1b6738:
 	text "Uh, <PLAY_G>?"
 
 	para "It's me!"
@@ -1250,7 +1250,7 @@ UnknownText_0x1b6738: ; 0x1b6738
 	text "!"
 	done
 
-UnknownText_0x1b6757: ; 0x1b6757
+UnknownText_0x1b6757:
 	text "Uh, <PLAY_G>?"
 
 	para "It's me!"
@@ -1259,7 +1259,7 @@ UnknownText_0x1b6757: ; 0x1b6757
 	text "!"
 	done
 
-UnknownText_0x1b6776: ; 0x1b6776
+UnknownText_0x1b6776:
 	text "Uh, <PLAY_G>?"
 
 	para "It's me!"
@@ -1268,7 +1268,7 @@ UnknownText_0x1b6776: ; 0x1b6776
 	text "!"
 	done
 
-UnknownText_0x1b6795: ; 0x1b6795
+UnknownText_0x1b6795:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text " is"
@@ -1281,7 +1281,7 @@ UnknownText_0x1b6795: ; 0x1b6795
 	line "#MON doing?"
 	done
 
-UnknownText_0x1b67e2: ; 0x1b67e2
+UnknownText_0x1b67e2:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1291,7 +1291,7 @@ UnknownText_0x1b67e2: ; 0x1b67e2
 	line "Good morning!"
 	done
 
-UnknownText_0x1b680e: ; 0x1b680e
+UnknownText_0x1b680e:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1301,7 +1301,7 @@ UnknownText_0x1b680e: ; 0x1b680e
 	line "day!"
 	done
 
-UnknownText_0x1b6836: ; 0x1b6836
+UnknownText_0x1b6836:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1311,7 +1311,7 @@ UnknownText_0x1b6836: ; 0x1b6836
 	line "evening!"
 	done
 
-UnknownText_0x1b6862: ; 0x1b6862
+UnknownText_0x1b6862:
 	text "Hi, <PLAY_G>, good"
 	line "morning!"
 
@@ -1321,7 +1321,7 @@ UnknownText_0x1b6862: ; 0x1b6862
 	line "How are you?"
 	done
 
-UnknownText_0x1b6890: ; 0x1b6890
+UnknownText_0x1b6890:
 	text "Hi, <PLAY_G>, good"
 	line "day!"
 
@@ -1331,7 +1331,7 @@ UnknownText_0x1b6890: ; 0x1b6890
 	line "How are you?"
 	done
 
-UnknownText_0x1b68ba: ; 0x1b68ba
+UnknownText_0x1b68ba:
 	text "Hi, <PLAY_G>, good"
 	line "evening!"
 
@@ -1341,7 +1341,7 @@ UnknownText_0x1b68ba: ; 0x1b68ba
 	line "How are you?"
 	done
 
-UnknownText_0x1b68e8: ; 0x1b68e8
+UnknownText_0x1b68e8:
 	text "How are your"
 	line "#MON doing?"
 
@@ -1360,28 +1360,28 @@ UnknownText_0x1b68e8: ; 0x1b68e8
 	cont "be a big surprise."
 	done
 
-UnknownText_0x1b69a8: ; 0x1b69a8
+UnknownText_0x1b69a8:
 	text "Hi, <PLAY_G>?"
 
 	para "Good morning pika."
 	line "What's up pika?"
 	done
 
-UnknownText_0x1b69d2: ; 0x1b69d2
+UnknownText_0x1b69d2:
 	text "Hi, <PLAY_G>?"
 
 	para "Good day pika,"
 	line "what's up pika?"
 	done
 
-UnknownText_0x1b69f8: ; 0x1b69f8
+UnknownText_0x1b69f8:
 	text "Hi, <PLAY_G>?"
 
 	para "Good evening pika,"
 	line "what's up pika?"
 	done
 
-UnknownText_0x1b6a22: ; 0x1b6a22
+UnknownText_0x1b6a22:
 	text "<PLAY_G> pika, good"
 	line "morning!"
 
@@ -1391,7 +1391,7 @@ UnknownText_0x1b6a22: ; 0x1b6a22
 	line "pika are you?"
 	done
 
-UnknownText_0x1b6a56: ; 0x1b6a56
+UnknownText_0x1b6a56:
 	text "<PLAY_G> pika, good"
 	line "pika day!"
 
@@ -1401,7 +1401,7 @@ UnknownText_0x1b6a56: ; 0x1b6a56
 	line "pika are you?"
 	done
 
-UnknownText_0x1b6a8b: ; 0x1b6a8b
+UnknownText_0x1b6a8b:
 	text "<PLAY_G> pika, good"
 	line "evening!"
 
@@ -1411,7 +1411,7 @@ UnknownText_0x1b6a8b: ; 0x1b6a8b
 	line "you pika awake?"
 	done
 
-UnknownText_0x1b6ac2: ; 0x1b6ac2
+UnknownText_0x1b6ac2:
 	text "You have to hear"
 	line "this! My lovable"
 
@@ -1425,7 +1425,7 @@ UnknownText_0x1b6ac2: ; 0x1b6ac2
 	cont "together as one!"
 	done
 
-UnknownText_0x1b6b39: ; 0x1b6b39
+UnknownText_0x1b6b39:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1435,7 +1435,7 @@ UnknownText_0x1b6b39: ; 0x1b6b39
 	line "<PLAY_G>."
 	done
 
-UnknownText_0x1b6b65: ; 0x1b6b65
+UnknownText_0x1b6b65:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1445,7 +1445,7 @@ UnknownText_0x1b6b65: ; 0x1b6b65
 	line "<PLAY_G>, right?"
 	done
 
-UnknownText_0x1b6b92: ; 0x1b6b92
+UnknownText_0x1b6b92:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1455,7 +1455,7 @@ UnknownText_0x1b6b92: ; 0x1b6b92
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b6bb9: ; 0x1b6bb9
+UnknownText_0x1b6bb9:
 	text "Hello!"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1465,7 +1465,7 @@ UnknownText_0x1b6bb9: ; 0x1b6bb9
 	line "weather's great!"
 	done
 
-UnknownText_0x1b6bef: ; 0x1b6bef
+UnknownText_0x1b6bef:
 	text "Hello!"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1475,7 +1475,7 @@ UnknownText_0x1b6bef: ; 0x1b6bef
 	line "for fishing!"
 	done
 
-UnknownText_0x1b6c23: ; 0x1b6c23
+UnknownText_0x1b6c23:
 	text "Hello!"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1485,7 +1485,7 @@ UnknownText_0x1b6c23: ; 0x1b6c23
 	line "for fishing!"
 	done
 
-UnknownText_0x1b6c56: ; 0x1b6c56
+UnknownText_0x1b6c56:
 	text "How's your trip"
 	line "coming along?"
 
@@ -1493,7 +1493,7 @@ UnknownText_0x1b6c56: ; 0x1b6c56
 	line "about my fishing!"
 	done
 
-UnknownText_0x1b6c96: ; 0x1b6c96
+UnknownText_0x1b6c96:
 	text "Yes? @"
 	text_from_ram wStringBuffer3
 	text " here…"
@@ -1502,7 +1502,7 @@ UnknownText_0x1b6c96: ; 0x1b6c96
 	line "can I do for you?"
 	done
 
-UnknownText_0x1b6cc6: ; 0x1b6cc6
+UnknownText_0x1b6cc6:
 	text "Yes? @"
 	text_from_ram wStringBuffer3
 	text " here…"
@@ -1511,7 +1511,7 @@ UnknownText_0x1b6cc6: ; 0x1b6cc6
 	line "can I do for you?"
 	done
 
-UnknownText_0x1b6cf6: ; 0x1b6cf6
+UnknownText_0x1b6cf6:
 	text "Yes? @"
 	text_from_ram wStringBuffer3
 	text " here…"
@@ -1520,7 +1520,7 @@ UnknownText_0x1b6cf6: ; 0x1b6cf6
 	line "can I do for you?"
 	done
 
-UnknownText_0x1b6d26: ; 0x1b6d26
+UnknownText_0x1b6d26:
 	text "Hiya, <PLAYER>. How"
 	line "are you doing?"
 
@@ -1530,7 +1530,7 @@ UnknownText_0x1b6d26: ; 0x1b6d26
 	text "."
 	done
 
-UnknownText_0x1b6d57: ; 0x1b6d57
+UnknownText_0x1b6d57:
 	text "Hiya, <PLAYER>, how"
 	line "are you doing?"
 
@@ -1540,7 +1540,7 @@ UnknownText_0x1b6d57: ; 0x1b6d57
 	text "."
 	done
 
-UnknownText_0x1b6d88: ; 0x1b6d88
+UnknownText_0x1b6d88:
 	text "Hiya, <PLAYER>, how"
 	line "are you doing?"
 
@@ -1550,7 +1550,7 @@ UnknownText_0x1b6d88: ; 0x1b6d88
 	text "."
 	done
 
-UnknownText_0x1b6db9: ; 0x1b6db9
+UnknownText_0x1b6db9:
 	text "Oh yeah, I saw you"
 	line "coming out of a"
 
@@ -1573,7 +1573,7 @@ UnknownText_0x1b6db9: ; 0x1b6db9
 	cont "often. Heheh!"
 	done
 
-UnknownText_0x1b6e7c: ; 0x1b6e7c
+UnknownText_0x1b6e7c:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1583,7 +1583,7 @@ UnknownText_0x1b6e7c: ; 0x1b6e7c
 	line "Good morning."
 	done
 
-UnknownText_0x1b6ea6: ; 0x1b6ea6
+UnknownText_0x1b6ea6:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1593,7 +1593,7 @@ UnknownText_0x1b6ea6: ; 0x1b6ea6
 	line "Hello."
 	done
 
-UnknownText_0x1b6ec9: ; 0x1b6ec9
+UnknownText_0x1b6ec9:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1603,7 +1603,7 @@ UnknownText_0x1b6ec9: ; 0x1b6ec9
 	line "evening."
 	done
 
-UnknownText_0x1b6ef3: ; 0x1b6ef3
+UnknownText_0x1b6ef3:
 	text "Is this <PLAY_G>?"
 
 	para "Good morning. This"
@@ -1612,7 +1612,7 @@ UnknownText_0x1b6ef3: ; 0x1b6ef3
 	text "."
 	done
 
-UnknownText_0x1b6f1c: ; 0x1b6f1c
+UnknownText_0x1b6f1c:
 	text "Is this <PLAY_G>?"
 
 	para "Hi, it's @"
@@ -1620,7 +1620,7 @@ UnknownText_0x1b6f1c: ; 0x1b6f1c
 	text "."
 	done
 
-UnknownText_0x1b6f37: ; 0x1b6f37
+UnknownText_0x1b6f37:
 	text "Is this <PLAY_G>?"
 
 	para "Good evening. This"
@@ -1629,7 +1629,7 @@ UnknownText_0x1b6f37: ; 0x1b6f37
 	text "."
 	done
 
-UnknownText_0x1b6f60: ; 0x1b6f60
+UnknownText_0x1b6f60:
 	text "Are your #MON"
 	line "doing well?"
 
@@ -1652,7 +1652,7 @@ UnknownText_0x1b6f60: ; 0x1b6f60
 	line "every day."
 	done
 
-UnknownText_0x1b7019: ; 0x1b7019
+UnknownText_0x1b7019:
 	text "Yes, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1664,7 +1664,7 @@ UnknownText_0x1b7019: ; 0x1b7019
 	line "#MON?"
 	done
 
-UnknownText_0x1b7057: ; 0x1b7057
+UnknownText_0x1b7057:
 	text "Yes, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1676,7 +1676,7 @@ UnknownText_0x1b7057: ; 0x1b7057
 	line "#MON flying?"
 	done
 
-UnknownText_0x1b7092: ; 0x1b7092
+UnknownText_0x1b7092:
 	text "Yes, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1689,7 +1689,7 @@ UnknownText_0x1b7092: ; 0x1b7092
 	line "see some action?"
 	done
 
-UnknownText_0x1b70e7: ; 0x1b70e7
+UnknownText_0x1b70e7:
 	text "Good morning,"
 	line "<PLAY_G>!"
 
@@ -1699,7 +1699,7 @@ UnknownText_0x1b70e7: ; 0x1b70e7
 	line "Good morning!"
 	done
 
-UnknownText_0x1b7112: ; 0x1b7112
+UnknownText_0x1b7112:
 	text "Hi, <PLAY_G>!"
 
 	para "It's @"
@@ -1708,7 +1708,7 @@ UnknownText_0x1b7112: ; 0x1b7112
 	line "Remember me?"
 	done
 
-UnknownText_0x1b7132: ; 0x1b7132
+UnknownText_0x1b7132:
 	text "Good evening,"
 	line "<PLAY_G>!"
 
@@ -1718,7 +1718,7 @@ UnknownText_0x1b7132: ; 0x1b7132
 	line "Are you free now?"
 	done
 
-UnknownText_0x1b7161: ; 0x1b7161
+UnknownText_0x1b7161:
 	text "Are you and your"
 	line "#MON fine?"
 
@@ -1734,7 +1734,7 @@ UnknownText_0x1b7161: ; 0x1b7161
 	line "#MON!"
 	done
 
-UnknownText_0x1b71d5: ; 0x1b71d5
+UnknownText_0x1b71d5:
 	text "Hello, you have"
 	line "reached @"
 	text_from_ram wStringBuffer3
@@ -1743,7 +1743,7 @@ UnknownText_0x1b71d5: ; 0x1b71d5
 	para "Ah, <PLAY_G>."
 	done
 
-UnknownText_0x1b71fc: ; 0x1b71fc
+UnknownText_0x1b71fc:
 	text "Hello, you have"
 	line "reached @"
 	text_from_ram wStringBuffer3
@@ -1753,7 +1753,7 @@ UnknownText_0x1b71fc: ; 0x1b71fc
 	line "it?"
 	done
 
-UnknownText_0x1b722a: ; 0x1b722a
+UnknownText_0x1b722a:
 	text "Hello, you have"
 	line "reached @"
 	text_from_ram wStringBuffer3
@@ -1763,7 +1763,7 @@ UnknownText_0x1b722a: ; 0x1b722a
 	line "<PLAY_G>."
 	done
 
-UnknownText_0x1b725c: ; 0x1b725c
+UnknownText_0x1b725c:
 	text "Ah, it's @"
 	text_from_ram wStringBuffer3
 	text "…"
@@ -1772,7 +1772,7 @@ UnknownText_0x1b725c: ; 0x1b725c
 	line "moment?"
 	done
 
-UnknownText_0x1b7283: ; 0x1b7283
+UnknownText_0x1b7283:
 	text "Ah, it's @"
 	text_from_ram wStringBuffer3
 	text "…"
@@ -1780,7 +1780,7 @@ UnknownText_0x1b7283: ; 0x1b7283
 	para "Can you talk now?"
 	done
 
-UnknownText_0x1b72a5: ; 0x1b72a5
+UnknownText_0x1b72a5:
 	text "Ah, it's @"
 	text_from_ram wStringBuffer3
 	text "…"
@@ -1789,7 +1789,7 @@ UnknownText_0x1b72a5: ; 0x1b72a5
 	line "so late."
 	done
 
-UnknownText_0x1b72d0: ; 0x1b72d0
+UnknownText_0x1b72d0:
 	text "Have your #MON"
 	line "grown any?"
 
@@ -1799,7 +1799,7 @@ UnknownText_0x1b72d0: ; 0x1b72d0
 	line "grown quite a bit."
 	done
 
-UnknownText_0x1b730b: ; 0x1b730b
+UnknownText_0x1b730b:
 	text_from_ram wStringBuffer3
 	text " here…"
 
@@ -1807,7 +1807,7 @@ UnknownText_0x1b730b: ; 0x1b730b
 	line "morning, hey?"
 	done
 
-UnknownText_0x1b7331: ; 0x1b7331
+UnknownText_0x1b7331:
 	text_from_ram wStringBuffer3
 	text " here…"
 
@@ -1815,7 +1815,7 @@ UnknownText_0x1b7331: ; 0x1b7331
 	line "weather, hey?"
 	done
 
-UnknownText_0x1b7357: ; 0x1b7357
+UnknownText_0x1b7357:
 	text_from_ram wStringBuffer3
 	text " here…"
 
@@ -1823,28 +1823,28 @@ UnknownText_0x1b7357: ; 0x1b7357
 	line "moonlight, hey?"
 	done
 
-UnknownText_0x1b737f: ; 0x1b737f
+UnknownText_0x1b737f:
 	text "Hey, <PLAYER>!"
 	line "This is @"
 	text_from_ram wStringBuffer3
 	text "!"
 	done
 
-UnknownText_0x1b7397: ; 0x1b7397
+UnknownText_0x1b7397:
 	text "Hey, <PLAYER>!"
 	line "This is @"
 	text_from_ram wStringBuffer3
 	text "!"
 	done
 
-UnknownText_0x1b73af: ; 0x1b73af
+UnknownText_0x1b73af:
 	text "Hey, <PLAYER>!"
 	line "This is @"
 	text_from_ram wStringBuffer3
 	text "!"
 	done
 
-UnknownText_0x1b73c7: ; 0x1b73c7
+UnknownText_0x1b73c7:
 	text "Yup, yup!"
 	line "It's @"
 	text_from_ram wStringBuffer3
@@ -1854,7 +1854,7 @@ UnknownText_0x1b73c7: ; 0x1b73c7
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b73ef: ; 0x1b73ef
+UnknownText_0x1b73ef:
 	text "Yup, yup!"
 	line "It's @"
 	text_from_ram wStringBuffer3
@@ -1864,7 +1864,7 @@ UnknownText_0x1b73ef: ; 0x1b73ef
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b7417: ; 0x1b7417
+UnknownText_0x1b7417:
 	text "Yup, yup!"
 	line "It's @"
 	text_from_ram wStringBuffer3
@@ -1874,7 +1874,7 @@ UnknownText_0x1b7417: ; 0x1b7417
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b743f: ; 0x1b743f
+UnknownText_0x1b743f:
 	text "<PLAY_G>, it's"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1884,7 +1884,7 @@ UnknownText_0x1b743f: ; 0x1b743f
 	line "proper breakfast?"
 	done
 
-UnknownText_0x1b746f: ; 0x1b746f
+UnknownText_0x1b746f:
 	text "<PLAY_G>, it's"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1894,7 +1894,7 @@ UnknownText_0x1b746f: ; 0x1b746f
 	line "proper lunch?"
 	done
 
-UnknownText_0x1b749b: ; 0x1b749b
+UnknownText_0x1b749b:
 	text "<PLAY_G>, it's"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1904,7 +1904,7 @@ UnknownText_0x1b749b: ; 0x1b749b
 	line "proper dinner?"
 	done
 
-UnknownText_0x1b74c8: ; 0x1b74c8
+UnknownText_0x1b74c8:
 	text "Are your #MON"
 	line "looking good?"
 
@@ -1917,7 +1917,7 @@ UnknownText_0x1b74c8: ; 0x1b74c8
 	line "Hahahah!"
 	done
 
-UnknownText_0x1b751a: ; 0x1b751a
+UnknownText_0x1b751a:
 	text "Yes, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1927,7 +1927,7 @@ UnknownText_0x1b751a: ; 0x1b751a
 	line "Good morning!"
 	done
 
-UnknownText_0x1b7548: ; 0x1b7548
+UnknownText_0x1b7548:
 	text "Yes, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1937,7 +1937,7 @@ UnknownText_0x1b7548: ; 0x1b7548
 	line "Yahoo!"
 	done
 
-UnknownText_0x1b756f: ; 0x1b756f
+UnknownText_0x1b756f:
 	text "Yes, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1946,7 +1946,7 @@ UnknownText_0x1b756f: ; 0x1b756f
 	para "Oh, hi, <PLAY_G>!"
 	done
 
-UnknownText_0x1b758f: ; 0x1b758f
+UnknownText_0x1b758f:
 	text "<PLAY_G>!"
 
 	para "It's @"
@@ -1955,7 +1955,7 @@ UnknownText_0x1b758f: ; 0x1b758f
 	line "Good morning!"
 	done
 
-UnknownText_0x1b75ac: ; 0x1b75ac
+UnknownText_0x1b75ac:
 	text "<PLAY_G>!"
 
 	para "It's @"
@@ -1964,7 +1964,7 @@ UnknownText_0x1b75ac: ; 0x1b75ac
 	line "Working hard?"
 	done
 
-UnknownText_0x1b75c9: ; 0x1b75c9
+UnknownText_0x1b75c9:
 	text "<PLAY_G>!"
 
 	para "It's @"
@@ -1973,7 +1973,7 @@ UnknownText_0x1b75c9: ; 0x1b75c9
 	line "Were you up?"
 	done
 
-UnknownText_0x1b75e5: ; 0x1b75e5
+UnknownText_0x1b75e5:
 	text "Are you raising"
 	line "your #MON?"
 
@@ -1986,6 +1986,6 @@ UnknownText_0x1b75e5: ; 0x1b75e5
 	cont "looking good!"
 	done
 
-UnusedPhoneText: ; 0x1b7624
+UnusedPhoneText:
 	text "Good morning."
 	done
diff --git a/data/player_names.asm b/data/player_names.asm
index 04eac7508..6263cb828 100644
--- a/data/player_names.asm
+++ b/data/player_names.asm
@@ -1,15 +1,15 @@
-ChrisNameMenuDataHeader: ; 882b5
+ChrisNameMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, TEXTBOX_Y - 1
 	dw .MaleNames
 	db 1 ; ????
 	db 0 ; default option
 
-.MaleNames: ; 882be
+.MaleNames:
 	db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags
 	db 5 ; items
 	db "NEW NAME@"
-MalePlayerNameArray: ; 882c9
+MalePlayerNameArray:
 	db "CHRIS@"
 	db "MAT@"
 	db "ALLAN@"
@@ -17,18 +17,18 @@ MalePlayerNameArray: ; 882c9
 	db 2 ; displacement
 	db " NAME @" ; title
 
-KrisNameMenuDataHeader: ; 882e5
+KrisNameMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, TEXTBOX_Y - 1
 	dw .FemaleNames
 	db 1 ; ????
 	db 0 ; default option
 
-.FemaleNames: ; 882ee
+.FemaleNames:
 	db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags
 	db 5 ; items
 	db "NEW NAME@"
-FemalePlayerNameArray: ; 882f9
+FemalePlayerNameArray:
 	db "KRIS@"
 	db "AMANDA@"
 	db "JUANA@"
diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm
index d7824f196..890c46f20 100644
--- a/data/pokemon/base_stats/abra.asm
+++ b/data/pokemon/base_stats/abra.asm
@@ -3,20 +3,19 @@
 	db  25,  20,  15,  90, 105,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 200 ; catch rate
 	db 73 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/abra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
 	; end
diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm
index 26eac4ded..29e406504 100644
--- a/data/pokemon/base_stats/aerodactyl.asm
+++ b/data/pokemon/base_stats/aerodactyl.asm
@@ -3,20 +3,19 @@
 	db  80, 105,  65, 130,  60,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, FLYING
+	db ROCK, FLYING ; type
 	db 45 ; catch rate
 	db 202 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/aerodactyl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm
index 0bd6954f4..12edacca2 100644
--- a/data/pokemon/base_stats/aipom.asm
+++ b/data/pokemon/base_stats/aipom.asm
@@ -3,20 +3,19 @@
 	db  55,  70,  55,  85,  40,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 94 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/aipom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, STRENGTH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm
index 35ebdf9af..5de640d73 100644
--- a/data/pokemon/base_stats/alakazam.asm
+++ b/data/pokemon/base_stats/alakazam.asm
@@ -3,20 +3,19 @@
 	db  55,  50,  45, 120, 135,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 50 ; catch rate
 	db 186 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/alakazam/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
 	; end
diff --git a/data/pokemon/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm
index b391238d3..e4ef4bd0a 100644
--- a/data/pokemon/base_stats/ampharos.asm
+++ b/data/pokemon/base_stats/ampharos.asm
@@ -3,20 +3,19 @@
 	db  90,  75,  75,  55, 115,  90
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 45 ; catch rate
 	db 194 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ampharos/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm
index 52341c37d..b90c83b1c 100644
--- a/data/pokemon/base_stats/arbok.asm
+++ b/data/pokemon/base_stats/arbok.asm
@@ -3,20 +3,19 @@
 	db  60,  85,  69,  80,  65,  79
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, POISON
+	db POISON, POISON ; type
 	db 90 ; catch rate
 	db 147 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/arbok/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, REPTILE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm
index 299086c9d..92f9b0233 100644
--- a/data/pokemon/base_stats/arcanine.asm
+++ b/data/pokemon/base_stats/arcanine.asm
@@ -3,20 +3,19 @@
 	db  90, 110,  80,  95, 100,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 75 ; catch rate
 	db 213 ; base exp
-	db BURNT_BERRY ; item 1
-	db BURNT_BERRY ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db BURNT_BERRY, BURNT_BERRY ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/arcanine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm
index 78697127c..ca8076a20 100644
--- a/data/pokemon/base_stats/ariados.asm
+++ b/data/pokemon/base_stats/ariados.asm
@@ -3,20 +3,19 @@
 	db  70,  90,  70,  40,  60,  60
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, POISON
+	db BUG, POISON ; type
 	db 90 ; catch rate
 	db 134 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ariados/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH
 	; end
diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm
index e637c47f4..1189afec1 100644
--- a/data/pokemon/base_stats/articuno.asm
+++ b/data/pokemon/base_stats/articuno.asm
@@ -3,20 +3,19 @@
 	db  90,  85, 100,  85,  95, 125
 	;   hp  atk  def  spd  sat  sdf
 
-	db ICE, FLYING
+	db ICE, FLYING ; type
 	db 3 ; catch rate
 	db 215 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/articuno/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm
index 1681d3be2..d76e1bd72 100644
--- a/data/pokemon/base_stats/azumarill.asm
+++ b/data/pokemon/base_stats/azumarill.asm
@@ -3,20 +3,19 @@
 	db 100,  50,  80,  50,  50,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 75 ; catch rate
 	db 153 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/azumarill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AMPHIBIAN, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_WATER_1, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm
index 50ee3044c..1228b4d49 100644
--- a/data/pokemon/base_stats/bayleef.asm
+++ b/data/pokemon/base_stats/bayleef.asm
@@ -3,20 +3,19 @@
 	db  60,  62,  80,  60,  63,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, GRASS
+	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 141 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bayleef/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH
 	; end
diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm
index 3fa11d8eb..8e371d790 100644
--- a/data/pokemon/base_stats/beedrill.asm
+++ b/data/pokemon/base_stats/beedrill.asm
@@ -3,20 +3,19 @@
 	db  65,  80,  40,  75,  45,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, POISON
+	db BUG, POISON ; type
 	db 45 ; catch rate
 	db 159 ; base exp
-	db NO_ITEM ; item 1
-	db POISON_BARB ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, POISON_BARB ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/beedrill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, FURY_CUTTER, CUT
 	; end
diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm
index 3f3f06870..328959a5f 100644
--- a/data/pokemon/base_stats/bellossom.asm
+++ b/data/pokemon/base_stats/bellossom.asm
@@ -3,20 +3,19 @@
 	db  75,  80,  85,  50,  90, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, GRASS
+	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 184 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bellossom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm
index 5e75e6e89..099dc7142 100644
--- a/data/pokemon/base_stats/bellsprout.asm
+++ b/data/pokemon/base_stats/bellsprout.asm
@@ -3,20 +3,19 @@
 	db  50,  75,  35,  40,  70,  30
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, POISON
+	db GRASS, POISON ; type
 	db 255 ; catch rate
 	db 84 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bellsprout/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm
index 7e2f1697e..9cb62420a 100644
--- a/data/pokemon/base_stats/blastoise.asm
+++ b/data/pokemon/base_stats/blastoise.asm
@@ -3,20 +3,19 @@
 	db  79,  83, 100,  78,  85, 105
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 210 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/blastoise/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm
index 789649a40..8e6256843 100644
--- a/data/pokemon/base_stats/blissey.asm
+++ b/data/pokemon/base_stats/blissey.asm
@@ -3,20 +3,19 @@
 	db 255,  10,  10,  55,  75, 135
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 30 ; catch rate
 	db 255 ; base exp
-	db NO_ITEM ; item 1
-	db LUCKY_EGG ; item 2
-	db GENDER_F100 ; gender
-	db 100 ; unknown
+	db NO_ITEM, LUCKY_EGG ; items
+	db GENDER_F100 ; gender ratio
+	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/blissey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm
index 2795d8035..f4178d8ae 100644
--- a/data/pokemon/base_stats/bulbasaur.asm
+++ b/data/pokemon/base_stats/bulbasaur.asm
@@ -3,20 +3,19 @@
 	db  45,  49,  49,  45,  65,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, POISON
+	db GRASS, POISON ; type
 	db 45 ; catch rate
 	db 64 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/bulbasaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm
index 1feee4f58..f2c125ac4 100644
--- a/data/pokemon/base_stats/butterfree.asm
+++ b/data/pokemon/base_stats/butterfree.asm
@@ -3,20 +3,19 @@
 	db  60,  45,  50,  70,  80,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, FLYING
+	db BUG, FLYING ; type
 	db 45 ; catch rate
 	db 160 ; base exp
-	db NO_ITEM ; item 1
-	db SILVERPOWDER ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, SILVERPOWDER ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/butterfree/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, NIGHTMARE, FLASH
 	; end
diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm
index a10790541..d7525ee53 100644
--- a/data/pokemon/base_stats/caterpie.asm
+++ b/data/pokemon/base_stats/caterpie.asm
@@ -3,20 +3,19 @@
 	db  45,  30,  35,  45,  20,  20
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, BUG
+	db BUG, BUG ; type
 	db 255 ; catch rate
 	db 53 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/caterpie/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm
 	; end
diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm
index aabadba4f..8943dc8bc 100644
--- a/data/pokemon/base_stats/celebi.asm
+++ b/data/pokemon/base_stats/celebi.asm
@@ -3,20 +3,19 @@
 	db 100, 100, 100, 100, 100, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, GRASS
+	db PSYCHIC, GRASS ; type
 	db 45 ; catch rate
 	db 64 ; base exp
-	db NO_ITEM ; item 1
-	db MIRACLEBERRY ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, MIRACLEBERRY ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/celebi/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, NIGHTMARE, FLASH
 	; end
diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm
index d51f67d4f..78ec783ae 100644
--- a/data/pokemon/base_stats/chansey.asm
+++ b/data/pokemon/base_stats/chansey.asm
@@ -3,20 +3,19 @@
 	db 250,  05,  05,  50,  35, 105
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 30 ; catch rate
 	db 255 ; base exp
-	db NO_ITEM ; item 1
-	db LUCKY_EGG ; item 2
-	db GENDER_F100 ; gender
-	db 100 ; unknown
+	db NO_ITEM, LUCKY_EGG ; items
+	db GENDER_F100 ; gender ratio
+	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/chansey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm
index d978c6ad5..237f7d72b 100644
--- a/data/pokemon/base_stats/charizard.asm
+++ b/data/pokemon/base_stats/charizard.asm
@@ -3,20 +3,19 @@
 	db  78,  84,  78, 100, 109,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FLYING
+	db FIRE, FLYING ; type
 	db 45 ; catch rate
 	db 209 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/charizard/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, REPTILE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, CUT, FLY, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm
index 2fa9b9526..6f60c22a8 100644
--- a/data/pokemon/base_stats/charmander.asm
+++ b/data/pokemon/base_stats/charmander.asm
@@ -3,20 +3,19 @@
 	db  39,  52,  43,  65,  60,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 65 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/charmander/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, REPTILE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm
index 5d86b975b..832757a7e 100644
--- a/data/pokemon/base_stats/charmeleon.asm
+++ b/data/pokemon/base_stats/charmeleon.asm
@@ -3,20 +3,19 @@
 	db  58,  64,  58,  80,  80,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 142 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/charmeleon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, REPTILE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm
index 0476ba558..639e51377 100644
--- a/data/pokemon/base_stats/chikorita.asm
+++ b/data/pokemon/base_stats/chikorita.asm
@@ -3,20 +3,19 @@
 	db  45,  49,  65,  45,  49,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, GRASS
+	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 64 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/chikorita/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm
index a5b3ded3a..3bad12e41 100644
--- a/data/pokemon/base_stats/chinchou.asm
+++ b/data/pokemon/base_stats/chinchou.asm
@@ -3,20 +3,19 @@
 	db  75,  38,  38,  67,  56,  56
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, ELECTRIC
+	db WATER, ELECTRIC ; type
 	db 190 ; catch rate
 	db 90 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/chinchou/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FISH, FISH ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm
index 4da3c73df..dc627f02c 100644
--- a/data/pokemon/base_stats/clefable.asm
+++ b/data/pokemon/base_stats/clefable.asm
@@ -3,20 +3,19 @@
 	db  95,  70,  73,  60,  85,  90
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 25 ; catch rate
 	db 129 ; base exp
-	db MYSTERYBERRY ; item 1
-	db MOON_STONE ; item 2
-	db GENDER_F75 ; gender
-	db 100 ; unknown
+	db MYSTERYBERRY, MOON_STONE ; items
+	db GENDER_F75 ; gender ratio
+	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/clefable/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm
index 5e4def0ca..71c8ac9a7 100644
--- a/data/pokemon/base_stats/clefairy.asm
+++ b/data/pokemon/base_stats/clefairy.asm
@@ -3,20 +3,19 @@
 	db  70,  45,  48,  35,  60,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 150 ; catch rate
 	db 68 ; base exp
-	db MYSTERYBERRY ; item 1
-	db MOON_STONE ; item 2
-	db GENDER_F75 ; gender
-	db 100 ; unknown
+	db MYSTERYBERRY, MOON_STONE ; items
+	db GENDER_F75 ; gender ratio
+	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/clefairy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm
index 89fa91a45..923b339b9 100644
--- a/data/pokemon/base_stats/cleffa.asm
+++ b/data/pokemon/base_stats/cleffa.asm
@@ -3,20 +3,19 @@
 	db  50,  25,  28,  15,  45,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 150 ; catch rate
 	db 37 ; base exp
-	db MYSTERYBERRY ; item 1
-	db MOON_STONE ; item 2
-	db GENDER_F75 ; gender
-	db 100 ; unknown
+	db MYSTERYBERRY, MOON_STONE ; items
+	db GENDER_F75 ; gender ratio
+	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/cleffa/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm
index 3f3c13b6a..7dfc72ff9 100644
--- a/data/pokemon/base_stats/cloyster.asm
+++ b/data/pokemon/base_stats/cloyster.asm
@@ -3,20 +3,19 @@
 	db  50,  95, 180,  70,  85,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, ICE
+	db WATER, ICE ; type
 	db 60 ; catch rate
 	db 203 ; base exp
-	db PEARL ; item 1
-	db BIG_PEARL ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db PEARL, BIG_PEARL ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/cloyster/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm
index 8f1e836ff..e5f2536f8 100644
--- a/data/pokemon/base_stats/corsola.asm
+++ b/data/pokemon/base_stats/corsola.asm
@@ -3,20 +3,19 @@
 	db  55,  55,  85,  35,  65,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, ROCK
+	db WATER, ROCK ; type
 	db 60 ; catch rate
 	db 113 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F75 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F75 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/corsola/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AMPHIBIAN, INVERTEBRATE ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm
index 34d7d10c5..11b39ab2d 100644
--- a/data/pokemon/base_stats/crobat.asm
+++ b/data/pokemon/base_stats/crobat.asm
@@ -3,20 +3,19 @@
 	db  85,  90,  80, 130,  70,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, FLYING
+	db POISON, FLYING ; type
 	db 90 ; catch rate
 	db 204 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/crobat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
 	; end
diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm
index 6c76b19b1..8b0fa482f 100644
--- a/data/pokemon/base_stats/croconaw.asm
+++ b/data/pokemon/base_stats/croconaw.asm
@@ -3,20 +3,19 @@
 	db  65,  80,  80,  58,  59,  63
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 143 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/croconaw/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm
index 451f52133..a44eea42e 100644
--- a/data/pokemon/base_stats/cubone.asm
+++ b/data/pokemon/base_stats/cubone.asm
@@ -3,20 +3,19 @@
 	db  50,  50,  95,  35,  40,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db GROUND, GROUND
+	db GROUND, GROUND ; type
 	db 190 ; catch rate
 	db 87 ; base exp
-	db NO_ITEM ; item 1
-	db THICK_CLUB ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, THICK_CLUB ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/cubone/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm
index a1b07cb91..8170baa48 100644
--- a/data/pokemon/base_stats/cyndaquil.asm
+++ b/data/pokemon/base_stats/cyndaquil.asm
@@ -3,20 +3,19 @@
 	db  39,  52,  43,  65,  60,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 65 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/cyndaquil/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, CUT, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm
index 0b38e8b97..636541752 100644
--- a/data/pokemon/base_stats/delibird.asm
+++ b/data/pokemon/base_stats/delibird.asm
@@ -3,20 +3,19 @@
 	db  45,  55,  45,  75,  65,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db ICE, FLYING
+	db ICE, FLYING ; type
 	db 45 ; catch rate
 	db 183 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/delibird/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_WATER_1, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLY, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm
index ae6aa1941..7abfad876 100644
--- a/data/pokemon/base_stats/dewgong.asm
+++ b/data/pokemon/base_stats/dewgong.asm
@@ -3,20 +3,19 @@
 	db  90,  70,  80,  70,  70,  95
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, ICE
+	db WATER, ICE ; type
 	db 75 ; catch rate
 	db 176 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dewgong/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm
index 1153cbcac..7027030e6 100644
--- a/data/pokemon/base_stats/diglett.asm
+++ b/data/pokemon/base_stats/diglett.asm
@@ -3,20 +3,19 @@
 	db  10,  55,  25,  95,  35,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db GROUND, GROUND
+	db GROUND, GROUND ; type
 	db 255 ; catch rate
 	db 81 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/diglett/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT
 	; end
diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm
index 89d92ab7a..4528b5381 100644
--- a/data/pokemon/base_stats/ditto.asm
+++ b/data/pokemon/base_stats/ditto.asm
@@ -3,20 +3,19 @@
 	db  48,  48,  48,  48,  48,  48
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 35 ; catch rate
 	db 61 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ditto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn LADIES_MAN, LADIES_MAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_DITTO, EGG_DITTO ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm
 	; end
diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm
index 9065dcbde..dbdb095e2 100644
--- a/data/pokemon/base_stats/dodrio.asm
+++ b/data/pokemon/base_stats/dodrio.asm
@@ -3,20 +3,19 @@
 	db  60, 110,  70, 100,  60,  60
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, FLYING
+	db NORMAL, FLYING ; type
 	db 45 ; catch rate
 	db 158 ; base exp
-	db NO_ITEM ; item 1
-	db SHARP_BEAK ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, SHARP_BEAK ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dodrio/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY
 	; end
diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm
index f844ccb07..668740723 100644
--- a/data/pokemon/base_stats/doduo.asm
+++ b/data/pokemon/base_stats/doduo.asm
@@ -3,20 +3,19 @@
 	db  35,  85,  45,  75,  35,  35
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, FLYING
+	db NORMAL, FLYING ; type
 	db 190 ; catch rate
 	db 96 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/doduo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY
 	; end
diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm
index a5995c3fb..4d1e58f14 100644
--- a/data/pokemon/base_stats/donphan.asm
+++ b/data/pokemon/base_stats/donphan.asm
@@ -3,20 +3,19 @@
 	db  90, 120, 120,  50,  60,  60
 	;   hp  atk  def  spd  sat  sdf
 
-	db GROUND, GROUND
+	db GROUND, GROUND ; type
 	db 60 ; catch rate
 	db 189 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/donphan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm
index 0478bd6a1..a876a54de 100644
--- a/data/pokemon/base_stats/dragonair.asm
+++ b/data/pokemon/base_stats/dragonair.asm
@@ -3,20 +3,19 @@
 	db  61,  84,  65,  70,  70,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db DRAGON, DRAGON
+	db DRAGON, DRAGON ; type
 	db 45 ; catch rate
 	db 144 ; base exp
-	db NO_ITEM ; item 1
-	db DRAGON_SCALE ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, DRAGON_SCALE ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dragonair/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm
index d8ae9add9..6d088437f 100644
--- a/data/pokemon/base_stats/dragonite.asm
+++ b/data/pokemon/base_stats/dragonite.asm
@@ -3,20 +3,19 @@
 	db  91, 134,  95,  80, 100, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db DRAGON, FLYING
+	db DRAGON, FLYING ; type
 	db 45 ; catch rate
 	db 218 ; base exp
-	db NO_ITEM ; item 1
-	db DRAGON_SCALE ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, DRAGON_SCALE ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dragonite/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm
index 0d5ccd5fd..2e8b2a226 100644
--- a/data/pokemon/base_stats/dratini.asm
+++ b/data/pokemon/base_stats/dratini.asm
@@ -3,20 +3,19 @@
 	db  41,  64,  45,  50,  50,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db DRAGON, DRAGON
+	db DRAGON, DRAGON ; type
 	db 45 ; catch rate
 	db 67 ; base exp
-	db NO_ITEM ; item 1
-	db DRAGON_SCALE ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, DRAGON_SCALE ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dratini/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm
index 7dd4855a3..d00ea31b3 100644
--- a/data/pokemon/base_stats/drowzee.asm
+++ b/data/pokemon/base_stats/drowzee.asm
@@ -3,20 +3,19 @@
 	db  60,  48,  45,  42,  43,  90
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 190 ; catch rate
 	db 102 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/drowzee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH
 	; end
diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm
index 9430a6669..ec1fb51f5 100644
--- a/data/pokemon/base_stats/dugtrio.asm
+++ b/data/pokemon/base_stats/dugtrio.asm
@@ -3,20 +3,19 @@
 	db  35,  80,  50, 120,  50,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db GROUND, GROUND
+	db GROUND, GROUND ; type
 	db 50 ; catch rate
 	db 153 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dugtrio/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT
 	; end
diff --git a/data/pokemon/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm
index 8eef16241..6ebebf36c 100644
--- a/data/pokemon/base_stats/dunsparce.asm
+++ b/data/pokemon/base_stats/dunsparce.asm
@@ -3,20 +3,19 @@
 	db 100,  70,  70,  45,  65,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 190 ; catch rate
 	db 75 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/dunsparce/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm
index 95f67cf2b..9a267c70a 100644
--- a/data/pokemon/base_stats/eevee.asm
+++ b/data/pokemon/base_stats/eevee.asm
@@ -3,20 +3,19 @@
 	db  55,  55,  50,  55,  45,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 92 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/eevee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT
 	; end
diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm
index feed64b34..997125e31 100644
--- a/data/pokemon/base_stats/ekans.asm
+++ b/data/pokemon/base_stats/ekans.asm
@@ -3,20 +3,19 @@
 	db  35,  60,  44,  55,  40,  54
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, POISON
+	db POISON, POISON ; type
 	db 255 ; catch rate
 	db 62 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ekans/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, REPTILE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm
index 472e4487c..b9524d571 100644
--- a/data/pokemon/base_stats/electabuzz.asm
+++ b/data/pokemon/base_stats/electabuzz.asm
@@ -3,20 +3,19 @@
 	db  65,  83,  57, 105,  95,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 45 ; catch rate
 	db 156 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/electabuzz/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm
index 72bc666e9..ec4714cd3 100644
--- a/data/pokemon/base_stats/electrode.asm
+++ b/data/pokemon/base_stats/electrode.asm
@@ -3,20 +3,19 @@
 	db  60,  50,  70, 140,  80,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 60 ; catch rate
 	db 150 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/electrode/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm
index e53dcc23c..ba7abf250 100644
--- a/data/pokemon/base_stats/elekid.asm
+++ b/data/pokemon/base_stats/elekid.asm
@@ -3,20 +3,19 @@
 	db  45,  63,  37,  95,  65,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 45 ; catch rate
 	db 106 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/elekid/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm
index 4e4b7b3f8..7085e8990 100644
--- a/data/pokemon/base_stats/entei.asm
+++ b/data/pokemon/base_stats/entei.asm
@@ -3,20 +3,19 @@
 	db 115, 115,  85, 100,  90,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 3 ; catch rate
 	db 217 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/entei/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm
index 0bc50fb6d..4763ce9e9 100644
--- a/data/pokemon/base_stats/espeon.asm
+++ b/data/pokemon/base_stats/espeon.asm
@@ -3,20 +3,19 @@
 	db  65,  65,  60, 110, 130,  95
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 45 ; catch rate
 	db 197 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/espeon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm
index 0547333ad..34c132fde 100644
--- a/data/pokemon/base_stats/exeggcute.asm
+++ b/data/pokemon/base_stats/exeggcute.asm
@@ -3,20 +3,19 @@
 	db  60,  40,  80,  40,  60,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, PSYCHIC
+	db GRASS, PSYCHIC ; type
 	db 90 ; catch rate
 	db 98 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/exeggcute/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH
 	; end
diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm
index 409eb8a1d..b9df54bad 100644
--- a/data/pokemon/base_stats/exeggutor.asm
+++ b/data/pokemon/base_stats/exeggutor.asm
@@ -3,20 +3,19 @@
 	db  95,  95,  85,  55, 125,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, PSYCHIC
+	db GRASS, PSYCHIC ; type
 	db 45 ; catch rate
 	db 212 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/exeggutor/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH
 	; end
diff --git a/data/pokemon/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm
index 35d76b0a9..b08bd8135 100644
--- a/data/pokemon/base_stats/farfetch_d.asm
+++ b/data/pokemon/base_stats/farfetch_d.asm
@@ -3,20 +3,19 @@
 	db  52,  65,  55,  60,  58,  62
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, FLYING
+	db NORMAL, FLYING ; type
 	db 45 ; catch rate
 	db 94 ; base exp
-	db NO_ITEM ; item 1
-	db STICK ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, STICK ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/farfetch_d/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY
 	; end
diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm
index 7ef9936d8..294aa8b4d 100644
--- a/data/pokemon/base_stats/fearow.asm
+++ b/data/pokemon/base_stats/fearow.asm
@@ -3,20 +3,19 @@
 	db  65,  90,  65, 100,  61,  61
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, FLYING
+	db NORMAL, FLYING ; type
 	db 90 ; catch rate
 	db 162 ; base exp
-	db NO_ITEM ; item 1
-	db SHARP_BEAK ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, SHARP_BEAK ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/fearow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
 	; end
diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm
index 41efb2edd..acdbc4126 100644
--- a/data/pokemon/base_stats/feraligatr.asm
+++ b/data/pokemon/base_stats/feraligatr.asm
@@ -3,20 +3,19 @@
 	db  85, 105, 100,  78,  79,  83
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 210 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/feraligatr/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm
index b20dc4774..3ce3116cf 100644
--- a/data/pokemon/base_stats/flaaffy.asm
+++ b/data/pokemon/base_stats/flaaffy.asm
@@ -3,20 +3,19 @@
 	db  70,  55,  55,  45,  80,  60
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 120 ; catch rate
 	db 117 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/flaaffy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm
index f1d4c8a69..a57bf46e3 100644
--- a/data/pokemon/base_stats/flareon.asm
+++ b/data/pokemon/base_stats/flareon.asm
@@ -3,20 +3,19 @@
 	db  65, 130,  60,  65,  95, 110
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 198 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/flareon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm
index 9c5a885aa..24eded41f 100644
--- a/data/pokemon/base_stats/forretress.asm
+++ b/data/pokemon/base_stats/forretress.asm
@@ -3,20 +3,19 @@
 	db  75,  90, 140,  40,  60,  60
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, STEEL
+	db BUG, STEEL ; type
 	db 75 ; catch rate
 	db 118 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/forretress/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm
index b26a82e2e..c63f0a664 100644
--- a/data/pokemon/base_stats/furret.asm
+++ b/data/pokemon/base_stats/furret.asm
@@ -3,20 +3,19 @@
 	db  85,  76,  64,  90,  45,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 90 ; catch rate
 	db 116 ; base exp
-	db BERRY ; item 1
-	db GOLD_BERRY ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db BERRY, GOLD_BERRY ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/furret/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm
index 7e46be055..3845f1991 100644
--- a/data/pokemon/base_stats/gastly.asm
+++ b/data/pokemon/base_stats/gastly.asm
@@ -3,20 +3,19 @@
 	db  30,  35,  30,  80, 100,  35
 	;   hp  atk  def  spd  sat  sdf
 
-	db GHOST, POISON
+	db GHOST, POISON ; type
 	db 190 ; catch rate
 	db 95 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/gastly/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm
index 4176aa330..33faaa3f7 100644
--- a/data/pokemon/base_stats/gengar.asm
+++ b/data/pokemon/base_stats/gengar.asm
@@ -3,20 +3,19 @@
 	db  60,  65,  60, 110, 130,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db GHOST, POISON
+	db GHOST, POISON ; type
 	db 45 ; catch rate
 	db 190 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/gengar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm
index 35e5d22a7..f084e0b84 100644
--- a/data/pokemon/base_stats/geodude.asm
+++ b/data/pokemon/base_stats/geodude.asm
@@ -3,20 +3,19 @@
 	db  40,  80, 100,  20,  30,  30
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, GROUND
+	db ROCK, GROUND ; type
 	db 255 ; catch rate
 	db 86 ; base exp
-	db NO_ITEM ; item 1
-	db EVERSTONE ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, EVERSTONE ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/geodude/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm
index 7e67b19a6..2e2c7812a 100644
--- a/data/pokemon/base_stats/girafarig.asm
+++ b/data/pokemon/base_stats/girafarig.asm
@@ -3,20 +3,19 @@
 	db  70,  80,  65,  85,  90,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, PSYCHIC
+	db NORMAL, PSYCHIC ; type
 	db 60 ; catch rate
 	db 149 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/girafarig/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm
index e16bf7043..ae609d5d2 100644
--- a/data/pokemon/base_stats/gligar.asm
+++ b/data/pokemon/base_stats/gligar.asm
@@ -3,20 +3,19 @@
 	db  65,  75, 105,  85,  35,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db GROUND, FLYING
+	db GROUND, FLYING ; type
 	db 60 ; catch rate
 	db 108 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/gligar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm
index 128b1fe81..87941e18a 100644
--- a/data/pokemon/base_stats/gloom.asm
+++ b/data/pokemon/base_stats/gloom.asm
@@ -3,20 +3,19 @@
 	db  60,  65,  70,  40,  85,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, POISON
+	db GRASS, POISON ; type
 	db 120 ; catch rate
 	db 132 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/gloom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm
index 2de7278ca..071df7e59 100644
--- a/data/pokemon/base_stats/golbat.asm
+++ b/data/pokemon/base_stats/golbat.asm
@@ -3,20 +3,19 @@
 	db  75,  80,  70,  90,  65,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, FLYING
+	db POISON, FLYING ; type
 	db 90 ; catch rate
 	db 171 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/golbat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
 	; end
diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm
index bc165c7a5..eb432d38b 100644
--- a/data/pokemon/base_stats/goldeen.asm
+++ b/data/pokemon/base_stats/goldeen.asm
@@ -3,20 +3,19 @@
 	db  45,  67,  60,  63,  35,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 225 ; catch rate
 	db 111 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/goldeen/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FISH, FISH ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm
index e3e5ea1aa..8a0acfebd 100644
--- a/data/pokemon/base_stats/golduck.asm
+++ b/data/pokemon/base_stats/golduck.asm
@@ -3,20 +3,19 @@
 	db  80,  82,  78,  85,  95,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 75 ; catch rate
 	db 174 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/golduck/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, FURY_CUTTER, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm
index bda102404..bb973d0b9 100644
--- a/data/pokemon/base_stats/golem.asm
+++ b/data/pokemon/base_stats/golem.asm
@@ -3,20 +3,19 @@
 	db  80, 110, 130,  45,  55,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, GROUND
+	db ROCK, GROUND ; type
 	db 45 ; catch rate
 	db 177 ; base exp
-	db NO_ITEM ; item 1
-	db EVERSTONE ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, EVERSTONE ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/golem/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm
index 9c572cf7b..05c268003 100644
--- a/data/pokemon/base_stats/granbull.asm
+++ b/data/pokemon/base_stats/granbull.asm
@@ -3,20 +3,19 @@
 	db  90, 120,  75,  45,  60,  60
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 75 ; catch rate
 	db 178 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F75 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F75 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/granbull/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FIELD, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_GROUND, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm
index b6be8cb5c..97c4699c0 100644
--- a/data/pokemon/base_stats/graveler.asm
+++ b/data/pokemon/base_stats/graveler.asm
@@ -3,20 +3,19 @@
 	db  55,  95, 115,  35,  45,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, GROUND
+	db ROCK, GROUND ; type
 	db 120 ; catch rate
 	db 134 ; base exp
-	db NO_ITEM ; item 1
-	db EVERSTONE ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, EVERSTONE ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/graveler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm
index b1536bb3c..72eb064e3 100644
--- a/data/pokemon/base_stats/grimer.asm
+++ b/data/pokemon/base_stats/grimer.asm
@@ -3,20 +3,19 @@
 	db  80,  80,  50,  25,  40,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, POISON
+	db POISON, POISON ; type
 	db 190 ; catch rate
 	db 90 ; base exp
-	db NO_ITEM ; item 1
-	db NUGGET ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NUGGET ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/grimer/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm
index e3cfa7faa..84113f0fb 100644
--- a/data/pokemon/base_stats/growlithe.asm
+++ b/data/pokemon/base_stats/growlithe.asm
@@ -3,20 +3,19 @@
 	db  55,  70,  45,  60,  70,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 190 ; catch rate
 	db 91 ; base exp
-	db BURNT_BERRY ; item 1
-	db BURNT_BERRY ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db BURNT_BERRY, BURNT_BERRY ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/growlithe/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm
index eb4f51f08..0e4d5ca6e 100644
--- a/data/pokemon/base_stats/gyarados.asm
+++ b/data/pokemon/base_stats/gyarados.asm
@@ -3,20 +3,19 @@
 	db  95, 125,  79,  81,  60, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, FLYING
+	db WATER, FLYING ; type
 	db 45 ; catch rate
 	db 214 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 5 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/gyarados/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FISH, REPTILE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_2, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm
index 5c31fd2a9..1ce4557bc 100644
--- a/data/pokemon/base_stats/haunter.asm
+++ b/data/pokemon/base_stats/haunter.asm
@@ -3,20 +3,19 @@
 	db  45,  50,  45,  95, 115,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db GHOST, POISON
+	db GHOST, POISON ; type
 	db 90 ; catch rate
 	db 126 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/haunter/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm
index f27efbe0d..699fc40a8 100644
--- a/data/pokemon/base_stats/heracross.asm
+++ b/data/pokemon/base_stats/heracross.asm
@@ -3,20 +3,19 @@
 	db  80, 125,  75,  85,  40,  95
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, FIGHTING
+	db BUG, FIGHTING ; type
 	db 45 ; catch rate
 	db 200 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/heracross/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm
index b8e7da73b..49d92287c 100644
--- a/data/pokemon/base_stats/hitmonchan.asm
+++ b/data/pokemon/base_stats/hitmonchan.asm
@@ -3,20 +3,19 @@
 	db  50, 105,  79,  76,  35, 110
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIGHTING, FIGHTING
+	db FIGHTING, FIGHTING ; type
 	db 45 ; catch rate
 	db 140 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F0 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F0 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hitmonchan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm
index a5759f92d..a8b11274a 100644
--- a/data/pokemon/base_stats/hitmonlee.asm
+++ b/data/pokemon/base_stats/hitmonlee.asm
@@ -3,20 +3,19 @@
 	db  50, 120,  53,  87,  35, 110
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIGHTING, FIGHTING
+	db FIGHTING, FIGHTING ; type
 	db 45 ; catch rate
 	db 139 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F0 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F0 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hitmonlee/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm
index a36b7fc58..6a383b07c 100644
--- a/data/pokemon/base_stats/hitmontop.asm
+++ b/data/pokemon/base_stats/hitmontop.asm
@@ -3,20 +3,19 @@
 	db  50,  95,  95,  70,  35, 110
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIGHTING, FIGHTING
+	db FIGHTING, FIGHTING ; type
 	db 45 ; catch rate
 	db 138 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F0 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F0 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hitmontop/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm
index 910ea5a9f..d2a7627cb 100644
--- a/data/pokemon/base_stats/ho_oh.asm
+++ b/data/pokemon/base_stats/ho_oh.asm
@@ -3,20 +3,19 @@
 	db 106, 130,  90,  90, 110, 154
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FLYING
+	db FIRE, FLYING ; type
 	db 3 ; catch rate
 	db 220 ; base exp
-	db SACRED_ASH ; item 1
-	db SACRED_ASH ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db SACRED_ASH, SACRED_ASH ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ho_oh/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm
index b52e929e9..29293fc6a 100644
--- a/data/pokemon/base_stats/hoothoot.asm
+++ b/data/pokemon/base_stats/hoothoot.asm
@@ -3,20 +3,19 @@
 	db  60,  30,  30,  50,  36,  56
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, FLYING
+	db NORMAL, FLYING ; type
 	db 255 ; catch rate
 	db 58 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hoothoot/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH
 	; end
diff --git a/data/pokemon/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm
index c6e1a86dc..da08514ef 100644
--- a/data/pokemon/base_stats/hoppip.asm
+++ b/data/pokemon/base_stats/hoppip.asm
@@ -3,20 +3,19 @@
 	db  35,  35,  40,  50,  35,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, FLYING
+	db GRASS, FLYING ; type
 	db 255 ; catch rate
 	db 74 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hoppip/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FAIRY, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FAIRY, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm
index c3d75a927..dd3c085a8 100644
--- a/data/pokemon/base_stats/horsea.asm
+++ b/data/pokemon/base_stats/horsea.asm
@@ -3,20 +3,19 @@
 	db  30,  40,  70,  60,  70,  25
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 225 ; catch rate
 	db 83 ; base exp
-	db NO_ITEM ; item 1
-	db DRAGON_SCALE ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, DRAGON_SCALE ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/horsea/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm
index 1f3b4f903..6bb11aa86 100644
--- a/data/pokemon/base_stats/houndoom.asm
+++ b/data/pokemon/base_stats/houndoom.asm
@@ -3,20 +3,19 @@
 	db  75,  90,  50,  95, 110,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db DARK, FIRE
+	db DARK, FIRE ; type
 	db 45 ; catch rate
 	db 204 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/houndoom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm
index b064b3e0d..3eac9dafd 100644
--- a/data/pokemon/base_stats/houndour.asm
+++ b/data/pokemon/base_stats/houndour.asm
@@ -3,20 +3,19 @@
 	db  45,  60,  30,  65,  80,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db DARK, FIRE
+	db DARK, FIRE ; type
 	db 120 ; catch rate
 	db 114 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/houndour/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm
index 83aab91c8..e9761fe8d 100644
--- a/data/pokemon/base_stats/hypno.asm
+++ b/data/pokemon/base_stats/hypno.asm
@@ -3,20 +3,19 @@
 	db  85,  73,  70,  67,  73, 115
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 75 ; catch rate
 	db 165 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/hypno/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH
 	; end
diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm
index 8745ecafb..687171369 100644
--- a/data/pokemon/base_stats/igglybuff.asm
+++ b/data/pokemon/base_stats/igglybuff.asm
@@ -3,20 +3,19 @@
 	db  90,  30,  15,  15,  40,  20
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 170 ; catch rate
 	db 39 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F75 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F75 ; gender ratio
+	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/igglybuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm
index 8e7c7c9c4..870a4b675 100644
--- a/data/pokemon/base_stats/ivysaur.asm
+++ b/data/pokemon/base_stats/ivysaur.asm
@@ -3,20 +3,19 @@
 	db  60,  62,  63,  60,  80,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, POISON
+	db GRASS, POISON ; type
 	db 45 ; catch rate
 	db 141 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ivysaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm
index f785f0228..5a3066a56 100644
--- a/data/pokemon/base_stats/jigglypuff.asm
+++ b/data/pokemon/base_stats/jigglypuff.asm
@@ -3,20 +3,19 @@
 	db 115,  45,  20,  20,  45,  25
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 170 ; catch rate
 	db 76 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F75 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F75 ; gender ratio
+	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/jigglypuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm
index a6636ebba..3984d9d93 100644
--- a/data/pokemon/base_stats/jolteon.asm
+++ b/data/pokemon/base_stats/jolteon.asm
@@ -3,20 +3,19 @@
 	db  65,  65,  60, 130, 110,  95
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 45 ; catch rate
 	db 197 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/jolteon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm
index c40d2c559..61a8b7fe2 100644
--- a/data/pokemon/base_stats/jumpluff.asm
+++ b/data/pokemon/base_stats/jumpluff.asm
@@ -3,20 +3,19 @@
 	db  75,  55,  70, 110,  55,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, FLYING
+	db GRASS, FLYING ; type
 	db 45 ; catch rate
 	db 176 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/jumpluff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FAIRY, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FAIRY, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm
index 5696b83ee..1a7149d35 100644
--- a/data/pokemon/base_stats/jynx.asm
+++ b/data/pokemon/base_stats/jynx.asm
@@ -3,20 +3,19 @@
 	db  65,  50,  35,  95, 115,  95
 	;   hp  atk  def  spd  sat  sdf
 
-	db ICE, PSYCHIC
+	db ICE, PSYCHIC ; type
 	db 45 ; catch rate
 	db 137 ; base exp
-	db ICE_BERRY ; item 1
-	db ICE_BERRY ; item 2
-	db GENDER_F100 ; gender
-	db 100 ; unknown
+	db ICE_BERRY, ICE_BERRY ; items
+	db GENDER_F100 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/jynx/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm
index 60022586f..f9ac24011 100644
--- a/data/pokemon/base_stats/kabuto.asm
+++ b/data/pokemon/base_stats/kabuto.asm
@@ -3,20 +3,19 @@
 	db  30,  80,  90,  55,  55,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, WATER
+	db ROCK, WATER ; type
 	db 45 ; catch rate
 	db 119 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 30 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kabuto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm
index b56cb1db8..c6d755694 100644
--- a/data/pokemon/base_stats/kabutops.asm
+++ b/data/pokemon/base_stats/kabutops.asm
@@ -3,20 +3,19 @@
 	db  60, 115, 105,  80,  65,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, WATER
+	db ROCK, WATER ; type
 	db 45 ; catch rate
 	db 201 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 30 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kabutops/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm
index e3ce05321..9a7f7f841 100644
--- a/data/pokemon/base_stats/kadabra.asm
+++ b/data/pokemon/base_stats/kadabra.asm
@@ -3,20 +3,19 @@
 	db  40,  35,  30, 105, 120,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 100 ; catch rate
 	db 145 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kadabra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH
 	; end
diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm
index 4c8304dd2..20c0db908 100644
--- a/data/pokemon/base_stats/kakuna.asm
+++ b/data/pokemon/base_stats/kakuna.asm
@@ -3,20 +3,19 @@
 	db  45,  25,  50,  35,  25,  25
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, POISON
+	db BUG, POISON ; type
 	db 120 ; catch rate
 	db 71 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kakuna/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm
 	; end
diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm
index 3724e29eb..f56401af5 100644
--- a/data/pokemon/base_stats/kangaskhan.asm
+++ b/data/pokemon/base_stats/kangaskhan.asm
@@ -3,20 +3,19 @@
 	db 105,  95,  80,  90,  40,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 175 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F100 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F100 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kangaskhan/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm
index d217fa612..930f30b7b 100644
--- a/data/pokemon/base_stats/kingdra.asm
+++ b/data/pokemon/base_stats/kingdra.asm
@@ -3,20 +3,19 @@
 	db  75,  95,  95,  85,  95,  95
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, DRAGON
+	db WATER, DRAGON ; type
 	db 45 ; catch rate
 	db 207 ; base exp
-	db NO_ITEM ; item 1
-	db DRAGON_SCALE ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, DRAGON_SCALE ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kingdra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm
index 82549ca88..3362dc4f0 100644
--- a/data/pokemon/base_stats/kingler.asm
+++ b/data/pokemon/base_stats/kingler.asm
@@ -3,20 +3,19 @@
 	db  55, 130, 115,  75,  50,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 60 ; catch rate
 	db 206 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/kingler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm
index 8408f4ad8..13f297f0f 100644
--- a/data/pokemon/base_stats/koffing.asm
+++ b/data/pokemon/base_stats/koffing.asm
@@ -3,20 +3,19 @@
 	db  40,  65,  95,  35,  60,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, POISON
+	db POISON, POISON ; type
 	db 190 ; catch rate
 	db 114 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/koffing/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm
index f4d78962a..5b8214773 100644
--- a/data/pokemon/base_stats/krabby.asm
+++ b/data/pokemon/base_stats/krabby.asm
@@ -3,20 +3,19 @@
 	db  30, 105,  90,  50,  25,  25
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 225 ; catch rate
 	db 115 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/krabby/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm
index ea97a9722..140d85dc4 100644
--- a/data/pokemon/base_stats/lanturn.asm
+++ b/data/pokemon/base_stats/lanturn.asm
@@ -3,20 +3,19 @@
 	db 125,  58,  58,  67,  76,  76
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, ELECTRIC
+	db WATER, ELECTRIC ; type
 	db 75 ; catch rate
 	db 156 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/lanturn/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FISH, FISH ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm
index 4ba001dfd..dbbaa0203 100644
--- a/data/pokemon/base_stats/lapras.asm
+++ b/data/pokemon/base_stats/lapras.asm
@@ -3,20 +3,19 @@
 	db 130,  85,  80,  60,  85,  95
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, ICE
+	db WATER, ICE ; type
 	db 45 ; catch rate
 	db 219 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/lapras/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, WHIRLPOOL, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm
index d9c18d1bc..fc595d973 100644
--- a/data/pokemon/base_stats/larvitar.asm
+++ b/data/pokemon/base_stats/larvitar.asm
@@ -3,20 +3,19 @@
 	db  50,  64,  50,  41,  45,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, GROUND
+	db ROCK, GROUND ; type
 	db 45 ; catch rate
 	db 67 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/larvitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT
 	; end
diff --git a/data/pokemon/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm
index 1f0cb4fd9..ac8e998b7 100644
--- a/data/pokemon/base_stats/ledian.asm
+++ b/data/pokemon/base_stats/ledian.asm
@@ -3,20 +3,19 @@
 	db  55,  35,  50,  85,  55, 110
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, FLYING
+	db BUG, FLYING ; type
 	db 90 ; catch rate
 	db 134 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ledian/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH
 	; end
diff --git a/data/pokemon/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm
index e78d4efe4..7ec0cf21b 100644
--- a/data/pokemon/base_stats/ledyba.asm
+++ b/data/pokemon/base_stats/ledyba.asm
@@ -3,20 +3,19 @@
 	db  40,  20,  30,  55,  40,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, FLYING
+	db BUG, FLYING ; type
 	db 255 ; catch rate
 	db 54 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ledyba/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH
 	; end
diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm
index 43d60ec6c..71b61380f 100644
--- a/data/pokemon/base_stats/lickitung.asm
+++ b/data/pokemon/base_stats/lickitung.asm
@@ -3,20 +3,19 @@
 	db  90,  55,  75,  30,  60,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 127 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/lickitung/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm
index 7ad2f23a1..db3c17b29 100644
--- a/data/pokemon/base_stats/lugia.asm
+++ b/data/pokemon/base_stats/lugia.asm
@@ -3,20 +3,19 @@
 	db 106,  90, 130, 110,  90, 154
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, FLYING
+	db PSYCHIC, FLYING ; type
 	db 3 ; catch rate
 	db 220 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/lugia/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm
index 41b168234..5595336c7 100644
--- a/data/pokemon/base_stats/machamp.asm
+++ b/data/pokemon/base_stats/machamp.asm
@@ -3,20 +3,19 @@
 	db  90, 130,  80,  55,  65,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIGHTING, FIGHTING
+	db FIGHTING, FIGHTING ; type
 	db 45 ; catch rate
 	db 193 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/machamp/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm
index 8b98ea1de..ebbd9e3a8 100644
--- a/data/pokemon/base_stats/machoke.asm
+++ b/data/pokemon/base_stats/machoke.asm
@@ -3,20 +3,19 @@
 	db  80, 100,  70,  45,  50,  60
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIGHTING, FIGHTING
+	db FIGHTING, FIGHTING ; type
 	db 90 ; catch rate
 	db 146 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/machoke/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm
index cb1b2f7c5..51446b53f 100644
--- a/data/pokemon/base_stats/machop.asm
+++ b/data/pokemon/base_stats/machop.asm
@@ -3,20 +3,19 @@
 	db  70,  80,  50,  35,  35,  35
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIGHTING, FIGHTING
+	db FIGHTING, FIGHTING ; type
 	db 180 ; catch rate
 	db 88 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/machop/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm
index 132387f32..1d029bd65 100644
--- a/data/pokemon/base_stats/magby.asm
+++ b/data/pokemon/base_stats/magby.asm
@@ -3,20 +3,19 @@
 	db  45,  75,  37,  83,  70,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 117 ; base exp
-	db BURNT_BERRY ; item 1
-	db BURNT_BERRY ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db BURNT_BERRY, BURNT_BERRY ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magby/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm
index aa2008cd1..472e67895 100644
--- a/data/pokemon/base_stats/magcargo.asm
+++ b/data/pokemon/base_stats/magcargo.asm
@@ -3,20 +3,19 @@
 	db  50,  50, 120,  30,  80,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, ROCK
+	db FIRE, ROCK ; type
 	db 75 ; catch rate
 	db 154 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magcargo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm
index e5524543f..16e0cebc9 100644
--- a/data/pokemon/base_stats/magikarp.asm
+++ b/data/pokemon/base_stats/magikarp.asm
@@ -3,20 +3,19 @@
 	db  20,  10,  55,  80,  15,  20
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 255 ; catch rate
 	db 20 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 5 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magikarp/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FISH, REPTILE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_2, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm
 	; end
diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm
index 595df7ab7..a01e0387b 100644
--- a/data/pokemon/base_stats/magmar.asm
+++ b/data/pokemon/base_stats/magmar.asm
@@ -3,20 +3,19 @@
 	db  65,  95,  57,  93, 100,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 167 ; base exp
-	db BURNT_BERRY ; item 1
-	db BURNT_BERRY ; item 2
-	db GENDER_F25 ; gender
-	db 100 ; unknown
+	db BURNT_BERRY, BURNT_BERRY ; items
+	db GENDER_F25 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magmar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm
index 42bdc18a7..5a34e2bbc 100644
--- a/data/pokemon/base_stats/magnemite.asm
+++ b/data/pokemon/base_stats/magnemite.asm
@@ -3,20 +3,19 @@
 	db  25,  35,  70,  45,  95,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, STEEL
+	db ELECTRIC, STEEL ; type
 	db 190 ; catch rate
 	db 89 ; base exp
-	db NO_ITEM ; item 1
-	db METAL_COAT ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, METAL_COAT ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magnemite/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm
index 5cac867be..620171c17 100644
--- a/data/pokemon/base_stats/magneton.asm
+++ b/data/pokemon/base_stats/magneton.asm
@@ -3,20 +3,19 @@
 	db  50,  60,  95,  70, 120,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, STEEL
+	db ELECTRIC, STEEL ; type
 	db 60 ; catch rate
 	db 161 ; base exp
-	db NO_ITEM ; item 1
-	db METAL_COAT ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, METAL_COAT ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/magneton/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm
index 41aaac8a9..c56672f7b 100644
--- a/data/pokemon/base_stats/mankey.asm
+++ b/data/pokemon/base_stats/mankey.asm
@@ -3,20 +3,19 @@
 	db  40,  80,  35,  70,  35,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIGHTING, FIGHTING
+	db FIGHTING, FIGHTING ; type
 	db 190 ; catch rate
 	db 74 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mankey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm
index bec060cb6..7b5cd54a9 100644
--- a/data/pokemon/base_stats/mantine.asm
+++ b/data/pokemon/base_stats/mantine.asm
@@ -3,20 +3,19 @@
 	db  65,  40,  70,  70,  80, 140
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, FLYING
+	db WATER, FLYING ; type
 	db 25 ; catch rate
 	db 168 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mantine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AMPHIBIAN, AMPHIBIAN ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm
index 8388d7f8c..7ed0d477e 100644
--- a/data/pokemon/base_stats/mareep.asm
+++ b/data/pokemon/base_stats/mareep.asm
@@ -3,20 +3,19 @@
 	db  55,  40,  40,  35,  65,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 235 ; catch rate
 	db 59 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mareep/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm
index b6fcc62e5..28f936745 100644
--- a/data/pokemon/base_stats/marill.asm
+++ b/data/pokemon/base_stats/marill.asm
@@ -3,20 +3,19 @@
 	db  70,  20,  50,  40,  20,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 190 ; catch rate
 	db 58 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/marill/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AMPHIBIAN, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_WATER_1, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm
index cc03dc697..264814f55 100644
--- a/data/pokemon/base_stats/marowak.asm
+++ b/data/pokemon/base_stats/marowak.asm
@@ -3,20 +3,19 @@
 	db  60,  80, 110,  45,  50,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db GROUND, GROUND
+	db GROUND, GROUND ; type
 	db 75 ; catch rate
 	db 124 ; base exp
-	db NO_ITEM ; item 1
-	db THICK_CLUB ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, THICK_CLUB ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/marowak/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm
index eaca626d4..b5e67957f 100644
--- a/data/pokemon/base_stats/meganium.asm
+++ b/data/pokemon/base_stats/meganium.asm
@@ -3,20 +3,19 @@
 	db  80,  82, 100,  80,  83, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, GRASS
+	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 208 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/meganium/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH
 	; end
diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm
index 114f76899..bd51fbc19 100644
--- a/data/pokemon/base_stats/meowth.asm
+++ b/data/pokemon/base_stats/meowth.asm
@@ -3,20 +3,19 @@
 	db  40,  45,  35,  90,  40,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 255 ; catch rate
 	db 69 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/meowth/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm
index f2b33f831..335e894e3 100644
--- a/data/pokemon/base_stats/metapod.asm
+++ b/data/pokemon/base_stats/metapod.asm
@@ -3,20 +3,19 @@
 	db  50,  20,  55,  30,  25,  25
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, BUG
+	db BUG, BUG ; type
 	db 120 ; catch rate
 	db 72 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/metapod/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm
 	; end
diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm
index 4d70413d0..aa9ed7012 100644
--- a/data/pokemon/base_stats/mew.asm
+++ b/data/pokemon/base_stats/mew.asm
@@ -3,20 +3,19 @@
 	db 100, 100, 100, 100, 100, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 45 ; catch rate
 	db 64 ; base exp
-	db NO_ITEM ; item 1
-	db MIRACLEBERRY ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, MIRACLEBERRY ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mew/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, FLY, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm
index 0e9636223..348603b84 100644
--- a/data/pokemon/base_stats/mewtwo.asm
+++ b/data/pokemon/base_stats/mewtwo.asm
@@ -3,20 +3,19 @@
 	db 106, 110,  90, 130, 154,  90
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 3 ; catch rate
 	db 220 ; base exp
-	db NO_ITEM ; item 1
-	db BERSERK_GENE ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, BERSERK_GENE ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mewtwo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm
index c751a2f9c..471e45208 100644
--- a/data/pokemon/base_stats/miltank.asm
+++ b/data/pokemon/base_stats/miltank.asm
@@ -3,20 +3,19 @@
 	db  95,  80, 105, 100,  40,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 200 ; base exp
-	db MOOMOO_MILK ; item 1
-	db MOOMOO_MILK ; item 2
-	db GENDER_F100 ; gender
-	db 100 ; unknown
+	db MOOMOO_MILK, MOOMOO_MILK ; items
+	db GENDER_F100 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/miltank/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm
index d1824eaa2..821cb37ac 100644
--- a/data/pokemon/base_stats/misdreavus.asm
+++ b/data/pokemon/base_stats/misdreavus.asm
@@ -3,20 +3,19 @@
 	db  60,  60,  60,  85,  85,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db GHOST, GHOST
+	db GHOST, GHOST ; type
 	db 45 ; catch rate
 	db 147 ; base exp
-	db NO_ITEM ; item 1
-	db SPELL_TAG ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, SPELL_TAG ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/misdreavus/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm
index 22157c073..2635909d1 100644
--- a/data/pokemon/base_stats/moltres.asm
+++ b/data/pokemon/base_stats/moltres.asm
@@ -3,20 +3,19 @@
 	db  90, 100,  90,  90, 125,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FLYING
+	db FIRE, FLYING ; type
 	db 3 ; catch rate
 	db 217 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/moltres/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, STEEL_WING, FLY, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm
index 1abc9995f..476483d9e 100644
--- a/data/pokemon/base_stats/mr__mime.asm
+++ b/data/pokemon/base_stats/mr__mime.asm
@@ -3,20 +3,19 @@
 	db  40,  45,  65,  90, 100, 120
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 45 ; catch rate
 	db 136 ; base exp
-	db NO_ITEM ; item 1
-	db MYSTERYBERRY ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, MYSTERYBERRY ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/mr__mime/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn HUMANSHAPE, HUMANSHAPE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm
index a25d85605..48c4e5cd7 100644
--- a/data/pokemon/base_stats/muk.asm
+++ b/data/pokemon/base_stats/muk.asm
@@ -3,20 +3,19 @@
 	db 105, 105,  75,  50,  65, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, POISON
+	db POISON, POISON ; type
 	db 75 ; catch rate
 	db 157 ; base exp
-	db NO_ITEM ; item 1
-	db NUGGET ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NUGGET ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/muk/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm
index 2fada2697..db9c40fa1 100644
--- a/data/pokemon/base_stats/murkrow.asm
+++ b/data/pokemon/base_stats/murkrow.asm
@@ -3,20 +3,19 @@
 	db  60,  85,  42,  91,  85,  42
 	;   hp  atk  def  spd  sat  sdf
 
-	db DARK, FLYING
+	db DARK, FLYING ; type
 	db 30 ; catch rate
 	db 107 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/murkrow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY
 	; end
diff --git a/data/pokemon/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm
index b9bde658a..6f1076eb7 100644
--- a/data/pokemon/base_stats/natu.asm
+++ b/data/pokemon/base_stats/natu.asm
@@ -3,20 +3,19 @@
 	db  40,  50,  45,  70,  70,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, FLYING
+	db PSYCHIC, FLYING ; type
 	db 190 ; catch rate
 	db 73 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/natu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH
 	; end
diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm
index 3d7205af5..af3572a96 100644
--- a/data/pokemon/base_stats/nidoking.asm
+++ b/data/pokemon/base_stats/nidoking.asm
@@ -3,20 +3,19 @@
 	db  81,  92,  77,  85,  85,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, GROUND
+	db POISON, GROUND ; type
 	db 45 ; catch rate
 	db 195 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F0 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F0 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidoking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm
index 4c5ca110e..72eb9336c 100644
--- a/data/pokemon/base_stats/nidoqueen.asm
+++ b/data/pokemon/base_stats/nidoqueen.asm
@@ -3,20 +3,19 @@
 	db  90,  82,  87,  76,  75,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, GROUND
+	db POISON, GROUND ; type
 	db 45 ; catch rate
 	db 194 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F100 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F100 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidoqueen/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm
index 77925f1df..e3cb1c9b2 100644
--- a/data/pokemon/base_stats/nidoran_f.asm
+++ b/data/pokemon/base_stats/nidoran_f.asm
@@ -3,20 +3,19 @@
 	db  55,  47,  52,  41,  40,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, POISON
+	db POISON, POISON ; type
 	db 235 ; catch rate
 	db 59 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F100 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F100 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidoran_f/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm
index 0f25712dd..8b3d28ddc 100644
--- a/data/pokemon/base_stats/nidoran_m.asm
+++ b/data/pokemon/base_stats/nidoran_m.asm
@@ -3,20 +3,19 @@
 	db  46,  57,  40,  50,  40,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, POISON
+	db POISON, POISON ; type
 	db 235 ; catch rate
 	db 60 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F0 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F0 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidoran_m/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm
index 2385f82ec..d446a0d3b 100644
--- a/data/pokemon/base_stats/nidorina.asm
+++ b/data/pokemon/base_stats/nidorina.asm
@@ -3,20 +3,19 @@
 	db  70,  62,  67,  56,  55,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, POISON
+	db POISON, POISON ; type
 	db 120 ; catch rate
 	db 117 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F100 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F100 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidorina/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm
index 9c94ea824..7ece56a58 100644
--- a/data/pokemon/base_stats/nidorino.asm
+++ b/data/pokemon/base_stats/nidorino.asm
@@ -3,20 +3,19 @@
 	db  61,  72,  57,  65,  55,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, POISON
+	db POISON, POISON ; type
 	db 120 ; catch rate
 	db 118 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F0 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F0 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/nidorino/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm
index f23d2e384..cb8f538b0 100644
--- a/data/pokemon/base_stats/ninetales.asm
+++ b/data/pokemon/base_stats/ninetales.asm
@@ -3,20 +3,19 @@
 	db  73,  76,  75, 100,  81, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 75 ; catch rate
 	db 178 ; base exp
-	db BURNT_BERRY ; item 1
-	db BURNT_BERRY ; item 2
-	db GENDER_F75 ; gender
-	db 100 ; unknown
+	db BURNT_BERRY, BURNT_BERRY ; items
+	db GENDER_F75 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ninetales/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm
index 030dec08e..5ad54adc6 100644
--- a/data/pokemon/base_stats/noctowl.asm
+++ b/data/pokemon/base_stats/noctowl.asm
@@ -3,20 +3,19 @@
 	db 100,  50,  50,  70,  76,  96
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, FLYING
+	db NORMAL, FLYING ; type
 	db 90 ; catch rate
 	db 162 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/noctowl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH
 	; end
diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm
index 6bc2f7d46..c4a9a9c09 100644
--- a/data/pokemon/base_stats/octillery.asm
+++ b/data/pokemon/base_stats/octillery.asm
@@ -3,20 +3,19 @@
 	db  75, 105,  75,  45, 105,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 75 ; catch rate
 	db 164 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/octillery/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FISH ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_2 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm
index 98f8c96f9..3bb4fb1a3 100644
--- a/data/pokemon/base_stats/oddish.asm
+++ b/data/pokemon/base_stats/oddish.asm
@@ -3,20 +3,19 @@
 	db  45,  50,  55,  30,  75,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, POISON
+	db GRASS, POISON ; type
 	db 255 ; catch rate
 	db 78 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/oddish/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm
index 70b88df38..d676205de 100644
--- a/data/pokemon/base_stats/omanyte.asm
+++ b/data/pokemon/base_stats/omanyte.asm
@@ -3,20 +3,19 @@
 	db  35,  40, 100,  35,  90,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, WATER
+	db ROCK, WATER ; type
 	db 45 ; catch rate
 	db 120 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 30 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/omanyte/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm
index 659ecc825..33816ae00 100644
--- a/data/pokemon/base_stats/omastar.asm
+++ b/data/pokemon/base_stats/omastar.asm
@@ -3,20 +3,19 @@
 	db  70,  60, 125,  55, 115,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, WATER
+	db ROCK, WATER ; type
 	db 45 ; catch rate
 	db 199 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 30 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/omastar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, INVERTEBRATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm
index befd53abf..6b3183e97 100644
--- a/data/pokemon/base_stats/onix.asm
+++ b/data/pokemon/base_stats/onix.asm
@@ -3,20 +3,19 @@
 	db  35,  45, 160,  70,  30,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, GROUND
+	db ROCK, GROUND ; type
 	db 45 ; catch rate
 	db 108 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/onix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm
index 46687f928..1cd8aa500 100644
--- a/data/pokemon/base_stats/paras.asm
+++ b/data/pokemon/base_stats/paras.asm
@@ -3,20 +3,19 @@
 	db  35,  70,  55,  25,  45,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, GRASS
+	db BUG, GRASS ; type
 	db 190 ; catch rate
 	db 70 ; base exp
-	db TINYMUSHROOM ; item 1
-	db BIG_MUSHROOM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db TINYMUSHROOM, BIG_MUSHROOM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/paras/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, PLANT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm
index d40dd4fd9..f5b1a4fe5 100644
--- a/data/pokemon/base_stats/parasect.asm
+++ b/data/pokemon/base_stats/parasect.asm
@@ -3,20 +3,19 @@
 	db  60,  95,  80,  30,  60,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, GRASS
+	db BUG, GRASS ; type
 	db 75 ; catch rate
 	db 128 ; base exp
-	db TINYMUSHROOM ; item 1
-	db BIG_MUSHROOM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db TINYMUSHROOM, BIG_MUSHROOM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/parasect/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, PLANT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm
index bbfd9beec..c71837785 100644
--- a/data/pokemon/base_stats/persian.asm
+++ b/data/pokemon/base_stats/persian.asm
@@ -3,20 +3,19 @@
 	db  65,  70,  60, 115,  65,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 90 ; catch rate
 	db 148 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/persian/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm
index 27794e0b5..27221d4fb 100644
--- a/data/pokemon/base_stats/phanpy.asm
+++ b/data/pokemon/base_stats/phanpy.asm
@@ -3,20 +3,19 @@
 	db  90,  60,  60,  40,  40,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db GROUND, GROUND
+	db GROUND, GROUND ; type
 	db 120 ; catch rate
 	db 124 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/phanpy/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm
index 35d6a105a..6805a0386 100644
--- a/data/pokemon/base_stats/pichu.asm
+++ b/data/pokemon/base_stats/pichu.asm
@@ -3,20 +3,19 @@
 	db  20,  40,  15,  60,  35,  35
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 190 ; catch rate
 	db 42 ; base exp
-	db NO_ITEM ; item 1
-	db BERRY ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, BERRY ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pichu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm
index 2d117b955..5d935b01d 100644
--- a/data/pokemon/base_stats/pidgeot.asm
+++ b/data/pokemon/base_stats/pidgeot.asm
@@ -3,20 +3,19 @@
 	db  83,  80,  75,  91,  70,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, FLYING
+	db NORMAL, FLYING ; type
 	db 45 ; catch rate
 	db 172 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pidgeot/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
 	; end
diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm
index 8e263c4b3..766a2e5cf 100644
--- a/data/pokemon/base_stats/pidgeotto.asm
+++ b/data/pokemon/base_stats/pidgeotto.asm
@@ -3,20 +3,19 @@
 	db  63,  60,  55,  71,  50,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, FLYING
+	db NORMAL, FLYING ; type
 	db 120 ; catch rate
 	db 113 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pidgeotto/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
 	; end
diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm
index 123b95d7d..4d9ccb21a 100644
--- a/data/pokemon/base_stats/pidgey.asm
+++ b/data/pokemon/base_stats/pidgey.asm
@@ -3,20 +3,19 @@
 	db  40,  45,  40,  56,  35,  35
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, FLYING
+	db NORMAL, FLYING ; type
 	db 255 ; catch rate
 	db 55 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pidgey/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
 	; end
diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm
index 78204ff78..7beb911ff 100644
--- a/data/pokemon/base_stats/pikachu.asm
+++ b/data/pokemon/base_stats/pikachu.asm
@@ -3,20 +3,19 @@
 	db  35,  55,  30,  90,  50,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 190 ; catch rate
 	db 82 ; base exp
-	db NO_ITEM ; item 1
-	db BERRY ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, BERRY ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pikachu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FAIRY ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, STRENGTH, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm
index 3e48aa4c9..077146eca 100644
--- a/data/pokemon/base_stats/piloswine.asm
+++ b/data/pokemon/base_stats/piloswine.asm
@@ -3,20 +3,19 @@
 	db 100, 100,  80,  50,  60,  60
 	;   hp  atk  def  spd  sat  sdf
 
-	db ICE, GROUND
+	db ICE, GROUND ; type
 	db 75 ; catch rate
 	db 160 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/piloswine/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm
index 5754c49a2..fc5e2e591 100644
--- a/data/pokemon/base_stats/pineco.asm
+++ b/data/pokemon/base_stats/pineco.asm
@@ -3,20 +3,19 @@
 	db  50,  65,  90,  15,  35,  35
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, BUG
+	db BUG, BUG ; type
 	db 190 ; catch rate
 	db 60 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pineco/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm
index 55927c918..7d7a46257 100644
--- a/data/pokemon/base_stats/pinsir.asm
+++ b/data/pokemon/base_stats/pinsir.asm
@@ -3,20 +3,19 @@
 	db  65, 125, 100,  85,  55,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, BUG
+	db BUG, BUG ; type
 	db 45 ; catch rate
 	db 200 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pinsir/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm
index 6ad959406..617dc0c7c 100644
--- a/data/pokemon/base_stats/politoed.asm
+++ b/data/pokemon/base_stats/politoed.asm
@@ -3,20 +3,19 @@
 	db  90,  75,  75,  70,  90, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 185 ; base exp
-	db NO_ITEM ; item 1
-	db KINGS_ROCK ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, KINGS_ROCK ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/politoed/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMPHIBIAN, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm
index 3a4d8c051..d3a2722a5 100644
--- a/data/pokemon/base_stats/poliwag.asm
+++ b/data/pokemon/base_stats/poliwag.asm
@@ -3,20 +3,19 @@
 	db  40,  50,  40,  90,  40,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 255 ; catch rate
 	db 77 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/poliwag/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMPHIBIAN, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm
index d28964ebd..2c2e9dba9 100644
--- a/data/pokemon/base_stats/poliwhirl.asm
+++ b/data/pokemon/base_stats/poliwhirl.asm
@@ -3,20 +3,19 @@
 	db  65,  65,  65,  90,  50,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 120 ; catch rate
 	db 131 ; base exp
-	db NO_ITEM ; item 1
-	db KINGS_ROCK ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, KINGS_ROCK ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/poliwhirl/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMPHIBIAN, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm
index 3b142e061..114cc7c88 100644
--- a/data/pokemon/base_stats/poliwrath.asm
+++ b/data/pokemon/base_stats/poliwrath.asm
@@ -3,20 +3,19 @@
 	db  90,  85,  95,  70,  70,  90
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, FIGHTING
+	db WATER, FIGHTING ; type
 	db 45 ; catch rate
 	db 185 ; base exp
-	db NO_ITEM ; item 1
-	db KINGS_ROCK ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, KINGS_ROCK ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/poliwrath/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn AMPHIBIAN, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_WATER_1, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm
index 2c3c3f9cf..0be847fbd 100644
--- a/data/pokemon/base_stats/ponyta.asm
+++ b/data/pokemon/base_stats/ponyta.asm
@@ -3,20 +3,19 @@
 	db  50,  85,  55,  90,  65,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 190 ; catch rate
 	db 152 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ponyta/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm
index c034acdfb..e8b1f4402 100644
--- a/data/pokemon/base_stats/porygon.asm
+++ b/data/pokemon/base_stats/porygon.asm
@@ -3,20 +3,19 @@
 	db  65,  60,  70,  40,  85,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 130 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/porygon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm
index 1e9625509..11fd950aa 100644
--- a/data/pokemon/base_stats/porygon2.asm
+++ b/data/pokemon/base_stats/porygon2.asm
@@ -3,20 +3,19 @@
 	db  85,  80,  90,  60, 105,  95
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 180 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/porygon2/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm
index a7d1ee74a..15da82cb3 100644
--- a/data/pokemon/base_stats/primeape.asm
+++ b/data/pokemon/base_stats/primeape.asm
@@ -3,20 +3,19 @@
 	db  65, 105,  60,  95,  60,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIGHTING, FIGHTING
+	db FIGHTING, FIGHTING ; type
 	db 75 ; catch rate
 	db 149 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/primeape/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm
index d2901750b..dd964344b 100644
--- a/data/pokemon/base_stats/psyduck.asm
+++ b/data/pokemon/base_stats/psyduck.asm
@@ -3,20 +3,19 @@
 	db  50,  52,  48,  55,  65,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 190 ; catch rate
 	db 80 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/psyduck/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm
index 7ff381195..b4bc6e5e7 100644
--- a/data/pokemon/base_stats/pupitar.asm
+++ b/data/pokemon/base_stats/pupitar.asm
@@ -3,20 +3,19 @@
 	db  70,  84,  70,  51,  65,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, GROUND
+	db ROCK, GROUND ; type
 	db 45 ; catch rate
 	db 144 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/pupitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT
 	; end
diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm
index 75a1d24be..c3599d036 100644
--- a/data/pokemon/base_stats/quagsire.asm
+++ b/data/pokemon/base_stats/quagsire.asm
@@ -3,20 +3,19 @@
 	db  95,  85,  85,  35,  65,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, GROUND
+	db WATER, GROUND ; type
 	db 90 ; catch rate
 	db 137 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/quagsire/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm
index 4cb388301..82cf03a7f 100644
--- a/data/pokemon/base_stats/quilava.asm
+++ b/data/pokemon/base_stats/quilava.asm
@@ -3,20 +3,19 @@
 	db  58,  64,  58,  80,  80,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 142 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/quilava/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm
index 0cfe4e2d8..16cf03d07 100644
--- a/data/pokemon/base_stats/qwilfish.asm
+++ b/data/pokemon/base_stats/qwilfish.asm
@@ -3,20 +3,19 @@
 	db  65,  95,  75,  85,  55,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, POISON
+	db WATER, POISON ; type
 	db 45 ; catch rate
 	db 100 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/qwilfish/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FISH, FISH ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm
index b6723ac0f..6b7727f6b 100644
--- a/data/pokemon/base_stats/raichu.asm
+++ b/data/pokemon/base_stats/raichu.asm
@@ -3,20 +3,19 @@
 	db  60,  90,  55, 100,  90,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 75 ; catch rate
 	db 122 ; base exp
-	db NO_ITEM ; item 1
-	db BERRY ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, BERRY ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/raichu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FAIRY ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, STRENGTH, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm
index 47f4f9da3..753800d93 100644
--- a/data/pokemon/base_stats/raikou.asm
+++ b/data/pokemon/base_stats/raikou.asm
@@ -3,20 +3,19 @@
 	db  90,  85,  75, 115, 115, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 3 ; catch rate
 	db 216 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/raikou/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm
index 291b129f2..9827add2d 100644
--- a/data/pokemon/base_stats/rapidash.asm
+++ b/data/pokemon/base_stats/rapidash.asm
@@ -3,20 +3,19 @@
 	db  65, 100,  70, 105,  80,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 60 ; catch rate
 	db 192 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/rapidash/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm
index 1424f3ffb..8fbcc2e40 100644
--- a/data/pokemon/base_stats/raticate.asm
+++ b/data/pokemon/base_stats/raticate.asm
@@ -3,20 +3,19 @@
 	db  55,  81,  60,  97,  50,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 90 ; catch rate
 	db 116 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/raticate/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, CUT, STRENGTH, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm
index 71498aeac..30c9581ec 100644
--- a/data/pokemon/base_stats/rattata.asm
+++ b/data/pokemon/base_stats/rattata.asm
@@ -3,20 +3,19 @@
 	db  30,  56,  35,  72,  25,  35
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 255 ; catch rate
 	db 57 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/rattata/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF
 	; end
diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm
index 8dabbb0a4..a41ce6ce8 100644
--- a/data/pokemon/base_stats/remoraid.asm
+++ b/data/pokemon/base_stats/remoraid.asm
@@ -3,20 +3,19 @@
 	db  35,  65,  35,  65,  65,  35
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 190 ; catch rate
 	db 78 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/remoraid/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FISH ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_WATER_2 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm
index e885edd75..9b95d9e94 100644
--- a/data/pokemon/base_stats/rhydon.asm
+++ b/data/pokemon/base_stats/rhydon.asm
@@ -3,20 +3,19 @@
 	db 105, 130, 120,  40,  45,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db GROUND, ROCK
+	db GROUND, ROCK ; type
 	db 60 ; catch rate
 	db 204 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/rhydon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm
index f15f73719..ee691b796 100644
--- a/data/pokemon/base_stats/rhyhorn.asm
+++ b/data/pokemon/base_stats/rhyhorn.asm
@@ -3,20 +3,19 @@
 	db  80,  85,  95,  25,  30,  30
 	;   hp  atk  def  spd  sat  sdf
 
-	db GROUND, ROCK
+	db GROUND, ROCK ; type
 	db 120 ; catch rate
 	db 135 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/rhyhorn/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm
index 7b172a120..8da9f1a88 100644
--- a/data/pokemon/base_stats/sandshrew.asm
+++ b/data/pokemon/base_stats/sandshrew.asm
@@ -3,20 +3,19 @@
 	db  50,  75,  85,  40,  20,  30
 	;   hp  atk  def  spd  sat  sdf
 
-	db GROUND, GROUND
+	db GROUND, GROUND ; type
 	db 255 ; catch rate
 	db 93 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sandshrew/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm
index d850c9697..f2936e47b 100644
--- a/data/pokemon/base_stats/sandslash.asm
+++ b/data/pokemon/base_stats/sandslash.asm
@@ -3,20 +3,19 @@
 	db  75, 100, 110,  65,  45,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db GROUND, GROUND
+	db GROUND, GROUND ; type
 	db 90 ; catch rate
 	db 163 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sandslash/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm
index c841c6301..e59a4bd96 100644
--- a/data/pokemon/base_stats/scizor.asm
+++ b/data/pokemon/base_stats/scizor.asm
@@ -3,20 +3,19 @@
 	db  70, 130, 100,  65,  55,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, STEEL
+	db BUG, STEEL ; type
 	db 25 ; catch rate
 	db 200 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/scizor/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm
index ea7c7cd33..a39f00ec9 100644
--- a/data/pokemon/base_stats/scyther.asm
+++ b/data/pokemon/base_stats/scyther.asm
@@ -3,20 +3,19 @@
 	db  70, 110,  80, 105,  55,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, FLYING
+	db BUG, FLYING ; type
 	db 45 ; catch rate
 	db 187 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/scyther/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT
 	; end
diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm
index 3ba5687ce..9793dbc2a 100644
--- a/data/pokemon/base_stats/seadra.asm
+++ b/data/pokemon/base_stats/seadra.asm
@@ -3,20 +3,19 @@
 	db  55,  65,  95,  85,  95,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 75 ; catch rate
 	db 155 ; base exp
-	db NO_ITEM ; item 1
-	db DRAGON_SCALE ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, DRAGON_SCALE ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/seadra/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, REPTILE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_DRAGON ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm
index 70bee646a..16877fbc4 100644
--- a/data/pokemon/base_stats/seaking.asm
+++ b/data/pokemon/base_stats/seaking.asm
@@ -3,20 +3,19 @@
 	db  80,  92,  65,  68,  65,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 60 ; catch rate
 	db 170 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/seaking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FISH, FISH ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_2, EGG_WATER_2 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm
index 13edf89bc..8635ff507 100644
--- a/data/pokemon/base_stats/seel.asm
+++ b/data/pokemon/base_stats/seel.asm
@@ -3,20 +3,19 @@
 	db  65,  45,  55,  45,  45,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 190 ; catch rate
 	db 100 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/seel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm
index c3802fa63..bb68d5c50 100644
--- a/data/pokemon/base_stats/sentret.asm
+++ b/data/pokemon/base_stats/sentret.asm
@@ -3,20 +3,19 @@
 	db  35,  46,  34,  20,  35,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 255 ; catch rate
 	db 57 ; base exp
-	db NO_ITEM ; item 1
-	db BERRY ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, BERRY ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sentret/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF
 	; end
diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm
index 9ca88a03d..c7a39fc88 100644
--- a/data/pokemon/base_stats/shellder.asm
+++ b/data/pokemon/base_stats/shellder.asm
@@ -3,20 +3,19 @@
 	db  30,  65, 100,  40,  45,  25
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 190 ; catch rate
 	db 97 ; base exp
-	db PEARL ; item 1
-	db BIG_PEARL ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db PEARL, BIG_PEARL ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/shellder/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm
index ec3a3b410..ca4cbc9c2 100644
--- a/data/pokemon/base_stats/shuckle.asm
+++ b/data/pokemon/base_stats/shuckle.asm
@@ -3,20 +3,19 @@
 	db  20,  10, 230,  05,  10, 230
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, ROCK
+	db BUG, ROCK ; type
 	db 190 ; catch rate
 	db 80 ; base exp
-	db BERRY ; item 1
-	db BERRY ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db BERRY, BERRY ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/shuckle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLASH
 	; end
diff --git a/data/pokemon/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm
index 4d0b5f3de..73fc39741 100644
--- a/data/pokemon/base_stats/skarmory.asm
+++ b/data/pokemon/base_stats/skarmory.asm
@@ -3,20 +3,19 @@
 	db  65,  80, 140,  70,  40,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db STEEL, FLYING
+	db STEEL, FLYING ; type
 	db 25 ; catch rate
 	db 168 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/skarmory/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY
 	; end
diff --git a/data/pokemon/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm
index 29a7be748..f3ae26958 100644
--- a/data/pokemon/base_stats/skiploom.asm
+++ b/data/pokemon/base_stats/skiploom.asm
@@ -3,20 +3,19 @@
 	db  55,  45,  50,  80,  45,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, FLYING
+	db GRASS, FLYING ; type
 	db 120 ; catch rate
 	db 136 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/skiploom/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FAIRY, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_FAIRY, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm
index a9fc61e3a..797dbbf3a 100644
--- a/data/pokemon/base_stats/slowbro.asm
+++ b/data/pokemon/base_stats/slowbro.asm
@@ -3,20 +3,19 @@
 	db  95,  75, 110,  30, 100,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, PSYCHIC
+	db WATER, PSYCHIC ; type
 	db 75 ; catch rate
 	db 164 ; base exp
-	db NO_ITEM ; item 1
-	db KINGS_ROCK ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, KINGS_ROCK ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/slowbro/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm
index 59d6c83e4..56e565e5c 100644
--- a/data/pokemon/base_stats/slowking.asm
+++ b/data/pokemon/base_stats/slowking.asm
@@ -3,20 +3,19 @@
 	db  95,  75,  80,  30, 100, 110
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, PSYCHIC
+	db WATER, PSYCHIC ; type
 	db 70 ; catch rate
 	db 164 ; base exp
-	db NO_ITEM ; item 1
-	db KINGS_ROCK ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, KINGS_ROCK ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/slowking/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, WHIRLPOOL, FLAMETHROWER, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm
index cb9bc813b..99d9a60ba 100644
--- a/data/pokemon/base_stats/slowpoke.asm
+++ b/data/pokemon/base_stats/slowpoke.asm
@@ -3,20 +3,19 @@
 	db  90,  65,  65,  15,  40,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, PSYCHIC
+	db WATER, PSYCHIC ; type
 	db 190 ; catch rate
 	db 99 ; base exp
-	db NO_ITEM ; item 1
-	db KINGS_ROCK ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, KINGS_ROCK ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/slowpoke/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm
index 234e844b9..26e8818c7 100644
--- a/data/pokemon/base_stats/slugma.asm
+++ b/data/pokemon/base_stats/slugma.asm
@@ -3,20 +3,19 @@
 	db  40,  40,  40,  20,  70,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 190 ; catch rate
 	db 78 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/slugma/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm
index 2373cb0f0..1a9c891f1 100644
--- a/data/pokemon/base_stats/smeargle.asm
+++ b/data/pokemon/base_stats/smeargle.asm
@@ -3,20 +3,19 @@
 	db  55,  20,  35,  75,  20,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 106 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/smeargle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm
 	; end
diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm
index f8f5e22f6..7be8e51de 100644
--- a/data/pokemon/base_stats/smoochum.asm
+++ b/data/pokemon/base_stats/smoochum.asm
@@ -3,20 +3,19 @@
 	db  45,  30,  15,  65,  85,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db ICE, PSYCHIC
+	db ICE, PSYCHIC ; type
 	db 45 ; catch rate
 	db 87 ; base exp
-	db ICE_BERRY ; item 1
-	db ICE_BERRY ; item 2
-	db GENDER_F100 ; gender
-	db 100 ; unknown
+	db ICE_BERRY, ICE_BERRY ; items
+	db GENDER_F100 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/smoochum/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm
index 4e24a8ada..2b58b31eb 100644
--- a/data/pokemon/base_stats/sneasel.asm
+++ b/data/pokemon/base_stats/sneasel.asm
@@ -3,20 +3,19 @@
 	db  55,  95,  55, 115,  35,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db DARK, ICE
+	db DARK, ICE ; type
 	db 60 ; catch rate
 	db 132 ; base exp
-	db NO_ITEM ; item 1
-	db QUICK_CLAW ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, QUICK_CLAW ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sneasel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm
index 9a9e426e9..68b1be600 100644
--- a/data/pokemon/base_stats/snorlax.asm
+++ b/data/pokemon/base_stats/snorlax.asm
@@ -3,20 +3,19 @@
 	db 160, 110,  65,  30,  65, 110
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 25 ; catch rate
 	db 154 ; base exp
-	db LEFTOVERS ; item 1
-	db LEFTOVERS ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db LEFTOVERS, LEFTOVERS ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/snorlax/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm
index 6dbca375e..bcfac58e7 100644
--- a/data/pokemon/base_stats/snubbull.asm
+++ b/data/pokemon/base_stats/snubbull.asm
@@ -3,20 +3,19 @@
 	db  60,  80,  50,  30,  40,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 190 ; catch rate
 	db 63 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F75 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F75 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/snubbull/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FIELD, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_GROUND, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm
index a55e8a17c..98b61b6b7 100644
--- a/data/pokemon/base_stats/spearow.asm
+++ b/data/pokemon/base_stats/spearow.asm
@@ -3,20 +3,19 @@
 	db  40,  60,  30,  70,  31,  31
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, FLYING
+	db NORMAL, FLYING ; type
 	db 255 ; catch rate
 	db 58 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/spearow/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
 	; end
diff --git a/data/pokemon/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm
index fb2fbb7f3..e02fb6ca1 100644
--- a/data/pokemon/base_stats/spinarak.asm
+++ b/data/pokemon/base_stats/spinarak.asm
@@ -3,20 +3,19 @@
 	db  40,  60,  40,  30,  40,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, POISON
+	db BUG, POISON ; type
 	db 255 ; catch rate
 	db 54 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/spinarak/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH
 	; end
diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm
index 6582f88a8..f09725cb0 100644
--- a/data/pokemon/base_stats/squirtle.asm
+++ b/data/pokemon/base_stats/squirtle.asm
@@ -3,20 +3,19 @@
 	db  44,  48,  65,  43,  50,  64
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 66 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/squirtle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm
index a8537a1e0..bc3145cd5 100644
--- a/data/pokemon/base_stats/stantler.asm
+++ b/data/pokemon/base_stats/stantler.asm
@@ -3,20 +3,19 @@
 	db  73,  95,  62,  85,  85,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 165 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/stantler/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH
 	; end
diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm
index 55c5fcc99..8823bbbe2 100644
--- a/data/pokemon/base_stats/starmie.asm
+++ b/data/pokemon/base_stats/starmie.asm
@@ -3,20 +3,19 @@
 	db  60,  75,  85, 115, 100,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, PSYCHIC
+	db WATER, PSYCHIC ; type
 	db 60 ; catch rate
 	db 207 ; base exp
-	db STARDUST ; item 1
-	db STAR_PIECE ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db STARDUST, STAR_PIECE ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/starmie/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm
index d702faaf2..d999b0d13 100644
--- a/data/pokemon/base_stats/staryu.asm
+++ b/data/pokemon/base_stats/staryu.asm
@@ -3,20 +3,19 @@
 	db  30,  45,  55,  85,  70,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 225 ; catch rate
 	db 106 ; base exp
-	db STARDUST ; item 1
-	db STAR_PIECE ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db STARDUST, STAR_PIECE ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/staryu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm
index 6931418c8..e8e620831 100644
--- a/data/pokemon/base_stats/steelix.asm
+++ b/data/pokemon/base_stats/steelix.asm
@@ -3,20 +3,19 @@
 	db  75,  85, 200,  30,  55,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db STEEL, GROUND
+	db STEEL, GROUND ; type
 	db 25 ; catch rate
 	db 196 ; base exp
-	db NO_ITEM ; item 1
-	db METAL_COAT ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, METAL_COAT ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/steelix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, CUT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm
index 40726999d..cd95db096 100644
--- a/data/pokemon/base_stats/sudowoodo.asm
+++ b/data/pokemon/base_stats/sudowoodo.asm
@@ -3,20 +3,19 @@
 	db  70, 100, 115,  30,  30,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, ROCK
+	db ROCK, ROCK ; type
 	db 65 ; catch rate
 	db 135 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sudowoodo/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm
index b199eddd7..b52e0f5d0 100644
--- a/data/pokemon/base_stats/suicune.asm
+++ b/data/pokemon/base_stats/suicune.asm
@@ -3,20 +3,19 @@
 	db 100,  75, 115,  85,  90, 115
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 3 ; catch rate
 	db 215 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/suicune/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm
index ec39d0932..aac7603f6 100644
--- a/data/pokemon/base_stats/sunflora.asm
+++ b/data/pokemon/base_stats/sunflora.asm
@@ -3,20 +3,19 @@
 	db  75,  75,  55,  30, 105,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, GRASS
+	db GRASS, GRASS ; type
 	db 120 ; catch rate
 	db 146 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sunflora/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm
index 7e502900c..c646e80db 100644
--- a/data/pokemon/base_stats/sunkern.asm
+++ b/data/pokemon/base_stats/sunkern.asm
@@ -3,20 +3,19 @@
 	db  30,  30,  30,  30,  30,  30
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, GRASS
+	db GRASS, GRASS ; type
 	db 235 ; catch rate
 	db 52 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/sunkern/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm
index ee6bd783a..62a330733 100644
--- a/data/pokemon/base_stats/swinub.asm
+++ b/data/pokemon/base_stats/swinub.asm
@@ -3,20 +3,19 @@
 	db  50,  50,  40,  50,  30,  30
 	;   hp  atk  def  spd  sat  sdf
 
-	db ICE, GROUND
+	db ICE, GROUND ; type
 	db 225 ; catch rate
 	db 78 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/swinub/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm
index a2b5b06a0..2535b6c82 100644
--- a/data/pokemon/base_stats/tangela.asm
+++ b/data/pokemon/base_stats/tangela.asm
@@ -3,20 +3,19 @@
 	db  65,  55, 115,  60, 100,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, GRASS
+	db GRASS, GRASS ; type
 	db 45 ; catch rate
 	db 166 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tangela/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm
index 936d60a4d..307033fd2 100644
--- a/data/pokemon/base_stats/tauros.asm
+++ b/data/pokemon/base_stats/tauros.asm
@@ -3,20 +3,19 @@
 	db  75, 100,  95, 110,  40,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 45 ; catch rate
 	db 211 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F0 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F0 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tauros/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm
index 18c4ede7a..9309d247d 100644
--- a/data/pokemon/base_stats/teddiursa.asm
+++ b/data/pokemon/base_stats/teddiursa.asm
@@ -3,20 +3,19 @@
 	db  60,  80,  50,  40,  50,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 120 ; catch rate
 	db 124 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/teddiursa/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm
index 94dcb42b0..c5ce41e0a 100644
--- a/data/pokemon/base_stats/tentacool.asm
+++ b/data/pokemon/base_stats/tentacool.asm
@@ -3,20 +3,19 @@
 	db  40,  40,  35,  70,  50, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, POISON
+	db WATER, POISON ; type
 	db 190 ; catch rate
 	db 105 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tentacool/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm
index e922c5938..35037c668 100644
--- a/data/pokemon/base_stats/tentacruel.asm
+++ b/data/pokemon/base_stats/tentacruel.asm
@@ -3,20 +3,19 @@
 	db  80,  70,  65, 100,  80, 120
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, POISON
+	db WATER, POISON ; type
 	db 60 ; catch rate
 	db 205 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tentacruel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn INVERTEBRATE, INVERTEBRATE ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_WATER_3, EGG_WATER_3 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm
index 0f22863e5..98b5f6bcd 100644
--- a/data/pokemon/base_stats/togepi.asm
+++ b/data/pokemon/base_stats/togepi.asm
@@ -3,20 +3,19 @@
 	db  35,  20,  65,  20,  40,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 190 ; catch rate
 	db 74 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/togepi/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, FLASH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm
index ef2f94305..77176266c 100644
--- a/data/pokemon/base_stats/togetic.asm
+++ b/data/pokemon/base_stats/togetic.asm
@@ -3,20 +3,19 @@
 	db  55,  40,  85,  40,  80, 105
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, FLYING
+	db NORMAL, FLYING ; type
 	db 75 ; catch rate
 	db 114 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/togetic/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn AVIAN, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FLYING, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLASH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm
index 49c7603f6..86830e11e 100644
--- a/data/pokemon/base_stats/totodile.asm
+++ b/data/pokemon/base_stats/totodile.asm
@@ -3,20 +3,19 @@
 	db  50,  65,  64,  43,  44,  48
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 66 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/totodile/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm
index ed6fcf198..181a24661 100644
--- a/data/pokemon/base_stats/typhlosion.asm
+++ b/data/pokemon/base_stats/typhlosion.asm
@@ -3,20 +3,19 @@
 	db  78,  84,  78, 100, 109,  85
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 45 ; catch rate
 	db 209 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/typhlosion/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm
index b6ed98dd7..a3bd68aef 100644
--- a/data/pokemon/base_stats/tyranitar.asm
+++ b/data/pokemon/base_stats/tyranitar.asm
@@ -3,20 +3,19 @@
 	db 100, 134, 110,  61,  95, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db ROCK, DARK
+	db ROCK, DARK ; type
 	db 45 ; catch rate
 	db 218 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tyranitar/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn MONSTER, MONSTER ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_MONSTER ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm
index 026aab404..fb7e75eb5 100644
--- a/data/pokemon/base_stats/tyrogue.asm
+++ b/data/pokemon/base_stats/tyrogue.asm
@@ -3,20 +3,19 @@
 	db  35,  35,  35,  35,  35,  35
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIGHTING, FIGHTING
+	db FIGHTING, FIGHTING ; type
 	db 75 ; catch rate
 	db 91 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F0 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F0 ; gender ratio
+	db 100 ; unknown 1
 	db 25 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/tyrogue/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm
index 0382e69e2..55dc75902 100644
--- a/data/pokemon/base_stats/umbreon.asm
+++ b/data/pokemon/base_stats/umbreon.asm
@@ -3,20 +3,19 @@
 	db  95,  65, 110,  65,  60, 130
 	;   hp  atk  def  spd  sat  sdf
 
-	db DARK, DARK
+	db DARK, DARK ; type
 	db 45 ; catch rate
 	db 197 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/umbreon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm
index ef67b1ce1..248aae9d1 100644
--- a/data/pokemon/base_stats/unown.asm
+++ b/data/pokemon/base_stats/unown.asm
@@ -3,20 +3,19 @@
 	db  48,  72,  48,  48,  72,  48
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 225 ; catch rate
 	db 61 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 40 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/unown_a/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm
 	; end
diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm
index 8f2031c77..1cc2f21a8 100644
--- a/data/pokemon/base_stats/ursaring.asm
+++ b/data/pokemon/base_stats/ursaring.asm
@@ -3,20 +3,19 @@
 	db  90, 130,  75,  55,  75,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 60 ; catch rate
 	db 189 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/ursaring/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH
 	; end
diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm
index 083a67499..8e266396e 100644
--- a/data/pokemon/base_stats/vaporeon.asm
+++ b/data/pokemon/base_stats/vaporeon.asm
@@ -3,20 +3,19 @@
 	db 130,  65,  60,  65, 110,  95
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 196 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 35 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/vaporeon/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm
index c92c7fbff..43e50bfd4 100644
--- a/data/pokemon/base_stats/venomoth.asm
+++ b/data/pokemon/base_stats/venomoth.asm
@@ -3,20 +3,19 @@
 	db  70,  65,  60,  90,  90,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, POISON
+	db BUG, POISON ; type
 	db 75 ; catch rate
 	db 138 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/venomoth/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF, FLASH
 	; end
diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm
index 40a9639b8..77f05af31 100644
--- a/data/pokemon/base_stats/venonat.asm
+++ b/data/pokemon/base_stats/venonat.asm
@@ -3,20 +3,19 @@
 	db  60,  55,  50,  45,  40,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, POISON
+	db BUG, POISON ; type
 	db 190 ; catch rate
 	db 75 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/venonat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF
 	; end
diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm
index 465b3d0fc..bd7664e57 100644
--- a/data/pokemon/base_stats/venusaur.asm
+++ b/data/pokemon/base_stats/venusaur.asm
@@ -3,20 +3,19 @@
 	db  80,  82,  83,  80, 100, 100
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, POISON
+	db GRASS, POISON ; type
 	db 45 ; catch rate
 	db 208 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/venusaur/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm
index e4e1a24e5..43fe562f9 100644
--- a/data/pokemon/base_stats/victreebel.asm
+++ b/data/pokemon/base_stats/victreebel.asm
@@ -3,20 +3,19 @@
 	db  80, 105,  65,  70, 100,  60
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, POISON
+	db GRASS, POISON ; type
 	db 45 ; catch rate
 	db 191 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/victreebel/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm
index 3f0d0b996..fff689e49 100644
--- a/data/pokemon/base_stats/vileplume.asm
+++ b/data/pokemon/base_stats/vileplume.asm
@@ -3,20 +3,19 @@
 	db  75,  80,  85,  50, 100,  90
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, POISON
+	db GRASS, POISON ; type
 	db 45 ; catch rate
 	db 184 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/vileplume/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm
index 2767568fa..ad5f16737 100644
--- a/data/pokemon/base_stats/voltorb.asm
+++ b/data/pokemon/base_stats/voltorb.asm
@@ -3,20 +3,19 @@
 	db  40,  30,  50, 100,  55,  55
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, ELECTRIC
+	db ELECTRIC, ELECTRIC ; type
 	db 190 ; catch rate
 	db 103 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/voltorb/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INANIMATE, INANIMATE ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_MINERAL, EGG_MINERAL ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm
index e012402a0..1f19771ee 100644
--- a/data/pokemon/base_stats/vulpix.asm
+++ b/data/pokemon/base_stats/vulpix.asm
@@ -3,20 +3,19 @@
 	db  38,  41,  40,  65,  50,  65
 	;   hp  atk  def  spd  sat  sdf
 
-	db FIRE, FIRE
+	db FIRE, FIRE ; type
 	db 190 ; catch rate
 	db 63 ; base exp
-	db BURNT_BERRY ; item 1
-	db BURNT_BERRY ; item 2
-	db GENDER_F75 ; gender
-	db 100 ; unknown
+	db BURNT_BERRY, BURNT_BERRY ; items
+	db GENDER_F75 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/vulpix/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn FIELD, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_GROUND, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
 	; end
diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm
index 7df729f3f..20db04447 100644
--- a/data/pokemon/base_stats/wartortle.asm
+++ b/data/pokemon/base_stats/wartortle.asm
@@ -3,20 +3,19 @@
 	db  59,  63,  80,  58,  65,  80
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, WATER
+	db WATER, WATER ; type
 	db 45 ; catch rate
 	db 143 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F12_5 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F12_5 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/wartortle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn MONSTER, AMPHIBIAN ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm
index 520109245..c2536b316 100644
--- a/data/pokemon/base_stats/weedle.asm
+++ b/data/pokemon/base_stats/weedle.asm
@@ -3,20 +3,19 @@
 	db  40,  35,  30,  50,  20,  20
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, POISON
+	db BUG, POISON ; type
 	db 255 ; catch rate
 	db 52 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/weedle/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm
 	; end
diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm
index 3dbd2595e..4a4069abb 100644
--- a/data/pokemon/base_stats/weepinbell.asm
+++ b/data/pokemon/base_stats/weepinbell.asm
@@ -3,20 +3,19 @@
 	db  65,  90,  50,  55,  85,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db GRASS, POISON
+	db GRASS, POISON ; type
 	db 120 ; catch rate
 	db 151 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/weepinbell/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_SLOW ; growth rate
-	dn PLANT, PLANT ; egg groups
+	db GROWTH_MEDIUM_SLOW ; growth rate
+	dn EGG_PLANT, EGG_PLANT ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH
 	; end
diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm
index 41c1d4f5d..e18c78bb2 100644
--- a/data/pokemon/base_stats/weezing.asm
+++ b/data/pokemon/base_stats/weezing.asm
@@ -3,20 +3,19 @@
 	db  65,  90, 120,  60,  85,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, POISON
+	db POISON, POISON ; type
 	db 60 ; catch rate
 	db 173 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/weezing/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm
index e2d3bd7e6..0a3498b8f 100644
--- a/data/pokemon/base_stats/wigglytuff.asm
+++ b/data/pokemon/base_stats/wigglytuff.asm
@@ -3,20 +3,19 @@
 	db 140,  70,  45,  45,  75,  50
 	;   hp  atk  def  spd  sat  sdf
 
-	db NORMAL, NORMAL
+	db NORMAL, NORMAL ; type
 	db 50 ; catch rate
 	db 109 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F75 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F75 ; gender ratio
+	db 100 ; unknown 1
 	db 10 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/wigglytuff/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db FAST ; growth rate
-	dn FAIRY, FAIRY ; egg groups
+	db GROWTH_FAST ; growth rate
+	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm
index 393655150..39514450e 100644
--- a/data/pokemon/base_stats/wobbuffet.asm
+++ b/data/pokemon/base_stats/wobbuffet.asm
@@ -3,20 +3,19 @@
 	db 190,  33,  58,  33,  33,  58
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, PSYCHIC
+	db PSYCHIC, PSYCHIC ; type
 	db 45 ; catch rate
 	db 177 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/wobbuffet/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMORPHOUS, AMORPHOUS ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm
 	; end
diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm
index db3f7f90a..5cc4a6666 100644
--- a/data/pokemon/base_stats/wooper.asm
+++ b/data/pokemon/base_stats/wooper.asm
@@ -3,20 +3,19 @@
 	db  55,  45,  45,  15,  25,  25
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, GROUND
+	db WATER, GROUND ; type
 	db 255 ; catch rate
 	db 52 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/wooper/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AMPHIBIAN, FIELD ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_WATER_1, EGG_GROUND ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, ICE_BEAM
 	; end
diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm
index a5941421e..79bf0bc60 100644
--- a/data/pokemon/base_stats/xatu.asm
+++ b/data/pokemon/base_stats/xatu.asm
@@ -3,20 +3,19 @@
 	db  65,  75,  70,  95,  95,  70
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC, FLYING
+	db PSYCHIC, FLYING ; type
 	db 75 ; catch rate
 	db 171 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/xatu/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLY, FLASH
 	; end
diff --git a/data/pokemon/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm
index 0bff5157a..01918230c 100644
--- a/data/pokemon/base_stats/yanma.asm
+++ b/data/pokemon/base_stats/yanma.asm
@@ -3,20 +3,19 @@
 	db  65,  65,  45,  95,  75,  45
 	;   hp  atk  def  spd  sat  sdf
 
-	db BUG, FLYING
+	db BUG, FLYING ; type
 	db 75 ; catch rate
 	db 147 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/yanma/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn INSECT, INSECT ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLASH
 	; end
diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm
index 35b557404..a5589ab9a 100644
--- a/data/pokemon/base_stats/zapdos.asm
+++ b/data/pokemon/base_stats/zapdos.asm
@@ -3,20 +3,19 @@
 	db  90,  90,  85, 100, 125,  90
 	;   hp  atk  def  spd  sat  sdf
 
-	db ELECTRIC, FLYING
+	db ELECTRIC, FLYING ; type
 	db 3 ; catch rate
 	db 216 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDERLESS ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
 	db 80 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/zapdos/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db SLOW ; growth rate
-	dn NO_EGGS, NO_EGGS ; egg groups
+	db GROWTH_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm
index 5da4ceeba..ee3716844 100644
--- a/data/pokemon/base_stats/zubat.asm
+++ b/data/pokemon/base_stats/zubat.asm
@@ -3,20 +3,19 @@
 	db  40,  45,  35,  55,  30,  40
 	;   hp  atk  def  spd  sat  sdf
 
-	db POISON, FLYING
+	db POISON, FLYING ; type
 	db 255 ; catch rate
 	db 54 ; base exp
-	db NO_ITEM ; item 1
-	db NO_ITEM ; item 2
-	db GENDER_F50 ; gender
-	db 100 ; unknown
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
 	db 15 ; step cycles to hatch
-	db 5 ; unknown
+	db 5 ; unknown 2
 	INCBIN "gfx/pokemon/zubat/front.dimensions"
 	db 0, 0, 0, 0 ; padding
-	db MEDIUM_FAST ; growth rate
-	dn AVIAN, AVIAN ; egg groups
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_FLYING, EGG_FLYING ; egg groups
 
-	; tmhm
+	; tm/hm learnset
 	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
 	; end
diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm
index e6f729361..a57eac98c 100644
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@@ -3,7 +3,7 @@ mon_cry: MACRO
 	dw \1, \2, \3
 ENDM
 
-PokemonCries:: ; f2787
+PokemonCries::
 ; entries correspond to constants/pokemon_constants.asm
 	mon_cry CRY_BULBASAUR,   $080,  $081 ; BULBASAUR
 	mon_cry CRY_BULBASAUR,   $020,  $100 ; IVYSAUR
@@ -260,4 +260,3 @@ PokemonCries:: ; f2787
 	mon_cry CRY_NIDORAN_M,      0,     0 ; 253
 	mon_cry CRY_NIDORAN_M,      0,     0 ; 254
 	mon_cry CRY_NIDORAN_M,      0,     0 ; 255
-; f2d81
diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
index 7381a4262..a66f16737 100644
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -3,7 +3,6 @@ INCLUDE "constants.asm"
 
 SECTION "Pokedex Entries 001-064", ROMX
 
-PokedexEntries1::
 BulbasaurPokedexEntry::  INCLUDE "data/pokemon/dex_entries/bulbasaur.asm"
 IvysaurPokedexEntry::    INCLUDE "data/pokemon/dex_entries/ivysaur.asm"
 VenusaurPokedexEntry::   INCLUDE "data/pokemon/dex_entries/venusaur.asm"
@@ -72,7 +71,6 @@ KadabraPokedexEntry::    INCLUDE "data/pokemon/dex_entries/kadabra.asm"
 
 SECTION "Pokedex Entries 065-128", ROMX
 
-PokedexEntries2::
 AlakazamPokedexEntry::   INCLUDE "data/pokemon/dex_entries/alakazam.asm"
 MachopPokedexEntry::     INCLUDE "data/pokemon/dex_entries/machop.asm"
 MachokePokedexEntry::    INCLUDE "data/pokemon/dex_entries/machoke.asm"
@@ -141,7 +139,6 @@ TaurosPokedexEntry::     INCLUDE "data/pokemon/dex_entries/tauros.asm"
 
 SECTION "Pokedex Entries 129-192", ROMX
 
-PokedexEntries3::
 MagikarpPokedexEntry::   INCLUDE "data/pokemon/dex_entries/magikarp.asm"
 GyaradosPokedexEntry::   INCLUDE "data/pokemon/dex_entries/gyarados.asm"
 LaprasPokedexEntry::     INCLUDE "data/pokemon/dex_entries/lapras.asm"
@@ -210,7 +207,6 @@ SunfloraPokedexEntry::   INCLUDE "data/pokemon/dex_entries/sunflora.asm"
 
 SECTION "Pokedex Entries 193-251", ROMX
 
-PokedexEntries4::
 YanmaPokedexEntry::      INCLUDE "data/pokemon/dex_entries/yanma.asm"
 WooperPokedexEntry::     INCLUDE "data/pokemon/dex_entries/wooper.asm"
 QuagsirePokedexEntry::   INCLUDE "data/pokemon/dex_entries/quagsire.asm"
diff --git a/data/pokemon/dex_entries/abra.asm b/data/pokemon/dex_entries/abra.asm
index be3b263cd..91f55c23f 100644
--- a/data/pokemon/dex_entries/abra.asm
+++ b/data/pokemon/dex_entries/abra.asm
@@ -1,10 +1,10 @@
-; AbraPokedexEntry: ; 0x1830d5
 	db "PSI@" ; species name
 	dw 211, 430 ; height, weight
 
 	db   "It hypnotizes"
 	next "itself so that it"
 	next "can teleport away"
+
 	page "when it senses"
 	next "danger, even"
 	next "if it is asleep.@"
diff --git a/data/pokemon/dex_entries/aerodactyl.asm b/data/pokemon/dex_entries/aerodactyl.asm
index d6189500b..48f943c99 100644
--- a/data/pokemon/dex_entries/aerodactyl.asm
+++ b/data/pokemon/dex_entries/aerodactyl.asm
@@ -1,10 +1,10 @@
-; AerodactylPokedexEntry: ; 0x1cc576
 	db "FOSSIL@" ; species name
 	dw 511, 1300 ; height, weight
 
 	db   "In prehistoric"
 	next "times, this"
 	next "#MON flew"
+
 	page "freely and"
 	next "fearlessly through"
 	next "the skies.@"
diff --git a/data/pokemon/dex_entries/aipom.asm b/data/pokemon/dex_entries/aipom.asm
index 3fadb9169..4cb0f86ce 100644
--- a/data/pokemon/dex_entries/aipom.asm
+++ b/data/pokemon/dex_entries/aipom.asm
@@ -1,10 +1,10 @@
-; AipomPokedexEntry: ; 0x1cda11
 	db "LONG TAIL@" ; species name
 	dw 207, 250 ; height, weight
 
 	db   "It uses its tail"
 	next "to hang on to tree"
 	next "branches. It uses"
+
 	page "its momentum to"
 	next "swing from one"
 	next "branch to another.@"
diff --git a/data/pokemon/dex_entries/alakazam.asm b/data/pokemon/dex_entries/alakazam.asm
index 1d34fa1f7..e13ef835f 100644
--- a/data/pokemon/dex_entries/alakazam.asm
+++ b/data/pokemon/dex_entries/alakazam.asm
@@ -1,10 +1,10 @@
-; AlakazamPokedexEntry: ; 0x1b8000
 	db "PSI@" ; species name
 	dw 411, 1060 ; height, weight
 
 	db   "It has an IQ of"
 	next "5000. It calcu-"
 	next "lates many things"
+
 	page "in order to gain"
 	next "the edge in every"
 	next "battle.@"
diff --git a/data/pokemon/dex_entries/ampharos.asm b/data/pokemon/dex_entries/ampharos.asm
index 1f48fe322..dd5c18620 100644
--- a/data/pokemon/dex_entries/ampharos.asm
+++ b/data/pokemon/dex_entries/ampharos.asm
@@ -1,10 +1,10 @@
-; AmpharosPokedexEntry: ; 0x1cd626
 	db "LIGHT@" ; species name
 	dw 407, 1360 ; height, weight
 
 	db   "When it gets dark,"
 	next "the light from its"
 	next "bright, shiny tail"
+
 	page "can be seen from"
 	next "far away on the"
 	next "ocean's surface.@"
diff --git a/data/pokemon/dex_entries/arbok.asm b/data/pokemon/dex_entries/arbok.asm
index c5d5b7704..0ecab500c 100644
--- a/data/pokemon/dex_entries/arbok.asm
+++ b/data/pokemon/dex_entries/arbok.asm
@@ -1,10 +1,10 @@
-; ArbokPokedexEntry: ; 0x18203d
 	db "COBRA@" ; species name
 	dw 1106, 1430 ; height, weight
 
 	db   "To intimidate"
 	next "foes, it spreads"
 	next "its chest wide and"
+
 	page "makes eerie sounds"
 	next "by expelling air"
 	next "from its mouth.@"
diff --git a/data/pokemon/dex_entries/arcanine.asm b/data/pokemon/dex_entries/arcanine.asm
index e319bcb6a..2443a1be8 100644
--- a/data/pokemon/dex_entries/arcanine.asm
+++ b/data/pokemon/dex_entries/arcanine.asm
@@ -1,10 +1,10 @@
-; ArcaninePokedexEntry: ; 0x182f1c
 	db "LEGENDARY@" ; species name
 	dw 603, 3420 ; height, weight
 
 	db   "An ancient picture"
 	next "scroll shows that"
 	next "people were"
+
 	page "attracted to its"
 	next "movement as it ran"
 	next "through prairies.@"
diff --git a/data/pokemon/dex_entries/ariados.asm b/data/pokemon/dex_entries/ariados.asm
index a27d13fef..bdc335f2c 100644
--- a/data/pokemon/dex_entries/ariados.asm
+++ b/data/pokemon/dex_entries/ariados.asm
@@ -1,10 +1,10 @@
-; AriadosPokedexEntry: ; 0x1cd083
 	db "LONG LEG@" ; species name
 	dw 307, 740 ; height, weight
 
 	db   "Rather than mak-"
 	next "ing a nest in one"
 	next "specific spot, it"
+
 	page "wanders in search"
 	next "of food after"
 	next "darkness falls.@"
diff --git a/data/pokemon/dex_entries/articuno.asm b/data/pokemon/dex_entries/articuno.asm
index 92b297d28..50439c59b 100644
--- a/data/pokemon/dex_entries/articuno.asm
+++ b/data/pokemon/dex_entries/articuno.asm
@@ -1,10 +1,10 @@
-; ArticunoPokedexEntry: ; 0x1cc632
 	db "FREEZE@" ; species name
 	dw 507, 1220 ; height, weight
 
 	db   "Legendary bird"
 	next "#MON. As it"
 	next "flies through the"
+
 	page "sky, it cools the"
 	next "air, causing snow"
 	next "to fall.@"
diff --git a/data/pokemon/dex_entries/azumarill.asm b/data/pokemon/dex_entries/azumarill.asm
index bdbc83d1d..892ac77e3 100644
--- a/data/pokemon/dex_entries/azumarill.asm
+++ b/data/pokemon/dex_entries/azumarill.asm
@@ -1,10 +1,10 @@
-; AzumarillPokedexEntry: ; 0x1cd771
 	db "AQUARABBIT@" ; species name
 	dw 207, 630 ; height, weight
 
 	db   "The bubble-like"
 	next "pattern on its"
 	next "stomach helps it"
+
 	page "camouflage itself"
 	next "when it's in the"
 	next "water.@"
diff --git a/data/pokemon/dex_entries/bayleef.asm b/data/pokemon/dex_entries/bayleef.asm
index ac66dccd5..534c4c972 100644
--- a/data/pokemon/dex_entries/bayleef.asm
+++ b/data/pokemon/dex_entries/bayleef.asm
@@ -1,10 +1,10 @@
-; BayleefPokedexEntry: ; 0x1cc9e9
 	db "LEAF@" ; species name
 	dw 311, 350 ; height, weight
 
 	db   "The scent that"
 	next "wafts from the"
 	next "leaves on its neck"
+
 	page "causes anyone who"
 	next "smells it to"
 	next "become energetic.@"
diff --git a/data/pokemon/dex_entries/beedrill.asm b/data/pokemon/dex_entries/beedrill.asm
index 505396ca1..7dc8f6262 100644
--- a/data/pokemon/dex_entries/beedrill.asm
+++ b/data/pokemon/dex_entries/beedrill.asm
@@ -1,10 +1,10 @@
-; BeedrillPokedexEntry: ; 0x181c8a
 	db "POISON BEE@" ; species name
 	dw 303, 650 ; height, weight
 
 	db   "It uses sharp,"
 	next "poisonous stings"
 	next "to defeat prey,"
+
 	page "then takes the"
 	next "victim back to its"
 	next "nest for food.@"
diff --git a/data/pokemon/dex_entries/bellossom.asm b/data/pokemon/dex_entries/bellossom.asm
index 0d13ed65d..1e90f4b35 100644
--- a/data/pokemon/dex_entries/bellossom.asm
+++ b/data/pokemon/dex_entries/bellossom.asm
@@ -1,10 +1,10 @@
-; BellossomPokedexEntry: ; 0x1cd69a
 	db "FLOWER@" ; species name
 	dw 104, 130 ; height, weight
 
 	db   "When these dance"
 	next "together, their"
 	next "petals rub against"
+
 	page "each other,"
 	next "making pretty,"
 	next "relaxing sounds.@"
diff --git a/data/pokemon/dex_entries/bellsprout.asm b/data/pokemon/dex_entries/bellsprout.asm
index fcd42c125..f279bbefb 100644
--- a/data/pokemon/dex_entries/bellsprout.asm
+++ b/data/pokemon/dex_entries/bellsprout.asm
@@ -1,10 +1,10 @@
-; BellsproutPokedexEntry: ; 0x1b81a1
 	db "FLOWER@" ; species name
 	dw 204, 90 ; height, weight
 
 	db   "If it notices"
 	next "anything that"
 	next "moves, it"
+
 	page "immediately flings"
 	next "its vine at the"
 	next "object.@"
diff --git a/data/pokemon/dex_entries/blastoise.asm b/data/pokemon/dex_entries/blastoise.asm
index ea2a18d05..eeb7cf202 100644
--- a/data/pokemon/dex_entries/blastoise.asm
+++ b/data/pokemon/dex_entries/blastoise.asm
@@ -1,10 +1,10 @@
-; BlastoisePokedexEntry: ; 0x1819f9
 	db "SHELLFISH@" ; species name
 	dw 503, 1890 ; height, weight
 
 	db   "It firmly plants"
 	next "its feet on the"
 	next "ground before"
+
 	page "shooting water"
 	next "from the jets on"
 	next "its back.@"
diff --git a/data/pokemon/dex_entries/blissey.asm b/data/pokemon/dex_entries/blissey.asm
index 10151a398..2496478b5 100644
--- a/data/pokemon/dex_entries/blissey.asm
+++ b/data/pokemon/dex_entries/blissey.asm
@@ -1,10 +1,10 @@
-; BlisseyPokedexEntry: ; 0x1d14f7
 	db "HAPPINESS@" ; species name
 	dw 411, 1030 ; height, weight
 
 	db   "Biting into one"
 	next "of the delicious"
 	next "eggs that BLISSEY"
+
 	page "provides will make"
 	next "everyone around"
 	next "smile with joy.@"
diff --git a/data/pokemon/dex_entries/bulbasaur.asm b/data/pokemon/dex_entries/bulbasaur.asm
index fdfe39c8c..88fca15ec 100644
--- a/data/pokemon/dex_entries/bulbasaur.asm
+++ b/data/pokemon/dex_entries/bulbasaur.asm
@@ -1,10 +1,10 @@
-; BulbasaurPokedexEntry: ; 0x181695
 	db "SEED@" ; species name
 	dw 204, 150 ; height, weight
 
 	db   "While it is young,"
 	next "it uses the"
 	next "nutrients that are"
+
 	page "stored in the"
 	next "seeds on its back"
 	next "in order to grow.@"
diff --git a/data/pokemon/dex_entries/butterfree.asm b/data/pokemon/dex_entries/butterfree.asm
index edf9e2599..9661cce68 100644
--- a/data/pokemon/dex_entries/butterfree.asm
+++ b/data/pokemon/dex_entries/butterfree.asm
@@ -1,10 +1,10 @@
-; ButterfreePokedexEntry: ; 0x181b45
 	db "BUTTERFLY@" ; species name
 	dw 307, 710 ; height, weight
 
 	db   "It flits from"
 	next "flower to flower,"
 	next "collecting honey."
+
 	page "It can even"
 	next "identify distant"
 	next "flowers in bloom.@"
diff --git a/data/pokemon/dex_entries/caterpie.asm b/data/pokemon/dex_entries/caterpie.asm
index 940aa014f..2c5d74c8d 100644
--- a/data/pokemon/dex_entries/caterpie.asm
+++ b/data/pokemon/dex_entries/caterpie.asm
@@ -1,10 +1,10 @@
-; CaterpiePokedexEntry: ; 0x181a60
 	db "WORM@" ; species name
 	dw 100, 60 ; height, weight
 
 	db   "It crawls into"
 	next "foliage where it"
 	next "camouflages itself"
+
 	page "among leaves that"
 	next "are the same color"
 	next "as its body.@"
diff --git a/data/pokemon/dex_entries/celebi.asm b/data/pokemon/dex_entries/celebi.asm
index 3922d1749..ae0bc0fc0 100644
--- a/data/pokemon/dex_entries/celebi.asm
+++ b/data/pokemon/dex_entries/celebi.asm
@@ -1,10 +1,10 @@
-; CelebiPokedexEntry: ; 0x1d18cc
 	db "TIMETRAVEL@" ; species name
 	dw 200, 110 ; height, weight
 
 	db   "Revered as a"
 	next "guardian of the"
 	next "forest, CELEBI"
+
 	page "appears wherever"
 	next "beautiful forests"
 	next "exist.@"
diff --git a/data/pokemon/dex_entries/chansey.asm b/data/pokemon/dex_entries/chansey.asm
index fd45cf121..2cc0b278b 100644
--- a/data/pokemon/dex_entries/chansey.asm
+++ b/data/pokemon/dex_entries/chansey.asm
@@ -1,10 +1,10 @@
-; ChanseyPokedexEntry: ; 0x1b942e
 	db "EGG@" ; species name
 	dw 307, 760 ; height, weight
 
 	db   "People try to"
 	next "catch it for its"
 	next "extremely"
+
 	page "nutritious eggs,"
 	next "but it rarely can"
 	next "be found.@"
diff --git a/data/pokemon/dex_entries/charizard.asm b/data/pokemon/dex_entries/charizard.asm
index 53a542fb5..2bd55febe 100644
--- a/data/pokemon/dex_entries/charizard.asm
+++ b/data/pokemon/dex_entries/charizard.asm
@@ -1,10 +1,10 @@
-; CharizardPokedexEntry: ; 0x1818b3
 	db "FLAME@" ; species name
 	dw 507, 2000 ; height, weight
 
 	db   "It uses its wings"
 	next "to fly high. The"
 	next "temperature of its"
+
 	page "fire increases as"
 	next "it gains exper-"
 	next "ience in battle.@"
diff --git a/data/pokemon/dex_entries/charmander.asm b/data/pokemon/dex_entries/charmander.asm
index a89b138f8..19ed15cbc 100644
--- a/data/pokemon/dex_entries/charmander.asm
+++ b/data/pokemon/dex_entries/charmander.asm
@@ -1,10 +1,10 @@
-; CharmanderPokedexEntry: ; 0x1817db
 	db "LIZARD@" ; species name
 	dw 200, 190 ; height, weight
 
 	db   "If it's healthy,"
 	next "the flame on the"
 	next "tip of its tail"
+
 	page "will burn vigor-"
 	next "ously, even if it"
 	next "gets a bit wet.@"
diff --git a/data/pokemon/dex_entries/charmeleon.asm b/data/pokemon/dex_entries/charmeleon.asm
index 2891764c3..17868516d 100644
--- a/data/pokemon/dex_entries/charmeleon.asm
+++ b/data/pokemon/dex_entries/charmeleon.asm
@@ -1,10 +1,10 @@
-; CharmeleonPokedexEntry: ; 0x18184a
 	db "FLAME@" ; species name
 	dw 307, 420 ; height, weight
 
 	db   "If it becomes"
 	next "agitated during"
 	next "battle, it spouts"
+
 	page "intense flames,"
 	next "incinerating its"
 	next "surroundings.@"
diff --git a/data/pokemon/dex_entries/chikorita.asm b/data/pokemon/dex_entries/chikorita.asm
index 3ba17e1f8..ecf5f8520 100644
--- a/data/pokemon/dex_entries/chikorita.asm
+++ b/data/pokemon/dex_entries/chikorita.asm
@@ -1,10 +1,10 @@
-; ChikoritaPokedexEntry: ; 0x1cc988
 	db "LEAF@" ; species name
 	dw 211, 140 ; height, weight
 
 	db   "It loves to bask"
 	next "in the sunlight."
 	next "It uses the leaf"
+
 	page "on its head to"
 	next "seek out warm"
 	next "places.@"
diff --git a/data/pokemon/dex_entries/chinchou.asm b/data/pokemon/dex_entries/chinchou.asm
index 22d887859..6074d4995 100644
--- a/data/pokemon/dex_entries/chinchou.asm
+++ b/data/pokemon/dex_entries/chinchou.asm
@@ -1,10 +1,10 @@
-; ChinchouPokedexEntry: ; 0x1cd165
 	db "ANGLER@" ; species name
 	dw 108, 260 ; height, weight
 
 	db   "Its antennae, whi-"
 	next "ch evolved from a"
 	next "fin, have both po-"
+
 	page "sitive and neg-"
 	next "ative charges flo-"
 	next "wing through them.@"
diff --git a/data/pokemon/dex_entries/clefable.asm b/data/pokemon/dex_entries/clefable.asm
index 240d70eb5..3ea166487 100644
--- a/data/pokemon/dex_entries/clefable.asm
+++ b/data/pokemon/dex_entries/clefable.asm
@@ -1,10 +1,10 @@
-; ClefablePokedexEntry: ; 0x182530
 	db "FAIRY@" ; species name
 	dw 403, 880 ; height, weight
 
 	db   "Said to live in"
 	next "quiet, remote"
 	next "mountains, this"
+
 	page "type of fairy has"
 	next "a strong aversion"
 	next "to being seen.@"
diff --git a/data/pokemon/dex_entries/clefairy.asm b/data/pokemon/dex_entries/clefairy.asm
index b5973b21a..ff26e3e4a 100644
--- a/data/pokemon/dex_entries/clefairy.asm
+++ b/data/pokemon/dex_entries/clefairy.asm
@@ -1,10 +1,10 @@
-; ClefairyPokedexEntry: ; 0x1824c8
 	db "FAIRY@" ; species name
 	dw 200, 170 ; height, weight
 
 	db   "Though rarely"
 	next "seen, it becomes"
 	next "easier to spot,"
+
 	page "for some reason,"
 	next "on the night of a "
 	next "full moon.@"
diff --git a/data/pokemon/dex_entries/cleffa.asm b/data/pokemon/dex_entries/cleffa.asm
index 897bb2501..9095f990f 100644
--- a/data/pokemon/dex_entries/cleffa.asm
+++ b/data/pokemon/dex_entries/cleffa.asm
@@ -1,10 +1,10 @@
-; CleffaPokedexEntry: ; 0x1cd2bc
 	db "STARSHAPE@" ; species name
 	dw 100, 70 ; height, weight
 
 	db   "If the impact site"
 	next "of a meteorite is"
 	next "found, this"
+
 	page "#MON is certain"
 	next "to be within the"
 	next "immediate area.@"
diff --git a/data/pokemon/dex_entries/cloyster.asm b/data/pokemon/dex_entries/cloyster.asm
index b1eaf80b9..7a887838d 100644
--- a/data/pokemon/dex_entries/cloyster.asm
+++ b/data/pokemon/dex_entries/cloyster.asm
@@ -1,10 +1,10 @@
-; CloysterPokedexEntry: ; 0x1b8ad9
 	db "BIVALVE@" ; species name
 	dw 411, 2920 ; height, weight
 
 	db   "Even a missile"
 	next "can't break the"
 	next "spikes it uses to"
+
 	page "stab opponents."
 	next "They're even hard-"
 	next "er than its shell.@"
diff --git a/data/pokemon/dex_entries/corsola.asm b/data/pokemon/dex_entries/corsola.asm
index 52fbd0c44..fa073f0d0 100644
--- a/data/pokemon/dex_entries/corsola.asm
+++ b/data/pokemon/dex_entries/corsola.asm
@@ -1,10 +1,10 @@
-; CorsolaPokedexEntry: ; 0x1d0c68
 	db "CORAL@" ; species name
 	dw 200, 110 ; height, weight
 
 	db   "The points on its"
 	next "head absorb"
 	next "nutrients from"
+
 	page "clean water. They"
 	next "cannot survive in"
 	next "polluted water.@"
diff --git a/data/pokemon/dex_entries/crobat.asm b/data/pokemon/dex_entries/crobat.asm
index 107683110..2b7e28f76 100644
--- a/data/pokemon/dex_entries/crobat.asm
+++ b/data/pokemon/dex_entries/crobat.asm
@@ -1,10 +1,10 @@
-; CrobatPokedexEntry: ; 0x1cd0f5
 	db "BAT@" ; species name
 	dw 511, 1650 ; height, weight
 
 	db   "As a result of its"
 	next "pursuit of faster,"
 	next "yet more silent"
+
 	page "flight, a new set"
 	next "of wings grew on"
 	next "its hind legs.@"
diff --git a/data/pokemon/dex_entries/croconaw.asm b/data/pokemon/dex_entries/croconaw.asm
index 0edcf80cc..0cde70653 100644
--- a/data/pokemon/dex_entries/croconaw.asm
+++ b/data/pokemon/dex_entries/croconaw.asm
@@ -1,10 +1,10 @@
-; CroconawPokedexEntry: ; 0x1ccc84
 	db "BIG JAW@" ; species name
 	dw 307, 550 ; height, weight
 
 	db   "The tips of its"
 	next "fangs are slanted"
 	next "backward. Once"
+
 	page "those fangs clamp"
 	next "down, the prey has"
 	next "no hope of escape.@"
diff --git a/data/pokemon/dex_entries/cubone.asm b/data/pokemon/dex_entries/cubone.asm
index 911377864..6c8bed214 100644
--- a/data/pokemon/dex_entries/cubone.asm
+++ b/data/pokemon/dex_entries/cubone.asm
@@ -1,10 +1,10 @@
-; CubonePokedexEntry: ; 0x1b9068
 	db "LONELY@" ; species name
 	dw 104, 140 ; height, weight
 
 	db   "It lost its mother"
 	next "after its birth."
 	next "It wears its"
+
 	page "mother's skull,"
 	next "never revealing"
 	next "its true face.@"
diff --git a/data/pokemon/dex_entries/cyndaquil.asm b/data/pokemon/dex_entries/cyndaquil.asm
index 47329d37f..2604f4879 100644
--- a/data/pokemon/dex_entries/cyndaquil.asm
+++ b/data/pokemon/dex_entries/cyndaquil.asm
@@ -1,10 +1,10 @@
-; CyndaquilPokedexEntry: ; 0x1ccabd
 	db "FIRE MOUSE@" ; species name
 	dw 108, 170 ; height, weight
 
 	db   "The fire that"
 	next "spouts from its"
 	next "back burns hottest"
+
 	page "when it is angry."
 	next "The flaring flames"
 	next "intimidate foes.@"
diff --git a/data/pokemon/dex_entries/delibird.asm b/data/pokemon/dex_entries/delibird.asm
index 2c998d8be..47f8e2c90 100644
--- a/data/pokemon/dex_entries/delibird.asm
+++ b/data/pokemon/dex_entries/delibird.asm
@@ -1,10 +1,10 @@
-; DelibirdPokedexEntry: ; 0x1d0db1
 	db "DELIVERY@" ; species name
 	dw 211, 350 ; height, weight
 
 	db   "It always carries"
 	next "its food with it,"
 	next "wherever it goes."
+
 	page "If attacked, it"
 	next "throws its food at"
 	next "the opponent.@"
diff --git a/data/pokemon/dex_entries/dewgong.asm b/data/pokemon/dex_entries/dewgong.asm
index a3ff9b6f5..a7a0bf13e 100644
--- a/data/pokemon/dex_entries/dewgong.asm
+++ b/data/pokemon/dex_entries/dewgong.asm
@@ -1,10 +1,10 @@
-; DewgongPokedexEntry: ; 0x1b8934
 	db "SEA LION@" ; species name
 	dw 507, 2650 ; height, weight
 
 	db   "It sleeps under"
 	next "shallow ocean"
 	next "waters during the"
+
 	page "day, then looks"
 	next "for food at night"
 	next "when it's cold.@"
diff --git a/data/pokemon/dex_entries/diglett.asm b/data/pokemon/dex_entries/diglett.asm
index 469d9311d..c2b6c4671 100644
--- a/data/pokemon/dex_entries/diglett.asm
+++ b/data/pokemon/dex_entries/diglett.asm
@@ -1,10 +1,10 @@
-; DiglettPokedexEntry: ; 0x182b30
 	db "MOLE@" ; species name
 	dw 8, 20 ; height, weight
 
 	db   "It digs under-"
 	next "ground and chews"
 	next "on tree roots,"
+
 	page "sticking its head"
 	next "out only when the"
 	next "sun isn't bright.@"
diff --git a/data/pokemon/dex_entries/ditto.asm b/data/pokemon/dex_entries/ditto.asm
index 5a838b5b8..ffe394a1b 100644
--- a/data/pokemon/dex_entries/ditto.asm
+++ b/data/pokemon/dex_entries/ditto.asm
@@ -1,10 +1,10 @@
-; DittoPokedexEntry: ; 0x1cc13c
 	db "TRANSFORM@" ; species name
 	dw 100, 90 ; height, weight
 
 	db   "When it encount-"
 	next "ers another DITTO,"
 	next "it will move"
+
 	page "faster than normal"
 	next "to duplicate that"
 	next "opponent exactly.@"
diff --git a/data/pokemon/dex_entries/dodrio.asm b/data/pokemon/dex_entries/dodrio.asm
index ef495b99b..767fd9abe 100644
--- a/data/pokemon/dex_entries/dodrio.asm
+++ b/data/pokemon/dex_entries/dodrio.asm
@@ -1,10 +1,10 @@
-; DodrioPokedexEntry: ; 0x1b884a
 	db "TRIPLEBIRD@" ; species name
 	dw 511, 1880 ; height, weight
 
 	db   "An enemy that"
 	next "takes its eyes off"
 	next "any of the three"
+
 	page "heads--even for a"
 	next "second--will get"
 	next "pecked severely.@"
diff --git a/data/pokemon/dex_entries/doduo.asm b/data/pokemon/dex_entries/doduo.asm
index 124469457..eba65000d 100644
--- a/data/pokemon/dex_entries/doduo.asm
+++ b/data/pokemon/dex_entries/doduo.asm
@@ -1,10 +1,10 @@
-; DoduoPokedexEntry: ; 0x1b87d7
 	db "TWIN BIRD@" ; species name
 	dw 407, 860 ; height, weight
 
 	db   "It lives on a"
 	next "grassy plain where"
 	next "it can see a long"
+
 	page "way. If it sees an"
 	next "enemy, it runs"
 	next "away at 60 mph.@"
diff --git a/data/pokemon/dex_entries/donphan.asm b/data/pokemon/dex_entries/donphan.asm
index 4dc489938..eac9c5467 100644
--- a/data/pokemon/dex_entries/donphan.asm
+++ b/data/pokemon/dex_entries/donphan.asm
@@ -1,10 +1,10 @@
-; DonphanPokedexEntry: ; 0x1d10ac
 	db "ARMOR@" ; species name
 	dw 307, 2650 ; height, weight
 
 	db   "Because this"
 	next "#MON's skin is"
 	next "so tough, a normal"
+
 	page "attack won't even"
 	next "leave a scratch on"
 	next "it.@"
diff --git a/data/pokemon/dex_entries/dragonair.asm b/data/pokemon/dex_entries/dragonair.asm
index cef4f8f29..915db2c21 100644
--- a/data/pokemon/dex_entries/dragonair.asm
+++ b/data/pokemon/dex_entries/dragonair.asm
@@ -1,10 +1,10 @@
-; DragonairPokedexEntry: ; 0x1cc7dc
 	db "DRAGON@" ; species name
 	dw 1301, 360 ; height, weight
 
 	db   "It is called the"
 	next "divine #MON."
 	next "When its entire"
+
 	page "body brightens"
 	next "slightly, the"
 	next "weather changes.@"
diff --git a/data/pokemon/dex_entries/dragonite.asm b/data/pokemon/dex_entries/dragonite.asm
index bbbc6cff0..9db1bf54b 100644
--- a/data/pokemon/dex_entries/dragonite.asm
+++ b/data/pokemon/dex_entries/dragonite.asm
@@ -1,10 +1,10 @@
-; DragonitePokedexEntry: ; 0x1cc843
 	db "DRAGON@" ; species name
 	dw 703, 4630 ; height, weight
 
 	db   "It is said that"
 	next "somewhere in the"
 	next "ocean lies an"
+
 	page "island where these"
 	next "gather. Only they"
 	next "live there.@"
diff --git a/data/pokemon/dex_entries/dratini.asm b/data/pokemon/dex_entries/dratini.asm
index ef16aa20c..baa12940e 100644
--- a/data/pokemon/dex_entries/dratini.asm
+++ b/data/pokemon/dex_entries/dratini.asm
@@ -1,10 +1,10 @@
-; DratiniPokedexEntry: ; 0x1cc761
 	db "DRAGON@" ; species name
 	dw 511, 70 ; height, weight
 
 	db   "It sheds many lay-"
 	next "ers of skin as it"
 	next "grows larger. Dur-"
+
 	page "ing this process,"
 	next "it is protected by"
 	next "a rapid waterfall.@"
diff --git a/data/pokemon/dex_entries/drowzee.asm b/data/pokemon/dex_entries/drowzee.asm
index 34ae54435..fe6f14ba7 100644
--- a/data/pokemon/dex_entries/drowzee.asm
+++ b/data/pokemon/dex_entries/drowzee.asm
@@ -1,10 +1,10 @@
-; DrowzeePokedexEntry: ; 0x1b8d0a
 	db "HYPNOSIS@" ; species name
 	dw 303, 710 ; height, weight
 
 	db   "When it twitches"
 	next "its nose, it can"
 	next "tell where someone"
+
 	page "is sleeping and"
 	next "what that person"
 	next "is dreaming about.@"
diff --git a/data/pokemon/dex_entries/dugtrio.asm b/data/pokemon/dex_entries/dugtrio.asm
index 829e2aa09..a12c2984d 100644
--- a/data/pokemon/dex_entries/dugtrio.asm
+++ b/data/pokemon/dex_entries/dugtrio.asm
@@ -1,10 +1,10 @@
-; DugtrioPokedexEntry: ; 0x182b9d
 	db "MOLE@" ; species name
 	dw 204, 730 ; height, weight
 
 	db   "These DIGLETT"
 	next "triplets dig over"
 	next "60 miles below sea"
+
 	page "level. No one"
 	next "knows what it's"
 	next "like underground.@"
diff --git a/data/pokemon/dex_entries/dunsparce.asm b/data/pokemon/dex_entries/dunsparce.asm
index 7a9d812f3..5391438c1 100644
--- a/data/pokemon/dex_entries/dunsparce.asm
+++ b/data/pokemon/dex_entries/dunsparce.asm
@@ -1,10 +1,10 @@
-; DunsparcePokedexEntry: ; 0x1d0593
 	db "LAND SNAKE@" ; species name
 	dw 411, 310 ; height, weight
 
 	db   "It hides deep"
 	next "inside caves where"
 	next "no light ever"
+
 	page "reaches it and"
 	next "remains virtually"
 	next "motionless there.@"
diff --git a/data/pokemon/dex_entries/eevee.asm b/data/pokemon/dex_entries/eevee.asm
index 3081a5829..91a3d70bc 100644
--- a/data/pokemon/dex_entries/eevee.asm
+++ b/data/pokemon/dex_entries/eevee.asm
@@ -1,10 +1,10 @@
-; EeveePokedexEntry: ; 0x1cc1b2
 	db "EVOLUTION@" ; species name
 	dw 100, 140 ; height, weight
 
 	db   "Its ability to"
 	next "evolve into many"
 	next "forms allows it to"
+
 	page "adapt smoothly"
 	next "and perfectly to"
 	next "any environment.@"
diff --git a/data/pokemon/dex_entries/ekans.asm b/data/pokemon/dex_entries/ekans.asm
index 23faa4854..bb2fe9594 100644
--- a/data/pokemon/dex_entries/ekans.asm
+++ b/data/pokemon/dex_entries/ekans.asm
@@ -1,10 +1,10 @@
-; EkansPokedexEntry: ; 0x181fd4
 	db "SNAKE@" ; species name
 	dw 607, 150 ; height, weight
 
 	db   "It flutters the"
 	next "tip of its tongue"
 	next "to seek out the"
+
 	page "scent of prey,"
 	next "then swallows the"
 	next "prey whole.@"
diff --git a/data/pokemon/dex_entries/electabuzz.asm b/data/pokemon/dex_entries/electabuzz.asm
index e6bf15587..0eddf3416 100644
--- a/data/pokemon/dex_entries/electabuzz.asm
+++ b/data/pokemon/dex_entries/electabuzz.asm
@@ -1,10 +1,10 @@
-; ElectabuzzPokedexEntry: ; 0x1b992a
 	db "ELECTRIC@" ; species name
 	dw 307, 660 ; height, weight
 
 	db   "When two"
 	next "ELECTABUZZ touch,"
 	next "they control the"
+
 	page "electric currents"
 	next "to communicate"
 	next "their feelings.@"
diff --git a/data/pokemon/dex_entries/electrode.asm b/data/pokemon/dex_entries/electrode.asm
index 48d523c69..2e6378d41 100644
--- a/data/pokemon/dex_entries/electrode.asm
+++ b/data/pokemon/dex_entries/electrode.asm
@@ -1,10 +1,10 @@
-; ElectrodePokedexEntry: ; 0x1b8f19
 	db "BALL@" ; species name
 	dw 311, 1470 ; height, weight
 
 	db   "The more energy it"
 	next "charges up, the"
 	next "faster it gets."
+
 	page "But this also"
 	next "makes it more"
 	next "likely to explode.@"
diff --git a/data/pokemon/dex_entries/elekid.asm b/data/pokemon/dex_entries/elekid.asm
index 6a046bda4..a84d24dc0 100644
--- a/data/pokemon/dex_entries/elekid.asm
+++ b/data/pokemon/dex_entries/elekid.asm
@@ -1,10 +1,10 @@
-; ElekidPokedexEntry: ; 0x1d1398
 	db "ELECTRIC@" ; species name
 	dw 200, 520 ; height, weight
 
 	db   "It loves violent"
 	next "thunder. The space"
 	next "between its horns"
+
 	page "flickers bluish-"
 	next "white when it is"
 	next "charging energy.@"
diff --git a/data/pokemon/dex_entries/entei.asm b/data/pokemon/dex_entries/entei.asm
index 3784a898c..355bd4ae6 100644
--- a/data/pokemon/dex_entries/entei.asm
+++ b/data/pokemon/dex_entries/entei.asm
@@ -1,10 +1,10 @@
-; EnteiPokedexEntry: ; 0x1d15dd
 	db "VOLCANO@" ; species name
 	dw 607, 4370 ; height, weight
 
 	db   "This brawny"
 	next "#MON courses"
 	next "around the earth,"
+
 	page "spouting flames"
 	next "hotter than a"
 	next "volcano's magma.@"
diff --git a/data/pokemon/dex_entries/espeon.asm b/data/pokemon/dex_entries/espeon.asm
index 059b01fbe..93bde0d8c 100644
--- a/data/pokemon/dex_entries/espeon.asm
+++ b/data/pokemon/dex_entries/espeon.asm
@@ -1,10 +1,10 @@
-; EspeonPokedexEntry: ; 0x1d0155
 	db "SUN@" ; species name
 	dw 211, 580 ; height, weight
 
 	db   "The tip of its"
 	next "forked tail"
 	next "quivers when it is"
+
 	page "predicting its"
 	next "opponent's next"
 	next "move.@"
diff --git a/data/pokemon/dex_entries/exeggcute.asm b/data/pokemon/dex_entries/exeggcute.asm
index 01453955e..27360dc05 100644
--- a/data/pokemon/dex_entries/exeggcute.asm
+++ b/data/pokemon/dex_entries/exeggcute.asm
@@ -1,10 +1,10 @@
-; ExeggcutePokedexEntry: ; 0x1b8f84
 	db "EGG@" ; species name
 	dw 104, 60 ; height, weight
 
 	db   "If even one is"
 	next "separated from the"
 	next "group, the energy"
+
 	page "bond between the"
 	next "six will make them"
 	next "rejoin instantly.@"
diff --git a/data/pokemon/dex_entries/exeggutor.asm b/data/pokemon/dex_entries/exeggutor.asm
index abefffd69..31ba01ae4 100644
--- a/data/pokemon/dex_entries/exeggutor.asm
+++ b/data/pokemon/dex_entries/exeggutor.asm
@@ -1,10 +1,10 @@
-; ExeggutorPokedexEntry: ; 0x1b8ff6
 	db "COCONUT@" ; species name
 	dw 607, 2650 ; height, weight
 
 	db   "Living in a good"
 	next "environment makes"
 	next "it grow lots of"
+
 	page "heads. A head that"
 	next "drops off becomes"
 	next "an EXEGGCUTE.@"
diff --git a/data/pokemon/dex_entries/farfetch_d.asm b/data/pokemon/dex_entries/farfetch_d.asm
index c9e756a6a..b5bd3bc98 100644
--- a/data/pokemon/dex_entries/farfetch_d.asm
+++ b/data/pokemon/dex_entries/farfetch_d.asm
@@ -1,10 +1,10 @@
-; FarfetchDPokedexEntry: ; 0x1b876c
 	db "WILD DUCK@" ; species name
 	dw 207, 330 ; height, weight
 
 	db   "In order to pre-"
 	next "vent their"
 	next "extinction, more"
+
 	page "people have made"
 	next "an effort to breed"
 	next "these #MON.@"
diff --git a/data/pokemon/dex_entries/fearow.asm b/data/pokemon/dex_entries/fearow.asm
index 90de6a612..b91c66ed1 100644
--- a/data/pokemon/dex_entries/fearow.asm
+++ b/data/pokemon/dex_entries/fearow.asm
@@ -1,10 +1,10 @@
-; FearowPokedexEntry: ; 0x181f64
 	db "BEAK@" ; species name
 	dw 311, 840 ; height, weight
 
 	db   "It uses its long"
 	next "beak to attack. It"
 	next "has a surprisingly"
+
 	page "long reach, so it"
 	next "must be treated"
 	next "with caution.@"
diff --git a/data/pokemon/dex_entries/feraligatr.asm b/data/pokemon/dex_entries/feraligatr.asm
index cb3672c92..3c411fe48 100644
--- a/data/pokemon/dex_entries/feraligatr.asm
+++ b/data/pokemon/dex_entries/feraligatr.asm
@@ -1,10 +1,10 @@
-; FeraligatrPokedexEntry: ; 0x1cccf9
 	db "BIG JAW@" ; species name
 	dw 707, 1960 ; height, weight
 
 	db   "Although it has a"
 	next "massive body, its"
 	next "powerful hind legs"
+
 	page "enable it to move"
 	next "quickly, even on"
 	next "the ground.@"
diff --git a/data/pokemon/dex_entries/flaaffy.asm b/data/pokemon/dex_entries/flaaffy.asm
index 04bcc0668..d408a4706 100644
--- a/data/pokemon/dex_entries/flaaffy.asm
+++ b/data/pokemon/dex_entries/flaaffy.asm
@@ -1,10 +1,10 @@
-; FlaaffyPokedexEntry: ; 0x1cd5b8
 	db "WOOL@" ; species name
 	dw 207, 290 ; height, weight
 
 	db   "Because of its"
 	next "rubbery, electric-"
 	next "ity-resistant"
+
 	page "skin, it can store"
 	next "lots of electric-"
 	next "ity in its fur.@"
diff --git a/data/pokemon/dex_entries/flareon.asm b/data/pokemon/dex_entries/flareon.asm
index ba3e0399d..fbab999c4 100644
--- a/data/pokemon/dex_entries/flareon.asm
+++ b/data/pokemon/dex_entries/flareon.asm
@@ -1,10 +1,10 @@
-; FlareonPokedexEntry: ; 0x1cc2ec
 	db "FLAME@" ; species name
 	dw 211, 550 ; height, weight
 
 	db   "Once it has stored"
 	next "up enough heat,"
 	next "this #MON's"
+
 	page "body temperature"
 	next "can reach up to"
 	next "1700 degrees.@"
diff --git a/data/pokemon/dex_entries/forretress.asm b/data/pokemon/dex_entries/forretress.asm
index 8644b4b39..6815f6d31 100644
--- a/data/pokemon/dex_entries/forretress.asm
+++ b/data/pokemon/dex_entries/forretress.asm
@@ -1,10 +1,10 @@
-; ForretressPokedexEntry: ; 0x1d0524
 	db "BAGWORM@" ; species name
 	dw 311, 2770 ; height, weight
 
 	db   "Usually found"
 	next "hanging on to a"
 	next "fat tree trunk. It"
+
 	page "shoots out bits of"
 	next "its shell when it"
 	next "sees action.@"
diff --git a/data/pokemon/dex_entries/furret.asm b/data/pokemon/dex_entries/furret.asm
index 653a3dead..b9ec74d2d 100644
--- a/data/pokemon/dex_entries/furret.asm
+++ b/data/pokemon/dex_entries/furret.asm
@@ -1,10 +1,10 @@
-; FurretPokedexEntry: ; 0x1ccddd
 	db "LONG BODY@" ; species name
 	dw 511, 720 ; height, weight
 
 	db   "It lives in narrow"
 	next "burrows that fit"
 	next "its slim body. The"
+
 	page "deeper the nests"
 	next "go, the more maze-"
 	next "like they become.@"
diff --git a/data/pokemon/dex_entries/gastly.asm b/data/pokemon/dex_entries/gastly.asm
index db7f6d57d..5f5420e02 100644
--- a/data/pokemon/dex_entries/gastly.asm
+++ b/data/pokemon/dex_entries/gastly.asm
@@ -1,10 +1,10 @@
-; GastlyPokedexEntry: ; 0x1b8b4a
 	db "GAS@" ; species name
 	dw 403, 2 ; height, weight
 
 	db   "It wraps its op-"
 	next "ponent in its gas-"
 	next "like body, slowly"
+
 	page "weakening its prey"
 	next "by poisoning it"
 	next "through the skin.@"
diff --git a/data/pokemon/dex_entries/gengar.asm b/data/pokemon/dex_entries/gengar.asm
index e9650fb39..ac85e88f4 100644
--- a/data/pokemon/dex_entries/gengar.asm
+++ b/data/pokemon/dex_entries/gengar.asm
@@ -1,10 +1,10 @@
-; GengarPokedexEntry: ; 0x1b8c25
 	db "SHADOW@" ; species name
 	dw 411, 890 ; height, weight
 
 	db   "Hiding in people's"
 	next "shadows at night,"
 	next "it absorbs their"
+
 	page "heat. The chill it"
 	next "causes makes the"
 	next "victims shake.@"
diff --git a/data/pokemon/dex_entries/geodude.asm b/data/pokemon/dex_entries/geodude.asm
index 389ce042a..ea3c8b79e 100644
--- a/data/pokemon/dex_entries/geodude.asm
+++ b/data/pokemon/dex_entries/geodude.asm
@@ -1,10 +1,10 @@
-; GeodudePokedexEntry: ; 0x1b83a1
 	db "ROCK@" ; species name
 	dw 104, 440 ; height, weight
 
 	db   "Proud of their"
 	next "sturdy bodies,"
 	next "they bash against"
+
 	page "each other in a"
 	next "contest to prove"
 	next "whose is harder.@"
diff --git a/data/pokemon/dex_entries/girafarig.asm b/data/pokemon/dex_entries/girafarig.asm
index 527aa9807..caeb13dd7 100644
--- a/data/pokemon/dex_entries/girafarig.asm
+++ b/data/pokemon/dex_entries/girafarig.asm
@@ -1,10 +1,10 @@
-; GirafarigPokedexEntry: ; 0x1d0446
 	db "LONG NECK@" ; species name
 	dw 411, 910 ; height, weight
 
 	db   "When it is in"
 	next "danger, its tail"
 	next "uses some sort of"
+
 	page "mysterious powers"
 	next "to drive away the"
 	next "enemy.@"
diff --git a/data/pokemon/dex_entries/gligar.asm b/data/pokemon/dex_entries/gligar.asm
index 43c4c95ce..32ac0a5f5 100644
--- a/data/pokemon/dex_entries/gligar.asm
+++ b/data/pokemon/dex_entries/gligar.asm
@@ -1,10 +1,10 @@
-; GligarPokedexEntry: ; 0x1d0604
 	db "FLYSCORPIO@" ; species name
 	dw 307, 1430 ; height, weight
 
 	db   "It builds its nest"
 	next "on a steep cliff."
 	next "When it is done"
+
 	page "gliding, it hops"
 	next "along the ground"
 	next "back to its nest.@"
diff --git a/data/pokemon/dex_entries/gloom.asm b/data/pokemon/dex_entries/gloom.asm
index 0552a8d0c..6b2e4e534 100644
--- a/data/pokemon/dex_entries/gloom.asm
+++ b/data/pokemon/dex_entries/gloom.asm
@@ -1,10 +1,10 @@
-; GloomPokedexEntry: ; 0x1828a6
 	db "WEED@" ; species name
 	dw 207, 190 ; height, weight
 
 	db   "The smell from its"
 	next "drool-like syrup"
 	next "and the pollen on"
+
 	page "its petals is so"
 	next "bad, it may make"
 	next "opponents faint.@"
diff --git a/data/pokemon/dex_entries/golbat.asm b/data/pokemon/dex_entries/golbat.asm
index 434108bf4..d59b9408c 100644
--- a/data/pokemon/dex_entries/golbat.asm
+++ b/data/pokemon/dex_entries/golbat.asm
@@ -1,10 +1,10 @@
-; GolbatPokedexEntry: ; 0x1827c4
 	db "BAT@" ; species name
 	dw 503, 1210 ; height, weight
 
 	db   "When it plunges"
 	next "its fangs into its"
 	next "prey, it instantly"
+
 	page "draws and gulps"
 	next "down more than ten"
 	next "ounces of blood.@"
diff --git a/data/pokemon/dex_entries/goldeen.asm b/data/pokemon/dex_entries/goldeen.asm
index 101edf434..075a9b5a2 100644
--- a/data/pokemon/dex_entries/goldeen.asm
+++ b/data/pokemon/dex_entries/goldeen.asm
@@ -1,10 +1,10 @@
-; GoldeenPokedexEntry: ; 0x1b9626
 	db "GOLDFISH@" ; species name
 	dw 200, 330 ; height, weight
 
 	db   "During spawning"
 	next "season, they swim"
 	next "gracefully in the"
+
 	page "water, searching"
 	next "for their perfect"
 	next "mate.@"
diff --git a/data/pokemon/dex_entries/golduck.asm b/data/pokemon/dex_entries/golduck.asm
index b38cfd2dc..921e4ddb0 100644
--- a/data/pokemon/dex_entries/golduck.asm
+++ b/data/pokemon/dex_entries/golduck.asm
@@ -1,10 +1,10 @@
-; GolduckPokedexEntry: ; 0x182d55
 	db "DUCK@" ; species name
 	dw 507, 1690 ; height, weight
 
 	db   "It swims grace-"
 	next "fully along on the"
 	next "quiet, slow-moving"
+
 	page "rivers and lakes"
 	next "of which it is so"
 	next "fond.@"
diff --git a/data/pokemon/dex_entries/golem.asm b/data/pokemon/dex_entries/golem.asm
index dbb5a8e3d..7d5e9af49 100644
--- a/data/pokemon/dex_entries/golem.asm
+++ b/data/pokemon/dex_entries/golem.asm
@@ -1,10 +1,10 @@
-; GolemPokedexEntry: ; 0x1b8481
 	db "MEGATON@" ; species name
 	dw 407, 6620 ; height, weight
 
 	db   "Its rock-like body"
 	next "is so durable,"
 	next "even high-powered"
+
 	page "dynamite blasts"
 	next "fail to scratch"
 	next "its rugged hide.@"
diff --git a/data/pokemon/dex_entries/granbull.asm b/data/pokemon/dex_entries/granbull.asm
index 15f3e194c..de6460d8d 100644
--- a/data/pokemon/dex_entries/granbull.asm
+++ b/data/pokemon/dex_entries/granbull.asm
@@ -1,10 +1,10 @@
-; GranbullPokedexEntry: ; 0x1d074a
 	db "FAIRY@" ; species name
 	dw 407, 1070 ; height, weight
 
 	db   "It can make most"
 	next "any #MON run"
 	next "away simply by"
+
 	page "opening its mouth"
 	next "wide to reveal its"
 	next "big fangs.@"
diff --git a/data/pokemon/dex_entries/graveler.asm b/data/pokemon/dex_entries/graveler.asm
index 3bf04148c..26b9db795 100644
--- a/data/pokemon/dex_entries/graveler.asm
+++ b/data/pokemon/dex_entries/graveler.asm
@@ -1,10 +1,10 @@
-; GravelerPokedexEntry: ; 0x1b840c
 	db "ROCK@" ; species name
 	dw 303, 2320 ; height, weight
 
 	db   "It travels by rol-"
 	next "ling on mountain"
 	next "paths. If it gains"
+
 	page "too much speed, it"
 	next "stops by running"
 	next "into huge rocks.@"
diff --git a/data/pokemon/dex_entries/grimer.asm b/data/pokemon/dex_entries/grimer.asm
index bda09cf94..ed76b6249 100644
--- a/data/pokemon/dex_entries/grimer.asm
+++ b/data/pokemon/dex_entries/grimer.asm
@@ -1,10 +1,10 @@
-; GrimerPokedexEntry: ; 0x1b89a2
 	db "SLUDGE@" ; species name
 	dw 211, 660 ; height, weight
 
 	db   "When two of these"
 	next "#MON's bodies"
 	next "are combined"
+
 	page "together, new"
 	next "poisons are"
 	next "created.@"
diff --git a/data/pokemon/dex_entries/growlithe.asm b/data/pokemon/dex_entries/growlithe.asm
index cd261d886..af5610cda 100644
--- a/data/pokemon/dex_entries/growlithe.asm
+++ b/data/pokemon/dex_entries/growlithe.asm
@@ -1,10 +1,10 @@
-; GrowlithePokedexEntry: ; 0x182eaa
 	db "PUPPY@" ; species name
 	dw 204, 420 ; height, weight
 
 	db   "It controls a big"
 	next "territory. If it"
 	next "detects an unknown"
+
 	page "smell, it roars"
 	next "loudly to force"
 	next "out the intruder.@"
diff --git a/data/pokemon/dex_entries/gyarados.asm b/data/pokemon/dex_entries/gyarados.asm
index 767380680..3f3235679 100644
--- a/data/pokemon/dex_entries/gyarados.asm
+++ b/data/pokemon/dex_entries/gyarados.asm
@@ -1,10 +1,10 @@
-; GyaradosPokedexEntry: ; 0x1cc065
 	db "ATROCIOUS@" ; species name
 	dw 2104, 5180 ; height, weight
 
 	db   "It appears when-"
 	next "ever there is"
 	next "world conflict,"
+
 	page "burning down any"
 	next "place it travels"
 	next "through.@"
diff --git a/data/pokemon/dex_entries/haunter.asm b/data/pokemon/dex_entries/haunter.asm
index 6efe4b15c..b03c0996f 100644
--- a/data/pokemon/dex_entries/haunter.asm
+++ b/data/pokemon/dex_entries/haunter.asm
@@ -1,10 +1,10 @@
-; HaunterPokedexEntry: ; 0x1b8bbd
 	db "GAS@" ; species name
 	dw 503, 2 ; height, weight
 
 	db   "It hides in the"
 	next "dark, planning to"
 	next "take the life of"
+
 	page "the next living"
 	next "thing that wanders"
 	next "close by.@"
diff --git a/data/pokemon/dex_entries/heracross.asm b/data/pokemon/dex_entries/heracross.asm
index ed709b526..25d1e28a6 100644
--- a/data/pokemon/dex_entries/heracross.asm
+++ b/data/pokemon/dex_entries/heracross.asm
@@ -1,10 +1,10 @@
-; HeracrossPokedexEntry: ; 0x1d0907
 	db "SINGLEHORN@" ; species name
 	dw 411, 1190 ; height, weight
 
 	db   "With its Herculean"
 	next "powers, it can"
 	next "easily throw arou-"
+
 	page "nd an object that"
 	next "is 100 times its"
 	next "own weight.@"
diff --git a/data/pokemon/dex_entries/hitmonchan.asm b/data/pokemon/dex_entries/hitmonchan.asm
index e5686b1a5..8b2f97823 100644
--- a/data/pokemon/dex_entries/hitmonchan.asm
+++ b/data/pokemon/dex_entries/hitmonchan.asm
@@ -1,10 +1,10 @@
-; HitmonchanPokedexEntry: ; 0x1b91a4
 	db "PUNCHING@" ; species name
 	dw 407, 1110 ; height, weight
 
 	db   "To increase the"
 	next "strength of all"
 	next "its punch moves,"
+
 	page "it spins its arms"
 	next "just before making"
 	next "contact.@"
diff --git a/data/pokemon/dex_entries/hitmonlee.asm b/data/pokemon/dex_entries/hitmonlee.asm
index 0215d3bdc..0df1bf2a9 100644
--- a/data/pokemon/dex_entries/hitmonlee.asm
+++ b/data/pokemon/dex_entries/hitmonlee.asm
@@ -1,10 +1,10 @@
-; HitmonleePokedexEntry: ; 0x1b913f
 	db "KICKING@" ; species name
 	dw 411, 1100 ; height, weight
 
 	db   "It is also called"
 	next "the Kick Master."
 	next "It uses its"
+
 	page "elastic legs to"
 	next "execute every"
 	next "known kick.@"
diff --git a/data/pokemon/dex_entries/hitmontop.asm b/data/pokemon/dex_entries/hitmontop.asm
index 14175ec8a..609ccb48a 100644
--- a/data/pokemon/dex_entries/hitmontop.asm
+++ b/data/pokemon/dex_entries/hitmontop.asm
@@ -1,10 +1,10 @@
-; HitmontopPokedexEntry: ; 0x1d12c0
 	db "HANDSTAND@" ; species name
 	dw 407, 1060 ; height, weight
 
 	db   "After doing a"
 	next "handstand to"
 	next "throw off the"
+
 	page "opponent's timing,"
 	next "it presents its"
 	next "fancy kick moves.@"
diff --git a/data/pokemon/dex_entries/ho_oh.asm b/data/pokemon/dex_entries/ho_oh.asm
index 1d74cd058..2bc0abcf0 100644
--- a/data/pokemon/dex_entries/ho_oh.asm
+++ b/data/pokemon/dex_entries/ho_oh.asm
@@ -1,10 +1,10 @@
-; HoOhPokedexEntry: ; 0x1d185d
 	db "RAINBOW@" ; species name
 	dw 1206, 4390 ; height, weight
 
 	db   "It will reveal"
 	next "itself before a"
 	next "pure-hearted"
+
 	page "trainer by shining"
 	next "its bright rain-"
 	next "bow-colored wings.@"
diff --git a/data/pokemon/dex_entries/hoothoot.asm b/data/pokemon/dex_entries/hoothoot.asm
index 88039eea8..1df540fe6 100644
--- a/data/pokemon/dex_entries/hoothoot.asm
+++ b/data/pokemon/dex_entries/hoothoot.asm
@@ -1,10 +1,10 @@
-; HoothootPokedexEntry: ; 0x1cce58
 	db "OWL@" ; species name
 	dw 204, 470 ; height, weight
 
 	db   "It begins to hoot"
 	next "at the same time"
 	next "every day. Some"
+
 	page "trainers use them"
 	next "in place of"
 	next "clocks.@"
diff --git a/data/pokemon/dex_entries/hoppip.asm b/data/pokemon/dex_entries/hoppip.asm
index 734ddc766..3e97be0e2 100644
--- a/data/pokemon/dex_entries/hoppip.asm
+++ b/data/pokemon/dex_entries/hoppip.asm
@@ -1,10 +1,10 @@
-; HoppipPokedexEntry: ; 0x1cd8b5
 	db "COTTONWEED@" ; species name
 	dw 104, 10 ; height, weight
 
 	db   "It can be carried"
 	next "away on even the"
 	next "gentlest breeze."
+
 	page "It may even float"
 	next "all the way to the"
 	next "next town.@"
diff --git a/data/pokemon/dex_entries/horsea.asm b/data/pokemon/dex_entries/horsea.asm
index dd50057e7..53f6ec71d 100644
--- a/data/pokemon/dex_entries/horsea.asm
+++ b/data/pokemon/dex_entries/horsea.asm
@@ -1,10 +1,10 @@
-; HorseaPokedexEntry: ; 0x1b9553
 	db "DRAGON@" ; species name
 	dw 104, 180 ; height, weight
 
 	db   "When they're in a"
 	next "safe location,"
 	next "they can be seen"
+
 	page "playfully tangling"
 	next "their tails"
 	next "together.@"
diff --git a/data/pokemon/dex_entries/houndoom.asm b/data/pokemon/dex_entries/houndoom.asm
index 6a21602f3..a3b8f9cb8 100644
--- a/data/pokemon/dex_entries/houndoom.asm
+++ b/data/pokemon/dex_entries/houndoom.asm
@@ -1,10 +1,10 @@
-; HoundoomPokedexEntry: ; 0x1d0f66
 	db "DARK@" ; species name
 	dw 407, 770 ; height, weight
 
 	db   "The pungent-"
 	next "smelling flame"
 	next "that shoots from"
+
 	page "its mouth results"
 	next "from toxins burn-"
 	next "ing in its body.@"
diff --git a/data/pokemon/dex_entries/houndour.asm b/data/pokemon/dex_entries/houndour.asm
index 5fa89fe85..ba89b90d2 100644
--- a/data/pokemon/dex_entries/houndour.asm
+++ b/data/pokemon/dex_entries/houndour.asm
@@ -1,10 +1,10 @@
-; HoundourPokedexEntry: ; 0x1d0eff
 	db "DARK@" ; species name
 	dw 200, 240 ; height, weight
 
 	db   "Around dawn, its"
 	next "ominous howl"
 	next "echoes through the"
+
 	page "area to announce"
 	next "that this is its"
 	next "territory.@"
diff --git a/data/pokemon/dex_entries/hypno.asm b/data/pokemon/dex_entries/hypno.asm
index 2309a6bfa..cfdd29896 100644
--- a/data/pokemon/dex_entries/hypno.asm
+++ b/data/pokemon/dex_entries/hypno.asm
@@ -1,10 +1,10 @@
-; HypnoPokedexEntry: ; 0x1b8d80
 	db "HYPNOSIS@" ; species name
 	dw 503, 1670 ; height, weight
 
 	db   "The longer it"
 	next "swings its"
 	next "pendulum, the"
+
 	page "longer the effects"
 	next "of its hypnosis"
 	next "last.@"
diff --git a/data/pokemon/dex_entries/igglybuff.asm b/data/pokemon/dex_entries/igglybuff.asm
index aa1c1cabf..27d5a8040 100644
--- a/data/pokemon/dex_entries/igglybuff.asm
+++ b/data/pokemon/dex_entries/igglybuff.asm
@@ -1,10 +1,10 @@
-; IgglybuffPokedexEntry: ; 0x1cd32c
 	db "BALLOON@" ; species name
 	dw 100, 20 ; height, weight
 
 	db   "Instead of walking"
 	next "with its short"
 	next "legs, it moves"
+
 	page "around by bouncing"
 	next "on its soft,"
 	next "tender body.@"
diff --git a/data/pokemon/dex_entries/ivysaur.asm b/data/pokemon/dex_entries/ivysaur.asm
index 66d16d323..91a672c9e 100644
--- a/data/pokemon/dex_entries/ivysaur.asm
+++ b/data/pokemon/dex_entries/ivysaur.asm
@@ -1,10 +1,10 @@
-; IvysaurPokedexEntry: ; 0x181702
 	db "SEED@" ; species name
 	dw 303, 290 ; height, weight
 
 	db   "The bulb on its"
 	next "back grows as it"
 	next "absorbs nutrients."
+
 	page "The bulb gives off"
 	next "a pleasant aroma"
 	next "when it blooms.@"
diff --git a/data/pokemon/dex_entries/jigglypuff.asm b/data/pokemon/dex_entries/jigglypuff.asm
index 01a3b4480..b90ba7316 100644
--- a/data/pokemon/dex_entries/jigglypuff.asm
+++ b/data/pokemon/dex_entries/jigglypuff.asm
@@ -1,10 +1,10 @@
-; JigglypuffPokedexEntry: ; 0x182673
 	db "BALLOON@" ; species name
 	dw 108, 120 ; height, weight
 
 	db   "It rolls its cute"
 	next "eyes as it sings a"
 	next "soothing lullaby."
+
 	page "Its gentle song"
 	next "puts anyone who"
 	next "hears it to sleep.@"
diff --git a/data/pokemon/dex_entries/jolteon.asm b/data/pokemon/dex_entries/jolteon.asm
index 9b9149d9a..4d6be5d57 100644
--- a/data/pokemon/dex_entries/jolteon.asm
+++ b/data/pokemon/dex_entries/jolteon.asm
@@ -1,10 +1,10 @@
-; JolteonPokedexEntry: ; 0x1cc28b
 	db "LIGHTNING@" ; species name
 	dw 207, 540 ; height, weight
 
 	db   "The negatively"
 	next "charged ions"
 	next "generated in its"
+
 	page "fur create a"
 	next "constant sparking"
 	next "noise.@"
diff --git a/data/pokemon/dex_entries/jumpluff.asm b/data/pokemon/dex_entries/jumpluff.asm
index 0aade0b75..8dacd4dff 100644
--- a/data/pokemon/dex_entries/jumpluff.asm
+++ b/data/pokemon/dex_entries/jumpluff.asm
@@ -1,10 +1,10 @@
-; JumpluffPokedexEntry: ; 0x1cd998
 	db "COTTONWEED@" ; species name
 	dw 207, 70 ; height, weight
 
 	db   "Even in the fierc-"
 	next "est wind, it can"
 	next "control its fluff"
+
 	page "to make its way to"
 	next "any place in the"
 	next "world it wants.@"
diff --git a/data/pokemon/dex_entries/jynx.asm b/data/pokemon/dex_entries/jynx.asm
index b4b9eac8c..6f6486776 100644
--- a/data/pokemon/dex_entries/jynx.asm
+++ b/data/pokemon/dex_entries/jynx.asm
@@ -1,10 +1,10 @@
-; JynxPokedexEntry: ; 0x1b98c5
 	db "HUMANSHAPE@" ; species name
 	dw 407, 900 ; height, weight
 
 	db   "It has several"
 	next "different cry pat-"
 	next "terns, each of"
+
 	page "which seems to"
 	next "have its own"
 	next "meaning.@"
diff --git a/data/pokemon/dex_entries/kabuto.asm b/data/pokemon/dex_entries/kabuto.asm
index 9231fb9be..8a65e4cb6 100644
--- a/data/pokemon/dex_entries/kabuto.asm
+++ b/data/pokemon/dex_entries/kabuto.asm
@@ -1,10 +1,10 @@
-; KabutoPokedexEntry: ; 0x1cc497
 	db "SHELLFISH@" ; species name
 	dw 108, 250 ; height, weight
 
 	db   "Three hundred"
 	next "million years ago,"
 	next "it hid on the sea"
+
 	page "floor. It also has"
 	next "eyes on its back"
 	next "that glow.@"
diff --git a/data/pokemon/dex_entries/kabutops.asm b/data/pokemon/dex_entries/kabutops.asm
index 8f5e1348b..bca687d39 100644
--- a/data/pokemon/dex_entries/kabutops.asm
+++ b/data/pokemon/dex_entries/kabutops.asm
@@ -1,10 +1,10 @@
-; KabutopsPokedexEntry: ; 0x1cc507
 	db "SHELLFISH@" ; species name
 	dw 403, 890 ; height, weight
 
 	db   "It was able to"
 	next "swim quickly thro-"
 	next "ugh the water by"
+
 	page "compactly folding"
 	next "up its razor-sharp"
 	next "sickles.@"
diff --git a/data/pokemon/dex_entries/kadabra.asm b/data/pokemon/dex_entries/kadabra.asm
index 26226724f..01fd96098 100644
--- a/data/pokemon/dex_entries/kadabra.asm
+++ b/data/pokemon/dex_entries/kadabra.asm
@@ -1,10 +1,10 @@
-; KadabraPokedexEntry: ; 0x18313c
 	db "PSI@" ; species name
 	dw 403, 1250 ; height, weight
 
 	db   "When it closes its"
 	next "eyes, twice as"
 	next "many alpha parti-"
+
 	page "cles come out of"
 	next "the surface of its"
 	next "body.@"
diff --git a/data/pokemon/dex_entries/kakuna.asm b/data/pokemon/dex_entries/kakuna.asm
index 469e14bf6..3f4a1326d 100644
--- a/data/pokemon/dex_entries/kakuna.asm
+++ b/data/pokemon/dex_entries/kakuna.asm
@@ -1,10 +1,10 @@
-; KakunaPokedexEntry: ; 0x181c23
 	db "COCOON@" ; species name
 	dw 200, 220 ; height, weight
 
 	db   "Nearly incapable"
 	next "of movement, it"
 	next "leans against"
+
 	page "stout trees while"
 	next "waiting for its"
 	next "evolution.@"
diff --git a/data/pokemon/dex_entries/kangaskhan.asm b/data/pokemon/dex_entries/kangaskhan.asm
index ec2050845..c1c9d8db5 100644
--- a/data/pokemon/dex_entries/kangaskhan.asm
+++ b/data/pokemon/dex_entries/kangaskhan.asm
@@ -1,10 +1,10 @@
-; KangaskhanPokedexEntry: ; 0x1b94f6
 	db "PARENT@" ; species name
 	dw 703, 1760 ; height, weight
 
 	db   "To avoid"
 	next "crushing the"
 	next "baby it carries in"
+
 	page "its pouch, it"
 	next "always sleeps"
 	next "standing up.@"
diff --git a/data/pokemon/dex_entries/kingdra.asm b/data/pokemon/dex_entries/kingdra.asm
index 555601b51..05e79a86a 100644
--- a/data/pokemon/dex_entries/kingdra.asm
+++ b/data/pokemon/dex_entries/kingdra.asm
@@ -1,10 +1,10 @@
-; KingdraPokedexEntry: ; 0x1d0fd1
 	db "DRAGON@" ; species name
 	dw 511, 3350 ; height, weight
 
 	db   "It stores energy"
 	next "by sleeping at"
 	next "underwater depths"
+
 	page "at which no other"
 	next "life forms can"
 	next "survive.@"
diff --git a/data/pokemon/dex_entries/kingler.asm b/data/pokemon/dex_entries/kingler.asm
index 25685d517..2c4b17a15 100644
--- a/data/pokemon/dex_entries/kingler.asm
+++ b/data/pokemon/dex_entries/kingler.asm
@@ -1,10 +1,10 @@
-; KinglerPokedexEntry: ; 0x1b8e45
 	db "PINCER@" ; species name
 	dw 403, 1320 ; height, weight
 
 	db   "Its oversized claw"
 	next "is very powerful,"
 	next "but when it's not"
+
 	page "in battle, the"
 	next "claw just gets in"
 	next "the way.@"
diff --git a/data/pokemon/dex_entries/koffing.asm b/data/pokemon/dex_entries/koffing.asm
index 20bde8671..a3fc0da9f 100644
--- a/data/pokemon/dex_entries/koffing.asm
+++ b/data/pokemon/dex_entries/koffing.asm
@@ -1,10 +1,10 @@
-; KoffingPokedexEntry: ; 0x1b9276
 	db "POISON GAS@" ; species name
 	dw 200, 20 ; height, weight
 
 	db   "If one gets close"
 	next "enough to it when"
 	next "it expels poison-"
+
 	page "ous gas, the gas"
 	next "swirling inside it"
 	next "can be seen.@"
diff --git a/data/pokemon/dex_entries/krabby.asm b/data/pokemon/dex_entries/krabby.asm
index 2435cd64d..0e0081ae6 100644
--- a/data/pokemon/dex_entries/krabby.asm
+++ b/data/pokemon/dex_entries/krabby.asm
@@ -1,10 +1,10 @@
-; KrabbyPokedexEntry: ; 0x1b8ddd
 	db "RIVER CRAB@" ; species name
 	dw 104, 140 ; height, weight
 
 	db   "If it is unable"
 	next "to find food, it"
 	next "will absorb"
+
 	page "nutrients by"
 	next "swallowing a"
 	next "mouthful of sand.@"
diff --git a/data/pokemon/dex_entries/lanturn.asm b/data/pokemon/dex_entries/lanturn.asm
index 3aa2b5523..46ea41e89 100644
--- a/data/pokemon/dex_entries/lanturn.asm
+++ b/data/pokemon/dex_entries/lanturn.asm
@@ -1,10 +1,10 @@
-; LanturnPokedexEntry: ; 0x1cd1de
 	db "LIGHT@" ; species name
 	dw 311, 500 ; height, weight
 
 	db   "This #MON uses"
 	next "the bright part of"
 	next "its body, which"
+
 	page "changed from a"
 	next "dorsal fin, to"
 	next "lure prey.@"
diff --git a/data/pokemon/dex_entries/lapras.asm b/data/pokemon/dex_entries/lapras.asm
index 550d6e12c..e074cfe02 100644
--- a/data/pokemon/dex_entries/lapras.asm
+++ b/data/pokemon/dex_entries/lapras.asm
@@ -1,10 +1,10 @@
-; LaprasPokedexEntry: ; 0x1cc0cd
 	db "TRANSPORT@" ; species name
 	dw 802, 4850 ; height, weight
 
 	db   "This gentle"
 	next "#MON loves to"
 	next "give people rides"
+
 	page "and provides a ve-"
 	next "ry comfortable way"
 	next "to get around.@"
diff --git a/data/pokemon/dex_entries/larvitar.asm b/data/pokemon/dex_entries/larvitar.asm
index 14ec08c7b..fa8145626 100644
--- a/data/pokemon/dex_entries/larvitar.asm
+++ b/data/pokemon/dex_entries/larvitar.asm
@@ -1,10 +1,10 @@
-; LarvitarPokedexEntry: ; 0x1d169c
 	db "ROCK SKIN@" ; species name
 	dw 200, 1590 ; height, weight
 
 	db   "Born deep under-"
 	next "ground, this"
 	next "#MON becomes a"
+
 	page "pupa after eating"
 	next "enough dirt to"
 	next "make a mountain.@"
diff --git a/data/pokemon/dex_entries/ledian.asm b/data/pokemon/dex_entries/ledian.asm
index a112aa722..90a21d427 100644
--- a/data/pokemon/dex_entries/ledian.asm
+++ b/data/pokemon/dex_entries/ledian.asm
@@ -1,10 +1,10 @@
-; LedianPokedexEntry: ; 0x1ccfa0
 	db "FIVE STAR@" ; species name
 	dw 407, 780 ; height, weight
 
 	db   "In the daytime"
 	next "when it gets warm,"
 	next "it curls up inside"
+
 	page "a big leaf and"
 	next "drifts off into"
 	next "a deep slumber.@"
diff --git a/data/pokemon/dex_entries/ledyba.asm b/data/pokemon/dex_entries/ledyba.asm
index 1e62ab4b1..71ed42a8d 100644
--- a/data/pokemon/dex_entries/ledyba.asm
+++ b/data/pokemon/dex_entries/ledyba.asm
@@ -1,10 +1,10 @@
-; LedybaPokedexEntry: ; 0x1ccf2c
 	db "FIVE STAR@" ; species name
 	dw 303, 240 ; height, weight
 
 	db   "It is timid and"
 	next "clusters together"
 	next "with others. The"
+
 	page "fluid secreted by"
 	next "its feet indicates"
 	next "its location.@"
diff --git a/data/pokemon/dex_entries/lickitung.asm b/data/pokemon/dex_entries/lickitung.asm
index 0003f14dc..b5aa73af5 100644
--- a/data/pokemon/dex_entries/lickitung.asm
+++ b/data/pokemon/dex_entries/lickitung.asm
@@ -1,10 +1,10 @@
-; LickitungPokedexEntry: ; 0x1b9210
 	db "LICKING@" ; species name
 	dw 311, 1440 ; height, weight
 
 	db   "It has a tongue"
 	next "that is over 6'6''"
 	next "long. It uses this"
+
 	page "long tongue to"
 	next "lick its body"
 	next "clean.@"
diff --git a/data/pokemon/dex_entries/lugia.asm b/data/pokemon/dex_entries/lugia.asm
index c15345300..8fa0dcf1f 100644
--- a/data/pokemon/dex_entries/lugia.asm
+++ b/data/pokemon/dex_entries/lugia.asm
@@ -1,10 +1,10 @@
-; LugiaPokedexEntry: ; 0x1d17e9
 	db "DIVING@" ; species name
 	dw 1701, 4760 ; height, weight
 
 	db   "It has an incred-"
 	next "ible ability to"
 	next "calm raging sto-"
+
 	page "rms. It is said"
 	next "that LUGIA appears"
 	next "when storms start.@"
diff --git a/data/pokemon/dex_entries/machamp.asm b/data/pokemon/dex_entries/machamp.asm
index 0ff42bf5f..2a84a6815 100644
--- a/data/pokemon/dex_entries/machamp.asm
+++ b/data/pokemon/dex_entries/machamp.asm
@@ -1,10 +1,10 @@
-; MachampPokedexEntry: ; 0x1b8133
 	db "SUPERPOWER@" ; species name
 	dw 503, 2870 ; height, weight
 
 	db   "With four arms"
 	next "that react more"
 	next "quickly than it"
+
 	page "can think, it can"
 	next "execute many"
 	next "punches at once.@"
diff --git a/data/pokemon/dex_entries/machoke.asm b/data/pokemon/dex_entries/machoke.asm
index 53523a832..fa7642ee7 100644
--- a/data/pokemon/dex_entries/machoke.asm
+++ b/data/pokemon/dex_entries/machoke.asm
@@ -1,10 +1,10 @@
-; MachokePokedexEntry: ; 0x1b80cb
 	db "SUPERPOWER@" ; species name
 	dw 411, 1550 ; height, weight
 
 	db   "This tough #MON"
 	next "always stays in"
 	next "the zone. Its"
+
 	page "muscles become"
 	next "thicker after"
 	next "every battle.@"
diff --git a/data/pokemon/dex_entries/machop.asm b/data/pokemon/dex_entries/machop.asm
index aba71bc04..d50eb0aa7 100644
--- a/data/pokemon/dex_entries/machop.asm
+++ b/data/pokemon/dex_entries/machop.asm
@@ -1,10 +1,10 @@
-; MachopPokedexEntry: ; 0x1b8065
 	db "SUPERPOWER@" ; species name
 	dw 207, 430 ; height, weight
 
 	db   "It trains by"
 	next "lifting rocks in"
 	next "the mountains. It"
+
 	page "can even pick up a"
 	next "GRAVELER with"
 	next "ease.@"
diff --git a/data/pokemon/dex_entries/magby.asm b/data/pokemon/dex_entries/magby.asm
index 53f9e1129..013d96670 100644
--- a/data/pokemon/dex_entries/magby.asm
+++ b/data/pokemon/dex_entries/magby.asm
@@ -1,10 +1,10 @@
-; MagbyPokedexEntry: ; 0x1d140e
 	db "LIVE COAL@" ; species name
 	dw 204, 470 ; height, weight
 
 	db   "It naturally spits"
 	next "an 1100-degree"
 	next "flame. It is said"
+
 	page "when many appear,"
 	next "it heralds a"
 	next "volcanic eruption.@"
diff --git a/data/pokemon/dex_entries/magcargo.asm b/data/pokemon/dex_entries/magcargo.asm
index 5f1122906..8bbb84593 100644
--- a/data/pokemon/dex_entries/magcargo.asm
+++ b/data/pokemon/dex_entries/magcargo.asm
@@ -1,10 +1,10 @@
-; MagcargoPokedexEntry: ; 0x1d0b21
 	db "LAVA@" ; species name
 	dw 207, 1210 ; height, weight
 
 	db   "Its body is as hot"
 	next "as lava and is"
 	next "always billowing."
+
 	page "Flames will"
 	next "occasionally burst"
 	next "from its shell.@"
diff --git a/data/pokemon/dex_entries/magikarp.asm b/data/pokemon/dex_entries/magikarp.asm
index 765840899..2be156fcc 100644
--- a/data/pokemon/dex_entries/magikarp.asm
+++ b/data/pokemon/dex_entries/magikarp.asm
@@ -1,10 +1,10 @@
-; MagikarpPokedexEntry: ; 0x1cc000
 	db "FISH@" ; species name
 	dw 211, 220 ; height, weight
 
 	db   "This weak and"
 	next "pathetic #MON"
 	next "gets easily pushed"
+
 	page "along rivers when"
 	next "there are strong"
 	next "currents.@"
diff --git a/data/pokemon/dex_entries/magmar.asm b/data/pokemon/dex_entries/magmar.asm
index 1bfa961f9..f62544b50 100644
--- a/data/pokemon/dex_entries/magmar.asm
+++ b/data/pokemon/dex_entries/magmar.asm
@@ -1,10 +1,10 @@
-; MagmarPokedexEntry: ; 0x1b9994
 	db "SPITFIRE@" ; species name
 	dw 403, 980 ; height, weight
 
 	db   "It moves more"
 	next "frequently in hot"
 	next "areas. It can heal"
+
 	page "itself by dipping"
 	next "its wound into"
 	next "lava.@"
diff --git a/data/pokemon/dex_entries/magnemite.asm b/data/pokemon/dex_entries/magnemite.asm
index e7703e050..646bd80f4 100644
--- a/data/pokemon/dex_entries/magnemite.asm
+++ b/data/pokemon/dex_entries/magnemite.asm
@@ -1,10 +1,10 @@
-; MagnemitePokedexEntry: ; 0x1b869d
 	db "MAGNET@" ; species name
 	dw 100, 130 ; height, weight
 
 	db   "The electricity"
 	next "emitted by the"
 	next "units on each side"
+
 	page "of its body cause"
 	next "it to become a"
 	next "strong magnet.@"
diff --git a/data/pokemon/dex_entries/magneton.asm b/data/pokemon/dex_entries/magneton.asm
index 115506ad6..fff66dec7 100644
--- a/data/pokemon/dex_entries/magneton.asm
+++ b/data/pokemon/dex_entries/magneton.asm
@@ -1,10 +1,10 @@
-; MagnetonPokedexEntry: ; 0x1b870a
 	db "MAGNET@" ; species name
 	dw 303, 1320 ; height, weight
 
 	db   "When many"
 	next "MAGNETON gather"
 	next "together, the"
+
 	page "resulting magnetic"
 	next "storm disrupts"
 	next "radio waves.@"
diff --git a/data/pokemon/dex_entries/mankey.asm b/data/pokemon/dex_entries/mankey.asm
index 59dfc4919..344e6ca0f 100644
--- a/data/pokemon/dex_entries/mankey.asm
+++ b/data/pokemon/dex_entries/mankey.asm
@@ -1,10 +1,10 @@
-; MankeyPokedexEntry: ; 0x182dbd
 	db "PIG MONKEY@" ; species name
 	dw 108, 620 ; height, weight
 
 	db   "It lives in groups"
 	next "in the treetops."
 	next "If it loses sight"
+
 	page "of its group, it"
 	next "becomes infuriated"
 	next "by its loneliness.@"
diff --git a/data/pokemon/dex_entries/mantine.asm b/data/pokemon/dex_entries/mantine.asm
index 880c4f179..02d4c445a 100644
--- a/data/pokemon/dex_entries/mantine.asm
+++ b/data/pokemon/dex_entries/mantine.asm
@@ -1,10 +1,10 @@
-; MantinePokedexEntry: ; 0x1d0e25
 	db "KITE@" ; species name
 	dw 611, 4850 ; height, weight
 
 	db   "It swims along"
 	next "freely, eating"
 	next "things that swim"
+
 	page "into its mouth."
 	next "Its whole body is"
 	next "very coarse.@"
diff --git a/data/pokemon/dex_entries/mareep.asm b/data/pokemon/dex_entries/mareep.asm
index 94f78ee31..3f0492ade 100644
--- a/data/pokemon/dex_entries/mareep.asm
+++ b/data/pokemon/dex_entries/mareep.asm
@@ -1,10 +1,10 @@
-; MareepPokedexEntry: ; 0x1cd551
 	db "WOOL@" ; species name
 	dw 200, 170 ; height, weight
 
 	db   "It stores lots of"
 	next "air in its soft"
 	next "fur, allowing it"
+
 	page "to stay cool in"
 	next "summer and warm"
 	next "in winter.@"
diff --git a/data/pokemon/dex_entries/marill.asm b/data/pokemon/dex_entries/marill.asm
index 6afbc2902..1b87ba23c 100644
--- a/data/pokemon/dex_entries/marill.asm
+++ b/data/pokemon/dex_entries/marill.asm
@@ -1,10 +1,10 @@
-; MarillPokedexEntry: ; 0x1cd705
 	db "AQUAMOUSE@" ; species name
 	dw 104, 190 ; height, weight
 
 	db   "The fur on its"
 	next "body naturally"
 	next "repels water. It"
+
 	page "can stay dry, even"
 	next "when it plays in"
 	next "the water.@"
diff --git a/data/pokemon/dex_entries/marowak.asm b/data/pokemon/dex_entries/marowak.asm
index 01baf04e3..18b3f2e5d 100644
--- a/data/pokemon/dex_entries/marowak.asm
+++ b/data/pokemon/dex_entries/marowak.asm
@@ -1,10 +1,10 @@
-; MarowakPokedexEntry: ; 0x1b90d2
 	db "BONEKEEPER@" ; species name
 	dw 303, 990 ; height, weight
 
 	db   "Somewhere in the"
 	next "world is a ceme-"
 	next "tery just for"
+
 	page "MAROWAK. It gets"
 	next "its bones from"
 	next "those graves.@"
diff --git a/data/pokemon/dex_entries/meganium.asm b/data/pokemon/dex_entries/meganium.asm
index dead64ff5..711c12b57 100644
--- a/data/pokemon/dex_entries/meganium.asm
+++ b/data/pokemon/dex_entries/meganium.asm
@@ -1,10 +1,10 @@
-; MeganiumPokedexEntry: ; 0x1cca54
 	db "HERB@" ; species name
 	dw 511, 2220 ; height, weight
 
 	db   "Anyone who stands"
 	next "beside it becomes"
 	next "refreshed, just as"
+
 	page "if they were"
 	next "relaxing in a"
 	next "sunny forest.@"
diff --git a/data/pokemon/dex_entries/meowth.asm b/data/pokemon/dex_entries/meowth.asm
index 9fe66977b..9897a3b60 100644
--- a/data/pokemon/dex_entries/meowth.asm
+++ b/data/pokemon/dex_entries/meowth.asm
@@ -1,10 +1,10 @@
-; MeowthPokedexEntry: ; 0x182c08
 	db "SCRATCHCAT@" ; species name
 	dw 104, 90 ; height, weight
 
 	db   "It loves things"
 	next "that sparkle. When"
 	next "it sees a shiny"
+
 	page "object, the gold"
 	next "coin on its head"
 	next "shines too.@"
diff --git a/data/pokemon/dex_entries/metapod.asm b/data/pokemon/dex_entries/metapod.asm
index b2c6b78b7..9ee9b8a71 100644
--- a/data/pokemon/dex_entries/metapod.asm
+++ b/data/pokemon/dex_entries/metapod.asm
@@ -1,10 +1,10 @@
-; MetapodPokedexEntry: ; 0x181ace
 	db "COCOON@" ; species name
 	dw 204, 220 ; height, weight
 
 	db   "This is its pre-"
 	next "evolved form. At"
 	next "this stage, it can"
+
 	page "only harden, so it"
 	next "remains motionless"
 	next "to avoid attack.@"
diff --git a/data/pokemon/dex_entries/mew.asm b/data/pokemon/dex_entries/mew.asm
index 9da7f6a17..66682b14c 100644
--- a/data/pokemon/dex_entries/mew.asm
+++ b/data/pokemon/dex_entries/mew.asm
@@ -1,10 +1,10 @@
-; MewPokedexEntry: ; 0x1cc915
 	db "NEW SPECIE@" ; species name
 	dw 104, 90 ; height, weight
 
 	db   "Because it can"
 	next "learn any move,"
 	next "some people began"
+
 	page "research to see if"
 	next "it is the ancestor"
 	next "of all #MON.@"
diff --git a/data/pokemon/dex_entries/mewtwo.asm b/data/pokemon/dex_entries/mewtwo.asm
index eb41ebb90..c49e553d5 100644
--- a/data/pokemon/dex_entries/mewtwo.asm
+++ b/data/pokemon/dex_entries/mewtwo.asm
@@ -1,10 +1,10 @@
-; MewtwoPokedexEntry: ; 0x1cc8ae
 	db "GENETIC@" ; species name
 	dw 607, 2690 ; height, weight
 
 	db   "Said to rest qui-"
 	next "etly in an"
 	next "undiscovered cave,"
+
 	page "this #MON was"
 	next "created solely for"
 	next "battling.@"
diff --git a/data/pokemon/dex_entries/miltank.asm b/data/pokemon/dex_entries/miltank.asm
index 1f85ef668..660f652bc 100644
--- a/data/pokemon/dex_entries/miltank.asm
+++ b/data/pokemon/dex_entries/miltank.asm
@@ -1,10 +1,10 @@
-; MiltankPokedexEntry: ; 0x1d1482
 	db "MILK COW@" ; species name
 	dw 311, 1660 ; height, weight
 
 	db   "In order to milk a"
 	next "MILTANK, one must"
 	next "have a knack for"
+
 	page "rhythmically pull-"
 	next "ing up and down"
 	next "on its udders.@"
diff --git a/data/pokemon/dex_entries/misdreavus.asm b/data/pokemon/dex_entries/misdreavus.asm
index c3f1b002a..6e7e510a7 100644
--- a/data/pokemon/dex_entries/misdreavus.asm
+++ b/data/pokemon/dex_entries/misdreavus.asm
@@ -1,10 +1,10 @@
-; MisdreavusPokedexEntry: ; 0x1d0301
 	db "SCREECH@" ; species name
 	dw 204, 20 ; height, weight
 
 	db   "It loves to watch"
 	next "people it's scar-"
 	next "ed. It frightens"
+
 	page "them by screaming"
 	next "loudly or appear-"
 	next "ing suddenly.@"
diff --git a/data/pokemon/dex_entries/moltres.asm b/data/pokemon/dex_entries/moltres.asm
index f459d622e..d4ec793d5 100644
--- a/data/pokemon/dex_entries/moltres.asm
+++ b/data/pokemon/dex_entries/moltres.asm
@@ -1,10 +1,10 @@
-; MoltresPokedexEntry: ; 0x1cc706
 	db "FLAME@" ; species name
 	dw 607, 1320 ; height, weight
 
 	db   "Legendary bird"
 	next "#MON. It is"
 	next "said to migrate"
+
 	page "from the south"
 	next "along with the"
 	next "spring.@"
diff --git a/data/pokemon/dex_entries/mr__mime.asm b/data/pokemon/dex_entries/mr__mime.asm
index dce25be67..d96b9b37b 100644
--- a/data/pokemon/dex_entries/mr__mime.asm
+++ b/data/pokemon/dex_entries/mr__mime.asm
@@ -1,10 +1,10 @@
-; MrMimePokedexEntry: ; 0x1b97ea
 	db "BARRIER@" ; species name
 	dw 403, 1200 ; height, weight
 
 	db   "It uses the"
 	next "mysterious"
 	next "power it has in"
+
 	page "its fingers to"
 	next "solidify air into"
 	next "an invisible wall.@"
diff --git a/data/pokemon/dex_entries/muk.asm b/data/pokemon/dex_entries/muk.asm
index 49512c99f..6db1f1867 100644
--- a/data/pokemon/dex_entries/muk.asm
+++ b/data/pokemon/dex_entries/muk.asm
@@ -1,10 +1,10 @@
-; MukPokedexEntry: ; 0x1b89fc
 	db "SLUDGE@" ; species name
 	dw 311, 660 ; height, weight
 
 	db   "As it moves, a"
 	next "very strong poison"
 	next "leaks from it,"
+
 	page "making the ground"
 	next "there barren for"
 	next "three years.@"
diff --git a/data/pokemon/dex_entries/murkrow.asm b/data/pokemon/dex_entries/murkrow.asm
index 6a0f42145..90d90bfbf 100644
--- a/data/pokemon/dex_entries/murkrow.asm
+++ b/data/pokemon/dex_entries/murkrow.asm
@@ -1,10 +1,10 @@
-; MurkrowPokedexEntry: ; 0x1d021e
 	db "DARKNESS@" ; species name
 	dw 108, 50 ; height, weight
 
 	db   "It hides any shiny"
 	next "object it finds in"
 	next "a secret location."
+
 	page "MURKROW and"
 	next "MEOWTH loot one"
 	next "another's stashes.@"
diff --git a/data/pokemon/dex_entries/natu.asm b/data/pokemon/dex_entries/natu.asm
index 20958dbff..04c47970c 100644
--- a/data/pokemon/dex_entries/natu.asm
+++ b/data/pokemon/dex_entries/natu.asm
@@ -1,10 +1,10 @@
-; NatuPokedexEntry: ; 0x1cd47d
 	db "LITTLE BIRD@" ; species name
 	dw 8, 40 ; height, weight
 
 	db   "It is extremely"
 	next "good at climbing"
 	next "tree trunks and"
+
 	page "likes to eat the"
 	next "new sprouts on"
 	next "the trees.@"
diff --git a/data/pokemon/dex_entries/nidoking.asm b/data/pokemon/dex_entries/nidoking.asm
index 97c203064..a260ceadb 100644
--- a/data/pokemon/dex_entries/nidoking.asm
+++ b/data/pokemon/dex_entries/nidoking.asm
@@ -1,10 +1,10 @@
-; NidokingPokedexEntry: ; 0x182463
 	db "DRILL@" ; species name
 	dw 407, 1370 ; height, weight
 
 	db   "It uses its thick"
 	next "arms, legs and"
 	next "tail to attack"
+
 	page "forcefully. Melee"
 	next "combat is its"
 	next "specialty.@"
diff --git a/data/pokemon/dex_entries/nidoqueen.asm b/data/pokemon/dex_entries/nidoqueen.asm
index c0f711eb4..534546721 100644
--- a/data/pokemon/dex_entries/nidoqueen.asm
+++ b/data/pokemon/dex_entries/nidoqueen.asm
@@ -1,10 +1,10 @@
-; NidoqueenPokedexEntry: ; 0x18232e
 	db "DRILL@" ; species name
 	dw 403, 1320 ; height, weight
 
 	db   "The hard scales"
 	next "that cover its"
 	next "strong body serve"
+
 	page "as excellent"
 	next "protection from"
 	next "any attack.@"
diff --git a/data/pokemon/dex_entries/nidoran_f.asm b/data/pokemon/dex_entries/nidoran_f.asm
index 4e7299b0d..9181edc20 100644
--- a/data/pokemon/dex_entries/nidoran_f.asm
+++ b/data/pokemon/dex_entries/nidoran_f.asm
@@ -1,10 +1,10 @@
-; NidoranFPokedexEntry: ; 0x18224b
 	db "POISON PIN@" ; species name
 	dw 104, 150 ; height, weight
 
 	db   "Small and very"
 	next "docile, it pro-"
 	next "tects itself with"
+
 	page "its small, poison-"
 	next "ous horn when"
 	next "attacked.@"
diff --git a/data/pokemon/dex_entries/nidoran_m.asm b/data/pokemon/dex_entries/nidoran_m.asm
index 8970afc36..51ec0a530 100644
--- a/data/pokemon/dex_entries/nidoran_m.asm
+++ b/data/pokemon/dex_entries/nidoran_m.asm
@@ -1,10 +1,10 @@
-; NidoranMPokedexEntry: ; 0x182392
 	db "POISON PIN@" ; species name
 	dw 108, 200 ; height, weight
 
 	db   "It constantly"
 	next "moves its large"
 	next "ears in many"
+
 	page "directions in"
 	next "order to detect"
 	next "danger right away.@"
diff --git a/data/pokemon/dex_entries/nidorina.asm b/data/pokemon/dex_entries/nidorina.asm
index 93c1e164d..e1670a187 100644
--- a/data/pokemon/dex_entries/nidorina.asm
+++ b/data/pokemon/dex_entries/nidorina.asm
@@ -1,10 +1,10 @@
-; NidorinaPokedexEntry: ; 0x1822b6
 	db "POISON PIN@" ; species name
 	dw 207, 440 ; height, weight
 
 	db   "It has a docile"
 	next "nature. If it is"
 	next "threatened with"
+
 	page "attack, it raises"
 	next "the barbs that are"
 	next "all over its body.@"
diff --git a/data/pokemon/dex_entries/nidorino.asm b/data/pokemon/dex_entries/nidorino.asm
index 6b1403ad2..3f00ac0a5 100644
--- a/data/pokemon/dex_entries/nidorino.asm
+++ b/data/pokemon/dex_entries/nidorino.asm
@@ -1,10 +1,10 @@
-; NidorinoPokedexEntry: ; 0x1823fd
 	db "POISON PIN@" ; species name
 	dw 211, 430 ; height, weight
 
 	db   "It is easily"
 	next "agitated and uses"
 	next "its horn for"
+
 	page "offense as soon as"
 	next "it notices an"
 	next "attacker.@"
diff --git a/data/pokemon/dex_entries/ninetales.asm b/data/pokemon/dex_entries/ninetales.asm
index fd3a66ffb..c0295e0f7 100644
--- a/data/pokemon/dex_entries/ninetales.asm
+++ b/data/pokemon/dex_entries/ninetales.asm
@@ -1,10 +1,10 @@
-; NinetalesPokedexEntry: ; 0x18260c
 	db "FOX@" ; species name
 	dw 307, 440 ; height, weight
 
 	db   "It is said to live"
 	next "a thousand years,"
 	next "and each of its"
+
 	page "tails is loaded"
 	next "with supernatural"
 	next "powers.@"
diff --git a/data/pokemon/dex_entries/noctowl.asm b/data/pokemon/dex_entries/noctowl.asm
index b939cfe05..ed04cb200 100644
--- a/data/pokemon/dex_entries/noctowl.asm
+++ b/data/pokemon/dex_entries/noctowl.asm
@@ -1,10 +1,10 @@
-; NoctowlPokedexEntry: ; 0x1cceb9
 	db "OWL@" ; species name
 	dw 503, 900 ; height, weight
 
 	db   "Its extremely soft"
 	next "feathers make no"
 	next "sound in flight."
+
 	page "It silently sneaks"
 	next "up on prey without"
 	next "being detected.@"
diff --git a/data/pokemon/dex_entries/octillery.asm b/data/pokemon/dex_entries/octillery.asm
index 902c1bf9a..66c539155 100644
--- a/data/pokemon/dex_entries/octillery.asm
+++ b/data/pokemon/dex_entries/octillery.asm
@@ -1,10 +1,10 @@
-; OctilleryPokedexEntry: ; 0x1d0d42
 	db "JET@" ; species name
 	dw 211, 630 ; height, weight
 
 	db   "Its instinct is to"
 	next "bury itself in"
 	next "holes. It often"
+
 	page "steals the nesting"
 	next "holes of others to"
 	next "sleep in them.@"
diff --git a/data/pokemon/dex_entries/oddish.asm b/data/pokemon/dex_entries/oddish.asm
index 84560c113..e8a63d81f 100644
--- a/data/pokemon/dex_entries/oddish.asm
+++ b/data/pokemon/dex_entries/oddish.asm
@@ -1,10 +1,10 @@
-; OddishPokedexEntry: ; 0x182836
 	db "WEED@" ; species name
 	dw 108, 120 ; height, weight
 
 	db   "During the day, it"
 	next "stays in the cold"
 	next "underground to"
+
 	page "avoid the sun."
 	next "It grows by bath-"
 	next "ing in moonlight.@"
diff --git a/data/pokemon/dex_entries/omanyte.asm b/data/pokemon/dex_entries/omanyte.asm
index 9f7948fe0..70c556910 100644
--- a/data/pokemon/dex_entries/omanyte.asm
+++ b/data/pokemon/dex_entries/omanyte.asm
@@ -1,10 +1,10 @@
-; OmanytePokedexEntry: ; 0x1cc3c1
 	db "SPIRAL@" ; species name
 	dw 104, 170 ; height, weight
 
 	db   "In prehistoric"
 	next "times, it swam on"
 	next "the sea floor,"
+
 	page "eating plankton."
 	next "Its fossils are"
 	next "sometimes found.@"
diff --git a/data/pokemon/dex_entries/omastar.asm b/data/pokemon/dex_entries/omastar.asm
index 65ba92356..f2cc0caba 100644
--- a/data/pokemon/dex_entries/omastar.asm
+++ b/data/pokemon/dex_entries/omastar.asm
@@ -1,10 +1,10 @@
-; OmastarPokedexEntry: ; 0x1cc42e
 	db "SPIRAL@" ; species name
 	dw 303, 770 ; height, weight
 
 	db   "Its heavy shell"
 	next "allowed it to"
 	next "reach only nearby"
+
 	page "food. This could"
 	next "be the reason it"
 	next "is extinct.@"
diff --git a/data/pokemon/dex_entries/onix.asm b/data/pokemon/dex_entries/onix.asm
index f0f88fcff..12164c5fb 100644
--- a/data/pokemon/dex_entries/onix.asm
+++ b/data/pokemon/dex_entries/onix.asm
@@ -1,10 +1,10 @@
-; OnixPokedexEntry: ; 0x1b8c98
 	db "ROCK SNAKE@" ; species name
 	dw 2810, 4630 ; height, weight
 
 	db   "As it digs through"
 	next "the ground, it"
 	next "absorbs many hard"
+
 	page "objects. This is"
 	next "what makes its"
 	next "body so solid.@"
diff --git a/data/pokemon/dex_entries/paras.asm b/data/pokemon/dex_entries/paras.asm
index 152e1fcc0..62d473c53 100644
--- a/data/pokemon/dex_entries/paras.asm
+++ b/data/pokemon/dex_entries/paras.asm
@@ -1,10 +1,10 @@
-; ParasPokedexEntry: ; 0x18297f
 	db "MUSHROOM@" ; species name
 	dw 100, 120 ; height, weight
 
 	db   "The tochukaso"
 	next "growing on this"
 	next "#MON's back"
+
 	page "orders it to"
 	next "extract juice from"
 	next "tree trunks.@"
diff --git a/data/pokemon/dex_entries/parasect.asm b/data/pokemon/dex_entries/parasect.asm
index bd912212e..6fbf4f7f9 100644
--- a/data/pokemon/dex_entries/parasect.asm
+++ b/data/pokemon/dex_entries/parasect.asm
@@ -1,10 +1,10 @@
-; ParasectPokedexEntry: ; 0x1829e2
 	db "MUSHROOM@" ; species name
 	dw 303, 650 ; height, weight
 
 	db   "When nothing's"
 	next "left to extract"
 	next "from the bug, the"
+
 	page "mushrooms on its"
 	next "back leave spores"
 	next "on the bug's egg.@"
diff --git a/data/pokemon/dex_entries/persian.asm b/data/pokemon/dex_entries/persian.asm
index 7ce74f6f8..9264eeca2 100644
--- a/data/pokemon/dex_entries/persian.asm
+++ b/data/pokemon/dex_entries/persian.asm
@@ -1,10 +1,10 @@
-; PersianPokedexEntry: ; 0x182c78
 	db "CLASSY CAT@" ; species name
 	dw 303, 710 ; height, weight
 
 	db   "Behind its lithe,"
 	next "elegant appearance"
 	next "lies a barbaric"
+
 	page "side. It will tear"
 	next "apart its prey on"
 	next "a mere whim.@"
diff --git a/data/pokemon/dex_entries/phanpy.asm b/data/pokemon/dex_entries/phanpy.asm
index a7393e546..c32a6889e 100644
--- a/data/pokemon/dex_entries/phanpy.asm
+++ b/data/pokemon/dex_entries/phanpy.asm
@@ -1,10 +1,10 @@
-; PhanpyPokedexEntry: ; 0x1d1038
 	db "LONG NOSE@" ; species name
 	dw 108, 740 ; height, weight
 
 	db   "During the desert-"
 	next "ed morning hours,"
 	next "it comes ashore"
+
 	page "where it deftly"
 	next "uses its trunk to"
 	next "take a shower.@"
diff --git a/data/pokemon/dex_entries/pichu.asm b/data/pokemon/dex_entries/pichu.asm
index b31976aaf..2d82c6fb1 100644
--- a/data/pokemon/dex_entries/pichu.asm
+++ b/data/pokemon/dex_entries/pichu.asm
@@ -1,10 +1,10 @@
-; PichuPokedexEntry: ; 0x1cd243
 	db "TINY MOUSE@" ; species name
 	dw 100, 40 ; height, weight
 
 	db   "It is unskilled at"
 	next "storing electric"
 	next "power. Any kind of"
+
 	page "shock causes it to"
 	next "discharge energy"
 	next "spontaneously.@"
diff --git a/data/pokemon/dex_entries/pidgeot.asm b/data/pokemon/dex_entries/pidgeot.asm
index 16a877427..07df086f2 100644
--- a/data/pokemon/dex_entries/pidgeot.asm
+++ b/data/pokemon/dex_entries/pidgeot.asm
@@ -1,10 +1,10 @@
-; PidgeotPokedexEntry: ; 0x181dd7
 	db "BIRD@" ; species name
 	dw 411, 870 ; height, weight
 
 	db   "Its outstanding"
 	next "vision allows it"
 	next "to spot splashing"
+
 	page "MAGIKARP, even"
 	next "while flying at"
 	next "3300 feet.@"
diff --git a/data/pokemon/dex_entries/pidgeotto.asm b/data/pokemon/dex_entries/pidgeotto.asm
index 1ab6fde5c..30a1ccebd 100644
--- a/data/pokemon/dex_entries/pidgeotto.asm
+++ b/data/pokemon/dex_entries/pidgeotto.asm
@@ -1,10 +1,10 @@
-; PidgeottoPokedexEntry: ; 0x181d75
 	db "BIRD@" ; species name
 	dw 307, 660 ; height, weight
 
 	db   "It slowly flies in"
 	next "a circular pat-"
 	next "tern, all the"
+
 	page "while keeping a"
 	next "sharp lookout for"
 	next "prey.@"
diff --git a/data/pokemon/dex_entries/pidgey.asm b/data/pokemon/dex_entries/pidgey.asm
index 491dfb9b9..cde05eb61 100644
--- a/data/pokemon/dex_entries/pidgey.asm
+++ b/data/pokemon/dex_entries/pidgey.asm
@@ -1,10 +1,10 @@
-; PidgeyPokedexEntry: ; 0x181cfa
 	db "TINY BIRD@" ; species name
 	dw 100, 40 ; height, weight
 
 	db   "It rapidly flaps"
 	next "its wings in the"
 	next "grass, stirring up"
+
 	page "a dust cloud that"
 	next "drives insect prey"
 	next "out into the open.@"
diff --git a/data/pokemon/dex_entries/pikachu.asm b/data/pokemon/dex_entries/pikachu.asm
index 680e24673..699900f18 100644
--- a/data/pokemon/dex_entries/pikachu.asm
+++ b/data/pokemon/dex_entries/pikachu.asm
@@ -1,10 +1,10 @@
-; PikachuPokedexEntry: ; 0x1820ad
 	db "MOUSE@" ; species name
 	dw 104, 130 ; height, weight
 
 	db   "When it is anger-"
 	next "ed, it immediately"
 	next "discharges the"
+
 	page "energy stored in"
 	next "the pouches in its"
 	next "cheeks.@"
diff --git a/data/pokemon/dex_entries/piloswine.asm b/data/pokemon/dex_entries/piloswine.asm
index 326ea4503..1c5aa36c0 100644
--- a/data/pokemon/dex_entries/piloswine.asm
+++ b/data/pokemon/dex_entries/piloswine.asm
@@ -1,10 +1,10 @@
-; PiloswinePokedexEntry: ; 0x1d0c01
 	db "SWINE@" ; species name
 	dw 307, 1230 ; height, weight
 
 	db   "Although its legs"
 	next "are short, its"
 	next "rugged hooves"
+
 	page "prevent it from"
 	next "slipping, even on"
 	next "icy ground.@"
diff --git a/data/pokemon/dex_entries/pineco.asm b/data/pokemon/dex_entries/pineco.asm
index 9781b094e..7d8d990b9 100644
--- a/data/pokemon/dex_entries/pineco.asm
+++ b/data/pokemon/dex_entries/pineco.asm
@@ -1,10 +1,10 @@
-; PinecoPokedexEntry: ; 0x1d04b0
 	db "BAGWORM@" ; species name
 	dw 200, 160 ; height, weight
 
 	db   "It spits out a"
 	next "fluid that it uses"
 	next "to glue tree bark"
+
 	page "to its body. The"
 	next "fluid hardens when"
 	next "it touches air.@"
diff --git a/data/pokemon/dex_entries/pinsir.asm b/data/pokemon/dex_entries/pinsir.asm
index c236b3594..331a8d4f5 100644
--- a/data/pokemon/dex_entries/pinsir.asm
+++ b/data/pokemon/dex_entries/pinsir.asm
@@ -1,10 +1,10 @@
-; PinsirPokedexEntry: ; 0x1b99fb
 	db "STAGBEETLE@" ; species name
 	dw 411, 1210 ; height, weight
 
 	db   "When the tempera-"
 	next "ture drops at"
 	next "night, it sleeps"
+
 	page "on treetops or"
 	next "among roots where"
 	next "it is well hidden.@"
diff --git a/data/pokemon/dex_entries/politoed.asm b/data/pokemon/dex_entries/politoed.asm
index 0dea3d572..a085ad58a 100644
--- a/data/pokemon/dex_entries/politoed.asm
+++ b/data/pokemon/dex_entries/politoed.asm
@@ -1,10 +1,10 @@
-; PolitoedPokedexEntry: ; 0x1cd84b
 	db "FROG@" ; species name
 	dw 307, 750 ; height, weight
 
 	db   "When it expands"
 	next "its throat to"
 	next "croak out a tune,"
+
 	page "nearby POLIWAG and"
 	next "POLIWHIRL gather"
 	next "immediately.@"
diff --git a/data/pokemon/dex_entries/poliwag.asm b/data/pokemon/dex_entries/poliwag.asm
index d21677cc4..9183a15da 100644
--- a/data/pokemon/dex_entries/poliwag.asm
+++ b/data/pokemon/dex_entries/poliwag.asm
@@ -1,10 +1,10 @@
-; PoliwagPokedexEntry: ; 0x182f91
 	db "TADPOLE@" ; species name
 	dw 200, 270 ; height, weight
 
 	db   "The swirl on its"
 	next "belly is its"
 	next "insides showing"
+
 	page "through the skin."
 	next "It looks clearer"
 	next "after it eats.@"
diff --git a/data/pokemon/dex_entries/poliwhirl.asm b/data/pokemon/dex_entries/poliwhirl.asm
index 69a6ee206..df4e0e6fd 100644
--- a/data/pokemon/dex_entries/poliwhirl.asm
+++ b/data/pokemon/dex_entries/poliwhirl.asm
@@ -1,10 +1,10 @@
-; PoliwhirlPokedexEntry: ; 0x182ffd
 	db "TADPOLE@" ; species name
 	dw 303, 440 ; height, weight
 
 	db   "Though it is"
 	next "skilled at walk-"
 	next "ing, it prefers to"
+
 	page "live underwater"
 	next "where there is"
 	next "less danger.@"
diff --git a/data/pokemon/dex_entries/poliwrath.asm b/data/pokemon/dex_entries/poliwrath.asm
index bb3e7dda5..4b4f23389 100644
--- a/data/pokemon/dex_entries/poliwrath.asm
+++ b/data/pokemon/dex_entries/poliwrath.asm
@@ -1,10 +1,10 @@
-; PoliwrathPokedexEntry: ; 0x183066
 	db "TADPOLE@" ; species name
 	dw 403, 1190 ; height, weight
 
 	db   "It can use its"
 	next "well-developed"
 	next "arms and legs to"
+
 	page "run on the surface"
 	next "of the water for a"
 	next "split second.@"
diff --git a/data/pokemon/dex_entries/ponyta.asm b/data/pokemon/dex_entries/ponyta.asm
index fa123cde1..0d82b7702 100644
--- a/data/pokemon/dex_entries/ponyta.asm
+++ b/data/pokemon/dex_entries/ponyta.asm
@@ -1,10 +1,10 @@
-; PonytaPokedexEntry: ; 0x1b84f2
 	db "FIRE HORSE@" ; species name
 	dw 303, 660 ; height, weight
 
 	db   "Training by"
 	next "jumping over grass"
 	next "that grows longer"
+
 	page "every day has made"
 	next "it a world-class"
 	next "jumper.@"
diff --git a/data/pokemon/dex_entries/porygon.asm b/data/pokemon/dex_entries/porygon.asm
index 9a73c9623..098a96d25 100644
--- a/data/pokemon/dex_entries/porygon.asm
+++ b/data/pokemon/dex_entries/porygon.asm
@@ -1,10 +1,10 @@
-; PorygonPokedexEntry: ; 0x1cc353
 	db "VIRTUAL@" ; species name
 	dw 207, 800 ; height, weight
 
 	db   "An artificial"
 	next "#MON created"
 	next "due to extensive"
+
 	page "research, it can"
 	next "perform only what"
 	next "is in its program.@"
diff --git a/data/pokemon/dex_entries/porygon2.asm b/data/pokemon/dex_entries/porygon2.asm
index 8591e0039..e4f5a2358 100644
--- a/data/pokemon/dex_entries/porygon2.asm
+++ b/data/pokemon/dex_entries/porygon2.asm
@@ -1,10 +1,10 @@
-; Porygon2PokedexEntry: ; 0x1d110c
 	db "VIRTUAL@" ; species name
 	dw 200, 720 ; height, weight
 
 	db   "This manmade"
 	next "#MON evolved"
 	next "from the latest"
+
 	page "technology. It"
 	next "may have unprog-"
 	next "rammed reactions.@"
diff --git a/data/pokemon/dex_entries/primeape.asm b/data/pokemon/dex_entries/primeape.asm
index 7d7f211cc..3a96c936c 100644
--- a/data/pokemon/dex_entries/primeape.asm
+++ b/data/pokemon/dex_entries/primeape.asm
@@ -1,10 +1,10 @@
-; PrimeapePokedexEntry: ; 0x182e39
 	db "PIG MONKEY@" ; species name
 	dw 303, 710 ; height, weight
 
 	db   "It will beat up"
 	next "anyone who makes"
 	next "it mad, even if it"
+
 	page "has to chase them"
 	next "until the end of"
 	next "the world.@"
diff --git a/data/pokemon/dex_entries/psyduck.asm b/data/pokemon/dex_entries/psyduck.asm
index 088b4ff76..6a58bc9f8 100644
--- a/data/pokemon/dex_entries/psyduck.asm
+++ b/data/pokemon/dex_entries/psyduck.asm
@@ -1,10 +1,10 @@
-; PsyduckPokedexEntry: ; 0x182cee
 	db "DUCK@" ; species name
 	dw 207, 430 ; height, weight
 
 	db   "The only time it"
 	next "can use its psy-"
 	next "chic power is when"
+
 	page "its sleeping brain"
 	next "cells happen to"
 	next "wake.@"
diff --git a/data/pokemon/dex_entries/pupitar.asm b/data/pokemon/dex_entries/pupitar.asm
index d35e457ad..ae8b5b3a4 100644
--- a/data/pokemon/dex_entries/pupitar.asm
+++ b/data/pokemon/dex_entries/pupitar.asm
@@ -1,10 +1,10 @@
-; PupitarPokedexEntry: ; 0x1d1709
 	db "HARD SHELL@" ; species name
 	dw 311, 3350 ; height, weight
 
 	db   "It will not stay"
 	next "still, even while"
 	next "it's a pupa. It"
+
 	page "already has arms"
 	next "and legs under its"
 	next "solid shell.@"
diff --git a/data/pokemon/dex_entries/quagsire.asm b/data/pokemon/dex_entries/quagsire.asm
index 053058d54..25bb2ab66 100644
--- a/data/pokemon/dex_entries/quagsire.asm
+++ b/data/pokemon/dex_entries/quagsire.asm
@@ -1,10 +1,10 @@
-; QuagsirePokedexEntry: ; 0x1d00dd
 	db "WATER FISH@" ; species name
 	dw 407, 1650 ; height, weight
 
 	db   "Its body is always"
 	next "slimy. It often"
 	next "bangs its head on"
+
 	page "the river bottom"
 	next "as it swims but"
 	next "seems not to care.@"
diff --git a/data/pokemon/dex_entries/quilava.asm b/data/pokemon/dex_entries/quilava.asm
index aaf8069af..97363c158 100644
--- a/data/pokemon/dex_entries/quilava.asm
+++ b/data/pokemon/dex_entries/quilava.asm
@@ -1,10 +1,10 @@
-; QuilavaPokedexEntry: ; 0x1ccb33
 	db "VOLCANO@" ; species name
 	dw 211, 420 ; height, weight
 
 	db   "Before battle, it"
 	next "turns its back on"
 	next "its opponent to"
+
 	page "demonstrate how"
 	next "ferociously its"
 	next "fire blazes.@"
diff --git a/data/pokemon/dex_entries/qwilfish.asm b/data/pokemon/dex_entries/qwilfish.asm
index d9529146f..c7405b980 100644
--- a/data/pokemon/dex_entries/qwilfish.asm
+++ b/data/pokemon/dex_entries/qwilfish.asm
@@ -1,10 +1,10 @@
-; QwilfishPokedexEntry: ; 0x1d07b1
 	db "BALLOON@" ; species name
 	dw 108, 90 ; height, weight
 
 	db   "When faced with a"
 	next "larger opponent,"
 	next "it swallows as"
+
 	page "much water as it"
 	next "can to match the"
 	next "opponent's size.@"
diff --git a/data/pokemon/dex_entries/raichu.asm b/data/pokemon/dex_entries/raichu.asm
index 886aef283..a17a5e9c2 100644
--- a/data/pokemon/dex_entries/raichu.asm
+++ b/data/pokemon/dex_entries/raichu.asm
@@ -1,10 +1,10 @@
-; RaichuPokedexEntry: ; 0x182117
 	db "MOUSE@" ; species name
 	dw 207, 660 ; height, weight
 
 	db   "If its electric"
 	next "pouches run empty,"
 	next "it raises its tail"
+
 	page "to gather electri-"
 	next "city from the"
 	next "atmosphere.@"
diff --git a/data/pokemon/dex_entries/raikou.asm b/data/pokemon/dex_entries/raikou.asm
index 315eb84ae..4f300635f 100644
--- a/data/pokemon/dex_entries/raikou.asm
+++ b/data/pokemon/dex_entries/raikou.asm
@@ -1,10 +1,10 @@
-; RaikouPokedexEntry: ; 0x1d156b
 	db "THUNDER@" ; species name
 	dw 603, 3920 ; height, weight
 
 	db   "This rough #MON"
 	next "stores energy"
 	next "inside its body,"
+
 	page "then sweeps across"
 	next "the land, shooting"
 	next "off electricity.@"
diff --git a/data/pokemon/dex_entries/rapidash.asm b/data/pokemon/dex_entries/rapidash.asm
index ae98e2cb8..051e557ef 100644
--- a/data/pokemon/dex_entries/rapidash.asm
+++ b/data/pokemon/dex_entries/rapidash.asm
@@ -1,10 +1,10 @@
-; RapidashPokedexEntry: ; 0x1b855e
 	db "FIRE HORSE@" ; species name
 	dw 507, 2090 ; height, weight
 
 	db   "It just loves to"
 	next "gallop. The faster"
 	next "it goes, the long-"
+
 	page "er the swaying"
 	next "flames of its mane"
 	next "will become.@"
diff --git a/data/pokemon/dex_entries/raticate.asm b/data/pokemon/dex_entries/raticate.asm
index f009c29aa..50898dda3 100644
--- a/data/pokemon/dex_entries/raticate.asm
+++ b/data/pokemon/dex_entries/raticate.asm
@@ -1,10 +1,10 @@
-; RaticatePokedexEntry: ; 0x181ea3
 	db "RAT@" ; species name
 	dw 204, 410 ; height, weight
 
 	db   "The webs on its"
 	next "hind legs enable"
 	next "it to cross"
+
 	page "rivers. It search-"
 	next "es wide areas for"
 	next "food.@"
diff --git a/data/pokemon/dex_entries/rattata.asm b/data/pokemon/dex_entries/rattata.asm
index 0a066eb74..f9e801b52 100644
--- a/data/pokemon/dex_entries/rattata.asm
+++ b/data/pokemon/dex_entries/rattata.asm
@@ -1,10 +1,10 @@
-; RattataPokedexEntry: ; 0x181e3d
 	db "RAT@" ; species name
 	dw 100, 80 ; height, weight
 
 	db   "This #MON's"
 	next "impressive vital-"
 	next "ity allows it to"
+
 	page "live anywhere. It"
 	next "also multiplies"
 	next "very quickly.@"
diff --git a/data/pokemon/dex_entries/remoraid.asm b/data/pokemon/dex_entries/remoraid.asm
index aaa6f1a49..1b9b0e562 100644
--- a/data/pokemon/dex_entries/remoraid.asm
+++ b/data/pokemon/dex_entries/remoraid.asm
@@ -1,10 +1,10 @@
-; RemoraidPokedexEntry: ; 0x1d0cd3
 	db "JET@" ; species name
 	dw 200, 260 ; height, weight
 
 	db   "To escape from an"
 	next "attacker, it may"
 	next "shoot water out of"
+
 	page "its mouth, then"
 	next "use that force to"
 	next "swim backward.@"
diff --git a/data/pokemon/dex_entries/rhydon.asm b/data/pokemon/dex_entries/rhydon.asm
index c820666b3..c81141343 100644
--- a/data/pokemon/dex_entries/rhydon.asm
+++ b/data/pokemon/dex_entries/rhydon.asm
@@ -1,10 +1,10 @@
-; RhydonPokedexEntry: ; 0x1b93c5
 	db "DRILL@" ; species name
 	dw 603, 2650 ; height, weight
 
 	db   "By lightly spin-"
 	next "ning its drill-"
 	next "like horn, it can"
+
 	page "easily shatter"
 	next "even a diamond in"
 	next "the rough.@"
diff --git a/data/pokemon/dex_entries/rhyhorn.asm b/data/pokemon/dex_entries/rhyhorn.asm
index b2f26e204..d7dd8d7e1 100644
--- a/data/pokemon/dex_entries/rhyhorn.asm
+++ b/data/pokemon/dex_entries/rhyhorn.asm
@@ -1,10 +1,10 @@
-; RhyhornPokedexEntry: ; 0x1b935d
 	db "SPIKES@" ; species name
 	dw 303, 2540 ; height, weight
 
 	db   "It can remember"
 	next "only one thing at"
 	next "a time. Once it"
+
 	page "starts rushing, it"
 	next "forgets why it"
 	next "started.@"
diff --git a/data/pokemon/dex_entries/sandshrew.asm b/data/pokemon/dex_entries/sandshrew.asm
index 2ef83f9c3..570907b31 100644
--- a/data/pokemon/dex_entries/sandshrew.asm
+++ b/data/pokemon/dex_entries/sandshrew.asm
@@ -1,10 +1,10 @@
-; SandshrewPokedexEntry: ; 0x182184
 	db "MOUSE@" ; species name
 	dw 200, 260 ; height, weight
 
 	db   "It prefers dry,"
 	next "sandy places"
 	next "because it uses"
+
 	page "the sand to"
 	next "protect itself"
 	next "when threatened.@"
diff --git a/data/pokemon/dex_entries/sandslash.asm b/data/pokemon/dex_entries/sandslash.asm
index fd2492f91..9e7fc454b 100644
--- a/data/pokemon/dex_entries/sandslash.asm
+++ b/data/pokemon/dex_entries/sandslash.asm
@@ -1,10 +1,10 @@
-; SandslashPokedexEntry: ; 0x1821e7
 	db "MOUSE@" ; species name
 	dw 303, 650 ; height, weight
 
 	db   "Adept at climbing"
 	next "trees, it rolls"
 	next "into a spiny ball,"
+
 	page "then attacks its"
 	next "enemies from"
 	next "above.@"
diff --git a/data/pokemon/dex_entries/scizor.asm b/data/pokemon/dex_entries/scizor.asm
index a000a6586..fa184c6ca 100644
--- a/data/pokemon/dex_entries/scizor.asm
+++ b/data/pokemon/dex_entries/scizor.asm
@@ -1,10 +1,10 @@
-; ScizorPokedexEntry: ; 0x1d0821
 	db "SCISSORS@" ; species name
 	dw 511, 2600 ; height, weight
 
 	db   "This #MON's"
 	next "pincers, which"
 	next "contain steel, can"
+
 	page "crush any hard"
 	next "object it gets a"
 	next "hold of into bits.@"
diff --git a/data/pokemon/dex_entries/scyther.asm b/data/pokemon/dex_entries/scyther.asm
index ca47c46b6..f2231dd6d 100644
--- a/data/pokemon/dex_entries/scyther.asm
+++ b/data/pokemon/dex_entries/scyther.asm
@@ -1,10 +1,10 @@
-; ScytherPokedexEntry: ; 0x1b9851
 	db "MANTIS@" ; species name
 	dw 411, 1230 ; height, weight
 
 	db   "It's very proud of"
 	next "its speed. It"
 	next "moves so fast that"
+
 	page "its opponent does"
 	next "not even know what"
 	next "knocked it down.@"
diff --git a/data/pokemon/dex_entries/seadra.asm b/data/pokemon/dex_entries/seadra.asm
index 91731c64a..482302ad6 100644
--- a/data/pokemon/dex_entries/seadra.asm
+++ b/data/pokemon/dex_entries/seadra.asm
@@ -1,10 +1,10 @@
-; SeadraPokedexEntry: ; 0x1b95b8
 	db "DRAGON@" ; species name
 	dw 311, 550 ; height, weight
 
 	db   "The male raises"
 	next "the young. If it"
 	next "is approached, it"
+
 	page "uses its toxic"
 	next "spikes to fend off"
 	next "the intruder.@"
diff --git a/data/pokemon/dex_entries/seaking.asm b/data/pokemon/dex_entries/seaking.asm
index 0d7d1fe48..1225d0bf8 100644
--- a/data/pokemon/dex_entries/seaking.asm
+++ b/data/pokemon/dex_entries/seaking.asm
@@ -1,10 +1,10 @@
-; SeakingPokedexEntry: ; 0x1b9690
 	db "GOLDFISH@" ; species name
 	dw 403, 860 ; height, weight
 
 	db   "When autumn comes,"
 	next "the males patrol"
 	next "the area around"
+
 	page "their nests in"
 	next "order to protect"
 	next "their offspring.@"
diff --git a/data/pokemon/dex_entries/seel.asm b/data/pokemon/dex_entries/seel.asm
index 53d179097..ac5bdbc8a 100644
--- a/data/pokemon/dex_entries/seel.asm
+++ b/data/pokemon/dex_entries/seel.asm
@@ -1,10 +1,10 @@
-; SeelPokedexEntry: ; 0x1b88bf
 	db "SEA LION@" ; species name
 	dw 307, 1980 ; height, weight
 
 	db   "The light blue fur"
 	next "that covers it"
 	next "keeps it protected"
+
 	page "against the cold."
 	next "It loves iceberg-"
 	next "filled oceans.@"
diff --git a/data/pokemon/dex_entries/sentret.asm b/data/pokemon/dex_entries/sentret.asm
index 9e70418c8..70f1af39e 100644
--- a/data/pokemon/dex_entries/sentret.asm
+++ b/data/pokemon/dex_entries/sentret.asm
@@ -1,10 +1,10 @@
-; SentretPokedexEntry: ; 0x1ccd6b
 	db "SCOUT@" ; species name
 	dw 207, 130 ; height, weight
 
 	db   "When acting as a"
 	next "lookout, it warns"
 	next "others of danger"
+
 	page "by screeching and"
 	next "hitting the ground"
 	next "with its tail.@"
diff --git a/data/pokemon/dex_entries/shellder.asm b/data/pokemon/dex_entries/shellder.asm
index 0c7553c43..43d3c05a8 100644
--- a/data/pokemon/dex_entries/shellder.asm
+++ b/data/pokemon/dex_entries/shellder.asm
@@ -1,10 +1,10 @@
-; ShellderPokedexEntry: ; 0x1b8a68
 	db "BIVALVE@" ; species name
 	dw 100, 90 ; height, weight
 
 	db   "Clamping on to an"
 	next "opponent reveals"
 	next "its vulnerable"
+
 	page "parts, so it uses"
 	next "this move only as"
 	next "a last resort.@"
diff --git a/data/pokemon/dex_entries/shuckle.asm b/data/pokemon/dex_entries/shuckle.asm
index 3795942e3..4eaa349eb 100644
--- a/data/pokemon/dex_entries/shuckle.asm
+++ b/data/pokemon/dex_entries/shuckle.asm
@@ -1,10 +1,10 @@
-; ShucklePokedexEntry: ; 0x1d088e
 	db "MOLD@" ; species name
 	dw 200, 450 ; height, weight
 
 	db   "The fluid secreted"
 	next "by its toes carves"
 	next "holes in rocks for"
+
 	page "nesting and can be"
 	next "mixed with BERRIES"
 	next "to make a drink.@"
diff --git a/data/pokemon/dex_entries/skarmory.asm b/data/pokemon/dex_entries/skarmory.asm
index 2558065af..46f0a12fc 100644
--- a/data/pokemon/dex_entries/skarmory.asm
+++ b/data/pokemon/dex_entries/skarmory.asm
@@ -1,10 +1,10 @@
-; SkarmoryPokedexEntry: ; 0x1d0e8c
 	db "ARMOR BIRD@" ; species name
 	dw 507, 1110 ; height, weight
 
 	db   "The feathers that"
 	next "it sheds are very"
 	next "sharp. It is said"
+
 	page "that people once"
 	next "used the feathers"
 	next "as swords.@"
diff --git a/data/pokemon/dex_entries/skiploom.asm b/data/pokemon/dex_entries/skiploom.asm
index f6e62266c..2980679e8 100644
--- a/data/pokemon/dex_entries/skiploom.asm
+++ b/data/pokemon/dex_entries/skiploom.asm
@@ -1,10 +1,10 @@
-; SkiploomPokedexEntry: ; 0x1cd928
 	db "COTTONWEED@" ; species name
 	dw 200, 20 ; height, weight
 
 	db   "As soon as it"
 	next "rains, it closes"
 	next "its flower and"
+
 	page "hides in the shade"
 	next "of a tree to avoid"
 	next "getting wet.@"
diff --git a/data/pokemon/dex_entries/slowbro.asm b/data/pokemon/dex_entries/slowbro.asm
index fdfb36e98..f48be6761 100644
--- a/data/pokemon/dex_entries/slowbro.asm
+++ b/data/pokemon/dex_entries/slowbro.asm
@@ -1,10 +1,10 @@
-; SlowbroPokedexEntry: ; 0x1b8635
 	db "HERMITCRAB@" ; species name
 	dw 503, 1730 ; height, weight
 
 	db   "An attached"
 	next "SHELLDER won't let"
 	next "go because of the"
+
 	page "tasty flavor that"
 	next "oozes out of its"
 	next "tail.@"
diff --git a/data/pokemon/dex_entries/slowking.asm b/data/pokemon/dex_entries/slowking.asm
index f52bdb1b7..07a5c4a15 100644
--- a/data/pokemon/dex_entries/slowking.asm
+++ b/data/pokemon/dex_entries/slowking.asm
@@ -1,10 +1,10 @@
-; SlowkingPokedexEntry: ; 0x1d0292
 	db "ROYAL@" ; species name
 	dw 607, 1750 ; height, weight
 
 	db   "Every time it ya-"
 	next "wns, SHELLDER"
 	next "injects more poi-"
+
 	page "son into it. The"
 	next "poison makes it"
 	next "more intelligent.@"
diff --git a/data/pokemon/dex_entries/slowpoke.asm b/data/pokemon/dex_entries/slowpoke.asm
index 2341758f8..0c35e438f 100644
--- a/data/pokemon/dex_entries/slowpoke.asm
+++ b/data/pokemon/dex_entries/slowpoke.asm
@@ -1,10 +1,10 @@
-; SlowpokePokedexEntry: ; 0x1b85d3
 	db "DOPEY@" ; species name
 	dw 311, 790 ; height, weight
 
 	db   "It is always so"
 	next "absent-minded that"
 	next "it won't react,"
+
 	page "even if its"
 	next "flavorful tail is"
 	next "bitten.@"
diff --git a/data/pokemon/dex_entries/slugma.asm b/data/pokemon/dex_entries/slugma.asm
index ea1fc01f2..d56958540 100644
--- a/data/pokemon/dex_entries/slugma.asm
+++ b/data/pokemon/dex_entries/slugma.asm
@@ -1,10 +1,10 @@
-; SlugmaPokedexEntry: ; 0x1d0ab8
 	db "LAVA@" ; species name
 	dw 204, 770 ; height, weight
 
 	db   "These group to-"
 	next "gether in areas"
 	next "that are hotter"
+
 	page "than normal. If it"
 	next "cools off, its"
 	next "skin hardens.@"
diff --git a/data/pokemon/dex_entries/smeargle.asm b/data/pokemon/dex_entries/smeargle.asm
index 8b265c1ea..98b9f69f3 100644
--- a/data/pokemon/dex_entries/smeargle.asm
+++ b/data/pokemon/dex_entries/smeargle.asm
@@ -1,10 +1,10 @@
-; SmearglePokedexEntry: ; 0x1d11e0
 	db "PAINTER@" ; species name
 	dw 311, 1280 ; height, weight
 
 	db   "The color of the"
 	next "mysterious fluid"
 	next "secreted from its"
+
 	page "tail is predeter-"
 	next "mined for each"
 	next "SMEARGLE.@"
diff --git a/data/pokemon/dex_entries/smoochum.asm b/data/pokemon/dex_entries/smoochum.asm
index b619b1720..74dbc77b8 100644
--- a/data/pokemon/dex_entries/smoochum.asm
+++ b/data/pokemon/dex_entries/smoochum.asm
@@ -1,10 +1,10 @@
-; SmoochumPokedexEntry: ; 0x1d132b
 	db "KISS@" ; species name
 	dw 104, 130 ; height, weight
 
 	db   "The sensitivity of"
 	next "its lips develops"
 	next "most quickly."
+
 	page "It uses them to"
 	next "try to identify"
 	next "unknown objects.@"
diff --git a/data/pokemon/dex_entries/sneasel.asm b/data/pokemon/dex_entries/sneasel.asm
index 5c1e70f09..b2cba47fa 100644
--- a/data/pokemon/dex_entries/sneasel.asm
+++ b/data/pokemon/dex_entries/sneasel.asm
@@ -1,10 +1,10 @@
-; SneaselPokedexEntry: ; 0x1d097a
 	db "SHARP CLAW@" ; species name
 	dw 211, 620 ; height, weight
 
 	db   "This cunning"
 	next "#MON hides"
 	next "under the cover"
+
 	page "of darkness,"
 	next "waiting to attack"
 	next "its prey.@"
diff --git a/data/pokemon/dex_entries/snorlax.asm b/data/pokemon/dex_entries/snorlax.asm
index e56651fb8..b006777dd 100644
--- a/data/pokemon/dex_entries/snorlax.asm
+++ b/data/pokemon/dex_entries/snorlax.asm
@@ -1,10 +1,10 @@
-; SnorlaxPokedexEntry: ; 0x1cc5cf
 	db "SLEEPING@" ; species name
 	dw 611, 10140 ; height, weight
 
 	db   "This #MON's"
 	next "stomach is so"
 	next "strong, even"
+
 	page "eating moldy or"
 	next "rotten food will"
 	next "not affect it.@"
diff --git a/data/pokemon/dex_entries/snubbull.asm b/data/pokemon/dex_entries/snubbull.asm
index 97b27ed8f..ca8b9bb2d 100644
--- a/data/pokemon/dex_entries/snubbull.asm
+++ b/data/pokemon/dex_entries/snubbull.asm
@@ -1,10 +1,10 @@
-; SnubbullPokedexEntry: ; 0x1d06e0
 	db "FAIRY@" ; species name
 	dw 200, 170 ; height, weight
 
 	db   "In truth, it is a"
 	next "cowardly #MON."
 	next "It growls eagerly"
+
 	page "in order to hide"
 	next "its fear from its"
 	next "opponent.@"
diff --git a/data/pokemon/dex_entries/spearow.asm b/data/pokemon/dex_entries/spearow.asm
index 16b89d22f..290e721b1 100644
--- a/data/pokemon/dex_entries/spearow.asm
+++ b/data/pokemon/dex_entries/spearow.asm
@@ -1,10 +1,10 @@
-; SpearowPokedexEntry: ; 0x181f03
 	db "TINY BIRD@" ; species name
 	dw 100, 40 ; height, weight
 
 	db   "To protect its"
 	next "territory, it"
 	next "flies around"
+
 	page "ceaselessly,"
 	next "making high-"
 	next "pitched cries.@"
diff --git a/data/pokemon/dex_entries/spinarak.asm b/data/pokemon/dex_entries/spinarak.asm
index e6e4c7203..8adbd74ef 100644
--- a/data/pokemon/dex_entries/spinarak.asm
+++ b/data/pokemon/dex_entries/spinarak.asm
@@ -1,10 +1,10 @@
-; SpinarakPokedexEntry: ; 0x1cd012
 	db "STRINGSPIT@" ; species name
 	dw 108, 190 ; height, weight
 
 	db   "If prey becomes"
 	next "ensnared in its"
 	next "nest of spun"
+
 	page "string, it waits"
 	next "motionlessly until"
 	next "it becomes dark.@"
diff --git a/data/pokemon/dex_entries/squirtle.asm b/data/pokemon/dex_entries/squirtle.asm
index 6fd442a13..e82e6bd6b 100644
--- a/data/pokemon/dex_entries/squirtle.asm
+++ b/data/pokemon/dex_entries/squirtle.asm
@@ -1,10 +1,10 @@
-; SquirtlePokedexEntry: ; 0x181926
 	db "TINYTURTLE@" ; species name
 	dw 108, 200 ; height, weight
 
 	db   "When it feels"
 	next "threatened, it"
 	next "draws its legs"
+
 	page "inside its shell"
 	next "and sprays water"
 	next "from its mouth.@"
diff --git a/data/pokemon/dex_entries/stantler.asm b/data/pokemon/dex_entries/stantler.asm
index 0fce8f2b5..cabe544ff 100644
--- a/data/pokemon/dex_entries/stantler.asm
+++ b/data/pokemon/dex_entries/stantler.asm
@@ -1,10 +1,10 @@
-; StantlerPokedexEntry: ; 0x1d1174
 	db "BIG HORN@" ; species name
 	dw 407, 1570 ; height, weight
 
 	db   "The round balls"
 	next "found on the"
 	next "fallen antlers can"
+
 	page "be ground into a"
 	next "powder that aids"
 	next "in sleeping.@"
diff --git a/data/pokemon/dex_entries/starmie.asm b/data/pokemon/dex_entries/starmie.asm
index 83393b9c2..c7aa7838a 100644
--- a/data/pokemon/dex_entries/starmie.asm
+++ b/data/pokemon/dex_entries/starmie.asm
@@ -1,10 +1,10 @@
-; StarmiePokedexEntry: ; 0x1b9776
 	db "MYSTERIOUS@" ; species name
 	dw 307, 1760 ; height, weight
 
 	db   "It is said that it"
 	next "uses the seven-"
 	next "colored core of"
+
 	page "its body to send"
 	next "electric waves"
 	next "into outer space.@"
diff --git a/data/pokemon/dex_entries/staryu.asm b/data/pokemon/dex_entries/staryu.asm
index 9f1fadc9c..f18678d98 100644
--- a/data/pokemon/dex_entries/staryu.asm
+++ b/data/pokemon/dex_entries/staryu.asm
@@ -1,10 +1,10 @@
-; StaryuPokedexEntry: ; 0x1b9702
 	db "STARSHAPE@" ; species name
 	dw 207, 760 ; height, weight
 
 	db   "When the stars"
 	next "twinkle at night,"
 	next "it floats up from"
+
 	page "the sea floor, and"
 	next "its body's center"
 	next "core flickers.@"
diff --git a/data/pokemon/dex_entries/steelix.asm b/data/pokemon/dex_entries/steelix.asm
index 6bbfe6c28..7d9fcc219 100644
--- a/data/pokemon/dex_entries/steelix.asm
+++ b/data/pokemon/dex_entries/steelix.asm
@@ -1,10 +1,10 @@
-; SteelixPokedexEntry: ; 0x1d067c
 	db "IRON SNAKE@" ; species name
 	dw 3002, 8820 ; height, weight
 
 	db   "The many small"
 	next "metal particles"
 	next "that cover this"
+
 	page "#MON's body"
 	next "reflect bright"
 	next "light well.@"
diff --git a/data/pokemon/dex_entries/sudowoodo.asm b/data/pokemon/dex_entries/sudowoodo.asm
index 060db1d8d..f8250f5f0 100644
--- a/data/pokemon/dex_entries/sudowoodo.asm
+++ b/data/pokemon/dex_entries/sudowoodo.asm
@@ -1,10 +1,10 @@
-; SudowoodoPokedexEntry: ; 0x1cd7d9
 	db "IMITATION@" ; species name
 	dw 311, 840 ; height, weight
 
 	db   "If a tree branch"
 	next "shakes when there"
 	next "is no wind, it's a"
+
 	page "SUDOWOODO, not a"
 	next "tree. It hides"
 	next "from the rain.@"
diff --git a/data/pokemon/dex_entries/suicune.asm b/data/pokemon/dex_entries/suicune.asm
index c60c002f7..5b4aa9e27 100644
--- a/data/pokemon/dex_entries/suicune.asm
+++ b/data/pokemon/dex_entries/suicune.asm
@@ -1,10 +1,10 @@
-; SuicunePokedexEntry: ; 0x1d1642
 	db "AURORA@" ; species name
 	dw 607, 4120 ; height, weight
 
 	db   "This divine"
 	next "#MON blows"
 	next "around the world,"
+
 	page "always in search"
 	next "of a pure"
 	next "reservoir.@"
diff --git a/data/pokemon/dex_entries/sunflora.asm b/data/pokemon/dex_entries/sunflora.asm
index 2d0e78111..2b162a526 100644
--- a/data/pokemon/dex_entries/sunflora.asm
+++ b/data/pokemon/dex_entries/sunflora.asm
@@ -1,10 +1,10 @@
-; SunfloraPokedexEntry: ; 0x1cdaef
 	db "SUN@" ; species name
 	dw 207, 190 ; height, weight
 
 	db   "As the hot season"
 	next "approaches, the"
 	next "petals on this"
+
 	page "#MON's face"
 	next "become more vivid"
 	next "and lively.@"
diff --git a/data/pokemon/dex_entries/sunkern.asm b/data/pokemon/dex_entries/sunkern.asm
index 680e1799e..8264891e4 100644
--- a/data/pokemon/dex_entries/sunkern.asm
+++ b/data/pokemon/dex_entries/sunkern.asm
@@ -1,10 +1,10 @@
-; SunkernPokedexEntry: ; 0x1cda87
 	db "SEED@" ; species name
 	dw 100, 40 ; height, weight
 
 	db   "It is very weak."
 	next "Its only means of"
 	next "defense is to"
+
 	page "shake its leaves"
 	next "desperately at its"
 	next "attacker.@"
diff --git a/data/pokemon/dex_entries/swinub.asm b/data/pokemon/dex_entries/swinub.asm
index 3e6d61dc8..44f78aaaa 100644
--- a/data/pokemon/dex_entries/swinub.asm
+++ b/data/pokemon/dex_entries/swinub.asm
@@ -1,10 +1,10 @@
-; SwinubPokedexEntry: ; 0x1d0b8d
 	db "PIG@" ; species name
 	dw 104, 140 ; height, weight
 
 	db   "It uses the tip of"
 	next "its nose to dig"
 	next "for food. Its nose"
+
 	page "is so tough that"
 	next "even frozen ground"
 	next "poses no problem.@"
diff --git a/data/pokemon/dex_entries/tangela.asm b/data/pokemon/dex_entries/tangela.asm
index 4e011b082..6c84cbfd1 100644
--- a/data/pokemon/dex_entries/tangela.asm
+++ b/data/pokemon/dex_entries/tangela.asm
@@ -1,10 +1,10 @@
-; TangelaPokedexEntry: ; 0x1b948c
 	db "VINE@" ; species name
 	dw 303, 770 ; height, weight
 
 	db   "During battle, it"
 	next "constantly moves"
 	next "the vines that"
+
 	page "cover its body in"
 	next "order to annoy its"
 	next "opponent.@"
diff --git a/data/pokemon/dex_entries/tauros.asm b/data/pokemon/dex_entries/tauros.asm
index bd7851165..04a4b5ce1 100644
--- a/data/pokemon/dex_entries/tauros.asm
+++ b/data/pokemon/dex_entries/tauros.asm
@@ -1,10 +1,10 @@
-; TaurosPokedexEntry: ; 0x1b9a6f
 	db "WILD BULL@" ; species name
 	dw 407, 1950 ; height, weight
 
 	db   "These violent"
 	next "#MON fight"
 	next "with other mem-"
+
 	page "bers of their herd"
 	next "in order to prove"
 	next "their strength.@"
diff --git a/data/pokemon/dex_entries/teddiursa.asm b/data/pokemon/dex_entries/teddiursa.asm
index 35b32c322..1d75c8299 100644
--- a/data/pokemon/dex_entries/teddiursa.asm
+++ b/data/pokemon/dex_entries/teddiursa.asm
@@ -1,10 +1,10 @@
-; TeddiursaPokedexEntry: ; 0x1d09da
 	db "LITTLE BEAR@" ; species name
 	dw 200, 190 ; height, weight
 
 	db   "It always licks"
 	next "honey. Its palm"
 	next "tastes sweet"
+
 	page "because of all the"
 	next "honey it has"
 	next "absorbed.@"
diff --git a/data/pokemon/dex_entries/tentacool.asm b/data/pokemon/dex_entries/tentacool.asm
index 5ed4b4fa0..f16523c9d 100644
--- a/data/pokemon/dex_entries/tentacool.asm
+++ b/data/pokemon/dex_entries/tentacool.asm
@@ -1,10 +1,10 @@
-; TentacoolPokedexEntry: ; 0x1b82d1
 	db "JELLYFISH@" ; species name
 	dw 211, 1000 ; height, weight
 
 	db   "As it floats along"
 	next "on the waves, it"
 	next "uses its toxic"
+
 	page "feelers to stab"
 	next "anything it"
 	next "touches.@"
diff --git a/data/pokemon/dex_entries/tentacruel.asm b/data/pokemon/dex_entries/tentacruel.asm
index 27dad758f..c09f892e4 100644
--- a/data/pokemon/dex_entries/tentacruel.asm
+++ b/data/pokemon/dex_entries/tentacruel.asm
@@ -1,10 +1,10 @@
-; TentacruelPokedexEntry: ; 0x1b8337
 	db "JELLYFISH@" ; species name
 	dw 503, 1210 ; height, weight
 
 	db   "When its 80 feel-"
 	next "ers absorb water,"
 	next "it stretches to"
+
 	page "become like a net"
 	next "to entangle its"
 	next "prey.@"
diff --git a/data/pokemon/dex_entries/togepi.asm b/data/pokemon/dex_entries/togepi.asm
index eb185b1f1..a295acf54 100644
--- a/data/pokemon/dex_entries/togepi.asm
+++ b/data/pokemon/dex_entries/togepi.asm
@@ -1,10 +1,10 @@
-; TogepiPokedexEntry: ; 0x1cd396
 	db "SPIKE BALL@" ; species name
 	dw 100, 30 ; height, weight
 
 	db   "It is considered"
 	next "to be a symbol of"
 	next "good luck. Its"
+
 	page "shell is said to"
 	next "be filled with"
 	next "happiness.@"
diff --git a/data/pokemon/dex_entries/togetic.asm b/data/pokemon/dex_entries/togetic.asm
index 7d1519d73..b638aceb3 100644
--- a/data/pokemon/dex_entries/togetic.asm
+++ b/data/pokemon/dex_entries/togetic.asm
@@ -1,10 +1,10 @@
-; TogeticPokedexEntry: ; 0x1cd402
 	db "HAPPINESS@" ; species name
 	dw 200, 70 ; height, weight
 
 	db   "Although it does"
 	next "not flap its wings"
 	next "very much, it can"
+
 	page "stay up in the air"
 	next "as it tags along"
 	next "after its trainer.@"
diff --git a/data/pokemon/dex_entries/totodile.asm b/data/pokemon/dex_entries/totodile.asm
index 78a1b761e..8be3ad28c 100644
--- a/data/pokemon/dex_entries/totodile.asm
+++ b/data/pokemon/dex_entries/totodile.asm
@@ -1,10 +1,10 @@
-; TotodilePokedexEntry: ; 0x1ccc14
 	db "BIG JAW@" ; species name
 	dw 200, 210 ; height, weight
 
 	db   "This rough critter"
 	next "chomps at any"
 	next "moving object it"
+
 	page "sees. Turning your"
 	next "back on it is not"
 	next "recommended.@"
diff --git a/data/pokemon/dex_entries/typhlosion.asm b/data/pokemon/dex_entries/typhlosion.asm
index e11823cf5..52961be46 100644
--- a/data/pokemon/dex_entries/typhlosion.asm
+++ b/data/pokemon/dex_entries/typhlosion.asm
@@ -1,10 +1,10 @@
-; TyphlosionPokedexEntry: ; 0x1ccba0
 	db "VOLCANO@" ; species name
 	dw 507, 1750 ; height, weight
 
 	db   "When heat from its"
 	next "body causes the"
 	next "air around it to"
+
 	page "shimmer, this is a"
 	next "sign that it is"
 	next "ready to battle.@"
diff --git a/data/pokemon/dex_entries/tyranitar.asm b/data/pokemon/dex_entries/tyranitar.asm
index 9786a6430..4d5a16672 100644
--- a/data/pokemon/dex_entries/tyranitar.asm
+++ b/data/pokemon/dex_entries/tyranitar.asm
@@ -1,10 +1,10 @@
-; TyranitarPokedexEntry: ; 0x1d177b
 	db "ARMOR@" ; species name
 	dw 607, 4450 ; height, weight
 
 	db   "In just one of its"
 	next "mighty hands, it"
 	next "has the power to"
+
 	page "make the ground"
 	next "shake and moun-"
 	next "tains crumble.@"
diff --git a/data/pokemon/dex_entries/tyrogue.asm b/data/pokemon/dex_entries/tyrogue.asm
index d8900c160..6571e9f62 100644
--- a/data/pokemon/dex_entries/tyrogue.asm
+++ b/data/pokemon/dex_entries/tyrogue.asm
@@ -1,10 +1,10 @@
-; TyroguePokedexEntry: ; 0x1d124b
 	db "SCUFFLE@" ; species name
 	dw 204, 460 ; height, weight
 
 	db   "To brush up on its"
 	next "fighting skills,"
 	next "it will challenge"
+
 	page "anyone. It has a"
 	next "very strong com-"
 	next "petitive spirit.@"
diff --git a/data/pokemon/dex_entries/umbreon.asm b/data/pokemon/dex_entries/umbreon.asm
index 483322f18..206ea4070 100644
--- a/data/pokemon/dex_entries/umbreon.asm
+++ b/data/pokemon/dex_entries/umbreon.asm
@@ -1,10 +1,10 @@
-; UmbreonPokedexEntry: ; 0x1d01af
 	db "MOONLIGHT@" ; species name
 	dw 303, 600 ; height, weight
 
 	db   "On the night of a"
 	next "full moon, or when"
 	next "it gets excited,"
+
 	page "the ring patterns"
 	next "on its body glow"
 	next "yellow.@"
diff --git a/data/pokemon/dex_entries/unown.asm b/data/pokemon/dex_entries/unown.asm
index 5be078b8a..60ee3b3de 100644
--- a/data/pokemon/dex_entries/unown.asm
+++ b/data/pokemon/dex_entries/unown.asm
@@ -1,10 +1,10 @@
-; UnownPokedexEntry: ; 0x1d0373
 	db "SYMBOL@" ; species name
 	dw 108, 110 ; height, weight
 
 	db   "Because different"
 	next "types of UNOWN"
 	next "exist, it is said"
+
 	page "that they must"
 	next "have a variety of"
 	next "abilities.@"
diff --git a/data/pokemon/dex_entries/ursaring.asm b/data/pokemon/dex_entries/ursaring.asm
index acf7626f9..c2f070603 100644
--- a/data/pokemon/dex_entries/ursaring.asm
+++ b/data/pokemon/dex_entries/ursaring.asm
@@ -1,10 +1,10 @@
-; UrsaringPokedexEntry: ; 0x1d0a41
 	db "HIBERNANT@" ; species name
 	dw 511, 2770 ; height, weight
 
 	db   "Although it has a"
 	next "large body, it is"
 	next "quite skilled at"
+
 	page "climbing trees. It"
 	next "eats and sleeps in"
 	next "the treetops.@"
diff --git a/data/pokemon/dex_entries/vaporeon.asm b/data/pokemon/dex_entries/vaporeon.asm
index 36617899f..dbbce1177 100644
--- a/data/pokemon/dex_entries/vaporeon.asm
+++ b/data/pokemon/dex_entries/vaporeon.asm
@@ -1,10 +1,10 @@
-; VaporeonPokedexEntry: ; 0x1cc224
 	db "BUBBLE JET@" ; species name
 	dw 303, 640 ; height, weight
 
 	db   "As it uses the"
 	next "fins on the tip"
 	next "of its tail to"
+
 	page "swim, it blends"
 	next "with the water"
 	next "perfectly.@"
diff --git a/data/pokemon/dex_entries/venomoth.asm b/data/pokemon/dex_entries/venomoth.asm
index 4ff583940..338f0ed8e 100644
--- a/data/pokemon/dex_entries/venomoth.asm
+++ b/data/pokemon/dex_entries/venomoth.asm
@@ -1,10 +1,10 @@
-; VenomothPokedexEntry: ; 0x182abf
 	db "POISONMOTH@" ; species name
 	dw 411, 280 ; height, weight
 
 	db   "The scales it"
 	next "scatters will"
 	next "paralyze anyone"
+
 	page "who touches them,"
 	next "making that person"
 	next "unable to stand.@"
diff --git a/data/pokemon/dex_entries/venonat.asm b/data/pokemon/dex_entries/venonat.asm
index 8e52b4c82..01e4df353 100644
--- a/data/pokemon/dex_entries/venonat.asm
+++ b/data/pokemon/dex_entries/venonat.asm
@@ -1,10 +1,10 @@
-; VenonatPokedexEntry: ; 0x182a53
 	db "INSECT@" ; species name
 	dw 303, 660 ; height, weight
 
 	db   "The small bugs it"
 	next "eats appear only"
 	next "at night, so it"
+
 	page "sleeps in a hole"
 	next "in a tree until"
 	next "night falls.@"
diff --git a/data/pokemon/dex_entries/venusaur.asm b/data/pokemon/dex_entries/venusaur.asm
index 1b9cc6e43..b5c843c15 100644
--- a/data/pokemon/dex_entries/venusaur.asm
+++ b/data/pokemon/dex_entries/venusaur.asm
@@ -1,10 +1,10 @@
-; VenusaurPokedexEntry: ; 0x181773
 	db "SEED@" ; species name
 	dw 607, 2210 ; height, weight
 
 	db   "As it warms it-"
 	next "self and absorbs"
 	next "the sunlight, its"
+
 	page "flower petals"
 	next "release a pleasant"
 	next "fragrance.@"
diff --git a/data/pokemon/dex_entries/victreebel.asm b/data/pokemon/dex_entries/victreebel.asm
index 552051572..b960cf81c 100644
--- a/data/pokemon/dex_entries/victreebel.asm
+++ b/data/pokemon/dex_entries/victreebel.asm
@@ -1,10 +1,10 @@
-; VictreebelPokedexEntry: ; 0x1b826e
 	db "FLYCATCHER@" ; species name
 	dw 507, 340 ; height, weight
 
 	db   "Once ingested into"
 	next "this #MON's"
 	next "body, even the"
+
 	page "hardest object"
 	next "will melt into"
 	next "nothing.@"
diff --git a/data/pokemon/dex_entries/vileplume.asm b/data/pokemon/dex_entries/vileplume.asm
index cf2ea191d..541fd4da5 100644
--- a/data/pokemon/dex_entries/vileplume.asm
+++ b/data/pokemon/dex_entries/vileplume.asm
@@ -1,10 +1,10 @@
-; VileplumePokedexEntry: ; 0x182918
 	db "FLOWER@" ; species name
 	dw 311, 410 ; height, weight
 
 	db   "By shaking its big"
 	next "petals, it scat-"
 	next "ters toxic pollen"
+
 	page "into the air,"
 	next "turning the air"
 	next "yellow.@"
diff --git a/data/pokemon/dex_entries/voltorb.asm b/data/pokemon/dex_entries/voltorb.asm
index 5a532e2d0..ddc0ffa29 100644
--- a/data/pokemon/dex_entries/voltorb.asm
+++ b/data/pokemon/dex_entries/voltorb.asm
@@ -1,10 +1,10 @@
-; VoltorbPokedexEntry: ; 0x1b8eb0
 	db "BALL@" ; species name
 	dw 108, 230 ; height, weight
 
 	db   "During the study"
 	next "of this #MON,"
 	next "it was discovered"
+
 	page "that its compo-"
 	next "nents are not"
 	next "found in nature.@"
diff --git a/data/pokemon/dex_entries/vulpix.asm b/data/pokemon/dex_entries/vulpix.asm
index f5bbd03a1..0409bb91e 100644
--- a/data/pokemon/dex_entries/vulpix.asm
+++ b/data/pokemon/dex_entries/vulpix.asm
@@ -1,10 +1,10 @@
-; VulpixPokedexEntry: ; 0x18259b
 	db "FOX@" ; species name
 	dw 200, 220 ; height, weight
 
 	db   "As its body grows"
 	next "larger, its six"
 	next "warm tails become"
+
 	page "more beautiful,"
 	next "with a more luxur-"
 	next "ious coat of fur.@"
diff --git a/data/pokemon/dex_entries/wartortle.asm b/data/pokemon/dex_entries/wartortle.asm
index 927af5fd2..f96c6e40d 100644
--- a/data/pokemon/dex_entries/wartortle.asm
+++ b/data/pokemon/dex_entries/wartortle.asm
@@ -1,10 +1,10 @@
-; WartortlePokedexEntry: ; 0x181993
 	db "TURTLE@" ; species name
 	dw 303, 500 ; height, weight
 
 	db   "Its long, furry"
 	next "tail is a symbol"
 	next "of longevity,"
+
 	page "making it quite"
 	next "popular among"
 	next "older people.@"
diff --git a/data/pokemon/dex_entries/weedle.asm b/data/pokemon/dex_entries/weedle.asm
index 9b81fa11d..c7e9deb00 100644
--- a/data/pokemon/dex_entries/weedle.asm
+++ b/data/pokemon/dex_entries/weedle.asm
@@ -1,10 +1,10 @@
-; WeedlePokedexEntry: ; 0x181bb4
 	db "HAIRY BUG@" ; species name
 	dw 100, 70 ; height, weight
 
 	db   "The barb on top of"
 	next "its head secretes"
 	next "a strong poison."
+
 	page "It uses this toxic"
 	next "barb to protect"
 	next "itself.@"
diff --git a/data/pokemon/dex_entries/weepinbell.asm b/data/pokemon/dex_entries/weepinbell.asm
index 81eb7c215..d53be6604 100644
--- a/data/pokemon/dex_entries/weepinbell.asm
+++ b/data/pokemon/dex_entries/weepinbell.asm
@@ -1,10 +1,10 @@
-; WeepinbellPokedexEntry: ; 0x1b81fd
 	db "FLYCATCHER@" ; species name
 	dw 303, 140 ; height, weight
 
 	db   "When it's hungry,"
 	next "it swings its"
 	next "razor-sharp"
+
 	page "leaves, slicing up"
 	next "any unlucky object"
 	next "nearby for food.@"
diff --git a/data/pokemon/dex_entries/weezing.asm b/data/pokemon/dex_entries/weezing.asm
index 1a7b268fd..8e02970d0 100644
--- a/data/pokemon/dex_entries/weezing.asm
+++ b/data/pokemon/dex_entries/weezing.asm
@@ -1,10 +1,10 @@
-; WeezingPokedexEntry: ; 0x1b92ec
 	db "POISON GAS@" ; species name
 	dw 311, 210 ; height, weight
 
 	db   "When it inhales"
 	next "poisonous gases"
 	next "from garbage, its"
+
 	page "body expands, and"
 	next "its insides smell"
 	next "much worse.@"
diff --git a/data/pokemon/dex_entries/wigglytuff.asm b/data/pokemon/dex_entries/wigglytuff.asm
index 8ba563cce..65e9f49bb 100644
--- a/data/pokemon/dex_entries/wigglytuff.asm
+++ b/data/pokemon/dex_entries/wigglytuff.asm
@@ -1,10 +1,10 @@
-; WigglytuffPokedexEntry: ; 0x1826e9
 	db "BALLOON@" ; species name
 	dw 303, 260 ; height, weight
 
 	db   "The rich, fluffy"
 	next "fur that covers"
 	next "its body feels so"
+
 	page "good that anyone"
 	next "who feels it can't"
 	next "stop touching it.@"
diff --git a/data/pokemon/dex_entries/wobbuffet.asm b/data/pokemon/dex_entries/wobbuffet.asm
index 95aae69ab..6dcde2df9 100644
--- a/data/pokemon/dex_entries/wobbuffet.asm
+++ b/data/pokemon/dex_entries/wobbuffet.asm
@@ -1,10 +1,10 @@
-; WobbuffetPokedexEntry: ; 0x1d03dd
 	db "PATIENT@" ; species name
 	dw 403, 630 ; height, weight
 
 	db   "In order to con-"
 	next "ceal its black"
 	next "tail, it lives in"
+
 	page "a dark cave and"
 	next "only moves about"
 	next "at night.@"
diff --git a/data/pokemon/dex_entries/wooper.asm b/data/pokemon/dex_entries/wooper.asm
index d612f2070..00f97d0d7 100644
--- a/data/pokemon/dex_entries/wooper.asm
+++ b/data/pokemon/dex_entries/wooper.asm
@@ -1,10 +1,10 @@
-; WooperPokedexEntry: ; 0x1d0078
 	db "WATER FISH@" ; species name
 	dw 104, 190 ; height, weight
 
 	db   "A mucous"
 	next "membrane covers"
 	next "its body. Touching"
+
 	page "it barehanded will"
 	next "cause a shooting"
 	next "pain.@"
diff --git a/data/pokemon/dex_entries/xatu.asm b/data/pokemon/dex_entries/xatu.asm
index 21a53d8fc..c285b8cb3 100644
--- a/data/pokemon/dex_entries/xatu.asm
+++ b/data/pokemon/dex_entries/xatu.asm
@@ -1,10 +1,10 @@
-; XatuPokedexEntry: ; 0x1cd4e9
 	db "MYSTIC@" ; species name
 	dw 411, 330 ; height, weight
 
 	db   "Once it begins to"
 	next "meditate at sun-"
 	next "rise, the entire"
+
 	page "day will pass"
 	next "before it will"
 	next "move again.@"
diff --git a/data/pokemon/dex_entries/yanma.asm b/data/pokemon/dex_entries/yanma.asm
index 9843ad289..4acf0e290 100644
--- a/data/pokemon/dex_entries/yanma.asm
+++ b/data/pokemon/dex_entries/yanma.asm
@@ -1,10 +1,10 @@
-; YanmaPokedexEntry: ; 0x1d0000
 	db "CLEAR WING@" ; species name
 	dw 311, 840 ; height, weight
 
 	db   "It can see in all"
 	next "directions without"
 	next "moving its big"
+
 	page "eyes, helping it"
 	next "spot attackers and"
 	next "food right away.@"
diff --git a/data/pokemon/dex_entries/zapdos.asm b/data/pokemon/dex_entries/zapdos.asm
index ea61198a0..3dfa33530 100644
--- a/data/pokemon/dex_entries/zapdos.asm
+++ b/data/pokemon/dex_entries/zapdos.asm
@@ -1,10 +1,10 @@
-; ZapdosPokedexEntry: ; 0x1cc697
 	db "ELECTRIC@" ; species name
 	dw 503, 1160 ; height, weight
 
 	db   "Legendary bird"
 	next "#MON. They say"
 	next "lightning caused"
+
 	page "by the flapping of"
 	next "its wings causes"
 	next "summer storms.@"
diff --git a/data/pokemon/dex_entries/zubat.asm b/data/pokemon/dex_entries/zubat.asm
index 8232f8bd6..0f54d51b1 100644
--- a/data/pokemon/dex_entries/zubat.asm
+++ b/data/pokemon/dex_entries/zubat.asm
@@ -1,10 +1,10 @@
-; ZubatPokedexEntry: ; 0x18275d
 	db "BAT@" ; species name
 	dw 207, 170 ; height, weight
 
 	db   "During the day, it"
 	next "gathers with"
 	next "others and hangs"
+
 	page "from the ceilings"
 	next "of old buildings"
 	next "and caves.@"
diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm
index c4ddc7280..6081757e5 100644
--- a/data/pokemon/dex_entry_pointers.asm
+++ b/data/pokemon/dex_entry_pointers.asm
@@ -1,4 +1,4 @@
-PokedexDataPointerTable: ; 0x44378
+PokedexDataPointerTable:
 ; entries correspond to constants/pokemon_constants.asm
 	dw BulbasaurPokedexEntry
 	dw IvysaurPokedexEntry
@@ -251,4 +251,3 @@ PokedexDataPointerTable: ; 0x44378
 	dw LugiaPokedexEntry
 	dw HoOhPokedexEntry
 	dw CelebiPokedexEntry
-; 0x4456e
diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm
index 8fcb0acd1..b93238cb9 100644
--- a/data/pokemon/dex_order_alpha.asm
+++ b/data/pokemon/dex_order_alpha.asm
@@ -1,6 +1,6 @@
 ; Every Pokémon sorted alphabetically by name.
 
-AlphabeticalPokedexOrder: ; 0x40c65
+AlphabeticalPokedexOrder:
 	db ABRA
 	db AERODACTYL
 	db AIPOM
@@ -252,4 +252,3 @@ AlphabeticalPokedexOrder: ; 0x40c65
 	db YANMA
 	db ZAPDOS
 	db ZUBAT
-; 0x40d60
diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm
index bf7e3d298..853fbe73d 100644
--- a/data/pokemon/dex_order_new.asm
+++ b/data/pokemon/dex_order_new.asm
@@ -1,6 +1,6 @@
 ; Every Pokémon sorted in New Pokédex Order.
 
-NewPokedexOrder: ; 0x40d60
+NewPokedexOrder:
 	db CHIKORITA
 	db BAYLEEF
 	db MEGANIUM
@@ -252,4 +252,3 @@ NewPokedexOrder: ; 0x40d60
 	db MEWTWO
 	db MEW
 	db CELEBI
-; 0x40e5b
diff --git a/data/pokemon/egg_move_pointers.asm b/data/pokemon/egg_move_pointers.asm
index caa9ed7c0..3f4de2d2a 100644
--- a/data/pokemon/egg_move_pointers.asm
+++ b/data/pokemon/egg_move_pointers.asm
@@ -1,4 +1,4 @@
-EggMovePointers:: ; 0x23b11
+EggMovePointers::
 	dw BulbasaurEggMoves
 	dw NoEggMoves
 	dw NoEggMoves
@@ -254,4 +254,3 @@ endc
 	dw NoEggMoves
 	dw NoEggMoves
 	dw NoEggMoves
-; 0x23d07
diff --git a/data/pokemon/egg_moves.asm b/data/pokemon/egg_moves.asm
index 886c47349..1ababff89 100644
--- a/data/pokemon/egg_moves.asm
+++ b/data/pokemon/egg_moves.asm
@@ -11,12 +11,8 @@ SECTION "Egg Moves", ROMX
 ; Staryu's egg moves were removed in Crystal, because Staryu is genderless
 ; and can only breed with Ditto.
 
-
 INCLUDE "data/pokemon/egg_move_pointers.asm"
 
-
-EggMoves::
-
 BulbasaurEggMoves:
 	db LIGHT_SCREEN
 	db SKULL_BASH
diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm
index 2649bb7a1..1ec2f2886 100644
--- a/data/pokemon/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -3,12 +3,20 @@ INCLUDE "constants.asm"
 
 SECTION "Evolutions and Attacks", ROMX
 
+; Evos+attacks data structure:
+; - Evolution methods:
+;    * db EVOLVE_LEVEL, level, species
+;    * db EVOLVE_ITEM, used item, species
+;    * db EVOLVE_TRADE, held item (or -1 for none), species
+;    * db EVOLVE_HAPPINESS, TR_* constant (ANYTIME, MORNDAY, NITE), species
+;    * db EVOLVE_STAT, level, ATK_*_DEF constant (LT, GT, EQ), species
+; - db 0 ; no more evolutions
+; - Learnset (in increasing level order):
+;    * db level, move
+; - db 0 ; no more level-up moves
 
 INCLUDE "data/pokemon/evos_attacks_pointers.asm"
 
-
-EvosAttacks::
-
 BulbasaurEvosAttacks:
 	db EVOLVE_LEVEL, 16, IVYSAUR
 	db 0 ; no more evolutions
@@ -831,7 +839,7 @@ AbraEvosAttacks:
 	db 0 ; no more level-up moves
 
 KadabraEvosAttacks:
-	db EVOLVE_TRADE, $ff, ALAKAZAM
+	db EVOLVE_TRADE, -1, ALAKAZAM
 	db 0 ; no more evolutions
 	db 1, TELEPORT
 	db 1, KINESIS
@@ -875,7 +883,7 @@ MachopEvosAttacks:
 	db 0 ; no more level-up moves
 
 MachokeEvosAttacks:
-	db EVOLVE_TRADE, $ff, MACHAMP
+	db EVOLVE_TRADE, -1, MACHAMP
 	db 0 ; no more evolutions
 	db 1, LOW_KICK
 	db 1, LEER
@@ -989,7 +997,7 @@ GeodudeEvosAttacks:
 	db 0 ; no more level-up moves
 
 GravelerEvosAttacks:
-	db EVOLVE_TRADE, $ff, GOLEM
+	db EVOLVE_TRADE, -1, GOLEM
 	db 0 ; no more evolutions
 	db 1, TACKLE
 	db 1, DEFENSE_CURL
@@ -1248,7 +1256,7 @@ GastlyEvosAttacks:
 	db 0 ; no more level-up moves
 
 HaunterEvosAttacks:
-	db EVOLVE_TRADE, $ff, GENGAR
+	db EVOLVE_TRADE, -1, GENGAR
 	db 0 ; no more evolutions
 	db 1, HYPNOSIS
 	db 1, LICK
diff --git a/data/pokemon/evos_attacks_pointers.asm b/data/pokemon/evos_attacks_pointers.asm
index f6582e786..7b27c6a74 100644
--- a/data/pokemon/evos_attacks_pointers.asm
+++ b/data/pokemon/evos_attacks_pointers.asm
@@ -1,6 +1,6 @@
 ; Evolutions and attacks are grouped together since they're both checked at level-up.
 
-EvosAttacksPointers:: ; 0x425b1
+EvosAttacksPointers::
 	dw BulbasaurEvosAttacks
 	dw IvysaurEvosAttacks
 	dw VenusaurEvosAttacks
@@ -252,4 +252,3 @@ EvosAttacksPointers:: ; 0x425b1
 	dw LugiaEvosAttacks
 	dw HoOhEvosAttacks
 	dw CelebiEvosAttacks
-; 0x427a7
diff --git a/data/pokemon/ezchat_order.asm b/data/pokemon/ezchat_order.asm
index 8cb860028..cb9a60d98 100644
--- a/data/pokemon/ezchat_order.asm
+++ b/data/pokemon/ezchat_order.asm
@@ -93,4 +93,3 @@ EZChat_SortedPokemon:
 .ro:       db VULPIX, -1
 .wa:       db JUMPLUFF, TOTODILE, MACHOP ;, -1
 .end:      db -1
-; 11d67e
diff --git a/data/pokemon/rby_base_special.asm b/data/pokemon/gen1_base_special.asm
index 9998692ab..306ce31d9 100644
--- a/data/pokemon/rby_base_special.asm
+++ b/data/pokemon/gen1_base_special.asm
@@ -1,6 +1,6 @@
 ; The original base Special stat for each Pokémon from Red/Blue
 
-KantoMonSpecials: ; fb656
+KantoMonSpecials:
 	db  65 ; BULBASAUR
 	db  80 ; IVYSAUR
 	db 100 ; VENUSAUR
@@ -152,4 +152,3 @@ KantoMonSpecials: ; fb656
 	db 100 ; DRAGONITE
 	db 154 ; MEWTWO
 	db 100 ; MEW
-; fb6ed
diff --git a/data/pokemon/rby_order.asm b/data/pokemon/gen1_order.asm
index e40ba0273..45efcafa0 100644
--- a/data/pokemon/rby_order.asm
+++ b/data/pokemon/gen1_order.asm
@@ -1,4 +1,4 @@
-Pokered_MonIndices: ; fb91c
+Pokered_MonIndices:
 	db RHYDON
 	db KANGASKHAN
 	db NIDORAN_M
@@ -252,4 +252,3 @@ Pokered_MonIndices: ; fb91c
 	db QWILFISH
 	db WOBBUFFET
 	db WOBBUFFET
-; fba18
diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm
index 360b206a2..f378cbfbe 100644
--- a/data/pokemon/menu_icons.asm
+++ b/data/pokemon/menu_icons.asm
@@ -1,6 +1,6 @@
 ; party menu icons
 
-MonMenuIcons: ; 8eac4
+MonMenuIcons:
 	db ICON_BULBASAUR   ; BULBASAUR
 	db ICON_BULBASAUR   ; IVYSAUR
 	db ICON_BULBASAUR   ; VENUSAUR
@@ -252,4 +252,3 @@ MonMenuIcons: ; 8eac4
 	db ICON_LUGIA       ; LUGIA
 	db ICON_HO_OH       ; HO_OH
 	db ICON_HUMANSHAPE  ; CELEBI
-; 8ebbf
diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm
index ec2cc3c0b..a3507c203 100644
--- a/data/pokemon/palettes.asm
+++ b/data/pokemon/palettes.asm
@@ -1,4 +1,4 @@
-PokemonPalettes: ; a8ce
+PokemonPalettes:
 ; entries correspond to Pokémon species, two apiece
 
 ; 000
@@ -534,5 +534,3 @@ INCLUDE "gfx/pokemon/egg/shiny.pal"
 ; 255 shiny
 	RGB 23, 23, 23
 	RGB 17, 17, 17
-
-; b0ce
diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm
new file mode 100644
index 000000000..5b54b84ed
--- /dev/null
+++ b/data/pokemon/unown_words.asm
@@ -0,0 +1,65 @@
+unownword: MACRO
+x = 1
+rept STRLEN(\1)
+	db STRSUB(\1, x, 1) - $40
+x = x + 1
+endr
+	db -1
+ENDM
+
+UnownWords:
+; entries correspond to UNOWN_* form constants
+	dw UnownWordA
+	dw UnownWordA
+	dw UnownWordB
+	dw UnownWordC
+	dw UnownWordD
+	dw UnownWordE
+	dw UnownWordF
+	dw UnownWordG
+	dw UnownWordH
+	dw UnownWordI
+	dw UnownWordJ
+	dw UnownWordK
+	dw UnownWordL
+	dw UnownWordM
+	dw UnownWordN
+	dw UnownWordO
+	dw UnownWordP
+	dw UnownWordQ
+	dw UnownWordR
+	dw UnownWordS
+	dw UnownWordT
+	dw UnownWordU
+	dw UnownWordV
+	dw UnownWordW
+	dw UnownWordX
+	dw UnownWordY
+	dw UnownWordZ
+
+UnownWordA: unownword "ANGRY"
+UnownWordB: unownword "BEAR"
+UnownWordC: unownword "CHASE"
+UnownWordD: unownword "DIRECT"
+UnownWordE: unownword "ENGAGE"
+UnownWordF: unownword "FIND"
+UnownWordG: unownword "GIVE"
+UnownWordH: unownword "HELP"
+UnownWordI: unownword "INCREASE"
+UnownWordJ: unownword "JOIN"
+UnownWordK: unownword "KEEP"
+UnownWordL: unownword "LAUGH"
+UnownWordM: unownword "MAKE"
+UnownWordN: unownword "NUZZLE"
+UnownWordO: unownword "OBSERVE"
+UnownWordP: unownword "PERFORM"
+UnownWordQ: unownword "QUICKEN"
+UnownWordR: unownword "REASSURE"
+UnownWordS: unownword "SEARCH"
+UnownWordT: unownword "TELL"
+UnownWordU: unownword "UNDO"
+UnownWordV: unownword "VANISH"
+UnownWordW: unownword "WANT"
+UnownWordX: unownword "XXXXX"
+UnownWordY: unownword "YIELD"
+UnownWordZ: unownword "ZOOM"
diff --git a/data/pokemon/unused_pic_banks.asm b/data/pokemon/unused_pic_banks.asm
new file mode 100644
index 000000000..2ede9c3f9
--- /dev/null
+++ b/data/pokemon/unused_pic_banks.asm
@@ -0,0 +1,17 @@
+; This was a table of Pokémon sprite banks in the 1997 G/S prototype.
+; See pokegold-spaceworld's gfx/pokemon/pkmn_pic_banks.asm.
+
+Unreferenced_MonPicBanks:
+	; last mon in bank, bank #
+	db RAICHU,    $15 + 0
+	db DUGTRIO,   $15 + 1
+	db GRAVELER,  $15 + 2
+	db KRABBY,    $15 + 3
+	db STARMIE,   $15 + 4
+	db ARTICUNO,  $15 + 5
+	db ARIADOS,   $15 + 6 ; JARANRA in pokegold-spaceworld
+	db ESPEON,    $15 + 7 ; KOUNYA in pokegold-spaceworld
+	db OCTILLERY, $15 + 8 ; BOMBSEEKER in pokegold-spaceworld
+	db LARVITAR,  $15 + 9 ; NYULA in pokegold-spaceworld
+	db $ff,       $15 + 10
+	db $ff,       $15 + 11
diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm
index 16281d035..1693f22aa 100644
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.asm
@@ -6,7 +6,7 @@ add_predef: MACRO
 	dab \1
 ENDM
 
-PredefPointers:: ; 856b
+PredefPointers::
 	add_predef LearnMove ; $0
 	add_predef DummyPredef1
 	add_predef HealParty ; this is both a special and a predef
@@ -15,19 +15,19 @@ PredefPointers:: ; 856b
 	add_predef FillPP
 	add_predef TryAddMonToParty
 	add_predef AddTempmonToParty
-	add_predef SendGetPkmnIntoFromBox
-	add_predef SendPkmnIntoBox
+	add_predef SendGetMonIntoFromBox
+	add_predef SendMonIntoBox
 	add_predef GiveEgg
 	add_predef AnimateHPBar
-	add_predef CalcPkmnStats
-	add_predef CalcPkmnStatC
+	add_predef CalcMonStats
+	add_predef CalcMonStatC
 	add_predef CanLearnTMHMMove
 	add_predef GetTMHMMove
 	add_predef LinkTextboxAtHL ; $ 10
 	add_predef PrintMoveDesc
 	add_predef UpdatePlayerHUD
 	add_predef PlaceGraphic
-	add_predef CheckPlayerPartyForFitPkmn
+	add_predef CheckPlayerPartyForFitMon
 	add_predef UpdateEnemyHUD
 	add_predef StartBattle
 	add_predef FillInExpBar
@@ -38,7 +38,7 @@ PredefPointers:: ; 856b
 	add_predef EvolveAfterBattle
 	add_predef TradeAnimationPlayer2
 	add_predef TradeAnimation
-	add_predef CopyPkmnToTempMon
+	add_predef CopyMonToTempMon
 	add_predef ListMoves ; $20
 	add_predef PlaceNonFaintStatus
 	add_predef Unused_PlaceEnemyHPLevel
@@ -58,7 +58,7 @@ PredefPointers:: ; 856b
 	add_predef InitSGBBorder ; $30
 	add_predef LoadSGBLayout
 	add_predef Pokedex_GetArea
-	add_predef Unused_CheckContestMon
+	add_predef Unused_CheckShininess
 	add_predef DoBattleTransition
 	add_predef DummyPredef35
 	add_predef DummyPredef36
@@ -82,4 +82,3 @@ PredefPointers:: ; 856b
 	add_predef Unused_HOF_AnimateAlignedFrontpic ; $48
 	add_predef HOF_AnimateFrontpic
 	dbw -1, InexplicablyEmptyFunction ; ???
-; 864c
diff --git a/data/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm
index ad7b6529d..acef4bdd3 100644
--- a/data/radio/oaks_pkmn_talk_routes.asm
+++ b/data/radio/oaks_pkmn_talk_routes.asm
@@ -1,19 +1,19 @@
 ; Oak's Pokémon Talk will list wild Pokémon on these maps.
 
-OaksPkmnTalkRoutes:
-	map ROUTE_29
-	map ROUTE_46
-	map ROUTE_30
-	map ROUTE_32
-	map ROUTE_34
-	map ROUTE_35
-	map ROUTE_37
-	map ROUTE_38
-	map ROUTE_39
-	map ROUTE_42
-	map ROUTE_43
-	map ROUTE_44
-	map ROUTE_45
-	map ROUTE_36
-	map ROUTE_31
-OaksPkmnTalkRoutesEnd
+OaksPKMNTalkRoutes:
+	map_id ROUTE_29
+	map_id ROUTE_46
+	map_id ROUTE_30
+	map_id ROUTE_32
+	map_id ROUTE_34
+	map_id ROUTE_35
+	map_id ROUTE_37
+	map_id ROUTE_38
+	map_id ROUTE_39
+	map_id ROUTE_42
+	map_id ROUTE_43
+	map_id ROUTE_44
+	map_id ROUTE_45
+	map_id ROUTE_36
+	map_id ROUTE_31
+.End
diff --git a/data/radio/pnp_hidden_places.asm b/data/radio/pnp_hidden_places.asm
index 4cf1987d3..a43dfd252 100644
--- a/data/radio/pnp_hidden_places.asm
+++ b/data/radio/pnp_hidden_places.asm
@@ -1,13 +1,13 @@
 ; Places and People will not describe these maps.
 
 PnP_HiddenPlaces:
-	map PALLET_TOWN
-	map ROUTE_22
-	map PEWTER_CITY
-	map CERULEAN_POLICE_STATION
-	map ROUTE_12
-	map ROUTE_11
-	map ROUTE_16
-	map ROUTE_14
-	map CINNABAR_POKECENTER_2F_BETA
-PnP_HiddenPlacesEnd
+	map_id PALLET_TOWN
+	map_id ROUTE_22
+	map_id PEWTER_CITY
+	map_id CERULEAN_POLICE_STATION
+	map_id ROUTE_12
+	map_id ROUTE_11
+	map_id ROUTE_16
+	map_id ROUTE_14
+	map_id CINNABAR_POKECENTER_2F_BETA
+.End
diff --git a/data/sgb_ctrl_packets.asm b/data/sgb_ctrl_packets.asm
index a8c1e25f5..b3c2b0404 100644
--- a/data/sgb_ctrl_packets.asm
+++ b/data/sgb_ctrl_packets.asm
@@ -37,7 +37,6 @@ sgb_data_snd: MACRO
 	db \3 ; length (1-11)
 ENDM
 
-
 ; Crystal does not support SGB, so this is unused.
 
 PalTrnPacket:  sgb_pal_trn
@@ -49,7 +48,6 @@ PctTrnPacket:  sgb_pct_trn
 MaskEnFreezePacket: sgb_mask_en 1
 MaskEnCancelPacket: sgb_mask_en 0
 
-
 ; These are packets containing SNES code.
 ; This set of packets is found in several Japanese SGB-compatible titles.
 ; It appears to be part of NCL's SGB devkit.
diff --git a/data/special_pointers.asm b/data/special_pointers.asm
index f788583a2..2b62dc6a3 100644
--- a/data/special_pointers.asm
+++ b/data/special_pointers.asm
@@ -6,180 +6,179 @@ add_special: MACRO
 	dba \1
 ENDM
 
-SpecialsPointers:: ; c029
-	add_special Special_WarpToSpawnPoint
+SpecialsPointers::
+	add_special WarpToSpawnPoint ; $0
 
 ; Communications
-	add_special Special_SetBitsForLinkTradeRequest
-	add_special Special_WaitForLinkedFriend
-	add_special Special_CheckLinkTimeout
-	add_special Special_TryQuickSave
-	add_special Special_CheckBothSelectedSameRoom
-	add_special Special_FailedLinkToPast
-	add_special Special_CloseLink
-	add_special Special_WaitForOtherPlayerToExit
-	add_special Special_SetBitsForBattleRequest
-	add_special Special_SetBitsForTimeCapsuleRequest
-	add_special Special_CheckTimeCapsuleCompatibility
-	add_special Special_EnterTimeCapsule
-	add_special Special_TradeCenter
-	add_special Special_Colosseum
-	add_special Special_TimeCapsule
-	add_special Special_CableClubCheckWhichChris
-	add_special Special_CheckMysteryGift
-	add_special Special_GetMysteryGiftItem
-	add_special Special_UnlockMysteryGift
+	add_special SetBitsForLinkTradeRequest
+	add_special WaitForLinkedFriend
+	add_special CheckLinkTimeout
+	add_special TryQuickSave
+	add_special CheckBothSelectedSameRoom
+	add_special FailedLinkToPast
+	add_special CloseLink
+	add_special WaitForOtherPlayerToExit ; $8
+	add_special SetBitsForBattleRequest
+	add_special SetBitsForTimeCapsuleRequest
+	add_special CheckTimeCapsuleCompatibility
+	add_special EnterTimeCapsule
+	add_special TradeCenter
+	add_special Colosseum
+	add_special TimeCapsule
+	add_special CableClubCheckWhichChris ; $10
+	add_special CheckMysteryGift
+	add_special GetMysteryGiftItem
+	add_special UnlockMysteryGift
 
-; Map Events
-	add_special Special_BugContestJudging
-	add_special Special_CheckPartyFullAfterContest
-	add_special Special_ContestDropOffMons
-	add_special Special_ContestReturnMons
-	add_special Special_GiveParkBalls
-	add_special Special_CheckMagikarpLength
-	add_special Special_MagikarpHouseSign
+; Map events
+	add_special BugContestJudging
+	add_special CheckPartyFullAfterContest
+	add_special ContestDropOffMons
+	add_special ContestReturnMons
+	add_special GiveParkBalls ; $18
+	add_special CheckMagikarpLength
+	add_special MagikarpHouseSign
 	add_special HealParty ; this is both a special and a predef
-	add_special Special_PokemonCenterPC
-	add_special Special_KrissHousePC
-	add_special Special_DayCareMan
-	add_special Special_DayCareLady
-	add_special Special_DayCareManOutside
-	add_special Special_MoveDeletion
-	add_special Special_BankOfMom
-	add_special Special_MagnetTrain
-	add_special Special_NameRival
-	add_special Special_SetDayOfWeek
-	add_special Special_TownMap
-	add_special Special_UnownPrinter
-	add_special Special_MapRadio
-	add_special Special_UnownPuzzle
-	add_special Special_SlotMachine
-	add_special Special_CardFlip
-	add_special Special_DummyNonfunctionalGameCornerGame
-	add_special Special_ClearBGPalettesBufferScreen
-	add_special Special_FadeOutPalettes
-	add_special Special_BattleTowerFade
-	add_special Special_FadeBlackQuickly
-	add_special Special_FadeInPalettes
-	add_special Special_FadeInQuickly
+	add_special PokemonCenterPC
+	add_special PlayersHousePC
+	add_special DayCareMan
+	add_special DayCareLady
+	add_special DayCareManOutside ; $20
+	add_special MoveDeletion
+	add_special BankOfMom
+	add_special MagnetTrain
+	add_special NameRival
+	add_special SetDayOfWeek
+	add_special OverworldTownMap
+	add_special UnownPrinter
+	add_special MapRadio ; $28
+	add_special UnownPuzzle
+	add_special SlotMachine
+	add_special CardFlip
+	add_special DummyNonfunctionalGameCornerGame
+	add_special ClearBGPalettesBufferScreen
+	add_special FadeOutPalettes
+	add_special BattleTowerFade
+	add_special FadeBlackQuickly ; $30
+	add_special FadeInPalettes
+	add_special FadeInQuickly
 	add_special ReloadSpritesNoPalettes ; bank 0
 	add_special ClearBGPalettes ; bank 0
 	add_special UpdateTimePals ; bank 0
 	add_special ClearTileMap ; bank 0
 	add_special UpdateSprites ; bank 0
-	add_special ReplaceKrisSprite ; bank 0
-	add_special Special_GameCornerPrizeMonCheckDex
-	add_special UnusedSpecial_SeenMon
+	add_special ReplaceKrisSprite ; $38 ; bank 0
+	add_special GameCornerPrizeMonCheckDex
+	add_special UnusedSetSeenMon
 	add_special WaitSFX ; bank 0
 	add_special PlayMapMusic ; bank 0
 	add_special RestartMapMusic ; bank 0
-	add_special Special_HealMachineAnim
-	add_special Special_SurfStartStep
-	add_special Special_FindGreaterThanThatLevel
-	add_special Special_FindAtLeastThatHappy
-	add_special Special_FindThatSpecies
-	add_special Special_FindThatSpeciesYourTrainerID
-	add_special UnusedSpecial_CheckUnusedTwoDayTimer
-	add_special Special_DayCareMon1
-	add_special Special_DayCareMon2
-	add_special Special_SelectRandomBugContestContestants
-	add_special Special_ActivateFishingSwarm
-	add_special Special_ToggleMaptileDecorations
-	add_special Special_ToggleDecorationsVisibility
-	add_special Special_GiveShuckle
-	add_special Special_ReturnShuckle
-	add_special Special_BillsGrandfather
-	add_special Special_CheckPokerus
-	add_special Special_DisplayCoinCaseBalance
-	add_special Special_DisplayMoneyAndCoinBalance
-	add_special Special_PlaceMoneyTopRight
-	add_special Special_CheckForLuckyNumberWinners
-	add_special Special_CheckLuckyNumberShowFlag
-	add_special Special_ResetLuckyNumberShowFlag
-	add_special Special_PrintTodaysLuckyNumber
-	add_special Special_SelectApricornForKurt
-	add_special Special_NameRater
-	add_special Special_DisplayLinkRecord
-	add_special Special_GetFirstPokemonHappiness
-	add_special Special_CheckFirstMonIsEgg
-	add_special Special_RandomUnseenWildMon
-	add_special Special_RandomPhoneWildMon
-	add_special Special_RandomPhoneMon
-	add_special Special_LoadUsedSpritesGFX
-	add_special Special_PlaySlowCry
-	add_special Special_SnorlaxAwake
-	add_special Special_YoungerHaircutBrother
-	add_special Special_OlderHaircutBrother
-	add_special Special_DaisyMassage
-	add_special Special_PlayCurMonCry
-	add_special Special_ProfOaksPCBoot
-	add_special Special_GameboyCheck
-	add_special Special_TrainerHouse
-	add_special Special_PhotoStudio
-	add_special Special_InitRoamMons
-	add_special Special_FadeOutMusic
-	add_special Special_Diploma
-	add_special Special_PrintDiploma
+	add_special HealMachineAnim
+	add_special SurfStartStep
+	add_special FindPartyMonAboveLevel ; $40
+	add_special FindPartyMonAtLeastThatHappy
+	add_special FindPartyMonThatSpecies
+	add_special FindPartyMonThatSpeciesYourTrainerID
+	add_special UnusedCheckUnusedTwoDayTimer
+	add_special DayCareMon1
+	add_special DayCareMon2
+	add_special SelectRandomBugContestContestants
+	add_special ActivateFishingSwarm ; $48
+	add_special ToggleMaptileDecorations
+	add_special ToggleDecorationsVisibility
+	add_special GiveShuckle
+	add_special ReturnShuckle
+	add_special BillsGrandfather
+	add_special CheckPokerus
+	add_special DisplayCoinCaseBalance
+	add_special DisplayMoneyAndCoinBalance ; $50
+	add_special PlaceMoneyTopRight
+	add_special CheckForLuckyNumberWinners
+	add_special CheckLuckyNumberShowFlag
+	add_special ResetLuckyNumberShowFlag
+	add_special PrintTodaysLuckyNumber
+	add_special SelectApricornForKurt
+	add_special NameRater
+	add_special DisplayLinkRecord ; $58
+	add_special GetFirstPokemonHappiness
+	add_special CheckFirstMonIsEgg
+	add_special RandomUnseenWildMon
+	add_special RandomPhoneWildMon
+	add_special RandomPhoneMon
+	add_special LoadUsedSpritesGFX
+	add_special PlaySlowCry
+	add_special SnorlaxAwake ; $60
+	add_special YoungerHaircutBrother
+	add_special OlderHaircutBrother
+	add_special DaisysGrooming
+	add_special PlayCurMonCry
+	add_special ProfOaksPCBoot
+	add_special GameboyCheck
+	add_special TrainerHouse
+	add_special PhotoStudio ; $68
+	add_special InitRoamMons
+	add_special FadeOutMusic
+	add_special Diploma
+	add_special PrintDiploma
 
-	; Crystal
-	add_special Special_Function11ac3e
-	add_special Special_Function11b444
-	add_special Special_Function11b5e8
-	add_special Special_Function11b7e5
-	add_special Special_Function11b879
-	add_special Special_Function11b920
-	add_special Special_Function11b93b
-	add_special Special_BattleTowerRoomMenu
-	add_special Special_Function1700ba
-	add_special Special_Function170114
-	add_special Special_BattleTowerBattle
-	add_special UnusedSpecial_Function1704e1
+; Crystal only
+	add_special Function11ac3e
+	add_special Function11b444
+	add_special Function11b5e8
+	add_special Function11b7e5 ; $70
+	add_special Function11b879
+	add_special Function11b920
+	add_special Function11b93b
+	add_special BattleTowerRoomMenu
+	add_special Function1700ba
+	add_special Function170114
+	add_special BattleTowerBattle
+	add_special Function1704e1 ; $78
 	add_special DummySpecial_17021d
-	add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite
-	add_special Special_Function11ba38
-	add_special Special_CheckForBattleTowerRules
-	add_special Special_GiveOddEgg
+	add_special LoadOpponentTrainerAndPokemonWithOTSprite
+	add_special Function11ba38
+	add_special CheckForBattleTowerRules
+	add_special GiveOddEgg
 	add_special Reset ; bank 0
-	add_special Special_Function1011f1
-	add_special Special_Function101220
-	add_special Special_Function101225
-	add_special Special_Function101231
-	add_special Special_MoveTutor
-	add_special Special_OmanyteChamber
-	add_special Special_Function11c1ab
-	add_special Special_BattleTowerAction
-	add_special Special_DisplayUnownWords
-	add_special Special_Menu_ChallengeExplanationCancel
-	add_special Special_Function17d2b6
-	add_special Special_Function17d2ce
-	add_special Special_BattleTowerMobileError
-	add_special Special_AskMobileOrCable
-	add_special Special_HoOhChamber
-	add_special Special_Function102142
-	add_special Special_CelebiShrineEvent
-	add_special Special_CheckCaughtCelebi
-	add_special Special_PokeSeer
-	add_special Special_BuenasPassword
-	add_special Special_BuenaPrize
-	add_special Special_Dratini
-	add_special Special_SampleKenjiBreakCountdown
-	add_special Special_BeastsCheck
-	add_special Special_MonCheck
-	add_special Special_SetPlayerPalette
+	add_special Function1011f1
+	add_special Function101220 ; $80
+	add_special Function101225
+	add_special Function101231
+	add_special MoveTutor
+	add_special OmanyteChamber
+	add_special Function11c1ab
+	add_special BattleTowerAction
+	add_special DisplayUnownWords
+	add_special Menu_ChallengeExplanationCancel ; $88
+	add_special Function17d2b6
+	add_special Function17d2ce
+	add_special BattleTowerMobileError
+	add_special AskMobileOrCable
+	add_special HoOhChamber
+	add_special Function102142
+	add_special CelebiShrineEvent
+	add_special CheckCaughtCelebi ; $90
+	add_special PokeSeer
+	add_special BuenasPassword
+	add_special BuenaPrize
+	add_special GiveDratini
+	add_special SampleKenjiBreakCountdown
+	add_special BeastsCheck
+	add_special MonCheck
+	add_special SetPlayerPalette ; $98
 	add_special DummySpecial_170bd2
-	add_special Special_Mobile_SelectThreeMons
-	add_special Special_Function1037eb
-	add_special Special_Function10383c
-	add_special Special_StubbedTrainerRankings_Healings
-	add_special Special_RefreshSprites
-	add_special Special_Function1037c2
-	add_special Special_Mobile_DummyReturnFalse
-	add_special Special_Function103780
-	add_special Special_Function10387b
-	add_special Special_AskRememberPassword
-	add_special Special_LoadMapPalettes
-	add_special UnusedSpecial_FindItemInPCOrBag
-	add_special Special_InitialSetDSTFlag
-	add_special Special_InitialClearDSTFlag
-	add_special DummySpecial_c224
-; c224
+	add_special Mobile_SelectThreeMons
+	add_special Function1037eb
+	add_special Function10383c
+	add_special StubbedTrainerRankings_Healings
+	add_special RefreshSprites
+	add_special Function1037c2
+	add_special Mobile_DummyReturnFalse ; $a0
+	add_special Function103780
+	add_special Function10387b
+	add_special AskRememberPassword
+	add_special LoadMapPalettes
+	add_special UnusedFindItemInPCOrBag
+	add_special InitialSetDSTFlag
+	add_special InitialClearDSTFlag
+	add_special DummySpecial_c224 ; $a8
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm
index d768ec21a..666f2b2e2 100755..100644
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -1,4 +1,4 @@
-SpriteAnimFrameData: ; 8d6e6
+SpriteAnimFrameData:
 ; entries correspond to SPRITE_ANIM_FRAMESET_* constants
 	dw .Frameset_00
 	dw .Frameset_PartyMon
@@ -66,7 +66,6 @@ SpriteAnimFrameData: ; 8d6e6
 	dw .Frameset_IntroUnownF
 	dw .Frameset_CelebiLeft
 	dw .Frameset_CelebiRight
-; 8d76a
 
 .Frameset_00:
 	frame SPRITE_ANIM_OAMSET_RED_WALK_1, 32
@@ -496,4 +495,3 @@ SpriteAnimFrameData: ; 8d6e6
 	frame SPRITE_ANIM_OAMSET_CELEBI_1,  8, OAM_X_FLIP
 	frame SPRITE_ANIM_OAMSET_CELEBI_2,  8, OAM_X_FLIP
 	endanim
-; 8d94d
diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm
index bfd5cbcd3..4fa153504 100644
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -1,4 +1,4 @@
-SpriteAnimOAMData: ; 8d94d
+SpriteAnimOAMData:
 ; entries correspond to SPRITE_ANIM_OAMSET_* constants
 	; vtile offset, pointer
 	dbw $00, .OAMData_RedWalk                  ; SPRITE_ANIM_OAMSET_RED_WALK_1
@@ -1126,4 +1126,3 @@ SpriteAnimOAMData: ; 8d94d
 	dsprite  0,  0, -1,  4, $51, 1
 	dsprite  0,  0,  0,  4, $52, 1
 	dsprite  0,  0,  1,  4, $53, 1
-; 8e706
diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm
index 36a0f4afc..77171bb8f 100644
--- a/data/sprite_anims/sequences.asm
+++ b/data/sprite_anims/sequences.asm
@@ -1,4 +1,4 @@
-SpriteAnimSeqData: ; 8d1c4
+SpriteAnimSeqData:
 ; entries correspond to SPRITE_ANIM_INDEX_* constants
 	; frameset sequence, tile
 	db SPRITE_ANIM_FRAMESET_PARTY_MON,                SPRITE_ANIM_SEQ_PARTY_MON,               $00 ; SPRITE_ANIM_INDEX_PARTY_MON
@@ -46,4 +46,3 @@ SpriteAnimSeqData: ; 8d1c4
 	db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F,            SPRITE_ANIM_SEQ_INTRO_UNOWN_F,           $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN_F
 	db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY,       SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY,      $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
 	db SPRITE_ANIM_FRAMESET_CELEBI_LEFT,              SPRITE_ANIM_SEQ_NULL,                    $00 ; SPRITE_ANIM_INDEX_CELEBI
-; 8d24b
diff --git a/data/sprites/emotes.asm b/data/sprites/emotes.asm
index 2e25e52b5..2371c4624 100644
--- a/data/sprites/emotes.asm
+++ b/data/sprites/emotes.asm
@@ -2,21 +2,20 @@ emote: MACRO
 ; graphics pointer, length, starting tile
 	dw \1
 	db \2 tiles, BANK(\1)
-	dw vTiles1 tile \3
+	dw vTiles0 tile \3
 ENDM
 
-Emotes: ; 144d
+Emotes:
 ; entries correspond to EMOTE_* constants
-	emote ShockEmote,     4, $78
-	emote QuestionEmote,  4, $78
-	emote HappyEmote,     4, $78
-	emote SadEmote,       4, $78
-	emote HeartEmote,     4, $78
-	emote BoltEmote,      4, $78
-	emote SleepEmote,     4, $78
-	emote FishEmote,      4, $78
-	emote JumpShadowGFX,  1, $7c
-	emote FishingRodGFX,  2, $7c
-	emote BoulderDustGFX, 2, $7e
-	emote GrassRustleGFX, 1, $7e
-; 14495
+	emote ShockEmote,     4, $f8
+	emote QuestionEmote,  4, $f8
+	emote HappyEmote,     4, $f8
+	emote SadEmote,       4, $f8
+	emote HeartEmote,     4, $f8
+	emote BoltEmote,      4, $f8
+	emote SleepEmote,     4, $f8
+	emote FishEmote,      4, $f8
+	emote JumpShadowGFX,  1, $fc
+	emote FishingRodGFX,  2, $fc
+	emote BoulderDustGFX, 2, $fe
+	emote GrassRustleGFX, 1, $fe
diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm
index 4d2a55364..aebf97ff5 100644
--- a/data/sprites/facings.asm
+++ b/data/sprites/facings.asm
@@ -1,4 +1,4 @@
-Facings: ; 4049
+Facings:
 ; entries correspond to FACING_* constants
 	dw FacingStepDown0
 	dw FacingStepDown1
@@ -32,11 +32,10 @@ Facings: ; 4049
 	dw FacingBoulderDust2
 	dw FacingGrass1
 	dw FacingGrass2
-FacingsEnd:
+.End
 	dw 0
 
-NUM_FACINGS EQU (FacingsEnd - Facings) / 2
-
+NUM_FACINGS EQU (Facings.End - Facings) / 2
 
 ; Tables used as a reference to transform OAM data.
 
@@ -50,136 +49,120 @@ FacingWeirdTree2: ; standing down
 	db 4 ; #
 	db  0,  0, 0, $00
 	db  0,  8, 0, $01
-	db  8,  0, 2, $02
-	db  8,  8, 2, $03
-; 409c
+	db  8,  0, RELATIVE_ATTRIBUTES, $02
+	db  8,  8, RELATIVE_ATTRIBUTES, $03
 
 FacingStepDown1: ; walking down 1
 	db 4 ; #
 	db  0,  0, 0, $80
 	db  0,  8, 0, $81
-	db  8,  0, 2, $82
-	db  8,  8, 2, $83
-; 40ad
+	db  8,  0, RELATIVE_ATTRIBUTES, $82
+	db  8,  8, RELATIVE_ATTRIBUTES, $83
 
 FacingStepDown3: ; walking down 2
 	db 4 ; #
 	db  0,  8, X_FLIP, $80
 	db  0,  0, X_FLIP, $81
-	db  8,  8, 2 | X_FLIP, $82
-	db  8,  0, 2 | X_FLIP, $83
-; 40be
+	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $82
+	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $83
 
 FacingStepUp0:
 FacingStepUp2: ; standing up
 	db 4 ; #
 	db  0,  0, 0, $04
 	db  0,  8, 0, $05
-	db  8,  0, 2, $06
-	db  8,  8, 2, $07
-; 40cf
+	db  8,  0, RELATIVE_ATTRIBUTES, $06
+	db  8,  8, RELATIVE_ATTRIBUTES, $07
 
 FacingStepUp1: ; walking up 1
 	db 4 ; #
 	db  0,  0, 0, $84
 	db  0,  8, 0, $85
-	db  8,  0, 2, $86
-	db  8,  8, 2, $87
-; 40e0
+	db  8,  0, RELATIVE_ATTRIBUTES, $86
+	db  8,  8, RELATIVE_ATTRIBUTES, $87
 
 FacingStepUp3: ; walking up 2
 	db 4 ; #
 	db  0,  8, X_FLIP, $84
 	db  0,  0, X_FLIP, $85
-	db  8,  8, 2 | X_FLIP, $86
-	db  8,  0, 2 | X_FLIP, $87
-; 40f1
+	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $86
+	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $87
 
 FacingStepLeft0:
 FacingStepLeft2: ; standing left
 	db 4 ; #
 	db  0,  0, 0, $08
 	db  0,  8, 0, $09
-	db  8,  0, 2, $0a
-	db  8,  8, 2, $0b
-; 4102
+	db  8,  0, RELATIVE_ATTRIBUTES, $0a
+	db  8,  8, RELATIVE_ATTRIBUTES, $0b
 
 FacingStepRight0:
 FacingStepRight2: ; standing right
 	db 4 ; #
 	db  0,  8, X_FLIP, $08
 	db  0,  0, X_FLIP, $09
-	db  8,  8, 2 | X_FLIP, $0a
-	db  8,  0, 2 | X_FLIP, $0b
-; 4113
+	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $0a
+	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $0b
 
 FacingStepLeft1:
 FacingStepLeft3: ; walking left
 	db 4 ; #
 	db  0,  0, 0, $88
 	db  0,  8, 0, $89
-	db  8,  0, 2, $8a
-	db  8,  8, 2, $8b
-; 4124
+	db  8,  0, RELATIVE_ATTRIBUTES, $8a
+	db  8,  8, RELATIVE_ATTRIBUTES, $8b
 
 FacingStepRight1:
 FacingStepRight3: ; walking right
 	db 4 ; #
 	db  0,  8, X_FLIP, $88
 	db  0,  0, X_FLIP, $89
-	db  8,  8, 2 | X_FLIP, $8a
-	db  8,  0, 2 | X_FLIP, $8b
-; 4135
+	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $8a
+	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $8b
 
 FacingFishDown: ; fishing down
 	db 5 ; #
 	db  0,  0, 0, $00
 	db  0,  8, 0, $01
-	db  8,  0, 2, $02
-	db  8,  8, 2, $03
-	db 16,  0, 4, $fc
-; 414a
+	db  8,  0, RELATIVE_ATTRIBUTES, $02
+	db  8,  8, RELATIVE_ATTRIBUTES, $03
+	db 16,  0, ABSOLUTE_TILE_ID, $fc
 
 FacingFishUp: ; fishing up
 	db 5 ; #
 	db  0,  0, 0, $04
 	db  0,  8, 0, $05
-	db  8,  0, 2, $06
-	db  8,  8, 2, $07
-	db -8,  0, 4, $fc
-; 415f
+	db  8,  0, RELATIVE_ATTRIBUTES, $06
+	db  8,  8, RELATIVE_ATTRIBUTES, $07
+	db -8,  0, ABSOLUTE_TILE_ID, $fc
 
 FacingFishLeft: ; fishing left
 	db 5 ; #
 	db  0,  0, 0, $08
 	db  0,  8, 0, $09
-	db  8,  0, 2, $0a
-	db  8,  8, 2, $0b
-	db  5, -8, 4 | X_FLIP, $fd
-; 4174
+	db  8,  0, RELATIVE_ATTRIBUTES, $0a
+	db  8,  8, RELATIVE_ATTRIBUTES, $0b
+	db  5, -8, ABSOLUTE_TILE_ID | X_FLIP, $fd
 
 FacingFishRight: ; fishing right
 	db 5 ; #
 	db  0,  8, X_FLIP, $08
 	db  0,  0, X_FLIP, $09
-	db  8,  8, 2 | X_FLIP, $0a
-	db  8,  0, 2 | X_FLIP, $0b
-	db  5, 16, 4, $fd
-; 4189
+	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $0a
+	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $0b
+	db  5, 16, ABSOLUTE_TILE_ID, $fd
 
 FacingEmote: ; emote
 	db 4 ; #
-	db  0,  0, 4, $f8
-	db  0,  8, 4, $f9
-	db  8,  0, 4, $fa
-	db  8,  8, 4, $fb
-; 419a
+	db  0,  0, ABSOLUTE_TILE_ID, $f8
+	db  0,  8, ABSOLUTE_TILE_ID, $f9
+	db  8,  0, ABSOLUTE_TILE_ID, $fa
+	db  8,  8, ABSOLUTE_TILE_ID, $fb
 
 FacingShadow: ; shadow
 	db 2 ; #
-	db  0,  0, 4, $fc
-	db  0,  8, 4 | X_FLIP, $fc
-; 41a3
+	db  0,  0, ABSOLUTE_TILE_ID, $fc
+	db  0,  8, ABSOLUTE_TILE_ID | X_FLIP, $fc
 
 FacingBigDollSymmetric: ; big snorlax or lapras doll
 	db 16 ; #
@@ -199,23 +182,20 @@ FacingBigDollSymmetric: ; big snorlax or lapras doll
 	db 16, 16, X_FLIP, $05
 	db 24, 24, X_FLIP, $06
 	db 24, 16, X_FLIP, $07
-; 41e4
 
-FacingWeirdTree1: ; 41e4
+FacingWeirdTree1:
 	db 4 ; #
 	db  0,  0, 0, $04
 	db  0,  8, 0, $05
 	db  8,  0, 0, $06
 	db  8,  8, 0, $07
-; 41f5
 
-FacingWeirdTree3: ; 41f5
+FacingWeirdTree3:
 	db 4 ; #
 	db  0,  8, X_FLIP, $04
 	db  0,  0, X_FLIP, $05
 	db  8,  8, X_FLIP, $06
 	db  8,  0, X_FLIP, $07
-; 4206
 
 FacingBigDollAsymmetric: ; big doll other than snorlax or lapras
 	db 14 ; #
@@ -233,32 +213,27 @@ FacingBigDollAsymmetric: ; big doll other than snorlax or lapras
 	db 16, 16, 0, $08
 	db 24, 24, X_FLIP, $04
 	db 24, 16, 0, $0b
-; 423f
 
 FacingBoulderDust1: ; boulder dust 1
 	db 4 ; #
-	db  0,  0, 4, $fe
-	db  0,  8, 4, $fe
-	db  8,  0, 4, $fe
-	db  8,  8, 4, $fe
-; 4250
+	db  0,  0, ABSOLUTE_TILE_ID, $fe
+	db  0,  8, ABSOLUTE_TILE_ID, $fe
+	db  8,  0, ABSOLUTE_TILE_ID, $fe
+	db  8,  8, ABSOLUTE_TILE_ID, $fe
 
 FacingBoulderDust2: ; boulder dust 2
 	db 4 ; #
-	db  0,  0, 4, $ff
-	db  0,  8, 4, $ff
-	db  8,  0, 4, $ff
-	db  8,  8, 4, $ff
-; 4261
+	db  0,  0, ABSOLUTE_TILE_ID, $ff
+	db  0,  8, ABSOLUTE_TILE_ID, $ff
+	db  8,  0, ABSOLUTE_TILE_ID, $ff
+	db  8,  8, ABSOLUTE_TILE_ID, $ff
 
-FacingGrass1: ; 4261
+FacingGrass1:
 	db 2 ; #
-	db  8,  0, 4, $fe
-	db  8,  8, 4 | X_FLIP, $fe
-; 426a
+	db  8,  0, ABSOLUTE_TILE_ID, $fe
+	db  8,  8, ABSOLUTE_TILE_ID | X_FLIP, $fe
 
-FacingGrass2: ; 426a
+FacingGrass2:
 	db 2 ; #
-	db  9, -1, 4, $fe
-	db  9,  9, 4 | X_FLIP, $fe
-; 4273
+	db  9, -1, ABSOLUTE_TILE_ID, $fe
+	db  9,  9, ABSOLUTE_TILE_ID | X_FLIP, $fe
diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm
index 19a7c8d27..10afaf57b 100755..100644
--- a/data/sprites/map_objects.asm
+++ b/data/sprites/map_objects.asm
@@ -1,47 +1,306 @@
-sprite_movement_data: MACRO
-	db \1, \2, \3, \4, \5
-	dn \6, 0
-ENDM
-
-SpriteMovementData:: ; 4273
+SpriteMovementData::
 ; entries correspond to SPRITEMOVEDATA_* constants
-	; function,                                              facing, action,                  flags1, flags2, palette flags
-	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_00
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; SPRITEMOVEDATA_ITEM_TREE
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_WANDER
-	sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINRANDOM_SLOW
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y,         DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_WALK_UP_DOWN
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X,         DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_WALK_LEFT_RIGHT
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_DOWN
-	sprite_movement_data SPRITEMOVEFN_STANDING,              UP,     OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_UP
-	sprite_movement_data SPRITEMOVEFN_STANDING,              LEFT,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_LEFT
-	sprite_movement_data SPRITEMOVEFN_STANDING,              RIGHT,  OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_STANDING_RIGHT
-	sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINRANDOM_FAST
-	sprite_movement_data SPRITEMOVEFN_OBEY_DPAD,             DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_PLAYER
-	sprite_movement_data SPRITEMOVEFN_08,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0C
-	sprite_movement_data SPRITEMOVEFN_09,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0D
-	sprite_movement_data SPRITEMOVEFN_0A,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0E
-	sprite_movement_data SPRITEMOVEFN_0B,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_0F
-	sprite_movement_data SPRITEMOVEFN_0C,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_10
-	sprite_movement_data SPRITEMOVEFN_0D,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_11
-	sprite_movement_data SPRITEMOVEFN_0E,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_12
-	sprite_movement_data SPRITEMOVEFN_FOLLOW,                DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_FOLLOWING
-	sprite_movement_data SPRITEMOVEFN_SCRIPTED,              DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_SCRIPTED
-	sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX,           DOWN,   OBJECT_ACTION_BIG_SNORLAX,  $2e,    $01,    %1100 ; SPRITEMOVEDATA_SNORLAX
-	sprite_movement_data SPRITEMOVEFN_BOUNCE,                DOWN,   OBJECT_ACTION_BOUNCE,       $2e,    $00,    %0000 ; SPRITEMOVEDATA_POKEMON
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; SPRITEMOVEDATA_SUDOWOODO
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $2e,    $10,    %0000 ; SPRITEMOVEDATA_SMASHABLE_ROCK
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_STAND,        $2e,    $00,    %0100 ; SPRITEMOVEDATA_STRENGTH_BOULDER
-	sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT,        DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; SPRITEMOVEDATA_FOLLOWNOTEXACT
-	sprite_movement_data SPRITEMOVEFN_SHADOW,                DOWN,   OBJECT_ACTION_00,           $8e,    $01,    %0000 ; SPRITEMOVEDATA_SHADOW
-	sprite_movement_data SPRITEMOVEFN_EMOTE,                 DOWN,   OBJECT_ACTION_EMOTE,        $8e,    $02,    %0000 ; SPRITEMOVEDATA_EMOTE
-	sprite_movement_data SPRITEMOVEFN_SCREENSHAKE,           DOWN,   OBJECT_ACTION_00,           $82,    $00,    %0000 ; SPRITEMOVEDATA_SCREENSHAKE
-	sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE
-	sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE,        RIGHT,  OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; SPRITEMOVEDATA_SPINCLOCKWISE
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_LAPRAS,   $2e,    $01,    %1100 ; SPRITEMOVEDATA_20
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_DOLL,     $2e,    $01,    %1100 ; SPRITEMOVEDATA_BIGDOLL
-	sprite_movement_data SPRITEMOVEFN_BOULDERDUST,           DOWN,   OBJECT_ACTION_BOULDER_DUST, $8e,    $01,    %0000 ; SPRITEMOVEDATA_BOULDERDUST
-	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   OBJECT_ACTION_GRASS_SHAKE,  $8e,    $02,    %0000 ; SPRITEMOVEDATA_GRASS
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0010 ; SPRITEMOVEDATA_LAPRAS
-	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 25
-; 4357
+
+; SPRITEMOVEDATA_00
+	db SPRITEMOVEFN_00 ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db WONT_DELETE ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_STILL
+	db SPRITEMOVEFN_STANDING ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db FIXED_FACING | SLIDING ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_WANDER
+	db SPRITEMOVEFN_RANDOM_WALK_XY ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_SPINRANDOM_SLOW
+	db SPRITEMOVEFN_SLOW_RANDOM_SPIN ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_WALK_UP_DOWN
+	db SPRITEMOVEFN_RANDOM_WALK_Y ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_WALK_LEFT_RIGHT
+	db SPRITEMOVEFN_RANDOM_WALK_X ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_STANDING_DOWN
+	db SPRITEMOVEFN_STANDING ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_STANDING_UP
+	db SPRITEMOVEFN_STANDING ; movement function
+	db UP ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_STANDING_LEFT
+	db SPRITEMOVEFN_STANDING ; movement function
+	db LEFT ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_STANDING_RIGHT
+	db SPRITEMOVEFN_STANDING ; movement function
+	db RIGHT ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_SPINRANDOM_FAST
+	db SPRITEMOVEFN_FAST_RANDOM_SPIN ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_PLAYER
+	db SPRITEMOVEFN_OBEY_DPAD ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db WONT_DELETE ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_0C
+	db SPRITEMOVEFN_08 ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_0D
+	db SPRITEMOVEFN_09 ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_0E
+	db SPRITEMOVEFN_0A ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_0F
+	db SPRITEMOVEFN_0B ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_10
+	db SPRITEMOVEFN_0C ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_11
+	db SPRITEMOVEFN_0D ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_12
+	db SPRITEMOVEFN_0E ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_FOLLOWING
+	db SPRITEMOVEFN_FOLLOW ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db WONT_DELETE ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_SCRIPTED
+	db SPRITEMOVEFN_SCRIPTED ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db WONT_DELETE ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_BIGDOLLSYM
+	db SPRITEMOVEFN_BIG_SNORLAX ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_BIG_DOLL_SYM ; action
+	db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+	db LOW_PRIORITY ; flags2
+	db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
+
+; SPRITEMOVEDATA_POKEMON
+	db SPRITEMOVEFN_BOUNCE ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_BOUNCE ; action
+	db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_SUDOWOODO
+	db SPRITEMOVEFN_STANDING ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db FIXED_FACING | SLIDING ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_SMASHABLE_ROCK
+	db SPRITEMOVEFN_STANDING ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+	db USE_OBP1 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_STRENGTH_BOULDER
+	db SPRITEMOVEFN_STRENGTH ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+	db 0 ; flags2
+	db STRENGTH_BOULDER ; palette flags
+
+; SPRITEMOVEDATA_FOLLOWNOTEXACT
+	db SPRITEMOVEFN_FOLLOWNOTEXACT ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db WONT_DELETE ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_SHADOW
+	db SPRITEMOVEFN_SHADOW ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_00 ; action
+	db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+	db LOW_PRIORITY ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_EMOTE
+	db SPRITEMOVEFN_EMOTE ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_EMOTE ; action
+	db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+	db HIGH_PRIORITY ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_SCREENSHAKE
+	db SPRITEMOVEFN_SCREENSHAKE ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_00 ; action
+	db WONT_DELETE | EMOTE_OBJECT ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE
+	db SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE ; movement function
+	db LEFT ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_SPINCLOCKWISE
+	db SPRITEMOVEFN_SPIN_CLOCKWISE ; movement function
+	db RIGHT ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_BIGDOLLASYM
+	db SPRITEMOVEFN_STRENGTH ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_BIG_DOLL_ASYM ; action
+	db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+	db LOW_PRIORITY ; flags2
+	db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
+
+; SPRITEMOVEDATA_BIGDOLL
+	db SPRITEMOVEFN_STRENGTH ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_BIG_DOLL ; action
+	db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+	db LOW_PRIORITY ; flags2
+	db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
+
+; SPRITEMOVEDATA_BOULDERDUST
+	db SPRITEMOVEFN_BOULDERDUST ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_BOULDER_DUST ; action
+	db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+	db LOW_PRIORITY ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_GRASS
+	db SPRITEMOVEFN_GRASS ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_GRASS_SHAKE ; action
+	db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+	db HIGH_PRIORITY ; flags2
+	db 0 ; palette flags
+
+; SPRITEMOVEDATA_SWIM_WANDER
+	db SPRITEMOVEFN_RANDOM_WALK_XY ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db SWIMMING ; palette flags
+
+; 25
+	db SPRITEMOVEFN_00 ; movement function
+	db DOWN ; facing
+	db OBJECT_ACTION_STAND ; action
+	db 0 ; flags1
+	db 0 ; flags2
+	db 0 ; palette flags
diff --git a/data/sprites/player_sprites.asm b/data/sprites/player_sprites.asm
new file mode 100644
index 000000000..89eb6e831
--- /dev/null
+++ b/data/sprites/player_sprites.asm
@@ -0,0 +1,13 @@
+ChrisStateSprites:
+	db PLAYER_NORMAL,    SPRITE_CHRIS
+	db PLAYER_BIKE,      SPRITE_CHRIS_BIKE
+	db PLAYER_SURF,      SPRITE_SURF
+	db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
+	db -1 ; end
+
+KrisStateSprites:
+	db PLAYER_NORMAL,    SPRITE_KRIS
+	db PLAYER_BIKE,      SPRITE_KRIS_BIKE
+	db PLAYER_SURF,      SPRITE_SURF
+	db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
+	db -1 ; end
diff --git a/data/sprites/sprite_mons.asm b/data/sprites/sprite_mons.asm
index d3000e2b7..3d53804db 100644
--- a/data/sprites/sprite_mons.asm
+++ b/data/sprites/sprite_mons.asm
@@ -1,4 +1,4 @@
-SpriteMons: ; 14495
+SpriteMons:
 ; entries correspond to SPRITE_* constants past SPRITE_POKEMON
 	db UNOWN
 	db GEODUDE
@@ -35,4 +35,3 @@ SpriteMons: ; 14495
 	db GYARADOS
 	db LUGIA
 	db HO_OH
-; 144b8
diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
index 214b14757..b55593c97 100644
--- a/data/sprites/sprites.asm
+++ b/data/sprites/sprites.asm
@@ -1,111 +1,110 @@
 overworld_sprite: MACRO
 ; pointer, length, type, palette
 	dw \1
-	db \2 * 4 tiles, BANK(\1)
-	db \3, \4
+	db \2 tiles, BANK(\1), \3, \4
 ENDM
 
-OverworldSprites: ; 14736
+OverworldSprites:
 ; entries correspond to SPRITE_* constants
-	overworld_sprite ChrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite ChrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite GameboyKidSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN
-	overworld_sprite SilverSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite OakSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite RedSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BlueSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BillSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite ElderSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite JanineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite KurtSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite MomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BlaineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite RedsMomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite DaisySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite ElmSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite WillSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-	overworld_sprite FalknerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite WhitneySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BugsySpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite MortySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite ChuckSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite JasmineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite PryceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite ClairSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BrockSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite KarenSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
-	overworld_sprite BrunoSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite MistySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite LanceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite SurgeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite ErikaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite KogaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite SabrinaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite CooltrainerMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite CooltrainerFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite BugCatcherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite TwinSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite YoungsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite LassSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite TeacherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BuenaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite SuperNerdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite RockerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite PokefanMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite PokefanFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite GrampsSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite GrannySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite SwimmerGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite SwimmerGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite BigSnorlaxSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
-	overworld_sprite SurfingPikachuSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite RocketSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite RocketGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite NurseSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-	overworld_sprite LinkReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite ClerkSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN
-	overworld_sprite FisherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite FishingGuruSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite ScientistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite KimonoGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite SageSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite UnusedGuySpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-	overworld_sprite GentlemanSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite BlackBeltSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite ReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite OfficerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite CalSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite SlowpokeSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite CaptainSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite BigLaprasSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
-	overworld_sprite GymGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite SailorSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite BikerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN
-	overworld_sprite PharmacistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite MonsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite FairySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BirdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite DragonSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED
-	overworld_sprite BigOnixSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN
-	overworld_sprite N64SpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
-	overworld_sprite SudowoodoSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN
-	overworld_sprite SurfSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite PokeBallSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite PokedexSpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
-	overworld_sprite PaperSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
-	overworld_sprite VirtualBoySpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite OldLinkReceptionistSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED
-	overworld_sprite RockSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK
-	overworld_sprite BoulderSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK
-	overworld_sprite SnesSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
-	overworld_sprite FamicomSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite FruitTreeSpriteGFX, 1, STILL_SPRITE, PAL_OW_TREE
-	overworld_sprite GoldTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN
-	overworld_sprite SilverTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_SILVER
-	overworld_sprite KrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite KrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE
-	overworld_sprite KurtOutsideSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN
-	overworld_sprite SuicuneSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE
-	overworld_sprite EnteiSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite RaikouSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED
-	overworld_sprite StandingYoungsterSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE
+	overworld_sprite ChrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite ChrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite GameboyKidSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN
+	overworld_sprite SilverSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite OakSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite RedSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BlueSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BillSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite ElderSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite JanineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite KurtSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite MomSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BlaineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite RedsMomSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite DaisySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite ElmSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite WillSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite FalknerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite WhitneySpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BugsySpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite MortySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite ChuckSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite JasmineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite PryceSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite ClairSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BrockSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite KarenSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BrunoSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite MistySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite LanceSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite SurgeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite ErikaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite KogaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SabrinaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite CooltrainerMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite CooltrainerFSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BugCatcherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite TwinSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite YoungsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite LassSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite TeacherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BuenaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SuperNerdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite RockerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite PokefanMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite PokefanFSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite GrampsSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite GrannySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SwimmerGuySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SwimmerGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BigSnorlaxSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SurfingPikachuSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite RocketSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite RocketGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite NurseSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite LinkReceptionistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite ClerkSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
+	overworld_sprite FisherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite FishingGuruSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite ScientistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite KimonoGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite SageSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite UnusedGuySpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite GentlemanSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BlackBeltSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite ReceptionistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite OfficerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite CalSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SlowpokeSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite CaptainSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite BigLaprasSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE
+	overworld_sprite GymGuySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite SailorSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite BikerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
+	overworld_sprite PharmacistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite MonsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite FairySpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BirdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite DragonSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+	overworld_sprite BigOnixSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
+	overworld_sprite N64SpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite SudowoodoSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN
+	overworld_sprite SurfSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite PokeBallSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite PokedexSpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite PaperSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE
+	overworld_sprite VirtualBoySpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite OldLinkReceptionistSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED
+	overworld_sprite RockSpriteGFX, 4, STILL_SPRITE, PAL_OW_ROCK
+	overworld_sprite BoulderSpriteGFX, 4, STILL_SPRITE, PAL_OW_ROCK
+	overworld_sprite SnesSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE
+	overworld_sprite FamicomSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite FruitTreeSpriteGFX, 4, STILL_SPRITE, PAL_OW_TREE
+	overworld_sprite GoldTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN
+	overworld_sprite SilverTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_SILVER
+	overworld_sprite KrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite KrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
+	overworld_sprite KurtOutsideSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
+	overworld_sprite SuicuneSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE
+	overworld_sprite EnteiSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite RaikouSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
+	overworld_sprite StandingYoungsterSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE
diff --git a/data/battle/battle_text.asm b/data/text/battle.asm
index 1a609b476..97152ebbb 100644
--- a/data/battle/battle_text.asm
+++ b/data/text/battle.asm
@@ -1,198 +1,170 @@
-BattleText::
+BattleText:: ; used only for BANK(BattleText)
 
-BattleText_PlayerPickedUpPayDayMoney: ; 0x80730
+BattleText_PlayerPickedUpPayDayMoney:
 	text "<PLAYER> picked up"
 	line "¥@"
 	deciram wPayDayMoney, 3, 6
 	text "!"
 	prompt
-; 0x80746
 
-WildPokemonAppearedText: ; 0x80746
+WildPokemonAppearedText:
 	text "Wild @"
 	text_from_ram wEnemyMonNick
 	text_start
 	line "appeared!"
 	prompt
-; 0x8075c
 
-HookedPokemonAttackedText: ; 0x8075c
+HookedPokemonAttackedText:
 	text "The hooked"
 	line "@"
 	text_from_ram wEnemyMonNick
 	text_start
 	cont "attacked!"
 	prompt
-; 0x80778
 
-PokemonFellFromTreeText: ; 0x80778
+PokemonFellFromTreeText:
 	text_from_ram wEnemyMonNick
 	text " fell"
 	line "out of the tree!"
 	prompt
-; 0x80793
 
-WildCelebiAppearedText: ; 0x80793
+WildCelebiAppearedText:
 	text "Wild @"
 	text_from_ram wEnemyMonNick
 	text_start
 	line "appeared!"
 	prompt
-; 0x807a9
 
-WantsToBattleText:: ; 0x807a9
+WantsToBattleText::
 	text "<ENEMY>"
 	line "wants to battle!"
 	prompt
-; 0x807bd
 
-BattleText_WildFled: ; 0x807bd
+BattleText_WildFled:
 	text "Wild @"
 	text_from_ram wEnemyMonNick
 	text_start
 	line "fled!"
 	prompt
-; 0x807cf
 
-BattleText_EnemyFled: ; 0x807cf
+BattleText_EnemyFled:
 	text "Enemy @"
 	text_from_ram wEnemyMonNick
 	text_start
 	line "fled!"
 	prompt
-; 0x807e2
 
-HurtByPoisonText: ; 0x807e2
+HurtByPoisonText:
 	text "<USER>"
 	line "is hurt by poison!"
 	prompt
-; 0x807f8
 
-HurtByBurnText: ; 0x807f8
+HurtByBurnText:
 	text "<USER>'s"
 	line "hurt by its burn!"
 	prompt
-; 0x8080e
 
-LeechSeedSapsText: ; 0x8080e
+LeechSeedSapsText:
 	text "LEECH SEED saps"
 	line "<USER>!"
 	prompt
-; 0x80822
 
-HasANightmareText: ; 0x80822
+HasANightmareText:
 	text "<USER>"
 	line "has a NIGHTMARE!"
 	prompt
-; 0x80836
 
-HurtByCurseText: ; 0x80836
+HurtByCurseText:
 	text "<USER>'s"
 	line "hurt by the CURSE!"
 	prompt
-; 0x8084d
 
-SandstormHitsText: ; 0x8084d
+SandstormHitsText:
 	text "The SANDSTORM hits"
 	line "<USER>!"
 	prompt
-; 0x80864
 
-PerishCountText: ; 0x80864
+PerishCountText:
 	text "<USER>'s"
 	line "PERISH count is @"
 	deciram wd265, 1, 1
 	text "!"
 	prompt
-; 0x80880
 
-BattleText_TargetRecoveredWithItem: ; 0x80880
+BattleText_TargetRecoveredWithItem:
 	text "<TARGET>"
 	line "recovered with"
 	cont "@"
 	text_from_ram wStringBuffer1
 	text "."
 	prompt
-; 0x80899
 
-BattleText_UserRecoveredPPUsing: ; 0x80899
+BattleText_UserRecoveredPPUsing:
 	text "<USER>"
 	line "recovered PP using"
 	cont "@"
 	text_from_ram wStringBuffer1
 	text "."
 	prompt
-; 0x808b6
 
-BattleText_TargetWasHitByFutureSight: ; 0x808b6
+BattleText_TargetWasHitByFutureSight:
 	text "<TARGET>"
 	line "was hit by FUTURE"
 	cont "SIGHT!"
 	prompt
-; 0x808d2
 
-BattleText_SafeguardFaded: ; 0x808d2
+BattleText_SafeguardFaded:
 	text "<USER>'s"
 	line "SAFEGUARD faded!"
 	prompt
-; 0x808e7
 
-BattleText_PkmnLightScreenFell: ; 0x808e7
+BattleText_MonsLightScreenFell:
 	text_from_ram wStringBuffer1
 	text " #MON's"
 	line "LIGHT SCREEN fell!"
 	prompt
-; 0x80905
 
-BattleText_PkmnReflectFaded: ; 0x80905
+BattleText_MonsReflectFaded:
 	text_from_ram wStringBuffer1
 	text " #MON's"
 	line "REFLECT faded!"
 	prompt
-; 0x8091f
 
-BattleText_RainContinuesToFall: ; 0x8091f
+BattleText_RainContinuesToFall:
 	text "Rain continues to"
 	line "fall."
 	prompt
-; 0x80938
 
-BattleText_TheSunlightIsStrong: ; 0x80938
+BattleText_TheSunlightIsStrong:
 	text "The sunlight is"
 	line "strong."
 	prompt
-; 0x80951
 
-BattleText_TheSandstormRages: ; 0x80951
+BattleText_TheSandstormRages:
 	text "The SANDSTORM"
 	line "rages."
 	prompt
-; 0x80967
 
-BattleText_TheRainStopped: ; 0x80967
+BattleText_TheRainStopped:
 	text "The rain stopped."
 	prompt
-; 0x8097a
 
-BattleText_TheSunlightFaded: ; 0x8097a
+BattleText_TheSunlightFaded:
 	text "The sunlight"
 	line "faded."
 	prompt
-; 0x8098f
 
-BattleText_TheSandstormSubsided: ; 0x8098f
+BattleText_TheSandstormSubsided:
 	text "The SANDSTORM"
 	line "subsided."
 	prompt
-; 0x809a8
 
-BattleText_EnemyPkmnFainted: ; 0x809a8
+BattleText_EnemyMonFainted:
 	text "Enemy @"
 	text_from_ram wEnemyMonNick
 	text_start
 	line "fainted!"
 	prompt
-; 0x809be
 
 GotMoneyForWinningText:
 	text "<PLAYER> got ¥@"
@@ -201,17 +173,15 @@ GotMoneyForWinningText:
 	line "for winning!"
 	prompt
 
-BattleText_EnemyWasDefeated: ; 0x809da
+BattleText_EnemyWasDefeated:
 	text "<ENEMY>"
 	line "was defeated!"
 	prompt
-; 0x809eb
 
-TiedAgainstText: ; 0x809eb
+TiedAgainstText:
 	text "Tied against"
 	line "<ENEMY>!"
 	prompt
-; 0x809fc
 
 SentSomeToMomText:
 	text "<PLAYER> got ¥@"
@@ -229,39 +199,34 @@ SentAllToMomText:
 	text "Sent all to MOM!"
 	prompt
 
-BattleText_0x80a4f: ; 0x80a4f
+BattleText_0x80a4f:
 	text "<RIVAL>: Huh? I"
 	line "should've chosen"
 	cont "your #MON!"
 	prompt
-; 0x80a75
 
-BattleText_PkmnFainted: ; 0x80a75
+BattleText_MonFainted:
 	text_from_ram wBattleMonNick
 	text_start
 	line "fainted!"
 	prompt
-; 0x80a83
 
-BattleText_UseNextMon: ; 0x80a83
+BattleText_UseNextMon:
 	text "Use next #MON?"
 	done
-; 0x80a93
 
-BattleText_0x80a93: ; 0x80a93
+BattleText_0x80a93:
 	text "<RIVAL>: Yes!"
 	line "I guess I chose a"
 	cont "good #MON!"
 	prompt
-; 0x80ab9
 
-LostAgainstText: ; 0x80ab9
+LostAgainstText:
 	text "Lost against"
 	line "<ENEMY>!"
 	prompt
-; 0x80aca
 
-BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca
+BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
 	text "<ENEMY>"
 	line "is about to use"
 	cont "@"
@@ -271,128 +236,111 @@ BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca
 	para "Will <PLAYER>"
 	line "change #MON?"
 	done
-; 0x80af8
 
-BattleText_EnemySentOut: ; 0x80af8
+BattleText_EnemySentOut:
 	text "<ENEMY>"
 	line "sent out"
 	cont "@"
 	text_from_ram wEnemyMonNick
 	text "!"
 	done
-; 0x80b0b
 
-BattleText_TheresNoWillToBattle: ; 0x80b0b
+BattleText_TheresNoWillToBattle:
 	text "There's no will to"
 	line "battle!"
 	prompt
-; 0x80b26
 
-BattleText_AnEGGCantBattle: ; 0x80b26
+BattleText_AnEGGCantBattle:
 	text "An EGG can't"
 	line "battle!"
 	prompt
-; 0x80b3b
 
-BattleText_CantEscape2: ; 0x80b3b
+BattleText_CantEscape2:
 	text "Can't escape!"
 	prompt
-; 0x80b49
 
-BattleText_TheresNoEscapeFromTrainerBattle: ; 0x80b49
+BattleText_TheresNoEscapeFromTrainerBattle:
 	text "No! There's no"
 	line "running from a"
 	cont "trainer battle!"
 	prompt
 
-BattleText_GotAwaySafely: ; 0x80b77
+BattleText_GotAwaySafely:
 	text "Got away safely!"
 	prompt
 
-BattleText_UserFledUsingAStringBuffer1: ; 0x80b89
+BattleText_UserFledUsingAStringBuffer1:
 	text "<USER>"
 	line "fled using a"
 	cont "@"
 	text_from_ram wStringBuffer1
 	text "!"
 	prompt
-; 0x80ba0
 
-BattleText_CantEscape: ; 0x80ba0
+BattleText_CantEscape:
 	text "Can't escape!"
 	prompt
-; 0x80bae
 
-BattleText_UserHurtBySpikes: ; 0x80bae
+BattleText_UserHurtBySpikes:
 	text "<USER>'s"
 	line "hurt by SPIKES!"
 	prompt
-; 0x80bc2
 
-RecoveredUsingText: ; 0x80bc2
+RecoveredUsingText:
 	text "<TARGET>"
 	line "recovered using a"
 	cont "@"
 	text_from_ram wStringBuffer1
 	text "!"
 	prompt
-; 0x80bde
 
-BattleText_UsersStringBuffer1Activated: ; 0x80bde
+BattleText_UsersStringBuffer1Activated:
 	text "<USER>'s"
 	line "@"
 	text_from_ram wStringBuffer1
 	text_start
 	cont "activated!"
 	prompt
-; 0x80bf3
 
-BattleText_ItemsCantBeUsedHere: ; 0x80bf3
+BattleText_ItemsCantBeUsedHere:
 	text "Items can't be"
 	line "used here."
 	prompt
-; 0x80c0d
 
-BattleText_PkmnIsAlreadyOut: ; 0x80c0d
+BattleText_MonIsAlreadyOut:
 	text_from_ram wBattleMonNick
 	text_start
 	line "is already out."
 	prompt
-; 0x80c22
 
-BattleText_PkmnCantBeRecalled: ; 0x80c22
+BattleText_MonCantBeRecalled:
 	text_from_ram wBattleMonNick
 	text_start
 	line "can't be recalled!"
 	prompt
-; 0x80c39
 
-BattleText_TheresNoPPLeftForThisMove: ; 0x80c39
+BattleText_TheresNoPPLeftForThisMove:
 	text "There's no PP left"
 	line "for this move!"
 	prompt
-; 0x80c5b
 
-BattleText_TheMoveIsDisabled: ; 0x80c5b
+BattleText_TheMoveIsDisabled:
 	text "The move is"
 	line "DISABLED!"
 	prompt
-; 0x80c72
 
-BattleText_PkmnHasNoMovesLeft: ; 0x80c72
+BattleText_MonHasNoMovesLeft:
 	text_from_ram wBattleMonNick
 	text_start
 	line "has no moves left!"
 	done
-; 0x80c8a
 
-BattleText_TargetsEncoreEnded: ; 0x80c8a
+BattleText_TargetsEncoreEnded:
 	text "<TARGET>'s"
 	line "ENCORE ended!"
 	prompt
-; 0x80c9c
 
-BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
+BattleText_StringBuffer1GrewToLevel:
 	text_from_ram wStringBuffer1
 	text " grew to"
 	line "level @"
@@ -400,79 +348,67 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
 	text "!@"
 	sound_dex_fanfare_50_79
 	db "@@"
-; 0x80cb9
 
-BattleText_WildPkmnIsEating: ; 0x80cba
+BattleText_WildMonIsEating:
 	text "Wild @"
 	text_from_ram wEnemyMonNick
 	text_start
 	line "is eating!"
 	prompt
-; 0x80cd1
 
-BattleText_WildPkmnIsAngry: ; 0x80cd1
+BattleText_WildMonIsAngry:
 	text "Wild @"
 	text_from_ram wEnemyMonNick
 	text_start
 	line "is angry!"
 	prompt
-; 0x80ce7
 
-FastAsleepText: ; 0x80ce7
+FastAsleepText:
 	text "<USER>"
 	line "is fast asleep!"
 	prompt
-; 0x80cfa
 
-WokeUpText: ; 0x80cfa
+WokeUpText:
 	text "<USER>"
 	line "woke up!"
 	prompt
-; 0x80d06
 
-FrozenSolidText: ; 0x80d06
+FrozenSolidText:
 	text "<USER>"
 	line "is frozen solid!"
 	prompt
-; 0x80d1a
 
-FlinchedText: ; 0x80d1a
+FlinchedText:
 	text "<USER>"
 	line "flinched!"
 	prompt
-; 0x80d27
 
-MustRechargeText: ; 0x80d27
+MustRechargeText:
 	text "<USER>"
 	line "must recharge!"
 	prompt
-; 0x80d39
 
-DisabledNoMoreText: ; 0x80d39
+DisabledNoMoreText:
 	text "<USER>'s"
 	line "disabled no more!"
 	prompt
-; 0x80d4f
 
-IsConfusedText: ; 0x80d4f
+IsConfusedText:
 	text "<USER>"
 	line "is confused!"
 	prompt
-; 0x80d5f
 
-HurtItselfText: ; 0x80d5f
+HurtItselfText:
 	text "It hurt itself in"
 	line "its confusion!"
 	prompt
-; 0x80d81
 
-ConfusedNoMoreText: ; 0x80d81
+ConfusedNoMoreText:
 	text "<USER>'s"
 	line "confused no more!"
 	prompt
-; 0x80d97
 
-BecameConfusedText: ; 0x80d97
+BecameConfusedText:
 	text "<TARGET>"
 	line "became confused!"
 	prompt
@@ -485,292 +421,249 @@ BattleText_ItemHealedConfusion: ; ItemHealedConfusion
 	line "<TARGET>"
 	cont "of its confusion."
 	prompt
-; 0x80dcc
 
-AlreadyConfusedText: ; 0x80dcc
+AlreadyConfusedText:
 	text "<TARGET>'s"
 	line "already confused!"
 	prompt
-; 0x80de2
 
-BattleText_UsersHurtByStringBuffer1: ; 0x80de2
+BattleText_UsersHurtByStringBuffer1:
 	text "<USER>'s"
 	line "hurt by"
 	cont "@"
 	text_from_ram wStringBuffer1
 	text "!"
 	prompt
-; 0x80df5
 
-BattleText_UserWasReleasedFromStringBuffer1: ; 0x80df5
+BattleText_UserWasReleasedFromStringBuffer1:
 	text "<USER>"
 	line "was released from"
 	cont "@"
 	text_from_ram wStringBuffer1
 	text "!"
 	prompt
-; 0x80e11
 
-UsedBindText: ; 0x80e11
+UsedBindText:
 	text "<USER>"
 	line "used BIND on"
 	cont "<TARGET>!"
 	prompt
-; 0x80e24
 
-WhirlpoolTrapText: ; 0x80e24
+WhirlpoolTrapText:
 	text "<TARGET>"
 	line "was trapped!"
 	prompt
-; 0x80e34
 
-FireSpinTrapText: ; 0x80e34
+FireSpinTrapText:
 	text "<TARGET>"
 	line "was trapped!"
 	prompt
-; 0x80e44
 
-WrappedByText: ; 0x80e44
+WrappedByText:
 	text "<TARGET>"
 	line "was WRAPPED by"
 	cont "<USER>!"
 	prompt
-; 0x80e59
 
-ClampedByText: ; 0x80e59
+ClampedByText:
 	text "<TARGET>"
 	line "was CLAMPED by"
 	cont "<USER>!"
 	prompt
-; 0x80e6e
 
-StoringEnergyText: ; 0x80e6e
+StoringEnergyText:
 	text "<USER>"
 	line "is storing energy!"
 	prompt
-; 0x80e84
 
-UnleashedEnergyText: ; 0x80e84
+UnleashedEnergyText:
 	text "<USER>"
 	line "unleashed energy!"
 	prompt
-; 0x80e99
 
-HungOnText: ; 0x80e99
+HungOnText:
 	text "<TARGET>"
 	line "hung on with"
 	cont "@"
 	text_from_ram wStringBuffer1
 	text "!"
 	prompt
-; 0x80eb0
 
-EnduredText: ; 0x80eb0
+EnduredText:
 	text "<TARGET>"
 	line "ENDURED the hit!"
 	prompt
-; 0x80ec4
 
-InLoveWithText: ; 0x80ec4
+InLoveWithText:
 	text "<USER>"
 	line "is in love with"
 	cont "<TARGET>!"
 	prompt
-; 0x80eda
 
-InfatuationText: ; 0x80eda
+InfatuationText:
 	text "<USER>'s"
 	line "infatuation kept"
 	cont "it from attacking!"
 	prompt
-; 0x80f02
 
-DisabledMoveText: ; 0x80f02
+DisabledMoveText:
 	text "<USER>'s"
 	line "@"
 	text_from_ram wStringBuffer1
 	text " is"
 	cont "DISABLED!"
 	prompt
-; 0x80f19
 
-LoafingAroundText: ; 0x80f19
+LoafingAroundText:
 	text_from_ram wBattleMonNick
 	text " is"
 	line "loafing around."
 	prompt
-; 0x80f31
 
-BeganToNapText: ; 0x80f31
+BeganToNapText:
 	text_from_ram wBattleMonNick
 	text " began"
 	line "to nap!"
 	prompt
-; 0x80f44
 
-WontObeyText: ; 0x80f44
+WontObeyText:
 	text_from_ram wBattleMonNick
 	text " won't"
 	line "obey!"
 	prompt
-; 0x80f54
 
-TurnedAwayText: ; 0x80f54
+TurnedAwayText:
 	text_from_ram wBattleMonNick
 	text " turned"
 	line "away!"
 	prompt
-; 0x80f66
 
-IgnoredOrdersText: ; 0x80f66
+IgnoredOrdersText:
 	text_from_ram wBattleMonNick
 	text " ignored"
 	line "orders!"
 	prompt
-; 0x80f7b
 
-IgnoredSleepingText: ; 0x80f7b
+IgnoredSleepingText:
 	text_from_ram wBattleMonNick
 	text " ignored"
 	line "orders…sleeping!"
 	prompt
-; 0x80f99
 
-NoPPLeftText: ; 0x80f99
+NoPPLeftText:
 	text "But no PP is left"
 	line "for the move!"
 	prompt
-; 0x80fba
 
-HasNoPPLeftText: ; 0x80fba
+HasNoPPLeftText:
 	text "<USER>"
 	line "has no PP left for"
 	cont "@"
 	text_from_ram wStringBuffer2
 	text "!"
 	prompt
-; 0x80fd7
 
-WentToSleepText: ; 0x80fd7
+WentToSleepText:
 	text "<USER>"
 	line "went to sleep!"
 	done
-; 0x80fe9
 
-RestedText: ; 0x80fe9
+RestedText:
 	text "<USER>"
 	line "fell asleep and"
 	cont "became healthy!"
 	done
-; 0x8100c
 
-RegainedHealthText: ; 0x8100c
+RegainedHealthText:
 	text "<USER>"
 	line "regained health!"
 	prompt
-; 0x81020
 
-AttackMissedText: ; 0x81020
+AttackMissedText:
 	text "<USER>'s"
 	line "attack missed!"
 	prompt
-; 0x81033
 
-AttackMissed2Text: ; 0x81033
+AttackMissed2Text:
 	text "<USER>'s"
 	line "attack missed!"
 	prompt
-; 0x81046
 
-CrashedText: ; 0x81046
+CrashedText:
 	text "<USER>"
 	line "kept going and"
 	cont "crashed!"
 	prompt
-; 0x81061
 
-UnaffectedText: ; 0x81061
+UnaffectedText:
 	text "<TARGET>'s"
 	line "unaffected!"
 	prompt
-; 0x81071
 
-DoesntAffectText: ; 0x81071
+DoesntAffectText:
 	text "It doesn't affect"
 	line "<TARGET>!"
 	prompt
-; 0x81086
 
-CriticalHitText: ; 0x81086
+CriticalHitText:
 	text "A critical hit!"
 	prompt
-; 0x81097
 
-OneHitKOText: ; 0x81097
+OneHitKOText:
 	text "It's a one-hit KO!"
 	prompt
-; 0x810aa
 
-SuperEffectiveText: ; 0x810aa
+SuperEffectiveText:
 	text "It's super-"
 	line "effective!"
 	prompt
-; 0x810c1
 
-NotVeryEffectiveText: ; 0x810c1
+NotVeryEffectiveText:
 	text "It's not very"
 	line "effective…"
 	prompt
-; 0x810da
 
-TookDownWithItText: ; 0x810da
+TookDownWithItText:
 	text "<TARGET>"
 	line "took down with it,"
 	cont "<USER>!"
 	prompt
-; 0x810f3
 
-RageBuildingText: ; 0x810f3
+RageBuildingText:
 	text "<USER>'s"
 	line "RAGE is building!"
 	prompt
-; 0x81109
 
-GotAnEncoreText: ; 0x81109
+GotAnEncoreText:
 	text "<TARGET>"
 	line "got an ENCORE!"
 	prompt
-; 0x8111b
 
-SharedPainText: ; 0x8111b
+SharedPainText:
 	text "The battlers"
 	line "shared pain!"
 	prompt
-; 0x81136
 
-TookAimText: ; 0x81136
+TookAimText:
 	text "<USER>"
 	line "took aim!"
 	prompt
-; 0x81143
 
-SketchedText: ; 0x81143
+SketchedText:
 	text "<USER>"
 	line "SKETCHED"
 	cont "@"
 	text_from_ram wStringBuffer1
 	text "!"
 	prompt
-; 0x81156
 
-DestinyBondEffectText: ; 0x81156
+DestinyBondEffectText:
 	text "<USER>'s"
 	line "trying to take its"
 	cont "opponent with it!"
 	prompt
-; 0x8117f
 
-SpiteEffectText: ; 0x8117f
+SpiteEffectText:
 	text "<TARGET>'s"
 	line "@"
 	text_from_ram wStringBuffer1
@@ -779,515 +672,436 @@ SpiteEffectText: ; 0x8117f
 	deciram wd265, 1, 1
 	text "!"
 	prompt
-; 0x811a0
 
-BellChimedText: ; 0x811a0
+BellChimedText:
 	text "A bell chimed!"
 	line ""
 	prompt
-; 0x811b1
 
-FellAsleepText: ; 0x811b1
+FellAsleepText:
 	text "<TARGET>"
 	line "fell asleep!"
 	prompt
-; 0x811c1
 
-AlreadyAsleepText: ; 0x811c1
+AlreadyAsleepText:
 	text "<TARGET>'s"
 	line "already asleep!"
 	prompt
-; 0x811d5
 
-WasPoisonedText: ; 0x811d5
+WasPoisonedText:
 	text "<TARGET>"
 	line "was poisoned!"
 	prompt
-; 0x811e6
 
-BadlyPoisonedText: ; 0x811e6
+BadlyPoisonedText:
 	text "<TARGET>'s"
 	line "badly poisoned!"
 	prompt
-; 0x811fa
 
-AlreadyPoisonedText: ; 0x811fa
+AlreadyPoisonedText:
 	text "<TARGET>'s"
 	line "already poisoned!"
 	prompt
-; 0x81210
 
-SuckedHealthText: ; 0x81210
+SuckedHealthText:
 	text "Sucked health from"
 	line "<TARGET>!"
 	prompt
-; 0x81227
 
-DreamEatenText: ; 0x81227
+DreamEatenText:
 	text "<TARGET>'s"
 	line "dream was eaten!"
 	prompt
-; 0x8123c
 
-WasBurnedText: ; 0x8123c
+WasBurnedText:
 	text "<TARGET>"
 	line "was burned!"
 	prompt
-; 0x8124b
 
-DefrostedOpponentText: ; 0x8124b
+DefrostedOpponentText:
 	text "<TARGET>"
 	line "was defrosted!"
 	prompt
-; 0x8125d
 
-WasFrozenText: ; 0x8125d
+WasFrozenText:
 	text "<TARGET>"
 	line "was frozen solid!"
 	prompt
-; 0x81272
 
-WontRiseAnymoreText: ; 0x81272
+WontRiseAnymoreText:
 	text "<USER>'s"
 	line "@"
 	text_from_ram wStringBuffer2
 	text " won't"
 	cont "rise anymore!"
 	prompt
-; 0x8128f
 
-WontDropAnymoreText: ; 0x8128f
+WontDropAnymoreText:
 	text "<TARGET>'s"
 	line "@"
 	text_from_ram wStringBuffer2
 	text " won't"
 	cont "drop anymore!"
 	prompt
-; 0x812ac
 
-FledFromBattleText:: ; 0x812ac
+FledFromBattleText::
 	text "<USER>"
 	line "fled from battle!"
 	prompt
-; 0x812c1
 
-FledInFearText: ; 0x812c1
+FledInFearText:
 	text "<TARGET>"
 	line "fled in fear!"
 	prompt
-; 0x812d2
 
-BlownAwayText: ; 0x812d2
+BlownAwayText:
 	text "<TARGET>"
 	line "was blown away!"
 	prompt
-; 0x812e5
 
-PlayerHitTimesText: ; 0x812e5
+PlayerHitTimesText:
 	text "Hit @"
 	deciram wPlayerDamageTaken, 1, 1
 	text " times!"
 	prompt
-; 0x812f8
 
-EnemyHitTimesText: ; 0x812f8
+EnemyHitTimesText:
 	text "Hit @"
 	deciram wEnemyDamageTaken, 1, 1
 	text " times!"
 	prompt
-; 0x8130b
 
-MistText: ; 0x8130b
+MistText:
 	text "<USER>'s"
 	line "shrouded in MIST!"
 	prompt
-; 0x81321
 
-ProtectedByMistText: ; 0x81321
+ProtectedByMistText:
 	text "<TARGET>'s"
 	line "protected by MIST."
 	prompt
-; 0x81338
 
-GettingPumpedText: ; 0x81338
+GettingPumpedText:
 	interpret_data
 	text "<USER>'s"
 	line "getting pumped!"
 	prompt
-; 0x8134d
 
-RecoilText: ; 0x8134d
+RecoilText:
 	text "<USER>'s"
 	line "hit with recoil!"
 	prompt
-; 0x81362
 
-MadeSubstituteText: ; 0x81362
+MadeSubstituteText:
 	text "<USER>"
 	line "made a SUBSTITUTE!"
 	prompt
-; 0x81378
 
-HasSubstituteText: ; 0x81378
+HasSubstituteText:
 	text "<USER>"
 	line "has a SUBSTITUTE!"
 	prompt
-; 0x8138d
 
-TooWeakSubText: ; 0x8138d
+TooWeakSubText:
 	text "Too weak to make"
 	line "a SUBSTITUTE!"
 	prompt
-; 0x813ad
 
-SubTookDamageText: ; 0x813ad
+SubTookDamageText:
 	text "The SUBSTITUTE"
 	line "took damage for"
 	cont "<TARGET>!"
 	prompt
-; 0x813d0
 
-SubFadedText: ; 0x813d0
+SubFadedText:
 	text "<TARGET>'s"
 	line "SUBSTITUTE faded!"
 	prompt
-; 0x813e6
 
-LearnedMoveText: ; 0x813e6
+LearnedMoveText:
 	text "<USER>"
 	line "learned"
 	cont "@"
 	text_from_ram wStringBuffer1
 	text "!"
 	prompt
-; 0x813f8
 
-WasSeededText: ; 0x813f8
+WasSeededText:
 	text "<TARGET>"
 	line "was seeded!"
 	prompt
-; 0x81407
 
-EvadedText: ; 0x81407
+EvadedText:
 	text "<TARGET>"
 	line "evaded the attack!"
 	prompt
-; 0x8141d
 
-WasDisabledText: ; 0x8141d
+WasDisabledText:
 	text "<TARGET>'s"
 	line "@"
 	text_from_ram wStringBuffer1
 	text " was"
 	cont "DISABLED!"
 	prompt
-; 0x81435
 
-CoinsScatteredText: ; 0x81435
+CoinsScatteredText:
 	text "Coins scattered"
 	line "everywhere!"
 	prompt
-; 0x81452
 
-TransformedTypeText: ; 0x81452
+TransformedTypeText:
 	text "<USER>"
 	line "transformed into"
 	cont "the @"
 	text_from_ram wStringBuffer1
 	text "-type!"
 	prompt
-; 0x81476
 
-EliminatedStatsText: ; 0x81476
+EliminatedStatsText:
 	text "All stat changes"
 	line "were eliminated!"
 	prompt
-; 0x81499
 
-TransformedText: ; 0x81499
+TransformedText:
 	text "<USER>"
 	line "TRANSFORMED into"
 	cont "@"
 	text_from_ram wStringBuffer1
 	text "!"
 	prompt
-; 0x814b4
 
-LightScreenEffectText: ; 0x814b4
+LightScreenEffectText:
 	text "<USER>'s"
 	line "SPCL.DEF rose!"
 	prompt
-; 0x814c7
 
-ReflectEffectText: ; 0x814c7
+ReflectEffectText:
 	text "<USER>'s"
 	line "DEFENSE rose!"
 	prompt
-; 0x814d9
 
-NothingHappenedText: ; 0x814d9
+NothingHappenedText:
 	text "But nothing"
 	line "happened."
 	prompt
-; 0x814f0
 
-ButItFailedText: ; 0x814f0
+ButItFailedText:
 	text "But it failed!"
 	prompt
-; 0x81500
 
-ItFailedText: ; 0x81500
+ItFailedText:
 	text "It failed!"
 	prompt
-; 0x8150c
 
-DidntAffect1Text: ; 0x8150c
+DidntAffect1Text:
 	text "It didn't affect"
 	line "<TARGET>!"
 	prompt
-; 0x81520
 
-DidntAffect2Text: ; 0x81520
+DidntAffect2Text:
 	text "It didn't affect"
 	line "<TARGET>!"
 	prompt
-; 0x81534
 
-HPIsFullText: ; 0x81534
+HPIsFullText:
 	text "<USER>'s"
 	line "HP is full!"
 	prompt
-; 0x81544
 
-DraggedOutText: ; 0x81544
+DraggedOutText:
 	text "<USER>"
 	line "was dragged out!"
 	prompt
-; 0x81558
 
-ParalyzedText: ; 0x81558
+ParalyzedText:
 	text "<TARGET>'s"
 	line "paralyzed! Maybe"
 	cont "it can't attack!"
 	prompt
-; 0x8157d
 
-FullyParalyzedText: ; 0x8157d
+FullyParalyzedText:
 	text "<USER>'s"
 	line "fully paralyzed!"
 	prompt
-; 0x81592
 
-AlreadyParalyzedText: ; 0x81592
+AlreadyParalyzedText:
 	text "<TARGET>'s"
 	line "already paralyzed!"
 	prompt
-; 0x815a9
 
-ProtectedByText: ; 0x815a9
+ProtectedByText:
 	text "<TARGET>'s"
 	line "protected by"
 	cont "@"
 	text_from_ram wStringBuffer1
 	text "!"
 	prompt
-; 0x815c1
 
-MirrorMoveFailedText: ; 0x815c1
+MirrorMoveFailedText:
 	text "The MIRROR MOVE"
 	next "failed!"
 	prompt
-; 0x815da
 
-StoleText: ; 0x815da
+StoleText:
 	text "<USER>"
 	line "stole @"
 	text_from_ram wStringBuffer1
 	text_start
 	cont "from its foe!"
 	prompt
-; 0x815f7
 
-CantEscapeNowText: ; 0x815f7
+CantEscapeNowText:
 	text "<TARGET>"
 	line "can't escape now!"
 	prompt
-; 0x8160b
 
-StartedNightmareText: ; 0x8160b
+StartedNightmareText:
 	text "<TARGET>"
 	line "started to have a"
 	cont "NIGHTMARE!"
 	prompt
-; 0x8162b
 
-WasDefrostedText: ; 0x8162b
+WasDefrostedText:
 	text "<USER>"
 	line "was defrosted!"
 	prompt
-; 0x8163d
 
-PutACurseText: ; 0x8163d
+PutACurseText:
 	text "<USER>"
 	line "cut its own HP and"
 
 	para "put a CURSE on"
 	line "<TARGET>!"
 	prompt
-; 0x81665
 
-ProtectedItselfText: ; 0x81665
+ProtectedItselfText:
 	text "<USER>"
 	line "PROTECTED itself!"
 	prompt
-; 0x8167a
 
-ProtectingItselfText: ; 0x8167a
+ProtectingItselfText:
 	text "<TARGET>'s"
 	line "PROTECTING itself!"
 	done
-; 0x81691
 
-SpikesText: ; 0x81691
+SpikesText:
 	text "SPIKES scattered"
 	line "all around"
 	cont "<TARGET>!"
 	prompt
-; 0x816b1
 
-IdentifiedText: ; 0x816b1
+IdentifiedText:
 	text "<USER>"
 	line "identified"
 	cont "<TARGET>!"
 	prompt
-; 0x816c2
 
-StartPerishText: ; 0x816c2
+StartPerishText:
 	text "Both #MON will"
 	line "faint in 3 turns!"
 	prompt
-; 0x816e4
 
-SandstormBrewedText: ; 0x816e4
+SandstormBrewedText:
 	text "A SANDSTORM"
 	line "brewed!"
 	prompt
-; 0x816f9
 
-BracedItselfText: ; 0x816f9
+BracedItselfText:
 	text "<USER>"
 	line "braced itself!"
 	prompt
-; 0x8170b
 
-FellInLoveText: ; 0x8170b
+FellInLoveText:
 	text "<TARGET>"
 	line "fell in love!"
 	prompt
-; 0x8171c
 
-CoveredByVeilText: ; 0x8171c
+CoveredByVeilText:
 	text "<USER>'s"
 	line "covered by a veil!"
 	prompt
-; 0x81733
 
-SafeguardProtectText: ; 0x81733
+SafeguardProtectText:
 	text "<TARGET>"
 	line "is protected by"
 	cont "SAFEGUARD!"
 	prompt
-; 0x81751
 
-MagnitudeText: ; 0x81751
+MagnitudeText:
 	text "Magnitude @"
 	deciram wd265, 1, 1
 	text "!"
 	prompt
-; 0x81764
 
-ReleasedByText: ; 0x81764
+ReleasedByText:
 	text "<USER>"
 	line "was released by"
 	cont "<TARGET>!"
 	prompt
-; 0x8177a
 
-ShedLeechSeedText: ; 0x8177a
+ShedLeechSeedText:
 	text "<USER>"
 	line "shed LEECH SEED!"
 	prompt
-; 0x8178e
 
-BlewSpikesText: ; 0x8178e
+BlewSpikesText:
 	text "<USER>"
 	line "blew away SPIKES!"
 	prompt
-; 0x817a3
 
-DownpourText: ; 0x817a3
+DownpourText:
 	text "A downpour"
 	line "started!"
 	prompt
-; 0x817b8
 
-SunGotBrightText: ; 0x817b8
+SunGotBrightText:
 	text "The sunlight got"
 	line "bright!"
 	prompt
-; 0x817d2
 
-BellyDrumText: ; 0x817d2
+BellyDrumText:
 	text "<USER>"
 	line "cut its HP and"
 	cont "maximized ATTACK!"
 	prompt
-; 0x817f6
 
-CopiedStatsText: ; 0x817f6
+CopiedStatsText:
 	text "<USER>"
 	line "copied the stat"
 
 	para "changes of"
 	line "<TARGET>!"
 	prompt
-; 0x81817
 
-ForesawAttackText: ; 0x81817
+ForesawAttackText:
 	text "<USER>"
 	line "foresaw an attack!"
 	prompt
-; 0x8182d
 
-BeatUpAttackText: ; 0x8182d
+BeatUpAttackText:
 	text_from_ram wStringBuffer1
 	text "'s"
 	line "attack!"
 	done
-; 0x8183b
 
-RefusedGiftText: ; 0x8183b
+RefusedGiftText:
 	text "<TARGET>"
 	line "refused the gift!"
 	prompt
-; 0x81850
 
-IgnoredOrders2Text: ; 0x81850
+IgnoredOrders2Text:
 	text "<USER>"
 	line "ignored orders!"
 	prompt
-; 0x81863
 
-BattleText_LinkErrorBattleCanceled: ; 0x81863
+BattleText_LinkErrorBattleCanceled:
 	text "Link error…"
 
 	para "The battle has"
 	line "been canceled…"
 	prompt
-; 0x8188e
 
-BattleText_0x8188e: ; 0x8188e
+BattleText_0x8188e:
 	text "There is no time"
 	line "left today!"
 	done
-; 0x818ac
diff --git a/data/text/common.asm b/data/text/common.asm
new file mode 100644
index 000000000..d1fbb8b1a
--- /dev/null
+++ b/data/text/common.asm
@@ -0,0 +1,16 @@
+INCLUDE "constants.asm"
+
+
+SECTION "Text 1", ROMX
+
+INCLUDE "data/text/common_1.asm"
+
+
+SECTION "Text 2", ROMX
+
+INCLUDE "data/text/common_2.asm"
+
+
+SECTION "Text 3", ROMX
+
+INCLUDE "data/text/common_3.asm"
diff --git a/data/common_text/common_text_1.asm b/data/text/common_1.asm
index 80b47013d..c99f7eb29 100644
--- a/data/common_text/common_text_1.asm
+++ b/data/text/common_1.asm
@@ -93,7 +93,7 @@ UnknownText_0x1bc14f::
 	line "level @"
 	deciram wCurPartyLevel, 1, 3
 	text "!@"
-	sound_dex_fanfare_50_79
+	sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP
 	text_waitbutton
 	db "@@"
 
@@ -1121,7 +1121,7 @@ Text_RemainingTime::
 	text "Remaining Time"
 	done
 
-Text_YourPkmnsHPWasHealed::
+Text_YourMonsHPWasHealed::
 	text "Your #MON's HP"
 	line "was healed."
 	prompt
diff --git a/data/common_text/common_text_2.asm b/data/text/common_2.asm
index 183d254fc..582d3b16f 100644
--- a/data/common_text/common_text_2.asm
+++ b/data/text/common_2.asm
@@ -113,17 +113,17 @@ Text_StringBuffer2ExpPoints::
 	text " EXP. Points!"
 	prompt
 
-Text_GoPkmn::
+Text_GoMon::
 	text "Go! @@"
 
-Text_DoItPkmn::
+Text_DoItMon::
 	text "Do it! @@"
 
-Text_GoForItPkmn::
+Text_GoForItMon::
 	text "Go for it,"
 	line "@@"
 
-Text_YourFoesWeakGetmPkmn::
+Text_YourFoesWeakGetmMon::
 	text "Your foe's weak!"
 	line "Get'm, @@"
 
@@ -618,7 +618,7 @@ UnknownText_0x1c0bee::
 	cont "time to use that!"
 	prompt
 
-Text_YouDontHaveAPkmn::
+Text_YouDontHaveAMon::
 	text "You don't have a"
 	line "#MON!"
 	prompt
@@ -1071,12 +1071,12 @@ UnknownText_0x1c1368::
 	line "to do?"
 	done
 
-_KrissPCHowManyWithdrawText::
+_PlayersPCHowManyWithdrawText::
 	text "How many do you"
 	line "want to withdraw?"
 	done
 
-_KrissPCWithdrewItemsText::
+_PlayersPCWithdrewItemsText::
 	text "Withdrew @"
 	deciram wItemQuantityChangeBuffer, 1, 2
 	text_start
@@ -1085,7 +1085,7 @@ _KrissPCWithdrewItemsText::
 	text "(S)."
 	prompt
 
-_KrissPCNoRoomWithdrawText::
+_PlayersPCNoRoomWithdrawText::
 	text "There's no room"
 	line "for more items."
 	prompt
@@ -1094,12 +1094,12 @@ UnknownText_0x1c13df::
 	text "No items here!"
 	prompt
 
-_KrissPCHowManyDepositText::
+_PlayersPCHowManyDepositText::
 	text "How many do you"
 	line "want to deposit?"
 	done
 
-_KrissPCDepositItemsText::
+_PlayersPCDepositItemsText::
 	text "Deposited @"
 	deciram wItemQuantityChangeBuffer, 1, 2
 	text_start
@@ -1108,7 +1108,7 @@ _KrissPCDepositItemsText::
 	text "(S)."
 	prompt
 
-_KrissPCNoRoomDepositText::
+_PlayersPCNoRoomDepositText::
 	text "There's no room to"
 	line "store items."
 	prompt
diff --git a/data/common_text/common_text_3.asm b/data/text/common_3.asm
index 7724775a4..4ed12258b 100644
--- a/data/common_text/common_text_3.asm
+++ b/data/text/common_3.asm
@@ -1139,14 +1139,14 @@ UnknownText_0x1c59a3::
 	para ""
 	done
 
-Text_OnlyThreePkmnMayBeEntered::
+Text_OnlyThreeMonMayBeEntered::
 	text "Only three #MON"
 	line "may be entered."
 
 	para ""
 	done
 
-Text_ThePkmnMustAllBeDifferentKinds::
+Text_TheMonMustAllBeDifferentKinds::
 	text "The @"
 	text_from_ram wStringBuffer2
 	text " #MON"
@@ -1156,7 +1156,7 @@ Text_ThePkmnMustAllBeDifferentKinds::
 	para ""
 	done
 
-Text_ThePkmnMustNotHoldTheSameItems::
+Text_TheMonMustNotHoldTheSameItems::
 	text "The @"
 	text_from_ram wStringBuffer2
 	text " #MON"
diff --git a/data/mail_input_chars.asm b/data/text/mail_input_chars.asm
index ca3833529..ac76e71eb 100644
--- a/data/mail_input_chars.asm
+++ b/data/text/mail_input_chars.asm
@@ -1,19 +1,17 @@
 ; see engine/naming_screen.asm
 
-MailEntry_Uppercase: ; 122dd
+MailEntry_Uppercase:
 	db "A B C D E F G H I J"
 	db "K L M N O P Q R S T"
 	db "U V W X Y Z   , ? !"
 	db "1 2 3 4 5 6 7 8 9 0"
 	db "<PK> <MN> <PO> <KE> é ♂ ♀ ¥ … ×"
 	db "lower  DEL   END   "
-; 1224f
 
-MailEntry_Lowercase: ; 1224f
+MailEntry_Lowercase:
 	db "a b c d e f g h i j"
 	db "k l m n o p q r s t"
 	db "u v w x y z   . - /"
 	db "'d 'l 'm 'r 's 't 'v & ( )"
 	db "“ ” [ ] ' : ;      "
 	db "UPPER  DEL   END   "
-; 122c1
diff --git a/data/name_input_chars.asm b/data/text/name_input_chars.asm
index d89289142..d89289142 100644
--- a/data/name_input_chars.asm
+++ b/data/text/name_input_chars.asm
diff --git a/data/std_text.asm b/data/text/std_text.asm
index 238f0ac5d..238f0ac5d 100644
--- a/data/std_text.asm
+++ b/data/text/std_text.asm
diff --git a/data/unused/dakutens.asm b/data/text/unused_dakutens.asm
index 756018d79..756018d79 100644
--- a/data/unused/dakutens.asm
+++ b/data/text/unused_dakutens.asm
diff --git a/data/unused/gen_1_trainer_names.asm b/data/text/unused_gen1_trainer_names.asm
index b3d60569d..fa839f366 100644
--- a/data/unused/gen_1_trainer_names.asm
+++ b/data/text/unused_gen1_trainer_names.asm
@@ -1,4 +1,4 @@
-Gen1TrainerClassNames: ; 50a42
+Gen1TrainerClassNames:
 ; Untranslated trainer class names from Red.
 	dw .Youngster
 	dw .BugCatcher
diff --git a/data/unused/sweet_honey_text.asm b/data/text/unused_sweet_honey.asm
index 9bfa4f6b1..04ceae2e6 100644
--- a/data/unused/sweet_honey_text.asm
+++ b/data/text/unused_sweet_honey.asm
@@ -8,7 +8,7 @@
 ; Most of these texts seem to be associated with a single NPC.
 ; The last text is associated with a second NPC, probably a Butterfree.
 
-UnusedSweetHoneyText: ; 0x5578a
+UnusedSweetHoneyText:
 	text "My #MON is an"
 	line "expert at collect-"
 	cont "ing SWEET HONEY."
@@ -17,7 +17,7 @@ UnusedSweetHoneyText: ; 0x5578a
 	line "with you."
 	done
 
-UnusedSweetHoneyBagFullText: ; 0x557d6
+UnusedSweetHoneyBagFullText:
 	text "I want to give you"
 	line "some SWEET HONEY,"
 
@@ -25,17 +25,17 @@ UnusedSweetHoneyBagFullText: ; 0x557d6
 	line "room for it."
 	done
 
-UnusedSweetHoneyGiveText: ; 0x55819
+UnusedSweetHoneyGiveText:
 	text "Here you go! Have"
 	line "some SWEET HONEY!"
 	done
 
-UnusedGotSweetHoneyText: ; 0x5583e
+UnusedGotSweetHoneyText:
 	text "<PLAYER> received"
 	line "SWEET HONEY."
 	done
 
-UnusedSweetHoneyAfterText1: ; 0x55856
+UnusedSweetHoneyAfterText1:
 	text "My little brother"
 	line "takes SWEET HONEY"
 
@@ -46,7 +46,7 @@ UnusedSweetHoneyAfterText1: ; 0x55856
 	line "up to?"
 	done
 
-UnusedSweetHoneyAfterText2: ; 0x558b1
+UnusedSweetHoneyAfterText2:
 	text "Did you put SWEET"
 	line "HONEY on a tree?"
 
@@ -54,7 +54,7 @@ UnusedSweetHoneyAfterText2: ; 0x558b1
 	line "it?"
 	done
 
-UnusedSweetHoneyAfterText3: ; 0x558ea
+UnusedSweetHoneyAfterText3:
 	text "Did you put SWEET"
 	line "HONEY on a tree?"
 
@@ -63,6 +63,6 @@ UnusedSweetHoneyAfterText3: ; 0x558ea
 	cont "be drawn to it."
 	done
 
-UnusedSweetHoneyButterfreeText: ; 0x5593f
+UnusedSweetHoneyButterfreeText:
 	text "BUTTERFREE: Freeh!"
 	done
diff --git a/data/text_buffers.asm b/data/text_buffers.asm
index 7dd7af428..7c28c11e0 100644
--- a/data/text_buffers.asm
+++ b/data/text_buffers.asm
@@ -1,4 +1,4 @@
-StringBufferPointers:: ; 24000
+StringBufferPointers::
 ; entries correspond to arguments for text_buffer (TX_STRINGBUFFER)
 	dw wStringBuffer3 ; 0
 	dw wStringBuffer4 ; 1
diff --git a/data/tilesets.asm b/data/tilesets.asm
index c44a218fc..b95c20f40 100644
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@@ -7,10 +7,10 @@ ENDM
 
 ; Associated data:
 ; - The *GFX, *Meta, and *Coll are defined in gfx/tilesets.asm
-; - The *Anim are defined in engine/tileset_anims.asm
-; - The *PalMap are defined in gfx/tilesets/palette_maps.asm
+; - The *PalMap are defined in gfx/tileset_palette_maps.asm
+; - The *Anim are defined in engine/tilesets/tileset_anims.asm
 
-Tilesets:: ; 4d596
+Tilesets::
 ; entries correspond to TILESET_* constants
 	tileset Tileset0
 	tileset TilesetJohto
@@ -49,4 +49,3 @@ Tilesets:: ; 4d596
 	tileset TilesetKabutoWordRoom
 	tileset TilesetOmanyteWordRoom
 	tileset TilesetAerodactylWordRoom
-; 4d7c1
diff --git a/data/tilesets/aerodactyl_word_room_collision.asm b/data/tilesets/aerodactyl_word_room_collision.asm
index 138f07143..58bdacc53 100644
--- a/data/tilesets/aerodactyl_word_room_collision.asm
+++ b/data/tilesets/aerodactyl_word_room_collision.asm
@@ -1,4 +1,5 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
@@ -17,20 +18,20 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
-	tilecoll WALL, WALL, WALL, FLOOR ; 15
+	tilecoll WALL, WALL, WALL, FLOOR ; 14
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
-	tilecoll WALL, WALL, FLOOR, WALL ; 1a
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
-	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, WALL ; 19
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
 	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
 	tilecoll WALL, WALL, WALL, WALL ; 20
-	tilecoll WALL, WALL, WALL, WALL ; 21
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
@@ -61,4 +62,3 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/data/tilesets/battle_tower_collision.asm b/data/tilesets/battle_tower_collision.asm
index 908fee326..97e09bf5d 100644
--- a/data/tilesets/battle_tower_collision.asm
+++ b/data/tilesets/battle_tower_collision.asm
@@ -1,64 +1,64 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 02
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 05
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 06
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 07
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 08
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 09
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0a
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 05
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 06
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 08
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 09
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
-	tilecoll DOOR, WALL, FLOOR, FLOOR ; 11
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 13
-	tilecoll WALL, WALL, WALL, WALL ; 14
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 15
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 10
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 11
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 12
+	tilecoll WALL, WALL, WALL, WALL ; 13
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 14
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 15
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 16
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 17
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 19
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1c
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 18
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 19
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
-	tilecoll WALL, WALL, FLOOR, WALL ; 20
-	tilecoll WALL, WALL, WALL, FLOOR ; 21
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 25
-	tilecoll WALL, FLOOR, FLOOR, DOOR ; 26
+	tilecoll WALL, WALL, FLOOR, WALL ; 1f
+	tilecoll WALL, WALL, WALL, FLOOR ; 20
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 24
+	tilecoll WALL, FLOOR, FLOOR, DOOR ; 25
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 26
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 28
-	tilecoll WALL, PC, FLOOR, FLOOR ; 29
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
-	tilecoll WALL, WALL, WALL, FLOOR ; 2b
-	tilecoll WALL, WALL, FLOOR, WALL ; 2c
-	tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2d
-	tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2e
+	tilecoll WALL, PC, FLOOR, FLOOR ; 28
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 29
+	tilecoll WALL, WALL, WALL, FLOOR ; 2a
+	tilecoll WALL, WALL, FLOOR, WALL ; 2b
+	tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2c
+	tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 35
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
-	tilecoll WALL, WALL, FLOOR, WALL ; 37
-	tilecoll WALL, WALL, WALL, FLOOR ; 38
-	tilecoll WALL, WALL, FLOOR, WALL ; 39
-	tilecoll WALL, WALL, WALL, WALL ; 3a
-	tilecoll WALL, WALL, WALL, FLOOR ; 3b
-	tilecoll WALL, WALL, WALL, WALL ; 3c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+	tilecoll WALL, WALL, FLOOR, WALL ; 36
+	tilecoll WALL, WALL, WALL, FLOOR ; 37
+	tilecoll WALL, WALL, FLOOR, WALL ; 38
+	tilecoll WALL, WALL, WALL, WALL ; 39
+	tilecoll WALL, WALL, WALL, FLOOR ; 3a
+	tilecoll WALL, WALL, WALL, WALL ; 3b
+	tilecoll WALL, WALL, FLOOR, WALL ; 3c
 	tilecoll WALL, WALL, FLOOR, WALL ; 3d
-	tilecoll WALL, WALL, FLOOR, WALL ; 3e
-	tilecoll WALL, WALL, WALL, FLOOR ; 3f
-	tilecoll WALL, WALL, FLOOR, WALL ; 40
+	tilecoll WALL, WALL, WALL, FLOOR ; 3e
+	tilecoll WALL, WALL, FLOOR, WALL ; 3f
diff --git a/data/tilesets/battle_tower_outside_collision.asm b/data/tilesets/battle_tower_outside_collision.asm
index 3aaa60113..03dec85bf 100644
--- a/data/tilesets/battle_tower_outside_collision.asm
+++ b/data/tilesets/battle_tower_outside_collision.asm
@@ -1,37 +1,38 @@
-	tilecoll 01, 01, 01, 01 ; 01
+	tilecoll 01, 01, 01, 01 ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
-	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 08
 	tilecoll WALL, WALL, WALL, WALL ; 09
 	tilecoll WALL, WALL, WALL, WALL ; 0a
 	tilecoll WALL, WALL, WALL, WALL ; 0b
-	tilecoll WALL, WALL, WALL, WALL ; 0c
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d
-	tilecoll FLOOR, WALL, WALL, WALL ; 0e
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c
+	tilecoll FLOOR, WALL, WALL, WALL ; 0d
+	tilecoll WALL, WALL, WALL, WALL ; 0e
 	tilecoll WALL, WALL, WALL, WALL ; 0f
-	tilecoll WALL, WALL, WALL, WALL ; 10
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 11
-	tilecoll WALL, WALL, FLOOR, WALL ; 12
-	tilecoll WALL, WALL, DOOR, DOOR ; 13
-	tilecoll WALL, WALL, WALL, FLOOR ; 14
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
-	tilecoll WALL, WALL, WALL, WALL ; 16
-	tilecoll WALL, WALL, DOOR, WALL ; 17
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 10
+	tilecoll WALL, WALL, FLOOR, WALL ; 11
+	tilecoll WALL, WALL, DOOR, DOOR ; 12
+	tilecoll WALL, WALL, WALL, FLOOR ; 13
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 14
+	tilecoll WALL, WALL, WALL, WALL ; 15
+	tilecoll WALL, WALL, DOOR, WALL ; 16
+	tilecoll WALL, WALL, WALL, WALL ; 17
 	tilecoll WALL, WALL, WALL, WALL ; 18
 	tilecoll WALL, WALL, WALL, WALL ; 19
 	tilecoll WALL, WALL, WALL, WALL ; 1a
 	tilecoll WALL, WALL, WALL, WALL ; 1b
-	tilecoll WALL, WALL, WALL, WALL ; 1c
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1d
-	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1e
-	tilecoll WALL, WALL, WALL, WALL ; 1f
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 20
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 21
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1c
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1d
+	tilecoll WALL, WALL, WALL, WALL ; 1e
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 1f
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 20
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21
+	tilecoll WALL, WALL, WALL, WALL ; 22
 	tilecoll WALL, WALL, WALL, WALL ; 23
 	tilecoll WALL, WALL, WALL, WALL ; 24
 	tilecoll WALL, WALL, WALL, WALL ; 25
@@ -42,18 +43,18 @@
 	tilecoll WALL, WALL, WALL, WALL ; 2a
 	tilecoll WALL, WALL, WALL, WALL ; 2b
 	tilecoll WALL, WALL, WALL, WALL ; 2c
-	tilecoll WALL, WALL, WALL, WALL ; 2d
-	tilecoll WALL, FLOOR, WALL, WALL ; 2e
-	tilecoll WALL, WALL, WALL, WALL ; 2f
-	tilecoll WALL, FLOOR, WALL, WALL ; 30
-	tilecoll WALL, WALL, WALL, WALL ; 31
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 32
-	tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 33
-	tilecoll WALL, WALL, WALL, WALL ; 34
-	tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 35
-	tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 36
-	tilecoll 5B, FLOOR, FLOOR, FLOOR ; 37
-	tilecoll 5B, 01, FLOOR, FLOOR ; 38
+	tilecoll WALL, FLOOR, WALL, WALL ; 2d
+	tilecoll WALL, WALL, WALL, WALL ; 2e
+	tilecoll WALL, FLOOR, WALL, WALL ; 2f
+	tilecoll WALL, WALL, WALL, WALL ; 30
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 31
+	tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 32
+	tilecoll WALL, WALL, WALL, WALL ; 33
+	tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 34
+	tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 35
+	tilecoll 5B, FLOOR, FLOOR, FLOOR ; 36
+	tilecoll 5B, 01, FLOOR, FLOOR ; 37
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
@@ -65,11 +66,11 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 41
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 42
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 43
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44
+	tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 44
 	tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 45
 	tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 46
 	tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 47
-	tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 48
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b
@@ -125,4 +126,3 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80
diff --git a/data/tilesets/beta_word_room_collision.asm b/data/tilesets/beta_word_room_collision.asm
index 138f07143..58bdacc53 100644
--- a/data/tilesets/beta_word_room_collision.asm
+++ b/data/tilesets/beta_word_room_collision.asm
@@ -1,4 +1,5 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
@@ -17,20 +18,20 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
-	tilecoll WALL, WALL, WALL, FLOOR ; 15
+	tilecoll WALL, WALL, WALL, FLOOR ; 14
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
-	tilecoll WALL, WALL, FLOOR, WALL ; 1a
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
-	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, WALL ; 19
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
 	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
 	tilecoll WALL, WALL, WALL, WALL ; 20
-	tilecoll WALL, WALL, WALL, WALL ; 21
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
@@ -61,4 +62,3 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/data/tilesets/cave_collision.asm b/data/tilesets/cave_collision.asm
index 3d5e0ae05..18f9b805a 100644
--- a/data/tilesets/cave_collision.asm
+++ b/data/tilesets/cave_collision.asm
@@ -1,64 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
 	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll WALL, WALL, WALL, WALL ; 02
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
-	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 05
-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06
-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 07
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 09
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c
-	tilecoll WALL, FLOOR, WALL, WALL ; 0d
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
-	tilecoll FLOOR, WALL, WALL, WALL ; 0f
-	tilecoll WATER, WATER, WATER, WATER ; 10
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 04
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 08
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0a
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0b
+	tilecoll WALL, FLOOR, WALL, WALL ; 0c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0d
+	tilecoll FLOOR, WALL, WALL, WALL ; 0e
+	tilecoll WATER, WATER, WATER, WATER ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11
 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13
-	tilecoll FLOOR, FLOOR, WALL, CAVE ; 14
+	tilecoll FLOOR, FLOOR, WALL, CAVE ; 13
+	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 14
 	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15
-	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16
-	tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
-	tilecoll WALL, WALL, WALL, FLOOR ; 19
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1a
-	tilecoll WALL, WALL, FLOOR, WALL ; 1b
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
-	tilecoll WALL, WALL, WALL, WALL ; 1e
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20
-	tilecoll WALL, FLOOR, WALL, WALL ; 21
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 22
-	tilecoll FLOOR, WALL, WALL, WALL ; 23
-	tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25
+	tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 16
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, WALL, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
+	tilecoll WALL, WALL, FLOOR, WALL ; 1a
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1e
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f
+	tilecoll WALL, FLOOR, WALL, WALL ; 20
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 21
+	tilecoll FLOOR, WALL, WALL, WALL ; 22
+	tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 23
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 24
+	tilecoll WATER, WATER, WATER, WATER ; 25
 	tilecoll WATER, WATER, WATER, WATER ; 26
 	tilecoll WATER, WATER, WATER, WATER ; 27
-	tilecoll WATER, WATER, WATER, WATER ; 28
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
-	tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 29
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2a
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b
+	tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2c
+	tilecoll WALL, WALL, WALL, WALL ; 2d
 	tilecoll WALL, WALL, WALL, WALL ; 2e
 	tilecoll WALL, WALL, WALL, WALL ; 2f
-	tilecoll WALL, WALL, WALL, WALL ; 30
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31
-	tilecoll WALL, WALL, WALL, WALL ; 32
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 30
+	tilecoll WALL, WALL, WALL, WALL ; 31
+	tilecoll WATER, WATER, WATER, WATER ; 32
 	tilecoll WATER, WATER, WATER, WATER ; 33
-	tilecoll WATER, WATER, WATER, WATER ; 34
-	tilecoll WALL, WALL, WALL, WALL ; 35
+	tilecoll WALL, WALL, WALL, WALL ; 34
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 35
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 36
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
-	tilecoll WALL, WALL, WALL, CAVE ; 38
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39
-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b
-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c
-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d
+	tilecoll WALL, WALL, WALL, CAVE ; 37
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 38
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 39
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3a
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3b
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3c
+	tilecoll WATER, WATER, WATER, WATER ; 3d
 	tilecoll WATER, WATER, WATER, WATER ; 3e
-	tilecoll WATER, WATER, WATER, WATER ; 3f
-	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40
+	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 3f
diff --git a/data/tilesets/champions_room_collision.asm b/data/tilesets/champions_room_collision.asm
index 351f76f61..bb3201d0d 100644
--- a/data/tilesets/champions_room_collision.asm
+++ b/data/tilesets/champions_room_collision.asm
@@ -1,64 +1,64 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll WALL, WALL, FLOOR, WALL ; 02
-	tilecoll WALL, WALL, WALL, FLOOR ; 03
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 04
-	tilecoll WALL, WALL, WALL, WALL ; 05
-	tilecoll WALL, WALL, COUNTER, FLOOR ; 06
-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 07
-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09
-	tilecoll WALL, FLOOR, FLOOR, WALL ; 0a
-	tilecoll WALL, WALL, WALL, WALL ; 0b
-	tilecoll WALL, WALL, LADDER, LADDER ; 0c
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0d
-	tilecoll WALL, WALL, WALL, WALL ; 0e
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f
-	tilecoll WALL, WALL, WALL, WALL ; 10
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
-	tilecoll WALL, WALL, WALL, FLOOR ; 12
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
-	tilecoll WALL, WALL, FLOOR, WALL ; 14
-	tilecoll WALL, FLOOR, WALL, WALL ; 15
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 17
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 19
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 1d
-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1e
-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 1f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
-	tilecoll WALL, FLOOR, WALL, WALL ; 21
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
-	tilecoll FLOOR, WALL, WALL, WALL ; 23
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 25
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll WALL, WALL, FLOOR, WALL ; 01
+	tilecoll WALL, WALL, WALL, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 03
+	tilecoll WALL, WALL, WALL, WALL ; 04
+	tilecoll WALL, WALL, COUNTER, FLOOR ; 05
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 06
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 07
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08
+	tilecoll WALL, FLOOR, FLOOR, WALL ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll WALL, WALL, LADDER, LADDER ; 0b
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, WALL, WALL, WALL ; 0d
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll WALL, WALL, WALL, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+	tilecoll WALL, WALL, FLOOR, WALL ; 13
+	tilecoll WALL, FLOOR, WALL, WALL ; 14
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 16
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 18
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 19
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 1c
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1d
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 1e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f
+	tilecoll WALL, FLOOR, WALL, WALL ; 20
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
+	tilecoll FLOOR, WALL, WALL, WALL ; 22
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 23
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 24
+	tilecoll WALL, WALL, WALL, WALL ; 25
 	tilecoll WALL, WALL, WALL, WALL ; 26
-	tilecoll WALL, WALL, WALL, WALL ; 27
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 28
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 27
+	tilecoll WALL, WALL, WALL, WALL ; 28
 	tilecoll WALL, WALL, WALL, WALL ; 29
 	tilecoll WALL, WALL, WALL, WALL ; 2a
-	tilecoll WALL, WALL, WALL, WALL ; 2b
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2b
+	tilecoll WALL, WALL, WALL, WALL ; 2c
 	tilecoll WALL, WALL, WALL, WALL ; 2d
 	tilecoll WALL, WALL, WALL, WALL ; 2e
-	tilecoll WALL, WALL, WALL, WALL ; 2f
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 30
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 31
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2f
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 34
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 35
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 36
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
-	tilecoll FLOOR, WALL, WALL, WALL ; 38
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 39
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 3a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 33
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 34
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 35
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 36
+	tilecoll FLOOR, WALL, WALL, WALL ; 37
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 38
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 39
+	tilecoll WALL, WALL, WALL, WALL ; 3a
 	tilecoll WALL, WALL, WALL, WALL ; 3b
-	tilecoll WALL, WALL, WALL, WALL ; 3c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
-	tilecoll WALL, FLOOR, WALL, WALL ; 3f
-	tilecoll FLOOR, WALL, WALL, WALL ; 40
+	tilecoll WALL, FLOOR, WALL, WALL ; 3e
+	tilecoll FLOOR, WALL, WALL, WALL ; 3f
diff --git a/data/tilesets/dark_cave_collision.asm b/data/tilesets/dark_cave_collision.asm
index 3d5e0ae05..18f9b805a 100644
--- a/data/tilesets/dark_cave_collision.asm
+++ b/data/tilesets/dark_cave_collision.asm
@@ -1,64 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
 	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll WALL, WALL, WALL, WALL ; 02
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
-	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 05
-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06
-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 07
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 09
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c
-	tilecoll WALL, FLOOR, WALL, WALL ; 0d
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
-	tilecoll FLOOR, WALL, WALL, WALL ; 0f
-	tilecoll WATER, WATER, WATER, WATER ; 10
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 04
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 08
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0a
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0b
+	tilecoll WALL, FLOOR, WALL, WALL ; 0c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0d
+	tilecoll FLOOR, WALL, WALL, WALL ; 0e
+	tilecoll WATER, WATER, WATER, WATER ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11
 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13
-	tilecoll FLOOR, FLOOR, WALL, CAVE ; 14
+	tilecoll FLOOR, FLOOR, WALL, CAVE ; 13
+	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 14
 	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15
-	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16
-	tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
-	tilecoll WALL, WALL, WALL, FLOOR ; 19
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1a
-	tilecoll WALL, WALL, FLOOR, WALL ; 1b
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
-	tilecoll WALL, WALL, WALL, WALL ; 1e
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20
-	tilecoll WALL, FLOOR, WALL, WALL ; 21
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 22
-	tilecoll FLOOR, WALL, WALL, WALL ; 23
-	tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25
+	tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 16
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, WALL, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
+	tilecoll WALL, WALL, FLOOR, WALL ; 1a
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1e
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f
+	tilecoll WALL, FLOOR, WALL, WALL ; 20
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 21
+	tilecoll FLOOR, WALL, WALL, WALL ; 22
+	tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 23
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 24
+	tilecoll WATER, WATER, WATER, WATER ; 25
 	tilecoll WATER, WATER, WATER, WATER ; 26
 	tilecoll WATER, WATER, WATER, WATER ; 27
-	tilecoll WATER, WATER, WATER, WATER ; 28
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
-	tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 29
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2a
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b
+	tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2c
+	tilecoll WALL, WALL, WALL, WALL ; 2d
 	tilecoll WALL, WALL, WALL, WALL ; 2e
 	tilecoll WALL, WALL, WALL, WALL ; 2f
-	tilecoll WALL, WALL, WALL, WALL ; 30
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31
-	tilecoll WALL, WALL, WALL, WALL ; 32
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 30
+	tilecoll WALL, WALL, WALL, WALL ; 31
+	tilecoll WATER, WATER, WATER, WATER ; 32
 	tilecoll WATER, WATER, WATER, WATER ; 33
-	tilecoll WATER, WATER, WATER, WATER ; 34
-	tilecoll WALL, WALL, WALL, WALL ; 35
+	tilecoll WALL, WALL, WALL, WALL ; 34
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 35
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 36
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
-	tilecoll WALL, WALL, WALL, CAVE ; 38
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39
-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b
-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c
-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d
+	tilecoll WALL, WALL, WALL, CAVE ; 37
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 38
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 39
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3a
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3b
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3c
+	tilecoll WATER, WATER, WATER, WATER ; 3d
 	tilecoll WATER, WATER, WATER, WATER ; 3e
-	tilecoll WATER, WATER, WATER, WATER ; 3f
-	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40
+	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 3f
diff --git a/data/tilesets/elite_four_room_collision.asm b/data/tilesets/elite_four_room_collision.asm
index cc0b705f3..59b5d223e 100644
--- a/data/tilesets/elite_four_room_collision.asm
+++ b/data/tilesets/elite_four_room_collision.asm
@@ -1,64 +1,64 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04
-	tilecoll WALL, WALL, WALL, FLOOR ; 05
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 06
-	tilecoll WALL, WALL, FLOOR, WALL ; 07
-	tilecoll WALL, WALL, WALL, WALL ; 08
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 09
-	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 0a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0c
-	tilecoll WALL, FLOOR, WALL, WALL ; 0d
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
-	tilecoll FLOOR, WALL, WALL, WALL ; 0f
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 11
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
-	tilecoll WALL, WALL, WALL, WALL ; 15
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
-	tilecoll LADDER, LADDER, FLOOR, FLOOR ; 17
-	tilecoll WALL, WALL, WALL, WALL ; 18
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 03
+	tilecoll WALL, WALL, WALL, FLOOR ; 04
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+	tilecoll WALL, WALL, FLOOR, WALL ; 06
+	tilecoll WALL, WALL, WALL, WALL ; 07
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 08
+	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 09
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0a
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0b
+	tilecoll WALL, FLOOR, WALL, WALL ; 0c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0d
+	tilecoll FLOOR, WALL, WALL, WALL ; 0e
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 10
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13
+	tilecoll WALL, WALL, WALL, WALL ; 14
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
+	tilecoll LADDER, LADDER, FLOOR, FLOOR ; 16
+	tilecoll WALL, WALL, WALL, WALL ; 17
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 18
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 19
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 1a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
-	tilecoll WALL, FLOOR, WALL, WALL ; 1c
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1d
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
-	tilecoll WALL, WALL, WALL, WALL ; 20
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 21
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+	tilecoll WALL, FLOOR, WALL, WALL ; 1b
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1e
+	tilecoll WALL, WALL, WALL, WALL ; 1f
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 20
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 21
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 22
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 23
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 24
-	tilecoll WALL, WALL, WALL, WALL ; 25
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 26
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 27
-	tilecoll WALL, WALL, WALL, WALL ; 28
+	tilecoll WALL, WALL, WALL, WALL ; 24
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 25
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 26
+	tilecoll WALL, WALL, WALL, WALL ; 27
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 28
 	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 29
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 2a
+	tilecoll WALL, WALL, WALL, WALL ; 2a
 	tilecoll WALL, WALL, WALL, WALL ; 2b
 	tilecoll WALL, WALL, WALL, WALL ; 2c
-	tilecoll WALL, WALL, WALL, WALL ; 2d
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
-	tilecoll ICE, ICE, ICE, FLOOR ; 2f
-	tilecoll ICE, ICE, FLOOR, ICE ; 30
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31
-	tilecoll FLOOR, ICE, ICE, ICE ; 32
-	tilecoll ICE, FLOOR, ICE, ICE ; 33
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
+	tilecoll ICE, ICE, ICE, FLOOR ; 2e
+	tilecoll ICE, ICE, FLOOR, ICE ; 2f
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 30
+	tilecoll FLOOR, ICE, ICE, ICE ; 31
+	tilecoll ICE, FLOOR, ICE, ICE ; 32
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 33
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 34
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 35
-	tilecoll ICE, WALL, ICE, WALL ; 36
-	tilecoll WALL, ICE, WALL, ICE ; 37
-	tilecoll WALL, WALL, WALL, WALL ; 38
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
-	tilecoll ICE, ICE, ICE, ICE ; 3a
-	tilecoll WALL, FLOOR, FLOOR, WALL ; 3b
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c
-	tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3d
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3e
+	tilecoll ICE, WALL, ICE, WALL ; 35
+	tilecoll WALL, ICE, WALL, ICE ; 36
+	tilecoll WALL, WALL, WALL, WALL ; 37
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+	tilecoll ICE, ICE, ICE, ICE ; 39
+	tilecoll WALL, FLOOR, FLOOR, WALL ; 3a
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3b
+	tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3c
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3d
+	tilecoll WALL, WALL, WALL, WALL ; 3e
 	tilecoll WALL, WALL, WALL, WALL ; 3f
-	tilecoll WALL, WALL, WALL, WALL ; 40
diff --git a/data/tilesets/facility_collision.asm b/data/tilesets/facility_collision.asm
index eb5cd8f33..781618c25 100644
--- a/data/tilesets/facility_collision.asm
+++ b/data/tilesets/facility_collision.asm
@@ -1,64 +1,64 @@
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 02
-	tilecoll WALL, WALL, WALL, WALL ; 03
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04
 	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 05
-	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 06
-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 07
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 09
-	tilecoll WALL, WALL, WALL, FLOOR ; 0a
-	tilecoll WALL, WALL, FLOOR, WALL ; 0b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0e
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
-	tilecoll WALL, WALL, WALL, WALL ; 10
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 12
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 08
+	tilecoll WALL, WALL, WALL, FLOOR ; 09
+	tilecoll WALL, WALL, FLOOR, WALL ; 0a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 11
+	tilecoll WALL, WALL, WALL, WALL ; 12
 	tilecoll WALL, WALL, WALL, WALL ; 13
-	tilecoll WALL, WALL, WALL, WALL ; 14
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 14
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, WALL, WALL ; 16
 	tilecoll WALL, WALL, WALL, WALL ; 17
-	tilecoll WALL, WALL, WALL, WALL ; 18
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
-	tilecoll WALL, WALL, WALL, WALL ; 1a
-	tilecoll WALL, WALL, WALL, FLOOR ; 1b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1e
-	tilecoll WALL, WALL, FLOOR, COUNTER ; 1f
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 20
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 21
-	tilecoll WALL, WALL, WALL, FLOOR ; 22
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 23
-	tilecoll WALL, FLOOR, WALL, WALL ; 24
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 25
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 26
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 27
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, WALL, WALL ; 19
+	tilecoll WALL, WALL, WALL, FLOOR ; 1a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1d
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 1e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 20
+	tilecoll WALL, WALL, WALL, FLOOR ; 21
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 22
+	tilecoll WALL, FLOOR, WALL, WALL ; 23
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 24
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 25
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 26
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 28
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 29
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2c
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2e
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 2f
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 30
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 32
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 33
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 34
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 35
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 31
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 32
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 33
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 34
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 35
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 36
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 37
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 38
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 39
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 3a
-	tilecoll FLOOR, WALL, WALL, WALL ; 3b
-	tilecoll WALL, WALL, FLOOR, WALL ; 3c
-	tilecoll WALL, WALL, WALL, FLOOR ; 3d
-	tilecoll WALL, WALL, FLOOR, WALL ; 3e
-	tilecoll WALL, FLOOR, WALL, WALL ; 3f
-	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 39
+	tilecoll FLOOR, WALL, WALL, WALL ; 3a
+	tilecoll WALL, WALL, FLOOR, WALL ; 3b
+	tilecoll WALL, WALL, WALL, FLOOR ; 3c
+	tilecoll WALL, WALL, FLOOR, WALL ; 3d
+	tilecoll WALL, FLOOR, WALL, WALL ; 3e
+	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 3f
diff --git a/data/tilesets/forest_collision.asm b/data/tilesets/forest_collision.asm
index 70cc72ff1..0b9aa78bb 100644
--- a/data/tilesets/forest_collision.asm
+++ b/data/tilesets/forest_collision.asm
@@ -1,43 +1,44 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll WATER, WATER, WATER, WATER ; 02
 	tilecoll WATER, WATER, WATER, WATER ; 03
-	tilecoll WATER, WATER, WATER, WATER ; 04
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll WALL, WALL, WALL, WALL ; 06
-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 07
-	tilecoll WATER, WATER, WATER, WATER ; 08
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 09
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 0a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 06
+	tilecoll WATER, WATER, WATER, WATER ; 07
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 08
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 09
+	tilecoll WATER, WATER, WATER, WATER ; 0a
 	tilecoll WATER, WATER, WATER, WATER ; 0b
-	tilecoll WATER, WATER, WATER, WATER ; 0c
-	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0d
-	tilecoll WATER, WATER, WATER, WATER ; 0e
-	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0f
-	tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 10
-	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11
-	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 12
-	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 13
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
-	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 15
-	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 16
-	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 17
-	tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 18
-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 19
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 1a
-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1c
-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1d
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0c
+	tilecoll WATER, WATER, WATER, WATER ; 0d
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0e
+	tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 0f
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 10
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11
+	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13
+	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 14
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 15
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 16
+	tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 17
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 18
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 19
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1b
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
 	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
-	tilecoll WALL, WALL, WALL, WALL ; 20
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20
+	tilecoll WALL, WALL, WALL, WALL ; 21
 	tilecoll WALL, WALL, WALL, WALL ; 22
 	tilecoll WALL, WALL, WALL, WALL ; 23
-	tilecoll WALL, WALL, WALL, WALL ; 24
-	tilecoll WALL, WALL, WALL, DOOR ; 25
+	tilecoll WALL, WALL, WALL, DOOR ; 24
+	tilecoll WALL, WALL, WALL, WALL ; 25
 	tilecoll WALL, WALL, WALL, WALL ; 26
 	tilecoll WALL, WALL, WALL, WALL ; 27
-	tilecoll WALL, WALL, WALL, WALL ; 28
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 28
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 29
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 2a
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
@@ -61,4 +62,3 @@
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 3d
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 3e
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 3f
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 40
diff --git a/data/tilesets/game_corner_collision.asm b/data/tilesets/game_corner_collision.asm
index 65b99cf54..9bcc3feb4 100644
--- a/data/tilesets/game_corner_collision.asm
+++ b/data/tilesets/game_corner_collision.asm
@@ -1,52 +1,53 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
-	tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 08
+	tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 07
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 08
 	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 09
 	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0a
-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b
-	tilecoll WALL, WALL, WALL, WALL ; 0c
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0d
+	tilecoll WALL, WALL, WALL, WALL ; 0e
 	tilecoll WALL, WALL, WALL, WALL ; 0f
-	tilecoll WALL, WALL, WALL, WALL ; 10
+	tilecoll WALL, WALL, COUNTER, COUNTER ; 10
 	tilecoll WALL, WALL, COUNTER, COUNTER ; 11
-	tilecoll WALL, WALL, COUNTER, COUNTER ; 12
-	tilecoll WALL, WALL, WALL, WALL ; 13
-	tilecoll WALL, WALL, COUNTER, FLOOR ; 14
-	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 15
-	tilecoll WALL, WALL, WALL, WALL ; 16
-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 17
-	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 18
-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 19
+	tilecoll WALL, WALL, WALL, WALL ; 12
+	tilecoll WALL, WALL, COUNTER, FLOOR ; 13
+	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 14
+	tilecoll WALL, WALL, WALL, WALL ; 15
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 16
+	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 17
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 18
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
-	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1c
-	tilecoll WALL, WALL, FLOOR, COUNTER ; 1d
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1e
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1f
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 20
+	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1b
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 1c
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1d
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f
+	tilecoll WALL, WALL, WALL, WALL ; 20
 	tilecoll WALL, WALL, WALL, WALL ; 21
 	tilecoll WALL, WALL, WALL, WALL ; 22
 	tilecoll WALL, WALL, WALL, WALL ; 23
 	tilecoll WALL, WALL, WALL, WALL ; 24
 	tilecoll WALL, WALL, WALL, WALL ; 25
-	tilecoll WALL, WALL, WALL, WALL ; 26
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 28
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 29
-	tilecoll WALL, WALL, FLOOR, WALL ; 2a
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
-	tilecoll WALL, WALL, FLOOR, WALL ; 2c
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 26
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 28
+	tilecoll WALL, WALL, FLOOR, WALL ; 29
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2a
+	tilecoll WALL, WALL, FLOOR, WALL ; 2b
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2c
+	tilecoll WALL, WALL, WALL, WALL ; 2d
 	tilecoll WALL, WALL, WALL, WALL ; 2e
-	tilecoll WALL, WALL, WALL, WALL ; 2f
-	tilecoll WALL, WALL, FLOOR, WALL ; 30
-	tilecoll WALL, WALL, WALL, FLOOR ; 31
+	tilecoll WALL, WALL, FLOOR, WALL ; 2f
+	tilecoll WALL, WALL, WALL, FLOOR ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
@@ -61,4 +62,3 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/data/tilesets/gate_collision.asm b/data/tilesets/gate_collision.asm
index 54cd95d34..1a7501f4c 100644
--- a/data/tilesets/gate_collision.asm
+++ b/data/tilesets/gate_collision.asm
@@ -1,64 +1,64 @@
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
-	tilecoll WALL, WALL, WALL, WALL ; 04
-	tilecoll DOOR, DOOR, FLOOR, FLOOR ; 05
-	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 02
+	tilecoll WALL, WALL, WALL, WALL ; 03
+	tilecoll DOOR, DOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 06
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 07
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 08
-	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 09
-	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 0a
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0c
-	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0d
-	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0e
-	tilecoll WALL, WALL, COUNTER, FLOOR ; 0f
-	tilecoll WALL, WALL, FLOOR, COUNTER ; 10
-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11
+	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 08
+	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 09
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b
+	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0c
+	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0d
+	tilecoll WALL, WALL, COUNTER, FLOOR ; 0e
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 0f
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 10
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 11
 	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 12
-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 13
-	tilecoll WALL, WALL, FLOOR, COUNTER ; 14
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
-	tilecoll WALL, WALL, WALL, WALL ; 16
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 13
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+	tilecoll WALL, WALL, WALL, WALL ; 15
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 1a
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 19
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 22
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 24
-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 26
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27
-	tilecoll WALL, WALL, WALL, WALL ; 28
-	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 29
-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 2a
-	tilecoll DOOR, WALL, FLOOR, FLOOR ; 2b
-	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2c
-	tilecoll WALL, WALL, FLOOR, PC ; 2d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
-	tilecoll DOOR, WALL, FLOOR, FLOOR ; 2f
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 30
-	tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 31
-	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 32
-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 33
-	tilecoll COUNTER, FLOOR, FLOOR, WALL ; 34
-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 35
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 21
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 23
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 24
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26
+	tilecoll WALL, WALL, WALL, WALL ; 27
+	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 29
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 2a
+	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2b
+	tilecoll WALL, WALL, FLOOR, PC ; 2c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 2e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2f
+	tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 30
+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 31
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 32
+	tilecoll COUNTER, FLOOR, FLOOR, WALL ; 33
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 34
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 39
-	tilecoll WALL, WALL, WALL, WALL ; 3a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
-	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3c
-	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 3e
-	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3f
-	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 38
+	tilecoll WALL, WALL, WALL, WALL ; 39
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 3a
+	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3b
+	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3d
+	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3e
+	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 3f
diff --git a/data/tilesets/ho_oh_word_room_collision.asm b/data/tilesets/ho_oh_word_room_collision.asm
index 138f07143..58bdacc53 100644
--- a/data/tilesets/ho_oh_word_room_collision.asm
+++ b/data/tilesets/ho_oh_word_room_collision.asm
@@ -1,4 +1,5 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
@@ -17,20 +18,20 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
-	tilecoll WALL, WALL, WALL, FLOOR ; 15
+	tilecoll WALL, WALL, WALL, FLOOR ; 14
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
-	tilecoll WALL, WALL, FLOOR, WALL ; 1a
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
-	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, WALL ; 19
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
 	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
 	tilecoll WALL, WALL, WALL, WALL ; 20
-	tilecoll WALL, WALL, WALL, WALL ; 21
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
@@ -61,4 +62,3 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/data/tilesets/house_collision.asm b/data/tilesets/house_collision.asm
index ae5580782..7c7f3fca5 100644
--- a/data/tilesets/house_collision.asm
+++ b/data/tilesets/house_collision.asm
@@ -1,54 +1,55 @@
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 02
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 03
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05
-	tilecoll WALL, WINDOW, FLOOR, FLOOR ; 06
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 07
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 08
-	tilecoll WALL, WINDOW, FLOOR, FLOOR ; 09
-	tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 0a
-	tilecoll WALL, WALL, WALL, WALL ; 0b
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e
-	tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
-	tilecoll WALL, WALL, PC, WALL ; 11
-	tilecoll WALL, WALL, WALL, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 01
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 02
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04
+	tilecoll WALL, WINDOW, FLOOR, FLOOR ; 05
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 06
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 07
+	tilecoll WALL, WINDOW, FLOOR, FLOOR ; 08
+	tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+	tilecoll WALL, WALL, PC, WALL ; 10
+	tilecoll WALL, WALL, WALL, FLOOR ; 11
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 12
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 13
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 14
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 15
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16
-	tilecoll WINDOW, WALL, FLOOR, FLOOR ; 17
-	tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 18
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a
-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b
-	tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1c
-	tilecoll WALL, WALL, FLOOR, PC ; 1d
-	tilecoll WALL, WALL, FLOOR, RADIO ; 1e
-	tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1f
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15
+	tilecoll WINDOW, WALL, FLOOR, FLOOR ; 16
+	tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a
+	tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1b
+	tilecoll WALL, WALL, FLOOR, PC ; 1c
+	tilecoll WALL, WALL, FLOOR, RADIO ; 1d
+	tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1e
+	tilecoll WALL, WALL, WALL, WALL ; 1f
 	tilecoll WALL, WALL, WALL, WALL ; 20
-	tilecoll WALL, WALL, WALL, WALL ; 21
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 22
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 23
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 24
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 25
-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 26
-	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 27
-	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 21
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 22
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 23
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 24
+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 25
+	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 26
+	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 27
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 28
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 29
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
-	tilecoll WALL, WALL, WALL, WALL ; 2d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
-	tilecoll WALL, WALL, FLOOR, WALL ; 30
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 31
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 32
-	tilecoll WALL, WINDOW, WALL, WALL ; 33
+	tilecoll WALL, WALL, WALL, WALL ; 2c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+	tilecoll WALL, WALL, FLOOR, WALL ; 2f
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 30
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 31
+	tilecoll WALL, WINDOW, WALL, WALL ; 32
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
@@ -61,4 +62,3 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/data/tilesets/ice_path_collision.asm b/data/tilesets/ice_path_collision.asm
index 4fd9376ad..362126969 100644
--- a/data/tilesets/ice_path_collision.asm
+++ b/data/tilesets/ice_path_collision.asm
@@ -1,64 +1,64 @@
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
-	tilecoll WALL, WALL, WALL, WALL ; 02
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04
-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 05
-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06
-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 07
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 09
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
-	tilecoll WALL, WALL, WALL, WALL ; 0c
-	tilecoll WALL, FLOOR, WALL, WALL ; 0d
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
-	tilecoll FLOOR, WALL, WALL, WALL ; 0f
-	tilecoll WALL, WALL, WALL, WALL ; 10
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 04
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 08
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll WALL, FLOOR, WALL, WALL ; 0c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0d
+	tilecoll FLOOR, WALL, WALL, WALL ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11
 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13
-	tilecoll FLOOR, FLOOR, WALL, CAVE ; 14
-	tilecoll WALL, WALL, WALL, FLOOR ; 15
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
-	tilecoll WALL, WALL, FLOOR, WALL ; 17
-	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 18
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 19
-	tilecoll WALL, WALL, WALL, WALL ; 1a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
-	tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1c
-	tilecoll WALL, FLOOR, WALL, WALL ; 1d
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 1e
-	tilecoll FLOOR, WALL, WALL, WALL ; 1f
-	tilecoll ICE, ICE, ICE, ICE ; 20
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 24
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 25
-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 26
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 27
-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 28
-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 29
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 2a
-	tilecoll WALL, WALL, WALL, WALL ; 2b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
-	tilecoll WALL, ICE, ICE, ICE ; 2d
-	tilecoll ICE, ICE, WALL, ICE ; 2e
-	tilecoll ICE, WALL, ICE, ICE ; 2f
-	tilecoll ICE, ICE, ICE, WALL ; 30
-	tilecoll WALL, WALL, FLOOR, WALL ; 31
-	tilecoll WALL, WALL, WALL, WALL ; 32
-	tilecoll WALL, WALL, WALL, FLOOR ; 33
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 34
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 35
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37
+	tilecoll FLOOR, FLOOR, WALL, CAVE ; 13
+	tilecoll WALL, WALL, WALL, FLOOR ; 14
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, FLOOR, WALL ; 16
+	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 17
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 18
+	tilecoll WALL, WALL, WALL, WALL ; 19
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+	tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1b
+	tilecoll WALL, FLOOR, WALL, WALL ; 1c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1d
+	tilecoll FLOOR, WALL, WALL, WALL ; 1e
+	tilecoll ICE, ICE, ICE, ICE ; 1f
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 21
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 23
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 24
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 25
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 26
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 27
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 28
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 29
+	tilecoll WALL, WALL, WALL, WALL ; 2a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+	tilecoll WALL, ICE, ICE, ICE ; 2c
+	tilecoll ICE, ICE, WALL, ICE ; 2d
+	tilecoll ICE, WALL, ICE, ICE ; 2e
+	tilecoll ICE, ICE, ICE, WALL ; 2f
+	tilecoll WALL, WALL, FLOOR, WALL ; 30
+	tilecoll WALL, WALL, WALL, WALL ; 31
+	tilecoll WALL, WALL, WALL, FLOOR ; 32
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 33
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 34
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 37
 	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 38
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 39
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
-	tilecoll WALL, WALL, WALL, WALL ; 3c
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3e
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 3f
-	tilecoll ICE, ICE, ICE, LADDER ; 40
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 39
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 3a
+	tilecoll WALL, WALL, WALL, WALL ; 3b
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 3e
+	tilecoll ICE, ICE, ICE, LADDER ; 3f
diff --git a/data/tilesets/johto_collision.asm b/data/tilesets/johto_collision.asm
index 4d6d2c072..8da65db43 100644
--- a/data/tilesets/johto_collision.asm
+++ b/data/tilesets/johto_collision.asm
@@ -1,33 +1,34 @@
-	tilecoll 01, 01, 01, 01 ; 01
+	tilecoll 01, 01, 01, 01 ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
-	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll WALL, WALL, WALL, WALL ; 06
-	tilecoll LADDER, LADDER, LADDER, LADDER ; 07
-	tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 08
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll LADDER, LADDER, LADDER, LADDER ; 06
+	tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 07
+	tilecoll WALL, WALL, WALL, WALL ; 08
 	tilecoll WALL, WALL, WALL, WALL ; 09
 	tilecoll WALL, WALL, WALL, WALL ; 0a
-	tilecoll WALL, WALL, WALL, WALL ; 0b
-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c
-	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e
-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
 	tilecoll WALL, WALL, WALL, WALL ; 10
 	tilecoll WALL, WALL, WALL, WALL ; 11
 	tilecoll WALL, WALL, WALL, WALL ; 12
 	tilecoll WALL, WALL, WALL, WALL ; 13
-	tilecoll WALL, WALL, WALL, WALL ; 14
-	tilecoll WALL, WALL, WALL, DOOR ; 15
-	tilecoll WALL, WALL, WALL, WALL ; 16
-	tilecoll WALL, WALL, WALL, DOOR ; 17
+	tilecoll WALL, WALL, WALL, DOOR ; 14
+	tilecoll WALL, WALL, WALL, WALL ; 15
+	tilecoll WALL, WALL, WALL, DOOR ; 16
+	tilecoll WALL, WALL, WALL, WALL ; 17
 	tilecoll WALL, WALL, WALL, WALL ; 18
 	tilecoll WALL, WALL, WALL, WALL ; 19
-	tilecoll WALL, WALL, WALL, WALL ; 1a
-	tilecoll WALL, WALL, WALL, DOOR ; 1b
+	tilecoll WALL, WALL, WALL, DOOR ; 1a
+	tilecoll WALL, WALL, WALL, WALL ; 1b
 	tilecoll WALL, WALL, WALL, WALL ; 1c
-	tilecoll WALL, WALL, WALL, WALL ; 1d
-	tilecoll WALL, WALL, DOOR, WALL ; 1e
+	tilecoll WALL, WALL, DOOR, WALL ; 1d
+	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
 	tilecoll WALL, WALL, WALL, WALL ; 20
 	tilecoll WALL, WALL, WALL, WALL ; 21
@@ -36,93 +37,92 @@
 	tilecoll WALL, WALL, WALL, WALL ; 24
 	tilecoll WALL, WALL, WALL, WALL ; 25
 	tilecoll WALL, WALL, WALL, WALL ; 26
-	tilecoll WALL, WALL, WALL, WALL ; 27
-	tilecoll WALL, WALL, DOOR, WALL ; 28
-	tilecoll WALL, WALL, WALL, DOOR ; 29
-	tilecoll WALL, WALL, WALL, WALL ; 2a
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2b
-	tilecoll WALL, WALL, WALL, WALL ; 2c
+	tilecoll WALL, WALL, DOOR, WALL ; 27
+	tilecoll WALL, WALL, WALL, DOOR ; 28
+	tilecoll WALL, WALL, WALL, WALL ; 29
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2a
+	tilecoll WALL, WALL, WALL, WALL ; 2b
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2c
 	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2e
-	tilecoll WALL, WALL, WALL, DOOR ; 2f
-	tilecoll WALL, WALL, WALL, WALL ; 30
-	tilecoll BUOY, BUOY, BUOY, WATER ; 31
-	tilecoll BUOY, BUOY, WATER, WATER ; 32
-	tilecoll BUOY, BUOY, WATER, BUOY ; 33
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 34
-	tilecoll BUOY, WATER, BUOY, WATER ; 35
-	tilecoll WATER, WATER, WATER, WATER ; 36
-	tilecoll WATER, BUOY, WATER, BUOY ; 37
-	tilecoll WALL, WALL, WALL, DOOR ; 38
-	tilecoll BUOY, WATER, BUOY, BUOY ; 39
-	tilecoll WATER, WATER, BUOY, BUOY ; 3a
-	tilecoll WATER, BUOY, BUOY, BUOY ; 3b
-	tilecoll WALL, WALL, WALL, WALL ; 3c
-	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3d
-	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3e
-	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 40
-	tilecoll WALL, WALL, WALL, FLOOR ; 41
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 42
-	tilecoll WALL, WALL, FLOOR, WALL ; 43
-	tilecoll WATER, WATER, WATER, WATER ; 44
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 45
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 47
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48
-	tilecoll WALL, FLOOR, WALL, WALL ; 49
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 4a
-	tilecoll FLOOR, WALL, WALL, WALL ; 4b
-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c
-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d
-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e
-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f
-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54
+	tilecoll WALL, WALL, WALL, DOOR ; 2e
+	tilecoll WALL, WALL, WALL, WALL ; 2f
+	tilecoll BUOY, BUOY, BUOY, WATER ; 30
+	tilecoll BUOY, BUOY, WATER, WATER ; 31
+	tilecoll BUOY, BUOY, WATER, BUOY ; 32
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 33
+	tilecoll BUOY, WATER, BUOY, WATER ; 34
+	tilecoll WATER, WATER, WATER, WATER ; 35
+	tilecoll WATER, BUOY, WATER, BUOY ; 36
+	tilecoll WALL, WALL, WALL, DOOR ; 37
+	tilecoll BUOY, WATER, BUOY, BUOY ; 38
+	tilecoll WATER, WATER, BUOY, BUOY ; 39
+	tilecoll WATER, BUOY, BUOY, BUOY ; 3a
+	tilecoll WALL, WALL, WALL, WALL ; 3b
+	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3c
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3d
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3e
+	tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 3f
+	tilecoll WALL, WALL, WALL, FLOOR ; 40
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 41
+	tilecoll WALL, WALL, FLOOR, WALL ; 42
+	tilecoll WATER, WATER, WATER, WATER ; 43
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 44
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 46
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 47
+	tilecoll WALL, FLOOR, WALL, WALL ; 48
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 49
+	tilecoll FLOOR, WALL, WALL, WALL ; 4a
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53
+	tilecoll WATER, WATER, WATER, WATER ; 54
 	tilecoll WATER, WATER, WATER, WATER ; 55
-	tilecoll WATER, WATER, WATER, WATER ; 56
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56
 	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58
+	tilecoll WATER, WATER, WATER, WATER ; 58
 	tilecoll WATER, WATER, WATER, WATER ; 59
-	tilecoll WATER, WATER, WATER, WATER ; 5a
-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b
-	tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5c
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5d
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5e
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5f
-	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 60
-	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 61
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 62
-	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 63
-	tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 64
-	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65
-	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 66
-	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 67
-	tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 68
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 69
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 6a
-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b
-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c
-	tilecoll WALL, FLOOR, WALL, WALL ; 6d
-	tilecoll FLOOR, WALL, WALL, WALL ; 6e
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70
-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 73
-	tilecoll FLOOR, FLOOR, CAVE, WALL ; 74
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 76
-	tilecoll WATER, WATER, WATER, WATER ; 77
-	tilecoll WALL, WALL, DOOR, WALL ; 78
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a
+	tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5b
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5c
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5d
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5e
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 5f
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 60
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 61
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 62
+	tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 63
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 64
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65
+	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 66
+	tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 67
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 68
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 69
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b
+	tilecoll WALL, FLOOR, WALL, WALL ; 6c
+	tilecoll FLOOR, WALL, WALL, WALL ; 6d
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 72
+	tilecoll FLOOR, FLOOR, CAVE, WALL ; 73
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 75
+	tilecoll WATER, WATER, WATER, WATER ; 76
+	tilecoll WALL, WALL, DOOR, WALL ; 77
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 78
+	tilecoll WATER, WATER, WATER, WATER ; 79
 	tilecoll WATER, WATER, WATER, WATER ; 7a
-	tilecoll WATER, WATER, WATER, WATER ; 7b
+	tilecoll WALL, WALL, WALL, WALL ; 7b
 	tilecoll WALL, WALL, WALL, WALL ; 7c
 	tilecoll WALL, WALL, WALL, WALL ; 7d
 	tilecoll WALL, WALL, WALL, WALL ; 7e
 	tilecoll WALL, WALL, WALL, WALL ; 7f
-	tilecoll WALL, WALL, WALL, WALL ; 80
diff --git a/data/tilesets/johto_modern_collision.asm b/data/tilesets/johto_modern_collision.asm
index 40255d744..67ba03575 100644
--- a/data/tilesets/johto_modern_collision.asm
+++ b/data/tilesets/johto_modern_collision.asm
@@ -1,40 +1,41 @@
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
-	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 08
 	tilecoll WALL, WALL, WALL, WALL ; 09
 	tilecoll WALL, WALL, WALL, WALL ; 0a
-	tilecoll WALL, WALL, WALL, WALL ; 0b
-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c
-	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e
-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
 	tilecoll WALL, WALL, WALL, WALL ; 10
 	tilecoll WALL, WALL, WALL, WALL ; 11
 	tilecoll WALL, WALL, WALL, WALL ; 12
 	tilecoll WALL, WALL, WALL, WALL ; 13
-	tilecoll WALL, WALL, WALL, WALL ; 14
-	tilecoll WALL, WALL, WALL, DOOR ; 15
-	tilecoll WALL, WALL, WALL, WALL ; 16
-	tilecoll WALL, WALL, WALL, DOOR ; 17
-	tilecoll WALL, WALL, DOOR, WALL ; 18
+	tilecoll WALL, WALL, WALL, DOOR ; 14
+	tilecoll WALL, WALL, WALL, WALL ; 15
+	tilecoll WALL, WALL, WALL, DOOR ; 16
+	tilecoll WALL, WALL, DOOR, WALL ; 17
+	tilecoll WALL, WALL, WALL, WALL ; 18
 	tilecoll WALL, WALL, WALL, WALL ; 19
-	tilecoll WALL, WALL, WALL, WALL ; 1a
-	tilecoll WALL, WALL, WALL, DOOR ; 1b
+	tilecoll WALL, WALL, WALL, DOOR ; 1a
+	tilecoll WALL, WALL, WALL, WALL ; 1b
 	tilecoll WALL, WALL, WALL, WALL ; 1c
-	tilecoll WALL, WALL, WALL, WALL ; 1d
-	tilecoll WALL, WALL, DOOR, WALL ; 1e
+	tilecoll WALL, WALL, DOOR, WALL ; 1d
+	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
 	tilecoll WALL, WALL, WALL, WALL ; 20
 	tilecoll WALL, WALL, WALL, WALL ; 21
 	tilecoll WALL, WALL, WALL, WALL ; 22
 	tilecoll WALL, WALL, WALL, WALL ; 23
-	tilecoll WALL, WALL, WALL, WALL ; 24
-	tilecoll WALL, WALL, DOOR, WALL ; 25
+	tilecoll WALL, WALL, DOOR, WALL ; 24
+	tilecoll WALL, WALL, WALL, WALL ; 25
 	tilecoll WALL, WALL, WALL, WALL ; 26
 	tilecoll WALL, WALL, WALL, WALL ; 27
 	tilecoll WALL, WALL, WALL, WALL ; 28
@@ -42,87 +43,86 @@
 	tilecoll WALL, WALL, WALL, WALL ; 2a
 	tilecoll WALL, WALL, WALL, WALL ; 2b
 	tilecoll WALL, WALL, WALL, WALL ; 2c
-	tilecoll WALL, WALL, WALL, WALL ; 2d
-	tilecoll WALL, WALL, WALL, DOOR ; 2e
-	tilecoll WALL, WALL, WALL, WALL ; 2f
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 30
-	tilecoll BUOY, BUOY, BUOY, WATER ; 31
-	tilecoll BUOY, BUOY, WATER, WATER ; 32
-	tilecoll BUOY, BUOY, WATER, BUOY ; 33
-	tilecoll WALL, WALL, WALL, WALL ; 34
-	tilecoll BUOY, WATER, BUOY, WATER ; 35
-	tilecoll WATER, WATER, WATER, WATER ; 36
-	tilecoll WATER, BUOY, WATER, BUOY ; 37
-	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 38
-	tilecoll BUOY, WATER, BUOY, BUOY ; 39
-	tilecoll WATER, WATER, BUOY, BUOY ; 3a
-	tilecoll WATER, BUOY, BUOY, BUOY ; 3b
-	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3c
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3d
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3e
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3f
-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 40
-	tilecoll WALL, WALL, WALL, FLOOR ; 41
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 42
-	tilecoll WALL, WALL, FLOOR, WALL ; 43
-	tilecoll WATER, WATER, WATER, WATER ; 44
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 45
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 47
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48
-	tilecoll WALL, FLOOR, WALL, WALL ; 49
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 4a
-	tilecoll FLOOR, WALL, WALL, WALL ; 4b
-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c
-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d
-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e
-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f
-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54
+	tilecoll WALL, WALL, WALL, DOOR ; 2d
+	tilecoll WALL, WALL, WALL, WALL ; 2e
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 2f
+	tilecoll BUOY, BUOY, BUOY, WATER ; 30
+	tilecoll BUOY, BUOY, WATER, WATER ; 31
+	tilecoll BUOY, BUOY, WATER, BUOY ; 32
+	tilecoll WALL, WALL, WALL, WALL ; 33
+	tilecoll BUOY, WATER, BUOY, WATER ; 34
+	tilecoll WATER, WATER, WATER, WATER ; 35
+	tilecoll WATER, BUOY, WATER, BUOY ; 36
+	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 37
+	tilecoll BUOY, WATER, BUOY, BUOY ; 38
+	tilecoll WATER, WATER, BUOY, BUOY ; 39
+	tilecoll WATER, BUOY, BUOY, BUOY ; 3a
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3b
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3c
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3d
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 3f
+	tilecoll WALL, WALL, WALL, FLOOR ; 40
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 41
+	tilecoll WALL, WALL, FLOOR, WALL ; 42
+	tilecoll WATER, WATER, WATER, WATER ; 43
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 44
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 46
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 47
+	tilecoll WALL, FLOOR, WALL, WALL ; 48
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 49
+	tilecoll FLOOR, WALL, WALL, WALL ; 4a
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53
+	tilecoll WATER, WATER, WATER, WATER ; 54
 	tilecoll WATER, WATER, WATER, WATER ; 55
-	tilecoll WATER, WATER, WATER, WATER ; 56
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56
 	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58
+	tilecoll WATER, WATER, WATER, WATER ; 58
 	tilecoll WATER, WATER, WATER, WATER ; 59
-	tilecoll WATER, WATER, WATER, WATER ; 5a
-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b
-	tilecoll WALL, WALL, WALL, CAVE ; 5c
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 5d
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a
+	tilecoll WALL, WALL, WALL, CAVE ; 5b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 5c
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5d
 	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5e
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5f
-	tilecoll WALL, WALL, WALL, WALL ; 60
+	tilecoll WALL, WALL, WALL, WALL ; 5f
+	tilecoll WATER, WATER, WALL, WALL ; 60
 	tilecoll WATER, WATER, WALL, WALL ; 61
 	tilecoll WATER, WATER, WALL, WALL ; 62
-	tilecoll WATER, WATER, WALL, WALL ; 63
-	tilecoll WATER, WATER, WATER, WATER ; 64
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 65
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 66
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 67
-	tilecoll WALL, WALL, WALL, WALL ; 68
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 69
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 6a
-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b
-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c
-	tilecoll WALL, FLOOR, WALL, WALL ; 6d
-	tilecoll FLOOR, WALL, WALL, WALL ; 6e
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70
-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 73
-	tilecoll FLOOR, FLOOR, WALL, CAVE ; 74
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 76
-	tilecoll WATER, WATER, WATER, WATER ; 77
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 78
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 79
+	tilecoll WATER, WATER, WATER, WATER ; 63
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 64
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 65
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 66
+	tilecoll WALL, WALL, WALL, WALL ; 67
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 68
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 69
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b
+	tilecoll WALL, FLOOR, WALL, WALL ; 6c
+	tilecoll FLOOR, WALL, WALL, WALL ; 6d
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 72
+	tilecoll FLOOR, FLOOR, WALL, CAVE ; 73
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 75
+	tilecoll WATER, WATER, WATER, WATER ; 76
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 77
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 78
+	tilecoll WATER, WATER, WATER, WATER ; 79
 	tilecoll WATER, WATER, WATER, WATER ; 7a
-	tilecoll WATER, WATER, WATER, WATER ; 7b
+	tilecoll WALL, WALL, WALL, WALL ; 7b
 	tilecoll WALL, WALL, WALL, WALL ; 7c
 	tilecoll WALL, WALL, WALL, WALL ; 7d
 	tilecoll WALL, WALL, WALL, WALL ; 7e
-	tilecoll WALL, WALL, WALL, WALL ; 7f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f
diff --git a/data/tilesets/kabuto_word_room_collision.asm b/data/tilesets/kabuto_word_room_collision.asm
index 138f07143..58bdacc53 100644
--- a/data/tilesets/kabuto_word_room_collision.asm
+++ b/data/tilesets/kabuto_word_room_collision.asm
@@ -1,4 +1,5 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
@@ -17,20 +18,20 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
-	tilecoll WALL, WALL, WALL, FLOOR ; 15
+	tilecoll WALL, WALL, WALL, FLOOR ; 14
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
-	tilecoll WALL, WALL, FLOOR, WALL ; 1a
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
-	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, WALL ; 19
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
 	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
 	tilecoll WALL, WALL, WALL, WALL ; 20
-	tilecoll WALL, WALL, WALL, WALL ; 21
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
@@ -61,4 +62,3 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/data/tilesets/kanto_collision.asm b/data/tilesets/kanto_collision.asm
index 9b0f0c275..275c2b0b1 100644
--- a/data/tilesets/kanto_collision.asm
+++ b/data/tilesets/kanto_collision.asm
@@ -1,128 +1,128 @@
-	tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 01
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll WALL, WALL, WALL, DOOR ; 03
-	tilecoll WALL, WALL, WALL, WALL ; 04
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 05
-	tilecoll LADDER, LADDER, LADDER, LADDER ; 06
-	tilecoll FLOOR, FLOOR, CAVE, WALL ; 07
-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 08
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09
-	tilecoll WALL, WALL, WALL, WALL ; 0a
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
-	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0c
+	tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll WALL, WALL, WALL, DOOR ; 02
+	tilecoll WALL, WALL, WALL, WALL ; 03
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04
+	tilecoll LADDER, LADDER, LADDER, LADDER ; 05
+	tilecoll FLOOR, FLOOR, CAVE, WALL ; 06
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0b
+	tilecoll WALL, WALL, WALL, WALL ; 0c
 	tilecoll WALL, WALL, WALL, WALL ; 0d
 	tilecoll WALL, WALL, WALL, WALL ; 0e
 	tilecoll WALL, WALL, WALL, WALL ; 0f
 	tilecoll WALL, WALL, WALL, WALL ; 10
 	tilecoll WALL, WALL, WALL, WALL ; 11
-	tilecoll WALL, WALL, WALL, WALL ; 12
-	tilecoll WALL, WALL, DOOR, WALL ; 13
-	tilecoll WALL, WALL, WALL, WALL ; 14
-	tilecoll WALL, WATER, WALL, WALL ; 15
-	tilecoll WATER, WALL, WALL, WALL ; 16
-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17
-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 18
-	tilecoll WALL, WATER, WALL, WATER ; 19
-	tilecoll WATER, WALL, WATER, WALL ; 1a
-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 1d
+	tilecoll WALL, WALL, DOOR, WALL ; 12
+	tilecoll WALL, WALL, WALL, WALL ; 13
+	tilecoll WALL, WATER, WALL, WALL ; 14
+	tilecoll WATER, WALL, WALL, WALL ; 15
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 16
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 17
+	tilecoll WALL, WATER, WALL, WATER ; 18
+	tilecoll WATER, WALL, WATER, WALL ; 19
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1c
+	tilecoll WATER, WATER, WATER, WATER ; 1d
 	tilecoll WATER, WATER, WATER, WATER ; 1e
 	tilecoll WATER, WATER, WATER, WATER ; 1f
-	tilecoll WATER, WATER, WATER, WATER ; 20
+	tilecoll WALL, WALL, WALL, WALL ; 20
 	tilecoll WALL, WALL, WALL, WALL ; 21
-	tilecoll WALL, WALL, WALL, WALL ; 22
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
-	tilecoll WALL, FLOOR, WALL, WALL ; 25
-	tilecoll FLOOR, WALL, WALL, WALL ; 26
+	tilecoll WALL, FLOOR, WALL, WALL ; 24
+	tilecoll FLOOR, WALL, WALL, WALL ; 25
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 29
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 2a
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 28
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 29
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+	tilecoll WATER, WATER, WATER, WATER ; 2d
 	tilecoll WATER, WATER, WATER, WATER ; 2e
-	tilecoll WATER, WATER, WATER, WATER ; 2f
-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 30
-	tilecoll WALL, WALL, WALL, WALL ; 31
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
-	tilecoll WALL, CUT_TREE, WALL, FLOOR ; 33
-	tilecoll WALL, WALL, FLOOR, CUT_TREE ; 34
-	tilecoll CUT_TREE, FLOOR, WALL, WALL ; 35
-	tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 36
-	tilecoll WALL, WALL, FLOOR, WALL ; 37
-	tilecoll WALL, WALL, WALL, WALL ; 38
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 2f
+	tilecoll WALL, WALL, WALL, WALL ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+	tilecoll WALL, CUT_TREE, WALL, FLOOR ; 32
+	tilecoll WALL, WALL, FLOOR, CUT_TREE ; 33
+	tilecoll CUT_TREE, FLOOR, WALL, WALL ; 34
+	tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 35
+	tilecoll WALL, WALL, FLOOR, WALL ; 36
+	tilecoll WALL, WALL, WALL, WALL ; 37
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 38
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 39
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 3a
-	tilecoll WALL, WALL, DOOR, WALL ; 3b
-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 3c
-	tilecoll WALL, WALL, WALL, DOOR ; 3d
-	tilecoll WALL, WALL, WALL, WALL ; 3e
-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 3f
-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 40
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 41
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 42
-	tilecoll HOP_DOWN, WALL, WALL, WALL ; 43
-	tilecoll WATER, WATER, WATER, WATER ; 44
+	tilecoll WALL, WALL, DOOR, WALL ; 3a
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 3b
+	tilecoll WALL, WALL, WALL, DOOR ; 3c
+	tilecoll WALL, WALL, WALL, WALL ; 3d
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 3e
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 3f
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 40
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 41
+	tilecoll HOP_DOWN, WALL, WALL, WALL ; 42
+	tilecoll WATER, WATER, WATER, WATER ; 43
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 45
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 46
-	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 47
-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 48
+	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 46
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 47
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4b
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4c
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4d
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 4e
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 4f
-	tilecoll FLOOR, WALL, WALL, WALL ; 50
-	tilecoll WALL, FLOOR, WALL, WALL ; 51
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 52
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 53
-	tilecoll WALL, WALL, WALL, DOOR ; 54
-	tilecoll WALL, WALL, WALL, WALL ; 55
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 56
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4a
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4b
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4c
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 4d
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 4e
+	tilecoll FLOOR, WALL, WALL, WALL ; 4f
+	tilecoll WALL, FLOOR, WALL, WALL ; 50
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 51
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 52
+	tilecoll WALL, WALL, WALL, DOOR ; 53
+	tilecoll WALL, WALL, WALL, WALL ; 54
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 55
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 56
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 57
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 58
-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 59
-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 5a
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5b
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5c
-	tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5d
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 58
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 59
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5a
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5b
+	tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 60
-	tilecoll FLOOR, WALL, CUT_TREE, WALL ; 61
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 62
-	tilecoll WALL, WALL, WALL, FLOOR ; 63
-	tilecoll WALL, WALL, FLOOR, WALL ; 64
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 5f
+	tilecoll FLOOR, WALL, CUT_TREE, WALL ; 60
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 61
+	tilecoll WALL, WALL, WALL, FLOOR ; 62
+	tilecoll WALL, WALL, FLOOR, WALL ; 63
+	tilecoll WATER, WATER, WATER, WATER ; 64
 	tilecoll WATER, WATER, WATER, WATER ; 65
-	tilecoll WATER, WATER, WATER, WATER ; 66
-	tilecoll WALL, WALL, WALL, WALL ; 67
-	tilecoll WALL, WATER, WALL, WATER ; 68
+	tilecoll WALL, WALL, WALL, WALL ; 66
+	tilecoll WALL, WATER, WALL, WATER ; 67
+	tilecoll WALL, WALL, WALL, WALL ; 68
 	tilecoll WALL, WALL, WALL, WALL ; 69
-	tilecoll WALL, WALL, WALL, WALL ; 6a
-	tilecoll WATER, WALL, WATER, WALL ; 6b
-	tilecoll WATER, WATER, WALL, WALL ; 6c
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 6d
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 6e
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 6f
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 70
-	tilecoll FLOOR, WALL, CAVE, WALL ; 71
+	tilecoll WATER, WALL, WATER, WALL ; 6a
+	tilecoll WATER, WATER, WALL, WALL ; 6b
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 6c
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 6d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 6e
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 6f
+	tilecoll FLOOR, WALL, CAVE, WALL ; 70
+	tilecoll WALL, WALL, WALL, WALL ; 71
 	tilecoll WALL, WALL, WALL, WALL ; 72
 	tilecoll WALL, WALL, WALL, WALL ; 73
-	tilecoll WALL, WALL, WALL, WALL ; 74
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 74
+	tilecoll WALL, WALL, WALL, WALL ; 75
 	tilecoll WALL, WALL, WALL, WALL ; 76
-	tilecoll WALL, WALL, WALL, WALL ; 77
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 78
-	tilecoll WATER, WATER, WATER, WATER ; 79
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7a
-	tilecoll WALL, WALL, WALL, WALL ; 7b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c
-	tilecoll WALL, WALL, WALL, DOOR ; 7d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 77
+	tilecoll WATER, WATER, WATER, WATER ; 78
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79
+	tilecoll WALL, WALL, WALL, WALL ; 7a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7b
+	tilecoll WALL, WALL, WALL, DOOR ; 7c
+	tilecoll WALL, WALL, WALL, WALL ; 7d
 	tilecoll WALL, WALL, WALL, WALL ; 7e
 	tilecoll WALL, WALL, WALL, WALL ; 7f
-	tilecoll WALL, WALL, WALL, WALL ; 80
diff --git a/data/tilesets/lab_collision.asm b/data/tilesets/lab_collision.asm
index 436c8e0a7..b3aa6ef1b 100644
--- a/data/tilesets/lab_collision.asm
+++ b/data/tilesets/lab_collision.asm
@@ -1,50 +1,51 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 03
-	tilecoll WALL, WALL, WALL, WALL ; 04
-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 06
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 02
+	tilecoll WALL, WALL, WALL, WALL ; 03
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 06
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 07
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 08
-	tilecoll WALL, WALL, WALL, WALL ; 09
-	tilecoll WINDOW, WALL, FLOOR, FLOOR ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 08
+	tilecoll WINDOW, WALL, FLOOR, FLOOR ; 09
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0f
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 10
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0e
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 11
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 12
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 13
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 14
-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 15
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
-	tilecoll WALL, WALL, WALL, WALL ; 18
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
-	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 1a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 20
-	tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 21
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 22
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 14
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+	tilecoll WALL, WALL, WALL, WALL ; 17
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 18
+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 19
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1c
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1e
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1f
+	tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 20
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 21
+	tilecoll WALL, WALL, WALL, WALL ; 22
 	tilecoll WALL, WALL, WALL, WALL ; 23
 	tilecoll WALL, WALL, WALL, WALL ; 24
-	tilecoll WALL, WALL, WALL, WALL ; 25
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
+	tilecoll WALL, WALL, WALL, WALL ; 26
 	tilecoll WALL, WALL, WALL, WALL ; 27
 	tilecoll WALL, WALL, WALL, WALL ; 28
-	tilecoll WALL, WALL, WALL, WALL ; 29
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 29
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
@@ -61,4 +62,3 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/data/tilesets/lighthouse_collision.asm b/data/tilesets/lighthouse_collision.asm
index 05b6cd614..81781fafa 100644
--- a/data/tilesets/lighthouse_collision.asm
+++ b/data/tilesets/lighthouse_collision.asm
@@ -1,64 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
 	tilecoll WALL, WALL, WALL, WALL ; 01
 	tilecoll WALL, WALL, WALL, WALL ; 02
 	tilecoll WALL, WALL, WALL, WALL ; 03
-	tilecoll WALL, WALL, WALL, WALL ; 04
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll WALL, WALL, WALL, WALL ; 06
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0a
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 09
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+	tilecoll WALL, WALL, WALL, WALL ; 0c
 	tilecoll WALL, WALL, WALL, WALL ; 0d
 	tilecoll WALL, WALL, WALL, WALL ; 0e
 	tilecoll WALL, WALL, WALL, WALL ; 0f
-	tilecoll WALL, WALL, WALL, WALL ; 10
-	tilecoll 9C, FLOOR, COUNTER, FLOOR ; 11
+	tilecoll 9C, FLOOR, COUNTER, FLOOR ; 10
+	tilecoll WALL, WALL, WALL, WALL ; 11
 	tilecoll WALL, WALL, WALL, WALL ; 12
 	tilecoll WALL, WALL, WALL, WALL ; 13
-	tilecoll WALL, WALL, WALL, WALL ; 14
-	tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 15
-	tilecoll WALL, WALL, WALL, WALL ; 16
-	tilecoll 9C, FLOOR, COUNTER, FLOOR ; 17
-	tilecoll WALL, WALL, WALL, WALL ; 18
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 19
-	tilecoll WALL, WALL, WALL, STAIRCASE ; 1a
-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1b
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c
-	tilecoll WALL, WALL, WALL, WALL ; 1d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
+	tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 14
+	tilecoll WALL, WALL, WALL, WALL ; 15
+	tilecoll 9C, FLOOR, COUNTER, FLOOR ; 16
+	tilecoll WALL, WALL, WALL, WALL ; 17
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 18
+	tilecoll WALL, WALL, WALL, STAIRCASE ; 19
+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1a
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1b
+	tilecoll WALL, WALL, WALL, WALL ; 1c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
+	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
-	tilecoll WALL, WALL, WALL, WALL ; 20
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 21
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 22
-	tilecoll WALL, FLOOR, WALL, WALL ; 23
-	tilecoll FLOOR, WALL, WALL, WALL ; 24
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 26
-	tilecoll WALL, WALL, WALL, WALL ; 27
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
-	tilecoll FLOOR, FLOOR, PIT, PIT ; 29
-	tilecoll WALL, WALL, WINDOW, WINDOW ; 2a
-	tilecoll WALL, WALL, WALL, WALL ; 2b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
-	tilecoll WALL, WALL, WALL, WALL ; 2e
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f
-	tilecoll WALL, WALL, WALL, BOOKSHELF ; 30
-	tilecoll WALL, WALL, FLOOR, WALL ; 31
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 32
-	tilecoll WALL, WALL, WALL, WALL ; 33
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 34
-	tilecoll WALL, WALL, PC, FLOOR ; 35
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 36
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
-	tilecoll WALL, WALL, WALL, WALL ; 38
-	tilecoll WALL, WALL, FLOOR, WALL ; 39
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 20
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 21
+	tilecoll WALL, FLOOR, WALL, WALL ; 22
+	tilecoll FLOOR, WALL, WALL, WALL ; 23
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 25
+	tilecoll WALL, WALL, WALL, WALL ; 26
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+	tilecoll FLOOR, FLOOR, PIT, PIT ; 28
+	tilecoll WALL, WALL, WINDOW, WINDOW ; 29
+	tilecoll WALL, WALL, WALL, WALL ; 2a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
+	tilecoll WALL, WALL, WALL, WALL ; 2d
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e
+	tilecoll WALL, WALL, WALL, BOOKSHELF ; 2f
+	tilecoll WALL, WALL, FLOOR, WALL ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 31
+	tilecoll WALL, WALL, WALL, WALL ; 32
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 33
+	tilecoll WALL, WALL, PC, FLOOR ; 34
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 35
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 36
+	tilecoll WALL, WALL, WALL, WALL ; 37
+	tilecoll WALL, WALL, FLOOR, WALL ; 38
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a
+	tilecoll WALL, WALL, WALL, WALL ; 3b
 	tilecoll WALL, WALL, WALL, WALL ; 3c
-	tilecoll WALL, WALL, WALL, WALL ; 3d
-	tilecoll WALL, WALL, WINDOW, WALL ; 3e
+	tilecoll WALL, WALL, WINDOW, WALL ; 3d
+	tilecoll WALL, WALL, WALL, WALL ; 3e
 	tilecoll WALL, WALL, WALL, WALL ; 3f
-	tilecoll WALL, WALL, WALL, WALL ; 40
diff --git a/data/tilesets/mansion_collision.asm b/data/tilesets/mansion_collision.asm
index 5db409be7..2c8edd747 100644
--- a/data/tilesets/mansion_collision.asm
+++ b/data/tilesets/mansion_collision.asm
@@ -1,64 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
 	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll WALL, WALL, WALL, WALL ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06
-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 06
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 07
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 08
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 09
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
-	tilecoll WALL, WALL, FLOOR, WALL ; 0b
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0c
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
-	tilecoll WALL, WALL, FLOOR, WALL ; 0e
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f
-	tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10
-	tilecoll WALL, WALL, WALL, WALL ; 11
-	tilecoll WALL, WALL, BOOKSHELF, WALL ; 12
-	tilecoll WALL, WALL, WALL, WALL ; 13
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 15
+	tilecoll WALL, WALL, FLOOR, WALL ; 0a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, WALL, FLOOR, WALL ; 0d
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0e
+	tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 0f
+	tilecoll WALL, WALL, WALL, WALL ; 10
+	tilecoll WALL, WALL, BOOKSHELF, WALL ; 11
+	tilecoll WALL, WALL, WALL, WALL ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 14
+	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 15
 	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16
-	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17
-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 18
-	tilecoll WALL, WALL, BOOKSHELF, WALL ; 19
-	tilecoll WALL, WALL, WALL, WALL ; 1a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, BOOKSHELF, WALL ; 18
+	tilecoll WALL, WALL, WALL, WALL ; 19
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1d
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 1e
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 1f
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 20
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 21
-	tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22
-	tilecoll WALL, WALL, FLOOR, WALL ; 23
-	tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24
-	tilecoll WALL, WALL, WALL, STAIRCASE ; 25
-	tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 27
-	tilecoll WALL, WALL, DOOR, WALL ; 28
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 20
+	tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 21
+	tilecoll WALL, WALL, FLOOR, WALL ; 22
+	tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 23
+	tilecoll WALL, WALL, WALL, STAIRCASE ; 24
+	tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 25
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 26
+	tilecoll WALL, WALL, DOOR, WALL ; 27
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 28
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 29
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 2a
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
-	tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
-	tilecoll WALL, WALL, WALL, FLOOR ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+	tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+	tilecoll WALL, WALL, WALL, FLOOR ; 2f
+	tilecoll WALL, WALL, FLOOR, WALL ; 30
 	tilecoll WALL, WALL, FLOOR, WALL ; 31
-	tilecoll WALL, WALL, FLOOR, WALL ; 32
-	tilecoll WALL, WALL, WALL, WALL ; 33
-	tilecoll WALL, WALL, WALL, FLOOR ; 34
-	tilecoll WALL, WALL, WALL, WALL ; 35
-	tilecoll FLOOR, WALL, WALL, WALL ; 36
-	tilecoll WALL, WALL, FLOOR, WALL ; 37
-	tilecoll WALL, FLOOR, WALL, WALL ; 38
-	tilecoll WALL, WALL, FLOOR, WALL ; 39
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
+	tilecoll WALL, WALL, WALL, WALL ; 32
+	tilecoll WALL, WALL, WALL, FLOOR ; 33
+	tilecoll WALL, WALL, WALL, WALL ; 34
+	tilecoll FLOOR, WALL, WALL, WALL ; 35
+	tilecoll WALL, WALL, FLOOR, WALL ; 36
+	tilecoll WALL, FLOOR, WALL, WALL ; 37
+	tilecoll WALL, WALL, FLOOR, WALL ; 38
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 39
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 3a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
-	tilecoll WALL, FLOOR, WALL, WALL ; 3e
-	tilecoll FLOOR, WALL, WALL, WALL ; 3f
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 40
+	tilecoll WALL, FLOOR, WALL, WALL ; 3d
+	tilecoll FLOOR, WALL, WALL, WALL ; 3e
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 3f
diff --git a/data/tilesets/mart_collision.asm b/data/tilesets/mart_collision.asm
index 80076ac3f..ee4f1e4c1 100644
--- a/data/tilesets/mart_collision.asm
+++ b/data/tilesets/mart_collision.asm
@@ -1,64 +1,64 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02
-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 08
-	tilecoll WALL, WALL, FLOOR, COUNTER ; 09
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
-	tilecoll WALL, WALL, COUNTER, FLOOR ; 0b
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0c
-	tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0d
-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0e
-	tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0f
-	tilecoll FLOOR, WALL, WALL, WALL ; 10
-	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 11
-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 12
-	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 13
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 01
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 06
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 08
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 09
+	tilecoll WALL, WALL, COUNTER, FLOOR ; 0a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0b
+	tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0c
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0d
+	tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0e
+	tilecoll FLOOR, WALL, WALL, WALL ; 0f
+	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 10
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 12
+	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 13
 	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 14
 	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 15
-	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 16
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
-	tilecoll WALL, WALL, FLOOR, COUNTER ; 18
-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 19
-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1a
-	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1b
-	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 17
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 19
+	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1a
+	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1b
+	tilecoll WALL, WALL, WALL, WALL ; 1c
 	tilecoll WALL, WALL, WALL, WALL ; 1d
-	tilecoll WALL, WALL, WALL, WALL ; 1e
-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1f
-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 20
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 21
-	tilecoll WALL, WALL, WALL, WALL ; 22
-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 23
-	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 24
-	tilecoll WALL, WALL, WALL, WALL ; 25
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
-	tilecoll WALL, WALL, COUNTER, MART_SHELF ; 28
-	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 29
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
-	tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2d
-	tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2e
-	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2f
-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 30
-	tilecoll WALL, WALL, WALL, WALL ; 31
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
-	tilecoll WALL, WALL, WALL, WALL ; 33
-	tilecoll WALL, FLOOR, WALL, WALL ; 34
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 35
-	tilecoll FLOOR, WALL, WALL, WALL ; 36
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1e
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 1f
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 20
+	tilecoll WALL, WALL, WALL, WALL ; 21
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22
+	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 23
+	tilecoll WALL, WALL, WALL, WALL ; 24
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 25
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 26
+	tilecoll WALL, WALL, COUNTER, MART_SHELF ; 27
+	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 28
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+	tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2c
+	tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2d
+	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2e
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 2f
+	tilecoll WALL, WALL, WALL, WALL ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+	tilecoll WALL, WALL, WALL, WALL ; 32
+	tilecoll WALL, FLOOR, WALL, WALL ; 33
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 34
+	tilecoll FLOOR, WALL, WALL, WALL ; 35
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 36
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 38
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
-	tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 3a
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+	tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 39
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+	tilecoll WALL, WALL, WALL, WALL ; 3b
 	tilecoll WALL, WALL, WALL, WALL ; 3c
 	tilecoll WALL, WALL, WALL, WALL ; 3d
-	tilecoll WALL, WALL, WALL, WALL ; 3e
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
-	tilecoll WALL, WALL, WALL, WALL ; 40
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+	tilecoll WALL, WALL, WALL, WALL ; 3f
diff --git a/data/tilesets/omanyte_word_room_collision.asm b/data/tilesets/omanyte_word_room_collision.asm
index 138f07143..58bdacc53 100644
--- a/data/tilesets/omanyte_word_room_collision.asm
+++ b/data/tilesets/omanyte_word_room_collision.asm
@@ -1,4 +1,5 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
@@ -17,20 +18,20 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
-	tilecoll WALL, WALL, WALL, FLOOR ; 15
+	tilecoll WALL, WALL, WALL, FLOOR ; 14
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
-	tilecoll WALL, WALL, FLOOR, WALL ; 1a
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
-	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, WALL ; 19
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
 	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
 	tilecoll WALL, WALL, WALL, WALL ; 20
-	tilecoll WALL, WALL, WALL, WALL ; 21
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
@@ -61,4 +62,3 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/data/tilesets/park_collision.asm b/data/tilesets/park_collision.asm
index c5965e0c9..d24de1ec1 100644
--- a/data/tilesets/park_collision.asm
+++ b/data/tilesets/park_collision.asm
@@ -1,55 +1,56 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
-	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
-	tilecoll WALL, WALL, WALL, WALL ; 07
-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 07
+	tilecoll WALL, WALL, WALL, WALL ; 08
 	tilecoll WALL, WALL, WALL, WALL ; 09
-	tilecoll WALL, WALL, WALL, WALL ; 0a
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0b
+	tilecoll WALL, WALL, WALL, WALL ; 0c
 	tilecoll WALL, WALL, WALL, WALL ; 0d
-	tilecoll WALL, WALL, WALL, WALL ; 0e
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10
-	tilecoll WALL, WALL, WALL, FLOOR ; 11
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 12
-	tilecoll WALL, WALL, FLOOR, WALL ; 13
-	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 14
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 15
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 17
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18
-	tilecoll WALL, FLOOR, WALL, WALL ; 19
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 1a
-	tilecoll FLOOR, WALL, WALL, WALL ; 1b
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c
-	tilecoll WALL, WALL, WALL, FLOOR ; 1d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
-	tilecoll WALL, WALL, FLOOR, WALL ; 1f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 21
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 23
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
-	tilecoll WALL, FLOOR, WALL, WALL ; 25
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 26
-	tilecoll FLOOR, WALL, WALL, WALL ; 27
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f
+	tilecoll WALL, WALL, WALL, FLOOR ; 10
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 11
+	tilecoll WALL, WALL, FLOOR, WALL ; 12
+	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 13
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 14
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 16
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17
+	tilecoll WALL, FLOOR, WALL, WALL ; 18
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 19
+	tilecoll FLOOR, WALL, WALL, WALL ; 1a
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b
+	tilecoll WALL, WALL, WALL, FLOOR ; 1c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
+	tilecoll WALL, WALL, FLOOR, WALL ; 1e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 20
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 22
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+	tilecoll WALL, FLOOR, WALL, WALL ; 24
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 25
+	tilecoll FLOOR, WALL, WALL, WALL ; 26
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+	tilecoll WALL, WALL, WALL, WALL ; 28
 	tilecoll WALL, WALL, WALL, WALL ; 29
 	tilecoll WALL, WALL, WALL, WALL ; 2a
-	tilecoll WALL, WALL, WALL, WALL ; 2b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+	tilecoll WALL, WALL, WALL, WALL ; 2c
 	tilecoll WALL, WALL, WALL, WALL ; 2d
 	tilecoll WALL, WALL, WALL, WALL ; 2e
-	tilecoll WALL, WALL, WALL, WALL ; 2f
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2f
+	tilecoll WALL, WALL, WALL, WALL ; 30
 	tilecoll WALL, WALL, WALL, WALL ; 31
 	tilecoll WALL, WALL, WALL, WALL ; 32
-	tilecoll WALL, WALL, WALL, WALL ; 33
-	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 34
+	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 33
+	tilecoll WALL, WALL, WALL, WALL ; 34
 	tilecoll WALL, WALL, WALL, WALL ; 35
 	tilecoll WALL, WALL, WALL, WALL ; 36
 	tilecoll WALL, WALL, WALL, WALL ; 37
@@ -60,5 +61,4 @@
 	tilecoll WALL, WALL, WALL, WALL ; 3c
 	tilecoll WALL, WALL, WALL, WALL ; 3d
 	tilecoll WALL, WALL, WALL, WALL ; 3e
-	tilecoll WALL, WALL, WALL, WALL ; 3f
-	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 40
+	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f
diff --git a/data/tilesets/players_house_collision.asm b/data/tilesets/players_house_collision.asm
index ed6b70a29..34c8c237b 100644
--- a/data/tilesets/players_house_collision.asm
+++ b/data/tilesets/players_house_collision.asm
@@ -1,43 +1,44 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll WINDOW, WALL, FLOOR, FLOOR ; 02
-	tilecoll WALL, WALL, FLOOR, TV ; 03
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
-	tilecoll WALL, WALL, WALL, WALL ; 05
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 06
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07
-	tilecoll WALL, WALL, WALL, WALL ; 08
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll WINDOW, WALL, FLOOR, FLOOR ; 01
+	tilecoll WALL, WALL, FLOOR, TV ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll WALL, WALL, WALL, WALL ; 04
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 06
+	tilecoll WALL, WALL, WALL, WALL ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 08
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 09
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0a
 	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0b
-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0c
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
-	tilecoll WALL, WALL, WALL, WALL ; 10
-	tilecoll WALL, WALL, PC, FLOOR ; 11
-	tilecoll WALL, WALL, TV, WALL ; 12
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
-	tilecoll FLOOR, TV, FLOOR, WALL ; 14
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 15
-	tilecoll WALL, WALL, FLOOR, WALL ; 16
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 17
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
-	tilecoll WALL, WALL, RADIO, PC ; 19
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
-	tilecoll WALL, WALL, RADIO, FLOOR ; 1b
-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1c
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e
-	tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1f
-	tilecoll WALL, WALL, PC, RADIO ; 20
-	tilecoll WALL, WALL, WALL, WALL ; 21
-	tilecoll WALL, WALL, TV, BOOKSHELF ; 22
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 23
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll WALL, WALL, PC, FLOOR ; 10
+	tilecoll WALL, WALL, TV, WALL ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+	tilecoll FLOOR, TV, FLOOR, WALL ; 13
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 14
+	tilecoll WALL, WALL, FLOOR, WALL ; 15
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 16
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, RADIO, PC ; 18
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
+	tilecoll WALL, WALL, RADIO, FLOOR ; 1a
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
+	tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1e
+	tilecoll WALL, WALL, PC, RADIO ; 1f
+	tilecoll WALL, WALL, WALL, WALL ; 20
+	tilecoll WALL, WALL, TV, BOOKSHELF ; 21
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 22
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 23
 	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 24
-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 25
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 26
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 28
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 25
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
@@ -61,4 +62,3 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/data/tilesets/players_room_collision.asm b/data/tilesets/players_room_collision.asm
index 464d80b83..713f06c9c 100644
--- a/data/tilesets/players_room_collision.asm
+++ b/data/tilesets/players_room_collision.asm
@@ -1,41 +1,42 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
 	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll WALL, WALL, WALL, WALL ; 02
-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03
-	tilecoll WALL, WALL, TV, BOOKSHELF ; 04
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02
+	tilecoll WALL, WALL, TV, BOOKSHELF ; 03
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 07
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 08
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 09
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 12
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 14
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1f
-	tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 20
+	tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 1f
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20
 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 23
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 22
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 23
 	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24
 	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25
-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 26
+	tilecoll FF, FF, FF, FF ; 26
 	tilecoll FF, FF, FF, FF ; 27
 	tilecoll FF, FF, FF, FF ; 28
 	tilecoll FF, FF, FF, FF ; 29
@@ -61,4 +62,3 @@
 	tilecoll FF, FF, FF, FF ; 3d
 	tilecoll FF, FF, FF, FF ; 3e
 	tilecoll FF, FF, FF, FF ; 3f
-	tilecoll FF, FF, FF, FF ; 40
diff --git a/data/tilesets/pokecenter_collision.asm b/data/tilesets/pokecenter_collision.asm
index 5b776330e..d76860917 100644
--- a/data/tilesets/pokecenter_collision.asm
+++ b/data/tilesets/pokecenter_collision.asm
@@ -1,64 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
 	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll WALL, WALL, WALL, WALL ; 02
-	tilecoll WALL, WALL, WALL, FLOOR ; 03
-	tilecoll WALL, WALL, FLOOR, WALL ; 04
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 06
-	tilecoll WALL, COUNTER, FLOOR, FLOOR ; 07
-	tilecoll COUNTER, WALL, FLOOR, FLOOR ; 08
-	tilecoll WALL, WALL, FLOOR, PC ; 09
-	tilecoll WALL, WALL, FLOOR, WALL ; 0a
-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 0b
-	tilecoll WALL, WALL, WALL, WALL ; 0c
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0e
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f
-	tilecoll WALL, WALL, FLOOR, WALL ; 10
-	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 11
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12
-	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 13
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 14
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15
-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 16
-	tilecoll WALL, WALL, FLOOR, WALL ; 17
+	tilecoll WALL, WALL, WALL, FLOOR ; 02
+	tilecoll WALL, WALL, FLOOR, WALL ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 05
+	tilecoll WALL, COUNTER, FLOOR, FLOOR ; 06
+	tilecoll COUNTER, WALL, FLOOR, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, PC ; 08
+	tilecoll WALL, WALL, FLOOR, WALL ; 09
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0d
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e
+	tilecoll WALL, WALL, FLOOR, WALL ; 0f
+	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 10
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 11
+	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 12
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 13
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 14
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, FLOOR, WALL ; 16
+	tilecoll WALL, WALL, WALL, WALL ; 17
 	tilecoll WALL, WALL, WALL, WALL ; 18
 	tilecoll WALL, WALL, WALL, WALL ; 19
 	tilecoll WALL, WALL, WALL, WALL ; 1a
 	tilecoll WALL, WALL, WALL, WALL ; 1b
 	tilecoll WALL, WALL, WALL, WALL ; 1c
-	tilecoll WALL, WALL, WALL, WALL ; 1d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 20
-	tilecoll WALL, WALL, WALL, WALL ; 21
-	tilecoll WALL, WALL, FLOOR, PC ; 22
-	tilecoll WALL, WALL, WALL, FLOOR ; 23
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 26
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 28
-	tilecoll WALL, WALL, FLOOR, WALL ; 29
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a
-	tilecoll WALL, WALL, WALL, FLOOR ; 2b
-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 2c
-	tilecoll WALL, WALL, WALL, WALL ; 2d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2f
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 30
-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 31
-	tilecoll WALL, WALL, FLOOR, WALL ; 32
-	tilecoll PC, WALL, FLOOR, WALL ; 33
-	tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 34
-	tilecoll DOOR, WALL, FLOOR, FLOOR ; 35
-	tilecoll DOOR, WALL, FLOOR, WALL ; 36
-	tilecoll DOOR, WALL, FLOOR, FLOOR ; 37
-	tilecoll DOOR, WALL, FLOOR, WALL ; 38
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 39
-	tilecoll WALL, WALL, FLOOR, WALL ; 3a
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3b
-	tilecoll WALL, WALL, FLOOR, WALL ; 3c
+	tilecoll WALL, WALL, WALL, WALL ; 20
+	tilecoll WALL, WALL, FLOOR, PC ; 21
+	tilecoll WALL, WALL, WALL, FLOOR ; 22
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 25
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 26
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27
+	tilecoll WALL, WALL, FLOOR, WALL ; 28
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29
+	tilecoll WALL, WALL, WALL, FLOOR ; 2a
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 2b
+	tilecoll WALL, WALL, WALL, WALL ; 2c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2e
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2f
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 30
+	tilecoll WALL, WALL, FLOOR, WALL ; 31
+	tilecoll PC, WALL, FLOOR, WALL ; 32
+	tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 33
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 34
+	tilecoll DOOR, WALL, FLOOR, WALL ; 35
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 36
+	tilecoll DOOR, WALL, FLOOR, WALL ; 37
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 38
+	tilecoll WALL, WALL, FLOOR, WALL ; 39
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3a
+	tilecoll WALL, WALL, FLOOR, WALL ; 3b
+	tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3c
 	tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3d
-	tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3e
-	tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3f
-	tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 40
+	tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3e
+	tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 3f
diff --git a/data/tilesets/pokecom_center_collision.asm b/data/tilesets/pokecom_center_collision.asm
index 1ecef84de..2272acfd4 100644
--- a/data/tilesets/pokecom_center_collision.asm
+++ b/data/tilesets/pokecom_center_collision.asm
@@ -1,38 +1,39 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 03
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
-	tilecoll WALL, WALL, WALL, FLOOR ; 05
-	tilecoll WALL, WALL, WALL, WALL ; 06
-	tilecoll WALL, WALL, WALL, FLOOR ; 07
-	tilecoll WALL, WALL, FLOOR, PC ; 08
-	tilecoll WALL, WALL, WALL, FLOOR ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+	tilecoll WALL, WALL, WALL, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll WALL, WALL, WALL, FLOOR ; 06
+	tilecoll WALL, WALL, FLOOR, PC ; 07
+	tilecoll WALL, WALL, WALL, FLOOR ; 08
+	tilecoll WALL, COUNTER, FLOOR, FLOOR ; 09
 	tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0a
-	tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0b
-	tilecoll WALL, WALL, WALL, WALL ; 0c
-	tilecoll WALL, WALL, FLOOR, WALL ; 0d
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll WALL, WALL, FLOOR, WALL ; 0c
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f
-	tilecoll WALL, WALL, FLOOR, WALL ; 10
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 11
-	tilecoll WALL, WALL, WALL, FLOOR ; 12
+	tilecoll WALL, WALL, FLOOR, WALL ; 0f
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 10
+	tilecoll WALL, WALL, WALL, FLOOR ; 11
+	tilecoll WALL, WALL, WALL, WALL ; 12
 	tilecoll WALL, WALL, WALL, WALL ; 13
 	tilecoll WALL, WALL, WALL, WALL ; 14
-	tilecoll WALL, WALL, WALL, WALL ; 15
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, WALL, WALL ; 16
 	tilecoll WALL, WALL, WALL, WALL ; 17
 	tilecoll WALL, WALL, WALL, WALL ; 18
 	tilecoll WALL, WALL, WALL, WALL ; 19
-	tilecoll WALL, WALL, WALL, WALL ; 1a
-	tilecoll WALL, WALL, FLOOR, WALL ; 1b
+	tilecoll WALL, WALL, FLOOR, WALL ; 1a
+	tilecoll WALL, WALL, WALL, WALL ; 1b
 	tilecoll WALL, WALL, WALL, WALL ; 1c
 	tilecoll WALL, WALL, WALL, WALL ; 1d
 	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
-	tilecoll WALL, WALL, WALL, WALL ; 20
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+	tilecoll WALL, WALL, WALL, WALL ; 23
 	tilecoll WALL, WALL, WALL, WALL ; 24
 	tilecoll WALL, WALL, WALL, WALL ; 25
 	tilecoll WALL, WALL, WALL, WALL ; 26
@@ -40,25 +41,24 @@
 	tilecoll WALL, WALL, WALL, WALL ; 28
 	tilecoll WALL, WALL, WALL, WALL ; 29
 	tilecoll WALL, WALL, WALL, WALL ; 2a
-	tilecoll WALL, WALL, WALL, WALL ; 2b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
-	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2d
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
+	tilecoll WALL, WALL, WALL, WALL ; 2f
 	tilecoll WALL, WALL, WALL, WALL ; 30
 	tilecoll WALL, WALL, WALL, WALL ; 31
 	tilecoll WALL, WALL, WALL, WALL ; 32
-	tilecoll WALL, WALL, WALL, WALL ; 33
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 34
-	tilecoll WALL, WALL, WALL, WALL ; 35
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 36
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 38
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 33
+	tilecoll WALL, WALL, WALL, WALL ; 34
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 35
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 37
+	tilecoll WALL, WALL, WALL, WALL ; 38
 	tilecoll WALL, WALL, WALL, WALL ; 39
-	tilecoll WALL, WALL, WALL, WALL ; 3a
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 3c
-	tilecoll WALL, WALL, WALL, WALL ; 3d
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 3e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3b
+	tilecoll WALL, WALL, WALL, WALL ; 3c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 3d
+	tilecoll WALL, WALL, WALL, WALL ; 3e
 	tilecoll WALL, WALL, WALL, WALL ; 3f
-	tilecoll WALL, WALL, WALL, WALL ; 40
diff --git a/data/tilesets/port_collision.asm b/data/tilesets/port_collision.asm
index fb37ee11e..8abc712c9 100644
--- a/data/tilesets/port_collision.asm
+++ b/data/tilesets/port_collision.asm
@@ -1,64 +1,64 @@
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
-	tilecoll WALL, WALL, WALL, WALL ; 02
-	tilecoll BUOY, WATER, BUOY, WATER ; 03
-	tilecoll WATER, BUOY, WATER, BUOY ; 04
-	tilecoll LADDER, LADDER, LADDER, LADDER ; 05
-	tilecoll WALL, WALL, WALL, WATER ; 06
-	tilecoll WALL, WALL, WATER, WATER ; 07
-	tilecoll WALL, WALL, WATER, WALL ; 08
-	tilecoll WATER, WATER, WATER, WATER ; 09
-	tilecoll WALL, WATER, WALL, WATER ; 0a
-	tilecoll WATER, WATER, WATER, WATER ; 0b
-	tilecoll WATER, WALL, WATER, WALL ; 0c
-	tilecoll WATER, WATER, FLOOR, FLOOR ; 0d
-	tilecoll WALL, WATER, WALL, WALL ; 0e
-	tilecoll WATER, WATER, WALL, WALL ; 0f
-	tilecoll WATER, WALL, WALL, WALL ; 10
-	tilecoll WATER, WATER, WATER, WATER ; 11
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
-	tilecoll WATER, WATER, WATER, WATER ; 13
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll BUOY, WATER, BUOY, WATER ; 02
+	tilecoll WATER, BUOY, WATER, BUOY ; 03
+	tilecoll LADDER, LADDER, LADDER, LADDER ; 04
+	tilecoll WALL, WALL, WALL, WATER ; 05
+	tilecoll WALL, WALL, WATER, WATER ; 06
+	tilecoll WALL, WALL, WATER, WALL ; 07
+	tilecoll WATER, WATER, WATER, WATER ; 08
+	tilecoll WALL, WATER, WALL, WATER ; 09
+	tilecoll WATER, WATER, WATER, WATER ; 0a
+	tilecoll WATER, WALL, WATER, WALL ; 0b
+	tilecoll WATER, WATER, FLOOR, FLOOR ; 0c
+	tilecoll WALL, WATER, WALL, WALL ; 0d
+	tilecoll WATER, WATER, WALL, WALL ; 0e
+	tilecoll WATER, WALL, WALL, WALL ; 0f
+	tilecoll WATER, WATER, WATER, WATER ; 10
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+	tilecoll WATER, WATER, WATER, WATER ; 12
+	tilecoll WATER, FLOOR, WATER, FLOOR ; 13
 	tilecoll WATER, FLOOR, WATER, FLOOR ; 14
-	tilecoll WATER, FLOOR, WATER, FLOOR ; 15
+	tilecoll WATER, WATER, WATER, WATER ; 15
 	tilecoll WATER, WATER, WATER, WATER ; 16
-	tilecoll WATER, WATER, WATER, WATER ; 17
-	tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 18
-	tilecoll WATER, WATER, WALL, WALL ; 19
-	tilecoll WATER, FLOOR, WALL, WALL ; 1a
-	tilecoll WALL, WALL, WALL, WALL ; 1b
-	tilecoll WALL, WATER, WALL, WALL ; 1c
+	tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 17
+	tilecoll WATER, WATER, WALL, WALL ; 18
+	tilecoll WATER, FLOOR, WALL, WALL ; 19
+	tilecoll WALL, WALL, WALL, WALL ; 1a
+	tilecoll WALL, WATER, WALL, WALL ; 1b
+	tilecoll WATER_21, WATER_21, WALL, WALL ; 1c
 	tilecoll WATER_21, WATER_21, WALL, WALL ; 1d
 	tilecoll WATER_21, WATER_21, WALL, WALL ; 1e
-	tilecoll WATER_21, WATER_21, WALL, WALL ; 1f
-	tilecoll WALL, WALL, WALL, WATER ; 20
-	tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 21
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
-	tilecoll BUOY, BUOY, BUOY, WATER ; 23
-	tilecoll BUOY, BUOY, WATER, BUOY ; 24
+	tilecoll WALL, WALL, WALL, WATER ; 1f
+	tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 20
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
+	tilecoll BUOY, BUOY, BUOY, WATER ; 22
+	tilecoll BUOY, BUOY, WATER, BUOY ; 23
+	tilecoll BUOY, BUOY, WATER, WATER ; 24
 	tilecoll BUOY, BUOY, WATER, WATER ; 25
-	tilecoll BUOY, BUOY, WATER, WATER ; 26
-	tilecoll LADDER, LADDER, LADDER, LADDER ; 27
-	tilecoll FLOOR, FLOOR, WATER, WATER ; 28
-	tilecoll FLOOR, FLOOR, FLOOR, WATER ; 29
-	tilecoll FLOOR, FLOOR, WATER, FLOOR ; 2a
-	tilecoll WALL, WALL, WALL, WALL ; 2b
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
-	tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2d
-	tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2e
-	tilecoll FLOOR, WATER, FLOOR, WATER ; 2f
-	tilecoll WATER, FLOOR, WATER, FLOOR ; 30
-	tilecoll FLOOR, FLOOR, WATER, WATER ; 31
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 33
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34
-	tilecoll FLOOR, WATER, FLOOR, WATER ; 35
-	tilecoll WALL, WALL, FLOOR, LADDER ; 36
-	tilecoll WATER, WATER, WATER, WATER ; 37
-	tilecoll FLOOR, WATER, FLOOR, WATER ; 38
-	tilecoll WATER, FLOOR, WATER, FLOOR ; 39
-	tilecoll WATER, WATER, FLOOR, FLOOR ; 3a
+	tilecoll LADDER, LADDER, LADDER, LADDER ; 26
+	tilecoll FLOOR, FLOOR, WATER, WATER ; 27
+	tilecoll FLOOR, FLOOR, FLOOR, WATER ; 28
+	tilecoll FLOOR, FLOOR, WATER, FLOOR ; 29
+	tilecoll WALL, WALL, WALL, WALL ; 2a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
+	tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2c
+	tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2d
+	tilecoll FLOOR, WATER, FLOOR, WATER ; 2e
+	tilecoll WATER, FLOOR, WATER, FLOOR ; 2f
+	tilecoll FLOOR, FLOOR, WATER, WATER ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 32
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 33
+	tilecoll FLOOR, WATER, FLOOR, WATER ; 34
+	tilecoll WALL, WALL, FLOOR, LADDER ; 35
+	tilecoll WATER, WATER, WATER, WATER ; 36
+	tilecoll FLOOR, WATER, FLOOR, WATER ; 37
+	tilecoll WATER, FLOOR, WATER, FLOOR ; 38
+	tilecoll WATER, WATER, FLOOR, FLOOR ; 39
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3a
 	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3b
 	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3c
 	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d
 	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e
 	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40
diff --git a/data/tilesets/radio_tower_collision.asm b/data/tilesets/radio_tower_collision.asm
index 1713eb438..2c2813047 100644
--- a/data/tilesets/radio_tower_collision.asm
+++ b/data/tilesets/radio_tower_collision.asm
@@ -1,64 +1,64 @@
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 04
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
-	tilecoll FLOOR, FLOOR, WALL, COUNTER ; 06
-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 07
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08
-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 09
-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 0a
-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0b
-	tilecoll WALL, WALL, WALL, WALL ; 0c
-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0d
-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0e
-	tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0f
-	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 10
-	tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 11
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 12
-	tilecoll WALL, WALL, PC, FLOOR ; 13
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 02
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, WALL, COUNTER ; 05
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 06
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 09
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0e
+	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 0f
+	tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 10
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 11
+	tilecoll WALL, WALL, PC, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 16
-	tilecoll WALL, WALL, WALL, WALL ; 17
-	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 18
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19
-	tilecoll WALL, WALL, FLOOR, COUNTER ; 1a
-	tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1b
-	tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1c
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1d
-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1e
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 20
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 21
-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22
-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 23
-	tilecoll WALL, WALL, WALL, WALL ; 24
-	tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 25
-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 26
-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
-	tilecoll WALL, WALL, FLOOR, WALL ; 29
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 2a
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2c
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
-	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2e
-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2f
-	tilecoll WALL, WALL, WALL, WALL ; 30
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 31
-	tilecoll WALL, WALL, FLOOR, WALL ; 32
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33
-	tilecoll WALL, WALL, WALL, FLOOR ; 34
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 35
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 37
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 38
-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 39
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
-	tilecoll WALL, WALL, WALL, WALL ; 3c
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3d
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 15
+	tilecoll WALL, WALL, WALL, WALL ; 16
+	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 17
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 19
+	tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1a
+	tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1b
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1f
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 20
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 21
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 22
+	tilecoll WALL, WALL, WALL, WALL ; 23
+	tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 24
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 25
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 26
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+	tilecoll WALL, WALL, FLOOR, WALL ; 28
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 29
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2d
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2e
+	tilecoll WALL, WALL, WALL, WALL ; 2f
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 30
+	tilecoll WALL, WALL, FLOOR, WALL ; 31
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 32
+	tilecoll WALL, WALL, WALL, FLOOR ; 33
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 36
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 38
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+	tilecoll WALL, WALL, WALL, WALL ; 3b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3c
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 3e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
diff --git a/data/tilesets/ruins_of_alph_collision.asm b/data/tilesets/ruins_of_alph_collision.asm
index 8c65340ab..fd7447583 100644
--- a/data/tilesets/ruins_of_alph_collision.asm
+++ b/data/tilesets/ruins_of_alph_collision.asm
@@ -1,64 +1,64 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll WALL, WALL, WALL, FLOOR ; 02
-	tilecoll WALL, WALL, FLOOR, WALL ; 03
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll WALL, WALL, WALL, FLOOR ; 01
+	tilecoll WALL, WALL, FLOOR, WALL ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll WALL, WALL, WALL, FLOOR ; 06
+	tilecoll WALL, WALL, WALL, FLOOR ; 05
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 06
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 07
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 08
-	tilecoll WALL, WALL, FLOOR, WALL ; 09
-	tilecoll WALL, FLOOR, WALL, WALL ; 0a
+	tilecoll WALL, WALL, FLOOR, WALL ; 08
+	tilecoll WALL, FLOOR, WALL, WALL ; 09
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0a
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 0b
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0c
-	tilecoll FLOOR, WALL, WALL, WALL ; 0d
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0f
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 10
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
-	tilecoll WALL, FLOOR, WALL, WALL ; 15
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17
-	tilecoll FLOOR, WALL, WALL, WALL ; 18
-	tilecoll WALL, WALL, WALL, PIT ; 19
-	tilecoll WALL, WALL, PIT, WALL ; 1a
-	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1b
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1d
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1e
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 22
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 23
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 24
+	tilecoll FLOOR, WALL, WALL, WALL ; 0c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0e
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13
+	tilecoll WALL, FLOOR, WALL, WALL ; 14
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 16
+	tilecoll FLOOR, WALL, WALL, WALL ; 17
+	tilecoll WALL, WALL, WALL, PIT ; 18
+	tilecoll WALL, WALL, PIT, WALL ; 19
+	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1e
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 21
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23
+	tilecoll WALL, WALL, WALL, WALL ; 24
 	tilecoll WALL, WALL, WALL, WALL ; 25
 	tilecoll WALL, WALL, WALL, WALL ; 26
 	tilecoll WALL, WALL, WALL, WALL ; 27
 	tilecoll WALL, WALL, WALL, WALL ; 28
 	tilecoll WALL, WALL, WALL, WALL ; 29
 	tilecoll WALL, WALL, WALL, WALL ; 2a
-	tilecoll WALL, WALL, WALL, WALL ; 2b
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2c
-	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2d
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2b
+	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2f
-	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 30
-	tilecoll CAVE, WALL, FLOOR, FLOOR ; 31
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 32
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
-	tilecoll WALL, WALL, WALL, PIT ; 35
-	tilecoll WALL, WALL, PIT, WALL ; 36
+	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 2f
+	tilecoll CAVE, WALL, FLOOR, FLOOR ; 30
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 32
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+	tilecoll WALL, WALL, WALL, PIT ; 34
+	tilecoll WALL, WALL, PIT, WALL ; 35
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
-	tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 39
-	tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 3a
-	tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3b
-	tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3c
-	tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3d
-	tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3e
-	tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3f
-	tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 40
+	tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 38
+	tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 39
+	tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3a
+	tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3b
+	tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3c
+	tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3d
+	tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3e
+	tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 3f
diff --git a/data/tilesets/tower_collision.asm b/data/tilesets/tower_collision.asm
index 9d02e9640..30e74a56f 100644
--- a/data/tilesets/tower_collision.asm
+++ b/data/tilesets/tower_collision.asm
@@ -1,64 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
 	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll WALL, WALL, WALL, WALL ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 02
 	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04
-	tilecoll WALL, WALL, WALL, FLOOR ; 05
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 06
-	tilecoll WALL, WALL, FLOOR, WALL ; 07
-	tilecoll WALL, WALL, WALL, WALL ; 08
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 09
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
-	tilecoll WALL, WALL, WALL, WALL ; 0c
-	tilecoll WALL, FLOOR, WALL, WALL ; 0d
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
-	tilecoll FLOOR, WALL, WALL, WALL ; 0f
-	tilecoll WALL, WALL, WALL, WALL ; 10
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 11
+	tilecoll WALL, WALL, WALL, FLOOR ; 04
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+	tilecoll WALL, WALL, FLOOR, WALL ; 06
+	tilecoll WALL, WALL, WALL, WALL ; 07
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 08
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll WALL, FLOOR, WALL, WALL ; 0c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0d
+	tilecoll FLOOR, WALL, WALL, WALL ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 10
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 11
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 12
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 13
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 14
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16
-	tilecoll WALL, FLOOR, WALL, WALL ; 17
-	tilecoll FLOOR, WALL, WALL, WALL ; 18
-	tilecoll WALL, WALL, WALL, WALL ; 19
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 13
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 14
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15
+	tilecoll WALL, FLOOR, WALL, WALL ; 16
+	tilecoll FLOOR, WALL, WALL, WALL ; 17
+	tilecoll WALL, WALL, WALL, WALL ; 18
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 19
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+	tilecoll WALL, WALL, WALL, WALL ; 1b
 	tilecoll WALL, WALL, WALL, WALL ; 1c
-	tilecoll WALL, WALL, WALL, WALL ; 1d
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1e
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1f
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1d
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1e
+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1f
 	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 20
-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 21
-	tilecoll WALL, WALL, WALL, FLOOR ; 22
-	tilecoll WALL, WALL, FLOOR, WALL ; 23
-	tilecoll WALL, WALL, WALL, WALL ; 24
-	tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 25
-	tilecoll WALL, WALL, PIT, FLOOR ; 26
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 27
-	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 28
+	tilecoll WALL, WALL, WALL, FLOOR ; 21
+	tilecoll WALL, WALL, FLOOR, WALL ; 22
+	tilecoll WALL, WALL, WALL, WALL ; 23
+	tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 24
+	tilecoll WALL, WALL, PIT, FLOOR ; 25
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 26
+	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 27
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
-	tilecoll WALL, WALL, WALL, WALL ; 2b
-	tilecoll WALL, HOP_LEFT, WALL, WALL ; 2c
-	tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
-	tilecoll WALL, WALL, WALL, FLOOR ; 2f
-	tilecoll WALL, WALL, FLOOR, WALL ; 30
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 31
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 32
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 33
-	tilecoll WALL, WALL, WALL, FLOOR ; 34
-	tilecoll WALL, WALL, FLOOR, WALL ; 35
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 36
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
-	tilecoll PIT, PIT, FLOOR, FLOOR ; 38
-	tilecoll FLOOR, PIT, FLOOR, PIT ; 39
-	tilecoll PIT, FLOOR, PIT, FLOOR ; 3a
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 3c
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3d
-	tilecoll WALL, HOP_DOWN, WALL, WALL ; 3e
-	tilecoll HOP_DOWN, WALL, WALL, WALL ; 3f
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 40
+	tilecoll WALL, WALL, WALL, WALL ; 2a
+	tilecoll WALL, HOP_LEFT, WALL, WALL ; 2b
+	tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
+	tilecoll WALL, WALL, WALL, FLOOR ; 2e
+	tilecoll WALL, WALL, FLOOR, WALL ; 2f
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 30
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 31
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 32
+	tilecoll WALL, WALL, WALL, FLOOR ; 33
+	tilecoll WALL, WALL, FLOOR, WALL ; 34
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 35
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 36
+	tilecoll PIT, PIT, FLOOR, FLOOR ; 37
+	tilecoll FLOOR, PIT, FLOOR, PIT ; 38
+	tilecoll PIT, FLOOR, PIT, FLOOR ; 39
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3b
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3c
+	tilecoll WALL, HOP_DOWN, WALL, WALL ; 3d
+	tilecoll HOP_DOWN, WALL, WALL, WALL ; 3e
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3f
diff --git a/data/tilesets/traditional_house_collision.asm b/data/tilesets/traditional_house_collision.asm
index 95cb1c21d..72db9bd42 100644
--- a/data/tilesets/traditional_house_collision.asm
+++ b/data/tilesets/traditional_house_collision.asm
@@ -1,64 +1,64 @@
-	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll WALL, WALL, RADIO, FLOOR ; 02
-	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 03
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll WALL, WALL, RADIO, FLOOR ; 01
+	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 02
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 08
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 09
-	tilecoll WALL, WALL, WALL, WALL ; 0a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0c
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 06
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0b
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
-	tilecoll WALL, WALL, WALL, WALL ; 10
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 12
-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 13
-	tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 14
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 12
+	tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 13
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 14
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15
 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17
-	tilecoll WALL, WALL, WALL, WALL ; 18
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a
-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1c
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f
+	tilecoll WALL, WALL, WALL, WALL ; 17
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1b
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 22
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 23
-	tilecoll WALL, WALL, RADIO, FLOOR ; 24
-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 26
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 27
-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 28
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 29
-	tilecoll WALL, WALL, WALL, WALL ; 2a
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 21
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 22
+	tilecoll WALL, WALL, RADIO, FLOOR ; 23
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 24
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 25
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 26
+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 27
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 28
+	tilecoll WALL, WALL, WALL, WALL ; 29
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
-	tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2f
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 31
+	tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2e
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2f
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 30
+	tilecoll WALL, WALL, WALL, WALL ; 31
 	tilecoll WALL, WALL, WALL, WALL ; 32
-	tilecoll WALL, WALL, WALL, WALL ; 33
+	tilecoll WALL, WALL, WALL, FLOOR ; 33
 	tilecoll WALL, WALL, WALL, FLOOR ; 34
-	tilecoll WALL, WALL, WALL, FLOOR ; 35
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 36
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37
-	tilecoll WALL, WALL, FLOOR, WALL ; 38
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 39
-	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 3a
-	tilecoll 04, 03, 03, 03 ; 3b
-	tilecoll 03, 03, 03, 03 ; 3c
-	tilecoll 03, 03, 04, 04 ; 3d
-	tilecoll 04, 04, 04, 04 ; 3e
-	tilecoll 03, 03, 03, 03 ; 3f
-	tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 40
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 35
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36
+	tilecoll WALL, WALL, FLOOR, WALL ; 37
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 38
+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 39
+	tilecoll 04, 03, 03, 03 ; 3a
+	tilecoll 03, 03, 03, 03 ; 3b
+	tilecoll 03, 03, 04, 04 ; 3c
+	tilecoll 04, 04, 04, 04 ; 3d
+	tilecoll 03, 03, 03, 03 ; 3e
+	tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 3f
diff --git a/data/tilesets/train_station_collision.asm b/data/tilesets/train_station_collision.asm
index 55b147237..a6a4b1ace 100644
--- a/data/tilesets/train_station_collision.asm
+++ b/data/tilesets/train_station_collision.asm
@@ -1,64 +1,64 @@
-	tilecoll FF, FF, FF, FF ; 01
-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 02
-	tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 03
+	tilecoll FF, FF, FF, FF ; 00
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 01
+	tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 07
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 08
-	tilecoll WALL, FLOOR, WALL, WALL ; 09
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a
-	tilecoll WALL, WALL, WALL, WALL ; 0b
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0d
-	tilecoll WALL, WALL, WALL, WALL ; 0e
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 06
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 07
+	tilecoll WALL, FLOOR, WALL, WALL ; 08
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0c
+	tilecoll WALL, WALL, WALL, WALL ; 0d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
 	tilecoll WALL, WALL, WALL, WALL ; 10
-	tilecoll WALL, WALL, WALL, WALL ; 11
-	tilecoll WALL, WALL, DOOR, WALL ; 12
-	tilecoll WALL, WALL, WALL, DOOR ; 13
+	tilecoll WALL, WALL, DOOR, WALL ; 11
+	tilecoll WALL, WALL, WALL, DOOR ; 12
+	tilecoll WALL, WALL, WALL, WALL ; 13
 	tilecoll WALL, WALL, WALL, WALL ; 14
 	tilecoll WALL, WALL, WALL, WALL ; 15
 	tilecoll WALL, WALL, WALL, WALL ; 16
 	tilecoll WALL, WALL, WALL, WALL ; 17
-	tilecoll WALL, WALL, WALL, WALL ; 18
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
+	tilecoll WALL, WALL, WALL, WALL ; 1a
 	tilecoll WALL, WALL, WALL, WALL ; 1b
-	tilecoll WALL, WALL, WALL, WALL ; 1c
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 20
-	tilecoll WALL, WALL, WALL, WALL ; 21
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 22
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 23
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1e
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1f
+	tilecoll WALL, WALL, WALL, WALL ; 20
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 21
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 22
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 23
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 24
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 25
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 26
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 27
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 28
-	tilecoll WALL, WALL, WALL, FLOOR ; 29
-	tilecoll WALL, WALL, FLOOR, WALL ; 2a
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 26
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 27
+	tilecoll WALL, WALL, WALL, FLOOR ; 28
+	tilecoll WALL, WALL, FLOOR, WALL ; 29
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 2b
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 2c
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 2d
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 2e
-	tilecoll WALL, WALL, WALL, WALL ; 2f
+	tilecoll WALL, WALL, WALL, WALL ; 2e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2f
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 30
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 31
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 32
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 33
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 35
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 36
-	tilecoll WALL, WALL, WALL, FLOOR ; 37
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 38
-	tilecoll WALL, WALL, FLOOR, WALL ; 39
-	tilecoll WALL, FLOOR, WALL, WALL ; 3a
-	tilecoll WALL, WALL, WALL, WALL ; 3b
-	tilecoll FLOOR, WALL, WALL, WALL ; 3c
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 31
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 32
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 33
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 34
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 35
+	tilecoll WALL, WALL, WALL, FLOOR ; 36
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 37
+	tilecoll WALL, WALL, FLOOR, WALL ; 38
+	tilecoll WALL, FLOOR, WALL, WALL ; 39
+	tilecoll WALL, WALL, WALL, WALL ; 3a
+	tilecoll FLOOR, WALL, WALL, WALL ; 3b
+	tilecoll WALL, WALL, WALL, WALL ; 3c
 	tilecoll WALL, WALL, WALL, WALL ; 3d
 	tilecoll WALL, WALL, WALL, WALL ; 3e
 	tilecoll WALL, WALL, WALL, WALL ; 3f
-	tilecoll WALL, WALL, WALL, WALL ; 40
diff --git a/data/tilesets/underground_collision.asm b/data/tilesets/underground_collision.asm
index 0c3120451..e4cee7495 100644
--- a/data/tilesets/underground_collision.asm
+++ b/data/tilesets/underground_collision.asm
@@ -1,64 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
 	tilecoll WALL, WALL, WALL, WALL ; 01
-	tilecoll WALL, WALL, WALL, WALL ; 02
+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 02
 	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 03
-	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04
-	tilecoll WALL, WALL, WALL, FLOOR ; 05
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 07
-	tilecoll FLOOR, FLOOR, PIT, PIT ; 08
-	tilecoll WALL, WALL, WALL, FLOOR ; 09
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
-	tilecoll WALL, WALL, FLOOR, WALL ; 0b
-	tilecoll WALL, WALL, WALL, WALL ; 0c
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0d
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 10
-	tilecoll WALL, FLOOR, WALL, WALL ; 11
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 12
-	tilecoll FLOOR, WALL, WALL, WALL ; 13
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 14
+	tilecoll WALL, WALL, WALL, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 06
+	tilecoll FLOOR, FLOOR, PIT, PIT ; 07
+	tilecoll WALL, WALL, WALL, FLOOR ; 08
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 09
+	tilecoll WALL, WALL, FLOOR, WALL ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0e
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 0f
+	tilecoll WALL, FLOOR, WALL, WALL ; 10
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 11
+	tilecoll FLOOR, WALL, WALL, WALL ; 12
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 13
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 14
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 15
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 16
-	tilecoll WALL, FLOOR, WALL, WALL ; 17
-	tilecoll FLOOR, WALL, WALL, WALL ; 18
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 19
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f
+	tilecoll WALL, FLOOR, WALL, WALL ; 16
+	tilecoll FLOOR, WALL, WALL, WALL ; 17
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 18
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 19
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 20
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 21
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22
 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 24
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25
-	tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 26
-	tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 27
-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 28
-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 29
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 2a
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24
+	tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 25
+	tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 26
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 27
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 28
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 29
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2a
+	tilecoll WALL, WALL, WALL, WALL ; 2b
 	tilecoll WALL, WALL, WALL, WALL ; 2c
 	tilecoll WALL, WALL, WALL, WALL ; 2d
-	tilecoll WALL, WALL, WALL, WALL ; 2e
-	tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2f
+	tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2e
+	tilecoll WALL, WALL, WALL, WALL ; 2f
 	tilecoll WALL, WALL, WALL, WALL ; 30
 	tilecoll WALL, WALL, WALL, WALL ; 31
 	tilecoll WALL, WALL, WALL, WALL ; 32
 	tilecoll WALL, WALL, WALL, WALL ; 33
 	tilecoll WALL, WALL, WALL, WALL ; 34
 	tilecoll WALL, WALL, WALL, WALL ; 35
-	tilecoll WALL, WALL, WALL, WALL ; 36
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 37
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 38
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 36
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
+	tilecoll WALL, WALL, WALL, WALL ; 38
 	tilecoll WALL, WALL, WALL, WALL ; 39
 	tilecoll WALL, WALL, WALL, WALL ; 3a
 	tilecoll WALL, WALL, WALL, WALL ; 3b
 	tilecoll WALL, WALL, WALL, WALL ; 3c
-	tilecoll WALL, WALL, WALL, WALL ; 3d
-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3e
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/data/tilesets/unused_dark_cave_collision.asm b/data/tilesets/unused_dark_cave_collision.asm
index 0022d3881..8bbc11f2a 100644
--- a/data/tilesets/unused_dark_cave_collision.asm
+++ b/data/tilesets/unused_dark_cave_collision.asm
@@ -1,33 +1,34 @@
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
-	tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 04
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
-	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
-	tilecoll WALL, WALL, WALL, WALL ; 09
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
-	tilecoll WALL, WALL, WALL, WALL ; 0b
-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0d
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f
+	tilecoll WALL, WALL, WALL, WALL ; 08
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
 	tilecoll WALL, WALL, WALL, WALL ; 10
 	tilecoll WALL, WALL, WALL, WALL ; 11
 	tilecoll WALL, WALL, WALL, WALL ; 12
 	tilecoll WALL, WALL, WALL, WALL ; 13
-	tilecoll WALL, WALL, WALL, WALL ; 14
-	tilecoll WALL, WALL, WALL, DOOR ; 15
-	tilecoll WALL, WALL, WALL, WALL ; 16
-	tilecoll WALL, WALL, WALL, DOOR ; 17
-	tilecoll WALL, WALL, TOWN_MAP, WALL ; 18
+	tilecoll WALL, WALL, WALL, DOOR ; 14
+	tilecoll WALL, WALL, WALL, WALL ; 15
+	tilecoll WALL, WALL, WALL, DOOR ; 16
+	tilecoll WALL, WALL, TOWN_MAP, WALL ; 17
+	tilecoll WALL, WALL, WALL, WALL ; 18
 	tilecoll WALL, WALL, WALL, WALL ; 19
-	tilecoll WALL, WALL, WALL, WALL ; 1a
-	tilecoll WALL, WALL, WALL, DOOR ; 1b
-	tilecoll WALL, WALL, TOWN_MAP, WALL ; 1c
-	tilecoll WALL, WALL, WALL, WALL ; 1d
-	tilecoll WALL, WALL, DOOR, WALL ; 1e
+	tilecoll WALL, WALL, WALL, DOOR ; 1a
+	tilecoll WALL, WALL, TOWN_MAP, WALL ; 1b
+	tilecoll WALL, WALL, WALL, WALL ; 1c
+	tilecoll WALL, WALL, DOOR, WALL ; 1d
+	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
 	tilecoll WALL, WALL, WALL, WALL ; 20
 	tilecoll WALL, WALL, WALL, WALL ; 21
@@ -37,92 +38,91 @@
 	tilecoll WALL, WALL, WALL, WALL ; 25
 	tilecoll WALL, WALL, WALL, WALL ; 26
 	tilecoll WALL, WALL, WALL, WALL ; 27
-	tilecoll WALL, WALL, WALL, WALL ; 28
-	tilecoll WALL, WALL, WALL, DOOR ; 29
-	tilecoll WALL, WALL, WALL, WALL ; 2a
-	tilecoll WALL, WALL, WALL, DOOR ; 2b
-	tilecoll WALL, WALL, WALL, WALL ; 2c
+	tilecoll WALL, WALL, WALL, DOOR ; 28
+	tilecoll WALL, WALL, WALL, WALL ; 29
+	tilecoll WALL, WALL, WALL, DOOR ; 2a
+	tilecoll WALL, WALL, WALL, WALL ; 2b
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2c
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 2d
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2e
-	tilecoll WALL, WALL, WALL, DOOR ; 2f
-	tilecoll WALL, WALL, WALL, WALL ; 30
-	tilecoll BUOY, BUOY, BUOY, WATER_21 ; 31
-	tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 32
-	tilecoll BUOY, BUOY, WATER_21, BUOY ; 33
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 34
-	tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 35
-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 36
-	tilecoll WATER_21, BUOY, WATER_21, BUOY ; 37
-	tilecoll WALL, WALL, WALL, WALL ; 38
-	tilecoll BUOY, WATER_21, BUOY, BUOY ; 39
-	tilecoll WATER_21, WATER_21, BUOY, BUOY ; 3a
-	tilecoll WATER_21, BUOY, BUOY, BUOY ; 3b
-	tilecoll WALL, WALL, WALL, WALL ; 3c
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40
-	tilecoll WALL, WALL, WALL, FLOOR ; 41
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 42
-	tilecoll WALL, WALL, FLOOR, WALL ; 43
-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 44
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 45
-	tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 46
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 47
-	tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 48
-	tilecoll WALL, FLOOR, WALL, WALL ; 49
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 4a
-	tilecoll FLOOR, WALL, WALL, WALL ; 4b
-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c
-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d
-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e
-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f
-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54
+	tilecoll WALL, WALL, WALL, DOOR ; 2e
+	tilecoll WALL, WALL, WALL, WALL ; 2f
+	tilecoll BUOY, BUOY, BUOY, WATER_21 ; 30
+	tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 31
+	tilecoll BUOY, BUOY, WATER_21, BUOY ; 32
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 33
+	tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 34
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 35
+	tilecoll WATER_21, BUOY, WATER_21, BUOY ; 36
+	tilecoll WALL, WALL, WALL, WALL ; 37
+	tilecoll BUOY, WATER_21, BUOY, BUOY ; 38
+	tilecoll WATER_21, WATER_21, BUOY, BUOY ; 39
+	tilecoll WATER_21, BUOY, BUOY, BUOY ; 3a
+	tilecoll WALL, WALL, WALL, WALL ; 3b
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3d
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3e
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f
+	tilecoll WALL, WALL, WALL, FLOOR ; 40
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 41
+	tilecoll WALL, WALL, FLOOR, WALL ; 42
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 43
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 44
+	tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 45
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 46
+	tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 47
+	tilecoll WALL, FLOOR, WALL, WALL ; 48
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 49
+	tilecoll FLOOR, WALL, WALL, WALL ; 4a
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 54
 	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55
-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 56
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56
 	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 58
 	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59
-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 5a
-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b
-	tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5c
-	tilecoll WALL, WALL, WALL, FLOOR ; 5d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 5e
-	tilecoll WALL, WALL, FLOOR, WALL ; 5f
-	tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 60
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 61
-	tilecoll WALL, WALL, WALL, WALL ; 62
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 63
-	tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 64
-	tilecoll WALL, FLOOR, WALL, WALL ; 65
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 66
-	tilecoll FLOOR, WALL, WALL, WALL ; 67
-	tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 68
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 69
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 6a
-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b
-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c
-	tilecoll WALL, FLOOR, WALL, WALL ; 6d
-	tilecoll FLOOR, WALL, WALL, WALL ; 6e
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70
-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 73
-	tilecoll FLOOR, FLOOR, DOOR, WALL ; 74
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 76
-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 77
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a
+	tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5b
+	tilecoll WALL, WALL, WALL, FLOOR ; 5c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 5d
+	tilecoll WALL, WALL, FLOOR, WALL ; 5e
+	tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 5f
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 60
+	tilecoll WALL, WALL, WALL, WALL ; 61
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 62
+	tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 63
+	tilecoll WALL, FLOOR, WALL, WALL ; 64
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 65
+	tilecoll FLOOR, WALL, WALL, WALL ; 66
+	tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 67
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 68
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 69
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b
+	tilecoll WALL, FLOOR, WALL, WALL ; 6c
+	tilecoll FLOOR, WALL, WALL, WALL ; 6d
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 72
+	tilecoll FLOOR, FLOOR, DOOR, WALL ; 73
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 75
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 76
+	tilecoll WALL, WALL, WALL, WALL ; 77
 	tilecoll WALL, WALL, WALL, WALL ; 78
-	tilecoll WALL, WALL, WALL, WALL ; 79
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 79
 	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a
-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7b
+	tilecoll WALL, WALL, WALL, WALL ; 7b
 	tilecoll WALL, WALL, WALL, WALL ; 7c
 	tilecoll WALL, WALL, WALL, WALL ; 7d
 	tilecoll WALL, WALL, WALL, WALL ; 7e
 	tilecoll WALL, WALL, WALL, WALL ; 7f
-	tilecoll WALL, WALL, WALL, WALL ; 80
diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm
index 224e460c9..67d852d83 100644
--- a/data/trainers/attributes.asm
+++ b/data/trainers/attributes.asm
@@ -1,406 +1,404 @@
-TrainerClassAttributes: ; 3959c
+TrainerClassAttributes:
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
 
 ; Falkner
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Whitney
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Bugsy
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Morty
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Pryce
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Jasmine
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Chuck
-	db FULL_HEAL, 0 ; items
+	db FULL_HEAL, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Clair
 	db FULL_HEAL, HYPER_POTION ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Rival1
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 15 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Pokemon Prof
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_AGGRESSIVE + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_AGGRESSIVE | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Will
-	db MAX_POTION, 0 ; items
+	db MAX_POTION, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Cal
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Bruno
-	db MAX_POTION, 0 ; items
+	db MAX_POTION, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Karen
 	db FULL_HEAL, MAX_POTION ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Koga
 	db FULL_HEAL, FULL_RESTORE ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Champion
 	db FULL_HEAL, FULL_RESTORE ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Brock
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Misty
-	db FULL_HEAL, 0 ; items
+	db FULL_HEAL, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Lt Surge
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Scientist
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Erika
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Youngster
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 4 ; base reward
-	dw AI_BASIC + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Schoolboy
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
-	dw CONTEXT_USE + SWITCH_OFTEN
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_OFTEN
 
 ; Bird Keeper
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 6 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_OFFENSIVE | AI_OPPORTUNIST | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Lass
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 6 ; base reward
-	dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
-	dw CONTEXT_USE + SWITCH_OFTEN
+	dw AI_BASIC | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_OFTEN
 
 ; Janine
-	db DIRE_HIT, 0 ; items
+	db DIRE_HIT, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Cooltrainerm
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 12 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Cooltrainerf
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 12 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Beauty
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 22 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Pokemaniac
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 15 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_AGGRESSIVE + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_OFFENSIVE | AI_AGGRESSIVE | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Gruntm
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Gentleman
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_AGGRESSIVE + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_AGGRESSIVE | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Skier
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Teacher
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
-	dw AI_BASIC + AI_OPPORTUNIST + AI_AGGRESSIVE + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_OPPORTUNIST | AI_AGGRESSIVE | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Sabrina
-	db HYPER_POTION, 0 ; items
+	db HYPER_POTION, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Bug Catcher
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 4 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Fisher
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
-	dw CONTEXT_USE + SWITCH_OFTEN
+	dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_OFTEN
 
 ; Swimmerm
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 2 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OFFENSIVE + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_OFFENSIVE | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Swimmerf
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 5 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Sailor
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
-	dw AI_BASIC + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_OFFENSIVE | AI_OPPORTUNIST | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Super Nerd
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_SMART | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Rival2
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Guitarist
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Hiker
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
-	dw AI_BASIC + AI_OFFENSIVE + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_OFFENSIVE | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Biker
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Blaine
 	db MAX_POTION, FULL_HEAL ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Burglar
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 22 ; base reward
-	dw AI_BASIC + AI_OFFENSIVE + AI_CAUTIOUS + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_OFFENSIVE | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Firebreather
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 12 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_OFFENSIVE | AI_OPPORTUNIST | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Juggler
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_SMART | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Blackbelt T
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 6 ; base reward
-	dw AI_BASIC + AI_OFFENSIVE + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_OFFENSIVE | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Executivem
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_SMART | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Psychic T
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Picnicker
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 5 ; base reward
-	dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Camper
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 5 ; base reward
-	dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Executivef
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_SMART | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Sage
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 8 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Medium
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Boarder
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Pokefanm
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 20 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_SMART | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Kimono Girl
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 18 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Twins
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 5 ; base reward
 	dw NO_AI
-	dw CONTEXT_USE + SWITCH_OFTEN
+	dw CONTEXT_USE | SWITCH_OFTEN
 
 ; Pokefanf
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 20 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_SMART | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Red
 	db FULL_RESTORE, FULL_RESTORE ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Blue
 	db FULL_RESTORE, FULL_RESTORE ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Officer
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_STATUS
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Gruntf
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 10 ; base reward
-	dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
+	dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
 
 ; Mysticalman
-	db 0, 0 ; items
+	db NO_ITEM, NO_ITEM ; items
 	db 25 ; base reward
-	dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
-	dw CONTEXT_USE + SWITCH_SOMETIMES
-
-; 39771
+	dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
+	dw CONTEXT_USE | SWITCH_SOMETIMES
diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm
index 48d81f910..66c953492 100755..100644
--- a/data/trainers/class_names.asm
+++ b/data/trainers/class_names.asm
@@ -1,4 +1,4 @@
-TrainerClassNames:: ; 2c1ef
+TrainerClassNames::
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
 	db "LEADER@"
 	db "LEADER@"
diff --git a/data/trainers/dvs.asm b/data/trainers/dvs.asm
index 06f486774..5ed883681 100644
--- a/data/trainers/dvs.asm
+++ b/data/trainers/dvs.asm
@@ -1,72 +1,70 @@
-TrainerClassDVs: ; 270d6
+TrainerClassDVs:
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
-	;  Atk  Spd
-	;  Def  Spc
-	db $9A, $77 ; falkner
-	db $88, $88 ; bugsy
-	db $98, $88 ; whitney
-	db $98, $88 ; morty
-	db $98, $88 ; pryce
-	db $98, $88 ; jasmine
-	db $98, $88 ; chuck
-	db $7C, $DD ; clair
-	db $DD, $DD ; rival1
-	db $98, $88 ; pokemon prof
-	db $DC, $DD ; will
-	db $DC, $DD ; cal
-	db $DC, $DD ; bruno
-	db $7F, $DF ; karen
-	db $DC, $DD ; koga
-	db $DC, $DD ; champion
-	db $98, $88 ; brock
-	db $78, $88 ; misty
-	db $98, $88 ; lt surge
-	db $98, $88 ; scientist
-	db $78, $88 ; erika
-	db $98, $88 ; youngster
-	db $98, $88 ; schoolboy
-	db $98, $88 ; bird keeper
-	db $58, $88 ; lass
-	db $98, $88 ; janine
-	db $D8, $C8 ; cooltrainerm
-	db $7C, $C8 ; cooltrainerf
-	db $69, $C8 ; beauty
-	db $98, $88 ; pokemaniac
-	db $D8, $A8 ; gruntm
-	db $98, $88 ; gentleman
-	db $98, $88 ; skier
-	db $68, $88 ; teacher
-	db $7D, $87 ; sabrina
-	db $98, $88 ; bug catcher
-	db $98, $88 ; fisher
-	db $98, $88 ; swimmerm
-	db $78, $88 ; swimmerf
-	db $98, $88 ; sailor
-	db $98, $88 ; super nerd
-	db $98, $88 ; rival2
-	db $98, $88 ; guitarist
-	db $A8, $88 ; hiker
-	db $98, $88 ; biker
-	db $98, $88 ; blaine
-	db $98, $88 ; burglar
-	db $98, $88 ; firebreather
-	db $98, $88 ; juggler
-	db $98, $88 ; blackbelt
-	db $D8, $A8 ; executivem
-	db $98, $88 ; psychic
-	db $6A, $A8 ; picnicker
-	db $98, $88 ; camper
-	db $7E, $A8 ; executivef
-	db $98, $88 ; sage
-	db $78, $88 ; medium
-	db $98, $88 ; boarder
-	db $98, $88 ; pokefanm
-	db $68, $8A ; kimono girl
-	db $68, $A8 ; twins
-	db $6D, $88 ; pokefanf
-	db $FD, $DE ; red
-	db $9D, $DD ; blue
-	db $98, $88 ; officer
-	db $7E, $A8 ; gruntf
-	db $98, $88 ; mysticalman
-; 2715c
+	;  atk,def,spd,spc
+	dn  9, 10,  7,  7 ; FALKNER
+	dn  8,  8,  8,  8 ; BUGSY
+	dn  9,  8,  8,  8 ; WHITNEY
+	dn  9,  8,  8,  8 ; MORTY
+	dn  9,  8,  8,  8 ; PRYCE
+	dn  9,  8,  8,  8 ; JASMINE
+	dn  9,  8,  8,  8 ; CHUCK
+	dn  7, 12, 13, 13 ; CLAIR
+	dn 13, 13, 13, 13 ; RIVAL1
+	dn  9,  8,  8,  8 ; POKEMON_PROF
+	dn 13, 12, 13, 13 ; WILL
+	dn 13, 12, 13, 13 ; CAL
+	dn 13, 12, 13, 13 ; BRUNO
+	dn  7, 15, 13, 15 ; KAREN
+	dn 13, 12, 13, 13 ; KOGA
+	dn 13, 12, 13, 13 ; CHAMPION
+	dn  9,  8,  8,  8 ; BROCK
+	dn  7,  8,  8,  8 ; MISTY
+	dn  9,  8,  8,  8 ; LT_SURGE
+	dn  9,  8,  8,  8 ; SCIENTIST
+	dn  7,  8,  8,  8 ; ERIKA
+	dn  9,  8,  8,  8 ; YOUNGSTER
+	dn  9,  8,  8,  8 ; SCHOOLBOY
+	dn  9,  8,  8,  8 ; BIRD_KEEPER
+	dn  5,  8,  8,  8 ; LASS
+	dn  9,  8,  8,  8 ; JANINE
+	dn 13,  8, 12,  8 ; COOLTRAINERM
+	dn  7, 12, 12,  8 ; COOLTRAINERF
+	dn  6,  9, 12,  8 ; BEAUTY
+	dn  9,  8,  8,  8 ; POKEMANIAC
+	dn 13,  8, 10,  8 ; GRUNTM
+	dn  9,  8,  8,  8 ; GENTLEMAN
+	dn  9,  8,  8,  8 ; SKIER
+	dn  6,  8,  8,  8 ; TEACHER
+	dn  7, 13,  8,  7 ; SABRINA
+	dn  9,  8,  8,  8 ; BUG_CATCHER
+	dn  9,  8,  8,  8 ; FISHER
+	dn  9,  8,  8,  8 ; SWIMMERM
+	dn  7,  8,  8,  8 ; SWIMMERF
+	dn  9,  8,  8,  8 ; SAILOR
+	dn  9,  8,  8,  8 ; SUPER_NERD
+	dn  9,  8,  8,  8 ; RIVAL2
+	dn  9,  8,  8,  8 ; GUITARIST
+	dn 10,  8,  8,  8 ; HIKER
+	dn  9,  8,  8,  8 ; BIKER
+	dn  9,  8,  8,  8 ; BLAINE
+	dn  9,  8,  8,  8 ; BURGLAR
+	dn  9,  8,  8,  8 ; FIREBREATHER
+	dn  9,  8,  8,  8 ; JUGGLER
+	dn  9,  8,  8,  8 ; BLACKBELT_T
+	dn 13,  8, 10,  8 ; EXECUTIVEM
+	dn  9,  8,  8,  8 ; PSYCHIC_T
+	dn  6, 10, 10,  8 ; PICNICKER
+	dn  9,  8,  8,  8 ; CAMPER
+	dn  7, 14, 10,  8 ; EXECUTIVEF
+	dn  9,  8,  8,  8 ; SAGE
+	dn  7,  8,  8,  8 ; MEDIUM
+	dn  9,  8,  8,  8 ; BOARDER
+	dn  9,  8,  8,  8 ; POKEFANM
+	dn  6,  8,  8, 10 ; KIMONO_GIRL
+	dn  6,  8, 10,  8 ; TWINS
+	dn  6, 13,  8,  8 ; POKEFANF
+	dn 15, 13, 13, 14 ; RED
+	dn  9, 13, 13, 13 ; BLUE
+	dn  9,  8,  8,  8 ; OFFICER
+	dn  7, 14, 10,  8 ; GRUNTF
+	dn  9,  8,  8,  8 ; MYSTICALMAN
diff --git a/data/trainers/gendered_trainers.asm b/data/trainers/gendered_trainers.asm
index 758e3f0a4..c3ff6ffd4 100644
--- a/data/trainers/gendered_trainers.asm
+++ b/data/trainers/gendered_trainers.asm
@@ -1,6 +1,6 @@
 ; Used by GetMobileOTTrainerClass
 
-MaleTrainers: ; 4e95d
+MaleTrainers:
 	db BURGLAR
 	db YOUNGSTER
 	db SCHOOLBOY
@@ -26,9 +26,9 @@ MaleTrainers: ; 4e95d
 	db SAGE
 	db BIKER
 	db SCIENTIST
-MaleTrainersEnd
+.End
 
-FemaleTrainers: ; 4e976
+FemaleTrainers:
 	db MEDIUM
 	db LASS
 	db BEAUTY
@@ -39,4 +39,4 @@ FemaleTrainers: ; 4e976
 	db KIMONO_GIRL
 	db POKEFANF
 	db COOLTRAINERF
-FemaleTrainersEnd
+.End
diff --git a/data/trainers/genders.asm b/data/trainers/genders.asm
index e9e78f4bf..1bfc925d2 100644
--- a/data/trainers/genders.asm
+++ b/data/trainers/genders.asm
@@ -1,6 +1,6 @@
 ; Used by BattleTowerText
 
-BTTrainerClassGenders: ; 11f2f0
+BTTrainerClassGenders:
 ; entries correspond to trainer classes
 	db MALE   ; FALKNER
 	db FEMALE ; WHITNEY
@@ -68,4 +68,3 @@ BTTrainerClassGenders: ; 11f2f0
 	db MALE   ; BLUE
 	db MALE   ; OFFICER
 	db FEMALE ; GRUNTF
-; 11f332
diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm
index c502846c4..130c867bc 100644
--- a/data/trainers/palettes.asm
+++ b/data/trainers/palettes.asm
@@ -1,4 +1,4 @@
-TrainerPalettes: ; b0ce
+TrainerPalettes:
 ; entries correspond to trainer classes
 
 PlayerPalette: ; Chris uses the same colors as Cal
@@ -71,4 +71,3 @@ INCLUDE "gfx/trainers/blue.pal"
 INCLUDE "gfx/trainers/officer.pal"
 INCLUDE "gfx/trainers/grunt_f.pal"
 INCLUDE "gfx/trainers/mysticalman.pal"
-; b1de
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 1bf5cb859..35de91e85 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -1,8829 +1,3497 @@
-Trainers:
-
-; All trainers follow a basic structure:
-	; Name
-		; String in format "TEXT@"
-	; Type
-		; TRAINERTYPE_NORMAL:     level, species
-		; TRAINERTYPE_MOVES:      level, species, moves
-		; TRAINERTYPE_ITEM:       level, species, item
-		; TRAINERTYPE_ITEM_MOVES: level, species, item, moves
-	; Party
-		; Up to six monsters following the data type
-	; $ff
+INCLUDE "data/trainers/party_pointers.asm"
 
+Trainers:
+; Trainer data structure:
+; - db "NAME@", TRAINERTYPE_* constant
+; - 1 to 6 Pokémon:
+;    * for TRAINERTYPE_NORMAL:     db level, species
+;    * for TRAINERTYPE_ITEM:       db level, species, item
+;    * for TRAINERTYPE_MOVES:      db level, species, 4 moves
+;    * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves
+; - db -1 ; end
 
 FalknerGroup:
-; ================================
-; ================
-
 	; FALKNER (1)
-	db "FALKNER@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 7, PIDGEY
-		db TACKLE
-		db MUD_SLAP
-		db 0
-		db 0
-
-	db 9, PIDGEOTTO
-		db TACKLE
-		db MUD_SLAP
-		db GUST
-		db 0
-
+	db "FALKNER@", TRAINERTYPE_MOVES
+	db  7, PIDGEY,     TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE
+	db  9, PIDGEOTTO,  TACKLE, MUD_SLAP, GUST, NO_MOVE
 	db -1 ; end
 
-; ================
-; ================================
-
-
 WhitneyGroup:
-; ================================
-; ================
-
 	; WHITNEY (1)
-	db "WHITNEY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 18, CLEFAIRY
-		db DOUBLESLAP
-		db MIMIC
-		db ENCORE
-		db METRONOME
-
-	db 20, MILTANK
-		db ROLLOUT
-		db ATTRACT
-		db STOMP
-		db MILK_DRINK
-
+	db "WHITNEY@", TRAINERTYPE_MOVES
+	db 18, CLEFAIRY,   DOUBLESLAP, MIMIC, ENCORE, METRONOME
+	db 20, MILTANK,    ROLLOUT, ATTRACT, STOMP, MILK_DRINK
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BugsyGroup:
-; ================================
-; ================
-
 	; BUGSY (1)
-	db "BUGSY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 14, METAPOD
-		db TACKLE
-		db STRING_SHOT
-		db HARDEN
-		db 0
-
-	db 14, KAKUNA
-		db POISON_STING
-		db STRING_SHOT
-		db HARDEN
-		db 0
-
-	db 16, SCYTHER
-		db QUICK_ATTACK
-		db LEER
-		db FURY_CUTTER
-		db 0
-
+	db "BUGSY@", TRAINERTYPE_MOVES
+	db 14, METAPOD,    TACKLE, STRING_SHOT, HARDEN, NO_MOVE
+	db 14, KAKUNA,     POISON_STING, STRING_SHOT, HARDEN, NO_MOVE
+	db 16, SCYTHER,    QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
 	db -1 ; end
 
-; ================
-; ================================
-
-
 MortyGroup:
-; ================================
-; ================
-
 	; MORTY (1)
-	db "MORTY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 21, GASTLY
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
-
-	db 21, HAUNTER
-		db HYPNOSIS
-		db MIMIC
-		db CURSE
-		db NIGHT_SHADE
-
-	db 25, GENGAR
-		db HYPNOSIS
-		db SHADOW_BALL
-		db MEAN_LOOK
-		db DREAM_EATER
-
-	db 23, HAUNTER
-		db SPITE
-		db MEAN_LOOK
-		db MIMIC
-		db NIGHT_SHADE
-
+	db "MORTY@", TRAINERTYPE_MOVES
+	db 21, GASTLY,     LICK, SPITE, MEAN_LOOK, CURSE
+	db 21, HAUNTER,    HYPNOSIS, MIMIC, CURSE, NIGHT_SHADE
+	db 25, GENGAR,     HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER
+	db 23, HAUNTER,    SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
 	db -1 ; end
 
-; ================
-; ================================
-
-
 PryceGroup:
-; ================================
-; ================
-
 	; PRYCE (1)
-	db "PRYCE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 27, SEEL
-		db HEADBUTT
-		db ICY_WIND
-		db AURORA_BEAM
-		db REST
-
-	db 29, DEWGONG
-		db HEADBUTT
-		db ICY_WIND
-		db AURORA_BEAM
-		db REST
-
-	db 31, PILOSWINE
-		db ICY_WIND
-		db FURY_ATTACK
-		db MIST
-		db BLIZZARD
-
+	db "PRYCE@", TRAINERTYPE_MOVES
+	db 27, SEEL,       HEADBUTT, ICY_WIND, AURORA_BEAM, REST
+	db 29, DEWGONG,    HEADBUTT, ICY_WIND, AURORA_BEAM, REST
+	db 31, PILOSWINE,  ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
 	db -1 ; end
 
-; ================
-; ================================
-
-
 JasmineGroup:
-; ================================
-; ================
-
 	; JASMINE (1)
-	db "JASMINE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 30, MAGNEMITE
-		db THUNDERBOLT
-		db SUPERSONIC
-		db SONICBOOM
-		db THUNDER_WAVE
-
-	db 30, MAGNEMITE
-		db THUNDERBOLT
-		db SUPERSONIC
-		db SONICBOOM
-		db THUNDER_WAVE
-
-	db 35, STEELIX
-		db SCREECH
-		db SUNNY_DAY
-		db ROCK_THROW
-		db IRON_TAIL
-
+	db "JASMINE@", TRAINERTYPE_MOVES
+	db 30, MAGNEMITE,  THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
+	db 30, MAGNEMITE,  THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE
+	db 35, STEELIX,    SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
 	db -1 ; end
 
-; ================
-; ================================
-
-
 ChuckGroup:
-; ================================
-; ================
-
 	; CHUCK (1)
-	db "CHUCK@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 27, PRIMEAPE
-		db LEER
-		db RAGE
-		db KARATE_CHOP
-		db FURY_SWIPES
-
-	db 30, POLIWRATH
-		db HYPNOSIS
-		db MIND_READER
-		db SURF
-		db DYNAMICPUNCH
-
+	db "CHUCK@", TRAINERTYPE_MOVES
+	db 27, PRIMEAPE,   LEER, RAGE, KARATE_CHOP, FURY_SWIPES
+	db 30, POLIWRATH,  HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
 	db -1 ; end
 
-; ================
-; ================================
-
-
 ClairGroup:
-; ================================
-; ================
-
 	; CLAIR (1)
-	db "CLAIR@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 37, DRAGONAIR
-		db THUNDER_WAVE
-		db SURF
-		db SLAM
-		db DRAGONBREATH
-
-	db 37, DRAGONAIR
-		db THUNDER_WAVE
-		db THUNDERBOLT
-		db SLAM
-		db DRAGONBREATH
-
-	db 37, DRAGONAIR
-		db THUNDER_WAVE
-		db ICE_BEAM
-		db SLAM
-		db DRAGONBREATH
-
-	db 40, KINGDRA
-		db SMOKESCREEN
-		db SURF
-		db HYPER_BEAM
-		db DRAGONBREATH
-
+	db "CLAIR@", TRAINERTYPE_MOVES
+	db 37, DRAGONAIR,  THUNDER_WAVE, SURF, SLAM, DRAGONBREATH
+	db 37, DRAGONAIR,  THUNDER_WAVE, THUNDERBOLT, SLAM, DRAGONBREATH
+	db 37, DRAGONAIR,  THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH
+	db 40, KINGDRA,    SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
 	db -1 ; end
 
-; ================
-; ================================
-
-
 Rival1Group:
-; ================================
-; ================
-
 	; RIVAL1 (1)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 5, CHIKORITA
-
+	db "?@", TRAINERTYPE_NORMAL
+	db  5, CHIKORITA
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (2)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 5, CYNDAQUIL
-
+	db "?@", TRAINERTYPE_NORMAL
+	db  5, CYNDAQUIL
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (3)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 5, TOTODILE
-
+	db "?@", TRAINERTYPE_NORMAL
+	db  5, TOTODILE
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (4)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "?@", TRAINERTYPE_NORMAL
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, BAYLEEF
-
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (5)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "?@", TRAINERTYPE_NORMAL
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, QUILAVA
-
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (6)
-	db "?@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "?@", TRAINERTYPE_NORMAL
 	db 12, GASTLY
 	db 14, ZUBAT
 	db 16, CROCONAW
-
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (7)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 20, HAUNTER
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
-
-	db 18, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SUPERSONIC
-		db SONICBOOM
-
-	db 20, ZUBAT
-		db LEECH_LIFE
-		db SUPERSONIC
-		db BITE
-		db CONFUSE_RAY
-
-	db 22, BAYLEEF
-		db GROWL
-		db REFLECT
-		db RAZOR_LEAF
-		db POISONPOWDER
-
+	db "?@", TRAINERTYPE_MOVES
+	db 20, HAUNTER,    LICK, SPITE, MEAN_LOOK, CURSE
+	db 18, MAGNEMITE,  TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
+	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
+	db 22, BAYLEEF,    GROWL, REFLECT, RAZOR_LEAF, POISONPOWDER
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (8)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 20, HAUNTER
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
-
-	db 18, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SUPERSONIC
-		db SONICBOOM
-
-	db 20, ZUBAT
-		db LEECH_LIFE
-		db SUPERSONIC
-		db BITE
-		db CONFUSE_RAY
-
-	db 22, QUILAVA
-		db LEER
-		db SMOKESCREEN
-		db EMBER
-		db QUICK_ATTACK
-
+	db "?@", TRAINERTYPE_MOVES
+	db 20, HAUNTER,    LICK, SPITE, MEAN_LOOK, CURSE
+	db 18, MAGNEMITE,  TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
+	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
+	db 22, QUILAVA,    LEER, SMOKESCREEN, EMBER, QUICK_ATTACK
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (9)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 20, HAUNTER
-		db LICK
-		db SPITE
-		db MEAN_LOOK
-		db CURSE
-
-	db 18, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SUPERSONIC
-		db SONICBOOM
-
-	db 20, ZUBAT
-		db LEECH_LIFE
-		db SUPERSONIC
-		db BITE
-		db CONFUSE_RAY
-
-	db 22, CROCONAW
-		db LEER
-		db RAGE
-		db WATER_GUN
-		db BITE
-
+	db "?@", TRAINERTYPE_MOVES
+	db 20, HAUNTER,    LICK, SPITE, MEAN_LOOK, CURSE
+	db 18, MAGNEMITE,  TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM
+	db 20, ZUBAT,      LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY
+	db 22, CROCONAW,   LEER, RAGE, WATER_GUN, BITE
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (10)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 30, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 28, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-
-	db 30, HAUNTER
-		db LICK
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-
-	db 32, SNEASEL
-		db LEER
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-
-	db 32, MEGANIUM
-		db REFLECT
-		db RAZOR_LEAF
-		db POISONPOWDER
-		db BODY_SLAM
-
+	db "?@", TRAINERTYPE_MOVES
+	db 30, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 28, MAGNEMITE,  TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
+	db 30, HAUNTER,    LICK, MEAN_LOOK, CURSE, SHADOW_BALL
+	db 32, SNEASEL,    LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
+	db 32, MEGANIUM,   REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (11)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 30, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 28, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-
-	db 30, HAUNTER
-		db LICK
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-
-	db 32, SNEASEL
-		db LEER
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-
-	db 32, QUILAVA
-		db SMOKESCREEN
-		db EMBER
-		db QUICK_ATTACK
-		db FLAME_WHEEL
-
+	db "?@", TRAINERTYPE_MOVES
+	db 30, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 28, MAGNEMITE,  TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
+	db 30, HAUNTER,    LICK, MEAN_LOOK, CURSE, SHADOW_BALL
+	db 32, SNEASEL,    LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
+	db 32, QUILAVA,    SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (12)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 30, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 28, MAGNEMITE
-		db TACKLE
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-
-	db 30, HAUNTER
-		db LICK
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-
-	db 32, SNEASEL
-		db LEER
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-
-	db 32, FERALIGATR
-		db RAGE
-		db WATER_GUN
-		db BITE
-		db SCARY_FACE
-
+	db "?@", TRAINERTYPE_MOVES
+	db 30, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 28, MAGNEMITE,  TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE
+	db 30, HAUNTER,    LICK, MEAN_LOOK, CURSE, SHADOW_BALL
+	db 32, SNEASEL,    LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK
+	db 32, FERALIGATR, RAGE, WATER_GUN, BITE, SCARY_FACE
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (13)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 34, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
-
-	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 35, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
-
-	db 35, HAUNTER
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
-
-	db 35, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
-
-	db 38, MEGANIUM
-		db REFLECT
-		db RAZOR_LEAF
-		db POISONPOWDER
-		db BODY_SLAM
-
+	db "?@", TRAINERTYPE_MOVES
+	db 34, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 36, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 35, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 35, HAUNTER,    MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 35, KADABRA,    DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
+	db 38, MEGANIUM,   REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (14)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 34, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
-
-	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 35, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
-
-	db 35, HAUNTER
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
-
-	db 35, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
-
-	db 38, TYPHLOSION
-		db SMOKESCREEN
-		db EMBER
-		db QUICK_ATTACK
-		db FLAME_WHEEL
-
+	db "?@", TRAINERTYPE_MOVES
+	db 34, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 36, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 35, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 35, HAUNTER,    MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 35, KADABRA,    DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
+	db 38, TYPHLOSION, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL
 	db -1 ; end
 
-; ================
-
 	; RIVAL1 (15)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 34, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
-
-	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 34, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
-
-	db 35, HAUNTER
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
-
-	db 35, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
-
-	db 38, FERALIGATR
-		db RAGE
-		db WATER_GUN
-		db SCARY_FACE
-		db SLASH
-
+	db "?@", TRAINERTYPE_MOVES
+	db 34, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 36, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 34, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 35, HAUNTER,    MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 35, KADABRA,    DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
+	db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH
 	db -1 ; end
 
-; ================
-; ================================
-
-
 PokemonProfGroup:
-; ================================
-; ================
-; ================================
-
 
 WillGroup:
-; ================================
-; ================
-
 	; WILL (1)
-	db "WILL@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 40, XATU
-		db QUICK_ATTACK
-		db FUTURE_SIGHT
-		db CONFUSE_RAY
-		db PSYCHIC_M
-
-	db 41, JYNX
-		db DOUBLESLAP
-		db LOVELY_KISS
-		db ICE_PUNCH
-		db PSYCHIC_M
-
-	db 41, EXEGGUTOR
-		db REFLECT
-		db LEECH_SEED
-		db EGG_BOMB
-		db PSYCHIC_M
-
-	db 41, SLOWBRO
-		db CURSE
-		db AMNESIA
-		db BODY_SLAM
-		db PSYCHIC_M
-
-	db 42, XATU
-		db QUICK_ATTACK
-		db FUTURE_SIGHT
-		db CONFUSE_RAY
-		db PSYCHIC_M
-
+	db "WILL@", TRAINERTYPE_MOVES
+	db 40, XATU,       QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
+	db 41, JYNX,       DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M
+	db 41, EXEGGUTOR,  REFLECT, LEECH_SEED, EGG_BOMB, PSYCHIC_M
+	db 41, SLOWBRO,    CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M
+	db 42, XATU,       QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
 	db -1 ; end
 
-; ================
-; ================================
-
-
 PKMNTrainerGroup:
-; ================================
-; ================
-
 	; CAL (1)
-	db "CAL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CAL@", TRAINERTYPE_NORMAL
 	db 10, CHIKORITA
 	db 10, CYNDAQUIL
 	db 10, TOTODILE
-
 	db -1 ; end
 
-; ================
-
 	; CAL (2)
-	db "CAL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CAL@", TRAINERTYPE_NORMAL
 	db 30, BAYLEEF
 	db 30, QUILAVA
 	db 30, CROCONAW
-
 	db -1 ; end
 
-; ================
-
 	; CAL (3)
-	db "CAL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CAL@", TRAINERTYPE_NORMAL
 	db 50, MEGANIUM
 	db 50, TYPHLOSION
 	db 50, FERALIGATR
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BrunoGroup:
-; ================================
-; ================
-
 	; BRUNO (1)
-	db "BRUNO@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 42, HITMONTOP
-		db PURSUIT
-		db QUICK_ATTACK
-		db DIG
-		db DETECT
-
-	db 42, HITMONLEE
-		db SWAGGER
-		db DOUBLE_KICK
-		db HI_JUMP_KICK
-		db FORESIGHT
-
-	db 42, HITMONCHAN
-		db THUNDERPUNCH
-		db ICE_PUNCH
-		db FIRE_PUNCH
-		db MACH_PUNCH
-
-	db 43, ONIX
-		db BIND
-		db EARTHQUAKE
-		db SANDSTORM
-		db ROCK_SLIDE
-
-	db 46, MACHAMP
-		db ROCK_SLIDE
-		db FORESIGHT
-		db VITAL_THROW
-		db CROSS_CHOP
-
+	db "BRUNO@", TRAINERTYPE_MOVES
+	db 42, HITMONTOP,  PURSUIT, QUICK_ATTACK, DIG, DETECT
+	db 42, HITMONLEE,  SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT
+	db 42, HITMONCHAN, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MACH_PUNCH
+	db 43, ONIX,       BIND, EARTHQUAKE, SANDSTORM, ROCK_SLIDE
+	db 46, MACHAMP,    ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
 	db -1 ; end
 
-; ================
-; ================================
-
-
 KarenGroup:
-; ================================
-; ================
-
 	; KAREN (1)
-	db "KAREN@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 42, UMBREON
-		db SAND_ATTACK
-		db CONFUSE_RAY
-		db FAINT_ATTACK
-		db MEAN_LOOK
-
-	db 42, VILEPLUME
-		db STUN_SPORE
-		db ACID
-		db MOONLIGHT
-		db PETAL_DANCE
-
-	db 45, GENGAR
-		db LICK
-		db SPITE
-		db CURSE
-		db DESTINY_BOND
-
-	db 44, MURKROW
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db PURSUIT
-		db FAINT_ATTACK
-
-	db 47, HOUNDOOM
-		db ROAR
-		db PURSUIT
-		db FLAMETHROWER
-		db CRUNCH
-
+	db "KAREN@", TRAINERTYPE_MOVES
+	db 42, UMBREON,    SAND_ATTACK, CONFUSE_RAY, FAINT_ATTACK, MEAN_LOOK
+	db 42, VILEPLUME,  STUN_SPORE, ACID, MOONLIGHT, PETAL_DANCE
+	db 45, GENGAR,     LICK, SPITE, CURSE, DESTINY_BOND
+	db 44, MURKROW,    QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK
+	db 47, HOUNDOOM,   ROAR, PURSUIT, FLAMETHROWER, CRUNCH
 	db -1 ; end
 
-; ================
-; ================================
-
-
 KogaGroup:
-; ================================
-; ================
-
 	; KOGA (1)
-	db "KOGA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 40, ARIADOS
-		db DOUBLE_TEAM
-		db SPIDER_WEB
-		db BATON_PASS
-		db GIGA_DRAIN
-
-	db 41, VENOMOTH
-		db SUPERSONIC
-		db GUST
-		db PSYCHIC_M
-		db TOXIC
-
-	db 43, FORRETRESS
-		db PROTECT
-		db SWIFT
-		db EXPLOSION
-		db SPIKES
-
-	db 42, MUK
-		db MINIMIZE
-		db ACID_ARMOR
-		db SLUDGE_BOMB
-		db TOXIC
-
-	db 44, CROBAT
-		db DOUBLE_TEAM
-		db QUICK_ATTACK
-		db WING_ATTACK
-		db TOXIC
-
+	db "KOGA@", TRAINERTYPE_MOVES
+	db 40, ARIADOS,    DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN
+	db 41, VENOMOTH,   SUPERSONIC, GUST, PSYCHIC_M, TOXIC
+	db 43, FORRETRESS, PROTECT, SWIFT, EXPLOSION, SPIKES
+	db 42, MUK,        MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC
+	db 44, CROBAT,     DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
 	db -1 ; end
 
-; ================
-; ================================
-
-
 ChampionGroup:
-; ================================
-; ================
-
 	; CHAMPION (1)
-	db "LANCE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 44, GYARADOS
-		db FLAIL
-		db RAIN_DANCE
-		db SURF
-		db HYPER_BEAM
-
-	db 47, DRAGONITE
-		db THUNDER_WAVE
-		db TWISTER
-		db THUNDER
-		db HYPER_BEAM
-
-	db 47, DRAGONITE
-		db THUNDER_WAVE
-		db TWISTER
-		db BLIZZARD
-		db HYPER_BEAM
-
-	db 46, AERODACTYL
-		db WING_ATTACK
-		db ANCIENTPOWER
-		db ROCK_SLIDE
-		db HYPER_BEAM
-
-	db 46, CHARIZARD
-		db FLAMETHROWER
-		db WING_ATTACK
-		db SLASH
-		db HYPER_BEAM
-
-	db 50, DRAGONITE
-		db FIRE_BLAST
-		db SAFEGUARD
-		db OUTRAGE
-		db HYPER_BEAM
-
+	db "LANCE@", TRAINERTYPE_MOVES
+	db 44, GYARADOS,   FLAIL, RAIN_DANCE, SURF, HYPER_BEAM
+	db 47, DRAGONITE,  THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM
+	db 47, DRAGONITE,  THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM
+	db 46, AERODACTYL, WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM
+	db 46, CHARIZARD,  FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM
+	db 50, DRAGONITE,  FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BrockGroup:
-; ================================
-; ================
-
 	; BROCK (1)
-	db "BROCK@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 41, GRAVELER
-		db DEFENSE_CURL
-		db ROCK_SLIDE
-		db ROLLOUT
-		db EARTHQUAKE
-
-	db 41, RHYHORN
-		db FURY_ATTACK
-		db SCARY_FACE
-		db EARTHQUAKE
-		db HORN_DRILL
-
-	db 42, OMASTAR
-		db BITE
-		db SURF
-		db PROTECT
-		db SPIKE_CANNON
-
-	db 44, ONIX
-		db BIND
-		db ROCK_SLIDE
-		db BIDE
-		db SANDSTORM
-
-	db 42, KABUTOPS
-		db SLASH
-		db SURF
-		db ENDURE
-		db GIGA_DRAIN
-
+	db "BROCK@", TRAINERTYPE_MOVES
+	db 41, GRAVELER,   DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE
+	db 41, RHYHORN,    FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL
+	db 42, OMASTAR,    BITE, SURF, PROTECT, SPIKE_CANNON
+	db 44, ONIX,       BIND, ROCK_SLIDE, BIDE, SANDSTORM
+	db 42, KABUTOPS,   SLASH, SURF, ENDURE, GIGA_DRAIN
 	db -1 ; end
 
-; ================
-; ================================
-
-
 MistyGroup:
-; ================================
-; ================
-
 	; MISTY (1)
-	db "MISTY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 42, GOLDUCK
-		db SURF
-		db DISABLE
-		db PSYCH_UP
-		db PSYCHIC_M
-
-	db 42, QUAGSIRE
-		db SURF
-		db AMNESIA
-		db EARTHQUAKE
-		db RAIN_DANCE
-
-	db 44, LAPRAS
-		db SURF
-		db PERISH_SONG
-		db BLIZZARD
-		db RAIN_DANCE
-
-	db 47, STARMIE
-		db SURF
-		db CONFUSE_RAY
-		db RECOVER
-		db ICE_BEAM
-
+	db "MISTY@", TRAINERTYPE_MOVES
+	db 42, GOLDUCK,    SURF, DISABLE, PSYCH_UP, PSYCHIC_M
+	db 42, QUAGSIRE,   SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE
+	db 44, LAPRAS,     SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE
+	db 47, STARMIE,    SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
 	db -1 ; end
 
-; ================
-; ================================
-
-
 LtSurgeGroup:
-; ================================
-; ================
-
 	; LT_SURGE (1)
-	db "LT.SURGE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 44, RAICHU
-		db THUNDER_WAVE
-		db QUICK_ATTACK
-		db THUNDERBOLT
-		db THUNDER
-
-	db 40, ELECTRODE
-		db SCREECH
-		db DOUBLE_TEAM
-		db SWIFT
-		db EXPLOSION
-
-	db 40, MAGNETON
-		db LOCK_ON
-		db DOUBLE_TEAM
-		db SWIFT
-		db ZAP_CANNON
-
-	db 40, ELECTRODE
-		db SCREECH
-		db DOUBLE_TEAM
-		db SWIFT
-		db EXPLOSION
-
-	db 46, ELECTABUZZ
-		db QUICK_ATTACK
-		db THUNDERPUNCH
-		db LIGHT_SCREEN
-		db THUNDER
-
+	db "LT.SURGE@", TRAINERTYPE_MOVES
+	db 44, RAICHU,     THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER
+	db 40, ELECTRODE,  SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
+	db 40, MAGNETON,   LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON
+	db 40, ELECTRODE,  SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION
+	db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
 	db -1 ; end
 
-; ================
-; ================================
-
-
 ScientistGroup:
-; ================================
-; ================
-
 	; SCIENTIST (1)
-	db "ROSS@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ROSS@", TRAINERTYPE_NORMAL
 	db 22, KOFFING
 	db 22, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; SCIENTIST (2)
-	db "MITCH@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MITCH@", TRAINERTYPE_NORMAL
 	db 24, DITTO
-
 	db -1 ; end
 
-; ================
-
 	; SCIENTIST (3)
-	db "JED@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JED@", TRAINERTYPE_NORMAL
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SCIENTIST (4)
-	db "MARC@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MARC@", TRAINERTYPE_NORMAL
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SCIENTIST (5)
-	db "RICH@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 30, PORYGON
-		db CONVERSION
-		db CONVERSION2
-		db RECOVER
-		db TRI_ATTACK
-
+	db "RICH@", TRAINERTYPE_MOVES
+	db 30, PORYGON,    CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 	db -1 ; end
 
-; ================
-; ================================
-
-
 ErikaGroup:
-; ================================
-; ================
-
 	; ERIKA (1)
-	db "ERIKA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 42, TANGELA
-		db VINE_WHIP
-		db BIND
-		db GIGA_DRAIN
-		db SLEEP_POWDER
-
-	db 41, JUMPLUFF
-		db MEGA_DRAIN
-		db LEECH_SEED
-		db COTTON_SPORE
-		db GIGA_DRAIN
-
-	db 46, VICTREEBEL
-		db SUNNY_DAY
-		db SYNTHESIS
-		db ACID
-		db RAZOR_LEAF
-
-	db 46, BELLOSSOM
-		db SUNNY_DAY
-		db SYNTHESIS
-		db PETAL_DANCE
-		db SOLARBEAM
-
+	db "ERIKA@", TRAINERTYPE_MOVES
+	db 42, TANGELA,    VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER
+	db 41, JUMPLUFF,   MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN
+	db 46, VICTREEBEL, SUNNY_DAY, SYNTHESIS, ACID, RAZOR_LEAF
+	db 46, BELLOSSOM,  SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
 	db -1 ; end
 
-; ================
-; ================================
-
-
 YoungsterGroup:
-; ================================
-; ================
-
 	; YOUNGSTER (1)
-	db "JOEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 4, RATTATA
-
+	db "JOEY@", TRAINERTYPE_NORMAL
+	db  4, RATTATA
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (2)
-	db "MIKEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 2, PIDGEY
-	db 4, RATTATA
-
+	db "MIKEY@", TRAINERTYPE_NORMAL
+	db  2, PIDGEY
+	db  4, RATTATA
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (3)
-	db "ALBERT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 6, RATTATA
-	db 8, ZUBAT
-
+	db "ALBERT@", TRAINERTYPE_NORMAL
+	db  6, RATTATA
+	db  8, ZUBAT
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (4)
-	db "GORDON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GORDON@", TRAINERTYPE_NORMAL
 	db 10, WOOPER
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (5)
-	db "SAMUEL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 7, RATTATA
+	db "SAMUEL@", TRAINERTYPE_NORMAL
+	db  7, RATTATA
 	db 10, SANDSHREW
-	db 8, SPEAROW
-	db 8, SPEAROW
-
+	db  8, SPEAROW
+	db  8, SPEAROW
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (6)
-	db "IAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "IAN@", TRAINERTYPE_NORMAL
 	db 10, MANKEY
 	db 12, DIGLETT
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (7)
-	db "JOEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JOEY@", TRAINERTYPE_NORMAL
 	db 15, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (8)
-	db "JOEY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 21, RATICATE
-		db TAIL_WHIP
-		db QUICK_ATTACK
-		db HYPER_FANG
-		db SCARY_FACE
-
+	db "JOEY@", TRAINERTYPE_MOVES
+	db 21, RATICATE,   TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, SCARY_FACE
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (9)
-	db "WARREN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "WARREN@", TRAINERTYPE_NORMAL
 	db 35, FEAROW
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (10)
-	db "JIMMY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JIMMY@", TRAINERTYPE_NORMAL
 	db 33, RATICATE
 	db 33, ARBOK
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (11)
-	db "OWEN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "OWEN@", TRAINERTYPE_NORMAL
 	db 35, GROWLITHE
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (12)
-	db "JASON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JASON@", TRAINERTYPE_NORMAL
 	db 33, SANDSLASH
 	db 33, CROBAT
-
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (13)
-	db "JOEY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 30, RATICATE
-		db TAIL_WHIP
-		db QUICK_ATTACK
-		db HYPER_FANG
-		db PURSUIT
-
+	db "JOEY@", TRAINERTYPE_MOVES
+	db 30, RATICATE,   TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, PURSUIT
 	db -1 ; end
 
-; ================
-
 	; YOUNGSTER (14)
-	db "JOEY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 37, RATICATE
-		db HYPER_BEAM
-		db QUICK_ATTACK
-		db HYPER_FANG
-		db PURSUIT
-
+	db "JOEY@", TRAINERTYPE_MOVES
+	db 37, RATICATE,   HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
 	db -1 ; end
 
-; ================
-; ================================
-
-
 SchoolboyGroup:
-; ================================
-; ================
-
 	; SCHOOLBOY (1)
-	db "JACK@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JACK@", TRAINERTYPE_NORMAL
 	db 12, ODDISH
 	db 15, VOLTORB
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (2)
-	db "KIPP@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KIPP@", TRAINERTYPE_NORMAL
 	db 27, VOLTORB
 	db 27, MAGNEMITE
 	db 31, VOLTORB
 	db 31, MAGNETON
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (3)
-	db "ALAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ALAN@", TRAINERTYPE_NORMAL
 	db 16, TANGELA
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (4)
-	db "JOHNNY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JOHNNY@", TRAINERTYPE_NORMAL
 	db 29, BELLSPROUT
 	db 31, WEEPINBELL
 	db 33, VICTREEBEL
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (5)
-	db "DANNY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DANNY@", TRAINERTYPE_NORMAL
 	db 31, JYNX
 	db 31, ELECTABUZZ
 	db 31, MAGMAR
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (6)
-	db "TOMMY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TOMMY@", TRAINERTYPE_NORMAL
 	db 32, XATU
 	db 34, ALAKAZAM
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (7)
-	db "DUDLEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DUDLEY@", TRAINERTYPE_NORMAL
 	db 35, ODDISH
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (8)
-	db "JOE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JOE@", TRAINERTYPE_NORMAL
 	db 33, TANGELA
 	db 33, VAPOREON
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (9)
-	db "BILLY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BILLY@", TRAINERTYPE_NORMAL
 	db 27, PARAS
 	db 27, PARAS
 	db 27, POLIWHIRL
 	db 35, DITTO
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (10)
-	db "CHAD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CHAD@", TRAINERTYPE_NORMAL
 	db 19, MR__MIME
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (11)
-	db "NATE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "NATE@", TRAINERTYPE_NORMAL
 	db 32, LEDIAN
 	db 32, EXEGGUTOR
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (12)
-	db "RICKY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RICKY@", TRAINERTYPE_NORMAL
 	db 32, AIPOM
 	db 32, DITTO
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (13)
-	db "JACK@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JACK@", TRAINERTYPE_NORMAL
 	db 14, ODDISH
 	db 17, VOLTORB
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (14)
-	db "JACK@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JACK@", TRAINERTYPE_NORMAL
 	db 28, GLOOM
 	db 31, ELECTRODE
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (15)
-	db "ALAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ALAN@", TRAINERTYPE_NORMAL
 	db 17, TANGELA
 	db 17, YANMA
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (16)
-	db "ALAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ALAN@", TRAINERTYPE_NORMAL
 	db 20, NATU
 	db 22, TANGELA
 	db 20, QUAGSIRE
 	db 25, YANMA
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (17)
-	db "CHAD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CHAD@", TRAINERTYPE_NORMAL
 	db 19, MR__MIME
 	db 19, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (18)
-	db "CHAD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CHAD@", TRAINERTYPE_NORMAL
 	db 27, MR__MIME
 	db 31, MAGNETON
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (19)
-	db "JACK@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JACK@", TRAINERTYPE_NORMAL
 	db 30, GLOOM
 	db 33, GROWLITHE
 	db 33, ELECTRODE
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (20)
-	db "JACK@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 35, ELECTRODE
-		db SCREECH
-		db SONICBOOM
-		db ROLLOUT
-		db LIGHT_SCREEN
-
-	db 35, GROWLITHE
-		db SUNNY_DAY
-		db LEER
-		db TAKE_DOWN
-		db FLAME_WHEEL
-
-	db 37, VILEPLUME
-		db SOLARBEAM
-		db SLEEP_POWDER
-		db ACID
-		db MOONLIGHT
-
+	db "JACK@", TRAINERTYPE_MOVES
+	db 35, ELECTRODE,  SCREECH, SONICBOOM, ROLLOUT, LIGHT_SCREEN
+	db 35, GROWLITHE,  SUNNY_DAY, LEER, TAKE_DOWN, FLAME_WHEEL
+	db 37, VILEPLUME,  SOLARBEAM, SLEEP_POWDER, ACID, MOONLIGHT
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (21)
-	db "ALAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ALAN@", TRAINERTYPE_NORMAL
 	db 27, NATU
 	db 27, TANGELA
 	db 30, QUAGSIRE
 	db 30, YANMA
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (22)
-	db "ALAN@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 35, XATU
-		db PECK
-		db NIGHT_SHADE
-		db SWIFT
-		db FUTURE_SIGHT
-
-	db 32, TANGELA
-		db POISONPOWDER
-		db VINE_WHIP
-		db BIND
-		db MEGA_DRAIN
-
-	db 32, YANMA
-		db QUICK_ATTACK
-		db DOUBLE_TEAM
-		db SONICBOOM
-		db SUPERSONIC
-
-	db 35, QUAGSIRE
-		db TAIL_WHIP
-		db SLAM
-		db AMNESIA
-		db EARTHQUAKE
-
+	db "ALAN@", TRAINERTYPE_MOVES
+	db 35, XATU,       PECK, NIGHT_SHADE, SWIFT, FUTURE_SIGHT
+	db 32, TANGELA,    POISONPOWDER, VINE_WHIP, BIND, MEGA_DRAIN
+	db 32, YANMA,      QUICK_ATTACK, DOUBLE_TEAM, SONICBOOM, SUPERSONIC
+	db 35, QUAGSIRE,   TAIL_WHIP, SLAM, AMNESIA, EARTHQUAKE
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (23)
-	db "CHAD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CHAD@", TRAINERTYPE_NORMAL
 	db 30, MR__MIME
 	db 34, MAGNETON
-
 	db -1 ; end
 
-; ================
-
 	; SCHOOLBOY (24)
-	db "CHAD@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 34, MR__MIME
-		db PSYCHIC_M
-		db LIGHT_SCREEN
-		db REFLECT
-		db ENCORE
-
-	db 38, MAGNETON
-		db ZAP_CANNON
-		db THUNDER_WAVE
-		db LOCK_ON
-		db SWIFT
-
+	db "CHAD@", TRAINERTYPE_MOVES
+	db 34, MR__MIME,   PSYCHIC_M, LIGHT_SCREEN, REFLECT, ENCORE
+	db 38, MAGNETON,   ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BirdKeeperGroup:
-; ================================
-; ================
-
 	; BIRD_KEEPER (1)
-	db "ROD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 7, PIDGEY
-	db 7, PIDGEY
-
+	db "ROD@", TRAINERTYPE_NORMAL
+	db  7, PIDGEY
+	db  7, PIDGEY
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (2)
-	db "ABE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 9, SPEAROW
-
+	db "ABE@", TRAINERTYPE_NORMAL
+	db  9, SPEAROW
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (3)
-	db "BRYAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BRYAN@", TRAINERTYPE_NORMAL
 	db 12, PIDGEY
 	db 14, PIDGEOTTO
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (4)
-	db "THEO@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "THEO@", TRAINERTYPE_NORMAL
 	db 17, PIDGEY
 	db 15, PIDGEY
 	db 19, PIDGEY
 	db 15, PIDGEY
 	db 15, PIDGEY
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (5)
-	db "TOBY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TOBY@", TRAINERTYPE_NORMAL
 	db 15, DODUO
 	db 16, DODUO
 	db 17, DODUO
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (6)
-	db "DENIS@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DENIS@", TRAINERTYPE_NORMAL
 	db 18, SPEAROW
 	db 20, FEAROW
 	db 18, SPEAROW
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (7)
-	db "VANCE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "VANCE@", TRAINERTYPE_NORMAL
 	db 25, PIDGEOTTO
 	db 25, PIDGEOTTO
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (8)
-	db "HANK@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HANK@", TRAINERTYPE_NORMAL
 	db 12, PIDGEY
 	db 34, PIDGEOT
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (9)
-	db "ROY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ROY@", TRAINERTYPE_NORMAL
 	db 29, FEAROW
 	db 35, FEAROW
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (10)
-	db "BORIS@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BORIS@", TRAINERTYPE_NORMAL
 	db 30, DODUO
 	db 28, DODUO
 	db 32, DODRIO
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (11)
-	db "BOB@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BOB@", TRAINERTYPE_NORMAL
 	db 34, NOCTOWL
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (12)
-	db "JOSE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JOSE@", TRAINERTYPE_NORMAL
 	db 36, FARFETCH_D
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (13)
-	db "PETER@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 6, PIDGEY
-	db 6, PIDGEY
-	db 8, SPEAROW
-
+	db "PETER@", TRAINERTYPE_NORMAL
+	db  6, PIDGEY
+	db  6, PIDGEY
+	db  8, SPEAROW
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (14)
-	db "JOSE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JOSE@", TRAINERTYPE_NORMAL
 	db 34, FARFETCH_D
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (15)
-	db "PERRY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "PERRY@", TRAINERTYPE_NORMAL
 	db 34, FARFETCH_D
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (16)
-	db "BRET@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BRET@", TRAINERTYPE_NORMAL
 	db 32, PIDGEOTTO
 	db 32, FEAROW
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (17)
-	db "JOSE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 40, FARFETCH_D
-		db FURY_ATTACK
-		db DETECT
-		db FLY
-		db SLASH
-
+	db "JOSE@", TRAINERTYPE_MOVES
+	db 40, FARFETCH_D, FURY_ATTACK, DETECT, FLY, SLASH
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (18)
-	db "VANCE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "VANCE@", TRAINERTYPE_NORMAL
 	db 32, PIDGEOTTO
 	db 32, PIDGEOTTO
-
 	db -1 ; end
 
-; ================
-
 	; BIRD_KEEPER (19)
-	db "VANCE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 38, PIDGEOT
-		db TOXIC
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db FLY
-
-	db 38, PIDGEOT
-		db SWIFT
-		db DETECT
-		db STEEL_WING
-		db FLY
-
+	db "VANCE@", TRAINERTYPE_MOVES
+	db 38, PIDGEOT,    TOXIC, QUICK_ATTACK, WHIRLWIND, FLY
+	db 38, PIDGEOT,    SWIFT, DETECT, STEEL_WING, FLY
 	db -1 ; end
 
-; ================
-; ================================
-
-
 LassGroup:
-; ================================
-; ================
-
 	; LASS (1)
-	db "CARRIE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 18, SNUBBULL
-		db SCARY_FACE
-		db CHARM
-		db BITE
-		db LICK
-
+	db "CARRIE@", TRAINERTYPE_MOVES
+	db 18, SNUBBULL,   SCARY_FACE, CHARM, BITE, LICK
 	db -1 ; end
 
-; ================
-
 	; LASS (2)
-	db "BRIDGET@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BRIDGET@", TRAINERTYPE_NORMAL
 	db 15, JIGGLYPUFF
 	db 15, JIGGLYPUFF
 	db 15, JIGGLYPUFF
-
 	db -1 ; end
 
-; ================
-
 	; LASS (3)
-	db "ALICE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ALICE@", TRAINERTYPE_NORMAL
 	db 30, GLOOM
 	db 34, ARBOK
 	db 30, GLOOM
-
 	db -1 ; end
 
-; ================
-
 	; LASS (4)
-	db "KRISE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KRISE@", TRAINERTYPE_NORMAL
 	db 12, ODDISH
 	db 15, CUBONE
-
 	db -1 ; end
 
-; ================
-
 	; LASS (5)
-	db "CONNIE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CONNIE@", TRAINERTYPE_NORMAL
 	db 21, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; LASS (6)
-	db "LINDA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LINDA@", TRAINERTYPE_NORMAL
 	db 30, BULBASAUR
 	db 32, IVYSAUR
 	db 34, VENUSAUR
-
 	db -1 ; end
 
-; ================
-
 	; LASS (7)
-	db "LAURA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LAURA@", TRAINERTYPE_NORMAL
 	db 28, GLOOM
 	db 31, PIDGEOTTO
 	db 31, BELLOSSOM
-
 	db -1 ; end
 
-; ================
-
 	; LASS (8)
-	db "SHANNON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SHANNON@", TRAINERTYPE_NORMAL
 	db 29, PARAS
 	db 29, PARAS
 	db 32, PARASECT
-
 	db -1 ; end
 
-; ================
-
 	; LASS (9)
-	db "MICHELLE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MICHELLE@", TRAINERTYPE_NORMAL
 	db 32, SKIPLOOM
 	db 33, HOPPIP
 	db 34, JUMPLUFF
-
 	db -1 ; end
 
-; ================
-
 	; LASS (10)
-	db "DANA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 18, FLAAFFY
-		db TACKLE
-		db GROWL
-		db THUNDERSHOCK
-		db THUNDER_WAVE
-
-	db 18, PSYDUCK
-		db SCRATCH
-		db TAIL_WHIP
-		db DISABLE
-		db CONFUSION
-
+	db "DANA@", TRAINERTYPE_MOVES
+	db 18, FLAAFFY,    TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
+	db 18, PSYDUCK,    SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 	db -1 ; end
 
-; ================
-
 	; LASS (11)
-	db "ELLEN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ELLEN@", TRAINERTYPE_NORMAL
 	db 30, WIGGLYTUFF
 	db 34, GRANBULL
-
 	db -1 ; end
 
-; ================
-
 	; LASS (12)
-	db "CONNIE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CONNIE@", TRAINERTYPE_NORMAL
 	db 21, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; LASS (13)
-	db "CONNIE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CONNIE@", TRAINERTYPE_NORMAL
 	db 21, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; LASS (14)
-	db "DANA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 21, FLAAFFY
-		db TACKLE
-		db GROWL
-		db THUNDERSHOCK
-		db THUNDER_WAVE
-
-	db 21, PSYDUCK
-		db SCRATCH
-		db TAIL_WHIP
-		db DISABLE
-		db CONFUSION
-
+	db "DANA@", TRAINERTYPE_MOVES
+	db 21, FLAAFFY,    TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE
+	db 21, PSYDUCK,    SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
 	db -1 ; end
 
-; ================
-
 	; LASS (15)
-	db "DANA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 29, PSYDUCK
-		db SCRATCH
-		db DISABLE
-		db CONFUSION
-		db SCREECH
-
-	db 29, AMPHAROS
-		db TACKLE
-		db THUNDERSHOCK
-		db THUNDER_WAVE
-		db COTTON_SPORE
-
+	db "DANA@", TRAINERTYPE_MOVES
+	db 29, PSYDUCK,    SCRATCH, DISABLE, CONFUSION, SCREECH
+	db 29, AMPHAROS,   TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE
 	db -1 ; end
 
-; ================
-
 	; LASS (16)
-	db "DANA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 32, PSYDUCK
-		db SCRATCH
-		db DISABLE
-		db CONFUSION
-		db SCREECH
-
-	db 32, AMPHAROS
-		db TACKLE
-		db THUNDERPUNCH
-		db THUNDER_WAVE
-		db COTTON_SPORE
-
+	db "DANA@", TRAINERTYPE_MOVES
+	db 32, PSYDUCK,    SCRATCH, DISABLE, CONFUSION, SCREECH
+	db 32, AMPHAROS,   TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
 	db -1 ; end
 
-; ================
-
 	; LASS (17)
-	db "DANA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 36, AMPHAROS
-		db SWIFT
-		db THUNDERPUNCH
-		db THUNDER_WAVE
-		db COTTON_SPORE
-
-	db 36, GOLDUCK
-		db DISABLE
-		db SURF
-		db PSYCHIC_M
-		db SCREECH
-
+	db "DANA@", TRAINERTYPE_MOVES
+	db 36, AMPHAROS,   SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE
+	db 36, GOLDUCK,    DISABLE, SURF, PSYCHIC_M, SCREECH
 	db -1 ; end
 
-; ================
-; ================================
-
-
 JanineGroup:
-; ================================
-; ================
-
 	; JANINE (1)
-	db "JANINE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 36, CROBAT
-		db SCREECH
-		db SUPERSONIC
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 36, WEEZING
-		db SMOG
-		db SLUDGE_BOMB
-		db TOXIC
-		db EXPLOSION
-
-	db 36, WEEZING
-		db SMOG
-		db SLUDGE_BOMB
-		db TOXIC
-		db EXPLOSION
-
-	db 33, ARIADOS
-		db SCARY_FACE
-		db GIGA_DRAIN
-		db STRING_SHOT
-		db NIGHT_SHADE
-
-	db 39, VENOMOTH
-		db FORESIGHT
-		db DOUBLE_TEAM
-		db GUST
-		db PSYCHIC_M
-
+	db "JANINE@", TRAINERTYPE_MOVES
+	db 36, CROBAT,     SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK
+	db 36, WEEZING,    SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
+	db 36, WEEZING,    SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION
+	db 33, ARIADOS,    SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE
+	db 39, VENOMOTH,   FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
 	db -1 ; end
 
-; ================
-; ================================
-
-
 CooltrainerMGroup:
-; ================================
-; ================
-
 	; COOLTRAINERM (1)
-	db "NICK@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 26, CHARMANDER
-		db EMBER
-		db SMOKESCREEN
-		db RAGE
-		db SCARY_FACE
-
-	db 26, SQUIRTLE
-		db WITHDRAW
-		db WATER_GUN
-		db BITE
-		db CURSE
-
-	db 26, BULBASAUR
-		db LEECH_SEED
-		db POISONPOWDER
-		db SLEEP_POWDER
-		db RAZOR_LEAF
-
+	db "NICK@", TRAINERTYPE_MOVES
+	db 26, CHARMANDER, EMBER, SMOKESCREEN, RAGE, SCARY_FACE
+	db 26, SQUIRTLE,   WITHDRAW, WATER_GUN, BITE, CURSE
+	db 26, BULBASAUR,  LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (2)
-	db "AARON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "AARON@", TRAINERTYPE_NORMAL
 	db 24, IVYSAUR
 	db 24, CHARMELEON
 	db 24, WARTORTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (3)
-	db "PAUL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "PAUL@", TRAINERTYPE_NORMAL
 	db 34, DRATINI
 	db 34, DRATINI
 	db 34, DRATINI
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (4)
-	db "CODY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CODY@", TRAINERTYPE_NORMAL
 	db 34, HORSEA
 	db 36, SEADRA
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (5)
-	db "MIKE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MIKE@", TRAINERTYPE_NORMAL
 	db 37, DRAGONAIR
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (6)
-	db "GAVEN@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 35, VICTREEBEL
-		db WRAP
-		db TOXIC
-		db ACID
-		db RAZOR_LEAF
-
-	db 35, KINGLER
-		db BUBBLEBEAM
-		db STOMP
-		db GUILLOTINE
-		db PROTECT
-
-	db 35, FLAREON
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db BITE
-		db FIRE_SPIN
-
+	db "GAVEN@", TRAINERTYPE_MOVES
+	db 35, VICTREEBEL, WRAP, TOXIC, ACID, RAZOR_LEAF
+	db 35, KINGLER,    BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
+	db 35, FLAREON,    SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (7)
-	db "GAVEN@"
-	db TRAINERTYPE_ITEM_MOVES
-
-	; party
-
-	db 39, VICTREEBEL, NO_ITEM
-		db GIGA_DRAIN
-		db TOXIC
-		db SLUDGE_BOMB
-		db RAZOR_LEAF
-
-	db 39, KINGLER, KINGS_ROCK
-		db SURF
-		db STOMP
-		db GUILLOTINE
-		db BLIZZARD
-
-	db 39, FLAREON, NO_ITEM
-		db FLAMETHROWER
-		db QUICK_ATTACK
-		db BITE
-		db FIRE_SPIN
-
+	db "GAVEN@", TRAINERTYPE_ITEM_MOVES
+	db 39, VICTREEBEL, NO_ITEM,      GIGA_DRAIN, TOXIC, SLUDGE_BOMB, RAZOR_LEAF
+	db 39, KINGLER,    KINGS_ROCK,   SURF, STOMP, GUILLOTINE, BLIZZARD
+	db 39, FLAREON,    NO_ITEM,      FLAMETHROWER, QUICK_ATTACK, BITE, FIRE_SPIN
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (8)
-	db "RYAN@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 25, PIDGEOT
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db WING_ATTACK
-
-	db 27, ELECTABUZZ
-		db THUNDERPUNCH
-		db LIGHT_SCREEN
-		db SWIFT
-		db SCREECH
-
+	db "RYAN@", TRAINERTYPE_MOVES
+	db 25, PIDGEOT,    SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK
+	db 27, ELECTABUZZ, THUNDERPUNCH, LIGHT_SCREEN, SWIFT, SCREECH
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (9)
-	db "JAKE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 33, PARASECT
-		db LEECH_LIFE
-		db SPORE
-		db SLASH
-		db SWORDS_DANCE
-
-	db 35, GOLDUCK
-		db CONFUSION
-		db SCREECH
-		db PSYCH_UP
-		db FURY_SWIPES
-
+	db "JAKE@", TRAINERTYPE_MOVES
+	db 33, PARASECT,   LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE
+	db 35, GOLDUCK,    CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (10)
-	db "GAVEN@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 32, VICTREEBEL
-		db WRAP
-		db TOXIC
-		db ACID
-		db RAZOR_LEAF
-
-	db 32, KINGLER
-		db BUBBLEBEAM
-		db STOMP
-		db GUILLOTINE
-		db PROTECT
-
-	db 32, FLAREON
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db BITE
-		db FIRE_SPIN
-
+	db "GAVEN@", TRAINERTYPE_MOVES
+	db 32, VICTREEBEL, WRAP, TOXIC, ACID, RAZOR_LEAF
+	db 32, KINGLER,    BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT
+	db 32, FLAREON,    SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (11)
-	db "BLAKE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 33, MAGNETON
-		db THUNDERBOLT
-		db SUPERSONIC
-		db SWIFT
-		db SCREECH
-
-	db 31, QUAGSIRE
-		db WATER_GUN
-		db SLAM
-		db AMNESIA
-		db EARTHQUAKE
-
-	db 31, EXEGGCUTE
-		db LEECH_SEED
-		db CONFUSION
-		db SLEEP_POWDER
-		db SOLARBEAM
-
+	db "BLAKE@", TRAINERTYPE_MOVES
+	db 33, MAGNETON,   THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH
+	db 31, QUAGSIRE,   WATER_GUN, SLAM, AMNESIA, EARTHQUAKE
+	db 31, EXEGGCUTE,  LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (12)
-	db "BRIAN@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 35, SANDSLASH
-		db SAND_ATTACK
-		db POISON_STING
-		db SLASH
-		db SWIFT
-
+	db "BRIAN@", TRAINERTYPE_MOVES
+	db 35, SANDSLASH,  SAND_ATTACK, POISON_STING, SLASH, SWIFT
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (13)
-	db "ERICK@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ERICK@", TRAINERTYPE_NORMAL
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (14)
-	db "ANDY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ANDY@", TRAINERTYPE_NORMAL
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (15)
-	db "TYLER@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TYLER@", TRAINERTYPE_NORMAL
 	db 10, BULBASAUR
 	db 10, CHARMANDER
 	db 10, SQUIRTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (16)
-	db "SEAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SEAN@", TRAINERTYPE_NORMAL
 	db 35, FLAREON
 	db 35, TANGELA
 	db 35, TAUROS
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (17)
-	db "KEVIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KEVIN@", TRAINERTYPE_NORMAL
 	db 38, RHYHORN
 	db 35, CHARMELEON
 	db 35, WARTORTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (18)
-	db "STEVE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "STEVE@", TRAINERTYPE_NORMAL
 	db 14, BULBASAUR
 	db 14, CHARMANDER
 	db 14, SQUIRTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (19)
-	db "ALLEN@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 27, CHARMELEON
-		db EMBER
-		db SMOKESCREEN
-		db RAGE
-		db SCARY_FACE
-
+	db "ALLEN@", TRAINERTYPE_MOVES
+	db 27, CHARMELEON, EMBER, SMOKESCREEN, RAGE, SCARY_FACE
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERM (20)
-	db "DARIN@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 37, DRAGONAIR
-		db WRAP
-		db SURF
-		db DRAGON_RAGE
-		db SLAM
-
+	db "DARIN@", TRAINERTYPE_MOVES
+	db 37, DRAGONAIR,  WRAP, SURF, DRAGON_RAGE, SLAM
 	db -1 ; end
 
-; ================
-; ================================
-
-
 CooltrainerFGroup:
-; ================================
-; ================
-
 	; COOLTRAINERF (1)
-	db "GWEN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GWEN@", TRAINERTYPE_NORMAL
 	db 26, EEVEE
 	db 22, FLAREON
 	db 22, VAPOREON
 	db 22, JOLTEON
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (2)
-	db "LOIS@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 25, SKIPLOOM
-		db SYNTHESIS
-		db POISONPOWDER
-		db MEGA_DRAIN
-		db LEECH_SEED
-
-	db 25, NINETALES
-		db EMBER
-		db QUICK_ATTACK
-		db CONFUSE_RAY
-		db SAFEGUARD
-
+	db "LOIS@", TRAINERTYPE_MOVES
+	db 25, SKIPLOOM,   SYNTHESIS, POISONPOWDER, MEGA_DRAIN, LEECH_SEED
+	db 25, NINETALES,  EMBER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (3)
-	db "FRAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "FRAN@", TRAINERTYPE_NORMAL
 	db 37, SEADRA
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (4)
-	db "LOLA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LOLA@", TRAINERTYPE_NORMAL
 	db 34, DRATINI
 	db 36, DRAGONAIR
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (5)
-	db "KATE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KATE@", TRAINERTYPE_NORMAL
 	db 26, SHELLDER
 	db 28, CLOYSTER
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (6)
-	db "IRENE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "IRENE@", TRAINERTYPE_NORMAL
 	db 22, GOLDEEN
 	db 24, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (7)
-	db "KELLY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KELLY@", TRAINERTYPE_NORMAL
 	db 27, MARILL
 	db 24, WARTORTLE
 	db 24, WARTORTLE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (8)
-	db "JOYCE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 36, PIKACHU
-		db QUICK_ATTACK
-		db DOUBLE_TEAM
-		db THUNDERBOLT
-		db THUNDER
-
-	db 32, BLASTOISE
-		db BITE
-		db CURSE
-		db SURF
-		db RAIN_DANCE
-
+	db "JOYCE@", TRAINERTYPE_MOVES
+	db 36, PIKACHU,    QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER
+	db 32, BLASTOISE,  BITE, CURSE, SURF, RAIN_DANCE
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (9)
-	db "BETH@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 36, RAPIDASH
-		db STOMP
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db AGILITY
-
+	db "BETH@", TRAINERTYPE_MOVES
+	db 36, RAPIDASH,   STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (10)
-	db "REENA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "REENA@", TRAINERTYPE_NORMAL
 	db 31, STARMIE
 	db 33, NIDOQUEEN
 	db 31, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (11)
-	db "MEGAN@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 32, BULBASAUR
-		db GROWL
-		db LEECH_SEED
-		db POISONPOWDER
-		db RAZOR_LEAF
-
-	db 32, IVYSAUR
-		db GROWL
-		db LEECH_SEED
-		db POISONPOWDER
-		db RAZOR_LEAF
-
-	db 32, VENUSAUR
-		db BODY_SLAM
-		db SLEEP_POWDER
-		db RAZOR_LEAF
-		db SWEET_SCENT
-
+	db "MEGAN@", TRAINERTYPE_MOVES
+	db 32, BULBASAUR,  GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
+	db 32, IVYSAUR,    GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF
+	db 32, VENUSAUR,   BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (12)
-	db "BETH@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 39, RAPIDASH
-		db STOMP
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db AGILITY
-
+	db "BETH@", TRAINERTYPE_MOVES
+	db 39, RAPIDASH,   STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (13)
-	db "CAROL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CAROL@", TRAINERTYPE_NORMAL
 	db 35, ELECTRODE
 	db 35, STARMIE
 	db 35, NINETALES
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (14)
-	db "QUINN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "QUINN@", TRAINERTYPE_NORMAL
 	db 38, IVYSAUR
 	db 38, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (15)
-	db "EMMA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "EMMA@", TRAINERTYPE_NORMAL
 	db 28, POLIWHIRL
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (16)
-	db "CYBIL@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 25, BUTTERFREE
-		db CONFUSION
-		db SLEEP_POWDER
-		db WHIRLWIND
-		db GUST
-
-	db 25, BELLOSSOM
-		db ABSORB
-		db STUN_SPORE
-		db ACID
-		db SOLARBEAM
-
+	db "CYBIL@", TRAINERTYPE_MOVES
+	db 25, BUTTERFREE, CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST
+	db 25, BELLOSSOM,  ABSORB, STUN_SPORE, ACID, SOLARBEAM
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (17)
-	db "JENN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JENN@", TRAINERTYPE_NORMAL
 	db 24, STARYU
 	db 26, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (18)
-	db "BETH@"
-	db TRAINERTYPE_ITEM_MOVES
-
-	; party
-
-	db 43, RAPIDASH, FOCUS_BAND
-		db STOMP
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db FIRE_BLAST
-
+	db "BETH@", TRAINERTYPE_ITEM_MOVES
+	db 43, RAPIDASH,   FOCUS_BAND,   STOMP, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (19)
-	db "REENA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "REENA@", TRAINERTYPE_NORMAL
 	db 34, STARMIE
 	db 36, NIDOQUEEN
 	db 34, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (20)
-	db "REENA@"
-	db TRAINERTYPE_ITEM_MOVES
-
-	; party
-
-	db 38, STARMIE, NO_ITEM
-		db DOUBLE_TEAM
-		db PSYCHIC_M
-		db WATERFALL
-		db CONFUSE_RAY
-
-	db 40, NIDOQUEEN, PINK_BOW
-		db EARTHQUAKE
-		db DOUBLE_KICK
-		db TOXIC
-		db BODY_SLAM
-
-	db 38, STARMIE, NO_ITEM
-		db BLIZZARD
-		db PSYCHIC_M
-		db WATERFALL
-		db RECOVER
-
+	db "REENA@", TRAINERTYPE_ITEM_MOVES
+	db 38, STARMIE,    NO_ITEM,      DOUBLE_TEAM, PSYCHIC_M, WATERFALL, CONFUSE_RAY
+	db 40, NIDOQUEEN,  PINK_BOW,     EARTHQUAKE, DOUBLE_KICK, TOXIC, BODY_SLAM
+	db 38, STARMIE,    NO_ITEM,      BLIZZARD, PSYCHIC_M, WATERFALL, RECOVER
 	db -1 ; end
 
-; ================
-
 	; COOLTRAINERF (21)
-	db "CARA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 33, HORSEA
-		db SMOKESCREEN
-		db LEER
-		db WHIRLPOOL
-		db TWISTER
-
-	db 33, HORSEA
-		db SMOKESCREEN
-		db LEER
-		db WHIRLPOOL
-		db TWISTER
-
-	db 35, SEADRA
-		db SWIFT
-		db LEER
-		db WATERFALL
-		db TWISTER
-
+	db "CARA@", TRAINERTYPE_MOVES
+	db 33, HORSEA,     SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
+	db 33, HORSEA,     SMOKESCREEN, LEER, WHIRLPOOL, TWISTER
+	db 35, SEADRA,     SWIFT, LEER, WATERFALL, TWISTER
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BeautyGroup:
-; ================================
-; ================
-
 	; BEAUTY (1)
-	db "VICTORIA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 9, SENTRET
+	db "VICTORIA@", TRAINERTYPE_NORMAL
+	db  9, SENTRET
 	db 13, SENTRET
 	db 17, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (2)
-	db "SAMANTHA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 16, MEOWTH
-		db SCRATCH
-		db GROWL
-		db BITE
-		db PAY_DAY
-
-	db 16, MEOWTH
-		db SCRATCH
-		db GROWL
-		db BITE
-		db SLASH
-
+	db "SAMANTHA@", TRAINERTYPE_MOVES
+	db 16, MEOWTH,     SCRATCH, GROWL, BITE, PAY_DAY
+	db 16, MEOWTH,     SCRATCH, GROWL, BITE, SLASH
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (3)
-	db "JULIE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JULIE@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (4)
-	db "JACLYN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JACLYN@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (5)
-	db "BRENDA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BRENDA@", TRAINERTYPE_NORMAL
 	db 16, FURRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (6)
-	db "CASSIE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CASSIE@", TRAINERTYPE_NORMAL
 	db 28, VILEPLUME
 	db 34, BUTTERFREE
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (7)
-	db "CAROLINE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CAROLINE@", TRAINERTYPE_NORMAL
 	db 30, MARILL
 	db 32, SEEL
 	db 30, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (8)
-	db "CARLENE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CARLENE@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (9)
-	db "JESSICA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JESSICA@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (10)
-	db "RACHAEL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RACHAEL@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (11)
-	db "ANGELICA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ANGELICA@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (12)
-	db "KENDRA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KENDRA@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (13)
-	db "VERONICA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "VERONICA@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (14)
-	db "JULIA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JULIA@", TRAINERTYPE_NORMAL
 	db 32, PARAS
 	db 32, EXEGGCUTE
 	db 35, PARASECT
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (15)
-	db "THERESA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "THERESA@", TRAINERTYPE_NORMAL
 	db 15, SENTRET
-
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (16)
-	db "VALERIE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 17, HOPPIP
-		db SYNTHESIS
-		db TAIL_WHIP
-		db TACKLE
-		db POISONPOWDER
-
-	db 17, SKIPLOOM
-		db SYNTHESIS
-		db TAIL_WHIP
-		db TACKLE
-		db STUN_SPORE
-
+	db "VALERIE@", TRAINERTYPE_MOVES
+	db 17, HOPPIP,     SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER
+	db 17, SKIPLOOM,   SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE
 	db -1 ; end
 
-; ================
-
 	; BEAUTY (17)
-	db "OLIVIA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "OLIVIA@", TRAINERTYPE_NORMAL
 	db 19, CORSOLA
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 PokemaniacGroup:
-; ================================
-; ================
-
 	; POKEMANIAC (1)
-	db "LARRY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LARRY@", TRAINERTYPE_NORMAL
 	db 10, SLOWPOKE
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (2)
-	db "ANDREW@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ANDREW@", TRAINERTYPE_NORMAL
 	db 24, MAROWAK
 	db 24, MAROWAK
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (3)
-	db "CALVIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CALVIN@", TRAINERTYPE_NORMAL
 	db 26, KANGASKHAN
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (4)
-	db "SHANE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SHANE@", TRAINERTYPE_NORMAL
 	db 16, NIDORINA
 	db 16, NIDORINO
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (5)
-	db "BEN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BEN@", TRAINERTYPE_NORMAL
 	db 19, SLOWBRO
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (6)
-	db "BRENT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BRENT@", TRAINERTYPE_NORMAL
 	db 19, LICKITUNG
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (7)
-	db "RON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RON@", TRAINERTYPE_NORMAL
 	db 19, NIDOKING
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (8)
-	db "ETHAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ETHAN@", TRAINERTYPE_NORMAL
 	db 31, RHYHORN
 	db 31, RHYDON
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (9)
-	db "BRENT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BRENT@", TRAINERTYPE_NORMAL
 	db 25, KANGASKHAN
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (10)
-	db "BRENT@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 36, PORYGON
-		db RECOVER
-		db PSYCHIC_M
-		db CONVERSION2
-		db TRI_ATTACK
-
+	db "BRENT@", TRAINERTYPE_MOVES
+	db 36, PORYGON,    RECOVER, PSYCHIC_M, CONVERSION2, TRI_ATTACK
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (11)
-	db "ISSAC@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 12, LICKITUNG
-		db LICK
-		db SUPERSONIC
-		db CUT
-		db 0
-
+	db "ISSAC@", TRAINERTYPE_MOVES
+	db 12, LICKITUNG,  LICK, SUPERSONIC, CUT, NO_MOVE
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (12)
-	db "DONALD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DONALD@", TRAINERTYPE_NORMAL
 	db 10, SLOWPOKE
 	db 10, SLOWPOKE
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (13)
-	db "ZACH@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ZACH@", TRAINERTYPE_NORMAL
 	db 27, RHYHORN
-
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (14)
-	db "BRENT@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 41, CHANSEY
-		db ROLLOUT
-		db ATTRACT
-		db EGG_BOMB
-		db SOFTBOILED
-
+	db "BRENT@", TRAINERTYPE_MOVES
+	db 41, CHANSEY,    ROLLOUT, ATTRACT, EGG_BOMB, SOFTBOILED
 	db -1 ; end
 
-; ================
-
 	; POKEMANIAC (15)
-	db "MILLER@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MILLER@", TRAINERTYPE_NORMAL
 	db 17, NIDOKING
 	db 17, NIDOQUEEN
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 GruntMGroup:
-; ================================
-; ================
-
 	; GRUNTM (1)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 14, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (2)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 7, RATTATA
-	db 9, ZUBAT
-	db 9, ZUBAT
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
+	db  7, RATTATA
+	db  9, ZUBAT
+	db  9, ZUBAT
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (3)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 24, RATICATE
 	db 24, RATICATE
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (4)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 23, GRIMER
 	db 23, GRIMER
 	db 25, MUK
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (5)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 21, RATTATA
 	db 21, RATTATA
 	db 23, RATTATA
 	db 23, RATTATA
 	db 23, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (6)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 26, ZUBAT
 	db 26, ZUBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (7)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 23, KOFFING
 	db 23, GRIMER
 	db 23, ZUBAT
 	db 23, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (8)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 26, WEEZING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (9)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 24, RATICATE
 	db 26, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (10)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 22, ZUBAT
 	db 24, GOLBAT
 	db 22, GRIMER
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (11)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 23, MUK
 	db 23, KOFFING
 	db 25, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (12)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 33, HOUNDOUR
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (13)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 27, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (14)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 24, RATICATE
 	db 24, GOLBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (15)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 26, GRIMER
 	db 23, WEEZING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (16)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 16, RATTATA
 	db 16, RATTATA
 	db 16, RATTATA
 	db 16, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (17)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 18, GOLBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (18)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 17, RATTATA
 	db 17, ZUBAT
 	db 17, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (19)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 18, VENONAT
 	db 18, VENONAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (20)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 17, DROWZEE
 	db 19, ZUBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (21)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 16, ZUBAT
 	db 17, GRIMER
 	db 18, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (22)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 36, GOLBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (23)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 30, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (24)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 25, KOFFING
 	db 25, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (25)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 24, KOFFING
 	db 24, MUK
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (26)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 15, RATTATA
 	db 15, RATTATA
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (27)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 22, ZUBAT
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (28)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 19, RATICATE
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (29)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 9, RATTATA
-	db 9, RATTATA
-
+	db "GRUNT@", TRAINERTYPE_NORMAL
+	db  9, RATTATA
+	db  9, RATTATA
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (30)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 25, GOLBAT
 	db 25, GOLBAT
 	db 30, ARBOK
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTM (31)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 30, GOLBAT
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 GentlemanGroup:
-; ================================
-; ================
-
 	; GENTLEMAN (1)
-	db "PRESTON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "PRESTON@", TRAINERTYPE_NORMAL
 	db 18, GROWLITHE
 	db 18, GROWLITHE
-
 	db -1 ; end
 
-; ================
-
 	; GENTLEMAN (2)
-	db "EDWARD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "EDWARD@", TRAINERTYPE_NORMAL
 	db 33, PERSIAN
-
 	db -1 ; end
 
-; ================
-
 	; GENTLEMAN (3)
-	db "GREGORY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GREGORY@", TRAINERTYPE_NORMAL
 	db 37, PIKACHU
 	db 33, FLAAFFY
-
 	db -1 ; end
 
-; ================
-
 	; GENTLEMAN (4)
-	db "VIRGIL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "VIRGIL@", TRAINERTYPE_NORMAL
 	db 20, PONYTA
-
 	db -1 ; end
 
-; ================
-
 	; GENTLEMAN (5)
-	db "ALFRED@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ALFRED@", TRAINERTYPE_NORMAL
 	db 20, NOCTOWL
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 SkierGroup:
-; ================================
-; ================
-
 	; SKIER (1)
-	db "ROXANNE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ROXANNE@", TRAINERTYPE_NORMAL
 	db 28, JYNX
-
 	db -1 ; end
 
-; ================
-
 	; SKIER (2)
-	db "CLARISSA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CLARISSA@", TRAINERTYPE_NORMAL
 	db 28, DEWGONG
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 TeacherGroup:
-; ================================
-; ================
-
 	; TEACHER (1)
-	db "COLETTE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "COLETTE@", TRAINERTYPE_NORMAL
 	db 36, CLEFAIRY
-
 	db -1 ; end
 
-; ================
-
 	; TEACHER (2)
-	db "HILLARY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HILLARY@", TRAINERTYPE_NORMAL
 	db 32, AIPOM
 	db 36, CUBONE
-
 	db -1 ; end
 
-; ================
-
 	; TEACHER (3)
-	db "SHIRLEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SHIRLEY@", TRAINERTYPE_NORMAL
 	db 35, JIGGLYPUFF
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 SabrinaGroup:
-; ================================
-; ================
-
 	; SABRINA (1)
-	db "SABRINA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 46, ESPEON
-		db SAND_ATTACK
-		db QUICK_ATTACK
-		db SWIFT
-		db PSYCHIC_M
-
-	db 46, MR__MIME
-		db BARRIER
-		db REFLECT
-		db BATON_PASS
-		db PSYCHIC_M
-
-	db 48, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
-
+	db "SABRINA@", TRAINERTYPE_MOVES
+	db 46, ESPEON,     SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M
+	db 46, MR__MIME,   BARRIER, REFLECT, BATON_PASS, PSYCHIC_M
+	db 48, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BugCatcherGroup:
-; ================================
-; ================
-
 	; BUG_CATCHER (1)
-	db "DON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 3, CATERPIE
-	db 3, CATERPIE
-
+	db "DON@", TRAINERTYPE_NORMAL
+	db  3, CATERPIE
+	db  3, CATERPIE
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (2)
-	db "ROB@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ROB@", TRAINERTYPE_NORMAL
 	db 32, BEEDRILL
 	db 32, BUTTERFREE
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (3)
-	db "ED@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ED@", TRAINERTYPE_NORMAL
 	db 30, BEEDRILL
 	db 30, BEEDRILL
 	db 30, BEEDRILL
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (4)
-	db "WADE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 2, CATERPIE
-	db 2, CATERPIE
-	db 3, WEEDLE
-	db 2, CATERPIE
-
+	db "WADE@", TRAINERTYPE_NORMAL
+	db  2, CATERPIE
+	db  2, CATERPIE
+	db  3, WEEDLE
+	db  2, CATERPIE
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (5)
-	db "BENNY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 7, WEEDLE
-	db 9, KAKUNA
+	db "BENNY@", TRAINERTYPE_NORMAL
+	db  7, WEEDLE
+	db  9, KAKUNA
 	db 12, BEEDRILL
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (6)
-	db "AL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "AL@", TRAINERTYPE_NORMAL
 	db 12, CATERPIE
 	db 12, WEEDLE
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (7)
-	db "JOSH@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JOSH@", TRAINERTYPE_NORMAL
 	db 13, PARAS
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (8)
-	db "ARNIE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ARNIE@", TRAINERTYPE_NORMAL
 	db 15, VENONAT
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (9)
-	db "KEN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KEN@", TRAINERTYPE_NORMAL
 	db 30, ARIADOS
 	db 32, PINSIR
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (10)
-	db "WADE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 9, METAPOD
-	db 9, METAPOD
+	db "WADE@", TRAINERTYPE_NORMAL
+	db  9, METAPOD
+	db  9, METAPOD
 	db 10, KAKUNA
-	db 9, METAPOD
-
+	db  9, METAPOD
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (11)
-	db "WADE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "WADE@", TRAINERTYPE_NORMAL
 	db 14, BUTTERFREE
 	db 14, BUTTERFREE
 	db 15, BEEDRILL
 	db 14, BUTTERFREE
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (12)
-	db "DOUG@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DOUG@", TRAINERTYPE_NORMAL
 	db 34, ARIADOS
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (13)
-	db "ARNIE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ARNIE@", TRAINERTYPE_NORMAL
 	db 19, VENONAT
-
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (14)
-	db "ARNIE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 28, VENOMOTH
-		db DISABLE
-		db SUPERSONIC
-		db CONFUSION
-		db LEECH_LIFE
-
+	db "ARNIE@", TRAINERTYPE_MOVES
+	db 28, VENOMOTH,   DISABLE, SUPERSONIC, CONFUSION, LEECH_LIFE
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (15)
-	db "WADE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 24, BUTTERFREE
-		db CONFUSION
-		db POISONPOWDER
-		db SUPERSONIC
-		db WHIRLWIND
-
-	db 24, BUTTERFREE
-		db CONFUSION
-		db STUN_SPORE
-		db SUPERSONIC
-		db WHIRLWIND
-
-	db 25, BEEDRILL
-		db FURY_ATTACK
-		db FOCUS_ENERGY
-		db TWINEEDLE
-		db RAGE
-
-	db 24, BUTTERFREE
-		db CONFUSION
-		db SLEEP_POWDER
-		db SUPERSONIC
-		db WHIRLWIND
-
+	db "WADE@", TRAINERTYPE_MOVES
+	db 24, BUTTERFREE, CONFUSION, POISONPOWDER, SUPERSONIC, WHIRLWIND
+	db 24, BUTTERFREE, CONFUSION, STUN_SPORE, SUPERSONIC, WHIRLWIND
+	db 25, BEEDRILL,   FURY_ATTACK, FOCUS_ENERGY, TWINEEDLE, RAGE
+	db 24, BUTTERFREE, CONFUSION, SLEEP_POWDER, SUPERSONIC, WHIRLWIND
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (16)
-	db "WADE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 30, BUTTERFREE
-		db CONFUSION
-		db POISONPOWDER
-		db SUPERSONIC
-		db GUST
-
-	db 30, BUTTERFREE
-		db CONFUSION
-		db STUN_SPORE
-		db SUPERSONIC
-		db GUST
-
-	db 32, BEEDRILL
-		db FURY_ATTACK
-		db PURSUIT
-		db TWINEEDLE
-		db DOUBLE_TEAM
-
-	db 34, BUTTERFREE
-		db PSYBEAM
-		db SLEEP_POWDER
-		db GUST
-		db WHIRLWIND
-
+	db "WADE@", TRAINERTYPE_MOVES
+	db 30, BUTTERFREE, CONFUSION, POISONPOWDER, SUPERSONIC, GUST
+	db 30, BUTTERFREE, CONFUSION, STUN_SPORE, SUPERSONIC, GUST
+	db 32, BEEDRILL,   FURY_ATTACK, PURSUIT, TWINEEDLE, DOUBLE_TEAM
+	db 34, BUTTERFREE, PSYBEAM, SLEEP_POWDER, GUST, WHIRLWIND
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (17)
-	db "ARNIE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 36, VENOMOTH
-		db GUST
-		db SUPERSONIC
-		db PSYBEAM
-		db LEECH_LIFE
-
+	db "ARNIE@", TRAINERTYPE_MOVES
+	db 36, VENOMOTH,   GUST, SUPERSONIC, PSYBEAM, LEECH_LIFE
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (18)
-	db "ARNIE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 40, VENOMOTH
-		db GUST
-		db SUPERSONIC
-		db PSYCHIC_M
-		db TOXIC
-
+	db "ARNIE@", TRAINERTYPE_MOVES
+	db 40, VENOMOTH,   GUST, SUPERSONIC, PSYCHIC_M, TOXIC
 	db -1 ; end
 
-; ================
-
 	; BUG_CATCHER (19)
-	db "WAYNE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 8, LEDYBA
+	db "WAYNE@", TRAINERTYPE_NORMAL
+	db  8, LEDYBA
 	db 10, PARAS
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 FisherGroup:
-; ================================
-; ================
-
 	; FISHER (1)
-	db "JUSTIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 5, MAGIKARP
-	db 5, MAGIKARP
+	db "JUSTIN@", TRAINERTYPE_NORMAL
+	db  5, MAGIKARP
+	db  5, MAGIKARP
 	db 15, MAGIKARP
-	db 5, MAGIKARP
-
+	db  5, MAGIKARP
 	db -1 ; end
 
-; ================
-
 	; FISHER (2)
-	db "RALPH@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RALPH@", TRAINERTYPE_NORMAL
 	db 10, GOLDEEN
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (3)
-	db "ARNOLD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ARNOLD@", TRAINERTYPE_NORMAL
 	db 34, TENTACRUEL
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (4)
-	db "KYLE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KYLE@", TRAINERTYPE_NORMAL
 	db 28, SEAKING
 	db 31, POLIWHIRL
 	db 31, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (5)
-	db "HENRY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 8, POLIWAG
-	db 8, POLIWAG
-
+	db "HENRY@", TRAINERTYPE_NORMAL
+	db  8, POLIWAG
+	db  8, POLIWAG
 	db -1 ; end
 
-; ================
-
 	; FISHER (6)
-	db "MARVIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MARVIN@", TRAINERTYPE_NORMAL
 	db 10, MAGIKARP
 	db 10, GYARADOS
 	db 15, MAGIKARP
 	db 15, GYARADOS
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (7)
-	db "TULLY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TULLY@", TRAINERTYPE_NORMAL
 	db 18, QWILFISH
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (8)
-	db "ANDRE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ANDRE@", TRAINERTYPE_NORMAL
 	db 27, GYARADOS
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (9)
-	db "RAYMOND@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RAYMOND@", TRAINERTYPE_NORMAL
 	db 22, MAGIKARP
 	db 22, MAGIKARP
 	db 22, MAGIKARP
 	db 22, MAGIKARP
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (10)
-	db "WILTON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "WILTON@", TRAINERTYPE_NORMAL
 	db 23, GOLDEEN
 	db 23, GOLDEEN
 	db 25, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (11)
-	db "EDGAR@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 25, REMORAID
-		db LOCK_ON
-		db PSYBEAM
-		db AURORA_BEAM
-		db BUBBLEBEAM
-
-	db 25, REMORAID
-		db LOCK_ON
-		db PSYBEAM
-		db AURORA_BEAM
-		db BUBBLEBEAM
-
+	db "EDGAR@", TRAINERTYPE_MOVES
+	db 25, REMORAID,   LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
+	db 25, REMORAID,   LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM
 	db -1 ; end
 
-; ================
-
 	; FISHER (12)
-	db "JONAH@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JONAH@", TRAINERTYPE_NORMAL
 	db 25, SHELLDER
 	db 29, OCTILLERY
 	db 25, REMORAID
 	db 29, CLOYSTER
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (13)
-	db "MARTIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MARTIN@", TRAINERTYPE_NORMAL
 	db 32, REMORAID
 	db 32, REMORAID
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (14)
-	db "STEPHEN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "STEPHEN@", TRAINERTYPE_NORMAL
 	db 25, MAGIKARP
 	db 25, MAGIKARP
 	db 31, QWILFISH
 	db 31, TENTACRUEL
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (15)
-	db "BARNEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BARNEY@", TRAINERTYPE_NORMAL
 	db 30, GYARADOS
 	db 30, GYARADOS
 	db 30, GYARADOS
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (16)
-	db "RALPH@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RALPH@", TRAINERTYPE_NORMAL
 	db 17, GOLDEEN
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (17)
-	db "RALPH@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RALPH@", TRAINERTYPE_NORMAL
 	db 17, QWILFISH
 	db 19, GOLDEEN
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (18)
-	db "TULLY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TULLY@", TRAINERTYPE_NORMAL
 	db 23, QWILFISH
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (19)
-	db "TULLY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TULLY@", TRAINERTYPE_NORMAL
 	db 32, GOLDEEN
 	db 32, GOLDEEN
 	db 32, QWILFISH
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (20)
-	db "WILTON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "WILTON@", TRAINERTYPE_NORMAL
 	db 29, GOLDEEN
 	db 29, GOLDEEN
 	db 32, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (21)
-	db "SCOTT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SCOTT@", TRAINERTYPE_NORMAL
 	db 30, QWILFISH
 	db 30, QWILFISH
 	db 34, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (22)
-	db "WILTON@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 34, SEAKING
-		db SUPERSONIC
-		db WATERFALL
-		db FLAIL
-		db FURY_ATTACK
-
-	db 34, SEAKING
-		db SUPERSONIC
-		db WATERFALL
-		db FLAIL
-		db FURY_ATTACK
-
-	db 38, REMORAID
-		db PSYBEAM
-		db AURORA_BEAM
-		db BUBBLEBEAM
-		db HYPER_BEAM
-
+	db "WILTON@", TRAINERTYPE_MOVES
+	db 34, SEAKING,    SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
+	db 34, SEAKING,    SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK
+	db 38, REMORAID,   PSYBEAM, AURORA_BEAM, BUBBLEBEAM, HYPER_BEAM
 	db -1 ; end
 
-; ================
-
 	; FISHER (23)
-	db "RALPH@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RALPH@", TRAINERTYPE_NORMAL
 	db 30, QWILFISH
 	db 32, GOLDEEN
-
 	db -1 ; end
 
-; ================
-
 	; FISHER (24)
-	db "RALPH@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 35, QWILFISH
-		db TOXIC
-		db MINIMIZE
-		db SURF
-		db PIN_MISSILE
-
-	db 39, SEAKING
-		db ENDURE
-		db FLAIL
-		db FURY_ATTACK
-		db WATERFALL
-
+	db "RALPH@", TRAINERTYPE_MOVES
+	db 35, QWILFISH,   TOXIC, MINIMIZE, SURF, PIN_MISSILE
+	db 39, SEAKING,    ENDURE, FLAIL, FURY_ATTACK, WATERFALL
 	db -1 ; end
 
-; ================
-
 	; FISHER (25)
-	db "TULLY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 34, SEAKING
-		db SUPERSONIC
-		db RAIN_DANCE
-		db WATERFALL
-		db FURY_ATTACK
-
-	db 34, SEAKING
-		db SUPERSONIC
-		db RAIN_DANCE
-		db WATERFALL
-		db FURY_ATTACK
-
-	db 37, QWILFISH
-		db ROLLOUT
-		db SURF
-		db PIN_MISSILE
-		db TAKE_DOWN
-
+	db "TULLY@", TRAINERTYPE_MOVES
+	db 34, SEAKING,    SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
+	db 34, SEAKING,    SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK
+	db 37, QWILFISH,   ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
 	db -1 ; end
 
-; ================
-; ================================
-
-
 SwimmerMGroup:
-; ================================
-; ================
-
 	; SWIMMERM (1)
-	db "HAROLD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HAROLD@", TRAINERTYPE_NORMAL
 	db 32, REMORAID
 	db 30, SEADRA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (2)
-	db "SIMON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SIMON@", TRAINERTYPE_NORMAL
 	db 20, TENTACOOL
 	db 20, TENTACOOL
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (3)
-	db "RANDALL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RANDALL@", TRAINERTYPE_NORMAL
 	db 18, SHELLDER
 	db 20, WARTORTLE
 	db 18, SHELLDER
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (4)
-	db "CHARLIE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CHARLIE@", TRAINERTYPE_NORMAL
 	db 21, SHELLDER
 	db 19, TENTACOOL
 	db 19, TENTACRUEL
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (5)
-	db "GEORGE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GEORGE@", TRAINERTYPE_NORMAL
 	db 16, TENTACOOL
 	db 17, TENTACOOL
 	db 16, TENTACOOL
 	db 19, STARYU
 	db 17, TENTACOOL
 	db 19, REMORAID
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (6)
-	db "BERKE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BERKE@", TRAINERTYPE_NORMAL
 	db 23, QWILFISH
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (7)
-	db "KIRK@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KIRK@", TRAINERTYPE_NORMAL
 	db 20, GYARADOS
 	db 20, GYARADOS
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (8)
-	db "MATHEW@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MATHEW@", TRAINERTYPE_NORMAL
 	db 23, KRABBY
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (9)
-	db "HAL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HAL@", TRAINERTYPE_NORMAL
 	db 24, SEEL
 	db 25, DEWGONG
 	db 24, SEEL
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (10)
-	db "PATON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "PATON@", TRAINERTYPE_NORMAL
 	db 26, PILOSWINE
 	db 26, PILOSWINE
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (11)
-	db "DARYL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DARYL@", TRAINERTYPE_NORMAL
 	db 24, SHELLDER
 	db 25, CLOYSTER
 	db 24, SHELLDER
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (12)
-	db "WALTER@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "WALTER@", TRAINERTYPE_NORMAL
 	db 15, HORSEA
 	db 15, HORSEA
 	db 20, SEADRA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (13)
-	db "TONY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TONY@", TRAINERTYPE_NORMAL
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (14)
-	db "JEROME@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JEROME@", TRAINERTYPE_NORMAL
 	db 26, SEADRA
 	db 28, TENTACOOL
 	db 30, TENTACRUEL
 	db 28, GOLDEEN
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (15)
-	db "TUCKER@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TUCKER@", TRAINERTYPE_NORMAL
 	db 30, SHELLDER
 	db 34, CLOYSTER
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (16)
-	db "RICK@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RICK@", TRAINERTYPE_NORMAL
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (17)
-	db "CAMERON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CAMERON@", TRAINERTYPE_NORMAL
 	db 34, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (18)
-	db "SETH@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SETH@", TRAINERTYPE_NORMAL
 	db 29, QUAGSIRE
 	db 29, OCTILLERY
 	db 32, QUAGSIRE
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (19)
-	db "JAMES@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JAMES@", TRAINERTYPE_NORMAL
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (20)
-	db "LEWIS@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LEWIS@", TRAINERTYPE_NORMAL
 	db 13, STARYU
 	db 18, STARMIE
 	db 16, HORSEA
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERM (21)
-	db "PARKER@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "PARKER@", TRAINERTYPE_NORMAL
 	db 32, HORSEA
 	db 32, HORSEA
 	db 35, SEADRA
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 SwimmerFGroup:
-; ================================
-; ================
-
 	; SWIMMERF (1)
-	db "ELAINE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ELAINE@", TRAINERTYPE_NORMAL
 	db 21, STARYU
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (2)
-	db "PAULA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "PAULA@", TRAINERTYPE_NORMAL
 	db 19, STARYU
 	db 19, SHELLDER
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (3)
-	db "KAYLEE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KAYLEE@", TRAINERTYPE_NORMAL
 	db 18, GOLDEEN
 	db 20, GOLDEEN
 	db 20, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (4)
-	db "SUSIE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 20, PSYDUCK
-		db SCRATCH
-		db TAIL_WHIP
-		db DISABLE
-		db CONFUSION
-
-	db 22, GOLDEEN
-		db PECK
-		db TAIL_WHIP
-		db SUPERSONIC
-		db HORN_ATTACK
-
+	db "SUSIE@", TRAINERTYPE_MOVES
+	db 20, PSYDUCK,    SCRATCH, TAIL_WHIP, DISABLE, CONFUSION
+	db 22, GOLDEEN,    PECK, TAIL_WHIP, SUPERSONIC, HORN_ATTACK
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (5)
-	db "DENISE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DENISE@", TRAINERTYPE_NORMAL
 	db 22, SEEL
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (6)
-	db "KARA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KARA@", TRAINERTYPE_NORMAL
 	db 20, STARYU
 	db 20, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (7)
-	db "WENDY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 21, HORSEA
-		db BUBBLE
-		db SMOKESCREEN
-		db LEER
-		db WATER_GUN
-
-	db 21, HORSEA
-		db DRAGON_RAGE
-		db SMOKESCREEN
-		db LEER
-		db WATER_GUN
-
+	db "WENDY@", TRAINERTYPE_MOVES
+	db 21, HORSEA,     BUBBLE, SMOKESCREEN, LEER, WATER_GUN
+	db 21, HORSEA,     DRAGON_RAGE, SMOKESCREEN, LEER, WATER_GUN
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (8)
-	db "LISA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LISA@", TRAINERTYPE_NORMAL
 	db 28, JYNX
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (9)
-	db "JILL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JILL@", TRAINERTYPE_NORMAL
 	db 28, DEWGONG
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (10)
-	db "MARY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MARY@", TRAINERTYPE_NORMAL
 	db 20, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (11)
-	db "KATIE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KATIE@", TRAINERTYPE_NORMAL
 	db 33, DEWGONG
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (12)
-	db "DAWN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DAWN@", TRAINERTYPE_NORMAL
 	db 34, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (13)
-	db "TARA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TARA@", TRAINERTYPE_NORMAL
 	db 20, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (14)
-	db "NICOLE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "NICOLE@", TRAINERTYPE_NORMAL
 	db 29, MARILL
 	db 29, MARILL
 	db 32, LAPRAS
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (15)
-	db "LORI@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LORI@", TRAINERTYPE_NORMAL
 	db 32, STARMIE
 	db 32, STARMIE
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (16)
-	db "JODY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JODY@", TRAINERTYPE_NORMAL
 	db 20, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (17)
-	db "NIKKI@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "NIKKI@", TRAINERTYPE_NORMAL
 	db 28, SEEL
 	db 28, SEEL
 	db 28, SEEL
 	db 28, DEWGONG
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (18)
-	db "DIANA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DIANA@", TRAINERTYPE_NORMAL
 	db 37, GOLDUCK
-
 	db -1 ; end
 
-; ================
-
 	; SWIMMERF (19)
-	db "BRIANA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BRIANA@", TRAINERTYPE_NORMAL
 	db 35, SEAKING
 	db 35, SEAKING
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 SailorGroup:
-; ================================
-; ================
-
 	; SAILOR (1)
-	db "EUGENE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "EUGENE@", TRAINERTYPE_NORMAL
 	db 17, POLIWHIRL
 	db 17, RATICATE
 	db 19, KRABBY
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (2)
-	db "HUEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HUEY@", TRAINERTYPE_NORMAL
 	db 18, POLIWAG
 	db 18, POLIWHIRL
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (3)
-	db "TERRELL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TERRELL@", TRAINERTYPE_NORMAL
 	db 20, POLIWHIRL
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (4)
-	db "KENT@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 18, KRABBY
-		db BUBBLE
-		db LEER
-		db VICEGRIP
-		db HARDEN
-
-	db 20, KRABBY
-		db BUBBLEBEAM
-		db LEER
-		db VICEGRIP
-		db HARDEN
-
+	db "KENT@", TRAINERTYPE_MOVES
+	db 18, KRABBY,     BUBBLE, LEER, VICEGRIP, HARDEN
+	db 20, KRABBY,     BUBBLEBEAM, LEER, VICEGRIP, HARDEN
 	db -1 ; end
 
-; ================
-
 	; SAILOR (5)
-	db "ERNEST@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ERNEST@", TRAINERTYPE_NORMAL
 	db 18, MACHOP
 	db 18, MACHOP
 	db 18, POLIWHIRL
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (6)
-	db "JEFF@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JEFF@", TRAINERTYPE_NORMAL
 	db 32, RATICATE
 	db 32, RATICATE
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (7)
-	db "GARRETT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GARRETT@", TRAINERTYPE_NORMAL
 	db 34, KINGLER
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (8)
-	db "KENNETH@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KENNETH@", TRAINERTYPE_NORMAL
 	db 28, MACHOP
 	db 28, MACHOP
 	db 28, POLIWRATH
 	db 28, MACHOP
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (9)
-	db "STANLY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "STANLY@", TRAINERTYPE_NORMAL
 	db 31, MACHOP
 	db 33, MACHOKE
 	db 26, PSYDUCK
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (10)
-	db "HARRY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HARRY@", TRAINERTYPE_NORMAL
 	db 19, WOOPER
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (11)
-	db "HUEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HUEY@", TRAINERTYPE_NORMAL
 	db 28, POLIWHIRL
 	db 28, POLIWHIRL
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (12)
-	db "HUEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HUEY@", TRAINERTYPE_NORMAL
 	db 34, POLIWHIRL
 	db 34, POLIWRATH
-
 	db -1 ; end
 
-; ================
-
 	; SAILOR (13)
-	db "HUEY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 38, POLITOED
-		db WHIRLPOOL
-		db RAIN_DANCE
-		db BODY_SLAM
-		db PERISH_SONG
-
-	db 38, POLIWRATH
-		db SURF
-		db STRENGTH
-		db ICE_PUNCH
-		db SUBMISSION
-
+	db "HUEY@", TRAINERTYPE_MOVES
+	db 38, POLITOED,   WHIRLPOOL, RAIN_DANCE, BODY_SLAM, PERISH_SONG
+	db 38, POLIWRATH,  SURF, STRENGTH, ICE_PUNCH, SUBMISSION
 	db -1 ; end
 
-; ================
-; ================================
-
-
 SuperNerdGroup:
-; ================================
-; ================
-
 	; SUPER_NERD (1)
-	db "STAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "STAN@", TRAINERTYPE_NORMAL
 	db 20, GRIMER
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (2)
-	db "ERIC@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ERIC@", TRAINERTYPE_NORMAL
 	db 11, GRIMER
 	db 11, GRIMER
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (3)
-	db "GREGG@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GREGG@", TRAINERTYPE_NORMAL
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
 	db 20, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (4)
-	db "JAY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JAY@", TRAINERTYPE_NORMAL
 	db 22, KOFFING
 	db 22, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (5)
-	db "DAVE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DAVE@", TRAINERTYPE_NORMAL
 	db 24, DITTO
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (6)
-	db "SAM@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SAM@", TRAINERTYPE_NORMAL
 	db 34, GRIMER
 	db 34, MUK
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (7)
-	db "TOM@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TOM@", TRAINERTYPE_NORMAL
 	db 32, MAGNEMITE
 	db 32, MAGNEMITE
 	db 32, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (8)
-	db "PAT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "PAT@", TRAINERTYPE_NORMAL
 	db 36, PORYGON
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (9)
-	db "SHAWN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SHAWN@", TRAINERTYPE_NORMAL
 	db 31, MAGNEMITE
 	db 33, MUK
 	db 31, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (10)
-	db "TERU@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 7, MAGNEMITE
+	db "TERU@", TRAINERTYPE_NORMAL
+	db  7, MAGNEMITE
 	db 11, VOLTORB
-	db 7, MAGNEMITE
-	db 9, MAGNEMITE
-
+	db  7, MAGNEMITE
+	db  9, MAGNEMITE
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (11)
-	db "RUSS@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RUSS@", TRAINERTYPE_NORMAL
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
 	db 27, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (12)
-	db "NORTON@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 30, PORYGON
-		db CONVERSION
-		db CONVERSION2
-		db RECOVER
-		db TRI_ATTACK
-
+	db "NORTON@", TRAINERTYPE_MOVES
+	db 30, PORYGON,    CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (13)
-	db "HUGH@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 39, SEADRA
-		db SMOKESCREEN
-		db TWISTER
-		db SURF
-		db WATERFALL
-
+	db "HUGH@", TRAINERTYPE_MOVES
+	db 39, SEADRA,     SMOKESCREEN, TWISTER, SURF, WATERFALL
 	db -1 ; end
 
-; ================
-
 	; SUPER_NERD (14)
-	db "MARKUS@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 19, SLOWPOKE
-		db CURSE
-		db WATER_GUN
-		db GROWL
-		db STRENGTH
-
+	db "MARKUS@", TRAINERTYPE_MOVES
+	db 19, SLOWPOKE,   CURSE, WATER_GUN, GROWL, STRENGTH
 	db -1 ; end
 
-; ================
-; ================================
-
-
 Rival2Group:
-; ================================
-; ================
-
 	; RIVAL2 (1)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 41, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
-
-	db 42, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 41, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
-
-	db 43, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
-
-	db 43, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-
-	db 45, MEGANIUM
-		db RAZOR_LEAF
-		db POISONPOWDER
-		db BODY_SLAM
-		db LIGHT_SCREEN
-
+	db "?@", TRAINERTYPE_MOVES
+	db 41, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 42, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 41, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 43, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 43, ALAKAZAM,   DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
+	db 45, MEGANIUM,   RAZOR_LEAF, POISONPOWDER, BODY_SLAM, LIGHT_SCREEN
 	db -1 ; end
 
-; ================
-
 	; RIVAL2 (2)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 41, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
-
-	db 42, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 41, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
-
-	db 43, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
-
-	db 43, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-
-	db 45, TYPHLOSION
-		db SMOKESCREEN
-		db QUICK_ATTACK
-		db FLAME_WHEEL
-		db SWIFT
-
+	db "?@", TRAINERTYPE_MOVES
+	db 41, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 42, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 41, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 43, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 43, ALAKAZAM,   DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
+	db 45, TYPHLOSION, SMOKESCREEN, QUICK_ATTACK, FLAME_WHEEL, SWIFT
 	db -1 ; end
 
-; ================
-
 	; RIVAL2 (3)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 41, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
-
-	db 42, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 41, MAGNETON
-		db THUNDERSHOCK
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
-
-	db 43, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
-
-	db 43, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-
-	db 45, FERALIGATR
-		db RAGE
-		db WATER_GUN
-		db SCARY_FACE
-		db SLASH
-
+	db "?@", TRAINERTYPE_MOVES
+	db 41, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 42, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
+	db 41, MAGNETON,   THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 43, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 43, ALAKAZAM,   DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M
+	db 45, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH
 	db -1 ; end
 
-; ================
-
 	; RIVAL2 (4)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 45, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
-
-	db 48, CROBAT
-		db TOXIC
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 45, MAGNETON
-		db THUNDER
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
-
-	db 46, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
-
-	db 46, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
-
-	db 50, MEGANIUM
-		db GIGA_DRAIN
-		db BODY_SLAM
-		db LIGHT_SCREEN
-		db SAFEGUARD
-
+	db "?@", TRAINERTYPE_MOVES
+	db 45, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 48, CROBAT,     TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
+	db 45, MAGNETON,   THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 46, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 46, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
+	db 50, MEGANIUM,   GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD
 	db -1 ; end
 
-; ================
-
 	; RIVAL2 (5)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 45, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
-
-	db 48, CROBAT
-		db TOXIC
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 45, MAGNETON
-		db THUNDER
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
-
-	db 46, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
-
-	db 46, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
-
-	db 50, TYPHLOSION
-		db SMOKESCREEN
-		db QUICK_ATTACK
-		db FIRE_BLAST
-		db SWIFT
-
+	db "?@", TRAINERTYPE_MOVES
+	db 45, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 48, CROBAT,     TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
+	db 45, MAGNETON,   THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 46, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 46, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
+	db 50, TYPHLOSION, SMOKESCREEN, QUICK_ATTACK, FIRE_BLAST, SWIFT
 	db -1 ; end
 
-; ================
-
 	; RIVAL2 (6)
-	db "?@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 45, SNEASEL
-		db QUICK_ATTACK
-		db SCREECH
-		db FAINT_ATTACK
-		db FURY_CUTTER
-
-	db 48, CROBAT
-		db TOXIC
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
-	db 45, MAGNETON
-		db THUNDER
-		db SONICBOOM
-		db THUNDER_WAVE
-		db SWIFT
-
-	db 46, GENGAR
-		db MEAN_LOOK
-		db CURSE
-		db SHADOW_BALL
-		db CONFUSE_RAY
-
-	db 46, ALAKAZAM
-		db RECOVER
-		db FUTURE_SIGHT
-		db PSYCHIC_M
-		db REFLECT
-
-	db 50, FERALIGATR
-		db SURF
-		db RAIN_DANCE
-		db SLASH
-		db SCREECH
-
+	db "?@", TRAINERTYPE_MOVES
+	db 45, SNEASEL,    QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER
+	db 48, CROBAT,     TOXIC, BITE, CONFUSE_RAY, WING_ATTACK
+	db 45, MAGNETON,   THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT
+	db 46, GENGAR,     MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY
+	db 46, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
+	db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH
 	db -1 ; end
 
-; ================
-; ================================
-
-
 GuitaristGroup:
-; ================================
-; ================
-
 	; GUITARIST (1)
-	db "CLYDE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CLYDE@", TRAINERTYPE_NORMAL
 	db 34, ELECTABUZZ
-
 	db -1 ; end
 
-; ================
-
 	; GUITARIST (2)
-	db "VINCENT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "VINCENT@", TRAINERTYPE_NORMAL
 	db 27, MAGNEMITE
 	db 33, VOLTORB
 	db 32, MAGNEMITE
 	db 32, MAGNEMITE
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 HikerGroup:
-; ================================
-; ================
-
 	; HIKER (1)
-	db "ANTHONY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ANTHONY@", TRAINERTYPE_NORMAL
 	db 16, GEODUDE
 	db 18, MACHAMP
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (2)
-	db "RUSSELL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 4, GEODUDE
-	db 6, GEODUDE
-	db 8, GEODUDE
-
+	db "RUSSELL@", TRAINERTYPE_NORMAL
+	db  4, GEODUDE
+	db  6, GEODUDE
+	db  8, GEODUDE
 	db -1 ; end
 
-; ================
-
 	; HIKER (3)
-	db "PHILLIP@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "PHILLIP@", TRAINERTYPE_NORMAL
 	db 23, GEODUDE
 	db 23, GEODUDE
 	db 23, GRAVELER
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (4)
-	db "LEONARD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LEONARD@", TRAINERTYPE_NORMAL
 	db 23, GEODUDE
 	db 25, MACHOP
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (5)
-	db "ANTHONY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ANTHONY@", TRAINERTYPE_NORMAL
 	db 11, GEODUDE
 	db 11, MACHOP
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (6)
-	db "BENJAMIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BENJAMIN@", TRAINERTYPE_NORMAL
 	db 14, DIGLETT
 	db 14, GEODUDE
 	db 16, DUGTRIO
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (7)
-	db "ERIK@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ERIK@", TRAINERTYPE_NORMAL
 	db 24, MACHOP
 	db 27, GRAVELER
 	db 27, MACHOP
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (8)
-	db "MICHAEL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MICHAEL@", TRAINERTYPE_NORMAL
 	db 25, GEODUDE
 	db 25, GRAVELER
 	db 25, GOLEM
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (9)
-	db "PARRY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "PARRY@", TRAINERTYPE_NORMAL
 	db 35, ONIX
 	db 33, SWINUB
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (10)
-	db "TIMOTHY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 27, DIGLETT
-		db MAGNITUDE
-		db DIG
-		db SAND_ATTACK
-		db SLASH
-
-	db 27, DUGTRIO
-		db MAGNITUDE
-		db DIG
-		db SAND_ATTACK
-		db SLASH
-
+	db "TIMOTHY@", TRAINERTYPE_MOVES
+	db 27, DIGLETT,    MAGNITUDE, DIG, SAND_ATTACK, SLASH
+	db 27, DUGTRIO,    MAGNITUDE, DIG, SAND_ATTACK, SLASH
 	db -1 ; end
 
-; ================
-
 	; HIKER (11)
-	db "BAILEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BAILEY@", TRAINERTYPE_NORMAL
 	db 13, GEODUDE
 	db 13, GEODUDE
 	db 13, GEODUDE
 	db 13, GEODUDE
 	db 13, GEODUDE
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (12)
-	db "ANTHONY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ANTHONY@", TRAINERTYPE_NORMAL
 	db 25, GRAVELER
 	db 27, GRAVELER
 	db 29, MACHOKE
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (13)
-	db "TIM@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TIM@", TRAINERTYPE_NORMAL
 	db 31, GRAVELER
 	db 31, GRAVELER
 	db 31, GRAVELER
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (14)
-	db "NOLAND@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "NOLAND@", TRAINERTYPE_NORMAL
 	db 31, SANDSLASH
 	db 33, GOLEM
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (15)
-	db "SIDNEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SIDNEY@", TRAINERTYPE_NORMAL
 	db 34, DUGTRIO
 	db 32, ONIX
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (16)
-	db "KENNY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KENNY@", TRAINERTYPE_NORMAL
 	db 27, SANDSLASH
 	db 29, GRAVELER
 	db 31, GOLEM
 	db 29, GRAVELER
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (17)
-	db "JIM@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JIM@", TRAINERTYPE_NORMAL
 	db 35, MACHAMP
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (18)
-	db "DANIEL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DANIEL@", TRAINERTYPE_NORMAL
 	db 11, ONIX
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (19)
-	db "PARRY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 35, PILOSWINE
-		db EARTHQUAKE
-		db BLIZZARD
-		db REST
-		db TAKE_DOWN
-
-	db 35, DUGTRIO
-		db MAGNITUDE
-		db DIG
-		db MUD_SLAP
-		db SLASH
-
-	db 38, STEELIX
-		db DIG
-		db IRON_TAIL
-		db SANDSTORM
-		db SLAM
-
+	db "PARRY@", TRAINERTYPE_MOVES
+	db 35, PILOSWINE,  EARTHQUAKE, BLIZZARD, REST, TAKE_DOWN
+	db 35, DUGTRIO,    MAGNITUDE, DIG, MUD_SLAP, SLASH
+	db 38, STEELIX,    DIG, IRON_TAIL, SANDSTORM, SLAM
 	db -1 ; end
 
-; ================
-
 	; HIKER (20)
-	db "PARRY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "PARRY@", TRAINERTYPE_NORMAL
 	db 29, ONIX
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (21)
-	db "ANTHONY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ANTHONY@", TRAINERTYPE_NORMAL
 	db 30, GRAVELER
 	db 30, GRAVELER
 	db 32, MACHOKE
-
 	db -1 ; end
 
-; ================
-
 	; HIKER (22)
-	db "ANTHONY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 34, GRAVELER
-		db MAGNITUDE
-		db SELFDESTRUCT
-		db DEFENSE_CURL
-		db ROLLOUT
-
-	db 36, GOLEM
-		db MAGNITUDE
-		db SELFDESTRUCT
-		db DEFENSE_CURL
-		db ROLLOUT
-
-	db 34, MACHOKE
-		db KARATE_CHOP
-		db VITAL_THROW
-		db HEADBUTT
-		db DIG
-
+	db "ANTHONY@", TRAINERTYPE_MOVES
+	db 34, GRAVELER,   MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
+	db 36, GOLEM,      MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT
+	db 34, MACHOKE,    KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BikerGroup:
-; ================================
-; ================
-
 	; BIKER (1)
-	db "BENNY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BENNY@", TRAINERTYPE_NORMAL
 	db 20, KOFFING
 	db 20, KOFFING
 	db 20, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (2)
-	db "KAZU@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KAZU@", TRAINERTYPE_NORMAL
 	db 20, KOFFING
 	db 20, KOFFING
 	db 20, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (3)
-	db "DWAYNE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DWAYNE@", TRAINERTYPE_NORMAL
 	db 27, KOFFING
 	db 28, KOFFING
 	db 29, KOFFING
 	db 30, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (4)
-	db "HARRIS@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HARRIS@", TRAINERTYPE_NORMAL
 	db 34, FLAREON
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (5)
-	db "ZEKE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ZEKE@", TRAINERTYPE_NORMAL
 	db 32, KOFFING
 	db 32, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (6)
-	db "CHARLES@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CHARLES@", TRAINERTYPE_NORMAL
 	db 30, KOFFING
 	db 30, CHARMELEON
 	db 30, WEEZING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (7)
-	db "RILEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RILEY@", TRAINERTYPE_NORMAL
 	db 34, WEEZING
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (8)
-	db "JOEL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JOEL@", TRAINERTYPE_NORMAL
 	db 32, MAGMAR
 	db 32, MAGMAR
-
 	db -1 ; end
 
-; ================
-
 	; BIKER (9)
-	db "GLENN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GLENN@", TRAINERTYPE_NORMAL
 	db 28, KOFFING
 	db 30, MAGMAR
 	db 32, WEEZING
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BlaineGroup:
-; ================================
-; ================
-
 	; BLAINE (1)
-	db "BLAINE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 45, MAGCARGO
-		db CURSE
-		db SMOG
-		db FLAMETHROWER
-		db ROCK_SLIDE
-
-	db 45, MAGMAR
-		db THUNDERPUNCH
-		db FIRE_PUNCH
-		db SUNNY_DAY
-		db CONFUSE_RAY
-
-	db 50, RAPIDASH
-		db QUICK_ATTACK
-		db FIRE_SPIN
-		db FURY_ATTACK
-		db FIRE_BLAST
-
+	db "BLAINE@", TRAINERTYPE_MOVES
+	db 45, MAGCARGO,   CURSE, SMOG, FLAMETHROWER, ROCK_SLIDE
+	db 45, MAGMAR,     THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY
+	db 50, RAPIDASH,   QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BurglarGroup:
-; ================================
-; ================
-
 	; BURGLAR (1)
-	db "DUNCAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DUNCAN@", TRAINERTYPE_NORMAL
 	db 23, KOFFING
 	db 25, MAGMAR
 	db 23, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; BURGLAR (2)
-	db "EDDIE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 26, GROWLITHE
-		db ROAR
-		db EMBER
-		db LEER
-		db TAKE_DOWN
-
-	db 24, KOFFING
-		db TACKLE
-		db SMOG
-		db SLUDGE
-		db SMOKESCREEN
-
+	db "EDDIE@", TRAINERTYPE_MOVES
+	db 26, GROWLITHE,  ROAR, EMBER, LEER, TAKE_DOWN
+	db 24, KOFFING,    TACKLE, SMOG, SLUDGE, SMOKESCREEN
 	db -1 ; end
 
-; ================
-
 	; BURGLAR (3)
-	db "COREY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "COREY@", TRAINERTYPE_NORMAL
 	db 25, KOFFING
 	db 28, MAGMAR
 	db 25, KOFFING
 	db 30, KOFFING
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 FirebreatherGroup:
-; ================================
-; ================
-
 	; FIREBREATHER (1)
-	db "OTIS@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "OTIS@", TRAINERTYPE_NORMAL
 	db 29, MAGMAR
 	db 32, WEEZING
 	db 29, MAGMAR
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (2)
-	db "DICK@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DICK@", TRAINERTYPE_NORMAL
 	db 17, CHARMELEON
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (3)
-	db "NED@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "NED@", TRAINERTYPE_NORMAL
 	db 15, KOFFING
 	db 16, GROWLITHE
 	db 15, KOFFING
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (4)
-	db "BURT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BURT@", TRAINERTYPE_NORMAL
 	db 32, KOFFING
 	db 32, SLUGMA
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (5)
-	db "BILL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 6, KOFFING
-	db 6, KOFFING
-
+	db "BILL@", TRAINERTYPE_NORMAL
+	db  6, KOFFING
+	db  6, KOFFING
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (6)
-	db "WALT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "WALT@", TRAINERTYPE_NORMAL
 	db 11, MAGMAR
 	db 13, MAGMAR
-
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (7)
-	db "RAY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 9, VULPIX
-
+	db "RAY@", TRAINERTYPE_NORMAL
+	db  9, VULPIX
 	db -1 ; end
 
-; ================
-
 	; FIREBREATHER (8)
-	db "LYLE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LYLE@", TRAINERTYPE_NORMAL
 	db 28, KOFFING
 	db 31, FLAREON
 	db 28, KOFFING
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 JugglerGroup:
-; ================================
-; ================
-
 	; JUGGLER (1)
-	db "IRWIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 2, VOLTORB
-	db 6, VOLTORB
+	db "IRWIN@", TRAINERTYPE_NORMAL
+	db  2, VOLTORB
+	db  6, VOLTORB
 	db 10, VOLTORB
 	db 14, VOLTORB
-
 	db -1 ; end
 
-; ================
-
 	; JUGGLER (2)
-	db "FRITZ@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "FRITZ@", TRAINERTYPE_NORMAL
 	db 29, MR__MIME
 	db 29, MAGMAR
 	db 29, MACHOKE
-
 	db -1 ; end
 
-; ================
-
 	; JUGGLER (3)
-	db "HORTON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HORTON@", TRAINERTYPE_NORMAL
 	db 33, ELECTRODE
 	db 33, ELECTRODE
 	db 33, ELECTRODE
 	db 33, ELECTRODE
-
 	db -1 ; end
 
-; ================
-
 	; JUGGLER (4)
-	db "IRWIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 6, VOLTORB
+	db "IRWIN@", TRAINERTYPE_NORMAL
+	db  6, VOLTORB
 	db 10, VOLTORB
 	db 14, VOLTORB
 	db 18, VOLTORB
-
 	db -1 ; end
 
-; ================
-
 	; JUGGLER (5)
-	db "IRWIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "IRWIN@", TRAINERTYPE_NORMAL
 	db 18, VOLTORB
 	db 22, VOLTORB
 	db 26, VOLTORB
 	db 30, ELECTRODE
-
 	db -1 ; end
 
-; ================
-
 	; JUGGLER (6)
-	db "IRWIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "IRWIN@", TRAINERTYPE_NORMAL
 	db 18, VOLTORB
 	db 22, VOLTORB
 	db 26, VOLTORB
 	db 30, ELECTRODE
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BlackbeltGroup:
-; ================================
-; ================
-
 	; BLACKBELT_T (1)
-	db "KENJI@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KENJI@", TRAINERTYPE_NORMAL
 	db 27, ONIX
 	db 30, HITMONLEE
 	db 27, ONIX
 	db 32, MACHOKE
-
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (2)
-	db "YOSHI@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 27, HITMONLEE
-		db DOUBLE_KICK
-		db MEDITATE
-		db JUMP_KICK
-		db FOCUS_ENERGY
-
+	db "YOSHI@", TRAINERTYPE_MOVES
+	db 27, HITMONLEE,  DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (3)
-	db "KENJI@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 33, ONIX
-		db BIND
-		db ROCK_THROW
-		db TOXIC
-		db DIG
-
-	db 38, MACHAMP
-		db HEADBUTT
-		db SWAGGER
-		db THUNDERPUNCH
-		db VITAL_THROW
-
-	db 33, STEELIX
-		db EARTHQUAKE
-		db ROCK_THROW
-		db IRON_TAIL
-		db SANDSTORM
-
-	db 36, HITMONLEE
-		db DOUBLE_TEAM
-		db HI_JUMP_KICK
-		db MUD_SLAP
-		db SWIFT
-
+	db "KENJI@", TRAINERTYPE_MOVES
+	db 33, ONIX,       BIND, ROCK_THROW, TOXIC, DIG
+	db 38, MACHAMP,    HEADBUTT, SWAGGER, THUNDERPUNCH, VITAL_THROW
+	db 33, STEELIX,    EARTHQUAKE, ROCK_THROW, IRON_TAIL, SANDSTORM
+	db 36, HITMONLEE,  DOUBLE_TEAM, HI_JUMP_KICK, MUD_SLAP, SWIFT
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (4)
-	db "LAO@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 27, HITMONCHAN
-		db COMET_PUNCH
-		db THUNDERPUNCH
-		db ICE_PUNCH
-		db FIRE_PUNCH
-
+	db "LAO@", TRAINERTYPE_MOVES
+	db 27, HITMONCHAN, COMET_PUNCH, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (5)
-	db "NOB@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 25, MACHOP
-		db LEER
-		db FOCUS_ENERGY
-		db KARATE_CHOP
-		db SEISMIC_TOSS
-
-	db 25, MACHOKE
-		db LEER
-		db KARATE_CHOP
-		db SEISMIC_TOSS
-		db ROCK_SLIDE
-
+	db "NOB@", TRAINERTYPE_MOVES
+	db 25, MACHOP,     LEER, FOCUS_ENERGY, KARATE_CHOP, SEISMIC_TOSS
+	db 25, MACHOKE,    LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (6)
-	db "KIYO@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KIYO@", TRAINERTYPE_NORMAL
 	db 34, HITMONLEE
 	db 34, HITMONCHAN
-
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (7)
-	db "LUNG@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LUNG@", TRAINERTYPE_NORMAL
 	db 23, MANKEY
 	db 23, MANKEY
 	db 25, PRIMEAPE
-
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (8)
-	db "KENJI@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KENJI@", TRAINERTYPE_NORMAL
 	db 28, MACHOKE
-
 	db -1 ; end
 
-; ================
-
 	; BLACKBELT_T (9)
-	db "WAI@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "WAI@", TRAINERTYPE_NORMAL
 	db 30, MACHOKE
 	db 32, MACHOKE
 	db 34, MACHOKE
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 ExecutiveMGroup:
-; ================================
-; ================
-
 	; EXECUTIVEM (1)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 33, HOUNDOUR
-		db EMBER
-		db ROAR
-		db BITE
-		db FAINT_ATTACK
-
-	db 33, KOFFING
-		db TACKLE
-		db SLUDGE
-		db SMOKESCREEN
-		db HAZE
-
-	db 35, HOUNDOOM
-		db EMBER
-		db SMOG
-		db BITE
-		db FAINT_ATTACK
-
+	db "EXECUTIVE@", TRAINERTYPE_MOVES
+	db 33, HOUNDOUR,   EMBER, ROAR, BITE, FAINT_ATTACK
+	db 33, KOFFING,    TACKLE, SLUDGE, SMOKESCREEN, HAZE
+	db 35, HOUNDOOM,   EMBER, SMOG, BITE, FAINT_ATTACK
 	db -1 ; end
 
-; ================
-
 	; EXECUTIVEM (2)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 36, GOLBAT
-		db LEECH_LIFE
-		db BITE
-		db CONFUSE_RAY
-		db WING_ATTACK
-
+	db "EXECUTIVE@", TRAINERTYPE_MOVES
+	db 36, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 	db -1 ; end
 
-; ================
-
 	; EXECUTIVEM (3)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
-
-	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
-
-	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
-
-	db 32, WEEZING
-		db TACKLE
-		db EXPLOSION
-		db SLUDGE
-		db SMOKESCREEN
-
-	db 30, KOFFING
-		db TACKLE
-		db SELFDESTRUCT
-		db SLUDGE
-		db SMOKESCREEN
-
-	db 30, KOFFING
-		db TACKLE
-		db SMOG
-		db SLUDGE
-		db SMOKESCREEN
-
+	db "EXECUTIVE@", TRAINERTYPE_MOVES
+	db 30, KOFFING,    TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 30, KOFFING,    TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 30, KOFFING,    TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 32, WEEZING,    TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN
+	db 30, KOFFING,    TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
+	db 30, KOFFING,    TACKLE, SMOG, SLUDGE, SMOKESCREEN
 	db -1 ; end
 
-; ================
-
 	; EXECUTIVEM (4)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 22, ZUBAT
 	db 24, RATICATE
 	db 22, KOFFING
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 PsychicGroup:
-; ================================
-; ================
-
 	; PSYCHIC_T (1)
-	db "NATHAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "NATHAN@", TRAINERTYPE_NORMAL
 	db 26, GIRAFARIG
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (2)
-	db "FRANKLIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "FRANKLIN@", TRAINERTYPE_NORMAL
 	db 37, KADABRA
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (3)
-	db "HERMAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HERMAN@", TRAINERTYPE_NORMAL
 	db 30, EXEGGCUTE
 	db 30, EXEGGCUTE
 	db 30, EXEGGUTOR
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (4)
-	db "FIDEL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "FIDEL@", TRAINERTYPE_NORMAL
 	db 34, XATU
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (5)
-	db "GREG@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 17, DROWZEE
-		db HYPNOSIS
-		db DISABLE
-		db DREAM_EATER
-		db 0
-
+	db "GREG@", TRAINERTYPE_MOVES
+	db 17, DROWZEE,    HYPNOSIS, DISABLE, DREAM_EATER, NO_MOVE
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (6)
-	db "NORMAN@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 17, SLOWPOKE
-		db TACKLE
-		db GROWL
-		db WATER_GUN
-		db 0
-
-	db 20, SLOWPOKE
-		db CURSE
-		db BODY_SLAM
-		db WATER_GUN
-		db CONFUSION
-
+	db "NORMAN@", TRAINERTYPE_MOVES
+	db 17, SLOWPOKE,   TACKLE, GROWL, WATER_GUN, NO_MOVE
+	db 20, SLOWPOKE,   CURSE, BODY_SLAM, WATER_GUN, CONFUSION
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (7)
-	db "MARK@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 13, ABRA
-		db TELEPORT
-		db FLASH
-		db 0
-		db 0
-
-	db 13, ABRA
-		db TELEPORT
-		db FLASH
-		db 0
-		db 0
-
-	db 15, KADABRA
-		db TELEPORT
-		db KINESIS
-		db CONFUSION
-		db 0
-
+	db "MARK@", TRAINERTYPE_MOVES
+	db 13, ABRA,       TELEPORT, FLASH, NO_MOVE, NO_MOVE
+	db 13, ABRA,       TELEPORT, FLASH, NO_MOVE, NO_MOVE
+	db 15, KADABRA,    TELEPORT, KINESIS, CONFUSION, NO_MOVE
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (8)
-	db "PHIL@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 24, NATU
-		db LEER
-		db NIGHT_SHADE
-		db FUTURE_SIGHT
-		db CONFUSE_RAY
-
-	db 26, KADABRA
-		db DISABLE
-		db PSYBEAM
-		db RECOVER
-		db FUTURE_SIGHT
-
+	db "PHIL@", TRAINERTYPE_MOVES
+	db 24, NATU,       LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY
+	db 26, KADABRA,    DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (9)
-	db "RICHARD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RICHARD@", TRAINERTYPE_NORMAL
 	db 36, ESPEON
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (10)
-	db "GILBERT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GILBERT@", TRAINERTYPE_NORMAL
 	db 30, STARMIE
 	db 30, EXEGGCUTE
 	db 34, GIRAFARIG
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (11)
-	db "JARED@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JARED@", TRAINERTYPE_NORMAL
 	db 32, MR__MIME
 	db 32, EXEGGCUTE
 	db 35, EXEGGCUTE
-
 	db -1 ; end
 
-; ================
-
 	; PSYCHIC_T (12)
-	db "RODNEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RODNEY@", TRAINERTYPE_NORMAL
 	db 29, DROWZEE
 	db 33, HYPNO
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 PicnickerGroup:
-; ================================
-; ================
-
 	; PICNICKER (1)
-	db "LIZ@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 9, NIDORAN_F
-
+	db "LIZ@", TRAINERTYPE_NORMAL
+	db  9, NIDORAN_F
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (2)
-	db "GINA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 9, HOPPIP
-	db 9, HOPPIP
+	db "GINA@", TRAINERTYPE_NORMAL
+	db  9, HOPPIP
+	db  9, HOPPIP
 	db 12, BULBASAUR
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (3)
-	db "BROOKE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 16, PIKACHU
-		db THUNDERSHOCK
-		db GROWL
-		db QUICK_ATTACK
-		db DOUBLE_TEAM
-
+	db "BROOKE@", TRAINERTYPE_MOVES
+	db 16, PIKACHU,    THUNDERSHOCK, GROWL, QUICK_ATTACK, DOUBLE_TEAM
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (4)
-	db "KIM@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KIM@", TRAINERTYPE_NORMAL
 	db 15, VULPIX
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (5)
-	db "CINDY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "CINDY@", TRAINERTYPE_NORMAL
 	db 36, NIDOQUEEN
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (6)
-	db "HOPE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HOPE@", TRAINERTYPE_NORMAL
 	db 34, FLAAFFY
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (7)
-	db "SHARON@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SHARON@", TRAINERTYPE_NORMAL
 	db 31, FURRET
 	db 33, RAPIDASH
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (8)
-	db "DEBRA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DEBRA@", TRAINERTYPE_NORMAL
 	db 33, SEAKING
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (9)
-	db "GINA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GINA@", TRAINERTYPE_NORMAL
 	db 14, HOPPIP
 	db 14, HOPPIP
 	db 17, IVYSAUR
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (10)
-	db "ERIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ERIN@", TRAINERTYPE_NORMAL
 	db 16, PONYTA
 	db 16, PONYTA
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (11)
-	db "LIZ@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LIZ@", TRAINERTYPE_NORMAL
 	db 15, WEEPINBELL
 	db 15, NIDORINA
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (12)
-	db "LIZ@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LIZ@", TRAINERTYPE_NORMAL
 	db 19, WEEPINBELL
 	db 19, NIDORINO
 	db 21, NIDOQUEEN
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (13)
-	db "HEIDI@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HEIDI@", TRAINERTYPE_NORMAL
 	db 32, SKIPLOOM
 	db 32, SKIPLOOM
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (14)
-	db "EDNA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "EDNA@", TRAINERTYPE_NORMAL
 	db 30, NIDORINA
 	db 34, RAICHU
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (15)
-	db "GINA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GINA@", TRAINERTYPE_NORMAL
 	db 26, SKIPLOOM
 	db 26, SKIPLOOM
 	db 29, IVYSAUR
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (16)
-	db "TIFFANY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 31, CLEFAIRY
-		db ENCORE
-		db SING
-		db DOUBLESLAP
-		db MINIMIZE
-
+	db "TIFFANY@", TRAINERTYPE_MOVES
+	db 31, CLEFAIRY,   ENCORE, SING, DOUBLESLAP, MINIMIZE
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (17)
-	db "TIFFANY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 37, CLEFAIRY
-		db ENCORE
-		db DOUBLESLAP
-		db MINIMIZE
-		db METRONOME
-
+	db "TIFFANY@", TRAINERTYPE_MOVES
+	db 37, CLEFAIRY,   ENCORE, DOUBLESLAP, MINIMIZE, METRONOME
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (18)
-	db "ERIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ERIN@", TRAINERTYPE_NORMAL
 	db 32, PONYTA
 	db 32, PONYTA
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (19)
-	db "TANYA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TANYA@", TRAINERTYPE_NORMAL
 	db 37, EXEGGUTOR
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (20)
-	db "TIFFANY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 20, CLEFAIRY
-		db ENCORE
-		db SING
-		db DOUBLESLAP
-		db MINIMIZE
-
+	db "TIFFANY@", TRAINERTYPE_MOVES
+	db 20, CLEFAIRY,   ENCORE, SING, DOUBLESLAP, MINIMIZE
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (21)
-	db "ERIN@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 36, PONYTA
-		db DOUBLE_TEAM
-		db STOMP
-		db FIRE_SPIN
-		db SUNNY_DAY
-
-	db 34, RAICHU
-		db SWIFT
-		db MUD_SLAP
-		db QUICK_ATTACK
-		db THUNDERBOLT
-
-	db 36, PONYTA
-		db DOUBLE_TEAM
-		db STOMP
-		db FIRE_SPIN
-		db SUNNY_DAY
-
+	db "ERIN@", TRAINERTYPE_MOVES
+	db 36, PONYTA,     DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
+	db 34, RAICHU,     SWIFT, MUD_SLAP, QUICK_ATTACK, THUNDERBOLT
+	db 36, PONYTA,     DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (22)
-	db "LIZ@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LIZ@", TRAINERTYPE_NORMAL
 	db 24, WEEPINBELL
 	db 26, NIDORINO
 	db 26, NIDOQUEEN
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (23)
-	db "LIZ@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 30, WEEPINBELL
-		db SLEEP_POWDER
-		db POISONPOWDER
-		db STUN_SPORE
-		db SLUDGE_BOMB
-
-	db 32, NIDOKING
-		db EARTHQUAKE
-		db DOUBLE_KICK
-		db POISON_STING
-		db IRON_TAIL
-
-	db 32, NIDOQUEEN
-		db EARTHQUAKE
-		db DOUBLE_KICK
-		db TAIL_WHIP
-		db BODY_SLAM
-
+	db "LIZ@", TRAINERTYPE_MOVES
+	db 30, WEEPINBELL, SLEEP_POWDER, POISONPOWDER, STUN_SPORE, SLUDGE_BOMB
+	db 32, NIDOKING,   EARTHQUAKE, DOUBLE_KICK, POISON_STING, IRON_TAIL
+	db 32, NIDOQUEEN,  EARTHQUAKE, DOUBLE_KICK, TAIL_WHIP, BODY_SLAM
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (24)
-	db "GINA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GINA@", TRAINERTYPE_NORMAL
 	db 30, SKIPLOOM
 	db 30, SKIPLOOM
 	db 32, IVYSAUR
-
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (25)
-	db "GINA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 33, JUMPLUFF
-		db STUN_SPORE
-		db SUNNY_DAY
-		db LEECH_SEED
-		db COTTON_SPORE
-
-	db 33, JUMPLUFF
-		db SUNNY_DAY
-		db SLEEP_POWDER
-		db LEECH_SEED
-		db COTTON_SPORE
-
-	db 38, VENUSAUR
-		db SOLARBEAM
-		db RAZOR_LEAF
-		db HEADBUTT
-		db MUD_SLAP
-
+	db "GINA@", TRAINERTYPE_MOVES
+	db 33, JUMPLUFF,   STUN_SPORE, SUNNY_DAY, LEECH_SEED, COTTON_SPORE
+	db 33, JUMPLUFF,   SUNNY_DAY, SLEEP_POWDER, LEECH_SEED, COTTON_SPORE
+	db 38, VENUSAUR,   SOLARBEAM, RAZOR_LEAF, HEADBUTT, MUD_SLAP
 	db -1 ; end
 
-; ================
-
 	; PICNICKER (26)
-	db "TIFFANY@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 43, CLEFAIRY
-		db METRONOME
-		db ENCORE
-		db MOONLIGHT
-		db MINIMIZE
-
+	db "TIFFANY@", TRAINERTYPE_MOVES
+	db 43, CLEFAIRY,   METRONOME, ENCORE, MOONLIGHT, MINIMIZE
 	db -1 ; end
 
-; ================
-; ================================
-
-
 CamperGroup:
-; ================================
-; ================
-
 	; CAMPER (1)
-	db "ROLAND@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 9, NIDORAN_M
-
+	db "ROLAND@", TRAINERTYPE_NORMAL
+	db  9, NIDORAN_M
 	db -1 ; end
 
-; ================
-
 	; CAMPER (2)
-	db "TODD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TODD@", TRAINERTYPE_NORMAL
 	db 14, PSYDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (3)
-	db "IVAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "IVAN@", TRAINERTYPE_NORMAL
 	db 10, DIGLETT
 	db 10, ZUBAT
 	db 14, DIGLETT
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (4)
-	db "ELLIOT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ELLIOT@", TRAINERTYPE_NORMAL
 	db 13, SANDSHREW
 	db 15, MARILL
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (5)
-	db "BARRY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BARRY@", TRAINERTYPE_NORMAL
 	db 36, NIDOKING
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (6)
-	db "LLOYD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LLOYD@", TRAINERTYPE_NORMAL
 	db 34, NIDOKING
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (7)
-	db "DEAN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DEAN@", TRAINERTYPE_NORMAL
 	db 33, GOLDUCK
 	db 31, SANDSLASH
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (8)
-	db "SID@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SID@", TRAINERTYPE_NORMAL
 	db 32, DUGTRIO
 	db 29, PRIMEAPE
 	db 29, POLIWRATH
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (9)
-	db "HARVEY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "HARVEY@", TRAINERTYPE_NORMAL
 	db 15, NIDORINO
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (10)
-	db "DALE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DALE@", TRAINERTYPE_NORMAL
 	db 15, NIDORINO
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (11)
-	db "TED@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TED@", TRAINERTYPE_NORMAL
 	db 17, MANKEY
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (12)
-	db "TODD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TODD@", TRAINERTYPE_NORMAL
 	db 17, GEODUDE
 	db 17, GEODUDE
 	db 23, PSYDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (13)
-	db "TODD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TODD@", TRAINERTYPE_NORMAL
 	db 23, GEODUDE
 	db 23, GEODUDE
 	db 26, PSYDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (14)
-	db "THOMAS@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "THOMAS@", TRAINERTYPE_NORMAL
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
 	db 42, GOLDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (15)
-	db "LEROY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "LEROY@", TRAINERTYPE_NORMAL
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
 	db 42, GOLDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (16)
-	db "DAVID@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DAVID@", TRAINERTYPE_NORMAL
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
 	db 42, GOLDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (17)
-	db "JOHN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JOHN@", TRAINERTYPE_NORMAL
 	db 33, GRAVELER
 	db 36, GRAVELER
 	db 40, GOLBAT
 	db 42, GOLDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (18)
-	db "JERRY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JERRY@", TRAINERTYPE_NORMAL
 	db 37, SANDSLASH
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (19)
-	db "SPENCER@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SPENCER@", TRAINERTYPE_NORMAL
 	db 17, SANDSHREW
 	db 17, SANDSLASH
 	db 19, ZUBAT
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (20)
-	db "TODD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "TODD@", TRAINERTYPE_NORMAL
 	db 30, GRAVELER
 	db 30, GRAVELER
 	db 30, SLUGMA
 	db 32, PSYDUCK
-
 	db -1 ; end
 
-; ================
-
 	; CAMPER (21)
-	db "TODD@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 33, GRAVELER
-		db SELFDESTRUCT
-		db ROCK_THROW
-		db HARDEN
-		db MAGNITUDE
-
-	db 33, GRAVELER
-		db SELFDESTRUCT
-		db ROCK_THROW
-		db HARDEN
-		db MAGNITUDE
-
-	db 36, MAGCARGO
-		db ROCK_THROW
-		db HARDEN
-		db AMNESIA
-		db FLAMETHROWER
-
-	db 34, GOLDUCK
-		db DISABLE
-		db PSYCHIC_M
-		db SURF
-		db PSYCH_UP
-
+	db "TODD@", TRAINERTYPE_MOVES
+	db 33, GRAVELER,   SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
+	db 33, GRAVELER,   SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE
+	db 36, MAGCARGO,   ROCK_THROW, HARDEN, AMNESIA, FLAMETHROWER
+	db 34, GOLDUCK,    DISABLE, PSYCHIC_M, SURF, PSYCH_UP
 	db -1 ; end
 
-; ================
-
 	; CAMPER (22)
-	db "QUENTIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "QUENTIN@", TRAINERTYPE_NORMAL
 	db 30, FEAROW
 	db 30, PRIMEAPE
 	db 30, TAUROS
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 ExecutiveFGroup:
-; ================================
-; ================
-
 	; EXECUTIVEF (1)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 32, ARBOK
-		db WRAP
-		db POISON_STING
-		db BITE
-		db GLARE
-
-	db 32, VILEPLUME
-		db ABSORB
-		db SWEET_SCENT
-		db SLEEP_POWDER
-		db ACID
-
-	db 32, MURKROW
-		db PECK
-		db PURSUIT
-		db HAZE
-		db NIGHT_SHADE
-
+	db "EXECUTIVE@", TRAINERTYPE_MOVES
+	db 32, ARBOK,      WRAP, POISON_STING, BITE, GLARE
+	db 32, VILEPLUME,  ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
+	db 32, MURKROW,    PECK, PURSUIT, HAZE, NIGHT_SHADE
 	db -1 ; end
 
-; ================
-
 	; EXECUTIVEF (2)
-	db "EXECUTIVE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 23, ARBOK
-		db WRAP
-		db LEER
-		db POISON_STING
-		db BITE
-
-	db 23, GLOOM
-		db ABSORB
-		db SWEET_SCENT
-		db SLEEP_POWDER
-		db ACID
-
-	db 25, MURKROW
-		db PECK
-		db PURSUIT
-		db HAZE
-		db 0
-
+	db "EXECUTIVE@", TRAINERTYPE_MOVES
+	db 23, ARBOK,      WRAP, LEER, POISON_STING, BITE
+	db 23, GLOOM,      ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
+	db 25, MURKROW,    PECK, PURSUIT, HAZE, NO_MOVE
 	db -1 ; end
 
-; ================
-; ================================
-
-
 SageGroup:
-; ================================
-; ================
-
 	; SAGE (1)
-	db "CHOW@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
-
+	db "CHOW@", TRAINERTYPE_NORMAL
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
 	db -1 ; end
 
-; ================
-
 	; SAGE (2)
-	db "NICO@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
-
+	db "NICO@", TRAINERTYPE_NORMAL
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
 	db -1 ; end
 
-; ================
-
 	; SAGE (3)
-	db "JIN@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 6, BELLSPROUT
-
+	db "JIN@", TRAINERTYPE_NORMAL
+	db  6, BELLSPROUT
 	db -1 ; end
 
-; ================
-
 	; SAGE (4)
-	db "TROY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 7, BELLSPROUT
-	db 7, HOOTHOOT
-
+	db "TROY@", TRAINERTYPE_NORMAL
+	db  7, BELLSPROUT
+	db  7, HOOTHOOT
 	db -1 ; end
 
-; ================
-
 	; SAGE (5)
-	db "JEFFREY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JEFFREY@", TRAINERTYPE_NORMAL
 	db 22, HAUNTER
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (6)
-	db "PING@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "PING@", TRAINERTYPE_NORMAL
 	db 16, GASTLY
 	db 16, GASTLY
 	db 16, GASTLY
 	db 16, GASTLY
 	db 16, GASTLY
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (7)
-	db "EDMOND@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
-	db 3, BELLSPROUT
-
+	db "EDMOND@", TRAINERTYPE_NORMAL
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
+	db  3, BELLSPROUT
 	db -1 ; end
 
-; ================
-
 	; SAGE (8)
-	db "NEAL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 6, BELLSPROUT
-
+	db "NEAL@", TRAINERTYPE_NORMAL
+	db  6, BELLSPROUT
 	db -1 ; end
 
-; ================
-
 	; SAGE (9)
-	db "LI@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 7, BELLSPROUT
-	db 7, BELLSPROUT
+	db "LI@", TRAINERTYPE_NORMAL
+	db  7, BELLSPROUT
+	db  7, BELLSPROUT
 	db 10, HOOTHOOT
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (10)
-	db "GAKU@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GAKU@", TRAINERTYPE_NORMAL
 	db 32, NOCTOWL
 	db 32, FLAREON
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (11)
-	db "MASA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MASA@", TRAINERTYPE_NORMAL
 	db 32, NOCTOWL
 	db 32, JOLTEON
-
 	db -1 ; end
 
-; ================
-
 	; SAGE (12)
-	db "KOJI@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KOJI@", TRAINERTYPE_NORMAL
 	db 32, NOCTOWL
 	db 32, VAPOREON
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 MediumGroup:
-; ================================
-; ================
-
 	; MEDIUM (1)
-	db "MARTHA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MARTHA@", TRAINERTYPE_NORMAL
 	db 18, GASTLY
 	db 20, HAUNTER
 	db 20, GASTLY
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (2)
-	db "GRACE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRACE@", TRAINERTYPE_NORMAL
 	db 20, HAUNTER
 	db 20, HAUNTER
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (3)
-	db "BETHANY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BETHANY@", TRAINERTYPE_NORMAL
 	db 25, HAUNTER
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (4)
-	db "MARGRET@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MARGRET@", TRAINERTYPE_NORMAL
 	db 25, HAUNTER
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (5)
-	db "ETHEL@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ETHEL@", TRAINERTYPE_NORMAL
 	db 25, HAUNTER
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (6)
-	db "REBECCA@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "REBECCA@", TRAINERTYPE_NORMAL
 	db 35, DROWZEE
 	db 35, HYPNO
-
 	db -1 ; end
 
-; ================
-
 	; MEDIUM (7)
-	db "DORIS@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DORIS@", TRAINERTYPE_NORMAL
 	db 34, SLOWPOKE
 	db 36, SLOWBRO
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BoarderGroup:
-; ================================
-; ================
-
 	; BOARDER (1)
-	db "RONALD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "RONALD@", TRAINERTYPE_NORMAL
 	db 24, SEEL
 	db 25, DEWGONG
 	db 24, SEEL
-
 	db -1 ; end
 
-; ================
-
 	; BOARDER (2)
-	db "BRAD@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "BRAD@", TRAINERTYPE_NORMAL
 	db 26, SWINUB
 	db 26, SWINUB
-
 	db -1 ; end
 
-; ================
-
 	; BOARDER (3)
-	db "DOUGLAS@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DOUGLAS@", TRAINERTYPE_NORMAL
 	db 24, SHELLDER
 	db 25, CLOYSTER
 	db 24, SHELLDER
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 PokefanMGroup:
-; ================================
-; ================
-
 	; POKEFANM (1)
-	db "WILLIAM@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 14, RAICHU, BERRY
-
+	db "WILLIAM@", TRAINERTYPE_ITEM
+	db 14, RAICHU,     BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (2)
-	db "DEREK@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 17, PIKACHU, BERRY
-
+	db "DEREK@", TRAINERTYPE_ITEM
+	db 17, PIKACHU,    BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (3)
-	db "ROBERT@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 33, QUAGSIRE, BERRY
-
+	db "ROBERT@", TRAINERTYPE_ITEM
+	db 33, QUAGSIRE,   BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (4)
-	db "JOSHUA@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 23, PIKACHU, BERRY
-	db 23, PIKACHU, BERRY
-	db 23, PIKACHU, BERRY
-	db 23, PIKACHU, BERRY
-	db 23, PIKACHU, BERRY
-	db 23, PIKACHU, BERRY
-
+	db "JOSHUA@", TRAINERTYPE_ITEM
+	db 23, PIKACHU,    BERRY
+	db 23, PIKACHU,    BERRY
+	db 23, PIKACHU,    BERRY
+	db 23, PIKACHU,    BERRY
+	db 23, PIKACHU,    BERRY
+	db 23, PIKACHU,    BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (5)
-	db "CARTER@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 29, BULBASAUR, BERRY
+	db "CARTER@", TRAINERTYPE_ITEM
+	db 29, BULBASAUR,  BERRY
 	db 29, CHARMANDER, BERRY
-	db 29, SQUIRTLE, BERRY
-
+	db 29, SQUIRTLE,   BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (6)
-	db "TREVOR@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 33, PSYDUCK, BERRY
-
+	db "TREVOR@", TRAINERTYPE_ITEM
+	db 33, PSYDUCK,    BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (7)
-	db "BRANDON@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 13, SNUBBULL, BERRY
-
+	db "BRANDON@", TRAINERTYPE_ITEM
+	db 13, SNUBBULL,   BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (8)
-	db "JEREMY@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 28, MEOWTH, BERRY
-	db 28, MEOWTH, BERRY
-	db 28, MEOWTH, BERRY
-
+	db "JEREMY@", TRAINERTYPE_ITEM
+	db 28, MEOWTH,     BERRY
+	db 28, MEOWTH,     BERRY
+	db 28, MEOWTH,     BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (9)
-	db "COLIN@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 32, DELIBIRD, BERRY
-
+	db "COLIN@", TRAINERTYPE_ITEM
+	db 32, DELIBIRD,   BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (10)
-	db "DEREK@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 19, PIKACHU, BERRY
-
+	db "DEREK@", TRAINERTYPE_ITEM
+	db 19, PIKACHU,    BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (11)
-	db "DEREK@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 36, PIKACHU, BERRY
-
+	db "DEREK@", TRAINERTYPE_ITEM
+	db 36, PIKACHU,    BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (12)
-	db "ALEX@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 29, NIDOKING, BERRY
-	db 29, SLOWKING, BERRY
-	db 29, SEAKING, BERRY
-
+	db "ALEX@", TRAINERTYPE_ITEM
+	db 29, NIDOKING,   BERRY
+	db 29, SLOWKING,   BERRY
+	db 29, SEAKING,    BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (13)
-	db "REX@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 35, PHANPY, BERRY
-
+	db "REX@", TRAINERTYPE_ITEM
+	db 35, PHANPY,     BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANM (14)
-	db "ALLAN@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 35, TEDDIURSA, BERRY
-
+	db "ALLAN@", TRAINERTYPE_ITEM
+	db 35, TEDDIURSA,  BERRY
 	db -1 ; end
 
-; ================
-; ================================
-
-
 KimonoGirlGroup:
-; ================================
-; ================
-
 	; KIMONO_GIRL (1)
-	db "NAOKO@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "NAOKO@", TRAINERTYPE_NORMAL
 	db 20, SKIPLOOM
 	db 20, VULPIX
 	db 18, SKIPLOOM
-
 	db -1 ; end
 
-; ================
-
 	; KIMONO_GIRL (2)
-	db "NAOKO@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "NAOKO@", TRAINERTYPE_NORMAL
 	db 17, FLAREON
-
 	db -1 ; end
 
-; ================
-
 	; KIMONO_GIRL (3)
-	db "SAYO@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "SAYO@", TRAINERTYPE_NORMAL
 	db 17, ESPEON
-
 	db -1 ; end
 
-; ================
-
 	; KIMONO_GIRL (4)
-	db "ZUKI@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "ZUKI@", TRAINERTYPE_NORMAL
 	db 17, UMBREON
-
 	db -1 ; end
 
-; ================
-
 	; KIMONO_GIRL (5)
-	db "KUNI@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KUNI@", TRAINERTYPE_NORMAL
 	db 17, VAPOREON
-
 	db -1 ; end
 
-; ================
-
 	; KIMONO_GIRL (6)
-	db "MIKI@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MIKI@", TRAINERTYPE_NORMAL
 	db 17, JOLTEON
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 TwinsGroup:
-; ================================
-; ================
-
 	; TWINS (1)
-	db "AMY & MAY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "AMY & MAY@", TRAINERTYPE_NORMAL
 	db 10, SPINARAK
 	db 10, LEDYBA
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (2)
-	db "ANN & ANNE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 16, CLEFAIRY
-		db GROWL
-		db ENCORE
-		db DOUBLESLAP
-		db METRONOME
-
-	db 16, JIGGLYPUFF
-		db SING
-		db DEFENSE_CURL
-		db POUND
-		db DISABLE
-
+	db "ANN & ANNE@", TRAINERTYPE_MOVES
+	db 16, CLEFAIRY,   GROWL, ENCORE, DOUBLESLAP, METRONOME
+	db 16, JIGGLYPUFF, SING, DEFENSE_CURL, POUND, DISABLE
 	db -1 ; end
 
-; ================
-
 	; TWINS (3)
-	db "ANN & ANNE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 16, JIGGLYPUFF
-		db SING
-		db DEFENSE_CURL
-		db POUND
-		db DISABLE
-
-	db 16, CLEFAIRY
-		db GROWL
-		db ENCORE
-		db DOUBLESLAP
-		db METRONOME
-
+	db "ANN & ANNE@", TRAINERTYPE_MOVES
+	db 16, JIGGLYPUFF, SING, DEFENSE_CURL, POUND, DISABLE
+	db 16, CLEFAIRY,   GROWL, ENCORE, DOUBLESLAP, METRONOME
 	db -1 ; end
 
-; ================
-
 	; TWINS (4)
-	db "AMY & MAY@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "AMY & MAY@", TRAINERTYPE_NORMAL
 	db 10, LEDYBA
 	db 10, SPINARAK
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (5)
-	db "JO & ZOE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JO & ZOE@", TRAINERTYPE_NORMAL
 	db 35, VICTREEBEL
 	db 35, VILEPLUME
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (6)
-	db "JO & ZOE@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "JO & ZOE@", TRAINERTYPE_NORMAL
 	db 35, VILEPLUME
 	db 35, VICTREEBEL
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (7)
-	db "MEG & PEG@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MEG & PEG@", TRAINERTYPE_NORMAL
 	db 31, TEDDIURSA
 	db 31, PHANPY
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (8)
-	db "MEG & PEG@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "MEG & PEG@", TRAINERTYPE_NORMAL
 	db 31, PHANPY
 	db 31, TEDDIURSA
-
 	db -1 ; end
 
-; ================
-
 	; TWINS (9)
-	db "LEA & PIA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 35, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db FLAMETHROWER
-		db HEADBUTT
-
-	db 35, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db ICE_BEAM
-		db HEADBUTT
-
+	db "LEA & PIA@", TRAINERTYPE_MOVES
+	db 35, DRATINI,    THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
+	db 35, DRATINI,    THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
 	db -1 ; end
 
-; ================
-
 	; TWINS (10)
-	db "LEA & PIA@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 38, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db ICE_BEAM
-		db HEADBUTT
-
-	db 38, DRATINI
-		db THUNDER_WAVE
-		db TWISTER
-		db FLAMETHROWER
-		db HEADBUTT
-
+	db "LEA & PIA@", TRAINERTYPE_MOVES
+	db 38, DRATINI,    THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
+	db 38, DRATINI,    THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
 	db -1 ; end
 
-; ================
-; ================================
-
-
 PokefanFGroup:
-; ================================
-; ================
-
 	; POKEFANF (1)
-	db "BEVERLY@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 14, SNUBBULL, BERRY
-
+	db "BEVERLY@", TRAINERTYPE_ITEM
+	db 14, SNUBBULL,   BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANF (2)
-	db "RUTH@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 17, PIKACHU, BERRY
-
+	db "RUTH@", TRAINERTYPE_ITEM
+	db 17, PIKACHU,    BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANF (3)
-	db "BEVERLY@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 18, SNUBBULL, BERRY
-
+	db "BEVERLY@", TRAINERTYPE_ITEM
+	db 18, SNUBBULL,   BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANF (4)
-	db "BEVERLY@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 30, GRANBULL, BERRY
-
+	db "BEVERLY@", TRAINERTYPE_ITEM
+	db 30, GRANBULL,   BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANF (5)
-	db "GEORGIA@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 23, SENTRET, BERRY
-	db 23, SENTRET, BERRY
-	db 23, SENTRET, BERRY
-	db 28, FURRET, BERRY
-	db 23, SENTRET, BERRY
-
+	db "GEORGIA@", TRAINERTYPE_ITEM
+	db 23, SENTRET,    BERRY
+	db 23, SENTRET,    BERRY
+	db 23, SENTRET,    BERRY
+	db 28, FURRET,     BERRY
+	db 23, SENTRET,    BERRY
 	db -1 ; end
 
-; ================
-
 	; POKEFANF (6)
-	db "JAIME@"
-	db TRAINERTYPE_ITEM
-
-	; party
-	db 16, MEOWTH, BERRY
-
+	db "JAIME@", TRAINERTYPE_ITEM
+	db 16, MEOWTH,     BERRY
 	db -1 ; end
 
-; ================
-; ================================
-
-
 RedGroup:
-; ================================
-; ================
-
 	; RED (1)
-	db "RED@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 81, PIKACHU
-		db CHARM
-		db QUICK_ATTACK
-		db THUNDERBOLT
-		db THUNDER
-
-	db 73, ESPEON
-		db MUD_SLAP
-		db REFLECT
-		db SWIFT
-		db PSYCHIC_M
-
-	db 75, SNORLAX
-		db AMNESIA
-		db SNORE
-		db REST
-		db BODY_SLAM
-
-	db 77, VENUSAUR
-		db SUNNY_DAY
-		db GIGA_DRAIN
-		db SYNTHESIS
-		db SOLARBEAM
-
-	db 77, CHARIZARD
-		db FLAMETHROWER
-		db WING_ATTACK
-		db SLASH
-		db FIRE_SPIN
-
-	db 77, BLASTOISE
-		db RAIN_DANCE
-		db SURF
-		db BLIZZARD
-		db WHIRLPOOL
-
+	db "RED@", TRAINERTYPE_MOVES
+	db 81, PIKACHU,    CHARM, QUICK_ATTACK, THUNDERBOLT, THUNDER
+	db 73, ESPEON,     MUD_SLAP, REFLECT, SWIFT, PSYCHIC_M
+	db 75, SNORLAX,    AMNESIA, SNORE, REST, BODY_SLAM
+	db 77, VENUSAUR,   SUNNY_DAY, GIGA_DRAIN, SYNTHESIS, SOLARBEAM
+	db 77, CHARIZARD,  FLAMETHROWER, WING_ATTACK, SLASH, FIRE_SPIN
+	db 77, BLASTOISE,  RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
 	db -1 ; end
 
-; ================
-; ================================
-
-
 BlueGroup:
-; ================================
-; ================
-
 	; BLUE (1)
-	db "BLUE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 56, PIDGEOT
-		db QUICK_ATTACK
-		db WHIRLWIND
-		db WING_ATTACK
-		db MIRROR_MOVE
-
-	db 54, ALAKAZAM
-		db DISABLE
-		db RECOVER
-		db PSYCHIC_M
-		db REFLECT
-
-	db 56, RHYDON
-		db FURY_ATTACK
-		db SANDSTORM
-		db ROCK_SLIDE
-		db EARTHQUAKE
-
-	db 58, GYARADOS
-		db TWISTER
-		db HYDRO_PUMP
-		db RAIN_DANCE
-		db HYPER_BEAM
-
-	db 58, EXEGGUTOR
-		db SUNNY_DAY
-		db LEECH_SEED
-		db EGG_BOMB
-		db SOLARBEAM
-
-	db 58, ARCANINE
-		db ROAR
-		db SWIFT
-		db FLAMETHROWER
-		db EXTREMESPEED
-
+	db "BLUE@", TRAINERTYPE_MOVES
+	db 56, PIDGEOT,    QUICK_ATTACK, WHIRLWIND, WING_ATTACK, MIRROR_MOVE
+	db 54, ALAKAZAM,   DISABLE, RECOVER, PSYCHIC_M, REFLECT
+	db 56, RHYDON,     FURY_ATTACK, SANDSTORM, ROCK_SLIDE, EARTHQUAKE
+	db 58, GYARADOS,   TWISTER, HYDRO_PUMP, RAIN_DANCE, HYPER_BEAM
+	db 58, EXEGGUTOR,  SUNNY_DAY, LEECH_SEED, EGG_BOMB, SOLARBEAM
+	db 58, ARCANINE,   ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
 	db -1 ; end
 
-; ================
-; ================================
-
-
 OfficerGroup:
-; ================================
-; ================
-
 	; OFFICER (1)
-	db "KEITH@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "KEITH@", TRAINERTYPE_NORMAL
 	db 17, GROWLITHE
-
 	db -1 ; end
 
-; ================
-
 	; OFFICER (2)
-	db "DIRK@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "DIRK@", TRAINERTYPE_NORMAL
 	db 14, GROWLITHE
 	db 14, GROWLITHE
-
 	db -1 ; end
 
-; ================
-; ================================
-
-
 GruntFGroup:
-; ================================
-; ================
-
 	; GRUNTF (1)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
-	db 9, ZUBAT
+	db "GRUNT@", TRAINERTYPE_NORMAL
+	db  9, ZUBAT
 	db 11, EKANS
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTF (2)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 26, ARBOK
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTF (3)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 25, GLOOM
 	db 25, GLOOM
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTF (4)
-	db "GRUNT@"
-	db TRAINERTYPE_NORMAL
-
-	; party
+	db "GRUNT@", TRAINERTYPE_NORMAL
 	db 21, EKANS
 	db 23, ODDISH
 	db 21, EKANS
 	db 24, GLOOM
-
 	db -1 ; end
 
-; ================
-
 	; GRUNTF (5)
-	db "GRUNT@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 18, EKANS
-		db WRAP
-		db LEER
-		db POISON_STING
-		db BITE
-
-	db 18, GLOOM
-		db ABSORB
-		db SWEET_SCENT
-		db STUN_SPORE
-		db SLEEP_POWDER
-
+	db "GRUNT@", TRAINERTYPE_MOVES
+	db 18, EKANS,      WRAP, LEER, POISON_STING, BITE
+	db 18, GLOOM,      ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
 	db -1 ; end
 
-; ================
-; ================================
-
-
 MysticalmanGroup:
-; ================================
-; ================
-
 	; MYSTICALMAN (1)
-	db "EUSINE@"
-	db TRAINERTYPE_MOVES
-
-	; party
-
-	db 23, DROWZEE
-		db DREAM_EATER
-		db HYPNOSIS
-		db DISABLE
-		db CONFUSION
-
-	db 23, HAUNTER
-		db LICK
-		db HYPNOSIS
-		db MEAN_LOOK
-		db CURSE
-
-	db 25, ELECTRODE
-		db SCREECH
-		db SONICBOOM
-		db THUNDER
-		db ROLLOUT
-
+	db "EUSINE@", TRAINERTYPE_MOVES
+	db 23, DROWZEE,    DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION
+	db 23, HAUNTER,    LICK, HYPNOSIS, MEAN_LOOK, CURSE
+	db 25, ELECTRODE,  SCREECH, SONICBOOM, THUNDER, ROLLOUT
 	db -1 ; end
-
-; ================
-; ================================
diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm
index 887544126..45ba65b85 100644
--- a/data/trainers/party_pointers.asm
+++ b/data/trainers/party_pointers.asm
@@ -1,6 +1,6 @@
 ; Groups are defined in data/trainers/parties.asm.
 
-TrainerGroups: ; 0x39999
+TrainerGroups:
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
 	dw FalknerGroup
 	dw WhitneyGroup
diff --git a/data/types/badge_type_boosts.asm b/data/types/badge_type_boosts.asm
new file mode 100644
index 000000000..b212ef22e
--- /dev/null
+++ b/data/types/badge_type_boosts.asm
@@ -0,0 +1,21 @@
+BadgeTypeBoosts:
+; entries correspond to wJohtoBadges constants
+	db FLYING   ; ZEPHYRBADGE
+	db BUG      ; HIVEBADGE
+	db NORMAL   ; PLAINBADGE
+	db GHOST    ; FOGBADGE
+	db STEEL    ; MINERALBADGE
+	db FIGHTING ; STORMBADGE
+	db ICE      ; GLACIERBADGE
+	db DRAGON   ; RISINGBADGE
+	; fallthrough
+; entries correspond to wKantoBadges constants
+	db ROCK     ; BOULDERBADGE
+	db WATER    ; CASCADEBADGE
+	db ELECTRIC ; THUNDERBADGE
+	db GRASS    ; RAINBOWBADGE
+	db POISON   ; SOULBADGE
+	db PSYCHIC  ; MARSHBADGE
+	db FIRE     ; VOLCANOBADGE
+	db GROUND   ; EARTHBADGE
+	db -1 ; end
diff --git a/data/types/names.asm b/data/types/names.asm
index ca810aea3..62d8e13bf 100644
--- a/data/types/names.asm
+++ b/data/types/names.asm
@@ -1,4 +1,4 @@
-TypeNames: ; 5097b
+TypeNames:
 ; entries correspond to types (see constants/type_constants.asm)
 	dw Normal
 	dw Fighting
@@ -48,5 +48,3 @@ Ghost:     db "GHOST@"
 Steel:     db "STEEL@"
 Dragon:    db "DRAGON@"
 Dark:      db "DARK@"
-
-; 50a28
diff --git a/data/types/search_strings.asm b/data/types/search_strings.asm
index 7e6eb71c2..d03d2786b 100644
--- a/data/types/search_strings.asm
+++ b/data/types/search_strings.asm
@@ -1,4 +1,4 @@
-PokedexTypeSearchStrings: ; 40fe4
+PokedexTypeSearchStrings:
 ; entries correspond with PokedexTypeSearchConversionTable (see data/types/search_types.asm)
 	db "  ----  @"
 	db " NORMAL @"
@@ -18,4 +18,3 @@ PokedexTypeSearchStrings: ; 40fe4
 	db " DRAGON @"
 	db "  DARK  @"
 	db " STEEL  @"
-; 41086
diff --git a/data/types/search_types.asm b/data/types/search_types.asm
index 2c5dbd4f4..a87ec0993 100644
--- a/data/types/search_types.asm
+++ b/data/types/search_types.asm
@@ -1,4 +1,4 @@
-PokedexTypeSearchConversionTable: ; 410f6
+PokedexTypeSearchConversionTable:
 ; entries correspond with PokedexTypeSearchStrings (see data/types/search_strings.asm)
 	db NORMAL
 	db FIRE
@@ -17,4 +17,3 @@ PokedexTypeSearchConversionTable: ; 410f6
 	db DRAGON
 	db DARK
 	db STEEL
-; 41107
diff --git a/data/battle/type_boost_items.asm b/data/types/type_boost_items.asm
index 3b7231a59..5b965c4fb 100644
--- a/data/battle/type_boost_items.asm
+++ b/data/types/type_boost_items.asm
@@ -1,4 +1,4 @@
-TypeBoostItems: ; 35703
+TypeBoostItems:
 	db HELD_NORMAL_BOOST,   NORMAL   ; PINK_BOW/POLKADOT_BOW
 	db HELD_FIGHTING_BOOST, FIGHTING ; BLACKBELT
 	db HELD_FLYING_BOOST,   FLYING   ; SHARP_BEAK
@@ -17,4 +17,3 @@ TypeBoostItems: ; 35703
 	db HELD_DARK_BOOST,     DARK     ; BLACKGLASSES
 	db HELD_STEEL_BOOST,    STEEL    ; METAL_COAT
 	db -1
-; 35726
diff --git a/data/battle/type_matchups.asm b/data/types/type_matchups.asm
index 90e38ae2c..04bfc3cd1 100644
--- a/data/battle/type_matchups.asm
+++ b/data/types/type_matchups.asm
@@ -1,4 +1,4 @@
-TypeMatchups: ; 34bb1
+TypeMatchups:
 	;  attacker,  defender,  *=
 	db NORMAL,    ROCK,      NOT_VERY_EFFECTIVE
 	db NORMAL,    STEEL,     NOT_VERY_EFFECTIVE
@@ -109,11 +109,10 @@ TypeMatchups: ; 34bb1
 	db STEEL,     ROCK,      SUPER_EFFECTIVE
 	db STEEL,     STEEL,     NOT_VERY_EFFECTIVE
 
-	db -2 ; end
+	db -2 ; end (with Foresight)
 
 ; Foresight removes Ghost's immunities.
 	db NORMAL,    GHOST,     NO_EFFECT
 	db FIGHTING,  GHOST,     NO_EFFECT
 
-	db -1 ; end (with Foresight)
-; 34cfd
+	db -1 ; end
diff --git a/data/unown_words.asm b/data/unown_words.asm
deleted file mode 100644
index ea8c4b2a8..000000000
--- a/data/unown_words.asm
+++ /dev/null
@@ -1,67 +0,0 @@
-unownword: MACRO
-x = 1
-	rept STRLEN(\1)
-	db STRSUB(\1, x, 1) - $40
-x = x + 1
-	endr
-	db -1
-ENDM
-
-UnownWords: ; fba5a
-; entries correspond to Unown forms
-	dw UnownWord1
-	dw UnownWord1
-	dw UnownWord2
-	dw UnownWord3
-	dw UnownWord4
-	dw UnownWord5
-	dw UnownWord6
-	dw UnownWord7
-	dw UnownWord8
-	dw UnownWord9
-	dw UnownWord10
-	dw UnownWord11
-	dw UnownWord12
-	dw UnownWord13
-	dw UnownWord14
-	dw UnownWord15
-	dw UnownWord16
-	dw UnownWord17
-	dw UnownWord18
-	dw UnownWord19
-	dw UnownWord20
-	dw UnownWord21
-	dw UnownWord22
-	dw UnownWord23
-	dw UnownWord24
-	dw UnownWord25
-	dw UnownWord26
-; fba90
-
-UnownWord1:  unownword "ANGRY"
-UnownWord2:  unownword "BEAR"
-UnownWord3:  unownword "CHASE"
-UnownWord4:  unownword "DIRECT"
-UnownWord5:  unownword "ENGAGE"
-UnownWord6:  unownword "FIND"
-UnownWord7:  unownword "GIVE"
-UnownWord8:  unownword "HELP"
-UnownWord9:  unownword "INCREASE"
-UnownWord10: unownword "JOIN"
-UnownWord11: unownword "KEEP"
-UnownWord12: unownword "LAUGH"
-UnownWord13: unownword "MAKE"
-UnownWord14: unownword "NUZZLE"
-UnownWord15: unownword "OBSERVE"
-UnownWord16: unownword "PERFORM"
-UnownWord17: unownword "QUICKEN"
-UnownWord18: unownword "REASSURE"
-UnownWord19: unownword "SEARCH"
-UnownWord20: unownword "TELL"
-UnownWord21: unownword "UNDO"
-UnownWord22: unownword "VANISH"
-UnownWord23: unownword "WANT"
-UnownWord24: unownword "XXXXX"
-UnownWord25: unownword "YIELD"
-UnownWord26: unownword "ZOOM"
-; fbb32
diff --git a/data/unused/unknown_53d84.asm b/data/unused/unknown_53d84.asm
deleted file mode 100755
index 026ec5275..000000000
--- a/data/unused/unknown_53d84.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-Unreferenced_53d84:
-	db $1a, $15
-	db $33, $16
-	db $4b, $17
-	db $62, $18
-	db $79, $19
-	db $90, $1a
-	db $a8, $1b
-	db $c4, $1c
-	db $e0, $1d
-	db $f6, $1e
-	db $ff, $1f
-	db $ff, $20
diff --git a/data/wild/bug_contest_mons.asm b/data/wild/bug_contest_mons.asm
index c3cdeaa8a..797127038 100644
--- a/data/wild/bug_contest_mons.asm
+++ b/data/wild/bug_contest_mons.asm
@@ -1,4 +1,4 @@
-ContestMons: ; 97d87
+ContestMons:
 	;   %, species,   min, max
 	db 20, CATERPIE,    7, 18
 	db 20, WEEDLE,      7, 18
@@ -11,4 +11,3 @@ ContestMons: ; 97d87
 	db  5, SCYTHER,    13, 14
 	db  5, PINSIR,     13, 14
 	db -1, VENOMOTH,   30, 40
-; 97db3
diff --git a/data/wild/fish.asm b/data/wild/fish.asm
index 91a887b53..1976c8f95 100644
--- a/data/wild/fish.asm
+++ b/data/wild/fish.asm
@@ -1,227 +1,230 @@
 time_group EQUS "0," ; use the nth TimeFishGroups entry
 
-FishGroups: ; 92488
-	dbwww 50 percent + 1, .Shore_Old,            .Shore_Good,            .Shore_Super
-	dbwww 50 percent + 1, .Ocean_Old,            .Ocean_Good,            .Ocean_Super
-	dbwww 50 percent + 1, .Lake_Old,             .Lake_Good,             .Lake_Super
-	dbwww 50 percent + 1, .Pond_Old,             .Pond_Good,             .Pond_Super
-	dbwww 50 percent + 1, .Dratini_Old,          .Dratini_Good,          .Dratini_Super
-	dbwww 50 percent + 1, .Qwilfish_Swarm_Old,   .Qwilfish_Swarm_Good,   .Qwilfish_Swarm_Super
-	dbwww 50 percent + 1, .Remoraid_Swarm_Old,   .Remoraid_Swarm_Good,   .Remoraid_Swarm_Super
-	dbwww 50 percent + 1, .Gyarados_Old,         .Gyarados_Good,         .Gyarados_Super
-	dbwww 50 percent + 1, .Dratini_2_Old,        .Dratini_2_Good,        .Dratini_2_Super
-	dbwww 50 percent + 1, .WhirlIslands_Old,     .WhirlIslands_Good,     .WhirlIslands_Super
-	dbwww 50 percent + 1, .Qwilfish_Old,         .Qwilfish_Good,         .Qwilfish_Super
-	dbwww 50 percent + 1, .Remoraid_Old,         .Remoraid_Good,         .Remoraid_Super
-	dbwww 50 percent + 1, .Qwilfish_NoSwarm_Old, .Qwilfish_NoSwarm_Good, .Qwilfish_NoSwarm_Super
+fishgroup: MACRO
+; chance, old rod, good rod, super rod
+	dbwww \1, \2, \3, \4
+ENDM
 
-.Shore_Old: ; 924e3
+FishGroups:
+; entries correspond to FISHGROUP_* constants
+	fishgroup 50 percent + 1, .Shore_Old,            .Shore_Good,            .Shore_Super
+	fishgroup 50 percent + 1, .Ocean_Old,            .Ocean_Good,            .Ocean_Super
+	fishgroup 50 percent + 1, .Lake_Old,             .Lake_Good,             .Lake_Super
+	fishgroup 50 percent + 1, .Pond_Old,             .Pond_Good,             .Pond_Super
+	fishgroup 50 percent + 1, .Dratini_Old,          .Dratini_Good,          .Dratini_Super
+	fishgroup 50 percent + 1, .Qwilfish_Swarm_Old,   .Qwilfish_Swarm_Good,   .Qwilfish_Swarm_Super
+	fishgroup 50 percent + 1, .Remoraid_Swarm_Old,   .Remoraid_Swarm_Good,   .Remoraid_Swarm_Super
+	fishgroup 50 percent + 1, .Gyarados_Old,         .Gyarados_Good,         .Gyarados_Super
+	fishgroup 50 percent + 1, .Dratini_2_Old,        .Dratini_2_Good,        .Dratini_2_Super
+	fishgroup 50 percent + 1, .WhirlIslands_Old,     .WhirlIslands_Good,     .WhirlIslands_Super
+	fishgroup 50 percent + 1, .Qwilfish_Old,         .Qwilfish_Good,         .Qwilfish_Super
+	fishgroup 50 percent + 1, .Remoraid_Old,         .Remoraid_Good,         .Remoraid_Super
+	fishgroup 50 percent + 1, .Qwilfish_NoSwarm_Old, .Qwilfish_NoSwarm_Good, .Qwilfish_NoSwarm_Super
+
+.Shore_Old:
 	db  70 percent + 1, MAGIKARP,   10
 	db  85 percent + 1, MAGIKARP,   10
 	db 100 percent,     KRABBY,     10
-.Shore_Good: ; 924ec
+.Shore_Good:
 	db  35 percent,     MAGIKARP,   20
 	db  70 percent,     KRABBY,     20
 	db  90 percent + 1, KRABBY,     20
 	db 100 percent,     time_group 0
-.Shore_Super: ; 924f8
+.Shore_Super:
 	db  40 percent,     KRABBY,     40
 	db  70 percent,     time_group 1
 	db  90 percent + 1, KRABBY,     40
 	db 100 percent,     KINGLER,    40
 
-.Ocean_Old: ; 92504
+.Ocean_Old:
 	db  70 percent + 1, MAGIKARP,   10
 	db  85 percent + 1, MAGIKARP,   10
 	db 100 percent,     TENTACOOL,  10
-.Ocean_Good: ; 9250d
+.Ocean_Good:
 	db  35 percent,     MAGIKARP,   20
 	db  70 percent,     TENTACOOL,  20
 	db  90 percent + 1, CHINCHOU,   20
 	db 100 percent,     time_group 2
-.Ocean_Super: ; 92519
+.Ocean_Super:
 	db  40 percent,     CHINCHOU,   40
 	db  70 percent,     time_group 3
 	db  90 percent + 1, TENTACRUEL, 40
 	db 100 percent,     LANTURN,    40
 
-.Lake_Old: ; 92525
+.Lake_Old:
 	db  70 percent + 1, MAGIKARP,   10
 	db  85 percent + 1, MAGIKARP,   10
 	db 100 percent,     GOLDEEN,    10
-.Lake_Good: ; 9252e
+.Lake_Good:
 	db  35 percent,     MAGIKARP,   20
 	db  70 percent,     GOLDEEN,    20
 	db  90 percent + 1, GOLDEEN,    20
 	db 100 percent,     time_group 4
-.Lake_Super: ; 9253a
+.Lake_Super:
 	db  40 percent,     GOLDEEN,    40
 	db  70 percent,     time_group 5
 	db  90 percent + 1, MAGIKARP,   40
 	db 100 percent,     SEAKING,    40
 
-.Pond_Old: ; 92546
+.Pond_Old:
 	db  70 percent + 1, MAGIKARP,   10
 	db  85 percent + 1, MAGIKARP,   10
 	db 100 percent,     POLIWAG,    10
-.Pond_Good: ; 9254f
+.Pond_Good:
 	db  35 percent,     MAGIKARP,   20
 	db  70 percent,     POLIWAG,    20
 	db  90 percent + 1, POLIWAG,    20
 	db 100 percent,     time_group 6
-.Pond_Super: ; 9255b
+.Pond_Super:
 	db  40 percent,     POLIWAG,    40
 	db  70 percent,     time_group 7
 	db  90 percent + 1, MAGIKARP,   40
 	db 100 percent,     POLIWAG,    40
 
-.Dratini_Old: ; 92567
+.Dratini_Old:
 	db  70 percent + 1, MAGIKARP,   10
 	db  85 percent + 1, MAGIKARP,   10
 	db 100 percent,     MAGIKARP,   10
-.Dratini_Good: ; 92570
+.Dratini_Good:
 	db  35 percent,     MAGIKARP,   20
 	db  70 percent,     MAGIKARP,   20
 	db  90 percent + 1, MAGIKARP,   20
 	db 100 percent,     time_group 8
-.Dratini_Super: ; 9257c
+.Dratini_Super:
 	db  40 percent,     MAGIKARP,   40
 	db  70 percent,     time_group 9
 	db  90 percent + 1, MAGIKARP,   40
 	db 100 percent,     DRAGONAIR,  40
 
-.Qwilfish_Swarm_Old: ; 92588
+.Qwilfish_Swarm_Old:
 	db  70 percent + 1, MAGIKARP,   5
 	db  85 percent + 1, MAGIKARP,   5
 	db 100 percent,     QWILFISH,   5
-.Qwilfish_Swarm_Good: ; 92591
+.Qwilfish_Swarm_Good:
 	db  35 percent,     MAGIKARP,   20
 	db  70 percent,     QWILFISH,   20
 	db  90 percent + 1, QWILFISH,   20
 	db 100 percent,     time_group 10
-.Qwilfish_Swarm_Super: ; 9259d
+.Qwilfish_Swarm_Super:
 	db  40 percent,     QWILFISH,   40
 	db  70 percent,     time_group 11
 	db  90 percent + 1, QWILFISH,   40
 	db 100 percent,     QWILFISH,   40
 
-.Remoraid_Swarm_Old: ; 925a9
+.Remoraid_Swarm_Old:
 	db  70 percent + 1, MAGIKARP,   10
 	db  85 percent + 1, MAGIKARP,   10
 	db 100 percent,     REMORAID,   10
-.Remoraid_Swarm_Good: ; 925b2
+.Remoraid_Swarm_Good:
 	db  35 percent,     MAGIKARP,   20
 	db  70 percent,     REMORAID,   20
 	db  90 percent + 1, REMORAID,   20
 	db 100 percent,     time_group 12
-.Remoraid_Swarm_Super: ; 925be
+.Remoraid_Swarm_Super:
 	db  40 percent,     REMORAID,   40
 	db  70 percent,     time_group 13
 	db  90 percent + 1, REMORAID,   40
 	db 100 percent,     REMORAID,   40
 
-.Gyarados_Old: ; 925ca
+.Gyarados_Old:
 	db  70 percent + 1, MAGIKARP,   10
 	db  85 percent + 1, MAGIKARP,   10
 	db 100 percent,     MAGIKARP,   10
-.Gyarados_Good: ; 925d3
+.Gyarados_Good:
 	db  35 percent,     MAGIKARP,   20
 	db  70 percent,     MAGIKARP,   20
 	db  90 percent + 1, MAGIKARP,   20
 	db 100 percent,     time_group 14
-.Gyarados_Super: ; 925df
+.Gyarados_Super:
 	db  40 percent,     MAGIKARP,   40
 	db  70 percent,     time_group 15
 	db  90 percent + 1, MAGIKARP,   40
 	db 100 percent,     MAGIKARP,   40
 
-.Dratini_2_Old: ; 925eb
+.Dratini_2_Old:
 	db  70 percent + 1, MAGIKARP,   10
 	db  85 percent + 1, MAGIKARP,   10
 	db 100 percent,     MAGIKARP,   10
-.Dratini_2_Good: ; 925f4
+.Dratini_2_Good:
 	db  35 percent,     MAGIKARP,   10
 	db  70 percent,     MAGIKARP,   10
 	db  90 percent + 1, MAGIKARP,   10
 	db 100 percent,     time_group 16
-.Dratini_2_Super: ; 92600
+.Dratini_2_Super:
 	db  40 percent,     MAGIKARP,   10
 	db  70 percent,     time_group 17
 	db  90 percent + 1, MAGIKARP,   10
 	db 100 percent,     DRAGONAIR,  10
 
-.WhirlIslands_Old: ; 9260c
+.WhirlIslands_Old:
 	db  70 percent + 1, MAGIKARP,   10
 	db  85 percent + 1, MAGIKARP,   10
 	db 100 percent,     KRABBY,     10
-.WhirlIslands_Good: ; 92615
+.WhirlIslands_Good:
 	db  35 percent,     MAGIKARP,   20
 	db  70 percent,     KRABBY,     20
 	db  90 percent + 1, KRABBY,     20
 	db 100 percent,     time_group 18
-.WhirlIslands_Super: ; 92621
+.WhirlIslands_Super:
 	db  40 percent,     KRABBY,     40
 	db  70 percent,     time_group 19
 	db  90 percent + 1, KINGLER,    40
 	db 100 percent,     SEADRA,     40
 
 .Qwilfish_NoSwarm_Old:
-.Qwilfish_Old: ; 9262d
+.Qwilfish_Old:
 	db  70 percent + 1, MAGIKARP,   10
 	db  85 percent + 1, MAGIKARP,   10
 	db 100 percent,     TENTACOOL,  10
 .Qwilfish_NoSwarm_Good:
-.Qwilfish_Good: ; 92636
+.Qwilfish_Good:
 	db  35 percent,     MAGIKARP,   20
 	db  70 percent,     TENTACOOL,  20
 	db  90 percent + 1, TENTACOOL,  20
 	db 100 percent,     time_group 20
 .Qwilfish_NoSwarm_Super:
-.Qwilfish_Super: ; 92642
+.Qwilfish_Super:
 	db  40 percent,     TENTACOOL,  40
 	db  70 percent,     time_group 21
 	db  90 percent + 1, MAGIKARP,   40
 	db 100 percent,     QWILFISH,   40
 
-.Remoraid_Old: ; 9264e
+.Remoraid_Old:
 	db  70 percent + 1, MAGIKARP,   10
 	db  85 percent + 1, MAGIKARP,   10
 	db 100 percent,     POLIWAG,    10
-.Remoraid_Good: ; 92657
+.Remoraid_Good:
 	db  35 percent,     MAGIKARP,   20
 	db  70 percent,     POLIWAG,    20
 	db  90 percent + 1, POLIWAG,    20
 	db 100 percent,     time_group 6
-.Remoraid_Super: ; 92663
+.Remoraid_Super:
 	db  40 percent,     POLIWAG,    40
 	db  70 percent,     time_group 7
 	db  90 percent + 1, MAGIKARP,   40
 	db 100 percent,     REMORAID,   40
-; 9266f
-
 
-TimeFishGroups: ; 9266f
+TimeFishGroups:
 	;  day              nite
-	db CORSOLA,    20,  STARYU,     20
-	db CORSOLA,    40,  STARYU,     40
-	db SHELLDER,   20,  SHELLDER,   20
-	db SHELLDER,   40,  SHELLDER,   40
-	db GOLDEEN,    20,  GOLDEEN,    20
-	db GOLDEEN,    40,  GOLDEEN,    40
-	db POLIWAG,    20,  POLIWAG,    20
-	db POLIWAG,    40,  POLIWAG,    40
-	db DRATINI,    20,  DRATINI,    20
-	db DRATINI,    40,  DRATINI,    40
-	db QWILFISH,   20,  QWILFISH,   20
-	db QWILFISH,   40,  QWILFISH,   40
-	db REMORAID,   20,  REMORAID,   20
-	db REMORAID,   40,  REMORAID,   40
-	db GYARADOS,   20,  GYARADOS,   20
-	db GYARADOS,   40,  GYARADOS,   40
-	db DRATINI,    10,  DRATINI,    10
-	db DRATINI,    10,  DRATINI,    10
-	db HORSEA,     20,  HORSEA,     20
-	db HORSEA,     40,  HORSEA,     40
-	db TENTACOOL,  20,  TENTACOOL,  20
-	db TENTACOOL,  40,  TENTACOOL,  40
-; 926c7
+	db CORSOLA,    20,  STARYU,     20 ; 0
+	db CORSOLA,    40,  STARYU,     40 ; 1
+	db SHELLDER,   20,  SHELLDER,   20 ; 2
+	db SHELLDER,   40,  SHELLDER,   40 ; 3
+	db GOLDEEN,    20,  GOLDEEN,    20 ; 4
+	db GOLDEEN,    40,  GOLDEEN,    40 ; 5
+	db POLIWAG,    20,  POLIWAG,    20 ; 6
+	db POLIWAG,    40,  POLIWAG,    40 ; 7
+	db DRATINI,    20,  DRATINI,    20 ; 8
+	db DRATINI,    40,  DRATINI,    40 ; 9
+	db QWILFISH,   20,  QWILFISH,   20 ; 10
+	db QWILFISH,   40,  QWILFISH,   40 ; 11
+	db REMORAID,   20,  REMORAID,   20 ; 12
+	db REMORAID,   40,  REMORAID,   40 ; 13
+	db GYARADOS,   20,  GYARADOS,   20 ; 14
+	db GYARADOS,   40,  GYARADOS,   40 ; 15
+	db DRATINI,    10,  DRATINI,    10 ; 16
+	db DRATINI,    10,  DRATINI,    10 ; 17
+	db HORSEA,     20,  HORSEA,     20 ; 18
+	db HORSEA,     40,  HORSEA,     40 ; 19
+	db TENTACOOL,  20,  TENTACOOL,  20 ; 20
+	db TENTACOOL,  40,  TENTACOOL,  40 ; 21
diff --git a/data/wild/flee_mons.asm b/data/wild/flee_mons.asm
index 1b1cea036..ae2a3a569 100644
--- a/data/wild/flee_mons.asm
+++ b/data/wild/flee_mons.asm
@@ -1,7 +1,7 @@
 FleeMons:
 ; referenced by TryEnemyFlee and FastBallMultiplier
 
-SometimesFleeMons: ; 3c59a
+SometimesFleeMons:
 	db MAGNEMITE
 	db GRIMER
 	db TANGELA
@@ -17,7 +17,7 @@ SometimesFleeMons: ; 3c59a
 	db HERACROSS
 	db -1
 
-OftenFleeMons: ; 3c5a8
+OftenFleeMons:
 	db CUBONE
 	db ARTICUNO
 	db ZAPDOS
@@ -28,9 +28,7 @@ OftenFleeMons: ; 3c5a8
 	db TEDDIURSA
 	db -1
 
-AlwaysFleeMons: ; 3c5b1
+AlwaysFleeMons:
 	db RAIKOU
 	db ENTEI
-;	db SUICUNE
 	db -1
-; 3c5b4
diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm
index be435b048..2567e9fcf 100644
--- a/data/wild/johto_grass.asm
+++ b/data/wild/johto_grass.asm
@@ -1,8 +1,8 @@
 ; Johto Pokémon in grass
 
-JohtoGrassWildMons: ; 0x2a5e9
+JohtoGrassWildMons:
 
-	map SPROUT_TOWER_2F
+	map_id SPROUT_TOWER_2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, RATTATA
@@ -29,7 +29,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 5, RATTATA
 	db 5, RATTATA
 
-	map SPROUT_TOWER_3F
+	map_id SPROUT_TOWER_3F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, RATTATA
@@ -56,7 +56,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 5, RATTATA
 	db 5, RATTATA
 
-	map TIN_TOWER_2F
+	map_id TIN_TOWER_2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -83,7 +83,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_3F
+	map_id TIN_TOWER_3F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -110,7 +110,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_4F
+	map_id TIN_TOWER_4F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -137,7 +137,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_5F
+	map_id TIN_TOWER_5F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -164,7 +164,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_6F
+	map_id TIN_TOWER_6F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -191,7 +191,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_7F
+	map_id TIN_TOWER_7F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -218,7 +218,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_8F
+	map_id TIN_TOWER_8F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -245,7 +245,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map TIN_TOWER_9F
+	map_id TIN_TOWER_9F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, RATTATA
@@ -272,7 +272,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, RATTATA
 	db 24, RATTATA
 
-	map BURNED_TOWER_1F
+	map_id BURNED_TOWER_1F
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, RATTATA
@@ -299,7 +299,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 15, RATICATE
 	db 15, RATICATE
 
-	map BURNED_TOWER_B1F
+	map_id BURNED_TOWER_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 14, RATTATA
@@ -326,7 +326,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 16, KOFFING
 	db 16, WEEZING
 
-	map NATIONAL_PARK
+	map_id NATIONAL_PARK
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 12, NIDORAN_M
@@ -353,7 +353,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 12, VENONAT
 	db 12, VENONAT
 
-	map RUINS_OF_ALPH_OUTSIDE
+	map_id RUINS_OF_ALPH_OUTSIDE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 20, NATU
@@ -380,7 +380,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 22, QUAGSIRE
 	db 22, QUAGSIRE
 
-	map RUINS_OF_ALPH_INNER_CHAMBER
+	map_id RUINS_OF_ALPH_INNER_CHAMBER
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, UNOWN
@@ -407,7 +407,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 5, UNOWN
 	db 5, UNOWN
 
-	map UNION_CAVE_1F
+	map_id UNION_CAVE_1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 6, GEODUDE
@@ -434,7 +434,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 6, ONIX
 	db 6, ONIX
 
-	map UNION_CAVE_B1F
+	map_id UNION_CAVE_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 8, GEODUDE
@@ -461,7 +461,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 8, RATTATA
 	db 8, RATTATA
 
-	map UNION_CAVE_B2F
+	map_id UNION_CAVE_B2F
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, ZUBAT
@@ -488,7 +488,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 23, ONIX
 	db 23, ONIX
 
-	map SLOWPOKE_WELL_B1F
+	map_id SLOWPOKE_WELL_B1F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, ZUBAT
@@ -515,7 +515,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 8, SLOWPOKE
 	db 8, SLOWPOKE
 
-	map SLOWPOKE_WELL_B2F
+	map_id SLOWPOKE_WELL_B2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 21, ZUBAT
@@ -542,7 +542,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 23, SLOWPOKE
 	db 23, SLOWPOKE
 
-	map ILEX_FOREST
+	map_id ILEX_FOREST
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, CATERPIE
@@ -569,7 +569,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 6, PARAS
 	db 6, PARAS
 
-	map MOUNT_MORTAR_1F_OUTSIDE
+	map_id MOUNT_MORTAR_1F_OUTSIDE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 14, RATTATA
@@ -596,7 +596,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 16, RATICATE
 	db 16, RATICATE
 
-	map MOUNT_MORTAR_1F_INSIDE
+	map_id MOUNT_MORTAR_1F_INSIDE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, GEODUDE
@@ -623,7 +623,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 15, GOLBAT
 	db 15, GOLBAT
 
-	map MOUNT_MORTAR_2F_INSIDE
+	map_id MOUNT_MORTAR_2F_INSIDE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 31, GRAVELER
@@ -650,7 +650,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 32, GOLBAT
 	db 32, GOLBAT
 
-	map MOUNT_MORTAR_B1F
+	map_id MOUNT_MORTAR_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 15, ZUBAT
@@ -677,7 +677,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 18, RATICATE
 	db 18, RATICATE
 
-	map ICE_PATH_1F
+	map_id ICE_PATH_1F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 21, SWINUB
@@ -704,7 +704,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 22, GOLBAT
 	db 22, GOLBAT
 
-	map ICE_PATH_B1F
+	map_id ICE_PATH_B1F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, SWINUB
@@ -731,7 +731,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 23, GOLBAT
 	db 22, SNEASEL
 
-	map ICE_PATH_B2F_MAHOGANY_SIDE
+	map_id ICE_PATH_B2F_MAHOGANY_SIDE
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, SWINUB
@@ -758,7 +758,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 22, SNEASEL
 	db 24, SNEASEL
 
-	map ICE_PATH_B2F_BLACKTHORN_SIDE
+	map_id ICE_PATH_B2F_BLACKTHORN_SIDE
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, SWINUB
@@ -785,7 +785,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 22, SNEASEL
 	db 24, SNEASEL
 
-	map ICE_PATH_B3F
+	map_id ICE_PATH_B3F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 24, SWINUB
@@ -812,7 +812,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, SNEASEL
 	db 26, SNEASEL
 
-	map WHIRL_ISLAND_NW
+	map_id WHIRL_ISLAND_NW
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -839,7 +839,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, GOLBAT
 	db 24, GOLBAT
 
-	map WHIRL_ISLAND_NE
+	map_id WHIRL_ISLAND_NE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -866,7 +866,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, GOLBAT
 	db 24, GOLBAT
 
-	map WHIRL_ISLAND_SW
+	map_id WHIRL_ISLAND_SW
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -893,7 +893,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, GOLBAT
 	db 24, GOLBAT
 
-	map WHIRL_ISLAND_CAVE
+	map_id WHIRL_ISLAND_CAVE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -920,7 +920,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, GOLBAT
 	db 24, GOLBAT
 
-	map WHIRL_ISLAND_SE
+	map_id WHIRL_ISLAND_SE
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, KRABBY
@@ -947,7 +947,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 24, GOLBAT
 	db 24, GOLBAT
 
-	map WHIRL_ISLAND_B1F
+	map_id WHIRL_ISLAND_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, KRABBY
@@ -974,7 +974,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 25, GOLBAT
 	db 25, GOLBAT
 
-	map WHIRL_ISLAND_B2F
+	map_id WHIRL_ISLAND_B2F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 24, KRABBY
@@ -1001,7 +1001,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 26, GOLBAT
 	db 26, GOLBAT
 
-	map WHIRL_ISLAND_LUGIA_CHAMBER
+	map_id WHIRL_ISLAND_LUGIA_CHAMBER
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 25, KRABBY
@@ -1028,7 +1028,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 27, GOLBAT
 	db 27, GOLBAT
 
-	map SILVER_CAVE_ROOM_1
+	map_id SILVER_CAVE_ROOM_1
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 43, GRAVELER
@@ -1055,7 +1055,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 46, GOLBAT
 	db 46, GOLBAT
 
-	map SILVER_CAVE_ROOM_2
+	map_id SILVER_CAVE_ROOM_2
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 48, GOLBAT
@@ -1082,7 +1082,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 45, MISDREAVUS
 	db 45, MISDREAVUS
 
-	map SILVER_CAVE_ROOM_3
+	map_id SILVER_CAVE_ROOM_3
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 51, GOLBAT
@@ -1109,7 +1109,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 53, GOLBAT
 	db 53, GOLBAT
 
-	map SILVER_CAVE_ITEM_ROOMS
+	map_id SILVER_CAVE_ITEM_ROOMS
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 48, GOLBAT
@@ -1136,7 +1136,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 50, PARASECT
 	db 52, PARASECT
 
-	map DARK_CAVE_VIOLET_ENTRANCE
+	map_id DARK_CAVE_VIOLET_ENTRANCE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, GEODUDE
@@ -1163,7 +1163,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 4, ZUBAT
 	db 4, DUNSPARCE
 
-	map DARK_CAVE_BLACKTHORN_ENTRANCE
+	map_id DARK_CAVE_BLACKTHORN_ENTRANCE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, GEODUDE
@@ -1190,7 +1190,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 23, GOLBAT
 	db 23, GOLBAT
 
-	map ROUTE_29
+	map_id ROUTE_29
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 2, PIDGEY
@@ -1217,7 +1217,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 3, HOOTHOOT
 	db 3, HOOTHOOT
 
-	map ROUTE_30
+	map_id ROUTE_30
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, LEDYBA
@@ -1244,7 +1244,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 4, HOOTHOOT
 	db 4, HOOTHOOT
 
-	map ROUTE_31
+	map_id ROUTE_31
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 4, LEDYBA
@@ -1271,7 +1271,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 5, GASTLY
 	db 5, GASTLY
 
-	map ROUTE_32
+	map_id ROUTE_32
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 4, EKANS
@@ -1298,7 +1298,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 7, GASTLY
 	db 7, GASTLY
 
-	map ROUTE_33
+	map_id ROUTE_33
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 6, RATTATA
@@ -1325,7 +1325,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 7, RATTATA
 	db 7, RATTATA
 
-	map ROUTE_34
+	map_id ROUTE_34
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 10, SNUBBULL
@@ -1352,7 +1352,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 10, DITTO
 	db 10, DITTO
 
-	map ROUTE_35
+	map_id ROUTE_35
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 12, SNUBBULL
@@ -1379,7 +1379,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 10, DITTO
 	db 12, YANMA
 
-	map ROUTE_36
+	map_id ROUTE_36
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 4, LEDYBA
@@ -1406,7 +1406,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 5, GASTLY
 	db 5, GASTLY
 
-	map ROUTE_37
+	map_id ROUTE_37
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, LEDYBA
@@ -1433,7 +1433,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 15, ARIADOS
 	db 15, ARIADOS
 
-	map ROUTE_38
+	map_id ROUTE_38
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 16, RATTATA
@@ -1460,7 +1460,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 16, MEOWTH
 	db 16, MEOWTH
 
-	map ROUTE_39
+	map_id ROUTE_39
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
 	; morn
 	db 16, RATTATA
@@ -1487,7 +1487,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 18, MEOWTH
 	db 18, MEOWTH
 
-	map ROUTE_42
+	map_id ROUTE_42
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, EKANS
@@ -1514,7 +1514,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 16, GOLBAT
 	db 16, GOLBAT
 
-	map ROUTE_43
+	map_id ROUTE_43
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 15, SENTRET
@@ -1541,7 +1541,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 17, VENOMOTH
 	db 17, VENOMOTH
 
-	map ROUTE_44
+	map_id ROUTE_44
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, TANGELA
@@ -1568,7 +1568,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 26, POLIWHIRL
 	db 26, POLIWHIRL
 
-	map ROUTE_45
+	map_id ROUTE_45
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, GEODUDE
@@ -1595,7 +1595,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 27, GRAVELER
 	db 27, GRAVELER
 
-	map ROUTE_46
+	map_id ROUTE_46
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 2, GEODUDE
@@ -1622,7 +1622,7 @@ JohtoGrassWildMons: ; 0x2a5e9
 	db 2, RATTATA
 	db 2, RATTATA
 
-	map SILVER_CAVE_OUTSIDE
+	map_id SILVER_CAVE_OUTSIDE
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 41, TANGELA
diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm
index d6e11c3a0..83e33b2d5 100644
--- a/data/wild/johto_water.asm
+++ b/data/wild/johto_water.asm
@@ -1,230 +1,230 @@
 ; Johto Pokémon in water
 
-JohtoWaterWildMons: ; 0x2b11d
+JohtoWaterWildMons:
 
-	map RUINS_OF_ALPH_OUTSIDE
+	map_id RUINS_OF_ALPH_OUTSIDE
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
 
-	map UNION_CAVE_1F
+	map_id UNION_CAVE_1F
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
 
-	map UNION_CAVE_B1F
+	map_id UNION_CAVE_B1F
 	db 2 percent ; encounter rate
 	db 15, WOOPER
 	db 20, QUAGSIRE
 	db 15, QUAGSIRE
 
-	map UNION_CAVE_B2F
+	map_id UNION_CAVE_B2F
 	db 4 percent ; encounter rate
 	db 15, TENTACOOL
 	db 20, QUAGSIRE
 	db 20, TENTACRUEL
 
-	map SLOWPOKE_WELL_B1F
+	map_id SLOWPOKE_WELL_B1F
 	db 2 percent ; encounter rate
 	db 15, SLOWPOKE
 	db 20, SLOWPOKE
 	db 10, SLOWPOKE
 
-	map SLOWPOKE_WELL_B2F
+	map_id SLOWPOKE_WELL_B2F
 	db 2 percent ; encounter rate
 	db 15, SLOWPOKE
 	db 20, SLOWPOKE
 	db 20, SLOWBRO
 
-	map ILEX_FOREST
+	map_id ILEX_FOREST
 	db 2 percent ; encounter rate
 	db 15, PSYDUCK
 	db 10, PSYDUCK
 	db 15, GOLDUCK
 
-	map MOUNT_MORTAR_1F_OUTSIDE
+	map_id MOUNT_MORTAR_1F_OUTSIDE
 	db 4 percent ; encounter rate
 	db 15, GOLDEEN
 	db 20, MARILL
 	db 20, SEAKING
 
-	map MOUNT_MORTAR_2F_INSIDE
+	map_id MOUNT_MORTAR_2F_INSIDE
 	db 2 percent ; encounter rate
 	db 20, GOLDEEN
 	db 25, MARILL
 	db 25, SEAKING
 
-	map MOUNT_MORTAR_B1F
+	map_id MOUNT_MORTAR_B1F
 	db 2 percent ; encounter rate
 	db 15, GOLDEEN
 	db 20, MARILL
 	db 20, SEAKING
 
-	map WHIRL_ISLAND_SW
+	map_id WHIRL_ISLAND_SW
 	db 4 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, HORSEA
 	db 20, TENTACRUEL
 
-	map WHIRL_ISLAND_B2F
+	map_id WHIRL_ISLAND_B2F
 	db 4 percent ; encounter rate
 	db 15, HORSEA
 	db 20, HORSEA
 	db 20, TENTACRUEL
 
-	map WHIRL_ISLAND_LUGIA_CHAMBER
+	map_id WHIRL_ISLAND_LUGIA_CHAMBER
 	db 4 percent ; encounter rate
 	db 20, HORSEA
 	db 20, TENTACRUEL
 	db 20, SEADRA
 
-	map SILVER_CAVE_ROOM_2
+	map_id SILVER_CAVE_ROOM_2
 	db 2 percent ; encounter rate
 	db 35, SEAKING
 	db 35, GOLDUCK
 	db 35, GOLDEEN
 
-	map DARK_CAVE_VIOLET_ENTRANCE
+	map_id DARK_CAVE_VIOLET_ENTRANCE
 	db 2 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
 
-	map DARK_CAVE_BLACKTHORN_ENTRANCE
+	map_id DARK_CAVE_BLACKTHORN_ENTRANCE
 	db 2 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
 
-	map DRAGONS_DEN_B1F
+	map_id DRAGONS_DEN_B1F
 	db 4 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 10, DRATINI
 
-	map OLIVINE_PORT
+	map_id OLIVINE_PORT
 	db 2 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ROUTE_30
+	map_id ROUTE_30
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map ROUTE_31
+	map_id ROUTE_31
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map ROUTE_32
+	map_id ROUTE_32
 	db 6 percent ; encounter rate
 	db 15, TENTACOOL
 	db 20, QUAGSIRE
 	db 20, TENTACRUEL
 
-	map ROUTE_34
+	map_id ROUTE_34
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ROUTE_35
+	map_id ROUTE_35
 	db 4 percent ; encounter rate
 	db 20, PSYDUCK
 	db 15, PSYDUCK
 	db 20, GOLDUCK
 
-	map ROUTE_40
+	map_id ROUTE_40
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ROUTE_41
+	map_id ROUTE_41
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 20, TENTACRUEL
 	db 20, MANTINE
 
-	map ROUTE_42
+	map_id ROUTE_42
 	db 4 percent ; encounter rate
 	db 20, GOLDEEN
 	db 15, GOLDEEN
 	db 20, SEAKING
 
-	map ROUTE_43
+	map_id ROUTE_43
 	db 2 percent ; encounter rate
 	db 20, MAGIKARP
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 
-	map ROUTE_44
+	map_id ROUTE_44
 	db 2 percent ; encounter rate
 	db 25, POLIWAG
 	db 20, POLIWAG
 	db 25, POLIWHIRL
 
-	map ROUTE_45
+	map_id ROUTE_45
 	db 2 percent ; encounter rate
 	db 20, MAGIKARP
 	db 15, MAGIKARP
 	db 5, MAGIKARP
 
-	map NEW_BARK_TOWN
+	map_id NEW_BARK_TOWN
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map CHERRYGROVE_CITY
+	map_id CHERRYGROVE_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map VIOLET_CITY
+	map_id VIOLET_CITY
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map CIANWOOD_CITY
+	map_id CIANWOOD_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map OLIVINE_CITY
+	map_id OLIVINE_CITY
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ECRUTEAK_CITY
+	map_id ECRUTEAK_CITY
 	db 2 percent ; encounter rate
 	db 20, POLIWAG
 	db 15, POLIWAG
 	db 20, POLIWHIRL
 
-	map LAKE_OF_RAGE
+	map_id LAKE_OF_RAGE
 	db 6 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 15, GYARADOS
 
-	map BLACKTHORN_CITY
+	map_id BLACKTHORN_CITY
 	db 4 percent ; encounter rate
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 	db 5, MAGIKARP
 
-	map SILVER_CAVE_OUTSIDE
+	map_id SILVER_CAVE_OUTSIDE
 	db 2 percent ; encounter rate
 	db 35, POLIWHIRL
 	db 40, POLIWHIRL
diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm
index 415514748..ff1720972 100644
--- a/data/wild/kanto_grass.asm
+++ b/data/wild/kanto_grass.asm
@@ -1,8 +1,8 @@
 ; Kanto Pokémon in grass
 
-KantoGrassWildMons: ; 0x2b274
+KantoGrassWildMons:
 
-	map DIGLETTS_CAVE
+	map_id DIGLETTS_CAVE
 	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, DIGLETT
@@ -29,7 +29,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 32, DUGTRIO
 	db 32, DUGTRIO
 
-	map MOUNT_MOON
+	map_id MOUNT_MOON
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 6, ZUBAT
@@ -56,7 +56,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 12, CLEFAIRY
 	db 12, CLEFAIRY
 
-	map ROCK_TUNNEL_1F
+	map_id ROCK_TUNNEL_1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 10, CUBONE
@@ -83,7 +83,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 15, ZUBAT
 	db 15, ZUBAT
 
-	map ROCK_TUNNEL_B1F
+	map_id ROCK_TUNNEL_B1F
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 12, CUBONE
@@ -110,7 +110,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 15, GOLBAT
 	db 15, GOLBAT
 
-	map VICTORY_ROAD
+	map_id VICTORY_ROAD
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 34, GRAVELER
@@ -137,7 +137,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 40, GRAVELER
 	db 40, GRAVELER
 
-	map TOHJO_FALLS
+	map_id TOHJO_FALLS
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 22, ZUBAT
@@ -164,7 +164,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 23, SLOWPOKE
 	db 23, SLOWPOKE
 
-	map ROUTE_1
+	map_id ROUTE_1
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 2, PIDGEY
@@ -191,7 +191,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 4, HOOTHOOT
 	db 4, HOOTHOOT
 
-	map ROUTE_2
+	map_id ROUTE_2
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, CATERPIE
@@ -218,7 +218,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 4, NOCTOWL
 	db 4, NOCTOWL
 
-	map ROUTE_3
+	map_id ROUTE_3
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, SPEAROW
@@ -245,7 +245,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 6, CLEFAIRY
 	db 6, CLEFAIRY
 
-	map ROUTE_4
+	map_id ROUTE_4
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 5, SPEAROW
@@ -272,7 +272,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 6, CLEFAIRY
 	db 6, CLEFAIRY
 
-	map ROUTE_5
+	map_id ROUTE_5
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, PIDGEY
@@ -299,7 +299,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 14, ABRA
 	db 14, ABRA
 
-	map ROUTE_6
+	map_id ROUTE_6
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 13, RATTATA
@@ -326,7 +326,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 15, RATICATE
 	db 15, RATICATE
 
-	map ROUTE_7
+	map_id ROUTE_7
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 17, RATTATA
@@ -353,7 +353,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 16, ABRA
 	db 16, ABRA
 
-	map ROUTE_8
+	map_id ROUTE_8
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 17, SNUBBULL
@@ -380,7 +380,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 18, KADABRA
 	db 18, KADABRA
 
-	map ROUTE_9
+	map_id ROUTE_9
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 15, RATTATA
@@ -407,7 +407,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 18, RATICATE
 	db 18, RATICATE
 
-	map ROUTE_10_NORTH
+	map_id ROUTE_10_NORTH
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 15, SPEAROW
@@ -434,7 +434,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 16, ELECTABUZZ
 	db 16, ELECTABUZZ
 
-	map ROUTE_11
+	map_id ROUTE_11
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 14, HOPPIP
@@ -461,7 +461,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 16, HYPNO
 	db 16, HYPNO
 
-	map ROUTE_13
+	map_id ROUTE_13
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, NIDORINO
@@ -488,7 +488,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 25, QUAGSIRE
 	db 25, CHANSEY
 
-	map ROUTE_14
+	map_id ROUTE_14
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 26, NIDORINO
@@ -515,7 +515,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 28, QUAGSIRE
 	db 28, CHANSEY
 
-	map ROUTE_15
+	map_id ROUTE_15
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 23, NIDORINO
@@ -542,7 +542,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 25, QUAGSIRE
 	db 25, CHANSEY
 
-	map ROUTE_16
+	map_id ROUTE_16
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 26, GRIMER
@@ -569,7 +569,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 30, MUK
 	db 30, MUK
 
-	map ROUTE_17
+	map_id ROUTE_17
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 30, FEAROW
@@ -596,7 +596,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 33, MUK
 	db 33, MUK
 
-	map ROUTE_18
+	map_id ROUTE_18
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 26, GRIMER
@@ -623,7 +623,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 30, MUK
 	db 30, MUK
 
-	map ROUTE_21
+	map_id ROUTE_21
 	db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite
 	; morn
 	db 30, TANGELA
@@ -650,7 +650,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 28, TANGELA
 	db 28, TANGELA
 
-	map ROUTE_22
+	map_id ROUTE_22
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, RATTATA
@@ -677,7 +677,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 7, RATTATA
 	db 7, RATTATA
 
-	map ROUTE_24
+	map_id ROUTE_24
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 8, CATERPIE
@@ -704,7 +704,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 14, GLOOM
 	db 14, GLOOM
 
-	map ROUTE_25
+	map_id ROUTE_25
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 10, CATERPIE
@@ -731,7 +731,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 14, NOCTOWL
 	db 14, NOCTOWL
 
-	map ROUTE_26
+	map_id ROUTE_26
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 28, DODUO
@@ -758,7 +758,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 30, QUAGSIRE
 	db 30, QUAGSIRE
 
-	map ROUTE_27
+	map_id ROUTE_27
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 28, DODUO
@@ -785,7 +785,7 @@ KantoGrassWildMons: ; 0x2b274
 	db 32, NOCTOWL
 	db 32, NOCTOWL
 
-	map ROUTE_28
+	map_id ROUTE_28
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 39, TANGELA
diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm
index 71fab48fb..c9abda73d 100644
--- a/data/wild/kanto_water.asm
+++ b/data/wild/kanto_water.asm
@@ -1,146 +1,146 @@
 ; Kanto Pokémon in water
 
-KantoWaterWildMons: ; 0x2b7f7
+KantoWaterWildMons:
 
-	map TOHJO_FALLS
+	map_id TOHJO_FALLS
 	db 4 percent ; encounter rate
 	db 20, GOLDEEN
 	db 20, SLOWPOKE
 	db 20, SEAKING
 
-	map VERMILION_PORT
+	map_id VERMILION_PORT
 	db 2 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map ROUTE_4
+	map_id ROUTE_4
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
 
-	map ROUTE_6
+	map_id ROUTE_6
 	db 2 percent ; encounter rate
 	db 10, PSYDUCK
 	db 5, PSYDUCK
 	db 10, GOLDUCK
 
-	map ROUTE_9
+	map_id ROUTE_9
 	db 4 percent ; encounter rate
 	db 15, GOLDEEN
 	db 10, GOLDEEN
 	db 15, SEAKING
 
-	map ROUTE_10_NORTH
+	map_id ROUTE_10_NORTH
 	db 4 percent ; encounter rate
 	db 15, GOLDEEN
 	db 10, GOLDEEN
 	db 15, SEAKING
 
-	map ROUTE_12
+	map_id ROUTE_12
 	db 6 percent ; encounter rate
 	db 25, TENTACOOL
 	db 25, QUAGSIRE
 	db 25, TENTACRUEL
 
-	map ROUTE_13
+	map_id ROUTE_13
 	db 6 percent ; encounter rate
 	db 25, TENTACOOL
 	db 25, QUAGSIRE
 	db 25, TENTACRUEL
 
-	map ROUTE_19
+	map_id ROUTE_19
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map ROUTE_20
+	map_id ROUTE_20
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map ROUTE_21
+	map_id ROUTE_21
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map ROUTE_22
+	map_id ROUTE_22
 	db 2 percent ; encounter rate
 	db 10, POLIWAG
 	db 5, POLIWAG
 	db 10, POLIWHIRL
 
-	map ROUTE_24
+	map_id ROUTE_24
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
 
-	map ROUTE_25
+	map_id ROUTE_25
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
 
-	map ROUTE_26
+	map_id ROUTE_26
 	db 6 percent ; encounter rate
 	db 30, TENTACOOL
 	db 25, TENTACOOL
 	db 30, TENTACRUEL
 
-	map ROUTE_27
+	map_id ROUTE_27
 	db 6 percent ; encounter rate
 	db 20, TENTACOOL
 	db 15, TENTACOOL
 	db 20, TENTACRUEL
 
-	map ROUTE_28
+	map_id ROUTE_28
 	db 2 percent ; encounter rate
 	db 40, POLIWAG
 	db 35, POLIWAG
 	db 40, POLIWHIRL
 
-	map PALLET_TOWN
+	map_id PALLET_TOWN
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map VIRIDIAN_CITY
+	map_id VIRIDIAN_CITY
 	db 2 percent ; encounter rate
 	db 10, POLIWAG
 	db 5, POLIWAG
 	db 10, POLIWHIRL
 
-	map CERULEAN_CITY
+	map_id CERULEAN_CITY
 	db 4 percent ; encounter rate
 	db 10, GOLDEEN
 	db 5, GOLDEEN
 	db 10, SEAKING
 
-	map VERMILION_CITY
+	map_id VERMILION_CITY
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 
-	map CELADON_CITY
+	map_id CELADON_CITY
 	db 2 percent ; encounter rate
 	db 20, GRIMER
 	db 15, GRIMER
 	db 15, MUK
 
-	map FUCHSIA_CITY
+	map_id FUCHSIA_CITY
 	db 2 percent ; encounter rate
 	db 20, MAGIKARP
 	db 15, MAGIKARP
 	db 10, MAGIKARP
 
-	map CINNABAR_ISLAND
+	map_id CINNABAR_ISLAND
 	db 6 percent ; encounter rate
 	db 35, TENTACOOL
 	db 30, TENTACOOL
diff --git a/data/wild/probabilities.asm b/data/wild/probabilities.asm
index 1813603c2..bf3144bbe 100644
--- a/data/wild/probabilities.asm
+++ b/data/wild/probabilities.asm
@@ -3,7 +3,7 @@ mon_prob: MACRO
 	db \1, \2 * 2
 ENDM
 
-GrassMonProbTable: ; 2a1cb
+GrassMonProbTable:
 	mon_prob 30,  0 ; 30% chance
 	mon_prob 60,  1 ; 30% chance
 	mon_prob 80,  2 ; 20% chance
@@ -11,10 +11,8 @@ GrassMonProbTable: ; 2a1cb
 	mon_prob 95,  4 ;  5% chance
 	mon_prob 99,  5 ;  4% chance
 	mon_prob 100, 6 ;  1% chance
-; 2a1d9
 
-WaterMonProbTable: ; 2a1d9
+WaterMonProbTable:
 	mon_prob 60,  0 ; 60% chance
 	mon_prob 90,  1 ; 30% chance
 	mon_prob 100, 2 ; 10% chance
-; 2a1df
diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm
index 07bb7a9d9..747dffae1 100644
--- a/data/wild/roammon_maps.asm
+++ b/data/wild/roammon_maps.asm
@@ -2,33 +2,32 @@
 ; Notably missing are Route 40 and Route 41, which are water routes.
 
 roam_map: MACRO
-; map, # of other maps, other maps
-	map \1
-	db  \2
-rept \2
-	map \3
+	map_id \1
+	db _NARG - 1
+rept _NARG + -1
+	map_id \2
 	shift
 endr
 	db 0
 ENDM
 
-RoamMaps: ; 2a40f
+RoamMaps:
 ; there are NUM_ROAMMON_MAPS entries
-	roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46
-	roam_map ROUTE_30, 2, ROUTE_29, ROUTE_31
-	roam_map ROUTE_31, 3, ROUTE_30, ROUTE_32, ROUTE_36
-	roam_map ROUTE_32, 3, ROUTE_36, ROUTE_31, ROUTE_33
-	roam_map ROUTE_33, 2, ROUTE_32, ROUTE_34
-	roam_map ROUTE_34, 2, ROUTE_33, ROUTE_35
-	roam_map ROUTE_35, 2, ROUTE_34, ROUTE_36
-	roam_map ROUTE_36, 4, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37
-	roam_map ROUTE_37, 3, ROUTE_36, ROUTE_38, ROUTE_42
-	roam_map ROUTE_38, 3, ROUTE_37, ROUTE_39, ROUTE_42
-	roam_map ROUTE_39, 1, ROUTE_38
-	roam_map ROUTE_42, 4, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38
-	roam_map ROUTE_43, 2, ROUTE_42, ROUTE_44
-	roam_map ROUTE_44, 3, ROUTE_42, ROUTE_43, ROUTE_45
-	roam_map ROUTE_45, 2, ROUTE_44, ROUTE_46
-	roam_map ROUTE_46, 2, ROUTE_45, ROUTE_29
+	; start map, ...other maps
+	roam_map ROUTE_29, ROUTE_30, ROUTE_46
+	roam_map ROUTE_30, ROUTE_29, ROUTE_31
+	roam_map ROUTE_31, ROUTE_30, ROUTE_32, ROUTE_36
+	roam_map ROUTE_32, ROUTE_36, ROUTE_31, ROUTE_33
+	roam_map ROUTE_33, ROUTE_32, ROUTE_34
+	roam_map ROUTE_34, ROUTE_33, ROUTE_35
+	roam_map ROUTE_35, ROUTE_34, ROUTE_36
+	roam_map ROUTE_36, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37
+	roam_map ROUTE_37, ROUTE_36, ROUTE_38, ROUTE_42
+	roam_map ROUTE_38, ROUTE_37, ROUTE_39, ROUTE_42
+	roam_map ROUTE_39, ROUTE_38
+	roam_map ROUTE_42, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38
+	roam_map ROUTE_43, ROUTE_42, ROUTE_44
+	roam_map ROUTE_44, ROUTE_42, ROUTE_43, ROUTE_45
+	roam_map ROUTE_45, ROUTE_44, ROUTE_46
+	roam_map ROUTE_46, ROUTE_45, ROUTE_29
 	db -1 ; end
-; 2a4a0
diff --git a/data/wild/swarm_grass.asm b/data/wild/swarm_grass.asm
index a26417f64..dd7110e16 100644
--- a/data/wild/swarm_grass.asm
+++ b/data/wild/swarm_grass.asm
@@ -1,9 +1,9 @@
 ; Pokémon swarms in grass
 
-SwarmGrassWildMons: ; 0x2b8d0
+SwarmGrassWildMons:
 
 ; Dunsparce swarm
-	map DARK_CAVE_VIOLET_ENTRANCE
+	map_id DARK_CAVE_VIOLET_ENTRANCE
 	db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite
 	; morn
 	db 3, GEODUDE
@@ -31,7 +31,7 @@ SwarmGrassWildMons: ; 0x2b8d0
 	db 4, DUNSPARCE
 
 ; Yanma swarm
-	map ROUTE_35
+	map_id ROUTE_35
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
 	db 12, NIDORAN_M
diff --git a/data/wild/swarm_water.asm b/data/wild/swarm_water.asm
index 3f69af512..ec105c003 100644
--- a/data/wild/swarm_water.asm
+++ b/data/wild/swarm_water.asm
@@ -1,6 +1,6 @@
 ; Pokémon swarms in water
 
-SwarmWaterWildMons: ; 0x2b92f
+SwarmWaterWildMons:
 
 	; No swarms encountered while surfing in Crystal
 
diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm
index 7860110ca..b85962399 100644
--- a/data/wild/treemon_maps.asm
+++ b/data/wild/treemon_maps.asm
@@ -1,9 +1,9 @@
 treemon_map: MACRO
-	map \1
-	db  \2 ; treemon set
+	map_id \1
+	db \2 ; treemon set
 ENDM
 
-TreeMonMaps: ; b825e
+TreeMonMaps:
 	treemon_map ROUTE_26,                  TREEMON_SET_KANTO
 	treemon_map ROUTE_27,                  TREEMON_SET_KANTO
 	treemon_map ROUTE_28,                  TREEMON_SET_CITY
@@ -11,7 +11,7 @@ TreeMonMaps: ; b825e
 	treemon_map ROUTE_30,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_31,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_32,                  TREEMON_SET_KANTO
-	treemon_map ROUTE_33,                  TREEMON_SET_AZALEA
+	treemon_map ROUTE_33,                  TREEMON_SET_TOWN
 	treemon_map ROUTE_34,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_35,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_36,                  TREEMON_SET_ROUTE
@@ -20,7 +20,7 @@ TreeMonMaps: ; b825e
 	treemon_map ROUTE_39,                  TREEMON_SET_ROUTE
 	treemon_map ROUTE_40,                  TREEMON_SET_CITY
 	treemon_map ROUTE_41,                  TREEMON_SET_CITY
-	treemon_map ROUTE_42,                  TREEMON_SET_AZALEA
+	treemon_map ROUTE_42,                  TREEMON_SET_TOWN
 	treemon_map ROUTE_43,                  TREEMON_SET_LAKE
 	treemon_map ROUTE_44,                  TREEMON_SET_CANYON
 	treemon_map ROUTE_45,                  TREEMON_SET_CANYON
@@ -28,7 +28,7 @@ TreeMonMaps: ; b825e
 	treemon_map NEW_BARK_TOWN,             TREEMON_SET_CITY
 	treemon_map CHERRYGROVE_CITY,          TREEMON_SET_CITY
 	treemon_map VIOLET_CITY,               TREEMON_SET_CITY
-	treemon_map AZALEA_TOWN,               TREEMON_SET_AZALEA
+	treemon_map AZALEA_TOWN,               TREEMON_SET_TOWN
 	treemon_map CIANWOOD_CITY,             TREEMON_SET_CITY
 	treemon_map GOLDENROD_CITY,            TREEMON_SET_CITY
 	treemon_map OLIVINE_CITY,              TREEMON_SET_CITY
@@ -39,12 +39,10 @@ TreeMonMaps: ; b825e
 	treemon_map SILVER_CAVE_OUTSIDE,       TREEMON_SET_CITY
 	treemon_map ILEX_FOREST,               TREEMON_SET_FOREST
 	db -1
-; b82c5
 
-RockMonMaps: ; b82c5
+RockMonMaps:
 	treemon_map CIANWOOD_CITY,             TREEMON_SET_ROCK
 	treemon_map ROUTE_40,                  TREEMON_SET_ROCK
 	treemon_map DARK_CAVE_VIOLET_ENTRANCE, TREEMON_SET_ROCK
 	treemon_map SLOWPOKE_WELL_B1F,         TREEMON_SET_ROCK
 	db -1
-; b82d2
diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm
index 21cef29ec..a6b1922f3 100644
--- a/data/wild/treemons.asm
+++ b/data/wild/treemons.asm
@@ -1,8 +1,8 @@
-TreeMons: ; b82e8
+TreeMons:
 ; entries correspond to TREEMON_SET_* constants
 	dw TreeMonSet_City
 	dw TreeMonSet_Canyon
-	dw TreeMonSet_Azalea
+	dw TreeMonSet_Town
 	dw TreeMonSet_Route
 	dw TreeMonSet_Kanto
 	dw TreeMonSet_Lake
@@ -15,7 +15,7 @@ TreeMons: ; b82e8
 ;	db  %, species, level
 
 TreeMonSet_City:
-TreeMonSet_Canyon: ; b82fa
+TreeMonSet_Canyon:
 ; common
 	db 50, SPEAROW,    10
 	db 15, SPEAROW,    10
@@ -33,7 +33,7 @@ TreeMonSet_Canyon: ; b82fa
 	db  5, AIPOM,      10
 	db -1
 
-TreeMonSet_Azalea: ; b8320
+TreeMonSet_Town:
 ; common
 	db 50, SPEAROW,    10
 	db 15, EKANS,      10
@@ -51,7 +51,7 @@ TreeMonSet_Azalea: ; b8320
 	db  5, AIPOM,      10
 	db -1
 
-TreeMonSet_Route: ; b8346
+TreeMonSet_Route:
 ; common
 	db 50, HOOTHOOT,   10
 	db 15, SPINARAK,   10
@@ -69,7 +69,7 @@ TreeMonSet_Route: ; b8346
 	db  5, EXEGGCUTE,  10
 	db -1
 
-TreeMonSet_Kanto: ; b836c
+TreeMonSet_Kanto:
 ; common
 	db 50, HOOTHOOT,   10
 	db 15, EKANS,      10
@@ -87,7 +87,7 @@ TreeMonSet_Kanto: ; b836c
 	db  5, EXEGGCUTE,  10
 	db -1
 
-TreeMonSet_Lake: ; b8392
+TreeMonSet_Lake:
 ; common
 	db 50, HOOTHOOT,   10
 	db 15, VENONAT,    10
@@ -105,7 +105,7 @@ TreeMonSet_Lake: ; b8392
 	db  5, EXEGGCUTE,  10
 	db -1
 
-TreeMonSet_Forest: ; b83b8
+TreeMonSet_Forest:
 ; common
 	db 50, HOOTHOOT,   10
 	db 15, PINECO,     10
@@ -123,8 +123,7 @@ TreeMonSet_Forest: ; b83b8
 	db  5, KAKUNA,     10
 	db -1
 
-TreeMonSet_Rock: ; b83de
+TreeMonSet_Rock:
 	db 90, KRABBY,     15
 	db 10, SHUCKLE,    15
 	db -1
-; b83e5
diff --git a/data/wild/unlocked_unowns.asm b/data/wild/unlocked_unowns.asm
new file mode 100644
index 000000000..d09064c4b
--- /dev/null
+++ b/data/wild/unlocked_unowns.asm
@@ -0,0 +1,24 @@
+unown_set: MACRO
+rept _NARG
+	db UNOWN_\1
+	shift
+endr
+	db -1
+ENDM
+
+UnlockedUnownLetterSets:
+; entries correspond to wUnlockedUnowns bits
+	dw .Set_A_K ; ENGINE_UNLOCKED_UNOWNS_A_TO_K
+	dw .Set_L_R ; ENGINE_UNLOCKED_UNOWNS_L_TO_R
+	dw .Set_S_W ; ENGINE_UNLOCKED_UNOWNS_S_TO_W
+	dw .Set_X_Z ; ENGINE_UNLOCKED_UNOWNS_X_TO_Z
+.End
+
+.Set_A_K:
+	unown_set A, B, C, D, E, F, G, H, I, J, K
+.Set_L_R:
+	unown_set L, M, N, O, P, Q, R
+.Set_S_W:
+	unown_set S, T, U, V, W
+.Set_X_Z:
+	unown_set X, Y, Z
diff --git a/docs/battle_anim_commands.md b/docs/battle_anim_commands.md
index bd40e8a6d..86763b24a 100644
--- a/docs/battle_anim_commands.md
+++ b/docs/battle_anim_commands.md
@@ -88,7 +88,7 @@ Temporarily creates sprites from the top row of the player backpic, so that the
 
 ## `$DB`: `anim_checkpokeball`
 
-Sets `BattleAnimVar` to the result of [GetPokeBallWobble](/engine/battle_anims/getpokeballwobble.asm).
+Sets `BattleAnimVar` to the result of [GetPokeBallWobble](/engine/battle_anims/pokeball_wobble.asm).
 
 
 ## `$DC`: `anim_transform`
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 7dfd8f421..3a6e5508c 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -15,6 +15,8 @@ These are known bugs and glitches in the original Pokémon Crystal game: code th
 - [A Pokémon that fainted from Pursuit will have its old status condition when revived](#a-pokémon-that-fainted-from-pursuit-will-have-its-old-status-condition-when-revived)
 - [Lock-On and Mind Reader don't always bypass Fly and Dig](#lock-on-and-mind-reader-dont-always-bypass-fly-and-dig)
 - [Beat Up can desynchronize link battles](#beat-up-can-desynchronize-link-battles)
+- [Beat Up may fail to raise substitute](#beat-up-may-fail-to-raise-substitute)
+- [Beat Up may trigger King's Rock even if it failed](#beat-up-may-trigger-kings-rock-even-if-it-failed)
 - [Present damage is incorrect in link battles](#present-damage-is-incorrect-in-link-battles)
 - ["Smart" AI encourages Mean Look if its own Pokémon is badly poisoned](#smart-ai-encourages-mean-look-if-its-own-pokémon-is-badly-poisoned)
 - [AI makes a false assumption about `CheckTypeMatchup`](#ai-makes-a-false-assumption-about-checktypematchup)
@@ -33,6 +35,7 @@ These are known bugs and glitches in the original Pokémon Crystal game: code th
 - [Magikarp length limits have a unit conversion error](#magikarp-length-limits-have-a-unit-conversion-error)
 - [Magikarp lengths can be miscalculated](#magikarp-lengths-can-be-miscalculated)
 - [Battle transitions fail to account for the enemy's level](#battle-transitions-fail-to-account-for-the-enemys-level)
+- [A "HOF Master!" title for 200-Time Famers is defined but inaccessible](#a-hof-master-title-for-200-time-famers-is-defined-but-inaccessible)
 - [Slot machine payout sound effects cut each other off](#slot-machine-payout-sound-effects-cut-each-other-off)
 - [Team Rocket battle music is not used for Executives or Scientists](#team-rocket-battle-music-is-not-used-for-executives-or-scientists)
 - [No bump noise if standing on tile `$3E`](#no-bump-noise-if-standing-on-tile-3e)
@@ -41,17 +44,18 @@ These are known bugs and glitches in the original Pokémon Crystal game: code th
 - [Two tiles in the `port` tileset are drawn incorrectly](#two-tiles-in-the-port-tileset-are-drawn-incorrectly)
 - [`LoadMetatiles` wraps around past 128 blocks](#loadmetatiles-wraps-around-past-128-blocks)
 - [Surfing directly across a map connection does not load the new map](#surfing-directly-across-a-map-connection-does-not-load-the-new-map)
-- [`Function6ec1` does not correctly limit object movement](#function6ec1-does-not-correctly-limit-object-movement)
+- [Swimming NPCs aren't limited by their movement radius](#swimming-npcs-arent-limited-by-their-movement-radius)
 - [`CheckOwnMon` only checks the first five letters of OT names](#checkownmon-only-checks-the-first-five-letters-of-ot-names)
 - [Catching a Transformed Pokémon always catches a Ditto](#catching-a-transformed-pokémon-always-catches-a-ditto)
 - [Using a Park Ball in normal battles has a corrupt animation](#using-a-park-ball-in-normal-battles-has-a-corrupt-animation)
 - [`HELD_CATCH_CHANCE` has no effect](#held_catch_chance-has-no-effect)
-- [Only the first three `EvosAttacks` evolution entries can have Stone compatibility reported correctly](#only-the-first-three-evosattacks-evolution-entries-can-have-stone-compatibility-reported-correctly)
+- [Only the first three evolution entries can have Stone compatibility reported correctly](#only-the-first-three-evolution-entries-can-have-stone-compatibility-reported-correctly)
+- [`EVOLVE_STAT` can break Stone compatibility reporting](#evolve_stat-can-break-stone-compatibility-reporting)
 - [`ScriptCall` can overflow `wScriptStack` and crash](#scriptcall-can-overflow-wscriptstack-and-crash)
 - [`LoadSpriteGFX` does not limit the capacity of `UsedSprites`](#loadspritegfx-does-not-limit-the-capacity-of-usedsprites)
 - [`ChooseWildEncounter` doesn't really validate the wild Pokémon species](#choosewildencounter-doesnt-really-validate-the-wild-pokémon-species)
 - [`TryObjectEvent` arbitrary code execution](#tryobjectevent-arbitrary-code-execution)
-- [`Special_CheckBugContestContestantFlag` can read beyond its data table](#special_checkbugcontestcontestantflag-can-read-beyond-its-data-table)
+- [`CheckBugContestContestantFlag` can read beyond its data table](#checkbugcontestcontestantflag-can-read-beyond-its-data-table)
 - [`ClearWRAM` only clears WRAM bank 1](#clearwram-only-clears-wram-bank-1)
 
 
@@ -72,21 +76,21 @@ This is a bug with `SpeciesItemBoost` in [engine/battle/effect_commands.asm](/en
 
 **Fix:**
 
-```asm
+```diff
 ; Double the stat
 	sla l
 	rl h
-
-	ld a, HIGH(MAX_STAT_VALUE)
-	cp h
-	jr c, .cap
-	ld a, LOW(MAX_STAT_VALUE)
-	cp l
-	ret nc
-
-.cap
-	ld h, HIGH(MAX_STAT_VALUE)
-	ld l, LOW(MAX_STAT_VALUE)
++
++	ld a, HIGH(MAX_STAT_VALUE)
++	cp h
++	jr c, .cap
++	ld a, LOW(MAX_STAT_VALUE)
++	cp l
++	ret nc
++
++.cap
++	ld h, HIGH(MAX_STAT_VALUE)
++	ld l, LOW(MAX_STAT_VALUE)
 	ret
 ```
 
@@ -119,7 +123,7 @@ This is a bug with `DittoMetalPowder` in [engine/battle/effect_commands.asm](/en
 
 **Fix:**
 
-```asm
+```diff
 	ld a, c
 	srl a
 	add c
@@ -134,17 +138,17 @@ This is a bug with `DittoMetalPowder` in [engine/battle/effect_commands.asm](/en
 .done
 	scf
 	rr c
-
-	ld a, HIGH(MAX_STAT_VALUE)
-	cp b
-	jr c, .cap
-	ld a, LOW(MAX_STAT_VALUE)
-	cp c
-	ret nc
-
-.cap
-	ld b, HIGH(MAX_STAT_VALUE)
-	ld c, LOW(MAX_STAT_VALUE)
++
++	ld a, HIGH(MAX_STAT_VALUE)
++	cp b
++	jr c, .cap
++	ld a, LOW(MAX_STAT_VALUE)
++	cp c
++	ret nc
++
++.cap
++	ld b, HIGH(MAX_STAT_VALUE)
++	ld c, LOW(MAX_STAT_VALUE)
 	ret
 ```
 
@@ -155,35 +159,35 @@ This is a bug with `DittoMetalPowder` in [engine/battle/effect_commands.asm](/en
 
 ([Video](https://www.youtube.com/watch?v=zuCLMikWo4Y))
 
-This is a bug with `BattleCommand_BellyDrum` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
+This is a bug with `BattleCommand_BellyDrum` in [engine/battle/move_effects/belly_drum.asm](/engine/battle/move_effects/belly_drum.asm):
 
 ```asm
-BattleCommand_BellyDrum: ; 37c1a
+BattleCommand_BellyDrum:
 ; bellydrum
 ; This command is buggy because it raises the user's attack
 ; before checking that it has enough HP to use the move.
 ; Swap the order of these two blocks to fix.
 	call BattleCommand_AttackUp2
-	ld a, [AttackMissed]
+	ld a, [wAttackMissed]
 	and a
 	jr nz, .failed
 
-	callab GetHalfMaxHP
-	callab CheckUserHasEnoughHP
+	callfar GetHalfMaxHP
+	callfar CheckUserHasEnoughHP
 	jr nc, .failed
 ```
 
 **Fix:**
 
 ```asm
-BattleCommand_BellyDrum: ; 37c1a
+BattleCommand_BellyDrum:
 ; bellydrum
-	callab GetHalfMaxHP
-	callab CheckUserHasEnoughHP
+	callfar GetHalfMaxHP
+	callfar CheckUserHasEnoughHP
 	jr nc, .failed
 
 	call BattleCommand_AttackUp2
-	ld a, [AttackMissed]
+	ld a, [wAttackMissed]
 	and a
 	jr nz, .failed
 ```
@@ -242,7 +246,35 @@ DefenseDownHit:
 
 ([Video](https://www.youtube.com/watch?v=uRYyzKRatFk))
 
-*To do:* Identify specific code causing this bug and fix it.
+This is a bug with `BattleCommand_Counter` in [engine/battle/move_effects/counter.asm](/engine/battle/move_effects/counter.asm) and `BattleCommand_MirrorCoat` in [engine/battle/move_effects/mirror_coat.asm](/engine/battle/move_effects/mirror_coat.asm):
+
+```asm
+	; BUG: Move should fail with all non-damaging battle actions
+	ld hl, wCurDamage
+	ld a, [hli]
+	or [hl]
+	ret z
+```
+
+**Fix:**
+
+```diff
+	ld hl, wCurDamage
+	ld a, [hli]
+	or [hl]
+-	ret z
++	jp z, .failed
+```
+
+Add this to the end of each file:
+
+```diff
++.failed
++	ld a, 1
++	ld [wEffectFailed], a
++	and a
++	ret
+```
 
 
 ## A Disabled but PP Up–enhanced move may not trigger Struggle
@@ -256,12 +288,11 @@ This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engi
 ```asm
 .done
 	; Bug: this will result in a move with PP Up confusing the game.
-	; Replace with "and $3f" to fix.
-	and a
+	and a ; should be "and PP_MASK"
 	ret nz
 
 .force_struggle
-	ld hl, BattleText_PkmnHasNoMovesLeft
+	ld hl, BattleText_MonHasNoMovesLeft
 	call StdBattleTextBox
 	ld c, 60
 	call DelayFrames
@@ -269,7 +300,7 @@ This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engi
 	ret
 ```
 
-**Fix:** Change `and a` to `and $3f`.
+**Fix:** Change `and a` to `and PP_MASK`.
 
 
 ## A Pokémon that fainted from Pursuit will have its old status condition when revived
@@ -290,7 +321,7 @@ This bug affects Attract, Curse, Foresight, Mean Look, Mimic, Nightmare, Spider
 This is a bug with `CheckHiddenOpponent` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
-CheckHiddenOpponent: ; 37daa
+CheckHiddenOpponent:
 ; BUG: This routine should account for Lock-On and Mind Reader.
 	ld a, BATTLE_VARS_SUBSTATUS3_OPP
 	call GetBattleVar
@@ -313,12 +344,12 @@ The code in `CheckHiddenOpponent` is completely redundant as `CheckHit` already
 
 ([Video](https://www.youtube.com/watch?v=202-iAsrIa8))
 
-This is a bug with `BattleCommand_BeatUp` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
+This is a bug with `BattleCommand_BeatUp` in [engine/battle/move_effects/beat_up.asm](/engine/battle/move_effects/beat_up.asm):
 
 ```asm
 .got_mon
 	ld a, [wd002]
-	ld hl, PartyMonNicknames
+	ld hl, wPartyMonNicknames
 	call GetNick
 	ld a, MON_HP
 	call GetBeatupMonLocation
@@ -327,11 +358,11 @@ This is a bug with `BattleCommand_BeatUp` in [engine/battle/effect_commands.asm]
 	jp z, .beatup_fail ; fainted
 	ld a, [wd002]
 	ld c, a
-	ld a, [CurBattleMon]
+	ld a, [wCurBattleMon]
 	; BUG: this can desynchronize link battles
 	; Change "cp [hl]" to "cp c" to fix
 	cp [hl]
-	ld hl, BattleMonStatus
+	ld hl, wBattleMonStatus
 	jr z, .active_mon
 	ld a, MON_STATUS
 	call GetBeatupMonLocation
@@ -344,6 +375,82 @@ This is a bug with `BattleCommand_BeatUp` in [engine/battle/effect_commands.asm]
 **Fix:** Change `cp [hl]` to `cp c`.
 
 
+## Beat Up may fail to raise substitute
+
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*  
+(Only the fixes denoted with "breaking" will actually break compatibility, the others just affect what's shown on the screen with the patched game)
+
+This is a bug in `BattleCommand_EndLoop` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm) that prevents the rest of the move's effect from being executed if the player or enemy only has one mon in their party while using Beat Up.
+
+It prevents the substitute from being raised and the King's Rock from working.
+
+```asm
+.only_one_beatup
+	ld a, BATTLE_VARS_SUBSTATUS3
+	call GetBattleVarAddr
+	res SUBSTATUS_IN_LOOP, [hl]
+	call BattleCommand_BeatUpFailText
+	jp EndMoveEffect
+```
+
+**Fix (breaking):** Replace the last two lines with `ret`.  
+**Fix (cosmetics):** Call `BattleCommand_RaiseSub` before the `jp`.
+
+There's a similar oversight in `BattleCommand_FailureText` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm) that will prevent the substitute from being raised if Beat Up is protected against.
+
+```asm
+	cp EFFECT_MULTI_HIT
+	jr z, .multihit
+	cp EFFECT_DOUBLE_HIT
+	jr z, .multihit
+	cp EFFECT_POISON_MULTI_HIT
+	jr z, .multihit
+	jp EndMoveEffect
+
+.multihit
+	call BattleCommand_RaiseSub
+	jp EndMoveEffect
+```
+
+**Fix:** Check for `EFFECT_BEAT_UP` as well.
+
+
+## Beat Up may trigger King's Rock even if it failed
+
+*Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
+
+This is a bug in how `wAttackMissed` is never set by BeatUp, even when none of the 'mon have been able to attack (due to being fainted or having a status effect), the King's Rock may activate.
+
+This bug can be fixed in a plethora of ways, but the most straight-forward would be in `BattleCommand_BeatUpFailText` in [engine/battle/move_effects/beat_up.asm](/engine/battle/move_effects/beat_up.asm), as that's always ran before the king's rock effect.
+
+```asm
+BattleCommand_BeatUpFailText:
+; beatupfailtext
+
+	ld a, [wBeatUpHitAtLeastOnce]
+	and a
+	ret nz
+
+	jp PrintButItFailed
+```
+
+**Fix:**
+
+```diff
+BattleCommand_BeatUpFailText:
+; beatupfailtext
+
+	ld a, [wBeatUpHitAtLeastOnce]
+	and a
+	ret nz
++
++	inc a
++	ld [wAttackMissed], a
+
+	jp PrintButItFailed
+```
+
+
 ## Present damage is incorrect in link battles
 
 *Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
@@ -352,10 +459,10 @@ This is a bug with `BattleCommand_BeatUp` in [engine/battle/effect_commands.asm]
 
 This bug existed for all battles in Gold and Silver, and was only fixed for single-player battles in Crystal to preserve link compatibility.
 
-This is a bug with `BattleCommand_Present` in [engine/battle/effect_commands/present.asm](/engine/battle/effect_commands/present.asm):
+This is a bug with `BattleCommand_Present` in [engine/battle/move_effects/present.asm](/engine/battle/move_effects/present.asm):
 
 ```asm
-BattleCommand_Present: ; 37874
+BattleCommand_Present:
 ; present
 
 	ld a, [wLinkMode]
@@ -378,7 +485,7 @@ BattleCommand_Present: ; 37874
 **Fix:**
 
 ```asm
-BattleCommand_Present: ; 37874
+BattleCommand_Present:
 ; present
 
 	push bc
@@ -397,13 +504,13 @@ This is a bug with `AI_Smart_MeanLook` in [engine/battle/ai/scoring.asm](/engine
 
 ```asm
 ; 80% chance to greatly encourage this move if the enemy is badly poisoned (buggy).
-; Should check PlayerSubStatus5 instead.
-	ld a, [EnemySubStatus5]
+; Should check wPlayerSubStatus5 instead.
+	ld a, [wEnemySubStatus5]
 	bit SUBSTATUS_TOXIC, a
 	jr nz, .asm_38e26
 ```
 
-**Fix:** Change `EnemySubStatus5` to `PlayerSubStatus5`.
+**Fix:** Change `wEnemySubStatus5` to `wPlayerSubStatus5`.
 
 
 ## AI makes a false assumption about `CheckTypeMatchup`
@@ -411,13 +518,13 @@ This is a bug with `AI_Smart_MeanLook` in [engine/battle/ai/scoring.asm](/engine
 In [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
-BattleCheckTypeMatchup: ; 347c8
-	ld hl, EnemyMonType1
+BattleCheckTypeMatchup:
+	ld hl, wEnemyMonType1
 	ld a, [hBattleTurn]
 	and a
 	jr z, CheckTypeMatchup
-	ld hl, BattleMonType1
-CheckTypeMatchup: ; 347d3
+	ld hl, wBattleMonType1
+CheckTypeMatchup:
 ; There is an incorrect assumption about this function made in the AI related code: when
 ; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing the
 ; offensive type in a will make this function do the right thing. Since a is overwritten,
@@ -442,25 +549,24 @@ CheckTypeMatchup: ; 347d3
 This is a bug with `AI_HealStatus` in [engine/battle/ai/items.asm](/engine/battle/ai/items.asm):
 
 ```asm
-AI_HealStatus: ; 384e0
-	ld a, [CurOTMon]
-	ld hl, OTPartyMon1Status
+AI_HealStatus:
+	ld a, [wCurOTMon]
+	ld hl, wOTPartyMon1Status
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	xor a
 	ld [hl], a
-	ld [EnemyMonStatus], a
+	ld [wEnemyMonStatus], a
 	; Bug: this should reset SUBSTATUS_NIGHTMARE too
 	; Uncomment the lines below to fix
-	; ld hl, EnemySubStatus1
+	; ld hl, wEnemySubStatus1
 	; res SUBSTATUS_NIGHTMARE, [hl]
-	ld hl, EnemySubStatus5
+	ld hl, wEnemySubStatus5
 	res SUBSTATUS_TOXIC, [hl]
 	ret
-; 384f7
 ```
 
-**Fix:** Uncomment `ld hl, EnemySubStatus1` and `res SUBSTATUS_NIGHTMARE, [hl]`.
+**Fix:** Uncomment `ld hl, wEnemySubStatus1` and `res SUBSTATUS_NIGHTMARE, [hl]`.
 
 
 ## HP bar animation is slow for high HP
@@ -495,15 +601,16 @@ This is a bug with `LongAnim_UpdateVariables` in [engine/battle/anim_hp_bar.asm]
 
 ([Video](https://www.youtube.com/watch?v=9KyNVIZxJvI))
 
-This is a bug with `ShortHPBar_CalcPixelFrame` in [engine/anim_hp_bar.asm](/engine/anim_hp_bar.asm):
+This is a bug with `ShortHPBar_CalcPixelFrame` in [engine/battle/anim_hp_bar.asm](/engine/battle/anim_hp_bar.asm):
 
 ```asm
 	ld b, 0
-; This routine is buggy. If [wCurHPAnimMaxHP] * [wCurHPBarPixels] is divisible
-; by 48, the loop runs one extra time. To fix, uncomment the line below.
+; This routine is buggy. If [wCurHPAnimMaxHP] * [wCurHPBarPixels] is
+; divisible by HP_BAR_LENGTH_PX, the loop runs one extra time.
+; To fix, uncomment the line below.
 .loop
 	ld a, l
-	sub 6 * 8
+	sub HP_BAR_LENGTH_PX
 	ld l, a
 	ld a, h
 	sbc $0
@@ -523,12 +630,12 @@ This is a bug with `ShortHPBar_CalcPixelFrame` in [engine/anim_hp_bar.asm](/engi
 
 This can bring Pokémon straight from level 1 to 100 by gaining just a few experience points.
 
-This is a bug with `CalcExpAtLevel` in [main.asm](/main.asm):
+This is a bug with `CalcExpAtLevel` in [engine/pokemon/experience.asm](/engine/pokemon/experience.asm):
 
 ```asm
-CalcExpAtLevel: ; 50e47
+CalcExpAtLevel:
 ; (a/b)*n**3 + c*n**2 + d*n - e
-	ld a, [BaseGrowthRate]
+	ld a, [wBaseGrowthRate]
 	add a
 	add a
 	ld c, a
@@ -539,23 +646,23 @@ CalcExpAtLevel: ; 50e47
 
 **Fix:**
 
-```asm
-CalcExpAtLevel: ; 50e47
+```diff
+CalcExpAtLevel:
 ; (a/b)*n**3 + c*n**2 + d*n - e
-	ld a, d
-	cp 1
-	jr nz, .UseExpFormula
-; Pokémon have 0 experience at level 1
-	xor a
-	ld hl, hProduct
-	ld [hli], a
-	ld [hli], a
-	ld [hli], a
-	ld [hl], a
-	ret
-
-.UseExpFormula
-	ld a, [BaseGrowthRate]
++	ld a, d
++	cp 1
++	jr nz, .UseExpFormula
++; Pokémon have 0 experience at level 1
++	xor a
++	ld hl, hProduct
++	ld [hli], a
++	ld [hli], a
++	ld [hli], a
++	ld [hl], a
++	ret
++
++.UseExpFormula
+	ld a, [wBaseGrowthRate]
 	add a
 	add a
 	ld c, a
@@ -569,45 +676,44 @@ CalcExpAtLevel: ; 50e47
 
 ([Video](https://www.youtube.com/watch?v=o54VjpAEoO8))
 
-This is a bug with `Text_ABoostedStringBuffer2ExpPoints` and `Text_StringBuffer2ExpPoints` in [text/common_2.asm](/text/common_2.asm):
+This is a bug with `Text_ABoostedStringBuffer2ExpPoints` and `Text_StringBuffer2ExpPoints` in [data/text/common_2.asm](/data/text/common_2.asm):
 
 ```asm
 Text_ABoostedStringBuffer2ExpPoints::
 	text_start
 	line "a boosted"
 	cont "@"
-	deciram StringBuffer2, 2, 4
+	deciram wStringBuffer2, 2, 4
 	text " EXP. Points!"
 	prompt
 
 Text_StringBuffer2ExpPoints::
 	text_start
 	line "@"
-	deciram StringBuffer2, 2, 4
+	deciram wStringBuffer2, 2, 4
 	text " EXP. Points!"
 	prompt
 ```
 
-**Fix:** Change both `deciram StringBuffer2, 2, 4` to `deciram StringBuffer2, 2, 5`.
+**Fix:** Change both `deciram wStringBuffer2, 2, 4` to `deciram wStringBuffer2, 2, 5`.
 
 
 ## BRN/PSN/PAR do not affect catch rate
 
-This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.asm):
+This is a bug with `PokeBallEffect` in [engine/items/item_effects.asm](/engine/items/item_effects.asm):
 
 ```asm
-.statuscheck
 ; This routine is buggy. It was intended that SLP and FRZ provide a higher
 ; catch rate than BRN/PSN/PAR, which in turn provide a higher catch rate than
 ; no status effect at all. But instead, it makes BRN/PSN/PAR provide no
 ; benefit.
 ; Uncomment the line below to fix this.
 	ld b, a
-	ld a, [EnemyMonStatus]
+	ld a, [wEnemyMonStatus]
 	and 1 << FRZ | SLP
 	ld c, 10
 	jr nz, .addstatus
-	; ld a, [EnemyMonStatus]
+	; ld a, [wEnemyMonStatus]
 	and a
 	ld c, 5
 	jr nz, .addstatus
@@ -620,7 +726,7 @@ This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.as
 .max_1
 ```
 
-**Fix:** Uncomment `ld a, [EnemyMonStatus]`.
+**Fix:** Uncomment `ld a, [wEnemyMonStatus]`.
 
 
 ## Moon Ball does not boost catch rate
@@ -639,7 +745,7 @@ MoonBallMultiplier:
 ; No Pokémon evolve with Burn Heal,
 ; so Moon Balls always have a catch rate of 1×.
 	push bc
-	ld a, BANK(EvosAttacks)
+	ld a, BANK("Evolutions and Attacks")
 	call GetFarByte
 	cp MOON_STONE_RED ; BURN_HEAL
 	pop bc
@@ -701,29 +807,29 @@ FastBallMultiplier:
 
 *Fixing this bug will break compatibility with standard Pokémon Crystal for link battles.*
 
-This is a bug with `ItemAttributes` in [items/attributes.asm](/items/attributes.asm):
+This is a bug with `ItemAttributes` in [data/items/attributes.asm](/data/items/attributes.asm):
 
 ```asm
-; DRAGON FANG
+; DRAGON_FANG
 	item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 
 ...
 
-; DRAGON SCALE
+; DRAGON_SCALE
 	item_attribute 2100, HELD_DRAGON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ```
 
-**Fix:** Move `HELD_DRAGON_BOOST` to the `DRAGON FANG` attributes and `0` to `DRAGON SCALE`.
+**Fix:** Move `HELD_DRAGON_BOOST` to the `DRAGON_FANG` attributes and `0` to `DRAGON_SCALE`.
 
 
 ## Daisy's grooming doesn't always increase happiness
 
-This is a bug with `MassageOrHaircut` in [engine/events/special.asm](/engine/events/special.asm):
+This is a bug with `HaircutOrGrooming` in [engine/events/haircut.asm](/engine/events/haircut.asm):
 
 ```asm
 ; Bug: Subtracting $ff from $ff fails to set c.
 ; This can result in overflow into the next data array.
-; In the case of getting a massage from Daisy, we bleed
+; In the case of getting a grooming from Daisy, we bleed
 ; into CopyPokemonName_Buffer1_Buffer3, which passes
 ; $d0 to ChangeHappiness and returns $73 to the script.
 ; The end result is that there is a 0.4% chance your
@@ -739,29 +845,36 @@ This is a bug with `MassageOrHaircut` in [engine/events/special.asm](/engine/eve
 .ok
 	inc hl
 	ld a, [hli]
-	ld [ScriptVar], a
+	ld [wScriptVar], a
 	ld c, [hl]
 	call ChangeHappiness
 	ret
 
 ...
 
-Data_DaisyMassage: ; 746b
-	db $ff, 2, HAPPINESS_MASSAGE ; 99.6% chance
+INCLUDE "data/events/happiness_probabilities.asm"
 
-CopyPokemonName_Buffer1_Buffer3: ; 746e
-	ld hl, StringBuffer1
-	ld de, StringBuffer3
+CopyPokemonName_Buffer1_Buffer3:
+	ld hl, wStringBuffer1
+	ld de, wStringBuffer3
 	ld bc, MON_NAME_LENGTH
 	jp CopyBytes
 ```
 
-**Fix:**
+In [data/events/happiness_probabilities.asm](/data/events/happiness_probabilities.asm):
 
 ```asm
-Data_DaisyMassage: ; 746b
-	db $80, 2, HAPPINESS_MASSAGE ; 50% chance
-	db $ff, 2, HAPPINESS_MASSAGE ; 50% chance
+HappinessData_DaisysGrooming:
+	db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance
+```
+
+**Fix:**
+
+```diff
+HappinessData_DaisysGrooming:
+-	db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance
++	db $80, 2, HAPPINESS_GROOMING ; 50% chance
++	db $ff, 2, HAPPINESS_GROOMING ; 50% chance
 ```
 
 
@@ -771,19 +884,23 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](
 
 ```asm
 .CheckMagikarpArea:
-; The z checks are supposed to be nz
-; Instead, all maps in GROUP_LAKE_OF_RAGE (mahogany area)
-; and routes 20 and 44 are treated as Lake of Rage
+; The "jr z" checks are supposed to be "jr nz".
+
+; Instead, all maps in GROUP_LAKE_OF_RAGE (Mahogany area)
+; and Routes 20 and 44 are treated as Lake of Rage.
 
 ; This also means Lake of Rage Magikarp can be smaller than ones
-; caught elsewhere rather than the other way around
+; caught elsewhere rather than the other way around.
+
+; Intended behavior enforces a minimum size at Lake of Rage.
+; The real behavior prevents a minimum size in the Lake of Rage area.
 
-; Intended behavior enforces a minimum size at Lake of Rage
-; The real behavior prevents size flooring in the Lake of Rage area
-	ld a, [MapGroup]
+; Moreover, due to the check not being translated to feet+inches, all Magikarp
+; smaller than 4'0" may be caught by the filter, a lot more than intended.
+	ld a, [wMapGroup]
 	cp GROUP_LAKE_OF_RAGE
 	jr z, .Happiness
-	ld a, [MapNumber]
+	ld a, [wMapNumber]
 	cp MAP_LAKE_OF_RAGE
 	jr z, .Happiness
 ```
@@ -797,31 +914,31 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](
 
 ```asm
 ; Get Magikarp's length
-	ld de, EnemyMonDVs
-	ld bc, PlayerID
+	ld de, wEnemyMonDVs
+	ld bc, wPlayerID
 	callfar CalcMagikarpLength
 
-; No reason to keep going if length > 1536 (i.e. if length / 256 != 6)
+; No reason to keep going if length > 1536 mm (i.e. if HIGH(length) > 6 feet)
 	ld a, [wMagikarpLength]
-	cp HIGH(1536) ; this compares to 6'0'', should be cp 5
+	cp HIGH(1536) ; should be "cp 5", since 1536 mm = 5'0", but HIGH(1536) = 6
 	jr nz, .CheckMagikarpArea
 
 ; 5% chance of skipping both size checks
 	call Random
 	cp 5 percent
 	jr c, .CheckMagikarpArea
-; Try again if length > 1615
+; Try again if length >= 1616 mm (i.e. if LOW(length) >= 3 inches)
 	ld a, [wMagikarpLength + 1]
-	cp LOW(1616) ; this compares to 6'80'', should be cp 3
+	cp LOW(1616) ; should be "cp 3", since 1616 mm = 5'3", but LOW(1616) = 80
 	jr nc, .GenerateDVs
 
 ; 20% chance of skipping this check
 	call Random
 	cp 20 percent - 1
 	jr c, .CheckMagikarpArea
-; Try again if length > 1599
+; Try again if length >= 1600 mm (i.e. if LOW(length) >= 2 inches)
 	ld a, [wMagikarpLength + 1]
-	cp LOW(1600) ; this compares to 6'64'', should be cp 2
+	cp LOW(1600) ; should be "cp 2", since 1600 mm = 5'2", but LOW(1600) = 64
 	jr nc, .GenerateDVs
 ```
 
@@ -833,7 +950,7 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](
 This is a bug with `CalcMagikarpLength.BCLessThanDE` in [engine/events/magikarp.asm](/engine/events/magikarp.asm):
 
 ```asm
-.BCLessThanDE: ; fbc9a
+.BCLessThanDE:
 ; Intention: Return bc < de.
 ; Reality: Return b < d.
 	ld a, b
@@ -843,7 +960,6 @@ This is a bug with `CalcMagikarpLength.BCLessThanDE` in [engine/events/magikarp.
 	ld a, c
 	cp e
 	ret
-; fbca1
 ```
 
 **Fix:** Delete `ret nc`.
@@ -853,59 +969,80 @@ This is a bug with `CalcMagikarpLength.BCLessThanDE` in [engine/events/magikarp.
 
 ([Video](https://www.youtube.com/watch?v=eij_1060SMc))
 
-This is a bug with `StartTrainerBattle_DetermineWhichAnimation` in [engine/battle_start.asm](/engine/battle_start.asm):
+This is a bug with `StartTrainerBattle_DetermineWhichAnimation` in [engine/battle/battle_transition.asm](/engine/battle/battle_transition.asm):
 
 ```asm
-StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365)
+StartTrainerBattle_DetermineWhichAnimation:
 ; The screen flashes a different number of times depending on the level of
 ; your lead Pokemon relative to the opponent's.
-; BUG: BattleMonLevel and EnemyMonLevel are not set at this point, so whatever
+; BUG: wBattleMonLevel and wEnemyMonLevel are not set at this point, so whatever
 ; values happen to be there will determine the animation.
 	ld de, 0
-	ld a, [BattleMonLevel]
+	ld a, [wBattleMonLevel]
 	add 3
-	ld hl, EnemyMonLevel
+	ld hl, wEnemyMonLevel
 	cp [hl]
-	jr nc, .okay
-	set 0, e
-.okay
-	ld a, [wPermission]
+	jr nc, .not_stronger
+	set TRANS_STRONGER_F, e
+.not_stronger
+	ld a, [wEnvironment]
 	cp CAVE
-	jr z, .okay2
-	cp PERM_5
-	jr z, .okay2
+	jr z, .cave
+	cp ENVIRONMENT_5
+	jr z, .cave
 	cp DUNGEON
-	jr z, .okay2
-	set 1, e
-.okay2
+	jr z, .cave
+	set TRANS_NO_CAVE_F, e
+.cave
 	ld hl, .StartingPoints
 	add hl, de
 	ld a, [hl]
 	ld [wJumptableIndex], a
 	ret
-; 8c38f (23:438f)
 
-.StartingPoints: ; 8c38f
-	db 1,  9
-	db 16, 24
-; 8c393
+.StartingPoints:
+; entries correspond to TRANS_* constants
+	db BATTLETRANSITION_CAVE
+	db BATTLETRANSITION_CAVE_STRONGER
+	db BATTLETRANSITION_NO_CAVE
+	db BATTLETRANSITION_NO_CAVE_STRONGER
 ```
 
 *To do:* Fix this bug.
 
 
+## A "HOF Master!" title for 200-Time Famers is defined but inaccessible
+
+([Video](https://www.youtube.com/watch?v=iHkWubvxmSg))
+
+This is a bug with `_HallOfFamePC.DisplayMonAndStrings` in [engine/events/halloffame.asm](/engine/events/halloffame.asm):
+
+```asm
+	ld a, [wHallOfFameTempWinCount]
+	cp HOF_MASTER_COUNT + 1 ; should be HOF_MASTER_COUNT
+	jr c, .print_num_hof
+	ld de, .HOFMaster
+	hlcoord 1, 2
+	call PlaceString
+	hlcoord 13, 2
+	jr .finish
+```
+
+**Fix:** Change `HOF_MASTER_COUNT + 1` to `HOF_MASTER_COUNT`.
+
+
 ## Slot machine payout sound effects cut each other off
 
 ([Video](https://www.youtube.com/watch?v=ojq3xqfRF6I))
 
-This is a bug with `Slots_PayoutAnim` in [engine/slot_machine.asm](/engine/slot_machine.asm):
+This is a bug with `Slots_PayoutAnim` in [engine/games/slot_machine.asm](/engine/games/slot_machine.asm):
 
 ```asm
 .okay
 	ld [hl], e
 	dec hl
 	ld [hl], d
-	ld a, [wcf64]
+	ld a, [wSlotsDelay]
 	and $7
 	ret z ; ret nz would be more appropriate
 	ld de, SFX_GET_COIN_FROM_SLOTS
@@ -918,10 +1055,10 @@ This is a bug with `Slots_PayoutAnim` in [engine/slot_machine.asm](/engine/slot_
 
 ## Team Rocket battle music is not used for Executives or Scientists
 
-This is a bug with `PlayBattleMusic` in [main.asm](/main.asm):
+This is a bug with `PlayBattleMusic` in [engine/battle/start_battle.asm](/engine/battle/start_battle.asm):
 
 ```asm
-	; really, they should have included admins and scientists here too...
+	; They should have included EXECUTIVEM, EXECUTIVEF, and SCIENTIST too...
 	ld de, MUSIC_ROCKET_BATTLE
 	cp GRUNTM
 	jr z, .done
@@ -931,24 +1068,24 @@ This is a bug with `PlayBattleMusic` in [main.asm](/main.asm):
 
 **Fix:**
 
-```asm
+```diff
 	ld de, MUSIC_ROCKET_BATTLE
 	cp GRUNTM
 	jr z, .done
 	cp GRUNTF
 	jr z, .done
-	cp EXECUTIVEM
-	jr z, .done
-	cp EXECUTIVEF
-	jr z, .done
-	cp SCIENTIST
-	jr z, .done
++	cp EXECUTIVEM
++	jr z, .done
++	cp EXECUTIVEF
++	jr z, .done
++	cp SCIENTIST
++	jr z, .done
 ```
 
 
 ## No bump noise if standing on tile `$3E`
 
-This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm](/engine/player_movement.asm):
+This is a bug with `DoPlayerMovement.CheckWarp` in [engine/overworld/player_movement.asm](/engine/overworld/player_movement.asm):
 
 ```asm
 ; Bug: Since no case is made for STANDING here, it will check
@@ -956,20 +1093,20 @@ This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm](
 ; This causes wd041 to be nonzero when standing on tile $3e,
 ; making bumps silent.
 
-	ld a, [WalkingDirection]
+	ld a, [wWalkingDirection]
 	; cp STANDING
 	; jr z, .not_warp
 	ld e, a
 	ld d, 0
 	ld hl, .EdgeWarps
 	add hl, de
-	ld a, [PlayerStandingTile]
+	ld a, [wPlayerStandingTile]
 	cp [hl]
 	jr nz, .not_warp
 
 	ld a, 1
 	ld [wd041], a
-	ld a, [WalkingDirection]
+	ld a, [wWalkingDirection]
 	; This is in the wrong place.
 	cp STANDING
 	jr z, .not_warp
@@ -977,21 +1114,26 @@ This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm](
 
 **Fix:**
 
-```asm
-	ld a, [WalkingDirection]
-	cp STANDING
-	jr z, .not_warp
+```diff
+	ld a, [wWalkingDirection]
+-	; cp STANDING
+-	; jr z, .not_warp
++	cp STANDING
++	jr z, .not_warp
 	ld e, a
 	ld d, 0
 	ld hl, .EdgeWarps
 	add hl, de
-	ld a, [PlayerStandingTile]
+	ld a, [wPlayerStandingTile]
 	cp [hl]
 	jr nz, .not_warp
 
 	ld a, 1
 	ld [wd041], a
-	ld a, [WalkingDirection]
+	ld a, [wWalkingDirection]
+-	; This is in the wrong place.
+-	cp STANDING
+-	jr z, .not_warp
 ```
 
 
@@ -1002,7 +1144,7 @@ This is a bug with `DoPlayerMovement.CheckWarp` in [engine/player_movement.asm](
 The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActionJumptable.Cry` in [engine/pokedex/pokedex.asm](/engine/pokedex/pokedex.asm):
 
 ```asm
-.Cry: ; 40340
+.Cry:
 	call Pokedex_GetSelectedMon
 	ld a, [wd265]
 	call GetCryIndex
@@ -1015,8 +1157,8 @@ The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActi
 **Workaround:**
 
 ```asm
-.Cry: ; 40340
-	ld a, [CurPartySpecies]
+.Cry:
+	ld a, [wCurPartySpecies]
 	call PlayMonCry
 	ret
 ```
@@ -1051,7 +1193,7 @@ This bug prevents you from using blocksets with more than 128 blocks.
 In [home/map.asm](/home/map.asm):
 
 ```asm
-	; Set hl to the address of the current metatile data ([TilesetBlocksAddress] + (a) tiles).
+	; Set hl to the address of the current metatile data ([wTilesetBlocksAddress] + (a) tiles).
 	; This is buggy; it wraps around past 128 blocks.
 	; To fix, uncomment the line below.
 	add a ; Comment or delete this line to fix the above bug.
@@ -1061,10 +1203,10 @@ In [home/map.asm](/home/map.asm):
 	add hl, hl
 	add hl, hl
 	add hl, hl
-	ld a, [TilesetBlocksAddress]
+	ld a, [wTilesetBlocksAddress]
 	add l
 	ld l, a
-	ld a, [TilesetBlocksAddress + 1]
+	ld a, [wTilesetBlocksAddress + 1]
 	adc h
 	ld h, a
 ```
@@ -1079,20 +1221,20 @@ In [home/map.asm](/home/map.asm):
 *To do:* Identify specific code causing this bug and fix it.
 
 
-## `Function6ec1` does not correctly limit object movement
+## Swimming NPCs aren't limited by their movement radius
 
-This bug is why the Lapras in Union Cave, which uses `SPRITEMOVEDATA_LAPRAS`, is not restricted by its `1, 1` movement radius.
+This bug is why the Lapras in [maps/UnionCaveB2F.asm](/maps/UnionCaveB2F.asm), which uses `SPRITEMOVEDATA_SWIM_WANDER`, is not restricted by its `1, 1` movement radius.
 
-In [engine/npc_movement.asm](/engine/npc_movement.asm):
+This is a bug with `CanObjectMoveInDirection` in [engine/overworld/npc_movement.asm](/engine/overworld/npc_movement.asm):
 
 ```asm
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit 4, [hl] ; lost, uncomment next line to fix
-;	jr nz, .resume
+	bit NOCLIP_TILES_F, [hl] ; lost, uncomment next line to fix
+	; jr nz, .noclip_tiles
 ```
 
-**Fix:** Uncomment `jr nz, .resume`.
+**Fix:** Uncomment `jr nz, .noclip_tiles`.
 
 
 ## `CheckOwnMon` only checks the first five letters of OT names
@@ -1101,16 +1243,16 @@ In [engine/npc_movement.asm](/engine/npc_movement.asm):
 
 This bug can allow you to talk to Eusine in Celadon City and encounter Ho-Oh with only traded legendary beasts.
 
-In [engine/search.asm](/engine/search.asm):
+In [engine/pokemon/search.asm](/engine/pokemon/search.asm):
 
 ```asm
 ; check OT
 ; This only checks five characters, which is fine for the Japanese version,
 ; but in the English version the player name is 7 characters, so this is wrong.
 
-	ld hl, PlayerName
+	ld hl, wPlayerName
 
-rept NAME_LENGTH_JAPANESE +- 2 ; should be PLAYER_NAME_LENGTH +- 2
+rept NAME_LENGTH_JAPANESE + -2 ; should be PLAYER_NAME_LENGTH + -2
 	ld a, [de]
 	cp [hl]
 	jr nz, .notfound
@@ -1123,87 +1265,92 @@ endr
 	ld a, [de]
 	cp [hl]
 	jr z, .found
-
-.notfound
-	pop de
-	pop hl
-	pop bc
-	and a
-	ret
 ```
 
-**Fix:** Change `rept NAME_LENGTH_JAPANESE +- 2` to `rept PLAYER_NAME_LENGTH +- 2`.
+**Fix:** Change `rept NAME_LENGTH_JAPANESE + -2` to `rept PLAYER_NAME_LENGTH + -2`.
 
 
 ## Catching a Transformed Pokémon always catches a Ditto
 
 This bug can affect Mew or Pokémon other than Ditto that used Transform via Mirror Move or Sketch.
 
-This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.asm):
+This is a bug with `PokeBallEffect` in [engine/items/item_effects.asm](/engine/items/item_effects.asm):
 
 ```asm
-	ld hl, EnemySubStatus5
+	ld hl, wEnemySubStatus5
 	ld a, [hl]
 	push af
 	set SUBSTATUS_TRANSFORMED, [hl]
 
 ; This code is buggy. Any wild Pokémon that has Transformed will be
 ; caught as a Ditto, even if it was something else like Mew.
-; To fix, do not set [TempEnemyMonSpecies] to DITTO.
+; To fix, do not set [wTempEnemyMonSpecies] to DITTO.
 	bit SUBSTATUS_TRANSFORMED, a
 	jr nz, .ditto
 	jr .not_ditto
 
 .ditto
 	ld a, DITTO
-	ld [TempEnemyMonSpecies], a
+	ld [wTempEnemyMonSpecies], a
 	jr .load_data
 
 .not_ditto
 	set SUBSTATUS_TRANSFORMED, [hl]
 	ld hl, wEnemyBackupDVs
-	ld a, [EnemyMonDVs]
+	ld a, [wEnemyMonDVs]
 	ld [hli], a
-	ld a, [EnemyMonDVs + 1]
+	ld a, [wEnemyMonDVs + 1]
 	ld [hl], a
 
 .load_data
-	ld a, [TempEnemyMonSpecies]
-	ld [CurPartySpecies], a
-	ld a, [EnemyMonLevel]
-	ld [CurPartyLevel], a
-	callba LoadEnemyMon
+	ld a, [wTempEnemyMonSpecies]
+	ld [wCurPartySpecies], a
+	ld a, [wEnemyMonLevel]
+	ld [wCurPartyLevel], a
+	farcall LoadEnemyMon
 
 	pop af
-	ld [EnemySubStatus5], a
+	ld [wEnemySubStatus5], a
 ```
 
 **Fix:** 
 
-```asm
-	ld hl, EnemySubStatus5
+```diff
+	ld hl, wEnemySubStatus5
 	ld a, [hl]
 	push af
 	set SUBSTATUS_TRANSFORMED, [hl]
 
+-; This code is buggy. Any wild Pokémon that has Transformed will be
+-; caught as a Ditto, even if it was something else like Mew.
+-; To fix, do not set [wTempEnemyMonSpecies] to DITTO.
 	bit SUBSTATUS_TRANSFORMED, a
-	jr nz, .load_data
-
+-	jr nz, .ditto
+-	jr .not_ditto
++	jr nz, .load_data
+
+-.ditto
+-	ld a, DITTO
+-	ld [wTempEnemyMonSpecies], a
+-	jr .load_data
+-
+-.not_ditto
+-	set SUBSTATUS_TRANSFORMED, [hl]
 	ld hl, wEnemyBackupDVs
-	ld a, [EnemyMonDVs]
+	ld a, [wEnemyMonDVs]
 	ld [hli], a
-	ld a, [EnemyMonDVs + 1]
+	ld a, [wEnemyMonDVs + 1]
 	ld [hl], a
 
 .load_data
-	ld a, [TempEnemyMonSpecies]
-	ld [CurPartySpecies], a
-	ld a, [EnemyMonLevel]
-	ld [CurPartyLevel], a
-	callba LoadEnemyMon
+	ld a, [wTempEnemyMonSpecies]
+	ld [wCurPartySpecies], a
+	ld a, [wEnemyMonLevel]
+	ld [wCurPartyLevel], a
+	farcall LoadEnemyMon
 
 	pop af
-	ld [EnemySubStatus5], a
+	ld [wEnemySubStatus5], a
 ```
 
 
@@ -1211,86 +1358,124 @@ This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.as
 
 ([Video](https://www.youtube.com/watch?v=v1ErZdLCIyU))
 
-This is a bug with `ParkBall` in [items/item_effects.asm](/items/item_effects.asm):
+This is a bug with `PokeBallEffect` in [engine/items/item_effects.asm](/engine/items/item_effects.asm):
 
 ```asm
 .room_in_party
 	xor a
 	ld [wWildMon], a
-	ld a, [CurItem]
+	ld a, [wCurItem]
 	cp PARK_BALL
 	call nz, ReturnToBattle_UseBall
 ```
 
 **Fix:**
 
-```asm
+```diff
 .room_in_party
 	xor a
 	ld [wWildMon], a
-	ld a, [BattleType]
-	cp BATTLETYPE_CONTEST
+-	ld a, [wCurItem]
+-	cp PARK_BALL
++	ld a, [wBattleType]
++	cp BATTLETYPE_CONTEST
 	call nz, ReturnToBattle_UseBall
 ```
 
 
 ## `HELD_CATCH_CHANCE` has no effect
 
-This is a bug with `PokeBall` in [items/item_effects.asm](/items/item_effects.asm):
+This is a bug with `PokeBallEffect` in [engine/items/item_effects.asm](/engine/items/item_effects.asm):
 
 ```asm
-	; BUG: callba overwrites a,
-	; and GetItemHeldEffect takes b anyway.
-
-	; This is probably the reason
-	; the HELD_CATCH_CHANCE effect
-	; is never used.
-
+	; BUG: farcall overwrites a, and GetItemHeldEffect takes b anyway.
+	; This is probably the reason the HELD_CATCH_CHANCE effect is never used.
 	; Uncomment the line below to fix.
-
-	ld a, [BattleMonItem]
-;	ld b, a
-	callba GetItemHeldEffect
+	ld d, a
+	push de
+	ld a, [wBattleMonItem]
+	; ld b, a
+	farcall GetItemHeldEffect
 	ld a, b
 	cp HELD_CATCH_CHANCE
+	pop de
+	ld a, d
+	jr nz, .max_2
+	add c
+	jr nc, .max_2
+	ld a, $ff
+.max_2
 ```
 
 **Fix:** Uncomment `ld b, a`.
 
 
-## Only the first three `EvosAttacks` evolution entries can have Stone compatibility reported correctly
+## Only the first three evolution entries can have Stone compatibility reported correctly
 
-This is a bug with `PlacePartyMonEvoStoneCompatibility.DetermineCompatibility` in [engine/party_menu.asm](/engine/party_menu.asm):
+This is a bug with `PlacePartyMonEvoStoneCompatibility.DetermineCompatibility` in [engine/pokemon/party_menu.asm](/engine/pokemon/party_menu.asm):
 
 ```asm
-.DetermineCompatibility: ; 50268
-	ld de, StringBuffer1
+.DetermineCompatibility:
+	ld de, wStringBuffer1
 	ld a, BANK(EvosAttacksPointers)
 	ld bc, 2
 	call FarCopyBytes
-	ld hl, StringBuffer1
+	ld hl, wStringBuffer1
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, StringBuffer1
-	ld a, BANK(EvosAttacks)
-	ld bc, $a
+	ld de, wStringBuffer1
+	ld a, BANK("Evolutions and Attacks")
+	ld bc, 10
 	call FarCopyBytes
 ```
 
-**Fix:** Change `ld bc, $a` to `ld bc, $10` to support up to five Stone entries.
+**Fix:** Change `ld bc, 10` to `ld bc, wStringBuffer2 - wStringBuffer1` to support up to six Stone entries.
+
+
+## `EVOLVE_STAT` can break Stone compatibility reporting
+
+This is a bug with `PlacePartyMonEvoStoneCompatibility.DetermineCompatibility` in [engine/pokemon/party_menu.asm](/engine/pokemon/party_menu.asm):
+
+```asm
+.loop2
+	ld a, [hli]
+	and a
+	jr z, .nope
+	inc hl
+	inc hl
+	cp EVOLVE_ITEM
+	jr nz, .loop2
+```
+
+**Fix:**
+
+```asm
+.loop2
+	ld a, [hli]
+	and a
+	jr z, .nope
++	cp EVOLVE_STAT
++	jr nz, .not_four_bytes
++	inc hl
++.not_four_bytes
+	inc hl
+	inc hl
+	cp EVOLVE_ITEM
+	jr nz, .loop2
+```
 
 
 ## `ScriptCall` can overflow `wScriptStack` and crash
 
-In [engine/scripting.asm](/engine/scripting.asm):
+In [engine/overworld/scripting.asm](/engine/overworld/scripting.asm):
 
 ```asm
 ScriptCall:
 ; Bug: The script stack has a capacity of 5 scripts, yet there is
 ; nothing to stop you from pushing a sixth script.  The high part
 ; of the script address can then be overwritten by modifications
-; to ScriptDelay, causing the script to return to the rst/interrupt
+; to wScriptDelay, causing the script to return to the rst/interrupt
 ; space.
 
 	push de
@@ -1303,32 +1488,34 @@ ScriptCall:
 	add hl, de
 	add hl, de
 	pop de
-	ld a, [ScriptBank]
+	ld a, [wScriptBank]
 	ld [hli], a
-	ld a, [ScriptPos]
+	ld a, [wScriptPos]
 	ld [hli], a
-	ld a, [ScriptPos + 1]
+	ld a, [wScriptPos + 1]
 	ld [hl], a
 	ld a, b
-	ld [ScriptBank], a
+	ld [wScriptBank], a
 	ld a, e
-	ld [ScriptPos], a
+	ld [wScriptPos], a
 	ld a, d
-	ld [ScriptPos + 1], a
+	ld [wScriptPos + 1], a
 	ret
 ```
 
+*To do:* Fix this bug.
+
 
 ## `LoadSpriteGFX` does not limit the capacity of `UsedSprites`
 
-In [engine/overworld.asm](/engine/overworld.asm):
+In [engine/overworld/overworld.asm](/engine/overworld/overworld.asm):
 
 ```asm
-LoadSpriteGFX: ; 14306
+LoadSpriteGFX:
 ; Bug: b is not preserved, so it's useless as a next count.
 ; Uncomment the lines below to fix.
 
-	ld hl, UsedSprites
+	ld hl, wUsedSprites
 	ld b, SPRITE_GFX_LIST_CAPACITY
 .loop
 	ld a, [hli]
@@ -1350,7 +1537,6 @@ LoadSpriteGFX: ; 14306
 	; pop bc
 	ld a, l
 	ret
-; 1431e
 ```
 
 **Fix:** Uncomment `push bc` and `pop bc`.
@@ -1358,14 +1544,13 @@ LoadSpriteGFX: ; 14306
 
 ## `ChooseWildEncounter` doesn't really validate the wild Pokémon species
 
-In [engine/wildmons.asm](/engine/wildmons.asm):
+In [engine/overworld/wildmons.asm](/engine/overworld/wildmons.asm):
 
 ```asm
-ChooseWildEncounter: ; 2a14f
+ChooseWildEncounter:
 ...
-
 	ld a, b
-	ld [CurPartyLevel], a
+	ld [wCurPartyLevel], a
 	ld b, [hl]
 	; ld a, b
 	call ValidateTempWildMonSpecies
@@ -1377,17 +1562,18 @@ ChooseWildEncounter: ; 2a14f
 
 ...
 
-ValidateTempWildMonSpecies: ; 2a4a0
+ValidateTempWildMonSpecies:
 ; Due to a development oversight, this function is called with the wild Pokemon's level, not its species, in a.
 ```
 
 **Fix:**
 
-```asm
+```diff
 	ld a, b
-	ld [CurPartyLevel], a
+	ld [wCurPartyLevel], a
 	ld b, [hl]
-	ld a, b
+-	; ld a, b
++	ld a, b
 	call ValidateTempWildMonSpecies
 	jr c, .nowildbattle
 
@@ -1397,7 +1583,7 @@ ValidateTempWildMonSpecies: ; 2a4a0
 
 ## `TryObjectEvent` arbitrary code execution
 
-In [engine/events.asm](/engine/events.asm):
+In [engine/overworld/events.asm](/engine/overworld/events.asm):
 
 ```asm
 ; Bug: If IsInArray returns nc, data at bc will be executed as code.
@@ -1423,15 +1609,16 @@ In [engine/events.asm](/engine/events.asm):
 **Fix:** Uncomment `pop bc`.
 
 
-## `Special_CheckBugContestContestantFlag` can read beyond its data table
+## `CheckBugContestContestantFlag` can read beyond its data table
 
 In [engine/events/bug_contest/contest_2.asm](/engine/events/bug_contest/contest_2.asm):
 
 ```asm
-Special_CheckBugContestContestantFlag: ; 139ed
+CheckBugContestContestantFlag:
 ; Checks the flag of the Bug Catching Contestant whose index is loaded in a.
 
-; Bug: If a >= 10 when this is called, it will read beyond the table.
+; Bug: If a >= NUM_BUG_CONTESTANTS when this is called,
+; it will read beyond the table.
 
 	ld hl, BugCatchingContestantEventFlagTable
 	ld e, a
@@ -1444,29 +1631,19 @@ Special_CheckBugContestContestantFlag: ; 139ed
 	ld b, CHECK_FLAG
 	call EventFlagAction
 	ret
-; 139fe
 
-BugCatchingContestantEventFlagTable: ; 139fe
-	dw EVENT_BUG_CATCHING_CONTESTANT_1A
-	dw EVENT_BUG_CATCHING_CONTESTANT_2A
-	dw EVENT_BUG_CATCHING_CONTESTANT_3A
-	dw EVENT_BUG_CATCHING_CONTESTANT_4A
-	dw EVENT_BUG_CATCHING_CONTESTANT_5A
-	dw EVENT_BUG_CATCHING_CONTESTANT_6A
-	dw EVENT_BUG_CATCHING_CONTESTANT_7A
-	dw EVENT_BUG_CATCHING_CONTESTANT_8A
-	dw EVENT_BUG_CATCHING_CONTESTANT_9A
-	dw EVENT_BUG_CATCHING_CONTESTANT_10A
-; 13a12
+INCLUDE "data/events/bug_contest_flags.asm"
 ```
 
+However, `a < NUM_BUG_CONTESTANTS` should always be true, so in practice this is not a problem.
+
 
 ## `ClearWRAM` only clears WRAM bank 1
 
 In [home/init.asm](/home/init.asm):
 
 ```asm
-ClearWRAM:: ; 25a
+ClearWRAM::
 ; Wipe swappable WRAM banks (1-7)
 ; Assumes CGB or AGB
 
@@ -1483,7 +1660,6 @@ ClearWRAM:: ; 25a
 	cp 8
 	jr nc, .bank_loop ; Should be jr c
 	ret
-; 270
 ```
 
 **Fix:** Change `jr nc, .bank_loop` to `jr c, .bank_loop`.
diff --git a/docs/design_flaws.md b/docs/design_flaws.md
index 7dc4d13db..c7a032702 100644
--- a/docs/design_flaws.md
+++ b/docs/design_flaws.md
@@ -8,8 +8,9 @@ These are parts of the code that do not work *incorrectly*, like [bugs and glitc
 - [Pic banks are offset by `PICS_FIX`](#pic-banks-are-offset-by-pics_fix)
 - [`PokemonPicPointers` and `UnownPicPointers` are assumed to start at the same address](#pokemonpicpointers-and-unownpicpointers-are-assumed-to-start-at-the-same-address)
 - [Footprints are split into top and bottom halves](#footprints-are-split-into-top-and-bottom-halves)
-- [Pokédex entry banks are derived from their species IDs](#pokédex-entry-banks-are-derived-from-their-species-ids)
 - [`ITEM_C3` and `ITEM_DC` break up the continuous sequence of TM items](#item_c3-and-item_dc-break-up-the-continuous-sequence-of-tm-items)
+- [Pokédex entry banks are derived from their species IDs](#pokédex-entry-banks-are-derived-from-their-species-ids)
+- [Identical sine wave code and data is repeated five times](#identical-sine-wave-code-and-data-is-repeated-five-times)
 - [`GetForestTreeFrame` works, but it's still bad](#getforesttreeframe-works-but-its-still-bad)
 
 
@@ -24,10 +25,10 @@ dba_pic: MACRO ; dbw bank, address
 ENDM
 ```
 
-The offset is translated into a correct bank by `FixPicBank` in [engine/load_pics.asm](/engine/load_pics.asm):
+The offset is translated into a correct bank by `FixPicBank` in [engine/gfx/load_pics.asm](/engine/gfx/load_pics.asm):
 
 ```asm
-FixPicBank: ; 511c5
+FixPicBank:
 ; This is a thing for some reason.
 
 PICS_FIX EQU $36
@@ -35,7 +36,7 @@ GLOBAL PICS_FIX
 
 	push hl
 	push bc
-	sub BANK(Pics_1) - PICS_FIX
+	sub BANK("Pics 1") - PICS_FIX
 	ld c, a
 	ld b, 0
 	ld hl, .PicsBanks
@@ -45,34 +46,34 @@ GLOBAL PICS_FIX
 	pop hl
 	ret
 
-.PicsBanks: ; 511d4
-	db BANK(Pics_1) + 0
-	db BANK(Pics_1) + 1
-	db BANK(Pics_1) + 2
-	db BANK(Pics_1) + 3
-	db BANK(Pics_1) + 4
-	db BANK(Pics_1) + 5
-	db BANK(Pics_1) + 6
-	db BANK(Pics_1) + 7
-	db BANK(Pics_1) + 8
-	db BANK(Pics_1) + 9
-	db BANK(Pics_1) + 10
-	db BANK(Pics_1) + 11
-	db BANK(Pics_1) + 12
-	db BANK(Pics_1) + 13
-	db BANK(Pics_1) + 14
-	db BANK(Pics_1) + 15
-	db BANK(Pics_1) + 16
-	db BANK(Pics_1) + 17
-	db BANK(Pics_1) + 18
-	db BANK(Pics_1) + 19
-	db BANK(Pics_1) + 20
-	db BANK(Pics_1) + 21
-	db BANK(Pics_1) + 22
-	db BANK(Pics_1) + 23
+.PicsBanks:
+	db BANK("Pics 1")  ; BANK("Pics 1") + 0
+	db BANK("Pics 2")  ; BANK("Pics 1") + 1
+	db BANK("Pics 3")  ; BANK("Pics 1") + 2
+	db BANK("Pics 4")  ; BANK("Pics 1") + 3
+	db BANK("Pics 5")  ; BANK("Pics 1") + 4
+	db BANK("Pics 6")  ; BANK("Pics 1") + 5
+	db BANK("Pics 7")  ; BANK("Pics 1") + 6
+	db BANK("Pics 8")  ; BANK("Pics 1") + 7
+	db BANK("Pics 9")  ; BANK("Pics 1") + 8
+	db BANK("Pics 10") ; BANK("Pics 1") + 9
+	db BANK("Pics 11") ; BANK("Pics 1") + 10
+	db BANK("Pics 12") ; BANK("Pics 1") + 11
+	db BANK("Pics 13") ; BANK("Pics 1") + 12
+	db BANK("Pics 14") ; BANK("Pics 1") + 13
+	db BANK("Pics 15") ; BANK("Pics 1") + 14
+	db BANK("Pics 16") ; BANK("Pics 1") + 15
+	db BANK("Pics 17") ; BANK("Pics 1") + 16
+	db BANK("Pics 18") ; BANK("Pics 1") + 17
+	db BANK("Pics 19") ; BANK("Pics 1") + 18
+	db BANK("Pics 20") ; BANK("Pics 1") + 19
+	db BANK("Pics 21") ; BANK("Pics 1") + 20
+	db BANK("Pics 22") ; BANK("Pics 1") + 21
+	db BANK("Pics 23") ; BANK("Pics 1") + 22
+	db BANK("Pics 24") ; BANK("Pics 1") + 23
 ```
 
-**Fix:** Use `dba` instead of `dba_pic`, and don't call `FixPicBank` to modify `a`.
+**Fix:** Use `dba` instead of `dba_pic`, delete `FixPicBank`, and remove all four calls to `FixPicBank`.
 
 
 ## `PokemonPicPointers` and `UnownPicPointers` are assumed to start at the same address
@@ -83,6 +84,7 @@ In [gfx/pics.asm](/gfx/pics.asm):
 ; PokemonPicPointers and UnownPicPointers are assumed to start at the same
 ; address, but in different banks. This is enforced in pokecrystal.link.
 
+
 SECTION "Pic Pointers", ROMX
 
 INCLUDE "data/pokemon/pic_pointers.asm"
@@ -106,18 +108,18 @@ ROMX $49
 	"Pics 2"
 ```
 
-Two routines in [engine/load_pics.asm](/engine/load_pics.asm) make this assumption; `GetFrontpicPointer`:
+Two routines in [engine/gfx/load_pics.asm](/engine/gfx/load_pics.asm) make this assumption; `GetFrontpicPointer`:
 
 ```asm
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr z, .unown
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	ld d, BANK(PokemonPicPointers)
 	jr .ok
 
 .unown
-	ld a, [UnownLetter]
+	ld a, [wUnownLetter]
 	ld d, BANK(UnownPicPointers)
 
 .ok
@@ -130,9 +132,7 @@ Two routines in [engine/load_pics.asm](/engine/load_pics.asm) make this assumpti
 And `GetMonBackpic`:
 
 ```asm
-	; These are assumed to be at the same
-	; address in their respective banks.
-	GLOBAL PokemonPicPointers,  UnownPicPointers
+	; These are assumed to be at the same address in their respective banks.
 	ld hl, PokemonPicPointers ; UnownPicPointers
 	ld a, b
 	ld d, BANK(PokemonPicPointers)
@@ -152,21 +152,22 @@ Don't enforce `org $4000` in pokecrystal.link.
 
 Modify `GetFrontpicPointer`:
 
-```asm
-	ld a, [CurPartySpecies]
+```diff
+	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr z, .unown
-	ld a, [CurPartySpecies]
-	ld hl, PokemonPicPointers
+	ld a, [wCurPartySpecies]
++	ld hl, PokemonPicPointers
 	ld d, BANK(PokemonPicPointers)
 	jr .ok
 
 .unown
-	ld a, [UnownLetter]
-	ld hl, UnownPicPointers
+	ld a, [wUnownLetter]
++	ld hl, UnownPicPointers
 	ld d, BANK(UnownPicPointers)
 
 .ok
+-	ld hl, PokemonPicPointers ; UnownPicPointers
 	dec a
 	ld bc, 6
 	call AddNTimes
@@ -175,14 +176,15 @@ Modify `GetFrontpicPointer`:
 And `GetMonBackpic`:
 
 ```asm
-	GLOBAL PokemonPicPointers, UnownPicPointers
+-	; These are assumed to be at the same address in their respective banks.
+-	ld hl, PokemonPicPointers ; UnownPicPointers
 	ld a, b
-	ld hl, PokemonPicPointers
++	ld hl, PokemonPicPointers
 	ld d, BANK(PokemonPicPointers)
 	cp UNOWN
 	jr nz, .ok
 	ld a, c
-	ld hl, UnownPicPointers
++	ld hl, UnownPicPointers
 	ld d, BANK(UnownPicPointers)
 .ok
 	dec a
@@ -234,7 +236,7 @@ INCBIN "gfx/footprints/wartortle.1bpp",  footprint_bottom
 	push hl
 	ld e, l
 	ld d, h
-	ld hl, VTiles2 tile $62
+	ld hl, vTiles2 tile $62
 	lb bc, BANK(Footprints), 2
 	call Request1bpp
 	pop hl
@@ -246,7 +248,7 @@ INCBIN "gfx/footprints/wartortle.1bpp",  footprint_bottom
 
 	ld e, l
 	ld d, h
-	ld hl, VTiles2 tile $64
+	ld hl, vTiles2 tile $64
 	lb bc, BANK(Footprints), 2
 	call Request1bpp
 ```
@@ -269,12 +271,128 @@ INCBIN "gfx/footprints/wartortle.1bpp"
 
 Modify `Pokedex_LoadAnyFootprint`:
 
-```asm
+```diff
+-	push hl
 	ld e, l
 	ld d, h
-	ld hl, VTiles2 tile $62
-	lb bc, BANK(Footprints), 4
+	ld hl, vTiles2 tile $62
+-	lb bc, BANK(Footprints), 2
++	lb bc, BANK(Footprints), 4
 	call Request1bpp
+-	pop hl
+-
+-	; Whoever was editing footprints forgot to fix their
+-	; tile editor. Now each bottom half is 8 tiles off.
+-	ld de, 8 tiles
+-	add hl, de
+-
+-	ld e, l
+-	ld d, h
+-	ld hl, vTiles2 tile $64
+-	lb bc, BANK(Footprints), 2
+-	call Request1bpp
+```
+
+
+## `ITEM_C3` and `ITEM_DC` break up the continuous sequence of TM items
+
+[constants/item_constants.asm](/constants/item_constants.asm) defined the 50 TMs in order with `add_tm`, but `ITEM_C3` and `ITEM_DC` break up that sequence.
+
+```asm
+	add_tm DYNAMICPUNCH ; bf
+	...
+	add_tm ROLLOUT      ; c2
+	const ITEM_C3       ; c3
+	add_tm ROAR         ; c4
+	...
+	add_tm DIG          ; db
+	const ITEM_DC       ; dc
+	add_tm PSYCHIC_M    ; dd
+	...
+	add_tm NIGHTMARE    ; f2
+NUM_TMS = const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC
+```
+
+`GetTMHMNumber` and `GetNumberedTMHM` in [engine/items/items.asm](/engine/items/items.asm) have to compensate for this:
+
+```asm
+GetTMHMNumber::
+; Return the number of a TM/HM by item id c.
+	ld a, c
+; Skip any dummy items.
+	cp ITEM_C3 ; TM04-05
+	jr c, .done
+	cp ITEM_DC ; TM28-29
+	jr c, .skip
+	dec a
+.skip
+	dec a
+.done
+	sub TM01
+	inc a
+	ld c, a
+	ret
+
+GetNumberedTMHM:
+; Return the item id of a TM/HM by number c.
+	ld a, c
+; Skip any gaps.
+	cp ITEM_C3 - (TM01 - 1)
+	jr c, .done
+	cp ITEM_DC - (TM01 - 1) - 1
+	jr c, .skip_one
+.skip_two
+	inc a
+.skip_one
+	inc a
+.done
+	add TM01
+	dec a
+	ld c, a
+	ret
+```
+
+**Fix:**
+
+Move `ITEM_C3` and `ITEM_DC` above all the TMs in every table of item data.
+
+Modify engine/items/items.asm:
+
+```diff
+GetTMHMNumber::
+; Return the number of a TM/HM by item id c.
+	ld a, c
+-; Skip any dummy items.
+-	cp ITEM_C3 ; TM04-05
+-	jr c, .done
+-	cp ITEM_DC ; TM28-29
+-	jr c, .skip
+-	dec a
+-.skip
+-	dec a
+-.done
+	sub TM01
+	inc a
+	ld c, a
+	ret
+
+GetNumberedTMHM:
+; Return the item id of a TM/HM by number c.
+	ld a, c
+-; Skip any gaps.
+-	cp ITEM_C3 - (TM01 - 1)
+-	jr c, .done
+-	cp ITEM_DC - (TM01 - 1) - 1
+-	jr c, .skip_one
+-.skip_two
+-	inc a
+-.skip_one
+-	inc a
+-.done
+	add TM01
+	dec a
+	ld c, a
+	ret
 ```
 
 
@@ -285,7 +403,7 @@ Modify `Pokedex_LoadAnyFootprint`:
 Three separate routines do the same derivation; `GetDexEntryPointer` in [engine/pokedex/pokedex_2.asm](/engine/pokedex/pokedex_2.asm):
 
 ```asm
-GetDexEntryPointer: ; 44333
+GetDexEntryPointer:
 ; return dex entry pointer b:de
 	push hl
 	ld hl, PokedexDataPointerTable
@@ -301,7 +419,7 @@ GetDexEntryPointer: ; 44333
 	push de
 	rlca
 	rlca
-	and $3
+	maskbits NUM_DEX_ENTRY_BANKS
 	ld hl, .PokedexEntryBanks
 	ld d, 0
 	ld e, a
@@ -311,29 +429,23 @@ GetDexEntryPointer: ; 44333
 	pop hl
 	ret
 
-.PokedexEntryBanks: ; 44351
-
-GLOBAL PokedexEntries1
-GLOBAL PokedexEntries2
-GLOBAL PokedexEntries3
-GLOBAL PokedexEntries4
-
-	db BANK(PokedexEntries1)
-	db BANK(PokedexEntries2)
-	db BANK(PokedexEntries3)
-	db BANK(PokedexEntries4)
+.PokedexEntryBanks:
+	db BANK("Pokedex Entries 001-064")
+	db BANK("Pokedex Entries 065-128")
+	db BANK("Pokedex Entries 129-192")
+	db BANK("Pokedex Entries 193-251")
 ```
 
-`GetPokedexEntryBank` in [engine/item_effects.asm](/engine/item_effects.asm):
+`GetPokedexEntryBank` in [engine/items/item_effects.asm](/engine/items/item_effects.asm):
 
 ```asm
 GetPokedexEntryBank:
 	push hl
 	push de
-	ld a, [EnemyMonSpecies]
+	ld a, [wEnemyMonSpecies]
 	rlca
 	rlca
-	and 3
+	maskbits NUM_DEX_ENTRY_BANKS
 	ld hl, .PokedexEntryBanks
 	ld d, 0
 	ld e, a
@@ -344,30 +456,24 @@ GetPokedexEntryBank:
 	ret
 
 .PokedexEntryBanks:
-
-GLOBAL PokedexEntries1
-GLOBAL PokedexEntries2
-GLOBAL PokedexEntries3
-GLOBAL PokedexEntries4
-
-	db BANK(PokedexEntries1)
-	db BANK(PokedexEntries2)
-	db BANK(PokedexEntries3)
-	db BANK(PokedexEntries4)
+	db BANK("Pokedex Entries 001-064")
+	db BANK("Pokedex Entries 065-128")
+	db BANK("Pokedex Entries 129-192")
+	db BANK("Pokedex Entries 193-251")
 ```
 
-And `PokedexShow_GetDexEntryBank` in [engine/radio.asm](/engine/radio.asm):
+And `PokedexShow_GetDexEntryBank` in [engine/pokegear/radio.asm](/engine/pokegear/radio.asm):
 
 ```asm
 PokedexShow_GetDexEntryBank:
 	push hl
 	push de
-	ld a, [CurPartySpecies]
+	ld a, [wCurPartySpecies]
 	dec a
 	rlca
 	rlca
-	and 3
-	ld hl, .pokedexbanks
+	maskbits NUM_DEX_ENTRY_BANKS
+	ld hl, .PokedexEntryBanks
 	ld d, 0
 	ld e, a
 	add hl, de
@@ -376,105 +482,145 @@ PokedexShow_GetDexEntryBank:
 	pop hl
 	ret
 
-.pokedexbanks
-	db BANK(PokedexEntries1)
-	db BANK(PokedexEntries2)
-	db BANK(PokedexEntries3)
-	db BANK(PokedexEntries4)
+.PokedexEntryBanks:
+	db BANK("Pokedex Entries 001-064")
+	db BANK("Pokedex Entries 065-128")
+	db BANK("Pokedex Entries 129-192")
+	db BANK("Pokedex Entries 193-251")
 ```
 
 **Fix:** Use `dba` instead of `dw` in `PokedexDataPointerTable`, and modify the code that accesses it to match.
 
 
-## `ITEM_C3` and `ITEM_DC` break up the continuous sequence of TM items
+## Identical sine wave code and data is repeated five times
 
-[constants/item_constants.asm](/constants/item_constants.asm) defined the 50 TMs in order with `add_tm`, but `ITEM_C3` and `ITEM_DC` break up that sequence.
+`_Sine` in [engine/math/sine.asm](/engine/math/sine.asm):
 
 ```asm
-	add_tm DYNAMICPUNCH ; $BF
-	...
-	add_tm ROLLOUT      ; $C2
-	const ITEM_C3       ; $C3
-	add_tm ROAR         ; $C4
-	...
-	add_tm DIG          ; $DB
-	const ITEM_DC       ; $DC
-	add_tm PSYCHIC_M    ; $DD
-	...
-	add_tm NIGHTMARE    ; $F2
-NUM_TMS = const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC
+_Sine::
+; a = d * sin(e * pi/32)
+	ld a, e
+	calc_sine_wave
 ```
 
-`GetTMHMNumber` and `GetNumberedTMHM` in [engine/items.asm](/engine/items.asm) have to compensate for this:
+`Sprites_Cosine` and `Sprites_Sine` in [engine/gfx/sprites.asm](/engine/gfx/sprites.asm):
 
 ```asm
-GetTMHMNumber:: ; d407
-; Return the number of a TM/HM by item id c.
-	ld a, c
-; Skip any dummy items.
-	cp ITEM_C3 ; TM04-05
-	jr c, .done
-	cp ITEM_DC ; TM28-29
-	jr c, .skip
-	dec a
-.skip
-	dec a
-.done
-	sub TM01
-	inc a
-	ld c, a
-	ret
+Sprites_Cosine:
+; a = d * cos(a * pi/32)
+	add %010000 ; cos(x) = sin(x + pi/2)
+	; fallthrough
+Sprites_Sine:
+; a = d * sin(a * pi/32)
+	calc_sine_wave
+```
 
-GetNumberedTMHM: ; d417
-; Return the item id of a TM/HM by number c.
-	ld a, c
-; Skip any gaps.
-	cp ITEM_C3 - (TM01 - 1)
-	jr c, .done
-	cp ITEM_DC - (TM01 - 1) - 1
-	jr c, .skip_one
-.skip_two
-	inc a
-.skip_one
-	inc a
-.done
-	add TM01
-	dec a
-	ld c, a
-	ret
+`BattleAnim_Cosine` and `BattleAnim_Sine` in [engine/battle_anims/functions.asm](/engine/battle_anims/functions.asm):
+
+```asm
+BattleAnim_Cosine:
+; a = d * cos(a * pi/32)
+	add %010000 ; cos(x) = sin(x + pi/2)
+	; fallthrough
+BattleAnim_Sine:
+; a = d * sin(a * pi/32)
+	calc_sine_wave BattleAnimSineWave
+
+...
+
+BattleAnimSineWave:
+	sine_table 32
 ```
 
-**Fix:**
+`StartTrainerBattle_DrawSineWave` in [engine/battle/battle_transition.asm](/engine/battle/battle_transition.asm):
 
-Move `ITEM_C3` and `ITEM_DC` above all the TMs in every table of item data.
+```asm
+StartTrainerBattle_DrawSineWave:
+	calc_sine_wave
+```
 
-Modify engine/items.asm:
+And `CelebiEvent_Cosine` in [engine/events/celebi.asm](/engine/events/celebi.asm):
 
 ```asm
-GetTMHMNumber:: ; d407
-; Return the number of a TM/HM by item id c.
-	ld a, c
-	sub TM01
+CelebiEvent_Cosine:
+; a = d * cos(a * pi/32)
+	add %010000 ; cos(x) = sin(x + pi/2)
+	calc_sine_wave
+```
+
+They all rely on `calc_sine_wave` in [macros/code.asm](/macros/code.asm):
+
+```asm
+calc_sine_wave: MACRO
+; input: a = a signed 6-bit value
+; output: a = d * sin(a * pi/32)
+	and %111111
+	cp  %100000
+	jr nc, .negative\@
+	call .apply\@
+	ld a, h
+	ret
+.negative\@
+	and %011111
+	call .apply\@
+	ld a, h
+	xor $ff
 	inc a
-	ld c, a
 	ret
-
-GetNumberedTMHM: ; d417
-; Return the item id of a TM/HM by number c.
-	ld a, c
-	add TM01
-	dec a
-	ld c, a
+.apply\@
+	ld e, a
+	ld a, d
+	ld d, 0
+if _NARG == 1
+	ld hl, \1
+else
+	ld hl, .sinetable\@
+endc
+	add hl, de
+	add hl, de
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	ld hl, 0
+.multiply\@ ; factor amplitude
+	srl a
+	jr nc, .even\@
+	add hl, de
+.even\@
+	sla e
+	rl d
+	and a
+	jr nz, .multiply\@
 	ret
+if _NARG == 0
+.sinetable\@
+	sine_table 32
+endc
+ENDM
 ```
 
+And on `sine_table` in [macros/data.asm](/macros/data.asm):
+
+```asm
+sine_table: MACRO
+; \1 samples of sin(x) from x=0 to x<32768 (pi radians)
+x = 0
+rept \1
+	dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
+x = x + DIV(32768, \1) ; a circle has 65536 "degrees"
+endr
+ENDM
+```
+
+**Fix:** Edit [home/sine.asm](/home/sine.asm) to contain a single copy of the (co)sine code in bank 0, and call it from those five sites.
+
 
 ## `GetForestTreeFrame` works, but it's still bad
 
-In [engine/tileset_anims.asm](/engine/tileset_anims.asm):
+In [engine/tilesets/tileset_anims.asm](/engine/tilesets/tileset_anims.asm):
 
 ```asm
-GetForestTreeFrame: ; fc54c
+GetForestTreeFrame:
 ; Return 0 if a is even, or 2 if odd.
 	and a
 	jr z, .even
@@ -497,16 +643,14 @@ GetForestTreeFrame: ; fc54c
 .even
 	xor a
 	ret
-; fc56d
 ```
 
 **Fix:**
 
 ```asm
-GetForestTreeFrame: ; fc54c
+GetForestTreeFrame:
 ; Return 0 if a is even, or 2 if odd.
 	and 1
 	add a
 	ret
-; fc56d
 ```
diff --git a/docs/event_commands.md b/docs/event_commands.md
index 91486ad06..21c49dfee 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -1,6 +1,8 @@
 # Event Commands
 
-Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/scripting.asm:ScriptCommandTable](/engine/scripting.asm).
+Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/overworld/scripting.asm:ScriptCommandTable](/engine/overworld/scripting.asm).
+
+Until this document is filled out, the [G/S Scripting Compendium](https://hax.iimarckus.org/files/scriptingcodes_eng.htm) has descriptions for most of these commands. It was written for G/S binary hacking and not Crystal assembly hacking, so it's not 100% accurate for pokecrystal.
 
 
 ## `$00`: <code>scall <i>script</i></code>
@@ -15,17 +17,17 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s
 
 ## `$05`: <code>ptjump <i>script</i></code>
 
-## `$06`: <code>if_equal <i>byte</i>, <i>script</i></code>
+## `$06`: <code>ifequal <i>byte</i>, <i>script</i></code>
 
-## `$07`: <code>if_not_equal <i>byte</i>, <i>script</i></code>
+## `$07`: <code>ifnotequal <i>byte</i>, <i>script</i></code>
 
 ## `$08`: <code>iffalse <i>script</i></code>
 
 ## `$09`: <code>iftrue <i>script</i></code>
 
-## `$0A`: <code>if_greater_than <i>byte</i>, <i>script</i></code>
+## `$0A`: <code>ifgreater <i>byte</i>, <i>script</i></code>
 
-## `$0B`: <code>if_less_than <i>byte</i>, <i>script</i></code>
+## `$0B`: <code>ifless <i>byte</i>, <i>script</i></code>
 
 ## `$0C`: <code>jumpstd <i>std_script</i></code>
 
@@ -91,19 +93,15 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s
 
 ## `$2B`: <code>checktime <i>time</i></code>
 
-- **`checkmorn`:** `checktime MORN`
-- **`checkday`:** `checktime DAY`
-- **`checknite`:** `checktime NITE`
-
 ## `$2C`: <code>checkpoke <i>mon_id</i></code>
 
 ## `$2D`: <code>givepoke <i>mon_id</i>, <i>level</i>[, <i>item</i>=0[, <i>trainer</i>=0, <i>ot_name</i>, <i>nickname</i>]]</code>
 
 ## `$2E`: <code>giveegg <i>mon_id</i>, <i>level</i></code>
 
-## `$2F`: <code>givepokeitem <i>pointer</i></code>
+## `$2F`: <code>givepokemail <i>pointer</i></code>
 
-## `$30`: <code>checkpokeitem <i>pointer</i></code>
+## `$30`: <code>checkpokemail <i>pointer</i></code>
 
 ## `$31`: <code>checkevent <i>event_flag</i></code>
 
@@ -165,7 +163,7 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s
 
 ## `$4E`: `yesorno`
 
-## `$4F`: <code>loadmenudata <i>data_pointer</i></code>
+## `$4F`: <code>loadmenu <i>menu_header</i></code>
 
 ## `$50`: `closewindow`
 
@@ -211,9 +209,9 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s
 
 ## `$65`: `scripttalkafter`
 
-## `$66`: `end_if_just_battled`
+## `$66`: `endifjustbattled`
 
-## `$67`: `check_just_battled`
+## `$67`: `checkjustbattled`
 
 ## `$68`: <code>setlasttalked <i>object_id</i></code>
 
@@ -243,7 +241,7 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s
 
 ## `$75`: <code>showemote <i>emote_id</i>, <i>object_id</i>, <i>length</i></code>
 
-## `$76`: <code>spriteface <i>object_id</i>, <i>facing</i></code>
+## `$76`: <code>turnobject <i>object_id</i>, <i>facing</i></code>
 
 ## `$77`: <code>follownotexact <i>object2</i>, <i>object1</i></code>
 
@@ -301,7 +299,7 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s
 
 ## `$92`: <code>reloadandreturn <i>which_method</i></code>
 
-## `$93`: `end_all`
+## `$93`: `endall`
 
 ## `$94`: <code>pokemart <i>dialog_id</i>, <i>mart_id</i></code>
 
@@ -345,4 +343,4 @@ Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/s
 
 ## `$A8`: <code>wait <i>duration</i></code>
 
-## `$A9`: `check_save`
+## `$A9`: `checksave`
diff --git a/docs/images/hp_exp_bar_border_fix.png b/docs/images/hp_exp_bar_border_fix.png
index 26135576f..dd79d6636 100644
--- a/docs/images/hp_exp_bar_border_fix.png
+++ b/docs/images/hp_exp_bar_border_fix.png
diff --git a/docs/images/port_fix.png b/docs/images/port_fix.png
index 3156b065d..45fa26338 100644
--- a/docs/images/port_fix.png
+++ b/docs/images/port_fix.png
diff --git a/docs/map_scripts.md b/docs/map_event_scripts.md
index 2302257e7..a77f74503 100644
--- a/docs/map_scripts.md
+++ b/docs/map_event_scripts.md
@@ -1,30 +1,57 @@
-# Map Scripts
+# Map Event Scripts
 
 
-## <code>const_value set 2</code>
+## Contents
+
+- [Object constants](#object-constants)
+- [Map scripts](#map-scripts)
+  - [Scene scripts](#scene-scripts)
+  - [Callbacks](#callbacks)
+    - [Callback types](#callback-types)
+- [Event scripts](#event-scripts)
+- [Text](#text)
+- [Movement data](#movement-data)
+- [Map events](#map-events)
+  - [Warp events](#warp-events)
+  - [Coord events](#coord-events)
+  - [BG events](#bg-events)
+    - [BG event types](#bg-event-types)
+  - [Object events](#object-events)
+    - [Movement types](#movement-types)
+    - [Object types](#object-types)
+
+
+## Object constants
 
 <pre>
+	const_def 2 ; object constants
 	const <i>MAPNAME</i>_<i>OBJECTNAME</i>
 </pre>
 
 
-## <code>MapName_MapScripts:</code>
+## Map scripts
 
+<pre>
+<i>MapName</i>_MapScripts:
+</pre>
 
-### <code>.SceneScripts: db <i>N</i></code>
+
+### Scene scripts
 
 <pre>
+	db <i>N</i> ; scene scripts
 	scene_script <i>script</i>
 </pre>
 
 
-### <code>.MapCallbacks: db <i>N</i></code>
+### Callbacks
 
 <pre>
+	db <i>N</i> ; callbacks
 	callback <i>type</i>, <i>script</i>
 </pre>
 
-Callback types:
+#### Callback types
 
 - `MAPCALLBACK_NEWMAP`
 
@@ -67,35 +94,38 @@ Callback types:
 [Movement commands](movement_commands.md)
 
 
-## <code>MapName_MapEvents:</code>
+## Map events
 
-```asm
-	; filler
-	db 0, 0
-```
+<pre>
+<i>MapName</i>_MapEvents:
+	db 0, 0 ; filler
+</pre>
 
 
-### <code>.Warps: db <i>N</i></code>
+### Warp events
 
 <pre>
-	warp_def <i>x</i>, <i>y</i>, <i>warp_id</i>, <i>map</i>
+	db <i>N</i> ; warp events
+	warp_event <i>x</i>, <i>y</i>, <i>map</i>, <i>warp_id</i>
 </pre>
 
 
-### <code>.CoordEvents: db <i>N</i></code>
+### Coord events
 
 <pre>
+	db <i>N</i> ; coord events
 	coord_event <i>x</i>, <i>y</i>, <i>scene_id</i>, <i>script</i>
 </pre>
 
 
-### <code>.BGEvents: db <i>N</i></code>
+### BG events
 
 <pre>
+	db <i>N</i> ; bg events
 	bg_event <i>x</i>, <i>y</i>, <i>type</i>, <i>script</i>
 </pre>
 
-BG event types:
+#### BG event types
 
 - `BGEVENT_READ`
 
@@ -110,20 +140,21 @@ BG event types:
 - `BGEVENT_ITEM`
 
 <pre>
-	hiddenitem <i>event_flag</i>, <i>item_id</i>
+	hiddenitem <i>item_id</i>, <i>event_flag</i>
 </pre>
 
 - `BGEVENT_COPY`
 
-### <code>.ObjectEvents: db <i>N</i></code>
+### Object events
 
 <pre>
+	db <i>N</i> ; object events
 	object_event <i>x</i>, <i>y</i>, <i>sprite</i>, <i>movement</i>, <i>rx</i>, <i>ry</i>, <i>h1</i>, <i>h2</i>, <i>palette</i>, <i>type</i>, <i>range</i>, <i>script</i>, <i>event_flag</i>
 </pre>
 
-Movement types:
+#### Movement types
 
-- `SPRITEMOVEDATA_ITEM_TREE`
+- `SPRITEMOVEDATA_STILL`
 
 - `SPRITEMOVEDATA_WANDER`
 
@@ -137,7 +168,7 @@ Movement types:
 
 - `SPRITEMOVEDATA_SPINRANDOM_FAST`
 
-- `SPRITEMOVEDATA_SNORLAX`
+- `SPRITEMOVEDATA_BIGDOLLSYM`
 
 - `SPRITEMOVEDATA_POKEMON`
 
@@ -151,22 +182,24 @@ Movement types:
 
 - `SPRITEMOVEDATA_SPINCLOCKWISE`
 
+- `SPRITEMOVEDATA_BIGDOLLASYM`
+
 - `SPRITEMOVEDATA_BIGDOLL`
 
-- `SPRITEMOVEDATA_LAPRAS`
+- `SPRITEMOVEDATA_SWIM_WANDER`
 
-Object types:
+#### Object types
 
 - `OBJECTTYPE_SCRIPT`
 
 - `OBJECTTYPE_ITEMBALL`
 
 <pre>
-	itemball <i>item_id</i>
+	itemball <i>item_id</i>[, <i>quantity</i>=1]
 </pre>
 
 - `OBJECTTYPE_TRAINER`
 
 <pre>
-	trainer <i>event_flag</i>, <i>group_id</i>, <i>trainer_id</i>, <i>seen_text</i>, <i>beaten_text</i>, <i>loss_text</i>, <i>script</i>
+	trainer <i>group_id</i>, <i>trainer_id</i>, <i>event_flag</i>, <i>seen_text</i>, <i>beaten_text</i>, <i>loss_text</i>, <i>script</i>
 </pre>
diff --git a/docs/menu.md b/docs/menu.md
index 71186a905..67403bf15 100644
--- a/docs/menu.md
+++ b/docs/menu.md
@@ -19,13 +19,13 @@ This is the only menu that does scrolling. It doesn't draw any `TextBox` around
 Structure:
 
 ```asm
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 2, 4, SCREEN_WIDTH - 1, 13
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db 0 ; flags
 	db 5, 0 ; rows, columns
 	db 1 ; horizontal spacing
@@ -35,7 +35,7 @@ Structure:
 	dba Function3
 ```
 
-`wMenuData2Flags`:
+`wMenuDataFlags`:
 
 ```
 7: Select is functional
@@ -48,14 +48,14 @@ Structure:
 0: Call Function1 to display the cancel entry
 ```
 
-If the columns entry in `MenuDataHeader2` of a scrolling menu is 0, `Function2` isn't called either. It doesn't affect the position of the arrows.
+If the columns entry in `MenuData` of a scrolling menu is 0, `Function2` isn't called either. It doesn't affect the position of the arrows.
 
-Call state for functions in `MenuDataHeader2` of `ScrollingMenu`:
+Call state for functions in `MenuData` of `ScrollingMenu`:
 
 ```
 All of them:
-[MenuSelection] = Current item. -1 is the CANCEL item.
-[MenuSelectionQuantity] = Quantity of the current item.
+[wMenuSelection] = Current item. -1 is the CANCEL item.
+[wMenuSelectionQuantity] = Quantity of the current item.
 
 Function1: Called to display a menu entry.
 de = Cursor position in TileMap
@@ -68,7 +68,7 @@ Function3: Called to display anything else, whenever the cursor is moved.
 
 There is no register of importance that should be preserved in any of these functions.
 
-The `; horizontal spacing` item in each `MenuData2` is a misnomer. It changes how the `Items` struct looks.
+The `; horizontal spacing` item in each `MenuData` is a misnomer. It changes how the `Items` struct looks.
 
 If it's 1:
 
@@ -90,7 +90,7 @@ db -1 ; cancel
 ...
 ```
 
-In case it's 1, `[MenuSelectionQuantity]` will simply contain the next entry.
+In case it's 1, `[wMenuSelectionQuantity]` will simply contain the next entry.
 
 ## `_2DMenu`
 
@@ -99,14 +99,14 @@ This, like is implied by the name, is a 2-dimensional menu, where you can move y
 Structure:
 
 ```asm
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	db 12, 08 ; start coords
 	db 17, 19 ; end coords
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	dn 2, 2 ; rows, columns
 	db 6 ; spacing
@@ -114,7 +114,7 @@ Structure:
 	dba Function
 ```
 
-`wMenuData2Flags`:
+`wMenuDataFlags`:
 
 ```
 7: Leave one tile of spacing between the left textbox border and the text, enabling the cursor.
@@ -141,13 +141,13 @@ These are like the regular `VerticalMenu`, except they allow for creating slight
 Structure:
 
 ```
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, 7
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 0 ; items
 	dw Items
@@ -155,7 +155,7 @@ Structure:
 	dw StringPointers
 ```
 
-`wMenuData2Flags`:
+`wMenuDataFlags`:
 
 ```
 7: Unused
@@ -208,7 +208,7 @@ StringPointers:
 
 Call state for `DisplayFunction`:
 ```
-[MenuSelection] = Current item. -1 is the CANCEL item.
+[wMenuSelection] = Current item. -1 is the CANCEL item.
 de = Cursor position in TileMap
 ```
 
@@ -219,20 +219,20 @@ This is the simplest menu. Like, the most boring. Nothing special. Just normal.
 Structure:
 
 ```asm
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_SPRITE_ANIMS | MENU_BACKUP_TILES ; flags
 	menu_coords 12, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 2 ; # items
 	db "GIVE@"
 	db "TAKE@"
 ```
 
-`wMenuData2Flags`:
+`wMenuDataFlags`:
 
 ```
 7: Leave one tile of spacing between the left textbox border and the text
@@ -259,7 +259,7 @@ This is used in the menu for selecting the character's name.
 
 ## Misc/Generic
 
-`MenuDataHeader` flags (`wMenuFlags`):
+`MenuHeader` flags (`wMenuFlags`):
 
 ```
 7: Save a backup of the tiles
diff --git a/docs/movement_commands.md b/docs/movement_commands.md
index 10792c88b..794dd8a98 100644
--- a/docs/movement_commands.md
+++ b/docs/movement_commands.md
@@ -1,6 +1,6 @@
 # Movement Commands
 
-Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engine/movement.asm:MovementPointers](/engine/movement.asm).
+Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engine/overworld/movement.asm:MovementPointers](/engine/overworld/movement.asm).
 
 
 ## `$00`−`$03`: <code>turn_head <i>direction</i></code>
diff --git a/docs/pic_animations.md b/docs/pic_animations.md
index 1075eb25b..c1a0db934 100644
--- a/docs/pic_animations.md
+++ b/docs/pic_animations.md
@@ -22,9 +22,9 @@ Animation data is in these files:
 - [gfx/pokemon/anims.asm](/gfx/pokemon/anims.asm):
   Main animations (played everywhere)
 
-- [gfx/pokemon/extras.asm](/gfx/pokemon/extras.asm):
-  Extra animations, appended to the main animation.  
+- [gfx/pokemon/idles.asm](/gfx/pokemon/idles.asm):
+  Idle animations, appended to the main animation.  
   Used in the status screen (blinking, tail wags etc.)
 
-- [gfx/pokemon/unown_anims.asm](/gfx/pokemon/unown_anims.asm) and [gfx/pokemon/unown_extras.asm](/gfx/pokemon/unown_extras.asm):
+- [gfx/pokemon/unown_anims.asm](/gfx/pokemon/unown_anims.asm) and [gfx/pokemon/unown_idles.asm](/gfx/pokemon/unown_idles.asm):
   Unown has its own animation data despite having an entry in the main tables.
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm
index 4d1eea2e8..29bc23b20 100644
--- a/engine/battle/ai/items.asm
+++ b/engine/battle/ai/items.asm
@@ -1,4 +1,4 @@
-AI_SwitchOrTryItem: ; 38000
+AI_SwitchOrTryItem:
 	and a
 
 	ld a, [wBattleMode]
@@ -38,12 +38,11 @@ AI_SwitchOrTryItem: ; 38000
 	jp nz, SwitchSometimes
 	; fallthrough
 
-DontSwitch: ; 38041
+DontSwitch:
 	call AI_TryItem
 	ret
-; 38045
 
-SwitchOften: ; 38045
+SwitchOften:
 	callfar CheckAbleToSwitch
 	ld a, [wEnemySwitchMonParam]
 	and $f0
@@ -52,7 +51,7 @@ SwitchOften: ; 38045
 	cp $10
 	jr nz, .not_10
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jr c, .switch
 	jp DontSwitch
 .not_10
@@ -60,7 +59,7 @@ SwitchOften: ; 38045
 	cp $20
 	jr nz, .not_20
 	call Random
-	cp -1 + 79 percent
+	cp 79 percent - 1
 	jr c, .switch
 	jp DontSwitch
 .not_20
@@ -74,12 +73,11 @@ SwitchOften: ; 38045
 	ld a, [wEnemySwitchMonParam]
 	and $f
 	inc a
-	; In register 'a' is the number (1-6) of the Pkmn to switch to
+	; In register 'a' is the number (1-6) of the mon to switch to
 	ld [wEnemySwitchMonIndex], a
 	jp AI_TrySwitch
-; 38083
 
-SwitchRarely: ; 38083
+SwitchRarely:
 	callfar CheckAbleToSwitch
 	ld a, [wEnemySwitchMonParam]
 	and $f0
@@ -103,7 +101,7 @@ SwitchRarely: ; 38083
 
 	; $30
 	call Random
-	cp -1 + 79 percent
+	cp 79 percent - 1
 	jp c, DontSwitch
 
 .switch
@@ -112,9 +110,8 @@ SwitchRarely: ; 38083
 	inc a
 	ld [wEnemySwitchMonIndex], a
 	jp AI_TrySwitch
-; 380c1
 
-SwitchSometimes: ; 380c1
+SwitchSometimes:
 	callfar CheckAbleToSwitch
 	ld a, [wEnemySwitchMonParam]
 	and $f0
@@ -123,7 +120,7 @@ SwitchSometimes: ; 380c1
 	cp $10
 	jr nz, .not_10
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jr c, .switch
 	jp DontSwitch
 .not_10
@@ -131,14 +128,14 @@ SwitchSometimes: ; 380c1
 	cp $20
 	jr nz, .not_20
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jr c, .switch
 	jp DontSwitch
 .not_20
 
 	; $30
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jp c, DontSwitch
 
 .switch
@@ -147,17 +144,13 @@ SwitchSometimes: ; 380c1
 	inc a
 	ld [wEnemySwitchMonIndex], a
 	jp AI_TrySwitch
-; 380ff
 
-
-CheckSubstatusCantRun: ; 380ff
+CheckSubstatusCantRun:
 	ld a, [wEnemySubStatus5]
 	bit SUBSTATUS_CANT_RUN, a
 	ret
-; 38105
-
 
-AI_TryItem: ; 38105
+AI_TryItem:
 	; items are not allowed in the BattleTower
 	ld a, [wInBattleTowerBattle]
 	and a
@@ -243,8 +236,7 @@ AI_TryItem: ; 38105
 	scf
 	ret
 
-
-.IsHighestLevel: ; 38170
+.IsHighestLevel:
 	ld a, [wOTPartyCount]
 	ld d, a
 	ld e, 0
@@ -274,10 +266,8 @@ AI_TryItem: ; 38105
 .yes
 	scf
 	ret
-; 38196
 
-
-AI_Items: ; 39196
+AI_Items:
 	dbw FULL_RESTORE, .FullRestore
 	dbw MAX_POTION,   .MaxPotion
 	dbw HYPER_POTION, .HyperPotion
@@ -292,16 +282,14 @@ AI_Items: ; 39196
 	dbw X_SPEED,      .XSpeed
 	dbw X_SPECIAL,    .XSpecial
 	db -1 ; end
-; 381be
 
-.FullHeal: ; 381be
+.FullHeal:
 	call .Status
 	jp c, .DontUse
 	call EnemyUsedFullHeal
 	jp .Use
-; 381ca
 
-.Status: ; 381ca (e:41ca)
+.Status:
 	ld a, [wEnemyMonStatus]
 	and a
 	jp z, .DontUse
@@ -313,7 +301,7 @@ AI_Items: ; 39196
 	bit ALWAYS_USE_F, a
 	jp nz, .Use
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jp c, .Use
 	jp .DontUse
 
@@ -325,16 +313,15 @@ AI_Items: ; 39196
 	cp 4
 	jr c, .FailToxicCheck
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jp c, .Use
 .FailToxicCheck:
 	ld a, [wEnemyMonStatus]
 	and 1 << FRZ | SLP
 	jp z, .DontUse
 	jp .Use
-; 38208
 
-.FullRestore: ; 38208
+.FullRestore:
 	call .HealItem
 	jp nc, .UseFullRestore
 	ld a, [bc]
@@ -346,15 +333,14 @@ AI_Items: ; 39196
 .UseFullRestore:
 	call EnemyUsedFullRestore
 	jp .Use
-; 38220
 
-.MaxPotion: ; 38220
+.MaxPotion:
 	call .HealItem
 	jp c, .DontUse
 	call EnemyUsedMaxPotion
 	jp .Use
 
-.HealItem: ; 3822c (e:422c)
+.HealItem:
 	ld a, [bc]
 	bit CONTEXT_USE_F, a
 	jr nz, .CheckHalfOrQuarterHP
@@ -366,54 +352,50 @@ AI_Items: ; 39196
 	callfar AICheckEnemyQuarterHP
 	jp nc, .UseHealItem
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jp c, .UseHealItem
 	jp .DontUse
 
-.CheckQuarterHP: ; 38254 (e:4254)
+.CheckQuarterHP:
 	callfar AICheckEnemyQuarterHP
 	jp c, .DontUse
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jp c, .DontUse
 	jr .UseHealItem
 
-.CheckHalfOrQuarterHP: ; 38267 (e:4267)
+.CheckHalfOrQuarterHP:
 	callfar AICheckEnemyHalfHP
 	jp c, .DontUse
 	callfar AICheckEnemyQuarterHP
 	jp nc, .UseHealItem
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jp nc, .DontUse
 
-.UseHealItem: ; 38281 (e:4281)
+.UseHealItem:
 	jp .Use
-; 38284
 
-.HyperPotion: ; 38284
+.HyperPotion:
 	call .HealItem
 	jp c, .DontUse
 	ld b, 200
 	call EnemyUsedHyperPotion
 	jp .Use
-; 38292 (e:4292)
 
-.SuperPotion: ; 38292
+.SuperPotion:
 	call .HealItem
 	jp c, .DontUse
 	ld b, 50
 	call EnemyUsedSuperPotion
 	jp .Use
-; 382a0
 
-.Potion: ; 382a0
+.Potion:
 	call .HealItem
 	jp c, .DontUse
 	ld b, 20
 	call EnemyUsedPotion
 	jp .Use
-; 382ae
 
 .asm_382ae ; This appears to be unused
 	callfar AICheckEnemyMaxHP
@@ -442,7 +424,7 @@ AI_Items: ; 39196
 	bit UNKNOWN_USE_F, a
 	jp z, .Use
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jp c, .Use
 
 .dont_use
@@ -454,61 +436,53 @@ AI_Items: ; 39196
 	bit UNKNOWN_USE_F, a
 	jp z, .DontUse
 	call Random
-	cp 1 + 39 percent
+	cp 39 percent + 1
 	jp c, .Use
 	jp .DontUse
-; 382f9
 
-.XAccuracy: ; 382f9
+.XAccuracy:
 	call .XItem
 	jp c, .DontUse
 	call EnemyUsedXAccuracy
 	jp .Use
-; 38305
 
-.GuardSpec: ; 38305
+.GuardSpec:
 	call .XItem
 	jp c, .DontUse
 	call EnemyUsedGuardSpec
 	jp .Use
-; 38311
 
-.DireHit: ; 38311
+.DireHit:
 	call .XItem
 	jp c, .DontUse
 	call EnemyUsedDireHit
 	jp .Use
-; 3831d (e:431d)
 
-.XAttack: ; 3831d
+.XAttack:
 	call .XItem
 	jp c, .DontUse
 	call EnemyUsedXAttack
 	jp .Use
-; 38329
 
-.XDefend: ; 38329
+.XDefend:
 	call .XItem
 	jp c, .DontUse
 	call EnemyUsedXDefend
 	jp .Use
-; 38335
 
-.XSpeed: ; 38335
+.XSpeed:
 	call .XItem
 	jp c, .DontUse
 	call EnemyUsedXSpeed
 	jp .Use
-; 38341
 
-.XSpecial: ; 38341
+.XSpecial:
 	call .XItem
 	jp c, .DontUse
 	call EnemyUsedXSpecial
 	jp .Use
-; 3834d
 
-.XItem: ; 3834d (e:434d)
+.XItem:
 	ld a, [wEnemyTurnsTaken]
 	and a
 	jr nz, .notfirstturnout
@@ -516,13 +490,13 @@ AI_Items: ; 39196
 	bit ALWAYS_USE_F, a
 	jp nz, .Use
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jp c, .DontUse
 	ld a, [bc]
 	bit CONTEXT_USE_F, a
 	jp nz, .Use
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jp c, .DontUse
 	jp .Use
 .notfirstturnout
@@ -530,7 +504,7 @@ AI_Items: ; 39196
 	bit ALWAYS_USE_F, a
 	jp z, .DontUse
 	call Random
-	cp -1 + 20 percent
+	cp 20 percent - 1
 	jp nc, .DontUse
 	jp .Use
 
@@ -542,8 +516,7 @@ AI_Items: ; 39196
 	and a
 	ret
 
-
-AIUpdateHUD: ; 38387
+AIUpdateHUD:
 	call UpdateEnemyMonInParty
 	farcall UpdateEnemyHUD
 	ld a, $1
@@ -552,29 +525,26 @@ AIUpdateHUD: ; 38387
 	dec [hl]
 	scf
 	ret
-; 3839a
 
-AIUsedItemSound: ; 3839a
+AIUsedItemSound:
 	push de
 	ld de, SFX_FULL_HEAL
 	call PlaySFX
 	pop de
 	ret
-; 383a3
 
-
-EnemyUsedFullHeal: ; 383a3 (e:43a3)
+EnemyUsedFullHeal:
 	call AIUsedItemSound
 	call AI_HealStatus
 	ld a, FULL_HEAL
 	jp PrintText_UsedItemOn_AND_AIUpdateHUD
 
-EnemyUsedMaxPotion: ; 383ae (e:43ae)
+EnemyUsedMaxPotion:
 	ld a, MAX_POTION
 	ld [wCurEnemyItem], a
 	jr FullRestoreContinue
 
-EnemyUsedFullRestore: ; 383b5 (e:43b5)
+EnemyUsedFullRestore:
 	call AI_HealStatus
 	ld a, FULL_RESTORE
 	ld [wCurEnemyItem], a
@@ -583,7 +553,7 @@ EnemyUsedFullRestore: ; 383b5 (e:43b5)
 	xor a
 	ld [wEnemyConfuseCount], a
 
-FullRestoreContinue: ; 383c6
+FullRestoreContinue:
 	ld de, wCurHPAnimOldHP
 	ld hl, wEnemyMonHP + 1
 	ld a, [hld]
@@ -603,23 +573,22 @@ FullRestoreContinue: ; 383c6
 	ld [wCurHPAnimMaxHP + 1], a
 	ld [wEnemyMonHP], a
 	jr EnemyPotionFinish
-; 383e8 (e:43e8)
 
-EnemyUsedPotion: ; 383e8
+EnemyUsedPotion:
 	ld a, POTION
 	ld b, 20
 	jr EnemyPotionContinue
 
-EnemyUsedSuperPotion: ; 383ee
+EnemyUsedSuperPotion:
 	ld a, SUPER_POTION
 	ld b, 50
 	jr EnemyPotionContinue
 
-EnemyUsedHyperPotion: ; 383f4 (e:43f4)
+EnemyUsedHyperPotion:
 	ld a, HYPER_POTION
 	ld b, 200
 
-EnemyPotionContinue: ; 383f8
+EnemyPotionContinue:
 	ld [wCurEnemyItem], a
 	ld hl, wEnemyMonHP + 1
 	ld a, [hl]
@@ -658,7 +627,7 @@ EnemyPotionContinue: ; 383f8
 	ld [hl], a
 	ld [wCurHPAnimNewHP + 1], a
 
-EnemyPotionFinish: ; 38436
+EnemyPotionFinish:
 	call PrintText_UsedItemOn
 	hlcoord 2, 2
 	xor a
@@ -667,8 +636,7 @@ EnemyPotionFinish: ; 38436
 	predef AnimateHPBar
 	jp AIUpdateHUD
 
-
-AI_TrySwitch: ; 3844b
+AI_TrySwitch:
 ; Determine whether the AI can switch based on how many Pokemon are still alive.
 ; If it can switch, it will.
 	ld a, [wOTPartyCount]
@@ -695,9 +663,8 @@ AI_TrySwitch: ; 3844b
 	jp nc, AI_Switch
 	and a
 	ret
-; 3846c
 
-AI_Switch: ; 3846c
+AI_Switch:
 	ld a, $1
 	ld [wEnemyIsSwitching], a
 	ld [wEnemyGoesFirst], a
@@ -739,21 +706,18 @@ AI_Switch: ; 3846c
 	ret nz
 	scf
 	ret
-; 384d0
 
-TextJump_EnemyWithdrew: ; 384d0
+TextJump_EnemyWithdrew:
 	text_jump Text_EnemyWithdrew
 	db "@"
-; 384d5
 
 Function384d5: ; This appears to be unused
 	call AIUsedItemSound
 	call AI_HealStatus
 	ld a, FULL_HEAL_RED ; X_SPEED
 	jp PrintText_UsedItemOn_AND_AIUpdateHUD
-; 384e0
 
-AI_HealStatus: ; 384e0
+AI_HealStatus:
 	ld a, [wCurOTMon]
 	ld hl, wOTPartyMon1Status
 	ld bc, PARTYMON_STRUCT_LENGTH
@@ -768,31 +732,27 @@ AI_HealStatus: ; 384e0
 	ld hl, wEnemySubStatus5
 	res SUBSTATUS_TOXIC, [hl]
 	ret
-; 384f7
 
-EnemyUsedXAccuracy: ; 384f7
+EnemyUsedXAccuracy:
 	call AIUsedItemSound
 	ld hl, wEnemySubStatus4
 	set SUBSTATUS_X_ACCURACY, [hl]
 	ld a, X_ACCURACY
 	jp PrintText_UsedItemOn_AND_AIUpdateHUD
-; 38504
 
-EnemyUsedGuardSpec: ; 38504
+EnemyUsedGuardSpec:
 	call AIUsedItemSound
 	ld hl, wEnemySubStatus4
 	set SUBSTATUS_MIST, [hl]
 	ld a, GUARD_SPEC
 	jp PrintText_UsedItemOn_AND_AIUpdateHUD
-; 38511
 
-EnemyUsedDireHit: ; 38511
+EnemyUsedDireHit:
 	call AIUsedItemSound
 	ld hl, wEnemySubStatus4
 	set SUBSTATUS_FOCUS_ENERGY, [hl]
 	ld a, DIRE_HIT
 	jp PrintText_UsedItemOn_AND_AIUpdateHUD
-; 3851e
 
 Function3851e: ; This appears to be unused
 	ld [hDivisor], a
@@ -818,31 +778,26 @@ Function3851e: ; This appears to be unused
 	ld a, e
 	sub c
 	ret
-; 38541
 
-EnemyUsedXAttack: ; 38541
+EnemyUsedXAttack:
 	ld b, ATTACK
 	ld a, X_ATTACK
 	jr EnemyUsedXItem
-; 38547
 
-EnemyUsedXDefend: ; 38547
+EnemyUsedXDefend:
 	ld b, DEFENSE
 	ld a, X_DEFEND
 	jr EnemyUsedXItem
-; 3854d
 
-EnemyUsedXSpeed: ; 3854d
+EnemyUsedXSpeed:
 	ld b, SPEED
 	ld a, X_SPEED
 	jr EnemyUsedXItem
-; 38553
 
-EnemyUsedXSpecial: ; 38553
+EnemyUsedXSpecial:
 	ld b, SP_ATTACK
 	ld a, X_SPECIAL
 
-
 ; Parameter
 ; a = ITEM_CONSTANT
 ; b = BATTLE_CONSTANT (ATTACK, DEFENSE, SPEED, SP_ATTACK, SP_DEFENSE, ACCURACY, EVASION)
@@ -853,18 +808,15 @@ EnemyUsedXItem:
 	pop bc
 	farcall CheckIfStatCanBeRaised
 	jp AIUpdateHUD
-; 38568
-
 
 ; Parameter
 ; a = ITEM_CONSTANT
-PrintText_UsedItemOn_AND_AIUpdateHUD: ; 38568
+PrintText_UsedItemOn_AND_AIUpdateHUD:
 	ld [wCurEnemyItem], a
 	call PrintText_UsedItemOn
 	jp AIUpdateHUD
-; 38571
 
-PrintText_UsedItemOn: ; 38571
+PrintText_UsedItemOn:
 	ld a, [wCurEnemyItem]
 	ld [wd265], a
 	call GetItemName
@@ -874,9 +826,7 @@ PrintText_UsedItemOn: ; 38571
 	call CopyBytes
 	ld hl, TextJump_EnemyUsedOn
 	jp PrintText
-; 3858c
 
-TextJump_EnemyUsedOn: ; 3858c
+TextJump_EnemyUsedOn:
 	text_jump Text_EnemyUsedOn
 	db "@"
-; 38591
diff --git a/engine/battle/ai/move.asm b/engine/battle/ai/move.asm
index b5ac966f8..df0053141 100755..100644
--- a/engine/battle/ai/move.asm
+++ b/engine/battle/ai/move.asm
@@ -1,4 +1,4 @@
-AIChooseMove: ; 440ce
+AIChooseMove:
 ; Score each move in wEnemyMonMoves starting from wBuffer1. Lower is better.
 ; Pick the move with the lowest score.
 
@@ -15,7 +15,6 @@ AIChooseMove: ; 440ce
 	farcall CheckEnemyLockedIn
 	ret nz
 
-
 ; The default score is 20. Unusable moves are given a score of 80.
 	ld a, 20
 	ld hl, wBuffer1
@@ -61,7 +60,6 @@ AIChooseMove: ; 440ce
 	ld [hl], 80
 	jr .CheckMovePP
 
-
 ; Apply AI scoring layers depending on the trainer class.
 .ApplyLayers:
 	ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS
@@ -198,10 +196,9 @@ AIChooseMove: ; 440ce
 	ld a, c
 	ld [wCurEnemyMoveNum], a
 	ret
-; 441af
-
 
-AIScoringPointers: ; 441af
+AIScoringPointers:
+; entries correspond to AI_* constants
 	dw AI_Basic
 	dw AI_Setup
 	dw AI_Types
@@ -218,4 +215,3 @@ AIScoringPointers: ; 441af
 	dw AI_None
 	dw AI_None
 	dw AI_None
-; 441cf
diff --git a/engine/battle/ai/redundant.asm b/engine/battle/ai/redundant.asm
index d09b4da73..d78fccb84 100755..100644
--- a/engine/battle/ai/redundant.asm
+++ b/engine/battle/ai/redundant.asm
@@ -1,4 +1,4 @@
-AI_Redundant: ; 2c41a
+AI_Redundant:
 ; Check if move effect c will fail because it's already been used.
 ; Return z if the move is a good choice.
 ; Return nz if the move is a bad choice.
@@ -13,7 +13,7 @@ AI_Redundant: ; 2c41a
 	ld l, a
 	jp hl
 
-.Moves: ; 2c42c
+.Moves:
 	dbw EFFECT_DREAM_EATER,  .DreamEater
 	dbw EFFECT_HEAL,         .Heal
 	dbw EFFECT_LIGHT_SCREEN, .LightScreen
@@ -46,22 +46,22 @@ AI_Redundant: ; 2c41a
 	dbw EFFECT_FUTURE_SIGHT, .FutureSight
 	db -1
 
-.LightScreen: ; 2c487
+.LightScreen:
 	ld a, [wEnemyScreens]
 	bit SCREENS_LIGHT_SCREEN, a
 	ret
 
-.Mist: ; 2c48d
+.Mist:
 	ld a, [wEnemySubStatus4]
 	bit SUBSTATUS_MIST, a
 	ret
 
-.FocusEnergy: ; 2c493
+.FocusEnergy:
 	ld a, [wEnemySubStatus4]
 	bit SUBSTATUS_FOCUS_ENERGY, a
 	ret
 
-.Confuse: ; 2c499
+.Confuse:
 	ld a, [wPlayerSubStatus3]
 	bit SUBSTATUS_CONFUSED, a
 	ret nz
@@ -69,49 +69,49 @@ AI_Redundant: ; 2c41a
 	bit SCREENS_SAFEGUARD, a
 	ret
 
-.Transform: ; 2c4a5
+.Transform:
 	ld a, [wEnemySubStatus5]
 	bit SUBSTATUS_TRANSFORMED, a
 	ret
 
-.Reflect: ; 2c4ab
+.Reflect:
 	ld a, [wEnemyScreens]
 	bit SCREENS_REFLECT, a
 	ret
 
-.Substitute: ; 2c4b1
+.Substitute:
 	ld a, [wEnemySubStatus4]
 	bit SUBSTATUS_SUBSTITUTE, a
 	ret
 
-.LeechSeed: ; 2c4b7
+.LeechSeed:
 	ld a, [wPlayerSubStatus4]
 	bit SUBSTATUS_LEECH_SEED, a
 	ret
 
-.Disable: ; 2c4bd
+.Disable:
 	ld a, [wPlayerDisableCount]
 	and a
 	ret
 
-.Encore: ; 2c4c2
+.Encore:
 	ld a, [wPlayerSubStatus5]
 	bit SUBSTATUS_ENCORED, a
 	ret
 
 .Snore:
-.SleepTalk: ; 2c4c8
+.SleepTalk:
 	ld a, [wEnemyMonStatus]
 	and SLP
 	jr z, .Redundant
 	jr .NotRedundant
 
-.MeanLook: ; 2c4d1
+.MeanLook:
 	ld a, [wEnemySubStatus5]
 	bit SUBSTATUS_CANT_RUN, a
 	ret
 
-.Nightmare: ; 2c4d7
+.Nightmare:
 	ld a, [wBattleMonStatus]
 	and a
 	jr z, .Redundant
@@ -119,63 +119,63 @@ AI_Redundant: ; 2c41a
 	bit SUBSTATUS_NIGHTMARE, a
 	ret
 
-.Spikes: ; 2c4e3
+.Spikes:
 	ld a, [wPlayerScreens]
 	bit SCREENS_SPIKES, a
 	ret
 
-.Foresight: ; 2c4e9
+.Foresight:
 	ld a, [wPlayerSubStatus1]
 	bit SUBSTATUS_IDENTIFIED, a
 	ret
 
-.PerishSong: ; 2c4ef
+.PerishSong:
 	ld a, [wPlayerSubStatus1]
 	bit SUBSTATUS_PERISH, a
 	ret
 
-.Sandstorm: ; 2c4f5
+.Sandstorm:
 	ld a, [wBattleWeather]
 	cp WEATHER_SANDSTORM
 	jr z, .Redundant
 	jr .NotRedundant
 
-.Attract: ; 2c4fe
+.Attract:
 	farcall CheckOppositeGender
 	jr c, .Redundant
 	ld a, [wPlayerSubStatus1]
 	bit SUBSTATUS_IN_LOVE, a
 	ret
 
-.Safeguard: ; 2c50c
+.Safeguard:
 	ld a, [wEnemyScreens]
 	bit SCREENS_SAFEGUARD, a
 	ret
 
-.RainDance: ; 2c512
+.RainDance:
 	ld a, [wBattleWeather]
 	cp WEATHER_RAIN
 	jr z, .Redundant
 	jr .NotRedundant
 
-.SunnyDay: ; 2c51b
+.SunnyDay:
 	ld a, [wBattleWeather]
 	cp WEATHER_SUN
 	jr z, .Redundant
 	jr .NotRedundant
 
-.DreamEater: ; 2c524
+.DreamEater:
 	ld a, [wBattleMonStatus]
 	and SLP
 	jr z, .Redundant
 	jr .NotRedundant
 
-.Swagger: ; 2c52d
+.Swagger:
 	ld a, [wPlayerSubStatus3]
 	bit SUBSTATUS_CONFUSED, a
 	ret
 
-.FutureSight: ; 2c533
+.FutureSight:
 	ld a, [wEnemyScreens]
 	bit 5, a
 	ret
@@ -183,16 +183,16 @@ AI_Redundant: ; 2c41a
 .Heal:
 .MorningSun:
 .Synthesis:
-.Moonlight: ; 2c539
+.Moonlight:
 	farcall AICheckEnemyMaxHP
 	jr nc, .NotRedundant
 
 .Teleport:
-.Redundant: ; 2c541
+.Redundant:
 	ld a, 1
 	and a
 	ret
 
-.NotRedundant: ; 2c545
+.NotRedundant:
 	xor a
 	ret
diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm
index b250128a4..3cd0e56c4 100644
--- a/engine/battle/ai/scoring.asm
+++ b/engine/battle/ai/scoring.asm
@@ -1,6 +1,6 @@
-AIScoring: ; 38591
+AIScoring: ; used only for BANK(AIScoring)
 
-AI_Basic: ; 38591
+AI_Basic:
 ; Don't do anything redundant:
 ;  -Using status-only moves if the player can't be statused
 ;  -Using moves that fail if they've already been used
@@ -40,7 +40,7 @@ AI_Basic: ; 38591
 	push hl
 	push de
 	push bc
-	ld hl, .statusonlyeffects
+	ld hl, StatusOnlyEffects
 	ld de, 1
 	call IsInArray
 
@@ -61,19 +61,11 @@ AI_Basic: ; 38591
 .discourage
 	call AIDiscourageMove
 	jr .checkmove
-; 385db
-
-.statusonlyeffects
-	db EFFECT_SLEEP
-	db EFFECT_TOXIC
-	db EFFECT_POISON
-	db EFFECT_PARALYZE
-	db -1 ; end
-; 385e0
 
+INCLUDE "data/battle/ai/status_only_effects.asm"
 
 
-AI_Setup: ; 385e0
+AI_Setup:
 ; Use stat-modifying moves on turn 1.
 
 ; 50% chance to greatly encourage stat-up moves during the first turn of enemy's Pokemon.
@@ -146,11 +138,9 @@ AI_Setup: ; 385e0
 	inc [hl]
 	inc [hl]
 	jr .checkmove
-; 38635
 
 
-
-AI_Types: ; 38635
+AI_Types:
 ; Dismiss any move that the player is immune to.
 ; Encourage super-effective moves.
 ; Discourage not very effective moves unless
@@ -238,11 +228,9 @@ AI_Types: ; 38635
 .immune
 	call AIDiscourageMove
 	jr .checkmove
-; 386a2
-
 
 
-AI_Offensive: ; 386a2
+AI_Offensive:
 ; Greatly discourage non-damaging moves.
 
 	ld hl, wBuffer1 - 1
@@ -267,11 +255,9 @@ AI_Offensive: ; 386a2
 	inc [hl]
 	inc [hl]
 	jr .checkmove
-; 386be
 
 
-
-AI_Smart: ; 386be
+AI_Smart:
 ; Context-specific scoring.
 
 	ld hl, wBuffer1
@@ -401,10 +387,8 @@ AI_Smart: ; 386be
 	dbw EFFECT_THUNDER,          AI_Smart_Thunder
 	dbw EFFECT_FLY,              AI_Smart_Fly
 	db -1 ; end
-; 387e3
-
 
-AI_Smart_Sleep: ; 387e3
+AI_Smart_Sleep:
 ; Greatly encourage sleep inducing moves if the enemy has either Dream Eater or Nightmare.
 ; 50% chance to greatly encourage sleep inducing moves otherwise.
 
@@ -422,10 +406,8 @@ AI_Smart_Sleep: ; 387e3
 	dec [hl]
 	dec [hl]
 	ret
-; 387f7
 
-
-AI_Smart_LeechHit: ; 387f7
+AI_Smart_LeechHit:
 	push hl
 	ld a, 1
 	ld [hBattleTurn], a
@@ -458,10 +440,8 @@ AI_Smart_LeechHit: ; 387f7
 
 	inc [hl]
 	ret
-; 3881d
-
 
-AI_Smart_LockOn: ; 3881d
+AI_Smart_LockOn:
 	ld a, [wPlayerSubStatus5]
 	bit SUBSTATUS_LOCK_ON, a
 	jr nz, .asm_38882
@@ -564,10 +544,8 @@ AI_Smart_LockOn: ; 3881d
 .asm_388a2
 	pop hl
 	jp AIDiscourageMove
-; 388a6
 
-
-AI_Smart_Selfdestruct: ; 388a6
+AI_Smart_Selfdestruct:
 ; Selfdestruct, Explosion
 
 ; Unless this is the enemy's last Pokemon...
@@ -602,10 +580,8 @@ AI_Smart_Selfdestruct: ; 388a6
 	inc [hl]
 	inc [hl]
 	ret
-; 388ca
-
 
-AI_Smart_DreamEater: ; 388ca
+AI_Smart_DreamEater:
 ; 90% chance to greatly encourage this move.
 ; The AI_Basic layer will make sure that
 ; Dream Eater is only used against sleeping targets.
@@ -616,11 +592,8 @@ AI_Smart_DreamEater: ; 388ca
 	dec [hl]
 	dec [hl]
 	ret
-; 388d4
-
-
-AI_Smart_EvasionUp: ; 388d4
 
+AI_Smart_EvasionUp:
 ; Dismiss this move if enemy's evasion can't raise anymore.
 	ld a, [wEnemyEvaLevel]
 	cp $d
@@ -704,7 +677,6 @@ AI_Smart_EvasionUp: ; 388d4
 	bit SUBSTATUS_ROLLOUT, a
 	jr nz, .asm_388ef
 
-
 .asm_38936
 	inc [hl]
 	ret
@@ -729,10 +701,8 @@ AI_Smart_EvasionUp: ; 388d4
 
 	dec [hl]
 	ret
-; 38947
-
 
-AI_Smart_AlwaysHit: ; 38947
+AI_Smart_AlwaysHit:
 ; 80% chance to greatly encourage this move if either...
 
 ; ...enemy's accuracy level has been lowered three or more stages
@@ -752,11 +722,8 @@ AI_Smart_AlwaysHit: ; 38947
 	dec [hl]
 	dec [hl]
 	ret
-; 3895b
-
-
-AI_Smart_MirrorMove: ; 3895b
 
+AI_Smart_MirrorMove:
 ; If the player did not use any move last turn...
 	ld a, [wLastPlayerCounterMove]
 	and a
@@ -796,11 +763,8 @@ AI_Smart_MirrorMove: ; 3895b
 
 	dec [hl]
 	ret
-; 38985
-
-
-AI_Smart_AccuracyDown: ; 38985
 
+AI_Smart_AccuracyDown:
 ; If player's HP is full...
 	call AICheckPlayerMaxHP
 	jr nc, .asm_389a0
@@ -903,11 +867,8 @@ AI_Smart_AccuracyDown: ; 38985
 
 	dec [hl]
 	ret
-; 389f5
-
-
-AI_Smart_ResetStats: ; 389f5
 
+AI_Smart_ResetStats:
 ; 85% chance to encourage this move if any of enemy's stat levels is lower than -2.
 	push hl
 	ld hl, wEnemyAtkLevel
@@ -946,10 +907,8 @@ AI_Smart_ResetStats: ; 389f5
 	pop hl
 	inc [hl]
 	ret
-; 38a1e
 
-
-AI_Smart_Bide: ; 38a1e
+AI_Smart_Bide:
 ; 90% chance to discourage this move unless enemy's HP is full.
 
 	call AICheckEnemyMaxHP
@@ -959,10 +918,8 @@ AI_Smart_Bide: ; 38a1e
 	ret c
 	inc [hl]
 	ret
-; 38a2a
-
 
-AI_Smart_ForceSwitch: ; 38a2a
+AI_Smart_ForceSwitch:
 ; Whirlwind, Roar.
 
 ; Discourage this move if the player has not shown
@@ -977,13 +934,11 @@ AI_Smart_ForceSwitch: ; 38a2a
 	ret c
 	inc [hl]
 	ret
-; 38a3a
-
 
 AI_Smart_Heal:
 AI_Smart_MorningSun:
 AI_Smart_Synthesis:
-AI_Smart_Moonlight: ; 38a3a
+AI_Smart_Moonlight:
 ; 90% chance to greatly encourage this move if enemy's HP is below 25%.
 ; Discourage this move if enemy's HP is higher than 50%.
 ; Do nothing otherwise.
@@ -1002,22 +957,18 @@ AI_Smart_Moonlight: ; 38a3a
 	dec [hl]
 	dec [hl]
 	ret
-; 38a4e
-
 
 AI_Smart_Toxic:
-AI_Smart_LeechSeed: ; 38a4e
+AI_Smart_LeechSeed:
 ; Discourage this move if player's HP is below 50%.
 
 	call AICheckPlayerHalfHP
 	ret c
 	inc [hl]
 	ret
-; 38a54
-
 
 AI_Smart_LightScreen:
-AI_Smart_Reflect: ; 38a54
+AI_Smart_Reflect:
 ; Over 90% chance to discourage this move unless enemy's HP is full.
 
 	call AICheckEnemyMaxHP
@@ -1027,10 +978,8 @@ AI_Smart_Reflect: ; 38a54
 	ret c
 	inc [hl]
 	ret
-; 38a60
-
 
-AI_Smart_Ohko: ; 38a60
+AI_Smart_Ohko:
 ; Dismiss this move if player's level is higher than enemy's level.
 ; Else, discourage this move is player's HP is below 50%.
 
@@ -1043,10 +992,8 @@ AI_Smart_Ohko: ; 38a60
 	ret c
 	inc [hl]
 	ret
-; 38a71
 
-
-AI_Smart_TrapTarget: ; 38a71
+AI_Smart_TrapTarget:
 ; Bind, Wrap, Fire Spin, Clamp
 
 ; 50% chance to discourage this move if the player is already trapped.
@@ -1061,7 +1008,7 @@ AI_Smart_TrapTarget: ; 38a71
 	jr nz, .asm_38a91
 
 	ld a, [wPlayerSubStatus1]
-	and 1<<SUBSTATUS_IN_LOVE | 1<<SUBSTATUS_ROLLOUT | 1<<SUBSTATUS_IDENTIFIED | 1<<SUBSTATUS_NIGHTMARE
+	and 1 << SUBSTATUS_IN_LOVE | 1 << SUBSTATUS_ROLLOUT | 1 << SUBSTATUS_IDENTIFIED | 1 << SUBSTATUS_NIGHTMARE
 	jr nz, .asm_38a91
 
 ; Else, 50% chance to greatly encourage this move if it's the player's Pokemon first turn.
@@ -1084,11 +1031,9 @@ AI_Smart_TrapTarget: ; 38a71
 	dec [hl]
 	dec [hl]
 	ret
-; 38a9c
-
 
 AI_Smart_RazorWind:
-AI_Smart_Unused2B: ; 38a9c
+AI_Smart_Unused2B:
 	ld a, [wEnemySubStatus1]
 	bit SUBSTATUS_PERISH, a
 	jr z, .asm_38aaa
@@ -1139,11 +1084,8 @@ AI_Smart_Unused2B: ; 38a9c
 	add 6
 	ld [hl], a
 	ret
-; 38adb
-
-
-AI_Smart_Confuse: ; 38adb
 
+AI_Smart_Confuse:
 ; 90% chance to discourage this move if player's HP is between 25% and 50%.
 	call AICheckPlayerHalfHP
 	ret c
@@ -1158,11 +1100,8 @@ AI_Smart_Confuse: ; 38adb
 	ret c
 	inc [hl]
 	ret
-; 38aed
-
-
-AI_Smart_SpDefenseUp2: ; 38aed
 
+AI_Smart_SpDefenseUp2:
 ; Discourage this move if enemy's HP is lower than 50%.
 	call AICheckEnemyHalfHP
 	jr nc, .asm_38b10
@@ -1194,10 +1133,8 @@ AI_Smart_SpDefenseUp2: ; 38aed
 .asm_38b10
 	inc [hl]
 	ret
-; 38b12
-
 
-AI_Smart_Fly: ; 38b12
+AI_Smart_Fly:
 ; Fly, Dig
 
 ; Greatly encourage this move if the player is
@@ -1214,21 +1151,16 @@ AI_Smart_Fly: ; 38b12
 	dec [hl]
 	dec [hl]
 	ret
-; 38b20
 
-
-AI_Smart_SuperFang: ; 38b20
+AI_Smart_SuperFang:
 ; Discourage this move if player's HP is below 25%.
 
 	call AICheckPlayerQuarterHP
 	ret c
 	inc [hl]
 	ret
-; 38b26
-
-
-AI_Smart_Paralyze: ; 38b26
 
+AI_Smart_Paralyze:
 ; 50% chance to discourage this move if player's HP is below 25%.
 	call AICheckPlayerQuarterHP
 	jr nc, .asm_38b3a
@@ -1250,10 +1182,8 @@ AI_Smart_Paralyze: ; 38b26
 	ret c
 	inc [hl]
 	ret
-; 38b40
-
 
-AI_Smart_SpeedDownHit: ; 38b40
+AI_Smart_SpeedDownHit:
 ; Icy Wind
 
 ; Almost 90% chance to greatly encourage this move if the following conditions all meet:
@@ -1277,19 +1207,15 @@ AI_Smart_SpeedDownHit: ; 38b40
 	dec [hl]
 	dec [hl]
 	ret
-; 38b5c
 
-
-AI_Smart_Substitute: ; 38b5c
+AI_Smart_Substitute:
 ; Dismiss this move if enemy's HP is below 50%.
 
 	call AICheckEnemyHalfHP
 	ret c
 	jp AIDiscourageMove
-; 38b63
-
 
-AI_Smart_HyperBeam: ; 38b63
+AI_Smart_HyperBeam:
 	call AICheckEnemyHalfHP
 	jr c, .asm_38b72
 
@@ -1311,10 +1237,8 @@ AI_Smart_HyperBeam: ; 38b63
 	ret c
 	inc [hl]
 	ret
-; 38b7f
 
-
-AI_Smart_Rage: ; 38b7f
+AI_Smart_Rage:
 	ld a, [wEnemySubStatus4]
 	bit SUBSTATUS_RAGE, a
 	jr z, .asm_38b9b
@@ -1351,10 +1275,8 @@ AI_Smart_Rage: ; 38b7f
 .asm_38ba6
 	inc [hl]
 	ret
-; 38ba8
-
 
-AI_Smart_Mimic: ; 38ba8
+AI_Smart_Mimic:
 	ld a, [wLastPlayerCounterMove]
 	and a
 	jr z, .asm_38be9
@@ -1402,10 +1324,8 @@ AI_Smart_Mimic: ; 38ba8
 .asm_38bef
 	inc [hl]
 	ret
-; 38bf1
 
-
-AI_Smart_Counter: ; 38bf1
+AI_Smart_Counter:
 	push hl
 	ld hl, wPlayerUsedMoves
 	ld c, 4
@@ -1454,7 +1374,6 @@ AI_Smart_Counter: ; 38bf1
 	cp SPECIAL
 	jr nc, .asm_38c38
 
-
 .asm_38c30
 	call Random
 	cp 39 percent + 1
@@ -1468,10 +1387,8 @@ AI_Smart_Counter: ; 38bf1
 .asm_38c39
 	inc [hl]
 	ret
-; 38c3b
 
-
-AI_Smart_Encore: ; 38c3b
+AI_Smart_Encore:
 	call AICompareSpeed
 	jr nc, .asm_38c81
 
@@ -1502,7 +1419,7 @@ AI_Smart_Encore: ; 38c3b
 .asm_38c68
 	push hl
 	ld a, [wLastPlayerCounterMove]
-	ld hl, .EncoreMoves
+	ld hl, EncoreMoves
 	ld de, 1
 	call IsInArray
 	pop hl
@@ -1522,42 +1439,9 @@ AI_Smart_Encore: ; 38c3b
 	inc [hl]
 	ret
 
-.EncoreMoves:
-	db SWORDS_DANCE
-	db WHIRLWIND
-	db LEER
-	db ROAR
-	db DISABLE
-	db MIST
-	db LEECH_SEED
-	db GROWTH
-	db POISONPOWDER
-	db STRING_SHOT
-	db MEDITATE
-	db AGILITY
-	db TELEPORT
-	db SCREECH
-	db HAZE
-	db FOCUS_ENERGY
-	db DREAM_EATER
-	db POISON_GAS
-	db SPLASH
-	db SHARPEN
-	db CONVERSION
-	db SUPER_FANG
-	db SUBSTITUTE
-	db TRIPLE_KICK
-	db SPIDER_WEB
-	db MIND_READER
-	db FLAME_WHEEL
-	db AEROBLAST
-	db COTTON_SPORE
-	db POWDER_SNOW
-	db -1 ; end
-; 38ca4
-
+INCLUDE "data/battle/ai/encore_moves.asm"
 
-AI_Smart_PainSplit: ; 38ca4
+AI_Smart_PainSplit:
 ; Discourage this move if [enemy's current HP * 2 > player's current HP].
 
 	push hl
@@ -1576,11 +1460,9 @@ AI_Smart_PainSplit: ; 38ca4
 	ret nc
 	inc [hl]
 	ret
-; 38cba
-
 
 AI_Smart_Snore:
-AI_Smart_SleepTalk: ; 38cba
+AI_Smart_SleepTalk:
 ; Greatly encourage this move if enemy is fast asleep.
 ; Greatly discourage this move otherwise.
 
@@ -1599,24 +1481,20 @@ AI_Smart_SleepTalk: ; 38cba
 	inc [hl]
 	inc [hl]
 	ret
-; 38ccb
-
 
-AI_Smart_DefrostOpponent: ; 38ccb
+AI_Smart_DefrostOpponent:
 ; Greatly encourage this move if enemy is frozen.
 ; No move has EFFECT_DEFROST_OPPONENT, so this layer is unused.
 
 	ld a, [wEnemyMonStatus]
-	and $20
+	and 1 << FRZ
 	ret z
 	dec [hl]
 	dec [hl]
 	dec [hl]
 	ret
-; 38cd5
 
-
-AI_Smart_Spite: ; 38cd5
+AI_Smart_Spite:
 	ld a, [wLastPlayerCounterMove]
 	and a
 	jr nz, .asm_38ce7
@@ -1671,27 +1549,21 @@ AI_Smart_Spite: ; 38cd5
 	dec [hl]
 	dec [hl]
 	ret
-; 38d16
-
 
-Function_0x38d16; 38d16
+Function_0x38d16:
 	jp AIDiscourageMove
-; 38d19
-
 
 AI_Smart_DestinyBond:
 AI_Smart_Reversal:
-AI_Smart_SkullBash: ; 38d19
+AI_Smart_SkullBash:
 ; Discourage this move if enemy's HP is above 25%.
 
 	call AICheckEnemyQuarterHP
 	ret nc
 	inc [hl]
 	ret
-; 38d1f
-
 
-AI_Smart_HealBell: ; 38d1f
+AI_Smart_HealBell:
 ; Dismiss this move if none of the opponent's Pokemon is statused.
 ; Encourage this move if the enemy is statused.
 ; 50% chance to greatly encourage this move if the enemy is fast asleep or frozen.
@@ -1747,10 +1619,8 @@ AI_Smart_HealBell: ; 38d1f
 	ret nz
 	jp AIDiscourageMove
 
-; 38d5a
 
-
-AI_Smart_PriorityHit: ; 38d5a
+AI_Smart_PriorityHit:
 	call AICompareSpeed
 	ret c
 
@@ -1780,20 +1650,16 @@ AI_Smart_PriorityHit: ; 38d5a
 	dec [hl]
 	dec [hl]
 	ret
-; 38d93
-
 
-AI_Smart_Thief: ; 38d93
+AI_Smart_Thief:
 ; Don't use Thief unless it's the only move available.
 
 	ld a, [hl]
 	add $1e
 	ld [hl], a
 	ret
-; 38d98
 
-
-AI_Smart_Conversion2: ; 38d98
+AI_Smart_Conversion2:
 	ld a, [wLastPlayerMove]
 	and a
 	jr nz, .asm_38dc9
@@ -1831,10 +1697,8 @@ AI_Smart_Conversion2: ; 38d98
 	ret c
 	inc [hl]
 	ret
-; 38dd1
-
 
-AI_Smart_Disable: ; 38dd1
+AI_Smart_Disable:
 	call AICompareSpeed
 	jr nc, .asm_38df3
 
@@ -1864,10 +1728,8 @@ AI_Smart_Disable: ; 38dd1
 	ret c
 	inc [hl]
 	ret
-; 38dfb
 
-
-AI_Smart_MeanLook: ; 38dfb
+AI_Smart_MeanLook:
 	call AICheckEnemyHalfHP
 	jr nc, .asm_38e24
 
@@ -1885,7 +1747,7 @@ AI_Smart_MeanLook: ; 38dfb
 ; 80% chance to greatly encourage this move if the player is either
 ; in love, identified, stuck in Rollout, or has a Nightmare.
 	ld a, [wPlayerSubStatus1]
-	and 1<<SUBSTATUS_IN_LOVE | 1<<SUBSTATUS_ROLLOUT | 1<<SUBSTATUS_IDENTIFIED | 1<<SUBSTATUS_NIGHTMARE
+	and 1 << SUBSTATUS_IN_LOVE | 1 << SUBSTATUS_ROLLOUT | 1 << SUBSTATUS_IDENTIFIED | 1 << SUBSTATUS_NIGHTMARE
 	jr nz, .asm_38e26
 
 ; Otherwise, discourage this move unless the player only has not very effective moves against the enemy.
@@ -1907,10 +1769,8 @@ AI_Smart_MeanLook: ; 38dfb
 	dec [hl]
 	dec [hl]
 	ret
-; 38e2e
-
 
-AICheckLastPlayerMon: ; 38e2e
+AICheckLastPlayerMon:
 	ld a, [wPartyCount]
 	ld b, a
 	ld c, 0
@@ -1934,10 +1794,8 @@ AICheckLastPlayerMon: ; 38e2e
 	jr nz, .loop
 
 	ret
-; 38e4a
 
-
-AI_Smart_Nightmare: ; 38e4a
+AI_Smart_Nightmare:
 ; 50% chance to encourage this move.
 ; The AI_Basic layer will make sure that
 ; Dream Eater is only used against sleeping targets.
@@ -1946,10 +1804,8 @@ AI_Smart_Nightmare: ; 38e4a
 	ret c
 	dec [hl]
 	ret
-; 38e50
-
 
-AI_Smart_FlameWheel: ; 38e50
+AI_Smart_FlameWheel:
 ; Use this move if the enemy is frozen.
 
 	ld a, [wEnemyMonStatus]
@@ -1959,10 +1815,8 @@ rept 5
 	dec [hl]
 endr
 	ret
-; 38e5c
-
 
-AI_Smart_Curse: ; 38e5c
+AI_Smart_Curse:
 	ld a, [wEnemyMonType1]
 	cp GHOST
 	jr z, .ghostcurse
@@ -2019,14 +1873,12 @@ AI_Smart_Curse: ; 38e5c
 
 	jr .asm_38eb7
 
-
 .asm_38eb0
 	push hl
 	call AICheckLastPlayerMon
 	pop hl
 	jr z, .asm_38ecb
 
-
 .asm_38eb7
 	call AICheckEnemyQuarterHP
 	jp nc, .asm_38e90
@@ -2048,10 +1900,8 @@ AI_Smart_Curse: ; 38e5c
 	dec [hl]
 	dec [hl]
 	ret
-; 38ed2
 
-
-AI_Smart_Protect: ; 38ed2
+AI_Smart_Protect:
 	ld a, [wEnemyProtectCount]
 	and a
 	jr nz, .asm_38f13
@@ -2101,10 +1951,8 @@ AI_Smart_Protect: ; 38ed2
 	inc [hl]
 	inc [hl]
 	ret
-; 38f1d
-
 
-AI_Smart_Foresight: ; 38f1d
+AI_Smart_Foresight:
 	ld a, [wEnemyAccLevel]
 	cp $5
 	jr c, .asm_38f41
@@ -2132,10 +1980,8 @@ AI_Smart_Foresight: ; 38f1d
 	dec [hl]
 	dec [hl]
 	ret
-; 38f4a
 
-
-AI_Smart_PerishSong: ; 38f4a
+AI_Smart_PerishSong:
 	push hl
 	callfar FindAliveEnemyMons
 	pop hl
@@ -2170,11 +2016,8 @@ AI_Smart_PerishSong: ; 38f4a
 	add 5
 	ld [hl], a
 	ret
-; 38f7a
-
-
-AI_Smart_Sandstorm: ; 38f7a
 
+AI_Smart_Sandstorm:
 ; Greatly discourage this move if the player is immune to Sandstorm damage.
 	ld a, [wBattleMonType1]
 	push hl
@@ -2215,10 +2058,8 @@ AI_Smart_Sandstorm: ; 38f7a
 	db GROUND
 	db STEEL
 	db -1 ; end
-; 38fac
-
 
-AI_Smart_Endure: ; 38fac
+AI_Smart_Endure:
 	ld a, [wEnemyProtectCount]
 	and a
 	jr nz, .asm_38fd8
@@ -2259,10 +2100,8 @@ AI_Smart_Endure: ; 38fac
 .asm_38fd9
 	inc [hl]
 	ret
-; 38fdb
 
-
-AI_Smart_FuryCutter: ; 38fdb
+AI_Smart_FuryCutter:
 ; Encourage this move based on Fury Cutter's count.
 
 	ld a, [wEnemyFuryCutterCount]
@@ -2284,10 +2123,8 @@ AI_Smart_FuryCutter: ; 38fdb
 .end
 
 	; fallthrough
-; 38fef
-
 
-AI_Smart_Rollout: ; 38fef
+AI_Smart_Rollout:
 ; Rollout, Fury Cutter
 
 ; 80% chance to discourage this move if the enemy is in love, confused, or paralyzed.
@@ -2328,11 +2165,9 @@ AI_Smart_Rollout: ; 38fef
 	ret c
 	inc [hl]
 	ret
-; 39026
-
 
 AI_Smart_Swagger:
-AI_Smart_Attract: ; 39026
+AI_Smart_Attract:
 ; 80% chance to encourage this move during the first turn of player's Pokemon.
 ; 80% chance to discourage this move otherwise.
 
@@ -2351,10 +2186,8 @@ AI_Smart_Attract: ; 39026
 	ret nc
 	dec [hl]
 	ret
-; 3903a
-
 
-AI_Smart_Safeguard: ; 3903a
+AI_Smart_Safeguard:
 ; 80% chance to discourage this move if player's HP is below 50%.
 
 	call AICheckPlayerHalfHP
@@ -2363,12 +2196,9 @@ AI_Smart_Safeguard: ; 3903a
 	ret c
 	inc [hl]
 	ret
-; 39044
-
 
 AI_Smart_Magnitude:
-AI_Smart_Earthquake: ; 39044
-
+AI_Smart_Earthquake:
 ; Greatly encourage this move if the player is underground and the enemy is faster.
 	ld a, [wLastPlayerCounterMove]
 	cp DIG
@@ -2396,10 +2226,8 @@ AI_Smart_Earthquake: ; 39044
 
 	dec [hl]
 	ret
-; 39062
 
-
-AI_Smart_BatonPass: ; 39062
+AI_Smart_BatonPass:
 ; Discourage this move if the player hasn't shown super-effective moves against the enemy.
 ; Consider player's type(s) if its moves are unknown.
 
@@ -2411,10 +2239,8 @@ AI_Smart_BatonPass: ; 39062
 	ret c
 	inc [hl]
 	ret
-; 39072
-
 
-AI_Smart_Pursuit: ; 39072
+AI_Smart_Pursuit:
 ; 50% chance to greatly encourage this move if player's HP is below 25%.
 ; 80% chance to discourage this move otherwise.
 
@@ -2431,10 +2257,8 @@ AI_Smart_Pursuit: ; 39072
 	dec [hl]
 	dec [hl]
 	ret
-; 39084
 
-
-AI_Smart_RapidSpin: ; 39084
+AI_Smart_RapidSpin:
 ; 80% chance to greatly encourage this move if the enemy is
 ; trapped (Bind effect), seeded, or scattered with spikes.
 
@@ -2457,10 +2281,8 @@ AI_Smart_RapidSpin: ; 39084
 	dec [hl]
 	dec [hl]
 	ret
-; 3909e
-
 
-AI_Smart_HiddenPower: ; 3909e
+AI_Smart_HiddenPower:
 	push hl
 	ld a, 1
 	ld [hBattleTurn], a
@@ -2497,11 +2319,8 @@ AI_Smart_HiddenPower: ; 3909e
 .bad
 	inc [hl]
 	ret
-; 390cb
-
-
-AI_Smart_RainDance: ; 390cb
 
+AI_Smart_RainDance:
 ; Greatly discourage this move if it would favour the player type-wise.
 ; Particularly, if the player is a Water-type.
 	ld a, [wBattleMonType1]
@@ -2519,26 +2338,10 @@ AI_Smart_RainDance: ; 390cb
 	push hl
 	ld hl, RainDanceMoves
 	jr AI_Smart_WeatherMove
-; 390e7
-
-RainDanceMoves: ; 390e7
-	db WATER_GUN
-	db HYDRO_PUMP
-	db SURF
-	db BUBBLEBEAM
-	db THUNDER
-	db WATERFALL
-	db CLAMP
-	db BUBBLE
-	db CRABHAMMER
-	db OCTAZOOKA
-	db WHIRLPOOL
-	db -1 ; end
-; 390f3
-
 
-AI_Smart_SunnyDay: ; 390f3
+INCLUDE "data/battle/ai/rain_dance_moves.asm"
 
+AI_Smart_SunnyDay:
 ; Greatly discourage this move if it would favour the player type-wise.
 ; Particularly, if the player is a Fire-type.
 	ld a, [wBattleMonType1]
@@ -2557,10 +2360,8 @@ AI_Smart_SunnyDay: ; 390f3
 	ld hl, SunnyDayMoves
 
 	; fallthrough
-; 3910d
 
-
-AI_Smart_WeatherMove: ; 3910d
+AI_Smart_WeatherMove:
 ; Rain Dance, Sunny Day
 
 ; Greatly discourage this move if the enemy doesn't have
@@ -2579,16 +2380,14 @@ AI_Smart_WeatherMove: ; 3910d
 
 	dec [hl]
 	ret
-; 3911e
 
-AIBadWeatherType: ; 3911e
+AIBadWeatherType:
 	inc [hl]
 	inc [hl]
 	inc [hl]
 	ret
-; 39122
 
-AIGoodWeatherType: ; 39122
+AIGoodWeatherType:
 ; Rain Dance, Sunny Day
 
 ; Greatly encourage this move if it would disfavour the player type-wise and player's HP is above 50%...
@@ -2610,23 +2409,10 @@ AIGoodWeatherType: ; 39122
 	dec [hl]
 	dec [hl]
 	ret
-; 39134
 
+INCLUDE "data/battle/ai/sunny_day_moves.asm"
 
-SunnyDayMoves: ; 39134
-	db FIRE_PUNCH
-	db EMBER
-	db FLAMETHROWER
-	db FIRE_SPIN
-	db FIRE_BLAST
-	db SACRED_FIRE
-	db MORNING_SUN
-	db SYNTHESIS
-	db -1 ; end
-; 3913d
-
-
-AI_Smart_BellyDrum: ; 3913d
+AI_Smart_BellyDrum:
 ; Dismiss this move if enemy's attack is higher than +2 or if enemy's HP is below 50%.
 ; Else, discourage this move if enemy's HP is not full.
 
@@ -2647,10 +2433,8 @@ AI_Smart_BellyDrum: ; 3913d
 	add $5
 	ld [hl], a
 	ret
-; 39152
 
-
-AI_Smart_PsychUp: ; 39152
+AI_Smart_PsychUp:
 	push hl
 	ld hl, wEnemyAtkLevel
 	ld b, $8
@@ -2706,10 +2490,8 @@ AI_Smart_PsychUp: ; 39152
 	inc [hl]
 	inc [hl]
 	ret
-; 3918b
-
 
-AI_Smart_MirrorCoat: ; 3918b
+AI_Smart_MirrorCoat:
 	push hl
 	ld hl, wPlayerUsedMoves
 	ld c, $4
@@ -2758,7 +2540,6 @@ AI_Smart_MirrorCoat: ; 3918b
 	cp SPECIAL
 	jr c, .asm_391d2
 
-
 .asm_391ca
 	call Random
 	cp 100
@@ -2771,12 +2552,9 @@ AI_Smart_MirrorCoat: ; 3918b
 .asm_391d3
 	inc [hl]
 	ret
-; 391d5
-
 
 AI_Smart_Twister:
-AI_Smart_Gust: ; 391d5
-
+AI_Smart_Gust:
 ; Greatly encourage this move if the player is flying and the enemy is faster.
 	ld a, [wLastPlayerCounterMove]
 	cp FLY
@@ -2803,10 +2581,8 @@ AI_Smart_Gust: ; 391d5
 	ret c
 	dec [hl]
 	ret
-; 391f3
 
-
-AI_Smart_FutureSight: ; 391f3
+AI_Smart_FutureSight:
 ; Greatly encourage this move if the player is
 ; flying or underground, and slower than the enemy.
 
@@ -2820,10 +2596,8 @@ AI_Smart_FutureSight: ; 391f3
 	dec [hl]
 	dec [hl]
 	ret
-; 39200
-
 
-AI_Smart_Stomp: ; 39200
+AI_Smart_Stomp:
 ; 80% chance to encourage this move if the player has used Minimize.
 
 	ld a, [wPlayerMinimized]
@@ -2835,10 +2609,8 @@ AI_Smart_Stomp: ; 39200
 
 	dec [hl]
 	ret
-; 3920b
 
-
-AI_Smart_Solarbeam: ; 3920b
+AI_Smart_Solarbeam:
 ; 80% chance to encourage this move when it's sunny.
 ; 90% chance to discourage this move when it's raining.
 
@@ -2864,10 +2636,8 @@ AI_Smart_Solarbeam: ; 3920b
 	dec [hl]
 	dec [hl]
 	ret
-; 39225
-
 
-AI_Smart_Thunder: ; 39225
+AI_Smart_Thunder:
 ; 90% chance to discourage this move when it's sunny.
 
 	ld a, [wBattleWeather]
@@ -2880,10 +2650,8 @@ AI_Smart_Thunder: ; 39225
 
 	inc [hl]
 	ret
-; 39233
 
-
-AICompareSpeed: ; 39233
+AICompareSpeed:
 ; Return carry if enemy is faster than player.
 
 	push bc
@@ -2897,30 +2665,24 @@ AICompareSpeed: ; 39233
 	sbc b
 	pop bc
 	ret
-; 39246
-
 
-AICheckPlayerMaxHP: ; 39246
+AICheckPlayerMaxHP:
 	push hl
 	push de
 	push bc
 	ld de, wBattleMonHP
 	ld hl, wBattleMonMaxHP
 	jr AICheckMaxHP
-; 39251
 
-
-AICheckEnemyMaxHP: ; 39251
+AICheckEnemyMaxHP:
 	push hl
 	push de
 	push bc
 	ld de, wEnemyMonHP
 	ld hl, wEnemyMonMaxHP
 	; fallthrough
-; 3925a
-
 
-AICheckMaxHP: ; 3925a
+AICheckMaxHP:
 ; Return carry if hp at de matches max hp at hl.
 
 	ld a, [de]
@@ -2945,10 +2707,8 @@ AICheckMaxHP: ; 3925a
 	pop hl
 	and a
 	ret
-; 3926e
 
-
-AICheckPlayerHalfHP: ; 3926e
+AICheckPlayerHalfHP:
 	push hl
 	ld hl, wBattleMonHP
 	ld b, [hl]
@@ -2964,10 +2724,8 @@ AICheckPlayerHalfHP: ; 3926e
 	sbc b
 	pop hl
 	ret
-; 39281
-
 
-AICheckEnemyHalfHP: ; 39281
+AICheckEnemyHalfHP:
 	push hl
 	push de
 	push bc
@@ -2987,10 +2745,8 @@ AICheckEnemyHalfHP: ; 39281
 	pop de
 	pop hl
 	ret
-; 39298
 
-
-AICheckEnemyQuarterHP: ; 39298
+AICheckEnemyQuarterHP:
 	push hl
 	push de
 	push bc
@@ -3012,10 +2768,8 @@ AICheckEnemyQuarterHP: ; 39298
 	pop de
 	pop hl
 	ret
-; 392b3
-
 
-AICheckPlayerQuarterHP: ; 392b3
+AICheckPlayerQuarterHP:
 	push hl
 	ld hl, wBattleMonHP
 	ld b, [hl]
@@ -3033,10 +2787,8 @@ AICheckPlayerQuarterHP: ; 392b3
 	sbc b
 	pop hl
 	ret
-; 392ca
 
-
-AIHasMoveEffect: ; 392ca
+AIHasMoveEffect:
 ; Return carry if the enemy has move b.
 
 	push hl
@@ -3066,10 +2818,8 @@ AIHasMoveEffect: ; 392ca
 	pop hl
 	scf
 	ret
-; 392e6
-
 
-AIHasMoveInArray: ; 392e6
+AIHasMoveInArray:
 ; Return carry if the enemy has a move in array hl.
 
 	push hl
@@ -3101,35 +2851,10 @@ AIHasMoveInArray: ; 392e6
 	pop de
 	pop hl
 	ret
-; 39301
-
-
-UsefulMoves: ; 39301
-; Moves that are usable all-around.
-	db DOUBLE_EDGE
-	db SING
-	db FLAMETHROWER
-	db HYDRO_PUMP
-	db SURF
-	db ICE_BEAM
-	db BLIZZARD
-	db HYPER_BEAM
-	db SLEEP_POWDER
-	db THUNDERBOLT
-	db THUNDER
-	db EARTHQUAKE
-	db TOXIC
-	db PSYCHIC_M
-	db HYPNOSIS
-	db RECOVER
-	db FIRE_BLAST
-	db SOFTBOILED
-	db SUPER_FANG
-	db -1 ; end
-; 39315
 
+INCLUDE "data/battle/ai/useful_moves.asm"
 
-AI_Opportunist: ; 39315
+AI_Opportunist:
 ; Discourage stall moves when the enemy's HP is low.
 
 ; Do nothing if enemy's HP is above 50%.
@@ -3161,7 +2886,7 @@ AI_Opportunist: ; 39315
 	push hl
 	push de
 	push bc
-	ld hl, .stallmoves
+	ld hl, StallMoves
 	ld de, 1
 	call IsInArray
 
@@ -3176,45 +2901,10 @@ AI_Opportunist: ; 39315
 .asm_39347
 	ret
 
-.stallmoves
-	db SWORDS_DANCE
-	db TAIL_WHIP
-	db LEER
-	db GROWL
-	db DISABLE
-	db MIST
-	db COUNTER
-	db LEECH_SEED
-	db GROWTH
-	db STRING_SHOT
-	db MEDITATE
-	db AGILITY
-	db RAGE
-	db MIMIC
-	db SCREECH
-	db HARDEN
-	db WITHDRAW
-	db DEFENSE_CURL
-	db BARRIER
-	db LIGHT_SCREEN
-	db HAZE
-	db REFLECT
-	db FOCUS_ENERGY
-	db BIDE
-	db AMNESIA
-	db TRANSFORM
-	db SPLASH
-	db ACID_ARMOR
-	db SHARPEN
-	db CONVERSION
-	db SUBSTITUTE
-	db FLAME_WHEEL
-	db -1 ; end
-; 39369
-
+INCLUDE "data/battle/ai/stall_moves.asm"
 
 
-AI_Aggressive: ; 39369
+AI_Aggressive:
 ; Use whatever does the most damage.
 
 ; Discourage all damaging moves but the one that does the most damage.
@@ -3304,7 +2994,7 @@ AI_Aggressive: ; 39369
 	push de
 	push bc
 	ld a, [wEnemyMoveStruct + MOVE_EFFECT]
-	ld hl, .RecklessMoves
+	ld hl, RecklessMoves
 	ld de, 1
 	call IsInArray
 	pop bc
@@ -3319,21 +3009,14 @@ AI_Aggressive: ; 39369
 .done
 	ret
 
-.RecklessMoves:
-	db EFFECT_SELFDESTRUCT
-	db EFFECT_RAMPAGE
-	db EFFECT_MULTI_HIT
-	db EFFECT_DOUBLE_HIT
-	db -1 ; end
-; 393e7
-
+INCLUDE "data/battle/ai/reckless_moves.asm"
 
-AIDamageCalc: ; 393e7
+AIDamageCalc:
 	ld a, 1
 	ld [hBattleTurn], a
 	ld a, [wEnemyMoveStruct + MOVE_EFFECT]
 	ld de, 1
-	ld hl, .ConstantDamageEffects
+	ld hl, ConstantDamageEffects
 	call IsInArray
 	jr nc, .asm_39400
 	callfar BattleCommand_ConstantDamage
@@ -3345,16 +3028,9 @@ AIDamageCalc: ; 393e7
 	callfar BattleCommand_Stab
 	ret
 
-.ConstantDamageEffects:
-	db EFFECT_SUPER_FANG
-	db EFFECT_STATIC_DAMAGE
-	db EFFECT_LEVEL_DAMAGE
-	db EFFECT_PSYWAVE
-	db -1 ; end
-; 39418
-
+INCLUDE "data/battle/ai/constant_damage_effects.asm"
 
-AI_Cautious: ; 39418
+AI_Cautious:
 ; 90% chance to discourage moves with residual effects after the first turn.
 
 	ld a, [wEnemyTurnsTaken]
@@ -3377,7 +3053,7 @@ AI_Cautious: ; 39418
 	push hl
 	push de
 	push bc
-	ld hl, .residualmoves
+	ld hl, ResidualMoves
 	ld de, 1
 	call IsInArray
 
@@ -3393,25 +3069,10 @@ AI_Cautious: ; 39418
 	inc [hl]
 	jr .asm_39425
 
-.residualmoves
-	db MIST
-	db LEECH_SEED
-	db POISONPOWDER
-	db STUN_SPORE
-	db THUNDER_WAVE
-	db FOCUS_ENERGY
-	db BIDE
-	db POISON_GAS
-	db TRANSFORM
-	db CONVERSION
-	db SUBSTITUTE
-	db SPIKES
-	db -1 ; end
-; 39453
-
+INCLUDE "data/battle/ai/residual_moves.asm"
 
 
-AI_Status: ; 39453
+AI_Status:
 ; Dismiss status moves that don't affect the player.
 
 	ld hl, wBuffer1 - 1
@@ -3471,11 +3132,9 @@ AI_Status: ; 39453
 .immune
 	call AIDiscourageMove
 	jr .checkmove
-; 394a9
 
 
-
-AI_Risky: ; 394a9
+AI_Risky:
 ; Use any move that will KO the target.
 ; Risky moves will often be an exception (see below).
 
@@ -3504,7 +3163,7 @@ AI_Risky: ; 394a9
 ; Don't use risky moves at max hp.
 	ld a, [wEnemyMoveStruct + MOVE_EFFECT]
 	ld de, 1
-	ld hl, .RiskyMoves
+	ld hl, RiskyEffects
 	call IsInArray
 	jr nc, .checkko
 
@@ -3541,28 +3200,19 @@ endr
 	pop de
 	jr .checkmove
 
-.RiskyMoves:
-	db EFFECT_SELFDESTRUCT
-	db EFFECT_OHKO
-	db -1 ; end
-; 39502
-
+INCLUDE "data/battle/ai/risky_effects.asm"
 
 
-AI_None: ; 39502
+AI_None:
 	ret
-; 39503
-
 
-AIDiscourageMove: ; 39503
+AIDiscourageMove:
 	ld a, [hl]
 	add 10
 	ld [hl], a
 	ret
-; 39508
 
-
-AIGetEnemyMove: ; 39508
+AIGetEnemyMove:
 ; Load attributes of move a into ram
 
 	push hl
@@ -3581,18 +3231,13 @@ AIGetEnemyMove: ; 39508
 	pop de
 	pop hl
 	ret
-; 39521
-
 
-AI_80_20: ; 39521
+AI_80_20:
 	call Random
 	cp 20 percent - 1
 	ret
-; 39527
-
 
-AI_50_50: ; 39527
+AI_50_50:
 	call Random
 	cp 50 percent + 1
 	ret
-; 3952d
diff --git a/engine/battle/ai/switch.asm b/engine/battle/ai/switch.asm
index d397c8d32..b9bd2ea60 100755..100644
--- a/engine/battle/ai/switch.asm
+++ b/engine/battle/ai/switch.asm
@@ -1,4 +1,4 @@
-CheckPlayerMoveTypeMatchups: ; 3484e
+CheckPlayerMoveTypeMatchups:
 ; Check how well the moves you've already used
 ; fare against the enemy's Pokemon.  Used to
 ; score a potential switch.
@@ -95,10 +95,8 @@ CheckPlayerMoveTypeMatchups: ; 3484e
 	pop de
 	pop hl
 	ret
-; 348de
 
-
-.CheckEnemyMoveMatchups: ; 348de
+.CheckEnemyMoveMatchups:
 	ld de, wEnemyMonMoves
 	ld b, NUM_MOVES + 1
 	ld c, 0
@@ -163,21 +161,19 @@ CheckPlayerMoveTypeMatchups: ; 3484e
 
 .doubledown
 	call .DecreaseScore
-.DecreaseScore: ; 34931
+.DecreaseScore:
 	ld a, [wEnemyAISwitchScore]
 	dec a
 	ld [wEnemyAISwitchScore], a
 	ret
-; 34939
 
-.IncreaseScore: ; 34939
+.IncreaseScore:
 	ld a, [wEnemyAISwitchScore]
 	inc a
 	ld [wEnemyAISwitchScore], a
 	ret
-; 34941
 
-CheckAbleToSwitch: ; 34941
+CheckAbleToSwitch:
 	xor a
 	ld [wEnemySwitchMonParam], a
 	call FindAliveEnemyMons
@@ -292,10 +288,8 @@ CheckAbleToSwitch: ; 34941
 	add $10
 	ld [wEnemySwitchMonParam], a
 	ret
-; 349f4
-
 
-FindAliveEnemyMons: ; 349f4
+FindAliveEnemyMons:
 	ld a, [wOTPartyCount]
 	cp 2
 	jr c, .only_one
@@ -344,10 +338,8 @@ FindAliveEnemyMons: ; 349f4
 .more_than_one
 	and a
 	ret
-; 34a2a
-
 
-FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
+FindEnemyMonsImmuneToLastCounterMove:
 	ld hl, wOTPartyMon1
 	ld a, [wOTPartyCount]
 	ld b, a
@@ -412,10 +404,8 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
 	inc d
 	srl c
 	jr .loop
-; 34a85
 
-
-FindAliveEnemyMonsWithASuperEffectiveMove: ; 34a85
+FindAliveEnemyMonsWithASuperEffectiveMove:
 	push bc
 	ld a, [wOTPartyCount]
 	ld e, a
@@ -445,8 +435,9 @@ FindAliveEnemyMonsWithASuperEffectiveMove: ; 34a85
 
 	and c
 	ld c, a
-FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
+	; fallthrough
 
+FindEnemyMonsWithASuperEffectiveMove:
 	ld a, -1
 	ld [wEnemyAISwitchScore], a
 	ld hl, wOTPartyMon1Moves
@@ -551,10 +542,8 @@ FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
 	ld [wEnemyAISwitchScore], a
 	pop bc
 	ret
-; 34b20
-
 
-FindEnemyMonsThatResistPlayer: ; 34b20
+FindEnemyMonsThatResistPlayer:
 	push bc
 	ld hl, wOTPartySpecies
 	ld b, 1 << (PARTY_LENGTH - 1)
@@ -613,10 +602,8 @@ FindEnemyMonsThatResistPlayer: ; 34b20
 	and c
 	ld c, a
 	ret
-; 34b77
-
 
-FindEnemyMonsWithAtLeastQuarterMaxHP: ; 34b77
+FindEnemyMonsWithAtLeastQuarterMaxHP:
 	push bc
 	ld de, wOTPartySpecies
 	ld b, 1 << (PARTY_LENGTH - 1)
@@ -669,4 +656,3 @@ FindEnemyMonsWithAtLeastQuarterMaxHP: ; 34b77
 	and c
 	ld c, a
 	ret
-; 34bb1
diff --git a/engine/battle/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm
index 7d51a8629..fd9c783ce 100755..100644
--- a/engine/battle/anim_hp_bar.asm
+++ b/engine/battle/anim_hp_bar.asm
@@ -1,4 +1,4 @@
-_AnimateHPBar: ; d627
+_AnimateHPBar:
 	call .IsMaximumMoreThan48Pixels
 	jr c, .MoreThan48Pixels
 	call .ComputePixels
@@ -38,9 +38,8 @@ _AnimateHPBar: ; d627
 	pop af
 	jr nc, .LongAnimLoop
 	ret
-; d65f
 
-.IsMaximumMoreThan48Pixels: ; d65f
+.IsMaximumMoreThan48Pixels:
 	ld a, [wCurHPAnimMaxHP + 1]
 	and a
 	jr nz, .player
@@ -53,9 +52,8 @@ _AnimateHPBar: ; d627
 .player
 	scf
 	ret
-; d670
 
-.ComputePixels: ; d670
+.ComputePixels:
 	push hl
 	ld hl, wCurHPAnimMaxHP
 	ld a, [hli]
@@ -127,9 +125,8 @@ _AnimateHPBar: ; d627
 	ld a, e
 	ld [wCurHPAnimDeltaHP + 1], a
 	ret
-; d6e2
 
-ShortAnim_UpdateVariables: ; d6e2
+ShortAnim_UpdateVariables:
 	ld hl, wCurHPBarPixels
 	ld a, [wNewHPBarPixels]
 	cp [hl]
@@ -144,9 +141,8 @@ ShortAnim_UpdateVariables: ; d6e2
 	call ShortHPBar_CalcPixelFrame
 	and a
 	ret
-; d6f5
 
-LongAnim_UpdateVariables: ; d6f5
+LongAnim_UpdateVariables:
 .loop
 	ld hl, wCurHPAnimOldHP
 	ld a, [hli]
@@ -199,9 +195,8 @@ LongAnim_UpdateVariables: ; d6f5
 	ld [hl], a
 	and a
 	ret
-; d730
 
-ShortHPBarAnim_UpdateTiles: ; d730
+ShortHPBarAnim_UpdateTiles:
 	call HPBarAnim_UpdateHPRemaining
 	ld d, HP_BAR_LENGTH
 	ld a, [wWhichHPBar]
@@ -215,9 +210,8 @@ ShortHPBarAnim_UpdateTiles: ; d730
 	pop de
 	call HPBarAnim_PaletteUpdate
 	ret
-; d749
 
-LongHPBarAnim_UpdateTiles: ; d749
+LongHPBarAnim_UpdateTiles:
 	call HPBarAnim_UpdateHPRemaining
 	ld a, [wCurHPAnimOldHP]
 	ld c, a
@@ -238,9 +232,8 @@ LongHPBarAnim_UpdateTiles: ; d749
 	pop de
 	call HPBarAnim_PaletteUpdate
 	ret
-; d771
 
-HPBarAnim_RedrawHPBar: ; d771
+HPBarAnim_RedrawHPBar:
 	ld a, [wWhichHPBar]
 	cp $2
 	jr nz, .skip
@@ -253,9 +246,8 @@ HPBarAnim_RedrawHPBar: ; d771
 .skip
 	call DrawBattleHPBar
 	ret
-; d784
 
-HPBarAnim_UpdateHPRemaining: ; d784
+HPBarAnim_UpdateHPRemaining:
 	ld a, [wWhichHPBar]
 	and a
 	ret z
@@ -283,9 +275,8 @@ HPBarAnim_UpdateHPRemaining: ; d784
 	call PrintNum
 	pop hl
 	ret
-; d7b4
 
-HPBarAnim_PaletteUpdate: ; d7b4
+HPBarAnim_PaletteUpdate:
 	ld a, [hCGB]
 	and a
 	ret z
@@ -295,9 +286,8 @@ HPBarAnim_PaletteUpdate: ; d7b4
 	ld c, a
 	farcall ApplyHPBarPals
 	ret
-; d7c9
 
-HPBarAnim_BGMapUpdate: ; d7c9
+HPBarAnim_BGMapUpdate:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
@@ -369,9 +359,8 @@ HPBarAnim_BGMapUpdate: ; d7c9
 	ld [hBGMapThird], a
 	call DelayFrame
 	ret
-; d839
 
-ShortHPBar_CalcPixelFrame: ; d839
+ShortHPBar_CalcPixelFrame:
 	ld a, [wCurHPAnimMaxHP]
 	ld c, a
 	ld b, 0
@@ -384,8 +373,9 @@ ShortHPBar_CalcPixelFrame: ; d839
 	call AddNTimes
 
 	ld b, 0
-; This routine is buggy. If [wCurHPAnimMaxHP] * [wCurHPBarPixels] is divisible
-; by 48, the loop runs one extra time. To fix, uncomment the line below.
+; This routine is buggy. If [wCurHPAnimMaxHP] * [wCurHPBarPixels] is
+; divisible by HP_BAR_LENGTH_PX, the loop runs one extra time.
+; To fix, uncomment the line below.
 .loop
 	ld a, l
 	sub HP_BAR_LENGTH_PX
@@ -432,4 +422,3 @@ ShortHPBar_CalcPixelFrame: ; d839
 	ld a, [wCurHPAnimMaxHP]
 	ld [wCurHPAnimOldHP], a
 	ret
-; d88c
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm
index 29b2d8663..8747f46a6 100644
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -1,4 +1,14 @@
-DoBattleTransition: ; 8c20f
+; BattleTransitionJumptable.Jumptable indexes
+BATTLETRANSITION_CAVE             EQU $01
+BATTLETRANSITION_CAVE_STRONGER    EQU $09
+BATTLETRANSITION_NO_CAVE          EQU $10
+BATTLETRANSITION_NO_CAVE_STRONGER EQU $18
+BATTLETRANSITION_FINISH           EQU $20
+BATTLETRANSITION_END              EQU $80
+
+BATTLETRANSITION_SQUARE EQUS "\"8\"" ; $fe
+
+DoBattleTransition:
 	call .InitGFX
 	ld a, [rBGP]
 	ld [wBGP], a
@@ -14,7 +24,7 @@ DoBattleTransition: ; 8c20f
 
 .loop
 	ld a, [wJumptableIndex]
-	bit 7, a
+	bit 7, a ; BATTLETRANSITION_END?
 	jr nz, .done
 	call BattleTransitionJumptable
 	call DelayFrame
@@ -50,9 +60,8 @@ DoBattleTransition: ; 8c20f
 	ld [hVBlank], a
 	call DelayFrame
 	ret
-; 8c26d
 
-.InitGFX: ; 8c26d
+.InitGFX:
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
 	jr z, .mobile
@@ -79,20 +88,18 @@ DoBattleTransition: ; 8c20f
 	ld [hl], a
 	call WipeLYOverrides
 	ret
-; 8c2a0
 
-.NonMobile_LoadPokeballTiles: ; 8c2a0
+.NonMobile_LoadPokeballTiles:
 	call LoadTrainerBattlePokeballTiles
 	hlbgcoord 0, 0
 	call ConvertTrainerBattlePokeballTilesTo2bpp
 	ret
-; 8c2aa
 
 LoadTrainerBattlePokeballTiles:
 ; Load the tiles used in the Pokeball Graphic that fills the screen
 ; at the start of every Trainer battle.
 	ld de, TrainerBattlePokeballTiles
-	ld hl, vTiles1 tile $7e
+	ld hl, vTiles0 tile BATTLETRANSITION_SQUARE
 	ld b, BANK(TrainerBattlePokeballTiles)
 	ld c, 2
 	call Request2bpp
@@ -103,7 +110,7 @@ LoadTrainerBattlePokeballTiles:
 	ld [rVBK], a
 
 	ld de, TrainerBattlePokeballTiles
-	ld hl, vTiles4 tile $7e
+	ld hl, vTiles3 tile BATTLETRANSITION_SQUARE
 	ld b, BANK(TrainerBattlePokeballTiles)
 	ld c, 2
 	call Request2bpp
@@ -111,9 +118,8 @@ LoadTrainerBattlePokeballTiles:
 	pop af
 	ld [rVBK], a
 	ret
-; 8c2cf
 
-ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf
+ConvertTrainerBattlePokeballTilesTo2bpp:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -138,20 +144,17 @@ ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf
 	pop af
 	ld [rSVBK], a
 	ret
-; 8c2f4
 
-TrainerBattlePokeballTiles: ; 8c2f4
+TrainerBattlePokeballTiles:
 INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
 
+BattleTransitionJumptable:
+	jumptable .Jumptable, wJumptableIndex
 
-BattleTransitionJumptable: ; 8c314
-	jumptable .dw, wJumptableIndex
-; 8c323
-
-.dw ; 8c323 (23:4323)
+.Jumptable
 	dw StartTrainerBattle_DetermineWhichAnimation ; 00
 
-	; Animation 1: cave
+	; BATTLETRANSITION_CAVE
 	dw StartTrainerBattle_LoadPokeBallGraphics ; 01
 	dw StartTrainerBattle_SetUpBGMap ; 02
 	dw StartTrainerBattle_Flash ; 03
@@ -161,7 +164,7 @@ BattleTransitionJumptable: ; 8c314
 	dw StartTrainerBattle_SetUpForWavyOutro ; 07
 	dw StartTrainerBattle_SineWave ; 08
 
-	; Animation 2: cave, stronger
+	; BATTLETRANSITION_CAVE_STRONGER
 	dw StartTrainerBattle_LoadPokeBallGraphics ; 09
 	dw StartTrainerBattle_SetUpBGMap ; 0a
 	dw StartTrainerBattle_Flash ; 0b
@@ -171,7 +174,7 @@ BattleTransitionJumptable: ; 8c314
 	; There is no setup for this one
 	dw StartTrainerBattle_ZoomToBlack ; 0f
 
-	; Animation 3: no cave
+	; BATTLETRANSITION_NO_CAVE
 	dw StartTrainerBattle_LoadPokeBallGraphics ; 10
 	dw StartTrainerBattle_SetUpBGMap ; 11
 	dw StartTrainerBattle_Flash ; 12
@@ -181,7 +184,7 @@ BattleTransitionJumptable: ; 8c314
 	dw StartTrainerBattle_SetUpForSpinOutro ; 16
 	dw StartTrainerBattle_SpinToBlack ; 17
 
-	; Animation 4: no cave, stronger
+	; BATTLETRANSITION_NO_CAVE_STRONGER
 	dw StartTrainerBattle_LoadPokeBallGraphics ; 18
 	dw StartTrainerBattle_SetUpBGMap ; 19
 	dw StartTrainerBattle_Flash ; 1a
@@ -191,11 +194,21 @@ BattleTransitionJumptable: ; 8c314
 	dw StartTrainerBattle_SetUpForRandomScatterOutro ; 1e
 	dw StartTrainerBattle_SpeckleToBlack ; 1f
 
-	; All animations jump to here.
+	; BATTLETRANSITION_FINISH
 	dw StartTrainerBattle_Finish ; 20
 
+; transition animations
+	const_def
+	const TRANS_CAVE
+	const TRANS_CAVE_STRONGER
+	const TRANS_NO_CAVE
+	const TRANS_NO_CAVE_STRONGER
+
+; transition animation bits
+TRANS_STRONGER_F EQU 0 ; bit set in TRANS_CAVE_STRONGER and TRANS_NO_CAVE_STRONGER
+TRANS_NO_CAVE_F EQU 1 ; bit set in TRANS_NO_CAVE and TRANS_NO_CAVE_STRONGER
 
-StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365)
+StartTrainerBattle_DetermineWhichAnimation:
 ; The screen flashes a different number of times depending on the level of
 ; your lead Pokemon relative to the opponent's.
 ; BUG: wBattleMonLevel and wEnemyMonLevel are not set at this point, so whatever
@@ -205,55 +218,56 @@ StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365)
 	add 3
 	ld hl, wEnemyMonLevel
 	cp [hl]
-	jr nc, .okay
-	set 0, e
-.okay
+	jr nc, .not_stronger
+	set TRANS_STRONGER_F, e
+.not_stronger
 	ld a, [wEnvironment]
 	cp CAVE
-	jr z, .okay2
+	jr z, .cave
 	cp ENVIRONMENT_5
-	jr z, .okay2
+	jr z, .cave
 	cp DUNGEON
-	jr z, .okay2
-	set 1, e
-.okay2
+	jr z, .cave
+	set TRANS_NO_CAVE_F, e
+.cave
 	ld hl, .StartingPoints
 	add hl, de
 	ld a, [hl]
 	ld [wJumptableIndex], a
 	ret
-; 8c38f (23:438f)
 
-.StartingPoints: ; 8c38f
-	db 1,  9
-	db 16, 24
-; 8c393
+.StartingPoints:
+; entries correspond to TRANS_* constants
+	db BATTLETRANSITION_CAVE
+	db BATTLETRANSITION_CAVE_STRONGER
+	db BATTLETRANSITION_NO_CAVE
+	db BATTLETRANSITION_NO_CAVE_STRONGER
 
-StartTrainerBattle_Finish: ; 8c393 (23:4393)
+StartTrainerBattle_Finish:
 	call ClearSprites
-	ld a, $80
+	ld a, BATTLETRANSITION_END
 	ld [wJumptableIndex], a
 	ret
 
-StartTrainerBattle_NextScene: ; 8c39c (23:439c)
+StartTrainerBattle_NextScene:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 
-StartTrainerBattle_SetUpBGMap: ; 8c3a1 (23:43a1)
+StartTrainerBattle_SetUpBGMap:
 	call StartTrainerBattle_NextScene
 	xor a
 	ld [wcf64], a
 	ld [hBGMapMode], a
 	ret
 
-StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
+StartTrainerBattle_Flash:
 	call .DoFlashAnimation
 	ret nc
 	call StartTrainerBattle_NextScene
 	ret
 
-.DoFlashAnimation: ; 8c3b3 (23:43b3)
+.DoFlashAnimation:
 	ld a, [wTimeOfDayPalset]
 	cp %11111111 ; dark cave
 	jr z, .done
@@ -278,9 +292,8 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
 	ld [wcf64], a
 	scf
 	ret
-; 8c3db (23:43db)
 
-.pals ; 8c3db
+.pals
 	db %11111001 ; 3321
 	db %11111110 ; 3332
 	db %11111111 ; 3333
@@ -294,9 +307,8 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
 	db %10010000 ; 2100
 	db %11100100 ; 3210
 	db %00000001 ; 0001
-; 8c3e8
 
-StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8)
+StartTrainerBattle_SetUpForWavyOutro:
 	farcall Function5602
 	ld a, BANK(wLYOverrides)
 	ld [rSVBK], a
@@ -314,7 +326,7 @@ StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8)
 	ld [wcf65], a
 	ret
 
-StartTrainerBattle_SineWave: ; 8c408 (23:4408)
+StartTrainerBattle_SineWave:
 	ld a, [wcf64]
 	cp $60
 	jr nc, .end
@@ -322,11 +334,11 @@ StartTrainerBattle_SineWave: ; 8c408 (23:4408)
 	ret
 
 .end
-	ld a, $20
+	ld a, BATTLETRANSITION_FINISH
 	ld [wJumptableIndex], a
 	ret
 
-.DoSineWave: ; 8c419 (23:4419)
+.DoSineWave:
 	ld hl, wcf65
 	ld a, [hl]
 	inc [hl]
@@ -354,7 +366,7 @@ StartTrainerBattle_SineWave: ; 8c408 (23:4408)
 	jr nz, .loop
 	ret
 
-StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d)
+StartTrainerBattle_SetUpForSpinOutro:
 	farcall Function5602
 	ld a, BANK(wLYOverrides)
 	ld [rSVBK], a
@@ -363,7 +375,7 @@ StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d)
 	ld [wcf64], a
 	ret
 
-StartTrainerBattle_SpinToBlack: ; 8c44f (23:444f)
+StartTrainerBattle_SpinToBlack:
 	xor a
 	ld [hBGMapMode], a
 	ld a, [wcf64]
@@ -394,10 +406,9 @@ endr
 	call DelayFrame
 	xor a
 	ld [hBGMapMode], a
-	ld a, $20
+	ld a, BATTLETRANSITION_FINISH
 	ld [wJumptableIndex], a
 	ret
-; 8c490 (23:4490)
 
 ; quadrants
 	const_def
@@ -406,7 +417,11 @@ endr
 	const LOWER_LEFT
 	const LOWER_RIGHT
 
-.spintable ; 8c490
+; quadrant bits
+RIGHT_QUADRANT_F EQU 0 ; bit set in UPPER_RIGHT and LOWER_RIGHT
+LOWER_QUADRANT_F EQU 1 ; bit set in LOWER_LEFT and LOWER_RIGHT
+
+.spintable
 spintable_entry: MACRO
 	db \1
 	dw .wedge\2
@@ -433,9 +448,8 @@ ENDM
 	spintable_entry LOWER_LEFT,  2,  0, 14
 	spintable_entry LOWER_LEFT,  1,  1, 11
 	db -1
-; 8c4f5
 
-.load ; 8c4f5 (23:44f5)
+.load
 	ld a, [hli]
 	ld e, a
 	ld a, [hli]
@@ -451,7 +465,7 @@ ENDM
 .loop1
 	ld [hl], $ff
 	ld a, [wcf65]
-	bit 0, a
+	bit RIGHT_QUADRANT_F, a
 	jr z, .leftside
 	inc hl
 	jr .okay1
@@ -462,7 +476,7 @@ ENDM
 	jr nz, .loop1
 	pop hl
 	ld a, [wcf65]
-	bit 1, a
+	bit LOWER_QUADRANT_F, a
 	ld bc, SCREEN_WIDTH
 	jr z, .upper
 	ld bc, -SCREEN_WIDTH
@@ -477,7 +491,7 @@ ENDM
 	ld c, a
 .loop2
 	ld a, [wcf65]
-	bit 0, a
+	bit RIGHT_QUADRANT_F, a
 	jr z, .leftside2
 	dec hl
 	jr .okay2
@@ -487,16 +501,14 @@ ENDM
 	dec c
 	jr nz, .loop2
 	jr .loop
-; 8c538 (23:4538)
 
 .wedge1 db 2, 3, 5, 4, 9, -1
 .wedge2 db 1, 1, 2, 2, 4, 2, 4, 2, 3, -1
 .wedge3 db 2, 1, 3, 1, 4, 1, 4, 1, 4, 1, 3, 1, 2, 1, 1, 1, 1, -1
 .wedge4 db 4, 1, 4, 0, 3, 1, 3, 0, 2, 1, 2, 0, 1, -1
 .wedge5 db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1
-; 8c578
 
-StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578)
+StartTrainerBattle_SetUpForRandomScatterOutro:
 	farcall Function5602
 	ld a, BANK(wLYOverrides)
 	ld [rSVBK], a
@@ -507,7 +519,7 @@ StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578)
 	ld [hBGMapMode], a
 	ret
 
-StartTrainerBattle_SpeckleToBlack: ; 8c58f (23:458f)
+StartTrainerBattle_SpeckleToBlack:
 	ld hl, wcf64
 	ld a, [hl]
 	and a
@@ -530,11 +542,11 @@ StartTrainerBattle_SpeckleToBlack: ; 8c58f (23:458f)
 	call DelayFrame
 	xor a
 	ld [hBGMapMode], a
-	ld a, $20
+	ld a, BATTLETRANSITION_FINISH
 	ld [wJumptableIndex], a
 	ret
 
-.BlackOutRandomTile: ; 8c5b8 (23:45b8)
+.BlackOutRandomTile:
 .y_loop
 	call Random
 	cp SCREEN_HEIGHT
@@ -565,7 +577,7 @@ StartTrainerBattle_SpeckleToBlack: ; 8c58f (23:458f)
 	ld [hl], $ff
 	ret
 
-StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
+StartTrainerBattle_LoadPokeBallGraphics:
 	ld a, [wOtherTrainerClass]
 	and a
 	jp z, .nextscene ; don't need to be here if wild
@@ -606,7 +618,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
 	jr z, .done
 	sla a
 	jr nc, .no_load
-	ld [hl], $fe
+	ld [hl], BATTLETRANSITION_SQUARE
 .no_load
 	inc hl
 	jr .loop4
@@ -665,11 +677,11 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
 	call DelayFrame
 	call BattleStart_CopyTilemapAtOnce
 
-.nextscene ; 8c673 (23:4673)
+.nextscene
 	call StartTrainerBattle_NextScene
 	ret
 
-.copypals ; 8c677 (23:4677)
+.copypals
 	ld de, wBGPals1 palette PAL_BG_TEXT
 	call .copy
 	ld de, wBGPals2 palette PAL_BG_TEXT
@@ -682,21 +694,18 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
 	call .copy
 	ld de, wOBPals2 palette PAL_OW_ROCK
 
-.copy ; 8c698 (23:4698)
+.copy
 	push hl
 	ld bc, 1 palettes
 	call CopyBytes
 	pop hl
 	ret
-; 8c6a1 (23:46a1)
 
-.daypals ; 8c6a1
+.daypals
 INCLUDE "gfx/overworld/trainer_battle_day.pal"
-; 8c6a9
 
-.nightpals ; 8c6a9
+.nightpals
 INCLUDE "gfx/overworld/trainer_battle_nite.pal"
-; 8c6b1
 
 .loadpokeballgfx
 	ld a, [wOtherTrainerClass]
@@ -721,7 +730,7 @@ PokeBallTransition:
 	db %00001111, %11110000
 	db %00000011, %11000000
 
-WipeLYOverrides: ; 8c6d8
+WipeLYOverrides:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wLYOverrides)
@@ -735,9 +744,8 @@ WipeLYOverrides: ; 8c6d8
 	pop af
 	ld [rSVBK], a
 	ret
-; 8c6ef
 
-.wipe ; 8c6ef
+.wipe
 	xor a
 	ld c, SCREEN_HEIGHT_PX
 .loop
@@ -745,54 +753,11 @@ WipeLYOverrides: ; 8c6d8
 	dec c
 	jr nz, .loop
 	ret
-; 8c6f7
-
-
-StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
-; a = d * sin(a * pi/32)
-	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-
-.ApplySineWave: ; 8c70c (23:470c)
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, .sinewave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
-; 8c728 (23:4728)
 
-.sinewave ; 8c728
-	sine_wave $100
-; 8c768
+StartTrainerBattle_DrawSineWave:
+	calc_sine_wave
 
-StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
+StartTrainerBattle_ZoomToBlack:
 	farcall Function5602
 	ld de, .boxes
 
@@ -818,12 +783,11 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
 	jr .loop
 
 .done
-	ld a, $20
+	ld a, BATTLETRANSITION_FINISH
 	ld [wJumptableIndex], a
 	ret
-; 8c792 (23:4792)
 
-.boxes ; 8c792
+.boxes
 zoombox: MACRO
 ; width, height, start y, start x
 	db \1, \2
@@ -839,9 +803,8 @@ ENDM
 	zoombox 18, 16,  1, 1
 	zoombox 20, 18,  0, 0
 	db -1
-; 8c7b7
 
-.Copy: ; 8c7b7 (23:47b7)
+.Copy:
 	ld a, $ff
 .row
 	push bc
@@ -857,7 +820,6 @@ ENDM
 	dec b
 	jr nz, .row
 	ret
-; 8c7c9 (23:47c9)
 
 Unreferenced_Function8c7c9:
 	ld a, $1
diff --git a/engine/battle/battlestart_copytilemapatonce.asm b/engine/battle/battlestart_copytilemapatonce.asm
index 2952e833b..9d4d48d3a 100644
--- a/engine/battle/battlestart_copytilemapatonce.asm
+++ b/engine/battle/battlestart_copytilemapatonce.asm
@@ -1,3 +1,3 @@
-BattleStart_CopyTilemapAtOnce: ; 8cf4f
+BattleStart_CopyTilemapAtOnce:
 	call CGBOnly_CopyTilemapAtOnce
 	ret
diff --git a/engine/battle/checkbattlescene.asm b/engine/battle/check_battle_scene.asm
index 577c36e33..13d0c665e 100644
--- a/engine/battle/checkbattlescene.asm
+++ b/engine/battle/check_battle_scene.asm
@@ -1,4 +1,4 @@
-CheckBattleScene: ; 4ea44
+CheckBattleScene:
 ; Return carry if battle scene is turned off.
 
 	ld a, BANK(wLinkMode)
diff --git a/engine/battle/consumehelditem.asm b/engine/battle/consume_held_item.asm
index 39ddbc27e..fe63d40a8 100644
--- a/engine/battle/consumehelditem.asm
+++ b/engine/battle/consume_held_item.asm
@@ -1,4 +1,4 @@
-ConsumeHeldItem: ; 27192
+ConsumeHeldItem:
 	push hl
 	push de
 	push bc
@@ -18,7 +18,7 @@ ConsumeHeldItem: ; 27192
 	ld a, [de]
 	ld b, a
 	farcall GetItemHeldEffect
-	ld hl, .ConsumableEffects
+	ld hl, ConsumableEffects
 .loop
 	ld a, [hli]
 	cp b
@@ -46,7 +46,7 @@ ConsumeHeldItem: ; 27192
 	jr z, .done
 
 .ourturn
-	ld [hl], $0
+	ld [hl], NO_ITEM
 
 .done
 	pop bc
@@ -54,27 +54,4 @@ ConsumeHeldItem: ; 27192
 	pop hl
 	ret
 
-.ConsumableEffects: ; 271de
-; Consumable items?
-	db HELD_BERRY
-	db HELD_2
-	db HELD_5
-	db HELD_HEAL_POISON
-	db HELD_HEAL_FREEZE
-	db HELD_HEAL_BURN
-	db HELD_HEAL_SLEEP
-	db HELD_HEAL_PARALYZE
-	db HELD_HEAL_STATUS
-	db HELD_30
-	db HELD_ATTACK_UP
-	db HELD_DEFENSE_UP
-	db HELD_SPEED_UP
-	db HELD_SP_ATTACK_UP
-	db HELD_SP_DEFENSE_UP
-	db HELD_ACCURACY_UP
-	db HELD_EVASION_UP
-	db HELD_38
-	db HELD_71
-	db HELD_ESCAPE
-	db HELD_CRITICAL_UP
-	db -1
+INCLUDE "data/battle/held_consumables.asm"
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 0fe77df40..d1bd41b84 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1,6 +1,6 @@
 ; Core components of the battle engine.
-BattleCore:
-DoBattle: ; 3c000
+
+DoBattle:
 	xor a
 	ld [wBattleParticipantsNotFainted], a
 	ld [wBattleParticipantsIncludingFainted], a
@@ -47,7 +47,7 @@ DoBattle: ; 3c000
 
 .player_2
 	call LoadTileMapToTempTileMap
-	call CheckPlayerPartyForFitPkmn
+	call CheckPlayerPartyForFitMon
 	ld a, d
 	and a
 	jp z, LostBattle
@@ -86,7 +86,7 @@ DoBattle: ; 3c000
 	call ResetBattleParticipants
 	call InitBattleMon
 	call ResetPlayerStatLevels
-	call SendOutPkmnText
+	call SendOutMonText
 	call NewBattleMonStatus
 	call BreakAttraction
 	call SendOutPlayerMon
@@ -114,13 +114,12 @@ DoBattle: ; 3c000
 
 .tutorial_debug
 	jp BattleMenu
-; 3c0e5
 
-WildFled_EnemyFled_LinkBattleCanceled: ; 3c0e5
+WildFled_EnemyFled_LinkBattleCanceled:
 	call Call_LoadTempTileMapToTileMap
 	ld a, [wBattleResult]
-	and $c0
-	add $2
+	and BATTLERESULT_BITMASK
+	add DRAW
 	ld [wBattleResult], a
 	ld a, [wLinkMode]
 	and a
@@ -128,8 +127,8 @@ WildFled_EnemyFled_LinkBattleCanceled: ; 3c0e5
 	jr z, .print_text
 
 	ld a, [wBattleResult]
-	and $c0
-	ld [wBattleResult], a
+	and BATTLERESULT_BITMASK
+	ld [wBattleResult], a ; WIN
 	ld hl, BattleText_EnemyFled
 	call CheckMobileBattleError
 	jr nc, .print_text
@@ -156,9 +155,8 @@ WildFled_EnemyFled_LinkBattleCanceled: ; 3c0e5
 	ld a, 1
 	ld [wBattleEnded], a
 	ret
-; 3c12f
 
-BattleTurn: ; 3c12f
+BattleTurn:
 .loop
 	call Stubbed_Function3c1bf
 	call CheckContestBattleOver
@@ -229,7 +227,6 @@ BattleTurn: ; 3c12f
 
 .quit
 	ret
-; 3c1bf
 
 Stubbed_Function3c1bf:
 	ret
@@ -248,9 +245,8 @@ Stubbed_Function3c1bf:
 .finish
 	call CloseSRAM
 	ret
-; 3c1d6
 
-HandleBetweenTurnEffects: ; 3c1d6
+HandleBetweenTurnEffects:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .CheckEnemyFirst
@@ -289,7 +285,7 @@ HandleBetweenTurnEffects: ; 3c1d6
 .NoMoreFaintingConditions:
 	call HandleLeftovers
 	call HandleMysteryberry
-	call HanleDefrost
+	call HandleDefrost
 	call HandleSafeguard
 	call HandleScreens
 	call HandleStatBoostingHeldItems
@@ -297,9 +293,8 @@ HandleBetweenTurnEffects: ; 3c1d6
 	call UpdateBattleMonInParty
 	call LoadTileMapToTempTileMap
 	jp HandleEncore
-; 3c23c
 
-CheckFaint_PlayerThenEnemy: ; 3c23c
+CheckFaint_PlayerThenEnemy:
 	call HasPlayerFainted
 	jr nz, .PlayerNotFainted
 	call HandlePlayerMonFaint
@@ -322,9 +317,8 @@ CheckFaint_PlayerThenEnemy: ; 3c23c
 .BattleIsOver:
 	scf
 	ret
-; 3c25c
 
-CheckFaint_EnemyThenPlayer: ; 3c25c
+CheckFaint_EnemyThenPlayer:
 	call HasEnemyFainted
 	jr nz, .EnemyNotFainted
 	call HandleEnemyMonFaint
@@ -347,9 +341,8 @@ CheckFaint_EnemyThenPlayer: ; 3c25c
 .BattleIsOver:
 	scf
 	ret
-; 3c27c
 
-HandleBerserkGene: ; 3c27c
+HandleBerserkGene:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .reverse
@@ -424,9 +417,8 @@ HandleBerserkGene: ; 3c27c
 	call SwitchTurnCore
 	ld hl, BecameConfusedText
 	jp StdBattleTextBox
-; 3c300
 
-EnemyTriesToFlee: ; 3c300
+EnemyTriesToFlee:
 	ld a, [wLinkMode]
 	and a
 	jr z, .not_linked
@@ -442,9 +434,8 @@ EnemyTriesToFlee: ; 3c300
 	call WildFled_EnemyFled_LinkBattleCanceled
 	scf
 	ret
-; 3c314
 
-DetermineMoveOrder: ; 3c314
+DetermineMoveOrder:
 	ld a, [wLinkMode]
 	and a
 	jr z, .use_move
@@ -463,13 +454,13 @@ DetermineMoveOrder: ; 3c314
 	jr z, .player_2
 
 	call BattleRandom
-	cp 1 + (50 percent)
+	cp 50 percent + 1
 	jp c, .player_first
 	jp .enemy_first
 
 .player_2
 	call BattleRandom
-	cp 1 + (50 percent)
+	cp 50 percent + 1
 	jp c, .enemy_first
 	jp .player_first
 
@@ -549,25 +540,23 @@ DetermineMoveOrder: ; 3c314
 	cp USING_INTERNAL_CLOCK
 	jr z, .player_2c
 	call BattleRandom
-	cp 1 + (50 percent)
+	cp 50 percent + 1
 	jp c, .player_first
 	jp .enemy_first
 
 .player_2c
 	call BattleRandom
-	cp 1 + (50 percent)
+	cp 50 percent + 1
 	jp c, .enemy_first
 .player_first
 	scf
 	ret
-; 3c3f3
 
-.enemy_first ; 3c3f3
+.enemy_first
 	and a
 	ret
-; 3c3f5
 
-CheckContestBattleOver: ; 3c3f5
+CheckContestBattleOver:
 	ld a, [wBattleType]
 	cp BATTLETYPE_CONTEST
 	jr nz, .contest_not_over
@@ -575,8 +564,8 @@ CheckContestBattleOver: ; 3c3f5
 	and a
 	jr nz, .contest_not_over
 	ld a, [wBattleResult]
-	and $c0
-	add $2
+	and BATTLERESULT_BITMASK
+	add DRAW
 	ld [wBattleResult], a
 	scf
 	ret
@@ -584,9 +573,8 @@ CheckContestBattleOver: ; 3c3f5
 .contest_not_over
 	and a
 	ret
-; 3c410
 
-CheckPlayerLockedIn: ; 3c410
+CheckPlayerLockedIn:
 	ld a, [wPlayerSubStatus4]
 	and 1 << SUBSTATUS_RECHARGE
 	jp nz, .quit
@@ -610,9 +598,8 @@ CheckPlayerLockedIn: ; 3c410
 .quit
 	scf
 	ret
-; 3c434
 
-ParsePlayerAction: ; 3c434
+ParsePlayerAction:
 	call CheckPlayerLockedIn
 	jp c, .locked_in
 	ld hl, wPlayerSubStatus5
@@ -706,9 +693,8 @@ ParsePlayerAction: ; 3c434
 	res SUBSTATUS_RAGE, [hl]
 	xor a
 	ret
-; 3c4df
 
-HandleEncore: ; 3c4df
+HandleEncore:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .player_1
@@ -764,9 +750,8 @@ HandleEncore: ; 3c4df
 	call SetPlayerTurn
 	ld hl, BattleText_TargetsEncoreEnded
 	jp StdBattleTextBox
-; 3c543
 
-TryEnemyFlee: ; 3c543
+TryEnemyFlee:
 	ld a, [wBattleMode]
 	dec a
 	jr nz, .Stay
@@ -791,7 +776,7 @@ TryEnemyFlee: ; 3c543
 
 	call BattleRandom
 	ld b, a
-	cp 1 + (50 percent)
+	cp 50 percent + 1
 	jr nc, .Stay
 
 	push bc
@@ -803,7 +788,7 @@ TryEnemyFlee: ; 3c543
 	jr c, .Flee
 
 	ld a, b
-	cp 1 + (10 percent)
+	cp 10 percent + 1
 	jr nc, .Stay
 
 	ld a, [wTempEnemyMonSpecies]
@@ -819,11 +804,10 @@ TryEnemyFlee: ; 3c543
 .Flee:
 	scf
 	ret
-; 3c59a
 
 INCLUDE "data/wild/flee_mons.asm"
 
-CompareMovePriority: ; 3c5b4
+CompareMovePriority:
 ; Compare the priority of the player and enemy's moves.
 ; Return carry if the player goes first, or z if they match.
 
@@ -836,9 +820,8 @@ CompareMovePriority: ; 3c5b4
 	pop bc
 	cp b
 	ret
-; 3c5c5
 
-GetMovePriority: ; 3c5c5
+GetMovePriority:
 ; Return the priority (0-3) of move a.
 
 	ld b, a
@@ -864,11 +847,10 @@ GetMovePriority: ; 3c5c5
 .done
 	ld a, [hl]
 	ret
-; 3c5df
 
 INCLUDE "data/moves/effects_priorities.asm"
 
-GetMoveEffect: ; 3c5ec
+GetMoveEffect:
 	ld a, b
 	dec a
 	ld hl, Moves + MOVE_EFFECT
@@ -878,9 +860,8 @@ GetMoveEffect: ; 3c5ec
 	call GetFarByte
 	ld b, a
 	ret
-; 3c5fe
 
-Battle_EnemyFirst: ; 3c5fe
+Battle_EnemyFirst:
 	call LoadTileMapToTempTileMap
 	call TryEnemyFlee
 	jp c, WildFled_EnemyFled_LinkBattleCanceled
@@ -922,9 +903,8 @@ Battle_EnemyFirst: ; 3c5fe
 	xor a
 	ld [wBattlePlayerAction], a
 	ret
-; 3c664
 
-Battle_PlayerFirst: ; 3c664
+Battle_PlayerFirst:
 	xor a
 	ld [wEnemyGoesFirst], a
 	call SetEnemyTurn
@@ -972,23 +952,20 @@ Battle_PlayerFirst: ; 3c664
 	xor a
 	ld [wBattlePlayerAction], a
 	ret
-; 3c6cf
 
-PlayerTurn_EndOpponentProtectEndureDestinyBond: ; 3c6cf
+PlayerTurn_EndOpponentProtectEndureDestinyBond:
 	call SetPlayerTurn
 	call EndUserDestinyBond
 	callfar DoPlayerTurn
 	jp EndOpponentProtectEndureDestinyBond
-; 3c6de
 
-EnemyTurn_EndOpponentProtectEndureDestinyBond: ; 3c6de
+EnemyTurn_EndOpponentProtectEndureDestinyBond:
 	call SetEnemyTurn
 	call EndUserDestinyBond
 	callfar DoEnemyTurn
 	jp EndOpponentProtectEndureDestinyBond
-; 3c6ed
 
-EndOpponentProtectEndureDestinyBond: ; 3c6ed
+EndOpponentProtectEndureDestinyBond:
 	ld a, BATTLE_VARS_SUBSTATUS1_OPP
 	call GetBattleVarAddr
 	res SUBSTATUS_PROTECT, [hl]
@@ -997,33 +974,30 @@ EndOpponentProtectEndureDestinyBond: ; 3c6ed
 	call GetBattleVarAddr
 	res SUBSTATUS_DESTINY_BOND, [hl]
 	ret
-; 3c6fe
 
-EndUserDestinyBond: ; 3c6fe
+EndUserDestinyBond:
 	ld a, BATTLE_VARS_SUBSTATUS5
 	call GetBattleVarAddr
 	res SUBSTATUS_DESTINY_BOND, [hl]
 	ret
-; 3c706
 
-HasUserFainted: ; 3c706
+HasUserFainted:
 	ld a, [hBattleTurn]
 	and a
 	jr z, HasPlayerFainted
-HasEnemyFainted: ; 3c70b
+HasEnemyFainted:
 	ld hl, wEnemyMonHP
 	jr CheckIfHPIsZero
 
-HasPlayerFainted: ; 3c710
+HasPlayerFainted:
 	ld hl, wBattleMonHP
 
-CheckIfHPIsZero: ; 3c713
+CheckIfHPIsZero:
 	ld a, [hli]
 	or [hl]
 	ret
-; 3c716
 
-ResidualDamage: ; 3c716
+ResidualDamage:
 ; Return z if the user fainted before
 ; or as a result of residual damage.
 ; For Sandstorm damage, see HandleWeather.
@@ -1158,9 +1132,8 @@ ResidualDamage: ; 3c716
 	call DelayFrames
 	xor a
 	ret
-; 3c801
 
-HandlePerishSong: ; 3c801
+HandlePerishSong:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .EnemyFirst
@@ -1227,9 +1200,8 @@ HandlePerishSong: ; 3c801
 	ld [hli], a
 	ld [hl], a
 	ret
-; 3c874
 
-HandleWrap: ; 3c874
+HandleWrap:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .EnemyFirst
@@ -1292,16 +1264,14 @@ HandleWrap: ; 3c874
 
 .print_text
 	jp StdBattleTextBox
-; 3c8e4
 
-SwitchTurnCore: ; 3c8e4
+SwitchTurnCore:
 	ld a, [hBattleTurn]
 	xor 1
 	ld [hBattleTurn], a
 	ret
-; 3c8eb
 
-HandleLeftovers: ; 3c8eb
+HandleLeftovers:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .DoEnemyFirst
@@ -1349,9 +1319,8 @@ HandleLeftovers: ; 3c8eb
 	call RestoreHP
 	ld hl, BattleText_TargetRecoveredWithItem
 	jp StdBattleTextBox
-; 3c93c
 
-HandleMysteryberry: ; 3c93c
+HandleMysteryberry:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .DoEnemyFirst
@@ -1488,9 +1457,8 @@ HandleMysteryberry: ; 3c93c
 	call SwitchTurnCore
 	ld hl, BattleText_UserRecoveredPPUsing
 	jp StdBattleTextBox
-; 3ca26
 
-HandleFutureSight: ; 3ca26
+HandleFutureSight:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .enemy_first
@@ -1533,7 +1501,7 @@ HandleFutureSight: ; 3ca26
 	xor a
 	ld [wAttackMissed], a
 	ld [wAlreadyDisobeyed], a
-	ld a, 10
+	ld a, EFFECTIVE
 	ld [wTypeModifier], a
 	callfar DoMove
 	xor a
@@ -1547,9 +1515,8 @@ HandleFutureSight: ; 3ca26
 
 	call UpdateBattleMonInParty
 	jp UpdateEnemyMonInParty
-; 3ca8f
 
-HanleDefrost: ; 3ca8f
+HandleDefrost:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .enemy_first
@@ -1607,9 +1574,8 @@ HanleDefrost: ; 3ca8f
 	call SetPlayerTurn
 	ld hl, DefrostedOpponentText
 	jp StdBattleTextBox
-; 3cafb
 
-HandleSafeguard: ; 3cafb
+HandleSafeguard:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .player1
@@ -1646,7 +1612,7 @@ HandleSafeguard: ; 3cafb
 	ld hl, BattleText_SafeguardFaded
 	jp StdBattleTextBox
 
-HandleScreens: ; 3cb36
+HandleScreens:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .Both
@@ -1681,15 +1647,13 @@ HandleScreens: ; 3cb36
 .Copy:
 	ld hl, wStringBuffer1
 	jp CopyName2
-; 3cb75
 
 .Your:
 	db "Your@"
 .Enemy:
 	db "Enemy@"
-; 3cb80
 
-.LightScreenTick: ; 3cb80
+.LightScreenTick:
 	ld a, [de]
 	dec a
 	ld [de], a
@@ -1697,25 +1661,23 @@ HandleScreens: ; 3cb36
 	res SCREENS_LIGHT_SCREEN, [hl]
 	push hl
 	push de
-	ld hl, BattleText_PkmnLightScreenFell
+	ld hl, BattleText_MonsLightScreenFell
 	call StdBattleTextBox
 	pop de
 	pop hl
 	ret
-; 3cb91
 
-.ReflectTick: ; 3cb91
+.ReflectTick:
 	inc de
 	ld a, [de]
 	dec a
 	ld [de], a
 	ret nz
 	res SCREENS_REFLECT, [hl]
-	ld hl, BattleText_PkmnReflectFaded
+	ld hl, BattleText_MonsReflectFaded
 	jp StdBattleTextBox
-; 3cb9e
 
-HandleWeather: ; 3cb9e
+HandleWeather:
 	ld a, [wBattleWeather]
 	cp WEATHER_NONE
 	ret z
@@ -1804,30 +1766,29 @@ HandleWeather: ; 3cb9e
 	ld h, [hl]
 	ld l, a
 	jp StdBattleTextBox
-; 3cc2d
 
 .WeatherMessages:
+; entries correspond to WEATHER_* constants
 	dw BattleText_RainContinuesToFall
 	dw BattleText_TheSunlightIsStrong
 	dw BattleText_TheSandstormRages
+
 .WeatherEndedMessages:
+; entries correspond to WEATHER_* constants
 	dw BattleText_TheRainStopped
 	dw BattleText_TheSunlightFaded
 	dw BattleText_TheSandstormSubsided
-; 3cc39
 
-SubtractHPFromTarget: ; 3cc39
+SubtractHPFromTarget:
 	call SubtractHP
 	jp UpdateHPBar
-; 3cc3f
 
-SubtractHPFromUser: ; 3cc3f
-; Subtract HP from Pkmn
+SubtractHPFromUser:
+; Subtract HP from mon
 	call SubtractHP
 	jp UpdateHPBarBattleHuds
-; 3cc45
 
-SubtractHP: ; 3cc45
+SubtractHP:
 	ld hl, wBattleMonHP
 	ld a, [hBattleTurn]
 	and a
@@ -1857,9 +1818,8 @@ SubtractHP: ; 3cc45
 	ld [wBuffer5], a
 	ld [wBuffer6], a
 	ret
-; 3cc76
 
-GetSixteenthMaxHP: ; 3cc76
+GetSixteenthMaxHP:
 	call GetQuarterMaxHP
 	; quarter result
 	srl c
@@ -1871,9 +1831,8 @@ GetSixteenthMaxHP: ; 3cc76
 	inc c
 .ok
 	ret
-; 3cc83
 
-GetEighthMaxHP: ; 3cc83
+GetEighthMaxHP:
 ; output: bc
 	call GetQuarterMaxHP
 ; assumes nothing can have 1024 or more hp
@@ -1886,9 +1845,8 @@ GetEighthMaxHP: ; 3cc83
 	inc c
 .end
 	ret
-; 3cc8e
 
-GetQuarterMaxHP: ; 3cc8e
+GetQuarterMaxHP:
 ; output: bc
 	call GetMaxHP
 
@@ -1906,9 +1864,8 @@ GetQuarterMaxHP: ; 3cc8e
 	inc c
 .end
 	ret
-; 3cc9f
 
-GetHalfMaxHP: ; 3cc9f
+GetHalfMaxHP:
 ; output: bc
 	call GetMaxHP
 
@@ -1923,9 +1880,8 @@ GetHalfMaxHP: ; 3cc9f
 	inc c
 .end
 	ret
-; 3ccac
 
-GetMaxHP: ; 3ccac
+GetMaxHP:
 ; output: bc, wBuffer1-2
 
 	ld hl, wBattleMonMaxHP
@@ -1942,9 +1898,8 @@ GetMaxHP: ; 3ccac
 	ld [wBuffer1], a
 	ld c, a
 	ret
-; 3ccc2
 
-Unreferenced_GetHalfHP: ; 3ccc2
+Unreferenced_GetHalfHP:
 	ld hl, wBattleMonHP
 	ld a, [hBattleTurn]
 	and a
@@ -1962,9 +1917,8 @@ Unreferenced_GetHalfHP: ; 3ccc2
 	ld a, [hl]
 	ld [wBuffer1], a
 	ret
-; 3ccde
 
-CheckUserHasEnoughHP: ; 3ccde
+CheckUserHasEnoughHP:
 	ld hl, wBattleMonHP + 1
 	ld a, [hBattleTurn]
 	and a
@@ -1977,9 +1931,8 @@ CheckUserHasEnoughHP: ; 3ccde
 	ld a, b
 	sbc [hl]
 	ret
-; 3ccef
 
-RestoreHP ; 3ccef
+RestoreHP
 	ld hl, wEnemyMonMaxHP
 	ld a, [hBattleTurn]
 	and a
@@ -2022,14 +1975,12 @@ RestoreHP ; 3ccef
 	call SwitchTurnCore
 	call UpdateHPBarBattleHuds
 	jp SwitchTurnCore
-; 3cd36
 
-UpdateHPBarBattleHuds: ; 3cd36
+UpdateHPBarBattleHuds:
 	call UpdateHPBar
 	jp UpdateBattleHuds
-; 3cd3c
 
-UpdateHPBar: ; 3cd3c
+UpdateHPBar:
 	hlcoord 10, 9
 	ld a, [hBattleTurn]
 	and a
@@ -2043,9 +1994,8 @@ UpdateHPBar: ; 3cd3c
 	predef AnimateHPBar
 	pop bc
 	ret
-; 3cd55
 
-HandleEnemyMonFaint: ; 3cd55
+HandleEnemyMonFaint:
 	call FaintEnemyPokemon
 	ld hl, wBattleMonHP
 	ld a, [hli]
@@ -2054,7 +2004,7 @@ HandleEnemyMonFaint: ; 3cd55
 	xor a
 	ld [wWhichMonFaintedFirst], a
 	call UpdateBattleStateAndExperienceAfterEnemyFaint
-	call CheckPlayerPartyForFitPkmn
+	call CheckPlayerPartyForFitMon
 	ld a, d
 	and a
 	jp z, LostBattle
@@ -2112,9 +2062,8 @@ HandleEnemyMonFaint: ; 3cd55
 	xor a
 	ld [wBattlePlayerAction], a
 	ret
-; 3cdca
 
-DoubleSwitch: ; 3cdca
+DoubleSwitch:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .player_1
@@ -2142,9 +2091,8 @@ DoubleSwitch: ; 3cdca
 	xor a
 	ld [wBattlePlayerAction], a
 	ret
-; 3ce01
 
-UpdateBattleStateAndExperienceAfterEnemyFaint: ; 3ce01
+UpdateBattleStateAndExperienceAfterEnemyFaint:
 	call UpdateBattleMonInParty
 	ld a, [wBattleMode]
 	dec a
@@ -2186,7 +2134,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: ; 3ce01
 	call PlayerMonFaintHappinessMod
 
 .player_mon_did_not_faint
-	call CheckPlayerPartyForFitPkmn
+	call CheckPlayerPartyForFitMon
 	ld a, d
 	and a
 	ret z
@@ -2196,8 +2144,8 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: ; 3ce01
 	call EmptyBattleTextBox
 	call LoadTileMapToTempTileMap
 	ld a, [wBattleResult]
-	and $c0
-	ld [wBattleResult], a
+	and BATTLERESULT_BITMASK
+	ld [wBattleResult], a ; WIN
 	call IsAnyMonHoldingExpShare
 	jr z, .skip_exp
 	ld hl, wEnemyMonBaseStats
@@ -2233,9 +2181,8 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: ; 3ce01
 	pop af
 	ld [wBattleParticipantsNotFainted], a
 	ret
-; 3ceaa
 
-IsAnyMonHoldingExpShare: ; 3ceaa
+IsAnyMonHoldingExpShare:
 	ld a, [wPartyCount]
 	ld b, a
 	ld hl, wPartyMon1
@@ -2289,15 +2236,13 @@ IsAnyMonHoldingExpShare: ; 3ceaa
 	ld a, e
 	and a
 	ret
-; 3ceec
 
-StopDangerSound: ; 3ceec
+StopDangerSound:
 	xor a
 	ld [wLowHealthAlarm], a
 	ret
-; 3cef1
 
-FaintYourPokemon: ; 3cef1
+FaintYourPokemon:
 	call StopDangerSound
 	call WaitSFX
 	ld a, $f0
@@ -2308,11 +2253,10 @@ FaintYourPokemon: ; 3cef1
 	hlcoord 9, 7
 	lb bc, 5, 11
 	call ClearBox
-	ld hl, BattleText_PkmnFainted
+	ld hl, BattleText_MonFainted
 	jp StdBattleTextBox
-; 3cf14
 
-FaintEnemyPokemon: ; 3cf14
+FaintEnemyPokemon:
 	call WaitSFX
 	ld de, SFX_KINESIS
 	call PlaySFX
@@ -2322,11 +2266,10 @@ FaintEnemyPokemon: ; 3cf14
 	hlcoord 1, 0
 	lb bc, 4, 10
 	call ClearBox
-	ld hl, BattleText_EnemyPkmnFainted
+	ld hl, BattleText_EnemyMonFainted
 	jp StdBattleTextBox
-; 3cf35
 
-CheckEnemyTrainerDefeated: ; 3cf35
+CheckEnemyTrainerDefeated:
 	ld a, [wOTPartyCount]
 	ld b, a
 	xor a
@@ -2344,9 +2287,8 @@ CheckEnemyTrainerDefeated: ; 3cf35
 
 	and a
 	ret
-; 3cf4a
 
-HandleEnemySwitch: ; 3cf4a
+HandleEnemySwitch:
 	ld hl, wEnemyHPPal
 	ld e, HP_BAR_LENGTH_PX
 	call UpdateHPPal
@@ -2371,9 +2313,8 @@ HandleEnemySwitch: ; 3cf4a
 	jr nz, EnemyPartyMonEntrance
 	inc a
 	ret
-; 3cf78
 
-EnemyPartyMonEntrance: ; 3cf78
+EnemyPartyMonEntrance:
 	push af
 	xor a
 	ld [wEnemySwitchMonIndex], a
@@ -2397,9 +2338,8 @@ EnemyPartyMonEntrance: ; 3cf78
 	ld [wBattlePlayerAction], a
 	inc a
 	ret
-; 3cfa4
 
-WinTrainerBattle: ; 3cfa4
+WinTrainerBattle:
 ; Player won the battle
 	call StopDangerSound
 	ld a, $1
@@ -2471,22 +2411,22 @@ WinTrainerBattle: ; 3cfa4
 	call nz, .DoubleReward
 	call .CheckMaxedOutMomMoney
 	push af
-	ld a, $0
+	ld a, FALSE
 	jr nc, .okay
 	ld a, [wMomSavingMoney]
-	and $7
-	cp $3
+	and MOM_SAVING_MONEY_MASK
+	cp (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF_MONEY_F)
 	jr nz, .okay
-	inc a
+	inc a ; TRUE
 
 .okay
 	ld b, a
-	ld c, $4
+	ld c, 4
 .loop
 	ld a, b
 	and a
 	jr z, .loop2
-	call .SendMoneyToMom
+	call .AddMoneyToMom
 	dec c
 	dec b
 	jr .loop
@@ -2505,7 +2445,7 @@ WinTrainerBattle: ; 3cfa4
 	pop af
 	jr nc, .KeepItAll
 	ld a, [wMomSavingMoney]
-	and $7
+	and MOM_SAVING_MONEY_MASK
 	jr z, .KeepItAll
 	ld hl, .SentToMomTexts
 	dec a
@@ -2521,27 +2461,24 @@ WinTrainerBattle: ; 3cfa4
 .KeepItAll:
 	ld hl, GotMoneyForWinningText
 	jp StdBattleTextBox
-; 3d081
 
-.SendMoneyToMom: ; 3d081
+.AddMoneyToMom:
 	push bc
 	ld hl, wBattleReward + 2
 	ld de, wMomsMoney + 2
 	call AddBattleMoneyToAccount
 	pop bc
 	ret
-; 3d08d
 
-.AddMoneyToWallet: ; 3d08d
+.AddMoneyToWallet:
 	push bc
 	ld hl, wBattleReward + 2
 	ld de, wMoney + 2
 	call AddBattleMoneyToAccount
 	pop bc
 	ret
-; 3d099
 
-.DoubleReward: ; 3d099
+.DoubleReward:
 	ld hl, wBattleReward + 2
 	sla [hl]
 	dec hl
@@ -2554,15 +2491,14 @@ WinTrainerBattle: ; 3cfa4
 	ld [hli], a
 	ld [hl], a
 	ret
-; 3d0ab
 
-.SentToMomTexts: ; 3d0ab
+.SentToMomTexts:
+; entries correspond to MOM_SAVING_* constants
 	dw SentSomeToMomText
 	dw SentHalfToMomText
 	dw SentAllToMomText
-; 3d0b1
 
-.CheckMaxedOutMomMoney: ; 3d0b1
+.CheckMaxedOutMomMoney:
 	ld hl, wMomsMoney + 2
 	ld a, [hld]
 	cp LOW(MAX_MONEY)
@@ -2571,10 +2507,9 @@ WinTrainerBattle: ; 3cfa4
 	ld a, [hl]
 	sbc HIGH(MAX_MONEY >> 8)
 	ret
-; 3d0be
 
-AddBattleMoneyToAccount: ; 3d0be
-	ld c, $3
+AddBattleMoneyToAccount:
+	ld c, 3
 	and a
 	push de
 	push hl
@@ -2606,9 +2541,8 @@ AddBattleMoneyToAccount: ; 3d0be
 	inc hl
 	ld [hl], LOW(MAX_MONEY)
 	ret
-; 3d0ea
 
-PlayVictoryMusic: ; 3d0ea
+PlayVictoryMusic:
 	push de
 	ld de, MUSIC_NONE
 	call PlayMusic
@@ -2642,26 +2576,24 @@ PlayVictoryMusic: ; 3d0ea
 .lost
 	pop de
 	ret
-; 3d123
 
-IsKantoGymLeader: ; 0x3d123
+IsKantoGymLeader:
 	ld hl, KantoGymLeaders
 	jr IsGymLeaderCommon
 
-IsGymLeader: ; 0x3d128
+IsGymLeader:
 	ld hl, GymLeaders
 IsGymLeaderCommon:
 	push de
 	ld a, [wOtherTrainerClass]
-	ld de, $1
+	ld de, 1
 	call IsInArray
 	pop de
 	ret
-; 0x3d137
 
 INCLUDE "data/trainers/leaders.asm"
 
-HandlePlayerMonFaint: ; 3d14e
+HandlePlayerMonFaint:
 	call FaintYourPokemon
 	ld hl, wEnemyMonHP
 	ld a, [hli]
@@ -2670,7 +2602,7 @@ HandlePlayerMonFaint: ; 3d14e
 	ld a, $1
 	ld [wWhichMonFaintedFirst], a
 	call PlayerMonFaintHappinessMod
-	call CheckPlayerPartyForFitPkmn
+	call CheckPlayerPartyForFitMon
 	ld a, d
 	and a
 	jp z, LostBattle
@@ -2709,9 +2641,8 @@ HandlePlayerMonFaint: ; 3d14e
 	call HandleEnemySwitch
 	jp z, WildFled_EnemyFled_LinkBattleCanceled
 	jp DoubleSwitch
-; 3d1aa
 
-PlayerMonFaintHappinessMod: ; 3d1aa
+PlayerMonFaintHappinessMod:
 	ld a, [wCurBattleMon]
 	ld c, a
 	ld hl, wBattleParticipantsNotFainted
@@ -2741,16 +2672,15 @@ PlayerMonFaintHappinessMod: ; 3d1aa
 	ld [wCurPartyMon], a
 	callfar ChangeHappiness
 	ld a, [wBattleResult]
-	and %11000000
-	add $1
+	and BATTLERESULT_BITMASK
+	add LOSE
 	ld [wBattleResult], a
 	ld a, [wWhichMonFaintedFirst]
 	and a
 	ret z
 	ret ; ??????????
-; 3d1f8
 
-AskUseNextPokemon: ; 3d1f8
+AskUseNextPokemon:
 	call EmptyBattleTextBox
 	call LoadTileMapToTempTileMap
 ; We don't need to be here if we're in a Trainer battle,
@@ -2777,11 +2707,10 @@ AskUseNextPokemon: ; 3d1f8
 	ld hl, wPartyMon1Speed
 	ld de, wEnemyMonSpeed
 	jp TryToRunAwayFromBattle
-; 3d227
 
-ForcePlayerMonChoice: ; 3d227
+ForcePlayerMonChoice:
 	call EmptyBattleTextBox
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call SetUpBattlePartyMenu_NoLoop
 	call ForcePickPartyMonInBattle
 	ld a, [wLinkMode]
@@ -2829,7 +2758,7 @@ ForcePlayerMonChoice: ; 3d227
 	call CloseWindow
 	call GetMemSGBLayout
 	call SetPalettes
-	call SendOutPkmnText
+	call SendOutMonText
 	call NewBattleMonStatus
 	call BreakAttraction
 	call SendOutPlayerMon
@@ -2841,9 +2770,8 @@ ForcePlayerMonChoice: ; 3d227
 	and a
 	ld c, a
 	ret
-; 3d2b3
 
-PlayerPartyMonEntrance: ; 3d2b3
+PlayerPartyMonEntrance:
 	ld a, [wCurBattleMon]
 	ld [wLastPlayerMon], a
 	ld a, [wCurPartyMon]
@@ -2851,7 +2779,7 @@ PlayerPartyMonEntrance: ; 3d2b3
 	call AddBattleParticipant
 	call InitBattleMon
 	call ResetPlayerStatLevels
-	call SendOutPkmnText
+	call SendOutMonText
 	call NewBattleMonStatus
 	call BreakAttraction
 	call SendOutPlayerMon
@@ -2859,9 +2787,8 @@ PlayerPartyMonEntrance: ; 3d2b3
 	call LoadTileMapToTempTileMap
 	call SetPlayerTurn
 	jp SpikesDamage
-; 3d2e0
 
-CheckMobileBattleError: ; 3d2e0
+CheckMobileBattleError:
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
 	jr nz, .not_mobile ; It's not a mobile battle
@@ -2877,15 +2804,13 @@ CheckMobileBattleError: ; 3d2e0
 .not_mobile
 	xor a
 	ret
-; 3d2f1
 
-IsMobileBattle: ; 3d2f1
+IsMobileBattle:
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
 	ret
-; 3d2f7
 
-SetUpBattlePartyMenu_NoLoop: ; 3d2f7
+SetUpBattlePartyMenu_NoLoop:
 	call ClearBGPalettes
 SetUpBattlePartyMenu: ; switch to fullscreen menu?
 	farcall LoadPartyMenuGFX
@@ -2893,18 +2818,16 @@ SetUpBattlePartyMenu: ; switch to fullscreen menu?
 	farcall InitPartyMenuBGPal7
 	farcall InitPartyMenuGFX
 	ret
-; 3d313
 
-JumpToPartyMenuAndPrintText: ; 3d313
+JumpToPartyMenuAndPrintText:
 	farcall WritePartyMenuTilemap
 	farcall PrintPartyMenuText
 	call WaitBGMap
 	call SetPalettes
 	call DelayFrame
 	ret
-; 3d329
 
-SelectBattleMon: ; 3d329
+SelectBattleMon:
 	call IsMobileBattle
 	jr z, .mobile
 	farcall PartyMenuSelect
@@ -2913,9 +2836,8 @@ SelectBattleMon: ; 3d329
 .mobile
 	farcall Mobile_PartyMenuSelect
 	ret
-; 3d33c
 
-PickPartyMonInBattle: ; 3d33c
+PickPartyMonInBattle:
 .loop
 	ld a, PARTYMENUACTION_SWITCH ; Which PKMN?
 	ld [wPartyMenuActionText], a
@@ -2926,15 +2848,14 @@ PickPartyMonInBattle: ; 3d33c
 	jr z, .loop
 	xor a
 	ret
-; 3d34f
 
-SwitchMonAlreadyOut: ; 3d34f
+SwitchMonAlreadyOut:
 	ld hl, wCurBattleMon
 	ld a, [wCurPartyMon]
 	cp [hl]
 	jr nz, .notout
 
-	ld hl, BattleText_PkmnIsAlreadyOut
+	ld hl, BattleText_MonIsAlreadyOut
 	call StdBattleTextBox
 	scf
 	ret
@@ -2942,9 +2863,8 @@ SwitchMonAlreadyOut: ; 3d34f
 .notout
 	xor a
 	ret
-; 3d362
 
-ForcePickPartyMonInBattle: ; 3d362
+ForcePickPartyMonInBattle:
 ; Can't back out.
 
 .pick
@@ -2957,9 +2877,8 @@ ForcePickPartyMonInBattle: ; 3d362
 	call PlaySFX
 	call WaitSFX
 	jr .pick
-; 3d375
 
-PickSwitchMonInBattle: ; 3d375
+PickSwitchMonInBattle:
 .pick
 	call PickPartyMonInBattle
 	ret c
@@ -2967,9 +2886,8 @@ PickSwitchMonInBattle: ; 3d375
 	jr c, .pick
 	xor a
 	ret
-; 3d380
 
-ForcePickSwitchMonInBattle: ; 3d380
+ForcePickSwitchMonInBattle:
 ; Can't back out.
 
 .pick
@@ -2981,9 +2899,8 @@ ForcePickSwitchMonInBattle: ; 3d380
 
 	xor a
 	ret
-; 3d38e
 
-LostBattle: ; 3d38e
+LostBattle:
 	ld a, 1
 	ld [wBattleEnded], a
 
@@ -3046,8 +2963,8 @@ LostBattle: ; 3d38e
 	jr nz, .not_tied
 	ld hl, TiedAgainstText
 	ld a, [wBattleResult]
-	and $c0
-	add 2
+	and BATTLERESULT_BITMASK
+	add DRAW
 	ld [wBattleResult], a
 	jr .text
 
@@ -3077,21 +2994,18 @@ LostBattle: ; 3d38e
 	farcall Mobile_PrintOpponentBattleMessage
 	scf
 	ret
-; 3d432
 
-EnemyMonFaintedAnimation: ; 3d432
+EnemyMonFaintedAnimation:
 	hlcoord 12, 5
 	decoord 12, 6
 	jp MonFaintedAnimation
-; 3d43b
 
-PlayerMonFaintedAnimation: ; 3d43b
+PlayerMonFaintedAnimation:
 	hlcoord 1, 10
 	decoord 1, 11
 	jp MonFaintedAnimation
-; 3d444
 
-MonFaintedAnimation: ; 3d444
+MonFaintedAnimation:
 	ld a, [wcfbe]
 	push af
 	set 6, a
@@ -3140,13 +3054,11 @@ MonFaintedAnimation: ; 3d444
 	pop af
 	ld [wcfbe], a
 	ret
-; 3d488
 
 .Spaces:
 	db "       @"
-; 3d490
 
-SlideBattlePicOut: ; 3d490
+SlideBattlePicOut:
 	ld [hMapObjectIndexBuffer], a
 	ld c, a
 .loop
@@ -3168,9 +3080,8 @@ SlideBattlePicOut: ; 3d490
 	dec c
 	jr nz, .loop
 	ret
-; 3d4ae
 
-.DoFrame: ; 3d4ae
+.DoFrame:
 	ld a, [hMapObjectIndexBuffer]
 	ld c, a
 	cp $8
@@ -3190,39 +3101,37 @@ SlideBattlePicOut: ; 3d490
 	dec c
 	jr nz, .back
 	ret
-; 3d4c3
 
-ForceEnemySwitch: ; 3d4c3
+ForceEnemySwitch:
 	call ResetEnemyBattleVars
 	ld a, [wEnemySwitchMonIndex]
 	dec a
 	ld b, a
-	call LoadEnemyPkmnToSwitchTo
+	call LoadEnemyMonToSwitchTo
 	call ClearEnemyMonBox
 	call NewEnemyMonStatus
 	call ResetEnemyStatLevels
-	call Function_SetEnemyPkmnAndSendOutAnimation
+	call Function_SetEnemyMonAndSendOutAnimation
 	call BreakAttraction
 	call ResetBattleParticipants
 	ret
-; 3d4e1
 
-EnemySwitch: ; 3d4e1
+EnemySwitch:
 	call CheckWhetherToAskSwitch
 	jr nc, EnemySwitch_SetMode
 	; Shift Mode
 	call ResetEnemyBattleVars
 	call CheckWhetherSwitchmonIsPredetermined
 	jr c, .skip
-	call FindPkmnInOTPartyToSwitchIntoBattle
+	call FindMonInOTPartyToSwitchIntoBattle
 .skip
-	; 'b' contains the PartyNr of the Pkmn the AI will switch to
-	call LoadEnemyPkmnToSwitchTo
+	; 'b' contains the PartyNr of the mon the AI will switch to
+	call LoadEnemyMonToSwitchTo
 	call OfferSwitch
 	push af
 	call ClearEnemyMonBox
 	call Function_BattleTextEnemySentOut
-	call Function_SetEnemyPkmnAndSendOutAnimation
+	call Function_SetEnemyMonAndSendOutAnimation
 	pop af
 	ret c
 	; If we're here, then we're switching too
@@ -3234,24 +3143,22 @@ EnemySwitch: ; 3d4e1
 	ld [wEnemyIsSwitching], a
 	call LoadTileMapToTempTileMap
 	jp PlayerSwitch
-; 3d517
 
-EnemySwitch_SetMode: ; 3d517
+EnemySwitch_SetMode:
 	call ResetEnemyBattleVars
 	call CheckWhetherSwitchmonIsPredetermined
 	jr c, .skip
-	call FindPkmnInOTPartyToSwitchIntoBattle
+	call FindMonInOTPartyToSwitchIntoBattle
 .skip
-	; 'b' contains the PartyNr of the Pkmn the AI will switch to
-	call LoadEnemyPkmnToSwitchTo
+	; 'b' contains the PartyNr of the mon the AI will switch to
+	call LoadEnemyMonToSwitchTo
 	ld a, 1
 	ld [wEnemyIsSwitching], a
 	call ClearEnemyMonBox
 	call Function_BattleTextEnemySentOut
-	jp Function_SetEnemyPkmnAndSendOutAnimation
-; 3d533
+	jp Function_SetEnemyMonAndSendOutAnimation
 
-CheckWhetherSwitchmonIsPredetermined: ; 3d533
+CheckWhetherSwitchmonIsPredetermined:
 ; returns carry if: ???
 	ld a, [wLinkMode]
 	and a
@@ -3283,9 +3190,8 @@ CheckWhetherSwitchmonIsPredetermined: ; 3d533
 .return_carry
 	scf
 	ret
-; 3d557
 
-ResetEnemyBattleVars: ; 3d557
+ResetEnemyBattleVars:
 ; and draw empty TextBox
 	xor a
 	ld [wLastPlayerCounterMove], a
@@ -3300,14 +3206,13 @@ ResetEnemyBattleVars: ; 3d557
 	ld a, 8
 	call SlideBattlePicOut
 	call EmptyBattleTextBox
-	jp LoadStandardMenuDataHeader
-; 3d57a
+	jp LoadStandardMenuHeader
 
-ResetBattleParticipants: ; 3d57a
+ResetBattleParticipants:
 	xor a
 	ld [wBattleParticipantsNotFainted], a
 	ld [wBattleParticipantsIncludingFainted], a
-AddBattleParticipant: ; 3d581
+AddBattleParticipant:
 	ld a, [wCurBattleMon]
 	ld c, a
 	ld hl, wBattleParticipantsNotFainted
@@ -3317,10 +3222,9 @@ AddBattleParticipant: ; 3d581
 	pop bc
 	ld hl, wBattleParticipantsIncludingFainted
 	predef_jump SmallFarFlagAction
-; 3d599
 
-FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599
-	ld b, $ff
+FindMonInOTPartyToSwitchIntoBattle:
+	ld b, -1
 	ld a, $1
 	ld [wBuffer1], a
 	ld [wBuffer2], a
@@ -3347,16 +3251,15 @@ FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599
 	pop bc
 	jr z, .discourage
 	call LookUpTheEffectivenessOfEveryMove
-	call IsThePlayerPkmnTypesEffectiveAgainstOTPkmn
+	call IsThePlayerMonTypesEffectiveAgainstOTMon
 	jr .loop
 
 .discourage
 	ld hl, wBuffer2
 	set 0, [hl]
 	jr .loop
-; 3d5d7
 
-LookUpTheEffectivenessOfEveryMove: ; 3d5d7
+LookUpTheEffectivenessOfEveryMove:
 	push bc
 	ld hl, wOTPartyMon1Moves
 	ld a, b
@@ -3392,11 +3295,10 @@ LookUpTheEffectivenessOfEveryMove: ; 3d5d7
 	ret
 .done
 	ret
-; 3d618
 
-IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618
-; Calculates the effectiveness of the types of the PlayerPkmn
-; against the OTPkmn
+IsThePlayerMonTypesEffectiveAgainstOTMon:
+; Calculates the effectiveness of the types of the PlayerMon
+; against the OTMon
 	push bc
 	ld hl, wOTPartyCount
 	ld a, b
@@ -3441,9 +3343,8 @@ IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618
 .reset
 	res 0, [hl]
 	ret
-; 3d672
 
-ScoreMonTypeMatchups: ; 3d672
+ScoreMonTypeMatchups:
 .loop1
 	ld hl, wBuffer1
 	sla [hl]
@@ -3464,7 +3365,7 @@ ScoreMonTypeMatchups: ; 3d672
 	ld a, [wBuffer1]
 	and a
 	jr z, .okay2
-	ld b, $ff
+	ld b, -1
 	ld c, a
 .loop3
 	inc b
@@ -3473,7 +3374,7 @@ ScoreMonTypeMatchups: ; 3d672
 	jr .quit
 
 .okay2
-	ld b, $ff
+	ld b, -1
 	ld a, [wBuffer2]
 	ld c, a
 .loop4
@@ -3506,10 +3407,9 @@ ScoreMonTypeMatchups: ; 3d672
 
 .quit
 	ret
-; 3d6ca
 
-LoadEnemyPkmnToSwitchTo: ; 3d6ca
-	; 'b' contains the PartyNr of the Pkmn the AI will switch to
+LoadEnemyMonToSwitchTo:
+	; 'b' contains the PartyNr of the mon the AI will switch to
 	ld a, b
 	ld [wCurPartyMon], a
 	ld hl, wOTPartyMon1Level
@@ -3545,9 +3445,8 @@ LoadEnemyPkmnToSwitchTo: ; 3d6ca
 	ld a, [hl]
 	ld [wEnemyHPAtTimeOfPlayerSwitch + 1], a
 	ret
-; 3d714
 
-CheckWhetherToAskSwitch: ; 3d714
+CheckWhetherToAskSwitch:
 	ld a, [wBattleHasJustStarted]
 	dec a
 	jp z, .return_nc
@@ -3575,13 +3474,12 @@ CheckWhetherToAskSwitch: ; 3d714
 .return_nc
 	and a
 	ret
-; 3d74b
 
-OfferSwitch: ; 3d74b
+OfferSwitch:
 	ld a, [wCurPartyMon]
 	push af
 	callfar Battle_GetTrainerName
-	ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangePkmn
+	ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangeMon
 	call StdBattleTextBox
 	lb bc, 1, 7
 	call PlaceYesNoBox
@@ -3616,9 +3514,8 @@ OfferSwitch: ; 3d74b
 	ld [wCurPartyMon], a
 	scf
 	ret
-; 3d7a0
 
-ClearEnemyMonBox: ; 3d7a0
+ClearEnemyMonBox:
 	xor a
 	ld [hBGMapMode], a
 	call ExitMenu
@@ -3628,23 +3525,21 @@ ClearEnemyMonBox: ; 3d7a0
 	call ClearBox
 	call WaitBGMap
 	jp FinishBattleAnim
-; 3d7b8
 
-Function_BattleTextEnemySentOut: ; 3d7b8
+Function_BattleTextEnemySentOut:
 	callfar Battle_GetTrainerName
 	ld hl, BattleText_EnemySentOut
 	call StdBattleTextBox
 	jp WaitBGMap
-; 3d7c7
 
-Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
+Function_SetEnemyMonAndSendOutAnimation:
 	ld a, [wTempEnemyMonSpecies]
 	ld [wCurPartySpecies], a
 	ld [wCurSpecies], a
 	call GetBaseData
 	ld a, OTPARTYMON
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	call GetEnemyMonFrontpic
 
 	xor a
@@ -3684,9 +3579,8 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; 3d834
 
-NewEnemyMonStatus: ; 3d834
+NewEnemyMonStatus:
 	xor a
 	ld [wLastPlayerCounterMove], a
 	ld [wLastEnemyCounterMove], a
@@ -3708,9 +3602,8 @@ endr
 	ld hl, wPlayerSubStatus5
 	res SUBSTATUS_CANT_RUN, [hl]
 	ret
-; 3d867
 
-ResetEnemyStatLevels: ; 3d867
+ResetEnemyStatLevels:
 	ld a, BASE_STAT_LEVEL
 	ld b, NUM_LEVEL_STATS
 	ld hl, wEnemyStatLevels
@@ -3719,27 +3612,25 @@ ResetEnemyStatLevels: ; 3d867
 	dec b
 	jr nz, .loop
 	ret
-; 3d873
 
-CheckPlayerPartyForFitPkmn: ; 3d873
-; Has the player any Pkmn in his Party that can fight?
+CheckPlayerPartyForFitMon:
+; Has the player any mon in his Party that can fight?
 	ld a, [wPartyCount]
 	ld e, a
 	xor a
 	ld hl, wPartyMon1HP
-	ld bc, wPartyMon2 - (wPartyMon1 + 1)
+	ld bc, PARTYMON_STRUCT_LENGTH - 1
 .loop
 	or [hl]
-	inc hl
+	inc hl ; + 1
 	or [hl]
 	add hl, bc
 	dec e
 	jr nz, .loop
 	ld d, a
 	ret
-; 3d887
 
-CheckIfCurPartyMonIsFitToFight: ; 3d887
+CheckIfCurPartyMonIsFitToFight:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMon1HP
 	call GetPartyLocation
@@ -3768,9 +3659,8 @@ CheckIfCurPartyMonIsFitToFight: ; 3d887
 .finish_fail
 	xor a
 	ret
-; 3d8b3
 
-TryToRunAwayFromBattle: ; 3d8b3
+TryToRunAwayFromBattle:
 ; Run away from battle, with or without item
 	ld a, [wBattleType]
 	cp BATTLETYPE_DEBUG
@@ -3924,11 +3814,11 @@ TryToRunAwayFromBattle: ; 3d8b3
 	cp BATTLEACTION_FORFEIT
 	ld a, DRAW
 	jr z, .fled
-	dec a
+	dec a ; LOSE
 .fled
 	ld b, a
 	ld a, [wBattleResult]
-	and $c0
+	and BATTLERESULT_BITMASK
 	add b
 	ld [wBattleResult], a
 	call StopDangerSound
@@ -3957,9 +3847,8 @@ TryToRunAwayFromBattle: ; 3d8b3
 	call LoadTileMapToTempTileMap
 	scf
 	ret
-; 3da0d
 
-InitBattleMon: ; 3da0d
+InitBattleMon:
 	ld a, MON_SPECIES
 	call GetPartyParamLocation
 	ld de, wBattleMonSpecies
@@ -3998,23 +3887,21 @@ InitBattleMon: ; 3da0d
 	call ApplyStatusEffectOnPlayerStats
 	call BadgeStatBoosts
 	ret
-; 3da74
 
-BattleCheckPlayerShininess: ; 3da74
+BattleCheckPlayerShininess:
 	call GetPartyMonDVs
 	jr BattleCheckShininess
 
-BattleCheckEnemyShininess: ; 3da79
+BattleCheckEnemyShininess:
 	call GetEnemyMonDVs
 
-BattleCheckShininess: ; 3da7c
+BattleCheckShininess:
 	ld b, h
 	ld c, l
 	callfar CheckShininess
 	ret
-; 3da85
 
-GetPartyMonDVs: ; 3da85
+GetPartyMonDVs:
 	ld hl, wBattleMonDVs
 	ld a, [wPlayerSubStatus5]
 	bit SUBSTATUS_TRANSFORMED, a
@@ -4022,9 +3909,8 @@ GetPartyMonDVs: ; 3da85
 	ld hl, wPartyMon1DVs
 	ld a, [wCurBattleMon]
 	jp GetPartyLocation
-; 3da97
 
-GetEnemyMonDVs: ; 3da97
+GetEnemyMonDVs:
 	ld hl, wEnemyMonDVs
 	ld a, [wEnemySubStatus5]
 	bit SUBSTATUS_TRANSFORMED, a
@@ -4036,9 +3922,8 @@ GetEnemyMonDVs: ; 3da97
 	ld hl, wOTPartyMon1DVs
 	ld a, [wCurOTMon]
 	jp GetPartyLocation
-; 3dab1
 
-ResetPlayerStatLevels: ; 3dab1
+ResetPlayerStatLevels:
 	ld a, BASE_STAT_LEVEL
 	ld b, NUM_LEVEL_STATS
 	ld hl, wPlayerStatLevels
@@ -4047,9 +3932,8 @@ ResetPlayerStatLevels: ; 3dab1
 	dec b
 	jr nz, .loop
 	ret
-; 3dabd
 
-InitEnemyMon: ; 3dabd
+InitEnemyMon:
 	ld a, [wCurPartyMon]
 	ld hl, wOTPartyMon1Species
 	call GetPartyLocation
@@ -4100,9 +3984,8 @@ InitEnemyMon: ; 3dabd
 	ld a, [wCurPartyMon]
 	ld [wCurOTMon], a
 	ret
-; 3db32
 
-SwitchPlayerMon: ; 3db32
+SwitchPlayerMon:
 	call ClearSprites
 	ld a, [wCurBattleMon]
 	ld [wLastPlayerMon], a
@@ -4120,9 +4003,8 @@ SwitchPlayerMon: ; 3db32
 	ld a, [hli]
 	or [hl]
 	ret
-; 3db5f
 
-SendOutPlayerMon: ; 3db5f
+SendOutPlayerMon:
 	ld hl, wBattleMonDVs
 	predef GetUnownLetter
 	hlcoord 1, 5
@@ -4176,9 +4058,8 @@ SendOutPlayerMon: ; 3db5f
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; 3dbde
 
-NewBattleMonStatus: ; 3dbde
+NewBattleMonStatus:
 	xor a
 	ld [wLastPlayerCounterMove], a
 	ld [wLastEnemyCounterMove], a
@@ -4205,17 +4086,15 @@ endr
 	ld hl, wEnemySubStatus5
 	res SUBSTATUS_CANT_RUN, [hl]
 	ret
-; 3dc18
 
-BreakAttraction: ; 3dc18
+BreakAttraction:
 	ld hl, wPlayerSubStatus1
 	res SUBSTATUS_IN_LOVE, [hl]
 	ld hl, wEnemySubStatus1
 	res SUBSTATUS_IN_LOVE, [hl]
 	ret
-; 3dc23
 
-SpikesDamage: ; 3dc23
+SpikesDamage:
 	ld hl, wPlayerScreens
 	ld de, wBattleMonType
 	ld bc, UpdatePlayerHUD
@@ -4254,9 +4133,8 @@ SpikesDamage: ; 3dc23
 
 .hl
 	jp hl
-; 3dc5b
 
-PursuitSwitch: ; 3dc5b
+PursuitSwitch:
 	ld a, BATTLE_VARS_MOVE
 	call GetBattleVar
 	ld b, a
@@ -4308,7 +4186,7 @@ PursuitSwitch: ; 3dc5b
 	ld b, RESET_FLAG
 	predef SmallFarFlagAction
 	call PlayerMonFaintedAnimation
-	ld hl, BattleText_PkmnFainted
+	ld hl, BattleText_MonFainted
 	jr .done_fainted
 
 .check_enemy_fainted
@@ -4324,7 +4202,7 @@ PursuitSwitch: ; 3dc5b
 	call PlaySFX
 	call WaitSFX
 	call EnemyMonFaintedAnimation
-	ld hl, BattleText_EnemyPkmnFainted
+	ld hl, BattleText_EnemyMonFainted
 
 .done_fainted
 	call StdBattleTextBox
@@ -4334,9 +4212,8 @@ PursuitSwitch: ; 3dc5b
 .done
 	and a
 	ret
-; 3dce6
 
-RecallPlayerMon: ; 3dce6
+RecallPlayerMon:
 	ld a, [hBattleTurn]
 	push af
 	xor a
@@ -4347,9 +4224,8 @@ RecallPlayerMon: ; 3dce6
 	pop af
 	ld [hBattleTurn], a
 	ret
-; 3dcf9
 
-HandleHealingItems: ; 3dcf9
+HandleHealingItems:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .player_1
@@ -4371,9 +4247,8 @@ HandleHealingItems: ; 3dcf9
 	call HandleHPHealingItem
 	call UseHeldStatusHealingItem
 	jp UseConfusionHealingItem
-; 3dd2f
 
-HandleHPHealingItem: ; 3dd2f
+HandleHPHealingItem:
 	callfar GetOpponentItem
 	ld a, b
 	cp HELD_BERRY
@@ -4427,7 +4302,7 @@ HandleHPHealingItem: ; 3dd2f
 	ld c, a
 	dec de
 	ld a, [de]
-	adc $0
+	adc 0
 	ld [wBuffer6], a
 	ld b, a
 	ld a, [hld]
@@ -4465,9 +4340,8 @@ UseOpponentItem:
 	callfar ConsumeHeldItem
 	ld hl, RecoveredUsingText
 	jp StdBattleTextBox
-; 3ddc8
 
-ItemRecoveryAnim: ; 3ddc8
+ItemRecoveryAnim:
 	push hl
 	push de
 	push bc
@@ -4484,11 +4358,10 @@ ItemRecoveryAnim: ; 3ddc8
 	pop de
 	pop hl
 	ret
-; 3dde9
 
-UseHeldStatusHealingItem: ; 3dde9
+UseHeldStatusHealingItem:
 	callfar GetOpponentItem
-	ld hl, .Statuses
+	ld hl, HeldStatusHealingEffects
 .loop
 	ld a, [hli]
 	cp $ff
@@ -4539,19 +4412,10 @@ UseHeldStatusHealingItem: ; 3dde9
 	ld a, $1
 	and a
 	ret
-; 3de44
 
-.Statuses: ; 3de44
-	db HELD_HEAL_POISON,   1 << PSN
-	db HELD_HEAL_FREEZE,   1 << FRZ
-	db HELD_HEAL_BURN,     1 << BRN
-	db HELD_HEAL_SLEEP,    SLP
-	db HELD_HEAL_PARALYZE, 1 << PAR
-	db HELD_HEAL_STATUS,   ALL_STATUS
-	db -1 ; end
-; 3de51
+INCLUDE "data/battle/held_heal_status.asm"
 
-UseConfusionHealingItem: ; 3de51
+UseConfusionHealingItem:
 	ld a, BATTLE_VARS_SUBSTATUS3_OPP
 	call GetBattleVar
 	bit SUBSTATUS_CONFUSED, a
@@ -4591,9 +4455,8 @@ UseConfusionHealingItem: ; 3de51
 	ld [bc], a
 	ld [hl], a
 	ret
-; 3de97
 
-HandleStatBoostingHeldItems: ; 3de97
+HandleStatBoostingHeldItems:
 ; The effects handled here are not used in-game.
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
@@ -4604,18 +4467,16 @@ HandleStatBoostingHeldItems: ; 3de97
 .player_1
 	call .DoEnemy
 	jp .DoPlayer
-; 3dea9
 
-.DoPlayer: ; 3dea9
+.DoPlayer:
 	call GetPartymonItem
 	ld a, $0
 	jp .HandleItem
-; 3deb1
 
-.DoEnemy: ; 3deb1
+.DoEnemy:
 	call GetOTPartymonItem
 	ld a, $1
-.HandleItem: ; 3deb6
+.HandleItem:
 	ld [hBattleTurn], a
 	ld d, h
 	ld e, l
@@ -4624,10 +4485,10 @@ HandleStatBoostingHeldItems: ; 3de97
 	ld a, [bc]
 	ld b, a
 	callfar GetItemHeldEffect
-	ld hl, .StatUpItems
+	ld hl, HeldStatUpItems
 .loop
 	ld a, [hli]
-	cp $ff
+	cp -1
 	jr z, .finish
 	inc hl
 	inc hl
@@ -4662,36 +4523,24 @@ HandleStatBoostingHeldItems: ; 3de97
 	pop bc
 	pop de
 	ret
-; 3defc
 
-.StatUpItems:
-	dbw HELD_ATTACK_UP,     BattleCommand_AttackUp
-	dbw HELD_DEFENSE_UP,    BattleCommand_DefenseUp
-	dbw HELD_SPEED_UP,      BattleCommand_SpeedUp
-	dbw HELD_SP_ATTACK_UP,  BattleCommand_SpecialAttackUp
-	dbw HELD_SP_DEFENSE_UP, BattleCommand_SpecialDefenseUp
-	dbw HELD_ACCURACY_UP,   BattleCommand_AccuracyUp
-	dbw HELD_EVASION_UP,    BattleCommand_EvasionUp
-	db -1 ; end
-; 3df12
+INCLUDE "data/battle/held_stat_up.asm"
 
-GetPartymonItem: ; 3df12
+GetPartymonItem:
 	ld hl, wPartyMon1Item
 	ld a, [wCurBattleMon]
 	call GetPartyLocation
 	ld bc, wBattleMonItem
 	ret
-; 3df1f
 
-GetOTPartymonItem: ; 3df1f
+GetOTPartymonItem:
 	ld hl, wOTPartyMon1Item
 	ld a, [wCurOTMon]
 	call GetPartyLocation
 	ld bc, wEnemyMonItem
 	ret
-; 3df2c
 
-UpdateBattleHUDs: ; 3df2c
+UpdateBattleHUDs:
 	push hl
 	push de
 	push bc
@@ -4706,9 +4555,8 @@ UpdateBattleHUDs: ; 3df2c
 	pop de
 	pop hl
 	ret
-; 3df48
 
-UpdatePlayerHUD:: ; 3df48
+UpdatePlayerHUD::
 	push hl
 	push de
 	push bc
@@ -4719,9 +4567,8 @@ UpdatePlayerHUD:: ; 3df48
 	pop de
 	pop hl
 	ret
-; 3df58
 
-DrawPlayerHUD: ; 3df58
+DrawPlayerHUD:
 	xor a
 	ld [hBGMapMode], a
 
@@ -4757,14 +4604,12 @@ DrawPlayerHUD: ; 3df58
 	call FillInExpBar
 	pop de
 	ret
-; 3df98
 
-UpdatePlayerHPPal: ; 3df98
+UpdatePlayerHPPal:
 	ld hl, wPlayerHPPal
 	jp UpdateHPPal
-; 3df9e
 
-CheckDanger: ; 3df9e
+CheckDanger:
 	ld hl, wBattleMonHP
 	ld a, [hli]
 	or [hl]
@@ -4787,9 +4632,8 @@ CheckDanger: ; 3df9e
 
 .done
 	ret
-; 3dfbf
 
-PrintPlayerHUD: ; 3dfbf
+PrintPlayerHUD:
 	ld de, wBattleMonNick
 	hlcoord 10, 7
 	call ret_3e138
@@ -4850,9 +4694,8 @@ PrintPlayerHUD: ; 3dfbf
 	ld a, [wBattleMonLevel]
 	ld [wTempMonLevel], a
 	jp PrintLevel
-; 3e036
 
-UpdateEnemyHUD:: ; 3e036
+UpdateEnemyHUD::
 	push hl
 	push de
 	push bc
@@ -4862,9 +4705,8 @@ UpdateEnemyHUD:: ; 3e036
 	pop de
 	pop hl
 	ret
-; 3e043
 
-DrawEnemyHUD: ; 3e043
+DrawEnemyHUD:
 	xor a
 	ld [hBGMapMode], a
 
@@ -4995,28 +4837,24 @@ DrawEnemyHUD: ; 3e043
 	ld b, 0
 	call DrawBattleHPBar
 	ret
-; 3e127
 
-UpdateEnemyHPPal: ; 3e127
+UpdateEnemyHPPal:
 	ld hl, wEnemyHPPal
 	call UpdateHPPal
 	ret
-; 3e12e
 
-UpdateHPPal: ; 3e12e
+UpdateHPPal:
 	ld b, [hl]
 	call SetHPPal
 	ld a, [hl]
 	cp b
 	ret z
 	jp FinishBattleAnim
-; 3e138
 
-ret_3e138: ; 3e138
+ret_3e138:
 	ret
-; 3e139
 
-BattleMenu: ; 3e139
+BattleMenu:
 	xor a
 	ld [hBGMapMode], a
 	call LoadTempTileMapToTileMap
@@ -5062,17 +4900,15 @@ BattleMenu: ; 3e139
 	cp $4
 	jp z, BattleMenu_Run
 	jr .loop
-; 3e192
 
-BattleMenu_Fight: ; 3e192
+BattleMenu_Fight:
 	xor a
 	ld [wNumFleeAttempts], a
 	call Call_LoadTempTileMapToTileMap
 	and a
 	ret
-; 3e19b
 
-LoadBattleMenu2: ; 3e19b
+LoadBattleMenu2:
 	call IsMobileBattle
 	jr z, .mobile
 
@@ -5096,9 +4932,8 @@ LoadBattleMenu2: ; 3e19b
 .error
 	scf
 	ret
-; 3e1c7
 
-BattleMenu_Pack: ; 3e1c7
+BattleMenu_Pack:
 	ld a, [wLinkMode]
 	and a
 	jp nz, .ItemsCantBeUsed
@@ -5107,7 +4942,7 @@ BattleMenu_Pack: ; 3e1c7
 	and a
 	jp nz, .ItemsCantBeUsed
 
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 
 	ld a, [wBattleType]
 	cp BATTLETYPE_TUTORIAL
@@ -5148,15 +4983,13 @@ BattleMenu_Pack: ; 3e1c7
 	call FinishBattleAnim
 	call LoadTileMapToTempTileMap
 	jp BattleMenu
-; 3e22b
 
-.ItemsCantBeUsed: ; 3e22b
+.ItemsCantBeUsed:
 	ld hl, BattleText_ItemsCantBeUsedHere
 	call StdBattleTextBox
 	jp BattleMenu
-; 3e234
 
-.UseItem: ; 3e234
+.UseItem:
 	ld a, [wWildMon]
 	and a
 	jr nz, .run
@@ -5193,19 +5026,18 @@ BattleMenu_Pack: ; 3e1c7
 	xor a
 	ld [wWildMon], a
 	ld a, [wBattleResult]
-	and $c0
-	ld [wBattleResult], a
+	and BATTLERESULT_BITMASK
+	ld [wBattleResult], a ; WIN
 	call ClearWindowData
 	call SetPalettes
 	scf
 	ret
-; 3e28d
 
-BattleMenu_PKMN: ; 3e28d
-	call LoadStandardMenuDataHeader
+BattleMenu_PKMN:
+	call LoadStandardMenuHeader
 BattleMenuPKMN_ReturnFromStats:
 	call ExitMenu
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call ClearBGPalettes
 BattleMenuPKMN_Loop:
 	call SetUpBattlePartyMenu
@@ -5249,9 +5081,8 @@ BattleMenuPKMN_Loop:
 	call GetMemSGBLayout
 	call SetPalettes
 	jp BattleMenu
-; 3e2f5
 
-.GetMenu: ; 3e2f5
+.GetMenu:
 	call IsMobileBattle
 	jr z, .mobile
 	farcall BattleMonMenu
@@ -5260,9 +5091,8 @@ BattleMenuPKMN_Loop:
 .mobile
 	farcall MobileBattleMonMenu
 	ret
-; 3e308
 
-Battle_StatsScreen: ; 3e308
+Battle_StatsScreen:
 	call DisableLCD
 
 	ld hl, vTiles2 tile $31
@@ -5298,15 +5128,14 @@ Battle_StatsScreen: ; 3e308
 
 	call EnableLCD
 	ret
-; 3e358
 
-TryPlayerSwitch: ; 3e358
+TryPlayerSwitch:
 	ld a, [wCurBattleMon]
 	ld d, a
 	ld a, [wCurPartyMon]
 	cp d
 	jr nz, .check_trapped
-	ld hl, BattleText_PkmnIsAlreadyOut
+	ld hl, BattleText_MonIsAlreadyOut
 	call StdBattleTextBox
 	jp BattleMenuPKMN_Loop
 
@@ -5319,7 +5148,7 @@ TryPlayerSwitch: ; 3e358
 	jr z, .try_switch
 
 .trapped
-	ld hl, BattleText_PkmnCantBeRecalled
+	ld hl, BattleText_MonCantBeRecalled
 	call StdBattleTextBox
 	jp BattleMenuPKMN_Loop
 
@@ -5339,13 +5168,13 @@ TryPlayerSwitch: ; 3e358
 	call SetPalettes
 	ld a, [wCurPartyMon]
 	ld [wCurBattleMon], a
-PlayerSwitch: ; 3e3ad
+PlayerSwitch:
 	ld a, 1
 	ld [wPlayerIsSwitching], a
 	ld a, [wLinkMode]
 	and a
 	jr z, .not_linked
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call LinkBattleSendReceiveAction
 	call CloseWindow
 
@@ -5387,16 +5216,14 @@ PlayerSwitch: ; 3e3ad
 	call BattleMonEntrance
 	and a
 	ret
-; 3e3ff
 
-EnemyMonEntrance: ; 3e3ff
+EnemyMonEntrance:
 	callfar AI_Switch
 	call SetEnemyTurn
 	jp SpikesDamage
-; 3e40b
 
-BattleMonEntrance: ; 3e40b
-	call WithdrawPkmnText
+BattleMonEntrance:
+	call WithdrawMonText
 
 	ld c, 50
 	call DelayFrames
@@ -5419,7 +5246,7 @@ BattleMonEntrance: ; 3e40b
 	call AddBattleParticipant
 	call InitBattleMon
 	call ResetPlayerStatLevels
-	call SendOutPkmnText
+	call SendOutMonText
 	call NewBattleMonStatus
 	call BreakAttraction
 	call SendOutPlayerMon
@@ -5430,9 +5257,8 @@ BattleMonEntrance: ; 3e40b
 	ld a, $2
 	ld [wMenuCursorY], a
 	ret
-; 3e459
 
-PassedBattleMonEntrance: ; 3e459
+PassedBattleMonEntrance:
 	ld c, 50
 	call DelayFrames
 
@@ -5452,9 +5278,8 @@ PassedBattleMonEntrance: ; 3e459
 	call LoadTileMapToTempTileMap
 	call SetPlayerTurn
 	jp SpikesDamage
-; 3e489
 
-BattleMenu_Run: ; 3e489
+BattleMenu_Run:
 	call Call_LoadTempTileMapToTileMap
 	ld a, $3
 	ld [wMenuCursorY], a
@@ -5468,9 +5293,8 @@ BattleMenu_Run: ; 3e489
 	and a
 	ret nz
 	jp BattleMenu
-; 3e4a8
 
-CheckAmuletCoin: ; 3e4a8
+CheckAmuletCoin:
 	ld a, [wBattleMonItem]
 	ld b, a
 	callfar GetItemHeldEffect
@@ -5480,9 +5304,8 @@ CheckAmuletCoin: ; 3e4a8
 	ld a, 1
 	ld [wAmuletCoin], a
 	ret
-; 3e4bc
 
-MoveSelectionScreen: ; 3e4bc
+MoveSelectionScreen:
 	call IsMobileBattle
 	jr nz, .not_mobile
 	farcall MobileMoveSelectionScreen
@@ -5684,11 +5507,9 @@ MoveSelectionScreen: ; 3e4bc
 	call StdBattleTextBox
 	call Call_LoadTempTileMapToTileMap
 	jp MoveSelectionScreen
-; 3e61c
 
-.string_3e61c ; 3e61c
+.string_3e61c
 	db "@"
-; 3e61d
 
 .pressed_up
 	ld a, [wMenuCursorY]
@@ -5698,9 +5519,8 @@ MoveSelectionScreen: ; 3e4bc
 	inc a
 	ld [wMenuCursorY], a
 	jp .menu_loop
-; 3e62e
 
-.pressed_down ; 3e62e
+.pressed_down
 	ld a, [wMenuCursorY]
 	ld b, a
 	ld a, [wNumMoves]
@@ -5711,9 +5531,8 @@ MoveSelectionScreen: ; 3e4bc
 	ld a, $1
 	ld [wMenuCursorY], a
 	jp .menu_loop
-; 3e643
 
-.pressed_select ; 3e643
+.pressed_select
 	ld a, [wMoveSwapBuffer]
 	and a
 	jr z, .start_swap
@@ -5796,9 +5615,8 @@ MoveSelectionScreen: ; 3e4bc
 	ld a, [wMenuCursorY]
 	ld [wMoveSwapBuffer], a
 	jp MoveSelectionScreen
-; 3e6c8
 
-MoveInfoBox: ; 3e6c8
+MoveInfoBox:
 	xor a
 	ld [hBGMapMode], a
 
@@ -5868,15 +5686,13 @@ MoveInfoBox: ; 3e6c8
 
 .done
 	ret
-; 3e74f
 
 .Disabled:
 	db "Disabled!@"
 .Type:
 	db "TYPE/@"
-; 3e75f
 
-.PrintPP: ; 3e75f
+.PrintPP:
 	hlcoord 5, 11
 	ld a, [wLinkMode] ; What's the point of this check?
 	cp LINK_MOBILE
@@ -5896,9 +5712,8 @@ MoveInfoBox: ; 3e6c8
 	lb bc, 1, 2
 	call PrintNum
 	ret
-; 3e786
 
-CheckPlayerHasUsableMoves: ; 3e786
+CheckPlayerHasUsableMoves:
 	ld a, STRUGGLE
 	ld [wCurPlayerMove], a
 	ld a, [wPlayerDisableCount]
@@ -5938,15 +5753,14 @@ CheckPlayerHasUsableMoves: ; 3e786
 	ret nz
 
 .force_struggle
-	ld hl, BattleText_PkmnHasNoMovesLeft
+	ld hl, BattleText_MonHasNoMovesLeft
 	call StdBattleTextBox
 	ld c, 60
 	call DelayFrames
 	xor a
 	ret
-; 3e7c1
 
-ParseEnemyAction: ; 3e7c1
+ParseEnemyAction:
 	ld a, [wEnemyIsSwitching]
 	and a
 	ret nz
@@ -6094,9 +5908,8 @@ ParseEnemyAction: ; 3e7c1
 .struggle
 	ld a, STRUGGLE
 	jr .finish
-; 3e8c1
 
-ResetVarsForSubstatusRage: ; 3e8c1
+ResetVarsForSubstatusRage:
 	xor a
 	ld [wEnemyFuryCutterCount], a
 	ld [wEnemyProtectCount], a
@@ -6104,9 +5917,8 @@ ResetVarsForSubstatusRage: ; 3e8c1
 	ld hl, wEnemySubStatus4
 	res SUBSTATUS_RAGE, [hl]
 	ret
-; 3e8d1
 
-CheckEnemyLockedIn: ; 3e8d1
+CheckEnemyLockedIn:
 	ld a, [wEnemySubStatus4]
 	and 1 << SUBSTATUS_RECHARGE
 	ret nz
@@ -6119,14 +5931,12 @@ CheckEnemyLockedIn: ; 3e8d1
 	ld hl, wEnemySubStatus1
 	bit SUBSTATUS_ROLLOUT, [hl]
 	ret
-; 3e8e4
 
-LinkBattleSendReceiveAction: ; 3e8e4
+LinkBattleSendReceiveAction:
 	farcall _LinkBattleSendReceiveAction
 	ret
-; 3e8eb
 
-LoadEnemyMon: ; 3e8eb
+LoadEnemyMon:
 ; Initialize enemy monster parameters
 ; To do this we pull the species from wTempEnemyMonSpecies
 
@@ -6190,7 +6000,7 @@ LoadEnemyMon: ; 3e8eb
 
 ; 25% chance of getting an item
 	call BattleRandom
-	cp 1 + (75 percent)
+	cp 75 percent + 1
 	ld a, NO_ITEM
 	jr c, .UpdateItem
 
@@ -6226,7 +6036,6 @@ LoadEnemyMon: ; 3e8eb
 	jp .Happiness
 
 .InitDVs:
-
 ; Trainer DVs
 
 ; All trainers have preset DVs, determined by class
@@ -6408,7 +6217,7 @@ LoadEnemyMon: ; 3e8eb
 	ld de, wEnemyMonMaxHP
 	ld b, FALSE
 	ld hl, wEnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1) ; wLinkBattleRNs + 7 ; ?
-	predef CalcPkmnStats
+	predef CalcMonStats
 
 ; If we're in a trainer battle,
 ; get the rest of the parameters from the party struct
@@ -6464,7 +6273,7 @@ LoadEnemyMon: ; 3e8eb
 
 .InitRoamHP:
 ; HP only uses the lo byte in the RoamMon struct since
-; Raikou/Entei/Suicune will have < 256 hp at level 40
+; Raikou and Entei will have < 256 hp at level 40
 	ld a, [wEnemyMonHP + 1]
 	ld [hl], a
 	jr .Moves
@@ -6595,9 +6404,8 @@ LoadEnemyMon: ; 3e8eb
 	call CopyBytes
 
 	ret
-; 3eb38
 
-CheckSleepingTreeMon: ; 3eb38
+CheckSleepingTreeMon:
 ; Return carry if species is in the list
 ; for the current time of day
 
@@ -6628,7 +6436,7 @@ CheckSleepingTreeMon: ; 3eb38
 
 INCLUDE "data/wild/treemons_asleep.asm"
 
-CheckUnownLetter: ; 3eb75
+CheckUnownLetter:
 ; Return carry if the Unown letter hasn't been unlocked yet
 
 	ld a, [wUnlockedUnowns]
@@ -6642,7 +6450,7 @@ CheckUnownLetter: ; 3eb75
 	jr nc, .next
 
 ; Is our letter in the set?
-	ld hl, .LetterSets
+	ld hl, UnlockedUnownLetterSets
 	add hl, de
 	ld a, [hli]
 	ld h, [hl]
@@ -6663,7 +6471,7 @@ CheckUnownLetter: ; 3eb75
 	inc e
 	inc e
 	ld a, e
-	cp .Set1 - .LetterSets
+	cp UnlockedUnownLetterSets.End - UnlockedUnownLetterSets
 	jr c, .loop
 
 ; Hasn't been unlocked, or the letter is invalid
@@ -6675,28 +6483,9 @@ CheckUnownLetter: ; 3eb75
 	and a
 	ret
 
-.LetterSets:
-	dw .Set1
-	dw .Set2
-	dw .Set3
-	dw .Set4
-
-.Set1:
-	;  A   B   C   D   E   F   G   H   I   J   K
-	db 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, $ff
-.Set2:
-	;  L   M   N   O   P   Q   R
-	db 12, 13, 14, 15, 16, 17, 18, $ff
-.Set3:
-	;  S   T   U   V   W
-	db 19, 20, 21, 22, 23, $ff
-.Set4:
-	;  X   Y   Z
-	db 24, 25, 26, $ff
-
-; 3ebc7
+INCLUDE "data/wild/unlocked_unowns.asm"
 
-Unreferenced_SwapBattlerLevels: ; 3ebc7
+Unreferenced_SwapBattlerLevels:
 	push bc
 	ld a, [wBattleMonLevel]
 	ld b, a
@@ -6706,9 +6495,8 @@ Unreferenced_SwapBattlerLevels: ; 3ebc7
 	ld [wEnemyMonLevel], a
 	pop bc
 	ret
-; 3ebd8
 
-BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8
+BattleWinSlideInEnemyTrainerFrontpic:
 	xor a
 	ld [wTempEnemyMonSpecies], a
 	call FinishBattleAnim
@@ -6748,9 +6536,8 @@ BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8
 	pop bc
 	dec hl
 	jr .outer_loop
-; 3ec1a
 
-.CopyColumn: ; 3ec1a
+.CopyColumn:
 	push hl
 	push de
 	push bc
@@ -6768,24 +6555,20 @@ BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8
 	pop de
 	pop hl
 	ret
-; 3ec2c
 
-ApplyStatusEffectOnPlayerStats: ; 3ec2c
+ApplyStatusEffectOnPlayerStats:
 	ld a, 1
 	jr ApplyStatusEffectOnStats
-; 3ec30
 
-ApplyStatusEffectOnEnemyStats: ; 3ec30
+ApplyStatusEffectOnEnemyStats:
 	xor a
-; 3ec31
 
-ApplyStatusEffectOnStats: ; 3ec31
+ApplyStatusEffectOnStats:
 	ld [hBattleTurn], a
 	call ApplyPrzEffectOnSpeed
 	jp ApplyBrnEffectOnAttack
-; 3ec39
 
-ApplyPrzEffectOnSpeed: ; 3ec39
+ApplyPrzEffectOnSpeed:
 	ld a, [hBattleTurn]
 	and a
 	jr z, .enemy
@@ -6829,9 +6612,8 @@ ApplyPrzEffectOnSpeed: ; 3ec39
 .enemy_ok
 	ld [hl], b
 	ret
-; 3ec76
 
-ApplyBrnEffectOnAttack: ; 3ec76
+ApplyBrnEffectOnAttack:
 	ld a, [hBattleTurn]
 	and a
 	jr z, .enemy
@@ -6871,9 +6653,8 @@ ApplyBrnEffectOnAttack: ; 3ec76
 .enemy_ok
 	ld [hl], b
 	ret
-; 3ecab
 
-ApplyStatLevelMultiplierOnAllStats: ; 3ecab
+ApplyStatLevelMultiplierOnAllStats:
 ; Apply StatLevelMultipliers on all 5 Stats
 	ld c, 0
 .stat_loop
@@ -6883,9 +6664,8 @@ ApplyStatLevelMultiplierOnAllStats: ; 3ecab
 	cp 5
 	jr nz, .stat_loop
 	ret
-; 3ecb7
 
-ApplyStatLevelMultiplier: ; 3ecb7
+ApplyStatLevelMultiplier:
 	push bc
 	push bc
 	ld a, [wd265]
@@ -6920,7 +6700,7 @@ ApplyStatLevelMultiplier: ; 3ecb7
 .okay2
 	pop bc
 	push hl
-	ld hl, .StatLevelMultipliers
+	ld hl, StatLevelMultipliers_Applied
 	dec b
 	sla b
 	ld c, b
@@ -6967,28 +6747,10 @@ ApplyStatLevelMultiplier: ; 3ecb7
 .okay4
 	pop bc
 	ret
-; 3ed2b
 
-.StatLevelMultipliers:
-;	      /
-	db 25, 100 ; 25%
-	db 28, 100 ; 28%
-	db 33, 100 ; 33%
-	db 40, 100 ; 40%
-	db 50, 100 ; 50%
-	db 66, 100 ; 66%
+INCLUDE "data/battle/stat_multipliers_2.asm"
 
-	db  1,  1 ; 100%
-
-	db 15, 10 ; 150%
-	db  2,  1 ; 200%
-	db 25, 10 ; 250%
-	db  3,  1 ; 300%
-	db 35, 10 ; 350%
-	db  4,  1 ; 400%
-; 3ed45
-
-BadgeStatBoosts: ; 3ed45
+BadgeStatBoosts:
 ; Raise the stats of the battle mon in wBattleMon
 ; depending on which badges have been obtained.
 
@@ -7045,9 +6807,8 @@ BadgeStatBoosts: ; 3ed45
 	srl a
 	call c, BoostStat
 	ret
-; 3ed7c
 
-BoostStat: ; 3ed7c
+BoostStat:
 ; Raise stat at hl by 1/8.
 
 	ld a, [hli]
@@ -7077,17 +6838,14 @@ BoostStat: ; 3ed7c
 	ld a, LOW(MAX_STAT_VALUE)
 	ld [hld], a
 	ret
-; 3ed9f
 
-_LoadBattleFontsHPBar: ; 3ed9f
+_LoadBattleFontsHPBar:
 	callfar LoadBattleFontsHPBar
 	ret
-; 3eda6
 
-_LoadHPBar: ; 3eda6
+_LoadHPBar:
 	callfar LoadHPBar
 	ret
-; 3edad
 
 Unreferenced_LoadHPExpBarGFX:
 	ld de, EnemyHPBarBorderGFX
@@ -7102,16 +6860,14 @@ Unreferenced_LoadHPExpBarGFX:
 	ld hl, vTiles2 tile $55
 	lb bc, BANK(ExpBarGFX), 8
 	jp Get2bpp
-; 3edd1
 
-EmptyBattleTextBox: ; 3edd1
+EmptyBattleTextBox:
 	ld hl, .empty
 	jp BattleTextBox
 .empty
 	db "@"
-; 3edd8
 
-_BattleRandom:: ; 3edd8
+_BattleRandom::
 ; If the normal RNG is used in a link battle it'll desync.
 ; To circumvent this a shared PRNG is used instead.
 
@@ -7178,25 +6934,22 @@ _BattleRandom:: ; 3edd8
 	pop bc
 	pop hl
 	ret
-; 3ee0f
 
-Call_PlayBattleAnim_OnlyIfVisible: ; 3ee0f
+Call_PlayBattleAnim_OnlyIfVisible:
 	ld a, BATTLE_VARS_SUBSTATUS3
 	call GetBattleVar
 	and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
 	ret nz
-; 3ee17
 
-Call_PlayBattleAnim: ; 3ee17
+Call_PlayBattleAnim:
 	ld a, e
 	ld [wFXAnimID], a
 	ld a, d
 	ld [wFXAnimID + 1], a
 	call WaitBGMap
 	predef_jump PlayBattleAnim
-; 3ee27
 
-FinishBattleAnim: ; 3ee27
+FinishBattleAnim:
 	push af
 	push bc
 	push de
@@ -7210,9 +6963,8 @@ FinishBattleAnim: ; 3ee27
 	pop bc
 	pop af
 	ret
-; 3ee3b
 
-GiveExperiencePoints: ; 3ee3b
+GiveExperiencePoints:
 ; Give experience.
 ; Don't give experience if linked or in the Battle Tower.
 	ld a, [wLinkMode]
@@ -7240,7 +6992,7 @@ GiveExperiencePoints: ; 3ee3b
 	ld a, [wCurPartyMon]
 	ld c, a
 	ld b, CHECK_FLAG
-	ld d, $0
+	ld d, FALSE
 	predef SmallFarFlagAction
 	ld a, c
 	and a
@@ -7254,7 +7006,7 @@ GiveExperiencePoints: ; 3ee3b
 	ld e, l
 	ld hl, wEnemyMonBaseStats - 1
 	push bc
-	ld c, $5
+	ld c, NUM_EXP_STATS
 .loop1
 	inc hl
 	ld a, [de]
@@ -7350,7 +7102,7 @@ GiveExperiencePoints: ; 3ee3b
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
 	call GetNick
-	ld hl, Text_PkmnGainedExpPoint
+	ld hl, Text_MonGainedExpPoint
 	call BattleTextBox
 	ld a, [wStringBuffer2 + 1]
 	ld [hQuotient + 2], a
@@ -7419,7 +7171,7 @@ GiveExperiencePoints: ; 3ee3b
 .not_max_exp
 	xor a ; PARTYMON
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	callfar CalcLevel
 	pop bc
 	ld hl, MON_LEVEL
@@ -7456,7 +7208,7 @@ GiveExperiencePoints: ; 3ee3b
 	add hl, bc
 	push bc
 	ld b, TRUE
-	predef CalcPkmnStats
+	predef CalcMonStats
 	pop bc
 	pop de
 	ld hl, MON_MAXHP + 1
@@ -7532,15 +7284,15 @@ GiveExperiencePoints: ; 3ee3b
 .skip_animation2
 	xor a ; PARTYMON
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	hlcoord 9, 0
-	ld b, $a
-	ld c, $9
+	ld b, 10
+	ld c, 9
 	call TextBox
 	hlcoord 11, 1
 	ld bc, 4
 	predef PrintTempMonStats
-	ld c, $1e
+	ld c, 30
 	call DelayFrames
 	call WaitPressAorB_BlinkCursor
 	call Call_LoadTempTileMapToTileMap
@@ -7590,7 +7342,6 @@ GiveExperiencePoints: ; 3ee3b
 
 .done
 	jp ResetBattleParticipants
-; 3f0d4
 
 .EvenlyDivideExpAmongParticipants:
 ; count number of battle participants
@@ -7625,9 +7376,8 @@ GiveExperiencePoints: ; 3ee3b
 	dec c
 	jr nz, .count_loop2
 	ret
-; 3f106
 
-BoostExp: ; 3f106
+BoostExp:
 ; Multiply experience by 1.5x
 	push bc
 ; load experience value
@@ -7646,9 +7396,8 @@ BoostExp: ; 3f106
 	ld [hProduct + 2], a
 	pop bc
 	ret
-; 3f11b
 
-Text_PkmnGainedExpPoint: ; 3f11b
+Text_MonGainedExpPoint:
 	text_jump Text_Gained
 	start_asm
 	ld hl, TextJump_StringBuffer2ExpPoints
@@ -7658,19 +7407,16 @@ Text_PkmnGainedExpPoint: ; 3f11b
 
 	ld hl, TextJump_ABoostedStringBuffer2ExpPoints
 	ret
-; 3f12c
 
-TextJump_ABoostedStringBuffer2ExpPoints: ; 3f12c
+TextJump_ABoostedStringBuffer2ExpPoints:
 	text_jump Text_ABoostedStringBuffer2ExpPoints
 	db "@"
-; 3f131
 
-TextJump_StringBuffer2ExpPoints: ; 3f131
+TextJump_StringBuffer2ExpPoints:
 	text_jump Text_StringBuffer2ExpPoints
 	db "@"
-; 3f136
 
-AnimateExpBar: ; 3f136
+AnimateExpBar:
 	push bc
 
 	ld hl, wCurPartyMon
@@ -7692,7 +7438,7 @@ AnimateExpBar: ; 3f136
 	ld [wd002], a
 	xor a ; PARTYMON
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	ld a, [wTempMonLevel]
 	ld b, a
 	ld e, a
@@ -7856,23 +7602,23 @@ AnimateExpBar: ; 3f136
 	ld [hBGMapMode], a
 	ret
 
-SendOutPkmnText: ; 3f26d
+SendOutMonText:
 	ld a, [wLinkMode]
 	and a
 	jr z, .not_linked
 
-	ld hl, JumpText_GoPkmn ; If we're in a LinkBattle print just "Go <PlayerMon>"
+	ld hl, JumpText_GoMon ; If we're in a LinkBattle print just "Go <PlayerMon>"
 
 	ld a, [wBattleHasJustStarted] ; unless this (unidentified) variable is set
 	and a
 	jr nz, .skip_to_textbox
 
 .not_linked
-; Depending on the HP of the enemy Pkmn, the game prints a different text
+; Depending on the HP of the enemy mon, the game prints a different text
 	ld hl, wEnemyMonHP
 	ld a, [hli]
 	or [hl]
-	ld hl, JumpText_GoPkmn
+	ld hl, JumpText_GoMon
 	jr z, .skip_to_textbox
 
 	; compute enemy helth remaining as a percentage
@@ -7901,62 +7647,56 @@ SendOutPkmnText: ; 3f26d
 	call Divide
 
 	ld a, [hQuotient + 2]
-	ld hl, JumpText_GoPkmn
+	ld hl, JumpText_GoMon
 	cp 70
 	jr nc, .skip_to_textbox
 
-	ld hl, JumpText_DoItPkmn
+	ld hl, JumpText_DoItMon
 	cp 40
 	jr nc, .skip_to_textbox
 
-	ld hl, JumpText_GoForItPkmn
+	ld hl, JumpText_GoForItMon
 	cp 10
 	jr nc, .skip_to_textbox
 
-	ld hl, JumpText_YourFoesWeakGetmPkmn
+	ld hl, JumpText_YourFoesWeakGetmMon
 .skip_to_textbox
 	jp BattleTextBox
-; 3f2d1
 
-JumpText_GoPkmn: ; 3f2d1
-	text_jump Text_GoPkmn
+JumpText_GoMon:
+	text_jump Text_GoMon
 	start_asm
 	jr Function_TextJump_BattleMonNick01
-; 3f2d6
 
-JumpText_DoItPkmn: ; 3f2d8
-	text_jump Text_DoItPkmn
+JumpText_DoItMon:
+	text_jump Text_DoItMon
 	start_asm
 	jr Function_TextJump_BattleMonNick01
-; 3f2dd
 
-JumpText_GoForItPkmn: ; 3f2df
-	text_jump Text_GoForItPkmn
+JumpText_GoForItMon:
+	text_jump Text_GoForItMon
 	start_asm
 	jr Function_TextJump_BattleMonNick01
-; 3f2e4
 
-JumpText_YourFoesWeakGetmPkmn: ; 3f2e6
-	text_jump Text_YourFoesWeakGetmPkmn
+JumpText_YourFoesWeakGetmMon:
+	text_jump Text_YourFoesWeakGetmMon
 	start_asm
-Function_TextJump_BattleMonNick01: ; 3f2eb
+Function_TextJump_BattleMonNick01:
 	ld hl, TextJump_BattleMonNick01
 	ret
-; 3f2ef
 
-TextJump_BattleMonNick01: ; 3f2ef
+TextJump_BattleMonNick01:
 	text_jump Text_BattleMonNick01
 	db "@"
-; 3f2f4
 
-WithdrawPkmnText: ; 3f2f4
-	ld hl, .WithdrawPkmnText
+WithdrawMonText:
+	ld hl, .WithdrawMonText
 	jp BattleTextBox
 
-.WithdrawPkmnText:
+.WithdrawMonText:
 	text_jump Text_BattleMonNickComma
 	start_asm
-; Print text to withdraw Pkmn
+; Print text to withdraw mon
 ; depending on HP the message is different
 	push de
 	push bc
@@ -8003,33 +7743,27 @@ WithdrawPkmnText: ; 3f2f4
 
 	ld hl, TextJump_GoodComeBack
 	ret
-; 3f348
 
-TextJump_ThatsEnoughComeBack: ; 3f348
+TextJump_ThatsEnoughComeBack:
 	text_jump Text_ThatsEnoughComeBack
 	db "@"
-; 3f34d
 
-TextJump_OKComeBack: ; 3f34d
+TextJump_OKComeBack:
 	text_jump Text_OKComeBack
 	db "@"
-; 3f352
 
-TextJump_GoodComeBack: ; 3f352
+TextJump_GoodComeBack:
 	text_jump Text_GoodComeBack
 	db "@"
-; 3f357
 
-Unreferenced_TextJump_ComeBack: ; 3f357
+Unreferenced_TextJump_ComeBack:
 ; this function doesn't seem to be used
 	ld hl, TextJump_ComeBack
 	ret
-; 3f35b
 
-TextJump_ComeBack: ; 3f35b
+TextJump_ComeBack:
 	text_jump Text_ComeBack
 	db "@"
-; 3f360
 
 Unreferenced_HandleSafariAngerEatingStatus:
 	ld hl, wSafariMonEating
@@ -8037,7 +7771,7 @@ Unreferenced_HandleSafariAngerEatingStatus:
 	and a
 	jr z, .angry
 	dec [hl]
-	ld hl, BattleText_WildPkmnIsEating
+	ld hl, BattleText_WildMonIsEating
 	jr .finish
 
 .angry
@@ -8046,7 +7780,7 @@ Unreferenced_HandleSafariAngerEatingStatus:
 	and a
 	ret z
 	dec [hl]
-	ld hl, BattleText_WildPkmnIsAngry
+	ld hl, BattleText_WildMonIsAngry
 	jr nz, .finish
 	push hl
 	ld a, [wEnemyMonSpecies]
@@ -8061,18 +7795,16 @@ Unreferenced_HandleSafariAngerEatingStatus:
 	call Call_LoadTempTileMapToTileMap
 	pop hl
 	jp StdBattleTextBox
-; 3f390
 
-FillInExpBar: ; 3f390
+FillInExpBar:
 	push hl
 	call CalcExpBar
 	pop hl
 	ld de, 7
 	add hl, de
 	jp PlaceExpBar
-; 3f39c
 
-CalcExpBar: ; 3f39c
+CalcExpBar:
 ; Calculate the percent exp between this level and the next
 ; Level in b
 	push de
@@ -8171,9 +7903,8 @@ CalcExpBar: ; 3f39c
 	sub b
 	ld b, a
 	ret
-; 3f41c
 
-PlaceExpBar: ; 3f41c
+PlaceExpBar:
 	ld c, $8 ; number of tiles
 .loop1
 	ld a, b
@@ -8203,15 +7934,14 @@ PlaceExpBar: ; 3f41c
 
 .finish
 	ret
-; 3f43d
 
-GetBattleMonBackpic: ; 3f43d
+GetBattleMonBackpic:
 	ld a, [wPlayerSubStatus4]
 	bit SUBSTATUS_SUBSTITUTE, a
 	ld hl, BattleAnimCmd_RaiseSub
 	jr nz, GetBattleMonBackpic_DoAnim ; substitute
 
-DropPlayerSub: ; 3f447
+DropPlayerSub:
 	ld a, [wPlayerMinimized]
 	and a
 	ld hl, BattleAnimCmd_MinimizeOpp
@@ -8227,9 +7957,8 @@ DropPlayerSub: ; 3f447
 	pop af
 	ld [wCurPartySpecies], a
 	ret
-; 3f46f
 
-GetBattleMonBackpic_DoAnim: ; 3f46f
+GetBattleMonBackpic_DoAnim:
 	ld a, [hBattleTurn]
 	push af
 	xor a
@@ -8239,15 +7968,14 @@ GetBattleMonBackpic_DoAnim: ; 3f46f
 	pop af
 	ld [hBattleTurn], a
 	ret
-; 3f47c
 
-GetEnemyMonFrontpic: ; 3f47c
+GetEnemyMonFrontpic:
 	ld a, [wEnemySubStatus4]
 	bit SUBSTATUS_SUBSTITUTE, a
 	ld hl, BattleAnimCmd_RaiseSub
 	jr nz, GetEnemyMonFrontpic_DoAnim
 
-DropEnemySub: ; 3f486
+DropEnemySub:
 	ld a, [wEnemyMinimized]
 	and a
 	ld hl, BattleAnimCmd_MinimizeOpp
@@ -8266,9 +7994,8 @@ DropEnemySub: ; 3f486
 	pop af
 	ld [wCurPartySpecies], a
 	ret
-; 3f4b4
 
-GetEnemyMonFrontpic_DoAnim: ; 3f4b4
+GetEnemyMonFrontpic_DoAnim:
 	ld a, [hBattleTurn]
 	push af
 	call SetEnemyTurn
@@ -8277,9 +8004,8 @@ GetEnemyMonFrontpic_DoAnim: ; 3f4b4
 	pop af
 	ld [hBattleTurn], a
 	ret
-; 3f4c1
 
-StartBattle: ; 3f4c1
+StartBattle:
 ; This check prevents you from entering a battle without any Pokemon.
 ; Those using walk-through-walls to bypass getting a Pokemon experience
 ; the effects of this check.
@@ -8296,14 +8022,12 @@ StartBattle: ; 3f4c1
 	ld [wTimeOfDayPal], a
 	scf
 	ret
-; 3f4d9
 
-Unreferenced_DoBattle: ; 3f4d9
+Unreferenced_DoBattle:
 	call DoBattle
 	ret
-; 3f4dd
 
-BattleIntro: ; 3f4dd
+BattleIntro:
 	farcall StubbedTrainerRankings_Battles ; mobile
 	call LoadTrainerOrWildMonPic
 	xor a
@@ -8342,9 +8066,8 @@ BattleIntro: ; 3f4dd
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; 3f54e
 
-LoadTrainerOrWildMonPic: ; 3f54e
+LoadTrainerOrWildMonPic:
 	ld a, [wOtherTrainerClass]
 	and a
 	jr nz, .Trainer
@@ -8354,16 +8077,14 @@ LoadTrainerOrWildMonPic: ; 3f54e
 .Trainer:
 	ld [wTempEnemyMonSpecies], a
 	ret
-; 3f55e
 
-InitEnemy: ; 3f55e
+InitEnemy:
 	ld a, [wOtherTrainerClass]
 	and a
 	jp nz, InitEnemyTrainer ; trainer
 	jp InitEnemyWildmon ; wild
-; 3f568
 
-BackUpBGMap2: ; 3f568
+BackUpBGMap2:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -8385,9 +8106,8 @@ BackUpBGMap2: ; 3f568
 	pop af
 	ld [rSVBK], a
 	ret
-; 3f594
 
-InitEnemyTrainer: ; 3f594
+InitEnemyTrainer:
 	ld [wTrainerClass], a
 	farcall StubbedTrainerRankings_TrainerBattles
 	xor a
@@ -8441,9 +8161,8 @@ InitEnemyTrainer: ; 3f594
 	jr .partyloop
 .done
 	ret
-; 3f607
 
-InitEnemyWildmon: ; 3f607
+InitEnemyWildmon:
 	ld a, WILD_BATTLE
 	ld [wBattleMode], a
 	farcall StubbedTrainerRankings_WildBattles
@@ -8476,9 +8195,8 @@ InitEnemyWildmon: ; 3f607
 	lb bc, 7, 7
 	predef PlaceGraphic
 	ret
-; 3f662
 
-Unreferenced_Function3f662: ; 3f662
+Unreferenced_Function3f662:
 	ld hl, wEnemyMonMoves
 	ld de, wListMoves_MoveIndicesBuffer
 	ld b, NUM_MOVES
@@ -8528,15 +8246,13 @@ Unreferenced_Function3f662: ; 3f662
 	dec b
 	jr nz, .clear
 	ret
-; 3f69e
 
-ExitBattle: ; 3f69e
+ExitBattle:
 	call .HandleEndOfBattle
 	call CleanUpBattleRAM
 	ret
-; 3f6a5
 
-.HandleEndOfBattle: ; 3f6a5
+.HandleEndOfBattle:
 	ld a, [wLinkMode]
 	and a
 	jr z, .not_linked
@@ -8556,9 +8272,8 @@ ExitBattle: ; 3f69e
 	predef EvolveAfterBattle
 	farcall GivePokerusAndConvertBerries
 	ret
-; 3f6d0
 
-CleanUpBattleRAM: ; 3f6d0
+CleanUpBattleRAM:
 	call BattleEnd_HandleRoamMons
 	xor a
 	ld [wLowHealthAlarm], a
@@ -8589,9 +8304,8 @@ CleanUpBattleRAM: ; 3f6d0
 	jr nz, .loop
 	call WaitSFX
 	ret
-; 3f71d
 
-CheckPayDay: ; 3f71d
+CheckPayDay:
 	ld hl, wPayDayMoney
 	ld a, [hli]
 	or [hl]
@@ -8625,9 +8339,8 @@ CheckPayDay: ; 3f71d
 	call ClearTileMap
 	call ClearBGPalettes
 	ret
-; 3f759
 
-ShowLinkBattleParticipantsAfterEnd: ; 3f759
+ShowLinkBattleParticipantsAfterEnd:
 	farcall StubbedTrainerRankings_LinkBattles
 	farcall BackupMobileEventIndex
 	ld a, [wCurOTMon]
@@ -8638,9 +8351,8 @@ ShowLinkBattleParticipantsAfterEnd: ; 3f759
 	call ClearTileMap
 	farcall _ShowLinkBattleParticipants
 	ret
-; 3f77c
 
-DisplayLinkBattleResult: ; 3f77c
+DisplayLinkBattleResult:
 	farcall CheckMobileBattleError
 	jp c, .Mobile_InvalidBattle
 	call IsMobileBattle2
@@ -8655,9 +8367,10 @@ DisplayLinkBattleResult: ; 3f77c
 .proceed
 	ld a, [wBattleResult]
 	and $f
-	cp $1
-	jr c, .victory
-	jr z, .loss
+	cp LOSE
+	jr c, .victory ; WIN
+	jr z, .loss ; LOSE
+	; DRAW
 	farcall StubbedTrainerRankings_ColosseumDraws
 	ld de, .Draw
 	jr .store_result
@@ -8698,7 +8411,6 @@ DisplayLinkBattleResult: ; 3f77c
 	call DelayFrames
 	call ClearTileMap
 	ret
-; 3f7f7
 
 .Win:
 	db "YOU WIN@"
@@ -8706,9 +8418,8 @@ DisplayLinkBattleResult: ; 3f77c
 	db "YOU LOSE@"
 .Draw:
 	db "  DRAW@"
-; 3f80f
 
-.Mobile_InvalidBattle: ; 3f80f
+.Mobile_InvalidBattle:
 	hlcoord 6, 8
 	ld de, .Invalid
 	call PlaceString
@@ -8716,19 +8427,16 @@ DisplayLinkBattleResult: ; 3f77c
 	call DelayFrames
 	call ClearTileMap
 	ret
-; 3f821
 
 .Invalid:
 	db "INVALID BATTLE@"
-; 3f830
 
-IsMobileBattle2: ; 3f830
+IsMobileBattle2:
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
 	ret
-; 3f836
 
-DisplayLinkRecord: ; 3f836
+_DisplayLinkRecord:
 	ld a, BANK(sLinkBattleStats)
 	call GetSRAMBank
 
@@ -8747,9 +8455,8 @@ DisplayLinkRecord: ; 3f836
 	call DelayFrames
 	call WaitPressAorB_BlinkCursor
 	ret
-; 3f85f
 
-ReadAndPrintLinkBattleRecord: ; 3f85f
+ReadAndPrintLinkBattleRecord:
 	call ClearTileMap
 	call ClearSprites
 	call .PrintBattleRecord
@@ -8866,30 +8573,27 @@ ReadAndPrintLinkBattleRecord: ; 3f85f
 	call PlaceString
 	scf
 	ret
-; 3f938
 
 .Scores:
 	db "   0    0    0@"
-; 3f947
 
-.Format: ; 3f947
-	db "  ---  <LNBRK>"
+.Format:
+	db "  ---  <LF>"
 	db "         -    -    -@"
-.Record: ; 3f964
+.Record:
 	db "<PLAYER>'s RECORD@"
-.Result: ; 3f96e
+.Result:
 	db "RESULT WIN LOSE DRAW@"
-.Total: ; 3f983
+.Total:
 	db "TOTAL  WIN LOSE DRAW@"
-; 3f998
 
-BattleEnd_HandleRoamMons: ; 3f998
+BattleEnd_HandleRoamMons:
 	ld a, [wBattleType]
 	cp BATTLETYPE_ROAMING
 	jr nz, .not_roaming
 	ld a, [wBattleResult]
 	and $f
-	jr z, .caught_or_defeated_roam_mon
+	jr z, .caught_or_defeated_roam_mon ; WIN
 	call GetRoamMonHP
 	ld a, [wEnemyMonHP + 1]
 	ld [hl], a
@@ -8897,13 +8601,13 @@ BattleEnd_HandleRoamMons: ; 3f998
 
 .caught_or_defeated_roam_mon
 	call GetRoamMonHP
-	ld [hl], $0
+	ld [hl], 0
 	call GetRoamMonMapGroup
-	ld [hl], $ff
+	ld [hl], GROUP_N_A
 	call GetRoamMonMapNumber
-	ld [hl], $ff
+	ld [hl], MAP_N_A
 	call GetRoamMonSpecies
-	ld [hl], $0
+	ld [hl], 0
 	ret
 
 .not_roaming
@@ -8914,9 +8618,8 @@ BattleEnd_HandleRoamMons: ; 3f998
 .update_roam_mons
 	callfar UpdateRoamMons
 	ret
-; 3f9d1
 
-GetRoamMonMapGroup: ; 3f9d1
+GetRoamMonMapGroup:
 	ld a, [wTempEnemyMonSpecies]
 	ld b, a
 	ld a, [wRoamMon1Species]
@@ -8929,9 +8632,8 @@ GetRoamMonMapGroup: ; 3f9d1
 	ret z
 	ld hl, wRoamMon3MapGroup
 	ret
-; 3f9e9
 
-GetRoamMonMapNumber: ; 3f9e9
+GetRoamMonMapNumber:
 	ld a, [wTempEnemyMonSpecies]
 	ld b, a
 	ld a, [wRoamMon1Species]
@@ -8944,9 +8646,8 @@ GetRoamMonMapNumber: ; 3f9e9
 	ret z
 	ld hl, wRoamMon3MapNumber
 	ret
-; 3fa01
 
-GetRoamMonHP: ; 3fa01
+GetRoamMonHP:
 ; output: hl = wRoamMonHP
 	ld a, [wTempEnemyMonSpecies]
 	ld b, a
@@ -8960,9 +8661,8 @@ GetRoamMonHP: ; 3fa01
 	ret z
 	ld hl, wRoamMon3HP
 	ret
-; 3fa19
 
-GetRoamMonDVs: ; 3fa19
+GetRoamMonDVs:
 ; output: hl = wRoamMonDVs
 	ld a, [wTempEnemyMonSpecies]
 	ld b, a
@@ -8976,9 +8676,8 @@ GetRoamMonDVs: ; 3fa19
 	ret z
 	ld hl, wRoamMon3DVs
 	ret
-; 3fa31
 
-GetRoamMonSpecies: ; 3fa31
+GetRoamMonSpecies:
 	ld a, [wTempEnemyMonSpecies]
 	ld hl, wRoamMon1Species
 	cp [hl]
@@ -8988,9 +8687,8 @@ GetRoamMonSpecies: ; 3fa31
 	ret z
 	ld hl, wRoamMon3Species
 	ret
-; 3fa42
 
-AddLastMobileBattleToLinkRecord: ; 3fa42
+AddLastMobileBattleToLinkRecord:
 	ld hl, wOTPlayerID
 	ld de, wStringBuffer1
 	ld bc, 2
@@ -9045,15 +8743,15 @@ AddLastMobileBattleToLinkRecord: ; 3fa42
 	call .StoreResult
 	call .FindOpponentAndAppendRecord
 	ret
-; 3faa0
-.StoreResult: ; 3faa0
+.StoreResult:
 	ld a, [wBattleResult]
 	and $f
-	cp $1
+	cp LOSE
 	ld bc, sLinkBattleWins + 1 - sLinkBattleResults
-	jr c, .okay
+	jr c, .okay ; WIN
 	ld bc, sLinkBattleLosses + 1 - sLinkBattleResults
-	jr z, .okay
+	jr z, .okay ; LOSE
+	; DRAW
 	ld bc, sLinkBattleDraws + 1 - sLinkBattleResults
 .okay
 	add hl, bc
@@ -9064,9 +8762,8 @@ AddLastMobileBattleToLinkRecord: ; 3fa42
 	dec hl
 	inc [hl]
 	ret
-; 3fabe
 
-.CheckOverflow: ; 3fabe
+.CheckOverflow:
 	dec hl
 	ld a, [hl]
 	inc hl
@@ -9075,9 +8772,8 @@ AddLastMobileBattleToLinkRecord: ; 3fa42
 	ld a, [hl]
 	cp LOW(MAX_LINK_RECORD)
 	ret
-; 3fac8
 
-.FindOpponentAndAppendRecord: ; 3fac8
+.FindOpponentAndAppendRecord:
 	ld b, 5
 	ld hl, sLinkBattleRecord + 17
 	ld de, wd002
@@ -9169,9 +8865,8 @@ AddLastMobileBattleToLinkRecord: ; 3fa42
 	pop de
 	call CopyBytes
 	ret
-; 3fb54
 
-.LoadPointer: ; 3fb54
+.LoadPointer:
 	ld e, $0
 	ld a, [hld]
 	ld c, a
@@ -9196,9 +8891,8 @@ AddLastMobileBattleToLinkRecord: ; 3fa42
 	ret nc
 	inc e
 	ret
-; 3fb6c
 
-InitBattleDisplay: ; 3fb6c
+InitBattleDisplay:
 	call .InitBackPic
 	hlcoord 0, 12
 	ld b, 4
@@ -9241,9 +8935,8 @@ InitBattleDisplay: ; 3fb6c
 	xor a
 	ld [hSCX], a
 	ret
-; 3fbd6
 
-.BlankBGMap: ; 3fbd6
+.BlankBGMap:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -9262,15 +8955,13 @@ InitBattleDisplay: ; 3fb6c
 	pop af
 	ld [rSVBK], a
 	ret
-; 3fbf8
 
-.InitBackPic: ; 3fbf8
+.InitBackPic:
 	call GetTrainerBackpic
 	call CopyBackpic
 	ret
-; 3fbff
 
-GetTrainerBackpic: ; 3fbff
+GetTrainerBackpic:
 ; Load the player character's backpic (6x6) into VRAM starting from vTiles2 tile $31.
 
 ; Special exception for Dude.
@@ -9282,10 +8973,10 @@ GetTrainerBackpic: ; 3fbff
 
 ; What gender are we?
 	ld a, [wPlayerSpriteSetupFlags]
-	bit 2, a ; transformed to male
+	bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a
 	jr nz, .Chris
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .Chris
 
 ; It's a girl.
@@ -9302,9 +8993,8 @@ GetTrainerBackpic: ; 3fbff
 	ld c, 7 * 7
 	predef DecompressGet2bpp
 	ret
-; 3fc30
 
-CopyBackpic: ; 3fc30
+CopyBackpic:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -9324,9 +9014,8 @@ CopyBackpic: ; 3fc30
 	lb bc, 6, 6
 	predef PlaceGraphic
 	ret
-; 3fc5b
 
-.LoadTrainerBackpicAsOAM: ; 3fc5b
+.LoadTrainerBackpicAsOAM:
 	ld hl, wVirtualOAMSprite00
 	xor a
 	ld [hMapObjectIndexBuffer], a
@@ -9360,9 +9049,8 @@ CopyBackpic: ; 3fc30
 	dec b
 	jr nz, .outer_loop
 	ret
-; 3fc8b
 
-BattleStartMessage: ; 3fc8b
+BattleStartMessage:
 	ld a, [wBattleMode]
 	dec a
 	jr z, .wild
@@ -9443,4 +9131,3 @@ BattleStartMessage: ; 3fc8b
 	farcall Mobile_PrintOpponentBattleMessage
 
 	ret
-; 3fd26
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index 48efba8fa..eb30af88b 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -1,4 +1,4 @@
-DoPlayerTurn: ; 34000
+DoPlayerTurn:
 	call SetPlayerTurn
 
 	ld a, [wBattlePlayerAction]
@@ -7,10 +7,7 @@ DoPlayerTurn: ; 34000
 
 	jr DoTurn
 
-; 3400a
-
-
-DoEnemyTurn: ; 3400a
+DoEnemyTurn:
 	call SetEnemyTurn
 
 	ld a, [wLinkMode]
@@ -24,10 +21,8 @@ DoEnemyTurn: ; 3400a
 	ret nc
 
 	; fallthrough
-; 3401d
-
 
-DoTurn: ; 3401d
+DoTurn:
 ; Read in and execute the user's move effects for this turn.
 
 	xor a
@@ -41,10 +36,8 @@ DoTurn: ; 3401d
 	ret nz
 
 	call UpdateMoveData
-; 3402c
 
-
-DoMove: ; 3402c
+DoMove:
 ; Get the user's move effect.
 	ld a, BATTLE_VARS_MOVE_EFFECT
 	call GetBattleVar
@@ -64,7 +57,7 @@ DoMove: ; 3402c
 	inc hl
 	ld [de], a
 	inc de
-	cp -1
+	cp endmove_command
 	jr nz, .GetMoveEffect
 
 ; Start at the first command.
@@ -75,7 +68,6 @@ DoMove: ; 3402c
 	ld [wBattleScriptBufferAddress + 1], a
 
 .ReadMoveEffectCommand:
-
 ; ld a, [wBattleScriptBufferAddress++]
 	ld a, [wBattleScriptBufferAddress]
 	ld l, a
@@ -115,11 +107,8 @@ DoMove: ; 3402c
 .DoMoveEffectCommand:
 	jp hl
 
-; 34084
-
-
 CheckTurn:
-BattleCommand_CheckTurn: ; 34084
+BattleCommand_CheckTurn:
 ; checkturn
 
 ; Repurposed as hardcoded turn handling. Useless as a command.
@@ -145,9 +134,7 @@ BattleCommand_CheckTurn: ; 34084
 	and a
 	jp nz, CheckEnemyTurn
 
-
 CheckPlayerTurn:
-
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_RECHARGE, [hl]
 	jr z, .no_recharge
@@ -160,7 +147,6 @@ CheckPlayerTurn:
 
 .no_recharge
 
-
 	ld hl, wBattleMonStatus
 	ld a, [hl]
 	and SLP
@@ -206,7 +192,6 @@ CheckPlayerTurn:
 
 .not_asleep
 
-
 	ld hl, wBattleMonStatus
 	bit FRZ, [hl]
 	jr z, .not_frozen
@@ -226,7 +211,6 @@ CheckPlayerTurn:
 
 .not_frozen
 
-
 	ld hl, wPlayerSubStatus3
 	bit SUBSTATUS_FLINCHED, [hl]
 	jr z, .not_flinched
@@ -240,7 +224,6 @@ CheckPlayerTurn:
 
 .not_flinched
 
-
 	ld hl, wPlayerDisableCount
 	ld a, [hl]
 	and a
@@ -258,7 +241,6 @@ CheckPlayerTurn:
 
 .not_disabled
 
-
 	ld a, [wPlayerSubStatus3]
 	add a
 	jr nc, .not_confused
@@ -297,7 +279,6 @@ CheckPlayerTurn:
 
 .not_confused
 
-
 	ld a, [wPlayerSubStatus1]
 	add a ; bit SUBSTATUS_ATTRACT
 	jr nc, .not_infatuated
@@ -321,7 +302,6 @@ CheckPlayerTurn:
 
 .not_infatuated
 
-
 	; We can't disable a move that doesn't exist.
 	ld a, [wDisabledMove]
 	and a
@@ -338,7 +318,6 @@ CheckPlayerTurn:
 
 .no_disabled_move
 
-
 	ld hl, wBattleMonStatus
 	bit PAR, [hl]
 	ret z
@@ -353,10 +332,7 @@ CheckPlayerTurn:
 	call CantMove
 	jp EndTurn
 
-; 341f0
-
-
-CantMove: ; 341f0
+CantMove:
 	ld a, BATTLE_VARS_SUBSTATUS1
 	call GetBattleVarAddr
 	res SUBSTATUS_ROLLOUT, [hl]
@@ -364,7 +340,7 @@ CantMove: ; 341f0
 	ld a, BATTLE_VARS_SUBSTATUS3
 	call GetBattleVarAddr
 	ld a, [hl]
-	and $ff ^ (1<<SUBSTATUS_BIDE + 1<<SUBSTATUS_RAMPAGE + 1<<SUBSTATUS_CHARGED)
+	and $ff ^ (1 << SUBSTATUS_BIDE | 1 << SUBSTATUS_RAMPAGE | 1 << SUBSTATUS_CHARGED)
 	ld [hl], a
 
 	call ResetFuryCutterCount
@@ -382,21 +358,12 @@ CantMove: ; 341f0
 	res SUBSTATUS_FLYING, [hl]
 	jp AppearUserRaiseSub
 
-; 34216
-
-
-
-OpponentCantMove: ; 34216
+OpponentCantMove:
 	call BattleCommand_SwitchTurn
 	call CantMove
 	jp BattleCommand_SwitchTurn
 
-; 3421f
-
-
-
-CheckEnemyTurn: ; 3421f
-
+CheckEnemyTurn:
 	ld hl, wEnemySubStatus4
 	bit SUBSTATUS_RECHARGE, [hl]
 	jr z, .no_recharge
@@ -409,7 +376,6 @@ CheckEnemyTurn: ; 3421f
 
 .no_recharge
 
-
 	ld hl, wEnemyMonStatus
 	ld a, [hl]
 	and SLP
@@ -453,7 +419,6 @@ CheckEnemyTurn: ; 3421f
 
 .not_asleep
 
-
 	ld hl, wEnemyMonStatus
 	bit FRZ, [hl]
 	jr z, .not_frozen
@@ -472,7 +437,6 @@ CheckEnemyTurn: ; 3421f
 
 .not_frozen
 
-
 	ld hl, wEnemySubStatus3
 	bit SUBSTATUS_FLINCHED, [hl]
 	jr z, .not_flinched
@@ -486,7 +450,6 @@ CheckEnemyTurn: ; 3421f
 
 .not_flinched
 
-
 	ld hl, wEnemyDisableCount
 	ld a, [hl]
 	and a
@@ -505,7 +468,6 @@ CheckEnemyTurn: ; 3421f
 
 .not_disabled
 
-
 	ld a, [wEnemySubStatus3]
 	add a ; bit SUBSTATUS_CONFUSED
 	jr nc, .not_confused
@@ -520,7 +482,6 @@ CheckEnemyTurn: ; 3421f
 	call StdBattleTextBox
 	jr .not_confused
 
-
 .confused
 	ld hl, IsConfusedText
 	call StdBattleTextBox
@@ -532,7 +493,7 @@ CheckEnemyTurn: ; 3421f
 
 	; 50% chance of hitting itself
 	call BattleRandom
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jr nc, .not_confused
 
 	; clear confusion-dependent substatus
@@ -556,15 +517,14 @@ CheckEnemyTurn: ; 3421f
 	and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
 	call z, PlayFXAnimID
 
-	ld c, $1
-	call EnemyHurtItself
+	ld c, TRUE
+	call DoEnemyDamage
 	call BattleCommand_RaiseSub
 	call CantMove
 	jp EndTurn
 
 .not_confused
 
-
 	ld a, [wEnemySubStatus1]
 	add a ; bit SUBSTATUS_ATTRACT
 	jr nc, .not_infatuated
@@ -578,7 +538,7 @@ CheckEnemyTurn: ; 3421f
 
 	; 50% chance of infatuation
 	call BattleRandom
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jr c, .not_infatuated
 
 	ld hl, InfatuationText
@@ -588,7 +548,6 @@ CheckEnemyTurn: ; 3421f
 
 .not_infatuated
 
-
 	; We can't disable a move that doesn't exist.
 	ld a, [wEnemyDisabledMove]
 	and a
@@ -606,7 +565,6 @@ CheckEnemyTurn: ; 3421f
 
 .no_disabled_move
 
-
 	ld hl, wEnemyMonStatus
 	bit PAR, [hl]
 	ret z
@@ -621,19 +579,13 @@ CheckEnemyTurn: ; 3421f
 	call CantMove
 
 	; fallthrough
-; 34385
 
-
-EndTurn: ; 34385
+EndTurn:
 	ld a, $1
 	ld [wTurnEnded], a
 	jp ResetDamage
 
-; 3438d
-
-
-MoveDisabled: ; 3438d
-
+MoveDisabled:
 	; Make sure any charged moves fail
 	ld a, BATTLE_VARS_SUBSTATUS3
 	call GetBattleVarAddr
@@ -647,11 +599,7 @@ MoveDisabled: ; 3438d
 	ld hl, DisabledMoveText
 	jp StdBattleTextBox
 
-; 343a5
-
-
-HitConfusion: ; 343a5
-
+HitConfusion:
 	ld hl, HurtItselfText
 	call StdBattleTextBox
 
@@ -676,14 +624,11 @@ HitConfusion: ; 343a5
 	call CallBattleCore
 	ld a, $1
 	ld [hBGMapMode], a
-	ld c, $1
-	call PlayerHurtItself
+	ld c, TRUE
+	call DoPlayerDamage
 	jp BattleCommand_RaiseSub
 
-; 343db
-
-
-BattleCommand_CheckObedience: ; 343db
+BattleCommand_CheckObedience:
 ; checkobedience
 
 	; Enemy can't disobey
@@ -725,7 +670,6 @@ BattleCommand_CheckObedience: ; 343db
 	cp [hl]
 	ret z
 
-
 .obeylevel
 	; The maximum obedience level is constrained by owned badges:
 	ld hl, wJohtoBadges
@@ -753,7 +697,6 @@ BattleCommand_CheckObedience: ; 343db
 	; no badges
 	ld a, 10
 
-
 .getlevel
 ; c = obedience level
 ; d = monster level
@@ -772,14 +715,12 @@ BattleCommand_CheckObedience: ; 343db
 	jr nc, .checklevel
 	ld b, $ff
 
-
 .checklevel
 ; If the monster's level is lower than the obedience level, it will obey.
 	ld a, c
 	cp d
 	ret nc
 
-
 ; Random number from 0 to obedience level + monster level
 .rand1
 	call BattleRandom
@@ -797,7 +738,6 @@ BattleCommand_CheckObedience: ; 343db
 	call IgnoreSleepOnly
 	ret c
 
-
 ; Another random number from 0 to obedience level + monster level
 .rand2
 	call BattleRandom
@@ -808,7 +748,6 @@ BattleCommand_CheckObedience: ; 343db
 	cp c
 	jr c, .UseInstead
 
-
 ; No hope of using a move now.
 
 ; b = number of levels the monster is above the obedience level
@@ -831,7 +770,6 @@ BattleCommand_CheckObedience: ; 343db
 	call HitConfusion
 	jp .EndDisobedience
 
-
 .Nap:
 	call BattleRandom
 	add a
@@ -844,7 +782,6 @@ BattleCommand_CheckObedience: ; 343db
 	ld hl, BeganToNapText
 	jr .Print
 
-
 .DoNothing:
 	; 4 random choices
 	call BattleRandom
@@ -868,9 +805,7 @@ BattleCommand_CheckObedience: ; 343db
 	call StdBattleTextBox
 	jp .EndDisobedience
 
-
 .UseInstead:
-
 ; Can't use another move if the monster only has one!
 	ld a, [wBattleMonMoves + 1]
 	and a
@@ -881,7 +816,6 @@ BattleCommand_CheckObedience: ; 343db
 	and a
 	jr nz, .DoNothing
 
-
 	ld hl, wBattleMonPP
 	ld de, wBattleMonMoves
 	ld b, 0
@@ -902,7 +836,6 @@ BattleCommand_CheckObedience: ; 343db
 	and a
 	jr nz, .GetTotalPP
 
-
 .CheckMovePP:
 	ld hl, wBattleMonPP
 	ld a, [wCurMoveNum]
@@ -916,7 +849,6 @@ BattleCommand_CheckObedience: ; 343db
 	cp b
 	jr z, .DoNothing
 
-
 ; Make sure we can actually use the move once we get there.
 	ld a, 1
 	ld [wAlreadyDisobeyed], a
@@ -929,7 +861,6 @@ BattleCommand_CheckObedience: ; 343db
 	ld c, a
 	push af
 
-
 .RandomMove:
 	call BattleRandom
 	maskbits NUM_MOVES
@@ -951,7 +882,6 @@ BattleCommand_CheckObedience: ; 343db
 	and PP_MASK
 	jr z, .RandomMove
 
-
 ; Use it.
 	ld a, [wCurMoveNum]
 	ld c, a
@@ -965,12 +895,10 @@ BattleCommand_CheckObedience: ; 343db
 	call UpdateMoveData
 	call DoMove
 
-
 ; Restore original move choice.
 	pop af
 	ld [wCurMoveNum], a
 
-
 .EndDisobedience:
 	xor a
 	ld [wLastPlayerMove], a
@@ -984,11 +912,7 @@ BattleCommand_CheckObedience: ; 343db
 
 	jp EndMoveEffect
 
-; 3451f
-
-
-IgnoreSleepOnly: ; 3451f
-
+IgnoreSleepOnly:
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 
@@ -1015,19 +939,12 @@ IgnoreSleepOnly: ; 3451f
 	scf
 	ret
 
-; 34541
-
-
-BattleCommand_UsedMoveText: ; 34541
+BattleCommand_UsedMoveText:
 ; usedmovetext
 	farcall DisplayUsedMoveText
 	ret
 
-; 34548
-
-
-CheckUserIsCharging: ; 34548
-
+CheckUserIsCharging:
 	ld a, [hBattleTurn]
 	and a
 	ld a, [wPlayerCharging] ; player
@@ -1037,10 +954,7 @@ CheckUserIsCharging: ; 34548
 	and a
 	ret
 
-; 34555
-
-
-BattleCommand_DoTurn: ; 34555
+BattleCommand_DoTurn:
 	call CheckUserIsCharging
 	ret nz
 
@@ -1165,9 +1079,7 @@ BattleCommand_DoTurn: ; 34555
 	ld b, 1
 	ret
 
-; 34602
-
-.continuousmoves ; 34602
+.continuousmoves
 	db EFFECT_RAZOR_WIND
 	db EFFECT_SKY_ATTACK
 	db EFFECT_SKULL_BASH
@@ -1177,9 +1089,8 @@ BattleCommand_DoTurn: ; 34555
 	db EFFECT_BIDE
 	db EFFECT_RAMPAGE
 	db -1
-; 3460b
 
-CheckMimicUsed: ; 3460b
+CheckMimicUsed:
 	ld a, [hBattleTurn]
 	and a
 	ld a, [wCurMoveNum]
@@ -1209,10 +1120,7 @@ CheckMimicUsed: ; 3460b
 	and a
 	ret
 
-; 34631
-
-
-BattleCommand_Critical: ; 34631
+BattleCommand_Critical:
 ; critical
 
 ; Determine whether this attack's hit will be critical.
@@ -1302,52 +1210,13 @@ BattleCommand_Critical: ; 34631
 	ld [wCriticalHit], a
 	ret
 
-INCLUDE "data/battle/critical_hits.asm"
-; 346b2
-
+INCLUDE "data/moves/critical_hit_moves.asm"
 
-BattleCommand_TripleKick: ; 346b2
-; triplekick
+INCLUDE "data/battle/critical_hit_chances.asm"
 
-	ld a, [wKickCounter]
-	ld b, a
-	inc b
-	ld hl, wCurDamage + 1
-	ld a, [hld]
-	ld e, a
-	ld a, [hli]
-	ld d, a
-.next_kick
-	dec b
-	ret z
-	ld a, [hl]
-	add e
-	ld [hld], a
-	ld a, [hl]
-	adc d
-	ld [hli], a
-
-; No overflow.
-	jr nc, .next_kick
-	ld a, $ff
-	ld [hld], a
-	ld [hl], a
-	ret
-
-; 346cd
-
-
-BattleCommand_KickCounter: ; 346cd
-; kickcounter
-
-	ld hl, wKickCounter
-	inc [hl]
-	ret
+INCLUDE "engine/battle/move_effects/triple_kick.asm"
 
-; 346d2
-
-
-BattleCommand_Stab: ; 346d2
+BattleCommand_Stab:
 ; STAB = Same Type Attack Bonus
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
@@ -1531,19 +1400,16 @@ BattleCommand_Stab: ; 346d2
 	ld [wTypeModifier], a
 	ret
 
-; 347c8
-
-
-BattleCheckTypeMatchup: ; 347c8
+BattleCheckTypeMatchup:
 	ld hl, wEnemyMonType1
 	ld a, [hBattleTurn]
 	and a
 	jr z, CheckTypeMatchup
 	ld hl, wBattleMonType1
-CheckTypeMatchup: ; 347d3
+CheckTypeMatchup:
 ; There is an incorrect assumption about this function made in the AI related code: when
-; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing
-; the offensive type in a will make this function do the right thing. Since a is overwritten,
+; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing the
+; offensive type in a will make this function do the right thing. Since a is overwritten,
 ; this assumption is incorrect. A simple fix would be to load the move type for the
 ; current move into a in BattleCheckTypeMatchup, before falling through, which is
 ; consistent with how the rest of the code assumes this code works like.
@@ -1613,10 +1479,7 @@ CheckTypeMatchup: ; 347d3
 	pop hl
 	ret
 
-; 34833
-
-
-BattleCommand_ResetTypeMatchup: ; 34833
+BattleCommand_ResetTypeMatchup:
 ; Reset the type matchup multiplier to 1.0, if the type matchup is not 0.
 ; If there is immunity in play, the move automatically misses.
 	call BattleCheckTypeMatchup
@@ -1635,13 +1498,11 @@ BattleCommand_ResetTypeMatchup: ; 34833
 	ld [wTypeMatchup], a
 	ret
 
-; 3484e
-
 INCLUDE "engine/battle/ai/switch.asm"
 
-INCLUDE "data/battle/type_matchups.asm"
+INCLUDE "data/types/type_matchups.asm"
 
-BattleCommand_DamageVariation: ; 34cfd
+BattleCommand_DamageVariation:
 ; damagevariation
 
 ; Modify the damage spread between 85% and 100%.
@@ -1650,7 +1511,6 @@ BattleCommand_DamageVariation: ; 34cfd
 ; is not consistent. This makes the highest damage multipliers
 ; rarer than normal.
 
-
 ; No point in reducing 1 or 0 damage.
 	ld hl, wCurDamage
 	ld a, [hli]
@@ -1694,10 +1554,7 @@ BattleCommand_DamageVariation: ; 34cfd
 	ld [hl], a
 	ret
 
-; 34d32
-
-
-BattleCommand_CheckHit: ; 34d32
+BattleCommand_CheckHit:
 ; checkhit
 
 	call .DreamEater
@@ -1765,7 +1622,6 @@ BattleCommand_CheckHit: ; 34d32
 .Hit:
 	ret
 
-
 .Miss:
 ; Keep the damage value intact if we're using (Hi) Jump Kick.
 	ld a, BATTLE_VARS_MOVE_EFFECT
@@ -1779,7 +1635,6 @@ BattleCommand_CheckHit: ; 34d32
 	ld [wAttackMissed], a
 	ret
 
-
 .DreamEater:
 ; Return z if we're trying to eat the dream of
 ; a monster that isn't sleeping.
@@ -1793,7 +1648,6 @@ BattleCommand_CheckHit: ; 34d32
 	and SLP
 	ret
 
-
 .Protect:
 ; Return nz if the opponent is protected.
 	ld a, BATTLE_VARS_SUBSTATUS1_OPP
@@ -1815,7 +1669,6 @@ BattleCommand_CheckHit: ; 34d32
 	and a
 	ret
 
-
 .LockOn:
 ; Return nz if we are locked-on and aren't trying to use Earthquake,
 ; Fissure or Magnitude on a monster that is flying.
@@ -1845,7 +1698,6 @@ BattleCommand_CheckHit: ; 34d32
 	and a
 	ret
 
-
 .DrainSub:
 ; Return z if using an HP drain move on a substitute.
 	call CheckSubstituteOpp
@@ -1864,7 +1716,6 @@ BattleCommand_CheckHit: ; 34d32
 	and a
 	ret
 
-
 .FlyDigMoves:
 ; Check for moves that can hit underground/flying opponents.
 ; Return z if the current move can hit the opponent.
@@ -1900,7 +1751,6 @@ BattleCommand_CheckHit: ; 34d32
 	cp MAGNITUDE
 	ret
 
-
 .ThunderRain:
 ; Return z if the current move always hits in rain, and it is raining.
 	ld a, BATTLE_VARS_MOVE_EFFECT
@@ -1912,16 +1762,13 @@ BattleCommand_CheckHit: ; 34d32
 	cp WEATHER_RAIN
 	ret
 
-
 .XAccuracy:
 	ld a, BATTLE_VARS_SUBSTATUS4
 	call GetBattleVar
 	bit SUBSTATUS_X_ACCURACY, a
 	ret
 
-
 .StatModifiers:
-
 	ld a, [hBattleTurn]
 	and a
 
@@ -2013,10 +1860,8 @@ BattleCommand_CheckHit: ; 34d32
 	ret
 
 INCLUDE "data/battle/accuracy_multipliers.asm"
-; 34ecc
 
-
-BattleCommand_EffectChance: ; 34ecc
+BattleCommand_EffectChance:
 ; effectchance
 
 	xor a
@@ -2043,10 +1888,7 @@ BattleCommand_EffectChance: ; 34ecc
 	and a
 	ret
 
-; 34eee
-
-
-BattleCommand_LowerSub: ; 34eee
+BattleCommand_LowerSub:
 ; lowersub
 
 	ld a, BATTLE_VARS_SUBSTATUS4
@@ -2114,19 +1956,13 @@ BattleCommand_LowerSub: ; 34eee
 	ld [wSomeoneIsRampaging], a
 	ret
 
-; 34f57
-
-
-BattleCommand_HitTarget: ; 34f57
-; hittarget
+BattleCommand_MoveAnim:
+; moveanim
 	call BattleCommand_LowerSub
-	call BattleCommand_HitTargetNoSub
+	call BattleCommand_MoveAnimNoSub
 	jp BattleCommand_RaiseSub
 
-; 34f60
-
-
-BattleCommand_HitTargetNoSub: ; 34f60
+BattleCommand_MoveAnimNoSub:
 	ld a, [wAttackMissed]
 	and a
 	jp nz, BattleCommand_MoveDelay
@@ -2144,20 +1980,19 @@ BattleCommand_HitTargetNoSub: ; 34f60
 	ld a, BATTLE_VARS_MOVE_EFFECT
 	call GetBattleVar
 	cp EFFECT_MULTI_HIT
-	jr z, .multihit
+	jr z, .alternate_anim
 	cp EFFECT_CONVERSION
-	jr z, .conversion
+	jr z, .alternate_anim
 	cp EFFECT_DOUBLE_HIT
-	jr z, .doublehit
+	jr z, .alternate_anim
 	cp EFFECT_POISON_MULTI_HIT
-	jr z, .twineedle
+	jr z, .alternate_anim
 	cp EFFECT_TRIPLE_KICK
 	jr z, .triplekick
 	xor a
 	ld [wKickCounter], a
 
 .triplekick
-
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 	ld e, a
@@ -2167,18 +2002,13 @@ BattleCommand_HitTargetNoSub: ; 34f60
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 	cp FLY
-	jr z, .fly_dig
+	jr z, .clear_sprite
 	cp DIG
 	ret nz
-
-.fly_dig
-; clear sprite
+.clear_sprite
 	jp AppearUserLowerSub
 
-.multihit
-.conversion
-.doublehit
-.twineedle
+.alternate_anim
 	ld a, [wKickCounter]
 	and 1
 	xor 1
@@ -2196,10 +2026,7 @@ BattleCommand_HitTargetNoSub: ; 34f60
 	ld [wNumHits], a
 	jp PlayFXAnimID
 
-; 34fd1
-
-
-BattleCommand_StatUpAnim: ; 34fd1
+BattleCommand_StatUpAnim:
 	ld a, [wAttackMissed]
 	and a
 	jp nz, BattleCommand_MoveDelay
@@ -2207,10 +2034,7 @@ BattleCommand_StatUpAnim: ; 34fd1
 	xor a
 	jr BattleCommand_StatUpDownAnim
 
-; 34fdb
-
-
-BattleCommand_StatDownAnim: ; 34fdb
+BattleCommand_StatDownAnim:
 	ld a, [wAttackMissed]
 	and a
 	jp nz, BattleCommand_MoveDelay
@@ -2222,10 +2046,8 @@ BattleCommand_StatDownAnim: ; 34fdb
 	ld a, BATTLEANIM_WOBBLE
 
 	; fallthrough
-; 34feb
 
-
-BattleCommand_StatUpDownAnim: ; 34feb
+BattleCommand_StatUpDownAnim:
 	ld [wNumHits], a
 	xor a
 	ld [wKickCounter], a
@@ -2235,10 +2057,7 @@ BattleCommand_StatUpDownAnim: ; 34feb
 	ld d, 0
 	jp PlayFXAnimID
 
-; 34ffd
-
-
-BattleCommand_SwitchTurn: ; 34ffd
+BattleCommand_SwitchTurn:
 ; switchturn
 
 	ld a, [hBattleTurn]
@@ -2246,10 +2065,7 @@ BattleCommand_SwitchTurn: ; 34ffd
 	ld [hBattleTurn], a
 	ret
 
-; 35004
-
-
-BattleCommand_RaiseSub: ; 35004
+BattleCommand_RaiseSub:
 ; raisesub
 
 	ld a, BATTLE_VARS_SUBSTATUS4
@@ -2268,10 +2084,7 @@ BattleCommand_RaiseSub: ; 35004
 	ld a, SUBSTITUTE
 	jp LoadAnim
 
-; 35023
-
-
-BattleCommand_FailureText: ; 35023
+BattleCommand_FailureText:
 ; failuretext
 ; If the move missed or failed, load the appropriate
 ; text, and end the effects of multi-turn or multi-
@@ -2313,68 +2126,68 @@ BattleCommand_FailureText: ; 35023
 	call AppearUserRaiseSub
 	jp EndMoveEffect
 
-; 3505e
-
-
-BattleCommand_CheckFaint: ; 3505e
-; checkfaint
+BattleCommand_ApplyDamage:
+; applydamage
 
 	ld a, BATTLE_VARS_SUBSTATUS1_OPP
 	call GetBattleVar
 	bit SUBSTATUS_ENDURE, a
-	jr z, .not_enduring
+	jr z, .focus_band
+
 	call BattleCommand_FalseSwipe
-	ld b, $0
-	jr nc, .okay
-	ld b, $1
-	jr .okay
+	ld b, 0
+	jr nc, .damage
+	ld b, 1
+	jr .damage
 
-.not_enduring
+.focus_band
 	call GetOpponentItem
 	ld a, b
 	cp HELD_FOCUS_BAND
-	ld b, $0
-	jr nz, .okay
+	ld b, 0
+	jr nz, .damage
+
 	call BattleRandom
 	cp c
-	jr nc, .okay
+	jr nc, .damage
 	call BattleCommand_FalseSwipe
-	ld b, $0
-	jr nc, .okay
-	ld b, $2
-.okay
+	ld b, 0
+	jr nc, .damage
+	ld b, 2
+
+.damage
 	push bc
-	call .check_sub
-	ld c, $0
+	call .update_damage_taken
+	ld c, FALSE
 	ld a, [hBattleTurn]
 	and a
 	jr nz, .damage_player
-	call EnemyHurtItself
+	call DoEnemyDamage
 	jr .done_damage
 
 .damage_player
-	call PlayerHurtItself
+	call DoPlayerDamage
 
 .done_damage
 	pop bc
 	ld a, b
 	and a
 	ret z
+
 	dec a
-	jr nz, .not_enduring2
+	jr nz, .focus_band_text
 	ld hl, EnduredText
 	jp StdBattleTextBox
 
-.not_enduring2
+.focus_band_text
 	call GetOpponentItem
 	ld a, [hl]
 	ld [wNamedObjectIndexBuffer], a
 	call GetItemName
-
 	ld hl, HungOnText
 	jp StdBattleTextBox
 
-.check_sub
+.update_damage_taken
 	ld a, BATTLE_VARS_SUBSTATUS4_OPP
 	call GetBattleVar
 	bit SUBSTATUS_SUBSTITUTE, a
@@ -2383,10 +2196,10 @@ BattleCommand_CheckFaint: ; 3505e
 	ld de, wPlayerDamageTaken + 1
 	ld a, [hBattleTurn]
 	and a
-	jr nz, .damage_taken
+	jr nz, .got_damage_taken
 	ld de, wEnemyDamageTaken + 1
 
-.damage_taken
+.got_damage_taken
 	ld a, [wCurDamage + 1]
 	ld b, a
 	ld a, [de]
@@ -2405,10 +2218,7 @@ BattleCommand_CheckFaint: ; 3505e
 	ld [de], a
 	ret
 
-; 350e4
-
-
-GetFailureResultText: ; 350e4
+GetFailureResultText:
 	ld hl, DoesntAffectText
 	ld de, DoesntAffectText
 	ld a, [wTypeModifier]
@@ -2443,10 +2253,10 @@ GetFailureResultText: ; 350e4
 	ld hl, wCurDamage
 	ld a, [hli]
 	ld b, [hl]
-	rept 3
+rept 3
 	srl a
 	rr b
-	endr
+endr
 	ld [hl], b
 	dec hl
 	ld [hli], a
@@ -2460,13 +2270,13 @@ GetFailureResultText: ; 350e4
 	ld a, $1
 	ld [wKickCounter], a
 	call LoadMoveAnim
-	ld c, $1
+	ld c, TRUE
 	ld a, [hBattleTurn]
 	and a
-	jp nz, EnemyHurtItself
-	jp PlayerHurtItself
+	jp nz, DoEnemyDamage
+	jp DoPlayerDamage
 
-FailText_CheckOpponentProtect: ; 35157
+FailText_CheckOpponentProtect:
 	ld a, BATTLE_VARS_SUBSTATUS1_OPP
 	call GetBattleVar
 	bit SUBSTATUS_PROTECT, a
@@ -2476,10 +2286,7 @@ FailText_CheckOpponentProtect: ; 35157
 .not_protected
 	jp StdBattleTextBox
 
-; 35165
-
-
-BattleCommanda5: ; 35165
+BattleCommand_BideFailText:
 	ld a, [wAttackMissed]
 	and a
 	ret z
@@ -2489,10 +2296,7 @@ BattleCommanda5: ; 35165
 	jp z, PrintDoesntAffect
 	jp PrintButItFailed
 
-; 35175
-
-
-BattleCommand_CriticalText: ; 35175
+BattleCommand_CriticalText:
 ; criticaltext
 ; Prints the message for critical hits or one-hit KOs.
 
@@ -2522,10 +2326,8 @@ BattleCommand_CriticalText: ; 35175
 .texts
 	dw CriticalHitText
 	dw OneHitKOText
-; 35197
-
 
-BattleCommand_StartLoop: ; 35197
+BattleCommand_StartLoop:
 ; startloop
 
 	ld hl, wPlayerRolloutCount
@@ -2538,10 +2340,7 @@ BattleCommand_StartLoop: ; 35197
 	ld [hl], a
 	ret
 
-; 351a5
-
-
-BattleCommand_SuperEffectiveLoopText: ; 351a5
+BattleCommand_SuperEffectiveLoopText:
 ; supereffectivelooptext
 
 	ld a, BATTLE_VARS_SUBSTATUS3
@@ -2550,10 +2349,8 @@ BattleCommand_SuperEffectiveLoopText: ; 351a5
 	ret nz
 
 	; fallthrough
-; 351ad
 
-
-BattleCommand_SuperEffectiveText: ; 351ad
+BattleCommand_SuperEffectiveText:
 ; supereffectivetext
 
 	ld a, [wTypeModifier]
@@ -2566,10 +2363,7 @@ BattleCommand_SuperEffectiveText: ; 351ad
 .print
 	jp StdBattleTextBox
 
-; 351c0
-
-
-BattleCommand_CheckDestinyBond: ; 351c0
+BattleCommand_CheckDestinyBond:
 ; checkdestinybond
 
 ; Faint the user if it fainted an opponent using Destiny Bond.
@@ -2656,10 +2450,7 @@ BattleCommand_CheckDestinyBond: ; 351c0
 .finish
 	jp EndMoveEffect
 
-; 35250
-
-
-BattleCommand_BuildOpponentRage: ; 35250
+BattleCommand_BuildOpponentRage:
 ; buildopponentrage
 
 	jp .start
@@ -2690,10 +2481,7 @@ BattleCommand_BuildOpponentRage: ; 35250
 	call StdBattleTextBox
 	jp BattleCommand_SwitchTurn
 
-; 3527b
-
-
-BattleCommand_RageDamage: ; 3527b
+BattleCommand_RageDamage:
 ; ragedamage
 
 	ld a, [wCurDamage]
@@ -2713,7 +2501,7 @@ BattleCommand_RageDamage: ; 3527b
 	dec a
 	add hl, bc
 	jr nc, .rage_loop
-	ld hl, -1
+	ld hl, $ffff
 .done
 	ld a, h
 	ld [wCurDamage], a
@@ -2721,10 +2509,7 @@ BattleCommand_RageDamage: ; 3527b
 	ld [wCurDamage + 1], a
 	ret
 
-; 352a3
-
-
-EndMoveEffect: ; 352a3
+EndMoveEffect:
 	ld a, [wBattleScriptBufferAddress]
 	ld l, a
 	ld a, [wBattleScriptBufferAddress + 1]
@@ -2735,10 +2520,7 @@ EndMoveEffect: ; 352a3
 	ld [hl], a
 	ret
 
-; 352b1
-
-
-DittoMetalPowder: ; 352b1
+DittoMetalPowder:
 	ld a, MON_SPECIES
 	call BattlePartyAttr
 	ld a, [hBattleTurn]
@@ -2774,10 +2556,7 @@ DittoMetalPowder: ; 352b1
 	rr c
 	ret
 
-; 352dc
-
-
-BattleCommand_DamageStats: ; 352dc
+BattleCommand_DamageStats:
 ; damagestats
 
 	ld a, [hBattleTurn]
@@ -2785,10 +2564,8 @@ BattleCommand_DamageStats: ; 352dc
 	jp nz, EnemyAttackDamage
 
 	; fallthrough
-; 352e2
 
-
-PlayerAttackDamage: ; 352e2
+PlayerAttackDamage:
 ; Return move power d, player level e, enemy defense c and player attack b.
 
 	call ResetDamage
@@ -2870,10 +2647,7 @@ PlayerAttackDamage: ; 352e2
 	and a
 	ret
 
-; 3534d
-
-
-TruncateHL_BC: ; 3534d
+TruncateHL_BC:
 .loop
 ; Truncate 16-bit values hl and bc to 8-bit values b and c respectively.
 ; b = hl, c = bc
@@ -2918,10 +2692,7 @@ TruncateHL_BC: ; 3534d
 	ld b, l
 	ret
 
-; 35378
-
-
-GetDamageStatsCritical: ; 35378
+GetDamageStatsCritical:
 ; Return carry if non-critical.
 
 	ld a, [wCriticalHit]
@@ -2930,10 +2701,8 @@ GetDamageStatsCritical: ; 35378
 	ret z
 
 	; fallthrough
-; 3537e
-
 
-GetDamageStats: ; 3537e
+GetDamageStats:
 ; Return the attacker's offensive stat and the defender's defensive
 ; stat based on whether the attacking type is physical or special.
 
@@ -2973,10 +2742,7 @@ GetDamageStats: ; 3537e
 	pop hl
 	ret
 
-; 353b5
-
-
-ThickClubBoost: ; 353b5
+ThickClubBoost:
 ; Return in hl the stat value at hl.
 
 ; If the attacking monster is Cubone or Marowak and
@@ -2991,10 +2757,7 @@ ThickClubBoost: ; 353b5
 	pop bc
 	ret
 
-; 353c3
-
-
-LightBallBoost: ; 353c3
+LightBallBoost:
 ; Return in hl the stat value at hl.
 
 ; If the attacking monster is Pikachu and it's
@@ -3009,10 +2772,7 @@ LightBallBoost: ; 353c3
 	pop bc
 	ret
 
-; 353d1
-
-
-SpeciesItemBoost: ; 353d1
+SpeciesItemBoost:
 ; Return in hl the stat value at hl.
 
 ; If the attacking monster is species b or c and
@@ -3052,10 +2812,7 @@ SpeciesItemBoost: ; 353d1
 	rl h
 	ret
 
-; 353f6
-
-
-EnemyAttackDamage: ; 353f6
+EnemyAttackDamage:
 	call ResetDamage
 
 ; No damage dealt with 0 power.
@@ -3133,231 +2890,9 @@ EnemyAttackDamage: ; 353f6
 	and a
 	ret
 
-; 35461
-
-
-BattleCommand_BeatUp: ; 35461
-; beatup
-
-	call ResetDamage
-	ld a, [hBattleTurn]
-	and a
-	jp nz, .enemy_beats_up
-	ld a, [wPlayerSubStatus3]
-	bit SUBSTATUS_IN_LOOP, a
-	jr nz, .next_mon
-	ld c, 20
-	call DelayFrames
-	xor a
-	ld [wPlayerRolloutCount], a
-	ld [wd002], a
-	ld [wBeatUpHitAtLeastOnce], a
-	jr .got_mon
-
-.next_mon
-	ld a, [wPlayerRolloutCount]
-	ld b, a
-	ld a, [wPartyCount]
-	sub b
-	ld [wd002], a
-
-.got_mon
-	ld a, [wd002]
-	ld hl, wPartyMonNicknames
-	call GetNick
-	ld a, MON_HP
-	call GetBeatupMonLocation
-	ld a, [hli]
-	or [hl]
-	jp z, .beatup_fail ; fainted
-	ld a, [wd002]
-	ld c, a
-	ld a, [wCurBattleMon]
-	; BUG: this can desynchronize link battles
-	; Change "cp [hl]" to "cp c" to fix
-	cp [hl]
-	ld hl, wBattleMonStatus
-	jr z, .active_mon
-	ld a, MON_STATUS
-	call GetBeatupMonLocation
-.active_mon
-	ld a, [hl]
-	and a
-	jp nz, .beatup_fail
-
-	ld a, $1
-	ld [wBeatUpHitAtLeastOnce], a
-	ld hl, BeatUpAttackText
-	call StdBattleTextBox
-	ld a, [wEnemyMonSpecies]
-	ld [wCurSpecies], a
-	call GetBaseData
-	ld a, [wBaseDefense]
-	ld c, a
-	push bc
-	ld a, MON_SPECIES
-	call GetBeatupMonLocation
-	ld a, [hl]
-	ld [wCurSpecies], a
-	call GetBaseData
-	ld a, [wBaseAttack]
-	pop bc
-	ld b, a
-	push bc
-	ld a, MON_LEVEL
-	call GetBeatupMonLocation
-	ld a, [hl]
-	ld e, a
-	pop bc
-	ld a, [wPlayerMoveStructPower]
-	ld d, a
-	ret
-
-.enemy_beats_up
-	ld a, [wEnemySubStatus3]
-	bit SUBSTATUS_IN_LOOP, a
-	jr nz, .not_first_enemy_beatup
-
-	xor a
-	ld [wEnemyRolloutCount], a
-	ld [wd002], a
-	ld [wBeatUpHitAtLeastOnce], a
-	jr .enemy_continue
-
-.not_first_enemy_beatup
-	ld a, [wEnemyRolloutCount]
-	ld b, a
-	ld a, [wOTPartyCount]
-	sub b
-	ld [wd002], a
-.enemy_continue
-	ld a, [wBattleMode]
-	dec a
-	jr z, .wild
-
-	ld a, [wLinkMode]
-	and a
-	jr nz, .link_or_tower
-
-	ld a, [wInBattleTowerBattle]
-	and a
-	jr nz, .link_or_tower
-
-	ld a, [wd002]
-	ld c, a
-	ld b, 0
-	ld hl, wOTPartySpecies
-	add hl, bc
-	ld a, [hl]
-	ld [wNamedObjectIndexBuffer], a
-	call GetPokemonName
-	jr .got_enemy_nick
-
-.link_or_tower
-	ld a, [wd002]
-	ld hl, wOTPartyMonNicknames
-	ld bc, NAME_LENGTH
-	call AddNTimes
-	ld de, wStringBuffer1
-	call CopyBytes
-.got_enemy_nick
-	ld a, MON_HP
-	call GetBeatupMonLocation
-	ld a, [hli]
-	or [hl]
-	jp z, .beatup_fail
-	ld a, [wd002]
-	ld b, a
-	ld a, [wCurOTMon]
-	cp b
-	ld hl, wEnemyMonStatus
-	jr z, .active_enemy
-
-	ld a, MON_STATUS
-	call GetBeatupMonLocation
-.active_enemy
-	ld a, [hl]
-	and a
-	jr nz, .beatup_fail
-
-	ld a, $1
-	ld [wBeatUpHitAtLeastOnce], a
-	jr .finish_beatup
-
-.wild
-	ld a, [wEnemyMonSpecies]
-	ld [wNamedObjectIndexBuffer], a
-	call GetPokemonName
-	ld hl, BeatUpAttackText
-	call StdBattleTextBox
-	jp EnemyAttackDamage
-
-.finish_beatup
-	ld hl, BeatUpAttackText
-	call StdBattleTextBox
-	ld a, [wBattleMonSpecies]
-	ld [wCurSpecies], a
-	call GetBaseData
-	ld a, [wBaseDefense]
-	ld c, a
-	push bc
-	ld a, MON_SPECIES
-	call GetBeatupMonLocation
-	ld a, [hl]
-	ld [wCurSpecies], a
-	call GetBaseData
-	ld a, [wBaseAttack]
-	pop bc
-	ld b, a
-	push bc
-	ld a, MON_LEVEL
-	call GetBeatupMonLocation
-	ld a, [hl]
-	ld e, a
-	pop bc
-	ld a, [wEnemyMoveStructPower]
-	ld d, a
-	ret
-
-; 355b0
+INCLUDE "engine/battle/move_effects/beat_up.asm"
 
-
-.beatup_fail ; 355b0
-	ld b, buildopponentrage_command
-	jp SkipToBattleCommand
-
-; 355b5
-
-
-BattleCommanda8: ; 355b5
-	ld a, [wBeatUpHitAtLeastOnce]
-	and a
-	ret nz
-
-	jp PrintButItFailed
-
-; 355bd
-
-
-GetBeatupMonLocation: ; 355bd
-	push bc
-	ld c, a
-	ld b, 0
-	ld a, [hBattleTurn]
-	and a
-	ld hl, wPartyMon1Species
-	jr z, .got_species
-	ld hl, wOTPartyMon1Species
-
-.got_species
-	ld a, [wd002]
-	add hl, bc
-	call GetPartyLocation
-	pop bc
-	ret
-
-
-BattleCommand_ClearMissDamage: ; 355d5
+BattleCommand_ClearMissDamage:
 ; clearmissdamage
 	ld a, [wAttackMissed]
 	and a
@@ -3365,10 +2900,7 @@ BattleCommand_ClearMissDamage: ; 355d5
 
 	jp ResetDamage
 
-; 355dd
-
-
-HitSelfInConfusion: ; 355dd
+HitSelfInConfusion:
 	call ResetDamage
 	ld a, [hBattleTurn]
 	and a
@@ -3404,10 +2936,7 @@ HitSelfInConfusion: ; 355dd
 	ld e, a
 	ret
 
-; 35612
-
-
-BattleCommand_DamageCalc: ; 35612
+BattleCommand_DamageCalc:
 ; damagecalc
 
 ; Return a damage value for move power d, player level e, enemy defense c and player attack b.
@@ -3530,12 +3059,11 @@ BattleCommand_DamageCalc: ; 35612
 	ld [hDivisor], a
 	ld b, 4
 	call Divide
-.DoneItem:
 
+.DoneItem:
 ; Critical hits
 	call .CriticalMultiplier
 
-
 ; Update wCurDamage (capped at 997).
 	ld hl, wCurDamage
 	ld b, [hl]
@@ -3600,7 +3128,6 @@ BattleCommand_DamageCalc: ; 35612
 	ld a, LOW(MAX_STAT_VALUE - MIN_NEUTRAL_DAMAGE)
 	ld [hld], a
 
-
 .dont_cap_3
 ; Minimum neutral damage is 2 (bringing the cap to 999).
 	inc hl
@@ -3615,7 +3142,6 @@ BattleCommand_DamageCalc: ; 35612
 	and a
 	ret
 
-
 .CriticalMultiplier:
 	ld a, [wCriticalHit]
 	and a
@@ -3639,13 +3165,9 @@ BattleCommand_DamageCalc: ; 35612
 
 	ret
 
-; 35703
-
-
-INCLUDE "data/battle/type_boost_items.asm"
-
+INCLUDE "data/types/type_boost_items.asm"
 
-BattleCommand_ConstantDamage: ; 35726
+BattleCommand_ConstantDamage:
 ; constantdamage
 
 	ld hl, wBattleMonLevel
@@ -3691,7 +3213,7 @@ BattleCommand_ConstantDamage: ; 35726
 	cp b
 	jr nc, .psywave_loop
 	ld b, a
-	ld a, $0
+	ld a, 0
 	jr .got_power
 
 .super_fang
@@ -3712,9 +3234,9 @@ BattleCommand_ConstantDamage: ; 35726
 	and a
 	jr nz, .got_power
 	or b
-	ld a, $0
+	ld a, 0
 	jr nz, .got_power
-	ld b, $1
+	ld b, 1
 	jr .got_power
 
 .got_power
@@ -3766,11 +3288,11 @@ BattleCommand_ConstantDamage: ; 35726
 	ld [hDividend + 2], a
 
 .skip_to_divide
-	ld b, $4
+	ld b, 4
 	call Divide
 	ld a, [hQuotient + 2]
 	ld b, a
-	ld hl, .FlailPower
+	ld hl, FlailReversalPower
 
 .reversal_loop
 	ld a, [hli]
@@ -3803,532 +3325,23 @@ BattleCommand_ConstantDamage: ; 35726
 	ld [hl], 1
 	ret
 
-.FlailPower:
-	;  px,  bp
-	db  1, 200
-	db  4, 150
-	db  9, 100
-	db 16,  80
-	db 32,  40
-	db 48,  20
-; 35813
-
-
-BattleCommand_Counter: ; 35813
-; counter
-
-	ld a, 1
-	ld [wAttackMissed], a
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
-	call GetBattleVar
-	and a
-	ret z
-
-	ld b, a
-	callfar GetMoveEffect
-	ld a, b
-	cp EFFECT_COUNTER
-	ret z
-
-	call BattleCommand_ResetTypeMatchup
-	ld a, [wTypeMatchup]
-	and a
-	ret z
-
-	call CheckOpponentWentFirst
-	ret z
-
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
-	call GetBattleVar
-	dec a
-	ld de, wStringBuffer1
-	call GetMoveData
-
-	ld a, [wStringBuffer1 + MOVE_POWER]
-	and a
-	ret z
-
-	ld a, [wStringBuffer1 + MOVE_TYPE]
-	cp SPECIAL
-	ret nc
-
-	ld hl, wCurDamage
-	ld a, [hli]
-	or [hl]
-	ret z
-
-	ld a, [hl]
-	add a
-	ld [hld], a
-	ld a, [hl]
-	adc a
-	ld [hl], a
-	jr nc, .capped
-	ld a, $ff
-	ld [hli], a
-	ld [hl], a
-.capped
-
-	xor a
-	ld [wAttackMissed], a
-	ret
-
-; 35864
-
-
-BattleCommand_Encore: ; 35864
-; encore
-
-	ld hl, wEnemyMonMoves
-	ld de, wEnemyEncoreCount
-	ld a, [hBattleTurn]
-	and a
-	jr z, .ok
-	ld hl, wBattleMonMoves
-	ld de, wPlayerEncoreCount
-.ok
-	ld a, BATTLE_VARS_LAST_MOVE_OPP
-	call GetBattleVar
-	and a
-	jp z, .failed
-	cp STRUGGLE
-	jp z, .failed
-	cp ENCORE
-	jp z, .failed
-	cp MIRROR_MOVE
-	jp z, .failed
-	ld b, a
-
-.got_move
-	ld a, [hli]
-	cp b
-	jr nz, .got_move
-
-	ld bc, wBattleMonPP - wBattleMonMoves - 1
-	add hl, bc
-	ld a, [hl]
-	and PP_MASK
-	jp z, .failed
-	ld a, [wAttackMissed]
-	and a
-	jp nz, .failed
-	ld a, BATTLE_VARS_SUBSTATUS5_OPP
-	call GetBattleVarAddr
-	bit SUBSTATUS_ENCORED, [hl]
-	jp nz, .failed
-	set SUBSTATUS_ENCORED, [hl]
-	call BattleRandom
-	and $3
-	inc a
-	inc a
-	inc a
-	ld [de], a
-	call CheckOpponentWentFirst
-	jr nz, .finish_move
-	ld a, [hBattleTurn]
-	and a
-	jr z, .force_last_enemy_move
-
-	push hl
-	ld a, [wLastPlayerMove]
-	ld b, a
-	ld c, 0
-	ld hl, wBattleMonMoves
-.find_player_move
-	ld a, [hli]
-	cp b
-	jr z, .got_player_move
-	inc c
-	ld a, c
-	cp NUM_MOVES
-	jr c, .find_player_move
-	pop hl
-	res SUBSTATUS_ENCORED, [hl]
-	xor a
-	ld [de], a
-	jr .failed
+INCLUDE "data/moves/flail_reversal_power.asm"
 
-.got_player_move
-	pop hl
-	ld a, c
-	ld [wCurMoveNum], a
-	ld a, b
-	ld [wCurPlayerMove], a
-	dec a
-	ld de, wPlayerMoveStruct
-	call GetMoveData
-	jr .finish_move
-
-.force_last_enemy_move
-	push hl
-	ld a, [wLastEnemyMove]
-	ld b, a
-	ld c, 0
-	ld hl, wEnemyMonMoves
-.find_enemy_move
-	ld a, [hli]
-	cp b
-	jr z, .got_enemy_move
-	inc c
-	ld a, c
-	cp NUM_MOVES
-	jr c, .find_enemy_move
-	pop hl
-	res SUBSTATUS_ENCORED, [hl]
-	xor a
-	ld [de], a
-	jr .failed
-
-.got_enemy_move
-	pop hl
-	ld a, c
-	ld [wCurEnemyMoveNum], a
-	ld a, b
-	ld [wCurEnemyMove], a
-	dec a
-	ld de, wEnemyMoveStruct
-	call GetMoveData
-
-.finish_move
-	call AnimateCurrentMove
-	ld hl, GotAnEncoreText
-	jp StdBattleTextBox
-
-.failed
-	jp PrintDidntAffect2
-
-; 35926
-
-
-BattleCommand_PainSplit: ; 35926
-; painsplit
-
-	ld a, [wAttackMissed]
-	and a
-	jp nz, .ButItFailed
-	call CheckSubstituteOpp
-	jp nz, .ButItFailed
-	call AnimateCurrentMove
-	ld hl, wBattleMonMaxHP + 1
-	ld de, wEnemyMonMaxHP + 1
-	call .PlayerShareHP
-	ld a, $1
-	ld [wWhichHPBar], a
-	hlcoord 10, 9
-	predef AnimateHPBar
-	ld hl, wEnemyMonHP
-	ld a, [hli]
-	ld [wBuffer4], a
-	ld a, [hli]
-	ld [wBuffer3], a
-	ld a, [hli]
-	ld [wBuffer2], a
-	ld a, [hl]
-	ld [wBuffer1], a
-	call .EnemyShareHP
-	xor a
-	ld [wWhichHPBar], a
-	call ResetDamage
-	hlcoord 2, 2
-	predef AnimateHPBar
-	farcall _UpdateBattleHUDs
+INCLUDE "engine/battle/move_effects/counter.asm"
 
-	ld hl, SharedPainText
-	jp StdBattleTextBox
+INCLUDE "engine/battle/move_effects/encore.asm"
 
-.PlayerShareHP:
-	ld a, [hld]
-	ld [wBuffer1], a
-	ld a, [hld]
-	ld [wBuffer2], a
-	ld a, [hld]
-	ld b, a
-	ld [wBuffer3], a
-	ld a, [hl]
-	ld [wBuffer4], a
-	dec de
-	dec de
-	ld a, [de]
-	dec de
-	add b
-	ld [wCurDamage + 1], a
-	ld b, [hl]
-	ld a, [de]
-	adc b
-	srl a
-	ld [wCurDamage], a
-	ld a, [wCurDamage + 1]
-	rr a
-	ld [wCurDamage + 1], a
-	inc hl
-	inc hl
-	inc hl
-	inc de
-	inc de
-	inc de
+INCLUDE "engine/battle/move_effects/pain_split.asm"
 
-.EnemyShareHP: ; 359ac
-	ld c, [hl]
-	dec hl
-	ld a, [wCurDamage + 1]
-	sub c
-	ld b, [hl]
-	dec hl
-	ld a, [wCurDamage]
-	sbc b
-	jr nc, .skip
+INCLUDE "engine/battle/move_effects/snore.asm"
 
-	ld a, [wCurDamage]
-	ld b, a
-	ld a, [wCurDamage + 1]
-	ld c, a
-.skip
-	ld a, c
-	ld [hld], a
-	ld [wBuffer5], a
-	ld a, b
-	ld [hli], a
-	ld [wBuffer6], a
-	ret
+INCLUDE "engine/battle/move_effects/conversion2.asm"
 
-; 359cd
+INCLUDE "engine/battle/move_effects/lock_on.asm"
 
-.ButItFailed:
-	jp PrintDidntAffect2
+INCLUDE "engine/battle/move_effects/sketch.asm"
 
-; 359d0
-
-
-BattleCommand_Snore: ; 359d0
-; snore
-	ld a, BATTLE_VARS_STATUS
-	call GetBattleVar
-	and SLP
-	ret nz
-	call ResetDamage
-	ld a, $1
-	ld [wAttackMissed], a
-	call FailSnore
-	jp EndMoveEffect
-
-; 359e6
-
-
-BattleCommand_Conversion2: ; 359e6
-; conversion2
-
-	ld a, [wAttackMissed]
-	and a
-	jr nz, .failed
-	ld hl, wBattleMonType1
-	ld a, [hBattleTurn]
-	and a
-	jr z, .got_type
-	ld hl, wEnemyMonType1
-.got_type
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
-	call GetBattleVar
-	and a
-	jr z, .failed
-	push hl
-	dec a
-	ld hl, Moves + MOVE_TYPE
-	call GetMoveAttr
-	ld d, a
-	pop hl
-	cp CURSE_T
-	jr z, .failed
-	call AnimateCurrentMove
-	call BattleCommand_SwitchTurn
-
-.loop
-	call BattleRandom
-	and $1f
-	cp UNUSED_TYPES
-	jr c, .okay
-	cp UNUSED_TYPES_END
-	jr c, .loop
-	cp TYPES_END
-	jr nc, .loop
-.okay
-	ld [hli], a
-	ld [hld], a
-	push hl
-	ld a, BATTLE_VARS_MOVE_TYPE
-	call GetBattleVarAddr
-	push af
-	push hl
-	ld a, d
-	ld [hl], a
-	call BattleCheckTypeMatchup
-	pop hl
-	pop af
-	ld [hl], a
-	pop hl
-	ld a, [wTypeMatchup]
-	cp 10
-	jr nc, .loop
-	call BattleCommand_SwitchTurn
-
-	ld a, [hl]
-	ld [wNamedObjectIndexBuffer], a
-	predef GetTypeName
-	ld hl, TransformedTypeText
-	jp StdBattleTextBox
-
-.failed
-	jp FailConversion2
-
-; 35a53
-
-
-BattleCommand_LockOn: ; 35a53
-; lockon
-
-	call CheckSubstituteOpp
-	jr nz, .fail
-
-	ld a, [wAttackMissed]
-	and a
-	jr nz, .fail
-
-	ld a, BATTLE_VARS_SUBSTATUS5_OPP
-	call GetBattleVarAddr
-	set SUBSTATUS_LOCK_ON, [hl]
-	call AnimateCurrentMove
-
-	ld hl, TookAimText
-	jp StdBattleTextBox
-
-.fail
-	call AnimateFailedMove
-	jp PrintDidntAffect
-
-; 35a74
-
-
-BattleCommand_Sketch: ; 35a74
-; sketch
-
-	call ClearLastMove
-; Don't sketch during a link battle
-	ld a, [wLinkMode]
-	and a
-	jr z, .not_linked
-	call AnimateFailedMove
-	jp PrintNothingHappened
-
-.not_linked
-; If the opponent has a substitute up, fail.
-	call CheckSubstituteOpp
-	jp nz, .fail
-; If the opponent is transformed, fail.
-	ld a, BATTLE_VARS_SUBSTATUS5_OPP
-	call GetBattleVarAddr
-	bit SUBSTATUS_TRANSFORMED, [hl]
-	jp nz, .fail
-; Get the user's moveset in its party struct.
-; This move replacement shall be permanent.
-; Pointer will be in de.
-	ld a, MON_MOVES
-	call UserPartyAttr
-	ld d, h
-	ld e, l
-; Get the battle move structs.
-	ld hl, wBattleMonMoves
-	ld a, [hBattleTurn]
-	and a
-	jr z, .get_last_move
-	ld hl, wEnemyMonMoves
-.get_last_move
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
-	call GetBattleVar
-	ld [wTypeMatchup], a
-	ld b, a
-; Fail if move is invalid or is Struggle.
-	and a
-	jr z, .fail
-	cp STRUGGLE
-	jr z, .fail
-; Fail if user already knows that move
-	ld c, NUM_MOVES
-.does_user_already_know_move
-	ld a, [hli]
-	cp b
-	jr z, .fail
-	dec c
-	jr nz, .does_user_already_know_move
-; Find Sketch in the user's moveset.
-; Pointer in hl, and index in c.
-	dec hl
-	ld c, NUM_MOVES
-.find_sketch
-	dec c
-	ld a, [hld]
-	cp SKETCH
-	jr nz, .find_sketch
-	inc hl
-; The Sketched move is loaded to that slot.
-	ld a, b
-	ld [hl], a
-; Copy the base PP from that move.
-	push bc
-	push hl
-	dec a
-	ld hl, Moves + MOVE_PP
-	call GetMoveAttr
-	pop hl
-	ld bc, wBattleMonPP - wBattleMonMoves
-	add hl, bc
-	ld [hl], a
-	pop bc
-
-	ld a, [hBattleTurn]
-	and a
-	jr z, .user_trainer
-	ld a, [wBattleMode]
-	dec a
-	jr nz, .user_trainer
-; wildmon
-	ld a, [hl]
-	push bc
-	ld hl, wWildMonPP
-	ld b, 0
-	add hl, bc
-	ld [hl], a
-	ld hl, wWildMonMoves
-	add hl, bc
-	pop bc
-	ld [hl], b
-	jr .done_copy
-
-.user_trainer
-	ld a, [hl]
-	push af
-	ld l, c
-	ld h, 0
-	add hl, de
-	ld a, b
-	ld [hl], a
-	pop af
-	ld de, MON_PP - MON_MOVES
-	add hl, de
-	ld [hl], a
-.done_copy
-	call GetMoveName
-	call AnimateCurrentMove
-
-	ld hl, SketchedText
-	jp StdBattleTextBox
-
-.fail
-	call AnimateFailedMove
-	jp PrintDidntAffect
-
-; 35b16
-
-
-BattleCommand_DefrostOpponent: ; 35b16
+BattleCommand_DefrostOpponent:
 ; defrostopponent
 ; Thaw the opponent if frozen, and
 ; raise the user's Attack one stage.
@@ -4354,344 +3367,17 @@ BattleCommand_DefrostOpponent: ; 35b16
 	ld [hl], a
 	ret
 
-; 35b33
-
-
-BattleCommand_SleepTalk: ; 35b33
-; sleeptalk
-
-	call ClearLastMove
-	ld a, [wAttackMissed]
-	and a
-	jr nz, .fail
-	ld a, [hBattleTurn]
-	and a
-	ld hl, wBattleMonMoves + 1
-	ld a, [wDisabledMove]
-	ld d, a
-	jr z, .got_moves
-	ld hl, wEnemyMonMoves + 1
-	ld a, [wEnemyDisabledMove]
-	ld d, a
-.got_moves
-	ld a, BATTLE_VARS_STATUS
-	call GetBattleVar
-	and SLP
-	jr z, .fail
-	ld a, [hl]
-	and a
-	jr z, .fail
-	call .safely_check_has_usable_move
-	jr c, .fail
-	dec hl
-.sample_move
-	push hl
-	call BattleRandom
-	maskbits NUM_MOVES
-	ld c, a
-	ld b, 0
-	add hl, bc
-	ld a, [hl]
-	pop hl
-	and a
-	jr z, .sample_move
-	ld e, a
-	ld a, BATTLE_VARS_MOVE_ANIM
-	call GetBattleVar
-	cp e
-	jr z, .sample_move
-	ld a, e
-	cp d
-	jr z, .sample_move
-	call .check_two_turn_move
-	jr z, .sample_move
-	ld a, BATTLE_VARS_MOVE
-	call GetBattleVarAddr
-	ld a, e
-	ld [hl], a
-	call CheckUserIsCharging
-	jr nz, .charging
-	ld a, [wKickCounter]
-	push af
-	call BattleCommand_LowerSub
-	pop af
-	ld [wKickCounter], a
-.charging
-	call LoadMoveAnim
-	call UpdateMoveData
-	jp ResetTurn
-
-.fail
-	call AnimateFailedMove
-	jp TryPrintButItFailed
-
-.safely_check_has_usable_move
-	push hl
-	push de
-	push bc
-	call .check_has_usable_move
-	pop bc
-	pop de
-	pop hl
-	ret
-
-.check_has_usable_move
-	ld a, [hBattleTurn]
-	and a
-	ld a, [wDisabledMove]
-	jr z, .got_move_2
+INCLUDE "engine/battle/move_effects/sleep_talk.asm"
 
-	ld a, [wEnemyDisabledMove]
-.got_move_2
-	ld b, a
-	ld a, BATTLE_VARS_MOVE
-	call GetBattleVar
-	ld c, a
-	dec hl
-	ld d, NUM_MOVES
-.loop2
-	ld a, [hl]
-	and a
-	jr z, .carry
+INCLUDE "engine/battle/move_effects/destiny_bond.asm"
 
-	cp c
-	jr z, .nope
-	cp b
-	jr z, .nope
+INCLUDE "engine/battle/move_effects/spite.asm"
 
-	call .check_two_turn_move
-	jr nz, .no_carry
+INCLUDE "engine/battle/move_effects/false_swipe.asm"
 
-.nope
-	inc hl
-	dec d
-	jr nz, .loop2
-
-.carry
-	scf
-	ret
-
-.no_carry
-	and a
-	ret
+INCLUDE "engine/battle/move_effects/heal_bell.asm"
 
-.check_two_turn_move
-	push hl
-	push de
-	push bc
-
-	ld b, a
-	callfar GetMoveEffect
-	ld a, b
-
-	pop bc
-	pop de
-	pop hl
-
-	cp EFFECT_SKULL_BASH
-	ret z
-	cp EFFECT_RAZOR_WIND
-	ret z
-	cp EFFECT_SKY_ATTACK
-	ret z
-	cp EFFECT_SOLARBEAM
-	ret z
-	cp EFFECT_FLY
-	ret z
-	cp EFFECT_BIDE
-	ret
-
-; 35bff
-
-
-BattleCommand_DestinyBond: ; 35bff
-; destinybond
-
-	ld a, BATTLE_VARS_SUBSTATUS5
-	call GetBattleVarAddr
-	set SUBSTATUS_DESTINY_BOND, [hl]
-	call AnimateCurrentMove
-	ld hl, DestinyBondEffectText
-	jp StdBattleTextBox
-
-; 35c0f
-
-
-BattleCommand_Spite: ; 35c0f
-; spite
-
-	ld a, [wAttackMissed]
-	and a
-	jp nz, .failed
-	ld bc, PARTYMON_STRUCT_LENGTH ; ????
-	ld hl, wEnemyMonMoves
-	ld a, [hBattleTurn]
-	and a
-	jr z, .got_moves
-	ld hl, wBattleMonMoves
-.got_moves
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
-	call GetBattleVar
-	and a
-	jr z, .failed
-	cp STRUGGLE
-	jr z, .failed
-	ld b, a
-	ld c, -1
-.loop
-	inc c
-	ld a, [hli]
-	cp b
-	jr nz, .loop
-	ld [wTypeMatchup], a
-	dec hl
-	ld b, 0
-	push bc
-	ld c, wBattleMonPP - wBattleMonMoves
-	add hl, bc
-	pop bc
-	ld a, [hl]
-	and PP_MASK
-	jr z, .failed
-	push bc
-	call GetMoveName
-	; lose 2-5 PP
-	call BattleRandom
-	and %11
-	inc a
-	inc a
-	ld b, a
-	ld a, [hl]
-	and PP_MASK
-	cp b
-	jr nc, .deplete_pp
-	ld b, a
-.deplete_pp
-	ld a, [hl]
-	sub b
-	ld [hl], a
-	push af
-	ld a, MON_PP
-	call OpponentPartyAttr
-	ld d, b
-	pop af
-	pop bc
-	add hl, bc
-	ld e, a
-	ld a, BATTLE_VARS_SUBSTATUS5_OPP
-	call GetBattleVar
-	bit SUBSTATUS_TRANSFORMED, a
-	jr nz, .transformed
-	ld a, [hBattleTurn]
-	and a
-	jr nz, .not_wildmon
-	ld a, [wBattleMode]
-	dec a
-	jr nz, .not_wildmon
-	ld hl, wWildMonPP
-	add hl, bc
-.not_wildmon
-	ld [hl], e
-.transformed
-	push de
-	call AnimateCurrentMove
-	pop de
-	ld a, d
-	ld [wTypeMatchup], a
-	ld hl, SpiteEffectText
-	jp StdBattleTextBox
-
-.failed
-	jp PrintDidntAffect2
-
-; 35c94
-
-
-BattleCommand_FalseSwipe: ; 35c94
-; falseswipe
-
-	ld hl, wEnemyMonHP
-	ld a, [hBattleTurn]
-	and a
-	jr z, .got_hp
-	ld hl, wBattleMonHP
-.got_hp
-	ld de, wCurDamage
-	ld c, 2
-	push hl
-	push de
-	call StringCmp
-	pop de
-	pop hl
-	jr c, .done
-	ld a, [hli]
-	ld [de], a
-	inc de
-	ld a, [hl]
-	dec a
-	ld [de], a
-	inc a
-	jr nz, .okay
-	dec de
-	ld a, [de]
-	dec a
-	ld [de], a
-.okay
-	ld a, [wCriticalHit]
-	cp 2
-	jr nz, .carry
-	xor a
-	ld [wCriticalHit], a
-.carry
-	scf
-	ret
-
-.done
-	and a
-	ret
-
-; 35cc9
-
-
-BattleCommand_HealBell: ; 35cc9
-; healbell
-
-	ld a, BATTLE_VARS_SUBSTATUS1
-	call GetBattleVarAddr
-	res SUBSTATUS_NIGHTMARE, [hl]
-	ld de, wPartyMon1Status
-	ld a, [hBattleTurn]
-	and a
-	jr z, .got_status
-	ld de, wOTPartyMon1Status
-.got_status
-	ld a, BATTLE_VARS_STATUS
-	call GetBattleVarAddr
-	xor a
-	ld [hl], a
-	ld h, d
-	ld l, e
-	ld bc, PARTYMON_STRUCT_LENGTH
-	ld d, PARTY_LENGTH
-.loop
-	ld [hl], a
-	add hl, bc
-	dec d
-	jr nz, .loop
-	call AnimateCurrentMove
-
-	ld hl, BellChimedText
-	call StdBattleTextBox
-
-	ld a, [hBattleTurn]
-	and a
-	jp z, CalcPlayerStats
-	jp CalcEnemyStats
-
-; 35d00
-
-
-FarPlayBattleAnimation: ; 35d00
+FarPlayBattleAnimation:
 ; play animation de
 
 	ld a, BATTLE_VARS_SUBSTATUS3
@@ -4700,9 +3386,8 @@ FarPlayBattleAnimation: ; 35d00
 	ret nz
 
 	; fallthrough
-; 35d08
 
-PlayFXAnimID: ; 35d08
+PlayFXAnimID:
 	ld a, e
 	ld [wFXAnimID], a
 	ld a, d
@@ -4710,15 +3395,10 @@ PlayFXAnimID: ; 35d08
 
 	ld c, 3
 	call DelayFrames
-
 	callfar PlayBattleAnim
-
 	ret
 
-; 35d1c
-
-
-EnemyHurtItself: ; 35d1c
+DoEnemyDamage:
 	ld hl, wCurDamage
 	ld a, [hli]
 	ld b, a
@@ -4728,13 +3408,14 @@ EnemyHurtItself: ; 35d1c
 
 	ld a, c
 	and a
-	jr nz, .mimic_sub_check
-
+	jr nz, .ignore_substitute
 	ld a, [wEnemySubStatus4]
 	bit SUBSTATUS_SUBSTITUTE, a
-	jp nz, SelfInflictDamageToSubstitute
+	jp nz, DoSubstituteDamage
 
-.mimic_sub_check
+.ignore_substitute
+	; Substract wCurDamage from wEnemyMonHP.
+	;  store original HP in little endian wBuffer3/4
 	ld a, [hld]
 	ld b, a
 	ld a, [wEnemyMonHP + 1]
@@ -4747,19 +3428,18 @@ EnemyHurtItself: ; 35d1c
 	ld [wBuffer4], a
 	sbc b
 	ld [wEnemyMonHP], a
-	jr nc, .mimic_faint
+	jr nc, .no_underflow
 
 	ld a, [wBuffer4]
 	ld [hli], a
 	ld a, [wBuffer3]
 	ld [hl], a
-
 	xor a
 	ld hl, wEnemyMonHP
 	ld [hli], a
 	ld [hl], a
 
-.mimic_faint
+.no_underflow
 	ld hl, wEnemyMonMaxHP
 	ld a, [hli]
 	ld [wBuffer2], a
@@ -4770,6 +3450,7 @@ EnemyHurtItself: ; 35d1c
 	ld [wBuffer6], a
 	ld a, [hl]
 	ld [wBuffer5], a
+
 	hlcoord 2, 2
 	xor a
 	ld [wWhichHPBar], a
@@ -4777,10 +3458,7 @@ EnemyHurtItself: ; 35d1c
 .did_no_damage
 	jp RefreshBattleHuds
 
-; 35d7e
-
-
-PlayerHurtItself: ; 35d7e
+DoPlayerDamage:
 	ld hl, wCurDamage
 	ld a, [hli]
 	ld b, a
@@ -4790,12 +3468,15 @@ PlayerHurtItself: ; 35d7e
 
 	ld a, c
 	and a
-	jr nz, .mimic_sub_check
-
+	jr nz, .ignore_substitute
 	ld a, [wPlayerSubStatus4]
 	bit SUBSTATUS_SUBSTITUTE, a
-	jp nz, SelfInflictDamageToSubstitute
-.mimic_sub_check
+	jp nz, DoSubstituteDamage
+
+.ignore_substitute
+	; Substract wCurDamage from wBattleMonHP.
+	;  store original HP in little endian wBuffer3/4
+	;  store new HP in little endian wBuffer5/6
 	ld a, [hld]
 	ld b, a
 	ld a, [wBattleMonHP + 1]
@@ -4809,14 +3490,13 @@ PlayerHurtItself: ; 35d7e
 	sbc b
 	ld [wBattleMonHP], a
 	ld [wBuffer6], a
-	jr nc, .mimic_faint
+	jr nc, .no_underflow
 
 	ld a, [wBuffer4]
 	ld [hli], a
 	ld a, [wBuffer3]
 	ld [hl], a
 	xor a
-
 	ld hl, wBattleMonHP
 	ld [hli], a
 	ld [hl], a
@@ -4824,24 +3504,21 @@ PlayerHurtItself: ; 35d7e
 	ld [hli], a
 	ld [hl], a
 
-.mimic_faint
+.no_underflow
 	ld hl, wBattleMonMaxHP
 	ld a, [hli]
 	ld [wBuffer2], a
 	ld a, [hl]
 	ld [wBuffer1], a
+
 	hlcoord 10, 9
-	ld a, $1
+	ld a, 1
 	ld [wWhichHPBar], a
 	predef AnimateHPBar
 .did_no_damage
 	jp RefreshBattleHuds
 
-; 35de0
-
-
-SelfInflictDamageToSubstitute: ; 35de0
-
+DoSubstituteDamage:
 	ld hl, SubTookDamageText
 	call StdBattleTextBox
 
@@ -4898,11 +3575,7 @@ SelfInflictDamageToSubstitute: ; 35de0
 .done
 	jp ResetDamage
 
-; 35e40
-
-
-UpdateMoveData: ; 35e40
-
+UpdateMoveData:
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVarAddr
 	ld d, h
@@ -4918,10 +3591,7 @@ UpdateMoveData: ; 35e40
 	call GetMoveName
 	jp CopyName1
 
-; 35e5c
-
-
-BattleCommand_SleepTarget: ; 35e5c
+BattleCommand_SleepTarget:
 ; sleeptarget
 
 	call GetOpponentItem
@@ -4992,10 +3662,7 @@ BattleCommand_SleepTarget: ; 35e5c
 	pop hl
 	jp StdBattleTextBox
 
-; 35ece
-
-
-.CheckAIRandomFail: ; 35ece
+.CheckAIRandomFail:
 	; Enemy turn
 	ld a, [hBattleTurn]
 	and a
@@ -5023,10 +3690,7 @@ BattleCommand_SleepTarget: ; 35e5c
 	xor a
 	ret
 
-; 35eee
-
-
-BattleCommand_PoisonTarget: ; 35eee
+BattleCommand_PoisonTarget:
 ; poisontarget
 
 	call CheckSubstituteOpp
@@ -5061,10 +3725,7 @@ BattleCommand_PoisonTarget: ; 35eee
 	farcall UseHeldStatusHealingItem
 	ret
 
-; 35f2c
-
-
-BattleCommand_Poison: ; 35f2c
+BattleCommand_Poison:
 ; poison
 
 	ld hl, DoesntAffectText
@@ -5101,25 +3762,25 @@ BattleCommand_Poison: ; 35f2c
 
 	ld a, [hBattleTurn]
 	and a
-	jr z, .mimic_random
+	jr z, .dont_sample_failure
 
 	ld a, [wLinkMode]
 	and a
-	jr nz, .mimic_random
+	jr nz, .dont_sample_failure
 
 	ld a, [wInBattleTowerBattle]
 	and a
-	jr nz, .mimic_random
+	jr nz, .dont_sample_failure
 
 	ld a, [wPlayerSubStatus5]
 	bit SUBSTATUS_LOCK_ON, a
-	jr nz, .mimic_random
+	jr nz, .dont_sample_failure
 
 	call BattleRandom
 	cp 25 percent + 1 ; 25% chance AI fails
 	jr c, .failed
 
-.mimic_random
+.dont_sample_failure
 	call CheckSubstituteOpp
 	jr nz, .failed
 	ld a, [wAttackMissed]
@@ -5152,18 +3813,12 @@ BattleCommand_Poison: ; 35f2c
 	pop hl
 	jp StdBattleTextBox
 
-; 35fc0
-
-
-.apply_poison ; 35fc0
+.apply_poison
 	call AnimateCurrentMove
 	call PoisonOpponent
 	jp RefreshBattleHuds
 
-; 35fc9
-
-
-.check_toxic ; 35fc9
+.check_toxic
 	ld a, BATTLE_VARS_SUBSTATUS5_OPP
 	call GetBattleVarAddr
 	ld a, [hBattleTurn]
@@ -5177,10 +3832,7 @@ BattleCommand_Poison: ; 35f2c
 	cp EFFECT_TOXIC
 	ret
 
-; 35fe1
-
-
-CheckIfTargetIsPoisonType: ; 35fe1
+CheckIfTargetIsPoisonType:
 	ld de, wEnemyMonType1
 	ld a, [hBattleTurn]
 	and a
@@ -5195,37 +3847,26 @@ CheckIfTargetIsPoisonType: ; 35fe1
 	cp POISON
 	ret
 
-; 35ff5
-
-
-PoisonOpponent: ; 35ff5
+PoisonOpponent:
 	ld a, BATTLE_VARS_STATUS_OPP
 	call GetBattleVarAddr
 	set PSN, [hl]
 	jp UpdateOpponentInParty
 
-; 35fff
-
-
-BattleCommand_DrainTarget: ; 35fff
+BattleCommand_DrainTarget:
 ; draintarget
 	call SapHealth
 	ld hl, SuckedHealthText
 	jp StdBattleTextBox
 
-; 36008
-
-
-BattleCommand_EatDream: ; 36008
+BattleCommand_EatDream:
 ; eatdream
 	call SapHealth
 	ld hl, DreamEatenText
 	jp StdBattleTextBox
 
-; 36011
-
-
-SapHealth: ; 36011
+SapHealth:
+	; Divide damage by 2, store it in hDividend
 	ld hl, wCurDamage
 	ld a, [hli]
 	srl a
@@ -5235,10 +3876,11 @@ SapHealth: ; 36011
 	rr a
 	ld [hDividend + 1], a
 	or b
-	jr nz, .ok1
-	ld a, $1
+	jr nz, .at_least_one
+	ld a, 1
 	ld [hDividend + 1], a
-.ok1
+.at_least_one
+
 	ld hl, wBattleMonHP
 	ld de, wBattleMonMaxHP
 	ld a, [hBattleTurn]
@@ -5247,12 +3889,16 @@ SapHealth: ; 36011
 	ld hl, wEnemyMonHP
 	ld de, wEnemyMonMaxHP
 .battlemonhp
+
+	; Store current HP in little endian wBuffer3/4
 	ld bc, wBuffer4
 	ld a, [hli]
 	ld [bc], a
 	ld a, [hl]
 	dec bc
 	ld [bc], a
+
+	; Store max HP in little endian wBuffer1/2
 	ld a, [de]
 	dec bc
 	ld [bc], a
@@ -5260,6 +3906,8 @@ SapHealth: ; 36011
 	ld a, [de]
 	dec bc
 	ld [bc], a
+
+	; Add hDividend to current HP and copy it to little endian wBuffer5/6
 	ld a, [hDividend + 1]
 	ld b, [hl]
 	add b
@@ -5270,7 +3918,9 @@ SapHealth: ; 36011
 	adc b
 	ld [hli], a
 	ld [wBuffer6], a
-	jr c, .okay2
+	jr c, .max_hp
+
+	; Substract current HP from max HP (to see if we have more than max HP)
 	ld a, [hld]
 	ld b, a
 	ld a, [de]
@@ -5281,8 +3931,10 @@ SapHealth: ; 36011
 	ld a, [de]
 	inc de
 	sbc b
-	jr nc, .okay3
-.okay2
+	jr nc, .finish
+
+.max_hp
+	; Load max HP into current HP and copy it to little endian wBuffer5/6
 	ld a, [de]
 	ld [hld], a
 	ld [wBuffer5], a
@@ -5291,7 +3943,8 @@ SapHealth: ; 36011
 	ld [hli], a
 	ld [wBuffer6], a
 	inc de
-.okay3
+
+.finish
 	ld a, [hBattleTurn]
 	and a
 	hlcoord 10, 9
@@ -5305,10 +3958,7 @@ SapHealth: ; 36011
 	call RefreshBattleHuds
 	jp UpdateBattleMonInParty
 
-; 3608c
-
-
-BattleCommand_BurnTarget: ; 3608c
+BattleCommand_BurnTarget:
 ; burntarget
 
 	xor a
@@ -5349,10 +3999,7 @@ BattleCommand_BurnTarget: ; 3608c
 	farcall UseHeldStatusHealingItem
 	ret
 
-; 360dd
-
-
-Defrost: ; 360dd
+Defrost:
 	ld a, [hl]
 	and 1 << FRZ
 	ret z
@@ -5377,10 +4024,7 @@ Defrost: ; 360dd
 	ld hl, DefrostedOpponentText
 	jp StdBattleTextBox
 
-; 36102
-
-
-BattleCommand_FreezeTarget: ; 36102
+BattleCommand_FreezeTarget:
 ; freezetarget
 
 	xor a
@@ -5433,10 +4077,7 @@ BattleCommand_FreezeTarget: ; 36102
 	ld [hl], $1
 	ret
 
-; 36165
-
-
-BattleCommand_ParalyzeTarget: ; 36165
+BattleCommand_ParalyzeTarget:
 ; paralyzetarget
 
 	xor a
@@ -5472,80 +4113,77 @@ BattleCommand_ParalyzeTarget: ; 36165
 	ld hl, UseHeldStatusHealingItem
 	jp CallBattleCore
 
-; 361ac
-
-
-BattleCommand_AttackUp: ; 361ac
+BattleCommand_AttackUp:
 ; attackup
 	ld b, ATTACK
 	jr BattleCommand_StatUp
 
-BattleCommand_DefenseUp: ; 361b0
+BattleCommand_DefenseUp:
 ; defenseup
 	ld b, DEFENSE
 	jr BattleCommand_StatUp
 
-BattleCommand_SpeedUp: ; 361b4
+BattleCommand_SpeedUp:
 ; speedup
 	ld b, SPEED
 	jr BattleCommand_StatUp
 
-BattleCommand_SpecialAttackUp: ; 361b8
+BattleCommand_SpecialAttackUp:
 ; specialattackup
 	ld b, SP_ATTACK
 	jr BattleCommand_StatUp
 
-BattleCommand_SpecialDefenseUp: ; 361bc
+BattleCommand_SpecialDefenseUp:
 ; specialdefenseup
 	ld b, SP_DEFENSE
 	jr BattleCommand_StatUp
 
-BattleCommand_AccuracyUp: ; 361c0
+BattleCommand_AccuracyUp:
 ; accuracyup
 	ld b, ACCURACY
 	jr BattleCommand_StatUp
 
-BattleCommand_EvasionUp: ; 361c4
+BattleCommand_EvasionUp:
 ; evasionup
 	ld b, EVASION
 	jr BattleCommand_StatUp
 
-BattleCommand_AttackUp2: ; 361c8
+BattleCommand_AttackUp2:
 ; attackup2
 	ld b, $10 | ATTACK
 	jr BattleCommand_StatUp
 
-BattleCommand_DefenseUp2: ; 361cc
+BattleCommand_DefenseUp2:
 ; defenseup2
 	ld b, $10 | DEFENSE
 	jr BattleCommand_StatUp
 
-BattleCommand_SpeedUp2: ; 361d0
+BattleCommand_SpeedUp2:
 ; speedup2
 	ld b, $10 | SPEED
 	jr BattleCommand_StatUp
 
-BattleCommand_SpecialAttackUp2: ; 361d4
+BattleCommand_SpecialAttackUp2:
 ; specialattackup2
 	ld b, $10 | SP_ATTACK
 	jr BattleCommand_StatUp
 
-BattleCommand_SpecialDefenseUp2: ; 361d8
+BattleCommand_SpecialDefenseUp2:
 ; specialdefenseup2
 	ld b, $10 | SP_DEFENSE
 	jr BattleCommand_StatUp
 
-BattleCommand_AccuracyUp2: ; 361dc
+BattleCommand_AccuracyUp2:
 ; accuracyup2
 	ld b, $10 | ACCURACY
 	jr BattleCommand_StatUp
 
-BattleCommand_EvasionUp2: ; 361e0
+BattleCommand_EvasionUp2:
 ; evasionup2
 	ld b, $10 | EVASION
 	jr BattleCommand_StatUp
 
-BattleCommand_StatUp: ; 361e4
+BattleCommand_StatUp:
 ; statup
 	call CheckIfStatCanBeRaised
 	ld a, [wFailedMessage]
@@ -5553,10 +4191,7 @@ BattleCommand_StatUp: ; 361e4
 	ret nz
 	jp StatUpAnimation
 
-; 361ef
-
-
-CheckIfStatCanBeRaised: ; 361ef
+CheckIfStatCanBeRaised:
 	ld a, b
 	ld [wLoweredStat], a
 	ld hl, wPlayerStatLevels
@@ -5635,35 +4270,24 @@ CheckIfStatCanBeRaised: ; 361ef
 	ld [wFailedMessage], a
 	ret
 
-; 3626e
-
-
-.stats_already_max ; 3626e
+.stats_already_max
 	pop hl
 	dec [hl]
 	; fallthrough
-; 36270
-
 
-.cant_raise_stat ; 36270
+.cant_raise_stat
 	ld a, $2
 	ld [wFailedMessage], a
 	ld a, $1
 	ld [wAttackMissed], a
 	ret
 
-; 3627b
-
-
-.stat_raise_failed ; 3627b
+.stat_raise_failed
 	ld a, $1
 	ld [wFailedMessage], a
 	ret
 
-; 36281
-
-
-StatUpAnimation: ; 36281
+StatUpAnimation:
 	ld bc, wPlayerMinimized
 	ld hl, DropPlayerSub
 	ld a, [hBattleTurn]
@@ -5688,79 +4312,76 @@ StatUpAnimation: ; 36281
 	call WaitBGMap
 	jp BattleCommand_MoveDelay
 
-; 362ad
-
-
-BattleCommand_AttackDown: ; 362ad
+BattleCommand_AttackDown:
 ; attackdown
 	ld a, ATTACK
 	jr BattleCommand_StatDown
 
-BattleCommand_DefenseDown: ; 362b1
+BattleCommand_DefenseDown:
 ; defensedown
 	ld a, DEFENSE
 	jr BattleCommand_StatDown
 
-BattleCommand_SpeedDown: ; 362b5
+BattleCommand_SpeedDown:
 ; speeddown
 	ld a, SPEED
 	jr BattleCommand_StatDown
 
-BattleCommand_SpecialAttackDown: ; 362b9
+BattleCommand_SpecialAttackDown:
 ; specialattackdown
 	ld a, SP_ATTACK
 	jr BattleCommand_StatDown
 
-BattleCommand_SpecialDefenseDown: ; 362bd
+BattleCommand_SpecialDefenseDown:
 ; specialdefensedown
 	ld a, SP_DEFENSE
 	jr BattleCommand_StatDown
 
-BattleCommand_AccuracyDown: ; 362c1
+BattleCommand_AccuracyDown:
 ; accuracydown
 	ld a, ACCURACY
 	jr BattleCommand_StatDown
 
-BattleCommand_EvasionDown: ; 362c5
+BattleCommand_EvasionDown:
 ; evasiondown
 	ld a, EVASION
 	jr BattleCommand_StatDown
 
-BattleCommand_AttackDown2: ; 362c9
+BattleCommand_AttackDown2:
 ; attackdown2
 	ld a, $10 | ATTACK
 	jr BattleCommand_StatDown
 
-BattleCommand_DefenseDown2: ; 362cd
+BattleCommand_DefenseDown2:
 ; defensedown2
 	ld a, $10 | DEFENSE
 	jr BattleCommand_StatDown
 
-BattleCommand_SpeedDown2: ; 362d1
+BattleCommand_SpeedDown2:
 ; speeddown2
 	ld a, $10 | SPEED
 	jr BattleCommand_StatDown
 
-BattleCommand_SpecialAttackDown2: ; 362d5
+BattleCommand_SpecialAttackDown2:
 ; specialattackdown2
 	ld a, $10 | SP_ATTACK
 	jr BattleCommand_StatDown
 
-BattleCommand_SpecialDefenseDown2: ; 362d9
+BattleCommand_SpecialDefenseDown2:
 ; specialdefensedown2
 	ld a, $10 | SP_DEFENSE
 	jr BattleCommand_StatDown
 
-BattleCommand_AccuracyDown2: ; 362dd
+BattleCommand_AccuracyDown2:
 ; accuracydown2
 	ld a, $10 | ACCURACY
 	jr BattleCommand_StatDown
 
-BattleCommand_EvasionDown2: ; 362e1
+BattleCommand_EvasionDown2:
 ; evasiondown2
 	ld a, $10 | EVASION
 
-BattleCommand_StatDown: ; 362e3
+BattleCommand_StatDown:
 ; statdown
 
 	ld [wLoweredStat], a
@@ -5883,10 +4504,7 @@ BattleCommand_StatDown: ; 362e3
 	ld [wAttackMissed], a
 	ret
 
-; 36391
-
-
-CheckMist: ; 36391
+CheckMist:
 	ld a, BATTLE_VARS_MOVE_EFFECT
 	call GetBattleVar
 	cp EFFECT_ATTACK_DOWN
@@ -5911,10 +4529,7 @@ CheckMist: ; 36391
 	bit SUBSTATUS_MIST, a
 	ret
 
-; 363b8
-
-
-BattleCommand_StatUpMessage: ; 363b8
+BattleCommand_StatUpMessage:
 	ld a, [wFailedMessage]
 	and a
 	ret nz
@@ -5944,10 +4559,7 @@ BattleCommand_StatUpMessage: ; 363b8
 	text_jump UnknownText_0x1c0ce0
 	db "@"
 
-; 363e9
-
-
-BattleCommand_StatDownMessage: ; 363e9
+BattleCommand_StatDownMessage:
 	ld a, [wFailedMessage]
 	and a
 	ret nz
@@ -5976,10 +4588,7 @@ BattleCommand_StatDownMessage: ; 363e9
 	text_jump UnknownText_0x1c0d06
 	db "@"
 
-; 3641a
-
-
-TryLowerStat: ; 3641a
+TryLowerStat:
 ; Lower stat c from stat struct hl (buffer de).
 
 	push bc
@@ -6022,10 +4631,7 @@ TryLowerStat: ; 3641a
 	and a
 	ret
 
-; 3644c
-
-
-BattleCommand_StatUpFailText: ; 3644c
+BattleCommand_StatUpFailText:
 ; statupfailtext
 	ld a, [wFailedMessage]
 	and a
@@ -6043,10 +4649,7 @@ BattleCommand_StatUpFailText: ; 3644c
 	ld hl, WontRiseAnymoreText
 	jp StdBattleTextBox
 
-; 3646a
-
-
-BattleCommand_StatDownFailText: ; 3646a
+BattleCommand_StatDownFailText:
 ; statdownfailtext
 	ld a, [wFailedMessage]
 	and a
@@ -6067,10 +4670,7 @@ BattleCommand_StatDownFailText: ; 3646a
 	ld hl, WontDropAnymoreText
 	jp StdBattleTextBox
 
-; 3648f
-
-
-GetStatName: ; 3648f
+GetStatName:
 	ld hl, StatNames
 	ld c, "@"
 .CheckName:
@@ -6089,11 +4689,9 @@ GetStatName: ; 3648f
 
 INCLUDE "data/battle/stat_names.asm"
 
-
 INCLUDE "data/battle/stat_multipliers.asm"
 
-
-BattleCommand_AllStatsUp: ; 36500
+BattleCommand_AllStatsUp:
 ; allstatsup
 
 ; Attack
@@ -6120,18 +4718,13 @@ BattleCommand_AllStatsUp: ; 36500
 	call ResetMiss
 	call BattleCommand_SpecialDefenseUp
 	jp   BattleCommand_StatUpMessage
-; 3652d
-
 
-ResetMiss: ; 3652d
+ResetMiss:
 	xor a
 	ld [wAttackMissed], a
 	ret
 
-; 36532
-
-
-LowerStat: ; 36532
+LowerStat:
 	ld [wLoweredStat], a
 
 	ld hl, wPlayerStatLevels
@@ -6202,10 +4795,7 @@ LowerStat: ; 36532
 	ld [wFailedMessage], a
 	ret
 
-; 3658f
-
-
-BattleCommand_TriStatusChance: ; 3658f
+BattleCommand_TriStatusChance:
 ; tristatuschance
 
 	call BattleCommand_EffectChance
@@ -6225,20 +4815,15 @@ BattleCommand_TriStatusChance: ; 3658f
 	dw BattleCommand_ParalyzeTarget ; paralyze
 	dw BattleCommand_FreezeTarget ; freeze
 	dw BattleCommand_BurnTarget ; burn
-; 365a7
 
-
-BattleCommand_Curl: ; 365a7
+BattleCommand_Curl:
 ; curl
 	ld a, BATTLE_VARS_SUBSTATUS2
 	call GetBattleVarAddr
 	set SUBSTATUS_CURLED, [hl]
 	ret
 
-; 365af
-
-
-BattleCommand_RaiseSubNoAnim: ; 365af
+BattleCommand_RaiseSubNoAnim:
 	ld hl, GetBattleMonBackpic
 	ld a, [hBattleTurn]
 	and a
@@ -6250,10 +4835,7 @@ BattleCommand_RaiseSubNoAnim: ; 365af
 	call CallBattleCore
 	jp WaitBGMap
 
-; 365c3
-
-
-BattleCommand_LowerSubNoAnim: ; 365c3
+BattleCommand_LowerSubNoAnim:
 	ld hl, DropPlayerSub
 	ld a, [hBattleTurn]
 	and a
@@ -6265,10 +4847,7 @@ BattleCommand_LowerSubNoAnim: ; 365c3
 	call CallBattleCore
 	jp WaitBGMap
 
-; 365d7
-
-
-CalcPlayerStats: ; 365d7
+CalcPlayerStats:
 	ld hl, wPlayerAtkLevel
 	ld de, wPlayerStats
 	ld bc, wBattleMonAttack
@@ -6289,10 +4868,7 @@ CalcPlayerStats: ; 365d7
 
 	jp BattleCommand_SwitchTurn
 
-; 365fd
-
-
-CalcEnemyStats: ; 365fd
+CalcEnemyStats:
 	ld hl, wEnemyAtkLevel
 	ld de, wEnemyStats
 	ld bc, wEnemyMonAttack
@@ -6310,10 +4886,7 @@ CalcEnemyStats: ; 365fd
 
 	jp BattleCommand_SwitchTurn
 
-; 3661d
-
-
-CalcStats: ; 3661d
+CalcStats:
 .loop
 	push af
 	ld a, [hli]
@@ -6382,117 +4955,9 @@ CalcStats: ; 3661d
 
 	ret
 
-; 36671
-
-
-BattleCommand_StoreEnergy: ; 36671
-; storeenergy
-
-	ld a, BATTLE_VARS_SUBSTATUS3
-	call GetBattleVar
-	bit SUBSTATUS_BIDE, a
-	ret z
-
-	ld hl, wPlayerRolloutCount
-	ld a, [hBattleTurn]
-	and a
-	jr z, .check_still_storing_energy
-	ld hl, wEnemyRolloutCount
-.check_still_storing_energy
-	dec [hl]
-	jr nz, .still_storing
-
-	ld a, BATTLE_VARS_SUBSTATUS3
-	call GetBattleVarAddr
-	res SUBSTATUS_BIDE, [hl]
+INCLUDE "engine/battle/move_effects/bide.asm"
 
-	ld hl, UnleashedEnergyText
-	call StdBattleTextBox
-
-	ld a, BATTLE_VARS_MOVE_POWER
-	call GetBattleVarAddr
-	ld a, 1
-	ld [hl], a
-	ld hl, wPlayerDamageTaken + 1
-	ld de, wPlayerCharging ; player
-	ld a, [hBattleTurn]
-	and a
-	jr z, .player
-	ld hl, wEnemyDamageTaken + 1
-	ld de, wEnemyCharging ; enemy
-.player
-	ld a, [hld]
-	add a
-	ld b, a
-	ld [wCurDamage + 1], a
-	ld a, [hl]
-	rl a
-	ld [wCurDamage], a
-	jr nc, .not_maxed
-	ld a, $ff
-	ld [wCurDamage], a
-	ld [wCurDamage + 1], a
-.not_maxed
-	or b
-	jr nz, .built_up_something
-	ld a, 1
-	ld [wAttackMissed], a
-.built_up_something
-	xor a
-	ld [hli], a
-	ld [hl], a
-	ld [de], a
-
-	ld a, BATTLE_VARS_MOVE_ANIM
-	call GetBattleVarAddr
-	ld a, BIDE
-	ld [hl], a
-
-	ld b, unleashenergy_command
-	jp SkipToBattleCommand
-
-.still_storing
-	ld hl, StoringEnergyText
-	call StdBattleTextBox
-	jp EndMoveEffect
-
-; 366e5
-
-
-BattleCommand_UnleashEnergy: ; 366e5
-; unleashenergy
-
-	ld de, wPlayerDamageTaken
-	ld bc, wPlayerRolloutCount
-	ld a, [hBattleTurn]
-	and a
-	jr z, .got_damage
-	ld de, wEnemyDamageTaken
-	ld bc, wEnemyRolloutCount
-.got_damage
-	ld a, BATTLE_VARS_SUBSTATUS3
-	call GetBattleVarAddr
-	set SUBSTATUS_BIDE, [hl]
-	xor a
-	ld [de], a
-	inc de
-	ld [de], a
-	ld [wPlayerMoveStructEffect], a
-	ld [wEnemyMoveStructEffect], a
-	call BattleRandom
-	and 1
-	inc a
-	inc a
-	ld [bc], a
-	ld a, 1
-	ld [wKickCounter], a
-	call AnimateCurrentMove
-	jp EndMoveEffect
-
-; 3671a
-
-
-BattleCommand_CheckRampage: ; 3671a
+BattleCommand_CheckRampage:
 ; checkrampage
 
 	ld de, wPlayerRolloutCount
@@ -6529,10 +4994,7 @@ BattleCommand_CheckRampage: ; 3671a
 	ld b, rampage_command
 	jp SkipToBattleCommand
 
-; 36751
-
-
-BattleCommand_Rampage: ; 36751
+BattleCommand_Rampage:
 ; rampage
 
 ; No rampage during Sleep Talk.
@@ -6559,113 +5021,16 @@ BattleCommand_Rampage: ; 36751
 	ld [wSomeoneIsRampaging], a
 	ret
 
-; 36778
-
-
-BattleCommand_Teleport: ; 36778
-; teleport
-
-	ld a, [wBattleType]
-	cp BATTLETYPE_SHINY
-	jr z, .failed
-	cp BATTLETYPE_TRAP
-	jr z, .failed
-	cp BATTLETYPE_CELEBI
-	jr z, .failed
-	cp BATTLETYPE_SUICUNE
-	jr z, .failed
-
-	ld a, BATTLE_VARS_SUBSTATUS5_OPP
-	call GetBattleVar
-	bit SUBSTATUS_CANT_RUN, a
-	jr nz, .failed
-; Only need to check these next things if it's your turn
-	ld a, [hBattleTurn]
-	and a
-	jr nz, .enemy_turn
-; Can't teleport from a trainer battle
-	ld a, [wBattleMode]
-	dec a
-	jr nz, .failed
-; If your level is greater than the opponent's, you run without fail.
-	ld a, [wCurPartyLevel]
-	ld b, a
-	ld a, [wBattleMonLevel]
-	cp b
-	jr nc, .run_away
-; Generate a number between 0 and (YourLevel + TheirLevel).
-	add b
-	ld c, a
-	inc c
-.loop_player
-	call BattleRandom
-	cp c
-	jr nc, .loop_player
-; If that number is greater than 4 times your level, run away.
-	srl b
-	srl b
-	cp b
-	jr nc, .run_away
-
-.failed
-	call AnimateFailedMove
-	jp PrintButItFailed
-
-.enemy_turn
-	ld a, [wBattleMode]
-	dec a
-	jr nz, .failed
-	ld a, [wBattleMonLevel]
-	ld b, a
-	ld a, [wCurPartyLevel]
-	cp b
-	jr nc, .run_away
-	add b
-	ld c, a
-	inc c
-.loop_enemy
-	call BattleRandom
-	cp c
-	jr nc, .loop_enemy
-	srl b
-	srl b
-	cp b
-	; This does the wrong thing. What was
-	; probably intended was jr c, .failed
-	; The way this is made makes enemy use
-	; of Teleport always succeed if able
-	jr nc, .run_away
-.run_away
-	call UpdateBattleMonInParty
-	xor a
-	ld [wNumHits], a
-	inc a
-	ld [wForcedSwitch], a
-	ld [wKickCounter], a
-	call SetBattleDraw
-	call BattleCommand_LowerSub
-	call LoadMoveAnim
-	ld c, 20
-	call DelayFrames
-	call SetBattleDraw
-
-	ld hl, FledFromBattleText
-	jp StdBattleTextBox
+INCLUDE "engine/battle/move_effects/teleport.asm"
 
-; 36804
-
-
-SetBattleDraw: ; 36804
+SetBattleDraw:
 	ld a, [wBattleResult]
-	and $c0
-	or $2
+	and BATTLERESULT_BITMASK
+	or DRAW
 	ld [wBattleResult], a
 	ret
 
-; 3680f
-
-
-BattleCommand_ForceSwitch: ; 3680f
+BattleCommand_ForceSwitch:
 ; forceswitch
 
 	ld a, [wBattleType]
@@ -6884,10 +5249,7 @@ BattleCommand_ForceSwitch: ; 3680f
 .do_text
 	jp StdBattleTextBox
 
-; 36994
-
-
-CheckPlayerHasMonToSwitchTo: ; 36994
+CheckPlayerHasMonToSwitchTo:
 	ld a, [wPartyCount]
 	ld d, a
 	ld e, 0
@@ -6916,13 +5278,10 @@ CheckPlayerHasMonToSwitchTo: ; 36994
 	and a
 	ret
 
-; 369b6
-
-
-BattleCommand_EndLoop: ; 369b6
+BattleCommand_EndLoop:
 ; endloop
 
-; Loop back to the command before 'critical'.
+; Loop back to 'critical'.
 
 	ld de, wPlayerRolloutCount
 	ld bc, wPlayerDamageTaken
@@ -6985,7 +5344,7 @@ BattleCommand_EndLoop: ; 369b6
 	ld a, BATTLE_VARS_SUBSTATUS3
 	call GetBattleVarAddr
 	res SUBSTATUS_IN_LOOP, [hl]
-	call BattleCommanda8
+	call BattleCommand_BeatUpFailText
 	jp EndMoveEffect
 
 .not_triple_kick
@@ -7037,7 +5396,6 @@ BattleCommand_EndLoop: ; 369b6
 	ld [bc], a
 	ret
 
-; Loop back to the command before 'critical'.
 .loop_back_to_critical
 	ld a, [wBattleScriptBufferAddress + 1]
 	ld h, a
@@ -7054,10 +5412,7 @@ BattleCommand_EndLoop: ; 369b6
 	ld [wBattleScriptBufferAddress], a
 	ret
 
-; 36a82
-
-
-BattleCommand_FakeOut: ; 36a82
+BattleCommand_FakeOut:
 	ld a, [wAttackMissed]
 	and a
 	ret nz
@@ -7078,10 +5433,7 @@ BattleCommand_FakeOut: ; 36a82
 	ld [wAttackMissed], a
 	ret
 
-; 36aa0
-
-
-BattleCommand_FlinchTarget: ; 36aa0
+BattleCommand_FlinchTarget:
 	call CheckSubstituteOpp
 	ret nz
 
@@ -7098,19 +5450,14 @@ BattleCommand_FlinchTarget: ; 36aa0
 	ret nz
 
 	; fallthrough
-; 36ab5
-
 
-FlinchTarget: ; 36ab5
+FlinchTarget:
 	ld a, BATTLE_VARS_SUBSTATUS3_OPP
 	call GetBattleVarAddr
 	set SUBSTATUS_FLINCHED, [hl]
 	jp EndRechargeOpp
 
-; 36abf
-
-
-CheckOpponentWentFirst: ; 36abf
+CheckOpponentWentFirst:
 ; Returns a=0, z if user went first
 ; Returns a=1, nz if opponent went first
 	push bc
@@ -7121,10 +5468,7 @@ CheckOpponentWentFirst: ; 36abf
 	pop bc
 	ret
 
-; 36ac9
-
-
-BattleCommand_HeldFlinch: ; 36ac9
+BattleCommand_HeldFlinch:
 ; kingsrock
 
 	ld a, [wAttackMissed]
@@ -7152,10 +5496,7 @@ BattleCommand_HeldFlinch: ; 36ac9
 	set SUBSTATUS_FLINCHED, [hl]
 	ret
 
-; 36af3
-
-
-BattleCommand_OHKO: ; 36af3
+BattleCommand_OHKO:
 ; ohko
 
 	call ResetDamage
@@ -7201,10 +5542,7 @@ BattleCommand_OHKO: ; 36af3
 	ld [wAttackMissed], a
 	ret
 
-; 36b3a
-
-
-BattleCommand_CheckCharge: ; 36b3a
+BattleCommand_CheckCharge:
 ; checkcharge
 
 	ld a, BATTLE_VARS_SUBSTATUS3
@@ -7217,10 +5555,7 @@ BattleCommand_CheckCharge: ; 36b3a
 	ld b, charge_command
 	jp SkipToBattleCommand
 
-; 36b4d
-
-
-BattleCommand_Charge: ; 36b4d
+BattleCommand_Charge:
 ; charge
 
 	call BattleCommand_ClearText
@@ -7301,7 +5636,7 @@ BattleCommand_Charge: ; 36b4d
 	jp EndMoveEffect
 
 .UsedText:
-	text_jump UnknownText_0x1c0d0e ; "[USER]"
+	text_jump UnknownText_0x1c0d0e ; "<USER>"
 	start_asm
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
@@ -7360,17 +5695,12 @@ BattleCommand_Charge: ; 36b4d
 ; 'dug a hole!'
 	text_jump UnknownText_0x1c0d6c
 	db "@"
-; 36c2c
-
 
-BattleCommand3c: ; 36c2c
+BattleCommand3c:
 ; unused
 	ret
 
-; 36c2d
-
-
-BattleCommand_TrapTarget: ; 36c2d
+BattleCommand_TrapTarget:
 ; traptarget
 
 	ld a, [wAttackMissed]
@@ -7425,48 +5755,12 @@ BattleCommand_TrapTarget: ; 36c2d
 	dbw FIRE_SPIN, FireSpinTrapText  ; 'was trapped!'
 	dbw CLAMP,     ClampedByText     ; 'was CLAMPED by'
 	dbw WHIRLPOOL, WhirlpoolTrapText ; 'was trapped!'
-; 36c7e
-
-
-BattleCommand_Mist: ; 36c7e
-; mist
-
-	ld a, BATTLE_VARS_SUBSTATUS4
-	call GetBattleVarAddr
-	bit SUBSTATUS_MIST, [hl]
-	jr nz, .already_mist
-	set SUBSTATUS_MIST, [hl]
-	call AnimateCurrentMove
-	ld hl, MistText
-	jp StdBattleTextBox
-
-.already_mist
-	call AnimateFailedMove
-	jp PrintButItFailed
-
-; 36c98
-
-
-BattleCommand_FocusEnergy: ; 36c98
-; focusenergy
-
-	ld a, BATTLE_VARS_SUBSTATUS4
-	call GetBattleVarAddr
-	bit SUBSTATUS_FOCUS_ENERGY, [hl]
-	jr nz, .already_pumped
-	set SUBSTATUS_FOCUS_ENERGY, [hl]
-	call AnimateCurrentMove
-	ld hl, GettingPumpedText
-	jp StdBattleTextBox
 
-.already_pumped
-	call AnimateFailedMove
-	jp PrintButItFailed
+INCLUDE "engine/battle/move_effects/mist.asm"
 
-; 36cb2
+INCLUDE "engine/battle/move_effects/focus_energy.asm"
 
-
-BattleCommand_Recoil: ; 36cb2
+BattleCommand_Recoil:
 ; recoil
 
 	ld hl, wBattleMonMaxHP
@@ -7530,10 +5824,7 @@ BattleCommand_Recoil: ; 36cb2
 	ld hl, RecoilText
 	jp StdBattleTextBox
 
-; 36d1d
-
-
-BattleCommand_ConfuseTarget: ; 36d1d
+BattleCommand_ConfuseTarget:
 ; confusetarget
 
 	call GetOpponentItem
@@ -7553,8 +5844,7 @@ BattleCommand_ConfuseTarget: ; 36d1d
 	ret nz
 	jr BattleCommand_FinishConfusingTarget
 
-
-BattleCommand_Confuse: ; 36d3b
+BattleCommand_Confuse:
 ; confuse
 
 	call GetOpponentItem
@@ -7583,7 +5873,7 @@ BattleCommand_Confuse: ; 36d3b
 	ld a, [wAttackMissed]
 	and a
 	jr nz, BattleCommand_Confuse_CheckSnore_Swagger_ConfuseHit
-BattleCommand_FinishConfusingTarget: ; 36d70
+BattleCommand_FinishConfusingTarget:
 	ld bc, wEnemyConfuseCount
 	ld a, [hBattleTurn]
 	and a
@@ -7626,9 +5916,7 @@ BattleCommand_FinishConfusingTarget: ; 36d70
 	ld hl, UseConfusionHealingItem
 	jp CallBattleCore
 
-; 36db6
-
-BattleCommand_Confuse_CheckSnore_Swagger_ConfuseHit: ; 36db6
+BattleCommand_Confuse_CheckSnore_Swagger_ConfuseHit:
 	ld a, BATTLE_VARS_MOVE_EFFECT
 	call GetBattleVar
 	cp EFFECT_CONFUSE_HIT
@@ -7639,10 +5927,7 @@ BattleCommand_Confuse_CheckSnore_Swagger_ConfuseHit: ; 36db6
 	ret z
 	jp PrintDidntAffect2
 
-; 36dc7
-
-
-BattleCommand_Paralyze: ; 36dc7
+BattleCommand_Paralyze:
 ; paralyze
 
 	ld a, BATTLE_VARS_STATUS_OPP
@@ -7681,7 +5966,7 @@ BattleCommand_Paralyze: ; 36dc7
 	jr nz, .dont_sample_failure
 
 	call BattleRandom
-	cp 1 + 25 percent
+	cp 25 percent + 1 ; 25% chance AI fails
 	jr c, .failed
 
 .dont_sample_failure
@@ -7722,10 +6007,7 @@ BattleCommand_Paralyze: ; 36dc7
 	call AnimateFailedMove
 	jp PrintDoesntAffect
 
-; 36e5b
-
-
-CheckMoveTypeMatchesTarget: ; 36e5b
+CheckMoveTypeMatchesTarget:
 ; Compare move type to opponent type.
 ; Return z if matching the opponent type,
 ; unless the move is Normal (Tri Attack).
@@ -7760,111 +6042,16 @@ CheckMoveTypeMatchesTarget: ; 36e5b
 	pop hl
 	ret
 
-; 36e7c
-
-
-BattleCommand_Substitute: ; 36e7c
-; substitute
-
-	call BattleCommand_MoveDelay
-	ld hl, wBattleMonMaxHP
-	ld de, wPlayerSubstituteHP
-	ld a, [hBattleTurn]
-	and a
-	jr z, .got_hp
-	ld hl, wEnemyMonMaxHP
-	ld de, wEnemySubstituteHP
-.got_hp
-
-	ld a, BATTLE_VARS_SUBSTATUS4
-	call GetBattleVar
-	bit SUBSTATUS_SUBSTITUTE, a
-	jr nz, .already_has_sub
-
-	ld a, [hli]
-	ld b, [hl]
-	srl a
-	rr b
-	srl a
-	rr b
-	dec hl
-	dec hl
-	ld a, b
-	ld [de], a
-	ld a, [hld]
-	sub b
-	ld e, a
-	ld a, [hl]
-	sbc 0
-	ld d, a
-	jr c, .too_weak_to_sub
-	ld a, d
-	or e
-	jr z, .too_weak_to_sub
-	ld [hl], d
-	inc hl
-	ld [hl], e
-
-	ld a, BATTLE_VARS_SUBSTATUS4
-	call GetBattleVarAddr
-	set SUBSTATUS_SUBSTITUTE, [hl]
-
-	ld hl, wPlayerWrapCount
-	ld de, wPlayerTrappingMove
-	ld a, [hBattleTurn]
-	and a
-	jr z, .player
-	ld hl, wEnemyWrapCount
-	ld de, wEnemyTrappingMove
-.player
-
-	xor a
-	ld [hl], a
-	ld [de], a
-	call _CheckBattleScene
-	jr c, .no_anim
-
-	xor a
-	ld [wNumHits], a
-	ld [wFXAnimID + 1], a
-	ld [wKickCounter], a
-	ld a, SUBSTITUTE
-	call LoadAnim
-	jr .finish
-
-.no_anim
-	call BattleCommand_RaiseSubNoAnim
-.finish
-	ld hl, MadeSubstituteText
-	call StdBattleTextBox
-	jp RefreshBattleHuds
+INCLUDE "engine/battle/move_effects/substitute.asm"
 
-.already_has_sub
-	call CheckUserIsCharging
-	call nz, BattleCommand_RaiseSub
-	ld hl, HasSubstituteText
-	jr .jp_stdbattletextbox
-
-.too_weak_to_sub
-	call CheckUserIsCharging
-	call nz, BattleCommand_RaiseSub
-	ld hl, TooWeakSubText
-.jp_stdbattletextbox
-	jp StdBattleTextBox
-
-; 36f0b
-
-BattleCommand_RechargeNextTurn: ; 36f0b
+BattleCommand_RechargeNextTurn:
 ; rechargenextturn
 	ld a, BATTLE_VARS_SUBSTATUS4
 	call GetBattleVarAddr
 	set SUBSTATUS_RECHARGE, [hl]
 	ret
 
-; 36f13
-
-
-EndRechargeOpp: ; 36f13
+EndRechargeOpp:
 	push hl
 	ld a, BATTLE_VARS_SUBSTATUS4_OPP
 	call GetBattleVarAddr
@@ -7872,20 +6059,9 @@ EndRechargeOpp: ; 36f13
 	pop hl
 	ret
 
-; 36f1d
+INCLUDE "engine/battle/move_effects/rage.asm"
 
-
-BattleCommand_Rage: ; 36f1d
-; rage
-	ld a, BATTLE_VARS_SUBSTATUS4
-	call GetBattleVarAddr
-	set SUBSTATUS_RAGE, [hl]
-	ret
-
-; 36f25
-
-
-BattleCommand_DoubleFlyingDamage: ; 36f25
+BattleCommand_DoubleFlyingDamage:
 ; doubleflyingdamage
 	ld a, BATTLE_VARS_SUBSTATUS3_OPP
 	call GetBattleVar
@@ -7893,10 +6069,7 @@ BattleCommand_DoubleFlyingDamage: ; 36f25
 	ret z
 	jr DoubleDamage
 
-; 36f2f
-
-
-BattleCommand_DoubleUndergroundDamage: ; 36f2f
+BattleCommand_DoubleUndergroundDamage:
 ; doubleundergrounddamage
 	ld a, BATTLE_VARS_SUBSTATUS3_OPP
 	call GetBattleVar
@@ -7904,10 +6077,8 @@ BattleCommand_DoubleUndergroundDamage: ; 36f2f
 	ret z
 
 	; fallthrough
-; 36f37
-
 
-DoubleDamage: ; 36f37
+DoubleDamage:
 	ld hl, wCurDamage + 1
 	sla [hl]
 	dec hl
@@ -7920,322 +6091,19 @@ DoubleDamage: ; 36f37
 .quit
 	ret
 
-; 36f46
+INCLUDE "engine/battle/move_effects/mimic.asm"
 
+INCLUDE "engine/battle/move_effects/leech_seed.asm"
 
-BattleCommand_Mimic: ; 36f46
-; mimic
+INCLUDE "engine/battle/move_effects/splash.asm"
 
-	call ClearLastMove
-	call BattleCommand_MoveDelay
-	ld a, [wAttackMissed]
-	and a
-	jr nz, .fail
-	ld hl, wBattleMonMoves
-	ld a, [hBattleTurn]
-	and a
-	jr z, .player_turn
-	ld hl, wEnemyMonMoves
-.player_turn
-	call CheckHiddenOpponent
-	jr nz, .fail
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
-	call GetBattleVar
-	and a
-	jr z, .fail
-	cp STRUGGLE
-	jr z, .fail
-	ld b, a
-	ld c, NUM_MOVES
-.check_already_knows_move
-	ld a, [hli]
-	cp b
-	jr z, .fail
-	dec c
-	jr nz, .check_already_knows_move
-	dec hl
-.find_mimic
-	ld a, [hld]
-	cp MIMIC
-	jr nz, .find_mimic
-	inc hl
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
-	call GetBattleVar
-	ld [hl], a
-	ld [wNamedObjectIndexBuffer], a
-	ld bc, wBattleMonPP - wBattleMonMoves
-	add hl, bc
-	ld [hl], 5
-	call GetMoveName
-	call AnimateCurrentMove
-	ld hl, LearnedMoveText
-	jp StdBattleTextBox
-
-.fail
-	jp FailMimic
+INCLUDE "engine/battle/move_effects/disable.asm"
 
-; 36f9d
+INCLUDE "engine/battle/move_effects/pay_day.asm"
 
+INCLUDE "engine/battle/move_effects/conversion.asm"
 
-BattleCommand_LeechSeed: ; 36f9d
-; leechseed
-	ld a, [wAttackMissed]
-	and a
-	jr nz, .evaded
-	call CheckSubstituteOpp
-	jr nz, .evaded
-
-	ld de, wEnemyMonType1
-	ld a, [hBattleTurn]
-	and a
-	jr z, .ok
-	ld de, wBattleMonType1
-.ok
-
-	ld a, [de]
-	cp GRASS
-	jr z, .grass
-	inc de
-	ld a, [de]
-	cp GRASS
-	jr z, .grass
-
-	ld a, BATTLE_VARS_SUBSTATUS4_OPP
-	call GetBattleVarAddr
-	bit SUBSTATUS_LEECH_SEED, [hl]
-	jr nz, .evaded
-	set SUBSTATUS_LEECH_SEED, [hl]
-	call AnimateCurrentMove
-	ld hl, WasSeededText
-	jp StdBattleTextBox
-
-.grass
-	call AnimateFailedMove
-	jp PrintDoesntAffect
-
-.evaded
-	call AnimateFailedMove
-	ld hl, EvadedText
-	jp StdBattleTextBox
-
-; 36fe1
-
-
-BattleCommand_Splash: ; 36fe1
-	call AnimateCurrentMove
-	farcall StubbedTrainerRankings_Splash
-	jp PrintNothingHappened
-
-; 36fed
-
-
-BattleCommand_Disable: ; 36fed
-; disable
-
-	ld a, [wAttackMissed]
-	and a
-	jr nz, .failed
-
-	ld de, wEnemyDisableCount
-	ld hl, wEnemyMonMoves
-	ld a, [hBattleTurn]
-	and a
-	jr z, .got_moves
-	ld de, wPlayerDisableCount
-	ld hl, wBattleMonMoves
-.got_moves
-
-	ld a, [de]
-	and a
-	jr nz, .failed
-
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
-	call GetBattleVar
-	and a
-	jr z, .failed
-	cp STRUGGLE
-	jr z, .failed
-
-	ld b, a
-	ld c, $ff
-.loop
-	inc c
-	ld a, [hli]
-	cp b
-	jr nz, .loop
-
-	ld a, [hBattleTurn]
-	and a
-	ld hl, wEnemyMonPP
-	jr z, .got_pp
-	ld hl, wBattleMonPP
-.got_pp
-	ld b, 0
-	add hl, bc
-	ld a, [hl]
-	and a
-	jr z, .failed
-.loop2
-	call BattleRandom
-	and 7
-	jr z, .loop2
-	inc a
-	inc c
-	swap c
-	add c
-	ld [de], a
-	call AnimateCurrentMove
-	ld hl, wDisabledMove
-	ld a, [hBattleTurn]
-	and a
-	jr nz, .got_disabled_move_pointer
-	inc hl
-.got_disabled_move_pointer
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
-	call GetBattleVar
-	ld [hl], a
-	ld [wNamedObjectIndexBuffer], a
-	call GetMoveName
-	ld hl, WasDisabledText
-	jp StdBattleTextBox
-
-.failed
-	jp FailDisable
-
-; 3705c
-
-
-BattleCommand_PayDay: ; 3705c
-; payday
-
-	xor a
-	ld hl, wStringBuffer1
-	ld [hli], a
-
-	ld a, [hBattleTurn]
-	and a
-	ld a, [wBattleMonLevel]
-	jr z, .ok
-	ld a, [wEnemyMonLevel]
-.ok
-
-	add a
-	ld hl, wPayDayMoney + 2
-	add [hl]
-	ld [hld], a
-	jr nc, .done
-	inc [hl]
-	dec hl
-	jr nz, .done
-	inc [hl]
-.done
-	ld hl, CoinsScatteredText
-	jp StdBattleTextBox
-
-; 3707f
-
-
-BattleCommand_Conversion: ; 3707f
-; conversion
-
-	ld hl, wBattleMonMoves
-	ld de, wBattleMonType1
-	ld a, [hBattleTurn]
-	and a
-	jr z, .got_moves
-	ld hl, wEnemyMonMoves
-	ld de, wEnemyMonType1
-.got_moves
-	push de
-	ld c, 0
-	ld de, wStringBuffer1
-.loop
-	push hl
-	ld b, 0
-	add hl, bc
-	ld a, [hl]
-	pop hl
-	and a
-	jr z, .okay
-	push hl
-	push bc
-	dec a
-	ld hl, Moves + MOVE_TYPE
-	call GetMoveAttr
-	ld [de], a
-	inc de
-	pop bc
-	pop hl
-	inc c
-	ld a, c
-	cp NUM_MOVES
-	jr c, .loop
-.okay
-	ld a, $ff
-	ld [de], a
-	inc de
-	ld [de], a
-	inc de
-	ld [de], a
-	pop de
-	ld hl, wStringBuffer1
-.loop2
-	ld a, [hl]
-	cp -1
-	jr z, .fail
-	cp CURSE_T
-	jr z, .next
-	ld a, [de]
-	cp [hl]
-	jr z, .next
-	inc de
-	ld a, [de]
-	dec de
-	cp [hl]
-	jr nz, .done
-.next
-	inc hl
-	jr .loop2
-
-.fail
-	call AnimateFailedMove
-	jp PrintButItFailed
-
-.done
-.loop3
-	call BattleRandom
-	maskbits NUM_MOVES
-	ld c, a
-	ld b, 0
-	ld hl, wStringBuffer1
-	add hl, bc
-	ld a, [hl]
-	cp -1
-	jr z, .loop3
-	cp CURSE_T
-	jr z, .loop3
-	ld a, [de]
-	cp [hl]
-	jr z, .loop3
-	inc de
-	ld a, [de]
-	dec de
-	cp [hl]
-	jr z, .loop3
-	ld a, [hl]
-	ld [de], a
-	inc de
-	ld [de], a
-	ld [wNamedObjectIndexBuffer], a
-	farcall GetTypeName
-	call AnimateCurrentMove
-	ld hl, TransformedTypeText
-	jp StdBattleTextBox
-
-; 3710e
-
-
-BattleCommand_ResetStats: ; 3710e
+BattleCommand_ResetStats:
 ; resetstats
 
 	ld a, 7 ; neutral
@@ -8268,10 +6136,7 @@ BattleCommand_ResetStats: ; 3710e
 	jr nz, .next
 	ret
 
-; 3713e
-
-
-BattleCommand_Heal: ; 3713e
+BattleCommand_Heal:
 ; heal
 
 	ld de, wBattleMonHP
@@ -8353,11 +6218,9 @@ BattleCommand_Heal: ; 3713e
 	ld hl, HPIsFullText
 	jp StdBattleTextBox
 
-; 371cd
+INCLUDE "engine/battle/move_effects/transform.asm"
 
-INCLUDE "engine/battle/effect_commands/transform.asm"
-
-BattleSideCopy: ; 372c6
+BattleSideCopy:
 ; Copy bc bytes from hl to de if it's the player's turn.
 ; Copy bc bytes from de to hl if it's the enemy's turn.
 	ld a, [hBattleTurn]
@@ -8372,17 +6235,11 @@ BattleSideCopy: ; 372c6
 .copy
 	jp CopyBytes
 
-; 372d2
-
-
-BattleEffect_ButItFailed: ; 372d2
+BattleEffect_ButItFailed:
 	call AnimateFailedMove
 	jp PrintButItFailed
 
-; 372d8
-
-
-ClearLastMove: ; 372d8
+ClearLastMove:
 	ld a, BATTLE_VARS_LAST_COUNTER_MOVE
 	call GetBattleVarAddr
 	xor a
@@ -8394,10 +6251,7 @@ ClearLastMove: ; 372d8
 	ld [hl], a
 	ret
 
-; 372e7
-
-
-ResetActorDisable: ; 372e7
+ResetActorDisable:
 	ld a, [hBattleTurn]
 	and a
 	jr z, .player
@@ -8413,10 +6267,7 @@ ResetActorDisable: ; 372e7
 	ld [wDisabledMove], a
 	ret
 
-; 372fc
-
-
-BattleCommand_Screen: ; 372fc
+BattleCommand_Screen:
 ; screen
 
 	ld hl, wPlayerScreens
@@ -8461,133 +6312,66 @@ BattleCommand_Screen: ; 372fc
 	call AnimateFailedMove
 	jp PrintButItFailed
 
-; 3733d
-
-
-PrintDoesntAffect: ; 3733d
+PrintDoesntAffect:
 ; 'it doesn't affect'
 	ld hl, DoesntAffectText
 	jp StdBattleTextBox
 
-; 37343
-
-
-PrintNothingHappened: ; 37343
+PrintNothingHappened:
 ; 'but nothing happened!'
 	ld hl, NothingHappenedText
 	jp StdBattleTextBox
 
-; 37349
-
-
-TryPrintButItFailed: ; 37349
+TryPrintButItFailed:
 	ld a, [wAlreadyFailed]
 	and a
 	ret nz
 
 	; fallthrough
-; 3734e
 
-
-PrintButItFailed: ; 3734e
+PrintButItFailed:
 ; 'but it failed!'
 	ld hl, ButItFailedText
 	jp StdBattleTextBox
 
-; 37354
-
-
-FailSnore:
-FailDisable:
-FailConversion2:
-FailAttract:
-FailForesight:
-FailSpikes:
+FailMove:
 	call AnimateFailedMove
 	; fallthrough
-; 37357
 
-FailMimic: ; 37357
+FailMimic:
 	ld hl, ButItFailedText ; 'but it failed!'
 	ld de, ItFailedText    ; 'it failed!'
 	jp FailText_CheckOpponentProtect
 
-; 37360
-
-
-PrintDidntAffect: ; 37360
+PrintDidntAffect:
 ; 'it didn't affect'
 	ld hl, DidntAffect1Text
 	jp StdBattleTextBox
 
-; 37366
-
-
-PrintDidntAffect2: ; 37366
+PrintDidntAffect2:
 	call AnimateFailedMove
 	ld hl, DidntAffect1Text ; 'it didn't affect'
 	ld de, DidntAffect2Text ; 'it didn't affect'
 	jp FailText_CheckOpponentProtect
 
-; 37372
-
-
-PrintParalyze: ; 37372
+PrintParalyze:
 ; 'paralyzed! maybe it can't attack!'
 	ld hl, ParalyzedText
 	jp StdBattleTextBox
 
-; 37378
-
-
-CheckSubstituteOpp: ; 37378
+CheckSubstituteOpp:
 	ld a, BATTLE_VARS_SUBSTATUS4_OPP
 	call GetBattleVar
 	bit SUBSTATUS_SUBSTITUTE, a
 	ret
 
-; 37380
-
-
-BattleCommand_Selfdestruct: ; 37380
-	farcall StubbedTrainerRankings_Selfdestruct
-	ld a, BATTLEANIM_PLAYER_DAMAGE
-	ld [wNumHits], a
-	ld c, 3
-	call DelayFrames
-	ld a, BATTLE_VARS_STATUS
-	call GetBattleVarAddr
-	xor a
-	ld [hli], a
-	inc hl
-	ld [hli], a
-	ld [hl], a
-	ld a, $1
-	ld [wKickCounter], a
-	call BattleCommand_LowerSub
-	call LoadMoveAnim
-	ld a, BATTLE_VARS_SUBSTATUS4
-	call GetBattleVarAddr
-	res SUBSTATUS_LEECH_SEED, [hl]
-	ld a, BATTLE_VARS_SUBSTATUS5_OPP
-	call GetBattleVarAddr
-	res SUBSTATUS_DESTINY_BOND, [hl]
-	call _CheckBattleScene
-	ret nc
-	farcall DrawPlayerHUD
-	farcall DrawEnemyHUD
-	call WaitBGMap
-	jp RefreshBattleHuds
-
-; 373c9
-
+INCLUDE "engine/battle/move_effects/selfdestruct.asm"
 
-INCLUDE "engine/battle/effect_commands/mirror_move.asm"
+INCLUDE "engine/battle/move_effects/mirror_move.asm"
 
-INCLUDE "engine/battle/effect_commands/metronome.asm"
+INCLUDE "engine/battle/move_effects/metronome.asm"
 
-
-CheckUserMove: ; 37462
+CheckUserMove:
 ; Return z if the user has move a.
 	ld b, a
 	ld de, wBattleMonMoves
@@ -8611,10 +6395,7 @@ CheckUserMove: ; 37462
 	and a
 	ret
 
-; 3747b
-
-
-ResetTurn: ; 3747b
+ResetTurn:
 	ld hl, wPlayerCharging
 	ld a, [hBattleTurn]
 	and a
@@ -8628,13 +6409,9 @@ ResetTurn: ; 3747b
 	call DoMove
 	jp EndMoveEffect
 
-; 37492
-
-
-INCLUDE "engine/battle/effect_commands/thief.asm"
+INCLUDE "engine/battle/move_effects/thief.asm"
 
-
-BattleCommand_ArenaTrap: ; 37517
+BattleCommand_ArenaTrap:
 ; arenatrap
 
 ; Doesn't work on an absent opponent.
@@ -8660,13 +6437,9 @@ BattleCommand_ArenaTrap: ; 37517
 	call AnimateFailedMove
 	jp PrintButItFailed
 
-; 37536
-
+INCLUDE "engine/battle/move_effects/nightmare.asm"
 
-INCLUDE "engine/battle/effect_commands/nightmare.asm"
-
-
-BattleCommand_Defrost: ; 37563
+BattleCommand_Defrost:
 ; defrost
 
 ; Thaw the user.
@@ -8697,188 +6470,39 @@ BattleCommand_Defrost: ; 37563
 	ld hl, WasDefrostedText
 	jp StdBattleTextBox
 
-; 37588
-
-
-INCLUDE "engine/battle/effect_commands/curse.asm"
+INCLUDE "engine/battle/move_effects/curse.asm"
 
-INCLUDE "engine/battle/effect_commands/protect.asm"
+INCLUDE "engine/battle/move_effects/protect.asm"
 
-INCLUDE "engine/battle/effect_commands/endure.asm"
+INCLUDE "engine/battle/move_effects/endure.asm"
 
-INCLUDE "engine/battle/effect_commands/spikes.asm"
+INCLUDE "engine/battle/move_effects/spikes.asm"
 
-INCLUDE "engine/battle/effect_commands/foresight.asm"
+INCLUDE "engine/battle/move_effects/foresight.asm"
 
-INCLUDE "engine/battle/effect_commands/perish_song.asm"
+INCLUDE "engine/battle/move_effects/perish_song.asm"
 
-INCLUDE "engine/battle/effect_commands/sandstorm.asm"
+INCLUDE "engine/battle/move_effects/sandstorm.asm"
 
-INCLUDE "engine/battle/effect_commands/rollout.asm"
+INCLUDE "engine/battle/move_effects/rollout.asm"
 
-
-BattleCommand5d: ; 37791
+BattleCommand5d:
 ; unused
 	ret
 
-; 37792
-
-
-BattleCommand_FuryCutter: ; 37792
-; furycutter
-
-	ld hl, wPlayerFuryCutterCount
-	ld a, [hBattleTurn]
-	and a
-	jr z, .go
-	ld hl, wEnemyFuryCutterCount
-
-.go
-	ld a, [wAttackMissed]
-	and a
-	jp nz, ResetFuryCutterCount
-
-	inc [hl]
-
-; Damage capped at 5 turns' worth (16x).
-	ld a, [hl]
-	ld b, a
-	cp 6
-	jr c, .checkdouble
-	ld b, 5
-
-.checkdouble
-	dec b
-	ret z
-
-; Double the damage
-	ld hl, wCurDamage + 1
-	sla [hl]
-	dec hl
-	rl [hl]
-	jr nc, .checkdouble
-
-; No overflow
-	ld a, $ff
-	ld [hli], a
-	ld [hl], a
-	ret
-
-; 377be
-
-
-ResetFuryCutterCount: ; 377be
-
-	push hl
-
-	ld hl, wPlayerFuryCutterCount
-	ld a, [hBattleTurn]
-	and a
-	jr z, .reset
-	ld hl, wEnemyFuryCutterCount
-
-.reset
-	xor a
-	ld [hl], a
-
-	pop hl
-	ret
-
-; 377ce
-
-
-INCLUDE "engine/battle/effect_commands/attract.asm"
-
-BattleCommand_HappinessPower: ; 3784b
-; happinesspower
-	push bc
-	ld hl, wBattleMonHappiness
-	ld a, [hBattleTurn]
-	and a
-	jr z, .ok
-	ld hl, wEnemyMonHappiness
-.ok
-	xor a
-	ld [hMultiplicand + 0], a
-	ld [hMultiplicand + 1], a
-	ld a, [hl]
-	ld [hMultiplicand + 2], a
-	ld a, 10
-	ld [hMultiplier], a
-	call Multiply
-	ld a, 25
-	ld [hDivisor], a
-	ld b, 4
-	call Divide
-	ld a, [hQuotient + 2]
-	ld d, a
-	pop bc
-	ret
-
-; 37874
-
-
-INCLUDE "engine/battle/effect_commands/present.asm"
-
-BattleCommand_FrustrationPower: ; 3790e
-; frustrationpower
-
-	push bc
-	ld hl, wBattleMonHappiness
-	ld a, [hBattleTurn]
-	and a
-	jr z, .got_happiness
-	ld hl, wEnemyMonHappiness
-.got_happiness
-	ld a, $ff
-	sub [hl]
-	ld [hMultiplicand + 2], a
-	xor a
-	ld [hMultiplicand + 0], a
-	ld [hMultiplicand + 1], a
-	ld a, 10
-	ld [hMultiplier], a
-	call Multiply
-	ld a, 25
-	ld [hDivisor], a
-	ld b, 4
-	call Divide
-	ld a, [hQuotient + 2]
-	ld d, a
-	pop bc
-	ret
-
-; 37939
-
+INCLUDE "engine/battle/move_effects/fury_cutter.asm"
 
-BattleCommand_Safeguard: ; 37939
-; safeguard
+INCLUDE "engine/battle/move_effects/attract.asm"
 
-	ld hl, wPlayerScreens
-	ld de, wPlayerSafeguardCount
-	ld a, [hBattleTurn]
-	and a
-	jr z, .ok
-	ld hl, wEnemyScreens
-	ld de, wEnemySafeguardCount
-.ok
-	bit SCREENS_SAFEGUARD, [hl]
-	jr nz, .failed
-	set SCREENS_SAFEGUARD, [hl]
-	ld a, 5
-	ld [de], a
-	call AnimateCurrentMove
-	ld hl, CoveredByVeilText
-	jp StdBattleTextBox
+INCLUDE "engine/battle/move_effects/return.asm"
 
-.failed
-	call AnimateFailedMove
-	jp PrintButItFailed
+INCLUDE "engine/battle/move_effects/present.asm"
 
-; 37962
+INCLUDE "engine/battle/move_effects/frustration.asm"
 
+INCLUDE "engine/battle/move_effects/safeguard.asm"
 
-SafeCheckSafeguard: ; 37962
+SafeCheckSafeguard:
 	push hl
 	ld hl, wEnemyScreens
 	ld a, [hBattleTurn]
@@ -8891,10 +6515,7 @@ SafeCheckSafeguard: ; 37962
 	pop hl
 	ret
 
-; 37972
-
-
-BattleCommand_CheckSafeguard: ; 37972
+BattleCommand_CheckSafeguard:
 ; checksafeguard
 	ld hl, wEnemyScreens
 	ld a, [hBattleTurn]
@@ -8911,381 +6532,30 @@ BattleCommand_CheckSafeguard: ; 37972
 	call StdBattleTextBox
 	jp EndMoveEffect
 
-; 37991
-
-
-BattleCommand_GetMagnitude: ; 37991
-; getmagnitude
-
-	push bc
-	call BattleRandom
-	ld b, a
-	ld hl, .Magnitudes
-.loop
-	ld a, [hli]
-	cp b
-	jr nc, .ok
-	inc hl
-	inc hl
-	jr .loop
-
-.ok
-	ld d, [hl]
-	push de
-	inc hl
-	ld a, [hl]
-	ld [wTypeMatchup], a
-	call BattleCommand_MoveDelay
-	ld hl, MagnitudeText
-	call StdBattleTextBox
-	pop de
-	pop bc
-	ret
-
-.Magnitudes:
-	;  /255, BP, magnitude
-	db  13,  10,  4
-	db  38,  30,  5
-	db  89,  50,  6
-	db 166,  70,  7
-	db 217,  90,  8
-	db 242, 110,  9
-	db 255, 150, 10
-; 379c9
-
-
-BattleCommand_BatonPass: ; 379c9
-; batonpass
-
-	ld a, [hBattleTurn]
-	and a
-	jp nz, .Enemy
-
-
-; Need something to switch to
-	call CheckAnyOtherAlivePartyMons
-	jp z, FailedBatonPass
-
-	call UpdateBattleMonInParty
-	call AnimateCurrentMove
-
-	ld c, 50
-	call DelayFrames
-
-; Transition into switchmon menu
-	call LoadStandardMenuDataHeader
-	farcall SetUpBattlePartyMenu_NoLoop
-
-	farcall ForcePickSwitchMonInBattle
-
-; Return to battle scene
-	call ClearPalettes
-	farcall _LoadBattleFontsHPBar
-	call CloseWindow
-	call ClearSprites
-	hlcoord 1, 0
-	lb bc, 4, 10
-	call ClearBox
-	ld b, SCGB_BATTLE_COLORS
-	call GetSGBLayout
-	call SetPalettes
-	call BatonPass_LinkPlayerSwitch
-
-; Mobile link battles handle entrances differently
-	farcall CheckMobileBattleError
-	jp c, EndMoveEffect
-
-	ld hl, PassedBattleMonEntrance
-	call CallBattleCore
-
-	call ResetBatonPassStatus
-	ret
-
-
-.Enemy:
-
-; Wildmons don't have anything to switch to
-	ld a, [wBattleMode]
-	dec a ; WILDMON
-	jp z, FailedBatonPass
-
-	call CheckAnyOtherAliveEnemyMons
-	jp z, FailedBatonPass
-
-	call UpdateEnemyMonInParty
-	call AnimateCurrentMove
-	call BatonPass_LinkEnemySwitch
-
-; Mobile link battles handle entrances differently
-	farcall CheckMobileBattleError
-	jp c, EndMoveEffect
-
-; Passed enemy PartyMon entrance
-	xor a
-	ld [wEnemySwitchMonIndex], a
-	ld hl, EnemySwitch_SetMode
-	call CallBattleCore
-	ld hl, ResetBattleParticipants
-	call CallBattleCore
-	ld a, 1
-	ld [wTypeMatchup], a
-	ld hl, ApplyStatLevelMultiplierOnAllStats
-	call CallBattleCore
-
-	ld hl, SpikesDamage
-	call CallBattleCore
-
-	jr ResetBatonPassStatus
-
-; 37a67
-
-
-BatonPass_LinkPlayerSwitch: ; 37a67
-	ld a, [wLinkMode]
-	and a
-	ret z
-
-	ld a, 1
-	ld [wBattlePlayerAction], a
-
-	call LoadStandardMenuDataHeader
-	ld hl, LinkBattleSendReceiveAction
-	call CallBattleCore
-	call CloseWindow
-
-	xor a
-	ld [wBattlePlayerAction], a
-	ret
-
-; 37a82
-
-
-BatonPass_LinkEnemySwitch: ; 37a82
-	ld a, [wLinkMode]
-	and a
-	ret z
-
-	call LoadStandardMenuDataHeader
-	ld hl, LinkBattleSendReceiveAction
-	call CallBattleCore
-
-	ld a, [wOTPartyCount]
-	add BATTLEACTION_SWITCH1
-	ld b, a
-	ld a, [wBattleAction]
-	cp BATTLEACTION_SWITCH1
-	jr c, .baton_pass
-	cp b
-	jr c, .switch
-
-.baton_pass
-	ld a, [wCurOTMon]
-	add BATTLEACTION_SWITCH1
-	ld [wBattleAction], a
-.switch
-	jp CloseWindow
-
-; 37aab
-
-
-FailedBatonPass: ; 37aab
-	call AnimateFailedMove
-	jp PrintButItFailed
-
-; 37ab1
-
-
-ResetBatonPassStatus: ; 37ab1
-; Reset status changes that aren't passed by Baton Pass.
-
-	; Nightmare isn't passed.
-	ld a, BATTLE_VARS_STATUS
-	call GetBattleVar
-	and SLP
-	jr nz, .ok
-
-	ld a, BATTLE_VARS_SUBSTATUS1
-	call GetBattleVarAddr
-	res SUBSTATUS_NIGHTMARE, [hl]
-.ok
-
-	; Disable isn't passed.
-	call ResetActorDisable
-
-	; Attraction isn't passed.
-	ld hl, wPlayerSubStatus1
-	res SUBSTATUS_IN_LOVE, [hl]
-	ld hl, wEnemySubStatus1
-	res SUBSTATUS_IN_LOVE, [hl]
-	ld hl, wPlayerSubStatus5
-
-	ld a, BATTLE_VARS_SUBSTATUS5
-	call GetBattleVarAddr
-	res SUBSTATUS_TRANSFORMED, [hl]
-	res SUBSTATUS_ENCORED, [hl]
-
-	; New mon hasn't used a move yet.
-	ld a, BATTLE_VARS_LAST_MOVE
-	call GetBattleVarAddr
-	ld [hl], 0
-
-	xor a
-	ld [wPlayerWrapCount], a
-	ld [wEnemyWrapCount], a
-	ret
-
-; 37ae9
+INCLUDE "engine/battle/move_effects/magnitude.asm"
 
+INCLUDE "engine/battle/move_effects/baton_pass.asm"
 
-CheckAnyOtherAlivePartyMons: ; 37ae9
-	ld hl, wPartyMon1HP
-	ld a, [wPartyCount]
-	ld d, a
-	ld a, [wCurBattleMon]
-	ld e, a
-	jr CheckAnyOtherAliveMons
+INCLUDE "engine/battle/move_effects/pursuit.asm"
 
-; 37af6
-
-
-CheckAnyOtherAliveEnemyMons: ; 37af6
-	ld hl, wOTPartyMon1HP
-	ld a, [wOTPartyCount]
-	ld d, a
-	ld a, [wCurOTMon]
-	ld e, a
-
-	; fallthrough
-; 37b01
-
-CheckAnyOtherAliveMons: ; 37b01
-; Check for nonzero HP starting from partymon
-; HP at hl for d partymons, besides current mon e.
-
-; Return nz if any are alive.
-
-	xor a
-	ld b, a
-	ld c, a
-.loop
-	ld a, c
-	cp d
-	jr z, .done
-	cp e
-	jr z, .next
+INCLUDE "engine/battle/move_effects/rapid_spin.asm"
 
-	ld a, [hli]
-	or b
-	ld b, a
-	ld a, [hld]
-	or b
-	ld b, a
-
-.next
-	push bc
-	ld bc, PARTYMON_STRUCT_LENGTH
-	add hl, bc
-	pop bc
-	inc c
-	jr .loop
-
-.done
-	ld a, b
-	and a
-	ret
-
-; 37b1d
-
-
-BattleCommand_Pursuit: ; 37b1d
-; pursuit
-; Double damage if the opponent is switching.
-
-	ld hl, wEnemyIsSwitching
-	ld a, [hBattleTurn]
-	and a
-	jr z, .ok
-	ld hl, wPlayerIsSwitching
-.ok
-	ld a, [hl]
-	and a
-	ret z
-
-	ld hl, wCurDamage + 1
-	sla [hl]
-	dec hl
-	rl [hl]
-	ret nc
-
-	ld a, $ff
-	ld [hli], a
-	ld [hl], a
-	ret
-
-; 37b39
-
-
-BattleCommand_ClearHazards: ; 37b39
-; clearhazards
-
-	ld a, BATTLE_VARS_SUBSTATUS4
-	call GetBattleVarAddr
-	bit SUBSTATUS_LEECH_SEED, [hl]
-	jr z, .not_leeched
-	res SUBSTATUS_LEECH_SEED, [hl]
-	ld hl, ShedLeechSeedText
-	call StdBattleTextBox
-.not_leeched
-
-	ld hl, wPlayerScreens
-	ld de, wPlayerWrapCount
-	ld a, [hBattleTurn]
-	and a
-	jr z, .got_screens_wrap
-	ld hl, wEnemyScreens
-	ld de, wEnemyWrapCount
-.got_screens_wrap
-	bit SCREENS_SPIKES, [hl]
-	jr z, .no_spikes
-	res SCREENS_SPIKES, [hl]
-	ld hl, BlewSpikesText
-	push de
-	call StdBattleTextBox
-	pop de
-.no_spikes
-
-	ld a, [de]
-	and a
-	ret z
-	xor a
-	ld [de], a
-	ld hl, ReleasedByText
-	jp StdBattleTextBox
-
-; 37b74
-
-
-BattleCommand_HealMorn: ; 37b74
+BattleCommand_HealMorn:
 ; healmorn
 	ld b, MORN_F
 	jr BattleCommand_TimeBasedHealContinue
 
-; 37b78
-
-BattleCommand_HealDay: ; 37b78
+BattleCommand_HealDay:
 ; healday
 	ld b, DAY_F
 	jr BattleCommand_TimeBasedHealContinue
 
-; 37b7c
-
-BattleCommand_HealNite: ; 37b7c
+BattleCommand_HealNite:
 ; healnite
 	ld b, NITE_F
 	; fallthrough
-; 37b7e
 
-BattleCommand_TimeBasedHealContinue: ; 37b7e
+BattleCommand_TimeBasedHealContinue:
 ; Time- and weather-sensitive heal.
 
 	ld hl, wBattleMonMaxHP
@@ -9310,14 +6580,14 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e
 ; Don't factor in time of day in link battles.
 	ld a, [wLinkMode]
 	and a
-	jr nz, .checkWeather
+	jr nz, .Weather
 
 	ld a, [wTimeOfDay]
 	cp b
-	jr z, .checkWeather
+	jr z, .Weather
 	dec c ; double
 
-.checkWeather:
+.Weather:
 	ld a, [wBattleWeather]
 	and a
 	jr z, .Heal
@@ -9366,202 +6636,20 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e
 	dw GetQuarterMaxHP
 	dw GetHalfMaxHP
 	dw GetMaxHP
-; 37be8
-
-
-BattleCommand_HiddenPower: ; 37be8
-; hiddenpower
-
-	ld a, [wAttackMissed]
-	and a
-	ret nz
-	farcall HiddenPowerDamage
-	ret
-
-; 37bf4
-
-
-BattleCommand_StartRain: ; 37bf4
-; startrain
-	ld a, WEATHER_RAIN
-	ld [wBattleWeather], a
-	ld a, 5
-	ld [wWeatherCount], a
-	call AnimateCurrentMove
-	ld hl, DownpourText
-	jp StdBattleTextBox
-
-; 37c07
-
-
-BattleCommand_StartSun: ; 37c07
-; startsun
-	ld a, WEATHER_SUN
-	ld [wBattleWeather], a
-	ld a, 5
-	ld [wWeatherCount], a
-	call AnimateCurrentMove
-	ld hl, SunGotBrightText
-	jp StdBattleTextBox
-
-; 37c1a
-
-
-BattleCommand_BellyDrum: ; 37c1a
-; bellydrum
-; This command is buggy because it raises the user's attack
-; before checking that it has enough HP to use the move.
-; Swap the order of these two blocks to fix.
-	call BattleCommand_AttackUp2
-	ld a, [wAttackMissed]
-	and a
-	jr nz, .failed
-
-	callfar GetHalfMaxHP
-	callfar CheckUserHasEnoughHP
-	jr nc, .failed
-
-	push bc
-	call AnimateCurrentMove
-	pop bc
-	callfar SubtractHPFromUser
-	call UpdateUserInParty
-	ld a, 5
-
-.max_attack_loop
-	push af
-	call BattleCommand_AttackUp2
-	pop af
-	dec a
-	jr nz, .max_attack_loop
 
-	ld hl, BellyDrumText
-	jp StdBattleTextBox
-
-.failed
-	call AnimateFailedMove
-	jp PrintButItFailed
+INCLUDE "engine/battle/move_effects/hidden_power.asm"
 
-; 37c55
+INCLUDE "engine/battle/move_effects/rain_dance.asm"
 
+INCLUDE "engine/battle/move_effects/sunny_day.asm"
 
-BattleCommand_PsychUp: ; 37c55
-; psychup
+INCLUDE "engine/battle/move_effects/belly_drum.asm"
 
-	ld hl, wEnemyStatLevels
-	ld de, wPlayerStatLevels
-	ld a, [hBattleTurn]
-	and a
-	jr z, .pointers_correct
-; It's the enemy's turn, so swap the pointers.
-	push hl
-	ld h, d
-	ld l, e
-	pop de
-.pointers_correct
-	push hl
-	ld b, NUM_LEVEL_STATS
-; If any of the enemy's stats is modified from its base level,
-; the move succeeds.  Otherwise, it fails.
-.loop
-	ld a, [hli]
-	cp BASE_STAT_LEVEL
-	jr nz, .break
-	dec b
-	jr nz, .loop
-	pop hl
-	call AnimateFailedMove
-	jp PrintButItFailed
-
-.break
-	pop hl
-	ld b, NUM_LEVEL_STATS
-.loop2
-	ld a, [hli]
-	ld [de], a
-	inc de
-	dec b
-	jr nz, .loop2
-	ld a, [hBattleTurn]
-	and a
-	jr nz, .calc_enemy_stats
-	call CalcPlayerStats
-	jr .merge
-
-.calc_enemy_stats
-	call CalcEnemyStats
-.merge
-	call AnimateCurrentMove
-	ld hl, CopiedStatsText
-	jp StdBattleTextBox
+INCLUDE "engine/battle/move_effects/psych_up.asm"
 
-; 37c95
+INCLUDE "engine/battle/move_effects/mirror_coat.asm"
 
-
-BattleCommand_MirrorCoat: ; 37c95
-; mirrorcoat
-
-	ld a, 1
-	ld [wAttackMissed], a
-
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
-	call GetBattleVar
-	and a
-	ret z
-
-	ld b, a
-	callfar GetMoveEffect
-	ld a, b
-	cp EFFECT_MIRROR_COAT
-	ret z
-
-	call BattleCommand_ResetTypeMatchup
-	ld a, [wTypeMatchup]
-	and a
-	ret z
-
-	call CheckOpponentWentFirst
-	ret z
-
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
-	call GetBattleVar
-	dec a
-	ld de, wStringBuffer1
-	call GetMoveData
-
-	ld a, [wStringBuffer1 + 2]
-	and a
-	ret z
-
-	ld a, [wStringBuffer1 + 3]
-	cp SPECIAL
-	ret c
-
-	ld hl, wCurDamage
-	ld a, [hli]
-	or [hl]
-	ret z
-
-	ld a, [hl]
-	add a
-	ld [hld], a
-	ld a, [hl]
-	adc a
-	ld [hl], a
-	jr nc, .capped
-	ld a, $ff
-	ld [hli], a
-	ld [hl], a
-.capped
-
-	xor a
-	ld [wAttackMissed], a
-	ret
-
-; 37ce6
-
-
-BattleCommand_DoubleMinimizeDamage: ; 37ce6
+BattleCommand_DoubleMinimizeDamage:
 ; doubleminimizedamage
 
 	ld hl, wEnemyMinimized
@@ -9583,10 +6671,7 @@ BattleCommand_DoubleMinimizeDamage: ; 37ce6
 	ld [hl], a
 	ret
 
-; 37d02
-
-
-BattleCommand_SkipSunCharge: ; 37d02
+BattleCommand_SkipSunCharge:
 ; mimicsuncharge
 	ld a, [wBattleWeather]
 	cp WEATHER_SUN
@@ -9594,129 +6679,18 @@ BattleCommand_SkipSunCharge: ; 37d02
 	ld b, charge_command
 	jp SkipToBattleCommand
 
-; 37d0d
+INCLUDE "engine/battle/move_effects/future_sight.asm"
 
+INCLUDE "engine/battle/move_effects/thunder.asm"
 
-BattleCommand_CheckFutureSight: ; 37d0d
-; checkfuturesight
-
-	ld hl, wPlayerFutureSightCount
-	ld de, wPlayerFutureSightDamage
-	ld a, [hBattleTurn]
-	and a
-	jr z, .ok
-	ld hl, wEnemyFutureSightCount
-	ld de, wEnemyFutureSightDamage
-.ok
-
-	ld a, [hl]
-	and a
-	ret z
-	cp 1
-	ret nz
-
-	ld [hl], 0
-	ld a, [de]
-	inc de
-	ld [wCurDamage], a
-	ld a, [de]
-	ld [wCurDamage + 1], a
-	ld b, futuresight_command
-	jp SkipToBattleCommand
-
-; 37d34
-
-BattleCommand_FutureSight: ; 37d34
-; futuresight
-
-	call CheckUserIsCharging
-	jr nz, .AlreadyChargingFutureSight
-	ld a, BATTLE_VARS_MOVE_ANIM
-	call GetBattleVar
-	ld b, a
-	ld a, BATTLE_VARS_LAST_COUNTER_MOVE
-	call GetBattleVarAddr
-	ld [hl], b
-	ld a, BATTLE_VARS_LAST_MOVE
-	call GetBattleVarAddr
-	ld [hl], b
-.AlreadyChargingFutureSight:
-	ld hl, wPlayerFutureSightCount
-	ld a, [hBattleTurn]
-	and a
-	jr z, .GotFutureSightCount
-	ld hl, wEnemyFutureSightCount
-.GotFutureSightCount:
-	ld a, [hl]
-	and a
-	jr nz, .failed
-	ld a, 4
-	ld [hl], a
-	call BattleCommand_LowerSub
-	call BattleCommand_MoveDelay
-	ld hl, ForesawAttackText
-	call StdBattleTextBox
-	call BattleCommand_RaiseSub
-	ld de, wPlayerFutureSightDamage
-	ld a, [hBattleTurn]
-	and a
-	jr z, .StoreDamage
-	ld de, wEnemyFutureSightDamage
-.StoreDamage:
-	ld hl, wCurDamage
-	ld a, [hl]
-	ld [de], a
-	ld [hl], 0
-	inc hl
-	inc de
-	ld a, [hl]
-	ld [de], a
-	ld [hl], 0
-	jp EndMoveEffect
-
-.failed
-	pop bc
-	call ResetDamage
-	call AnimateFailedMove
-	call PrintButItFailed
-	jp EndMoveEffect
-
-; 37d94
-
-
-BattleCommand_ThunderAccuracy: ; 37d94
-; thunderaccuracy
-
-	ld a, BATTLE_VARS_MOVE_TYPE
-	call GetBattleVarAddr
-	inc hl
-	ld a, [wBattleWeather]
-	cp WEATHER_RAIN
-	jr z, .rain
-	cp WEATHER_SUN
-	ret nz
-	ld [hl], 50 percent + 1
-	ret
-
-.rain
-	; Redundant with CheckHit guranteeing hit
-	ld [hl], 100 percent
-	ret
-
-; 37daa
-
-
-CheckHiddenOpponent: ; 37daa
+CheckHiddenOpponent:
 ; BUG: This routine should account for Lock-On and Mind Reader.
 	ld a, BATTLE_VARS_SUBSTATUS3_OPP
 	call GetBattleVar
 	and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
 	ret
 
-; 37db2
-
-
-GetUserItem: ; 37db2
+GetUserItem:
 ; Return the effect of the user's item in bc, and its id at hl.
 	ld hl, wBattleMonItem
 	ld a, [hBattleTurn]
@@ -9727,10 +6701,7 @@ GetUserItem: ; 37db2
 	ld b, [hl]
 	jp GetItemHeldEffect
 
-; 37dc1
-
-
-GetOpponentItem: ; 37dc1
+GetOpponentItem:
 ; Return the effect of the opponent's item in bc, and its id at hl.
 	ld hl, wEnemyMonItem
 	ld a, [hBattleTurn]
@@ -9741,10 +6712,7 @@ GetOpponentItem: ; 37dc1
 	ld b, [hl]
 	jp GetItemHeldEffect
 
-; 37dd0
-
-
-GetItemHeldEffect: ; 37dd0
+GetItemHeldEffect:
 ; Return the effect of item b in bc.
 	ld a, b
 	and a
@@ -9764,10 +6732,7 @@ GetItemHeldEffect: ; 37dd0
 	pop hl
 	ret
 
-; 37de9
-
-
-AnimateCurrentMoveEitherSide: ; 37de9
+AnimateCurrentMoveEitherSide:
 	push hl
 	push de
 	push bc
@@ -9783,10 +6748,7 @@ AnimateCurrentMoveEitherSide: ; 37de9
 	pop hl
 	ret
 
-; 37e01
-
-
-AnimateCurrentMove: ; 37e01
+AnimateCurrentMove:
 	push hl
 	push de
 	push bc
@@ -9802,10 +6764,7 @@ AnimateCurrentMove: ; 37e01
 	pop hl
 	ret
 
-; 37e19
-
-
-PlayDamageAnim: ; 37e19
+PlayDamageAnim:
 	xor a
 	ld [wFXAnimID + 1], a
 
@@ -9827,10 +6786,7 @@ PlayDamageAnim: ; 37e19
 
 	jp PlayUserBattleAnim
 
-; 37e36
-
-
-LoadMoveAnim: ; 37e36
+LoadMoveAnim:
 	xor a
 	ld [wNumHits], a
 	ld [wFXAnimID + 1], a
@@ -9841,18 +6797,13 @@ LoadMoveAnim: ; 37e36
 	ret z
 
 	; fallthrough
-; 37e44
-
-
-LoadAnim: ; 37e44
 
+LoadAnim:
 	ld [wFXAnimID], a
 
 	; fallthrough
-; 37e47
-
 
-PlayUserBattleAnim: ; 37e47
+PlayUserBattleAnim:
 	push hl
 	push de
 	push bc
@@ -9862,10 +6813,7 @@ PlayUserBattleAnim: ; 37e47
 	pop hl
 	ret
 
-; 37e54
-
-
-PlayOpponentBattleAnim: ; 37e54
+PlayOpponentBattleAnim:
 	ld a, e
 	ld [wFXAnimID], a
 	ld a, d
@@ -9886,35 +6834,23 @@ PlayOpponentBattleAnim: ; 37e54
 	pop hl
 	ret
 
-; 37e73
-
-
-CallBattleCore: ; 37e73
-	ld a, BANK(BattleCore)
+CallBattleCore:
+	ld a, BANK("Battle Core")
 	rst FarCall
 	ret
 
-; 37e77
-
-
-AnimateFailedMove: ; 37e77
+AnimateFailedMove:
 	call BattleCommand_LowerSub
 	call BattleCommand_MoveDelay
 	jp BattleCommand_RaiseSub
 
-; 37e80
-
-
-BattleCommand_MoveDelay: ; 37e80
+BattleCommand_MoveDelay:
 ; movedelay
 ; Wait 40 frames.
 	ld c, 40
 	jp DelayFrames
 
-; 37e85
-
-
-BattleCommand_ClearText: ; 37e85
+BattleCommand_ClearText:
 ; cleartext
 
 ; Used in multi-hit moves.
@@ -9923,10 +6859,8 @@ BattleCommand_ClearText: ; 37e85
 
 .text
 	db "@"
-; 37e8c
 
-
-SkipToBattleCommand: ; 37e8c
+SkipToBattleCommand:
 ; Skip over commands until reaching command b.
 	ld a, [wBattleScriptBufferAddress + 1]
 	ld h, a
@@ -9943,10 +6877,7 @@ SkipToBattleCommand: ; 37e8c
 	ld [wBattleScriptBufferAddress], a
 	ret
 
-; 37ea1
-
-
-GetMoveAttr: ; 37ea1
+GetMoveAttr:
 ; Assuming hl = Moves + x, return attribute x of move a.
 	push bc
 	ld bc, MOVE_LENGTH
@@ -9955,49 +6886,31 @@ GetMoveAttr: ; 37ea1
 	pop bc
 	ret
 
-; 37ead
-
-
-GetMoveData: ; 37ead
+GetMoveData:
 ; Copy move struct a to de.
 	ld hl, Moves
 	ld bc, MOVE_LENGTH
 	call AddNTimes
-	ld a, Bank(Moves)
+	ld a, BANK(Moves)
 	jp FarCopyBytes
 
-; 37ebb
-
-
-GetMoveByte: ; 37ebb
+GetMoveByte:
 	ld a, BANK(Moves)
 	jp GetFarByte
 
-; 37ec0
-
-
-DisappearUser: ; 37ec0
+DisappearUser:
 	farcall _DisappearUser
 	ret
 
-; 37ec7
-
-
-AppearUserLowerSub: ; 37ec7
+AppearUserLowerSub:
 	farcall _AppearUserLowerSub
 	ret
 
-; 37ece
-
-
-AppearUserRaiseSub: ; 37ece
+AppearUserRaiseSub:
 	farcall _AppearUserRaiseSub
 	ret
 
-; 37ed5
-
-
-_CheckBattleScene: ; 37ed5
+_CheckBattleScene:
 ; Checks the options.  Returns carry if battle animations are disabled.
 	push hl
 	push de
@@ -10007,5 +6920,3 @@ _CheckBattleScene: ; 37ed5
 	pop de
 	pop hl
 	ret
-
-; 37ee2
diff --git a/engine/battle/hidden_power.asm b/engine/battle/hidden_power.asm
index 9d9a8dc0e..537fe4354 100644
--- a/engine/battle/hidden_power.asm
+++ b/engine/battle/hidden_power.asm
@@ -1,4 +1,4 @@
-HiddenPowerDamage: ; fbced
+HiddenPowerDamage:
 ; Override Hidden Power's type and power based on the user's DVs.
 
 	ld hl, wBattleMonDVs
@@ -8,7 +8,6 @@ HiddenPowerDamage: ; fbced
 	ld hl, wEnemyMonDVs
 .got_dvs
 
-
 ; Power:
 
 ; Take the top bit from each stat
@@ -62,7 +61,6 @@ HiddenPowerDamage: ; fbced
 
 	ld d, a
 
-
 ; Type:
 
 	; Def & 3
@@ -108,4 +106,3 @@ HiddenPowerDamage: ; fbced
 	pop af
 	ld d, a
 	ret
-; fbd54
diff --git a/engine/battle/link_result.asm b/engine/battle/link_result.asm
index 8f456da9b..0dd339fe4 100755..100644
--- a/engine/battle/link_result.asm
+++ b/engine/battle/link_result.asm
@@ -1,4 +1,4 @@
-DetermineLinkBattleResult: ; 2b930
+DetermineLinkBattleResult:
 	farcall UpdateEnemyMonInParty
 	ld hl, wPartyMon1HP
 	call .CountMonsRemaining
@@ -41,24 +41,24 @@ DetermineLinkBattleResult: ; 2b930
 .victory
 	ld a, [wBattleResult]
 	and $f0
-	ld [wBattleResult], a
+	ld [wBattleResult], a ; WIN
 	ret
 
 .defeat
 	ld a, [wBattleResult]
 	and $f0
-	add $1
+	add LOSE
 	ld [wBattleResult], a
 	ret
 
 .drawn
 	ld a, [wBattleResult]
 	and $f0
-	add $2
+	add DRAW
 	ld [wBattleResult], a
 	ret
 
-.CountMonsRemaining: ; 2b995
+.CountMonsRemaining:
 	ld c, 0
 	ld b, 3
 	ld de, PARTYMON_STRUCT_LENGTH - 1
@@ -74,7 +74,7 @@ DetermineLinkBattleResult: ; 2b930
 	jr nz, .loop
 	ret
 
-.CalcPercentHPRemaining: ; 2b9a6
+.CalcPercentHPRemaining:
 	ld de, 0
 	ld c, $3
 .loop2
@@ -117,26 +117,26 @@ DetermineLinkBattleResult: ; 2b930
 	jr nz, .loop2
 	ret
 
-.BothSides_CheckNumberMonsAtFullHealth: ; 2b9e1
+.BothSides_CheckNumberMonsAtFullHealth:
 	ld hl, wPartyMon1HP
 	call .CheckFaintedOrFullHealth
 	jr nz, .finish ; we have a pokemon that's neither fainted nor at full health
 	ld hl, wOTPartyMon1HP
 	call .CheckFaintedOrFullHealth
-	ld e, $1
+	ld e, $1 ; victory
 	ret
 
 .finish
 	ld hl, wOTPartyMon1HP
 	call .CheckFaintedOrFullHealth
-	ld e, $0
+	ld e, $0 ; drawn
 	ret nz ; we both have pokemon that are neither fainted nor at full health
-	ld e, $2
-	ld a, $1
+	ld e, $2 ; defeat
+	ld a, $1 ; not drawn
 	and a
 	ret
 
-.CheckFaintedOrFullHealth: ; 2ba01
+.CheckFaintedOrFullHealth:
 	ld d, 3
 .loop3
 	ld a, [hli]
diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm
index c97cd7854..147430030 100755..100644
--- a/engine/battle/menu.asm
+++ b/engine/battle/menu.asm
@@ -1,6 +1,6 @@
-LoadBattleMenu: ; 24ef2
-	ld hl, BattleMenuDataHeader
-	call LoadMenuDataHeader
+LoadBattleMenu:
+	ld hl, BattleMenuHeader
+	call LoadMenuHeader
 	ld a, [wBattleMenuCursorBuffer]
 	ld [wMenuCursorBuffer], a
 	call InterpretBattleMenu
@@ -8,21 +8,18 @@ LoadBattleMenu: ; 24ef2
 	ld [wBattleMenuCursorBuffer], a
 	call ExitMenu
 	ret
-; 24f0b
 
-SafariBattleMenu: ; 24f0b
+SafariBattleMenu:
 ; untranslated
-	ld hl, MenuDataHeader_0x24f4e
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_0x24f4e
+	call LoadMenuHeader
 	jr Function24f19
-; 24f13
 
-ContestBattleMenu: ; 24f13
-	ld hl, MenuDataHeader_0x24f89
-	call LoadMenuDataHeader
-; 24f19
+ContestBattleMenu:
+	ld hl, MenuHeader_0x24f89
+	call LoadMenuHeader
 
-Function24f19: ; 24f19
+Function24f19:
 	ld a, [wBattleMenuCursorBuffer]
 	ld [wMenuCursorBuffer], a
 	call _2DMenu
@@ -30,86 +27,74 @@ Function24f19: ; 24f19
 	ld [wBattleMenuCursorBuffer], a
 	call ExitMenu
 	ret
-; 24f2c
 
-BattleMenuDataHeader: ; 24f2c
+BattleMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 8, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw MenuData_0x24f34
 	db 1 ; default option
-; 24f34
 
-MenuData_0x24f34: ; 0x24f34
+MenuData_0x24f34:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	dn 2, 2 ; rows, columns
 	db 6 ; spacing
 	dba Strings24f3d
 	dbw BANK(MenuData_0x24f34), 0
-; 0x24f3d
 
-Strings24f3d: ; 0x24f3d
+Strings24f3d:
 	db "FIGHT@"
 	db "<PKMN>@"
 	db "PACK@"
 	db "RUN@"
-; 24f4e
 
-MenuDataHeader_0x24f4e: ; 24f4e
+MenuHeader_0x24f4e:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw MenuData_0x24f56
 	db 1 ; default option
-; 24f56
 
-MenuData_0x24f56: ; 24f56
+MenuData_0x24f56:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	dn 2, 2 ; rows, columns
 	db 11 ; spacing
 	dba Strings24f5f
 	dba Function24f7c
-; 24f5f
 
-Strings24f5f: ; 24f5f
+Strings24f5f:
 	db "サファりボール×　　@" ; "SAFARI BALL×  @"
 	db "エサをなげる@" ; "THROW BAIT"
 	db "いしをなげる@" ; "THROW ROCK"
 	db "にげる@" ; "RUN"
-; 24f7c
 
-Function24f7c: ; 24f7c
+Function24f7c:
 	hlcoord 17, 13
 	ld de, wSafariBallsRemaining
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2
 	call PrintNum
 	ret
-; 24f89
 
-MenuDataHeader_0x24f89: ; 24f89
+MenuHeader_0x24f89:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 2, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw MenuData_0x24f91
 	db 1 ; default option
-; 24f91
 
-MenuData_0x24f91: ; 24f91
+MenuData_0x24f91:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	dn 2, 2 ; rows, columns
 	db 12 ; spacing
 	dba Strings24f9a
 	dba Function24fb2
-; 24f9a
 
-Strings24f9a: ; 24f9a
+Strings24f9a:
 	db "FIGHT@"
 	db "<PKMN>", "@"
 	db "PARKBALL×  @"
 	db "RUN@"
-; 24fb2
 
-Function24fb2: ; 24fb2
+Function24fb2:
 	hlcoord 13, 16
 	ld de, wParkBallsRemaining
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2
 	call PrintNum
 	ret
-; 24fbf
diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm
index b79c274b9..48062f643 100644
--- a/engine/battle/misc.asm
+++ b/engine/battle/misc.asm
@@ -1,4 +1,4 @@
-_DisappearUser: ; fbd54
+_DisappearUser:
 	xor a
 	ld [hBGMapMode], a
 	ld a, [hBattleTurn]
@@ -12,14 +12,14 @@ _DisappearUser: ; fbd54
 	call ClearBox
 	jr FinishAppearDisappearUser
 
-_AppearUserRaiseSub: ; fbd69 (3e:7d69)
+_AppearUserRaiseSub:
 	farcall BattleCommand_RaiseSubNoAnim
 	jr AppearUser
 
-_AppearUserLowerSub: ; fbd71 (3e:7d71)
+_AppearUserLowerSub:
 	farcall BattleCommand_LowerSubNoAnim
 
-AppearUser: ; fbd77 (3e:7d77)
+AppearUser:
 	xor a
 	ld [hBGMapMode], a
 	ld a, [hBattleTurn]
@@ -34,25 +34,23 @@ AppearUser: ; fbd77 (3e:7d77)
 .okay
 	ld [hGraphicStartTile], a
 	predef PlaceGraphic
-FinishAppearDisappearUser: ; fbd91 (3e:7d91)
+FinishAppearDisappearUser:
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
 
-GetEnemyFrontpicCoords: ; fbd96 (3e:7d96)
+GetEnemyFrontpicCoords:
 	hlcoord 12, 0
 	lb bc, 7, 7
 	ret
 
-GetPlayerBackpicCoords: ; fbd9d (3e:7d9d)
+GetPlayerBackpicCoords:
 	hlcoord 2, 6
 	lb bc, 6, 6
 	ret
 
-
-DoWeatherModifiers: ; fbda4
-
-	ld de, .WeatherTypeModifiers
+DoWeatherModifiers:
+	ld de, WeatherTypeModifiers
 	ld a, [wBattleWeather]
 	ld b, a
 	ld a, [wd265] ; move type
@@ -76,9 +74,8 @@ DoWeatherModifiers: ; fbda4
 	inc de
 	jr .CheckWeatherType
 
-
 .done_weather_types
-	ld de, .WeatherMoveModifiers
+	ld de, WeatherMoveModifiers
 
 	ld a, BATTLE_VARS_MOVE_EFFECT
 	call GetBattleVar
@@ -145,20 +142,9 @@ DoWeatherModifiers: ; fbda4
 .done
 	ret
 
-.WeatherTypeModifiers:
-	db WEATHER_RAIN, WATER, MORE_EFFECTIVE
-	db WEATHER_RAIN, FIRE,  NOT_VERY_EFFECTIVE
-	db WEATHER_SUN,  FIRE,  MORE_EFFECTIVE
-	db WEATHER_SUN,  WATER, NOT_VERY_EFFECTIVE
-	db -1 ; end
-
-.WeatherMoveModifiers:
-	db WEATHER_RAIN, EFFECT_SOLARBEAM, NOT_VERY_EFFECTIVE
-	db -1 ; end
-; fbe24
-
+INCLUDE "data/battle/weather_modifiers.asm"
 
-DoBadgeTypeBoosts: ; fbe24
+DoBadgeTypeBoosts:
 	ld a, [wLinkMode]
 	and a
 	ret nz
@@ -174,7 +160,7 @@ DoBadgeTypeBoosts: ; fbe24
 	push de
 	push bc
 
-	ld hl, .BadgeTypes
+	ld hl, BadgeTypeBoosts
 
 	ld a, [wKantoBadges]
 	ld b, a
@@ -235,25 +221,4 @@ DoBadgeTypeBoosts: ; fbe24
 	pop de
 	ret
 
-.BadgeTypes:
-; entries correspond to wJohtoBadges constants
-	db FLYING   ; ZEPHYRBADGE
-	db BUG      ; HIVEBADGE
-	db NORMAL   ; PLAINBADGE
-	db GHOST    ; FOGBADGE
-	db STEEL    ; MINERALBADGE
-	db FIGHTING ; STORMBADGE
-	db ICE      ; GLACIERBADGE
-	db DRAGON   ; RISINGBADGE
-	; fallthrough
-; entries correspond to wKantoBadges constants
-	db ROCK     ; BOULDERBADGE
-	db WATER    ; CASCADEBADGE
-	db ELECTRIC ; THUNDERBADGE
-	db GRASS    ; RAINBOWBADGE
-	db POISON   ; SOULBADGE
-	db PSYCHIC  ; MARSHBADGE
-	db FIRE     ; VOLCANOBADGE
-	db GROUND   ; EARTHBADGE
-	db -1 ; end
-; fbe91
+INCLUDE "data/types/badge_type_boosts.asm"
diff --git a/engine/battle/effect_commands/attract.asm b/engine/battle/move_effects/attract.asm
index da6a9c0e9..bb7b4fce4 100755..100644
--- a/engine/battle/effect_commands/attract.asm
+++ b/engine/battle/move_effects/attract.asm
@@ -1,4 +1,4 @@
-BattleCommand_Attract: ; 377ce
+BattleCommand_Attract:
 ; attract
 	ld a, [wAttackMissed]
 	and a
@@ -20,11 +20,9 @@ BattleCommand_Attract: ; 377ce
 	jp StdBattleTextBox
 
 .failed
-	jp FailAttract
-; 377f5
+	jp FailMove
 
-
-CheckOppositeGender: ; 377f5
+CheckOppositeGender:
 	ld a, MON_SPECIES
 	call BattlePartyAttr
 	ld a, [hl]
@@ -76,4 +74,3 @@ CheckOppositeGender: ; 377f5
 .genderless_samegender
 	scf
 	ret
-; 3784b
diff --git a/engine/battle/move_effects/baton_pass.asm b/engine/battle/move_effects/baton_pass.asm
new file mode 100644
index 000000000..5d9f19838
--- /dev/null
+++ b/engine/battle/move_effects/baton_pass.asm
@@ -0,0 +1,217 @@
+BattleCommand_BatonPass:
+; batonpass
+
+	ld a, [hBattleTurn]
+	and a
+	jp nz, .Enemy
+
+; Need something to switch to
+	call CheckAnyOtherAlivePartyMons
+	jp z, FailedBatonPass
+
+	call UpdateBattleMonInParty
+	call AnimateCurrentMove
+
+	ld c, 50
+	call DelayFrames
+
+; Transition into switchmon menu
+	call LoadStandardMenuHeader
+	farcall SetUpBattlePartyMenu_NoLoop
+
+	farcall ForcePickSwitchMonInBattle
+
+; Return to battle scene
+	call ClearPalettes
+	farcall _LoadBattleFontsHPBar
+	call CloseWindow
+	call ClearSprites
+	hlcoord 1, 0
+	lb bc, 4, 10
+	call ClearBox
+	ld b, SCGB_BATTLE_COLORS
+	call GetSGBLayout
+	call SetPalettes
+	call BatonPass_LinkPlayerSwitch
+
+; Mobile link battles handle entrances differently
+	farcall CheckMobileBattleError
+	jp c, EndMoveEffect
+
+	ld hl, PassedBattleMonEntrance
+	call CallBattleCore
+
+	call ResetBatonPassStatus
+	ret
+
+.Enemy:
+; Wildmons don't have anything to switch to
+	ld a, [wBattleMode]
+	dec a ; WILDMON
+	jp z, FailedBatonPass
+
+	call CheckAnyOtherAliveEnemyMons
+	jp z, FailedBatonPass
+
+	call UpdateEnemyMonInParty
+	call AnimateCurrentMove
+	call BatonPass_LinkEnemySwitch
+
+; Mobile link battles handle entrances differently
+	farcall CheckMobileBattleError
+	jp c, EndMoveEffect
+
+; Passed enemy PartyMon entrance
+	xor a
+	ld [wEnemySwitchMonIndex], a
+	ld hl, EnemySwitch_SetMode
+	call CallBattleCore
+	ld hl, ResetBattleParticipants
+	call CallBattleCore
+	ld a, 1
+	ld [wTypeMatchup], a
+	ld hl, ApplyStatLevelMultiplierOnAllStats
+	call CallBattleCore
+
+	ld hl, SpikesDamage
+	call CallBattleCore
+
+	jr ResetBatonPassStatus
+
+BatonPass_LinkPlayerSwitch:
+	ld a, [wLinkMode]
+	and a
+	ret z
+
+	ld a, 1
+	ld [wBattlePlayerAction], a
+
+	call LoadStandardMenuHeader
+	ld hl, LinkBattleSendReceiveAction
+	call CallBattleCore
+	call CloseWindow
+
+	xor a
+	ld [wBattlePlayerAction], a
+	ret
+
+BatonPass_LinkEnemySwitch:
+	ld a, [wLinkMode]
+	and a
+	ret z
+
+	call LoadStandardMenuHeader
+	ld hl, LinkBattleSendReceiveAction
+	call CallBattleCore
+
+	ld a, [wOTPartyCount]
+	add BATTLEACTION_SWITCH1
+	ld b, a
+	ld a, [wBattleAction]
+	cp BATTLEACTION_SWITCH1
+	jr c, .baton_pass
+	cp b
+	jr c, .switch
+
+.baton_pass
+	ld a, [wCurOTMon]
+	add BATTLEACTION_SWITCH1
+	ld [wBattleAction], a
+.switch
+	jp CloseWindow
+
+FailedBatonPass:
+	call AnimateFailedMove
+	jp PrintButItFailed
+
+ResetBatonPassStatus:
+; Reset status changes that aren't passed by Baton Pass.
+
+	; Nightmare isn't passed.
+	ld a, BATTLE_VARS_STATUS
+	call GetBattleVar
+	and SLP
+	jr nz, .ok
+
+	ld a, BATTLE_VARS_SUBSTATUS1
+	call GetBattleVarAddr
+	res SUBSTATUS_NIGHTMARE, [hl]
+.ok
+
+	; Disable isn't passed.
+	call ResetActorDisable
+
+	; Attraction isn't passed.
+	ld hl, wPlayerSubStatus1
+	res SUBSTATUS_IN_LOVE, [hl]
+	ld hl, wEnemySubStatus1
+	res SUBSTATUS_IN_LOVE, [hl]
+	ld hl, wPlayerSubStatus5
+
+	ld a, BATTLE_VARS_SUBSTATUS5
+	call GetBattleVarAddr
+	res SUBSTATUS_TRANSFORMED, [hl]
+	res SUBSTATUS_ENCORED, [hl]
+
+	; New mon hasn't used a move yet.
+	ld a, BATTLE_VARS_LAST_MOVE
+	call GetBattleVarAddr
+	ld [hl], 0
+
+	xor a
+	ld [wPlayerWrapCount], a
+	ld [wEnemyWrapCount], a
+	ret
+
+CheckAnyOtherAlivePartyMons:
+	ld hl, wPartyMon1HP
+	ld a, [wPartyCount]
+	ld d, a
+	ld a, [wCurBattleMon]
+	ld e, a
+	jr CheckAnyOtherAliveMons
+
+CheckAnyOtherAliveEnemyMons:
+	ld hl, wOTPartyMon1HP
+	ld a, [wOTPartyCount]
+	ld d, a
+	ld a, [wCurOTMon]
+	ld e, a
+
+	; fallthrough
+
+CheckAnyOtherAliveMons:
+; Check for nonzero HP starting from partymon
+; HP at hl for d partymons, besides current mon e.
+
+; Return nz if any are alive.
+
+	xor a
+	ld b, a
+	ld c, a
+.loop
+	ld a, c
+	cp d
+	jr z, .done
+	cp e
+	jr z, .next
+
+	ld a, [hli]
+	or b
+	ld b, a
+	ld a, [hld]
+	or b
+	ld b, a
+
+.next
+	push bc
+	ld bc, PARTYMON_STRUCT_LENGTH
+	add hl, bc
+	pop bc
+	inc c
+	jr .loop
+
+.done
+	ld a, b
+	and a
+	ret
diff --git a/engine/battle/move_effects/beat_up.asm b/engine/battle/move_effects/beat_up.asm
new file mode 100644
index 000000000..673fc46c6
--- /dev/null
+++ b/engine/battle/move_effects/beat_up.asm
@@ -0,0 +1,224 @@
+BattleCommand_BeatUp:
+; beatup
+
+	call ResetDamage
+	ld a, [hBattleTurn]
+	and a
+	jp nz, .enemy_beats_up
+
+	ld a, [wPlayerSubStatus3]
+	bit SUBSTATUS_IN_LOOP, a
+	jr nz, .next_mon
+
+	ld c, 20
+	call DelayFrames
+	xor a
+	ld [wPlayerRolloutCount], a
+	ld [wd002], a
+	ld [wBeatUpHitAtLeastOnce], a
+	jr .got_mon
+
+.next_mon
+	ld a, [wPlayerRolloutCount]
+	ld b, a
+	ld a, [wPartyCount]
+	sub b
+	ld [wd002], a
+
+.got_mon
+	ld a, [wd002]
+	ld hl, wPartyMonNicknames
+	call GetNick
+	ld a, MON_HP
+	call GetBeatupMonLocation
+	ld a, [hli]
+	or [hl]
+	jp z, .beatup_fail ; fainted
+	ld a, [wd002]
+	ld c, a
+	ld a, [wCurBattleMon]
+	; BUG: this can desynchronize link battles
+	; Change "cp [hl]" to "cp c" to fix
+	cp [hl]
+	ld hl, wBattleMonStatus
+	jr z, .active_mon
+	ld a, MON_STATUS
+	call GetBeatupMonLocation
+.active_mon
+	ld a, [hl]
+	and a
+	jp nz, .beatup_fail
+
+	ld a, $1
+	ld [wBeatUpHitAtLeastOnce], a
+	ld hl, BeatUpAttackText
+	call StdBattleTextBox
+
+	ld a, [wEnemyMonSpecies]
+	ld [wCurSpecies], a
+	call GetBaseData
+	ld a, [wBaseDefense]
+	ld c, a
+
+	push bc
+	ld a, MON_SPECIES
+	call GetBeatupMonLocation
+	ld a, [hl]
+	ld [wCurSpecies], a
+	call GetBaseData
+	ld a, [wBaseAttack]
+	pop bc
+	ld b, a
+
+	push bc
+	ld a, MON_LEVEL
+	call GetBeatupMonLocation
+	ld a, [hl]
+	ld e, a
+	pop bc
+
+	ld a, [wPlayerMoveStructPower]
+	ld d, a
+	ret
+
+.enemy_beats_up
+	ld a, [wEnemySubStatus3]
+	bit SUBSTATUS_IN_LOOP, a
+	jr nz, .enemy_next_mon
+
+	xor a
+	ld [wEnemyRolloutCount], a
+	ld [wd002], a
+	ld [wBeatUpHitAtLeastOnce], a
+	jr .enemy_got_mon
+
+.enemy_next_mon
+	ld a, [wEnemyRolloutCount]
+	ld b, a
+	ld a, [wOTPartyCount]
+	sub b
+	ld [wd002], a
+
+.enemy_got_mon
+	ld a, [wBattleMode]
+	dec a
+	jr z, .wild
+
+	ld a, [wLinkMode]
+	and a
+	jr nz, .link_or_tower
+
+	ld a, [wInBattleTowerBattle]
+	and a
+	jr nz, .link_or_tower
+
+	ld a, [wd002]
+	ld c, a
+	ld b, 0
+	ld hl, wOTPartySpecies
+	add hl, bc
+	ld a, [hl]
+	ld [wNamedObjectIndexBuffer], a
+	call GetPokemonName
+	jr .got_enemy_nick
+
+.link_or_tower
+	ld a, [wd002]
+	ld hl, wOTPartyMonNicknames
+	ld bc, NAME_LENGTH
+	call AddNTimes
+	ld de, wStringBuffer1
+	call CopyBytes
+
+.got_enemy_nick
+	ld a, MON_HP
+	call GetBeatupMonLocation
+	ld a, [hli]
+	or [hl]
+	jp z, .beatup_fail
+
+	ld a, [wd002]
+	ld b, a
+	ld a, [wCurOTMon]
+	cp b
+	ld hl, wEnemyMonStatus
+	jr z, .active_enemy
+	ld a, MON_STATUS
+	call GetBeatupMonLocation
+.active_enemy
+	ld a, [hl]
+	and a
+	jr nz, .beatup_fail
+
+	ld a, $1
+	ld [wBeatUpHitAtLeastOnce], a
+	jr .finish_beatup
+
+.wild
+	ld a, [wEnemyMonSpecies]
+	ld [wNamedObjectIndexBuffer], a
+	call GetPokemonName
+	ld hl, BeatUpAttackText
+	call StdBattleTextBox
+	jp EnemyAttackDamage
+
+.finish_beatup
+	ld hl, BeatUpAttackText
+	call StdBattleTextBox
+
+	ld a, [wBattleMonSpecies]
+	ld [wCurSpecies], a
+	call GetBaseData
+	ld a, [wBaseDefense]
+	ld c, a
+
+	push bc
+	ld a, MON_SPECIES
+	call GetBeatupMonLocation
+	ld a, [hl]
+	ld [wCurSpecies], a
+	call GetBaseData
+	ld a, [wBaseAttack]
+	pop bc
+	ld b, a
+
+	push bc
+	ld a, MON_LEVEL
+	call GetBeatupMonLocation
+	ld a, [hl]
+	ld e, a
+	pop bc
+
+	ld a, [wEnemyMoveStructPower]
+	ld d, a
+	ret
+
+.beatup_fail
+	ld b, buildopponentrage_command
+	jp SkipToBattleCommand
+
+BattleCommand_BeatUpFailText:
+; beatupfailtext
+
+	ld a, [wBeatUpHitAtLeastOnce]
+	and a
+	ret nz
+
+	jp PrintButItFailed
+
+GetBeatupMonLocation:
+	push bc
+	ld c, a
+	ld b, 0
+	ld a, [hBattleTurn]
+	and a
+	ld hl, wPartyMon1Species
+	jr z, .got_species
+	ld hl, wOTPartyMon1Species
+
+.got_species
+	ld a, [wd002]
+	add hl, bc
+	call GetPartyLocation
+	pop bc
+	ret
diff --git a/engine/battle/move_effects/belly_drum.asm b/engine/battle/move_effects/belly_drum.asm
new file mode 100644
index 000000000..27ef1a542
--- /dev/null
+++ b/engine/battle/move_effects/belly_drum.asm
@@ -0,0 +1,34 @@
+BattleCommand_BellyDrum:
+; bellydrum
+; This command is buggy because it raises the user's attack
+; before checking that it has enough HP to use the move.
+; Swap the order of these two blocks to fix.
+	call BattleCommand_AttackUp2
+	ld a, [wAttackMissed]
+	and a
+	jr nz, .failed
+
+	callfar GetHalfMaxHP
+	callfar CheckUserHasEnoughHP
+	jr nc, .failed
+
+	push bc
+	call AnimateCurrentMove
+	pop bc
+	callfar SubtractHPFromUser
+	call UpdateUserInParty
+	ld a, 5
+
+.max_attack_loop
+	push af
+	call BattleCommand_AttackUp2
+	pop af
+	dec a
+	jr nz, .max_attack_loop
+
+	ld hl, BellyDrumText
+	jp StdBattleTextBox
+
+.failed
+	call AnimateFailedMove
+	jp PrintButItFailed
diff --git a/engine/battle/move_effects/bide.asm b/engine/battle/move_effects/bide.asm
new file mode 100644
index 000000000..871e0e7a8
--- /dev/null
+++ b/engine/battle/move_effects/bide.asm
@@ -0,0 +1,100 @@
+BattleCommand_StoreEnergy:
+; storeenergy
+
+	ld a, BATTLE_VARS_SUBSTATUS3
+	call GetBattleVar
+	bit SUBSTATUS_BIDE, a
+	ret z
+
+	ld hl, wPlayerRolloutCount
+	ld a, [hBattleTurn]
+	and a
+	jr z, .check_still_storing_energy
+	ld hl, wEnemyRolloutCount
+.check_still_storing_energy
+	dec [hl]
+	jr nz, .still_storing
+
+	ld a, BATTLE_VARS_SUBSTATUS3
+	call GetBattleVarAddr
+	res SUBSTATUS_BIDE, [hl]
+
+	ld hl, UnleashedEnergyText
+	call StdBattleTextBox
+
+	ld a, BATTLE_VARS_MOVE_POWER
+	call GetBattleVarAddr
+	ld a, 1
+	ld [hl], a
+	ld hl, wPlayerDamageTaken + 1
+	ld de, wPlayerCharging ; player
+	ld a, [hBattleTurn]
+	and a
+	jr z, .player
+	ld hl, wEnemyDamageTaken + 1
+	ld de, wEnemyCharging ; enemy
+.player
+	ld a, [hld]
+	add a
+	ld b, a
+	ld [wCurDamage + 1], a
+	ld a, [hl]
+	rl a
+	ld [wCurDamage], a
+	jr nc, .not_maxed
+	ld a, $ff
+	ld [wCurDamage], a
+	ld [wCurDamage + 1], a
+.not_maxed
+	or b
+	jr nz, .built_up_something
+	ld a, 1
+	ld [wAttackMissed], a
+.built_up_something
+	xor a
+	ld [hli], a
+	ld [hl], a
+	ld [de], a
+
+	ld a, BATTLE_VARS_MOVE_ANIM
+	call GetBattleVarAddr
+	ld a, BIDE
+	ld [hl], a
+
+	ld b, unleashenergy_command
+	jp SkipToBattleCommand
+
+.still_storing
+	ld hl, StoringEnergyText
+	call StdBattleTextBox
+	jp EndMoveEffect
+
+BattleCommand_UnleashEnergy:
+; unleashenergy
+
+	ld de, wPlayerDamageTaken
+	ld bc, wPlayerRolloutCount
+	ld a, [hBattleTurn]
+	and a
+	jr z, .got_damage
+	ld de, wEnemyDamageTaken
+	ld bc, wEnemyRolloutCount
+.got_damage
+	ld a, BATTLE_VARS_SUBSTATUS3
+	call GetBattleVarAddr
+	set SUBSTATUS_BIDE, [hl]
+	xor a
+	ld [de], a
+	inc de
+	ld [de], a
+	ld [wPlayerMoveStructEffect], a
+	ld [wEnemyMoveStructEffect], a
+	call BattleRandom
+	and 1
+	inc a
+	inc a
+	ld [bc], a
+	ld a, 1
+	ld [wKickCounter], a
+	call AnimateCurrentMove
+	jp EndMoveEffect
diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm
new file mode 100644
index 000000000..f9307056c
--- /dev/null
+++ b/engine/battle/move_effects/conversion.asm
@@ -0,0 +1,96 @@
+BattleCommand_Conversion:
+; conversion
+
+	ld hl, wBattleMonMoves
+	ld de, wBattleMonType1
+	ld a, [hBattleTurn]
+	and a
+	jr z, .got_moves
+	ld hl, wEnemyMonMoves
+	ld de, wEnemyMonType1
+.got_moves
+	push de
+	ld c, 0
+	ld de, wStringBuffer1
+.loop
+	push hl
+	ld b, 0
+	add hl, bc
+	ld a, [hl]
+	pop hl
+	and a
+	jr z, .okay
+	push hl
+	push bc
+	dec a
+	ld hl, Moves + MOVE_TYPE
+	call GetMoveAttr
+	ld [de], a
+	inc de
+	pop bc
+	pop hl
+	inc c
+	ld a, c
+	cp NUM_MOVES
+	jr c, .loop
+.okay
+	ld a, $ff
+	ld [de], a
+	inc de
+	ld [de], a
+	inc de
+	ld [de], a
+	pop de
+	ld hl, wStringBuffer1
+.loop2
+	ld a, [hl]
+	cp -1
+	jr z, .fail
+	cp CURSE_T
+	jr z, .next
+	ld a, [de]
+	cp [hl]
+	jr z, .next
+	inc de
+	ld a, [de]
+	dec de
+	cp [hl]
+	jr nz, .done
+.next
+	inc hl
+	jr .loop2
+
+.fail
+	call AnimateFailedMove
+	jp PrintButItFailed
+
+.done
+.loop3
+	call BattleRandom
+	maskbits NUM_MOVES
+	ld c, a
+	ld b, 0
+	ld hl, wStringBuffer1
+	add hl, bc
+	ld a, [hl]
+	cp -1
+	jr z, .loop3
+	cp CURSE_T
+	jr z, .loop3
+	ld a, [de]
+	cp [hl]
+	jr z, .loop3
+	inc de
+	ld a, [de]
+	dec de
+	cp [hl]
+	jr z, .loop3
+	ld a, [hl]
+	ld [de], a
+	inc de
+	ld [de], a
+	ld [wNamedObjectIndexBuffer], a
+	farcall GetTypeName
+	call AnimateCurrentMove
+	ld hl, TransformedTypeText
+	jp StdBattleTextBox
diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm
new file mode 100644
index 000000000..14a7e257a
--- /dev/null
+++ b/engine/battle/move_effects/conversion2.asm
@@ -0,0 +1,64 @@
+BattleCommand_Conversion2:
+; conversion2
+
+	ld a, [wAttackMissed]
+	and a
+	jr nz, .failed
+	ld hl, wBattleMonType1
+	ld a, [hBattleTurn]
+	and a
+	jr z, .got_type
+	ld hl, wEnemyMonType1
+.got_type
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
+	call GetBattleVar
+	and a
+	jr z, .failed
+	push hl
+	dec a
+	ld hl, Moves + MOVE_TYPE
+	call GetMoveAttr
+	ld d, a
+	pop hl
+	cp CURSE_T
+	jr z, .failed
+	call AnimateCurrentMove
+	call BattleCommand_SwitchTurn
+
+.loop
+	call BattleRandom
+	maskbits NUM_TYPES
+	cp UNUSED_TYPES
+	jr c, .okay
+	cp UNUSED_TYPES_END
+	jr c, .loop
+	cp TYPES_END
+	jr nc, .loop
+.okay
+	ld [hli], a
+	ld [hld], a
+	push hl
+	ld a, BATTLE_VARS_MOVE_TYPE
+	call GetBattleVarAddr
+	push af
+	push hl
+	ld a, d
+	ld [hl], a
+	call BattleCheckTypeMatchup
+	pop hl
+	pop af
+	ld [hl], a
+	pop hl
+	ld a, [wTypeMatchup]
+	cp EFFECTIVE
+	jr nc, .loop
+	call BattleCommand_SwitchTurn
+
+	ld a, [hl]
+	ld [wNamedObjectIndexBuffer], a
+	predef GetTypeName
+	ld hl, TransformedTypeText
+	jp StdBattleTextBox
+
+.failed
+	jp FailMove
diff --git a/engine/battle/move_effects/counter.asm b/engine/battle/move_effects/counter.asm
new file mode 100644
index 000000000..031c399a6
--- /dev/null
+++ b/engine/battle/move_effects/counter.asm
@@ -0,0 +1,59 @@
+BattleCommand_Counter:
+; counter
+
+	ld a, 1
+	ld [wAttackMissed], a
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
+	call GetBattleVar
+	and a
+	ret z
+
+	ld b, a
+	callfar GetMoveEffect
+	ld a, b
+	cp EFFECT_COUNTER
+	ret z
+
+	call BattleCommand_ResetTypeMatchup
+	ld a, [wTypeMatchup]
+	and a
+	ret z
+
+	call CheckOpponentWentFirst
+	ret z
+
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
+	call GetBattleVar
+	dec a
+	ld de, wStringBuffer1
+	call GetMoveData
+
+	ld a, [wStringBuffer1 + MOVE_POWER]
+	and a
+	ret z
+
+	ld a, [wStringBuffer1 + MOVE_TYPE]
+	cp SPECIAL
+	ret nc
+
+	; BUG: Move should fail with all non-damaging battle actions
+	ld hl, wCurDamage
+	ld a, [hli]
+	or [hl]
+	ret z
+
+	ld a, [hl]
+	add a
+	ld [hld], a
+	ld a, [hl]
+	adc a
+	ld [hl], a
+	jr nc, .capped
+	ld a, $ff
+	ld [hli], a
+	ld [hl], a
+.capped
+
+	xor a
+	ld [wAttackMissed], a
+	ret
diff --git a/engine/battle/effect_commands/curse.asm b/engine/battle/move_effects/curse.asm
index b11b9f3fb..4861e9a37 100644
--- a/engine/battle/effect_commands/curse.asm
+++ b/engine/battle/move_effects/curse.asm
@@ -1,4 +1,4 @@
-BattleCommand_Curse: ; 37588
+BattleCommand_Curse:
 ; curse
 
 	ld de, wBattleMonType1
@@ -21,7 +21,6 @@ BattleCommand_Curse: ; 37588
 	cp GHOST
 	jr z, .ghost
 
-
 ; If no stats can be increased, don't.
 
 ; Attack
@@ -54,7 +53,6 @@ BattleCommand_Curse: ; 37588
 	call BattleCommand_DefenseUp
 	jp BattleCommand_StatUpMessage
 
-
 .ghost
 
 ; Cut HP in half and put a curse on the opponent.
@@ -84,7 +82,6 @@ BattleCommand_Curse: ; 37588
 	call AnimateFailedMove
 	jp PrintButItFailed
 
-
 .cantraise
 
 ; Can't raise either stat.
@@ -94,4 +91,3 @@ BattleCommand_Curse: ; 37588
 	call AnimateFailedMove
 	ld hl, WontRiseAnymoreText
 	jp StdBattleTextBox
-; 37618
diff --git a/engine/battle/move_effects/destiny_bond.asm b/engine/battle/move_effects/destiny_bond.asm
new file mode 100644
index 000000000..55809d98a
--- /dev/null
+++ b/engine/battle/move_effects/destiny_bond.asm
@@ -0,0 +1,9 @@
+BattleCommand_DestinyBond:
+; destinybond
+
+	ld a, BATTLE_VARS_SUBSTATUS5
+	call GetBattleVarAddr
+	set SUBSTATUS_DESTINY_BOND, [hl]
+	call AnimateCurrentMove
+	ld hl, DestinyBondEffectText
+	jp StdBattleTextBox
diff --git a/engine/battle/move_effects/disable.asm b/engine/battle/move_effects/disable.asm
new file mode 100644
index 000000000..44017e30d
--- /dev/null
+++ b/engine/battle/move_effects/disable.asm
@@ -0,0 +1,72 @@
+BattleCommand_Disable:
+; disable
+
+	ld a, [wAttackMissed]
+	and a
+	jr nz, .failed
+
+	ld de, wEnemyDisableCount
+	ld hl, wEnemyMonMoves
+	ld a, [hBattleTurn]
+	and a
+	jr z, .got_moves
+	ld de, wPlayerDisableCount
+	ld hl, wBattleMonMoves
+.got_moves
+
+	ld a, [de]
+	and a
+	jr nz, .failed
+
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
+	call GetBattleVar
+	and a
+	jr z, .failed
+	cp STRUGGLE
+	jr z, .failed
+
+	ld b, a
+	ld c, $ff
+.loop
+	inc c
+	ld a, [hli]
+	cp b
+	jr nz, .loop
+
+	ld a, [hBattleTurn]
+	and a
+	ld hl, wEnemyMonPP
+	jr z, .got_pp
+	ld hl, wBattleMonPP
+.got_pp
+	ld b, 0
+	add hl, bc
+	ld a, [hl]
+	and a
+	jr z, .failed
+.loop2
+	call BattleRandom
+	and 7
+	jr z, .loop2
+	inc a
+	inc c
+	swap c
+	add c
+	ld [de], a
+	call AnimateCurrentMove
+	ld hl, wDisabledMove
+	ld a, [hBattleTurn]
+	and a
+	jr nz, .got_disabled_move_pointer
+	inc hl
+.got_disabled_move_pointer
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
+	call GetBattleVar
+	ld [hl], a
+	ld [wNamedObjectIndexBuffer], a
+	call GetMoveName
+	ld hl, WasDisabledText
+	jp StdBattleTextBox
+
+.failed
+	jp FailMove
diff --git a/engine/battle/move_effects/encore.asm b/engine/battle/move_effects/encore.asm
new file mode 100644
index 000000000..f436fd970
--- /dev/null
+++ b/engine/battle/move_effects/encore.asm
@@ -0,0 +1,120 @@
+BattleCommand_Encore:
+; encore
+
+	ld hl, wEnemyMonMoves
+	ld de, wEnemyEncoreCount
+	ld a, [hBattleTurn]
+	and a
+	jr z, .ok
+	ld hl, wBattleMonMoves
+	ld de, wPlayerEncoreCount
+.ok
+	ld a, BATTLE_VARS_LAST_MOVE_OPP
+	call GetBattleVar
+	and a
+	jp z, .failed
+	cp STRUGGLE
+	jp z, .failed
+	cp ENCORE
+	jp z, .failed
+	cp MIRROR_MOVE
+	jp z, .failed
+	ld b, a
+
+.got_move
+	ld a, [hli]
+	cp b
+	jr nz, .got_move
+
+	ld bc, wBattleMonPP - wBattleMonMoves - 1
+	add hl, bc
+	ld a, [hl]
+	and PP_MASK
+	jp z, .failed
+	ld a, [wAttackMissed]
+	and a
+	jp nz, .failed
+	ld a, BATTLE_VARS_SUBSTATUS5_OPP
+	call GetBattleVarAddr
+	bit SUBSTATUS_ENCORED, [hl]
+	jp nz, .failed
+	set SUBSTATUS_ENCORED, [hl]
+	call BattleRandom
+	and $3
+	inc a
+	inc a
+	inc a
+	ld [de], a
+	call CheckOpponentWentFirst
+	jr nz, .finish_move
+	ld a, [hBattleTurn]
+	and a
+	jr z, .force_last_enemy_move
+
+	push hl
+	ld a, [wLastPlayerMove]
+	ld b, a
+	ld c, 0
+	ld hl, wBattleMonMoves
+.find_player_move
+	ld a, [hli]
+	cp b
+	jr z, .got_player_move
+	inc c
+	ld a, c
+	cp NUM_MOVES
+	jr c, .find_player_move
+	pop hl
+	res SUBSTATUS_ENCORED, [hl]
+	xor a
+	ld [de], a
+	jr .failed
+
+.got_player_move
+	pop hl
+	ld a, c
+	ld [wCurMoveNum], a
+	ld a, b
+	ld [wCurPlayerMove], a
+	dec a
+	ld de, wPlayerMoveStruct
+	call GetMoveData
+	jr .finish_move
+
+.force_last_enemy_move
+	push hl
+	ld a, [wLastEnemyMove]
+	ld b, a
+	ld c, 0
+	ld hl, wEnemyMonMoves
+.find_enemy_move
+	ld a, [hli]
+	cp b
+	jr z, .got_enemy_move
+	inc c
+	ld a, c
+	cp NUM_MOVES
+	jr c, .find_enemy_move
+	pop hl
+	res SUBSTATUS_ENCORED, [hl]
+	xor a
+	ld [de], a
+	jr .failed
+
+.got_enemy_move
+	pop hl
+	ld a, c
+	ld [wCurEnemyMoveNum], a
+	ld a, b
+	ld [wCurEnemyMove], a
+	dec a
+	ld de, wEnemyMoveStruct
+	call GetMoveData
+
+.finish_move
+	call AnimateCurrentMove
+	ld hl, GotAnEncoreText
+	jp StdBattleTextBox
+
+.failed
+	jp PrintDidntAffect2
diff --git a/engine/battle/effect_commands/endure.asm b/engine/battle/move_effects/endure.asm
index ed4329ff5..f0555a737 100644
--- a/engine/battle/effect_commands/endure.asm
+++ b/engine/battle/move_effects/endure.asm
@@ -1,4 +1,4 @@
-BattleCommand_Endure: ; 3766f
+BattleCommand_Endure:
 ; endure
 
 ; Endure shares code with Protect. See protect.asm.
@@ -14,4 +14,3 @@ BattleCommand_Endure: ; 3766f
 
 	ld hl, BracedItselfText
 	jp StdBattleTextBox
-; 37683
diff --git a/engine/battle/move_effects/false_swipe.asm b/engine/battle/move_effects/false_swipe.asm
new file mode 100644
index 000000000..4f4eb329c
--- /dev/null
+++ b/engine/battle/move_effects/false_swipe.asm
@@ -0,0 +1,48 @@
+BattleCommand_FalseSwipe:
+; falseswipe
+
+; Makes sure wCurDamage < MonHP
+
+	ld hl, wEnemyMonHP
+	ld a, [hBattleTurn]
+	and a
+	jr z, .got_hp
+	ld hl, wBattleMonHP
+.got_hp
+	ld de, wCurDamage
+	ld c, 2
+	push hl
+	push de
+	call StringCmp
+	pop de
+	pop hl
+	jr c, .done
+
+	ld a, [hli]
+	ld [de], a
+	inc de
+	ld a, [hl]
+	dec a
+	ld [de], a
+
+	inc a
+	jr nz, .okay
+	dec de
+	ld a, [de]
+	dec a
+	ld [de], a
+.okay
+
+	ld a, [wCriticalHit]
+	cp 2
+	jr nz, .carry
+	xor a
+	ld [wCriticalHit], a
+
+.carry
+	scf
+	ret
+
+.done
+	and a
+	ret
diff --git a/engine/battle/move_effects/focus_energy.asm b/engine/battle/move_effects/focus_energy.asm
new file mode 100644
index 000000000..ffdc7b136
--- /dev/null
+++ b/engine/battle/move_effects/focus_energy.asm
@@ -0,0 +1,15 @@
+BattleCommand_FocusEnergy:
+; focusenergy
+
+	ld a, BATTLE_VARS_SUBSTATUS4
+	call GetBattleVarAddr
+	bit SUBSTATUS_FOCUS_ENERGY, [hl]
+	jr nz, .already_pumped
+	set SUBSTATUS_FOCUS_ENERGY, [hl]
+	call AnimateCurrentMove
+	ld hl, GettingPumpedText
+	jp StdBattleTextBox
+
+.already_pumped
+	call AnimateFailedMove
+	jp PrintButItFailed
diff --git a/engine/battle/effect_commands/foresight.asm b/engine/battle/move_effects/foresight.asm
index 006e3b3d7..4235e0878 100644
--- a/engine/battle/effect_commands/foresight.asm
+++ b/engine/battle/move_effects/foresight.asm
@@ -1,4 +1,4 @@
-BattleCommand_Foresight: ; 376a0
+BattleCommand_Foresight:
 ; foresight
 
 	ld a, [wAttackMissed]
@@ -19,5 +19,4 @@ BattleCommand_Foresight: ; 376a0
 	jp StdBattleTextBox
 
 .failed
-	jp FailForesight
-; 376c2
+	jp FailMove
diff --git a/engine/battle/move_effects/frustration.asm b/engine/battle/move_effects/frustration.asm
new file mode 100644
index 000000000..3d395b510
--- /dev/null
+++ b/engine/battle/move_effects/frustration.asm
@@ -0,0 +1,27 @@
+BattleCommand_FrustrationPower:
+; frustrationpower
+
+	push bc
+	ld hl, wBattleMonHappiness
+	ld a, [hBattleTurn]
+	and a
+	jr z, .got_happiness
+	ld hl, wEnemyMonHappiness
+.got_happiness
+	ld a, $ff
+	sub [hl]
+	ld [hMultiplicand + 2], a
+	xor a
+	ld [hMultiplicand + 0], a
+	ld [hMultiplicand + 1], a
+	ld a, 10
+	ld [hMultiplier], a
+	call Multiply
+	ld a, 25
+	ld [hDivisor], a
+	ld b, 4
+	call Divide
+	ld a, [hQuotient + 2]
+	ld d, a
+	pop bc
+	ret
diff --git a/engine/battle/move_effects/fury_cutter.asm b/engine/battle/move_effects/fury_cutter.asm
new file mode 100644
index 000000000..6aa6b7838
--- /dev/null
+++ b/engine/battle/move_effects/fury_cutter.asm
@@ -0,0 +1,55 @@
+BattleCommand_FuryCutter:
+; furycutter
+
+	ld hl, wPlayerFuryCutterCount
+	ld a, [hBattleTurn]
+	and a
+	jr z, .go
+	ld hl, wEnemyFuryCutterCount
+
+.go
+	ld a, [wAttackMissed]
+	and a
+	jp nz, ResetFuryCutterCount
+
+	inc [hl]
+
+; Damage capped at 5 turns' worth (16x).
+	ld a, [hl]
+	ld b, a
+	cp 6
+	jr c, .checkdouble
+	ld b, 5
+
+.checkdouble
+	dec b
+	ret z
+
+; Double the damage
+	ld hl, wCurDamage + 1
+	sla [hl]
+	dec hl
+	rl [hl]
+	jr nc, .checkdouble
+
+; No overflow
+	ld a, $ff
+	ld [hli], a
+	ld [hl], a
+	ret
+
+ResetFuryCutterCount:
+	push hl
+
+	ld hl, wPlayerFuryCutterCount
+	ld a, [hBattleTurn]
+	and a
+	jr z, .reset
+	ld hl, wEnemyFuryCutterCount
+
+.reset
+	xor a
+	ld [hl], a
+
+	pop hl
+	ret
diff --git a/engine/battle/move_effects/future_sight.asm b/engine/battle/move_effects/future_sight.asm
new file mode 100644
index 000000000..c28841b35
--- /dev/null
+++ b/engine/battle/move_effects/future_sight.asm
@@ -0,0 +1,81 @@
+BattleCommand_CheckFutureSight:
+; checkfuturesight
+
+	ld hl, wPlayerFutureSightCount
+	ld de, wPlayerFutureSightDamage
+	ld a, [hBattleTurn]
+	and a
+	jr z, .ok
+	ld hl, wEnemyFutureSightCount
+	ld de, wEnemyFutureSightDamage
+.ok
+
+	ld a, [hl]
+	and a
+	ret z
+	cp 1
+	ret nz
+
+	ld [hl], 0
+	ld a, [de]
+	inc de
+	ld [wCurDamage], a
+	ld a, [de]
+	ld [wCurDamage + 1], a
+	ld b, futuresight_command
+	jp SkipToBattleCommand
+
+BattleCommand_FutureSight:
+; futuresight
+
+	call CheckUserIsCharging
+	jr nz, .AlreadyChargingFutureSight
+	ld a, BATTLE_VARS_MOVE_ANIM
+	call GetBattleVar
+	ld b, a
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE
+	call GetBattleVarAddr
+	ld [hl], b
+	ld a, BATTLE_VARS_LAST_MOVE
+	call GetBattleVarAddr
+	ld [hl], b
+.AlreadyChargingFutureSight:
+	ld hl, wPlayerFutureSightCount
+	ld a, [hBattleTurn]
+	and a
+	jr z, .GotFutureSightCount
+	ld hl, wEnemyFutureSightCount
+.GotFutureSightCount:
+	ld a, [hl]
+	and a
+	jr nz, .failed
+	ld a, 4
+	ld [hl], a
+	call BattleCommand_LowerSub
+	call BattleCommand_MoveDelay
+	ld hl, ForesawAttackText
+	call StdBattleTextBox
+	call BattleCommand_RaiseSub
+	ld de, wPlayerFutureSightDamage
+	ld a, [hBattleTurn]
+	and a
+	jr z, .StoreDamage
+	ld de, wEnemyFutureSightDamage
+.StoreDamage:
+	ld hl, wCurDamage
+	ld a, [hl]
+	ld [de], a
+	ld [hl], 0
+	inc hl
+	inc de
+	ld a, [hl]
+	ld [de], a
+	ld [hl], 0
+	jp EndMoveEffect
+
+.failed
+	pop bc
+	call ResetDamage
+	call AnimateFailedMove
+	call PrintButItFailed
+	jp EndMoveEffect
diff --git a/engine/battle/move_effects/heal_bell.asm b/engine/battle/move_effects/heal_bell.asm
new file mode 100644
index 000000000..2570a53ba
--- /dev/null
+++ b/engine/battle/move_effects/heal_bell.asm
@@ -0,0 +1,34 @@
+BattleCommand_HealBell:
+; healbell
+
+	ld a, BATTLE_VARS_SUBSTATUS1
+	call GetBattleVarAddr
+	res SUBSTATUS_NIGHTMARE, [hl]
+	ld de, wPartyMon1Status
+	ld a, [hBattleTurn]
+	and a
+	jr z, .got_status
+	ld de, wOTPartyMon1Status
+.got_status
+	ld a, BATTLE_VARS_STATUS
+	call GetBattleVarAddr
+	xor a
+	ld [hl], a
+	ld h, d
+	ld l, e
+	ld bc, PARTYMON_STRUCT_LENGTH
+	ld d, PARTY_LENGTH
+.loop
+	ld [hl], a
+	add hl, bc
+	dec d
+	jr nz, .loop
+	call AnimateCurrentMove
+
+	ld hl, BellChimedText
+	call StdBattleTextBox
+
+	ld a, [hBattleTurn]
+	and a
+	jp z, CalcPlayerStats
+	jp CalcEnemyStats
diff --git a/engine/battle/move_effects/hidden_power.asm b/engine/battle/move_effects/hidden_power.asm
new file mode 100644
index 000000000..3b40a6c31
--- /dev/null
+++ b/engine/battle/move_effects/hidden_power.asm
@@ -0,0 +1,8 @@
+BattleCommand_HiddenPower:
+; hiddenpower
+
+	ld a, [wAttackMissed]
+	and a
+	ret nz
+	farcall HiddenPowerDamage
+	ret
diff --git a/engine/battle/move_effects/leech_seed.asm b/engine/battle/move_effects/leech_seed.asm
new file mode 100644
index 000000000..5602e7f62
--- /dev/null
+++ b/engine/battle/move_effects/leech_seed.asm
@@ -0,0 +1,40 @@
+BattleCommand_LeechSeed:
+; leechseed
+	ld a, [wAttackMissed]
+	and a
+	jr nz, .evaded
+	call CheckSubstituteOpp
+	jr nz, .evaded
+
+	ld de, wEnemyMonType1
+	ld a, [hBattleTurn]
+	and a
+	jr z, .ok
+	ld de, wBattleMonType1
+.ok
+
+	ld a, [de]
+	cp GRASS
+	jr z, .grass
+	inc de
+	ld a, [de]
+	cp GRASS
+	jr z, .grass
+
+	ld a, BATTLE_VARS_SUBSTATUS4_OPP
+	call GetBattleVarAddr
+	bit SUBSTATUS_LEECH_SEED, [hl]
+	jr nz, .evaded
+	set SUBSTATUS_LEECH_SEED, [hl]
+	call AnimateCurrentMove
+	ld hl, WasSeededText
+	jp StdBattleTextBox
+
+.grass
+	call AnimateFailedMove
+	jp PrintDoesntAffect
+
+.evaded
+	call AnimateFailedMove
+	ld hl, EvadedText
+	jp StdBattleTextBox
diff --git a/engine/battle/move_effects/lock_on.asm b/engine/battle/move_effects/lock_on.asm
new file mode 100644
index 000000000..7dc4a013d
--- /dev/null
+++ b/engine/battle/move_effects/lock_on.asm
@@ -0,0 +1,21 @@
+BattleCommand_LockOn:
+; lockon
+
+	call CheckSubstituteOpp
+	jr nz, .fail
+
+	ld a, [wAttackMissed]
+	and a
+	jr nz, .fail
+
+	ld a, BATTLE_VARS_SUBSTATUS5_OPP
+	call GetBattleVarAddr
+	set SUBSTATUS_LOCK_ON, [hl]
+	call AnimateCurrentMove
+
+	ld hl, TookAimText
+	jp StdBattleTextBox
+
+.fail
+	call AnimateFailedMove
+	jp PrintDidntAffect
diff --git a/engine/battle/move_effects/magnitude.asm b/engine/battle/move_effects/magnitude.asm
new file mode 100644
index 000000000..4dcf919d7
--- /dev/null
+++ b/engine/battle/move_effects/magnitude.asm
@@ -0,0 +1,29 @@
+BattleCommand_GetMagnitude:
+; getmagnitude
+
+	push bc
+	call BattleRandom
+	ld b, a
+	ld hl, MagnitudePower
+.loop
+	ld a, [hli]
+	cp b
+	jr nc, .ok
+	inc hl
+	inc hl
+	jr .loop
+
+.ok
+	ld d, [hl]
+	push de
+	inc hl
+	ld a, [hl]
+	ld [wTypeMatchup], a
+	call BattleCommand_MoveDelay
+	ld hl, MagnitudeText
+	call StdBattleTextBox
+	pop de
+	pop bc
+	ret
+
+INCLUDE "data/moves/magnitude_power.asm"
diff --git a/engine/battle/effect_commands/metronome.asm b/engine/battle/move_effects/metronome.asm
index 1908df84d..25197d7cd 100644
--- a/engine/battle/effect_commands/metronome.asm
+++ b/engine/battle/move_effects/metronome.asm
@@ -1,4 +1,4 @@
-BattleCommand_Metronome: ; 37418
+BattleCommand_Metronome:
 ; metronome
 
 	call ClearLastMove
@@ -34,28 +34,10 @@ BattleCommand_Metronome: ; 37418
 	call CheckUserMove
 	jr z, .GetMove
 
-
 	ld a, BATTLE_VARS_MOVE
 	call GetBattleVarAddr
 	ld [hl], b
 	call UpdateMoveData
 	jp ResetTurn
-; 37454
-
-
-MetronomeExcepts: ; 37454
-	db NO_MOVE
-	db METRONOME
-	db STRUGGLE
-	db SKETCH
-	db MIMIC
-	db COUNTER
-	db MIRROR_COAT
-	db PROTECT
-	db DETECT
-	db ENDURE
-	db DESTINY_BOND
-	db SLEEP_TALK
-	db THIEF
-	db -1
-; 37462
+
+INCLUDE "data/moves/metronome_exception_moves.asm"
diff --git a/engine/battle/move_effects/mimic.asm b/engine/battle/move_effects/mimic.asm
new file mode 100644
index 000000000..b1c6608fa
--- /dev/null
+++ b/engine/battle/move_effects/mimic.asm
@@ -0,0 +1,50 @@
+BattleCommand_Mimic:
+; mimic
+
+	call ClearLastMove
+	call BattleCommand_MoveDelay
+	ld a, [wAttackMissed]
+	and a
+	jr nz, .fail
+	ld hl, wBattleMonMoves
+	ld a, [hBattleTurn]
+	and a
+	jr z, .player_turn
+	ld hl, wEnemyMonMoves
+.player_turn
+	call CheckHiddenOpponent
+	jr nz, .fail
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
+	call GetBattleVar
+	and a
+	jr z, .fail
+	cp STRUGGLE
+	jr z, .fail
+	ld b, a
+	ld c, NUM_MOVES
+.check_already_knows_move
+	ld a, [hli]
+	cp b
+	jr z, .fail
+	dec c
+	jr nz, .check_already_knows_move
+	dec hl
+.find_mimic
+	ld a, [hld]
+	cp MIMIC
+	jr nz, .find_mimic
+	inc hl
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
+	call GetBattleVar
+	ld [hl], a
+	ld [wNamedObjectIndexBuffer], a
+	ld bc, wBattleMonPP - wBattleMonMoves
+	add hl, bc
+	ld [hl], 5
+	call GetMoveName
+	call AnimateCurrentMove
+	ld hl, LearnedMoveText
+	jp StdBattleTextBox
+
+.fail
+	jp FailMimic
diff --git a/engine/battle/move_effects/mirror_coat.asm b/engine/battle/move_effects/mirror_coat.asm
new file mode 100644
index 000000000..fb3a30d58
--- /dev/null
+++ b/engine/battle/move_effects/mirror_coat.asm
@@ -0,0 +1,60 @@
+BattleCommand_MirrorCoat:
+; mirrorcoat
+
+	ld a, 1
+	ld [wAttackMissed], a
+
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
+	call GetBattleVar
+	and a
+	ret z
+
+	ld b, a
+	callfar GetMoveEffect
+	ld a, b
+	cp EFFECT_MIRROR_COAT
+	ret z
+
+	call BattleCommand_ResetTypeMatchup
+	ld a, [wTypeMatchup]
+	and a
+	ret z
+
+	call CheckOpponentWentFirst
+	ret z
+
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
+	call GetBattleVar
+	dec a
+	ld de, wStringBuffer1
+	call GetMoveData
+
+	ld a, [wStringBuffer1 + 2]
+	and a
+	ret z
+
+	ld a, [wStringBuffer1 + 3]
+	cp SPECIAL
+	ret c
+
+	; BUG: Move should fail with all non-damaging battle actions
+	ld hl, wCurDamage
+	ld a, [hli]
+	or [hl]
+	ret z
+
+	ld a, [hl]
+	add a
+	ld [hld], a
+	ld a, [hl]
+	adc a
+	ld [hl], a
+	jr nc, .capped
+	ld a, $ff
+	ld [hli], a
+	ld [hl], a
+.capped
+
+	xor a
+	ld [wAttackMissed], a
+	ret
diff --git a/engine/battle/effect_commands/mirror_move.asm b/engine/battle/move_effects/mirror_move.asm
index c4f208d77..089403839 100644
--- a/engine/battle/effect_commands/mirror_move.asm
+++ b/engine/battle/move_effects/mirror_move.asm
@@ -1,4 +1,4 @@
-BattleCommand_MirrorMove: ; 373c9
+BattleCommand_MirrorMove:
 ; mirrormove
 
 	call ClearLastMove
@@ -49,4 +49,3 @@ BattleCommand_MirrorMove: ; 373c9
 .done
 	call BattleCommand_MoveDelay
 	jp ResetTurn
-; 37418
diff --git a/engine/battle/move_effects/mist.asm b/engine/battle/move_effects/mist.asm
new file mode 100644
index 000000000..199a30045
--- /dev/null
+++ b/engine/battle/move_effects/mist.asm
@@ -0,0 +1,15 @@
+BattleCommand_Mist:
+; mist
+
+	ld a, BATTLE_VARS_SUBSTATUS4
+	call GetBattleVarAddr
+	bit SUBSTATUS_MIST, [hl]
+	jr nz, .already_mist
+	set SUBSTATUS_MIST, [hl]
+	call AnimateCurrentMove
+	ld hl, MistText
+	jp StdBattleTextBox
+
+.already_mist
+	call AnimateFailedMove
+	jp PrintButItFailed
diff --git a/engine/battle/effect_commands/nightmare.asm b/engine/battle/move_effects/nightmare.asm
index 788e3de41..dd85c722d 100644
--- a/engine/battle/effect_commands/nightmare.asm
+++ b/engine/battle/move_effects/nightmare.asm
@@ -1,4 +1,4 @@
-BattleCommand_Nightmare: ; 37536
+BattleCommand_Nightmare:
 ; nightmare
 
 ; Can't hit an absent opponent.
@@ -35,4 +35,3 @@ BattleCommand_Nightmare: ; 37536
 .failed
 	call AnimateFailedMove
 	jp PrintButItFailed
-; 37563
diff --git a/engine/battle/move_effects/pain_split.asm b/engine/battle/move_effects/pain_split.asm
new file mode 100644
index 000000000..4e4380b23
--- /dev/null
+++ b/engine/battle/move_effects/pain_split.asm
@@ -0,0 +1,93 @@
+BattleCommand_PainSplit:
+; painsplit
+
+	ld a, [wAttackMissed]
+	and a
+	jp nz, .ButItFailed
+	call CheckSubstituteOpp
+	jp nz, .ButItFailed
+	call AnimateCurrentMove
+	ld hl, wBattleMonMaxHP + 1
+	ld de, wEnemyMonMaxHP + 1
+	call .PlayerShareHP
+	ld a, $1
+	ld [wWhichHPBar], a
+	hlcoord 10, 9
+	predef AnimateHPBar
+	ld hl, wEnemyMonHP
+	ld a, [hli]
+	ld [wBuffer4], a
+	ld a, [hli]
+	ld [wBuffer3], a
+	ld a, [hli]
+	ld [wBuffer2], a
+	ld a, [hl]
+	ld [wBuffer1], a
+	call .EnemyShareHP
+	xor a
+	ld [wWhichHPBar], a
+	call ResetDamage
+	hlcoord 2, 2
+	predef AnimateHPBar
+	farcall _UpdateBattleHUDs
+
+	ld hl, SharedPainText
+	jp StdBattleTextBox
+
+.PlayerShareHP:
+	ld a, [hld]
+	ld [wBuffer1], a
+	ld a, [hld]
+	ld [wBuffer2], a
+	ld a, [hld]
+	ld b, a
+	ld [wBuffer3], a
+	ld a, [hl]
+	ld [wBuffer4], a
+	dec de
+	dec de
+	ld a, [de]
+	dec de
+	add b
+	ld [wCurDamage + 1], a
+	ld b, [hl]
+	ld a, [de]
+	adc b
+	srl a
+	ld [wCurDamage], a
+	ld a, [wCurDamage + 1]
+	rr a
+	ld [wCurDamage + 1], a
+	inc hl
+	inc hl
+	inc hl
+	inc de
+	inc de
+	inc de
+
+.EnemyShareHP:
+	ld c, [hl]
+	dec hl
+	ld a, [wCurDamage + 1]
+	sub c
+	ld b, [hl]
+	dec hl
+	ld a, [wCurDamage]
+	sbc b
+	jr nc, .skip
+
+	ld a, [wCurDamage]
+	ld b, a
+	ld a, [wCurDamage + 1]
+	ld c, a
+.skip
+	ld a, c
+	ld [hld], a
+	ld [wBuffer5], a
+	ld a, b
+	ld [hli], a
+	ld [wBuffer6], a
+	ret
+
+.ButItFailed:
+	jp PrintDidntAffect2
diff --git a/engine/battle/move_effects/pay_day.asm b/engine/battle/move_effects/pay_day.asm
new file mode 100644
index 000000000..ba1dce884
--- /dev/null
+++ b/engine/battle/move_effects/pay_day.asm
@@ -0,0 +1,26 @@
+BattleCommand_PayDay:
+; payday
+
+	xor a
+	ld hl, wStringBuffer1
+	ld [hli], a
+
+	ld a, [hBattleTurn]
+	and a
+	ld a, [wBattleMonLevel]
+	jr z, .ok
+	ld a, [wEnemyMonLevel]
+.ok
+
+	add a
+	ld hl, wPayDayMoney + 2
+	add [hl]
+	ld [hld], a
+	jr nc, .done
+	inc [hl]
+	dec hl
+	jr nz, .done
+	inc [hl]
+.done
+	ld hl, CoinsScatteredText
+	jp StdBattleTextBox
diff --git a/engine/battle/effect_commands/perish_song.asm b/engine/battle/move_effects/perish_song.asm
index 8c88c8739..4df52cc1c 100644
--- a/engine/battle/effect_commands/perish_song.asm
+++ b/engine/battle/move_effects/perish_song.asm
@@ -1,7 +1,6 @@
-BattleCommand_PerishSong: ; 376c2
+BattleCommand_PerishSong:
 ; perishsong
 
-
 	ld hl, wPlayerSubStatus1
 	ld de, wEnemySubStatus1
 	bit SUBSTATUS_PERISH, [hl]
@@ -37,4 +36,3 @@ BattleCommand_PerishSong: ; 376c2
 .failed
 	call AnimateFailedMove
 	jp PrintButItFailed
-; 376f8
diff --git a/engine/battle/effect_commands/present.asm b/engine/battle/move_effects/present.asm
index f0cf8006d..f0949558f 100755..100644
--- a/engine/battle/effect_commands/present.asm
+++ b/engine/battle/move_effects/present.asm
@@ -1,4 +1,4 @@
-BattleCommand_Present: ; 37874
+BattleCommand_Present:
 ; present
 
 	ld a, [wLinkMode]
@@ -27,17 +27,17 @@ BattleCommand_Present: ; 37874
 	push bc
 	call BattleRandom
 	ld b, a
-	ld hl, .PresentPower
+	ld hl, PresentPower
 	ld c, 0
 .next
 	ld a, [hli]
 	cp -1
-	jr z, .heal_effect ; 378a4 $11
+	jr z, .heal_effect
 	cp b
-	jr nc, .got_power ; 378a7 $4
+	jr nc, .got_power
 	inc c
 	inc hl
-	jr .next ; 378ab $f4
+	jr .next
 
 .got_power
 	ld a, c
@@ -49,19 +49,19 @@ BattleCommand_Present: ; 37874
 
 .heal_effect
 	pop bc
-	ld a, $3
+	ld a, 3
 	ld [wPresentPower], a
 	call AnimateCurrentMove
 	call BattleCommand_SwitchTurn
 	ld hl, AICheckPlayerMaxHP
 	ld a, [hBattleTurn]
 	and a
-	jr z, .got_hp_fn_pointer ; 378c9 $3
+	jr z, .got_hp_fn_pointer
 	ld hl, AICheckEnemyMaxHP
 .got_hp_fn_pointer
 	ld a, BANK(AICheckPlayerMaxHP)
 	rst FarCall
-	jr c, .already_fully_healed ; 378d1 $20
+	jr c, .already_fully_healed
 
 	ld hl, GetQuarterMaxHP
 	call CallBattleCore
@@ -73,21 +73,16 @@ BattleCommand_Present: ; 37874
 	call StdBattleTextBox
 	call BattleCommand_SwitchTurn
 	call UpdateOpponentInParty
-	jr .do_animation ; 378f1 $11
+	jr .do_animation
 
 .already_fully_healed
 	call BattleCommand_SwitchTurn
 	call _CheckBattleScene
-	jr nc, .do_animation ; 378f9 $9
+	jr nc, .do_animation
 	call AnimateFailedMove
 	ld hl, RefusedGiftText
 	call StdBattleTextBox
 .do_animation
 	jp EndMoveEffect
 
-.PresentPower:
-	db 40 percent,     40
-	db 70 percent + 1, 80
-	db 80 percent,    120
-	db -1 ; end
-; 3790e
+INCLUDE "data/moves/present_power.asm"
diff --git a/engine/battle/effect_commands/protect.asm b/engine/battle/move_effects/protect.asm
index 6c65e0ed1..9025d2f4b 100644
--- a/engine/battle/effect_commands/protect.asm
+++ b/engine/battle/move_effects/protect.asm
@@ -1,4 +1,4 @@
-BattleCommand_Protect: ; 37618
+BattleCommand_Protect:
 ; protect
 	call ProtectChance
 	ret c
@@ -11,11 +11,8 @@ BattleCommand_Protect: ; 37618
 
 	ld hl, ProtectedItselfText
 	jp StdBattleTextBox
-; 3762c
-
-
-ProtectChance: ; 3762c
 
+ProtectChance:
 	ld de, wPlayerProtectCount
 	ld a, [hBattleTurn]
 	and a
@@ -69,7 +66,6 @@ ProtectChance: ; 3762c
 	and a
 	ret
 
-
 .failed
 	xor a
 	ld [de], a
@@ -77,4 +73,3 @@ ProtectChance: ; 3762c
 	call PrintButItFailed
 	scf
 	ret
-; 3766f
diff --git a/engine/battle/move_effects/psych_up.asm b/engine/battle/move_effects/psych_up.asm
new file mode 100644
index 000000000..02fdef5d2
--- /dev/null
+++ b/engine/battle/move_effects/psych_up.asm
@@ -0,0 +1,49 @@
+BattleCommand_PsychUp:
+; psychup
+
+	ld hl, wEnemyStatLevels
+	ld de, wPlayerStatLevels
+	ld a, [hBattleTurn]
+	and a
+	jr z, .pointers_correct
+; It's the enemy's turn, so swap the pointers.
+	push hl
+	ld h, d
+	ld l, e
+	pop de
+.pointers_correct
+	push hl
+	ld b, NUM_LEVEL_STATS
+; If any of the enemy's stats is modified from its base level,
+; the move succeeds.  Otherwise, it fails.
+.loop
+	ld a, [hli]
+	cp BASE_STAT_LEVEL
+	jr nz, .break
+	dec b
+	jr nz, .loop
+	pop hl
+	call AnimateFailedMove
+	jp PrintButItFailed
+
+.break
+	pop hl
+	ld b, NUM_LEVEL_STATS
+.loop2
+	ld a, [hli]
+	ld [de], a
+	inc de
+	dec b
+	jr nz, .loop2
+	ld a, [hBattleTurn]
+	and a
+	jr nz, .calc_enemy_stats
+	call CalcPlayerStats
+	jr .merge
+
+.calc_enemy_stats
+	call CalcEnemyStats
+.merge
+	call AnimateCurrentMove
+	ld hl, CopiedStatsText
+	jp StdBattleTextBox
diff --git a/engine/battle/move_effects/pursuit.asm b/engine/battle/move_effects/pursuit.asm
new file mode 100644
index 000000000..18c358144
--- /dev/null
+++ b/engine/battle/move_effects/pursuit.asm
@@ -0,0 +1,24 @@
+BattleCommand_Pursuit:
+; pursuit
+; Double damage if the opponent is switching.
+
+	ld hl, wEnemyIsSwitching
+	ld a, [hBattleTurn]
+	and a
+	jr z, .ok
+	ld hl, wPlayerIsSwitching
+.ok
+	ld a, [hl]
+	and a
+	ret z
+
+	ld hl, wCurDamage + 1
+	sla [hl]
+	dec hl
+	rl [hl]
+	ret nc
+
+	ld a, $ff
+	ld [hli], a
+	ld [hl], a
+	ret
diff --git a/engine/battle/move_effects/rage.asm b/engine/battle/move_effects/rage.asm
new file mode 100644
index 000000000..df206a6bf
--- /dev/null
+++ b/engine/battle/move_effects/rage.asm
@@ -0,0 +1,6 @@
+BattleCommand_Rage:
+; rage
+	ld a, BATTLE_VARS_SUBSTATUS4
+	call GetBattleVarAddr
+	set SUBSTATUS_RAGE, [hl]
+	ret
diff --git a/engine/battle/move_effects/rain_dance.asm b/engine/battle/move_effects/rain_dance.asm
new file mode 100644
index 000000000..e9ef5d123
--- /dev/null
+++ b/engine/battle/move_effects/rain_dance.asm
@@ -0,0 +1,9 @@
+BattleCommand_StartRain:
+; startrain
+	ld a, WEATHER_RAIN
+	ld [wBattleWeather], a
+	ld a, 5
+	ld [wWeatherCount], a
+	call AnimateCurrentMove
+	ld hl, DownpourText
+	jp StdBattleTextBox
diff --git a/engine/battle/move_effects/rapid_spin.asm b/engine/battle/move_effects/rapid_spin.asm
new file mode 100644
index 000000000..0dc8b7de2
--- /dev/null
+++ b/engine/battle/move_effects/rapid_spin.asm
@@ -0,0 +1,36 @@
+BattleCommand_ClearHazards:
+; clearhazards
+
+	ld a, BATTLE_VARS_SUBSTATUS4
+	call GetBattleVarAddr
+	bit SUBSTATUS_LEECH_SEED, [hl]
+	jr z, .not_leeched
+	res SUBSTATUS_LEECH_SEED, [hl]
+	ld hl, ShedLeechSeedText
+	call StdBattleTextBox
+.not_leeched
+
+	ld hl, wPlayerScreens
+	ld de, wPlayerWrapCount
+	ld a, [hBattleTurn]
+	and a
+	jr z, .got_screens_wrap
+	ld hl, wEnemyScreens
+	ld de, wEnemyWrapCount
+.got_screens_wrap
+	bit SCREENS_SPIKES, [hl]
+	jr z, .no_spikes
+	res SCREENS_SPIKES, [hl]
+	ld hl, BlewSpikesText
+	push de
+	call StdBattleTextBox
+	pop de
+.no_spikes
+
+	ld a, [de]
+	and a
+	ret z
+	xor a
+	ld [de], a
+	ld hl, ReleasedByText
+	jp StdBattleTextBox
diff --git a/engine/battle/move_effects/return.asm b/engine/battle/move_effects/return.asm
new file mode 100644
index 000000000..d3071d23a
--- /dev/null
+++ b/engine/battle/move_effects/return.asm
@@ -0,0 +1,25 @@
+BattleCommand_HappinessPower:
+; happinesspower
+	push bc
+	ld hl, wBattleMonHappiness
+	ld a, [hBattleTurn]
+	and a
+	jr z, .ok
+	ld hl, wEnemyMonHappiness
+.ok
+	xor a
+	ld [hMultiplicand + 0], a
+	ld [hMultiplicand + 1], a
+	ld a, [hl]
+	ld [hMultiplicand + 2], a
+	ld a, 10
+	ld [hMultiplier], a
+	call Multiply
+	ld a, 25
+	ld [hDivisor], a
+	ld b, 4
+	call Divide
+	ld a, [hQuotient + 2]
+	ld d, a
+	pop bc
+	ret
diff --git a/engine/battle/effect_commands/rollout.asm b/engine/battle/move_effects/rollout.asm
index f6966c48a..de4bfcaa6 100644
--- a/engine/battle/effect_commands/rollout.asm
+++ b/engine/battle/move_effects/rollout.asm
@@ -1,7 +1,6 @@
 MAX_ROLLOUT_COUNT EQU 5
 
-
-BattleCommand_CheckCurl: ; 37718
+BattleCommand_CheckCurl:
 ; checkcurl
 
 	ld de, wPlayerRolloutCount
@@ -22,10 +21,8 @@ BattleCommand_CheckCurl: ; 37718
 	xor a
 	ld [de], a
 	ret
-; 37734
-
 
-BattleCommand_RolloutPower: ; 37734
+BattleCommand_RolloutPower:
 ; rolloutpower
 
 	ld a, BATTLE_VARS_STATUS
@@ -96,4 +93,3 @@ BattleCommand_RolloutPower: ; 37734
 
 .done_damage
 	ret
-; 37791
diff --git a/engine/battle/move_effects/safeguard.asm b/engine/battle/move_effects/safeguard.asm
new file mode 100644
index 000000000..a926bdccc
--- /dev/null
+++ b/engine/battle/move_effects/safeguard.asm
@@ -0,0 +1,23 @@
+BattleCommand_Safeguard:
+; safeguard
+
+	ld hl, wPlayerScreens
+	ld de, wPlayerSafeguardCount
+	ld a, [hBattleTurn]
+	and a
+	jr z, .ok
+	ld hl, wEnemyScreens
+	ld de, wEnemySafeguardCount
+.ok
+	bit SCREENS_SAFEGUARD, [hl]
+	jr nz, .failed
+	set SCREENS_SAFEGUARD, [hl]
+	ld a, 5
+	ld [de], a
+	call AnimateCurrentMove
+	ld hl, CoveredByVeilText
+	jp StdBattleTextBox
+
+.failed
+	call AnimateFailedMove
+	jp PrintButItFailed
diff --git a/engine/battle/effect_commands/sandstorm.asm b/engine/battle/move_effects/sandstorm.asm
index 5aaa61deb..77d6e24b5 100644
--- a/engine/battle/effect_commands/sandstorm.asm
+++ b/engine/battle/move_effects/sandstorm.asm
@@ -1,4 +1,4 @@
-BattleCommand_StartSandstorm: ; 376f8
+BattleCommand_StartSandstorm:
 ; startsandstorm
 
 	ld a, [wBattleWeather]
@@ -16,4 +16,3 @@ BattleCommand_StartSandstorm: ; 376f8
 .failed
 	call AnimateFailedMove
 	jp PrintButItFailed
-; 37718
diff --git a/engine/battle/move_effects/selfdestruct.asm b/engine/battle/move_effects/selfdestruct.asm
new file mode 100644
index 000000000..d6eeac484
--- /dev/null
+++ b/engine/battle/move_effects/selfdestruct.asm
@@ -0,0 +1,29 @@
+BattleCommand_Selfdestruct:
+	farcall StubbedTrainerRankings_Selfdestruct
+	ld a, BATTLEANIM_PLAYER_DAMAGE
+	ld [wNumHits], a
+	ld c, 3
+	call DelayFrames
+	ld a, BATTLE_VARS_STATUS
+	call GetBattleVarAddr
+	xor a
+	ld [hli], a
+	inc hl
+	ld [hli], a
+	ld [hl], a
+	ld a, $1
+	ld [wKickCounter], a
+	call BattleCommand_LowerSub
+	call LoadMoveAnim
+	ld a, BATTLE_VARS_SUBSTATUS4
+	call GetBattleVarAddr
+	res SUBSTATUS_LEECH_SEED, [hl]
+	ld a, BATTLE_VARS_SUBSTATUS5_OPP
+	call GetBattleVarAddr
+	res SUBSTATUS_DESTINY_BOND, [hl]
+	call _CheckBattleScene
+	ret nc
+	farcall DrawPlayerHUD
+	farcall DrawEnemyHUD
+	call WaitBGMap
+	jp RefreshBattleHuds
diff --git a/engine/battle/move_effects/sketch.asm b/engine/battle/move_effects/sketch.asm
new file mode 100644
index 000000000..4c15dbe02
--- /dev/null
+++ b/engine/battle/move_effects/sketch.asm
@@ -0,0 +1,117 @@
+BattleCommand_Sketch:
+; sketch
+
+	call ClearLastMove
+; Don't sketch during a link battle
+	ld a, [wLinkMode]
+	and a
+	jr z, .not_linked
+	call AnimateFailedMove
+	jp PrintNothingHappened
+
+.not_linked
+; If the opponent has a substitute up, fail.
+	call CheckSubstituteOpp
+	jp nz, .fail
+; If the opponent is transformed, fail.
+	ld a, BATTLE_VARS_SUBSTATUS5_OPP
+	call GetBattleVarAddr
+	bit SUBSTATUS_TRANSFORMED, [hl]
+	jp nz, .fail
+; Get the user's moveset in its party struct.
+; This move replacement shall be permanent.
+; Pointer will be in de.
+	ld a, MON_MOVES
+	call UserPartyAttr
+	ld d, h
+	ld e, l
+; Get the battle move structs.
+	ld hl, wBattleMonMoves
+	ld a, [hBattleTurn]
+	and a
+	jr z, .get_last_move
+	ld hl, wEnemyMonMoves
+.get_last_move
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
+	call GetBattleVar
+	ld [wTypeMatchup], a
+	ld b, a
+; Fail if move is invalid or is Struggle.
+	and a
+	jr z, .fail
+	cp STRUGGLE
+	jr z, .fail
+; Fail if user already knows that move
+	ld c, NUM_MOVES
+.does_user_already_know_move
+	ld a, [hli]
+	cp b
+	jr z, .fail
+	dec c
+	jr nz, .does_user_already_know_move
+; Find Sketch in the user's moveset.
+; Pointer in hl, and index in c.
+	dec hl
+	ld c, NUM_MOVES
+.find_sketch
+	dec c
+	ld a, [hld]
+	cp SKETCH
+	jr nz, .find_sketch
+	inc hl
+; The Sketched move is loaded to that slot.
+	ld a, b
+	ld [hl], a
+; Copy the base PP from that move.
+	push bc
+	push hl
+	dec a
+	ld hl, Moves + MOVE_PP
+	call GetMoveAttr
+	pop hl
+	ld bc, wBattleMonPP - wBattleMonMoves
+	add hl, bc
+	ld [hl], a
+	pop bc
+
+	ld a, [hBattleTurn]
+	and a
+	jr z, .user_trainer
+	ld a, [wBattleMode]
+	dec a
+	jr nz, .user_trainer
+; wildmon
+	ld a, [hl]
+	push bc
+	ld hl, wWildMonPP
+	ld b, 0
+	add hl, bc
+	ld [hl], a
+	ld hl, wWildMonMoves
+	add hl, bc
+	pop bc
+	ld [hl], b
+	jr .done_copy
+
+.user_trainer
+	ld a, [hl]
+	push af
+	ld l, c
+	ld h, 0
+	add hl, de
+	ld a, b
+	ld [hl], a
+	pop af
+	ld de, MON_PP - MON_MOVES
+	add hl, de
+	ld [hl], a
+.done_copy
+	call GetMoveName
+	call AnimateCurrentMove
+
+	ld hl, SketchedText
+	jp StdBattleTextBox
+
+.fail
+	call AnimateFailedMove
+	jp PrintDidntAffect
diff --git a/engine/battle/move_effects/sleep_talk.asm b/engine/battle/move_effects/sleep_talk.asm
new file mode 100644
index 000000000..ae2d252b7
--- /dev/null
+++ b/engine/battle/move_effects/sleep_talk.asm
@@ -0,0 +1,143 @@
+BattleCommand_SleepTalk:
+; sleeptalk
+
+	call ClearLastMove
+	ld a, [wAttackMissed]
+	and a
+	jr nz, .fail
+	ld a, [hBattleTurn]
+	and a
+	ld hl, wBattleMonMoves + 1
+	ld a, [wDisabledMove]
+	ld d, a
+	jr z, .got_moves
+	ld hl, wEnemyMonMoves + 1
+	ld a, [wEnemyDisabledMove]
+	ld d, a
+.got_moves
+	ld a, BATTLE_VARS_STATUS
+	call GetBattleVar
+	and SLP
+	jr z, .fail
+	ld a, [hl]
+	and a
+	jr z, .fail
+	call .safely_check_has_usable_move
+	jr c, .fail
+	dec hl
+.sample_move
+	push hl
+	call BattleRandom
+	maskbits NUM_MOVES
+	ld c, a
+	ld b, 0
+	add hl, bc
+	ld a, [hl]
+	pop hl
+	and a
+	jr z, .sample_move
+	ld e, a
+	ld a, BATTLE_VARS_MOVE_ANIM
+	call GetBattleVar
+	cp e
+	jr z, .sample_move
+	ld a, e
+	cp d
+	jr z, .sample_move
+	call .check_two_turn_move
+	jr z, .sample_move
+	ld a, BATTLE_VARS_MOVE
+	call GetBattleVarAddr
+	ld a, e
+	ld [hl], a
+	call CheckUserIsCharging
+	jr nz, .charging
+	ld a, [wKickCounter]
+	push af
+	call BattleCommand_LowerSub
+	pop af
+	ld [wKickCounter], a
+.charging
+	call LoadMoveAnim
+	call UpdateMoveData
+	jp ResetTurn
+
+.fail
+	call AnimateFailedMove
+	jp TryPrintButItFailed
+
+.safely_check_has_usable_move
+	push hl
+	push de
+	push bc
+	call .check_has_usable_move
+	pop bc
+	pop de
+	pop hl
+	ret
+
+.check_has_usable_move
+	ld a, [hBattleTurn]
+	and a
+	ld a, [wDisabledMove]
+	jr z, .got_move_2
+
+	ld a, [wEnemyDisabledMove]
+.got_move_2
+	ld b, a
+	ld a, BATTLE_VARS_MOVE
+	call GetBattleVar
+	ld c, a
+	dec hl
+	ld d, NUM_MOVES
+.loop2
+	ld a, [hl]
+	and a
+	jr z, .carry
+
+	cp c
+	jr z, .nope
+	cp b
+	jr z, .nope
+
+	call .check_two_turn_move
+	jr nz, .no_carry
+
+.nope
+	inc hl
+	dec d
+	jr nz, .loop2
+
+.carry
+	scf
+	ret
+
+.no_carry
+	and a
+	ret
+
+.check_two_turn_move
+	push hl
+	push de
+	push bc
+
+	ld b, a
+	callfar GetMoveEffect
+	ld a, b
+
+	pop bc
+	pop de
+	pop hl
+
+	cp EFFECT_SKULL_BASH
+	ret z
+	cp EFFECT_RAZOR_WIND
+	ret z
+	cp EFFECT_SKY_ATTACK
+	ret z
+	cp EFFECT_SOLARBEAM
+	ret z
+	cp EFFECT_FLY
+	ret z
+	cp EFFECT_BIDE
+	ret
diff --git a/engine/battle/move_effects/snore.asm b/engine/battle/move_effects/snore.asm
new file mode 100644
index 000000000..e2432c59f
--- /dev/null
+++ b/engine/battle/move_effects/snore.asm
@@ -0,0 +1,11 @@
+BattleCommand_Snore:
+; snore
+	ld a, BATTLE_VARS_STATUS
+	call GetBattleVar
+	and SLP
+	ret nz
+	call ResetDamage
+	ld a, $1
+	ld [wAttackMissed], a
+	call FailMove
+	jp EndMoveEffect
diff --git a/engine/battle/effect_commands/spikes.asm b/engine/battle/move_effects/spikes.asm
index a5e22a706..1eca7ae53 100644
--- a/engine/battle/effect_commands/spikes.asm
+++ b/engine/battle/move_effects/spikes.asm
@@ -1,4 +1,4 @@
-BattleCommand_Spikes: ; 37683
+BattleCommand_Spikes:
 ; spikes
 
 	ld hl, wEnemyScreens
@@ -23,5 +23,4 @@ BattleCommand_Spikes: ; 37683
 	jp StdBattleTextBox
 
 .failed
-	jp FailSpikes
-; 376a0
+	jp FailMove
diff --git a/engine/battle/move_effects/spite.asm b/engine/battle/move_effects/spite.asm
new file mode 100644
index 000000000..8aba187a4
--- /dev/null
+++ b/engine/battle/move_effects/spite.asm
@@ -0,0 +1,86 @@
+BattleCommand_Spite:
+; spite
+
+	ld a, [wAttackMissed]
+	and a
+	jp nz, .failed
+	ld bc, PARTYMON_STRUCT_LENGTH ; ????
+	ld hl, wEnemyMonMoves
+	ld a, [hBattleTurn]
+	and a
+	jr z, .got_moves
+	ld hl, wBattleMonMoves
+.got_moves
+	ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
+	call GetBattleVar
+	and a
+	jr z, .failed
+	cp STRUGGLE
+	jr z, .failed
+	ld b, a
+	ld c, -1
+.loop
+	inc c
+	ld a, [hli]
+	cp b
+	jr nz, .loop
+	ld [wTypeMatchup], a
+	dec hl
+	ld b, 0
+	push bc
+	ld c, wBattleMonPP - wBattleMonMoves
+	add hl, bc
+	pop bc
+	ld a, [hl]
+	and PP_MASK
+	jr z, .failed
+	push bc
+	call GetMoveName
+	; lose 2-5 PP
+	call BattleRandom
+	and %11
+	inc a
+	inc a
+	ld b, a
+	ld a, [hl]
+	and PP_MASK
+	cp b
+	jr nc, .deplete_pp
+	ld b, a
+.deplete_pp
+	ld a, [hl]
+	sub b
+	ld [hl], a
+	push af
+	ld a, MON_PP
+	call OpponentPartyAttr
+	ld d, b
+	pop af
+	pop bc
+	add hl, bc
+	ld e, a
+	ld a, BATTLE_VARS_SUBSTATUS5_OPP
+	call GetBattleVar
+	bit SUBSTATUS_TRANSFORMED, a
+	jr nz, .transformed
+	ld a, [hBattleTurn]
+	and a
+	jr nz, .not_wildmon
+	ld a, [wBattleMode]
+	dec a
+	jr nz, .not_wildmon
+	ld hl, wWildMonPP
+	add hl, bc
+.not_wildmon
+	ld [hl], e
+.transformed
+	push de
+	call AnimateCurrentMove
+	pop de
+	ld a, d
+	ld [wTypeMatchup], a
+	ld hl, SpiteEffectText
+	jp StdBattleTextBox
+
+.failed
+	jp PrintDidntAffect2
diff --git a/engine/battle/move_effects/splash.asm b/engine/battle/move_effects/splash.asm
new file mode 100644
index 000000000..493ea8ca6
--- /dev/null
+++ b/engine/battle/move_effects/splash.asm
@@ -0,0 +1,4 @@
+BattleCommand_Splash:
+	call AnimateCurrentMove
+	farcall StubbedTrainerRankings_Splash
+	jp PrintNothingHappened
diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm
new file mode 100644
index 000000000..8f14bc315
--- /dev/null
+++ b/engine/battle/move_effects/substitute.asm
@@ -0,0 +1,88 @@
+BattleCommand_Substitute:
+; substitute
+
+	call BattleCommand_MoveDelay
+	ld hl, wBattleMonMaxHP
+	ld de, wPlayerSubstituteHP
+	ld a, [hBattleTurn]
+	and a
+	jr z, .got_hp
+	ld hl, wEnemyMonMaxHP
+	ld de, wEnemySubstituteHP
+.got_hp
+
+	ld a, BATTLE_VARS_SUBSTATUS4
+	call GetBattleVar
+	bit SUBSTATUS_SUBSTITUTE, a
+	jr nz, .already_has_sub
+
+	ld a, [hli]
+	ld b, [hl]
+	srl a
+	rr b
+	srl a
+	rr b
+	dec hl
+	dec hl
+	ld a, b
+	ld [de], a
+	ld a, [hld]
+	sub b
+	ld e, a
+	ld a, [hl]
+	sbc 0
+	ld d, a
+	jr c, .too_weak_to_sub
+	ld a, d
+	or e
+	jr z, .too_weak_to_sub
+	ld [hl], d
+	inc hl
+	ld [hl], e
+
+	ld a, BATTLE_VARS_SUBSTATUS4
+	call GetBattleVarAddr
+	set SUBSTATUS_SUBSTITUTE, [hl]
+
+	ld hl, wPlayerWrapCount
+	ld de, wPlayerTrappingMove
+	ld a, [hBattleTurn]
+	and a
+	jr z, .player
+	ld hl, wEnemyWrapCount
+	ld de, wEnemyTrappingMove
+.player
+
+	xor a
+	ld [hl], a
+	ld [de], a
+	call _CheckBattleScene
+	jr c, .no_anim
+
+	xor a
+	ld [wNumHits], a
+	ld [wFXAnimID + 1], a
+	ld [wKickCounter], a
+	ld a, SUBSTITUTE
+	call LoadAnim
+	jr .finish
+
+.no_anim
+	call BattleCommand_RaiseSubNoAnim
+.finish
+	ld hl, MadeSubstituteText
+	call StdBattleTextBox
+	jp RefreshBattleHuds
+
+.already_has_sub
+	call CheckUserIsCharging
+	call nz, BattleCommand_RaiseSub
+	ld hl, HasSubstituteText
+	jr .jp_stdbattletextbox
+
+.too_weak_to_sub
+	call CheckUserIsCharging
+	call nz, BattleCommand_RaiseSub
+	ld hl, TooWeakSubText
+.jp_stdbattletextbox
+	jp StdBattleTextBox
diff --git a/engine/battle/move_effects/sunny_day.asm b/engine/battle/move_effects/sunny_day.asm
new file mode 100644
index 000000000..f5825930f
--- /dev/null
+++ b/engine/battle/move_effects/sunny_day.asm
@@ -0,0 +1,9 @@
+BattleCommand_StartSun:
+; startsun
+	ld a, WEATHER_SUN
+	ld [wBattleWeather], a
+	ld a, 5
+	ld [wWeatherCount], a
+	call AnimateCurrentMove
+	ld hl, SunGotBrightText
+	jp StdBattleTextBox
diff --git a/engine/battle/move_effects/teleport.asm b/engine/battle/move_effects/teleport.asm
new file mode 100644
index 000000000..1c67ef112
--- /dev/null
+++ b/engine/battle/move_effects/teleport.asm
@@ -0,0 +1,89 @@
+BattleCommand_Teleport:
+; teleport
+
+	ld a, [wBattleType]
+	cp BATTLETYPE_SHINY
+	jr z, .failed
+	cp BATTLETYPE_TRAP
+	jr z, .failed
+	cp BATTLETYPE_CELEBI
+	jr z, .failed
+	cp BATTLETYPE_SUICUNE
+	jr z, .failed
+
+	ld a, BATTLE_VARS_SUBSTATUS5_OPP
+	call GetBattleVar
+	bit SUBSTATUS_CANT_RUN, a
+	jr nz, .failed
+; Only need to check these next things if it's your turn
+	ld a, [hBattleTurn]
+	and a
+	jr nz, .enemy_turn
+; Can't teleport from a trainer battle
+	ld a, [wBattleMode]
+	dec a
+	jr nz, .failed
+; If your level is greater than the opponent's, you run without fail.
+	ld a, [wCurPartyLevel]
+	ld b, a
+	ld a, [wBattleMonLevel]
+	cp b
+	jr nc, .run_away
+; Generate a number between 0 and (YourLevel + TheirLevel).
+	add b
+	ld c, a
+	inc c
+.loop_player
+	call BattleRandom
+	cp c
+	jr nc, .loop_player
+; If that number is greater than 4 times your level, run away.
+	srl b
+	srl b
+	cp b
+	jr nc, .run_away
+
+.failed
+	call AnimateFailedMove
+	jp PrintButItFailed
+
+.enemy_turn
+	ld a, [wBattleMode]
+	dec a
+	jr nz, .failed
+	ld a, [wBattleMonLevel]
+	ld b, a
+	ld a, [wCurPartyLevel]
+	cp b
+	jr nc, .run_away
+	add b
+	ld c, a
+	inc c
+.loop_enemy
+	call BattleRandom
+	cp c
+	jr nc, .loop_enemy
+	srl b
+	srl b
+	cp b
+	; This does the wrong thing. What was
+	; probably intended was jr c, .failed
+	; The way this is made makes enemy use
+	; of Teleport always succeed if able
+	jr nc, .run_away
+.run_away
+	call UpdateBattleMonInParty
+	xor a
+	ld [wNumHits], a
+	inc a
+	ld [wForcedSwitch], a
+	ld [wKickCounter], a
+	call SetBattleDraw
+	call BattleCommand_LowerSub
+	call LoadMoveAnim
+	ld c, 20
+	call DelayFrames
+	call SetBattleDraw
+
+	ld hl, FledFromBattleText
+	jp StdBattleTextBox
diff --git a/engine/battle/effect_commands/thief.asm b/engine/battle/move_effects/thief.asm
index 5397c2bdf..64de1a4fe 100644
--- a/engine/battle/effect_commands/thief.asm
+++ b/engine/battle/move_effects/thief.asm
@@ -1,4 +1,4 @@
-BattleCommand_Thief: ; 37492
+BattleCommand_Thief:
 ; thief
 
 	ld a, [hBattleTurn]
@@ -50,7 +50,6 @@ BattleCommand_Thief: ; 37492
 	ld [de], a
 	jr .stole
 
-
 .enemy
 
 ; The enemy can't already have an item.
@@ -91,13 +90,11 @@ BattleCommand_Thief: ; 37492
 	ld [hl], a
 	ld [de], a
 
-
 .stole
 	call GetItemName
 	ld hl, StoleText
 	jp StdBattleTextBox
 
-
 .playeritem
 	ld a, 1
 	call BattlePartyAttr
@@ -113,4 +110,3 @@ BattleCommand_Thief: ; 37492
 	ld e, l
 	ld hl, wEnemyMonItem
 	ret
-; 37517
diff --git a/engine/battle/move_effects/thunder.asm b/engine/battle/move_effects/thunder.asm
new file mode 100644
index 000000000..b2a643787
--- /dev/null
+++ b/engine/battle/move_effects/thunder.asm
@@ -0,0 +1,18 @@
+BattleCommand_ThunderAccuracy:
+; thunderaccuracy
+
+	ld a, BATTLE_VARS_MOVE_TYPE
+	call GetBattleVarAddr
+	inc hl
+	ld a, [wBattleWeather]
+	cp WEATHER_RAIN
+	jr z, .rain
+	cp WEATHER_SUN
+	ret nz
+	ld [hl], 50 percent + 1
+	ret
+
+.rain
+	; Redundant with CheckHit guranteeing hit
+	ld [hl], 100 percent
+	ret
diff --git a/engine/battle/effect_commands/transform.asm b/engine/battle/move_effects/transform.asm
index 5ae7c1511..ef8071290 100755..100644
--- a/engine/battle/effect_commands/transform.asm
+++ b/engine/battle/move_effects/transform.asm
@@ -1,5 +1,5 @@
 
-BattleCommand_Transform: ; 371cd
+BattleCommand_Transform:
 ; transform
 
 	call ClearLastMove
@@ -137,5 +137,3 @@ BattleCommand_Transform: ; 371cd
 	call nz, LoadAnim
 	ld hl, TransformedText
 	jp StdBattleTextBox
-
-; 372c6
diff --git a/engine/battle/move_effects/triple_kick.asm b/engine/battle/move_effects/triple_kick.asm
new file mode 100644
index 000000000..e41044c9d
--- /dev/null
+++ b/engine/battle/move_effects/triple_kick.asm
@@ -0,0 +1,34 @@
+BattleCommand_TripleKick:
+; triplekick
+
+	ld a, [wKickCounter]
+	ld b, a
+	inc b
+	ld hl, wCurDamage + 1
+	ld a, [hld]
+	ld e, a
+	ld a, [hli]
+	ld d, a
+.next_kick
+	dec b
+	ret z
+	ld a, [hl]
+	add e
+	ld [hld], a
+	ld a, [hl]
+	adc d
+	ld [hli], a
+
+; No overflow.
+	jr nc, .next_kick
+	ld a, $ff
+	ld [hld], a
+	ld [hl], a
+	ret
+
+BattleCommand_KickCounter:
+; kickcounter
+
+	ld hl, wKickCounter
+	inc [hl]
+	ret
diff --git a/engine/battle/read_trainer_attributes.asm b/engine/battle/read_trainer_attributes.asm
index 0b9507e0d..6db8f4204 100644
--- a/engine/battle/read_trainer_attributes.asm
+++ b/engine/battle/read_trainer_attributes.asm
@@ -1,4 +1,4 @@
-GetTrainerClassName: ; 3952d
+GetTrainerClassName:
 	ld hl, wRivalName
 	ld a, c
 	cp RIVAL1
@@ -19,7 +19,7 @@ GetTrainerClassName: ; 3952d
 	pop de
 	ret
 
-GetOTName: ; 39550
+GetOTName:
 	ld hl, wOTPlayerName
 	ld a, [wLinkMode]
 	and a
@@ -44,7 +44,7 @@ GetOTName: ; 39550
 	pop de
 	ret
 
-GetTrainerAttributes: ; 3957b
+GetTrainerAttributes:
 	ld a, [wTrainerClass]
 	ld c, a
 	call GetOTName
@@ -62,3 +62,5 @@ GetTrainerAttributes: ; 3957b
 	ld a, [hl]
 	ld [wEnemyTrainerBaseReward], a
 	ret
+
+INCLUDE "data/trainers/attributes.asm"
diff --git a/engine/battle/read_trainer_dvs.asm b/engine/battle/read_trainer_dvs.asm
index c021e8e8c..d35c9ea61 100644
--- a/engine/battle/read_trainer_dvs.asm
+++ b/engine/battle/read_trainer_dvs.asm
@@ -1,4 +1,4 @@
-GetTrainerDVs: ; 270c4
+GetTrainerDVs:
 ; Return the DVs of wOtherTrainerClass in bc
 
 	push hl
@@ -17,4 +17,5 @@ GetTrainerDVs: ; 270c4
 
 	pop hl
 	ret
-; 270d6
+
+INCLUDE "data/trainers/dvs.asm"
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index 9f7a4a4a8..0a537b64e 100755..100644
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -1,4 +1,4 @@
-ReadTrainerParty: ; 39771
+ReadTrainerParty:
 	ld a, [wInBattleTowerBattle]
 	bit 0, a
 	ret nz
@@ -44,7 +44,7 @@ ReadTrainerParty: ; 39771
 	jr z, .got_trainer
 .loop
 	ld a, [hli]
-	cp $ff
+	cp -1
 	jr nz, .loop
 	jr .skip_trainer
 .got_trainer
@@ -79,16 +79,15 @@ ReadTrainerParty: ; 39771
 	call TrainerType2
 	call CloseSRAM
 	jr .done
-; 397e3
 
-TrainerTypes: ; 397e3
+TrainerTypes:
+; entries correspond to TRAINERTYPE_* constants
 	dw TrainerType1 ; level, species
 	dw TrainerType2 ; level, species, moves
 	dw TrainerType3 ; level, species, item
 	dw TrainerType4 ; level, species, item, moves
-; 397eb
 
-TrainerType1: ; 397eb
+TrainerType1:
 ; normal (level, species)
 	ld h, d
 	ld l, e
@@ -106,9 +105,8 @@ TrainerType1: ; 397eb
 	predef TryAddMonToParty
 	pop hl
 	jr .loop
-; 39806
 
-TrainerType2: ; 39806
+TrainerType2:
 ; moves
 	ld h, d
 	ld l, e
@@ -183,9 +181,8 @@ TrainerType2: ; 39806
 
 	pop hl
 	jr .loop
-; 39871
 
-TrainerType3: ; 39871
+TrainerType3:
 ; item
 	ld h, d
 	ld l, e
@@ -212,9 +209,8 @@ TrainerType3: ; 39871
 	ld a, [hli]
 	ld [de], a
 	jr .loop
-; 3989d (e:589d)
 
-TrainerType4: ; 3989d
+TrainerType4:
 ; item + moves
 	ld h, d
 	ld l, e
@@ -304,9 +300,8 @@ TrainerType4: ; 3989d
 
 	pop hl
 	jr .loop
-; 3991b
 
-ComputeTrainerReward: ; 3991b (e:591b)
+ComputeTrainerReward:
 	ld hl, hProduct
 	xor a
 	ld [hli], a
@@ -326,8 +321,7 @@ ComputeTrainerReward: ; 3991b (e:591b)
 	ld [hl], a
 	ret
 
-
-Battle_GetTrainerName:: ; 39939
+Battle_GetTrainerName::
 	ld a, [wInBattleTowerBattle]
 	bit 0, a
 	ld hl, wOTPlayerName
@@ -338,7 +332,7 @@ Battle_GetTrainerName:: ; 39939
 	ld a, [wOtherTrainerClass]
 	ld c, a
 
-GetTrainerName:: ; 3994c
+GetTrainerName::
 	ld a, c
 	cp CAL
 	jr nz, .not_cal2
@@ -378,20 +372,20 @@ GetTrainerName:: ; 3994c
 	jr nz, .skip
 	jr .loop
 
-CopyTrainerName: ; 39984
+CopyTrainerName:
 	ld de, wStringBuffer1
 	push de
 	ld bc, NAME_LENGTH
 	call CopyBytes
 	pop de
 	ret
-; 39990
 
-Function39990: ; 39990
+Function39990:
 ; This function is useless.
 	ld de, wStringBuffer1
 	push de
 	ld bc, NAME_LENGTH
 	pop de
 	ret
-; 39999
+
+INCLUDE "data/trainers/parties.asm"
diff --git a/engine/battle/returntobattle_useball.asm b/engine/battle/returntobattle_useball.asm
index b63881b2c..0aff780c9 100644
--- a/engine/battle/returntobattle_useball.asm
+++ b/engine/battle/returntobattle_useball.asm
@@ -1,4 +1,4 @@
-_ReturnToBattle_UseBall: ; 2715c
+_ReturnToBattle_UseBall:
 	call ClearBGPalettes
 	call ClearTileMap
 	ld a, [wBattleType]
@@ -14,6 +14,6 @@ _ReturnToBattle_UseBall: ; 2715c
 	farcall _LoadBattleFontsHPBar
 	call GetMemSGBLayout
 	call CloseWindow
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call WaitBGMap
 	jp SetPalettes
diff --git a/engine/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm
index 667f18191..6b866c6d8 100755..100644
--- a/engine/battle/sliding_intro.asm
+++ b/engine/battle/sliding_intro.asm
@@ -1,4 +1,4 @@
-BattleIntroSlidingPics: ; 4e980
+BattleIntroSlidingPics:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wLYOverrides)
@@ -12,9 +12,8 @@ BattleIntroSlidingPics: ; 4e980
 	pop af
 	ld [rSVBK], a
 	ret
-; 4e998
 
-.subfunction1 ; 4e998
+.subfunction1
 	call .subfunction4
 	ld a, $90
 	ld [hSCX], a
@@ -23,9 +22,8 @@ BattleIntroSlidingPics: ; 4e980
 	lb de, %11100100, %11100100
 	call DmgToCgbObjPals
 	ret
-; 4e9ab
 
-.subfunction2 ; 4e9ab
+.subfunction2
 	ld d, $90
 	ld e, $72
 	ld a, $48
@@ -57,9 +55,8 @@ BattleIntroSlidingPics: ; 4e980
 	dec a
 	jr nz, .loop1
 	ret
-; 4e9d6
 
-.subfunction3 ; 4e9d6
+.subfunction3
 	ld hl, wVirtualOAMSprite00XCoord
 	ld c, $12 ; 18
 	ld de, SPRITEOAMSTRUCT_LENGTH
@@ -70,17 +67,15 @@ BattleIntroSlidingPics: ; 4e980
 	dec c
 	jr nz, .loop3
 	ret
-; 4e9e5
 
-.subfunction4 ; 4e9e5
+.subfunction4
 	ld hl, wLYOverrides
 	ld a, $90
 	ld bc, SCREEN_HEIGHT_PX
 	call ByteFill
 	ret
-; 4e9f1
 
-.subfunction5 ; 4e9f1
+.subfunction5
 	ld hl, wLYOverrides
 	ld a, d
 	ld c, $3e ; 62
@@ -101,4 +96,3 @@ BattleIntroSlidingPics: ; 4e980
 	dec c
 	jr nz, .loop6
 	ret
-; 4ea0a
diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm
index 84cd1e858..f5fc4a6b0 100644
--- a/engine/battle/start_battle.asm
+++ b/engine/battle/start_battle.asm
@@ -1,4 +1,4 @@
-ShowLinkBattleParticipants: ; 2ee18
+ShowLinkBattleParticipants:
 ; If we're not in a communications room,
 ; we don't need to be here.
 	ld a, [wLinkMode]
@@ -12,11 +12,11 @@ ShowLinkBattleParticipants: ; 2ee18
 	call ClearSprites
 	ret
 
-FindFirstAliveMonAndStartBattle: ; 2ee2f
+FindFirstAliveMonAndStartBattle:
 	xor a
 	ld [hMapAnims], a
 	call DelayFrame
-	ld b, 6
+	ld b, PARTY_LENGTH
 	ld hl, wPartyMon1HP
 	ld de, PARTYMON_STRUCT_LENGTH - 1
 
@@ -46,7 +46,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f
 	ld [hMapAnims], a
 	ret
 
-PlayBattleMusic: ; 2ee6c
+PlayBattleMusic:
 	push hl
 	push de
 	push bc
@@ -148,7 +148,7 @@ PlayBattleMusic: ; 2ee6c
 	pop hl
 	ret
 
-ClearBattleRAM: ; 2ef18
+ClearBattleRAM:
 	xor a
 	ld [wBattlePlayerAction], a
 	ld [wBattleResult], a
diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm
index 0a18098ed..3930549b2 100755..100644
--- a/engine/battle/trainer_huds.asm
+++ b/engine/battle/trainer_huds.asm
@@ -1,4 +1,4 @@
-BattleStart_TrainerHuds: ; 2c000
+BattleStart_TrainerHuds:
 	ld a, $e4
 	ld [rOBP0], a
 	call LoadBallIconGFX
@@ -7,16 +7,14 @@ BattleStart_TrainerHuds: ; 2c000
 	dec a
 	ret z
 	jp ShowOTTrainerMonsRemaining
-; 2c012
 
-EnemySwitch_TrainerHud: ; 2c012
+EnemySwitch_TrainerHud:
 	ld a, $e4
 	ld [rOBP0], a
 	call LoadBallIconGFX
 	jp ShowOTTrainerMonsRemaining
-; 2c01c
 
-ShowPlayerMonsRemaining: ; 2c01c
+ShowPlayerMonsRemaining:
 	call DrawPlayerPartyIconHUDBorder
 	ld hl, wPartyMon1HP
 	ld de, wPartyCount
@@ -30,9 +28,8 @@ ShowPlayerMonsRemaining: ; 2c01c
 	ld [wPlaceBallsDirection], a
 	ld hl, wVirtualOAMSprite00
 	jp LoadTrainerHudOAM
-; 2c03a
 
-ShowOTTrainerMonsRemaining: ; 2c03a
+ShowOTTrainerMonsRemaining:
 	call DrawEnemyHUDBorder
 	ld hl, wOTPartyMon1HP
 	ld de, wOTPartyCount
@@ -46,9 +43,8 @@ ShowOTTrainerMonsRemaining: ; 2c03a
 	ld [wPlaceBallsDirection], a
 	ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
 	jp LoadTrainerHudOAM
-; 2c059
 
-StageBallTilesData: ; 2c059
+StageBallTilesData:
 	ld a, [de]
 	push af
 	ld de, wBuffer1
@@ -69,9 +65,8 @@ StageBallTilesData: ; 2c059
 	dec a
 	jr nz, .loop2
 	ret
-; 2c075
 
-.GetHUDTile: ; 2c075
+.GetHUDTile:
 	ld a, [hli]
 	and a
 	jr nz, .got_hp
@@ -102,9 +97,8 @@ StageBallTilesData: ; 2c059
 	ld bc, PARTYMON_STRUCT_LENGTH + MON_HP - MON_STATUS
 	add hl, bc
 	ret
-; 2c095
 
-DrawPlayerHUDBorder: ; 2c095
+DrawPlayerHUDBorder:
 	ld hl, .tiles
 	ld de, wTrainerHUDTiles
 	ld bc, 4
@@ -118,9 +112,8 @@ DrawPlayerHUDBorder: ; 2c095
 	db $77 ; bottom right
 	db $6f ; bottom left
 	db $76 ; bottom side
-; 2c0ad
 
-DrawPlayerPartyIconHUDBorder: ; 2c0ad
+DrawPlayerPartyIconHUDBorder:
 	ld hl, .tiles
 	ld de, wTrainerHUDTiles
 	ld bc, 4
@@ -134,9 +127,8 @@ DrawPlayerPartyIconHUDBorder: ; 2c0ad
 	db $5c ; bottom right
 	db $6f ; bottom left
 	db $76 ; bottom side
-; 2c0c5
 
-DrawEnemyHUDBorder: ; 2c0c5
+DrawEnemyHUDBorder:
 	ld hl, .tiles
 	ld de, wTrainerHUDTiles
 	ld bc, 4
@@ -160,9 +152,8 @@ DrawEnemyHUDBorder: ; 2c0c5
 	db $74 ; bottom left
 	db $78 ; bottom right
 	db $76 ; bottom side
-; 2c0f1
 
-PlaceHUDBorderTiles: ; 2c0f1
+PlaceHUDBorderTiles:
 	ld a, [wTrainerHUDTiles]
 	ld [hl], a
 	ld bc, SCREEN_WIDTH
@@ -180,9 +171,8 @@ PlaceHUDBorderTiles: ; 2c0f1
 	ld a, [wEndFlypoint]
 	ld [hl], a
 	ret
-; 2c10d
 
-LinkBattle_TrainerHuds: ; 2c10d
+LinkBattle_TrainerHuds:
 	call LoadBallIconGFX
 	ld hl, wPartyMon1HP
 	ld de, wPartyCount
@@ -205,9 +195,8 @@ LinkBattle_TrainerHuds: ; 2c10d
 	ld [hl], 13 * 8
 	ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
 	jp LoadTrainerHudOAM
-; 2c143
 
-LoadTrainerHudOAM: ; 2c143
+LoadTrainerHudOAM:
 	ld de, wBuffer1
 	ld c, PARTY_LENGTH
 .loop
@@ -228,21 +217,18 @@ LoadTrainerHudOAM: ; 2c143
 	dec c
 	jr nz, .loop
 	ret
-; 2c165
 
-LoadBallIconGFX: ; 2c165
+LoadBallIconGFX:
 	ld de, .gfx
 	ld hl, vTiles0 tile $31
 	lb bc, BANK(LoadBallIconGFX), 4
 	call Get2bpp_2
 	ret
-; 2c172
 
-.gfx ; 2c172
+.gfx
 INCBIN "gfx/battle/balls.2bpp"
-; 2c1b2
 
-_ShowLinkBattleParticipants: ; 2c1b2
+_ShowLinkBattleParticipants:
 	call ClearBGPalettes
 	call LoadFontsExtra
 	hlcoord 2, 3
@@ -266,4 +252,3 @@ _ShowLinkBattleParticipants: ; 2c1b2
 	ld a, $e4
 	ld [rOBP0], a
 	ret
-; 2c1ef
diff --git a/engine/routines/unreferenced_getgen1trainerclassname.asm b/engine/battle/unreferenced_getgen1trainerclassname.asm
index 66c80172d..045325234 100644
--- a/engine/routines/unreferenced_getgen1trainerclassname.asm
+++ b/engine/battle/unreferenced_getgen1trainerclassname.asm
@@ -1,4 +1,4 @@
-Unreferenced_GetGen1TrainerClassName: ; 50a28
+Unreferenced_GetGen1TrainerClassName:
 	ld hl, Gen1TrainerClassNames
 	ld a, [wTrainerClass]
 	dec a
@@ -18,4 +18,4 @@ Unreferenced_GetGen1TrainerClassName: ; 50a28
 	jr nz, .copy
 	ret
 
-INCLUDE "data/unused/gen_1_trainer_names.asm"
+INCLUDE "data/text/unused_gen1_trainer_names.asm"
diff --git a/engine/battle/updatebattlehuds.asm b/engine/battle/update_battle_huds.asm
index 0c31f1c36..0c31f1c36 100644
--- a/engine/battle/updatebattlehuds.asm
+++ b/engine/battle/update_battle_huds.asm
diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm
index bab0ea834..9307a1a1e 100755..100644
--- a/engine/battle/used_move_text.asm
+++ b/engine/battle/used_move_text.asm
@@ -1,11 +1,10 @@
-DisplayUsedMoveText: ; 105db0
+DisplayUsedMoveText:
 ; battle command 03
 	ld hl, UsedMoveText
 	call BattleTextBox
 	jp WaitBGMap
-; 105db9
 
-UsedMoveText: ; 105db9
+UsedMoveText:
 ; this is a stream of text and asm from 105db9 to 105ef6
 	text_jump _ActorNameText
 	start_asm
@@ -58,18 +57,16 @@ UsedMoveText: ; 105db9
 	ret c
 	ld hl, UsedMove1Text
 	ret
-; 105e04
 
-UsedMove1Text: ; 105e04
+UsedMove1Text:
 	text_jump _UsedMove1Text
 	start_asm
 	jr UsedMoveText_CheckObedience
-; 105e0b
 
-UsedMove2Text: ; 105e0b
+UsedMove2Text:
 	text_jump _UsedMove2Text
 	start_asm
-UsedMoveText_CheckObedience: ; 105e10
+UsedMoveText_CheckObedience:
 ; check obedience
 	ld a, [wAlreadyDisobeyed]
 	and a
@@ -77,7 +74,6 @@ UsedMoveText_CheckObedience: ; 105e10
 ; print "instead,"
 	ld hl, .UsedInsteadText
 	ret
-; 105e1a
 
 .UsedInsteadText:
 	text_jump _UsedInsteadText
@@ -85,9 +81,8 @@ UsedMoveText_CheckObedience: ; 105e10
 .GetMoveNameText:
 	ld hl, MoveNameText
 	ret
-; 105e23
 
-MoveNameText: ; 105e23
+MoveNameText:
 	text_jump _MoveNameText
 	start_asm
 ; get start address
@@ -111,39 +106,32 @@ MoveNameText: ; 105e23
 	ld h, [hl]
 	ld l, a
 	ret
-; 105e39
 
-.endusedmovetexts ; 105e39
+.endusedmovetexts
+; entries correspond to MoveGrammar sets
 	dw EndUsedMove1Text
 	dw EndUsedMove2Text
 	dw EndUsedMove3Text
 	dw EndUsedMove4Text
 	dw EndUsedMove5Text
-; 105e43
 
-EndUsedMove1Text: ; 105e43
+EndUsedMove1Text:
 	text_jump _EndUsedMove1Text
 	db "@"
-; 105e48
-EndUsedMove2Text: ; 105e48
+EndUsedMove2Text:
 	text_jump _EndUsedMove2Text
 	db "@"
-; 105e4d
-EndUsedMove3Text: ; 105e4d
+EndUsedMove3Text:
 	text_jump _EndUsedMove3Text
 	db "@"
-; 105e52
-EndUsedMove4Text: ; 105e52
+EndUsedMove4Text:
 	text_jump _EndUsedMove4Text
 	db "@"
-; 105e57
-EndUsedMove5Text: ; 105e57
+EndUsedMove5Text:
 	text_jump _EndUsedMove5Text
 	db "@"
-; 105e5c
 
-
-GetMoveGrammar: ; 105e5c
+GetMoveGrammar:
 ; store move grammar type in wd265
 
 	push bc
@@ -177,12 +165,10 @@ GetMoveGrammar: ; 105e5c
 ; we're done
 	pop bc
 	ret
-; 105e7a
 
 INCLUDE "data/moves/grammar.asm"
 
-
-UpdateUsedMoves: ; 105ed0
+UpdateUsedMoves:
 ; append move a to wPlayerUsedMoves unless it has already been used
 
 	push bc
@@ -236,4 +222,3 @@ UpdateUsedMoves: ; 105ed0
 ; list updated
 	pop bc
 	ret
-; 105ef6
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index ca4928233..600168a9a 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -1,7 +1,6 @@
 ; Battle animation command interpreter.
 
-PlayBattleAnim: ; cc0d6
-
+PlayBattleAnim:
 	ld a, [rSVBK]
 	push af
 
@@ -13,10 +12,8 @@ PlayBattleAnim: ; cc0d6
 	pop af
 	ld [rSVBK], a
 	ret
-; cc0e4
-
-_PlayBattleAnim: ; cc0e4
 
+_PlayBattleAnim:
 	ld c, 6
 .wait
 	call BattleAnimDelayFrame
@@ -52,10 +49,8 @@ _PlayBattleAnim: ; cc0e4
 	call BattleAnimDelayFrame
 	call WaitSFX
 	ret
-; cc11c
-
-BattleAnimRunScript: ; cc11c
 
+BattleAnimRunScript:
 	ld a, [wFXAnimID + 1]
 	and a
 	jr nz, .hi_byte
@@ -97,10 +92,8 @@ BattleAnimRunScript: ; cc11c
 .done
 	call BattleAnim_RevertPals
 	ret
-; cc163
-
-RunBattleAnimScript: ; cc163
 
+RunBattleAnimScript:
 	call ClearBattleAnims
 
 .playframe
@@ -140,10 +133,8 @@ RunBattleAnimScript: ; cc163
 
 	call BattleAnim_ClearCGB_OAMFlags
 	ret
-; cc1a1
-
-BattleAnimClearHud: ; cc1a1
 
+BattleAnimClearHud:
 	call BattleAnimDelayFrame
 	call WaitTop
 	call ClearActorHud
@@ -154,10 +145,8 @@ BattleAnimClearHud: ; cc1a1
 	call BattleAnimDelayFrame
 	call WaitTop
 	ret
-; cc1bb
-
-BattleAnimRestoreHuds: ; cc1bb
 
+BattleAnimRestoreHuds:
 	call BattleAnimDelayFrame
 	call WaitTop
 
@@ -180,10 +169,8 @@ BattleAnimRestoreHuds: ; cc1bb
 	call BattleAnimDelayFrame
 	call WaitTop
 	ret
-; cc1e2
-
-BattleAnimRequestPals: ; cc1e2
 
+BattleAnimRequestPals:
 	ld a, [hCGB]
 	and a
 	ret z
@@ -200,9 +187,8 @@ BattleAnimRequestPals: ; cc1e2
 	cp b
 	call nz, BattleAnim_SetOBPals
 	ret
-; cc1fb
 
-BattleAnimDelayFrame: ; cc1fb
+BattleAnimDelayFrame:
 ; Like DelayFrame but wastes battery life.
 
 	ld a, 1
@@ -212,10 +198,8 @@ BattleAnimDelayFrame: ; cc1fb
 	and a
 	jr nz, .wait
 	ret
-; cc207
-
-ClearActorHud: ; cc207
 
+ClearActorHud:
 	ld a, [hBattleTurn]
 	and a
 	jr z, .player
@@ -230,9 +214,8 @@ ClearActorHud: ; cc207
 	lb bc, 5, 11
 	call ClearBox
 	ret
-; cc220
 
-Unreferenced_Functioncc220: ; cc220
+Unreferenced_Functioncc220:
 	xor a
 	ld [hBGMapMode], a
 	ld a, LOW(vBGMap0 tile $28)
@@ -248,11 +231,8 @@ Unreferenced_Functioncc220: ; cc220
 	ld [hBGMapAddress + 1], a
 	call BattleAnimDelayFrame
 	ret
-; cc23d
-
-
-BattleAnim_ClearCGB_OAMFlags: ; cc23d
 
+BattleAnim_ClearCGB_OAMFlags:
 	ld a, [wBattleAnimFlags]
 	bit 3, a
 	jr z, .delete
@@ -263,7 +243,7 @@ BattleAnim_ClearCGB_OAMFlags: ; cc23d
 	ld a, [hl]
 	and $f0
 	ld [hli], a
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	dec c
@@ -279,16 +259,14 @@ endr
 	dec c
 	jr nz, .loop2
 	ret
-; cc25f
 
-RunBattleAnimCommand: ; cc25f
+RunBattleAnimCommand:
 	call .CheckTimer
 	ret nc
 	call .RunScript
 	ret
-; cc267
 
-.CheckTimer: ; cc267
+.CheckTimer:
 	ld a, [wBattleAnimDuration]
 	and a
 	jr z, .done
@@ -301,13 +279,12 @@ RunBattleAnimCommand: ; cc25f
 .done
 	scf
 	ret
-; cc275
 
-.RunScript: ; cc275
+.RunScript:
 .loop
 	call GetBattleAnimByte
 
-	cp $ff
+	cp anim_ret_command
 	jr nz, .not_done_with_anim
 
 ; Return from a subroutine.
@@ -329,9 +306,8 @@ RunBattleAnimCommand: ; cc25f
 	call .DoCommand
 
 	jr .loop
-; cc293
 
-.DoCommand: ; cc293
+.DoCommand:
 ; Execute battle animation command in [wBattleAnimByte].
 	ld a, [wBattleAnimByte]
 	sub $d0
@@ -346,10 +322,8 @@ RunBattleAnimCommand: ; cc25f
 	ld h, [hl]
 	ld l, a
 	jp hl
-; cc2a4
-
 
-BattleAnimCommands:: ; cc2a4 (33:42a4)
+BattleAnimCommands::
 ; entries correspond to macros/scripts/battle_anims.asm enumeration
 	dw BattleAnimCmd_Obj
 	dw BattleAnimCmd_1GFX
@@ -400,14 +374,13 @@ BattleAnimCommands:: ; cc2a4 (33:42a4)
 	dw BattleAnimCmd_Call
 	dw BattleAnimCmd_Ret
 
-
 BattleAnimCmd_EA:
 BattleAnimCmd_EB:
 BattleAnimCmd_EC:
-BattleAnimCmd_ED: ; cc304 (33:4304)
+BattleAnimCmd_ED:
 	ret
 
-BattleAnimCmd_Ret: ; cc305 (33:4305)
+BattleAnimCmd_Ret:
 	ld hl, wBattleAnimFlags
 	res 1, [hl]
 	ld hl, wBattleAnimParent
@@ -420,7 +393,7 @@ BattleAnimCmd_Ret: ; cc305 (33:4305)
 	ld [hl], d
 	ret
 
-BattleAnimCmd_Call: ; cc317 (33:4317)
+BattleAnimCmd_Call:
 	call GetBattleAnimByte
 	ld e, a
 	call GetBattleAnimByte
@@ -443,7 +416,7 @@ BattleAnimCmd_Call: ; cc317 (33:4317)
 	set 1, [hl]
 	ret
 
-BattleAnimCmd_Jump: ; cc339 (33:4339)
+BattleAnimCmd_Jump:
 	call GetBattleAnimByte
 	ld e, a
 	call GetBattleAnimByte
@@ -454,7 +427,7 @@ BattleAnimCmd_Jump: ; cc339 (33:4339)
 	ld [hl], d
 	ret
 
-BattleAnimCmd_Loop: ; cc348 (33:4348)
+BattleAnimCmd_Loop:
 	call GetBattleAnimByte
 	ld hl, wBattleAnimFlags
 	bit 2, [hl]
@@ -495,7 +468,7 @@ BattleAnimCmd_Loop: ; cc348 (33:4348)
 	ld [hl], e
 	ret
 
-BattleAnimCmd_JumpUntil: ; cc383 (33:4383)
+BattleAnimCmd_JumpUntil:
 	ld hl, wBattleAnimParam
 	ld a, [hl]
 	and a
@@ -524,17 +497,17 @@ BattleAnimCmd_JumpUntil: ; cc383 (33:4383)
 	ld [hl], e
 	ret
 
-BattleAnimCmd_SetVar: ; cc3a6 (33:43a6)
+BattleAnimCmd_SetVar:
 	call GetBattleAnimByte
 	ld [wBattleAnimVar], a
 	ret
 
-BattleAnimCmd_IncVar: ; cc3ad (33:43ad)
+BattleAnimCmd_IncVar:
 	ld hl, wBattleAnimVar
 	inc [hl]
 	ret
 
-BattleAnimCmd_IfVarEqual: ; cc3b2 (33:43b2)
+BattleAnimCmd_IfVarEqual:
 	call GetBattleAnimByte
 	ld hl, wBattleAnimVar
 	cp [hl]
@@ -562,7 +535,7 @@ BattleAnimCmd_IfVarEqual: ; cc3b2 (33:43b2)
 	ld [hl], d
 	ret
 
-BattleAnimCmd_IfParamEqual: ; cc3d6 (33:43d6)
+BattleAnimCmd_IfParamEqual:
 	call GetBattleAnimByte
 	ld hl, wBattleAnimParam
 	cp [hl]
@@ -590,7 +563,7 @@ BattleAnimCmd_IfParamEqual: ; cc3d6 (33:43d6)
 	ld [hl], d
 	ret
 
-BattleAnimCmd_IfParamAnd: ; cc3fa (33:43fa)
+BattleAnimCmd_IfParamAnd:
 	call GetBattleAnimByte
 	ld e, a
 	ld a, [wBattleAnimParam]
@@ -619,7 +592,7 @@ BattleAnimCmd_IfParamAnd: ; cc3fa (33:43fa)
 	ld [hl], d
 	ret
 
-BattleAnimCmd_Obj: ; cc41f (33:441f)
+BattleAnimCmd_Obj:
 ; index, x, y, param
 	call GetBattleAnimByte
 	ld [wBattleAnimTemp0], a
@@ -632,7 +605,7 @@ BattleAnimCmd_Obj: ; cc41f (33:441f)
 	call QueueBattleAnimation
 	ret
 
-BattleAnimCmd_BGEffect: ; cc43b (33:443b)
+BattleAnimCmd_BGEffect:
 	call GetBattleAnimByte
 	ld [wBattleAnimTemp0], a
 	call GetBattleAnimByte
@@ -644,22 +617,22 @@ BattleAnimCmd_BGEffect: ; cc43b (33:443b)
 	call _QueueBGEffect
 	ret
 
-BattleAnimCmd_BGP: ; cc457 (33:4457)
+BattleAnimCmd_BGP:
 	call GetBattleAnimByte
 	ld [wBGP], a
 	ret
 
-BattleAnimCmd_OBP0: ; cc45e (33:445e)
+BattleAnimCmd_OBP0:
 	call GetBattleAnimByte
 	ld [wOBP0], a
 	ret
 
-BattleAnimCmd_OBP1: ; cc465 (33:4465)
+BattleAnimCmd_OBP1:
 	call GetBattleAnimByte
 	ld [wOBP1], a
 	ret
 
-BattleAnimCmd_ResetObp0: ; cc46c (33:446c)
+BattleAnimCmd_ResetObp0:
 	ld a, [hSGB]
 	and a
 	ld a, $e0
@@ -669,7 +642,7 @@ BattleAnimCmd_ResetObp0: ; cc46c (33:446c)
 	ld [wOBP0], a
 	ret
 
-BattleAnimCmd_ClearObjs: ; cc479 (33:4479)
+BattleAnimCmd_ClearObjs:
 	ld hl, wActiveAnimObjects
 	ld a, $a0
 .loop
@@ -683,7 +656,7 @@ BattleAnimCmd_1GFX:
 BattleAnimCmd_2GFX:
 BattleAnimCmd_3GFX:
 BattleAnimCmd_4GFX:
-BattleAnimCmd_5GFX: ; cc485 (33:4485)
+BattleAnimCmd_5GFX:
 	ld a, [wBattleAnimByte]
 	and $f
 	ld c, a
@@ -718,7 +691,7 @@ endr
 	jr nz, .loop
 	ret
 
-BattleAnimCmd_IncObj: ; cc4c0 (33:44c0)
+BattleAnimCmd_IncObj:
 	call GetBattleAnimByte
 	ld e, 10
 	ld bc, wActiveAnimObjects
@@ -743,7 +716,7 @@ BattleAnimCmd_IncObj: ; cc4c0 (33:44c0)
 	inc [hl]
 	ret
 
-BattleAnimCmd_IncBGEffect: ; cc4e3 (33:44e3)
+BattleAnimCmd_IncBGEffect:
 	call GetBattleAnimByte
 	ld e, 5
 	ld bc, wActiveBGEffects
@@ -768,7 +741,7 @@ BattleAnimCmd_IncBGEffect: ; cc4e3 (33:44e3)
 	inc [hl]
 	ret
 
-BattleAnimCmd_SetObj: ; cc506 (33:4506)
+BattleAnimCmd_SetObj:
 	call GetBattleAnimByte
 	ld e, 10
 	ld bc, wActiveAnimObjects
@@ -794,8 +767,7 @@ BattleAnimCmd_SetObj: ; cc506 (33:4506)
 	ld [hl], a
 	ret
 
-BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
-
+BattleAnimCmd_EnemyFeetObj:
 	ld hl, wBattleAnimTileDict
 .loop
 	ld a, [hl]
@@ -828,7 +800,7 @@ BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
 	call .LoadFootprint
 	ret
 
-.LoadFootprint: ; cc561 (33:4561)
+.LoadFootprint:
 	push af
 	push hl
 	push de
@@ -849,8 +821,7 @@ BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
 	jr nz, .LoadFootprint
 	ret
 
-BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
-
+BattleAnimCmd_PlayerHeadObj:
 	ld hl, wBattleAnimTileDict
 .loop
 	ld a, [hl]
@@ -883,7 +854,7 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
 	call .LoadHead
 	ret
 
-.LoadHead: ; cc5b3 (33:45b3)
+.LoadHead:
 	push af
 	push hl
 	push de
@@ -904,16 +875,16 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
 	jr nz, .LoadHead
 	ret
 
-BattleAnimCmd_CheckPokeball: ; cc5d0 (33:45d0)
+BattleAnimCmd_CheckPokeball:
 	callfar GetPokeBallWobble
 	ld a, c
 	ld [wBattleAnimVar], a
 	ret
 
-BattleAnimCmd_E7: ; cc5db (33:45db)
+BattleAnimCmd_E7:
 	ret
 
-BattleAnimCmd_Transform: ; cc5dc (33:45dc)
+BattleAnimCmd_Transform:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wCurPartySpecies)
@@ -948,8 +919,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)
 	ld [rSVBK], a
 	ret
 
-BattleAnimCmd_UpdateActorPic: ; cc622 (33:4622)
-
+BattleAnimCmd_UpdateActorPic:
 	ld de, vTiles0 tile $00
 	ld a, [hBattleTurn]
 	and a
@@ -968,8 +938,7 @@ BattleAnimCmd_UpdateActorPic: ; cc622 (33:4622)
 	call Request2bpp
 	ret
 
-BattleAnimCmd_RaiseSub: ; cc640 (33:4640)
-
+BattleAnimCmd_RaiseSub:
 	ld a, [rSVBK]
 	push af
 	ld a, 1 ; unnecessary bankswitch?
@@ -977,7 +946,7 @@ BattleAnimCmd_RaiseSub: ; cc640 (33:4640)
 	xor a ; sScratch
 	call GetSRAMBank
 
-GetSubstitutePic: ; cc64c
+GetSubstitutePic: ; used only for BANK(GetSubstitutePic)
 
 	ld hl, sScratch
 	ld bc, (7 * 7) tiles
@@ -1037,13 +1006,13 @@ GetSubstitutePic: ; cc64c
 	ld [rSVBK], a
 	ret
 
-.CopyTile: ; cc6c6 (33:46c6)
+.CopyTile:
 	ld bc, 1 tiles
 	ld a, BANK(MonsterSpriteGFX)
 	call FarCopyBytes
 	ret
 
-BattleAnimCmd_MinimizeOpp: ; cc6cf (33:46cf)
+BattleAnimCmd_MinimizeOpp:
 	ld a, [rSVBK]
 	push af
 	ld a, 1 ; unnecessary bankswitch?
@@ -1057,7 +1026,7 @@ BattleAnimCmd_MinimizeOpp: ; cc6cf (33:46cf)
 	ld [rSVBK], a
 	ret
 
-GetMinimizePic: ; cc6e7 (33:46e7)
+GetMinimizePic:
 	ld hl, sScratch
 	ld bc, $31 tiles
 .loop
@@ -1087,19 +1056,17 @@ GetMinimizePic: ; cc6e7 (33:46e7)
 	lb bc, BANK(GetMinimizePic), 6 * 6
 	ret
 
-CopyMinimizePic: ; cc719 (33:4719)
+CopyMinimizePic:
 	ld hl, MinimizePic
 	ld bc, $10
 	ld a, BANK(MinimizePic)
 	call FarCopyBytes
 	ret
-; cc725 (33:4725)
 
-MinimizePic: ; cc725
+MinimizePic:
 INCBIN "gfx/battle/minimize.2bpp"
-; cc735
 
-BattleAnimCmd_Minimize: ; cc735 (33:4735)
+BattleAnimCmd_Minimize:
 	ld a, [rSVBK]
 	push af
 	ld a, 1 ; unnecessary bankswitch?
@@ -1114,7 +1081,7 @@ BattleAnimCmd_Minimize: ; cc735 (33:4735)
 	ld [rSVBK], a
 	ret
 
-BattleAnimCmd_DropSub: ; cc750 (33:4750)
+BattleAnimCmd_DropSub:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wCurPartySpecies)
@@ -1139,7 +1106,7 @@ BattleAnimCmd_DropSub: ; cc750 (33:4750)
 	ld [rSVBK], a
 	ret
 
-BattleAnimCmd_BeatUp: ; cc776 (33:4776)
+BattleAnimCmd_BeatUp:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wCurPartySpecies)
@@ -1175,31 +1142,31 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776)
 	ld [rSVBK], a
 	ret
 
-BattleAnimCmd_OAMOn: ; cc7bb (33:47bb)
+BattleAnimCmd_OAMOn:
 	xor a
 	ld [hOAMUpdate], a
 	ret
 
-BattleAnimCmd_OAMOff: ; cc7bf (33:47bf)
+BattleAnimCmd_OAMOff:
 	ld a, $1
 	ld [hOAMUpdate], a
 	ret
 
-BattleAnimCmd_ClearSprites: ; cc7c4 (33:47c4)
+BattleAnimCmd_ClearSprites:
 	ld hl, wBattleAnimFlags
 	set 3, [hl]
 	ret
 
-BattleAnimCmd_F5: ; cc7ca (33:47ca)
+BattleAnimCmd_F5:
 	ret
 
-BattleAnimCmd_F6: ; cc7cb (33:47cb)
+BattleAnimCmd_F6:
 	ret
 
-BattleAnimCmd_F7: ; cc7cc (33:47cc)
+BattleAnimCmd_F7:
 	ret
 
-BattleAnimCmd_Sound: ; cc7cd (33:47cd)
+BattleAnimCmd_Sound:
 	call GetBattleAnimByte
 	ld e, a
 	srl a
@@ -1222,13 +1189,11 @@ BattleAnimCmd_Sound: ; cc7cd (33:47cd)
 	callfar PlayStereoSFX
 
 	ret
-; cc7f8 (33:47f8)
 
-.GetPanning: ; cc7f8
+.GetPanning:
 	db $f0, $0f, $f0, $0f
-; cc7fc
 
-.GetCryTrack: ; cc7fc (33:47fc)
+.GetCryTrack:
 	ld a, [hBattleTurn]
 	and a
 	jr nz, .enemy
@@ -1241,7 +1206,7 @@ BattleAnimCmd_Sound: ; cc7cd (33:47cd)
 	xor 1
 	ret
 
-BattleAnimCmd_Cry: ; cc807 (33:4807)
+BattleAnimCmd_Cry:
 	call GetBattleAnimByte
 	maskbits NUM_NOISE_CHANS
 	ld e, a
@@ -1315,18 +1280,15 @@ endr
 	pop af
 	ld [rSVBK], a
 	ret
-; cc871 (33:4871)
 
-.CryData: ; cc871
+.CryData:
 ; +pitch, +length
 	dw $0000, $00c0
 	dw $0000, $0040
 	dw $0000, $0000
 	dw $0000, $0000
-; cc881
-
 
-PlayHitSound: ; cc881
+PlayHitSound:
 	ld a, [wNumHits]
 	cp $1
 	jr z, .okay
@@ -1338,7 +1300,7 @@ PlayHitSound: ; cc881
 	and $7f
 	ret z
 
-	cp 10
+	cp EFFECTIVE
 	ld de, SFX_DAMAGE
 	jr z, .play
 
@@ -1350,9 +1312,8 @@ PlayHitSound: ; cc881
 .play
 	call PlaySFX
 	ret
-; cc8a4
 
-BattleAnimAssignPals: ; cc8a4
+BattleAnimAssignPals:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
@@ -1378,9 +1339,8 @@ BattleAnimAssignPals: ; cc8a4
 	lb de, %11100100, %11100100
 	call DmgToCgbObjPals
 	ret
-; cc8d3
 
-ClearBattleAnims: ; cc8d3
+ClearBattleAnims:
 ; Clear animation block
 	ld hl, wLYOverrides
 	ld bc, wBattleAnimEnd - wLYOverrides
@@ -1403,9 +1363,8 @@ ClearBattleAnims: ; cc8d3
 	call BattleAnimAssignPals
 	call BattleAnimDelayFrame
 	ret
-; cc8f6
 
-BattleAnim_RevertPals: ; cc8f6
+BattleAnim_RevertPals:
 	call WaitTop
 	ld a, %11100100
 	ld [wBGP], a
@@ -1421,9 +1380,8 @@ BattleAnim_RevertPals: ; cc8f6
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; cc91a
 
-BattleAnim_SetBGPals: ; cc91a
+BattleAnim_SetBGPals:
 	ld [rBGP], a
 	ld a, [hCGB]
 	and a
@@ -1449,9 +1407,8 @@ BattleAnim_SetBGPals: ; cc91a
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; cc94b
 
-BattleAnim_SetOBPals: ; cc94b
+BattleAnim_SetOBPals:
 	ld [rOBP0], a
 	ld a, [hCGB]
 	and a
@@ -1471,9 +1428,8 @@ BattleAnim_SetOBPals: ; cc94b
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; cc96e
 
-BattleAnim_UpdateOAM_All: ; cc96e
+BattleAnim_UpdateOAM_All:
 	ld a, $0
 	ld [wBattleAnimOAMPointerLo], a
 	ld hl, wActiveAnimObjects
@@ -1510,4 +1466,3 @@ BattleAnim_UpdateOAM_All: ; cc96e
 
 .done
 	ret
-; cc9a1
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm
index 3192774dd..e5e186ab7 100644
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -8,7 +8,7 @@
 
 ; BG effects for use in battle animations.
 
-ExecuteBGEffects: ; c8000 (32:4000)
+ExecuteBGEffects:
 	ld hl, wActiveBGEffects
 	ld e, 5
 .loop
@@ -29,7 +29,7 @@ ExecuteBGEffects: ; c8000 (32:4000)
 	jr nz, .loop
 	ret
 
-QueueBGEffect: ; c801a (32:401a)
+QueueBGEffect:
 	ld hl, wActiveBGEffects
 	ld e, 5
 .loop
@@ -58,13 +58,13 @@ QueueBGEffect: ; c801a (32:401a)
 	ld [hl], a
 	ret
 
-EndBattleBGEffect: ; c8043 (32:4043)
+EndBattleBGEffect:
 	ld hl, BG_EFFECT_STRUCT_FUNCTION
 	add hl, bc
 	ld [hl], 0
 	ret
 
-DoBattleBGEffectFunction: ; c804a (32:404a)
+DoBattleBGEffectFunction:
 	ld hl, BG_EFFECT_STRUCT_FUNCTION
 	add hl, bc
 	ld e, [hl]
@@ -77,7 +77,7 @@ DoBattleBGEffectFunction: ; c804a (32:404a)
 	ld l, a
 	jp hl
 
-BattleBGEffects: ; c805a (32:405a)
+BattleBGEffects:
 ; entries correspond to ANIM_BG_* constants
 	dw BattleBGEffect_End
 	dw BattleBGEffect_FlashInverted
@@ -134,12 +134,11 @@ BattleBGEffects: ; c805a (32:405a)
 	dw BattleBGEffect_WobbleMon
 	dw BattleBGEffect_35
 
-
-BattleBGEffect_End: ; c80c6 (32:40c6)
+BattleBGEffect_End:
 	call EndBattleBGEffect
 	ret
 
-BatttleBGEffects_GetNamedJumptablePointer: ; c80ca (32:40ca)
+BatttleBGEffects_GetNamedJumptablePointer:
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
 	add hl, bc
 	ld l, [hl]
@@ -151,7 +150,7 @@ BatttleBGEffects_GetNamedJumptablePointer: ; c80ca (32:40ca)
 	ld l, a
 	ret
 
-BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7)
+BattleBGEffects_AnonJumptable:
 	pop de
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
 	add hl, bc
@@ -164,31 +163,29 @@ BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7)
 	ld l, a
 	jp hl
 
-BattleBGEffects_IncrementJumptable: ; c80e5 (32:40e5)
+BattleBGEffects_IncrementJumptable:
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
 	add hl, bc
 	inc [hl]
 	ret
 
-BattleBGEffect_FlashInverted: ; c80eb (32:40eb)
+BattleBGEffect_FlashInverted:
 	ld de, .inverted
 	jp BattleBGEffect_FlashContinue
 
 .inverted
 	db %11100100 ; 3210
 	db %00011011 ; 0123
-; c80f3
 
-BattleBGEffect_FlashWhite: ; c80f3 (32:40f3)
+BattleBGEffect_FlashWhite:
 	ld de, .white
 	jp BattleBGEffect_FlashContinue
 
 .white
 	db %11100100 ; 3210
 	db %00000000 ; 0000
-; c80fb
 
-BattleBGEffect_FlashContinue: ; c80fb (32:40fb)
+BattleBGEffect_FlashContinue:
 ; current timer, flash duration, number of flashes
 	ld a, $1
 	ld [wBattleAnimTemp0], a
@@ -226,7 +223,7 @@ BattleBGEffect_FlashContinue: ; c80fb (32:40fb)
 	ld [wBGP], a
 	ret
 
-BattleBGEffect_WhiteHues: ; c812d (32:412d)
+BattleBGEffect_WhiteHues:
 	ld de, .Pals
 	call BattleBGEffect_GetNthDMGPal
 	jr c, .quit
@@ -242,9 +239,8 @@ BattleBGEffect_WhiteHues: ; c812d (32:412d)
 	db %11100000
 	db %11010000
 	db -1
-; c8141
 
-BattleBGEffect_BlackHues: ; c8141 (32:4141)
+BattleBGEffect_BlackHues:
 	ld de, .Pals
 	call BattleBGEffect_GetNthDMGPal
 	jr c, .quit
@@ -260,9 +256,8 @@ BattleBGEffect_BlackHues: ; c8141 (32:4141)
 	db %11110100
 	db %11111000
 	db -1
-; c8155
 
-BattleBGEffect_AlternateHues: ; c8155 (32:4155)
+BattleBGEffect_AlternateHues:
 	ld de, .Pals
 	call BattleBGEffect_GetNthDMGPal
 	jr c, .quit
@@ -284,9 +279,8 @@ BattleBGEffect_AlternateHues: ; c8155 (32:4155)
 	db %01000000
 	db %10010000
 	db -2
-; c8171
 
-BattleBGEffect_06: ; c8171 (32:4171)
+BattleBGEffect_06:
 	call BattleBGEffects_CheckSGB
 	jr nz, .sgb
 	ld de, .PalsCGB
@@ -308,9 +302,8 @@ BattleBGEffect_06: ; c8171 (32:4171)
 	db %11110000
 	db %11000000
 	db -2
-; c818b
 
-BattleBGEffect_07: ; c818b (32:418b)
+BattleBGEffect_07:
 	call BattleBGEffects_CheckSGB
 	jr nz, .sgb
 	ld de, .PalsCGB
@@ -332,9 +325,8 @@ BattleBGEffect_07: ; c818b (32:418b)
 	db %11110000
 	db %11001100
 	db -2
-; c81a5
 
-BattleBGEffect_08: ; c81a5 (32:41a5)
+BattleBGEffect_08:
 	ld de, .Pals
 	call BattleBGEffect_GetNthDMGPal
 	ld [wBGP], a
@@ -345,9 +337,8 @@ BattleBGEffect_08: ; c81a5 (32:41a5)
 	db %01100011
 	db %10000111
 	db -2
-; c81b3
 
-BattleBGEffect_HideMon: ; c81b3 (32:41b3)
+BattleBGEffect_HideMon:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -356,7 +347,6 @@ BattleBGEffect_HideMon: ; c81b3 (32:41b3)
 	dw BattleBGEffects_IncrementJumptable
 	dw .four
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	push bc
@@ -384,7 +374,7 @@ BattleBGEffect_HideMon: ; c81b3 (32:41b3)
 	call EndBattleBGEffect
 	ret
 
-BattleBGEffect_ShowMon: ; c81ea (32:41ea)
+BattleBGEffect_ShowMon:
 	call BGEffect_CheckFlyDigStatus
 	jr z, .not_flying
 	call EndBattleBGEffect
@@ -412,9 +402,8 @@ BattleBGEffect_ShowMon: ; c81ea (32:41ea)
 .EnemyData:
 	db  3, $00, 3
 	db -1
-; c8214
 
-BattleBGEffect_FeetFollow: ; c8214 (32:4214)
+BattleBGEffect_FeetFollow:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -424,7 +413,6 @@ BattleBGEffect_FeetFollow: ; c8214 (32:4214)
 	dw BattleBGEffects_IncrementJumptable
 	dw .five
 
-
 .zero
 	call BGEffect_CheckFlyDigStatus
 	jr z, .not_flying_digging
@@ -482,7 +470,7 @@ BattleBGEffect_FeetFollow: ; c8214 (32:4214)
 	call EndBattleBGEffect
 	ret
 
-BattleBGEffect_HeadFollow: ; c8281 (32:4281)
+BattleBGEffect_HeadFollow:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -492,7 +480,6 @@ BattleBGEffect_HeadFollow: ; c8281 (32:4281)
 	dw BattleBGEffects_IncrementJumptable
 	dw .five
 
-
 .zero
 	call BGEffect_CheckFlyDigStatus
 	jr z, .not_flying_digging
@@ -550,11 +537,11 @@ BattleBGEffect_HeadFollow: ; c8281 (32:4281)
 	call EndBattleBGEffect
 	ret
 
-_QueueBattleAnimation: ; c82ee (32:42ee)
+_QueueBattleAnimation:
 	callfar QueueBattleAnimation
 	ret
 
-BattleBGEffect_27: ; c82f5 (32:42f5)
+BattleBGEffect_27:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -563,7 +550,6 @@ BattleBGEffect_27: ; c82f5 (32:42f5)
 	dw BattleBGEffects_IncrementJumptable
 	dw .four
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BGEffect_CheckBattleTurn
@@ -655,7 +641,7 @@ BattleBGEffect_27: ; c82f5 (32:42f5)
 	call EndBattleBGEffect
 	ret
 
-BattleBGEffect_EnterMon: ; c837b (32:437b)
+BattleBGEffect_EnterMon:
 	call BGEffect_CheckBattleTurn
 	jr nz, .player_turn
 	ld de, .EnemyData
@@ -681,9 +667,8 @@ BattleBGEffect_EnterMon: ; c837b (32:437b)
 	db  4, $00, 4
 	db  3, $00, 3
 	db -1
-; c83a8
 
-BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
+BattleBGEffect_ReturnMon:
 	call BGEffect_CheckBattleTurn
 	jr nz, .player_turn
 	ld de, .EnemyData
@@ -717,9 +702,8 @@ BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
 	db -2, $33, 5
 	db -3, $00, 0
 	db -1
-; c83ed
 
-BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed)
+BattleBGEffect_RunPicResizeScript:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -728,7 +712,6 @@ BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed)
 	dw .restart
 	dw .end
 
-
 .zero
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
@@ -918,16 +901,14 @@ ENDM
 	db $00, $15, $2a
 	db $03, $18, $2d
 	db $06, $1b, $30
-; c8545
 
-BattleBGEffect_Surf: ; c8545 (32:4545)
+BattleBGEffect_Surf:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	lb de, 2, 2
@@ -987,14 +968,13 @@ BattleBGEffect_Surf: ; c8545 (32:4545)
 	jr c, .loop2
 	ret
 
-BattleBGEffect_Whirlpool: ; c8599 (32:4599)
+BattleBGEffect_Whirlpool:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1016,14 +996,14 @@ BattleBGEffect_Whirlpool: ; c8599 (32:4599)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_30: ; c85c2 (32:45c2)
+BattleBGEffect_30:
 	call BattleBGEffects_ClearLYOverrides
 	ld a, rSCY - $ff00
 	call BattleBGEffect_SetLCDStatCustoms1
 	call EndBattleBGEffect
 	ret
 
-BattleBGEffect_31: ; c85ce (32:45ce)
+BattleBGEffect_31:
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
@@ -1057,18 +1037,17 @@ BattleBGEffect_31: ; c85ce (32:45ce)
 	call EndBattleBGEffect
 	ret
 
-BattleBGEffect_32: ; c8603 (32:4603)
+BattleBGEffect_32:
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_Psychic: ; c8607 (32:4607)
+BattleBGEffect_Psychic:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1099,14 +1078,13 @@ BattleBGEffect_Psychic: ; c8607 (32:4607)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_Teleport: ; c863f (32:463f)
+BattleBGEffect_Teleport:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1124,14 +1102,13 @@ BattleBGEffect_Teleport: ; c863f (32:463f)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_NightShade: ; c8662 (32:4662)
+BattleBGEffect_NightShade:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1152,7 +1129,7 @@ BattleBGEffect_NightShade: ; c8662 (32:4662)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
+BattleBGEffect_DoubleTeam:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1162,7 +1139,6 @@ BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
 	dw .four
 	dw .five
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1247,14 +1223,13 @@ BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_AcidArmor: ; c8709 (32:4709)
+BattleBGEffect_AcidArmor:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1310,14 +1285,13 @@ BattleBGEffect_AcidArmor: ; c8709 (32:4709)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_Withdraw: ; c8761 (32:4761)
+BattleBGEffect_Withdraw:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1359,7 +1333,7 @@ BattleBGEffect_Withdraw: ; c8761 (32:4761)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_Dig: ; c87a7 (32:47a7)
+BattleBGEffect_Dig:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1367,7 +1341,6 @@ BattleBGEffect_Dig: ; c87a7 (32:47a7)
 	dw .two
 	dw .three
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1426,7 +1399,7 @@ BattleBGEffect_Dig: ; c87a7 (32:47a7)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_Tackle: ; c8805 (32:4805)
+BattleBGEffect_Tackle:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1434,7 +1407,6 @@ BattleBGEffect_Tackle: ; c8805 (32:4805)
 	dw Tackle_BGEffect25_2d_two
 	dw .three
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1461,7 +1433,7 @@ BattleBGEffect_Tackle: ; c8805 (32:4805)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_25: ; c8837 (32:4837)
+BattleBGEffect_25:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1469,7 +1441,6 @@ BattleBGEffect_25: ; c8837 (32:4837)
 	dw Tackle_BGEffect25_2d_two
 	dw .three
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1537,7 +1508,7 @@ Tackle_BGEffect25_2d_two:
 	ld [hl], a
 	ret
 
-Functionc88a5: ; c88a5 (32:48a5)
+Functionc88a5:
 	push af
 	ld a, [wFXAnimID + 1] ; FXAnimID + 1
 	or a
@@ -1589,7 +1560,7 @@ Functionc88a5: ; c88a5 (32:48a5)
 	jr nz, .loop
 	ret
 
-BattleBGEffect_2d: ; c88e7 (32:48e7)
+BattleBGEffect_2d:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw BGEffect2d_2f_zero
@@ -1597,7 +1568,6 @@ BattleBGEffect_2d: ; c88e7 (32:48e7)
 	dw Tackle_BGEffect25_2d_two
 	dw .three
 
-
 .three
 	call BattleAnim_ResetLCDStatCustom
 	ret
@@ -1624,7 +1594,7 @@ BGEffect2d_2f_zero:
 	ld [hl], a
 	ret
 
-BattleBGEffect_2f: ; c8919 (32:4919)
+BattleBGEffect_2f:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw BGEffect2d_2f_zero
@@ -1638,14 +1608,13 @@ BattleBGEffect_2f: ; c8919 (32:4919)
 .two
 	ret
 
-BattleBGEffect_26: ; c892a (32:492a)
+BattleBGEffect_26:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1677,14 +1646,13 @@ BattleBGEffect_26: ; c892a (32:492a)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_2c: ; c8964 (32:4964)
+BattleBGEffect_2c:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1732,14 +1700,13 @@ BattleBGEffect_2c: ; c8964 (32:4964)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_28: ; c89b5 (32:49b5)
+BattleBGEffect_28:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1775,14 +1742,13 @@ BattleBGEffect_28: ; c89b5 (32:49b5)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_BounceDown: ; c89ee (32:49ee)
+BattleBGEffect_BounceDown:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1826,7 +1792,7 @@ BattleBGEffect_BounceDown: ; c89ee (32:49ee)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_2a: ; c8a3a (32:4a3a)
+BattleBGEffect_2a:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1933,15 +1899,13 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
 .data
 	db $00, $40, $90, $e4
 	db -1
-; c8acc
 
-BattleBGEffect_2b: ; c8acc (32:4acc)
+BattleBGEffect_2b:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1972,7 +1936,7 @@ BattleBGEffect_2b: ; c8acc (32:4acc)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_1c: ; c8b00 (32:4b00)
+BattleBGEffect_1c:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
@@ -1982,7 +1946,6 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	ld a, $e4
@@ -2130,97 +2093,86 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
 	db $90, $f8
 	db $40, $fc
 	db $90, $f8
-; c8be8
 
-BattleBGEffect_RapidFlash: ; c8be8 (32:4be8)
+BattleBGEffect_RapidFlash:
 	ld de, .FlashPals
 	call BGEffect_RapidCyclePals
 	ret
 
 .FlashPals:
 	db $e4, $6c, $fe
-; c8bf2
 
-BattleBGEffect_16: ; c8bf2 (32:4bf2)
+BattleBGEffect_16:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
 
 .Pals:
 	db $e4, $90, $40, $ff
-; c8bfd
 
-BattleBGEffect_17: ; c8bfd (32:4bfd)
+BattleBGEffect_17:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
 
 .Pals:
 	db $e4, $f8, $fc, $ff
-; c8c08
 
-BattleBGEffect_18: ; c8c08 (32:4c08)
+BattleBGEffect_18:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
 
 .Pals:
 	db $e4, $90, $40, $90, $fe
-; c8c14
 
-BattleBGEffect_19: ; c8c14 (32:4c14)
+BattleBGEffect_19:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
 
 .Pals:
 	db $e4, $f8, $fc, $f8, $fe
-; c8c20
 
-BattleBGEffect_1a: ; c8c20 (32:4c20)
+BattleBGEffect_1a:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
 
 .Pals:
 	db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe
-; c8c30
 
-BattleBGEffect_1b: ; c8c30 (32:4c30)
+BattleBGEffect_1b:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
 
 .Pals:
 	db $e4, $fc, $e4, $00, $fe
-; c8c3c
 
-BattleBGEffect_1d: ; c8c3c (32:4c3c)
+BattleBGEffect_1d:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
 
 .Pals:
 	db $e4, $90, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $90, $e4, $ff
-; c8c55
 
-BattleBGEffect_1e: ; c8c55 (32:4c55)
+BattleBGEffect_1e:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
 
 .Pals:
 	db $00, $40, $90, $e4, $ff
-; c8c61
 
-BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
+BattleBGEffect_VibrateMon:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 
-
-.zero ; c8c68 (32:4c68)
+.zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
 	ld a, rSCX - $ff00
@@ -2236,7 +2188,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
 	ld [hl], $20
 	ret
 
-.one ; c8c85 (32:4c85)
+.one
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
@@ -2258,15 +2210,14 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
+BattleBGEffect_WobbleMon:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 
-
-.zero ; c8cab (32:4cab)
+.zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
 	ld a, rSCX - $ff00
@@ -2280,7 +2231,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
 	ld [hl], $0
 	ret
 
-.one ; c8cc3 (32:4cc3)
+.one
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
@@ -2296,11 +2247,11 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
 	ld [hl], a
 	ret
 
-.two ; c8cdd (32:4cdd)
+.two
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_2e: ; c8ce1 (32:4ce1)
+BattleBGEffect_2e:
 	call Functionc8d0b
 	jr c, .xor_a
 	bit 7, a
@@ -2317,7 +2268,7 @@ BattleBGEffect_2e: ; c8ce1 (32:4ce1)
 	ld [wAnimObject01YOffset], a
 	ret
 
-BattleBGEffect_1f: ; c8cf9 (32:4cf9)
+BattleBGEffect_1f:
 	call Functionc8d0b
 	jr nc, .skip
 	xor a
@@ -2325,7 +2276,7 @@ BattleBGEffect_1f: ; c8cf9 (32:4cf9)
 	ld [hSCX], a
 	ret
 
-BattleBGEffect_20: ; c8d02 (32:4d02)
+BattleBGEffect_20:
 	call Functionc8d0b
 	jr nc, .skip
 	xor a
@@ -2333,7 +2284,7 @@ BattleBGEffect_20: ; c8d02 (32:4d02)
 	ld [hSCY], a
 	ret
 
-Functionc8d0b: ; c8d0b (32:4d0b)
+Functionc8d0b:
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
 	add hl, bc
 	ld a, [hl]
@@ -2371,7 +2322,7 @@ Functionc8d0b: ; c8d0b (32:4d0b)
 	and a
 	ret
 
-BattleBGEffect_35: ; c8d3a (32:4d3a)
+BattleBGEffect_35:
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
@@ -2392,7 +2343,7 @@ BattleBGEffect_35: ; c8d3a (32:4d3a)
 	ld [hSCX], a
 	ret
 
-BattleBGEffect_GetNthDMGPal: ; c8d57 (32:4d57)
+BattleBGEffect_GetNthDMGPal:
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
 	add hl, bc
 	ld a, [hl]
@@ -2415,7 +2366,7 @@ BattleBGEffect_GetNthDMGPal: ; c8d57 (32:4d57)
 	call BattleBGEffect_GetFirstDMGPal
 	ret
 
-BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
+BGEffect_RapidCyclePals:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
@@ -2430,8 +2381,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	dw .one_dmg
 	dw .two_dmg
 
-
-.zero_dmg ; c8d8b (32:4d8b)
+.zero_dmg
 	call BattleBGEffects_IncrementJumptable
 	ld a, $e4
 	call BattleBGEffects_SetLYOverrides
@@ -2449,7 +2399,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	ld [hl], a
 	ret
 
-.one_dmg ; c8daa (32:4daa)
+.one_dmg
 	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
@@ -2474,7 +2424,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	dec [hl]
 	ret
 
-.two_dmg ; c8dc9 (32:4dc9)
+.two_dmg
 	call BattleBGEffects_ResetVideoHRAM
 	ld a, %11100100
 	ld [rBGP], a
@@ -2488,15 +2438,14 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	pop de
 	jp hl
 
-.Jumptable_CGB: ; c8ddd (32:4ddd)
+.Jumptable_CGB:
 	dw .zero_cgb
 	dw .one_cgb
 	dw .two_cgb
 	dw .three_cgb
 	dw .four_cgb
 
-
-.zero_cgb ; c8de7 (32:4de7)
+.zero_cgb
 	call BGEffect_CheckBattleTurn
 	jr nz, .player_turn_cgb
 	call BattleBGEffects_IncrementJumptable
@@ -2512,7 +2461,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	ld [hl], a
 	ret
 
-.one_cgb ; c8e02 (32:4e02)
+.one_cgb
 	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
@@ -2537,13 +2486,13 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	dec [hl]
 	ret
 
-.two_cgb ; c8e21 (32:4e21)
+.two_cgb
 	ld a, $e4
 	call BGEffects_LoadBGPal0_OBPal1
 	call EndBattleBGEffect
 	ret
 
-.three_cgb ; c8e2a (32:4e2a)
+.three_cgb
 	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hl]
@@ -2568,13 +2517,13 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
 	dec [hl]
 	ret
 
-.four_cgb ; c8e49 (32:4e49)
+.four_cgb
 	ld a, $e4
 	call BGEffects_LoadBGPal1_OBPal0
 	call EndBattleBGEffect
 	ret
 
-BGEffects_LoadBGPal0_OBPal1: ; c8e52 (32:4e52)
+BGEffects_LoadBGPal0_OBPal1:
 	ld h, a
 	ld a, [rSVBK]
 	push af
@@ -2601,7 +2550,7 @@ BGEffects_LoadBGPal0_OBPal1: ; c8e52 (32:4e52)
 	ld [hCGBPalUpdate], a
 	ret
 
-BGEffects_LoadBGPal1_OBPal0: ; c8e7f (32:4e7f)
+BGEffects_LoadBGPal1_OBPal0:
 	ld h, a
 	ld a, [rSVBK]
 	push af
@@ -2628,12 +2577,12 @@ BGEffects_LoadBGPal1_OBPal0: ; c8e7f (32:4e7f)
 	ld [hCGBPalUpdate], a
 	ret
 
-BattleBGEffect_GetFirstDMGPal: ; c8eac (32:4eac)
+BattleBGEffect_GetFirstDMGPal:
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
 	inc [hl]
-BattleBGEffect_GetNextDMGPal: ; c8eb2 (32:4eb2)
+BattleBGEffect_GetNextDMGPal:
 	ld l, a
 	ld h, $0
 	add hl, de
@@ -2654,9 +2603,9 @@ BattleBGEffect_GetNextDMGPal: ; c8eb2 (32:4eb2)
 	scf
 	ret
 
-BattleBGEffects_ClearLYOverrides: ; c8eca (32:4eca)
+BattleBGEffects_ClearLYOverrides:
 	xor a
-BattleBGEffects_SetLYOverrides: ; c8ecb (32:4ecb)
+BattleBGEffects_SetLYOverrides:
 	ld hl, wLYOverrides ; wListPointer
 	ld e, $99
 .loop1
@@ -2671,7 +2620,7 @@ BattleBGEffects_SetLYOverrides: ; c8ecb (32:4ecb)
 	jr nz, .loop2
 	ret
 
-BattleBGEffect_SetLCDStatCustoms1: ; c8ede (32:4ede)
+BattleBGEffect_SetLCDStatCustoms1:
 	ld [hLCDCPointer], a
 	call BGEffect_CheckBattleTurn
 	jr nz, .player_turn
@@ -2687,7 +2636,7 @@ BattleBGEffect_SetLCDStatCustoms1: ; c8ede (32:4ede)
 	ld [hLYOverrideEnd], a
 	ret
 
-BattleBGEffect_SetLCDStatCustoms2: ; c8ef4 (32:4ef4)
+BattleBGEffect_SetLCDStatCustoms2:
 	ld [hLCDCPointer], a
 	call BGEffect_CheckBattleTurn
 	jr nz, .player_turn
@@ -2703,7 +2652,7 @@ BattleBGEffect_SetLCDStatCustoms2: ; c8ef4 (32:4ef4)
 	ld [hLYOverrideEnd], a
 	ret
 
-BattleAnim_ResetLCDStatCustom: ; c8f0a (32:4f0a)
+BattleAnim_ResetLCDStatCustom:
 	xor a
 	ld [hLYOverrideStart], a
 	ld [hLYOverrideEnd], a
@@ -2713,7 +2662,7 @@ BattleAnim_ResetLCDStatCustom: ; c8f0a (32:4f0a)
 	call EndBattleBGEffect
 	ret
 
-BattleBGEffects_ResetVideoHRAM: ; c8f19 (32:4f19)
+BattleBGEffects_ResetVideoHRAM:
 	xor a
 	ld [hLCDCPointer], a
 	ld a, %11100100
@@ -2725,7 +2674,7 @@ BattleBGEffects_ResetVideoHRAM: ; c8f19 (32:4f19)
 	call BattleBGEffects_ClearLYOverrides
 	ret
 
-Functionc8f2e: ; c8f2e (32:4f2e)
+Functionc8f2e:
 	push bc
 	xor a
 	ld [wBattleAnimTemp0], a
@@ -2760,7 +2709,7 @@ Functionc8f2e: ; c8f2e (32:4f2e)
 	pop bc
 	ret
 
-InitSurfWaves: ; c8f69 (32:4f69)
+InitSurfWaves:
 	push bc
 	xor a
 	ld [wBattleAnimTemp0], a
@@ -2788,7 +2737,7 @@ InitSurfWaves: ; c8f69 (32:4f69)
 	pop bc
 	ret
 
-Functionc8f9a: ; c8f9a (32:4f9a)
+Functionc8f9a:
 	push bc
 	ld [wBattleAnimTemp3], a
 	ld a, e
@@ -2847,7 +2796,7 @@ Functionc8f9a: ; c8f9a (32:4f9a)
 	ld d, $0
 	ret
 
-BattleBGEffect_WavyScreenFX: ; c8fef (32:4fef)
+BattleBGEffect_WavyScreenFX:
 	push bc
 	ld a, [hLYOverrideStart]
 	ld l, a
@@ -2874,7 +2823,7 @@ BattleBGEffect_WavyScreenFX: ; c8fef (32:4fef)
 	pop bc
 	ret
 
-BGEffect_FillLYOverridesBackup: ; c900b (32:500b)
+BGEffect_FillLYOverridesBackup:
 	push af
 	ld h, HIGH(wLYOverridesBackup)
 	ld a, [hLYOverrideStart]
@@ -2889,7 +2838,7 @@ BGEffect_FillLYOverridesBackup: ; c900b (32:500b)
 	jr nz, .loop
 	ret
 
-BGEffect_DisplaceLYOverridesBackup: ; c901b (32:501b)
+BGEffect_DisplaceLYOverridesBackup:
 	; e = a; d = [hLYOverrideEnd] - [hLYOverrideStart] - a
 	push af
 	ld e, a
@@ -2915,7 +2864,7 @@ BGEffect_DisplaceLYOverridesBackup: ; c901b (32:501b)
 	jr nz, .loop2
 	ret
 
-BGEffect_CheckBattleTurn: ; c9038 (32:5038)
+BGEffect_CheckBattleTurn:
 	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hBattleTurn]
@@ -2923,7 +2872,7 @@ BGEffect_CheckBattleTurn: ; c9038 (32:5038)
 	xor [hl]
 	ret
 
-BGEffect_CheckFlyDigStatus: ; c9042 (32:5042)
+BGEffect_CheckFlyDigStatus:
 	ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
 	add hl, bc
 	ld a, [hBattleTurn]
@@ -2939,21 +2888,19 @@ BGEffect_CheckFlyDigStatus: ; c9042 (32:5042)
 	and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
 	ret
 
-BattleBGEffects_CheckSGB: ; c9059 (32:5059)
+BattleBGEffects_CheckSGB:
 	ld a, [hSGB]
 	and a
 	ret
 
-BattleBGEffects_Sine: ; c905d (32:505d)
+BattleBGEffects_Sine:
 	ld e, a
 	callfar BattleAnim_Sine_e
 	ld a, e
 	ret
 
-BattleBGEffects_Cosine: ; c9066 (32:5066)
+BattleBGEffects_Cosine:
 	ld e, a
 	callfar BattleAnim_Cosine_e
 	ld a, e
 	ret
-
-; c906f (32:506f)
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm
index 11578f7f0..0f3bb8488 100755..100644
--- a/engine/battle_anims/core.asm
+++ b/engine/battle_anims/core.asm
@@ -1,4 +1,4 @@
-QueueBattleAnimation: ; cc9a1 (33:49a1)
+QueueBattleAnimation:
 	ld hl, wActiveAnimObjects
 	ld e, 10
 .loop
@@ -20,15 +20,13 @@ QueueBattleAnimation: ; cc9a1 (33:49a1)
 	call InitBattleAnimation
 	ret
 
-DeinitBattleAnimation: ; cc9bd
+DeinitBattleAnimation:
 	ld hl, BATTLEANIMSTRUCT_INDEX
 	add hl, bc
 	ld [hl], $0
 	ret
 
-; cc9c4
-
-InitBattleAnimation: ; cc9c4 (33:49c4)
+InitBattleAnimation:
 	ld a, [wBattleAnimTemp0]
 	ld e, a
 	ld d, 0
@@ -79,7 +77,7 @@ endr
 	ld [hl], a  ; 10
 	ret
 
-BattleAnimOAMUpdate: ; cca09
+BattleAnimOAMUpdate:
 	call InitBattleAnimBuffer
 	call GetBattleAnimFrame
 	cp -3
@@ -191,9 +189,7 @@ BattleAnimOAMUpdate: ; cca09
 	scf
 	ret
 
-; ccaaa
-
-InitBattleAnimBuffer: ; ccaaa
+InitBattleAnimBuffer:
 	ld hl, BATTLEANIMSTRUCT_01
 	add hl, bc
 	ld a, [hl]
@@ -276,9 +272,7 @@ InitBattleAnimBuffer: ; ccaaa
 	ld [wBattleAnimTempXOffset], a
 	ret
 
-; ccb31
-
-GetBattleAnimTileOffset: ; ccb31 (33:4b31)
+GetBattleAnimTileOffset:
 	push hl
 	push bc
 	ld hl, wBattleAnimTileDict
@@ -301,14 +295,10 @@ GetBattleAnimTileOffset: ; ccb31 (33:4b31)
 	pop hl
 	ret
 
-_ExecuteBGEffects: ; ccb48
+_ExecuteBGEffects:
 	callfar ExecuteBGEffects
 	ret
 
-; ccb4f
-
-_QueueBGEffect: ; ccb4f (33:4b4f)
+_QueueBGEffect:
 	callfar QueueBGEffect
 	ret
-
-; ccb56 (33:4b56)
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm
index e747feeef..d631ca72f 100755..100644
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -1,4 +1,4 @@
-DoBattleAnimFrame: ; ccfbe
+DoBattleAnimFrame:
 	ld hl, BATTLEANIMSTRUCT_FUNCTION
 	add hl, bc
 	ld e, [hl]
@@ -10,7 +10,6 @@ DoBattleAnimFrame: ; ccfbe
 	ld h, [hl]
 	ld l, a
 	jp hl
-; ccfce
 
 .Jumptable:
 ; entries correspond to BATTLEANIMFUNC_* constants
@@ -95,7 +94,7 @@ DoBattleAnimFrame: ; ccfbe
 	dw BattleAnimFunction_4E ; 4e
 	dw BattleAnimFunction_4F ; 4f
 
-BattleAnimFunction_Null: ; cd06e (33:506e)
+BattleAnimFunction_Null:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -105,13 +104,13 @@ BattleAnimFunction_Null: ; cd06e (33:506e)
 .zero
 	ret
 
-BattleAnimFunction_ThrowFromPlayerToEnemyAndDisappear: ; cd079 (33:5079)
+BattleAnimFunction_ThrowFromPlayerToEnemyAndDisappear:
 	call BattleAnimFunction_ThrowFromPlayerToEnemy
 	ret c
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_ThrowFromPlayerToEnemy: ; cd081 (33:5081)
+BattleAnimFunction_ThrowFromPlayerToEnemy:
 	; If x coord at $88 or beyond, abort.
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -143,7 +142,7 @@ BattleAnimFunction_ThrowFromPlayerToEnemy: ; cd081 (33:5081)
 	scf
 	ret
 
-BattleAnimFunction_04: ; cd0a6 (33:50a6)
+BattleAnimFunction_04:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -184,7 +183,7 @@ BattleAnimFunction_04: ; cd0a6 (33:50a6)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_03: ; cd0e3 (33:50e3)
+BattleAnimFunction_03:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -230,7 +229,7 @@ BattleAnimFunction_03: ; cd0e3 (33:50e3)
 	inc [hl]
 	ret
 
-BattleAnimFunction_01: ; cd12a (33:512a)
+BattleAnimFunction_01:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -251,7 +250,7 @@ BattleAnimFunction_01: ; cd12a (33:512a)
 	call Functionce70a
 	ret
 
-BattleAnimFunction_02: ; cd146 (33:5146)
+BattleAnimFunction_02:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -267,7 +266,7 @@ BattleAnimFunction_02: ; cd146 (33:5146)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_PokeBall: ; cd15c (33:515c)
+BattleAnimFunction_PokeBall:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -384,7 +383,7 @@ BattleAnimFunction_PokeBall: ; cd15c (33:515c)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_PokeBallBlocked: ; cd212 (33:5212)
+BattleAnimFunction_PokeBallBlocked:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -424,7 +423,7 @@ BattleAnimFunction_PokeBallBlocked: ; cd212 (33:5212)
 	call DeinitBattleAnimation
 	ret
 
-GetBallAnimPal: ; cd249 (33:5249)
+GetBallAnimPal:
 	ld hl, BallColors
 	ld a, [rSVBK]
 	push af
@@ -449,11 +448,10 @@ GetBallAnimPal: ; cd249 (33:5249)
 	add hl, bc
 	ld [hl], a
 	ret
-; cd26c (33:526c)
 
 INCLUDE "data/battle_anims/ball_colors.asm"
 
-BattleAnimFunction_10: ; cd284 (33:5284)
+BattleAnimFunction_10:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -495,7 +493,7 @@ BattleAnimFunction_10: ; cd284 (33:5284)
 .four
 	ret
 
-BattleAnimFunction_07: ; cd2be (33:52be)
+BattleAnimFunction_07:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -542,7 +540,7 @@ BattleAnimFunction_07: ; cd2be (33:52be)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_08: ; cd306 (33:5306)
+BattleAnimFunction_08:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -654,7 +652,7 @@ BattleAnimFunction_08: ; cd306 (33:5306)
 	jr nz, .loop
 	ret
 
-BattleAnimFunction_09: ; cd3ae (33:53ae)
+BattleAnimFunction_09:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -702,7 +700,7 @@ BattleAnimFunction_09: ; cd3ae (33:53ae)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_0A: ; cd3f2 (33:53f2)
+BattleAnimFunction_0A:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -798,7 +796,7 @@ BattleAnimFunction_0A: ; cd3f2 (33:53f2)
 .six
 	ret
 
-BattleAnimFunction_RazorLeaf: ; cd478 (33:5478)
+BattleAnimFunction_RazorLeaf:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -945,7 +943,7 @@ BattleAnimFunction_RazorLeaf: ; cd478 (33:5478)
 	call Functionce70a
 	ret
 
-Functioncd557: ; cd557 (33:5557)
+Functioncd557:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -983,7 +981,7 @@ Functioncd557: ; cd557 (33:5557)
 	ld de, -$100
 	ret
 
-BattleAnimFunction_4E: ; cd58a (33:558a)
+BattleAnimFunction_4E:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1045,7 +1043,7 @@ BattleAnimFunction_4E: ; cd58a (33:558a)
 	ld [hl], e
 	ret
 
-BattleAnimFunction_0C: ; cd5e9 (33:55e9)
+BattleAnimFunction_0C:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1129,7 +1127,7 @@ BattleAnimFunction_0C: ; cd5e9 (33:55e9)
 	ld [hl], d
 	ret
 
-BattleAnimFunction_0D: ; cd66a (33:566a)
+BattleAnimFunction_0D:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1205,7 +1203,7 @@ BattleAnimFunction_0D: ; cd66a (33:566a)
 	call DeinitBattleAnimation
 	ret
 
-asm_cd6da: ; cd6da (33:56da)
+asm_cd6da:
 	inc a
 	inc a
 	ld [hl], a
@@ -1214,19 +1212,21 @@ asm_cd6da: ; cd6da (33:56da)
 	ld [hLYOverrideStart], a
 	ret
 
-BattleAnimFunction_0E: ; cd6e3 (33:56e3)
+BattleAnimFunction_0E:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncd6ea
 	dw Functioncd6f7
-Functioncd6ea: ; cd6ea (33:56ea)
+
+Functioncd6ea:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, BATTLEANIMFRAMESET_24
 	add [hl] ; offset
 	call ReinitBattleAnimFrameset
-Functioncd6f7: ; cd6f7 (33:56f7)
+
+Functioncd6f7:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1249,16 +1249,17 @@ Functioncd6f7: ; cd6f7 (33:56f7)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_0F: ; cd71a (33:571a)
+BattleAnimFunction_0F:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncd725
 	dw Functioncd728
 	dw Functioncd763
 	dw Functioncd776
-Functioncd725: ; cd725 (33:5725)
+
+Functioncd725:
 	call BattleAnim_IncAnonJumptableIndex
-Functioncd728: ; cd728 (33:5728)
+Functioncd728:
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1292,7 +1293,7 @@ Functioncd728: ; cd728 (33:5728)
 	ld a, [hl]
 	and $1
 	ld [hl], a
-Functioncd763: ; cd763 (33:5763)
+Functioncd763:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -1305,10 +1306,10 @@ Functioncd763: ; cd763 (33:5763)
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, BATTLEANIMFRAMESET_29
 	call ReinitBattleAnimFrameset
-Functioncd776: ; cd776 (33:5776)
+Functioncd776:
 	ret
 
-BattleAnimFunction_11: ; cd777 (33:5777)
+BattleAnimFunction_11:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -1340,12 +1341,13 @@ BattleAnimFunction_11: ; cd777 (33:5777)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_14: ; cd7a4 (33:57a4)
+BattleAnimFunction_14:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncd7ab
 	dw Functioncd7d2
-Functioncd7ab: ; cd7ab (33:57ab)
+
+Functioncd7ab:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -1367,7 +1369,7 @@ Functioncd7ab: ; cd7ab (33:57ab)
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld [hl], $1
-Functioncd7d2: ; cd7d2 (33:57d2)
+Functioncd7d2:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -1407,25 +1409,26 @@ Functioncd7d2: ; cd7d2 (33:57d2)
 	dec [hl]
 	ret
 
-BattleAnimFunction_15: ; cd80c (33:580c)
+BattleAnimFunction_15:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncd81f
 	dw Functioncd817
 	dw Functioncd81f
 	dw Functioncd820
-Functioncd817: ; cd817 (33:5817)
+
+Functioncd817:
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, BATTLEANIMFRAMESET_35
 	call ReinitBattleAnimFrameset
-Functioncd81f: ; cd81f (33:581f)
+Functioncd81f:
 	ret
 
-Functioncd820: ; cd820 (33:5820)
+Functioncd820:
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_16: ; cd824 (33:5824)
+BattleAnimFunction_16:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncd835
@@ -1435,7 +1438,8 @@ BattleAnimFunction_16: ; cd824 (33:5824)
 	dw Functioncd88f
 	dw Functioncd88f
 	dw Functioncd893
-Functioncd835: ; cd835 (33:5835)
+
+Functioncd835:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
@@ -1462,7 +1466,7 @@ Functioncd835: ; cd835 (33:5835)
 	ld a, [hl]
 	and $7f
 	ld [hl], a
-Functioncd860: ; cd860 (33:5860)
+Functioncd860:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -1493,17 +1497,17 @@ Functioncd860: ; cd860 (33:5860)
 	ld a, [hl]
 	and $1f
 	ret nz
-Functioncd88f: ; cd88f (33:588f)
+Functioncd88f:
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-Functioncd893: ; cd893 (33:5893)
+Functioncd893:
 	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
 	add hl, bc
 	ld [hl], $1
 	ret
 
-BattleAnimFunction_17: ; cd89a (33:589a)
+BattleAnimFunction_17:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncd8ab
@@ -1513,7 +1517,8 @@ BattleAnimFunction_17: ; cd89a (33:589a)
 	dw Functioncd8f5
 	dw Functioncd8f5
 	dw Functioncd8f9
-Functioncd8ab: ; cd8ab (33:58ab)
+
+Functioncd8ab:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -1534,7 +1539,8 @@ Functioncd8ab: ; cd8ab (33:58ab)
 	ld a, [hl]
 	and $7f
 	ld [hl], a
-Functioncd8cc: ; cd8cc (33:58cc)
+
+Functioncd8cc:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -1561,29 +1567,31 @@ Functioncd8cc: ; cd8cc (33:58cc)
 	ld a, [hl]
 	and $1f
 	ret nz
-Functioncd8f5: ; cd8f5 (33:58f5)
+
+Functioncd8f5:
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-Functioncd8f9: ; cd8f9 (33:58f9)
+Functioncd8f9:
 	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
 	add hl, bc
 	ld [hl], $1
 	ret
 
-BattleAnimFunction_18: ; cd900 (33:5900)
+BattleAnimFunction_18:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncd907
 	dw Functioncd913
-Functioncd907: ; cd907 (33:5907)
+
+Functioncd907:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld [hl], $28
 	inc hl
 	ld [hl], $0
-Functioncd913: ; cd913 (33:5913)
+Functioncd913:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -1627,7 +1635,7 @@ Functioncd913: ; cd913 (33:5913)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_19: ; cd954 (33:5954)
+BattleAnimFunction_19:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncd961
@@ -1635,16 +1643,17 @@ BattleAnimFunction_19: ; cd954 (33:5954)
 	dw Functioncd96e
 	dw Functioncd96a
 	dw Functioncd97b
-Functioncd961: ; cd961 (33:5961)
+
+Functioncd961:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld [hl], $0
-Functioncd96a: ; cd96a (33:596a)
+Functioncd96a:
 	call Functioncd99a
 	ret
 
-Functioncd96e: ; cd96e (33:596e)
+Functioncd96e:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1653,7 +1662,7 @@ Functioncd96e: ; cd96e (33:596e)
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-Functioncd97b: ; cd97b (33:597b)
+Functioncd97b:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1662,7 +1671,7 @@ Functioncd97b: ; cd97b (33:597b)
 	call DeinitBattleAnimation
 	ret
 
-asm_cd988: ; cd988 (33:5988)
+asm_cd988:
 	call Functioncd99a
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -1675,7 +1684,7 @@ asm_cd988: ; cd988 (33:5988)
 	dec [hl]
 	ret
 
-Functioncd99a: ; cd99a (33:599a)
+Functioncd99a:
 	call Functioncd9f4
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -1735,7 +1744,7 @@ Functioncd99a: ; cd99a (33:599a)
 	ld [hl], a
 	ret
 
-Functioncd9f4: ; cd9f4 (33:59f4)
+Functioncd9f4:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld e, [hl]
@@ -1745,11 +1754,10 @@ Functioncd9f4: ; cd9f4 (33:59f4)
 	ld d, [hl]
 	ret
 
-; cda01 (33:5a01)
-Unknown_cda01: ; cda01
+Unknown_cda01:
 	db 8, 6, 5, 4, 5, 6, 8, 12, 16
-; cda0a
-BattleAnimFunction_1C: ; cda0a (33:5a0a)
+
+BattleAnimFunction_1C:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1778,13 +1786,14 @@ BattleAnimFunction_1C: ; cda0a (33:5a0a)
 	jr nz, .asm_cda2c
 	ret
 
-BattleAnimFunction_1F: ; cda31 (33:5a31)
+BattleAnimFunction_1F:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncda4c
 	dw Functioncda3a
 	dw Functioncda4c
-Functioncda3a: ; cda3a (33:5a3a)
+
+Functioncda3a:
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld a, [hl]
@@ -1794,24 +1803,24 @@ Functioncda3a: ; cda3a (33:5a3a)
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld [hl], $8
-Functioncda4c: ; cda4c (33:5a4c)
+Functioncda4c:
 	ret
 
-BattleAnimFunction_LeechSeed: ; cda4d (33:5a4d)
+BattleAnimFunction_LeechSeed:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 	dw .three
-.zero: ; cda58 (33:5a58)
+.zero:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld [hl], $40
 	ret
 
-.one: ; cda62 (33:5a62)
+.one:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -1827,7 +1836,7 @@ BattleAnimFunction_LeechSeed: ; cda4d (33:5a4d)
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-.two: ; cda7a (33:5a7a)
+.two:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -1840,10 +1849,10 @@ BattleAnimFunction_LeechSeed: ; cda4d (33:5a4d)
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, BATTLEANIMFRAMESET_58
 	call ReinitBattleAnimFrameset
-.three: ; cda8c (33:5a8c)
+.three:
 	ret
 
-Functioncda8d: ; cda8d (33:5a8d)
+Functioncda8d:
 	dec [hl]
 	ld d, $20
 	call BattleAnim_Sine
@@ -1891,20 +1900,21 @@ Functioncda8d: ; cda8d (33:5a8d)
 	dec [hl]
 	ret
 
-BattleAnimFunction_3F: ; cdad6 (33:5ad6)
+BattleAnimFunction_3F:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncdadf
 	dw Functioncdae9
 	dw Functioncdaf9
-Functioncdadf: ; cdadf (33:5adf)
+
+Functioncdadf:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld [hl], $40
 	ret
 
-Functioncdae9: ; cdae9 (33:5ae9)
+Functioncdae9:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -1915,10 +1925,10 @@ Functioncdae9: ; cdae9 (33:5ae9)
 
 .asm_cdaf6
 	call BattleAnim_IncAnonJumptableIndex
-Functioncdaf9: ; cdaf9 (33:5af9)
+Functioncdaf9:
 	ret
 
-BattleAnimFunction_1A: ; cdafa (33:5afa)
+BattleAnimFunction_1A:
 	call BattleAnimFunction_03
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -1927,7 +1937,7 @@ BattleAnimFunction_1A: ; cdafa (33:5afa)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_1B: ; cdb06 (33:5b06)
+BattleAnimFunction_1B:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncdb13
@@ -1935,10 +1945,11 @@ BattleAnimFunction_1B: ; cdb06 (33:5b06)
 	dw Functioncdb28
 	dw Functioncdb50
 	dw Functioncdb65
-Functioncdb13: ; cdb13 (33:5b13)
+
+Functioncdb13:
 	ret
 
-Functioncdb14: ; cdb14 (33:5b14)
+Functioncdb14:
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1954,7 +1965,7 @@ Functioncdb14: ; cdb14 (33:5b14)
 	ld [hl], a
 	ret
 
-Functioncdb28: ; cdb28 (33:5b28)
+Functioncdb28:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1979,7 +1990,7 @@ Functioncdb28: ; cdb28 (33:5b28)
 	dec [hl]
 	ret
 
-Functioncdb50: ; cdb50 (33:5b50)
+Functioncdb50:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -1990,7 +2001,7 @@ Functioncdb50: ; cdb50 (33:5b50)
 	ld hl, BATTLEANIMSTRUCT_DURATION
 	add hl, bc
 	ld [hl], $80
-Functioncdb65: ; cdb65 (33:5b65)
+Functioncdb65:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2009,7 +2020,7 @@ Functioncdb65: ; cdb65 (33:5b65)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_1D: ; cdb80 (33:5b80)
+BattleAnimFunction_1D:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncdb9f
@@ -2026,7 +2037,8 @@ BattleAnimFunction_1D: ; cdb80 (33:5b80)
 	dw Functioncdc48
 	dw Functioncdc57
 	dw Functioncdc74
-Functioncdb9f: ; cdb9f (33:5b9f)
+
+Functioncdb9f:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld [hl], $28
@@ -2040,7 +2052,7 @@ Functioncdb9f: ; cdb9f (33:5b9f)
 	ld [hl], a
 	ret
 
-Functioncdbb3: ; cdbb3 (33:5bb3)
+Functioncdbb3:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2051,7 +2063,7 @@ Functioncdbb3: ; cdbb3 (33:5bb3)
 	call Functioncdc75
 	ret
 
-Functioncdbc1: ; cdbc1 (33:5bc1)
+Functioncdbc1:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2062,7 +2074,7 @@ Functioncdbc1: ; cdbc1 (33:5bc1)
 	call Functioncdc75
 	ret
 
-Functioncdbcf: ; cdbcf (33:5bcf)
+Functioncdbcf:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2081,7 +2093,7 @@ Functioncdbcf: ; cdbcf (33:5bcf)
 	inc [hl]
 	ret
 
-Functioncdbeb: ; cdbeb (33:5beb)
+Functioncdbeb:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -2094,7 +2106,7 @@ Functioncdbeb: ; cdbeb (33:5beb)
 	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
 	add hl, bc
 	dec [hl]
-asm_cdbfa: ; cdbfa (33:5bfa)
+asm_cdbfa:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	inc [hl]
@@ -2116,17 +2128,17 @@ asm_cdbfa: ; cdbfa (33:5bfa)
 	ld [hl], e
 	ret
 
-Functioncdc1a: ; cdc1a (33:5c1a)
+Functioncdc1a:
 	call DeinitBattleAnimation
 	ret
 
-Functioncdc1e: ; cdc1e (33:5c1e)
+Functioncdc1e:
 	ld a, BATTLEANIMFRAMESET_4E
 	call ReinitBattleAnimFrameset
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-Functioncdc27: ; cdc27 (33:5c27)
+Functioncdc27:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2139,7 +2151,7 @@ Functioncdc27: ; cdc27 (33:5c27)
 	ld [hl], a
 	ret
 
-Functioncdc39: ; cdc39 (33:5c39)
+Functioncdc39:
 	ld a, BATTLEANIMFRAMESET_50
 	call ReinitBattleAnimFrameset
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -2148,7 +2160,7 @@ Functioncdc39: ; cdc39 (33:5c39)
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-Functioncdc48: ; cdc48 (33:5c48)
+Functioncdc48:
 	ld a, BATTLEANIMFRAMESET_4F
 	call ReinitBattleAnimFrameset
 	call BattleAnim_IncAnonJumptableIndex
@@ -2157,7 +2169,7 @@ Functioncdc48: ; cdc48 (33:5c48)
 	ld [hl], $40
 	ret
 
-Functioncdc57: ; cdc57 (33:5c57)
+Functioncdc57:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2176,10 +2188,10 @@ Functioncdc57: ; cdc57 (33:5c57)
 
 .asm_cdc71
 	call BattleAnim_IncAnonJumptableIndex
-Functioncdc74: ; cdc74 (33:5c74)
+Functioncdc74:
 	ret
 
-Functioncdc75: ; cdc75 (33:5c75)
+Functioncdc75:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hli]
@@ -2211,7 +2223,7 @@ Functioncdc75: ; cdc75 (33:5c75)
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-BattleAnimFunction_1E: ; cdca6 (33:5ca6)
+BattleAnimFunction_1E:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -2233,12 +2245,13 @@ BattleAnimFunction_1E: ; cdca6 (33:5ca6)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_21: ; cdcc3 (33:5cc3)
+BattleAnimFunction_21:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncdcca
 	dw Functioncdced
-Functioncdcca: ; cdcca (33:5cca)
+
+Functioncdcca:
 	ld a, [hBattleTurn]
 	and a
 	jr z, .asm_cdcd9
@@ -2260,7 +2273,7 @@ Functioncdcca: ; cdcca (33:5cca)
 	call ReinitBattleAnimFrameset
 	ret
 
-Functioncdced: ; cdced (33:5ced)
+Functioncdced:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2274,7 +2287,7 @@ Functioncdced: ; cdced (33:5ced)
 	call DeinitBattleAnimation
 	ret
 
-Functioncdcfe: ; cdcfe (33:5cfe)
+Functioncdcfe:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -2307,12 +2320,13 @@ Functioncdcfe: ; cdcfe (33:5cfe)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_22: ; cdd2a (33:5d2a)
+BattleAnimFunction_22:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncdd31
 	dw Functioncdd4f
-Functioncdd31: ; cdd31 (33:5d31)
+
+Functioncdd31:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -2331,7 +2345,7 @@ Functioncdd31: ; cdd31 (33:5d31)
 	call ReinitBattleAnimFrameset
 	ret
 
-Functioncdd4f: ; cdd4f (33:5d4f)
+Functioncdd4f:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2374,12 +2388,13 @@ Functioncdd4f: ; cdd4f (33:5d4f)
 	inc [hl]
 	ret
 
-BattleAnimFunction_23: ; cdd90 (33:5d90)
+BattleAnimFunction_23:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncdd97
 	dw Functioncddbc
-Functioncdd97: ; cdd97 (33:5d97)
+
+Functioncdd97:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
@@ -2401,7 +2416,7 @@ Functioncdd97: ; cdd97 (33:5d97)
 	ld a, [hl]
 	and $7f
 	ld [hl], a
-Functioncddbc: ; cddbc (33:5dbc)
+Functioncddbc:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2442,13 +2457,14 @@ Functioncddbc: ; cddbc (33:5dbc)
 	call ReinitBattleAnimFrameset
 	ret
 
-BattleAnimFunction_24: ; cddf9 (33:5df9)
+BattleAnimFunction_24:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncde02
 	dw Functioncde20
 	dw Functioncde21
-Functioncde02: ; cde02 (33:5e02)
+
+Functioncde02:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -2465,18 +2481,17 @@ Functioncde02: ; cde02 (33:5e02)
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-Functioncde20: ; cde20 (33:5e20)
+Functioncde20:
 	ret
 
-Functioncde21: ; cde21 (33:5e21)
+Functioncde21:
 	call DeinitBattleAnimation
 	ret
 
-; cde25 (33:5e25)
-Unknown_cde25: ; cde25
+Unknown_cde25:
 	db $ec, $f8, $00
-; cde28
-BattleAnimFunction_25: ; cde28 (33:5e28)
+
+BattleAnimFunction_25:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2505,7 +2520,7 @@ BattleAnimFunction_25: ; cde28 (33:5e28)
 	ld [hl], e
 	ret
 
-BattleAnimFunction_26: ; cde54 (33:5e54)
+BattleAnimFunction_26:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2521,12 +2536,13 @@ BattleAnimFunction_26: ; cde54 (33:5e54)
 	inc [hl]
 	ret
 
-BattleAnimFunction_27: ; cde6b (33:5e6b)
+BattleAnimFunction_27:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncde72
 	dw Functioncde88
-Functioncde72: ; cde72 (33:5e72)
+
+Functioncde72:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -2539,15 +2555,16 @@ Functioncde72: ; cde72 (33:5e72)
 .asm_cde83
 	add BATTLEANIMFRAMESET_6A
 	call ReinitBattleAnimFrameset
-Functioncde88: ; cde88 (33:5e88)
+Functioncde88:
 	ret
 
-BattleAnimFunction_28: ; cde89 (33:5e89)
+BattleAnimFunction_28:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncde90
 	dw Functioncdebf
-Functioncde90: ; cde90 (33:5e90)
+
+Functioncde90:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -2579,7 +2596,7 @@ Functioncde90: ; cde90 (33:5e90)
 	call ReinitBattleAnimFrameset
 	ret
 
-Functioncdebf: ; cdebf (33:5ebf)
+Functioncdebf:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2603,7 +2620,7 @@ Functioncdebf: ; cdebf (33:5ebf)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_SpiralDescent: ; cdedd (33:5edd)
+BattleAnimFunction_SpiralDescent:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2644,7 +2661,7 @@ BattleAnimFunction_SpiralDescent: ; cdedd (33:5edd)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_2D: ; cdf1b (33:5f1b)
+BattleAnimFunction_2D:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2685,12 +2702,13 @@ BattleAnimFunction_2D: ; cdf1b (33:5f1b)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_PoisonGas: ; cdf59 (33:5f59)
+BattleAnimFunction_PoisonGas:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncdf60
 	dw BattleAnimFunction_SpiralDescent
-Functioncdf60: ; cdf60 (33:5f60)
+
+Functioncdf60:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2720,7 +2738,7 @@ Functioncdf60: ; cdf60 (33:5f60)
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-BattleAnimFunction_34: ; cdf8c (33:5f8c)
+BattleAnimFunction_34:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2762,7 +2780,7 @@ BattleAnimFunction_34: ; cdf8c (33:5f8c)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_3C: ; cdfcb (33:5fcb)
+BattleAnimFunction_3C:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2805,13 +2823,14 @@ BattleAnimFunction_3C: ; cdfcb (33:5fcb)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_35: ; ce00b (33:600b)
+BattleAnimFunction_35:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce014
 	dw Functionce023
 	dw Functionce05f
-Functionce014: ; ce014 (33:6014)
+
+Functionce014:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -2819,7 +2838,7 @@ Functionce014: ; ce014 (33:6014)
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld [hl], $10
-Functionce023: ; ce023 (33:6023)
+Functionce023:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2858,18 +2877,18 @@ Functionce023: ; ce023 (33:6023)
 	srl [hl]
 	ret
 
-Functionce05f: ; ce05f (33:605f)
+Functionce05f:
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_Horn: ; ce063 (33:6063)
+BattleAnimFunction_Horn:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
 	dw .one
 	dw .two
 	dw Functionce09e
-.zero: ; ce06e (33:606e)
+.zero:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2884,7 +2903,7 @@ BattleAnimFunction_Horn: ; ce063 (33:6063)
 	ld [hl], a
 	ret
 
-.one: ; ce083 (33:6083)
+.one:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2894,7 +2913,7 @@ BattleAnimFunction_Horn: ; ce063 (33:6063)
 	call Functionce70a
 	ret
 
-.two: ; ce091 (33:6091)
+.two:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -2903,7 +2922,7 @@ BattleAnimFunction_Horn: ; ce063 (33:6063)
 	call DeinitBattleAnimation
 	ret
 
-Functionce09e: ; ce09e (33:609e)
+Functionce09e:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -2928,13 +2947,14 @@ Functionce09e: ; ce09e (33:609e)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_2C: ; ce0c5 (33:60c5)
+BattleAnimFunction_2C:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce0ce
 	dw Functionce0f8
 	dw Functionce0dd
-Functionce0ce: ; ce0ce (33:60ce)
+
+Functionce0ce:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2945,7 +2965,7 @@ Functionce0ce: ; ce0ce (33:60ce)
 	ld [hl], a
 	ret
 
-Functionce0dd: ; ce0dd (33:60dd)
+Functionce0dd:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2962,7 +2982,7 @@ Functionce0dd: ; ce0dd (33:60dd)
 	ld a, [hl]
 	sub $4
 	ld [hl], a
-Functionce0f8: ; ce0f8 (33:60f8)
+Functionce0f8:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2978,12 +2998,13 @@ Functionce0f8: ; ce0f8 (33:60f8)
 	call Functionce70a
 	ret
 
-BattleAnimFunction_2E: ; ce10e (33:610e)
+BattleAnimFunction_2E:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce115
 	dw Functionce12a
-Functionce115: ; ce115 (33:6115)
+
+Functionce115:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -2995,7 +3016,7 @@ Functionce115: ; ce115 (33:6115)
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld [hl], a
-Functionce12a: ; ce12a (33:612a)
+Functionce12a:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hli]
@@ -3028,7 +3049,7 @@ Functionce12a: ; ce12a (33:612a)
 	srl [hl]
 	ret
 
-BattleAnimFunction_2F: ; ce15c (33:615c)
+BattleAnimFunction_2F:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3087,7 +3108,7 @@ BattleAnimFunction_2F: ; ce15c (33:615c)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_42: ; ce1b0 (33:61b0)
+BattleAnimFunction_42:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3126,12 +3147,13 @@ BattleAnimFunction_42: ; ce1b0 (33:61b0)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_30: ; ce1e7 (33:61e7)
+BattleAnimFunction_30:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce1ee
 	dw Functionce1fb
-Functionce1ee: ; ce1ee (33:61ee)
+
+Functionce1ee:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_YCOORD
 	add hl, bc
@@ -3139,7 +3161,7 @@ Functionce1ee: ; ce1ee (33:61ee)
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld [hl], a
-Functionce1fb: ; ce1fb (33:61fb)
+Functionce1fb:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3165,12 +3187,13 @@ Functionce1fb: ; ce1fb (33:61fb)
 	inc [hl]
 	ret
 
-BattleAnimFunction_31: ; ce226 (33:6226)
+BattleAnimFunction_31:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce22d
 	dw Functionce254
-Functionce22d: ; ce22d (33:622d)
+
+Functionce22d:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -3191,17 +3214,18 @@ Functionce22d: ; ce22d (33:622d)
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld [hl], $f
-Functionce254: ; ce254 (33:6254)
+Functionce254:
 	ret
 
-BattleAnimFunction_32: ; ce255 (33:6255)
+BattleAnimFunction_32:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce260
 	dw Functionce274
 	dw Functionce278
 	dw Functionce289
-Functionce260: ; ce260 (33:6260)
+
+Functionce260:
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, [hBattleTurn]
 	and a
@@ -3217,11 +3241,11 @@ Functionce260: ; ce260 (33:6260)
 	ld [hl], a
 	ret
 
-Functionce274: ; ce274 (33:6274)
+Functionce274:
 	call Functionce29f
 	ret
 
-Functionce278: ; ce278 (33:6278)
+Functionce278:
 	call Functionce29f
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -3232,7 +3256,7 @@ Functionce278: ; ce278 (33:6278)
 	call Functionce70a
 	ret
 
-Functionce289: ; ce289 (33:6289)
+Functionce289:
 	call Functionce29f
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -3247,7 +3271,7 @@ Functionce289: ; ce289 (33:6289)
 	call DeinitBattleAnimation
 	ret
 
-Functionce29f: ; ce29f (33:629f)
+Functionce29f:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -3273,13 +3297,12 @@ Functionce29f: ; ce29f (33:629f)
 	ld [wOBP0], a
 	ret
 
-; ce2c4 (33:62c4)
-Unknown_ce2c4: ; ce2c4
+Unknown_ce2c4:
 	db $ff, $aa, $55, $aa
-Unknown_ce2c8: ; ce2c8
+Unknown_ce2c8:
 	db $ff, $ff, $00, $00
-; ce2cc
-BattleAnimFunction_33: ; ce2cc (33:62cc)
+
+BattleAnimFunction_33:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3309,13 +3332,14 @@ BattleAnimFunction_33: ; ce2cc (33:62cc)
 	dec [hl]
 	ret
 
-BattleAnimFunction_36: ; ce2fd (33:62fd)
+BattleAnimFunction_36:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce306
 	dw Functionce330
 	dw Functionce34c
-Functionce306: ; ce306 (33:6306)
+
+Functionce306:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3344,7 +3368,7 @@ Functionce306: ; ce306 (33:6306)
 	ld [hl], e
 	ret
 
-Functionce330: ; ce330 (33:6330)
+Functionce330:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -3367,7 +3391,7 @@ Functionce330: ; ce330 (33:6330)
 	ld [hl], a
 	ret
 
-Functionce34c: ; ce34c (33:634c)
+Functionce34c:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -3381,12 +3405,13 @@ Functionce34c: ; ce34c (33:634c)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_37: ; ce35f (33:635f)
+BattleAnimFunction_37:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce366
 	dw Functionce375
-Functionce366: ; ce366 (33:6366)
+
+Functionce366:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -3394,7 +3419,7 @@ Functionce366: ; ce366 (33:6366)
 	and $7f
 	add BATTLEANIMFRAMESET_81
 	call ReinitBattleAnimFrameset
-Functionce375: ; ce375 (33:6375)
+Functionce375:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	bit 7, [hl]
@@ -3410,20 +3435,21 @@ Functionce375: ; ce375 (33:6375)
 	dec [hl]
 	ret
 
-BattleAnimFunction_38: ; ce389 (33:6389)
+BattleAnimFunction_38:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce392
 	dw Functionce39c
 	dw Functionce3ae
-Functionce392: ; ce392 (33:6392)
+
+Functionce392:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld [hl], $c
 	ret
 
-Functionce39c: ; ce39c (33:639c)
+Functionce39c:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -3436,13 +3462,13 @@ Functionce39c: ; ce39c (33:639c)
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, BATTLEANIMFRAMESET_20
 	call ReinitBattleAnimFrameset
-Functionce3ae: ; ce3ae (33:63ae)
+Functionce3ae:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	dec [hl]
 	ret
 
-BattleAnimFunction_39: ; ce3b4 (33:63b4)
+BattleAnimFunction_39:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -3462,7 +3488,7 @@ BattleAnimFunction_39: ; ce3b4 (33:63b4)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_3A: ; ce3d2 (33:63d2)
+BattleAnimFunction_3A:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3492,12 +3518,13 @@ BattleAnimFunction_3A: ; ce3d2 (33:63d2)
 	inc [hl]
 	ret
 
-BattleAnimFunction_3B: ; ce3ff (33:63ff)
+BattleAnimFunction_3B:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce406
 	dw Functionce412
-Functionce406: ; ce406 (33:6406)
+
+Functionce406:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3507,11 +3534,11 @@ Functionce406: ; ce406 (33:6406)
 	ld [hl], a
 	ret
 
-Functionce412: ; ce412 (33:6412)
+Functionce412:
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_3D: ; ce416 (33:6416)
+BattleAnimFunction_3D:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3535,13 +3562,14 @@ BattleAnimFunction_3D: ; ce416 (33:6416)
 	inc [hl]
 	ret
 
-BattleAnimFunction_3E: ; ce43a (33:643a)
+BattleAnimFunction_3E:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce443
 	dw Functionce465
 	dw Functionce490
-Functionce443: ; ce443 (33:6443)
+
+Functionce443:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -3560,7 +3588,7 @@ Functionce443: ; ce443 (33:6443)
 	and $f0
 	or $8
 	ld [hl], a
-Functionce465: ; ce465 (33:6465)
+Functionce465:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -3589,7 +3617,7 @@ Functionce465: ; ce465 (33:6465)
 .asm_ce48b
 	ld [hl], $10
 	call BattleAnim_IncAnonJumptableIndex
-Functionce490: ; ce490 (33:6490)
+Functionce490:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -3599,19 +3627,20 @@ Functionce490: ; ce490 (33:6490)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_40: ; ce49c (33:649c)
+BattleAnimFunction_40:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce4a3
 	dw Functionce4b0
-Functionce4a3: ; ce4a3 (33:64a3)
+
+Functionce4a3:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, BATTLEANIMFRAMESET_24
 	add [hl]
 	call ReinitBattleAnimFrameset
-Functionce4b0: ; ce4b0 (33:64b0)
+Functionce4b0:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3641,7 +3670,7 @@ Functionce4b0: ; ce4b0 (33:64b0)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_41: ; ce4dc (33:64dc)
+BattleAnimFunction_41:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3671,7 +3700,7 @@ BattleAnimFunction_41: ; ce4dc (33:64dc)
 	srl [hl]
 	ret
 
-BattleAnimFunction_43: ; ce508 (33:6508)
+BattleAnimFunction_43:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -3701,7 +3730,7 @@ BattleAnimFunction_43: ; ce508 (33:6508)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_44: ; ce532 (33:6532)
+BattleAnimFunction_44:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld e, [hl]
@@ -3730,13 +3759,14 @@ BattleAnimFunction_44: ; ce532 (33:6532)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_45: ; ce55b (33:655b)
+BattleAnimFunction_45:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce564
 	dw Functionce56e
 	dw Functionce577
-Functionce564: ; ce564 (33:6564)
+
+Functionce564:
 	ld d, $18
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -3744,12 +3774,12 @@ Functionce564: ; ce564 (33:6564)
 	inc [hl]
 	jr asm_ce58f
 
-Functionce56e: ; ce56e (33:656e)
+Functionce56e:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld [hl], $18
-Functionce577: ; ce577 (33:6577)
+Functionce577:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -3767,16 +3797,17 @@ Functionce577: ; ce577 (33:6577)
 	call DeinitBattleAnimation
 	ret
 
-asm_ce58f: ; ce58f (33:658f)
+asm_ce58f:
 	call Functionce6f1
 	ret
 
-BattleAnimFunction_46: ; ce593 (33:6593)
+BattleAnimFunction_46:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce5b3
 	dw Functionce59a
-Functionce59a: ; ce59a (33:659a)
+
+Functionce59a:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -3794,10 +3825,10 @@ Functionce59a: ; ce59a (33:659a)
 
 .asm_ce5b0
 	call DeinitBattleAnimation
-Functionce5b3: ; ce5b3 (33:65b3)
+Functionce5b3:
 	ret
 
-BattleAnimFunction_47: ; ce5b4 (33:65b4)
+BattleAnimFunction_47:
 	ld d, $50
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -3824,7 +3855,7 @@ BattleAnimFunction_47: ; ce5b4 (33:65b4)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_48: ; ce5dc (33:65dc)
+BattleAnimFunction_48:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3840,14 +3871,15 @@ BattleAnimFunction_48: ; ce5dc (33:65dc)
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_49: ; ce5ee (33:65ee)
+BattleAnimFunction_49:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce5f9
 	dw Functionce60a
 	dw Functionce622
 	dw Functionce618
-Functionce5f9: ; ce5f9 (33:65f9)
+
+Functionce5f9:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3857,7 +3889,7 @@ Functionce5f9: ; ce5f9 (33:65f9)
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], $ec
-Functionce60a: ; ce60a (33:660a)
+Functionce60a:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3869,14 +3901,14 @@ Functionce60a: ; ce60a (33:660a)
 	inc [hl]
 	ret
 
-Functionce618: ; ce618 (33:6618)
+Functionce618:
 	call DeinitBattleAnimation
 	ret
 
-asm_ce61c: ; ce61c (33:661c)
+asm_ce61c:
 	call BattleAnim_IncAnonJumptableIndex
 	call BattleAnim_IncAnonJumptableIndex
-Functionce622: ; ce622 (33:6622)
+Functionce622:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3888,14 +3920,15 @@ Functionce622: ; ce622 (33:6622)
 	dec [hl]
 	ret
 
-BattleAnimFunction_4A: ; ce62f (33:662f)
+BattleAnimFunction_4A:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce63a
 	dw Functionce648
 	dw Functionce65c
 	dw Functionce672
-Functionce63a: ; ce63a (33:663a)
+
+Functionce63a:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3905,7 +3938,7 @@ Functionce63a: ; ce63a (33:663a)
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-Functionce648: ; ce648 (33:6648)
+Functionce648:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3921,7 +3954,7 @@ Functionce648: ; ce648 (33:6648)
 	inc [hl]
 	ret
 
-Functionce65c: ; ce65c (33:665c)
+Functionce65c:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3938,7 +3971,7 @@ Functionce65c: ; ce65c (33:665c)
 	ld [hl], a
 	ret
 
-Functionce672: ; ce672 (33:6672)
+Functionce672:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3955,7 +3988,7 @@ Functionce672: ; ce672 (33:6672)
 	ld [hl], a
 	ret
 
-BattleAnimFunction_4B: ; ce688 (33:6688)
+BattleAnimFunction_4B:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld d, [hl]
@@ -3986,7 +4019,7 @@ BattleAnimFunction_4B: ; ce688 (33:6688)
 	ld [hl], e
 	ret
 
-BattleAnimFunction_4C: ; ce6b3 (33:66b3)
+BattleAnimFunction_4C:
 	ld d, $18
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -3995,7 +4028,7 @@ BattleAnimFunction_4C: ; ce6b3 (33:66b3)
 	call Functionce6f1
 	ret
 
-BattleAnimFunction_4F: ; ce6bf (33:66bf)
+BattleAnimFunction_4F:
 	ld d, $18
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
@@ -4008,7 +4041,7 @@ BattleAnimFunction_4F: ; ce6bf (33:66bf)
 	call Functionce6f1
 	ret
 
-BattleAnimFunction_4D: ; ce6d2 (33:66d2)
+BattleAnimFunction_4D:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -4030,7 +4063,7 @@ BattleAnimFunction_4D: ; ce6d2 (33:66d2)
 	call DeinitBattleAnimation
 	ret
 
-Functionce6f1: ; ce6f1 (33:66f1)
+Functionce6f1:
 	push af
 	push de
 	call BattleAnim_Sine
@@ -4047,7 +4080,7 @@ Functionce6f1: ; ce6f1 (33:66f1)
 	ld [hl], a
 	ret
 
-Functionce70a: ; ce70a (33:670a)
+Functionce70a:
 	and $f
 	ld e, a
 	ld hl, BATTLEANIMSTRUCT_XCOORD
@@ -4063,7 +4096,7 @@ Functionce70a: ; ce70a (33:670a)
 	jr nz, .asm_ce719
 	ret
 
-BattleAnim_AnonJumptable: ; ce71e (33:671e)
+BattleAnim_AnonJumptable:
 	pop de
 	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
 	add hl, bc
@@ -4076,83 +4109,45 @@ BattleAnim_AnonJumptable: ; ce71e (33:671e)
 	ld l, a
 	jp hl
 
-BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c)
+BattleAnim_IncAnonJumptableIndex:
 	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
 	add hl, bc
 	inc [hl]
 	ret
 
-BattleAnim_Cosine: ; ce732 (33:6732)
+BattleAnim_Cosine:
 ; a = d * cos(a * pi/32)
-	add %010000
-BattleAnim_Sine: ; ce734 (33:6734)
+	add %010000 ; cos(x) = sin(x + pi/2)
+	; fallthrough
+BattleAnim_Sine:
 ; a = d * sin(a * pi/32)
-	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-
-.ApplySineWave:
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, BattleAnimSineWave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
+	calc_sine_wave BattleAnimSineWave
 
-BattleAnim_Sine_e: ; ce765 (33:6765)
+BattleAnim_Sine_e:
 	ld a, e
 	call BattleAnim_Sine
 	ld e, a
 	ret
 
-BattleAnim_Cosine_e: ; ce76b (33:676b)
+BattleAnim_Cosine_e:
 	ld a, e
 	call BattleAnim_Cosine
 	ld e, a
 	ret
 
-; ce771 (33:6771)
-BattleAnim_AbsSinePrecise: ; ce771
+BattleAnim_AbsSinePrecise:
 	ld a, e
 	call BattleAnim_Sine
 	ld e, l
 	ld d, h
 	ret
 
-; ce778
-BattleAnim_AbsCosinePrecise: ; ce778
+BattleAnim_AbsCosinePrecise:
 	ld a, e
 	call BattleAnim_Cosine
 	ld e, l
 	ld d, h
 	ret
 
-; ce77f
-BattleAnimSineWave: ; ce77f
-	sine_wave $100
-; ce7bf
+BattleAnimSineWave:
+	sine_table 32
diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm
index 0a00b65a4..63177b1b1 100755..100644
--- a/engine/battle_anims/helpers.asm
+++ b/engine/battle_anims/helpers.asm
@@ -1,4 +1,4 @@
-ReinitBattleAnimFrameset: ; ce7bf (33:67bf)
+ReinitBattleAnimFrameset:
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld [hl], a
@@ -10,7 +10,7 @@ ReinitBattleAnimFrameset: ; ce7bf (33:67bf)
 	ld [hl], -1
 	ret
 
-GetBattleAnimFrame: ; ce7d1
+GetBattleAnimFrame:
 .loop
 	ld hl, BATTLEANIMSTRUCT_DURATION
 	add hl, bc
@@ -72,9 +72,7 @@ GetBattleAnimFrame: ; ce7d1
 	ld [hl], a
 	jr .loop
 
-; ce823
-
-.GetPointer: ; ce823
+.GetPointer:
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld e, [hl]
@@ -93,9 +91,7 @@ GetBattleAnimFrame: ; ce7d1
 	add hl, de
 	ret
 
-; ce83c
-
-GetBattleAnimOAMPointer: ; ce83c
+GetBattleAnimOAMPointer:
 	ld l, a
 	ld h, 0
 	ld de, BattleAnimOAMData
@@ -104,9 +100,7 @@ GetBattleAnimOAMPointer: ; ce83c
 	add hl, de
 	ret
 
-; ce846
-
-LoadBattleAnimObj: ; ce846 (33:6846)
+LoadBattleAnimObj:
 	push hl
 	ld l, a
 	ld h, 0
@@ -126,5 +120,3 @@ LoadBattleAnimObj: ; ce846 (33:6846)
 	call DecompressRequest2bpp
 	pop bc
 	ret
-
-; ce85e (33:685e)
diff --git a/engine/battle_anims/getpokeballwobble.asm b/engine/battle_anims/pokeball_wobble.asm
index b3f558039..21f963f7e 100755..100644
--- a/engine/battle_anims/getpokeballwobble.asm
+++ b/engine/battle_anims/pokeball_wobble.asm
@@ -1,4 +1,4 @@
-GetPokeBallWobble: ; f971 (3:7971)
+GetPokeBallWobble:
 ; Returns whether a Poke Ball will wobble in the catch animation.
 ; Whether a Pokemon is caught is determined beforehand.
 
@@ -24,7 +24,7 @@ GetPokeBallWobble: ; f971 (3:7971)
 	ld c, 0 ; next
 	jr nz, .done
 
-	ld hl, .WobbleProbabilities
+	ld hl, WobbleProbabilities
 	ld a, [wBuffer1]
 	ld b, a
 .loop
@@ -59,30 +59,4 @@ GetPokeBallWobble: ; f971 (3:7971)
 	pop de
 	ret
 
-.WobbleProbabilities: ; f9ba
-; catch rate, chance of wobbling / 255
-; nLeft/255 = (nRight/255) ** 4
-	db   1,  63
-	db   2,  75
-	db   3,  84
-	db   4,  90
-	db   5,  95
-	db   7, 103
-	db  10, 113
-	db  15, 126
-	db  20, 134
-	db  30, 149
-	db  40, 160
-	db  50, 169
-	db  60, 177
-	db  80, 191
-	db 100, 201
-	db 120, 211
-	db 140, 220
-	db 160, 227
-	db 180, 234
-	db 200, 240
-	db 220, 246
-	db 240, 251
-	db 254, 253
-	db 255, 255
+INCLUDE "data/battle/wobble_probabilities.asm"
diff --git a/engine/events/basement_key.asm b/engine/events/basement_key.asm
index 879c86a34..d30149fbe 100755..100644
--- a/engine/events/basement_key.asm
+++ b/engine/events/basement_key.asm
@@ -1,4 +1,4 @@
-_BasementKey: ; 507b4
+_BasementKey:
 ; Are we even in the right map to use this?
 	ld a, [wMapGroup]
 	cp GROUP_GOLDENROD_UNDERGROUND
@@ -26,9 +26,7 @@ _BasementKey: ; 507b4
 	ld a, FALSE
 	ld [wItemEffectSucceeded], a
 	ret
-; 507e1
 
-.BasementKeyScript: ; 0x507e1
+.BasementKeyScript:
 	closetext
 	farjump BasementDoorScript
-; 0x507e6
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index 4b4494925..534e2c331 100755..100644
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -1,17 +1,15 @@
-Special_BattleTowerRoomMenu: ; 1700b0
+BattleTowerRoomMenu:
 ; special
 	call InitBattleTowerChallengeRAM
 	farcall _BattleTowerRoomMenu
 	ret
-; 1700ba
 
-Special_Function1700ba: ; 1700ba
+Function1700ba:
 	call InitBattleTowerChallengeRAM
 	farcall Function11811a
 	ret
-; 1700c4
 
-Function1700c4: ; 1700c4
+Function1700c4:
 	ld a, [rSVBK]
 	push af
 	ld a, $3
@@ -51,28 +49,25 @@ Function1700c4: ; 1700c4
 	pop af
 	ld [rSVBK], a
 	ret
-; 170114
 
-Special_Function170114: ; 170114
+Function170114:
 	call InitBattleTowerChallengeRAM
 	call .Function170121
 	farcall Function11805f
 	ret
-; 170121
 
-.Function170121: ; 170121
+.Function170121:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $a948
-	ld de, wMisc
+	ld de, wc608
 	ld bc, $f6 ; 246
 	call CopyBytes
 	call CloseSRAM
 	call Function170c8b
 	ret
-; 170139
 
-Function170139: ; 170139
+Function170139:
 ; Convert the 4-digit decimal number at 5:aa41 into binary
 	ld a, $5
 	call GetSRAMBank
@@ -90,12 +85,12 @@ Function170139: ; 170139
 	ld b, $0
 	add hl, bc
 	call CloseSRAM
-; Store that number in wMisc
+; Store that number in wc608
 	ld a, h
-	ld [wMisc], a
+	ld [wc608], a
 	ld a, l
-	ld [wMisc + 1], a
-	ld hl, wBT_OTTempPkmn1DVs
+	ld [wc608 + 1], a
+	ld hl, wBT_OTTempMon1DVs
 	ld a, [wPlayerID]
 	ld [hli], a
 	ld a, [wPlayerID + 1]
@@ -112,7 +107,7 @@ Function170139: ; 170139
 	ld bc, wPlayerID
 	ld de, wPlayerGender
 	farcall GetMobileOTTrainerClass
-	ld de, wBT_OTTempPkmn1CaughtGender
+	ld de, wBT_OTTempMon1CaughtGender
 	ld a, c
 	ld [de], a
 	inc de
@@ -161,15 +156,14 @@ Function170139: ; 170139
 	ld hl, $a894
 	ld bc, NAME_LENGTH_JAPANESE
 	call CopyBytes
-	ld hl, wMisc
+	ld hl, wc608
 	ld de, $a948
 	ld bc, $f6
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 17020c
 
-.DecToBin: ; 17020c
+.DecToBin:
 	ld a, [de]
 	inc de
 	and a
@@ -180,29 +174,25 @@ Function170139: ; 170139
 	dec a
 	jr nz, .digit_loop
 	ret
-; 170215
 
-Special_BattleTowerBattle: ; 170215
+BattleTowerBattle:
 	xor a
 	ld [wBattleTowerBattleEnded], a
 	call _BattleTowerBattle
 	ret
-; 17021d
 
-DummySpecial_17021d: ; 17021d
+DummySpecial_17021d:
 	ret
-; 17021e
 
-InitBattleTowerChallengeRAM: ; 17021e
+InitBattleTowerChallengeRAM:
 	xor a
 	ld [wBattleTowerBattleEnded], a
 	ld [wNrOfBeatenBattleTowerTrainers], a
 	ld [wcf65], a
 	ld [wcf66], a
 	ret
-; 17022c
 
-_BattleTowerBattle: ; 17022c
+_BattleTowerBattle:
 .loop
 	call .do_dw
 	call DelayFrame
@@ -210,9 +200,8 @@ _BattleTowerBattle: ; 17022c
 	cp $1
 	jr nz, .loop
 	ret
-; 17023a
 
-.do_dw ; 17023a
+.do_dw
 	ld a, [wBattleTowerBattleEnded]
 	ld e, a
 	ld d, 0
@@ -223,14 +212,12 @@ _BattleTowerBattle: ; 17022c
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 170249
 
-.dw ; 170249
+.dw
 	dw RunBattleTowerTrainer
 	dw SkipBattleTowerTrainer
-; 17024d
 
-RunBattleTowerTrainer: ; 17024d
+RunBattleTowerTrainer:
 	ld a, [wOptions]
 	push af
 	ld hl, wOptions
@@ -243,7 +230,7 @@ RunBattleTowerTrainer: ; 17024d
 
 	xor a
 	ld [wLinkMode], a
-	farcall Special_StubbedTrainerRankings_Healings
+	farcall StubbedTrainerRankings_Healings
 	farcall HealParty
 	call ReadBTTrainerParty
 	call Clears5_a89a
@@ -254,7 +241,7 @@ RunBattleTowerTrainer: ; 17024d
 	farcall HealParty
 	ld a, [wBattleResult]
 	ld [wScriptVar], a
-	and a
+	and a ; WIN?
 	jr nz, .lost
 	ld a, BANK(sNrOfBeatenBattleTowerTrainers)
 	call GetSRAMBank
@@ -277,61 +264,60 @@ RunBattleTowerTrainer: ; 17024d
 	ld [wBattleTowerBattleEnded], a
 	ret
 
-
-ReadBTTrainerParty: ; 1702b7
-; Initialise the BattleTower-Trainer and his Pkmn
+ReadBTTrainerParty:
+; Initialise the BattleTower-Trainer and his mon
 	call CopyBTTrainer_FromBT_OT_TowBT_OTTemp
 
 ; Check the nicknames for illegal characters, and replace bad nicknames
 ; with their species names.
-	ld de, wBT_OTTempPkmn1Name ; $c643
+	ld de, wBT_OTTempMon1Name
 	ld c, MON_NAME_LENGTH
 	farcall CheckStringForErrors
 	jr nc, .skip_mon_1
 
-	ld a, [wBT_OTTempPkmn1]
+	ld a, [wBT_OTTempMon1]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
 	ld l, e
 	ld h, d
-	ld de, wBT_OTTempPkmn1Name ; $c643
+	ld de, wBT_OTTempMon1Name
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
 .skip_mon_1
-	ld de, wBT_OTTempPkmn2Name ; $c67e
+	ld de, wBT_OTTempMon2Name
 	ld c, MON_NAME_LENGTH
 	farcall CheckStringForErrors
 	jr nc, .skip_mon_2
-	ld a, [wBT_OTTempPkmn2] ; [$c64e]
+	ld a, [wBT_OTTempMon2]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
 	ld l, e
 	ld h, d
-	ld de, wBT_OTTempPkmn2Name ; $c67e
+	ld de, wBT_OTTempMon2Name
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
 .skip_mon_2
-	ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9
+	ld de, wBT_OTTempMon3Name
 	ld c, MON_NAME_LENGTH
 	farcall CheckStringForErrors
 	jr nc, .skip_mon_3
-	ld a, [wBT_OTTempPkmn3] ; [$c689]
+	ld a, [wBT_OTTempMon3]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
 	ld l, e
 	ld h, d
-	ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9
+	ld de, wBT_OTTempMon3Name
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
 .skip_mon_3
 ; Add the terminator character to each of these names
 	ld a, "@"
-	ld [wBT_OTTempPkmn1NameEnd - 1], a ; $c64d
-	ld [wBT_OTTempPkmn2NameEnd - 1], a ; $c688
-	ld [wBT_OTTempPkmn3NameEnd - 1], a ; $c68a + 57 = $c6c3
+	ld [wBT_OTTempMon1NameEnd - 1], a
+	ld [wBT_OTTempMon2NameEnd - 1], a
+	ld [wBT_OTTempMon3NameEnd - 1], a
 ; Fix errors in the movesets
 	call CheckBTMonMovesForErrors
 ; Repair the trainer name if needed, then copy it to wOTPlayerName
@@ -343,7 +329,7 @@ ReadBTTrainerParty: ; 1702b7
 	jr .done_trainer_name
 
 .trainer_name_okay
-	ld hl, wBT_OTTempName ; 0xc608
+	ld hl, wBT_OTTempName
 
 .done_trainer_name
 	ld de, wOTPlayerName
@@ -360,7 +346,7 @@ ReadBTTrainerParty: ; 1702b7
 	ld a, HIGH(wOTPartyMonNicknames)
 	ld [wBGMapBuffer + 1], a
 
-	; Copy Pkmn into Memory from the address in hl
+	; Copy mon into Memory from the address in hl
 	ld de, wOTPartyMon1Species
 	ld bc, wOTPartyCount
 	ld a, BATTLETOWER_PARTY_LENGTH
@@ -394,11 +380,10 @@ ReadBTTrainerParty: ; 1702b7
 	ld a, -1
 	ld [bc], a
 	ret
-; 170394
 
-ValidateBTParty: ; 170394
+ValidateBTParty:
 ; Check for and fix errors in party data
-	ld hl, wBT_OTTempPkmn1Species
+	ld hl, wBT_OTTempMon1Species
 	ld d, BATTLETOWER_PARTY_LENGTH
 .pkmn_loop
 	push de
@@ -407,11 +392,11 @@ ValidateBTParty: ; 170394
 	ld c, l
 	ld a, [hl]
 	and a
-idx = $ff
-rept ($ff +- NUM_POKEMON)
+x = $ff
+rept ($ff + -NUM_POKEMON)
 	jr z, .invalid
-	cp idx
-idx = idx +- 1
+	cp x
+x = x + -1
 endr
 	jr nz, .valid
 
@@ -483,8 +468,8 @@ endr
 	push de
 	ld hl, MON_STAT_EXP - 1
 	add hl, bc
-	ld b, $1
-	predef CalcPkmnStats
+	ld b, TRUE
+	predef CalcMonStats
 	pop de
 	pop hl
 	dec de
@@ -501,13 +486,11 @@ endr
 	dec d
 	jp nz, .pkmn_loop
 	ret
-; 170426
 
-BT_ChrisName: ; 170426
+BT_ChrisName:
 	db "CHRIS@"
-; 17042c
 
-Function17042c: ; 17042c
+Function17042c:
 	ld hl, w3_d202TrainerData
 	ld a, BATTLETOWER_STREAK_LENGTH
 .loop
@@ -568,12 +551,10 @@ Function17042c: ; 17042c
 	dec a
 	jr nz, .loop
 	ret
-; 170470
 
 INCLUDE "data/battle_tower/unknown_levels.asm"
 
-
-CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ; 1704a2
+CopyBTTrainer_FromBT_OT_TowBT_OTTemp:
 ; copy the BattleTower-Trainer data that lies at 'wBT_OTTrainer' to 'wBT_OTTemp'
 	ld a, [rSVBK]
 	push af
@@ -595,11 +576,10 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ; 1704a2
 	ld hl, sNrOfBeatenBattleTowerTrainers
 	inc [hl]
 	call CloseSRAM
-SkipBattleTowerTrainer: ; 1704c9
+SkipBattleTowerTrainer:
 	ret
-; 1704ca
 
-Unreferenced_Function1704ca: ; 1704ca
+Unreferenced_Function1704ca:
 	ld a, [$be46]
 	cp $7
 	jr c, .asm_1704d3
@@ -617,18 +597,16 @@ Unreferenced_Function1704ca: ; 1704ca
 
 .asm_1704e0
 	ret
-; 1704e1
 
-UnusedSpecial_Function1704e1: ; 1704e1
+Function1704e1:
 	call SpeechTextBox
 	call FadeToMenu
 	call InitBattleTowerChallengeRAM
 	call .JumptableLoop
 	call CloseSubmenu
 	ret
-; 1704f1
 
-.JumptableLoop: ; 1704f1
+.JumptableLoop:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearScreen
@@ -643,9 +621,8 @@ UnusedSpecial_Function1704e1: ; 1704e1
 
 .done
 	ret
-; 170510
 
-.DoJumptable: ; 170510
+.DoJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -656,15 +633,13 @@ UnusedSpecial_Function1704e1: ; 1704e1
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 17051f
 
-.dw ; 17051f
+.dw
 	dw .Jumptable_0
 	dw .Jumptable_1
 	dw .Jumptable_2
-; 170525
 
-.Jumptable_0: ; 170525
+.Jumptable_0:
 	ld a, $5
 	call GetSRAMBank
 
@@ -674,7 +649,7 @@ UnusedSpecial_Function1704e1: ; 1704e1
 	call CopyBytes
 
 	ld hl, $a8b2
-	ld de, wMisc
+	ld de, wc608
 	ld bc, $0096
 	call CopyBytes
 
@@ -695,12 +670,10 @@ UnusedSpecial_Function1704e1: ; 1704e1
 	call .PlaceTextItems
 	jr .NextJumptableFunction
 
-
 .Jumptable_1:
 	call SetPalettes
 	call .NextJumptableFunction
 
-
 .Jumptable_2:
 	ld hl, hJoyPressed
 	ld a, [hl]
@@ -744,9 +717,8 @@ UnusedSpecial_Function1704e1: ; 1704e1
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
-; 1705b7
 
-.DrawBorder: ; 1705b7
+.DrawBorder:
 	hlcoord 0, 4
 	ld a, "┌"
 	ld [hli], a
@@ -786,14 +758,13 @@ UnusedSpecial_Function1704e1: ; 1704e1
 	dec c
 	jr nz, .right_border_loop
 	ret
-; 1705f0
 
-.PlaceTextItems: ; 1705f0
+.PlaceTextItems:
 	call .ClearBox
 	call .PlaceUpDownArrows
 	ld a, $50
 	ld [wcd4e], a
-	ld hl, wMisc
+	ld hl, wc608
 	ld a, [wNrOfBeatenBattleTowerTrainers]
 	ld c, a
 	xor a
@@ -855,9 +826,8 @@ UnusedSpecial_Function1704e1: ; 1704e1
 	dec a
 	jr nz, .loop1
 	ret
-; 17064b
 
-.ClearBox: ; 17064b
+.ClearBox:
 	hlcoord 1, 5
 	xor a
 	ld b, 12
@@ -872,9 +842,8 @@ UnusedSpecial_Function1704e1: ; 1704e1
 	dec b
 	jr nz, .clearbox_row
 	ret
-; 17065d
 
-.PlaceUpDownArrows: ; 17065d
+.PlaceUpDownArrows:
 	ld a, [wNrOfBeatenBattleTowerTrainers]
 	and a
 	jr z, .nope
@@ -890,17 +859,14 @@ UnusedSpecial_Function1704e1: ; 1704e1
 	ld a, "▼"
 	ld [hl], a
 	ret
-; 170676
 
-.String_Mail: ; 170676
+.String_Mail:
 	db "ルーム@"
-; 17067a
 
-.String_PastReaders: ; 17067a
+.String_PastReaders:
 	db "れきだいりーダーいちらん@"
-; 170687
 
-Special_BattleTowerAction: ; 170687
+BattleTowerAction:
 	ld a, [wScriptVar]
 	ld e, a
 	ld d, 0
@@ -911,10 +877,8 @@ Special_BattleTowerAction: ; 170687
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 170696
 
-
-.dw ; 170696 (5c:4696)
+.dw
 	dw BattleTowerAction_CheckExplanationRead ; 0x00
 	dw BattleTowerAction_SetExplanationRead ; 0x01
 	dw BattleTowerAction_GetChallengeState ; 0x02
@@ -948,9 +912,8 @@ Special_BattleTowerAction: ; 170687
 	dw BattleTower_RandomlyChooseReward ; 0x1e
 	dw BattleTower_SaveOptions ; 0x1f
 
-
 ; Reset the save memory for BattleTower-Trainers (Counter and all 7 TrainerBytes)
-ResetBattleTowerTrainersSRAM: ; 1706d6 (5c:46d6) BattleTowerAction $1a
+ResetBattleTowerTrainersSRAM: ; BattleTowerAction $1a
 	ld a, BANK(sBTTrainers)
 	call GetSRAMBank
 
@@ -966,7 +929,7 @@ ResetBattleTowerTrainersSRAM: ; 1706d6 (5c:46d6) BattleTowerAction $1a
 
 	ret
 
-BattleTower_GiveReward: ; 1706ee (5c:46ee) BattleTowerAction $1b
+BattleTower_GiveReward: ; BattleTowerAction $1b
 	ld a, BANK(sBattleTowerReward)
 	call GetSRAMBank
 
@@ -995,7 +958,7 @@ BattleTower_GiveReward: ; 1706ee (5c:46ee) BattleTowerAction $1b
 	ld [wScriptVar], a
 	ret
 
-Function17071b: ; 17071b (5c:471b) BattleTowerAction $1c
+Function17071b: ; BattleTowerAction $1c
 	ld a, BANK(sBattleTowerChallengeState)
 	call GetSRAMBank
 	ld a, BATTLETOWER_WON_CHALLENGE
@@ -1003,7 +966,7 @@ Function17071b: ; 17071b (5c:471b) BattleTowerAction $1c
 	call CloseSRAM
 	ret
 
-Function170729: ; 170729 (5c:4729) BattleTowerAction $1d
+Function170729: ; BattleTowerAction $1d
 	ld a, BANK(sBattleTowerChallengeState)
 	call GetSRAMBank
 	ld a, BATTLETOWER_RECEIVED_REWARD
@@ -1011,11 +974,11 @@ Function170729: ; 170729 (5c:4729) BattleTowerAction $1d
 	call CloseSRAM
 	ret
 
-BattleTower_SaveOptions: ; 170737 (5c:4737) BattleTowerAction $1f
+BattleTower_SaveOptions: ; BattleTowerAction $1f
 	farcall SaveOptions
 	ret
 
-BattleTower_RandomlyChooseReward: ; 17073e (5c:473e) BattleTowerAction $1e
+BattleTower_RandomlyChooseReward: ; BattleTowerAction $1e
 ; Generate a random stat boosting item.
 .loop
 	call Random
@@ -1036,7 +999,7 @@ BattleTower_RandomlyChooseReward: ; 17073e (5c:473e) BattleTowerAction $1e
 	call CloseSRAM
 	ret
 
-BattleTowerAction_CheckExplanationRead: ; 17075f (5c:475f) BattleTowerAction $00
+BattleTowerAction_CheckExplanationRead: ; BattleTowerAction $00
 	call BattleTower_CheckSaveFileExistsAndIsYours
 	ld a, [wScriptVar]
 	and a
@@ -1050,7 +1013,7 @@ BattleTowerAction_CheckExplanationRead: ; 17075f (5c:475f) BattleTowerAction $00
 	call CloseSRAM
 	ret
 
-BattleTowerAction_GetChallengeState: ; 170778 (5c:4778) BattleTowerAction $02
+BattleTowerAction_GetChallengeState: ; BattleTowerAction $02
 	ld hl, sBattleTowerChallengeState
 	ld a, BANK(sBattleTowerChallengeState)
 	call GetSRAMBank
@@ -1059,7 +1022,7 @@ BattleTowerAction_GetChallengeState: ; 170778 (5c:4778) BattleTowerAction $02
 	call CloseSRAM
 	ret
 
-BattleTowerAction_SetExplanationRead: ; 170788 (5c:4788) BattleTowerAction $01
+BattleTowerAction_SetExplanationRead: ; BattleTowerAction $01
 	ld a, BANK(sBattleTowerSaveFileFlags)
 	call GetSRAMBank
 	ld a, [sBattleTowerSaveFileFlags]
@@ -1068,13 +1031,13 @@ BattleTowerAction_SetExplanationRead: ; 170788 (5c:4788) BattleTowerAction $01
 	call CloseSRAM
 	ret
 
-BattleTowerAction_SetByteToQuickSaveChallenge: ; 170799 (5c:4799) BattleTowerAction $03
+BattleTowerAction_SetByteToQuickSaveChallenge: ; BattleTowerAction $03
 	ld c, BATTLETOWER_SAVED_AND_LEFT
 	jr asm_17079f
 
-BattleTowerAction_SetByteToCancelChallenge: ; 17079d (5c:479d) BattleTowerAction $04
+BattleTowerAction_SetByteToCancelChallenge: ; BattleTowerAction $04
 	ld c, BATTLETOWER_NO_CHALLENGE
-asm_17079f: ; 17079f (5c:479f)
+asm_17079f:
 	ld a, BANK(sBattleTowerChallengeState)
 	call GetSRAMBank
 	ld a, c
@@ -1082,7 +1045,7 @@ asm_17079f: ; 17079f (5c:479f)
 	call CloseSRAM
 	ret
 
-Function1707ac: ; 1707ac (5c:47ac) BattleTowerAction $05
+Function1707ac: ; BattleTowerAction $05
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$aa8c]
@@ -1123,7 +1086,7 @@ Function1707ac: ; 1707ac (5c:47ac) BattleTowerAction $05
 	ld a, $8
 	ld [wScriptVar], a
 
-Function1707f4: ; 1707f4 (5c:47f4) BattleTowerAction $06
+Function1707f4: ; BattleTowerAction $06
 	ld a, $5
 	call GetSRAMBank
 	xor a
@@ -1133,7 +1096,7 @@ Function1707f4: ; 1707f4 (5c:47f4) BattleTowerAction $06
 	call CloseSRAM
 	ret
 
-Function170807: ; 170807 (5c:4807) BattleTowerAction $16
+Function170807: ; BattleTowerAction $16
 	call UpdateTime
 	ld a, $5
 	call GetSRAMBank
@@ -1144,7 +1107,7 @@ Function170807: ; 170807 (5c:4807) BattleTowerAction $16
 	call CloseSRAM
 	ret
 
-Function17081d: ; 17081d (5c:481d) BattleTowerAction $17
+Function17081d: ; BattleTowerAction $17
 	xor a
 	ld [wScriptVar], a
 	ld a, $5
@@ -1187,7 +1150,7 @@ Function17081d: ; 17081d (5c:481d) BattleTowerAction $17
 	call CloseSRAM
 	ret
 
-SaveBattleTowerLevelGroup: ; 170868 (5c:4868) BattleTowerAction $07
+SaveBattleTowerLevelGroup: ; BattleTowerAction $07
 	ld a, BANK(sBTChoiceOfLevelGroup)
 	call GetSRAMBank
 	ld a, [rSVBK]
@@ -1201,7 +1164,7 @@ SaveBattleTowerLevelGroup: ; 170868 (5c:4868) BattleTowerAction $07
 	call CloseSRAM
 	ret
 
-LoadBattleTowerLevelGroup: ; 170881 (5c:4881) BattleTowerAction $08 ; Load level group choice
+LoadBattleTowerLevelGroup: ; BattleTowerAction $08 ; Load level group choice
 	ld a, BANK(sBTChoiceOfLevelGroup)
 	call GetSRAMBank
 	ld a, [rSVBK]
@@ -1215,7 +1178,7 @@ LoadBattleTowerLevelGroup: ; 170881 (5c:4881) BattleTowerAction $08 ; Load level
 	call CloseSRAM
 	ret
 
-BattleTower_CheckSaveFileExistsAndIsYours: ; 17089a BattleTowerAction $09
+BattleTower_CheckSaveFileExistsAndIsYours: ; BattleTowerAction $09
 	ld a, [wSaveFileExists]
 	and a
 	jr z, .nope
@@ -1230,16 +1193,14 @@ BattleTower_CheckSaveFileExistsAndIsYours: ; 17089a BattleTowerAction $09
 .nope
 	ld [wScriptVar], a
 	ret
-; 1708b1
-
 
-Function1708b1: ; 1708b1 (5c:48b1) BattleTowerAction $0a
+Function1708b1: ; BattleTowerAction $0a
 	xor a
 	ld [wMusicFade], a
 	call MaxVolume
 	ret
 
-CheckMobileEventIndex: ; 1708b9 (5c:48b9) BattleTowerAction $0b something to do with GS Ball
+CheckMobileEventIndex: ; BattleTowerAction $0b something to do with GS Ball
 	ld a, BANK(sMobileEventIndex)
 	call GetSRAMBank
 	ld a, [sMobileEventIndex]
@@ -1247,7 +1208,7 @@ CheckMobileEventIndex: ; 1708b9 (5c:48b9) BattleTowerAction $0b something to do
 	call CloseSRAM
 	ret
 
-Function1708c8: ; 1708c8 (5c:48c8) BattleTowerAction $0c
+Function1708c8: ; BattleTowerAction $0c
 	call UpdateTime
 	ld a, $5
 	call GetSRAMBank
@@ -1266,7 +1227,7 @@ Function1708c8: ; 1708c8 (5c:48c8) BattleTowerAction $0c
 	call CloseSRAM
 	ret
 
-Function1708f0: ; 1708f0 (5c:48f0) BattleTowerAction $0d
+Function1708f0: ; BattleTowerAction $0d
 	xor a
 	ld [wScriptVar], a
 	call UpdateTime
@@ -1292,8 +1253,7 @@ Function1708f0: ; 1708f0 (5c:48f0) BattleTowerAction $0d
 	ld [wScriptVar], a
 	ret
 
-
-Function170923: ; 170923
+Function170923:
 	ld a, $5
 	call GetSRAMBank
 	xor a
@@ -1304,10 +1264,8 @@ Function170923: ; 170923
 	call ByteFill
 	call CloseSRAM
 	ret
-; 17093c
-
 
-BattleTowerAction_EggTicket: ; 17093c (5c:493c) BattleTowerAction $0e
+BattleTowerAction_EggTicket: ; BattleTowerAction $0e
 	xor a
 	ld [wScriptVar], a
 	ld a, EGG_TICKET
@@ -1334,7 +1292,7 @@ BattleTowerAction_EggTicket: ; 17093c (5c:493c) BattleTowerAction $0e
 	dec a
 	jr nz, .loop2
 .skip
-	ld de, String_1709a4
+	ld de, String_MysteryJP
 	ld a, NAME_LENGTH_JAPANESE
 .compare_loop
 	push af
@@ -1373,12 +1331,11 @@ endr
 	dec c
 	jr nz, .loop
 	ret
-; 1709a4 (5c:49a4)
 
-String_1709a4: ; 1709a4
-	db "なぞナゾ@@"
+String_MysteryJP:
+	db "なぞナゾ@@" ; MYSTERY
 
-Function1709aa: ; 1709aa (5c:49aa) BattleTowerAction $0f
+Function1709aa: ; BattleTowerAction $0f
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(w3_d090)
@@ -1389,7 +1346,7 @@ Function1709aa: ; 1709aa (5c:49aa) BattleTowerAction $0f
 	ld [rSVBK], a
 	ret
 
-Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10
+Function1709bb: ; BattleTowerAction $10
 	xor a
 	ld [wScriptVar], a
 	ld a, $5
@@ -1400,7 +1357,7 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10
 	jr nc, .invalid
 	ld e, a
 	ld d, 0
-	ld hl, Jumptable_1709e7
+	ld hl, .jumptable
 	add hl, de
 	add hl, de
 	ld a, [hli]
@@ -1415,33 +1372,30 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10
 	ld [$a800], a
 	call CloseSRAM
 	ret
-; 1709e7 (5c:49e7)
 
-Jumptable_1709e7: ; 1709e7
+.jumptable:
 	dw .NoAction
 	dw .NoAction
 	dw .DoAction1
 	dw .DoAction1
 	dw .Action4
 	dw .Action5
-; 1709f3
 
-.DoAction1: ; 1709f3
+.DoAction1:
 	ld a, $5
 	call GetSRAMBank
 	ld a, $1
 	ld [$a800], a
 	call CloseSRAM
 
-.NoAction: ; 170a00
+.NoAction:
 	ret
-; 170a01
 
-.Action4: ; 170a01
+.Action4:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $b023
-	ld de, wMisc
+	ld de, wc608
 	ld bc, $0069
 	call CopyBytes
 	ld a, [$a825]
@@ -1454,20 +1408,19 @@ Jumptable_1709e7: ; 1709e7
 	ld a, $1
 	ld [wScriptVar], a
 	ret
-; 170a33
 
-.Action5: ; 170a33
+.Action5:
 	ld a, $0
 	call GetSRAMBank
 	ld hl, wRTC
-	ld de, wMisc
+	ld de, wc608
 	ld bc, $0004
 	call CopyBytes
 	call CloseSRAM
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $b08c
-	ld de, wMisc
+	ld de, wc608
 	ld c, $4
 .compare_loop
 	ld a, [de]
@@ -1516,15 +1469,14 @@ Jumptable_1709e7: ; 1709e7
 
 .no_scene_2
 	ret
-; 170a9c
 
-Function170a9c: ; 170a9c (5c:4a9c) BattleTowerAction $11
-	ld c, $0
+Function170a9c: ; BattleTowerAction $11
+	ld c, FALSE
 	jr asm_170aa2
 
-Function170aa0: ; 170aa0 (5c:4aa0) BattleTowerAction $12
-	ld c, $1
-asm_170aa2: ; 170aa2 (5c:4aa2)
+Function170aa0: ; BattleTowerAction $12
+	ld c, TRUE
+asm_170aa2:
 	ld a, $5
 	call GetSRAMBank
 	ld a, c
@@ -1532,7 +1484,7 @@ asm_170aa2: ; 170aa2 (5c:4aa2)
 	call CloseSRAM
 	ret
 
-Function170aaf: ; 170aaf (5c:4aaf) BattleTowerAction $13
+Function170aaf: ; BattleTowerAction $13
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$aa8d]
@@ -1540,7 +1492,7 @@ Function170aaf: ; 170aaf (5c:4aaf) BattleTowerAction $13
 	call CloseSRAM
 	ret
 
-Function170abe: ; 170abe (5c:4abe) BattleTowerAction $14
+Function170abe: ; BattleTowerAction $14
 	call BattleTower_CheckSaveFileExistsAndIsYours
 	ld a, [wScriptVar]
 	and a
@@ -1554,7 +1506,7 @@ Function170abe: ; 170abe (5c:4abe) BattleTowerAction $14
 	call CloseSRAM
 	ret
 
-Function170ad7: ; 170ad7 (5c:4ad7) BattleTowerAction $15
+Function170ad7: ; BattleTowerAction $15
 	ld a, BANK(sBattleTowerSaveFileFlags)
 	call GetSRAMBank
 	ld a, [sBattleTowerSaveFileFlags]
@@ -1563,7 +1515,7 @@ Function170ad7: ; 170ad7 (5c:4ad7) BattleTowerAction $15
 	call CloseSRAM
 	ret
 
-BattleTowerAction_LevelCheck: ; 170ae8 (5c:4ae8) BattleTowerAction $18
+BattleTowerAction_LevelCheck: ; BattleTowerAction $18
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$b2fb]
@@ -1583,7 +1535,7 @@ BattleTowerAction_LevelCheck: ; 170ae8 (5c:4ae8) BattleTowerAction $18
 	ld [wScriptVar], a
 	ret
 
-BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19
+BattleTowerAction_UbersCheck: ; BattleTowerAction $19
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$b2fb]
@@ -1603,7 +1555,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19
 	ld [wScriptVar], a
 	ret
 
-Special_LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44
+LoadOpponentTrainerAndPokemonWithOTSprite:
 	farcall Function_LoadOpponentTrainerAndPokemons
 	ld a, [rSVBK]
 	push af
@@ -1646,16 +1598,14 @@ Special_LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44
 	ld [hUsedSpriteTile], a
 	farcall GetUsedSprite
 	ret
-; 170b90
 
 INCLUDE "data/trainers/sprites.asm"
 
-DummySpecial_170bd2: ; 170bd2
+DummySpecial_170bd2:
 	ret
-; 170bd3
 
-Special_CheckForBattleTowerRules: ; 170bd3
-	farcall CheckForBattleTowerRules
+CheckForBattleTowerRules:
+	farcall _CheckForBattleTowerRules
 	jr c, .asm_170bde
 	xor a ; FALSE
 	jr .asm_170be0
@@ -1666,4 +1616,3 @@ Special_CheckForBattleTowerRules: ; 170bd3
 .asm_170be0
 	ld [wScriptVar], a
 	ret
-; 170be4
diff --git a/engine/events/battle_tower/get_trainer_class.asm b/engine/events/battle_tower/get_trainer_class.asm
index 37fe91c56..3b94b4d35 100644
--- a/engine/events/battle_tower/get_trainer_class.asm
+++ b/engine/events/battle_tower/get_trainer_class.asm
@@ -5,7 +5,7 @@ GetMobileOTTrainerClass: ; mobile function
 	ld c, a
 	ret
 
-.GetMobileOTTrainerClass: ; 4e930
+.GetMobileOTTrainerClass:
 	ld a, [hli]
 	xor [hl]
 	ld c, a
@@ -15,7 +15,7 @@ GetMobileOTTrainerClass: ; mobile function
 .male_trainer_loop
 	srl c
 	ld a, c
-	cp MaleTrainersEnd - MaleTrainers - 1
+	cp MaleTrainers.End - MaleTrainers - 1
 	jr nc, .male_trainer_loop
 	inc c
 
@@ -33,7 +33,7 @@ GetMobileOTTrainerClass: ; mobile function
 .female_trainer_loop
 	srl c
 	ld a, c
-	cp FemaleTrainersEnd - FemaleTrainers - 1
+	cp FemaleTrainers.End - FemaleTrainers - 1
 	jr nc, .female_trainer_loop
 	inc c
 
diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm
index bfb5cf885..f9be02b28 100644
--- a/engine/events/battle_tower/load_trainer.asm
+++ b/engine/events/battle_tower/load_trainer.asm
@@ -1,4 +1,4 @@
-Function_LoadOpponentTrainerAndPokemons: ; 1f8000
+Function_LoadOpponentTrainerAndPokemons:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBT_OTTrainer)
@@ -12,9 +12,9 @@ Function_LoadOpponentTrainerAndPokemons: ; 1f8000
 
 	; Write $ff into the Item-Slots
 	ld a, $ff
-	ld [wBT_OTPkmn1Item], a
-	ld [wBT_OTPkmn2Item], a
-	ld [wBT_OTPkmn3Item], a
+	ld [wBT_OTMon1Item], a
+	ld [wBT_OTMon2Item], a
+	ld [wBT_OTMon3Item], a
 
 	; Set wBT_OTTrainer as start address to write the following data to
 	ld de, wBT_OTTrainer
@@ -32,8 +32,8 @@ if DEF(_CRYSTAL11)
 else
 ; Crystal 1.0 used the wrong constant here, so only the first 21
 ; trainers in BattleTowerTrainers can be sampled.
-	maskbits BATTLETOWER_NUM_UNIQUE_PKMN
-	cp BATTLETOWER_NUM_UNIQUE_PKMN
+	maskbits BATTLETOWER_NUM_UNIQUE_MON
+	cp BATTLETOWER_NUM_UNIQUE_MON
 endc
 	jr nc, .resample
 	ld b, a
@@ -68,7 +68,7 @@ endc
 	ld bc, NAME_LENGTH
 	call CopyBytes
 
-	call Function_LoadRandomBattleTowerPkmn
+	call Function_LoadRandomBattleTowerMon
 	pop af
 
 	ld hl, BattleTowerTrainerData
@@ -91,21 +91,20 @@ endc
 
 	ret
 
-
-Function_LoadRandomBattleTowerPkmn: ; 1f8081
+Function_LoadRandomBattleTowerMon:
 	ld c, BATTLETOWER_PARTY_LENGTH
 .loop
 	push bc
-	ld a, BANK(sBTPkmnPrevTrainer1)
+	ld a, BANK(sBTMonPrevTrainer1)
 	call GetSRAMBank
 
-.FindARandomBattleTowerPkmn:
-	; From Which LevelGroup are the Pkmn loaded
+.FindARandomBattleTowerMon:
+	; From Which LevelGroup are the mon loaded
 	; a = 1..10
 	ld a, [wBTChoiceOfLvlGroup]
 	dec a
 	ld hl, BattleTowerMons
-	ld bc, BattleTowerMons2 - BattleTowerMons1
+	ld bc, BattleTowerMons2 - BattleTowerMons1 ; size of one level group
 	call AddNTimes
 
 	ld a, [hRandomAdd]
@@ -115,12 +114,12 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
 	ld a, [hRandomAdd]
 	add b
 	ld b, a
-	maskbits BATTLETOWER_NUM_UNIQUE_PKMN
-	cp BATTLETOWER_NUM_UNIQUE_PKMN
+	maskbits BATTLETOWER_NUM_UNIQUE_MON
+	cp BATTLETOWER_NUM_UNIQUE_MON
 	jr nc, .resample
-	; in register 'a' is the chosen Pkmn of the LevelGroup
+	; in register 'a' is the chosen mon of the LevelGroup
 
-	; Check if Pkmn was already loaded before
+	; Check if mon was already loaded before
 	; Check current and the 2 previous teams
 	; includes check if item is double at the current team
 	ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH
@@ -129,42 +128,42 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
 	ld b, a
 	ld a, [hld]
 	ld c, a
-	ld a, [wBT_OTPkmn1]
+	ld a, [wBT_OTMon1]
 	cp b
-	jr z, .FindARandomBattleTowerPkmn
-	ld a, [wBT_OTPkmn1Item]
+	jr z, .FindARandomBattleTowerMon
+	ld a, [wBT_OTMon1Item]
 	cp c
-	jr z, .FindARandomBattleTowerPkmn
-	ld a, [wBT_OTPkmn2]
+	jr z, .FindARandomBattleTowerMon
+	ld a, [wBT_OTMon2]
 	cp b
-	jr z, .FindARandomBattleTowerPkmn
-	ld a, [wBT_OTPkmn2Item]
+	jr z, .FindARandomBattleTowerMon
+	ld a, [wBT_OTMon2Item]
 	cp c
-	jr z, .FindARandomBattleTowerPkmn
-	ld a, [wBT_OTPkmn3]
+	jr z, .FindARandomBattleTowerMon
+	ld a, [wBT_OTMon3]
 	cp b
-	jr z, .FindARandomBattleTowerPkmn
-	ld a, [wBT_OTPkmn3Item]
+	jr z, .FindARandomBattleTowerMon
+	ld a, [wBT_OTMon3Item]
 	cp c
-	jr z, .FindARandomBattleTowerPkmn
-	ld a, [sBTPkmnPrevTrainer1]
+	jr z, .FindARandomBattleTowerMon
+	ld a, [sBTMonPrevTrainer1]
 	cp b
-	jr z, .FindARandomBattleTowerPkmn
-	ld a, [sBTPkmnPrevTrainer2]
+	jr z, .FindARandomBattleTowerMon
+	ld a, [sBTMonPrevTrainer2]
 	cp b
-	jr z, .FindARandomBattleTowerPkmn
-	ld a, [sBTPkmnPrevTrainer3]
+	jr z, .FindARandomBattleTowerMon
+	ld a, [sBTMonPrevTrainer3]
 	cp b
-	jr z, .FindARandomBattleTowerPkmn
-	ld a, [sBTPkmnPrevPrevTrainer1]
+	jr z, .FindARandomBattleTowerMon
+	ld a, [sBTMonPrevPrevTrainer1]
 	cp b
-	jr z, .FindARandomBattleTowerPkmn
-	ld a, [sBTPkmnPrevPrevTrainer2]
+	jr z, .FindARandomBattleTowerMon
+	ld a, [sBTMonPrevPrevTrainer2]
 	cp b
-	jr z, .FindARandomBattleTowerPkmn
-	ld a, [sBTPkmnPrevPrevTrainer3]
+	jr z, .FindARandomBattleTowerMon
+	ld a, [sBTMonPrevPrevTrainer3]
 	cp b
-	jr z, .FindARandomBattleTowerPkmn
+	jr z, .FindARandomBattleTowerMon
 
 	ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH
 	call CopyBytes
@@ -193,21 +192,20 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
 	dec c
 	jp nz, .loop
 
-	ld a, [sBTPkmnPrevTrainer1]
-	ld [sBTPkmnPrevPrevTrainer1], a
-	ld a, [sBTPkmnPrevTrainer2]
-	ld [sBTPkmnPrevPrevTrainer2], a
-	ld a, [sBTPkmnPrevTrainer3]
-	ld [sBTPkmnPrevPrevTrainer3], a
-	ld a, [wBT_OTPkmn1]
-	ld [sBTPkmnPrevTrainer1], a
-	ld a, [wBT_OTPkmn2]
-	ld [sBTPkmnPrevTrainer2], a
-	ld a, [wBT_OTPkmn3]
-	ld [sBTPkmnPrevTrainer3], a
+	ld a, [sBTMonPrevTrainer1]
+	ld [sBTMonPrevPrevTrainer1], a
+	ld a, [sBTMonPrevTrainer2]
+	ld [sBTMonPrevPrevTrainer2], a
+	ld a, [sBTMonPrevTrainer3]
+	ld [sBTMonPrevPrevTrainer3], a
+	ld a, [wBT_OTMon1]
+	ld [sBTMonPrevTrainer1], a
+	ld a, [wBT_OTMon2]
+	ld [sBTMonPrevTrainer2], a
+	ld a, [wBT_OTMon3]
+	ld [sBTMonPrevTrainer3], a
 	call CloseSRAM
 	ret
-; 1f814e
 
 INCLUDE "data/battle_tower/classes.asm"
 
diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm
index fc9fa948a..6a2990118 100644
--- a/engine/events/battle_tower/rules.asm
+++ b/engine/events/battle_tower/rules.asm
@@ -1,35 +1,31 @@
-CheckForMobileBattleRules: ; 8b1e1
+CheckForMobileBattleRules:
 	ld de, .PointerTables
 	call BattleTower_ExecuteJumptable
 	ret z
 	call BattleTower_PleaseReturnWhenReady
 	scf
 	ret
-; 8b1ed
 
-.PointerTables: ; 8b1ed
+.PointerTables:
 	db 2
 	dw .Functions
 	dw .TextPointers
 
-.Functions: ; 8b1f2
+.Functions:
 	dw BattleTower_CheckPartyLengthIs3
 	dw BattleTower_CheckPartyHasThreeMonsThatAreNotEggs
-; 8b1f6
 
-.TextPointers: ; 8b1f6
+.TextPointers:
 	dw .ExcuseMeText
 	dw JumpText_NeedAtLeastThreeMon
 	dw JumpText_EggDoesNotQualify
-; 8b1fc
 
-.ExcuseMeText: ; 0x8b1fc
+.ExcuseMeText:
 	; Excuse me!
 	text_jump UnknownText_0x1c5937
 	db "@"
-; 0x8b201
 
-CheckForBattleTowerRules: ; 8b201
+_CheckForBattleTowerRules:
 	ld hl, wStringBuffer2
 	ld [hl], "3"
 	inc hl
@@ -40,83 +36,71 @@ CheckForBattleTowerRules: ; 8b201
 	call BattleTower_PleaseReturnWhenReady
 	scf
 	ret
-; 8b215
 
-.PointerTables: ; 8b215
+.PointerTables:
 	db 4
 	dw .Functions
 	dw .TextPointers
 
-.Functions: ; 8b21a
+.Functions:
 	dw Function_PartyCountEq3
 	dw Function_PartySpeciesAreUnique
 	dw Function_PartyItemsAreUnique
 	dw Function_HasPartyAnEgg
-; 8b222
 
-.TextPointers: ; 8b222
+.TextPointers:
 	dw JumpText_ExcuseMeYoureNotReady
-	dw JumpText_OnlyThreePkmnMayBeEntered
-	dw JumpText_ThePkmnMustAllBeDifferentKinds
-	dw JumpText_ThePkmnMustNotHoldTheSameItems
+	dw JumpText_OnlyThreeMonMayBeEntered
+	dw JumpText_TheMonMustAllBeDifferentKinds
+	dw JumpText_TheMonMustNotHoldTheSameItems
 	dw JumpText_YouCantTakeAnEgg
-; 8b22c
 
-JumpText_ExcuseMeYoureNotReady: ; 0x8b22c
+JumpText_ExcuseMeYoureNotReady:
 	; Excuse me. You're not ready.
 	text_jump Text_ExcuseMeYoureNotReady
 	db "@"
-; 0x8b231
 
-BattleTower_PleaseReturnWhenReady: ; 8b231
+BattleTower_PleaseReturnWhenReady:
 	ld hl, .PleaseReturnWhenReady
 	call PrintText
 	ret
-; 8b238
 
-.PleaseReturnWhenReady: ; 0x8b238
+.PleaseReturnWhenReady:
 	; Please return when you're ready.
 	text_jump UnknownText_0x1c5962
 	db "@"
-; 0x8b23d
 
-JumpText_NeedAtLeastThreeMon: ; 0x8b23d
+JumpText_NeedAtLeastThreeMon:
 	; You need at least three #MON.
 	text_jump UnknownText_0x1c5983
 	db "@"
-; 0x8b242
 
-JumpText_EggDoesNotQualify: ; 0x8b242
+JumpText_EggDoesNotQualify:
 	; Sorry, an EGG doesn't qualify.
 	text_jump UnknownText_0x1c59a3
 	db "@"
-; 0x8b247
 
-JumpText_OnlyThreePkmnMayBeEntered: ; 0x8b247
+JumpText_OnlyThreeMonMayBeEntered:
 	; Only three #MON may be entered.
-	text_jump Text_OnlyThreePkmnMayBeEntered
+	text_jump Text_OnlyThreeMonMayBeEntered
 	db "@"
-; 0x8b24c
 
-JumpText_ThePkmnMustAllBeDifferentKinds: ; 0x8b24c
+JumpText_TheMonMustAllBeDifferentKinds:
 	; The @  #MON must all be different kinds.
-	text_jump Text_ThePkmnMustAllBeDifferentKinds
+	text_jump Text_TheMonMustAllBeDifferentKinds
 	db "@"
-; 0x8b251
 
-JumpText_ThePkmnMustNotHoldTheSameItems: ; 0x8b251
+JumpText_TheMonMustNotHoldTheSameItems:
 	; The @  #MON must not hold the same items.
-	text_jump Text_ThePkmnMustNotHoldTheSameItems
+	text_jump Text_TheMonMustNotHoldTheSameItems
 	db "@"
-; 0x8b256
 
-JumpText_YouCantTakeAnEgg: ; 0x8b256
+JumpText_YouCantTakeAnEgg:
 	; You can't take an EGG!
 	text_jump Text_YouCantTakeAnEgg
 	db "@"
-; 0x8b25b
 
-BattleTower_ExecuteJumptable: ; 8b25b
+BattleTower_ExecuteJumptable:
 	ld bc, 0
 .loop
 	call .DoJumptableFunction
@@ -126,9 +110,8 @@ BattleTower_ExecuteJumptable: ; 8b25b
 	ld a, b
 	and a
 	ret
-; 8b26c
 
-.DoJumptableFunction: ; 8b26c
+.DoJumptableFunction:
 	push de
 	push bc
 	call .GetFunctionPointer
@@ -137,16 +120,14 @@ BattleTower_ExecuteJumptable: ; 8b25b
 	pop bc
 	pop de
 	ret
-; 8b276
 
-.Next_CheckReachedEnd: ; 8b276
+.Next_CheckReachedEnd:
 	inc c
 	ld a, [de]
 	cp c
 	ret
-; 8b27a
 
-.GetFunctionPointer: ; 8b27a
+.GetFunctionPointer:
 	inc de
 	ld a, [de]
 	ld l, a
@@ -154,9 +135,8 @@ BattleTower_ExecuteJumptable: ; 8b25b
 	ld a, [de]
 	ld h, a
 	ret
-; 8b281
 
-.GetTextPointers: ; 8b281
+.GetTextPointers:
 	inc de
 	inc de
 	inc de
@@ -166,16 +146,14 @@ BattleTower_ExecuteJumptable: ; 8b25b
 	ld a, [de]
 	ld h, a
 	ret
-; 8b28a
 
-.LoadTextPointer: ; 8b28a
+.LoadTextPointer:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	ret
-; 8b28e
 
-.PrintFailureText: ; 8b28e
+.PrintFailureText:
 	push de
 	push bc
 	ld a, b
@@ -186,18 +164,16 @@ BattleTower_ExecuteJumptable: ; 8b25b
 	ld b, $1
 	pop de
 	ret
-; 8b29d
 
-.PrintFirstText: ; 8b29d
+.PrintFirstText:
 	push de
 	call .GetTextPointers
 	call .LoadTextPointer
 	call PrintText
 	pop de
 	ret
-; 8b2a9
 
-.PrintNthText: ; 8b2a9
+.PrintNthText:
 	push bc
 	call .GetTextPointers
 	inc hl
@@ -209,15 +185,13 @@ BattleTower_ExecuteJumptable: ; 8b25b
 	call PrintText
 	pop bc
 	ret
-; 8b2bb
 
-BattleTower_CheckPartyLengthIs3: ; 8b2bb
+BattleTower_CheckPartyLengthIs3:
 	ld a, [wPartyCount]
 	cp BATTLETOWER_PARTY_LENGTH
 	ret
-; 8b2c1
 
-BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1
+BattleTower_CheckPartyHasThreeMonsThatAreNotEggs:
 	ld hl, wPartyCount
 	ld a, [hli]
 	ld b, $0
@@ -237,23 +211,20 @@ BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1
 	ld a, b
 	cp BATTLETOWER_PARTY_LENGTH
 	ret
-; 8b2da
 
-Function_PartyCountEq3: ; 8b2da
+Function_PartyCountEq3:
 	ld a, [wPartyCount]
 	cp BATTLETOWER_PARTY_LENGTH
 	ret z
 	scf
 	ret
-; 8b2e2
 
-Function_PartySpeciesAreUnique: ; 8b2e2
+Function_PartySpeciesAreUnique:
 	ld hl, wPartyMon1Species
 	call VerifyUniqueness
 	ret
-; 8b2e9
 
-VerifyUniqueness: ; 8b2e9
+VerifyUniqueness:
 	ld de, wPartyCount
 	ld a, [de]
 	inc de
@@ -296,18 +267,16 @@ VerifyUniqueness: ; 8b2e9
 	pop hl
 	scf
 	ret
-; 8b31a
 
-.nextmon ; 8b31a
+.nextmon
 	push bc
 	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
 	inc de
 	pop bc
 	ret
-; 8b322
 
-.isegg ; 8b322
+.isegg
 	push bc
 	ld b, a
 	ld a, [de]
@@ -315,15 +284,13 @@ VerifyUniqueness: ; 8b2e9
 	ld a, b
 	pop bc
 	ret
-; 8b32a
 
-Function_PartyItemsAreUnique: ; 8b32a
+Function_PartyItemsAreUnique:
 	ld hl, wPartyMon1Item
 	call VerifyUniqueness
 	ret
-; 8b331
 
-Function_HasPartyAnEgg: ; 8b331
+Function_HasPartyAnEgg:
 	ld hl, wPartyCount
 	ld a, [hli]
 	ld c, a
@@ -339,4 +306,3 @@ Function_HasPartyAnEgg: ; 8b331
 .found
 	scf
 	ret
-; 8b342
diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm
index c4bcedf64..e2db148b7 100755..100644
--- a/engine/events/battle_tower/trainer_text.asm
+++ b/engine/events/battle_tower/trainer_text.asm
@@ -1,4 +1,4 @@
-BattleTowerText:: ; 11c000
+BattleTowerText::
 ; Print text c for trainer [wBT_OTTrainerClass]
 ; 1: Intro text
 ; 2: Player lost
@@ -83,19 +83,17 @@ endc
 	ld [rSVBK], a
 	call PlaceHLTextAtBC
 	ret
-; 11c05d
 
 INCLUDE "mobile/fixed_words.asm"
 
 INCLUDE "data/trainers/genders.asm"
 
-
-BTMaleTrainerTexts: ; 11f332
+BTMaleTrainerTexts:
 	dw .Greetings
 	dw .PlayerLost
 	dw .PlayerWon
 
-.Greetings: ; 11f338
+.Greetings:
 	dw BTGreetingM1
 	dw BTGreetingM2
 	dw BTGreetingM3
@@ -122,7 +120,7 @@ BTMaleTrainerTexts: ; 11f332
 	dw BTGreetingM24
 	dw BTGreetingM25
 
-.PlayerLost: ; 11f36a
+.PlayerLost:
 	dw BTLossM1
 	dw BTLossM2
 	dw BTLossM3
@@ -149,7 +147,7 @@ BTMaleTrainerTexts: ; 11f332
 	dw BTLossM24
 	dw BTLossM25
 
-.PlayerWon: ; 11f39c
+.PlayerWon:
 	dw BTWinM1
 	dw BTWinM2
 	dw BTWinM3
@@ -176,13 +174,12 @@ BTMaleTrainerTexts: ; 11f332
 	dw BTWinM24
 	dw BTWinM25
 
-
 BTFemaleTrainerTexts:
 	dw .Greetings
 	dw .PlayerLost
 	dw .PlayerWon
 
-.Greetings: ; 11f3d4
+.Greetings:
 	dw BTGreetingF1
 	dw BTGreetingF2
 	dw BTGreetingF3
@@ -199,7 +196,7 @@ BTFemaleTrainerTexts:
 	dw BTGreetingF14
 	dw BTGreetingF15
 
-.PlayerLost: ; 11f3f2
+.PlayerLost:
 	dw BTLossF1
 	dw BTLossF2
 	dw BTLossF3
@@ -216,7 +213,7 @@ BTFemaleTrainerTexts:
 	dw BTLossF14
 	dw BTLossF15
 
-.PlayerWon: ; 11f410
+.PlayerWon:
 	dw BTWinF1
 	dw BTWinF2
 	dw BTWinF3
@@ -233,486 +230,482 @@ BTFemaleTrainerTexts:
 	dw BTWinF14
 	dw BTWinF15
 
-
-BTGreetingM1: ; 0x11f42e
+BTGreetingM1:
 	text_jump BattleTowerText_0x1ec000
 	db "@"
 
-BTLossM1: ; 0x11f433
+BTLossM1:
 	text_jump BattleTowerText_0x1ec03b
 	db "@"
 
-BTWinM1: ; 0x11f438
+BTWinM1:
 	text_jump UnknownText_0x1ec060
 	db "@"
 
-BTGreetingM2: ; 0x11f43d
+BTGreetingM2:
 	text_jump BattleTowerText_0x1ec080
 	db "@"
 
-BTLossM2: ; 0x11f442
+BTLossM2:
 	text_jump UnknownText_0x1ec0a3
 	db "@"
 
-BTWinM2: ; 0x11f447
+BTWinM2:
 	text_jump UnknownText_0x1ec0c4
 	db "@"
 
-BTGreetingM3: ; 0x11f44c
+BTGreetingM3:
 	text_jump UnknownText_0x1ec0e1
 	db "@"
 
-BTLossM3: ; 0x11f451
+BTLossM3:
 	text_jump UnknownText_0x1ec108
 	db "@"
 
-BTWinM3: ; 0x11f456
+BTWinM3:
 	text_jump UnknownText_0x1ec12a
 	db "@"
 
-BTGreetingM4: ; 0x11f45b
+BTGreetingM4:
 	text_jump UnknownText_0x1ec14d
 	db "@"
 
-BTLossM4: ; 0x11f460
+BTLossM4:
 	text_jump UnknownText_0x1ec16f
 	db "@"
 
-BTWinM4: ; 0x11f465
+BTWinM4:
 	text_jump UnknownText_0x1ec190
 	db "@"
 
-BTGreetingM5: ; 0x11f46a
+BTGreetingM5:
 	text_jump UnknownText_0x1ec1ae
 	db "@"
 
-BTLossM5: ; 0x11f46f
+BTLossM5:
 	text_jump UnknownText_0x1ec1d0
 	db "@"
 
-BTWinM5: ; 0x11f474
+BTWinM5:
 	text_jump UnknownText_0x1ec1f4
 	db "@"
 
-BTGreetingM6: ; 0x11f479
+BTGreetingM6:
 	text_jump UnknownText_0x1ec216
 	db "@"
 
-BTLossM6: ; 0x11f47e
+BTLossM6:
 	text_jump UnknownText_0x1ec238
 	db "@"
 
-BTWinM6: ; 0x11f483
+BTWinM6:
 	text_jump UnknownText_0x1ec259
 	db "@"
 
-BTGreetingM7: ; 0x11f488
+BTGreetingM7:
 	text_jump UnknownText_0x1ec27b
 	db "@"
 
-BTLossM7: ; 0x11f48d
+BTLossM7:
 	text_jump UnknownText_0x1ec2a0
 	db "@"
 
-BTWinM7: ; 0x11f492
+BTWinM7:
 	text_jump UnknownText_0x1ec2c0
 	db "@"
 
-BTGreetingM8: ; 0x11f497
+BTGreetingM8:
 	text_jump UnknownText_0x1ec2d9
 	db "@"
 
-BTLossM8: ; 0x11f49c
+BTLossM8:
 	text_jump UnknownText_0x1ec2fe
 	db "@"
 
-BTWinM8: ; 0x11f4a1
+BTWinM8:
 	text_jump UnknownText_0x1ec320
 	db "@"
 
-BTGreetingM9: ; 0x11f4a6
+BTGreetingM9:
 	text_jump UnknownText_0x1ec33f
 	db "@"
 
-BTLossM9: ; 0x11f4ab
+BTLossM9:
 	text_jump UnknownText_0x1ec36c
 	db "@"
 
-BTWinM9: ; 0x11f4b0
+BTWinM9:
 	text_jump UnknownText_0x1ec389
 	db "@"
 
-BTGreetingM10: ; 0x11f4b5
+BTGreetingM10:
 	text_jump UnknownText_0x1ec3ad
 	db "@"
 
-BTLossM10: ; 0x11f4ba
+BTLossM10:
 	text_jump UnknownText_0x1ec3c5
 	db "@"
 
-BTWinM10: ; 0x11f4bf
+BTWinM10:
 	text_jump UnknownText_0x1ec3e5
 	db "@"
 
-BTGreetingM11: ; 0x11f4c4
+BTGreetingM11:
 	text_jump UnknownText_0x1ec402
 	db "@"
 
-BTLossM11: ; 0x11f4c9
+BTLossM11:
 	text_jump UnknownText_0x1ec411
 	db "@"
 
-BTWinM11: ; 0x11f4ce
+BTWinM11:
 	text_jump UnknownText_0x1ec41f
 	db "@"
 
-BTGreetingM12: ; 0x11f4d3
+BTGreetingM12:
 	text_jump UnknownText_0x1ec42e
 	db "@"
 
-BTLossM12: ; 0x11f4d8
+BTLossM12:
 	text_jump UnknownText_0x1ec461
 	db "@"
 
-BTWinM12: ; 0x11f4dd
+BTWinM12:
 	text_jump UnknownText_0x1ec4a0
 	db "@"
 
-BTGreetingM13: ; 0x11f4e2
+BTGreetingM13:
 	text_jump UnknownText_0x1ec4d6
 	db "@"
 
-BTLossM13: ; 0x11f4e7
+BTLossM13:
 	text_jump UnknownText_0x1ec4f5
 	db "@"
 
-BTWinM13: ; 0x11f4ec
+BTWinM13:
 	text_jump UnknownText_0x1ec512
 	db "@"
 
-BTGreetingM14: ; 0x11f4f1
+BTGreetingM14:
 	text_jump UnknownText_0x1ec532
 	db "@"
 
-BTLossM14: ; 0x11f4f6
+BTLossM14:
 	text_jump UnknownText_0x1ec54b
 	db "@"
 
-BTWinM14: ; 0x11f4fb
+BTWinM14:
 	text_jump UnknownText_0x1ec565
 	db "@"
 
-BTGreetingM15: ; 0x11f500
+BTGreetingM15:
 	text_jump UnknownText_0x1ec580
 	db "@"
 
-BTLossM15: ; 0x11f505
+BTLossM15:
 	text_jump UnknownText_0x1ec59d
 	db "@"
 
-BTWinM15: ; 0x11f50a
+BTWinM15:
 	text_jump UnknownText_0x1ec5b5
 	db "@"
 
-BTGreetingM16: ; 0x11f50f
+BTGreetingM16:
 	text_jump UnknownText_0x1ec5d3
 	db "@"
 
-BTLossM16: ; 0x11f514
+BTLossM16:
 	text_jump UnknownText_0x1ec5ee
 	db "@"
 
-BTWinM16: ; 0x11f519
+BTWinM16:
 	text_jump UnknownText_0x1ec60d
 	db "@"
 
-BTGreetingM17: ; 0x11f51e
+BTGreetingM17:
 	text_jump UnknownText_0x1ec631
 	db "@"
 
-BTLossM17: ; 0x11f523
+BTLossM17:
 	text_jump UnknownText_0x1ec651
 	db "@"
 
-BTWinM17: ; 0x11f528
+BTWinM17:
 	text_jump UnknownText_0x1ec68f
 	db "@"
 
-BTGreetingM18: ; 0x11f52d
+BTGreetingM18:
 	text_jump UnknownText_0x1ec6b1
 	db "@"
 
-BTLossM18: ; 0x11f532
+BTLossM18:
 	text_jump UnknownText_0x1ec6d0
 	db "@"
 
-BTWinM18: ; 0x11f537
+BTWinM18:
 	text_jump UnknownText_0x1ec708
 	db "@"
 
-BTGreetingM19: ; 0x11f53c
+BTGreetingM19:
 	text_jump UnknownText_0x1ec720
 	db "@"
 
-BTLossM19: ; 0x11f541
+BTLossM19:
 	text_jump UnknownText_0x1ec73e
 	db "@"
 
-BTWinM19: ; 0x11f546
+BTWinM19:
 	text_jump UnknownText_0x1ec75b
 	db "@"
 
-BTGreetingM20: ; 0x11f54b
+BTGreetingM20:
 	text_jump UnknownText_0x1ec77f
 	db "@"
 
-BTLossM20: ; 0x11f550
+BTLossM20:
 	text_jump UnknownText_0x1ec798
 	db "@"
 
-BTWinM20: ; 0x11f555
+BTWinM20:
 	text_jump UnknownText_0x1ec7bb
 	db "@"
 
-BTGreetingM21: ; 0x11f55a
+BTGreetingM21:
 	text_jump UnknownText_0x1ec7d8
 	db "@"
 
-BTLossM21: ; 0x11f55f
+BTLossM21:
 	text_jump UnknownText_0x1ec818
 	db "@"
 
-BTWinM21: ; 0x11f564
+BTWinM21:
 	text_jump UnknownText_0x1ec837
 	db "@"
 
-BTGreetingM22: ; 0x11f569
+BTGreetingM22:
 	text_jump UnknownText_0x1ec858
 	db "@"
 
-BTLossM22: ; 0x11f56e
+BTLossM22:
 	text_jump UnknownText_0x1ec876
 	db "@"
 
-BTWinM22: ; 0x11f573
+BTWinM22:
 	text_jump UnknownText_0x1ec898
 	db "@"
 
-BTGreetingM23: ; 0x11f578
+BTGreetingM23:
 	text_jump UnknownText_0x1ec8b1
 	db "@"
 
-BTLossM23: ; 0x11f57d
+BTLossM23:
 	text_jump UnknownText_0x1ec8d5
 	db "@"
 
-BTWinM23: ; 0x11f582
+BTWinM23:
 	text_jump UnknownText_0x1ec8f0
 	db "@"
 
-BTGreetingM24: ; 0x11f587
+BTGreetingM24:
 	text_jump UnknownText_0x1ec911
 	db "@"
 
-BTLossM24: ; 0x11f58c
+BTLossM24:
 	text_jump UnknownText_0x1ec928
 	db "@"
 
-BTWinM24: ; 0x11f591
+BTWinM24:
 	text_jump UnknownText_0x1ec949
 	db "@"
 
-BTGreetingM25: ; 0x11f596
+BTGreetingM25:
 	text_jump UnknownText_0x1ec969
 	db "@"
 
-BTLossM25: ; 0x11f59b
+BTLossM25:
 	text_jump UnknownText_0x1ec986
 	db "@"
 
-BTWinM25: ; 0x11f5a0
+BTWinM25:
 	text_jump UnknownText_0x1ec99b
 	db "@"
 
-
-
-
-BTGreetingF1: ; 0x11f5a5
+BTGreetingF1:
 	text_jump UnknownText_0x1ec9bd
 	db "@"
 
-BTLossF1: ; 0x11f5aa
+BTLossF1:
 	text_jump UnknownText_0x1ec9d9
 	db "@"
 
-BTWinF1: ; 0x11f5af
+BTWinF1:
 	text_jump UnknownText_0x1ec9f7
 	db "@"
 
-BTGreetingF2: ; 0x11f5b4
+BTGreetingF2:
 	text_jump UnknownText_0x1eca0a
 	db "@"
 
-BTLossF2: ; 0x11f5b9
+BTLossF2:
 	text_jump UnknownText_0x1eca2a
 	db "@"
 
-BTWinF2: ; 0x11f5be
+BTWinF2:
 	text_jump UnknownText_0x1eca47
 	db "@"
 
-BTGreetingF3: ; 0x11f5c3
+BTGreetingF3:
 	text_jump UnknownText_0x1eca64
 	db "@"
 
-BTLossF3: ; 0x11f5c8
+BTLossF3:
 	text_jump UnknownText_0x1eca82
 	db "@"
 
-BTWinF3: ; 0x11f5cd
+BTWinF3:
 	text_jump UnknownText_0x1eca9d
 	db "@"
 
-BTGreetingF4: ; 0x11f5d2
+BTGreetingF4:
 	text_jump UnknownText_0x1ecabf
 	db "@"
 
-BTLossF4: ; 0x11f5d7
+BTLossF4:
 	text_jump UnknownText_0x1ecade
 	db "@"
 
-BTWinF4: ; 0x11f5dc
+BTWinF4:
 	text_jump UnknownText_0x1ecafa
 	db "@"
 
-BTGreetingF5: ; 0x11f5e1
+BTGreetingF5:
 	text_jump UnknownText_0x1ecb19
 	db "@"
 
-BTLossF5: ; 0x11f5e6
+BTLossF5:
 	text_jump UnknownText_0x1ecb37
 	db "@"
 
-BTWinF5: ; 0x11f5eb
+BTWinF5:
 	text_jump UnknownText_0x1ecb55
 	db "@"
 
-BTGreetingF6: ; 0x11f5f0
+BTGreetingF6:
 	text_jump UnknownText_0x1ecb70
 	db "@"
 
-BTLossF6: ; 0x11f5f5
+BTLossF6:
 	text_jump UnknownText_0x1ecb92
 	db "@"
 
-BTWinF6: ; 0x11f5fa
+BTWinF6:
 	text_jump UnknownText_0x1ecbb6
 	db "@"
 
-BTGreetingF7: ; 0x11f5ff
+BTGreetingF7:
 	text_jump UnknownText_0x1ecbd9
 	db "@"
 
-BTLossF7: ; 0x11f604
+BTLossF7:
 	text_jump UnknownText_0x1ecbf3
 	db "@"
 
-BTWinF7: ; 0x11f609
+BTWinF7:
 	text_jump UnknownText_0x1ecc15
 	db "@"
 
-BTGreetingF8: ; 0x11f60e
+BTGreetingF8:
 	text_jump UnknownText_0x1ecc39
 	db "@"
 
-BTLossF8: ; 0x11f613
+BTLossF8:
 	text_jump UnknownText_0x1ecc55
 	db "@"
 
-BTWinF8: ; 0x11f618
+BTWinF8:
 	text_jump UnknownText_0x1ecc75
 	db "@"
 
-BTGreetingF9: ; 0x11f61d
+BTGreetingF9:
 	text_jump UnknownText_0x1ecc92
 	db "@"
 
-BTLossF9: ; 0x11f622
+BTLossF9:
 	text_jump UnknownText_0x1ecca7
 	db "@"
 
-BTWinF9: ; 0x11f627
+BTWinF9:
 	text_jump UnknownText_0x1eccc1
 	db "@"
 
-BTGreetingF10: ; 0x11f62c
+BTGreetingF10:
 	text_jump UnknownText_0x1eccd7
 	db "@"
 
-BTLossF10: ; 0x11f631
+BTLossF10:
 	text_jump UnknownText_0x1eccef
 	db "@"
 
-BTWinF10: ; 0x11f636
+BTWinF10:
 	text_jump UnknownText_0x1ecd0e
 	db "@"
 
-BTGreetingF11: ; 0x11f63b
+BTGreetingF11:
 	text_jump UnknownText_0x1ecd2b
 	db "@"
 
-BTLossF11: ; 0x11f640
+BTLossF11:
 	text_jump UnknownText_0x1ecd4d
 	db "@"
 
-BTWinF11: ; 0x11f645
+BTWinF11:
 	text_jump UnknownText_0x1ecd6b
 	db "@"
 
-BTGreetingF12: ; 0x11f64a
+BTGreetingF12:
 	text_jump UnknownText_0x1ecd8d
 	db "@"
 
-BTLossF12: ; 0x11f64f
+BTLossF12:
 	text_jump UnknownText_0x1ecdaf
 	db "@"
 
-BTWinF12: ; 0x11f654
+BTWinF12:
 	text_jump UnknownText_0x1ecdcf
 	db "@"
 
-BTGreetingF13: ; 0x11f659
+BTGreetingF13:
 	text_jump UnknownText_0x1ecded
 	db "@"
 
-BTLossF13: ; 0x11f65e
+BTLossF13:
 	text_jump UnknownText_0x1ece0d
 	db "@"
 
-BTWinF13: ; 0x11f663
+BTWinF13:
 	text_jump UnknownText_0x1ece2a
 	db "@"
 
-BTGreetingF14: ; 0x11f668
+BTGreetingF14:
 	text_jump UnknownText_0x1ece4b
 	db "@"
 
-BTLossF14: ; 0x11f66d
+BTLossF14:
 	text_jump UnknownText_0x1ece70
 	db "@"
 
-BTWinF14: ; 0x11f672
+BTWinF14:
 	text_jump UnknownText_0x1ece8a
 	db "@"
 
-BTGreetingF15: ; 0x11f677
+BTGreetingF15:
 	text_jump UnknownText_0x1ecea8
 	db "@"
 
-BTLossF15: ; 0x11f67c
+BTLossF15:
 	text_jump UnknownText_0x1ecec9
 	db "@"
 
-BTWinF15: ; 0x11f681
+BTWinF15:
 	text_jump UnknownText_0x1ecee8
 	db "@"
diff --git a/engine/events/buena.asm b/engine/events/buena.asm
index 1991d6a86..c5260760a 100644
--- a/engine/events/buena.asm
+++ b/engine/events/buena.asm
@@ -1,8 +1,8 @@
-Special_BuenasPassword: ; 8af6b
+BuenasPassword:
 	xor a
 	ld [wWhichIndexSet], a
-	ld hl, .MenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, .MenuHeader
+	call CopyMenuHeader
 	ld a, [wBuenasPassword]
 	ld c, a
 	farcall GetBuenasPassword
@@ -26,25 +26,22 @@ Special_BuenasPassword: ; 8af6b
 	ld a, b
 	ld [wScriptVar], a
 	ret
-; 8afa9
 
-.MenuDataHeader: ; 0x8afa9
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, 7
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x8afb1
 
 	db 0
 
-.MenuData2: ; 0x8afb2
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 0 ; items
 	dw .PasswordIndices
 	dw .PlacePasswordChoices
-; 0x8afb4
 
-.PasswordIndices: ; 8afb8
+.PasswordIndices:
 	db NUM_PASSWORDS_PER_CATEGORY
 x = 0
 rept NUM_PASSWORDS_PER_CATEGORY
@@ -53,7 +50,7 @@ x = x + 1
 endr
 	db -1
 
-.PlacePasswordChoices: ; 8afbd
+.PlacePasswordChoices:
 	push de
 	ld a, [wBuenasPassword]
 	and $f0
@@ -65,9 +62,8 @@ endr
 	pop hl
 	call PlaceString
 	ret
-; 8afd4
 
-Special_BuenaPrize: ; 8afd4
+BuenaPrize:
 	xor a
 	ld [wMenuScrollPosition], a
 	ld a, $1
@@ -149,61 +145,52 @@ Special_BuenaPrize: ; 8afd4
 	call JoyWaitAorB
 	call PlayClickSFX
 	ret
-; 8b072
 
-.Text_AskWhichPrize: ; 0x8b072
+.Text_AskWhichPrize:
 	; Which prize would you like?
 	text_jump UnknownText_0x1c589f
 	db "@"
-; 0x8b077
 
-.Text_IsThatRight: ; 0x8b077
+.Text_IsThatRight:
 	; ? Is that right?
 	text_jump UnknownText_0x1c58bc
 	db "@"
-; 0x8b07c
 
 .Text_HereYouGo:	; Here you go!
 	text_jump UnknownText_0x1c58d1
 	db "@"
-; 0x8b081
 
-.Text_NotEnoughPoints: ; 0x8b081
+.Text_NotEnoughPoints:
 	; You don't have enough points.
 	text_jump UnknownText_0x1c58e0
 	db "@"
-; 0x8b086
 
-.Text_NoRoom: ; 0x8b086
+.Text_NoRoom:
 	; You have no room for it.
 	text_jump UnknownText_0x1c58ff
 	db "@"
-; 0x8b08b
 
-.Text_PleaseComeBackAgain: ; 0x8b08b
+.Text_PleaseComeBackAgain:
 	; Oh. Please come back again!
 	text_jump UnknownText_0x1c591a
 	db "@"
-; 0x8b090
 
-Buena_DisplayBlueCardBalance: ; 8b090
-	ld hl, BlueCardBalanceMenuDataHeader
-	call LoadMenuDataHeader
+Buena_DisplayBlueCardBalance:
+	ld hl, BlueCardBalanceMenuHeader
+	call LoadMenuHeader
 	ret
-; 8b097
 
-PrintBlueCardBalance: ; 8b097
+PrintBlueCardBalance:
 	ld de, wBlueCardBalance
 	call .DrawBox
 	ret
-; 8b09e
 
-.DrawBox: ; 8b09e
+.DrawBox:
 	push de
 	xor a
 	ld [hBGMapMode], a
-	ld hl, BlueCardBalanceMenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, BlueCardBalanceMenuHeader
+	call CopyMenuHeader
 	call MenuBox
 	call UpdateSprites
 	call MenuBoxCoord2Tile
@@ -221,31 +208,26 @@ PrintBlueCardBalance: ; 8b097
 	lb bc, 1, 2
 	call PrintNum
 	ret
-; 8b0ca
 
 .Points_string:
 	db "Points@"
-; 8b0d1
 
-BlueCardBalanceMenuDataHeader: ; 0x8b0d1
+BlueCardBalanceMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 11, 11, 13
-; 8b0d6
 
-Buena_PlacePrizeMenuBox: ; 8b0d6
-	ld hl, .menudataheader
-	call LoadMenuDataHeader
+Buena_PlacePrizeMenuBox:
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	ret
-; 8b0dd
 
-.menudataheader ; 0x8b0dd
+.MenuHeader
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 17, TEXTBOX_Y - 1
-; 8b0e2
 
-Buena_PrizeMenu: ; 8b0e2
-	ld hl, .MenuDataHeader
-	call CopyMenuDataHeader
+Buena_PrizeMenu:
+	ld hl, .MenuHeader
+	call CopyMenuHeader
 	ld a, [wMenuSelection]
 	ld [wMenuCursorBuffer], a
 	xor a
@@ -268,29 +250,26 @@ Buena_PrizeMenu: ; 8b0e2
 .cancel
 	xor a
 	ret
-; 8b113
 
-.MenuDataHeader: ; 0x8b113
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, 16, 9
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x8b11b
 
 	db 0
 
-.MenuData2: ; 0x8b11c
+.MenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 13 ; rows, columns
 	db 1 ; spacing
 	dba .indices
 	dba .prizeitem
 	dba .prizepoints
-; 8b129
 
-NUM_BUENA_PRIZES EQU 9 ; ((BuenaPrizeItemsEnd - BuenaPrizeItems) / 2)
+NUM_BUENA_PRIZES EQU 9 ; ((BuenaPrizeItems.End - BuenaPrizeItems) / 2)
 
-.indices ; 8b129
+.indices
 	db NUM_BUENA_PRIZES
 x = 1
 rept NUM_BUENA_PRIZES
@@ -298,9 +277,8 @@ rept NUM_BUENA_PRIZES
 x = x + 1
 endr
 	db -1
-; 8b134
 
-.prizeitem ; 8b134
+.prizeitem
 	ld a, [wMenuSelection]
 	call Buena_getprize
 	ld a, [hl]
@@ -310,9 +288,8 @@ endr
 	pop hl
 	call PlaceString
 	ret
-; 8b147
 
-.prizepoints ; 8b147
+.prizepoints
 	ld a, [wMenuSelection]
 	call Buena_getprize
 	inc hl
@@ -321,9 +298,8 @@ endr
 	add c
 	ld [de], a
 	ret
-; 8b154
 
-Buena_getprize: ; 8b154
+Buena_getprize:
 	dec a
 	ld hl, BuenaPrizeItems
 	ld b, 0
@@ -331,6 +307,5 @@ Buena_getprize: ; 8b154
 	add hl, bc
 	add hl, bc
 	ret
-; 8b15e
 
 INCLUDE "data/items/buena_prizes.asm"
diff --git a/engine/events/buena_menu.asm b/engine/events/buena_menu.asm
index 047d1e7e3..e498a3ab8 100644
--- a/engine/events/buena_menu.asm
+++ b/engine/events/buena_menu.asm
@@ -1,4 +1,4 @@
-Special_AskRememberPassword: ; 4ae12
+AskRememberPassword:
 	call .DoMenu
 	ld a, $0
 	jr c, .okay
@@ -8,11 +8,11 @@ Special_AskRememberPassword: ; 4ae12
 	ld [wScriptVar], a
 	ret
 
-.DoMenu: ; 4ae1f
+.DoMenu:
 	lb bc, 14, 7
 	push bc
-	ld hl, YesNoMenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, YesNoMenuHeader
+	call CopyMenuHeader
 	pop bc
 	ld a, b
 	ld [wMenuBorderLeftCoord], a
@@ -42,7 +42,7 @@ Special_AskRememberPassword: ; 4ae12
 	scf
 	ret
 
-Buena_ExitMenu: ; 4ae5e
+Buena_ExitMenu:
 	ld a, [hOAMUpdate]
 	push af
 	call ExitMenu
diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm
index 4bad01829..45212ae3e 100644
--- a/engine/events/bug_contest/caught_mon.asm
+++ b/engine/events/bug_contest/caught_mon.asm
@@ -1,4 +1,4 @@
-BugContest_SetCaughtContestMon: ; e6ce
+BugContest_SetCaughtContestMon:
 	ld a, [wContestMon]
 	and a
 	jr z, .firstcatch
@@ -18,7 +18,7 @@ BugContest_SetCaughtContestMon: ; e6ce
 	call PrintText
 	ret
 
-.generatestats ; e6fd
+.generatestats
 	ld a, [wTempEnemyMonSpecies]
 	ld [wCurSpecies], a
 	ld [wCurPartySpecies], a
@@ -32,7 +32,7 @@ BugContest_SetCaughtContestMon: ; e6ce
 	ld hl, wContestMon
 	jp GeneratePartyMonStats
 
-.caughttext ; 0xe71d
+.caughttext
 	; Caught @ !
 	text_jump UnknownText_0x1c10c0
 	db "@"
diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm
index ba561abf2..4cf4f949a 100644
--- a/engine/events/bug_contest/contest.asm
+++ b/engine/events/bug_contest/contest.asm
@@ -1,4 +1,4 @@
-Special_GiveParkBalls: ; 135db
+GiveParkBalls:
 	xor a
 	ld [wContestMon], a
 	ld a, 20
@@ -6,7 +6,7 @@ Special_GiveParkBalls: ; 135db
 	farcall StartBugContestTimer
 	ret
 
-BugCatchingContestBattleScript:: ; 0x135eb
+BugCatchingContestBattleScript::
 	writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST
 	randomwildmon
 	startbattle
@@ -15,29 +15,29 @@ BugCatchingContestBattleScript:: ; 0x135eb
 	iffalse BugCatchingContestOutOfBallsScript
 	end
 
-BugCatchingContestOverScript:: ; 0x135f8
+BugCatchingContestOverScript::
 	playsound SFX_ELEVATOR_END
 	opentext
 	writetext BugCatchingContestText_BeeepTimesUp
 	waitbutton
 	jump BugCatchingContestReturnToGateScript
 
-BugCatchingContestOutOfBallsScript: ; 0x13603
+BugCatchingContestOutOfBallsScript:
 	playsound SFX_ELEVATOR_END
 	opentext
 	writetext BugCatchingContestText_ContestIsOver
 	waitbutton
 
-BugCatchingContestReturnToGateScript: ; 0x1360b
+BugCatchingContestReturnToGateScript:
 	closetext
 	jumpstd bugcontestresultswarp
 
-BugCatchingContestText_BeeepTimesUp: ; 0x1360f
+BugCatchingContestText_BeeepTimesUp:
 	; ANNOUNCER: BEEEP! Time's up!
 	text_jump UnknownText_0x1bd2ca
 	db "@"
 
-BugCatchingContestText_ContestIsOver: ; 0x13614
+BugCatchingContestText_ContestIsOver:
 	; ANNOUNCER: The Contest is over!
 	text_jump UnknownText_0x1bd2e7
 	db "@"
diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm
index 8913dee6f..9cf70a03e 100755..100644
--- a/engine/events/bug_contest/contest_2.asm
+++ b/engine/events/bug_contest/contest_2.asm
@@ -1,4 +1,4 @@
-Special_SelectRandomBugContestContestants: ; 139a8
+SelectRandomBugContestContestants:
 ; Select five random people to participate in the current contest.
 
 ; First we have to make sure that any old data is cleared away.
@@ -54,12 +54,12 @@ Special_SelectRandomBugContestContestants: ; 139a8
 	dec c
 	jr nz, .loop2
 	ret
-; 139ed
 
-Special_CheckBugContestContestantFlag: ; 139ed
+CheckBugContestContestantFlag:
 ; Checks the flag of the Bug Catching Contestant whose index is loaded in a.
 
-; Bug: If a >= NUM_BUG_CONTESTANTS when this is called, it will read beyond the table.
+; Bug: If a >= NUM_BUG_CONTESTANTS when this is called,
+; it will read beyond the table.
 
 	ld hl, BugCatchingContestantEventFlagTable
 	ld e, a
@@ -72,11 +72,10 @@ Special_CheckBugContestContestantFlag: ; 139ed
 	ld b, CHECK_FLAG
 	call EventFlagAction
 	ret
-; 139fe
 
-INCLUDE "data/bug_contest_flags.asm"
+INCLUDE "data/events/bug_contest_flags.asm"
 
-Special_ContestDropOffMons: ; 13a12
+ContestDropOffMons:
 	ld hl, wPartyMon1HP
 	ld a, [hli]
 	or [hl]
@@ -99,9 +98,8 @@ Special_ContestDropOffMons: ; 13a12
 	ld a, $1
 	ld [wScriptVar], a
 	ret
-; 13a31
 
-Special_ContestReturnMons: ; 13a31
+ContestReturnMons:
 ; Restore the species of the second mon.
 	ld hl, wPartySpecies + 1
 	ld a, [wBugContestSecondPartySpecies]
@@ -119,4 +117,3 @@ Special_ContestReturnMons: ; 13a31
 	ld a, b
 	ld [wPartyCount], a
 	ret
-; 13a47
diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm
index 13b90d0a3..94a5e9511 100644
--- a/engine/events/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
@@ -1,4 +1,4 @@
-DisplayCaughtContestMonStats: ; cc000
+DisplayCaughtContestMonStats:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -7,7 +7,7 @@ DisplayCaughtContestMonStats: ; cc000
 	ld hl, wOptions
 	ld a, [hl]
 	push af
-	set 4, [hl]
+	set NO_TEXT_SCROLL, [hl]
 
 	hlcoord 0, 0
 	ld b, 4
@@ -86,22 +86,22 @@ DisplayCaughtContestMonStats: ; cc000
 .This:
 	db " THIS <PKMN>  @"
 
-SwitchMonText: ; cc0c2
+SwitchMonText:
 	; Switch #MON?
 	text_jump UnknownText_0x1c10cf
 	db "@"
 
-DisplayAlreadyCaughtText: ; cc0c7
+DisplayAlreadyCaughtText:
 	call GetPokemonName
 	ld hl, .AlreadyCaughtText
 	jp PrintText
 
-.AlreadyCaughtText: ; 0xcc0d0
+.AlreadyCaughtText:
 	; You already caught a @ .
 	text_jump UnknownText_0x1c10dd
 	db "@"
 
 DummyPredef2F:
 DummyPredef38:
-DummyPredef39: ; cc0d5
+DummyPredef39:
 	ret
diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
index c63087397..d8f9d7657 100755..100644
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
@@ -1,4 +1,4 @@
-_BugContestJudging: ; 1369d
+_BugContestJudging:
 	call ContestScore
 	farcall StubbedTrainerRankings_BugContestScore
 	call BugContest_JudgeContestants
@@ -24,9 +24,8 @@ _BugContestJudging: ; 1369d
 	ld hl, BugContest_FirstPlaceText
 	call PrintText
 	jp BugContest_GetPlayersResult
-; 136eb
 
-BugContest_FirstPlaceText: ; 0x136eb
+BugContest_FirstPlaceText:
 	text_jump ContestJudging_FirstPlaceText
 	start_asm
 	ld de, SFX_1ST_PLACE
@@ -34,15 +33,13 @@ BugContest_FirstPlaceText: ; 0x136eb
 	call WaitSFX
 	ld hl, BugContest_FirstPlaceScoreText
 	ret
-; 136fd
 
-BugContest_FirstPlaceScoreText: ; 0x136fd
+BugContest_FirstPlaceScoreText:
 	; The winning score was @  points!
 	text_jump ContestJudging_FirstPlaceScoreText
 	db "@"
-; 0x13702
 
-BugContest_SecondPlaceText: ; 0x13702
+BugContest_SecondPlaceText:
 	; Placing second was @ , who caught a @ !@ @
 	text_jump ContestJudging_SecondPlaceText
 	start_asm
@@ -51,15 +48,13 @@ BugContest_SecondPlaceText: ; 0x13702
 	call WaitSFX
 	ld hl, BugContest_SecondPlaceScoreText
 	ret
-; 13714
 
-BugContest_SecondPlaceScoreText: ; 0x13714
+BugContest_SecondPlaceScoreText:
 	; The score was @  points!
 	text_jump ContestJudging_SecondPlaceScoreText
 	db "@"
-; 0x13719
 
-BugContest_ThirdPlaceText: ; 0x13719
+BugContest_ThirdPlaceText:
 	; Placing third was @ , who caught a @ !@ @
 	text_jump ContestJudging_ThirdPlaceText
 	start_asm
@@ -68,15 +63,13 @@ BugContest_ThirdPlaceText: ; 0x13719
 	call WaitSFX
 	ld hl, BugContest_ThirdPlaceScoreText
 	ret
-; 1372b
 
-BugContest_ThirdPlaceScoreText: ; 0x1372b
+BugContest_ThirdPlaceScoreText:
 	; The score was @  points!
 	text_jump ContestJudging_ThirdPlaceScoreText
 	db "@"
-; 0x13730
 
-LoadContestantName: ; 13730
+LoadContestantName:
 ; If a = 1, get your name.
 	dec a ; BUG_CONTEST_PLAYER
 	jr z, .player
@@ -131,14 +124,10 @@ LoadContestantName: ; 13730
 	ld de, wBugContestWinnerName
 	ld bc, NAME_LENGTH
 	jp CopyBytes
-; 13783
 
+INCLUDE "data/events/bug_contest_winners.asm"
 
-INCLUDE "data/bug_contest_winners.asm"
-; 13807
-
-
-BugContest_GetPlayersResult: ; 13807
+BugContest_GetPlayersResult:
 	ld hl, wBugContestThirdPlaceWinnerID
 	ld de, - BUG_CONTESTANT_SIZE
 	ld b, 3 ; 3rd, 2nd, or 1st
@@ -152,9 +141,8 @@ BugContest_GetPlayersResult: ; 13807
 
 .done
 	ret
-; 13819
 
-BugContest_JudgeContestants: ; 13819
+BugContest_JudgeContestants:
 	call ClearContestResults
 	call ComputeAIContestantScores
 	ld hl, wBugContestTempWinnerID
@@ -168,9 +156,8 @@ BugContest_JudgeContestants: ; 13819
 	ld [hl], a
 	call DetermineContestWinners
 	ret
-; 13833
 
-ClearContestResults: ; 13833
+ClearContestResults:
 	ld hl, wBugContestResults
 	ld b, wBugContestWinnersEnd - wBugContestResults
 	xor a
@@ -179,9 +166,8 @@ ClearContestResults: ; 13833
 	dec b
 	jr nz, .loop
 	ret
-; 1383e
 
-DetermineContestWinners: ; 1383e
+DetermineContestWinners:
 	ld de, wBugContestTempScore
 	ld hl, wBugContestFirstPlaceScore
 	ld c, 2
@@ -224,12 +210,11 @@ DetermineContestWinners: ; 1383e
 
 .done
 	ret
-; 138a0
 
-CopyTempContestant: ; 138a0
+CopyTempContestant:
 ; Could've just called CopyBytes.
 	ld de, wBugContestTempWinnerID
-rept BUG_CONTESTANT_SIZE +- 1
+rept BUG_CONTESTANT_SIZE + -1
 	ld a, [de]
 	inc de
 	ld [hli], a
@@ -238,13 +223,12 @@ endr
 	inc de
 	ld [hl], a
 	ret
-; 138b0
 
-ComputeAIContestantScores: ; 138b0
+ComputeAIContestantScores:
 	ld e, 0
 .loop
 	push de
-	call Special_CheckBugContestContestantFlag
+	call CheckBugContestContestantFlag
 	pop de
 	jr nz, .done
 	ld a, e
@@ -298,9 +282,8 @@ ComputeAIContestantScores: ; 138b0
 	cp NUM_BUG_CONTESTANTS
 	jr nz, .loop
 	ret
-; 13900
 
-ContestScore: ; 13900
+ContestScore:
 ; Determine the player's score in the Bug Catching Contest.
 
 	xor a
@@ -383,9 +366,8 @@ ContestScore: ; 13900
 
 .done
 	ret
-; 1397f
 
-.AddContestStat: ; 1397f
+.AddContestStat:
 	ld hl, hMultiplicand
 	add [hl]
 	ld [hl], a
@@ -393,4 +375,3 @@ ContestScore: ; 13900
 	dec hl
 	inc [hl]
 	ret
-; 13988
diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm
index 0f0b0ff33..eb013cfa2 100755..100644
--- a/engine/events/card_key.asm
+++ b/engine/events/card_key.asm
@@ -1,4 +1,4 @@
-_CardKey: ; 50779
+_CardKey:
 ; Are we even in the right map to use this?
 	ld a, [wMapGroup]
 	cp GROUP_RADIO_TOWER_3F
@@ -31,9 +31,7 @@ _CardKey: ; 50779
 	ld a, FALSE
 	ld [wItemEffectSucceeded], a
 	ret
-; 507af
 
-.CardKeyScript: ; 0x507af
+.CardKeyScript:
 	closetext
-	farjump MapRadioTower3FSignpost2Script
-; 0x507b4
+	farjump CardKeySlotScript
diff --git a/engine/events/catch_tutorial.asm b/engine/events/catch_tutorial.asm
index 6ae3b4a3b..898fb826f 100644
--- a/engine/events/catch_tutorial.asm
+++ b/engine/events/catch_tutorial.asm
@@ -1,4 +1,4 @@
-CatchTutorial:: ; 4e554
+CatchTutorial::
 	ld a, [wBattleType]
 	dec a
 	ld c, a
@@ -11,12 +11,12 @@ CatchTutorial:: ; 4e554
 	ld l, a
 	jp hl
 
-.dw ; 4e564 (13:6564)
+.dw
 	dw .DudeTutorial
 	dw .DudeTutorial
 	dw .DudeTutorial
 
-.DudeTutorial: ; 4e56a (13:656a)
+.DudeTutorial:
 ; Back up your name to your Mom's name.
 	ld hl, wPlayerName
 	ld de, wMomsName
@@ -52,7 +52,7 @@ CatchTutorial:: ; 4e554
 	call CopyBytes
 	ret
 
-.LoadDudeData: ; 4e5b7 (13:65b7)
+.LoadDudeData:
 	ld hl, wDudeNumItems
 	ld [hl], 1
 	inc hl
@@ -68,14 +68,14 @@ CatchTutorial:: ; 4e554
 	ld hl, wDudeNumBalls
 	ld a, 1
 	ld [hli], a
-	ld a, POKE_BALL ; 5
+	ld a, POKE_BALL
 	ld [hli], a
 	ld [hli], a
 	ld [hl], -1
 	ret
 
-.Dude: ; 4e5da
+.Dude:
 	db "DUDE@"
 
-.AutoInput: ; 4e5df
+.AutoInput:
 	db NO_INPUT, $ff ; end
diff --git a/engine/events/catch_tutorial_input.asm b/engine/events/catch_tutorial_input.asm
index 9d2a03db2..cca2db2d5 100644
--- a/engine/events/catch_tutorial_input.asm
+++ b/engine/events/catch_tutorial_input.asm
@@ -1,35 +1,35 @@
-_DudeAutoInput_A:: ; 1de28a
+_DudeAutoInput_A::
 	ld hl, DudeAutoInput_A
 	jr _DudeAutoInput
 
-_DudeAutoInput_RightA: ; 1de28f
+_DudeAutoInput_RightA:
 	ld hl, DudeAutoInput_RightA
 	jr _DudeAutoInput
 
-_DudeAutoInput_DownA: ; 1de294
+_DudeAutoInput_DownA:
 	ld hl, DudeAutoInput_DownA
 	jr _DudeAutoInput
 
-_DudeAutoInput: ; 1de299
+_DudeAutoInput:
 	ld a, BANK(DudeAutoInputs)
 	call StartAutoInput
 	ret
 
-DudeAutoInputs:
+DudeAutoInputs: ; used only for BANK(DudeAutoInputs)
 
-DudeAutoInput_A: ; 1de29f
+DudeAutoInput_A:
 	db NO_INPUT, $50
 	db A_BUTTON, $00
 	db NO_INPUT, $ff ; end
 
-DudeAutoInput_RightA: ; 1de2a5
+DudeAutoInput_RightA:
 	db NO_INPUT, $08
 	db D_RIGHT,  $00
 	db NO_INPUT, $08
 	db A_BUTTON, $00
 	db NO_INPUT, $ff ; end
 
-DudeAutoInput_DownA: ; 1de2af
+DudeAutoInput_DownA:
 	db NO_INPUT, $fe
 	db NO_INPUT, $fe
 	db NO_INPUT, $fe
diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm
index fe4a490f2..a34f3935a 100755..100644
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -1,6 +1,6 @@
 SPECIALCELEBIEVENT_CELEBI EQU $84
 
-Special_CelebiShrineEvent: ; 4989a
+CelebiShrineEvent:
 	call DelayFrame
 	ld a, [wVramState]
 	push af
@@ -31,7 +31,7 @@ Special_CelebiShrineEvent: ; 4989a
 	call GetCelebiSpriteTile
 	inc d
 	push de
-	ld a, $90
+	ld a, 36 * SPRITEOAMSTRUCT_LENGTH
 	ld [wCurrSpriteOAMAddr], a
 	farcall DoNextFrameForAllSprites
 	call CelebiEvent_CountDown
@@ -41,7 +41,6 @@ Special_CelebiShrineEvent: ; 4989a
 	pop bc
 	jr .loop
 
-
 .done
 	pop af
 	ld [wVramState], a
@@ -49,15 +48,13 @@ Special_CelebiShrineEvent: ; 4989a
 	call CelebiEvent_SetBattleType
 	ret
 
-; 498f9
-
-.RestorePlayerSprite_DespawnLeaves: ; 498f9
+.RestorePlayerSprite_DespawnLeaves:
 	ld hl, wVirtualOAMSprite00TileID
 	xor a
 	ld c, 4
 .OAMloop:
 	ld [hli], a ; tile id
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	inc a
@@ -69,9 +66,7 @@ endr
 	call ByteFill
 	ret
 
-; 49912
-
-LoadCelebiGFX: ; 49912
+LoadCelebiGFX:
 	farcall ClearSpriteAnims
 	ld de, SpecialCelebiLeafGFX
 	ld hl, vTiles1
@@ -85,9 +80,7 @@ LoadCelebiGFX: ; 49912
 	ld [wJumptableIndex], a
 	ret
 
-; 49935
-
-CelebiEvent_CountDown: ; 49935
+CelebiEvent_CountDown:
 	ld hl, wFrameCounter
 	ld a, [hl]
 	and a
@@ -95,15 +88,12 @@ CelebiEvent_CountDown: ; 49935
 	dec [hl]
 	ret
 
-
 .done
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
 
-; 49944
-
-CelebiEvent_SpawnLeaf: ; 49944
+CelebiEvent_SpawnLeaf:
 ; unused
 	ld hl, wcf65
 	ld a, [hl]
@@ -123,19 +113,16 @@ CelebiEvent_SpawnLeaf: ; 49944
 	ld [hl], $80
 	ret
 
-; 49962
-
-SpecialCelebiLeafGFX: ; 49962
+SpecialCelebiLeafGFX:
 INCBIN "gfx/overworld/cut_grass.2bpp"
 
-SpecialCelebiGFX: ; 499a2
+SpecialCelebiGFX:
 INCBIN "gfx/overworld/celebi/1.2bpp"
 INCBIN "gfx/overworld/celebi/2.2bpp"
 INCBIN "gfx/overworld/celebi/3.2bpp"
 INCBIN "gfx/overworld/celebi/4.2bpp"
 
-
-UpdateCelebiPosition: ; 49aa2 (12:5aa2)
+UpdateCelebiPosition:
 	ld hl, SPRITEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -229,8 +216,7 @@ UpdateCelebiPosition: ; 49aa2 (12:5aa2)
 .done
 	ret
 
-
-.FreezeCelebiPosition: ; 49b30 (12:5b30)
+.FreezeCelebiPosition:
 	pop af
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
@@ -238,53 +224,12 @@ UpdateCelebiPosition: ; 49aa2 (12:5aa2)
 	call ReinitSpriteAnimFrame
 	ret
 
-
-CelebiEvent_Cosine: ; 49b3b (12:5b3b)
+CelebiEvent_Cosine:
 ; a = d * cos(a * pi/32)
-	add %010000
-	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
+	add %010000 ; cos(x) = sin(x + pi/2)
+	calc_sine_wave
 
-.ApplySineWave: ; 49b52 (12:5b52)
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, .sinewave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
-; 49b6e (12:5b6e)
-
-.sinewave ; 49b6e
-	sine_wave $100
-; 49bae
-
-GetCelebiSpriteTile: ; 49bae
+GetCelebiSpriteTile:
 	push hl
 	push bc
 	push de
@@ -306,22 +251,18 @@ GetCelebiSpriteTile: ; 49bae
 	jr c, .done
 	jr .restart
 
-
 .Frame1:
 	ld a, SPECIALCELEBIEVENT_CELEBI
 	jr .load_tile
 
-
 .Frame2:
 	ld a, SPECIALCELEBIEVENT_CELEBI + 4
 	jr .load_tile
 
-
 .Frame3:
 	ld a, SPECIALCELEBIEVENT_CELEBI + 8
 	jr .load_tile
 
-
 .Frame4:
 	ld a, SPECIALCELEBIEVENT_CELEBI + 12
 
@@ -331,7 +272,6 @@ GetCelebiSpriteTile: ; 49bae
 	ld [hl], a
 	jr .done
 
-
 .restart
 	pop de
 	ld d, $ff
@@ -343,9 +283,7 @@ GetCelebiSpriteTile: ; 49bae
 	pop hl
 	ret
 
-; 49bed
-
-.AddE: ; 49bed
+.AddE:
 	push af
 	ld a, d
 	add e
@@ -353,29 +291,22 @@ GetCelebiSpriteTile: ; 49bae
 	pop af
 	ret
 
-; 49bf3
-
-CelebiEvent_SetBattleType: ; 49bf3
+CelebiEvent_SetBattleType:
 	ld a, BATTLETYPE_CELEBI
 	ld [wBattleType], a
 	ret
 
-; 49bf9
-
-Special_CheckCaughtCelebi: ; 49bf9
+CheckCaughtCelebi:
 	ld a, [wBattleResult]
-	bit 6, a
+	bit BATTLERESULT_CAUGHT_CELEBI, a
 	jr z, .false
-	ld a, $1
+	ld a, TRUE
 	ld [wScriptVar], a
 	jr .done
 
-
 .false
-	xor a
+	xor a ; FALSE
 	ld [wScriptVar], a
 
 .done
 	ret
-
-; 49c0c
diff --git a/engine/events/checkforhiddenitems.asm b/engine/events/checkforhiddenitems.asm
index 7396bd39a..2af9a1a1f 100644
--- a/engine/events/checkforhiddenitems.asm
+++ b/engine/events/checkforhiddenitems.asm
@@ -1,4 +1,4 @@
-CheckForHiddenItems: ; b8172
+CheckForHiddenItems:
 ; Checks to see if there are hidden items on the screen that have not yet been found.  If it finds one, returns carry.
 	call GetMapScriptsBank
 	ld [wBuffer1], a
@@ -75,11 +75,9 @@ CheckForHiddenItems: ; b8172
 	pop hl
 	scf
 	ret
-; b81e2
 
-.GetFarByte: ; b81e2
+.GetFarByte:
 	ld a, [wBuffer1]
 	call GetFarByte
 	inc hl
 	ret
-; b81ea
diff --git a/engine/routines/checksave.asm b/engine/events/checksave.asm
index 2280f0e53..1e9d18e71 100644
--- a/engine/routines/checksave.asm
+++ b/engine/events/checksave.asm
@@ -1,4 +1,4 @@
-CheckSave:: ; 4cffe
+CheckSave::
 	ld a, BANK(sCheckValue1) ; BANK(sCheckValue2)
 	call GetSRAMBank
 	ld a, [sCheckValue1]
diff --git a/engine/routines/checktime.asm b/engine/events/checktime.asm
index 4c7d033ff..6e470e883 100644
--- a/engine/routines/checktime.asm
+++ b/engine/events/checktime.asm
@@ -1,4 +1,4 @@
-CheckTime:: ; c000
+CheckTime::
 	ld a, [wTimeOfDay]
 	ld hl, .TimeOfDayTable
 	ld de, 2
@@ -11,7 +11,7 @@ CheckTime:: ; c000
 	ld c, a
 	ret
 
-.TimeOfDayTable: ; c012
+.TimeOfDayTable:
 	db MORN_F, MORN
 	db DAY_F,  DAY
 	db NITE_F, NITE
diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm
index 3d36bbfd7..5904a476d 100755..100644
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
@@ -21,9 +21,9 @@
 	const DAYCARETEXT_OH_FINE
 	const DAYCARETEXT_COME_AGAIN
 
-Special_DayCareMan: ; 166d6
+DayCareMan:
 	ld hl, wDayCareMan
-	bit 0, [hl]
+	bit DAYCAREMAN_HAS_MON_F, [hl]
 	jr nz, .AskWithdrawMon
 	ld hl, wDayCareMan
 	ld a, DAYCARETEXT_MAN_INTRO
@@ -33,7 +33,7 @@ Special_DayCareMan: ; 166d6
 	jr c, .print_text
 	farcall DepositMonWithDayCareMan
 	ld hl, wDayCareMan
-	set 0, [hl]
+	set DAYCAREMAN_HAS_MON_F, [hl]
 	call DayCare_DepositPokemonText
 	call DayCare_InitBreeding
 	ret
@@ -44,11 +44,11 @@ Special_DayCareMan: ; 166d6
 	call GetPriceToRetrieveBreedmon
 	call DayCare_AskWithdrawBreedMon
 	jr c, .print_text
-	farcall RetrievePokemonFromDayCareMan
+	farcall RetrieveMonFromDayCareMan
 	call DayCare_GetBackMonForMoney
 	ld hl, wDayCareMan
-	res 0, [hl]
-	res 5, [hl]
+	res DAYCAREMAN_HAS_MON_F, [hl]
+	res DAYCAREMAN_MONS_COMPATIBLE_F, [hl]
 	jr .cancel
 
 .print_text
@@ -58,11 +58,10 @@ Special_DayCareMan: ; 166d6
 	ld a, DAYCARETEXT_COME_AGAIN
 	call PrintDayCareText
 	ret
-; 1672a
 
-Special_DayCareLady: ; 1672a
+DayCareLady:
 	ld hl, wDayCareLady
-	bit 0, [hl]
+	bit DAYCARELADY_HAS_MON_F, [hl]
 	jr nz, .AskWithdrawMon
 	ld hl, wDayCareLady
 	ld a, DAYCARETEXT_LADY_INTRO
@@ -72,7 +71,7 @@ Special_DayCareLady: ; 1672a
 	jr c, .print_text
 	farcall DepositMonWithDayCareLady
 	ld hl, wDayCareLady
-	set 0, [hl]
+	set DAYCARELADY_HAS_MON_F, [hl]
 	call DayCare_DepositPokemonText
 	call DayCare_InitBreeding
 	ret
@@ -83,12 +82,12 @@ Special_DayCareLady: ; 1672a
 	call GetPriceToRetrieveBreedmon
 	call DayCare_AskWithdrawBreedMon
 	jr c, .print_text
-	farcall RetrievePokemonFromDayCareLady
+	farcall RetrieveMonFromDayCareLady
 	call DayCare_GetBackMonForMoney
 	ld hl, wDayCareLady
-	res 0, [hl]
+	res DAYCARELADY_HAS_MON_F, [hl]
 	ld hl, wDayCareMan
-	res 5, [hl]
+	res DAYCAREMAN_MONS_COMPATIBLE_F, [hl]
 	jr .cancel
 
 .print_text
@@ -98,27 +97,24 @@ Special_DayCareLady: ; 1672a
 	ld a, DAYCARETEXT_COME_AGAIN
 	call PrintDayCareText
 	ret
-; 16781
 
-DayCareLadyIntroText: ; 16781
-	bit 7, [hl]
+DayCareLadyIntroText:
+	bit DAYCARELADY_ACTIVE_F, [hl]
 	jr nz, .okay
-	set 7, [hl]
+	set DAYCARELADY_ACTIVE_F, [hl]
 	inc a
 .okay
 	call PrintDayCareText
 	call YesNoBox
 	ret
-; 1678f
 
-DayCareManIntroText: ; 1678f
-	set 7, [hl]
+DayCareManIntroText:
+	set DAYCAREMAN_ACTIVE_F, [hl]
 	call PrintDayCareText
 	call YesNoBox
 	ret
-; 16798
 
-DayCareAskDepositPokemon: ; 16798
+DayCareAskDepositPokemon:
 	ld a, [wPartyCount]
 	cp 2
 	jr c, .OnlyOneMon
@@ -169,15 +165,13 @@ DayCareAskDepositPokemon: ; 16798
 	ld a, DAYCARETEXT_REMOVE_MAIL
 	scf
 	ret
-; 167f1
 
-.DummyText: ; 0x167f1
+.DummyText:
 	;
 	text_jump UnknownText_0x1bdaa7
 	db "@"
-; 0x167f6
 
-DayCare_DepositPokemonText: ; 167f6
+DayCare_DepositPokemonText:
 	ld a, DAYCARETEXT_DEPOSIT
 	call PrintDayCareText
 	ld a, [wCurPartySpecies]
@@ -185,9 +179,8 @@ DayCare_DepositPokemonText: ; 167f6
 	ld a, DAYCARETEXT_COME_BACK_LATER
 	call PrintDayCareText
 	ret
-; 16807
 
-DayCare_AskWithdrawBreedMon: ; 16807
+DayCare_AskWithdrawBreedMon:
 	ld a, [wStringBuffer2 + 1]
 	and a
 	jr nz, .grew_at_least_one_level
@@ -232,9 +225,8 @@ DayCare_AskWithdrawBreedMon: ; 16807
 	ld a, DAYCARETEXT_PARTY_FULL
 	scf
 	ret
-; 16850
 
-DayCare_GetBackMonForMoney: ; 16850
+DayCare_GetBackMonForMoney:
 	ld bc, wStringBuffer2 + 2
 	ld de, wMoney
 	farcall TakeMoney
@@ -245,9 +237,8 @@ DayCare_GetBackMonForMoney: ; 16850
 	ld a, DAYCARETEXT_GOT_BACK
 	call PrintDayCareText
 	ret
-; 1686d
 
-GetPriceToRetrieveBreedmon: ; 1686d
+GetPriceToRetrieveBreedmon:
 	ld a, b
 	ld [wStringBuffer2], a
 	ld a, d
@@ -268,9 +259,8 @@ GetPriceToRetrieveBreedmon: ; 1686d
 	ld a, l
 	ld [wStringBuffer2 + 4], a
 	ret
-; 1689b
 
-PrintDayCareText: ; 1689b
+PrintDayCareText:
 	ld e, a
 	ld d, 0
 	ld hl, .TextTable
@@ -281,9 +271,8 @@ PrintDayCareText: ; 1689b
 	ld l, a
 	call PrintText
 	ret
-; 168aa
 
-.TextTable: ; 168aa
+.TextTable:
 ; entries correspond to DAYCARETEXT_* constants
 	dw .DayCareManIntro ; 00
 	dw .DayCareManOddEgg ; 01
@@ -305,143 +294,121 @@ PrintDayCareText: ; 1689b
 	dw .NotEnoughMoney ; 11
 	dw .OhFineThen ; 12
 	dw .ComeAgain ; 13
-; 168d2
 
-.DayCareManIntro: ; 0x168d2
+.DayCareManIntro:
 	; I'm the DAY-CARE MAN. Want me to raise a #MON?
 	text_jump UnknownText_0x1bdaa9
 	db "@"
-; 0x168d7
 
-.DayCareManOddEgg: ; 0x168d7
+.DayCareManOddEgg:
 	; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON?
 	text_jump UnknownText_0x1bdad8
 	db "@"
-; 0x168dc
 
-.DayCareLadyIntro: ; 0x168dc
+.DayCareLadyIntro:
 	; I'm the DAY-CARE LADY. Should I raise a #MON for you?
 	text_jump UnknownText_0x1bdb85
 	db "@"
-; 0x168e1
 
-.DayCareLadyOddEgg: ; 0x168e1
+.DayCareLadyOddEgg:
 	; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you?
 	text_jump UnknownText_0x1bdbbb
 	db "@"
-; 0x168e6
 
-.WhichOne: ; 0x168e6
+.WhichOne:
 	; What should I raise for you?
 	text_jump UnknownText_0x1bdc79
 	db "@"
-; 0x168eb
 
-.JustOneMon: ; 0x168eb
+.JustOneMon:
 	; Oh? But you have just one #MON.
 	text_jump UnknownText_0x1bdc97
 	db "@"
-; 0x168f0
 
-.CantAcceptEgg: ; 0x168f0
+.CantAcceptEgg:
 	; Sorry, but I can't accept an EGG.
 	text_jump UnknownText_0x1bdcb8
 	db "@"
-; 0x168f5
 
-.RemoveMail: ; 0x168f5
+.RemoveMail:
 	; Remove MAIL before you come see me.
 	text_jump UnknownText_0x1bdcda
 	db "@"
-; 0x168fa
 
-.LastHealthyMon: ; 0x168fa
+.LastHealthyMon:
 	; If you give me that, what will you battle with?
 	text_jump UnknownText_0x1bdcff
 	db "@"
-; 0x168ff
 
-.OkayIllRaiseYourMon: ; 0x168ff
+.OkayIllRaiseYourMon:
 	; OK. I'll raise your @ .
 	text_jump UnknownText_0x1bdd30
 	db "@"
-; 0x16904
 
-.ComeBackForItLater: ; 0x16904
+.ComeBackForItLater:
 	; Come back for it later.
 	text_jump UnknownText_0x1bdd4b
 	db "@"
-; 0x16909
 
-.AreWeGeniusesOrWhat: ; 0x16909
+.AreWeGeniusesOrWhat:
 	; Are we geniuses or what? Want to see your @ ?
 	text_jump UnknownText_0x1bdd64
 	db "@"
-; 0x1690e
 
-.AskRetrieveMon: ; 0x1690e
+.AskRetrieveMon:
 	; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ .
 	text_jump UnknownText_0x1bdd96
 	db "@"
-; 0x16913
 
-.PerfectHeresYourMon: ; 0x16913
+.PerfectHeresYourMon:
 	; Perfect! Here's your #MON.
 	text_jump UnknownText_0x1bde04
 	db "@"
-; 0x16918
 
-.GotBackMon: ; 0x16918
+.GotBackMon:
 	; got back @ .
 	text_jump UnknownText_0x1bde1f
 	db "@"
-; 0x1691d
 
-.ImmediatelyWithdrawMon: ; 0x1691d
+.ImmediatelyWithdrawMon:
 	; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100.
 	text_jump UnknownText_0x1bde32
 	db "@"
-; 0x16922
 
-.PartyFull: ; 0x16922
+.PartyFull:
 	; You have no room for it.
 	text_jump UnknownText_0x1bdea2
 	db "@"
-; 0x16927
 
-.NotEnoughMoney: ; 0x16927
+.NotEnoughMoney:
 	; You don't have enough money.
 	text_jump UnknownText_0x1bdebc
 	db "@"
-; 0x1692c
 
-.OhFineThen: ; 0x1692c
+.OhFineThen:
 	; Oh, fine then.
 	text_jump UnknownText_0x1bded9
 	db "@"
-; 0x16931
 
-.ComeAgain: ; 0x16931
+.ComeAgain:
 	; Come again.
 	text_jump UnknownText_0x1bdee9
 	db "@"
-; 0x16936
 
-Special_DayCareManOutside: ; 16936
+DayCareManOutside:
 	ld hl, wDayCareMan
-	bit 6, [hl]
+	bit DAYCAREMAN_HAS_EGG_F, [hl]
 	jr nz, .AskGiveEgg
 	ld hl, .NotYet
 	call PrintText
 	ret
 
-.NotYet: ; 0x16944
+.NotYet:
 	; Not yet…
 	text_jump UnknownText_0x1bdef6
 	db "@"
-; 0x16949
 
-.AskGiveEgg: ; 16949
+.AskGiveEgg:
 	ld hl, .IntroText
 	call PrintText
 	call YesNoBox
@@ -451,7 +418,7 @@ Special_DayCareManOutside: ; 16936
 	jr nc, .PartyFull
 	call DayCare_GiveEgg
 	ld hl, wDayCareMan
-	res 6, [hl]
+	res DAYCAREMAN_HAS_EGG_F, [hl]
 	call DayCare_InitBreeding
 	ld hl, .GotEggText
 	call PrintText
@@ -477,39 +444,33 @@ Special_DayCareManOutside: ; 16936
 	ld a, TRUE
 	ld [wScriptVar], a
 	ret
-; 16993
 
-.IntroText: ; 0x16993
+.IntroText:
 	; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it?
 	text_jump UnknownText_0x1bdf00
 	db "@"
-; 0x16998
 
-.GotEggText: ; 0x16998
+.GotEggText:
 	; received the EGG!
 	text_jump UnknownText_0x1bdfa5
 	db "@"
-; 0x1699d
 
-.TakeGoodCareOfItText: ; 0x1699d
+.TakeGoodCareOfItText:
 	; Take good care of it.
 	text_jump UnknownText_0x1bdfba
 	db "@"
-; 0x169a2
 
-.IllKeepItThanksText: ; 0x169a2
+.IllKeepItThanksText:
 	; Well then, I'll keep it. Thanks!
 	text_jump UnknownText_0x1bdfd1
 	db "@"
-; 0x169a7
 
-.PartyFullText: ; 0x169a7
+.PartyFullText:
 	; You have no room in your party. Come back later.
 	text_jump UnknownText_0x1bdff2
 	db "@"
-; 0x169ac
 
-DayCare_GiveEgg: ; 169ac
+DayCare_GiveEgg:
 	ld a, [wEggMonLevel]
 	ld [wCurPartyLevel], a
 	ld hl, wPartyCount
@@ -566,8 +527,8 @@ DayCare_GiveEgg: ; 169ac
 	ld e, l
 	pop hl
 	push bc
-	ld b, $0
-	predef CalcPkmnStats
+	ld b, FALSE
+	predef CalcMonStats
 	pop bc
 	ld hl, MON_HP
 	add hl, bc
@@ -580,23 +541,21 @@ DayCare_GiveEgg: ; 169ac
 .PartyFull:
 	scf
 	ret
-; 16a31
 
-DayCare_GetCurrentPartyMember: ; 16a31
+DayCare_GetCurrentPartyMember:
 	ld a, [wPartyCount]
 	dec a
 	call AddNTimes
 	ld d, h
 	ld e, l
 	ret
-; 16a3b
 
-DayCare_InitBreeding: ; 16a3b
+DayCare_InitBreeding:
 	ld a, [wDayCareLady]
-	bit 0, a
+	bit DAYCARELADY_HAS_MON_F, a
 	ret z
 	ld a, [wDayCareMan]
-	bit 0, a
+	bit DAYCAREMAN_HAS_MON_F, a
 	ret z
 	callfar CheckBreedmonCompatibility
 	ld a, [wd265]
@@ -605,16 +564,15 @@ DayCare_InitBreeding: ; 16a3b
 	inc a
 	ret z
 	ld hl, wDayCareMan
-	set 5, [hl]
+	set DAYCAREMAN_MONS_COMPATIBLE_F, [hl]
 .loop
 	call Random
 	cp 150
 	jr c, .loop
 	ld [wStepsToEgg], a
 	jp .UselessJump
-; 16a66
 
-.UselessJump: ; 16a66
+.UselessJump:
 	xor a
 	ld hl, wEggMon
 	ld bc, wEggMonEnd - wEggMon
@@ -660,11 +618,12 @@ DayCare_InitBreeding: ; 16a3b
 	ld a, EGG_LEVEL
 	ld [wCurPartyLevel], a
 
+; Nidoran♀ can give birth to either gender of Nidoran
 	ld a, [wCurPartySpecies]
 	cp NIDORAN_F
 	jr nz, .GotEggSpecies
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	ld a, NIDORAN_F
 	jr c, .GotEggSpecies
 	ld a, NIDORAN_M
@@ -787,8 +746,6 @@ DayCare_InitBreeding: ; 16a3b
 	ld a, [wCurPartyLevel]
 	ld [wEggMonLevel], a
 	ret
-; 16be0
 
-.String_EGG: ; 16be0
+.String_EGG:
 	db "EGG@"
-; 16be4
diff --git a/engine/diploma.asm b/engine/events/diploma.asm
index 5d0482cc4..aa4755e4f 100644
--- a/engine/diploma.asm
+++ b/engine/events/diploma.asm
@@ -1,10 +1,9 @@
-_Diploma: ; 1dd702
+_Diploma:
 	call PlaceDiplomaOnScreen
 	call WaitPressAorB_BlinkCursor
 	ret
-; 1dd709
 
-PlaceDiplomaOnScreen: ; 1dd709
+PlaceDiplomaOnScreen:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -35,7 +34,6 @@ PlaceDiplomaOnScreen: ; 1dd709
 	call SetPalettes
 	call DelayFrame
 	ret
-; 1dd760
 
 .Player:
 	db "PLAYER@"
@@ -50,9 +48,8 @@ PlaceDiplomaOnScreen: ; 1dd709
 	next "new #DEX."
 	next "Congratulations!"
 	db   "@"
-; 1dd7ae
 
-PrintDiplomaPage2: ; 1dd7ae
+PrintDiplomaPage2:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, $7f
@@ -77,17 +74,15 @@ PrintDiplomaPage2: ; 1dd7ae
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2
 	call PrintNum
 	ret
-; 1dd7f0
 
 .PlayTime: db "PLAY TIME@"
 .GameFreak: db "GAME FREAK@"
-; 1dd805
 
-DiplomaGFX: ; 1dd805
+DiplomaGFX:
 INCBIN "gfx/diploma/diploma.2bpp.lz"
 
-DiplomaPage1Tilemap: ; 1ddc4b
+DiplomaPage1Tilemap:
 INCBIN "gfx/diploma/page1.tilemap"
 
-DiplomaPage2Tilemap: ; 1dddb3
+DiplomaPage2Tilemap:
 INCBIN "gfx/diploma/page2.tilemap"
diff --git a/engine/events/dratini.asm b/engine/events/dratini.asm
index a45f01195..2dd97eaee 100644
--- a/engine/events/dratini.asm
+++ b/engine/events/dratini.asm
@@ -1,4 +1,4 @@
-Special_Dratini: ; 0x8b170
+GiveDratini:
 ; if wScriptVar is 0 or 1, change the moveset of the last Dratini in the party.
 ;  0: give it a special moveset with Extremespeed.
 ;  1: give it the normal moveset of a level 15 Dratini.
@@ -84,7 +84,7 @@ Special_Dratini: ; 0x8b170
 	db TWISTER
 	db 0
 
-.GetNthPartyMon: ; 0x8b1ce
+.GetNthPartyMon:
 ; inputs:
 ; hl must be set to 0 before calling this function.
 ; a must be set to the number of Pokémon in the party.
@@ -109,4 +109,3 @@ Special_Dratini: ; 0x8b170
 .EmptyParty:
 	scf
 	ret
-; 8b1e1
diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm
index 98d408b0e..705b24992 100755..100644
--- a/engine/events/elevator.asm
+++ b/engine/events/elevator.asm
@@ -1,4 +1,4 @@
-Elevator:: ; 1342d
+Elevator::
 	call .LoadPointer
 	call .FindCurrentFloor
 	jr c, .quit
@@ -15,9 +15,8 @@ Elevator:: ; 1342d
 .quit
 	scf
 	ret
-; 1344a
 
-.LoadPointer: ; 1344a
+.LoadPointer:
 	ld a, b
 	ld [wElevatorPointerBank], a
 	ld a, e
@@ -26,9 +25,8 @@ Elevator:: ; 1342d
 	ld [wElevatorPointer + 1], a
 	call .LoadFloors
 	ret
-; 1345a
 
-.LoadFloors: ; 1345a
+.LoadFloors:
 	ld de, wCurElevator
 	ld bc, 4
 	ld hl, wElevatorPointer
@@ -49,9 +47,8 @@ Elevator:: ; 1342d
 	cp -1
 	jr nz, .loop
 	ret
-; 1347d
 
-.FindCurrentFloor: ; 1347d
+.FindCurrentFloor:
 	ld hl, wElevatorPointer
 	ld a, [hli]
 	ld h, [hl]
@@ -98,9 +95,8 @@ Elevator:: ; 1342d
 .fail
 	scf
 	ret
-; 134c0
 
-Elevator_GoToFloor: ; 134c0
+Elevator_GoToFloor:
 	push af
 	ld hl, wElevatorPointer
 	ld a, [hli]
@@ -116,15 +112,14 @@ Elevator_GoToFloor: ; 134c0
 	ld bc, 3
 	call FarCopyBytes
 	ret
-; 134dd
 
-Elevator_AskWhichFloor: ; 134dd
-	call LoadStandardMenuDataHeader
+Elevator_AskWhichFloor:
+	call LoadStandardMenuHeader
 	ld hl, Elevator_WhichFloorText
 	call PrintText
 	call Elevator_GetCurrentFloorText
-	ld hl, Elevator_MenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, Elevator_MenuHeader
+	call CopyMenuHeader
 	call InitScrollingMenu
 	call UpdateSprites
 	xor a
@@ -141,16 +136,13 @@ Elevator_AskWhichFloor: ; 134dd
 .cancel
 	scf
 	ret
-; 1350d
 
-Elevator_WhichFloorText: ; 0x1350d
+Elevator_WhichFloorText:
 	; Which floor?
 	text_jump UnknownText_0x1bd2bc
 	db "@"
-; 0x13512
 
-
-Elevator_GetCurrentFloorText: ; 13512
+Elevator_GetCurrentFloorText:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -167,14 +159,11 @@ Elevator_GetCurrentFloorText: ; 13512
 	pop af
 	ld [wOptions], a
 	ret
-; 13537
 
-Elevator_CurrentFloorText: ; 13537
+Elevator_CurrentFloorText:
 	db "Now on:@"
-; 1353f
-
 
-Elevator_GetCurrentFloorString: ; 1353f
+Elevator_GetCurrentFloorString:
 	push hl
 	ld a, [wElevatorOriginFloor]
 	ld e, a
@@ -185,16 +174,14 @@ Elevator_GetCurrentFloorString: ; 1353f
 	pop de
 	call GetFloorString
 	ret
-; 13550
 
-Elevator_MenuDataHeader: ; 0x13550
+Elevator_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 12, 1, 18, 9
-	dw Elevator_MenuData2
+	dw Elevator_MenuData
 	db 1 ; default option
-; 0x13558
 
-Elevator_MenuData2: ; 0x13558
+Elevator_MenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 0 ; rows, columns
 	db 1 ; horizontal spacing
@@ -202,20 +189,18 @@ Elevator_MenuData2: ; 0x13558
 	dba GetElevatorFloorStrings
 	dba NULL
 	dba NULL
-; 13568
 
-GetElevatorFloorStrings: ; 13568
+GetElevatorFloorStrings:
 	ld a, [wMenuSelection]
-GetFloorString: ; 1356b
+GetFloorString:
 	push de
 	call FloorToString
 	ld d, h
 	ld e, l
 	pop hl
 	jp PlaceString
-; 13575
 
-FloorToString: ; 13575
+FloorToString:
 	push de
 	ld e, a
 	ld d, 0
@@ -227,6 +212,5 @@ FloorToString: ; 13575
 	ld l, a
 	pop de
 	ret
-; 13583
 
-INCLUDE "data/elevator_floors.asm"
+INCLUDE "data/events/elevator_floors.asm"
diff --git a/engine/engine_flags.asm b/engine/events/engine_flags.asm
index acda9ede7..6c2148f79 100644
--- a/engine/engine_flags.asm
+++ b/engine/events/engine_flags.asm
@@ -1,4 +1,4 @@
-EngineFlagAction:: ; 80430
+EngineFlagAction::
 ; Do action b on engine flag de
 ;
 ;   b = 0: reset flag
@@ -7,7 +7,6 @@ EngineFlagAction:: ; 80430
 ;
 ; Setting/resetting does not return a result.
 
-
 ; 16-bit flag ids are considered invalid, but it's nice
 ; to know that the infrastructure is there.
 
@@ -80,7 +79,5 @@ EngineFlagAction:: ; 80430
 	and c
 	ld [de], a
 	ret
-; 80462
-
 
 INCLUDE "data/engine_flags.asm"
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index 0f12338e0..6adb80ba6 100755..100644
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -1,32 +1,34 @@
-PlayWhirlpoolSound: ; 8c7d4
+FIELDMOVE_GRASS EQU $80
+FIELDMOVE_TREE EQU $84
+FIELDMOVE_FLY EQU $84
+
+PlayWhirlpoolSound:
 	call WaitSFX
 	ld de, SFX_SURF
 	call PlaySFX
 	call WaitSFX
 	ret
-; 8c7e1
 
-BlindingFlash: ; 8c7e1
-	farcall Special_FadeOutPalettes
+BlindingFlash:
+	farcall FadeOutPalettes
 	ld hl, wStatusFlags
-	set 2, [hl] ; Flash
+	set STATUSFLAGS_FLASH_F, [hl]
 	farcall ReplaceTimeOfDayPals
 	farcall UpdateTimeOfDayPal
 	ld b, SCGB_MAPPALS
 	call GetSGBLayout
 	farcall LoadOW_BGPal7
-	farcall Special_FadeInPalettes
+	farcall FadeInPalettes
 	ret
-; 8c80a
 
-ShakeHeadbuttTree: ; 8c80a
+ShakeHeadbuttTree:
 	farcall ClearSpriteAnims
 	ld de, CutGrassGFX
-	ld hl, vTiles1
+	ld hl, vTiles0 tile FIELDMOVE_GRASS
 	lb bc, BANK(CutGrassGFX), 4
 	call Request2bpp
 	ld de, HeadbuttTreeGFX
-	ld hl, vTiles1 tile $04
+	ld hl, vTiles0 tile FIELDMOVE_TREE
 	lb bc, BANK(HeadbuttTreeGFX), 8
 	call Request2bpp
 	call Cut_Headbutt_GetPixelFacing
@@ -34,8 +36,8 @@ ShakeHeadbuttTree: ; 8c80a
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
-	ld [hl], $84
-	ld a, 36 * 4
+	ld [hl], FIELDMOVE_TREE
+	ld a, 36 * SPRITEOAMSTRUCT_LENGTH
 	ld [wCurrSpriteOAMAddr], a
 	farcall DoNextFrameForAllSprites
 	call HideHeadbuttTree
@@ -50,7 +52,7 @@ ShakeHeadbuttTree: ; 8c80a
 	and a
 	jr z, .done
 	dec [hl]
-	ld a, 36 * 4
+	ld a, 36 * SPRITEOAMSTRUCT_LENGTH
 	ld [wCurrSpriteOAMAddr], a
 	farcall DoNextFrameForAllSprites
 	call DelayFrame
@@ -72,13 +74,11 @@ ShakeHeadbuttTree: ; 8c80a
 	call Get1bpp
 	call ReplaceKrisSprite
 	ret
-; 8c893
 
-HeadbuttTreeGFX: ; 8c893
+HeadbuttTreeGFX:
 INCBIN "gfx/overworld/headbutt_tree.2bpp"
-; 8c913
 
-HideHeadbuttTree: ; 8c913
+HideHeadbuttTree:
 	xor a
 	ld [hBGMapMode], a
 	ld a, [wPlayerDirection]
@@ -103,21 +103,19 @@ HideHeadbuttTree: ; 8c913
 	xor a
 	ld [hBGMapMode], a
 	ret
-; 8c938
 
-TreeRelativeLocationTable: ; 8c938
+TreeRelativeLocationTable:
 	dwcoord 8,     8 + 2 ; RIGHT
 	dwcoord 8,     8 - 2 ; LEFT
 	dwcoord 8 - 2, 8     ; DOWN
 	dwcoord 8 + 2, 8     ; UP
-; 8c940
 
-OWCutAnimation: ; 8c940
+OWCutAnimation:
 	; Animation index in e
 	; 0: Split tree in half
 	; 1: Mow the lawn
 	ld a, e
-	and $1
+	and 1
 	ld [wJumptableIndex], a
 	call .LoadCutGFX
 	call WaitSFX
@@ -127,7 +125,7 @@ OWCutAnimation: ; 8c940
 	ld a, [wJumptableIndex]
 	bit 7, a
 	jr nz, .finish
-	ld a, 36 * 4
+	ld a, 36 * SPRITEOAMSTRUCT_LENGTH
 	ld [wCurrSpriteOAMAddr], a
 	callfar DoNextFrameForAllSprites
 	call OWCutJumptable
@@ -136,30 +134,26 @@ OWCutAnimation: ; 8c940
 
 .finish
 	ret
-; 8c96d
 
-.LoadCutGFX: ; 8c96d
+.LoadCutGFX:
 	callfar ClearSpriteAnims ; pointless to farcall
 	ld de, CutGrassGFX
-	ld hl, vTiles1
+	ld hl, vTiles0 tile FIELDMOVE_GRASS
 	lb bc, BANK(CutGrassGFX), 4
 	call Request2bpp
 	ld de, CutTreeGFX
-	ld hl, vTiles1 tile $4
+	ld hl, vTiles0 tile FIELDMOVE_TREE
 	lb bc, BANK(CutTreeGFX), 4
 	call Request2bpp
 	ret
-; 8c98c
 
-CutTreeGFX: ; c898c
+CutTreeGFX:
 INCBIN "gfx/overworld/cut_tree.2bpp"
-; c89cc
 
-CutGrassGFX: ; 8c9cc
+CutGrassGFX:
 INCBIN "gfx/overworld/cut_grass.2bpp"
-; 8ca0c
 
-OWCutJumptable: ; 8ca0c
+OWCutJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -170,23 +164,20 @@ OWCutJumptable: ; 8ca0c
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 8ca1b
 
-
-.dw ; 8ca1b (23:4a1b)
+.dw
 	dw Cut_SpawnAnimateTree
 	dw Cut_SpawnAnimateLeaves
 	dw Cut_StartWaiting
 	dw Cut_WaitAnimSFX
 
-
-Cut_SpawnAnimateTree: ; 8ca23 (23:4a23)
+Cut_SpawnAnimateTree:
 	call Cut_Headbutt_GetPixelFacing
 	ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
-	ld [hl], $84
+	ld [hl], FIELDMOVE_TREE
 	ld a, 32
 	ld [wFrameCounter], a
 ; Cut_StartWaiting
@@ -195,7 +186,7 @@ Cut_SpawnAnimateTree: ; 8ca23 (23:4a23)
 	inc [hl]
 	ret
 
-Cut_SpawnAnimateLeaves: ; 8ca3c (23:4a3c)
+Cut_SpawnAnimateLeaves:
 	call Cut_GetLeafSpawnCoords
 	xor a
 	call Cut_SpawnLeaf
@@ -212,14 +203,14 @@ Cut_SpawnAnimateLeaves: ; 8ca3c (23:4a3c)
 	inc [hl]
 	ret
 
-Cut_StartWaiting: ; 8ca5c (23:4a5c)
+Cut_StartWaiting:
 	ld a, $1
 	ld [hBGMapMode], a
 ; Cut_WaitAnimSFX
 	ld hl, wJumptableIndex
 	inc [hl]
 
-Cut_WaitAnimSFX: ; 8ca64 (23:4a64)
+Cut_WaitAnimSFX:
 	ld hl, wFrameCounter
 	ld a, [hl]
 	and a
@@ -232,14 +223,14 @@ Cut_WaitAnimSFX: ; 8ca64 (23:4a64)
 	set 7, [hl]
 	ret
 
-Cut_SpawnLeaf: ; 8ca73 (23:4a73)
+Cut_SpawnLeaf:
 	push de
 	push af
 	ld a, SPRITE_ANIM_INDEX_LEAF ; leaf
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
-	ld [hl], $80
+	ld [hl], FIELDMOVE_GRASS
 	ld hl, SPRITEANIMSTRUCT_0E
 	add hl, bc
 	ld [hl], $4
@@ -250,7 +241,7 @@ Cut_SpawnLeaf: ; 8ca73 (23:4a73)
 	pop de
 	ret
 
-Cut_GetLeafSpawnCoords: ; 8ca8e (23:4a8e)
+Cut_GetLeafSpawnCoords:
 	ld de, 0
 	ld a, [wMetatileStandingX]
 	bit 0, a
@@ -273,9 +264,8 @@ Cut_GetLeafSpawnCoords: ; 8ca8e (23:4a8e)
 	inc hl
 	ld d, [hl]
 	ret
-; 8cab3 (23:4ab3)
 
-.Coords: ; 8cab3
+.Coords:
 	dbpixel 11, 12 ; facing down,  top left
 	dbpixel  9, 12 ; facing down,  top right
 	dbpixel 11, 14 ; facing down,  bottom left
@@ -295,9 +285,8 @@ Cut_GetLeafSpawnCoords: ; 8ca8e (23:4a8e)
 	dbpixel 13, 12 ; facing right, top right
 	dbpixel 11, 10 ; facing right, bottom left
 	dbpixel 13, 10 ; facing right, bottom right
-; 8cad3
 
-Cut_Headbutt_GetPixelFacing: ; 8cad3 (23:4ad3)
+Cut_Headbutt_GetPixelFacing:
 	ld a, [wPlayerDirection]
 	and %00001100
 	srl a
@@ -309,17 +298,14 @@ Cut_Headbutt_GetPixelFacing: ; 8cad3 (23:4ad3)
 	inc hl
 	ld d, [hl]
 	ret
-; 8cae5 (23:4ae5)
 
-.Coords: ; 8cae5
+.Coords:
 	dbpixel 10, 13
 	dbpixel 10,  9
 	dbpixel  8, 11
 	dbpixel 12, 11
-; 8caed
-
 
-FlyFromAnim: ; 8caed
+FlyFromAnim:
 	call DelayFrame
 	ld a, [wVramState]
 	push af
@@ -331,7 +317,7 @@ FlyFromAnim: ; 8caed
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
-	ld [hl], $84
+	ld [hl], FIELDMOVE_FLY
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
 	ld [hl], SPRITE_ANIM_SEQ_FLY_FROM
@@ -341,7 +327,7 @@ FlyFromAnim: ; 8caed
 	ld a, [wJumptableIndex]
 	bit 7, a
 	jr nz, .exit
-	ld a, 0 * 4
+	ld a, 0 * SPRITEOAMSTRUCT_LENGTH
 	ld [wCurrSpriteOAMAddr], a
 	callfar DoNextFrameForAllSprites
 	call FlyFunction_FrameTimer
@@ -352,9 +338,8 @@ FlyFromAnim: ; 8caed
 	pop af
 	ld [wVramState], a
 	ret
-; 8cb33
 
-FlyToAnim: ; 8cb33
+FlyToAnim:
 	call DelayFrame
 	ld a, [wVramState]
 	push af
@@ -366,7 +351,7 @@ FlyToAnim: ; 8cb33
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
-	ld [hl], $84
+	ld [hl], FIELDMOVE_FLY
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
 	ld [hl], SPRITE_ANIM_SEQ_FLY_TO
@@ -379,7 +364,7 @@ FlyToAnim: ; 8cb33
 	ld a, [wJumptableIndex]
 	bit 7, a
 	jr nz, .exit
-	ld a, 0 * 4
+	ld a, 0 * SPRITEOAMSTRUCT_LENGTH
 	ld [wCurrSpriteOAMAddr], a
 	callfar DoNextFrameForAllSprites
 	call FlyFunction_FrameTimer
@@ -392,13 +377,13 @@ FlyToAnim: ; 8cb33
 	call .RestorePlayerSprite_DespawnLeaves
 	ret
 
-.RestorePlayerSprite_DespawnLeaves: ; 8cb82 (23:4b82)
+.RestorePlayerSprite_DespawnLeaves:
 	ld hl, wVirtualOAMSprite00TileID
 	xor a
 	ld c, 4
 .OAMloop
 	ld [hli], a ; tile id
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	inc a
@@ -410,10 +395,10 @@ endr
 	call ByteFill
 	ret
 
-FlyFunction_InitGFX: ; 8cb9b (23:4b9b)
+FlyFunction_InitGFX:
 	callfar ClearSpriteAnims
 	ld de, CutGrassGFX
-	ld hl, vTiles1 tile $00
+	ld hl, vTiles0 tile FIELDMOVE_GRASS
 	lb bc, BANK(CutGrassGFX), 4
 	call Request2bpp
 	ld a, [wCurPartyMon]
@@ -423,13 +408,13 @@ FlyFunction_InitGFX: ; 8cb9b (23:4b9b)
 	add hl, de
 	ld a, [hl]
 	ld [wd265], a
-	ld e, $84
+	ld e, FIELDMOVE_FLY
 	farcall FlyFunction_GetMonIcon
 	xor a
 	ld [wJumptableIndex], a
 	ret
 
-FlyFunction_FrameTimer: ; 8cbc8 (23:4bc8)
+FlyFunction_FrameTimer:
 	call .SpawnLeaf
 	ld hl, wFrameCounter
 	ld a, [hl]
@@ -449,7 +434,7 @@ FlyFunction_FrameTimer: ; 8cbc8 (23:4bc8)
 	set 7, [hl]
 	ret
 
-.SpawnLeaf: ; 8cbe6 (23:4be6)
+.SpawnLeaf:
 	ld hl, wcf65
 	ld a, [hl]
 	inc [hl]
@@ -465,5 +450,5 @@ FlyFunction_FrameTimer: ; 8cbc8 (23:4bc8)
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
-	ld [hl], $80
+	ld [hl], FIELDMOVE_GRASS
 	ret
diff --git a/engine/events/fish.asm b/engine/events/fish.asm
index d79ac0a43..a1df536bb 100644
--- a/engine/events/fish.asm
+++ b/engine/events/fish.asm
@@ -1,4 +1,4 @@
-Fish: ; 92402
+Fish:
 ; Using a fishing rod.
 ; Fish for monsters with rod e in encounter group d.
 ; Return monster e at level d.
@@ -11,7 +11,7 @@ Fish: ; 92402
 	call GetFishGroupIndex
 
 	ld hl, FishGroups
-rept 7
+rept FISHGROUP_DATA_LENGTH
 	add hl, de
 endr
 	call .Fish
@@ -20,10 +20,8 @@ endr
 	pop bc
 	pop af
 	ret
-; 9241a
 
-
-.Fish: ; 9241a
+.Fish:
 ; Fish for monsters with rod b from encounter data in FishGroup at hl.
 ; Return monster e at level d.
 
@@ -90,15 +88,13 @@ endr
 	ld d, [hl]
 	inc hl
 	ret
-; 9245b
-
 
-GetFishGroupIndex: ; 9245b
+GetFishGroupIndex:
 ; Return the index of fishgroup d in de.
 
 	push hl
 	ld hl, wDailyFlags
-	bit 2, [hl]
+	bit DAILYFLAGS_FISH_SWARM_F, [hl]
 	pop hl
 	jr z, .done
 
@@ -127,7 +123,5 @@ GetFishGroupIndex: ; 9245b
 	jr nz, .done
 	ld d, FISHGROUP_REMORAID_SWARM
 	jr .done
-; 92488
-
 
 INCLUDE "data/wild/fish.asm"
diff --git a/engine/events/loadfishinggfx.asm b/engine/events/fishing_gfx.asm
index f67c51d8b..159f0022d 100644
--- a/engine/events/loadfishinggfx.asm
+++ b/engine/events/fishing_gfx.asm
@@ -1,4 +1,4 @@
-LoadFishingGFX: ; b84b3
+LoadFishingGFX:
 	ld a, [rVBK]
 	push af
 	ld a, $1
@@ -6,7 +6,7 @@ LoadFishingGFX: ; b84b3
 
 	ld de, FishingGFX
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .got_gender
 	ld de, KrisFishingGFX
 .got_gender
@@ -17,15 +17,14 @@ LoadFishingGFX: ; b84b3
 	call .LoadGFX
 	ld hl, vTiles0 tile $0a
 	call .LoadGFX
-	ld hl, vTiles1 tile $7c
+	ld hl, vTiles0 tile $fc
 	call .LoadGFX
 
 	pop af
 	ld [rVBK], a
 	ret
-; b84e3
 
-.LoadGFX: ; b84e3
+.LoadGFX:
 	lb bc, BANK(FishingGFX), 2
 	push de
 	call Get2bpp
@@ -35,12 +34,9 @@ LoadFishingGFX: ; b84b3
 	ld d, h
 	ld e, l
 	ret
-; b84f2
 
-FishingGFX: ; b84f2
+FishingGFX:
 INCBIN "gfx/overworld/chris_fish.2bpp"
-; b8582
 
-KrisFishingGFX: ; b8582
+KrisFishingGFX:
 INCBIN "gfx/overworld/kris_fish.2bpp"
-; b8612
diff --git a/engine/events/forced_movement.asm b/engine/events/forced_movement.asm
index 136698501..69f27bfe2 100755..100644
--- a/engine/events/forced_movement.asm
+++ b/engine/events/forced_movement.asm
@@ -1,60 +1,51 @@
-Script_ForcedMovement:: ; 0x1253d
+Script_ForcedMovement::
 	checkcode VAR_FACING
-	if_equal DOWN, .down
-	if_equal UP, .up
-	if_equal LEFT, .left
-	if_equal RIGHT, .right
+	ifequal DOWN, .down
+	ifequal UP, .up
+	ifequal LEFT, .left
+	ifequal RIGHT, .right
 	end
-; 0x12550
 
-.up ; 0x12550
+.up
 	applymovement PLAYER, .MovementData_up
 	end
-; 0x12555
 
-.down ; 0x12555
+.down
 	applymovement PLAYER, .MovementData_down
 	end
-; 0x1255a
 
-.right ; 0x1255a
+.right
 	applymovement PLAYER, .MovementData_right
 	end
-; 0x1255f
 
-.left ; 0x1255f
+.left
 	applymovement PLAYER, .MovementData_left
 	end
-; 0x12564
 
-.MovementData_up: ; 0x12564
+.MovementData_up:
 	step_dig 16
 	turn_in DOWN
 	step_dig 16
 	turn_head DOWN
 	step_end
-; 0x1256b
 
-.MovementData_down: ; 0x1256b
+.MovementData_down:
 	step_dig 16
 	turn_in UP
 	step_dig 16
 	turn_head UP
 	step_end
-; 0x12572
 
-.MovementData_right: ; 0x12572
+.MovementData_right:
 	step_dig 16
 	turn_in LEFT
 	step_dig 16
 	turn_head LEFT
 	step_end
-; 0x12579
 
-.MovementData_left: ; 0x12579
+.MovementData_left:
 	step_dig 16
 	turn_in RIGHT
 	step_dig 16
 	turn_head RIGHT
 	step_end
-; 0x12580
diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm
index 796880175..6d5ca6a1d 100644
--- a/engine/events/fruit_trees.asm
+++ b/engine/events/fruit_trees.asm
@@ -1,4 +1,4 @@
-FruitTreeScript:: ; 44000
+FruitTreeScript::
 	callasm GetCurTreeFruit
 	opentext
 	copybytetovar wCurFruit
@@ -32,38 +32,33 @@ FruitTreeScript:: ; 44000
 .end
 	closetext
 	end
-; 44041
 
-GetCurTreeFruit: ; 44041
+GetCurTreeFruit:
 	ld a, [wCurFruitTree]
 	dec a
 	call GetFruitTreeItem
 	ld [wCurFruit], a
 	ret
-; 4404c
 
-TryResetFruitTrees: ; 4404c
+TryResetFruitTrees:
 	ld hl, wDailyFlags
-	bit 4, [hl]
+	bit DAILYFLAGS_ALL_FRUIT_TREES_F, [hl]
 	ret nz
 	jp ResetFruitTrees
-; 44055
 
-CheckFruitTree: ; 44055
+CheckFruitTree:
 	ld b, 2
 	call GetFruitTreeFlag
 	ld a, c
 	ld [wScriptVar], a
 	ret
-; 4405f
 
-PickedFruitTree: ; 4405f
+PickedFruitTree:
 	farcall StubbedTrainerRankings_FruitPicked
 	ld b, 1
 	jp GetFruitTreeFlag
-; 4406a
 
-ResetFruitTrees: ; 4406a
+ResetFruitTrees:
 	xor a
 	ld hl, wFruitTreeFlags
 	ld [hli], a
@@ -71,11 +66,10 @@ ResetFruitTrees: ; 4406a
 	ld [hli], a
 	ld [hl], a
 	ld hl, wDailyFlags
-	set 4, [hl]
+	set DAILYFLAGS_ALL_FRUIT_TREES_F, [hl]
 	ret
-; 44078
 
-GetFruitTreeFlag: ; 44078
+GetFruitTreeFlag:
 	push hl
 	push de
 	ld a, [wCurFruitTree]
@@ -87,9 +81,8 @@ GetFruitTreeFlag: ; 44078
 	pop de
 	pop hl
 	ret
-; 4408a
 
-GetFruitTreeItem: ; 4408a
+GetFruitTreeItem:
 	push hl
 	push de
 	ld e, a
@@ -100,33 +93,25 @@ GetFruitTreeItem: ; 4408a
 	pop de
 	pop hl
 	ret
-; 44097
-
 
 INCLUDE "data/items/fruit_trees.asm"
 
-
-FruitBearingTreeText: ; 440b5
+FruitBearingTreeText:
 	text_jump _FruitBearingTreeText
 	db "@"
-; 440ba
 
-HeyItsFruitText: ; 440ba
+HeyItsFruitText:
 	text_jump _HeyItsFruitText
 	db "@"
-; 440bf
 
-ObtainedFruitText: ; 440bf
+ObtainedFruitText:
 	text_jump _ObtainedFruitText
 	db "@"
-; 440c4
 
-FruitPackIsFullText: ; 440c4
+FruitPackIsFullText:
 	text_jump _FruitPackIsFullText
 	db "@"
-; 440c9
 
-NothingHereText: ; 440c9
+NothingHereText:
 	text_jump _NothingHereText
 	db "@"
-; 440ce
diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm
new file mode 100644
index 000000000..d5b0afe8b
--- /dev/null
+++ b/engine/events/haircut.asm
@@ -0,0 +1,82 @@
+BillsGrandfather:
+	farcall SelectMonFromParty
+	jr c, .cancel
+	ld a, [wCurPartySpecies]
+	ld [wScriptVar], a
+	ld [wNamedObjectIndexBuffer], a
+	call GetPokemonName
+	jp CopyPokemonName_Buffer1_Buffer3
+
+.cancel
+	xor a
+	ld [wScriptVar], a
+	ret
+
+YoungerHaircutBrother:
+	ld hl, HappinessData_YoungerHaircutBrother
+	jr HaircutOrGrooming
+
+OlderHaircutBrother:
+	ld hl, HappinessData_OlderHaircutBrother
+	jr HaircutOrGrooming
+
+DaisysGrooming:
+	ld hl, HappinessData_DaisysGrooming
+	; fallthrough
+
+HaircutOrGrooming:
+	push hl
+	farcall SelectMonFromParty
+	pop hl
+	jr c, .nope
+	ld a, [wCurPartySpecies]
+	cp EGG
+	jr z, .egg
+	push hl
+	call GetCurNick
+	call CopyPokemonName_Buffer1_Buffer3
+	pop hl
+	call Random
+; Bug: Subtracting $ff from $ff fails to set c.
+; This can result in overflow into the next data array.
+; In the case of getting a grooming from Daisy, we bleed
+; into CopyPokemonName_Buffer1_Buffer3, which passes
+; $d0 to ChangeHappiness and returns $73 to the script.
+; The end result is that there is a 0.4% chance your
+; Pokemon's happiness will not change at all.
+.loop
+	sub [hl]
+	jr c, .ok
+	inc hl
+	inc hl
+	inc hl
+	jr .loop
+
+.ok
+	inc hl
+	ld a, [hli]
+	ld [wScriptVar], a
+	ld c, [hl]
+	call ChangeHappiness
+	ret
+
+.nope
+	xor a
+	ld [wScriptVar], a
+	ret
+
+.egg
+	ld a, 1
+	ld [wScriptVar], a
+	ret
+
+INCLUDE "data/events/happiness_probabilities.asm"
+
+CopyPokemonName_Buffer1_Buffer3:
+	ld hl, wStringBuffer1
+	ld de, wStringBuffer3
+	ld bc, MON_NAME_LENGTH
+	jp CopyBytes
+
+DummyPredef1:
+	ret
diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm
index 78b5cbe03..6cbc749d5 100755..100644
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -1,6 +1,6 @@
 HALLOFFAME_COLON EQU $63
 
-HallOfFame:: ; 0x8640e
+HallOfFame::
 	call HallOfFame_FadeOutMusic
 	ld a, [wStatusFlags]
 	push af
@@ -12,13 +12,13 @@ HallOfFame:: ; 0x8640e
 
 	; Enable the Pokégear map to cycle through all of Kanto
 	ld hl, wStatusFlags
-	set 6, [hl] ; hall of fame
+	set STATUSFLAGS_HALL_OF_FAME_F, [hl]
 
 	farcall HallOfFame_InitSaveIfNeeded
 
 	ld hl, wHallOfFameCount
 	ld a, [hl]
-	cp 200
+	cp HOF_MASTER_COUNT
 	jr nc, .ok
 	inc [hl]
 .ok
@@ -33,16 +33,15 @@ HallOfFame:: ; 0x8640e
 	ld b, a
 	farcall Credits
 	ret
-; 0x86455
 
-RedCredits:: ; 86455
+RedCredits::
 	ld a, LOW(MUSIC_NONE)
 	ld [wMusicFadeID], a
 	ld a, HIGH(MUSIC_NONE)
 	ld [wMusicFadeID + 1], a
 	ld a, 10
 	ld [wMusicFade], a
-	farcall Special_FadeOutPalettes
+	farcall FadeOutPalettes
 	xor a
 	ld [wVramState], a
 	ld [hMapAnims], a
@@ -56,25 +55,23 @@ RedCredits:: ; 86455
 	ld b, a
 	farcall Credits
 	ret
-; 8648e
 
-HallOfFame_FadeOutMusic: ; 8648e
+HallOfFame_FadeOutMusic:
 	ld a, LOW(MUSIC_NONE)
 	ld [wMusicFadeID], a
 	ld a, HIGH(MUSIC_NONE)
 	ld [wMusicFadeID + 1], a
 	ld a, 10
 	ld [wMusicFade], a
-	farcall Special_FadeOutPalettes
+	farcall FadeOutPalettes
 	xor a
 	ld [wVramState], a
 	ld [hMapAnims], a
 	farcall InitDisplayForHallOfFame
 	ld c, 100
 	jp DelayFrames
-; 864b4
 
-HallOfFame_PlayMusicDE: ; 864b4
+HallOfFame_PlayMusicDE:
 	push de
 	ld de, MUSIC_NONE
 	call PlayMusic
@@ -82,9 +79,8 @@ HallOfFame_PlayMusicDE: ; 864b4
 	pop de
 	call PlayMusic
 	ret
-; 864c3
 
-AnimateHallOfFame: ; 864c3
+AnimateHallOfFame:
 	xor a
 	ld [wJumptableIndex], a
 	call LoadHOFTeam
@@ -120,9 +116,8 @@ AnimateHallOfFame: ; 864c3
 	ld c, 8
 	call DelayFrames
 	ret
-; 8650c
 
-.DisplayNewHallOfFamer: ; 8650c
+.DisplayNewHallOfFamer:
 	call DisplayHOFMon
 	ld de, .String_NewHallOfFamer
 	hlcoord 1, 2
@@ -135,20 +130,17 @@ AnimateHallOfFame: ; 864c3
 	call DelayFrames
 	and a
 	ret
-; 8652c
 
 .String_NewHallOfFamer:
 	db "New Hall of Famer!@"
-; 8653f
 
-
-GetHallOfFameParty: ; 8653f
-	ld hl, wOverworldMap
-	ld bc, HOF_LENGTH
+GetHallOfFameParty:
+	ld hl, wHallOfFamePokemonList
+	ld bc, wHallOfFamePokemonListEnd - wHallOfFamePokemonList + 1
 	xor a
 	call ByteFill
 	ld a, [wHallOfFameCount]
-	ld de, wOverworldMap
+	ld de, wHallOfFamePokemonList
 	ld [de], a
 	inc de
 	ld hl, wPartySpecies
@@ -216,7 +208,7 @@ GetHallOfFameParty: ; 8653f
 	pop bc
 	inc c
 	pop de
-	ld hl, HOF_MON_LENGTH
+	ld hl, wHallOfFamePokemonListMon1End - wHallOfFamePokemonListMon1
 	add hl, de
 	ld e, l
 	ld d, h
@@ -224,12 +216,11 @@ GetHallOfFameParty: ; 8653f
 	jr .next
 
 .done
-	ld a, $ff
+	ld a, -1
 	ld [de], a
 	ret
-; 865b5
 
-AnimateHOFMonEntrance: ; 865b5
+AnimateHOFMonEntrance:
 	push hl
 	call ClearBGPalettes
 	farcall ResetDisplayBetweenHallOfFameMons
@@ -281,7 +272,6 @@ AnimateHOFMonEntrance: ; 865b5
 	ld [hSCY], a
 	call HOF_SlideFrontpic
 	ret
-; 86635
 
 HOF_SlideBackpic:
 .backpicloop
@@ -292,7 +282,6 @@ HOF_SlideBackpic:
 	ld [hSCX], a
 	call DelayFrame
 	jr .backpicloop
-; 86643
 
 HOF_SlideFrontpic:
 .frontpicloop
@@ -304,9 +293,8 @@ HOF_SlideFrontpic:
 	ld [hSCX], a
 	call DelayFrame
 	jr .frontpicloop
-; 86650
 
-_HallOfFamePC: ; 86650
+_HallOfFamePC:
 	call LoadFontsBattleExtra
 	xor a
 	ld [wJumptableIndex], a
@@ -355,7 +343,7 @@ _HallOfFamePC: ; 86650
 
 .DisplayMonAndStrings:
 ; Print the number of times the player has entered the Hall of Fame.
-; If that number is above 200, print "HOF Master!" instead.
+; If that number is at least HOF_MASTER_COUNT, print "HOF Master!" instead.
 	ld a, [wHallOfFameMonCounter]
 	cp PARTY_LENGTH
 	jr nc, .fail
@@ -376,7 +364,7 @@ _HallOfFamePC: ; 86650
 	pop hl
 	call DisplayHOFMon
 	ld a, [wHallOfFameTempWinCount]
-	cp 200 + 1
+	cp HOF_MASTER_COUNT + 1 ; should be HOF_MASTER_COUNT
 	jr c, .print_num_hof
 	ld de, .HOFMaster
 	hlcoord 1, 2
@@ -415,14 +403,13 @@ _HallOfFamePC: ; 86650
 
 .TimeFamer:
 	db "    -Time Famer@"
-; 8671c
 
-LoadHOFTeam: ; 8671c
+LoadHOFTeam:
 	ld a, [wJumptableIndex]
 	cp NUM_HOF_TEAMS
 	jr nc, .invalid
 	ld hl, sHallOfFame
-	ld bc, HOF_LENGTH
+	ld bc, wHallOfFameTempEnd - wHallOfFameTemp + 1
 	call AddNTimes
 	ld a, BANK(sHallOfFame)
 	call GetSRAMBank
@@ -430,7 +417,7 @@ LoadHOFTeam: ; 8671c
 	and a
 	jr z, .absent
 	ld de, wHallOfFameTemp
-	ld bc, HOF_LENGTH
+	ld bc, wHallOfFameTempEnd - wHallOfFameTemp + 1
 	call CopyBytes
 	call CloseSRAM
 	and a
@@ -442,9 +429,8 @@ LoadHOFTeam: ; 8671c
 .invalid
 	scf
 	ret
-; 86748
 
-DisplayHOFMon: ; 86748
+DisplayHOFMon:
 	xor a
 	ld [hBGMapMode], a
 	ld a, [hli]
@@ -529,9 +515,8 @@ DisplayHOFMon: ; 86748
 	lb bc, PRINTNUM_LEADINGZEROS | 2, 5
 	call PrintNum
 	ret
-; 86810
 
-HOF_AnimatePlayerPic: ; 86810
+HOF_AnimatePlayerPic:
 	call ClearBGPalettes
 	ld hl, vTiles2 tile HALLOFFAME_COLON
 	ld de, FontExtra + 13 tiles ; "<COLON>"
@@ -614,9 +599,6 @@ HOF_AnimatePlayerPic: ; 86810
 	call WaitBGMap
 	farcall ProfOaksPCRating
 	ret
-; 868ed
 
 .PlayTime:
 	db "PLAY TIME@"
-; 868f7
-
diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm
index 0c516247f..41f9a4411 100755..100644
--- a/engine/events/happiness_egg.asm
+++ b/engine/events/happiness_egg.asm
@@ -1,4 +1,4 @@
-Special_GetFirstPokemonHappiness: ; 718d
+GetFirstPokemonHappiness:
 	ld hl, wPartyMon1Happiness
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld de, wPartySpecies
@@ -17,7 +17,7 @@ Special_GetFirstPokemonHappiness: ; 718d
 	call GetPokemonName
 	jp CopyPokemonName_Buffer1_Buffer3
 
-Special_CheckFirstMonIsEgg: ; 71ac
+CheckFirstMonIsEgg:
 	ld a, [wPartySpecies]
 	ld [wd265], a
 	cp EGG
@@ -30,7 +30,7 @@ Special_CheckFirstMonIsEgg: ; 71ac
 	call GetPokemonName
 	jp CopyPokemonName_Buffer1_Buffer3
 
-ChangeHappiness: ; 71c2
+ChangeHappiness:
 ; Perform happiness action c on wCurPartyMon
 
 	ld a, [wCurPartyMon]
@@ -102,11 +102,9 @@ ChangeHappiness: ; 71c2
 	ld [wBattleMonHappiness], a
 	ret
 
+INCLUDE "data/events/happiness_changes.asm"
 
-INCLUDE "data/happiness_changes.asm"
-
-
-StepHappiness:: ; 725a
+StepHappiness::
 ; Raise the party's happiness by 1 point every other step cycle.
 
 	ld hl, wHappinessStepCount
@@ -141,12 +139,11 @@ StepHappiness:: ; 725a
 	jr nz, .loop
 	ret
 
-
-DayCareStep:: ; 7282
+DayCareStep::
 ; Raise the experience of Day-Care Pokémon every step cycle.
 
 	ld a, [wDayCareMan]
-	bit 0, a
+	bit DAYCAREMAN_HAS_MON_F, a
 	jr z, .day_care_lady
 
 	ld a, [wBreedMon1Level] ; level
@@ -168,7 +165,7 @@ DayCareStep:: ; 7282
 
 .day_care_lady
 	ld a, [wDayCareLady]
-	bit 0, a
+	bit DAYCARELADY_HAS_MON_F, a
 	jr z, .check_egg
 
 	ld a, [wBreedMon2Level] ; level
@@ -190,7 +187,7 @@ DayCareStep:: ; 7282
 
 .check_egg
 	ld hl, wDayCareMan
-	bit 5, [hl] ; egg
+	bit DAYCAREMAN_MONS_COMPATIBLE_F, [hl]
 	ret z
 	ld hl, wStepsToEgg
 	dec [hl]
@@ -218,6 +215,6 @@ DayCareStep:: ; 7282
 	cp b
 	ret nc
 	ld hl, wDayCareMan
-	res 5, [hl]
-	set 6, [hl]
+	res DAYCAREMAN_MONS_COMPATIBLE_F, [hl]
+	set DAYCAREMAN_HAS_EGG_F, [hl]
 	ret
diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm
index 400645b47..559886289 100755..100644
--- a/engine/events/heal_machine_anim.asm
+++ b/engine/events/heal_machine_anim.asm
@@ -1,4 +1,4 @@
-; Special_HealMachineAnim.Jumptable indexes
+; HealMachineAnim.Jumptable indexes
 	const_def
 	const HEALMACHINESTATE_LOADGFX
 	const HEALMACHINESTATE_PCLOADBALLS
@@ -7,7 +7,7 @@
 	const HEALMACHINESTATE_HOFPLAYSFX
 	const HEALMACHINESTATE_FINISH
 
-Special_HealMachineAnim: ; 12324
+HealMachineAnim:
 	; If you have no Pokemon, don't change the buffer.  This can lead to some glitchy effects if you have no Pokemon.
 	ld a, [wPartyCount]
 	and a
@@ -24,9 +24,8 @@ Special_HealMachineAnim: ; 12324
 	ld a, [wBuffer2]
 	call DmgToCgbObjPal1
 	ret
-; 1233e
 
-.DoJumptableFunctions: ; 1233e
+.DoJumptableFunctions:
 	xor a
 	ld [wBuffer3], a
 .jumpable_loop
@@ -53,14 +52,12 @@ Special_HealMachineAnim: ; 12324
 
 .finish
 	ret
-; 12365
 
-.Pointers: ; 12365
+.Pointers:
 ; entries correspond to HEALMACHINE_* constants
 	dw .Pokecenter
 	dw .ElmLab
 	dw .HallOfFame
-; 1236b
 
 healmachineanimseq: MACRO
 rept _NARG
@@ -69,15 +66,14 @@ rept _NARG
 endr
 ENDM
 
-.Pokecenter: ; 1236b
+.Pokecenter:
 	healmachineanimseq LOADGFX, PCLOADBALLS, PLAYMUSIC, FINISH
-.ElmLab: ; 1236f
+.ElmLab:
 	healmachineanimseq LOADGFX, PCLOADBALLS, PLAYMUSIC, FINISH
-.HallOfFame: ; 12373
+.HallOfFame:
 	healmachineanimseq LOADGFX, HOFLOADBALLS, HOFPLAYSFX, FINISH
-; 12377
 
-.Jumptable: ; 12377
+.Jumptable:
 ; entries correspond to HEALMACHINESTATE_* constants
 	dw .LoadGFX
 	dw .PC_LoadBallsOntoMachine
@@ -85,29 +81,27 @@ ENDM
 	dw .PlayHealMusic
 	dw .HOF_PlaySFX
 	dw .dummy_5 ; never encountered
-; 12383
 
-.LoadGFX: ; 12383
+.LoadGFX:
 	call .LoadPalettes
 	ld de, .HealMachineGFX
 	ld hl, vTiles0 tile $7c
 	lb bc, BANK(.HealMachineGFX), 2
 	call Request2bpp
 	ret
-; 12393
 
-.PC_LoadBallsOntoMachine: ; 12393
+.PC_LoadBallsOntoMachine:
 	ld hl, wVirtualOAMSprite32
 	ld de, .PC_ElmsLab_OAM
 	call .PlaceHealingMachineTile
 	call .PlaceHealingMachineTile
 	jr .LoadBallsOntoMachine
 
-.HOF_LoadBallsOntoMachine: ; 123a1
+.HOF_LoadBallsOntoMachine:
 	ld hl, wVirtualOAMSprite32
 	ld de, .HOF_OAM
 
-.LoadBallsOntoMachine: ; 123a7
+.LoadBallsOntoMachine:
 	ld a, [wPartyCount]
 	ld b, a
 .party_loop
@@ -121,15 +115,13 @@ ENDM
 	dec b
 	jr nz, .party_loop
 	ret
-; 123bf
 
-.PlayHealMusic: ; 123bf
+.PlayHealMusic:
 	ld de, MUSIC_HEAL
 	call PlayMusic
 	jp .FlashPalettes8Times
-; 123c8
 
-.HOF_PlaySFX: ; 123c8
+.HOF_PlaySFX:
 	ld de, SFX_GAME_FREAK_LOGO_GS
 	call PlaySFX
 	call .FlashPalettes8Times
@@ -137,13 +129,11 @@ ENDM
 	ld de, SFX_BOOT_PC
 	call PlaySFX
 	ret
-; 123db
 
-.dummy_5 ; 123db
+.dummy_5
 	ret
-; 123dc
 
-.PC_ElmsLab_OAM: ; 123dc
+.PC_ElmsLab_OAM:
 	dsprite   4, 0,   4, 2, $7c, PAL_OW_TREE | OBP_NUM
 	dsprite   4, 0,   4, 6, $7c, PAL_OW_TREE | OBP_NUM
 	dsprite   4, 6,   4, 0, $7d, PAL_OW_TREE | OBP_NUM
@@ -152,22 +142,19 @@ ENDM
 	dsprite   5, 3,   5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
 	dsprite   6, 0,   4, 0, $7d, PAL_OW_TREE | OBP_NUM
 	dsprite   6, 0,   5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
-; 123fc
 
-.HealMachineGFX: ; 123fc
+.HealMachineGFX:
 INCBIN "gfx/overworld/heal_machine.2bpp"
-; 1241c
 
-.HOF_OAM: ; 1241c
+.HOF_OAM:
 	dsprite   7, 4,  10, 1, $7d, PAL_OW_TREE | OBP_NUM
 	dsprite   7, 4,  10, 6, $7d, PAL_OW_TREE | OBP_NUM
 	dsprite   7, 3,   9, 5, $7d, PAL_OW_TREE | OBP_NUM
 	dsprite   7, 3,  11, 2, $7d, PAL_OW_TREE | OBP_NUM
 	dsprite   7, 1,   9, 1, $7d, PAL_OW_TREE | OBP_NUM
 	dsprite   7, 1,  11, 5, $7d, PAL_OW_TREE | OBP_NUM
-; 12434
 
-.LoadPalettes: ; 12434
+.LoadPalettes:
 	call IsCGB
 	jr nz, .cgb
 	ld a, %11100000
@@ -183,13 +170,11 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 12451
 
-.palettes ; 12451
+.palettes
 INCLUDE "gfx/overworld/heal_machine.pal"
-; 12459
 
-.FlashPalettes8Times: ; 12459
+.FlashPalettes8Times:
 	ld c, 8
 .palette_loop
 	push bc
@@ -200,9 +185,8 @@ INCLUDE "gfx/overworld/heal_machine.pal"
 	dec c
 	jr nz, .palette_loop
 	ret
-; 12469
 
-.FlashPalettes: ; 12469
+.FlashPalettes:
 	call IsCGB
 	jr nz, .go
 	ld a, [rOBP1]
@@ -250,9 +234,8 @@ INCLUDE "gfx/overworld/heal_machine.pal"
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 124a3
 
-.PlaceHealingMachineTile: ; 124a3
+.PlaceHealingMachineTile:
 	push bc
 	ld a, [wBuffer1]
 	bcpixel 2, 4
@@ -277,4 +260,3 @@ INCLUDE "gfx/overworld/heal_machine.pal"
 	ld [hli], a ; attributes
 	pop bc
 	ret
-; 124c1
diff --git a/engine/events/itemfinder.asm b/engine/events/itemfinder.asm
index 71aaa5b69..6a4d6edf3 100755..100644
--- a/engine/events/itemfinder.asm
+++ b/engine/events/itemfinder.asm
@@ -1,4 +1,4 @@
-ItemFinder: ; 12580
+ItemFinder:
 	farcall CheckForHiddenItems
 	jr c, .found_something
 	ld hl, .Script_FoundNothing
@@ -12,9 +12,8 @@ ItemFinder: ; 12580
 	ld a, $1
 	ld [wItemEffectSucceeded], a
 	ret
-; 12599
 
-.ItemfinderSound: ; 12599
+.ItemfinderSound:
 	ld c, 4
 .sfx_loop
 	push bc
@@ -26,33 +25,28 @@ ItemFinder: ; 12580
 	dec c
 	jr nz, .sfx_loop
 	ret
-; 125ad
 
-.Script_FoundSomething: ; 0x125ad
+.Script_FoundSomething:
 	reloadmappart
 	special UpdateTimePals
 	callasm .ItemfinderSound
 	writetext .Text_FoundSomething
 	closetext
 	end
-; 0x125ba
 
-.Script_FoundNothing: ; 0x125ba
+.Script_FoundNothing:
 	reloadmappart
 	special UpdateTimePals
 	writetext .Text_FoundNothing
 	closetext
 	end
-; 0x125c3
 
-.Text_FoundSomething: ; 0x125c3
+.Text_FoundSomething:
 	; Yes! ITEMFINDER indicates there's an item nearby.
 	text_jump UnknownText_0x1c0a77
 	db "@"
-; 0x125c8
 
-.Text_FoundNothing: ; 0x125c8
+.Text_FoundNothing:
 	; Nope! ITEMFINDER isn't responding.
 	text_jump UnknownText_0x1c0aa9
 	db "@"
-; 0x125cd
diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm
index 79eb7da2e..d4342b3e4 100644
--- a/engine/events/kurt.asm
+++ b/engine/events/kurt.asm
@@ -1,29 +1,25 @@
-Kurt_PrintTextWhichApricorn: ; 88000
+Kurt_PrintTextWhichApricorn:
 	ld hl, .Text
 	call PrintText
 	ret
-; 88007
 
-.Text: ; 0x88007
+.Text:
 	; Which APRICORN should I use?
 	text_jump UnknownText_0x1bc06b
 	db "@"
-; 0x8800c
 
-Kurt_PrintTextHowMany: ; 8800c
+Kurt_PrintTextHowMany:
 	ld hl, .Text
 	call PrintText
 	ret
-; 88013
 
-.Text: ; 0x88013
+.Text:
 	; How many should I make?
 	text_jump UnknownText_0x1bc089
 	db "@"
-; 0x88018
 
-Special_SelectApricornForKurt: ; 88018
-	call LoadStandardMenuDataHeader
+SelectApricornForKurt:
+	call LoadStandardMenuHeader
 	ld c, $1
 	xor a
 	ld [wMenuScrollPosition], a
@@ -54,13 +50,12 @@ Special_SelectApricornForKurt: ; 88018
 .done
 	call Call_ExitMenu
 	ret
-; 88055
 
-Kurt_SelectApricorn: ; 88055
+Kurt_SelectApricorn:
 	farcall FindApricornsInBag
 	jr c, .nope
-	ld hl, .MenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, .MenuHeader
+	call CopyMenuHeader
 	ld a, [wMenuSelection]
 	ld [wMenuCursorBuffer], a
 	xor a
@@ -81,18 +76,16 @@ Kurt_SelectApricorn: ; 88055
 .done
 	ld c, a
 	ret
-; 88086
 
-.MenuDataHeader: ; 0x88086
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, 13, 10
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x8808e
 
 	db 0 ; XXX
 
-.MenuData2: ; 0x8808f
+.MenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 7
 	db 1
@@ -101,15 +94,14 @@ Kurt_SelectApricorn: ; 88055
 	dba .Quantity
 	dba NULL
 
-.Name: ; 8809f
+.Name:
 	ld a, [wMenuSelection]
 	and a
 	ret z
 	farcall PlaceMenuItemName
 	ret
-; 880ab
 
-.Quantity: ; 880ab
+.Quantity:
 	ld a, [wMenuSelection]
 	ld [wCurItem], a
 	call Kurt_GetQuantityOfApricorn
@@ -118,9 +110,8 @@ Kurt_SelectApricorn: ; 88055
 	ld [wMenuSelectionQuantity], a
 	farcall PlaceMenuItemQuantity
 	ret
-; 880c2
 
-Kurt_SelectQuantity: ; 880c2
+Kurt_SelectQuantity:
 	ld a, [wCurItem]
 	ld [wMenuSelection], a
 	call Kurt_GetQuantityOfApricorn
@@ -129,8 +120,8 @@ Kurt_SelectQuantity: ; 880c2
 	ld [wItemQuantityBuffer], a
 	ld a, $1
 	ld [wItemQuantityChangeBuffer], a
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 .loop
 	xor a
 	ld [hBGMapMode], a
@@ -155,16 +146,15 @@ Kurt_SelectQuantity: ; 880c2
 .done
 	call CloseWindow
 	ret
-; 8810d
 
-.MenuDataHeader: ; 0x8810d
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 9, SCREEN_WIDTH - 1, 12
 	dw NULL
 	db -1 ; default option
 	db 0
 
-.PlaceApricornName: ; 88116
+.PlaceApricornName:
 	call MenuBoxCoord2Tile
 	ld de, SCREEN_WIDTH + 1
 	add hl, de
@@ -172,9 +162,8 @@ Kurt_SelectQuantity: ; 880c2
 	ld e, l
 	farcall PlaceMenuItemName
 	ret
-; 88126
 
-PlaceApricornQuantity: ; 88126
+PlaceApricornQuantity:
 	call MenuBoxCoord2Tile
 	ld de, 2 * SCREEN_WIDTH + 10
 	add hl, de
@@ -183,9 +172,8 @@ PlaceApricornQuantity: ; 88126
 	ld de, wItemQuantityChangeBuffer
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2
 	jp PrintNum
-; 88139
 
-Kurt_GetQuantityOfApricorn: ; 88139
+Kurt_GetQuantityOfApricorn:
 	push bc
 	ld hl, wNumItems
 	ld a, [wCurItem]
@@ -216,9 +204,8 @@ Kurt_GetQuantityOfApricorn: ; 88139
 	and a
 	pop bc
 	ret
-; 88161
 
-Kurt_GiveUpSelectedQuantityOfSelectedApricorn: ; 88161
+Kurt_GiveUpSelectedQuantityOfSelectedApricorn:
 ; Get the quantity of Apricorns of type [wCurItem]
 ; in the bag. Compatible with multiple stacks.
 
@@ -352,9 +339,8 @@ Kurt_GiveUpSelectedQuantityOfSelectedApricorn: ; 88161
 	pop bc
 	pop de
 	ret
-; 88201
 
-Kurt_GetAddressOfApricornQuantity: ; 88201
+Kurt_GetAddressOfApricornQuantity:
 	push hl
 	push bc
 	ld hl, wNumItems
@@ -368,9 +354,8 @@ Kurt_GetAddressOfApricornQuantity: ; 88201
 	pop bc
 	pop hl
 	ret
-; 88211
 
-Kurt_GetRidOfItem: ; 88211
+Kurt_GetRidOfItem:
 	push bc
 	ld hl, wNumItems
 	ld a, [wCurItemQuantity]
@@ -409,4 +394,3 @@ Kurt_GetRidOfItem: ; 88211
 	ld [wItemQuantityChangeBuffer], a
 	pop bc
 	ret
-; 88248
diff --git a/engine/events/kurt_selectquantity_interpretjoypad.asm b/engine/events/kurt_selectquantity_interpretjoypad.asm
index 12a43e325..44b71a113 100644
--- a/engine/events/kurt_selectquantity_interpretjoypad.asm
+++ b/engine/events/kurt_selectquantity_interpretjoypad.asm
@@ -1,4 +1,4 @@
-Kurt_SelectQuantity_InterpretJoypad: ; 27a28
+Kurt_SelectQuantity_InterpretJoypad:
 	call BuySellToss_InterpretJoypad
 	ld b, a
 	ret
diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm
index 1582cec7d..c5d6d18e0 100644
--- a/engine/events/lucky_number.asm
+++ b/engine/events/lucky_number.asm
@@ -1,4 +1,4 @@
-Special_CheckForLuckyNumberWinners: ; 4d87a
+CheckForLuckyNumberWinners:
 	xor a
 	ld [wScriptVar], a
 	ld [wFoundMatchingIDInParty], a
@@ -118,7 +118,7 @@ Special_CheckForLuckyNumberWinners: ; 4d87a
 .print
 	jp PrintText
 
-.CompareLuckyNumberToMonID: ; 4d939
+.CompareLuckyNumberToMonID:
 	push bc
 	push de
 	push hl
@@ -190,7 +190,7 @@ Special_CheckForLuckyNumberWinners: ; 4d87a
 	and a
 	ret
 
-.BoxBankAddresses: ; 4d99f
+.BoxBankAddresses:
 	dba sBox1
 	dba sBox2
 	dba sBox3
@@ -206,17 +206,17 @@ Special_CheckForLuckyNumberWinners: ; 4d87a
 	dba sBox13
 	dba sBox14
 
-.FoundPartymonText: ; 0x4d9c9
+.FoundPartymonText:
 	; Congratulations! We have a match with the ID number of @  in your party.
 	text_jump UnknownText_0x1c1261
 	db "@"
 
-.FoundBoxmonText: ; 0x4d9ce
+.FoundBoxmonText:
 	; Congratulations! We have a match with the ID number of @  in your PC BOX.
 	text_jump UnknownText_0x1c12ae
 	db "@"
 
-Special_PrintTodaysLuckyNumber: ; 4d9d3
+PrintTodaysLuckyNumber:
 	ld hl, wStringBuffer3
 	ld de, wLuckyIDNumber
 	lb bc, PRINTNUM_LEADINGZEROS | 2, 5
diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm
index 8d835960f..7fe8adba7 100644
--- a/engine/events/magikarp.asm
+++ b/engine/events/magikarp.asm
@@ -1,4 +1,4 @@
-Special_CheckMagikarpLength: ; fbb32
+CheckMagikarpLength:
 	; Returns 3 if you select a Magikarp that beats the previous record.
 	; Returns 2 if you select a Magikarp, but the current record is longer.
 	; Returns 1 if you press B in the Pokemon selection menu.
@@ -70,27 +70,23 @@ Special_CheckMagikarpLength: ; fbb32
 	xor a ; MAGIKARPLENGTH_NOT_MAGIKARP
 	ld [wScriptVar], a
 	ret
-; fbba9
 
-.MeasureItText: ; 0xfbba9
+.MeasureItText:
 	; Let me measure that MAGIKARP. …Hm, it measures @ .
 	text_jump UnknownText_0x1c1203
 	db "@"
-; 0xfbbae
 
-Magikarp_LoadFeetInchesChars: ; fbbae
+Magikarp_LoadFeetInchesChars:
 	ld hl, vTiles2 tile "′" ; $6e
 	ld de, .feetinchchars
 	lb bc, BANK(.feetinchchars), 2
 	call Request2bpp
 	ret
-; fbbbb
 
-.feetinchchars ; fbbb
+.feetinchchars
 INCBIN "gfx/font/feet_inches.2bpp"
-; fbbdb
 
-PrintMagikarpLength: ; fbbdb
+PrintMagikarpLength:
 	call Magikarp_LoadFeetInchesChars
 	ld hl, wStringBuffer1
 	ld de, wMagikarpLength
@@ -105,9 +101,8 @@ PrintMagikarpLength: ; fbbdb
 	inc hl
 	ld [hl], "@"
 	ret
-; fbbfc
 
-CalcMagikarpLength: ; fbbfc
+CalcMagikarpLength:
 ; Return Magikarp's length (in feet and inches) at wMagikarpLength (big endian).
 ;
 ; input:
@@ -144,7 +139,6 @@ CalcMagikarpLength: ; fbbfc
 ; if b = 252-253:  x = 65210,  y =   5,  z = 13
 ; if b = 254:      x = 65410,  y =   2,  z = 14
 
-
 	; bc = rrc(dv[0]) ++ rrc(dv[1]) ^ rrc(id)
 
 	; id
@@ -189,7 +183,7 @@ CalcMagikarpLength: ; fbbfc
 
 .no
 
-	ld hl, .Lengths
+	ld hl, MagikarpLengths
 	ld a, 2
 	ld [wd265], a
 
@@ -283,9 +277,8 @@ CalcMagikarpLength: ; fbbfc
 	inc hl
 	ld [hl], e ; in
 	ret
-; fbc9a
 
-.BCLessThanDE: ; fbc9a
+.BCLessThanDE:
 ; Intention: Return bc < de.
 ; Reality: Return b < d.
 	ld a, b
@@ -295,9 +288,8 @@ CalcMagikarpLength: ; fbbfc
 	ld a, c
 	cp e
 	ret
-; fbca1
 
-.BCMinusDE: ; fbca1
+.BCMinusDE:
 ; bc -= de
 	ld a, c
 	sub e
@@ -306,32 +298,10 @@ CalcMagikarpLength: ; fbbfc
 	sbc d
 	ld b, a
 	ret
-; fbca8
-
-.Lengths: ; fbca8
-; [wMagikarpLength] = z * 100 + (bc - x) / y
-; First argument is the bc threshold as well as x.
-; Second argument is y.
-; In reality, due to the bug at .BCLessThanDE, the threshold is determined by only register b.
-	dwb   110, 1 ; not used unless the bug is fixed
-	dwb   310, 2
-	dwb   710, 4
-	dwb  2710, 20
-	dwb  7710, 50
-	dwb 17710, 100
-	dwb 32710, 150
-	dwb 47710, 150
-	dwb 57710, 100
-	dwb 62710, 50
-	dwb 64710, 20
-	dwb 65210, 5
-	dwb 65410, 2
-	dwb 65510, 1 ; not used
-; fbcd2
-
-
-
-Special_MagikarpHouseSign: ; fbcd2
+
+INCLUDE "data/events/magikarp_lengths.asm"
+
+MagikarpHouseSign:
 	ld a, [wBestMagikarpLengthFeet]
 	ld [wMagikarpLength], a
 	ld a, [wBestMagikarpLengthInches]
@@ -340,10 +310,8 @@ Special_MagikarpHouseSign: ; fbcd2
 	ld hl, .CurrentRecordtext
 	call PrintText
 	ret
-; fbce8
 
-.CurrentRecordtext: ; 0xfbce8
+.CurrentRecordtext:
 	; "CURRENT RECORD"
 	text_jump UnknownText_0x1c123a
 	db "@"
-; 0xfbced
diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm
index ed7caf218..010983627 100755..100644
--- a/engine/events/magnet_train.asm
+++ b/engine/events/magnet_train.asm
@@ -1,4 +1,4 @@
-Special_MagnetTrain: ; 8cc04
+MagnetTrain:
 	ld a, [wScriptVar]
 	and a
 	jr nz, .ToGoldenrod
@@ -81,9 +81,8 @@ Special_MagnetTrain: ; 8cc04
 	pop af
 	ld [rSVBK], a
 	ret
-; 8cc99
 
-MagnetTrain_UpdateLYOverrides: ; 8cc99
+MagnetTrain_UpdateLYOverrides:
 	ld hl, wLYOverridesBackup
 	ld c, $2f
 	ld a, [wMagnetTrainOffset]
@@ -111,9 +110,8 @@ MagnetTrain_UpdateLYOverrides: ; 8cc99
 	dec c
 	jr nz, .loadloop
 	ret
-; 8ccc9
 
-MagntTrain_LoadGFX_PlayMusic: ; 8ccc9
+MagntTrain_LoadGFX_PlayMusic:
 	call ClearBGPalettes
 	call ClearSprites
 	call DisableLCD
@@ -155,9 +153,8 @@ MagntTrain_LoadGFX_PlayMusic: ; 8ccc9
 	ld de, MUSIC_MAGNET_TRAIN
 	call PlayMusic2
 	ret
-; 8cd27
 
-DrawMagnetTrain: ; 8cd27
+DrawMagnetTrain:
 	hlbgcoord 0, 0
 	xor a
 .loop
@@ -184,18 +181,16 @@ DrawMagnetTrain: ; 8cd27
 	ld c, 20
 	call .FillLine
 	ret
-; 8cd65
 
-.FillLine: ; 8cd65
+.FillLine:
 	ld a, [de]
 	inc de
 	ld [hli], a
 	dec c
 	jr nz, .FillLine
 	ret
-; 8cd6c
 
-.FillAlt: ; 8cd6c
+.FillAlt:
 	ld [hl], e
 	inc hl
 	ld [hl], d
@@ -203,9 +198,8 @@ DrawMagnetTrain: ; 8cd27
 	dec b
 	jr nz, .FillAlt
 	ret
-; 8cd74
 
-GetMagnetTrainBGTiles: ; 8cd74
+GetMagnetTrainBGTiles:
 	push hl
 	ld e, a
 	ld d, 0
@@ -217,9 +211,8 @@ GetMagnetTrainBGTiles: ; 8cd74
 	ld d, [hl]
 	pop hl
 	ret
-; 8cd82
 
-MagnetTrainBGTiles: ; 8cd82
+MagnetTrainBGTiles:
 ; Alternating tiles for each line of the Magnet Train tilemap.
 	db $4c, $4d ; bush
 	db $5c, $5d ; bush
@@ -239,9 +232,8 @@ MagnetTrainBGTiles: ; 8cd82
 	db $5c, $5d ; bush
 	db $4c, $4d ; bush
 	db $5c, $5d ; bush
-; 8cda6
 
-MagnetTrain_InitLYOverrides: ; 8cda6
+MagnetTrain_InitLYOverrides:
 	ld hl, wLYOverrides
 	ld bc, wLYOverridesEnd - wLYOverrides
 	ld a, [wMagnetTrainInitPosition]
@@ -253,9 +245,8 @@ MagnetTrain_InitLYOverrides: ; 8cda6
 	ld a, rSCX - $ff00
 	ld [hLCDCPointer], a
 	ret
-; 8cdc3
 
-SetMagnetTrainPals: ; 8cdc3
+SetMagnetTrainPals:
 	ld a, $1
 	ld [rVBK], a
 
@@ -286,9 +277,8 @@ SetMagnetTrainPals: ; 8cdc3
 	ld a, $0
 	ld [rVBK], a
 	ret
-; 8cdf7
 
-MagnetTrain_Jumptable: ; 8cdf7
+MagnetTrain_Jumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -299,9 +289,8 @@ MagnetTrain_Jumptable: ; 8cdf7
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 8ce06
 
-.Jumptable: ; 8ce06
+.Jumptable:
 	dw .InitPlayerSpriteAnim
 	dw .WaitScene
 	dw .MoveTrain1
@@ -309,15 +298,13 @@ MagnetTrain_Jumptable: ; 8cdf7
 	dw .MoveTrain2
 	dw .WaitScene
 	dw .TrainArrived
-; 8ce14
 
-.Next: ; 8ce14
+.Next:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
-; 8ce19
 
-.InitPlayerSpriteAnim: ; 8ce19
+.InitPlayerSpriteAnim:
 	ld d, 10 * 8 + 5
 	ld a, [wMagnetTrainPlayerSpriteInitX]
 	ld e, a
@@ -327,7 +314,7 @@ MagnetTrain_Jumptable: ; 8cdf7
 	ld a, BANK(wPlayerGender)
 	ld [rSVBK], a
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .got_gender
 	ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
 
@@ -343,9 +330,8 @@ MagnetTrain_Jumptable: ; 8cdf7
 	ld a, $80
 	ld [wMagnetTrainWaitCounter], a
 	ret
-; 8ce47
 
-.MoveTrain1: ; 8ce47
+.MoveTrain1:
 	ld hl, wMagnetTrainHoldPosition
 	ld a, [wMagnetTrainPosition]
 	cp [hl]
@@ -367,9 +353,8 @@ MagnetTrain_Jumptable: ; 8cdf7
 	ld a, $80
 	ld [wMagnetTrainWaitCounter], a
 	ret
-; 8ce6d
 
-.WaitScene: ; 8ce6d
+.WaitScene:
 	ld hl, wMagnetTrainWaitCounter
 	ld a, [hl]
 	and a
@@ -380,9 +365,8 @@ MagnetTrain_Jumptable: ; 8cdf7
 .DoneWaiting:
 	call .Next
 	ret
-; 8ce7a
 
-.MoveTrain2: ; 8ce7a
+.MoveTrain2:
 	ld hl, wMagnetTrainFinalPosition
 	ld a, [wMagnetTrainPosition]
 	cp [hl]
@@ -410,17 +394,15 @@ MagnetTrain_Jumptable: ; 8cdf7
 .PrepareToFinishAnim:
 	call .Next
 	ret
-; 8cea2
 
-.TrainArrived: ; 8cea2
+.TrainArrived:
 	ld a, $80
 	ld [wJumptableIndex], a
 	ld de, SFX_TRAIN_ARRIVED
 	call PlaySFX
 	ret
-; 8ceae
 
-MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae
+MagnetTrain_Jumptable_FirstRunThrough:
 	farcall PlaySpriteAnimations
 	call MagnetTrain_Jumptable
 	call MagnetTrain_UpdateLYOverrides
@@ -455,7 +437,6 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae
 	pop af
 	ld [rSVBK], a
 	ret
-; 8ceff
 
 MagnetTrainTilemap1:
 	db $1f, $05, $06, $0a, $0a, $0a, $09, $0a, $0a, $0a, $0a, $0a, $0a, $09, $0a, $0a, $0a, $0b, $0c, $1f
@@ -465,4 +446,3 @@ MagnetTrainTilemap3:
 	db $24, $25, $26, $27, $07, $2f, $29, $28, $28, $28, $28, $28, $28, $29, $07, $2f, $2a, $2b, $2c, $2d
 MagnetTrainTilemap4:
 	db $20, $1f, $2e, $1f, $17, $00, $2e, $1f, $1f, $1f, $1f, $1f, $1f, $2e, $17, $00, $1f, $2e, $1f, $0f
-; 8cf4f
diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm
index b97d40798..859f30034 100644
--- a/engine/events/map_name_sign.asm
+++ b/engine/events/map_name_sign.asm
@@ -1,14 +1,13 @@
 MAP_NAME_SIGN_START EQU $60
 
-ReturnFromMapSetupScript:: ; b8000
+ReturnFromMapSetupScript::
 	xor a
 	ld [hBGMapMode], a
 	farcall .inefficient_farcall ; this is a waste of 6 ROM bytes and 6 stack bytes
 	ret
-; b800a
 
 ; should have just been a fallthrough
-.inefficient_farcall ; b800a
+.inefficient_farcall
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
@@ -57,9 +56,8 @@ ReturnFromMapSetupScript:: ; b8000
 	xor a
 	ld [hLCDCPointer], a
 	ret
-; b8064
 
-.CheckMovingWithinLandmark: ; b8064
+.CheckMovingWithinLandmark:
 	ld a, [wCurrentLandmark]
 	ld c, a
 	ld a, [wPreviousLandmark]
@@ -67,9 +65,8 @@ ReturnFromMapSetupScript:: ; b8000
 	ret z
 	cp SPECIAL_MAP
 	ret
-; b8070
 
-.CheckSpecialMap: ; b8070
+.CheckSpecialMap:
 ; These landmarks do not get pop-up signs.
 	cp -1
 	ret z
@@ -85,12 +82,11 @@ ReturnFromMapSetupScript:: ; b8000
 	ret z
 	cp POWER_PLANT
 	ret z
-	ld a, $1
+	ld a, 1
 	and a
 	ret
-; b8089
 
-.CheckNationalParkGate: ; b8089
+.CheckNationalParkGate:
 	ld a, [wMapGroup]
 	cp GROUP_ROUTE_35_NATIONAL_PARK_GATE
 	ret nz
@@ -99,10 +95,8 @@ ReturnFromMapSetupScript:: ; b8000
 	ret z
 	cp MAP_ROUTE_36_NATIONAL_PARK_GATE
 	ret
-; b8098
 
-
-PlaceMapNameSign:: ; b8098 (2e:4098)
+PlaceMapNameSign::
 	ld hl, wLandmarkSignTimer
 	ld a, [hl]
 	and a
@@ -130,26 +124,22 @@ PlaceMapNameSign:: ; b8098 (2e:4098)
 	ld [hLCDCPointer], a
 	ret
 
-
-LoadMapNameSignGFX: ; b80c6
+LoadMapNameSignGFX:
 	ld de, MapEntryFrameGFX
 	ld hl, vTiles2 tile MAP_NAME_SIGN_START
 	lb bc, BANK(MapEntryFrameGFX), 14
 	call Get2bpp
 	ret
-; b80d3
 
-InitMapNameFrame: ; b80d3
+InitMapNameFrame:
 	hlcoord 0, 0
 	ld b, 2
 	ld c, 18
 	call InitMapSignAttrMap
 	call PlaceMapNameFrame
 	ret
-; b80e1
 
-
-PlaceMapNameCenterAlign: ; b80e1 (2e:40e1)
+PlaceMapNameCenterAlign:
 	ld a, [wCurrentLandmark]
 	ld e, a
 	farcall GetLandmarkName
@@ -165,7 +155,7 @@ PlaceMapNameCenterAlign: ; b80e1 (2e:40e1)
 	call PlaceString
 	ret
 
-.GetNameLength: ; b8101 (2e:4101)
+.GetNameLength:
 	ld c, 0
 	push hl
 	ld hl, wStringBuffer1
@@ -181,8 +171,7 @@ PlaceMapNameCenterAlign: ; b80e1 (2e:40e1)
 	pop hl
 	ret
 
-
-InitMapSignAttrMap: ; b8115
+InitMapSignAttrMap:
 	ld de, wAttrMap - wTileMap
 	add hl, de
 	inc b
@@ -204,9 +193,8 @@ InitMapSignAttrMap: ; b8115
 	dec b
 	jr nz, .loop
 	ret
-; b812f
 
-PlaceMapNameFrame: ; b812f
+PlaceMapNameFrame:
 	hlcoord 0, 0
 	; top left
 	ld a, MAP_NAME_SIGN_START + 1
@@ -243,9 +231,8 @@ PlaceMapNameFrame: ; b812f
 	ld a, MAP_NAME_SIGN_START + 10
 	ld [hl], a
 	ret
-; b815b
 
-.FillMiddle: ; b815b
+.FillMiddle:
 	ld c, SCREEN_WIDTH - 2
 	ld a, MAP_NAME_SIGN_START + 13
 .loop
@@ -253,9 +240,8 @@ PlaceMapNameFrame: ; b812f
 	dec c
 	jr nz, .loop
 	ret
-; b8164
 
-.FillTopBottom: ; b8164
+.FillTopBottom:
 	ld c, 5
 	jr .enterloop
 
@@ -271,4 +257,3 @@ PlaceMapNameFrame: ; b812f
 	dec c
 	jr nz, .continueloop
 	ret
-; b8172
diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm
index 4e4d5dc86..f88e72c45 100755..100644
--- a/engine/events/misc_scripts.asm
+++ b/engine/events/misc_scripts.asm
@@ -1,12 +1,12 @@
-Script_AbortBugContest: ; 0x122c1
+Script_AbortBugContest:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iffalse .finish
 	setflag ENGINE_DAILY_BUG_CONTEST
-	special Special_ContestReturnMons
+	special ContestReturnMons
 .finish
 	end
 
-FindItemInBallScript:: ; 0x122ce
+FindItemInBallScript::
 	callasm .TryReceiveItem
 	iffalse .no_room
 	disappear LAST_TALKED
@@ -17,9 +17,8 @@ FindItemInBallScript:: ; 0x122ce
 	itemnotify
 	closetext
 	end
-; 0x122e3
 
-.no_room ; 0x122e3
+.no_room
 	opentext
 	writetext .text_found
 	waitbutton
@@ -27,21 +26,18 @@ FindItemInBallScript:: ; 0x122ce
 	waitbutton
 	closetext
 	end
-; 0x122ee
 
-.text_found ; 0x122ee
+.text_found
 	; found @ !
 	text_jump UnknownText_0x1c0a1c
 	db "@"
-; 0x122f3
 
-.text_bag_full ; 0x122f3
+.text_bag_full
 	; But   can't carry any more items.
 	text_jump UnknownText_0x1c0a2c
 	db "@"
-; 0x122f8
 
-.TryReceiveItem: ; 122f8
+.TryReceiveItem:
 	xor a
 	ld [wScriptVar], a
 	ld a, [wEngineBuffer1]
@@ -59,4 +55,3 @@ FindItemInBallScript:: ; 0x122ce
 	ld a, $1
 	ld [wScriptVar], a
 	ret
-; 12324
diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm
index dd705b547..cb26ce12e 100644
--- a/engine/events/misc_scripts_2.asm
+++ b/engine/events/misc_scripts_2.asm
@@ -1,16 +1,16 @@
-RepelWoreOffScript:: ; 0x13619
+RepelWoreOffScript::
 	opentext
 	writetext .text
 	waitbutton
 	closetext
 	end
 
-.text ; 0x13620
+.text
 	; REPEL's effect wore off.
 	text_jump UnknownText_0x1bd308
 	db "@"
 
-HiddenItemScript:: ; 0x13625
+HiddenItemScript::
 	opentext
 	copybytetovar wEngineBuffer3
 	itemtotext USE_SCRIPT_VAR, MEM_BUFFER_0
@@ -22,26 +22,26 @@ HiddenItemScript:: ; 0x13625
 	itemnotify
 	jump .finish
 
-.bag_full ; 0x1363e
+.bag_full
 	buttonsound
 	writetext .no_room_text
 	waitbutton
 
-.finish ; 13643
+.finish
 	closetext
 	end
 
-.found_text ; 0x13645
+.found_text
 	; found @ !
 	text_jump UnknownText_0x1bd321
 	db "@"
 
-.no_room_text ; 0x1364a
+.no_room_text
 	; But   has no space left…
 	text_jump UnknownText_0x1bd331
 	db "@"
 
-SetMemEvent: ; 1364f
+SetMemEvent:
 	ld hl, wEngineBuffer1
 	ld a, [hli]
 	ld d, [hl]
diff --git a/engine/events/mom.asm b/engine/events/mom.asm
index fbda552ad..adaee701f 100644
--- a/engine/events/mom.asm
+++ b/engine/events/mom.asm
@@ -1,4 +1,4 @@
-Special_BankOfMom: ; 16218
+BankOfMom:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -16,9 +16,8 @@ Special_BankOfMom: ; 16218
 	pop af
 	ld [hInMenu], a
 	ret
-; 16233
 
-.RunJumptable: ; 16233
+.RunJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -29,9 +28,8 @@ Special_BankOfMom: ; 16218
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 16242
 
-.dw ; 16242
+.dw
 
 	dw .CheckIfBankInitialized
 	dw .InitializeBank
@@ -42,13 +40,12 @@ Special_BankOfMom: ; 16218
 	dw .StopOrStartSavingMoney
 	dw .AskDST
 	dw .JustDoWhatYouCan
-; 16254
 
-.CheckIfBankInitialized: ; 16254
+.CheckIfBankInitialized:
 	ld a, [wMomSavingMoney]
-	bit 7, a
+	bit MOM_ACTIVE_F, a
 	jr nz, .savingmoneyalready
-	set 7, a
+	set MOM_ACTIVE_F, a
 	ld [wMomSavingMoney], a
 	ld a, $1
 	jr .done_0
@@ -59,20 +56,19 @@ Special_BankOfMom: ; 16218
 .done_0
 	ld [wJumptableIndex], a
 	ret
-; 1626a
 
-.InitializeBank: ; 1626a
+.InitializeBank:
 	ld hl, UnknownText_0x16649
 	call PrintText
 	call YesNoBox
 	jr c, .DontSaveMoney
 	ld hl, UnknownText_0x1664e
 	call PrintText
-	ld a, %10000001
+	ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F)
 	jr .done_1
 
 .DontSaveMoney:
-	ld a, %10000000
+	ld a, 1 << MOM_ACTIVE_F
 
 .done_1
 	ld [wMomSavingMoney], a
@@ -81,9 +77,8 @@ Special_BankOfMom: ; 16218
 	ld a, $8
 	ld [wJumptableIndex], a
 	ret
-; 16290
 
-.IsThisAboutYourMoney: ; 16290
+.IsThisAboutYourMoney:
 	ld hl, UnknownText_0x16658
 	call PrintText
 	call YesNoBox
@@ -98,14 +93,13 @@ Special_BankOfMom: ; 16218
 .done_2
 	ld [wJumptableIndex], a
 	ret
-; 162a8
 
-.AccessBankOfMom: ; 162a8
+.AccessBankOfMom:
 	ld hl, UnknownText_0x1665d
 	call PrintText
-	call LoadStandardMenuDataHeader
-	ld hl, MenuDataHeader_0x166b5
-	call CopyMenuDataHeader
+	call LoadStandardMenuHeader
+	ld hl, MenuHeader_0x166b5
+	call CopyMenuHeader
 	call VerticalMenu
 	call CloseWindow
 	jr c, .cancel
@@ -135,9 +129,8 @@ Special_BankOfMom: ; 16218
 .done_3
 	ld [wJumptableIndex], a
 	ret
-; 162e0
 
-.StoreMoney: ; 162e0
+.StoreMoney:
 	ld hl, UnknownText_0x16662
 	call PrintText
 	xor a
@@ -145,9 +138,9 @@ Special_BankOfMom: ; 16218
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld a, $5
+	ld a, 5
 	ld [wMomBankDigitCursorPosition], a
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call Mom_SetUpDepositMenu
 	call Mom_Wait10Frames
 	call Mom_WithdrawDepositMenuJoypad
@@ -202,9 +195,8 @@ Special_BankOfMom: ; 16218
 .done_4
 	ld [wJumptableIndex], a
 	ret
-; 16373
 
-.TakeMoney: ; 16373
+.TakeMoney:
 	ld hl, UnknownText_0x16667
 	call PrintText
 	xor a
@@ -212,9 +204,9 @@ Special_BankOfMom: ; 16218
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld a, $5
+	ld a, 5
 	ld [wMomBankDigitCursorPosition], a
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call Mom_SetUpWithdrawMenu
 	call Mom_Wait10Frames
 	call Mom_WithdrawDepositMenuJoypad
@@ -269,14 +261,13 @@ Special_BankOfMom: ; 16218
 .done_5
 	ld [wJumptableIndex], a
 	ret
-; 16406
 
-.StopOrStartSavingMoney: ; 16406
+.StopOrStartSavingMoney:
 	ld hl, UnknownText_0x1666c
 	call PrintText
 	call YesNoBox
 	jr c, .StopSavingMoney
-	ld a, $81
+	ld a, (1 << MOM_ACTIVE_F) | (1 << MOM_SAVING_SOME_MONEY_F)
 	ld [wMomSavingMoney], a
 	ld hl, UnknownText_0x16685
 	call PrintText
@@ -285,24 +276,22 @@ Special_BankOfMom: ; 16218
 	ret
 
 .StopSavingMoney:
-	ld a, $80
+	ld a, 1 << MOM_ACTIVE_F
 	ld [wMomSavingMoney], a
 	ld a, $7
 	ld [wJumptableIndex], a
 	ret
-; 1642d
 
-.AskDST: ; 1642d
+.AskDST:
 	ld hl, UnknownText_0x16694
 	call PrintText
 
-.JustDoWhatYouCan: ; 16433
+.JustDoWhatYouCan:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
-; 16439
 
-DSTChecks: ; 16439
+DSTChecks:
 ; check the time; avoid changing DST if doing so would change the current day
 	ld a, [wDST]
 	bit 7, a
@@ -364,9 +353,8 @@ DSTChecks: ; 16439
 	ld hl, .Text_SetClockForward
 	call PlaceHLTextAtBC
 	ret
-; 164b9
 
-.SetClockForward: ; 164b9
+.SetClockForward:
 	ld a, [wStartHour]
 	add 1
 	sub 24
@@ -379,9 +367,8 @@ DSTChecks: ; 16439
 	adc 0
 	ld [wStartDay], a
 	ret
-; 164d1
 
-.SetClockBack: ; 164d1
+.SetClockBack:
 	ld a, [wStartHour]
 	sub 1
 	jr nc, .DontLoopHourBack
@@ -395,59 +382,51 @@ DSTChecks: ; 16439
 .DontLoopDayBack:
 	ld [wStartDay], a
 	ret
-; 164ea
 
-.ClearBox: ; 164ea
+.ClearBox:
 	hlcoord 1, 14
 	lb bc, 3, 18
 	call ClearBox
 	ret
-; 164f4
 
-.Text_AdjustClock: ; 0x164f4
+.Text_AdjustClock:
 	; Do you want to adjust your clock for Daylight Saving Time?
 	text_jump UnknownText_0x1c6095
 	db "@"
-; 0x164f9
 
-.Text_LostInstructionBooklet: ; 0x164f9
+.Text_LostInstructionBooklet:
 	; I lost the instruction booklet for the POKéGEAR.
 	; Come back again in a while.
 	text_jump UnknownText_0x1c60d1
 	db "@"
-; 0x164fe
 
-.Text_SwitchToDST: ; 0x164fe
+.Text_SwitchToDST:
 	; Do you want to switch to Daylight Saving Time?
 	text_jump UnknownText_0x1c6000
 	db "@"
-; 0x16503
 
-.Text_SetClockForward: ; 0x16503
+.Text_SetClockForward:
 	; I set the clock forward by one hour.
 	text_jump UnknownText_0x1c6030
 	db "@"
-; 0x16508
 
-.Text_IsDSTOver: ; 0x16508
+.Text_IsDSTOver:
 	; Is Daylight Saving Time over?
 	text_jump UnknownText_0x1c6056
 	db "@"
-; 0x1650d
 
-.Text_SetClockBack: ; 0x1650d
+.Text_SetClockBack:
 	; I put the clock back one hour.
 	text_jump UnknownText_0x1c6075
 	db "@"
-; 0x16512
 
-Mom_SetUpWithdrawMenu: ; 16512
+Mom_SetUpWithdrawMenu:
 	ld de, Mon_WithdrawString
 	jr Mom_ContinueMenuSetup
 
-Mom_SetUpDepositMenu: ; 16517
+Mom_SetUpDepositMenu:
 	ld de, Mom_DepositString
-Mom_ContinueMenuSetup: ; 1651a
+Mom_ContinueMenuSetup:
 	push de
 	xor a
 	ld [hBGMapMode], a
@@ -478,15 +457,13 @@ Mom_ContinueMenuSetup: ; 1651a
 	call UpdateSprites
 	call CGBOnly_CopyTilemapAtOnce
 	ret
-; 1656b
 
-Mom_Wait10Frames: ; 1656b
+Mom_Wait10Frames:
 	ld c, 10
 	call DelayFrames
 	ret
-; 16571
 
-Mom_WithdrawDepositMenuJoypad: ; 16571
+Mom_WithdrawDepositMenuJoypad:
 .loop
 	call JoyTextDelay
 	ld hl, hJoyPressed
@@ -590,9 +567,8 @@ Mom_WithdrawDepositMenuJoypad: ; 16571
 	add hl, de
 	pop de
 	ret
-; 16613
 
-.DigitQuantities: ; 16613
+.DigitQuantities:
 	dt 100000
 	dt 10000
 	dt 1000
@@ -613,132 +589,109 @@ Mom_WithdrawDepositMenuJoypad: ; 16571
 	dt 900
 	dt 90
 	dt 9
-; 16649
 
-UnknownText_0x16649: ; 0x16649
+UnknownText_0x16649:
 	; Wow, that's a cute #MON. Where did you get it? … So, you're leaving on an adventure… OK! I'll help too. But what can I do for you? I know! I'll save money for you. On a long journey, money's important. Do you want me to save your money?
 	text_jump UnknownText_0x1bd77f
 	db "@"
-; 0x1664e
 
-UnknownText_0x1664e: ; 0x1664e
+UnknownText_0x1664e:
 	; OK, I'll take care of your money.
 	text_jump UnknownText_0x1bd868
 	db "@"
-; 0x16653
 
-UnknownText_0x16653: ; 0x16653
+UnknownText_0x16653:
 	; Be careful. #MON are your friends. You need to work as a team. Now, go on!
 	text_jump UnknownText_0x1bd88e
 	db "@"
-; 0x16658
 
-UnknownText_0x16658: ; 0x16658
+UnknownText_0x16658:
 	; Hi! Welcome home! You're trying very hard, I see. I've kept your room tidy. Or is this about your money?
 	text_jump UnknownText_0x1bd8da
 	db "@"
-; 0x1665d
 
-UnknownText_0x1665d: ; 0x1665d
+UnknownText_0x1665d:
 	; What do you want to do?
 	text_jump UnknownText_0x1bd942
 	db "@"
-; 0x16662
 
-UnknownText_0x16662: ; 0x16662
+UnknownText_0x16662:
 	; How much do you want to save?
 	text_jump UnknownText_0x1bd95b
 	db "@"
-; 0x16667
 
-UnknownText_0x16667: ; 0x16667
+UnknownText_0x16667:
 	; How much do you want to take?
 	text_jump UnknownText_0x1bd97a
 	db "@"
-; 0x1666c
 
-UnknownText_0x1666c: ; 0x1666c
+UnknownText_0x1666c:
 	; Do you want to save some money?
 	text_jump UnknownText_0x1bd999
 	db "@"
-; 0x16671
 
-UnknownText_0x16671: ; 0x16671
+UnknownText_0x16671:
 	; You haven't saved that much.
 	text_jump UnknownText_0x1bd9ba
 	db "@"
-; 0x16676
 
-UnknownText_0x16676: ; 0x16676
+UnknownText_0x16676:
 	; You can't take that much.
 	text_jump UnknownText_0x1bd9d7
 	db "@"
-; 0x1667b
 
-UnknownText_0x1667b: ; 0x1667b
+UnknownText_0x1667b:
 	; You don't have that much.
 	text_jump UnknownText_0x1bd9f1
 	db "@"
-; 0x16680
 
-UnknownText_0x16680: ; 0x16680
+UnknownText_0x16680:
 	; You can't save that much.
 	text_jump UnknownText_0x1bda0b
 	db "@"
-; 0x16685
 
-UnknownText_0x16685: ; 0x16685
+UnknownText_0x16685:
 	; OK, I'll save your money. Trust me! , stick with it!
 	text_jump UnknownText_0x1bda25
 	db "@"
-; 0x1668a
 
-UnknownText_0x1668a: ; 0x1668a
+UnknownText_0x1668a:
 	; Your money's safe here! Get going!
 	text_jump UnknownText_0x1bda5b
 	db "@"
-; 0x1668f
 
-UnknownText_0x1668f: ; 0x1668f
+UnknownText_0x1668f:
 	; , don't give up!
 	text_jump UnknownText_0x1bda7e
 	db "@"
-; 0x16694
 
-UnknownText_0x16694: ; 0x16694
+UnknownText_0x16694:
 	; Just do what you can.
 	text_jump UnknownText_0x1bda90
 	db "@"
-; 0x16699
 
-Mom_SavedString: ; 16699
+Mom_SavedString:
 	db "SAVED@"
-; 1669f
 
-Mon_WithdrawString: ; 1669f
+Mon_WithdrawString:
 	db "WITHDRAW@"
-; 166a8
 
-Mom_DepositString: ; 166a8
+Mom_DepositString:
 	db "DEPOSIT@"
-; 166b0
 
-Mom_HeldString: ; 166b0
+Mom_HeldString:
 	db "HELD@"
-; 166b5
 
-MenuDataHeader_0x166b5: ; 0x166b5
+MenuHeader_0x166b5:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, 10
-	dw MenuData2_0x166bd
+	dw MenuData_0x166bd
 	db 1 ; default option
-; 0x166bd
 
-MenuData2_0x166bd: ; 0x166bd
+MenuData_0x166bd:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "GET@"
 	db "SAVE@"
 	db "CHANGE@"
 	db "CANCEL@"
-; 0x166d6
diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm
index 0b35fdb30..dc10ede35 100755..100644
--- a/engine/events/mom_phone.asm
+++ b/engine/events/mom_phone.asm
@@ -1,11 +1,11 @@
-NUM_MOM_ITEMS_1 EQUS "((MomItems_1End - MomItems_1) / 8)"
-NUM_MOM_ITEMS_2 EQUS "((MomItems_2End - MomItems_2) / 8)"
+NUM_MOM_ITEMS_1 EQUS "((MomItems_1.End - MomItems_1) / 8)"
+NUM_MOM_ITEMS_2 EQUS "((MomItems_2.End - MomItems_2) / 8)"
 
 const_value = 1
 	const MOM_ITEM
 	const MOM_DOLL
 
-MomTriesToBuySomething:: ; fcfec
+MomTriesToBuySomething::
 	ld a, [wMapReentryScriptQueueFlag]
 	and a
 	ret nz
@@ -23,14 +23,12 @@ MomTriesToBuySomething:: ; fcfec
 	farcall LoadScriptBDE
 	scf
 	ret
-; fd00f
 
-.Script: ; 0xfd00f
+.Script:
 	callasm .ASMFunction
 	farjump Script_ReceivePhoneCall
-; 0xfd017
 
-.ASMFunction: ; fd017
+.ASMFunction:
 	call MomBuysItem_DeductFunds
 	call Mom_GetScriptPointer
 	ld a, [wWhichMomItemSet]
@@ -56,9 +54,8 @@ MomTriesToBuySomething:: ; fcfec
 	ld a, d
 	ld [hl], a
 	ret
-; fd044
 
-CheckBalance_MomItem2: ; fd044
+CheckBalance_MomItem2:
 	ld a, [wWhichMomItem]
 	cp NUM_MOM_ITEMS_2
 	jr nc, .nope
@@ -115,10 +112,8 @@ CheckBalance_MomItem2: ; fd044
 	ld bc, hMoneyTemp
 	farcall AddMoney
 	ret
-; fd0a6
 
-
-MomBuysItem_DeductFunds: ; fd0a6 (3f:50a6)
+MomBuysItem_DeductFunds:
 	call GetItemFromMom
 	ld de, 3 ; cost
 	add hl, de
@@ -133,8 +128,7 @@ MomBuysItem_DeductFunds: ; fd0a6 (3f:50a6)
 	farcall TakeMoney
 	ret
 
-
-Mom_GiveItemOrDoll: ; fd0c3
+Mom_GiveItemOrDoll:
 	call GetItemFromMom
 	ld de, 6 ; item type
 	add hl, de
@@ -156,10 +150,8 @@ Mom_GiveItemOrDoll: ; fd0c3
 	ld hl, wPCItems
 	call ReceiveItem
 	ret
-; fd0eb
 
-
-Mom_GetScriptPointer: ; fd0eb (3f:50eb)
+Mom_GetScriptPointer:
 	call GetItemFromMom
 	ld de, 6 ; item type
 	add hl, de
@@ -169,26 +161,22 @@ Mom_GetScriptPointer: ; fd0eb (3f:50eb)
 	ret z
 	ld de, .DollScript
 	ret
-; fd0fd (3f:50fd)
 
-.ItemScript: ; 0xfd0fd
+.ItemScript:
 	writetext _MomText_HiHowAreYou
 	writetext _MomText_FoundAnItem
 	writetext _MomText_BoughtWithYourMoney
 	writetext _MomText_ItsInPC
 	end
-; 0xfd10a
 
-.DollScript: ; 0xfd10a
+.DollScript:
 	writetext _MomText_HiHowAreYou
 	writetext _MomText_FoundADoll
 	writetext _MomText_BoughtWithYourMoney
 	writetext _MomText_ItsInRoom
 	end
-; 0xfd117
-
 
-GetItemFromMom: ; fd117
+GetItemFromMom:
 	ld a, [wWhichMomItemSet]
 	and a
 	jr z, .zero
@@ -213,52 +201,44 @@ rept 3 ; multiply hl by 8
 endr
 	add hl, de
 	ret
-; fd136
 
 INCLUDE "data/items/mom_phone.asm"
 
 	db 0, 0, 0 ; unused
 
-_MomText_HiHowAreYou: ; 0xfd1b1
+_MomText_HiHowAreYou:
 	; Hi,  ! How are you?
 	text_jump UnknownText_0x1bc615
 	db "@"
-; 0xfd1b6
 
-_MomText_FoundAnItem: ; 0xfd1b6
+_MomText_FoundAnItem:
 	; I found a useful item shopping, so
 	text_jump UnknownText_0x1bc62a
 	db "@"
-; 0xfd1bb
 
-_MomText_BoughtWithYourMoney: ; 0xfd1bb
+_MomText_BoughtWithYourMoney:
 	; I bought it with your money. Sorry!
 	text_jump UnknownText_0x1bc64e
 	db "@"
-; 0xfd1c0
 
-_MomText_ItsInPC: ; 0xfd1c0
+_MomText_ItsInPC:
 	; It's in your PC. You'll like it!
 	text_jump UnknownText_0x1bc673
 	db "@"
-; 0xfd1c5
 
-_MomText_FoundADoll: ; 0xfd1c5
+_MomText_FoundADoll:
 	; While shopping today, I saw this adorable doll, so
 	text_jump UnknownText_0x1bc693
 	db "@"
-; 0xfd1ca
 
-_MomText_ItsInRoom: ; 0xfd1ca
+_MomText_ItsInRoom:
 	; It's in your room. You'll love it!
 	text_jump UnknownText_0x1bc6c7
 	db "@"
-; 0xfd1cf
 
 	db 0 ; unused
 
-DummyPredef3A: ; fd1d0
+DummyPredef3A:
 	ret
-; fd1d1
 
 	ret ; unused
diff --git a/engine/money.asm b/engine/events/money.asm
index 585c85618..c8f9d058e 100755..100644
--- a/engine/money.asm
+++ b/engine/events/money.asm
@@ -1,4 +1,4 @@
-GiveMoney:: ; 15fd7
+GiveMoney::
 	ld a, 3
 	call AddMoney
 	ld bc, MaxMoney
@@ -21,14 +21,11 @@ GiveMoney:: ; 15fd7
 .not_maxed_out
 	and a
 	ret
-; 15ff7
 
-MaxMoney: ; 15ff7
+MaxMoney:
 	dt MAX_MONEY
-; 15ffa
 
-
-TakeMoney:: ; 15ffa
+TakeMoney::
 	ld a, 3
 	call SubtractMoney
 	jr nc, .okay
@@ -45,11 +42,10 @@ TakeMoney:: ; 15ffa
 .okay
 	and a
 	ret
-; 1600b
 
-CompareMoney:: ; 1600b
+CompareMoney::
 	ld a, 3
-CompareFunds: ; 1600d
+CompareFunds:
 ; a: number of bytes
 ; bc: start addr of amount (big-endian)
 ; de: start addr of account (big-endian)
@@ -94,11 +90,10 @@ CompareFunds: ; 1600d
 	pop de
 	pop hl
 	ret
-; 16035
 
-SubtractMoney: ; 16035
+SubtractMoney:
 	ld a, 3
-SubtractFunds: ; 16037
+SubtractFunds:
 ; a: number of bytes
 ; bc: start addr of amount (big-endian)
 ; de: start addr of account (big-endian)
@@ -130,11 +125,10 @@ SubtractFunds: ; 16037
 	pop de
 	pop hl
 	ret
-; 16053
 
-AddMoney: ; 16053
+AddMoney:
 	ld a, 3
-AddFunds: ; 16055
+AddFunds:
 ; a: number of bytes
 ; bc: start addr of amount (big-endian)
 ; de: start addr of account (big-endian)
@@ -167,9 +161,8 @@ AddFunds: ; 16055
 	pop de
 	pop hl
 	ret
-; 1606f
 
-GiveCoins:: ; 1606f
+GiveCoins::
 	ld a, 2
 	ld de, wCoins
 	call AddFunds
@@ -189,14 +182,11 @@ GiveCoins:: ; 1606f
 .not_maxed
 	and a
 	ret
-; 1608d
 
-.maxcoins ; 1608d
+.maxcoins
 	bigdw MAX_COINS
-; 1608f
-
 
-TakeCoins:: ; 1608f
+TakeCoins::
 	ld a, 2
 	ld de, wCoins
 	call SubtractFunds
@@ -212,10 +202,8 @@ TakeCoins:: ; 1608f
 .okay
 	and a
 	ret
-; 160a1
 
-CheckCoins:: ; 160a1
+CheckCoins::
 	ld a, 2
 	ld de, wCoins
 	jp CompareFunds
-; 160a9
diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm
index fad33e222..f2b827227 100644
--- a/engine/events/move_deleter.asm
+++ b/engine/events/move_deleter.asm
@@ -1,4 +1,4 @@
-Special_MoveDeletion:
+MoveDeletion:
 	ld hl, .IntroText
 	call PrintText
 	call YesNoBox
@@ -19,7 +19,7 @@ Special_MoveDeletion:
 	jr z, .onlyonemove
 	ld hl, .AskWhichMoveText
 	call PrintText
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	farcall ChooseMoveToDelete
 	push af
 	call ReturnToMapWithSpeechTextbox
@@ -59,55 +59,47 @@ Special_MoveDeletion:
 	call PrintText
 	ret
 
-.OnlyOneMoveText: ; 0x2c5d1
+.OnlyOneMoveText:
 	; That #MON knows only one move.
 	text_jump UnknownText_0x1c5eba
 	db "@"
-; 0x2c5d6
 
-.ConfirmDeleteText: ; 0x2c5d6
+.ConfirmDeleteText:
 	; Oh, make it forget @ ?
 	text_jump UnknownText_0x1c5eda
 	db "@"
-; 0x2c5db
 
-.MoveDeletedText: ; 0x2c5db
+.MoveDeletedText:
 	; Done! Your #MON forgot the move.
 	text_jump UnknownText_0x1c5ef5
 	db "@"
-; 0x2c5e0
 
-.EggText: ; 0x2c5e0
+.EggText:
 	; An EGG doesn't know any moves!
 	text_jump UnknownText_0x1c5f17
 	db "@"
-; 0x2c5e5
 
-.DeclinedDeletionText: ; 0x2c5e5
+.DeclinedDeletionText:
 	; No? Come visit me again.
 	text_jump UnknownText_0x1c5f36
 	db "@"
-; 0x2c5ea
 
-.AskWhichMoveText: ; 0x2c5ea
+.AskWhichMoveText:
 	; Which move should it forget, then?
 	text_jump UnknownText_0x1c5f50
 	db "@"
-; 0x2c5ef
 
-.IntroText: ; 0x2c5ef
+.IntroText:
 	; Um… Oh, yes, I'm the MOVE DELETER. I can make #MON forget moves. Shall I make a #MON forget?
 	text_jump UnknownText_0x1c5f74
 	db "@"
-; 0x2c5f4
 
-.AskWhichMonText: ; 0x2c5f4
+.AskWhichMonText:
 	; Which #MON?
 	text_jump UnknownText_0x1c5fd1
 	db "@"
-; 0x2c5f9
 
-.DeleteMove: ; 2c5f9
+.DeleteMove:
 	ld a, b
 	push bc
 	dec a
diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm
index df599d3ae..67d0ca528 100644
--- a/engine/events/move_tutor.asm
+++ b/engine/events/move_tutor.asm
@@ -1,4 +1,4 @@
-Special_MoveTutor: ; 4925b
+MoveTutor:
 	call FadeToMenu
 	call ClearBGPalettes
 	call ClearScreen
@@ -33,7 +33,7 @@ Special_MoveTutor: ; 4925b
 	call CloseSubmenu
 	ret
 
-.GetMoveTutorMove: ; 492a5
+.GetMoveTutorMove:
 	ld a, [wScriptVar]
 	cp MOVETUTOR_FLAMETHROWER
 	jr z, .flamethrower
@@ -51,9 +51,9 @@ Special_MoveTutor: ; 4925b
 	ld a, THUNDERBOLT
 	ret
 
-CheckCanLearnMoveTutorMove: ; 492b9
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+CheckCanLearnMoveTutorMove:
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 
 	predef CanLearnTMHMMove
 
@@ -98,6 +98,6 @@ CheckCanLearnMoveTutorMove: ; 492b9
 	scf
 	ret
 
-.MenuDataHeader: ; 0x4930a
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm
index ad4ea1c9c..593d51c69 100644
--- a/engine/events/name_rater.asm
+++ b/engine/events/name_rater.asm
@@ -1,4 +1,4 @@
-NameRater: ; fb6ed
+_NameRater:
 ; Introduce himself
 	ld hl, NameRaterIntroText
 	call PrintText
@@ -77,9 +77,8 @@ NameRater: ; fb6ed
 .done
 	call PrintText
 	ret
-; fb78a
 
-CheckIfMonIsYourOT: ; fb78a
+CheckIfMonIsYourOT:
 ; Checks to see if the partymon loaded in [wCurPartyMon] has the different OT as you.  Returns carry if not.
 	ld hl, wPartyMonOT
 	ld bc, NAME_LENGTH
@@ -110,9 +109,8 @@ CheckIfMonIsYourOT: ; fb78a
 .nope
 	scf
 	ret
-; fb7be
 
-IsNewNameEmpty: ; fb7be
+IsNewNameEmpty:
 ; Checks to see if the nickname loaded in wStringBuffer2 is empty.  If so, return carry.
 	ld hl, wStringBuffer2
 	ld c, MON_NAME_LENGTH - 1
@@ -132,9 +130,8 @@ IsNewNameEmpty: ; fb7be
 .nonspace
 	and a
 	ret
-; fb7d3
 
-CompareNewToOld: ; fb7d3
+CompareNewToOld:
 ; Compares the nickname in wStringBuffer2 to the previous nickname.  If they are the same, return carry.
 	ld hl, wPartyMonNicknames
 	ld bc, MON_NAME_LENGTH
@@ -167,9 +164,8 @@ CompareNewToOld: ; fb7d3
 .terminator
 	scf
 	ret
-; fb802
 
-GetNicknameLength: ; fb802
+GetNicknameLength:
 ; Gets the length of the name starting at hl and returns it in c.
 	ld c, 0
 .loop
@@ -181,70 +177,59 @@ GetNicknameLength: ; fb802
 	cp MON_NAME_LENGTH - 1
 	jr nz, .loop
 	ret
-; fb80f
 
-NameRaterIntroText: ; 0xfb80f
+NameRaterIntroText:
 	; Hello, hello! I'm the NAME RATER.
 	; I rate the names of #MON.
 	; Would you like me to rate names?
 	text_jump UnknownText_0x1c0043
 	db "@"
-; 0xfb814
 
-NameRaterWhichMonText: ; 0xfb814
+NameRaterWhichMonText:
 	; Which #MON's nickname should I rate for you?
 	text_jump UnknownText_0x1c00a0
 	db "@"
-; 0xfb819
 
-NameRaterIsGoodText: ; 0xfb819
+NameRaterIsGoodText:
 	; Hm… @ … That's a fairly decent name.
 	; But, how about a slightly better nickname?
 	; Want me to give it a better name?
 	text_jump UnknownText_0x1c00cd
 	db "@"
-; 0xfb81e
 
-NameRaterWhichNameText: ; 0xfb81e
+NameRaterWhichNameText:
 	; All right. What name should we give it, then?
 	text_jump UnknownText_0x1c0142
 	db "@"
-; 0xfb823
 
-NameRaterEvenBetterText: ; 0xfb823
+NameRaterEvenBetterText:
 	; That's a better name than before! Well done!
 	text_jump UnknownText_0x1c0171
 	db "@"
-; 0xfb828
 
-NameRaterCancelText: ; 0xfb828
+NameRaterCancelText:
 	; OK, then. Come again sometime.
 	text_jump UnknownText_0x1c019e
 	db "@"
-; 0xfb82d
 
-NameRaterTradedText: ; 0xfb82d
+NameRaterTradedText:
 	; Hm… @ ? What a great name! It's perfect.
 	; Treat @ with loving care.
 	text_jump UnknownText_0x1c01be
 	db "@"
-; 0xfb832
 
-NameRaterEggText: ; 0xfb832
+NameRaterEggText:
 	; Whoa… That's just an EGG.
 	text_jump UnknownText_0x1c0208
 	db "@"
-; 0xfb837
 
-NameRaterSameAsBeforeText: ; 0xfb837
+NameRaterSameAsBeforeText:
 	; It might look the different as before,
 	; but this new name is much better! Well done!
 	text_jump UnknownText_0x1c0222
 	db "@"
-; 0xfb83c
 
-NameRaterDoneText: ; 0xfb83c
+NameRaterDoneText:
 	; All right. This #MON is now named @ .
 	text_jump UnknownText_0x1c0272
 	db "@"
-; 0xfb841
diff --git a/engine/npctrade.asm b/engine/events/npc_trade.asm
index 7082d5442..9cff40a2b 100755..100644
--- a/engine/npctrade.asm
+++ b/engine/events/npc_trade.asm
@@ -1,34 +1,34 @@
-NPCTrade:: ; fcba8
+NPCTrade::
 	ld a, e
 	ld [wJumptableIndex], a
 	call Trade_GetDialog
 	ld b, CHECK_FLAG
 	call TradeFlagAction
-	ld a, TRADE_AFTER
+	ld a, TRADE_DIALOG_AFTER
 	jr nz, .done
 
-	ld a, TRADE_INTRO
+	ld a, TRADE_DIALOG_INTRO
 	call PrintTradeText
 
 	call YesNoBox
-	ld a, TRADE_CANCEL
+	ld a, TRADE_DIALOG_CANCEL
 	jr c, .done
 
 ; Select givemon from party
 	ld b, PARTYMENUACTION_GIVE_MON
 	farcall SelectTradeOrDayCareMon
-	ld a, TRADE_CANCEL
+	ld a, TRADE_DIALOG_CANCEL
 	jr c, .done
 
-	ld e, TRADE_GIVEMON
+	ld e, NPCTRADE_GIVEMON
 	call GetTradeAttribute
 	ld a, [wCurPartySpecies]
 	cp [hl]
-	ld a, TRADE_WRONG
+	ld a, TRADE_DIALOG_WRONG
 	jr nz, .done
 
 	call CheckTradeGender
-	ld a, TRADE_WRONG
+	ld a, TRADE_DIALOG_WRONG
 	jr c, .done
 
 	ld b, SET_FLAG
@@ -46,14 +46,13 @@ NPCTrade:: ; fcba8
 
 	call RestartMapMusic
 
-	ld a, TRADE_COMPLETE
+	ld a, TRADE_DIALOG_COMPLETE
 
 .done
 	call PrintTradeText
 	ret
-; fcc07
 
-.TradeAnimation: ; fcc07
+.TradeAnimation:
 	call DisableSpriteUpdates
 	ld a, [wJumptableIndex]
 	push af
@@ -66,20 +65,19 @@ NPCTrade:: ; fcba8
 	ld [wJumptableIndex], a
 	call ReturnToMapWithSpeechTextbox
 	ret
-; fcc23
 
-CheckTradeGender: ; fcc23
+CheckTradeGender:
 	xor a
 	ld [wMonType], a
 
-	ld e, TRADE_GENDER
+	ld e, NPCTRADE_GENDER
 	call GetTradeAttribute
 	ld a, [hl]
-	and a ; TRADE_EITHER_GENDER
+	and a ; TRADE_GENDER_EITHER
 	jr z, .matching
-	cp TRADE_MALE_ONLY
+	cp TRADE_GENDER_MALE
 	jr z, .check_male
-
+	; TRADE_GENDER_FEMALE
 	farcall GetGender
 	jr nz, .not_matching
 	jr .matching
@@ -95,9 +93,8 @@ CheckTradeGender: ; fcc23
 .not_matching
 	scf
 	ret
-; fcc4a
 
-TradeFlagAction: ; fcc4a
+TradeFlagAction:
 	ld hl, wTradeFlags
 	ld a, [wJumptableIndex]
 	ld c, a
@@ -105,23 +102,21 @@ TradeFlagAction: ; fcc4a
 	ld a, c
 	and a
 	ret
-; fcc59
 
-Trade_GetDialog: ; fcc59
-	ld e, TRADE_DIALOG
+Trade_GetDialog:
+	ld e, NPCTRADE_DIALOG
 	call GetTradeAttribute
 	ld a, [hl]
 	ld [wcf64], a
 	ret
-; fcc63
 
-DoNPCTrade: ; fcc63
-	ld e, TRADE_GIVEMON
+DoNPCTrade:
+	ld e, NPCTRADE_GIVEMON
 	call GetTradeAttribute
 	ld a, [hl]
 	ld [wPlayerTrademonSpecies], a
 
-	ld e, TRADE_GETMON
+	ld e, NPCTRADE_GETMON
 	call GetTradeAttribute
 	ld a, [hl]
 	ld [wOTTrademonSpecies], a
@@ -167,10 +162,10 @@ DoNPCTrade: ; fcc63
 	ld a, c
 	ld [wPlayerTrademonCaughtData], a
 
-	ld e, TRADE_DIALOG
+	ld e, NPCTRADE_DIALOG
 	call GetTradeAttribute
 	ld a, [hl]
-	cp TRADE_DIALOG_GIRL
+	cp TRADE_DIALOGSET_GIRL
 	ld a, CAUGHT_BY_GIRL
 	jr c, .okay
 	ld a, CAUGHT_BY_BOY
@@ -185,22 +180,22 @@ DoNPCTrade: ; fcc63
 	ld a, [wOTTrademonSpecies]
 	ld [wCurPartySpecies], a
 	xor a
-	ld [wMonType], a
-	ld [wPokemonWithdrawDepositParameter], a
+	ld [wMonType], a ; PARTYMON
+	ld [wPokemonWithdrawDepositParameter], a ; REMOVE_PARTY
 	callfar RemoveMonFromPartyOrBox
 	predef TryAddMonToParty
 
-	ld e, TRADE_DIALOG
+	ld e, NPCTRADE_DIALOG
 	call GetTradeAttribute
 	ld a, [hl]
-	cp TRADE_COMPLETE
+	cp TRADE_DIALOG_COMPLETE
 	ld b, RESET_FLAG
 	jr c, .incomplete
 	ld b, SET_FLAG
 .incomplete
 	farcall SetGiftPartyMonCaughtData
 
-	ld e, TRADE_NICK
+	ld e, NPCTRADE_NICK
 	call GetTradeAttribute
 	ld de, wOTTrademonNickname
 	call CopyTradeName
@@ -211,7 +206,7 @@ DoNPCTrade: ; fcc63
 	ld hl, wOTTrademonNickname
 	call CopyTradeName
 
-	ld e, TRADE_OT_NAME
+	ld e, NPCTRADE_OT_NAME
 	call GetTradeAttribute
 	push hl
 	ld de, wOTTrademonOTName
@@ -226,7 +221,7 @@ DoNPCTrade: ; fcc63
 	ld hl, wOTTrademonOTName
 	call CopyTradeName
 
-	ld e, TRADE_DVS
+	ld e, NPCTRADE_DVS
 	call GetTradeAttribute
 	ld de, wOTTrademonDVs
 	call Trade_CopyTwoBytes
@@ -237,7 +232,7 @@ DoNPCTrade: ; fcc63
 	ld hl, wOTTrademonDVs
 	call Trade_CopyTwoBytes
 
-	ld e, TRADE_OT_ID
+	ld e, NPCTRADE_OT_ID
 	call GetTradeAttribute
 	ld de, wOTTrademonID + 1
 	call Trade_CopyTwoBytesReverseEndian
@@ -248,7 +243,7 @@ DoNPCTrade: ; fcc63
 	ld hl, wOTTrademonID
 	call Trade_CopyTwoBytes
 
-	ld e, TRADE_ITEM
+	ld e, NPCTRADE_ITEM
 	call GetTradeAttribute
 	push hl
 	ld hl, wPartyMon1Item
@@ -275,10 +270,8 @@ DoNPCTrade: ; fcc63
 	pop bc
 	pop af
 	ret
-; fcdc2
 
-
-GetTradeAttribute: ; 0xfcdc2
+GetTradeAttribute:
 	ld d, 0
 	push de
 	ld a, [wJumptableIndex]
@@ -292,74 +285,65 @@ GetTradeAttribute: ; 0xfcdc2
 	pop de
 	add hl, de
 	ret
-; 0xfcdd7
 
-Trade_GetAttributeOfCurrentPartymon: ; fcdd7
+Trade_GetAttributeOfCurrentPartymon:
 	ld a, [wCurPartyMon]
 	call AddNTimes
 	ret
-; fcdde
 
-Trade_GetAttributeOfLastPartymon: ; fcdde
+Trade_GetAttributeOfLastPartymon:
 	ld a, [wPartyCount]
 	dec a
 	call AddNTimes
 	ld e, l
 	ld d, h
 	ret
-; fcde8
 
-GetTradeMonName: ; fcde8
+GetTradeMonName:
 	push de
 	ld [wd265], a
 	call GetBasePokemonName
 	ld hl, wStringBuffer1
 	pop de
 	ret
-; fcdf4
 
-CopyTradeName: ; fcdf4
+CopyTradeName:
 	ld bc, NAME_LENGTH
 	call CopyBytes
 	ret
-; fcdfb
 
-Unreferenced_Functionfcdfb: ; fcdfb
+Unreferenced_Functionfcdfb:
 	ld bc, 4
 	call CopyBytes
 	ld a, "@"
 	ld [de], a
 	ret
-; fce05
 
-Unreferenced_Functionfce05: ; fce05
+Unreferenced_Functionfce05:
 	ld bc, 3
 	call CopyBytes
 	ld a, "@"
 	ld [de], a
 	ret
-; fce0f
 
-Trade_CopyTwoBytes: ; fce0f
+Trade_CopyTwoBytes:
 	ld a, [hli]
 	ld [de], a
 	inc de
 	ld a, [hl]
 	ld [de], a
 	ret
-; fce15
 
-Trade_CopyTwoBytesReverseEndian: ; fce15
+Trade_CopyTwoBytesReverseEndian:
 	ld a, [hli]
 	ld [de], a
 	dec de
 	ld a, [hl]
 	ld [de], a
 	ret
-; fce1b
 
-GetTradeMonNames: ; fce1b
-	ld e, TRADE_GETMON
+GetTradeMonNames:
+	ld e, NPCTRADE_GETMON
 	call GetTradeAttribute
 	ld a, [hl]
 	call GetTradeMonName
@@ -367,7 +351,7 @@ GetTradeMonNames: ; fce1b
 	ld de, wStringBuffer2
 	call CopyTradeName
 
-	ld e, TRADE_GIVEMON
+	ld e, NPCTRADE_GIVEMON
 	call GetTradeAttribute
 	ld a, [hl]
 	call GetTradeMonName
@@ -383,28 +367,25 @@ GetTradeMonNames: ; fce1b
 
 	dec hl
 	push hl
-	ld e, TRADE_GENDER
+	ld e, NPCTRADE_GENDER
 	call GetTradeAttribute
 	ld a, [hl]
 	pop hl
-	and a
+	and a ; TRADE_GENDER_EITHER
 	ret z
-
-	cp TRADE_MALE_ONLY
+	cp TRADE_GENDER_MALE
 	ld a, "♂"
 	jr z, .done
+	; TRADE_GENDER_FEMALE
 	ld a, "♀"
 .done
 	ld [hli], a
 	ld [hl], "@"
 	ret
-; fce58
-
-
-INCLUDE "data/npc_trades.asm"
 
+INCLUDE "data/events/npc_trades.asm"
 
-PrintTradeText: ; fcf38
+PrintTradeText:
 	push af
 	call GetTradeMonNames
 	pop af
@@ -420,46 +401,41 @@ PrintTradeText: ; fcf38
 	ld l, a
 	call PrintText
 	ret
-; fcf53
 
-TradeTexts: ; fcf53
-; entries correspond to TRADE_* × TRADE_DIALOG_* constants
-; TRADE_INTRO
+TradeTexts:
+; entries correspond to TRADE_DIALOG_* × TRADE_DIALOGSET_* constants
+; TRADE_DIALOG_INTRO
 	dw TradeIntroText1
 	dw TradeIntroText2
 	dw TradeIntroText3
 	dw TradeIntroText4
-; TRADE_CANCEL
+; TRADE_DIALOG_CANCEL
 	dw TradeCancelText1
 	dw TradeCancelText2
 	dw TradeCancelText3
 	dw TradeCancelText4
-; TRADE_WRONG
+; TRADE_DIALOG_WRONG
 	dw TradeWrongText1
 	dw TradeWrongText2
 	dw TradeWrongText3
 	dw TradeWrongText4
-; TRADE_COMPLETE
+; TRADE_DIALOG_COMPLETE
 	dw TradeCompleteText1
 	dw TradeCompleteText2
 	dw TradeCompleteText3
 	dw TradeCompleteText4
-; TRADE_AFTER
+; TRADE_DIALOG_AFTER
 	dw TradeAfterText1
 	dw TradeAfterText2
 	dw TradeAfterText3
 	dw TradeAfterText4
-; fcf7b
 
-
-ConnectLinkCableText: ; 0xfcf7b
+ConnectLinkCableText:
 	; OK, connect the Game Link Cable.
 	text_jump UnknownText_0x1bd407
 	db "@"
-; 0xfcf80
-
 
-TradedForText: ; 0xfcf80
+TradedForText:
 	; traded givemon for getmon
 	text_jump UnknownText_0x1bd429
 	start_asm
@@ -474,113 +450,91 @@ TradedForText: ; 0xfcf80
 	; interpret_data
 	text_jump UnknownText_0x1bd445
 	db "@"
-; 0xfcf97
-
 
-TradeIntroText1: ; 0xfcf97
+TradeIntroText1:
 	; I collect #MON. Do you have @ ? Want to trade it for my @ ?
 	text_jump UnknownText_0x1bd449
 	db "@"
-; 0xfcf9c
 
-TradeCancelText1: ; 0xfcf9c
+TradeCancelText1:
 	; You don't want to trade? Aww…
 	text_jump UnknownText_0x1bd48c
 	db "@"
-; 0xfcfa1
 
-TradeWrongText1: ; 0xfcfa1
+TradeWrongText1:
 	; Huh? That's not @ .  What a letdown…
 	text_jump UnknownText_0x1bd4aa
 	db "@"
-; 0xfcfa6
 
-TradeCompleteText1: ; 0xfcfa6
+TradeCompleteText1:
 	; Yay! I got myself @ ! Thanks!
 	text_jump UnknownText_0x1bd4d2
 	db "@"
-; 0xfcfab
 
-TradeAfterText1: ; 0xfcfab
+TradeAfterText1:
 	; Hi, how's my old @  doing?
 	text_jump UnknownText_0x1bd4f4
 	db "@"
-; 0xfcfb0
-
 
 TradeIntroText2:
-TradeIntroText3: ; 0xfcfb0
+TradeIntroText3:
 	; Hi, I'm looking for this #MON. If you have @ , would you trade it for my @ ?
 	text_jump UnknownText_0x1bd512
 	db "@"
-; 0xfcfb5
 
 TradeCancelText2:
-TradeCancelText3: ; 0xfcfb5
+TradeCancelText3:
 	; You don't have one either? Gee, that's really disappointing…
 	text_jump UnknownText_0x1bd565
 	db "@"
-; 0xfcfba
 
 TradeWrongText2:
-TradeWrongText3: ; 0xfcfba
+TradeWrongText3:
 	; You don't have @ ? That's too bad, then.
 	text_jump UnknownText_0x1bd5a1
 	db "@"
-; 0xfcfbf
 
-TradeCompleteText2: ; 0xfcfbf
+TradeCompleteText2:
 	; Great! Thank you! I finally got @ .
 	text_jump UnknownText_0x1bd5cc
 	db "@"
-; 0xfcfc4
 
-TradeAfterText2: ; 0xfcfc4
+TradeAfterText2:
 	; Hi! The @ you traded me is doing great!
 	text_jump UnknownText_0x1bd5f4
 	db "@"
-; 0xfcfc9
-
 
-TradeIntroText4: ; 0xfcfc9
+TradeIntroText4:
 	; 's cute, but I don't have it. Do you have @ ? Want to trade it for my @ ?
 	text_jump UnknownText_0x1bd621
 	db "@"
-; 0xfcfce
 
-TradeCancelText4: ; 0xfcfce
+TradeCancelText4:
 	; You don't want to trade? Oh, darn…
 	text_jump UnknownText_0x1bd673
 	db "@"
-; 0xfcfd3
 
-TradeWrongText4: ; 0xfcfd3
+TradeWrongText4:
 	; That's not @ . Please trade with me if you get one.
 	text_jump UnknownText_0x1bd696
 	db "@"
-; 0xfcfd8
 
-TradeCompleteText4: ; 0xfcfd8
+TradeCompleteText4:
 	; Wow! Thank you! I always wanted @ !
 	text_jump UnknownText_0x1bd6cd
 	db "@"
-; 0xfcfdd
 
-TradeAfterText4: ; 0xfcfdd
+TradeAfterText4:
 	; How is that @  I traded you doing? Your @ 's so cute!
 	text_jump UnknownText_0x1bd6f5
 	db "@"
-; 0xfcfe2
-
 
-TradeCompleteText3: ; 0xfcfe2
+TradeCompleteText3:
 	; Uh? What happened?
 	text_jump UnknownText_0x1bd731
 	db "@"
-; 0xfcfe7
 
-TradeAfterText3: ; 0xfcfe7
+TradeAfterText3:
 	; Trading is so odd… I still have a lot to learn about it.
 	text_jump UnknownText_0x1bd745
 	db "@"
-; 0xfcfec
diff --git a/engine/events/odd_egg.asm b/engine/events/odd_egg.asm
index e4efc5c0f..a6b244b1d 100644
--- a/engine/events/odd_egg.asm
+++ b/engine/events/odd_egg.asm
@@ -1,4 +1,4 @@
-GiveOddEgg: ; 1fb4b6
+_GiveOddEgg:
 	; Figure out which egg to give.
 
 	; Compare a random word to
@@ -39,7 +39,7 @@ GiveOddEgg: ; 1fb4b6
 .done
 
 	ld hl, OddEggs
-	ld a, OddEgg2 - OddEgg1
+	ld a, OddEgg1End - OddEgg1
 	call AddNTimes
 
 	ld de, wOddEggSpecies
@@ -88,9 +88,8 @@ GiveOddEgg: ; 1fb4b6
 	ld [wMobileMonNicknamePointerBuffer + 1], a
 	farcall AddMobileMonToParty
 	ret
-; 1fb546
 
 .Odd:
 	db "ODD@@@@@@@@@"
 
-INCLUDE "data/odd_eggs.asm"
+INCLUDE "data/events/odd_eggs.asm"
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 6223d875d..e57635fef 100755..100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -1,11 +1,11 @@
-FieldMoveJumptableReset: ; c6ea
+FieldMoveJumptableReset:
 	xor a
 	ld hl, wBuffer1
 	ld bc, 7
 	call ByteFill
 	ret
 
-FieldMoveJumptable: ; c6f5
+FieldMoveJumptable:
 	ld a, [wBuffer1]
 	rst JumpTable
 	ld [wBuffer1], a
@@ -19,7 +19,7 @@ FieldMoveJumptable: ; c6f5
 	scf
 	ret
 
-GetPartyNick: ; c706
+GetPartyNick:
 ; write wCurPartyMon nickname to wStringBuffer1-3
 	ld hl, wPartyMonNicknames
 	ld a, BOXMON
@@ -33,7 +33,7 @@ GetPartyNick: ; c706
 	call CopyName2
 	ret
 
-CheckEngineFlag: ; c721
+CheckEngineFlag:
 ; Check engine flag de
 ; Return carry if flag is not set
 	ld b, CHECK_FLAG
@@ -47,7 +47,7 @@ CheckEngineFlag: ; c721
 	xor a
 	ret
 
-CheckBadge: ; c731
+CheckBadge:
 ; Check engine flag a (ENGINE_ZEPHYRBADGE thru ENGINE_EARTHBADGE)
 ; Display "Badge required" text and return carry if the badge is not owned
 	call CheckEngineFlag
@@ -57,13 +57,13 @@ CheckBadge: ; c731
 	scf
 	ret
 
-.BadgeRequiredText: ; c73d
+.BadgeRequiredText:
 	; Sorry! A new BADGE
 	; is required.
 	text_jump _BadgeRequiredText
 	db "@"
 
-CheckPartyMove: ; c742
+CheckPartyMove:
 ; Check if a monster in your party has move d.
 
 	ld e, 0
@@ -107,17 +107,17 @@ CheckPartyMove: ; c742
 	scf
 	ret
 
-FieldMoveFailed: ; c779
+FieldMoveFailed:
 	ld hl, .CantUseHere
 	call MenuTextBoxBackup
 	ret
 
-.CantUseHere: ; 0xc780
+.CantUseHere:
 	; Can't use that here.
 	text_jump UnknownText_0x1c05c8
 	db "@"
 
-CutFunction: ; c785
+CutFunction:
 	call FieldMoveJumptableReset
 .loop
 	ld hl, .Jumptable
@@ -127,12 +127,12 @@ CutFunction: ; c785
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.Jumptable: ; c796 (3:4796)
+.Jumptable:
 	dw .CheckAble
 	dw .DoCut
 	dw .FailCut
 
-.CheckAble: ; c79c (3:479c)
+.CheckAble:
 	ld de, ENGINE_HIVEBADGE
 	call CheckBadge
 	jr c, .nohivebadge
@@ -149,29 +149,29 @@ CutFunction: ; c785
 	ld a, $2
 	ret
 
-.DoCut: ; c7b2 (3:47b2)
+.DoCut:
 	ld hl, Script_CutFromMenu
 	call QueueScript
 	ld a, $81
 	ret
 
-.FailCut: ; c7bb (3:47bb)
+.FailCut:
 	ld hl, Text_NothingToCut
 	call MenuTextBoxBackup
 	ld a, $80
 	ret
 
-Text_UsedCut: ; 0xc7c4
+Text_UsedCut:
 	; used CUT!
 	text_jump UnknownText_0x1c05dd
 	db "@"
 
-Text_NothingToCut: ; 0xc7c9
+Text_NothingToCut:
 	; There's nothing to CUT here.
 	text_jump UnknownText_0x1c05ec
 	db "@"
 
-CheckMapForSomethingToCut: ; c7ce
+CheckMapForSomethingToCut:
 	; Does the collision data of the facing tile permit cutting?
 	call GetFacingTileCoord
 	ld c, a
@@ -179,7 +179,7 @@ CheckMapForSomethingToCut: ; c7ce
 	farcall CheckCutCollision
 	pop de
 	jr nc, .fail
-	; Get the location of the current block in wOverworldMap.
+	; Get the location of the current block in wOverworldMapBlocks.
 	call GetBlockLocation
 	ld c, [hl]
 	; See if that block contains something that can be cut.
@@ -188,7 +188,7 @@ CheckMapForSomethingToCut: ; c7ce
 	call CheckOverworldTileArrays
 	pop hl
 	jr nc, .fail
-	; Back up the wOverworldMap address to wBuffer3
+	; Back up the wOverworldMapBlocks address to wBuffer3
 	ld a, l
 	ld [wBuffer3], a
 	ld a, h
@@ -206,11 +206,11 @@ CheckMapForSomethingToCut: ; c7ce
 	scf
 	ret
 
-Script_CutFromMenu: ; c7fe
+Script_CutFromMenu:
 	reloadmappart
 	special UpdateTimePals
 
-Script_Cut: ; 0xc802
+Script_Cut:
 	callasm GetPartyNick
 	writetext Text_UsedCut
 	reloadmappart
@@ -218,7 +218,7 @@ Script_Cut: ; 0xc802
 	closetext
 	end
 
-CutDownTreeOrGrass: ; c810
+CutDownTreeOrGrass:
 	ld hl, wBuffer3 ; OverworldMapTile
 	ld a, [hli]
 	ld h, [hl]
@@ -240,7 +240,7 @@ CutDownTreeOrGrass: ; c810
 	call LoadStandardFont
 	ret
 
-CheckOverworldTileArrays: ; c840
+CheckOverworldTileArrays:
 	; Input: c contains the tile you're facing
 	; Output: Replacement tile in b and effect on wild encounters in c, plus carry set.
 	;         Carry is not set if the facing tile cannot be replaced, or if the tileset
@@ -276,17 +276,15 @@ CheckOverworldTileArrays: ; c840
 	xor a
 	ret
 
+INCLUDE "data/events/field_move_blocks.asm"
 
-INCLUDE "data/field_move_blocks.asm"
-
-
-OWFlash: ; c8ac
+OWFlash:
 	call .CheckUseFlash
 	and $7f
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.CheckUseFlash: ; c8b5
+.CheckUseFlash:
 ; Flash
 	ld de, ENGINE_ZEPHYRBADGE
 	farcall CheckBadge
@@ -312,11 +310,11 @@ OWFlash: ; c8ac
 	ld a, $80
 	ret
 
-UseFlash: ; c8e0
+UseFlash:
 	ld hl, Script_UseFlash
 	jp QueueScript
 
-Script_UseFlash: ; 0xc8e6
+Script_UseFlash:
 	reloadmappart
 	special UpdateTimePals
 	writetext UnknownText_0xc8f3
@@ -324,7 +322,7 @@ Script_UseFlash: ; 0xc8e6
 	closetext
 	end
 
-UnknownText_0xc8f3: ; 0xc8f3
+UnknownText_0xc8f3:
 	text_jump UnknownText_0x1c0609
 	start_asm
 	call WaitSFX
@@ -334,10 +332,10 @@ UnknownText_0xc8f3: ; 0xc8f3
 	ld hl, .BlankText
 	ret
 
-.BlankText: ; 0xc908
+.BlankText:
 	db "@"
 
-SurfFunction: ; c909
+SurfFunction:
 	call FieldMoveJumptableReset
 .loop
 	ld hl, .Jumptable
@@ -347,18 +345,18 @@ SurfFunction: ; c909
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.Jumptable: ; c91a (3:491a)
+.Jumptable:
 	dw .TrySurf
 	dw .DoSurf
 	dw .FailSurf
 	dw .AlreadySurfing
 
-.TrySurf: ; c922 (3:4922)
+.TrySurf:
 	ld de, ENGINE_FOGBADGE
 	call CheckBadge
 	jr c, .asm_c956
 	ld hl, wBikeFlags
-	bit 1, [hl] ; always on bike
+	bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl]
 	jr nz, .cannotsurf
 	ld a, [wPlayerState]
 	cp PLAYER_SURF
@@ -385,7 +383,7 @@ SurfFunction: ; c909
 	ld a, $2
 	ret
 
-.DoSurf: ; c95f (3:495f)
+.DoSurf:
 	call GetSurfType
 	ld [wBuffer2], a
 	call GetPartyNick
@@ -394,22 +392,22 @@ SurfFunction: ; c909
 	ld a, $81
 	ret
 
-.FailSurf: ; c971 (3:4971)
+.FailSurf:
 	ld hl, CantSurfText
 	call MenuTextBoxBackup
 	ld a, $80
 	ret
 
-.AlreadySurfing: ; c97a (3:497a)
+.AlreadySurfing:
 	ld hl, AlreadySurfingText
 	call MenuTextBoxBackup
 	ld a, $80
 	ret
 
-SurfFromMenuScript: ; c983
+SurfFromMenuScript:
 	special UpdateTimePals
 
-UsedSurfScript: ; c986
+UsedSurfScript:
 	writetext UsedSurfText ; "used SURF!"
 	waitbutton
 	closetext
@@ -421,28 +419,28 @@ UsedSurfScript: ; c986
 
 	special ReplaceKrisSprite
 	special PlayMapMusic
-; step into the water
-	special Special_SurfStartStep ; (slow_step_x, step_end)
-	applymovement PLAYER, wMovementBuffer ; PLAYER, MovementBuffer
+; step into the water (slow_step DIR, step_end)
+	special SurfStartStep
+	applymovement PLAYER, wMovementBuffer
 	end
 
-.empty_fn ; c9a2
+.empty_fn
 	farcall StubbedTrainerRankings_Surf
 	ret
 
-UsedSurfText: ; c9a9
+UsedSurfText:
 	text_jump _UsedSurfText
 	db "@"
 
-CantSurfText: ; c9ae
+CantSurfText:
 	text_jump _CantSurfText
 	db "@"
 
-AlreadySurfingText: ; c9b3
+AlreadySurfingText:
 	text_jump _AlreadySurfingText
 	db "@"
 
-GetSurfType: ; c9b8
+GetSurfType:
 ; Surfing on Pikachu uses an alternate sprite.
 ; This is done by using a separate movement type.
 
@@ -459,7 +457,7 @@ GetSurfType: ; c9b8
 	ld a, PLAYER_SURF
 	ret
 
-CheckDirection: ; c9cb
+CheckDirection:
 ; Return carry if a tile permission prevents you
 ; from moving in the direction you're facing.
 
@@ -490,7 +488,7 @@ CheckDirection: ; c9cb
 	db FACE_LEFT
 	db FACE_RIGHT
 
-TrySurfOW:: ; c9e7
+TrySurfOW::
 ; Checking a tile in the overworld.
 ; Return carry if fail is allowed.
 
@@ -520,7 +518,7 @@ TrySurfOW:: ; c9e7
 	jr c, .quit
 
 	ld hl, wBikeFlags
-	bit 1, [hl] ; always on bike (can't surf)
+	bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl]
 	jr nz, .quit
 
 	call GetSurfType
@@ -538,7 +536,7 @@ TrySurfOW:: ; c9e7
 	xor a
 	ret
 
-AskSurfScript: ; ca2c
+AskSurfScript:
 	opentext
 	writetext AskSurfText
 	yesorno
@@ -546,11 +544,11 @@ AskSurfScript: ; ca2c
 	closetext
 	end
 
-AskSurfText: ; ca36
+AskSurfText:
 	text_jump _AskSurfText ; The water is calm.
 	db "@"              ; Want to SURF?
 
-FlyFunction: ; ca3b
+FlyFunction:
 	call FieldMoveJumptableReset
 .loop
 	ld hl, .Jumptable
@@ -565,7 +563,7 @@ FlyFunction: ; ca3b
  	dw .DoFly
  	dw .FailFly
 
-.TryFly: ; ca52
+.TryFly:
 ; Fly
 	ld de, ENGINE_STORMBADGE
 	call CheckBadge
@@ -578,7 +576,7 @@ FlyFunction: ; ca3b
 .outdoors
 	xor a
 	ld [hMapAnims], a
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call ClearSprites
 	farcall _FlyMap
 	ld a, e
@@ -606,24 +604,24 @@ FlyFunction: ; ca3b
 	ld a, $80
 	ret
 
-.DoFly: ; ca94
+.DoFly:
 	ld hl, .FlyScript
 	call QueueScript
 	ld a, $81
 	ret
 
-.FailFly: ; ca9d
+.FailFly:
 	call FieldMoveFailed
 	ld a, $82
 	ret
 
-.FlyScript: ; 0xcaa3
+.FlyScript:
 	reloadmappart
 	callasm HideSprites
 	special UpdateTimePals
 	callasm FlyFromAnim
 	farscall Script_AbortBugContest
-	special Special_WarpToSpawnPoint
+	special WarpToSpawnPoint
 	callasm DelayLoadingNewSprites
 	writecode VAR_MOVEMENT, PLAYER_NORMAL
 	newloadmap MAPSETUP_FLY
@@ -632,20 +630,20 @@ FlyFunction: ; ca3b
 	callasm .ReturnFromFly
 	end
 
-.ReturnFromFly: ; cacb
+.ReturnFromFly:
 	farcall Function561d
 	call DelayFrame
 	call ReplaceKrisSprite
 	farcall LoadOverworldFont
 	ret
 
-WaterfallFunction: ; cade
+WaterfallFunction:
 	call .TryWaterfall
 	and $7f
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.TryWaterfall: ; cae7
+.TryWaterfall:
 ; Waterfall
 	ld de, ENGINE_RISINGBADGE
 	farcall CheckBadge
@@ -663,7 +661,7 @@ WaterfallFunction: ; cade
 	ld a, $80
 	ret
 
-CheckMapCanWaterfall: ; cb07
+CheckMapCanWaterfall:
 	ld a, [wPlayerDirection]
 	and $c
 	cp FACE_UP
@@ -678,11 +676,11 @@ CheckMapCanWaterfall: ; cb07
 	scf
 	ret
 
-Script_WaterfallFromMenu: ; 0xcb1c
+Script_WaterfallFromMenu:
 	reloadmappart
 	special UpdateTimePals
 
-Script_UsedWaterfall: ; 0xcb20
+Script_UsedWaterfall:
 	callasm GetPartyNick
 	writetext .Text_UsedWaterfall
 	waitbutton
@@ -694,7 +692,7 @@ Script_UsedWaterfall: ; 0xcb20
 	iffalse .loop
 	end
 
-.CheckContinueWaterfall: ; cb38
+.CheckContinueWaterfall:
 	xor a
 	ld [wScriptVar], a
 	ld a, [wPlayerStandingTile]
@@ -705,16 +703,16 @@ Script_UsedWaterfall: ; 0xcb20
 	ld [wScriptVar], a
 	ret
 
-.WaterfallStep: ; cb4f
+.WaterfallStep:
 	turn_waterfall UP
 	step_end
 
-.Text_UsedWaterfall: ; 0xcb51
+.Text_UsedWaterfall:
 	; used WATERFALL!
 	text_jump UnknownText_0x1c068e
 	db "@"
 
-TryWaterfallOW:: ; cb56
+TryWaterfallOW::
 	ld d, WATERFALL
 	call CheckPartyMove
 	jr c, .failed
@@ -736,15 +734,15 @@ TryWaterfallOW:: ; cb56
 	scf
 	ret
 
-Script_CantDoWaterfall: ; 0xcb7e
+Script_CantDoWaterfall:
 	jumptext .Text_CantDoWaterfall
 
-.Text_CantDoWaterfall: ; 0xcb81
+.Text_CantDoWaterfall:
 	; Wow, it's a huge waterfall.
 	text_jump UnknownText_0x1c06a3
 	db "@"
 
-Script_AskWaterfall: ; 0xcb86
+Script_AskWaterfall:
 	opentext
 	writetext .AskUseWaterfall
 	yesorno
@@ -752,17 +750,17 @@ Script_AskWaterfall: ; 0xcb86
 	closetext
 	end
 
-.AskUseWaterfall: ; 0xcb90
+.AskUseWaterfall:
 	; Do you want to use WATERFALL?
 	text_jump UnknownText_0x1c06bf
 	db "@"
 
-EscapeRopeFunction: ; cb95
+EscapeRopeFunction:
 	call FieldMoveJumptableReset
 	ld a, $1
 	jr dig_incave
 
-DigFunction: ; cb9c
+DigFunction:
 	call FieldMoveJumptableReset
 	ld a, $2
 
@@ -776,12 +774,12 @@ dig_incave
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.DigTable: ; cbb2
+.DigTable:
 	dw .CheckCanDig
 	dw .DoDig
 	dw .FailDig
 
-.CheckCanDig: ; cbb8
+.CheckCanDig:
 	call GetMapEnvironment
 	cp CAVE
 	jr z, .incave
@@ -805,7 +803,7 @@ dig_incave
 	ld a, $1
 	ret
 
-.DoDig: ; cbd8
+.DoDig:
 	ld hl, wDigWarpNumber
 	ld de, wNextWarp
 	ld bc, 3
@@ -826,7 +824,7 @@ dig_incave
 	ld a, $81
 	ret
 
-.FailDig: ; cc06
+.FailDig:
 	ld a, [wBuffer2]
 	cp $2
 	jr nz, .failescaperope
@@ -839,56 +837,56 @@ dig_incave
 	ld a, $80
 	ret
 
-.Text_UsedDig: ; 0xcc1c
+.Text_UsedDig:
 	; used DIG!
 	text_jump UnknownText_0x1c06de
 	db "@"
 
-.Text_UsedEscapeRope: ; 0xcc21
+.Text_UsedEscapeRope:
 	; used an ESCAPE ROPE.
 	text_jump UnknownText_0x1c06ed
 	db "@"
 
-.Text_CantUseHere: ; 0xcc26
+.Text_CantUseHere:
 	; Can't use that here.
 	text_jump UnknownText_0x1c0705
 	db "@"
 
-.UsedEscapeRopeScript: ; 0xcc2b
+.UsedEscapeRopeScript:
 	reloadmappart
 	special UpdateTimePals
 	writetext .Text_UsedEscapeRope
 	jump .UsedDigOrEscapeRopeScript
 
-.UsedDigScript: ; 0xcc35
+.UsedDigScript:
 	reloadmappart
 	special UpdateTimePals
 	writetext .Text_UsedDig
 
-.UsedDigOrEscapeRopeScript: ; 0xcc3c
+.UsedDigOrEscapeRopeScript:
 	waitbutton
 	closetext
 	playsound SFX_WARP_TO
 	applymovement PLAYER, .DigOut
 	farscall Script_AbortBugContest
-	special Special_WarpToSpawnPoint
+	special WarpToSpawnPoint
 	writecode VAR_MOVEMENT, PLAYER_NORMAL
 	newloadmap MAPSETUP_DOOR
 	playsound SFX_WARP_FROM
 	applymovement PLAYER, .DigReturn
 	end
 
-.DigOut: ; 0xcc59
+.DigOut:
 	step_dig 32
 	hide_object
 	step_end
 
-.DigReturn: ; 0xcc5d
+.DigReturn:
 	show_object
 	return_dig 32
 	step_end
 
-TeleportFunction: ; cc61
+TeleportFunction:
 	call FieldMoveJumptableReset
 .loop
 	ld hl, .Jumptable
@@ -898,12 +896,12 @@ TeleportFunction: ; cc61
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.Jumptable: ; cc72
+.Jumptable:
 	dw .TryTeleport
 	dw .DoTeleport
 	dw .FailTeleport
 
-.TryTeleport: ; cc78
+.TryTeleport:
 	call GetMapEnvironment
 	call CheckOutdoorMap
 	jr z, .CheckIfSpawnPoint
@@ -925,30 +923,30 @@ TeleportFunction: ; cc61
 	ld a, $2
 	ret
 
-.DoTeleport: ; cc9c
+.DoTeleport:
 	call GetPartyNick
 	ld hl, .TeleportScript
 	call QueueScript
 	ld a, $81
 	ret
 
-.FailTeleport: ; cca8
+.FailTeleport:
 	ld hl, .Text_CantUseHere
 	call MenuTextBoxBackup
 	ld a, $80
 	ret
 
-.Text_ReturnToLastMonCenter: ; 0xccb1
+.Text_ReturnToLastMonCenter:
 	; Return to the last #MON CENTER.
 	text_jump UnknownText_0x1c071a
 	db "@"
 
-.Text_CantUseHere: ; 0xccb6
+.Text_CantUseHere:
 	; Can't use that here.
 	text_jump UnknownText_0x1c073b
 	db "@"
 
-.TeleportScript: ; 0xccbb
+.TeleportScript:
 	reloadmappart
 	special UpdateTimePals
 	writetext .Text_ReturnToLastMonCenter
@@ -958,28 +956,28 @@ TeleportFunction: ; cc61
 	playsound SFX_WARP_TO
 	applymovement PLAYER, .TeleportFrom
 	farscall Script_AbortBugContest
-	special Special_WarpToSpawnPoint
+	special WarpToSpawnPoint
 	writecode VAR_MOVEMENT, PLAYER_NORMAL
 	newloadmap MAPSETUP_TELEPORT
 	playsound SFX_WARP_FROM
 	applymovement PLAYER, .TeleportTo
 	end
 
-.TeleportFrom: ; cce1
+.TeleportFrom:
 	teleport_from
 	step_end
 
-.TeleportTo: ; cce3
+.TeleportTo:
 	teleport_to
 	step_end
 
-StrengthFunction: ; cce5
+StrengthFunction:
 	call .TryStrength
 	and $7f
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.TryStrength: ; ccee
+.TryStrength:
 ; Strength
 	ld de, ENGINE_PLAINBADGE
 	call CheckBadge
@@ -992,23 +990,23 @@ StrengthFunction: ; cce5
 	ld a, $80
 	ret
 
-.JumpText: ; 0xcd01
+.JumpText:
 	text_jump UnknownText_0x1c0751
 	db "@"
 
-.Failed: ; cd06
+.Failed:
 	ld a, $80
 	ret
 
-.UseStrength: ; cd09
+.UseStrength:
 	ld hl, Script_StrengthFromMenu
 	call QueueScript
 	ld a, $81
 	ret
 
-SetStrengthFlag: ; cd12
+SetStrengthFlag:
 	ld hl, wBikeFlags
-	set 0, [hl]
+	set BIKEFLAGS_STRENGTH_ACTIVE_F, [hl]
 	ld a, [wCurPartyMon]
 	ld e, a
 	ld d, 0
@@ -1019,11 +1017,11 @@ SetStrengthFlag: ; cd12
 	call GetPartyNick
 	ret
 
-Script_StrengthFromMenu: ; 0xcd29
+Script_StrengthFromMenu:
 	reloadmappart
 	special UpdateTimePals
 
-Script_UsedStrength: ; 0xcd2d
+Script_UsedStrength:
 	callasm SetStrengthFlag
 	writetext .UsedStrength
 	copybytetovar wBuffer6
@@ -1033,27 +1031,27 @@ Script_UsedStrength: ; 0xcd2d
 	closetext
 	end
 
-.UsedStrength: ; 0xcd41
+.UsedStrength:
 	text_jump UnknownText_0x1c0774
 	db "@"
 
-.StrengthAllowedItToMoveBoulders: ; 0xcd46
+.StrengthAllowedItToMoveBoulders:
 	text_jump UnknownText_0x1c0788
 	db "@"
 
 AskStrengthScript:
 	callasm TryStrengthOW
 	iffalse .AskStrength
-	if_equal $1, .DontMeetRequirements
+	ifequal $1, .DontMeetRequirements
 	jump .AlreadyUsedStrength
 
-.DontMeetRequirements: ; 0xcd59
+.DontMeetRequirements:
 	jumptext UnknownText_0xcd73
 
-.AlreadyUsedStrength: ; 0xcd5c
+.AlreadyUsedStrength:
 	jumptext UnknownText_0xcd6e
 
-.AskStrength: ; 0xcd5f
+.AskStrength:
 	opentext
 	writetext UnknownText_0xcd69
 	yesorno
@@ -1061,22 +1059,22 @@ AskStrengthScript:
 	closetext
 	end
 
-UnknownText_0xcd69: ; 0xcd69
+UnknownText_0xcd69:
 	; A #MON may be able to move this. Want to use STRENGTH?
 	text_jump UnknownText_0x1c07a0
 	db "@"
 
-UnknownText_0xcd6e: ; 0xcd6e
+UnknownText_0xcd6e:
 	; Boulders may now be moved!
 	text_jump UnknownText_0x1c07d8
 	db "@"
 
-UnknownText_0xcd73: ; 0xcd73
+UnknownText_0xcd73:
 	; A #MON may be able to move this.
 	text_jump UnknownText_0x1c07f4
 	db "@"
 
-TryStrengthOW: ; cd78
+TryStrengthOW:
 	ld d, STRENGTH
 	call CheckPartyMove
 	jr c, .nope
@@ -1086,7 +1084,7 @@ TryStrengthOW: ; cd78
 	jr c, .nope
 
 	ld hl, wBikeFlags
-	bit 0, [hl]
+	bit BIKEFLAGS_STRENGTH_ACTIVE_F, [hl]
 	jr z, .already_using
 
 	ld a, 2
@@ -1104,7 +1102,7 @@ TryStrengthOW: ; cd78
 	ld [wScriptVar], a
 	ret
 
-WhirlpoolFunction: ; cd9d
+WhirlpoolFunction:
 	call FieldMoveJumptableReset
 .loop
 	ld hl, Jumptable_cdae
@@ -1114,12 +1112,12 @@ WhirlpoolFunction: ; cd9d
 	ld [wFieldMoveSucceeded], a
 	ret
 
-Jumptable_cdae: ; cdae
+Jumptable_cdae:
 	dw .TryWhirlpool
 	dw .DoWhirlpool
 	dw .FailWhirlpool
 
-.TryWhirlpool: ; cdb4
+.TryWhirlpool:
 	ld de, ENGINE_GLACIERBADGE
 	call CheckBadge
 	jr c, .noglacierbadge
@@ -1136,23 +1134,23 @@ Jumptable_cdae: ; cdae
 	ld a, $80
 	ret
 
-.DoWhirlpool: ; cdca
+.DoWhirlpool:
 	ld hl, Script_WhirlpoolFromMenu
 	call QueueScript
 	ld a, $81
 	ret
 
-.FailWhirlpool: ; cdd3
+.FailWhirlpool:
 	call FieldMoveFailed
 	ld a, $80
 	ret
 
-Text_UsedWhirlpool: ; 0xcdd9
+Text_UsedWhirlpool:
 	; used WHIRLPOOL!
 	text_jump UnknownText_0x1c0816
 	db "@"
 
-TryWhirlpoolMenu: ; cdde
+TryWhirlpoolMenu:
 	call GetFacingTileCoord
 	ld c, a
 	push de
@@ -1181,11 +1179,11 @@ TryWhirlpoolMenu: ; cdde
 	scf
 	ret
 
-Script_WhirlpoolFromMenu: ; 0xce0b
+Script_WhirlpoolFromMenu:
 	reloadmappart
 	special UpdateTimePals
 
-Script_UsedWhirlpool: ; 0xce0f
+Script_UsedWhirlpool:
 	callasm GetPartyNick
 	writetext Text_UsedWhirlpool
 	reloadmappart
@@ -1193,7 +1191,7 @@ Script_UsedWhirlpool: ; 0xce0f
 	closetext
 	end
 
-DisappearWhirlpool: ; ce1d
+DisappearWhirlpool:
 	ld hl, wBuffer3
 	ld a, [hli]
 	ld h, [hl]
@@ -1210,7 +1208,7 @@ DisappearWhirlpool: ; ce1d
 	call GetMovementPermissions
 	ret
 
-TryWhirlpoolOW:: ; ce3e
+TryWhirlpoolOW::
 	ld d, WHIRLPOOL
 	call CheckPartyMove
 	jr c, .failed
@@ -1232,14 +1230,14 @@ TryWhirlpoolOW:: ; ce3e
 	scf
 	ret
 
-Script_MightyWhirlpool: ; 0xce66
+Script_MightyWhirlpool:
 	jumptext .MightyWhirlpoolText
 
-.MightyWhirlpoolText: ; 0xce69
+.MightyWhirlpoolText:
 	text_jump UnknownText_0x1c082b
 	db "@"
 
-Script_AskWhirlpoolOW: ; 0xce6e
+Script_AskWhirlpoolOW:
 	opentext
 	writetext UnknownText_0xce78
 	yesorno
@@ -1247,17 +1245,17 @@ Script_AskWhirlpoolOW: ; 0xce6e
 	closetext
 	end
 
-UnknownText_0xce78: ; 0xce78
+UnknownText_0xce78:
 	text_jump UnknownText_0x1c0864
 	db "@"
 
-HeadbuttFunction: ; ce7d
+HeadbuttFunction:
 	call TryHeadbuttFromMenu
 	and $7f
 	ld [wFieldMoveSucceeded], a
 	ret
 
-TryHeadbuttFromMenu: ; ce86
+TryHeadbuttFromMenu:
 	call GetFacingTileCoord
 	call CheckHeadbuttTreeTile
 	jr nz, .no_tree
@@ -1272,21 +1270,21 @@ TryHeadbuttFromMenu: ; ce86
 	ld a, $80
 	ret
 
-UnknownText_0xce9d: ; 0xce9d
+UnknownText_0xce9d:
 	; did a HEADBUTT!
 	text_jump UnknownText_0x1c0897
 	db "@"
 
-UnknownText_0xcea2: ; 0xcea2
+UnknownText_0xcea2:
 	; Nope. Nothing…
 	text_jump UnknownText_0x1c08ac
 	db "@"
 
-HeadbuttFromMenuScript: ; 0xcea7
+HeadbuttFromMenuScript:
 	reloadmappart
 	special UpdateTimePals
 
-HeadbuttScript: ; 0xceab
+HeadbuttScript:
 	callasm GetPartyNick
 	writetext UnknownText_0xce9d
 
@@ -1307,7 +1305,7 @@ HeadbuttScript: ; 0xceab
 	closetext
 	end
 
-TryHeadbuttOW:: ; cec9
+TryHeadbuttOW::
 	ld d, HEADBUTT
 	call CheckPartyMove
 	jr c, .no
@@ -1322,7 +1320,7 @@ TryHeadbuttOW:: ; cec9
 	xor a
 	ret
 
-AskHeadbuttScript: ; 0xcedc
+AskHeadbuttScript:
 	opentext
 	writetext UnknownText_0xcee6
 	yesorno
@@ -1330,18 +1328,18 @@ AskHeadbuttScript: ; 0xcedc
 	closetext
 	end
 
-UnknownText_0xcee6: ; 0xcee6
+UnknownText_0xcee6:
 	; A #MON could be in this tree. Want to HEADBUTT it?
 	text_jump UnknownText_0x1c08bc
 	db "@"
 
-RockSmashFunction: ; ceeb
+RockSmashFunction:
 	call TryRockSmashFromMenu
 	and $7f
 	ld [wFieldMoveSucceeded], a
 	ret
 
-TryRockSmashFromMenu: ; cef4
+TryRockSmashFromMenu:
 	call GetFacingObject
 	jr c, .no_rock
 	ld a, d
@@ -1358,7 +1356,7 @@ TryRockSmashFromMenu: ; cef4
 	ld a, $80
 	ret
 
-GetFacingObject: ; cf0d
+GetFacingObject:
 	farcall CheckFacingObject
 	jr nc, .fail
 
@@ -1380,11 +1378,11 @@ GetFacingObject: ; cf0d
 	scf
 	ret
 
-RockSmashFromMenuScript: ; 0xcf2e
+RockSmashFromMenuScript:
 	reloadmappart
 	special UpdateTimePals
 
-RockSmashScript: ; cf32
+RockSmashScript:
 	callasm GetPartyNick
 	writetext UnknownText_0xcf58
 	closetext
@@ -1403,17 +1401,17 @@ RockSmashScript: ; cf32
 .done
 	end
 
-MovementData_0xcf55: ; 0xcf55
+MovementData_0xcf55:
 	rock_smash 10
 	step_end
 
-UnknownText_0xcf58: ; 0xcf58
+UnknownText_0xcf58:
 	text_jump UnknownText_0x1c08f0
 	db "@"
 
-AskRockSmashScript: ; 0xcf5d
+AskRockSmashScript:
 	callasm HasRockSmash
-	if_equal 1, .no
+	ifequal 1, .no
 
 	opentext
 	writetext UnknownText_0xcf77
@@ -1424,17 +1422,17 @@ AskRockSmashScript: ; 0xcf5d
 .no
 	jumptext UnknownText_0xcf72
 
-UnknownText_0xcf72: ; 0xcf72
+UnknownText_0xcf72:
 	; Maybe a #MON can break this.
 	text_jump UnknownText_0x1c0906
 	db "@"
 
-UnknownText_0xcf77: ; 0xcf77
+UnknownText_0xcf77:
 	; This rock looks breakable. Want to use ROCK SMASH?
 	text_jump UnknownText_0x1c0924
 	db "@"
 
-HasRockSmash: ; cf7c
+HasRockSmash:
 	ld d, ROCK_SMASH
 	call CheckPartyMove
 	jr nc, .yes
@@ -1448,7 +1446,7 @@ HasRockSmash: ; cf7c
 	ld [wScriptVar], a
 	ret
 
-FishFunction: ; cf8e
+FishFunction:
 	ld a, e
 	push af
 	call FieldMoveJumptableReset
@@ -1462,14 +1460,14 @@ FishFunction: ; cf8e
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.FishTable: ; cfa5
+.FishTable:
 	dw .TryFish
 	dw .FishNoBite
 	dw .FishGotSomething
 	dw .FailFish
 	dw .FishNoFish
 
-.TryFish: ; cfaf
+.TryFish:
 	ld a, [wPlayerState]
 	cp PLAYER_SURF
 	jr z, .fail
@@ -1510,11 +1508,11 @@ FishFunction: ; cf8e
 	ld a, $1
 	ret
 
-.FailFish: ; cff1
+.FailFish:
 	ld a, $80
 	ret
 
-.FishGotSomething: ; cff4
+.FishGotSomething:
 	ld a, $1
 	ld [wBuffer6], a
 	ld hl, Script_GotABite
@@ -1522,7 +1520,7 @@ FishFunction: ; cf8e
 	ld a, $81
 	ret
 
-.FishNoBite: ; d002
+.FishNoBite:
 	ld a, $2
 	ld [wBuffer6], a
 	ld hl, Script_NotEvenANibble
@@ -1530,7 +1528,7 @@ FishFunction: ; cf8e
 	ld a, $81
 	ret
 
-.FishNoFish: ; d010
+.FishNoFish:
 	ld a, $0
 	ld [wBuffer6], a
 	ld hl, Script_NotEvenANibble2
@@ -1538,32 +1536,32 @@ FishFunction: ; cf8e
 	ld a, $81
 	ret
 
-Script_NotEvenANibble: ; 0xd01e
+Script_NotEvenANibble:
 	scall Script_FishCastRod
 	writetext UnknownText_0xd0a9
 	jump Script_NotEvenANibble_FallThrough
 
-Script_NotEvenANibble2: ; 0xd027
+Script_NotEvenANibble2:
 	scall Script_FishCastRod
 	writetext UnknownText_0xd0a9
 
-Script_NotEvenANibble_FallThrough: ; 0xd02d
+Script_NotEvenANibble_FallThrough:
 	loademote EMOTE_SHADOW
 	callasm PutTheRodAway
 	closetext
 	end
 
-Script_GotABite: ; 0xd035
+Script_GotABite:
 	scall Script_FishCastRod
 	callasm Fishing_CheckFacingUp
 	iffalse .NotFacingUp
 	applymovement PLAYER, .Movement_FacingUp
 	jump .FightTheHookedPokemon
 
-.NotFacingUp: ; 0xd046
+.NotFacingUp:
 	applymovement PLAYER, .Movement_NotFacingUp
 
-.FightTheHookedPokemon: ; 0xd04a
+.FightTheHookedPokemon:
 	pause 40
 	applymovement PLAYER, .Movement_RestoreRod
 	writetext UnknownText_0xd0a4
@@ -1574,7 +1572,7 @@ Script_GotABite: ; 0xd035
 	reloadmapafterbattle
 	end
 
-.Movement_NotFacingUp: ; d05c
+.Movement_NotFacingUp:
 	fish_got_bite
 	fish_got_bite
 	fish_got_bite
@@ -1582,7 +1580,7 @@ Script_GotABite: ; 0xd035
 	show_emote
 	step_end
 
-.Movement_FacingUp: ; d062
+.Movement_FacingUp:
 	fish_got_bite
 	fish_got_bite
 	fish_got_bite
@@ -1591,12 +1589,12 @@ Script_GotABite: ; 0xd035
 	show_emote
 	step_end
 
-.Movement_RestoreRod: ; d069
+.Movement_RestoreRod:
 	hide_emote
 	fish_cast_rod
 	step_end
 
-Fishing_CheckFacingUp: ; d06c
+Fishing_CheckFacingUp:
 	ld a, [wPlayerDirection]
 	and $c
 	cp OW_UP
@@ -1608,7 +1606,7 @@ Fishing_CheckFacingUp: ; d06c
 	ld [wScriptVar], a
 	ret
 
-Script_FishCastRod: ; 0xd07c
+Script_FishCastRod:
 	reloadmappart
 	loadvar hBGMapMode, $0
 	special UpdateTimePals
@@ -1619,11 +1617,11 @@ Script_FishCastRod: ; 0xd07c
 	pause 40
 	end
 
-MovementData_0xd093: ; d093
+MovementData_0xd093:
 	fish_cast_rod
 	step_end
 
-PutTheRodAway: ; d095
+PutTheRodAway:
 	xor a
 	ld [hBGMapMode], a
 	ld a, $1
@@ -1632,12 +1630,12 @@ PutTheRodAway: ; d095
 	call ReplaceKrisSprite
 	ret
 
-UnknownText_0xd0a4: ; 0xd0a4
+UnknownText_0xd0a4:
 	; Oh! A bite!
 	text_jump UnknownText_0x1c0958
 	db "@"
 
-UnknownText_0xd0a9: ; 0xd0a9
+UnknownText_0xd0a9:
 	; Not even a nibble!
 	text_jump UnknownText_0x1c0965
 	db "@"
@@ -1647,13 +1645,13 @@ UnknownText_0xd0ae: ; unused
 	text_jump UnknownText_0x1c0979
 	db "@"
 
-BikeFunction: ; d0b3
+BikeFunction:
 	call .TryBike
 	and $7f
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.TryBike: ; d0bc
+.TryBike:
 	call .CheckEnvironment
 	jr c, .CannotUseBike
 	ld a, [wPlayerState]
@@ -1683,7 +1681,7 @@ BikeFunction: ; d0b3
 
 .GetOffBike:
 	ld hl, wBikeFlags
-	bit 1, [hl]
+	bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl]
 	jr nz, .CantGetOffBike
 	ld hl, Script_GetOffBike
 	ld de, Script_GetOffBike_Register
@@ -1704,7 +1702,7 @@ BikeFunction: ; d0b3
 	ld a, $1
 	ret
 
-.CheckIfRegistered: ; d119
+.CheckIfRegistered:
 	ld a, [wUsingItemWithSelect]
 	and a
 	ret z
@@ -1712,7 +1710,7 @@ BikeFunction: ; d0b3
 	ld l, e
 	ret
 
-.CheckEnvironment: ; d121
+.CheckEnvironment:
 	call GetMapEnvironment
 	call CheckOutdoorMap
 	jr z, .ok
@@ -1733,7 +1731,7 @@ BikeFunction: ; d0b3
 	scf
 	ret
 
-Script_GetOnBike: ; 0xd13e
+Script_GetOnBike:
 	reloadmappart
 	special UpdateTimePals
 	writecode VAR_MOVEMENT, PLAYER_BIKE
@@ -1743,7 +1741,7 @@ Script_GetOnBike: ; 0xd13e
 	special ReplaceKrisSprite
 	end
 
-Script_GetOnBike_Register: ; 0xd14e
+Script_GetOnBike_Register:
 	writecode VAR_MOVEMENT, PLAYER_BIKE
 	closetext
 	special ReplaceKrisSprite
@@ -1753,7 +1751,7 @@ Script_GetOnBike_Register: ; 0xd14e
 	nop
 	ret
 
-Script_GetOffBike: ; 0xd158
+Script_GetOffBike:
 	reloadmappart
 	special UpdateTimePals
 	writecode VAR_MOVEMENT, PLAYER_NORMAL
@@ -1766,32 +1764,32 @@ FinishGettingOffBike:
 	special PlayMapMusic
 	end
 
-Script_GetOffBike_Register: ; 0xd16b
+Script_GetOffBike_Register:
 	writecode VAR_MOVEMENT, PLAYER_NORMAL
 	jump FinishGettingOffBike
 
-Script_CantGetOffBike: ; 0xd171
+Script_CantGetOffBike:
 	writetext .CantGetOffBikeText
 	waitbutton
 	closetext
 	end
 
-.CantGetOffBikeText: ; 0xd177
+.CantGetOffBikeText:
 	; You can't get off here!
 	text_jump UnknownText_0x1c099a
 	db "@"
 
-GotOnTheBikeText: ; 0xd17c
+GotOnTheBikeText:
 	; got on the @ .
 	text_jump UnknownText_0x1c09b2
 	db "@"
 
-GotOffTheBikeText: ; 0xd181
+GotOffTheBikeText:
 	; got off the @ .
 	text_jump UnknownText_0x1c09c7
 	db "@"
 
-TryCutOW:: ; d186
+TryCutOW::
 	ld d, CUT
 	call CheckPartyMove
 	jr c, .cant_cut
@@ -1813,7 +1811,7 @@ TryCutOW:: ; d186
 	scf
 	ret
 
-AskCutScript: ; 0xd1a9
+AskCutScript:
 	opentext
 	writetext UnknownText_0xd1c8
 	yesorno
@@ -1824,7 +1822,7 @@ AskCutScript: ; 0xd1a9
 	closetext
 	end
 
-.CheckMap: ; d1ba
+.CheckMap:
 	xor a
 	ld [wScriptVar], a
 	call CheckMapForSomethingToCut
@@ -1833,13 +1831,13 @@ AskCutScript: ; 0xd1a9
 	ld [wScriptVar], a
 	ret
 
-UnknownText_0xd1c8: ; 0xd1c8
+UnknownText_0xd1c8:
 	text_jump UnknownText_0x1c09dd
 	db "@"
 
-CantCutScript: ; 0xd1cd
+CantCutScript:
 	jumptext UnknownText_0xd1d0
 
-UnknownText_0xd1d0: ; 0xd1d0
+UnknownText_0xd1d0:
 	text_jump UnknownText_0x1c0a05
 	db "@"
diff --git a/engine/routines/playslowcry.asm b/engine/events/play_slow_cry.asm
index 1dc6c78ac..6839b3960 100644
--- a/engine/routines/playslowcry.asm
+++ b/engine/events/play_slow_cry.asm
@@ -1,4 +1,4 @@
-Special_PlaySlowCry: ; fb841
+PlaySlowCry:
 	ld a, [wScriptVar]
 	call LoadCry
 	jr c, .done
@@ -28,4 +28,3 @@ Special_PlaySlowCry: ; fb841
 
 .done
 	ret
-; fb877
diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm
index 47916076f..c7ba7660f 100755..100644
--- a/engine/events/poisonstep.asm
+++ b/engine/events/poisonstep.asm
@@ -1,4 +1,4 @@
-DoPoisonStep:: ; 505da
+DoPoisonStep::
 	ld a, [wPartyCount]
 	and a
 	jr z, .no_faint
@@ -55,9 +55,8 @@ DoPoisonStep:: ; 505da
 .no_faint
 	xor a
 	ret
-; 5062e
 
-.DamageMonIfPoisoned: ; 5062e
+.DamageMonIfPoisoned:
 ; check if mon is poisoned, return if not
 	ld a, MON_STATUS
 	call GetPartyParamLocation
@@ -98,31 +97,27 @@ DoPoisonStep:: ; 505da
 	ld c, %01
 	scf
 	ret
-; 50658
 
-.PlayPoisonSFX: ; 50658
+.PlayPoisonSFX:
 	ld de, SFX_POISON
 	call PlaySFX
 	ld b, $2
 	predef LoadPoisonBGPals
 	call DelayFrame
 	ret
-; 50669
 
-.Script_MonFaintedToPoison: ; 50669
+.Script_MonFaintedToPoison:
 	callasm .PlayPoisonSFX
 	opentext
 	callasm .CheckWhitedOut
 	iffalse .whiteout
 	closetext
 	end
-; 50677
 
-.whiteout ; 50677
+.whiteout
 	farjump Script_OverworldWhiteout
-; 5067b
 
-.CheckWhitedOut: ; 5067b
+.CheckWhitedOut:
 	xor a
 	ld [wCurPartyMon], a
 	ld de, wEngineBuffer2
@@ -145,18 +140,15 @@ DoPoisonStep:: ; 505da
 	ld a, [wPartyCount]
 	cp [hl]
 	jr nz, .party_loop
-	predef CheckPlayerPartyForFitPkmn
+	predef CheckPlayerPartyForFitMon
 	ld a, d
 	ld [wScriptVar], a
 	ret
-; 506b2
 
-.PoisonFaintText: ; 506b2
+.PoisonFaintText:
 	text_jump UnknownText_0x1c0acc
 	db "@"
-; 506b7
 
-.PoisonWhiteOutText: ; 506b7
+.PoisonWhiteOutText:
 	text_jump UnknownText_0x1c0ada
 	db "@"
-; 506bc
diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm
index c1bfa49f0..354aabb28 100644
--- a/engine/events/poisonstep_pals.asm
+++ b/engine/events/poisonstep_pals.asm
@@ -1,11 +1,11 @@
-LoadPoisonBGPals: ; cbcdd
+LoadPoisonBGPals:
 	call .LoadPals
 	ld a, [hCGB]
 	and a
 	ret nz
 	ret ; ????
 
-.LoadPals: ; cbce5
+.LoadPals:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm
index 85fc7af2d..dc99cb536 100644
--- a/engine/events/poke_seer.asm
+++ b/engine/events/poke_seer.asm
@@ -15,7 +15,7 @@
 	const SEERACTION_CANT_TELL_2
 	const SEERACTION_LEVEL_ONLY
 
-Special_PokeSeer: ; 4f0bc
+PokeSeer:
 	ld a, SEER_INTRO
 	call PrintSeerText
 	call JoyWaitAorB
@@ -47,34 +47,29 @@ Special_PokeSeer: ; 4f0bc
 	ld a, SEER_EGG
 	call PrintSeerText
 	ret
-; 4f0ee
 
-
-SeerAction: ; 4f0ee
+SeerAction:
 	ld a, [wSeerAction]
 	ld hl, SeerActions
 	rst JumpTable
 	ret
-; 4f0f6
 
-SeerActions: ; 4f0f6
+SeerActions:
 	dw SeerAction0
 	dw SeerAction1
 	dw SeerAction2
 	dw SeerAction3
 	dw SeerAction4
-; 4f100
 
-SeerAction0: ; 4f100
+SeerAction0:
 	ld a, SEER_MET_AT
 	call PrintSeerText
 	ld a, SEER_TIME_LEVEL
 	call PrintSeerText
 	call SeerAdvice
 	ret
-; 4f10e
 
-SeerAction1: ; 4f10e
+SeerAction1:
 	call GetCaughtOT
 	ld a, SEER_TRADED
 	call PrintSeerText
@@ -82,28 +77,24 @@ SeerAction1: ; 4f10e
 	call PrintSeerText
 	call SeerAdvice
 	ret
-; 4f11f
 
-SeerAction2: ; 4f11f
+SeerAction2:
 	ld a, SEER_CANT_TELL
 	call PrintSeerText
 	ret
-; 4f125
 
-SeerAction3: ; 4f125
+SeerAction3:
 	ld a, SEER_CANT_TELL
 	call PrintSeerText
 	ret
-; 4f12b
 
-SeerAction4: ; 4f12b
+SeerAction4:
 	ld a, SEER_LEVEL_ONLY
 	call PrintSeerText
 	call SeerAdvice
 	ret
-; 4f134
 
-ReadCaughtData: ; 4f134
+ReadCaughtData:
 	ld a, MON_CAUGHTDATA
 	call GetPartyParamLocation
 	ld a, [hli]
@@ -143,9 +134,8 @@ ReadCaughtData: ; 4f134
 	ld a, SEERACTION_CANT_TELL_1
 	ld [wSeerAction], a
 	ret
-; 4f176
 
-GetCaughtName: ; 4f176
+GetCaughtName:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
 	ld bc, MON_NAME_LENGTH
@@ -154,9 +144,8 @@ GetCaughtName: ; 4f176
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 	ret
-; 4f18c
 
-GetCaughtLevel: ; 4f18c
+GetCaughtLevel:
 	ld a, "@"
 	ld hl, wSeerCaughtLevelString
 	ld bc, 4
@@ -185,13 +174,11 @@ GetCaughtLevel: ; 4f18c
 	ld bc, 4
 	call CopyBytes
 	ret
-; 4f1c1
 
-.unknown_level ; 4f1c1
+.unknown_level
 	db "???@"
-; 4f1c5
 
-GetCaughtTime: ; 4f1c5
+GetCaughtTime:
 	ld a, [wSeerCaughtData]
 	and CAUGHT_TIME_MASK
 	jr z, .none
@@ -212,26 +199,22 @@ GetCaughtTime: ; 4f1c5
 	ld de, wSeerTimeOfDay
 	call UnknownCaughtData
 	ret
-; 4f1e6
 
-.times ; 4f1e6
+.times
 	db "Morning@"
 	db "Day@"
 	db "Night@"
-; 4f1f8
 
-UnknownCaughtData: ; 4f1f8
+UnknownCaughtData:
 	ld hl, .unknown
 	ld bc, NAME_LENGTH
 	call CopyBytes
 	ret
-; 4f202
 
-.unknown ; 4f202
+.unknown
 	db "Unknown@"
-; 4f20a
 
-GetCaughtLocation: ; 4f20a
+GetCaughtLocation:
 	ld a, [wSeerCaughtGender]
 	and CAUGHT_LOCATION_MASK
 	jr z, .Unknown
@@ -263,9 +246,8 @@ GetCaughtLocation: ; 4f20a
 	ld [wSeerAction], a
 	scf
 	ret
-; 4f242
 
-GetCaughtOT: ; 4f242
+GetCaughtOT:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonOT
 	ld bc, NAME_LENGTH
@@ -286,15 +268,13 @@ GetCaughtOT: ; 4f242
 	ld a, "@"
 	ld [de], a
 	ret
-; 4f26b
 
-.male ; 4f26b
+.male
 	db "@"
-.female ; 4f26c
+.female
 	db "@"
-; 4f26d
 
-PrintSeerText: ; 4f26d
+PrintSeerText:
 	ld e, a
 	ld d, 0
 	ld hl, SeerTexts
@@ -305,9 +285,8 @@ PrintSeerText: ; 4f26d
 	ld l, a
 	call PrintText
 	ret
-; 4f27c
 
-SeerTexts: ; 4f27c
+SeerTexts:
 	dw SeerIntroText
 	dw SeerCantTellText
 	dw SeerMetAtText
@@ -316,58 +295,48 @@ SeerTexts: ; 4f27c
 	dw SeerCancelText
 	dw SeerEggText
 	dw SeerLevelOnlyText
-; 4f28c
 
-SeerIntroText: ; 0x4f28c
+SeerIntroText:
 	; I see all. I know all… Certainly, I know of your #MON!
 	text_jump UnknownText_0x1c475f
 	db "@"
-; 0x4f291
 
-SeerCantTellText: ; 0x4f291
+SeerCantTellText:
 	; Whaaaat? I can't tell a thing! How could I not know of this?
 	text_jump UnknownText_0x1c4797
 	db "@"
-; 0x4f296
 
-SeerMetAtText: ; 0x4f296
+SeerMetAtText:
 	; Hm… I see you met @  here: @ !
 	text_jump UnknownText_0x1c47d4
 	db "@"
-; 0x4f29b
 
-SeerTimeLevelText: ; 0x4f29b
+SeerTimeLevelText:
 	; The time was @ ! Its level was @ ! Am I good or what?
 	text_jump UnknownText_0x1c47fa
 	db "@"
-; 0x4f2a0
 
-SeerTradedText: ; 0x4f2a0
+SeerTradedText:
 	; Hm… @ came from @ in a trade? @ was where @ met @ !
 	text_jump UnknownText_0x1c4837
 	db "@"
-; 0x4f2a5
 
-SeerLevelOnlyText: ; 0x4f2a5
+SeerLevelOnlyText:
 	; What!? Incredible! I don't understand how, but it is incredible! You are special. I can't tell where you met it, but it was at level @ . Am I good or what?
 	text_jump UnknownText_0x1c487f
 	db "@"
-; 0x4f2aa
 
-SeerEggText: ; 0x4f2aa
+SeerEggText:
 	; Hey! That's an EGG! You can't say that you've met it yet…
 	text_jump UnknownText_0x1c491d
 	db "@"
-; 0x4f2af
 
-SeerCancelText: ; 0x4f2af
+SeerCancelText:
 	; Fufufu! I saw that you'd do nothing!
 	text_jump UnknownText_0x1c4955
 	db "@"
-; 0x4f2b4
 
-
-SeerAdvice: ; 4f2b4
+SeerAdvice:
 	ld a, MON_LEVEL
 	call GetPartyParamLocation
 	ld a, [wSeerCaughtLevel]
@@ -392,9 +361,8 @@ SeerAdvice: ; 4f2b4
 	ld l, a
 	call PrintText
 	ret
-; 4f2d6
 
-SeerAdviceTexts: ; 4f2d6
+SeerAdviceTexts:
 ; level, text
 	dbw 9,   SeerAdvice1
 	dbw 29,  SeerAdvice2
@@ -402,40 +370,33 @@ SeerAdviceTexts: ; 4f2d6
 	dbw 89,  SeerAdvice4
 	dbw 100, SeerAdvice5
 	dbw 255, SeerAdvice1
-; 4f2e8
 
-SeerAdvice1: ; 0x4f2e8
+SeerAdvice1:
 	; Incidentally… It would be wise to raise your #MON with a little more care.
 	text_jump UnknownText_0x1c497a
 	db "@"
-; 0x4f2ed
 
-SeerAdvice2: ; 0x4f2ed
+SeerAdvice2:
 	; Incidentally… It seems to have grown a little. @  seems to be becoming more confident.
 	text_jump UnknownText_0x1c49c6
 	db "@"
-; 0x4f2f2
 
-SeerAdvice3: ; 0x4f2f2
+SeerAdvice3:
 	; Incidentally… @  has grown. It's gained much strength.
 	text_jump UnknownText_0x1c4a21
 	db "@"
-; 0x4f2f7
 
-SeerAdvice4: ; 0x4f2f7
+SeerAdvice4:
 	; Incidentally… It certainly has grown mighty! This @ must have come through numerous #MON battles. It looks brimming with confidence.
 	text_jump UnknownText_0x1c4a5b
 	db "@"
-; 0x4f2fc
 
-SeerAdvice5: ; 0x4f2fc
+SeerAdvice5:
 	; Incidentally… I'm impressed by your dedication. It's been a long time since I've seen a #MON as mighty as this @ . I'm sure that seeing @ in battle would excite anyone.
 	text_jump UnknownText_0x1c4ae5
 	db "@"
-; 0x4f301
-
 
-GetCaughtGender: ; 4f301
+GetCaughtGender:
 	ld hl, MON_CAUGHTGENDER
 	add hl, bc
 
@@ -458,4 +419,3 @@ GetCaughtGender: ; 4f301
 .genderless
 	ld c, CAUGHT_BY_UNKNOWN
 	ret
-; 4f31c
diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm
index 75309aaa1..f1a593b5a 100755..100644
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -1,4 +1,4 @@
-Special_PokemonCenterPC: ; 1559a
+PokemonCenterPC:
 	call PC_CheckPartyForPokemon
 	ret c
 	call PC_PlayBootSound
@@ -7,7 +7,7 @@ Special_PokemonCenterPC: ; 1559a
 	ld hl, PokecenterPCText_AccessWhosePC
 	call PC_DisplayTextWaitMenu
 	ld hl, .TopMenu
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 .loop
 	xor a
 	ld [hBGMapMode], a
@@ -29,22 +29,29 @@ Special_PokemonCenterPC: ; 1559a
 .TopMenu:
 	db MENU_BACKUP_TILES | MENU_NO_CLICK_SFX ; flags
 	menu_coords 0, 0, 15, 12
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw .WhichPC
 	dw PlaceNthMenuStrings
 	dw .JumpTable
 
+PCPC_PLAYERS_PC   EQU 0
+PCPC_BILLS_PC     EQU 1
+PCPC_OAKS_PC      EQU 2
+PCPC_HALL_OF_FAME EQU 3
+PCPC_TURN_OFF     EQU 4
+
 .JumpTable:
-	dw PlayersPC, .String_PlayersPC
-	dw BillsPC, .String_BillsPC
-	dw OaksPC, .String_OaksPC
+; entries correspond to PCPC_* constants
+	dw PlayersPC,    .String_PlayersPC
+	dw BillsPC,      .String_BillsPC
+	dw OaksPC,       .String_OaksPC
 	dw HallOfFamePC, .String_HallOfFame
-	dw TurnOffPC, .String_TurnOff
+	dw TurnOffPC,    .String_TurnOff
 
 .String_PlayersPC:  db "<PLAYER>'s PC@"
 .String_BillsPC:    db "BILL's PC@"
@@ -53,37 +60,45 @@ Special_PokemonCenterPC: ; 1559a
 .String_TurnOff:    db "TURN OFF@"
 
 .WhichPC:
-	; before pokedex
-	db  3 ; items
-	db  1, 0, 4 ; bill's, player's, turn off
-	db -1
+	; before Pokédex
+	db 3
+	db PCPC_BILLS_PC
+	db PCPC_PLAYERS_PC
+	db PCPC_TURN_OFF
+	db -1 ; end
 
 	; before Hall Of Fame
-	db  4 ; items
-	db  1, 0, 2, 4 ; bill's, player's, oak's, turn off
-	db -1
+	db 4
+	db PCPC_BILLS_PC
+	db PCPC_PLAYERS_PC
+	db PCPC_OAKS_PC
+	db PCPC_TURN_OFF
+	db -1 ; end
 
 	; postgame
-	db  5 ; items
-	db  1, 0, 2, 3, 4 ; bill's, player's, oak's, hall of fame, turn off
-	db -1
+	db 5
+	db PCPC_BILLS_PC
+	db PCPC_PLAYERS_PC
+	db PCPC_OAKS_PC
+	db PCPC_HALL_OF_FAME
+	db PCPC_TURN_OFF
+	db -1 ; end
 
 .ChooseWhichPCListToUse:
 	call CheckReceivedDex
 	jr nz, .got_dex
-	ld a, $0
+	ld a, 0 ; before Pokédex
 	ret
 
 .got_dex
 	ld a, [wHallOfFameCount]
 	and a
-	ld a, $1
+	ld a, 1 ; before Hall Of Fame
 	ret z
-	ld a, $2
+	ld a, 2 ; postgame
 	ret
-; 15650
 
-PC_CheckPartyForPokemon: ; 15650
+PC_CheckPartyForPokemon:
 	ld a, [wPartyCount]
 	and a
 	ret nz
@@ -98,18 +113,16 @@ PC_CheckPartyForPokemon: ; 15650
 	; Bzzzzt! You must have a #MON to use this!
 	text_jump UnknownText_0x1c1328
 	db "@"
-; 0x15668
 
-BillsPC: ; 15668
+BillsPC:
 	call PC_PlayChoosePCSound
 	ld hl, PokecenterPCText_AccessedBillsPC
 	call PC_DisplayText
 	farcall _BillsPC
 	and a
 	ret
-; 15679 (5:5679)
 
-PlayersPC: ; 15679
+PlayersPC:
 	call PC_PlayChoosePCSound
 	ld hl, PokecenterPCText_AccessedOwnPC
 	call PC_DisplayText
@@ -117,61 +130,56 @@ PlayersPC: ; 15679
 	call _PlayersPC
 	and a
 	ret
-; 15689
 
-OaksPC: ; 15689
+OaksPC:
 	call PC_PlayChoosePCSound
 	ld hl, PokecenterPCText_AccessedOaksPC
 	call PC_DisplayText
 	farcall ProfOaksPC
 	and a
 	ret
-; 1569a
 
-HallOfFamePC: ; 1569a
+HallOfFamePC:
 	call PC_PlayChoosePCSound
 	call FadeToMenu
 	farcall _HallOfFamePC
 	call CloseSubmenu
 	and a
 	ret
-; 156ab
 
-TurnOffPC: ; 156ab
+TurnOffPC:
 	ld hl, PokecenterPCText_LinkClosed
 	call PrintText
 	scf
 	ret
-; 156b3
 
-PC_PlayBootSound: ; 156b3
+PC_PlayBootSound:
 	ld de, SFX_BOOT_PC
 	jr PC_WaitPlaySFX
 
-PC_PlayShutdownSound: ; 156b8
+PC_PlayShutdownSound:
 	ld de, SFX_SHUT_DOWN_PC
 	call PC_WaitPlaySFX
 	call WaitSFX
 	ret
 
-PC_PlayChoosePCSound: ; 156c2
+PC_PlayChoosePCSound:
 	ld de, SFX_CHOOSE_PC_OPTION
 	jr PC_WaitPlaySFX
 
-PC_PlaySwapItemsSound: ; 156c7
+PC_PlaySwapItemsSound:
 	ld de, SFX_SWITCH_POKEMON
 	call PC_WaitPlaySFX
 	ld de, SFX_SWITCH_POKEMON
 
-PC_WaitPlaySFX: ; 156d0
+PC_WaitPlaySFX:
 	push de
 	call WaitSFX
 	pop de
 	call PlaySFX
 	ret
-; 156d9
 
-_KrissHousePC: ; 156d9
+_PlayersHousePC:
 	call PC_PlayBootSound
 	ld hl, UnknownText_0x156ff
 	call PC_DisplayText
@@ -190,15 +198,13 @@ _KrissHousePC: ; 156d9
 	call ClearBGPalettes
 	ld c, $1
 	ret
-; 156ff
 
-UnknownText_0x156ff: ; 0x156ff
+UnknownText_0x156ff:
 	; turned on the PC.
 	text_jump UnknownText_0x1c1353
 	db "@"
-; 0x15704
 
-_PlayersPC: ; 15704
+_PlayersPC:
 	ld a, b
 	ld [wWhichIndexSet], a
 	ld hl, UnknownText_0x157cc
@@ -206,14 +212,13 @@ _PlayersPC: ; 15704
 	call Function15715
 	call ExitMenu
 	ret
-; 15715
 
-Function15715: ; 15715
+Function15715:
 	xor a
 	ld [wPCItemsCursor], a
 	ld [wPCItemsScrollPosition], a
-	ld hl, KrissPCMenuData
-	call LoadMenuDataHeader
+	ld hl, PlayersPCMenuData
+	call LoadMenuHeader
 .asm_15722
 	call UpdateTimePals
 	call DoNthMenu
@@ -228,30 +233,38 @@ Function15715: ; 15715
 .asm_15732
 	call ExitMenu
 	ret
-; 15736
 
-KrissPCMenuData: ; 0x15736
+PlayersPCMenuData:
 	db MENU_BACKUP_TILES ; flags
 	db  0,  0 ; top left corner coords (y, x)
 	db 12, 15 ; bottom right corner coords (y, x)
-	dw .KrissPCMenuData2
+	dw .PlayersPCMenuData
 	db 1 ; default selected option
 
-.KrissPCMenuData2:
+.PlayersPCMenuData:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; # items?
-	dw .KrissPCMenuList1
+	dw .PlayersPCMenuList1
 	dw PlaceNthMenuStrings
-	dw .KrissPCMenuPointers
-
-.KrissPCMenuPointers: ; 0x15746
-	dw KrisWithdrawItemMenu, .WithdrawItem
-	dw KrisDepositItemMenu,  .DepositItem
-	dw KrisTossItemMenu,     .TossItem
-	dw KrisMailBoxMenu,      .MailBox
-	dw KrisDecorationMenu,   .Decoration
-	dw KrisLogOffMenu,       .LogOff
-	dw KrisLogOffMenu,       .TurnOff
+	dw .PlayersPCMenuPointers
+
+PLAYERSPC_WITHDRAW_ITEM EQU 0
+PLAYERSPC_DEPOSIT_ITEM  EQU 1
+PLAYERSPC_TOSS_ITEM     EQU 2
+PLAYERSPC_MAIL_BOX      EQU 3
+PLAYERSPC_DECORATION    EQU 4
+PLAYERSPC_TURN_OFF      EQU 5
+PLAYERSPC_LOG_OFF       EQU 6
+
+.PlayersPCMenuPointers:
+; entries correspond to PLAYERSPC_* constants
+	dw PlayerWithdrawItemMenu, .WithdrawItem
+	dw PlayerDepositItemMenu,  .DepositItem
+	dw PlayerTossItemMenu,     .TossItem
+	dw PlayerMailBoxMenu,      .MailBox
+	dw PlayerDecorationMenu,   .Decoration
+	dw PlayerLogOffMenu,       .LogOff
+	dw PlayerLogOffMenu,       .TurnOff
 
 .WithdrawItem: db "WITHDRAW ITEM@"
 .DepositItem:  db "DEPOSIT ITEM@"
@@ -261,34 +274,26 @@ KrissPCMenuData: ; 0x15736
 .TurnOff:      db "TURN OFF@"
 .LogOff:       db "LOG OFF@"
 
-WITHDRAW_ITEM EQU 0
-DEPOSIT_ITEM  EQU 1
-TOSS_ITEM     EQU 2
-MAIL_BOX      EQU 3
-DECORATION    EQU 4
-TURN_OFF      EQU 5
-LOG_OFF       EQU 6
-
-.KrissPCMenuList1:
+.PlayersPCMenuList1:
 	db 5
-	db WITHDRAW_ITEM
-	db DEPOSIT_ITEM
-	db TOSS_ITEM
-	db MAIL_BOX
-	db TURN_OFF
-	db -1
-
-.KrissPCMenuList2:
+	db PLAYERSPC_WITHDRAW_ITEM
+	db PLAYERSPC_DEPOSIT_ITEM
+	db PLAYERSPC_TOSS_ITEM
+	db PLAYERSPC_MAIL_BOX
+	db PLAYERSPC_TURN_OFF
+	db -1 ; end
+
+.PlayersPCMenuList2:
 	db 6
-	db WITHDRAW_ITEM
-	db DEPOSIT_ITEM
-	db TOSS_ITEM
-	db MAIL_BOX
-	db DECORATION
-	db LOG_OFF
-	db -1
-
-PC_DisplayTextWaitMenu: ; 157bb
+	db PLAYERSPC_WITHDRAW_ITEM
+	db PLAYERSPC_DEPOSIT_ITEM
+	db PLAYERSPC_TOSS_ITEM
+	db PLAYERSPC_MAIL_BOX
+	db PLAYERSPC_DECORATION
+	db PLAYERSPC_LOG_OFF
+	db -1 ; end
+
+PC_DisplayTextWaitMenu:
 	ld a, [wOptions]
 	push af
 	set NO_TEXT_SCROLL, a
@@ -297,16 +302,14 @@ PC_DisplayTextWaitMenu: ; 157bb
 	pop af
 	ld [wOptions], a
 	ret
-; 157cc
 
-UnknownText_0x157cc: ; 0x157cc
+UnknownText_0x157cc:
 	; What do you want to do?
 	text_jump UnknownText_0x1c1368
 	db "@"
-; 0x157d1
 
-KrisWithdrawItemMenu: ; 0x157d1
-	call LoadStandardMenuDataHeader
+PlayerWithdrawItemMenu:
+	call LoadStandardMenuHeader
 	farcall ClearPCItemScreen
 .loop
 	call PCItemsJoypad
@@ -369,20 +372,20 @@ KrisWithdrawItemMenu: ; 0x157d1
 .done
 	ret
 
-.HowManyText: ; 0x15850
-	text_jump _KrissPCHowManyWithdrawText
+.HowManyText:
+	text_jump _PlayersPCHowManyWithdrawText
 	db "@"
 
-.WithdrewText: ; 0x15855
-	text_jump _KrissPCWithdrewItemsText
+.WithdrewText:
+	text_jump _PlayersPCWithdrewItemsText
 	db "@"
 
-.NoRoomText: ; 0x1585a
-	text_jump _KrissPCNoRoomWithdrawText
+.NoRoomText:
+	text_jump _PlayersPCNoRoomWithdrawText
 	db "@"
 
-KrisTossItemMenu: ; 0x1585f
-	call LoadStandardMenuDataHeader
+PlayerTossItemMenu:
+	call LoadStandardMenuHeader
 	farcall ClearPCItemScreen
 .loop
 	call PCItemsJoypad
@@ -395,28 +398,25 @@ KrisTossItemMenu: ; 0x1585f
 	call CloseSubmenu
 	xor a
 	ret
-; 0x1587d
 
-KrisDecorationMenu: ; 0x1587d
-	farcall _KrisDecorationMenu
+PlayerDecorationMenu:
+	farcall _PlayerDecorationMenu
 	ld a, c
 	and a
 	ret z
 	scf
 	ret
-; 0x15888
 
-KrisLogOffMenu: ; 0x15888
+PlayerLogOffMenu:
 	xor a
 	scf
 	ret
-; 0x1588b
 
-KrisDepositItemMenu: ; 0x1588b
+PlayerDepositItemMenu:
 	call .CheckItemsInBag
 	jr c, .nope
 	call DisableSpriteUpdates
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	farcall DepositSellInitPackBuffers
 .loop
 	farcall DepositSellPack
@@ -461,13 +461,14 @@ KrisDepositItemMenu: ; 0x1588b
 	ret
 
 .dw
-	dw .tossable
+; entries correspond to ITEMMENU_* constants
+	dw .tossable ; ITEMMENU_NOUSE
 	dw .no_toss
 	dw .no_toss
 	dw .no_toss
-	dw .tossable
-	dw .tossable
-	dw .tossable
+	dw .tossable ; ITEMMENU_CURRENT
+	dw .tossable ; ITEMMENU_PARTY
+	dw .tossable ; ITEMMENU_CLOSE
 
 .no_toss
 	ret
@@ -531,25 +532,24 @@ KrisDepositItemMenu: ; 0x1588b
 	and a
 	ret
 
-.HowManyText: ; 0x1596e
-	text_jump _KrissPCHowManyDepositText
+.HowManyText:
+	text_jump _PlayersPCHowManyDepositText
 	db "@"
 
-.DepositText: ; 0x15973
-	text_jump _KrissPCDepositItemsText
+.DepositText:
+	text_jump _PlayersPCDepositItemsText
 	db "@"
 
-.NoRoomText: ; 0x15978
-	text_jump _KrissPCNoRoomDepositText
+.NoRoomText:
+	text_jump _PlayersPCNoRoomDepositText
 	db "@"
 
-KrisMailBoxMenu: ; 0x1597d
-	farcall _KrisMailBoxMenu
+PlayerMailBoxMenu:
+	farcall _PlayerMailBoxMenu
 	xor a
 	ret
-; 0x15985
 
-PCItemsJoypad: ; 0x15985
+PCItemsJoypad:
 	xor a
 	ld [wSwitchItem], a
 .loop
@@ -558,7 +558,7 @@ PCItemsJoypad: ; 0x15985
 	ld a, $0
 	ld [wSpriteUpdatesEnabled], a
 	ld hl, .PCItemsMenuData
-	call CopyMenuDataHeader
+	call CopyMenuHeader
 	hlcoord 0, 0
 	ld b, 10
 	ld c, 18
@@ -621,10 +621,10 @@ PCItemsJoypad: ; 0x15985
 .PCItemsMenuData:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 4, 1, 18, 10
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db SCROLLINGMENU_ENABLE_SELECT | SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 8 ; rows/cols?
 	db 2 ; horizontal spacing?
@@ -633,44 +633,37 @@ PCItemsJoypad: ; 0x15985
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
 
-PC_DisplayText: ; 15a20
+PC_DisplayText:
 	call MenuTextBox
 	call ExitMenu
 	ret
-; 15a27
 
-PokecenterPCText_BootedUpPC: ; 0x15a27
+PokecenterPCText_BootedUpPC:
 	; turned on the PC.
 	text_jump UnknownText_0x1c144d
 	db "@"
-; 0x15a2c
 
-PokecenterPCText_AccessWhosePC: ; 0x15a2c
+PokecenterPCText_AccessWhosePC:
 	; Access whose PC?
 	text_jump UnknownText_0x1c1462
 	db "@"
-; 0x15a31
 
-PokecenterPCText_AccessedBillsPC: ; 0x15a31
+PokecenterPCText_AccessedBillsPC:
 	; BILL's PC accessed. #MON Storage System opened.
 	text_jump UnknownText_0x1c1474
 	db "@"
-; 0x15a36
 
-PokecenterPCText_AccessedOwnPC: ; 0x15a36
+PokecenterPCText_AccessedOwnPC:
 	; Accessed own PC. Item Storage System opened.
 	text_jump UnknownText_0x1c14a4
 	db "@"
-; 0x15a3b
 
-PokecenterPCText_AccessedOaksPC: ; 0x15a3b
+PokecenterPCText_AccessedOaksPC:
 	; PROF.OAK's PC accessed. #DEX Rating System opened.
 	text_jump UnknownText_0x1c14d2
 	db "@"
-; 0x15a40
 
-PokecenterPCText_LinkClosed: ; 0x15a40
+PokecenterPCText_LinkClosed:
 	; … Link closed…
 	text_jump UnknownText_0x1c1505
 	db "@"
-; 0x15a45
diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm
index a98ba47d3..10ca4280b 100755..100644
--- a/engine/events/pokepic.asm
+++ b/engine/events/pokepic.asm
@@ -1,6 +1,6 @@
-Pokepic:: ; 244e3
-	ld hl, PokepicMenuDataHeader
-	call CopyMenuDataHeader
+Pokepic::
+	ld hl, PokepicMenuHeader
+	call CopyMenuHeader
 	call MenuBox
 	call UpdateSprites
 	call ApplyTilemap
@@ -27,9 +27,9 @@ Pokepic:: ; 244e3
 	call WaitBGMap
 	ret
 
-ClosePokepic:: ; 24528
-	ld hl, PokepicMenuDataHeader
-	call CopyMenuDataHeader
+ClosePokepic::
+	ld hl, PokepicMenuHeader
+	call CopyMenuHeader
 	call ClearMenuBoxInterior
 	call WaitBGMap
 	call GetMemSGBLayout
@@ -41,7 +41,7 @@ ClosePokepic:: ; 24528
 	call LoadStandardFont
 	ret
 
-PokepicMenuDataHeader: ; 0x24547
+PokepicMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 4, 14, 13
 	dw NULL
diff --git a/engine/events/pokerus/apply_pokerus_tick.asm b/engine/events/pokerus/apply_pokerus_tick.asm
index e632fbfe4..223fe0147 100644
--- a/engine/events/pokerus/apply_pokerus_tick.asm
+++ b/engine/events/pokerus/apply_pokerus_tick.asm
@@ -1,4 +1,4 @@
-ApplyPokerusTick: ; 13988
+ApplyPokerusTick:
 ; decreases all pokemon's pokerus counter by b. if the lower nybble reaches zero, the pokerus is cured.
 	ld hl, wPartyMon1PokerusStatus ; wPartyMon1 + MON_PKRS
 	ld a, [wPartyCount]
diff --git a/engine/events/pokerus/check_pokerus.asm b/engine/events/pokerus/check_pokerus.asm
index d45055ab2..201a37130 100644
--- a/engine/events/pokerus/check_pokerus.asm
+++ b/engine/events/pokerus/check_pokerus.asm
@@ -1,4 +1,4 @@
-CheckPokerus: ; 4d860
+_CheckPokerus:
 ; Return carry if a monster in your party has Pokerus
 
 ; Get number of monsters to iterate over
diff --git a/engine/events/pokerus/pokerus.asm b/engine/events/pokerus/pokerus.asm
index b29d0d096..a6764e3b5 100644
--- a/engine/events/pokerus/pokerus.asm
+++ b/engine/events/pokerus/pokerus.asm
@@ -1,4 +1,4 @@
-GivePokerusAndConvertBerries: ; 2ed44
+GivePokerusAndConvertBerries:
 	call ConvertBerriesToBerryJuice
 	ld hl, wPartyMon1PokerusStatus
 	ld a, [wPartyCount]
@@ -19,7 +19,7 @@ GivePokerusAndConvertBerries: ; 2ed44
 ; If we haven't been to Goldenrod City at least once,
 ; prevent the contraction of Pokerus.
 	ld hl, wStatusFlags2
-	bit 6, [hl]
+	bit STATUSFLAGS2_REACHED_GOLDENROD_F, [hl]
 	ret z
 	call Random
 	ld a, [hRandomAdd]
@@ -61,7 +61,7 @@ GivePokerusAndConvertBerries: ; 2ed44
 
 .TrySpreadPokerus:
 	call Random
-	cp 1 + 33 percent
+	cp 33 percent + 1
 	ret nc              ; 1/3 chance
 
 	ld a, [wPartyCount]
@@ -74,7 +74,7 @@ GivePokerusAndConvertBerries: ; 2ed44
 	jr c, .checkPreviousMonsLoop    ; no more mons after this one, go backwards
 
 	call Random
-	cp 1 + 50 percent
+	cp 50 percent + 1
 	jr c, .checkPreviousMonsLoop    ; 1/2 chance, go backwards
 .checkFollowingMonsLoop
 	add hl, de
@@ -121,14 +121,15 @@ GivePokerusAndConvertBerries: ; 2ed44
 	ld [hl], a
 	ret
 
-; any berry held by a Shuckle may be converted to berry juice
-ConvertBerriesToBerryJuice: ; 2ede6
+ConvertBerriesToBerryJuice:
+; If we haven't been to Goldenrod City at least once,
+; prevent Shuckle from turning held Berry into Berry Juice.
 	ld hl, wStatusFlags2
-	bit 6, [hl]
+	bit STATUSFLAGS2_REACHED_GOLDENROD_F, [hl]
 	ret z
 	call Random
-	cp $10
-	ret nc              ; 1/16 chance
+	cp 6 percent + 1 ; 1/16 chance
+	ret nc
 	ld hl, wPartyMons
 	ld a, [wPartyCount]
 .partyMonLoop
diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm
index 47766344c..cb29693af 100755..100644
--- a/engine/events/print_photo.asm
+++ b/engine/events/print_photo.asm
@@ -1,4 +1,4 @@
-Special_PhotoStudio: ; 16dc7
+PhotoStudio:
 	ld hl, .Text_AskWhichMon
 	call PrintText
 	farcall SelectMonFromParty
@@ -28,34 +28,28 @@ Special_PhotoStudio: ; 16dc7
 .print_text
 	call PrintText
 	ret
-; 16e04
 
-.Text_AskWhichMon: ; 0x16e04
+.Text_AskWhichMon:
 	; Which #MON should I photo- graph?
 	text_jump UnknownText_0x1be024
 	db "@"
-; 0x16e09
 
-.Text_HoldStill: ; 0x16e09
+.Text_HoldStill:
 	; All righty. Hold still for a bit.
 	text_jump UnknownText_0x1be047
 	db "@"
-; 0x16e0e
 
-.Text_Presto: ; 0x16e0e
+.Text_Presto:
 	; Presto! All done. Come again, OK?
 	text_jump UnknownText_0x1be06a
 	db "@"
-; 0x16e13
 
-.Text_NoPicture: ; 0x16e13
+.Text_NoPicture:
 	; Oh, no picture? Come again, OK?
 	text_jump UnknownText_0x1c0000
 	db "@"
-; 0x16e18
 
-.Text_Egg: ; 0x16e18
+.Text_Egg:
 	; An EGG? My talent is worth more…
 	text_jump UnknownText_0x1c0021
 	db "@"
-; 0x16e1d
diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm
index b0b7e856a..9e231f449 100644
--- a/engine/events/print_unown.asm
+++ b/engine/events/print_unown.asm
@@ -1,4 +1,7 @@
-UnownPrinter: ; 16be4
+UNOWNSTAMP_BOLD_A EQUS "\"♂\"" ; $ef
+UNOWNSTAMP_BOLD_B EQUS "\"♀\"" ; $f5
+
+_UnownPrinter:
 	ld a, [wUnownDex]
 	and a
 	ret z
@@ -15,12 +18,12 @@ UnownPrinter: ; 16be4
 	call ClearTileMap
 
 	ld de, UnownDexATile
-	ld hl, vTiles1 tile $6f
+	ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A
 	lb bc, BANK(UnownDexBTile), 1
 	call Request1bpp
 
 	ld de, UnownDexBTile
-	ld hl, vTiles1 tile $75
+	ld hl, vTiles0 tile UNOWNSTAMP_BOLD_B
 	lb bc, BANK(UnownDexBTile), 1
 	call Request1bpp
 
@@ -94,9 +97,8 @@ UnownPrinter: ; 16be4
 	ld [hInMenu], a
 	call ReturnToMapFromSubmenu
 	ret
-; 16ca0
 
-.LeftRight: ; 16ca0
+.LeftRight:
 	ld a, [hJoyLast]
 	and D_RIGHT
 	jr nz, .press_right
@@ -127,9 +129,8 @@ UnownPrinter: ; 16be4
 .return
 	call .UpdateUnownFrontpic
 	ret
-; 16cc8
 
-.UpdateUnownFrontpic: ; 16cc8
+.UpdateUnownFrontpic:
 	ld a, [wJumptableIndex]
 	cp 26
 	jr z, .vacant
@@ -151,7 +152,7 @@ UnownPrinter: ; 16be4
 	farcall RotateUnownFrontpic
 	ret
 
-.Load2bppToSRAM: ; 16cff
+.Load2bppToSRAM:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -194,7 +195,6 @@ UnownPrinter: ; 16be4
 	ld c, 20
 	call DelayFrames
 	ret
-; 16d57
 
 AlphRuinsStampString:
 	db " ALPH RUINS STAMP@"
@@ -203,23 +203,21 @@ UnownDexDoWhatString:
 	db "Do what?@"
 
 UnownDexMenuString:
-	db   "♂ PRINT"
-	next "♀ CANCEL"
+	db   UNOWNSTAMP_BOLD_A, " PRINT"
+	next UNOWNSTAMP_BOLD_B, " CANCEL"
 	next "← PREVIOUS"
 	next "→ NEXT"
 	db   "@"
 
 UnownDexVacantString:
 	db "VACANT@"
-; 16d9c
 
-UnownDexATile: ; 16d9c
+UnownDexATile:
 INCBIN "gfx/printer/bold_a.1bpp"
-UnownDexBTile: ; 16da4
+UnownDexBTile:
 INCBIN "gfx/printer/bold_b.1bpp"
-; 16dac
 
-PlaceUnownPrinterFrontpic: ; 16dac
+PlaceUnownPrinterFrontpic:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "
@@ -230,4 +228,3 @@ PlaceUnownPrinterFrontpic: ; 16dac
 	lb bc, 7, 7
 	predef PlaceGraphic
 	ret
-; 16dc7
diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm
index 4583a59e0..02f3fadd9 100644
--- a/engine/events/print_unown_2.asm
+++ b/engine/events/print_unown_2.asm
@@ -1,4 +1,4 @@
-RotateUnownFrontpic: ; e0000
+RotateUnownFrontpic:
 ; something to do with Unown printer
 	push de
 	xor a ; sScratch
@@ -12,7 +12,7 @@ RotateUnownFrontpic: ; e0000
 	ld de, wd002
 	call .Copy
 	call .Rotate
-	ld hl, UnownPrinter_OverworldMapRectangle
+	ld hl, UnownPrinter_GBPrinterRectangle
 	pop bc
 	add hl, bc
 	add hl, bc
@@ -30,7 +30,7 @@ RotateUnownFrontpic: ; e0000
 	cp 7 * 7
 	jr c, .loop
 
-	ld hl, wOverworldMap
+	ld hl, wGameboyPrinterRAM
 	ld de, sScratch
 	ld bc, 7 * 7 tiles
 	call CopyBytes
@@ -43,7 +43,7 @@ RotateUnownFrontpic: ; e0000
 	call CloseSRAM
 	ret
 
-.Copy: ; e004e
+.Copy:
 	ld c, $10
 .loop_copy
 	ld a, [hli]
@@ -53,7 +53,7 @@ RotateUnownFrontpic: ; e0000
 	jr nz, .loop_copy
 	ret
 
-.Rotate: ; e0057
+.Rotate:
 	ld hl, wd012
 	ld e, %10000000
 	ld d, 8
@@ -75,7 +75,7 @@ RotateUnownFrontpic: ; e0000
 	jr nz, .loop_decompress
 	ret
 
-.CountSetBit: ; e0078
+.CountSetBit:
 	ld b, 0
 	ld c, 8
 .loop_count
@@ -95,17 +95,17 @@ RotateUnownFrontpic: ; e0000
 	jr nz, .loop_count
 	ret
 
-overworldmaprect: MACRO
+gbprinterrect: MACRO
 y = 0
 rept \1
-x = \1 * (\2 +- 1) + y
+x = \1 * (\2 + -1) + y
 rept \2
-	dw wOverworldMap tile x
-x = x +- \2
+	dw wGameboyPrinterRAM tile x
+x = x + -\2
 endr
 y = y + 1
 endr
 ENDM
 
-UnownPrinter_OverworldMapRectangle: ; e008b
-	overworldmaprect 7, 7
+UnownPrinter_GBPrinterRectangle:
+	gbprinterrect 7, 7
diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm
index 5dca38efe..df55394aa 100755..100644
--- a/engine/events/prof_oaks_pc.asm
+++ b/engine/events/prof_oaks_pc.asm
@@ -1,9 +1,9 @@
-ProfOaksPC: ; 0x265d3
+ProfOaksPC:
 	ld hl, OakPCText1
 	call MenuTextBox
 	call YesNoBox
 	jr c, .shutdown
-	call Special_ProfOaksPCBoot ; player chose "yes"?
+	call ProfOaksPCBoot ; player chose "yes"?
 .shutdown
 	ld hl, OakPCText4
 	call PrintText
@@ -11,7 +11,7 @@ ProfOaksPC: ; 0x265d3
 	call ExitMenu
 	ret
 
-Special_ProfOaksPCBoot ; 0x265ee
+ProfOaksPCBoot:
 	ld hl, OakPCText2
 	call PrintText
 	call Rate
@@ -20,7 +20,7 @@ Special_ProfOaksPCBoot ; 0x265ee
 	call WaitSFX
 	ret
 
-ProfOaksPCRating: ; 0x26601
+ProfOaksPCRating:
 	call Rate
 	push de
 	ld de, MUSIC_NONE
@@ -31,7 +31,7 @@ ProfOaksPCRating: ; 0x26601
 	call WaitSFX
 	ret
 
-Rate: ; 0x26616
+Rate:
 ; calculate Seen/Owned
 	ld hl, wPokedexSeen
 	ld b, wEndPokedexSeen - wPokedexSeen
@@ -55,7 +55,7 @@ Rate: ; 0x26616
 	pop de
 	ret
 
-.UpdateRatingBuffers: ; 0x26647
+.UpdateRatingBuffers:
 	ld hl, wStringBuffer3
 	ld de, wd002
 	call .UpdateRatingBuffer
@@ -64,7 +64,7 @@ Rate: ; 0x26616
 	call .UpdateRatingBuffer
 	ret
 
-.UpdateRatingBuffer: ; 0x2665a
+.UpdateRatingBuffer:
 	push hl
 	ld a, "@"
 	ld bc, ITEM_NAME_LENGTH
@@ -74,7 +74,7 @@ Rate: ; 0x26616
 	call PrintNum
 	ret
 
-FindOakRating: ; 0x2666b
+FindOakRating:
 ; return sound effect in de
 ; return text pointer in hl
 	nop
@@ -98,37 +98,17 @@ endr
 	ld l, a
 	ret
 
-OakRatings: ; 0x2667f
-; if you caught at most this many, play this sound, load this text
-	dbww   9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01
-	dbww  19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02
-	dbww  34, SFX_DEX_FANFARE_20_49,        OakRating03
-	dbww  49, SFX_DEX_FANFARE_20_49,        OakRating04
-	dbww  64, SFX_DEX_FANFARE_50_79,        OakRating05
-	dbww  79, SFX_DEX_FANFARE_50_79,        OakRating06
-	dbww  94, SFX_DEX_FANFARE_80_109,       OakRating07
-	dbww 109, SFX_DEX_FANFARE_80_109,       OakRating08
-	dbww 124, SFX_CAUGHT_MON,               OakRating09
-	dbww 139, SFX_CAUGHT_MON,               OakRating10
-	dbww 154, SFX_DEX_FANFARE_140_169,      OakRating11
-	dbww 169, SFX_DEX_FANFARE_140_169,      OakRating12
-	dbww 184, SFX_DEX_FANFARE_170_199,      OakRating13
-	dbww 199, SFX_DEX_FANFARE_170_199,      OakRating14
-	dbww 214, SFX_DEX_FANFARE_200_229,      OakRating15
-	dbww 229, SFX_DEX_FANFARE_200_229,      OakRating16
-	dbww 239, SFX_DEX_FANFARE_230_PLUS,     OakRating17
-	dbww 248, SFX_DEX_FANFARE_230_PLUS,     OakRating18
-	dbww 255, SFX_DEX_FANFARE_230_PLUS,     OakRating19
-
-OakPCText1: ; 0x266de
+INCLUDE "data/events/pokedex_ratings.asm"
+
+OakPCText1:
 	text_jump _OakPCText1
 	db "@"
 
-OakPCText2: ; 0x266e3
+OakPCText2:
 	text_jump _OakPCText2
 	db "@"
 
-OakPCText3: ; 0x266e8
+OakPCText3:
 	text_jump _OakPCText3
 	db "@"
 
@@ -208,6 +188,6 @@ OakRating19:
 	text_jump _OakRating19
 	db "@"
 
-OakPCText4: ; 0x2674c
+OakPCText4:
 	text_jump _OakPCText4
 	db "@"
diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm
index cf305355a..32f24253c 100755..100644
--- a/engine/events/sacred_ash.asm
+++ b/engine/events/sacred_ash.asm
@@ -1,5 +1,5 @@
 
-_SacredAsh: ; 507e6
+_SacredAsh:
 	ld a, $0
 	ld [wItemEffectSucceeded], a
 	call CheckAnyFaintedMon
@@ -10,9 +10,8 @@ _SacredAsh: ; 507e6
 	ld a, $1
 	ld [wItemEffectSucceeded], a
 	ret
-; 507fb
 
-CheckAnyFaintedMon: ; 507fb
+CheckAnyFaintedMon:
 	ld de, PARTYMON_STRUCT_LENGTH
 	ld bc, wPartySpecies
 	ld hl, wPartyMon1HP
@@ -46,18 +45,17 @@ CheckAnyFaintedMon: ; 507fb
 	pop af
 	scf
 	ret
-; 50821
 
-SacredAshScript: ; 0x50821
+SacredAshScript:
 	special HealParty
 	reloadmappart
 	playsound SFX_WARP_TO
-	special Special_FadeOutPalettes
-	special Special_FadeInPalettes
-	special Special_FadeOutPalettes
-	special Special_FadeInPalettes
-	special Special_FadeOutPalettes
-	special Special_FadeInPalettes
+	special FadeOutPalettes
+	special FadeInPalettes
+	special FadeOutPalettes
+	special FadeInPalettes
+	special FadeOutPalettes
+	special FadeInPalettes
 	waitsfx
 	writetext UnknownText_0x50845
 	playsound SFX_CAUGHT_MON
@@ -65,10 +63,8 @@ SacredAshScript: ; 0x50821
 	waitbutton
 	closetext
 	end
-; 0x50845
 
-UnknownText_0x50845: ; 0x50845
+UnknownText_0x50845:
 	; 's #MON were all healed!
 	text_jump UnknownText_0x1c0b65
 	db "@"
-; 0x5084a
diff --git a/engine/events/special.asm b/engine/events/shuckle.asm
index 081606512..c6d909afe 100755..100644
--- a/engine/events/special.asm
+++ b/engine/events/shuckle.asm
@@ -1,7 +1,6 @@
 MANIA_OT_ID EQU 00518
 
-Special_GiveShuckle: ; 7305
-
+GiveShuckle:
 ; Adding to the party.
 	xor a
 	ld [wMonType], a
@@ -56,7 +55,7 @@ Special_GiveShuckle: ; 7305
 
 ; Engine flag for this event.
 	ld hl, wDailyFlags
-	set 5, [hl] ; ENGINE_SHUCKLE_GIVEN
+	set DAILYFLAGS_GOT_SHUCKIE_TODAY_F, [hl]
 	ld a, 1
 	ld [wScriptVar], a
 	ret
@@ -71,7 +70,7 @@ SpecialShuckleOT:
 SpecialShuckleNick:
 	db "SHUCKIE@"
 
-Special_ReturnShuckle: ; 737e
+ReturnShuckle:
 	farcall SelectMonFromParty
 	jr c, .refused
 
@@ -118,7 +117,7 @@ Special_ReturnShuckle: ; 737e
 	cp 150
 	ld a, SHUCKIE_HAPPY
 	jr nc, .HappyToStayWithYou
-	xor a ; take from pc
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	callfar RemoveMonFromPartyOrBox
 	ld a, SHUCKIE_RETURNED
@@ -140,96 +139,3 @@ Special_ReturnShuckle: ; 737e
 	ld a, SHUCKIE_FAINTED
 	ld [wScriptVar], a
 	ret
-
-Special_BillsGrandfather: ; 73f7
-	farcall SelectMonFromParty
-	jr c, .cancel
-	ld a, [wCurPartySpecies]
-	ld [wScriptVar], a
-	ld [wNamedObjectIndexBuffer], a
-	call GetPokemonName
-	jp CopyPokemonName_Buffer1_Buffer3
-
-.cancel
-	xor a
-	ld [wScriptVar], a
-	ret
-
-Special_YoungerHaircutBrother: ; 7413
-	ld hl, Data_YoungerHaircutBrother
-	jr MassageOrHaircut
-
-Special_OlderHaircutBrother: ; 7418
-	ld hl, Data_OlderHaircutBrother
-	jr MassageOrHaircut
-
-Special_DaisyMassage: ; 741d
-	ld hl, Data_DaisyMassage
-
-MassageOrHaircut: ; 7420
-	push hl
-	farcall SelectMonFromParty
-	pop hl
-	jr c, .nope
-	ld a, [wCurPartySpecies]
-	cp EGG
-	jr z, .egg
-	push hl
-	call GetCurNick
-	call CopyPokemonName_Buffer1_Buffer3
-	pop hl
-	call Random
-; Bug: Subtracting $ff from $ff fails to set c.
-; This can result in overflow into the next data array.
-; In the case of getting a massage from Daisy, we bleed
-; into CopyPokemonName_Buffer1_Buffer3, which passes
-; $d0 to ChangeHappiness and returns $73 to the script.
-; The end result is that there is a 0.4% chance your
-; Pokemon's happiness will not change at all.
-.loop
-	sub [hl]
-	jr c, .ok
-	inc hl
-	inc hl
-	inc hl
-	jr .loop
-
-.ok
-	inc hl
-	ld a, [hli]
-	ld [wScriptVar], a
-	ld c, [hl]
-	call ChangeHappiness
-	ret
-
-.nope
-	xor a
-	ld [wScriptVar], a
-	ret
-
-.egg
-	ld a, 1
-	ld [wScriptVar], a
-	ret
-
-Data_YoungerHaircutBrother: ; 7459
-	db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance
-	db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance
-	db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance
-
-Data_OlderHaircutBrother: ; 7462
-	db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance
-	db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance
-	db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance
-
-Data_DaisyMassage: ; 746b
-	db $ff, 2, HAPPINESS_MASSAGE ; 99.6% chance
-
-CopyPokemonName_Buffer1_Buffer3: ; 746e
-	ld hl, wStringBuffer1
-	ld de, wStringBuffer3
-	ld bc, MON_NAME_LENGTH
-	jp CopyBytes
-
-DummyPredef1: ; 747a
-	ret
diff --git a/engine/specials.asm b/engine/events/specials.asm
index facb1eb25..35d32dde6 100644
--- a/engine/specials.asm
+++ b/engine/events/specials.asm
@@ -1,4 +1,4 @@
-Special:: ; c01b
+Special::
 ; Run script special de.
 	ld hl, SpecialsPointers
 	add hl, de
@@ -12,22 +12,19 @@ Special:: ; c01b
 	ld a, b
 	rst FarCall
 	ret
-; c029
 
 INCLUDE "data/special_pointers.asm"
 
-DummySpecial_c224: ; c224
+DummySpecial_c224:
 	ret
-; c225
 
-Special_SetPlayerPalette: ; c225
+SetPlayerPalette:
 	ld a, [wScriptVar]
 	ld d, a
-	farcall SetPlayerPalette
+	farcall _SetPlayerPalette
 	ret
-; c230
 
-Special_GameCornerPrizeMonCheckDex: ; c230
+GameCornerPrizeMonCheckDex:
 	ld a, [wScriptVar]
 	dec a
 	call CheckCaughtMon
@@ -41,104 +38,95 @@ Special_GameCornerPrizeMonCheckDex: ; c230
 	farcall NewPokedexEntry
 	call ExitAllMenus
 	ret
-; c252
 
-UnusedSpecial_SeenMon: ; c252
+UnusedSetSeenMon:
 	ld a, [wScriptVar]
 	dec a
 	call SetSeenMon
 	ret
-; c25a
 
-Special_FindGreaterThanThatLevel: ; c25a
+FindPartyMonAboveLevel:
 	ld a, [wScriptVar]
 	ld b, a
-	farcall _FindGreaterThanThatLevel
+	farcall _FindPartyMonAboveLevel
 	jr z, FoundNone
 	jr FoundOne
 
-Special_FindAtLeastThatHappy: ; c268
+FindPartyMonAtLeastThatHappy:
 	ld a, [wScriptVar]
 	ld b, a
-	farcall _FindAtLeastThatHappy
+	farcall _FindPartyMonAtLeastThatHappy
 	jr z, FoundNone
 	jr FoundOne
 
-Special_FindThatSpecies: ; c276
+FindPartyMonThatSpecies:
 	ld a, [wScriptVar]
 	ld b, a
-	farcall _FindThatSpecies
+	farcall _FindPartyMonThatSpecies
 	jr z, FoundNone
 	jr FoundOne
 
-Special_FindThatSpeciesYourTrainerID: ; c284
+FindPartyMonThatSpeciesYourTrainerID:
 	ld a, [wScriptVar]
 	ld b, a
-	farcall _FindThatSpeciesYourTrainerID
+	farcall _FindPartyMonThatSpeciesYourTrainerID
 	jr z, FoundNone
 	jr FoundOne
 
-FoundOne: ; c292
+FoundOne:
 	ld a, TRUE
 	ld [wScriptVar], a
 	ret
 
-FoundNone: ; c298
+FoundNone:
 	xor a
 	ld [wScriptVar], a
 	ret
-; c29d
 
-Special_NameRival: ; 0xc29d
+NameRival:
 	ld b, $2 ; rival
 	ld de, wRivalName
 	farcall _NamingScreen
 	; default to "SILVER"
 	ld hl, wRivalName
-	ld de, DefaultRivalName
+	ld de, .default
 	call InitName
 	ret
-; 0xc2b2
 
-DefaultRivalName: ; 0xc2b2
+.default
 	db "SILVER@"
 
-Special_NameRater: ; c2b9
-	farcall NameRater
+NameRater:
+	farcall _NameRater
 	ret
-; c2c0
 
-Special_TownMap: ; c2c0
+OverworldTownMap:
 	call FadeToMenu
 	farcall _TownMap
 	call ExitAllMenus
 	ret
-; c2cd
 
-Special_UnownPrinter: ; c2cd
+UnownPrinter:
 	call FadeToMenu
-	farcall UnownPrinter
+	farcall _UnownPrinter
 	call ExitAllMenus
 	ret
-; c2da
 
-Special_DisplayLinkRecord: ; c2da
+DisplayLinkRecord:
 	call FadeToMenu
-	farcall DisplayLinkRecord
+	farcall _DisplayLinkRecord
 	call ExitAllMenus
 	ret
-; c2e7
 
-Special_KrissHousePC: ; c2e7
+PlayersHousePC:
 	xor a
 	ld [wScriptVar], a
-	farcall _KrissHousePC
+	farcall _PlayersHousePC
 	ld a, c
 	ld [wScriptVar], a
 	ret
-; c2f6
 
-Special_CheckMysteryGift: ; c2f6
+CheckMysteryGift:
 	ld a, BANK(sMysteryGiftItem)
 	call GetSRAMBank
 	ld a, [sMysteryGiftItem]
@@ -150,9 +138,8 @@ Special_CheckMysteryGift: ; c2f6
 	ld [wScriptVar], a
 	call CloseSRAM
 	ret
-; c309
 
-Special_GetMysteryGiftItem: ; c309
+GetMysteryGiftItem:
 	ld a, BANK(sMysteryGiftItem)
 	call GetSRAMBank
 	ld a, [sMysteryGiftItem]
@@ -179,65 +166,57 @@ Special_GetMysteryGiftItem: ; c309
 	xor a
 	ld [wScriptVar], a
 	ret
-; c345
 
-.ReceiveItemText: ; 0xc345
+.ReceiveItemText:
 	; received item
 	text_jump UnknownText_0x1bd3be
 	db "@"
-; 0xc34a
 
-Special_BugContestJudging: ; c34a
+BugContestJudging:
 	farcall _BugContestJudging
 	ld a, b
 	ld [wScriptVar], a
 	ret
-; c355
 
-Special_MapRadio: ; c355
+MapRadio:
 	ld a, [wScriptVar]
 	ld e, a
 	farcall PlayRadio
 	ret
-; c360
 
-Special_UnownPuzzle: ; c360
+UnownPuzzle:
 	call FadeToMenu
-	farcall UnownPuzzle
+	farcall _UnownPuzzle
 	ld a, [wSolvedUnownPuzzle]
 	ld [wScriptVar], a
 	call ExitAllMenus
 	ret
-; c373
 
-Special_SlotMachine: ; c373
-	call Special_CheckCoins
+SlotMachine:
+	call CheckCoinsAndCoinCase
 	ret c
 	ld a, BANK(_SlotMachine)
 	ld hl, _SlotMachine
-	call Special_StartGameCornerGame
+	call StartGameCornerGame
 	ret
-; c380
 
-Special_CardFlip: ; c380
-	call Special_CheckCoins
+CardFlip:
+	call CheckCoinsAndCoinCase
 	ret c
 	ld a, BANK(_CardFlip)
 	ld hl, _CardFlip
-	call Special_StartGameCornerGame
+	call StartGameCornerGame
 	ret
-; c38d
 
-Special_DummyNonfunctionalGameCornerGame: ; c38d
-	call Special_CheckCoins
+DummyNonfunctionalGameCornerGame:
+	call CheckCoinsAndCoinCase
 	ret c
 	ld a, BANK(_DummyGame)
 	ld hl, _DummyGame
-	call Special_StartGameCornerGame
+	call StartGameCornerGame
 	ret
-; c39a
 
-Special_StartGameCornerGame: ; c39a
+StartGameCornerGame:
 	call FarQueueScript
 	call FadeToMenu
 	ld hl, wQueuedScriptBank
@@ -250,9 +229,8 @@ Special_StartGameCornerGame: ; c39a
 	rst FarCall
 	call ExitAllMenus
 	ret
-; c3ae
 
-Special_CheckCoins: ; c3ae
+CheckCoinsAndCoinCase:
 	ld hl, wCoins
 	ld a, [hli]
 	or [hl]
@@ -276,27 +254,23 @@ Special_CheckCoins: ; c3ae
 	call PrintText
 	scf
 	ret
-; c3d1
 
-.NoCoinsText: ; 0xc3d1
+.NoCoinsText:
 	; You have no coins.
 	text_jump UnknownText_0x1bd3d7
 	db "@"
-; 0xc3d6
 
-.NoCoinCaseText: ; 0xc3d6
+.NoCoinCaseText:
 	; You don't have a COIN CASE.
 	text_jump UnknownText_0x1bd3eb
 	db "@"
-; 0xc3db
 
-Special_ClearBGPalettesBufferScreen: ; c3db
+ClearBGPalettesBufferScreen:
 	call ClearBGPalettes
 	call BufferScreen
 	ret
-; c3e2
 
-ScriptReturnCarry: ; c3e2
+ScriptReturnCarry:
 	jr c, .carry
 	xor a
 	ld [wScriptVar], a
@@ -305,23 +279,19 @@ ScriptReturnCarry: ; c3e2
 	ld a, 1
 	ld [wScriptVar], a
 	ret
-; c3ef
 
-UnusedSpecial_CheckUnusedTwoDayTimer: ; c3ef
+UnusedCheckUnusedTwoDayTimer:
 	farcall CheckUnusedTwoDayTimer
 	ld a, [wUnusedTwoDayTimer]
 	ld [wScriptVar], a
 	ret
-; c3fc
 
-Special_ActivateFishingSwarm: ; c3fc
+ActivateFishingSwarm:
 	ld a, [wScriptVar]
 	ld [wFishingSwarmFlag], a
 	ret
-; c403
 
-
-StoreSwarmMapIndices:: ; c403
+StoreSwarmMapIndices::
 	ld a, c
 	and a
 	jr nz, .yanma
@@ -338,29 +308,24 @@ StoreSwarmMapIndices:: ; c403
 	ld a, e
 	ld [wYanmaMapNumber], a
 	ret
-; c419
-
 
-Special_CheckPokerus: ; c419
+CheckPokerus:
 ; Check if a monster in your party has Pokerus
-	farcall CheckPokerus
+	farcall _CheckPokerus
 	jp ScriptReturnCarry
-; c422
 
-Special_ResetLuckyNumberShowFlag: ; c422
+ResetLuckyNumberShowFlag:
 	farcall RestartLuckyNumberCountdown
 	ld hl, wLuckyNumberShowFlag
-	res 0, [hl]
+	res LUCKYNUMBERSHOW_GAME_OVER_F, [hl]
 	farcall LoadOrRegenerateLuckyIDNumber
 	ret
-; c434
 
-Special_CheckLuckyNumberShowFlag: ; c434
-	farcall CheckLuckyNumberShowFlag
+CheckLuckyNumberShowFlag:
+	farcall _CheckLuckyNumberShowFlag
 	jp ScriptReturnCarry
-; c43d
 
-Special_SnorlaxAwake: ; 0xc43d
+SnorlaxAwake:
 ; Check if the Poké Flute channel is playing, and if the player is standing
 ; next to Snorlax.
 
@@ -410,14 +375,11 @@ Special_SnorlaxAwake: ; 0xc43d
 	db 36,  9 ; right
 	db -1
 
-
-Special_PlayCurMonCry: ; c472
+PlayCurMonCry:
 	ld a, [wCurPartySpecies]
 	jp PlayMonCry
-; c478
 
-
-Special_GameboyCheck: ; c478
+GameboyCheck:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
@@ -438,8 +400,7 @@ Special_GameboyCheck: ; c478
 	ld [wScriptVar], a
 	ret
 
-
-Special_FadeOutMusic: ; c48f
+FadeOutMusic:
 	ld a, LOW(MUSIC_NONE)
 	ld [wMusicFadeID], a
 	ld a, HIGH(MUSIC_NONE)
@@ -447,23 +408,20 @@ Special_FadeOutMusic: ; c48f
 	ld a, $2
 	ld [wMusicFade], a
 	ret
-; c49f
 
-Special_Diploma: ; c49f
+Diploma:
 	call FadeToMenu
 	farcall _Diploma
 	call ExitAllMenus
 	ret
-; c4ac
 
-Special_PrintDiploma: ; c4ac
+PrintDiploma:
 	call FadeToMenu
 	farcall _PrintDiploma
 	call ExitAllMenus
 	ret
-; c4b9
 
-Special_TrainerHouse: ; 0xc4b9
+TrainerHouse:
 	ld a, BANK(sMysteryGiftTrainerHouseFlag)
 	call GetSRAMBank
 	ld a, [sMysteryGiftTrainerHouseFlag]
diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm
index f6ab00951..74fd4d991 100755..100644
--- a/engine/events/squirtbottle.asm
+++ b/engine/events/squirtbottle.asm
@@ -1,4 +1,4 @@
-_Squirtbottle: ; 50730
+_Squirtbottle:
 	ld hl, .SquirtbottleScript
 	call QueueScript
 	ld a, $1
@@ -44,4 +44,3 @@ _Squirtbottle: ; 50730
 	xor a
 	ld [wScriptVar], a
 	ret
-; 50779
diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm
index 79dbc71f1..0e06b03c8 100644
--- a/engine/events/std_collision.asm
+++ b/engine/events/std_collision.asm
@@ -1,4 +1,4 @@
-CheckFacingTileForStdScript:: ; 1365b
+CheckFacingTileForStdScript::
 ; Checks to see if the tile you're facing has a std script associated with it.  If so, executes the script and returns carry.
 	ld a, c
 	ld de, 3
@@ -23,7 +23,7 @@ CheckFacingTileForStdScript:: ; 1365b
 	xor a
 	ret
 
-INCLUDE "data/collision_stdscripts.asm"
+INCLUDE "data/events/collision_stdscripts.asm"
 
-Script_JumpStdFromRAM: ; 0x1369a
+Script_JumpStdFromRAM:
 	jump wJumpStdScriptBuffer
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index 216ce0058..28272405c 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -57,11 +57,11 @@ PokecenterNurseScript:
 ; EVENT_WELCOMED_TO_POKECOM_CENTER is never set
 
 	opentext
-	checkmorn
+	checktime MORN
 	iftrue .morn
-	checkday
+	checktime DAY
 	iftrue .day
-	checknite
+	checktime NITE
 	iftrue .nite
 	jump .ok
 
@@ -108,23 +108,23 @@ PokecenterNurseScript:
 
 	farwritetext NurseTakePokemonText
 	pause 20
-	special Special_StubbedTrainerRankings_Healings
-	spriteface LAST_TALKED, LEFT
+	special StubbedTrainerRankings_Healings
+	turnobject LAST_TALKED, LEFT
 	pause 10
 	special HealParty
 	playmusic MUSIC_NONE
 	writebyte HEALMACHINE_POKECENTER
-	special Special_HealMachineAnim
+	special HealMachineAnim
 	pause 30
 	special RestartMapMusic
-	spriteface LAST_TALKED, DOWN
+	turnobject LAST_TALKED, DOWN
 	pause 10
 
 	checkphonecall ; elm already called about pokerus
 	iftrue .no
-	checkflag ENGINE_POKERUS ; nurse already talked about pokerus
+	checkflag ENGINE_CAUGHT_POKERUS
 	iftrue .no
-	special Special_CheckPokerus
+	special CheckPokerus
 	iftrue .pokerus
 .no
 
@@ -134,9 +134,9 @@ PokecenterNurseScript:
 .done
 	farwritetext NurseGoodbyeText
 
-	spriteface LAST_TALKED, UP
+	turnobject LAST_TALKED, UP
 	pause 10
-	spriteface LAST_TALKED, DOWN
+	turnobject LAST_TALKED, DOWN
 	pause 10
 
 	waitbutton
@@ -158,7 +158,7 @@ PokecenterNurseScript:
 	closetext
 
 .pokerus_done
-	setflag ENGINE_POKERUS
+	setflag ENGINE_CAUGHT_POKERUS
 	specialphonecall SPECIALCALL_POKERUS
 	end
 
@@ -184,7 +184,7 @@ TownMapScript:
 	opentext
 	farwritetext TownMapText
 	waitbutton
-	special Special_TownMap
+	special OverworldTownMap
 	closetext
 	end
 
@@ -204,7 +204,7 @@ HomepageScript:
 Radio1Script:
 	opentext
 	writebyte MAPRADIO_POKEMON_CHANNEL
-	special Special_MapRadio
+	special MapRadio
 	closetext
 	end
 
@@ -212,16 +212,16 @@ Radio2Script:
 ; Lucky Channel
 	opentext
 	writebyte MAPRADIO_LUCKY_CHANNEL
-	special Special_MapRadio
+	special MapRadio
 	closetext
 	end
 
-TrashCanScript: ; 0xbc1a5
+TrashCanScript:
 	farjumptext TrashCanText
 
 PCScript:
 	opentext
-	special Special_PokemonCenterPC
+	special PokemonCenterPC
 	closetext
 	end
 
@@ -240,17 +240,17 @@ SmashRockScript:
 PokecenterSignScript:
 	farjumptext PokecenterSignText
 
-MartSignScript
+MartSignScript:
 	farjumptext MartSignText
 
 DayToTextScript:
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, .Monday
-	if_equal TUESDAY, .Tuesday
-	if_equal WEDNESDAY, .Wednesday
-	if_equal THURSDAY, .Thursday
-	if_equal FRIDAY, .Friday
-	if_equal SATURDAY, .Saturday
+	ifequal MONDAY, .Monday
+	ifequal TUESDAY, .Tuesday
+	ifequal WEDNESDAY, .Wednesday
+	ifequal THURSDAY, .Thursday
+	ifequal FRIDAY, .Friday
+	ifequal SATURDAY, .Saturday
 	stringtotext .SundayText, MEM_BUFFER_0
 	end
 .Monday:
@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
 	clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
 	specialphonecall SPECIALCALL_WEIRDBROADCAST
-	setmapscene MAHOGANY_TOWN, 1
+	setmapscene MAHOGANY_TOWN, SCENE_FINISHED
 	end
 
 BugContestResultsWarpScript:
@@ -320,44 +320,43 @@ BugContestResultsScript:
 	opentext
 	farwritetext ContestResults_ReadyToJudgeText
 	waitbutton
-	special Special_BugContestJudging
+	special BugContestJudging
 	vartomem MEM_BUFFER_0
-	if_equal 1, BugContestResults_FirstPlace
-	if_equal 2, BugContestResults_SecondPlace
-	if_equal 3, BugContestResults_ThirdPlace
+	ifequal 1, BugContestResults_FirstPlace
+	ifequal 2, BugContestResults_SecondPlace
+	ifequal 3, BugContestResults_ThirdPlace
 	farwritetext ContestResults_ConsolationPrizeText
 	buttonsound
 	waitsfx
 	verbosegiveitem BERRY
 	iffalse BugContestResults_NoRoomForBerry
 
-BugContestResults_DidNotWin
+BugContestResults_DidNotWin:
 	farwritetext ContestResults_DidNotWinText
 	buttonsound
 	jump BugContestResults_FinishUp
-; 0xbc2b1
 
-BugContestResults_ReturnAfterWinnersPrize ; 0xbc2b1
+BugContestResults_ReturnAfterWinnersPrize:
 	farwritetext ContestResults_JoinUsNextTimeText
 	buttonsound
 
-BugContestResults_FinishUp
+BugContestResults_FinishUp:
 	checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 	iffalse BugContestResults_DidNotLeaveMons
 	farwritetext ContestResults_ReturnPartyText
 	waitbutton
-	special Special_ContestReturnMons
-BugContestResults_DidNotLeaveMons
-	special Special_CheckPartyFullAfterContest
-	if_equal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
-	if_equal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
+	special ContestReturnMons
+BugContestResults_DidNotLeaveMons:
+	special CheckPartyFullAfterContest
+	ifequal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
+	ifequal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
 	; BUGCONTEST_BOXED_MON
 	farwritetext ContestResults_PartyFullText
 	waitbutton
-BugContestResults_CleanUp
+BugContestResults_CleanUp:
 	closetext
-	setscene 0
-	setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0
+	setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING
+	setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOTHING
 	setevent EVENT_BUG_CATCHING_CONTESTANT_1A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_2A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_3A
@@ -381,65 +380,57 @@ BugContestResults_CleanUp
 	setflag ENGINE_DAILY_BUG_CONTEST
 	special PlayMapMusic
 	end
-; 0xbc31e
 
-BugContestResults_FirstPlace ; 0xbc31e
-	setevent EVENT_GAVE_KURT_APRICORNS
+BugContestResults_FirstPlace:
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	itemtotext SUN_STONE, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
 	verbosegiveitem SUN_STONE
 	iffalse BugContestResults_NoRoomForSunStone
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc332
 
-BugContestResults_SecondPlace ; 0xbc332
+BugContestResults_SecondPlace:
 	itemtotext EVERSTONE, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
 	verbosegiveitem EVERSTONE
 	iffalse BugContestResults_NoRoomForEverstone
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc343
 
-BugContestResults_ThirdPlace ; 0xbc343
+BugContestResults_ThirdPlace:
 	itemtotext GOLD_BERRY, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
 	verbosegiveitem GOLD_BERRY
 	iffalse BugContestResults_NoRoomForGoldBerry
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc354
 
-BugContestResults_NoRoomForSunStone ; 0xbc354
+BugContestResults_NoRoomForSunStone:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc35f
 
-BugContestResults_NoRoomForEverstone ; 0xbc35f
+BugContestResults_NoRoomForEverstone:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc36a
 
-BugContestResults_NoRoomForGoldBerry ; 0xbc36a
+BugContestResults_NoRoomForGoldBerry:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc375
 
-BugContestResults_NoRoomForBerry ; 0xbc375
+BugContestResults_NoRoomForBerry:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_BERRY
 	jump BugContestResults_DidNotWin
-; 0xbc380
 
-BugContestResults_CopyContestantsToResults ; 0xbc380
+BugContestResults_CopyContestantsToResults:
 	checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
 	iftrue .skip1
 	clearevent EVENT_BUG_CATCHING_CONTESTANT_1B
@@ -539,10 +530,10 @@ InitializeEventsScript:
 	setevent EVENT_MAHOGANY_MART_OWNERS
 	setevent EVENT_TIN_TOWER_ROOF_HO_OH
 	setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
-	setevent EVENT_KRISS_HOUSE_2F_CONSOLE
-	setevent EVENT_KRISS_HOUSE_2F_DOLL_1
-	setevent EVENT_KRISS_HOUSE_2F_DOLL_2
-	setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL
+	setevent EVENT_PLAYERS_HOUSE_2F_CONSOLE
+	setevent EVENT_PLAYERS_HOUSE_2F_DOLL_1
+	setevent EVENT_PLAYERS_HOUSE_2F_DOLL_2
+	setevent EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
 	setevent EVENT_DECO_BED_1
 	setevent EVENT_DECO_PLANT_4
 	setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
@@ -576,7 +567,7 @@ InitializeEventsScript:
 	setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
 	setevent EVENT_DRAGON_SHRINE_CLAIR
 	setevent EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
-	setevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
+	setevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
 	setevent EVENT_AZALEA_TOWN_KURT
 	setevent EVENT_AZALEA_TOWN_KURT
 	setevent EVENT_ILEX_FOREST_KURT
@@ -585,7 +576,7 @@ InitializeEventsScript:
 	setevent EVENT_GOLDENROD_SALE_OFF
 	setevent EVENT_ECRUTEAK_CITY_GRAMPS
 	setevent EVENT_EUSINE_IN_BURNED_TOWER
-	setevent EVENT_KRISS_HOUSE_MOM_2
+	setevent EVENT_PLAYERS_HOUSE_MOM_2
 	setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
 	setevent EVENT_CIANWOOD_CITY_EUSINE
 	setevent EVENT_TIN_TOWER_1F_EUSINE
@@ -622,28 +613,28 @@ InitializeEventsScript:
 	return
 
 AskNumber1MScript:
-	special Special_RandomPhoneMon
+	special RandomPhoneMon
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackAskNumber1Text
@@ -707,28 +698,28 @@ AskNumber1MScript:
 	end
 
 AskNumber2MScript:
-	special Special_RandomPhoneMon
+	special RandomPhoneMon
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackAskNumber2Text
@@ -800,26 +791,26 @@ RegisteredNumberMScript:
 
 NumberAcceptedMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackNumberAcceptedText
@@ -924,26 +915,26 @@ NumberAcceptedMScript:
 
 NumberDeclinedMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackNumberDeclinedText
@@ -1048,26 +1039,26 @@ NumberDeclinedMScript:
 
 PhoneFullMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackPhoneFullText
@@ -1172,23 +1163,23 @@ PhoneFullMScript:
 
 RematchMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackRematchText
@@ -1278,13 +1269,13 @@ RematchMScript:
 
 GiftMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
 
 .Jose:
 	farwritetext JoseGiftText
@@ -1317,17 +1308,17 @@ GiftMScript:
 
 PackFullMScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Huey:
 	farwritetext HueyPackFullText
@@ -1388,10 +1379,10 @@ PackFullMScript:
 RematchGiftMScript:
 	opentext
 	checkcode VAR_CALLERID
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Huey:
 	farwritetext HueyRematchGiftText
@@ -1412,14 +1403,14 @@ RematchGiftMScript:
 
 AskNumber1FScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyAskNumber1Text
@@ -1448,14 +1439,14 @@ AskNumber1FScript:
 
 AskNumber2FScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyAskNumber2Text
@@ -1489,16 +1480,16 @@ RegisteredNumberFScript:
 	buttonsound
 	end
 
-NumberAcceptedFScript: ; 0xbcbd3
+NumberAcceptedFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyNumberAcceptedText
@@ -1543,14 +1534,14 @@ NumberAcceptedFScript: ; 0xbcbd3
 
 NumberDeclinedFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyNumberDeclinedText
@@ -1595,14 +1586,14 @@ NumberDeclinedFScript:
 
 PhoneFullFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyPhoneFullText
@@ -1647,13 +1638,13 @@ PhoneFullFScript:
 
 RematchFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beth:
 	farwritetext BethRematchText
@@ -1693,10 +1684,10 @@ RematchFScript:
 
 GiftFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
 
 .Beverly:
 	farwritetext BeverlyGiftText
@@ -1717,11 +1708,11 @@ GiftFScript:
 
 PackFullFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext BeverlyPackFullText
@@ -1751,7 +1742,7 @@ PackFullFScript:
 
 RematchGiftFScript:
 	checkcode VAR_CALLERID
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Erin:
 	opentext
@@ -1777,23 +1768,21 @@ GymStatue2Script:
 	closetext
 	end
 
-ReceiveItemScript: ; 0xbcdb9
+ReceiveItemScript:
 	waitsfx
 	farwritetext ReceivedItemText
 	playsound SFX_ITEM
 	waitsfx
 	end
-; 0xbcdc3
 
-ReceiveTogepiEggScript: ; 0xbcdc3
+ReceiveTogepiEggScript:
 	waitsfx
 	farwritetext ReceivedItemText
 	playsound SFX_GET_EGG_FROM_DAY_CARE_LADY
 	waitsfx
 	end
-; 0xbcdcd
 
-GameCornerCoinVendorScript: ; 0xbcdcd
+GameCornerCoinVendorScript:
 	faceplayer
 	opentext
 	farwritetext CoinVendor_WelcomeText
@@ -1804,26 +1793,24 @@ GameCornerCoinVendorScript: ; 0xbcdcd
 	waitbutton
 	closetext
 	end
-; 0xbcde0
 
-CoinVendor_IntroScript: ; 0xbcde0
+CoinVendor_IntroScript:
 	farwritetext CoinVendor_IntroText
 
-.loop ; 0xbcde4
-	special Special_DisplayMoneyAndCoinBalance
-	loadmenudata .MenuDataHeader
+.loop
+	special DisplayMoneyAndCoinBalance
+	loadmenu .MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .Buy50
-	if_equal 2, .Buy500
+	ifequal 1, .Buy50
+	ifequal 2, .Buy500
 	jump .Cancel
-; 0xbcdf7
 
-.Buy50: ; 0xbcdf7
+.Buy50:
 	checkcoins MAX_COINS - 50
-	if_equal HAVE_MORE, .CoinCaseFull
+	ifequal HAVE_MORE, .CoinCaseFull
 	checkmoney YOUR_MONEY, 1000
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	givecoins 50
 	takemoney YOUR_MONEY, 1000
 	waitsfx
@@ -1831,13 +1818,12 @@ CoinVendor_IntroScript: ; 0xbcde0
 	farwritetext CoinVendor_Buy50CoinsText
 	waitbutton
 	jump .loop
-; 0xbce1b
 
-.Buy500: ; 0xbce1b
+.Buy500:
 	checkcoins MAX_COINS - 500
-	if_equal HAVE_MORE, .CoinCaseFull
+	ifequal HAVE_MORE, .CoinCaseFull
 	checkmoney YOUR_MONEY, 10000
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	givecoins 500
 	takemoney YOUR_MONEY, 10000
 	waitsfx
@@ -1845,51 +1831,44 @@ CoinVendor_IntroScript: ; 0xbcde0
 	farwritetext CoinVendor_Buy500CoinsText
 	waitbutton
 	jump .loop
-; 0xbce3f
 
-.NotEnoughMoney: ; 0xbce3f
+.NotEnoughMoney:
 	farwritetext CoinVendor_NotEnoughMoneyText
 	waitbutton
 	closetext
 	end
-; 0xbce46
 
-.CoinCaseFull: ; 0xbce46
+.CoinCaseFull:
 	farwritetext CoinVendor_CoinCaseFullText
 	waitbutton
 	closetext
 	end
-; 0xbce4d
 
-.Cancel: ; 0xbce4d
+.Cancel:
 	farwritetext CoinVendor_CancelText
 	waitbutton
 	closetext
 	end
-; 0xbce54
 
-
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 4, 15, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db " 50 :  ¥1000@"
 	db "500 : ¥10000@"
 	db "CANCEL@"
-; 0xbce7f
-
 
 HappinessCheckScript:
 	faceplayer
 	opentext
-	special Special_GetFirstPokemonHappiness
-	if_less_than 50, .Unhappy
-	if_less_than 150, .KindaHappy
+	special GetFirstPokemonHappiness
+	ifless 50, .Unhappy
+	ifless 150, .KindaHappy
 	farwritetext HappinessText3
 	waitbutton
 	closetext
@@ -1907,9 +1886,8 @@ HappinessCheckScript:
 	closetext
 	end
 
-Movement_ContestResults_WalkAfterWarp: ; bcea1
+Movement_ContestResults_WalkAfterWarp:
 	step RIGHT
 	step DOWN
 	turn_head UP
 	step_end
-; bcea5
diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm
index 2f1759a2b..1a378ede8 100755..100644
--- a/engine/events/sweet_scent.asm
+++ b/engine/events/sweet_scent.asm
@@ -1,12 +1,11 @@
-SweetScentFromMenu: ; 506bc
+SweetScentFromMenu:
 	ld hl, .SweetScent
 	call QueueScript
 	ld a, $1
 	ld [wFieldMoveSucceeded], a
 	ret
-; 506c8
 
-.SweetScent: ; 0x506c8
+.SweetScent:
 	reloadmappart
 	special UpdateTimePals
 	callasm GetPartyNick
@@ -20,24 +19,21 @@ SweetScentFromMenu: ; 506bc
 	startbattle
 	reloadmapafterbattle
 	end
-; 0x506e5
 
-.BugCatchingContest: ; 0x506e5
+.BugCatchingContest:
 	farjump BugCatchingContestBattleScript
-; 0x506e9
 
-SweetScentNothing: ; 0x506e9
+SweetScentNothing:
 	writetext UnknownText_0x5072b
 	waitbutton
 	closetext
 	end
-; 0x506ef
 
-SweetScentEncounter: ; 506ef
+SweetScentEncounter:
 	farcall CanUseSweetScent
 	jr nc, .no_battle
 	ld hl, wStatusFlags2
-	bit 2, [hl]
+	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
 	jr nz, .not_in_bug_contest
 	farcall GetMapEncounterRate
 	ld a, b
@@ -60,16 +56,13 @@ SweetScentEncounter: ; 506ef
 	ld [wScriptVar], a
 	ld [wBattleType], a
 	ret
-; 50726
 
-UnknownText_0x50726: ; 0x50726
+UnknownText_0x50726:
 	; used SWEET SCENT!
 	text_jump UnknownText_0x1c0b03
 	db "@"
-; 0x5072b
 
-UnknownText_0x5072b: ; 0x5072b
+UnknownText_0x5072b:
 	; Looks like there's nothing here…
 	text_jump UnknownText_0x1c0b1a
 	db "@"
-; 0x50730
diff --git a/engine/events/trainer_scripts.asm b/engine/events/trainer_scripts.asm
index abfcd8dee..6f0bb2d29 100644
--- a/engine/events/trainer_scripts.asm
+++ b/engine/events/trainer_scripts.asm
@@ -1,4 +1,4 @@
-TalkToTrainerScript:: ; 0xbe66a
+TalkToTrainerScript::
 	faceplayer
 	trainerflagaction CHECK_FLAG
 	iftrue AlreadyBeatenTrainerScript
@@ -6,7 +6,7 @@ TalkToTrainerScript:: ; 0xbe66a
 	encountermusic
 	jump StartBattleWithMapTrainerScript
 
-SeenByTrainerScript:: ; 0xbe675
+SeenByTrainerScript::
 	loadmemtrainer
 	encountermusic
 	showemote EMOTE_SHOCK, LAST_TALKED, 30
@@ -16,7 +16,7 @@ SeenByTrainerScript:: ; 0xbe675
 	faceobject PLAYER, LAST_TALKED
 	jump StartBattleWithMapTrainerScript
 
-StartBattleWithMapTrainerScript: ; 0xbe68a
+StartBattleWithMapTrainerScript:
 	opentext
 	trainertext $0
 	waitbutton
diff --git a/engine/events/treemons.asm b/engine/events/treemons.asm
index 6d55004f4..cd78421d6 100755..100644
--- a/engine/events/treemons.asm
+++ b/engine/events/treemons.asm
@@ -1,4 +1,4 @@
-TreeMonEncounter: ; b81ea
+TreeMonEncounter:
 	farcall StubbedTrainerRankings_TreeEncounters
 
 	xor a
@@ -25,10 +25,8 @@ TreeMonEncounter: ; b81ea
 	xor a
 	ld [wScriptVar], a
 	ret
-; b8219
-
-RockMonEncounter: ; b8219
 
+RockMonEncounter:
 	xor a
 	ld [wTempWildMonSpecies], a
 	ld [wCurPartyLevel], a
@@ -54,11 +52,10 @@ RockMonEncounter: ; b8219
 .no_battle
 	xor a
 	ret
-; b823e
 
 	db $05 ; ????
 
-GetTreeMonSet: ; b823f
+GetTreeMonSet:
 ; Return carry and treemon set in a
 ; if the current map is in table hl.
 	ld a, [wMapNumber]
@@ -93,11 +90,10 @@ GetTreeMonSet: ; b823f
 	ld a, [hl]
 	scf
 	ret
-; b825e
 
 INCLUDE "data/wild/treemon_maps.asm"
 
-GetTreeMons: ; b82d2
+GetTreeMons:
 ; Return the address of TreeMon table a in hl.
 ; Return nc if table a doesn't exist.
 
@@ -123,11 +119,10 @@ GetTreeMons: ; b82d2
 .quit
 	xor a
 	ret
-; b82e8
 
 INCLUDE "data/wild/treemons.asm"
 
-GetTreeMon: ; b83e5
+GetTreeMon:
 	push hl
 	call GetTreeScore
 	pop hl
@@ -168,9 +163,8 @@ GetTreeMon: ; b83e5
 	jr nz, .skip
 	call SelectTreeMon
 	ret
-; b841f
 
-SelectTreeMon: ; b841f
+SelectTreeMon:
 ; Read a TreeMons table and pick one monster at random.
 
 	ld a, 100
@@ -195,14 +189,13 @@ SelectTreeMon: ; b841f
 	scf
 	ret
 
-NoTreeMon: ; b843b
+NoTreeMon:
 	xor a
 	ld [wTempWildMonSpecies], a
 	ld [wCurPartyLevel], a
 	ret
-; b8443
 
-GetTreeScore: ; b8443
+GetTreeScore:
 	call .CoordScore
 	ld [wBuffer1], a
 	call .OTIDScore
@@ -228,9 +221,8 @@ GetTreeScore: ; b8443
 .rare
 	ld a, TREEMON_SCORE_RARE
 	ret
-; b8466
 
-.CoordScore: ; b8466
+.CoordScore:
 	call GetFacingTileCoord
 	ld hl, 0
 	ld c, e
@@ -269,9 +261,8 @@ GetTreeScore: ; b8443
 
 	ld a, [hQuotient + 3]
 	ret
-; b849d
 
-.OTIDScore: ; b849d
+.OTIDScore:
 	ld a, [wPlayerID]
 	ld [hDividend], a
 	ld a, [wPlayerID + 1]
@@ -282,4 +273,3 @@ GetTreeScore: ; b8443
 	call Divide
 	ld a, [hQuotient + 3]
 	ret
-; b84b3
diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm
index 5cc241966..105337630 100644
--- a/engine/events/unown_walls.asm
+++ b/engine/events/unown_walls.asm
@@ -1,18 +1,17 @@
-Special_HoOhChamber: ; 0x8addb
+HoOhChamber:
 	ld hl, wPartySpecies
 	ld a, [hl]
 	cp HO_OH ; is Ho-oh the first Pokémon in the party?
 	jr nz, .done ; if not, we're done
-	call GetMapDataPointer ; pointless?
+	call GetMapAttributesPointer ; pointless?
 	ld de, EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
 	ld b, SET_FLAG
 	call EventFlagAction
 .done
 	ret
-; 0x8adef
 
-Special_OmanyteChamber: ; 8adef
-	call GetMapDataPointer ; pointless?
+OmanyteChamber:
+	call GetMapAttributesPointer ; pointless?
 	ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
 	ld b, CHECK_FLAG
 	call EventFlagAction
@@ -44,25 +43,24 @@ Special_OmanyteChamber: ; 8adef
 	jr nz, .loop
 
 .open
-	call GetMapDataPointer ; pointless?
+	call GetMapAttributesPointer ; pointless?
 	ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
 	ld b, SET_FLAG
 	call EventFlagAction
 
 .nope
 	ret
-; 8ae30
 
-SpecialAerodactylChamber: ; 8ae30
+SpecialAerodactylChamber:
 	push de
 	push bc
 
-	call GetMapDataPointer
+	call GetMapAttributesPointer
 	ld a, h
-	cp HIGH(RuinsOfAlphAerodactylChamber_MapData)
+	cp HIGH(RuinsOfAlphAerodactylChamber_MapAttributes)
 	jr nz, .nope
 	ld a, l
-	cp LOW(RuinsOfAlphAerodactylChamber_MapData)
+	cp LOW(RuinsOfAlphAerodactylChamber_MapAttributes)
 	jr nz, .nope
 
 	ld de, EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
@@ -79,18 +77,17 @@ SpecialAerodactylChamber: ; 8ae30
 	pop bc
 	pop de
 	ret
-; 8ae4e
 
-SpecialKabutoChamber: ; 8ae4e
+SpecialKabutoChamber:
 	push hl
 	push de
 
-	call GetMapDataPointer
+	call GetMapAttributesPointer
 	ld a, h
-	cp HIGH(RuinsOfAlphKabutoChamber_MapData)
+	cp HIGH(RuinsOfAlphKabutoChamber_MapAttributes)
 	jr nz, .done
 	ld a, l
-	cp LOW(RuinsOfAlphKabutoChamber_MapData)
+	cp LOW(RuinsOfAlphKabutoChamber_MapAttributes)
 	jr nz, .done
 
 	ld de, EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
@@ -101,11 +98,10 @@ SpecialKabutoChamber: ; 8ae4e
 	pop de
 	pop hl
 	ret
-; 8ae68
 
-Special_DisplayUnownWords: ; 8ae68
+DisplayUnownWords:
 	ld a, [wScriptVar]
-	ld hl, MenuDataHeaders_UnownWalls
+	ld hl, MenuHeaders_UnownWalls
 	and a
 	jr z, .load
 
@@ -117,7 +113,7 @@ Special_DisplayUnownWords: ; 8ae68
 	jr nz, .loop
 
 .load
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 	xor a
 	ld [hBGMapMode], a
 	call MenuBox
@@ -151,11 +147,10 @@ Special_DisplayUnownWords: ; 8ae68
 	call PlayClickSFX
 	call CloseWindow
 	ret
-; 8aebc
 
-INCLUDE "data/unown_walls.asm"
+INCLUDE "data/events/unown_walls.asm"
 
-_DisplayUnownWords_FillAttr: ; 8aee9
+_DisplayUnownWords_FillAttr:
 	ld a, [de]
 	cp $ff
 	ret z
@@ -170,9 +165,8 @@ _DisplayUnownWords_FillAttr: ; 8aee9
 	inc hl
 	inc de
 	jr _DisplayUnownWords_FillAttr
-; 8aefd
 
-.PlaceSquare: ; 8aefd
+.PlaceSquare:
 	push hl
 	ld [hli], a
 	ld [hld], a
@@ -183,9 +177,8 @@ _DisplayUnownWords_FillAttr: ; 8aee9
 	ld [hl], a
 	pop hl
 	ret
-; 8af09
 
-_DisplayUnownWords_CopyWord: ; 8af09
+_DisplayUnownWords_CopyWord:
 	push hl
 	push de
 .word_loop
@@ -203,9 +196,8 @@ _DisplayUnownWords_CopyWord: ; 8af09
 	pop de
 	pop hl
 	ret
-; 8af1c
 
-.ConvertChar: ; 8af1c
+.ConvertChar:
 	push hl
 	ld a, c
 	cp $60
@@ -264,4 +256,3 @@ _DisplayUnownWords_CopyWord: ; 8af09
 	ld [hl], $2
 	pop hl
 	ret
-; 8af6b
diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm
index 4adef9f4f..82b7a4868 100755..100644
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -1,16 +1,15 @@
-Script_BattleWhiteout:: ; 0x124c1
+Script_BattleWhiteout::
 	callasm BattleBGMap
 	jump Script_Whiteout
-; 0x124c8
 
-Script_OverworldWhiteout:: ; 0x124c8
+Script_OverworldWhiteout::
 	refreshscreen
 	callasm OverworldBGMap
 
-Script_Whiteout: ; 0x124ce
+Script_Whiteout:
 	writetext .WhitedOutText
 	waitbutton
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	pause 40
 	special HealParty
 	checkflag ENGINE_BUG_CONTEST_TIMER
@@ -18,37 +17,33 @@ Script_Whiteout: ; 0x124ce
 	callasm HalveMoney
 	callasm GetWhiteoutSpawn
 	farscall Script_AbortBugContest
-	special Special_WarpToSpawnPoint
+	special WarpToSpawnPoint
 	newloadmap MAPSETUP_WARP
-	end_all
+	endall
 
 .bug_contest
 	jumpstd bugcontestresultswarp
-; 0x124f5
 
-.WhitedOutText: ; 0x124f5
+.WhitedOutText:
 	; is out of useable #MON!  whited out!
 	text_jump UnknownText_0x1c0a4e
 	db "@"
-; 0x124fa
 
-OverworldBGMap: ; 124fa
+OverworldBGMap:
 	call ClearPalettes
 	call ClearScreen
 	call WaitBGMap2
 	call HideSprites
 	call RotateThreePalettesLeft
 	ret
-; 1250a
 
-BattleBGMap: ; 1250a
+BattleBGMap:
 	ld b, SCGB_BATTLE_GRAYSCALE
 	call GetSGBLayout
 	call SetPalettes
 	ret
-; 12513
 
-HalveMoney: ; 12513
+HalveMoney:
 	farcall StubbedTrainerRankings_WhiteOuts
 
 ; Halve the player's money.
@@ -63,10 +58,8 @@ HalveMoney: ; 12513
 	rra
 	ld [hl], a
 	ret
-; 12527
 
-
-GetWhiteoutSpawn: ; 12527
+GetWhiteoutSpawn:
 	ld a, [wLastSpawnMapGroup]
 	ld d, a
 	ld a, [wLastSpawnMapNumber]
@@ -79,4 +72,3 @@ GetWhiteoutSpawn: ; 12527
 .yes
 	ld [wDefaultSpawnpoint], a
 	ret
-; 1253d
diff --git a/engine/events_2.asm b/engine/events_2.asm
deleted file mode 100644
index b43ebdd6a..000000000
--- a/engine/events_2.asm
+++ /dev/null
@@ -1,650 +0,0 @@
-; More overworld event handling.
-
-
-Special_WarpToSpawnPoint:: ; 97c28
-	ld hl, wStatusFlags2
-	res 1, [hl] ; safari zone?
-	res 2, [hl] ; bug contest
-	ret
-; 97c30
-
-RunMemScript:: ; 97c30
-; If there is no script here, we don't need to be here.
-	ld a, [wMapReentryScriptQueueFlag]
-	and a
-	ret z
-; Execute the script at (wMapReentryScriptBank):(wMapReentryScriptAddress).
-	ld hl, wMapReentryScriptAddress
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	ld a, [wMapReentryScriptBank]
-	call CallScript
-	scf
-; Clear the buffer for the next script.
-	push af
-	xor a
-	ld hl, wMapReentryScriptQueueFlag
-	ld bc, 8
-	call ByteFill
-	pop af
-	ret
-; 97c4f
-
-LoadScriptBDE:: ; 97c4f
-; If there's already a script here, don't overwrite.
-	ld hl, wMapReentryScriptQueueFlag
-	ld a, [hl]
-	and a
-	ret nz
-; Set the flag
-	ld [hl], 1
-	inc hl
-; Load the script pointer b:de into (wMapReentryScriptBank):(wMapReentryScriptAddress)
-	ld [hl], b
-	inc hl
-	ld [hl], e
-	inc hl
-	ld [hl], d
-	scf
-	ret
-; 97c5f
-
-TryTileCollisionEvent:: ; 97c5f
-	call GetFacingTileCoord
-	ld [wEngineBuffer1], a
-	ld c, a
-	farcall CheckFacingTileForStdScript
-	jr c, .done
-
-	call CheckCutTreeTile
-	jr nz, .whirlpool
-	farcall TryCutOW
-	jr .done
-
-.whirlpool
-	ld a, [wEngineBuffer1]
-	call CheckWhirlpoolTile
-	jr nz, .waterfall
-	farcall TryWhirlpoolOW
-	jr .done
-
-.waterfall
-	ld a, [wEngineBuffer1]
-	call CheckWaterfallTile
-	jr nz, .headbutt
-	farcall TryWaterfallOW
-	jr .done
-
-.headbutt
-	ld a, [wEngineBuffer1]
-	call CheckHeadbuttTreeTile
-	jr nz, .surf
-	farcall TryHeadbuttOW
-	jr c, .done
-	jr .noevent
-
-.surf
-	farcall TrySurfOW
-	jr nc, .noevent
-	jr .done
-
-.noevent
-	xor a
-	ret
-
-.done
-	call PlayClickSFX
-	ld a, $ff
-	scf
-	ret
-; 97cc0
-
-
-RandomEncounter:: ; 97cc0
-; Random encounter
-
-	call CheckWildEncounterCooldown
-	jr c, .nope
-	call CanUseSweetScent
-	jr nc, .nope
-	ld hl, wStatusFlags2
-	bit 2, [hl] ; bug contest
-	jr nz, .bug_contest
-	farcall TryWildEncounter
-	jr nz, .nope
-	jr .ok
-
-.bug_contest
-	call _TryWildEncounter_BugContest
-	jr nc, .nope
-	jr .ok_bug_contest
-
-.nope
-	ld a, 1
-	and a
-	ret
-
-.ok
-	ld a, BANK(WildBattleScript)
-	ld hl, WildBattleScript
-	jr .done
-
-.ok_bug_contest
-	ld a, BANK(BugCatchingContestBattleScript)
-	ld hl, BugCatchingContestBattleScript
-	jr .done
-
-.done
-	call CallScript
-	scf
-	ret
-; 97cf9
-
-WildBattleScript: ; 97cf9
-	randomwildmon
-	startbattle
-	reloadmapafterbattle
-	end
-; 97cfd
-
-CanUseSweetScent:: ; 97cfd
-	ld hl, wStatusFlags
-	bit 5, [hl]
-	jr nz, .no
-	ld a, [wEnvironment]
-	cp CAVE
-	jr z, .ice_check
-	cp DUNGEON
-	jr z, .ice_check
-	farcall CheckGrassCollision
-	jr nc, .no
-
-.ice_check
-	ld a, [wPlayerStandingTile]
-	call CheckIceTile
-	jr z, .no
-	scf
-	ret
-
-.no
-	and a
-	ret
-; 97d23
-
-_TryWildEncounter_BugContest: ; 97d23
-	call TryWildEncounter_BugContest
-	ret nc
-	call ChooseWildEncounter_BugContest
-	farcall CheckRepelEffect
-	ret
-; 97d31
-
-ChooseWildEncounter_BugContest:: ; 97d31
-; Pick a random mon out of ContestMons.
-
-.loop
-	call Random
-	cp 100 << 1
-	jr nc, .loop
-	srl a
-
-	ld hl, ContestMons
-	ld de, 4
-.CheckMon:
-	sub [hl]
-	jr c, .GotMon
-	add hl, de
-	jr .CheckMon
-
-.GotMon:
-	inc hl
-
-; Species
-	ld a, [hli]
-	ld [wTempWildMonSpecies], a
-
-; Min level
-	ld a, [hli]
-	ld d, a
-
-; Max level
-	ld a, [hl]
-
-	sub d
-	jr nz, .RandomLevel
-
-; If min and max are the same.
-	ld a, d
-	jr .GotLevel
-
-.RandomLevel:
-; Get a random level between the min and max.
-	ld c, a
-	inc c
-	call Random
-	ld a, [hRandomAdd]
-	call SimpleDivide
-	add d
-
-.GotLevel:
-	ld [wCurPartyLevel], a
-
-	xor a
-	ret
-; 97d64
-
-TryWildEncounter_BugContest: ; 97d64
-	ld a, [wPlayerStandingTile]
-	call CheckSuperTallGrassTile
-	ld b, 40 percent
-	jr z, .ok
-	ld b, 20 percent
-
-.ok
-	farcall ApplyMusicEffectOnEncounterRate
-	farcall ApplyCleanseTagEffectOnEncounterRate
-	call Random
-	ld a, [hRandomAdd]
-	cp b
-	ret c
-	ld a, 1
-	and a
-	ret
-; 97d87
-
-
-INCLUDE "data/wild/bug_contest_mons.asm"
-
-
-DoBikeStep:: ; 97db3
-	nop
-	nop
-	; If the bike shop owner doesn't have our number, or
-	; if we've already gotten the call, we don't have to
-	; be here.
-	ld hl, wStatusFlags2
-	bit 4, [hl] ; bike shop call
-	jr z, .NoCall
-
-	; If we're not on the bike, we don't have to be here.
-	ld a, [wPlayerState]
-	cp PLAYER_BIKE
-	jr nz, .NoCall
-
-	; If we're not in an area of phone service, we don't
-	; have to be here.
-	call GetMapPhoneService
-	and a
-	jr nz, .NoCall
-
-	; Check the bike step count and check whether we've
-	; taken 65536 of them yet.
-	ld hl, wBikeStep
-	ld a, [hli]
-	ld d, a
-	ld e, [hl]
-	cp 255
-	jr nz, .increment
-	ld a, e
-	cp 255
-	jr z, .dont_increment
-
-.increment
-	inc de
-	ld [hl], e
-	dec hl
-	ld [hl], d
-
-.dont_increment
-	; If we've taken at least 1024 steps, have the bike
-	;  shop owner try to call us.
-	ld a, d
-	cp HIGH(1024)
-	jr c, .NoCall
-
-	; If a call has already been queued, don't overwrite
-	; that call.
-	ld a, [wSpecialPhoneCallID]
-	and a
-	jr nz, .NoCall
-
-	; Queue the call.
-	ld a, SPECIALCALL_BIKESHOP
-	ld [wSpecialPhoneCallID], a
-	xor a
-	ld [wSpecialPhoneCallID + 1], a
-	ld hl, wStatusFlags2
-	res 4, [hl] ; bike shop call
-	scf
-	ret
-
-.NoCall:
-	xor a
-	ret
-; 97df9
-
-ClearCmdQueue:: ; 97df9
-	ld hl, wCmdQueue
-	ld de, 6
-	ld c, 4
-	xor a
-.loop
-	ld [hl], a
-	add hl, de
-	dec c
-	jr nz, .loop
-	ret
-; 97e08
-
-HandleCmdQueue:: ; 97e08
-	ld hl, wCmdQueue
-	xor a
-.loop
-	ld [hMapObjectIndexBuffer], a
-	ld a, [hl]
-	and a
-	jr z, .skip
-	push hl
-	ld b, h
-	ld c, l
-	call HandleQueuedCommand
-	pop hl
-
-.skip
-	ld de, CMDQUEUE_ENTRY_SIZE
-	add hl, de
-	ld a, [hMapObjectIndexBuffer]
-	inc a
-	cp CMDQUEUE_CAPACITY
-	jr nz, .loop
-	ret
-; 97e25
-
-Unreferenced_GetNthCmdQueueEntry: ; 97e25
-	ld hl, wCmdQueue
-	ld bc, CMDQUEUE_ENTRY_SIZE
-	call AddNTimes
-	ld b, h
-	ld c, l
-	ret
-; 97e31
-
-WriteCmdQueue:: ; 97e31
-	push bc
-	push de
-	call .GetNextEmptyEntry
-	ld d, h
-	ld e, l
-	pop hl
-	pop bc
-	ret c
-	ld a, b
-	ld bc, CMDQUEUE_ENTRY_SIZE - 1
-	call FarCopyBytes
-	xor a
-	ld [hl], a
-	ret
-; 97e45
-
-.GetNextEmptyEntry: ; 97e45
-	ld hl, wCmdQueue
-	ld de, CMDQUEUE_ENTRY_SIZE
-	ld c, CMDQUEUE_CAPACITY
-.loop
-	ld a, [hl]
-	and a
-	jr z, .done
-	add hl, de
-	dec c
-	jr nz, .loop
-	scf
-	ret
-
-.done
-	ld a, CMDQUEUE_CAPACITY
-	sub c
-	and a
-	ret
-; 97e5c
-
-DelCmdQueue:: ; 97e5c
-	ld hl, wCmdQueue
-	ld de, CMDQUEUE_ENTRY_SIZE
-	ld c, CMDQUEUE_CAPACITY
-.loop
-	ld a, [hl]
-	cp b
-	jr z, .done
-	add hl, de
-	dec c
-	jr nz, .loop
-	and a
-	ret
-
-.done
-	xor a
-	ld [hl], a
-	scf
-	ret
-; 97e72
-
-_DelCmdQueue: ; 97e72
-	ld hl, CMDQUEUE_TYPE
-	add hl, bc
-	ld [hl], 0
-	ret
-; 97e79
-
-HandleQueuedCommand: ; 97e79
-	ld hl, CMDQUEUE_TYPE
-	add hl, bc
-	ld a, [hl]
-	cp 5
-	jr c, .okay
-	xor a
-
-.okay
-	ld e, a
-	ld d, 0
-	ld hl, .Jumptable
-	add hl, de
-	add hl, de
-	add hl, de
-	ld a, [hli]
-	push af
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	pop af
-	rst FarCall
-	ret
-; 97e94
-
-.Jumptable: ; 97e94
-	dba CmdQueue_Null
-	dba CmdQueue_Null2
-	dba CmdQueue_StoneTable
-	dba CmdQueue_Type3
-	dba CmdQueue_Type4
-; 97ea3
-
-CmdQueueAnonymousJumptable: ; 97ea3
-	ld hl, CMDQUEUE_05
-	add hl, bc
-	ld a, [hl]
-	pop hl
-	rst JumpTable
-	ret
-; 97eab
-
-CmdQueueAnonJT_Increment: ; 97eab
-	ld hl, CMDQUEUE_05
-	add hl, bc
-	inc [hl]
-	ret
-; 97eb1
-
-CmdQueueAnonJT_Decrement: ; 97eb1
-	ld hl, CMDQUEUE_05
-	add hl, bc
-	dec [hl]
-	ret
-; 97eb7
-
-CmdQueue_Null: ; 97eb7
-	ret
-; 97eb8
-
-CmdQueue_Null2: ; 97eb8
-	call ret_2f3e
-	ret
-; 97ebc
-
-CmdQueue_Type4: ; 97ebc
-	call CmdQueueAnonymousJumptable
-	; anonymous dw
-	dw .zero
-	dw .one
-; 97ec3
-
-.zero ; 97ec3
-	ld a, [hSCY]
-	ld hl, 4
-	add hl, bc
-	ld [hl], a
-	call CmdQueueAnonJT_Increment
-.one ; 97ecd
-	ld hl, 1
-	add hl, bc
-	ld a, [hl]
-	dec a
-	ld [hl], a
-	jr z, .finish
-	and $1
-	jr z, .add
-	ld hl, 2
-	add hl, bc
-	ld a, [hSCY]
-	sub [hl]
-	ld [hSCY], a
-	ret
-
-.add
-	ld hl, 2
-	add hl, bc
-	ld a, [hSCY]
-	add [hl]
-	ld [hSCY], a
-	ret
-
-.finish
-	ld hl, 4
-	add hl, bc
-	ld a, [hl]
-	ld [hSCY], a
-	call _DelCmdQueue
-	ret
-; 97ef9
-
-CmdQueue_Type3: ; 97ef9
-	call CmdQueueAnonymousJumptable
-	; anonymous dw
-	dw .zero
-	dw .one
-	dw .two
-; 97f02
-
-.zero ; 97f02
-	call .IsPlayerFacingDown
-	jr z, .PlayerNotFacingDown
-	call CmdQueueAnonJT_Increment
-.one ; 97f0a
-	call .IsPlayerFacingDown
-	jr z, .PlayerNotFacingDown
-	call CmdQueueAnonJT_Increment
-
-	ld hl, 2
-	add hl, bc
-	ld a, [hl]
-	ld [wd173], a
-	ret
-; 97f1b
-
-.two ; 97f1b
-	call .IsPlayerFacingDown
-	jr z, .PlayerNotFacingDown
-	call CmdQueueAnonJT_Decrement
-
-	ld hl, 3
-	add hl, bc
-	ld a, [hl]
-	ld [wd173], a
-	ret
-; 97f2c
-
-.PlayerNotFacingDown: ; 97f2c
-	ld a, $7f
-	ld [wd173], a
-	ld hl, 5
-	add hl, bc
-	ld [hl], 0
-	ret
-; 97f38
-
-.IsPlayerFacingDown: ; 97f38
-	push bc
-	ld bc, wPlayerStruct
-	call GetSpriteDirection
-	and a
-	pop bc
-	ret
-; 97f42
-
-CmdQueue_StoneTable: ; 97f42
-	ld de, wPlayerStruct
-	ld a, NUM_OBJECT_STRUCTS
-.loop
-	push af
-
-	ld hl, OBJECT_SPRITE
-	add hl, de
-	ld a, [hl]
-	and a
-	jr z, .next
-
-	ld hl, OBJECT_MOVEMENTTYPE
-	add hl, de
-	ld a, [hl]
-	cp SPRITEMOVEDATA_STRENGTH_BOULDER
-	jr nz, .next
-
-	ld hl, OBJECT_NEXT_TILE
-	add hl, de
-	ld a, [hl]
-	call CheckPitTile
-	jr nz, .next
-
-	ld hl, OBJECT_DIRECTION_WALKING
-	add hl, de
-	ld a, [hl]
-	cp STANDING
-	jr nz, .next
-	call HandleStoneQueue
-	jr c, .fall_down_hole
-
-.next
-	ld hl, OBJECT_STRUCT_LENGTH
-	add hl, de
-	ld d, h
-	ld e, l
-
-	pop af
-	dec a
-	jr nz, .loop
-	ret
-
-.fall_down_hole
-	pop af
-	ret
-; 97f7e
diff --git a/engine/card_flip.asm b/engine/games/card_flip.asm
index fbeb3e3b6..805a3ca71 100755..100644
--- a/engine/card_flip.asm
+++ b/engine/games/card_flip.asm
@@ -1,18 +1,18 @@
-CARDFLIP_LIGHT_OFF EQU $ef
-CARDFLIP_LIGHT_ON  EQU $f5
+CARDFLIP_LIGHT_OFF EQUS "\"♂\"" ; $ef
+CARDFLIP_LIGHT_ON  EQUS "\"♀\"" ; $f5
 
 CARDFLIP_DECK_SIZE EQU 4 * 6
 
 ; two labels below called from inside ./dummy_game.asm
-Unknown_e00ed: ; e00ed (38:40ed)
+Unknown_e00ed:
 ; Graphics for an unused Game Corner
 ; game were meant to be here.
-ret_e00ed: ; e00ed (38:40ed)
+ret_e00ed:
 	ret
 
-_CardFlip: ; e00ee (38:40ee)
+_CardFlip:
 	ld hl, wOptions
-	set 4, [hl]
+	set NO_TEXT_SCROLL, [hl]
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -74,7 +74,7 @@ _CardFlip: ; e00ee (38:40ee)
 	res 4, [hl]
 	ret
 
-.CardFlip: ; e0191 (38:4191)
+.CardFlip:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -85,9 +85,8 @@ _CardFlip: ; e00ee (38:40ee)
 	ld h, [hl]
 	ld l, a
 	jp hl
-; e01a0 (38:41a0)
 
-.Jumptable: ; e01a0
+.Jumptable:
 	dw .AskPlayWithThree
 	dw .DeductCoins
 	dw .ChooseACard
@@ -96,15 +95,13 @@ _CardFlip: ; e00ee (38:40ee)
 	dw .TabulateTheResult
 	dw .PlayAgain
 	dw .Quit
-; e01b0
 
-.Increment: ; e01b0
+.Increment:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
-; e01b5
 
-.AskPlayWithThree: ; e01b5
+.AskPlayWithThree:
 	ld hl, .PlayWithThreeCoinsText
 	call CardFlip_UpdateCoinBalanceDisplay
 	call YesNoBox
@@ -117,15 +114,13 @@ _CardFlip: ; e00ee (38:40ee)
 	ld a, 7
 	ld [wJumptableIndex], a
 	ret
-; e01cd
 
-.PlayWithThreeCoinsText: ; 0xe01cd
+.PlayWithThreeCoinsText:
 	; Play with three coins?
 	text_jump UnknownText_0x1c5793
 	db "@"
-; 0xe01d2
 
-.DeductCoins: ; e01d2
+.DeductCoins:
 	ld a, [wCoins]
 	ld h, a
 	ld a, [wCoins + 1]
@@ -159,15 +154,13 @@ _CardFlip: ; e00ee (38:40ee)
 	call WaitSFX
 	call .Increment
 	ret
-; e0212
 
-.NotEnoughCoinsText: ; 0xe0212
+.NotEnoughCoinsText:
 	; Not enough coins…
 	text_jump UnknownText_0x1c57ab
 	db "@"
-; 0xe0217
 
-.ChooseACard: ; e0217
+.ChooseACard:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -238,15 +231,13 @@ _CardFlip: ; e00ee (38:40ee)
 	ld [wCardFlipWhichCard], a
 	call .Increment
 	ret
-; e02b2
 
-.ChooseACardText: ; 0xe02b2
+.ChooseACardText:
 	; Choose a card.
 	text_jump UnknownText_0x1c57be
 	db "@"
-; 0xe02b7
 
-.PlaceYourBet: ; e02b7
+.PlaceYourBet:
 	ld hl, .PlaceYourBetText
 	call CardFlip_UpdateCoinBalanceDisplay
 .betloop
@@ -262,15 +253,13 @@ _CardFlip: ; e00ee (38:40ee)
 .betdone
 	call .Increment
 	ret
-; e02d5
 
-.PlaceYourBetText: ; 0xe02d5
+.PlaceYourBetText:
 	; Place your bet.
 	text_jump UnknownText_0x1c57ce
 	db "@"
-; 0xe02da
 
-.CheckTheCard: ; e02da
+.CheckTheCard:
 	xor a
 	ld [hVBlankCounter], a
 	call CardFlip_UpdateCursorOAM
@@ -298,16 +287,14 @@ _CardFlip: ; e00ee (38:40ee)
 	call WaitBGMap2
 	call .Increment
 	ret
-; e0314
 
-.TabulateTheResult: ; e0314
+.TabulateTheResult:
 	call CardFlip_CheckWinCondition
 	call WaitPressAorB_BlinkCursor
 	call .Increment
 	ret
-; e031e
 
-.PlayAgain: ; e031e
+.PlayAgain:
 	call ClearSprites
 	ld hl, .PlayAgainText
 	call CardFlip_UpdateCoinBalanceDisplay
@@ -337,27 +324,23 @@ _CardFlip: ; e00ee (38:40ee)
 	ld a, 1
 	ld [wJumptableIndex], a
 	ret
-; e0356
 
-.PlayAgainText: ; 0xe0356
+.PlayAgainText:
 	; Want to play again?
 	text_jump UnknownText_0x1c57df
 	db "@"
-; 0xe035b
 
-.CardsShuffledText: ; 0xe035b
+.CardsShuffledText:
 	; The cards have been shuffled.
 	text_jump UnknownText_0x1c57f4
 	db "@"
-; 0xe0360
 
-.Quit: ; e0360
+.Quit:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
-; e0366
 
-CardFlip_ShuffleDeck: ; e0366
+CardFlip_ShuffleDeck:
 	ld hl, wDeck
 	ld bc, CARDFLIP_DECK_SIZE
 	xor a
@@ -384,9 +367,8 @@ CardFlip_ShuffleDeck: ; e0366
 	ld bc, CARDFLIP_DECK_SIZE
 	call ByteFill
 	ret
-; e0398
 
-CollapseCursorPosition: ; e0398
+CollapseCursorPosition:
 	ld hl, 0
 	ld bc, 6
 	ld a, [wCardFlipCursorY]
@@ -396,9 +378,8 @@ CollapseCursorPosition: ; e0398
 	ld c, a
 	add hl, bc
 	ret
-; e03ac
 
-GetCoordsOfChosenCard: ; e03ac
+GetCoordsOfChosenCard:
 	ld a, [wCardFlipWhichCard]
 	and a
 	jr nz, .BottomCard
@@ -412,27 +393,24 @@ GetCoordsOfChosenCard: ; e03ac
 
 .done
 	ret
-; e03c1
 
-PlaceCardFaceDown: ; e03c1
+PlaceCardFaceDown:
 	xor a
 	ld [hBGMapMode], a
 	ld de, .FaceDownCardTilemap
 	lb bc, 6, 5
 	call CardFlip_CopyToBox
 	ret
-; e03ce
 
-.FaceDownCardTilemap: ; e03ce
+.FaceDownCardTilemap:
 	db $08, $09, $09, $09, $0a
 	db $0b, $28, $2b, $28, $0c
 	db $0b, $2c, $2d, $2e, $0c
 	db $0b, $2f, $30, $31, $0c
 	db $0b, $32, $33, $34, $0c
 	db $0d, $0e, $0e, $0e, $0f
-; e03ec
 
-CardFlip_DisplayCardFaceUp: ; e03ec
+CardFlip_DisplayCardFaceUp:
 	xor a
 	ld [hBGMapMode], a
 	push hl
@@ -493,18 +471,16 @@ CardFlip_DisplayCardFaceUp: ; e03ec
 	lb bc, 6, 5
 	call CardFlip_FillBox
 	ret
-; e043b
 
-.FaceUpCardTilemap: ; e043b
+.FaceUpCardTilemap:
 	db $18, $19, $19, $19, $1a
 	db $1b, $35, $7f, $7f, $1c
 	db $0b, $28, $28, $28, $0c
 	db $0b, $28, $28, $28, $0c
 	db $0b, $28, $28, $28, $0c
 	db $1d, $1e, $1e, $1e, $1f
-; e0459
 
-.Deck: ; e0459
+.Deck:
 	; level, pic anchor (3x3)
 	db "1", $4e, "1", $57, "1", $69, "1", $60
 	db "2", $4e, "2", $57, "2", $69, "2", $60
@@ -512,9 +488,8 @@ CardFlip_DisplayCardFaceUp: ; e03ec
 	db "4", $4e, "4", $57, "4", $69, "4", $60
 	db "5", $4e, "5", $57, "5", $69, "5", $60
 	db "6", $4e, "6", $57, "6", $69, "6", $60
-; e0489
 
-CardFlip_UpdateCoinBalanceDisplay: ; e0489
+CardFlip_UpdateCoinBalanceDisplay:
 	push hl
 	hlcoord 0, 12
 	ld b, 4
@@ -524,9 +499,8 @@ CardFlip_UpdateCoinBalanceDisplay: ; e0489
 	call PrintTextBoxText
 	call CardFlip_PrintCoinBalance
 	ret
-; e049c
 
-CardFlip_PrintCoinBalance: ; e049c
+CardFlip_PrintCoinBalance:
 	hlcoord 9, 15
 	ld b, 1
 	ld c, 9
@@ -539,13 +513,11 @@ CardFlip_PrintCoinBalance: ; e049c
 	lb bc, PRINTNUM_LEADINGZEROS | 2, 4
 	call PrintNum
 	ret
-; e04bc
 
 .CoinStr:
 	db "COIN@"
-; e04c1
 
-CardFlip_InitTilemap: ; e04c1 (38:44c1)
+CardFlip_InitTilemap:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -560,12 +532,11 @@ CardFlip_InitTilemap: ; e04c1 (38:44c1)
 	lb bc, 4, 18
 	call TextBox
 	ret
-; e04e5 (38:44e5)
 
-CardFlip_FillGreenBox: ; e04e5
+CardFlip_FillGreenBox:
 	ld a, $29
 
-CardFlip_FillBox: ; e04e7 (38:44e7)
+CardFlip_FillBox:
 .row
 	push bc
 	push hl
@@ -581,7 +552,7 @@ CardFlip_FillBox: ; e04e7 (38:44e7)
 	jr nz, .row
 	ret
 
-CardFlip_CopyToBox: ; e04f7 (38:44f7)
+CardFlip_CopyToBox:
 .row
 	push bc
 	push hl
@@ -598,9 +569,8 @@ CardFlip_CopyToBox: ; e04f7 (38:44f7)
 	dec b
 	jr nz, .row
 	ret
-; e0509 (38:4509)
 
-CardFlip_CopyOAM: ; e0509
+CardFlip_CopyOAM:
 	ld de, wVirtualOAMSprite00
 	ld a, [hli]
 .loop
@@ -623,9 +593,8 @@ CardFlip_CopyOAM: ; e0509
 	dec a
 	jr nz, .loop
 	ret
-; e0521
 
-CardFlip_ShiftDigitsLeftTwoPixels: ; e0521 (38:4521)
+CardFlip_ShiftDigitsLeftTwoPixels:
 	ld de, vTiles0 tile "0"
 	ld hl, vTiles0 tile "0" + 2
 	ld bc, 10 tiles - 2
@@ -635,9 +604,8 @@ CardFlip_ShiftDigitsLeftTwoPixels: ; e0521 (38:4521)
 	ld [hli], a
 	ld [hl], a
 	ret
-; e0534 (38:4534)
 
-CardFlip_BlankDiscardedCardSlot: ; e0534
+CardFlip_BlankDiscardedCardSlot:
 	xor a
 	ld [hBGMapMode], a
 	ld a, [wCardFlipFaceUpCard]
@@ -660,18 +628,16 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
 	ld h, [hl]
 	ld l, a
 	jp hl
-; e0553
 
-.Jumptable: ; e0553
+.Jumptable:
 	dw .Level1
 	dw .Level2
 	dw .Level3
 	dw .Level4
 	dw .Level5
 	dw .Level6
-; e055f
 
-.Level1: ; e055f
+.Level1:
 	ld hl, wDiscardPile + 4
 	add hl, de
 	ld a, [hl]
@@ -695,9 +661,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
 	add hl, bc
 	ld [hl], $3d
 	ret
-; e0583
 
-.Level2: ; e0583
+.Level2:
 	ld hl, wDiscardPile - 4
 	add hl, de
 	ld a, [hl]
@@ -721,9 +686,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
 	add hl, bc
 	ld [hl], $3a
 	ret
-; e05a7
 
-.Level3: ; e05a7
+.Level3:
 	ld hl, wDiscardPile + 4
 	add hl, de
 	ld a, [hl]
@@ -747,9 +711,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
 	add hl, bc
 	ld [hl], $3d
 	ret
-; e05cb
 
-.Level4: ; e05cb
+.Level4:
 	ld hl, wDiscardPile - 4
 	add hl, de
 	ld a, [hl]
@@ -773,9 +736,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
 	add hl, bc
 	ld [hl], $3a
 	ret
-; e05ef
 
-.Level5: ; e05ef
+.Level5:
 	ld hl, wDiscardPile + 4
 	add hl, de
 	ld a, [hl]
@@ -799,9 +761,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
 	add hl, bc
 	ld [hl], $3d
 	ret
-; e0613
 
-.Level6: ; e0613
+.Level6:
 	ld hl, wDiscardPile - 4
 	add hl, de
 	ld a, [hl]
@@ -825,9 +786,8 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
 	add hl, bc
 	ld [hl], $3a
 	ret
-; e0637
 
-CardFlip_CheckWinCondition: ; e0637
+CardFlip_CheckWinCondition:
 	call CollapseCursorPosition
 	add hl, hl
 	ld de, .Jumptable
@@ -836,9 +796,8 @@ CardFlip_CheckWinCondition: ; e0637
 	ld h, [hl]
 	ld l, a
 	jp hl
-; e0643
 
-.Jumptable: ; e0643
+.Jumptable:
 	dw .Impossible
 	dw .Impossible
 	dw .PikaJiggly
@@ -894,233 +853,226 @@ CardFlip_CheckWinCondition: ; e0637
 	dw .JigglySix
 	dw .PoliSix
 	dw .OddSix
-; e06a3
 
-.Impossible: ; e06a3
+.Impossible:
 	jp .Lose
-; e06a6
 
-.PikaJiggly: ; e06a6
+.PikaJiggly:
 	ld a, [wCardFlipFaceUpCard]
 	and $2
 	jp nz, .Lose
 	jr .WinSix
 
-.PoliOddish: ; e06b0
+.PoliOddish:
 	ld a, [wCardFlipFaceUpCard]
 	and $2
 	jr nz, .WinSix
 	jp .Lose
 
-.WinSix: ; e06ba
+.WinSix:
 	ld c, $6
 	ld de, SFX_2ND_PLACE
 	jp .Payout
-; e06c2
 
-.OneTwo: ; e06c2
+.OneTwo:
 	ld a, [wCardFlipFaceUpCard]
 	and $18
 	jr z, .WinNine
 	jp .Lose
 
-.ThreeFour: ; e06cc
+.ThreeFour:
 	ld a, [wCardFlipFaceUpCard]
 	and $18
 	cp $8
 	jr z, .WinNine
 	jp .Lose
 
-.FiveSix: ; e06d8
+.FiveSix:
 	ld a, [wCardFlipFaceUpCard]
 	and $18
 	cp $10
 	jr z, .WinNine
 	jp .Lose
 
-.WinNine: ; e06e4
+.WinNine:
 	ld c, $9
 	ld de, SFX_2ND_PLACE
 	jp .Payout
-; e06ec
 
-.Pikachu: ; e06ec
+.Pikachu:
 	ld a, [wCardFlipFaceUpCard]
 	and $3
 	jr z, .WinTwelve
 	jp .Lose
 
-.Jigglypuff: ; e06f6
+.Jigglypuff:
 	ld a, [wCardFlipFaceUpCard]
 	and $3
 	cp $1
 	jr z, .WinTwelve
 	jp .Lose
 
-.Poliwag: ; e0702
+.Poliwag:
 	ld a, [wCardFlipFaceUpCard]
 	and $3
 	cp $2
 	jr z, .WinTwelve
 	jp .Lose
 
-.Oddish: ; e070e
+.Oddish:
 	ld a, [wCardFlipFaceUpCard]
 	and $3
 	cp $3
 	jr z, .WinTwelve
 	jp .Lose
 
-.WinTwelve: ; e071a
+.WinTwelve:
 	ld c, $c
 	ld de, SFX_2ND_PLACE
 	jp .Payout
-; e0722
 
-.One: ; e0722
+.One:
 	ld a, [wCardFlipFaceUpCard]
 	and $1c
 	jr z, .WinEighteen
 	jp .Lose
 
-.Two: ; e072c
+.Two:
 	ld a, [wCardFlipFaceUpCard]
 	and $1c
 	cp $4
 	jr z, .WinEighteen
 	jp .Lose
 
-.Three: ; e0738
+.Three:
 	ld a, [wCardFlipFaceUpCard]
 	and $1c
 	cp $8
 	jr z, .WinEighteen
 	jp .Lose
 
-.Four: ; e0744
+.Four:
 	ld a, [wCardFlipFaceUpCard]
 	and $1c
 	cp $c
 	jr z, .WinEighteen
 	jp .Lose
 
-.Five: ; e0750
+.Five:
 	ld a, [wCardFlipFaceUpCard]
 	and $1c
 	cp $10
 	jr z, .WinEighteen
 	jp .Lose
 
-.Six: ; e075c
+.Six:
 	ld a, [wCardFlipFaceUpCard]
 	and $1c
 	cp $14
 	jr z, .WinEighteen
 	jp .Lose
 
-.WinEighteen: ; e0768
+.WinEighteen:
 	ld c, $12
 	ld de, SFX_2ND_PLACE
 	jp .Payout
-; e0770
 
-
-.PikaOne: ; e0770
+.PikaOne:
 	ld e, $0
 	jr .CheckWin72
 
-.JigglyOne: ; e0774
+.JigglyOne:
 	ld e, $1
 	jr .CheckWin72
 
-.PoliOne: ; e0778
+.PoliOne:
 	ld e, $2
 	jr .CheckWin72
 
-.OddOne: ; e077c
+.OddOne:
 	ld e, $3
 	jr .CheckWin72
 
-.PikaTwo: ; e0780
+.PikaTwo:
 	ld e, $4
 	jr .CheckWin72
 
-.JigglyTwo: ; e0784
+.JigglyTwo:
 	ld e, $5
 	jr .CheckWin72
 
-.PoliTwo: ; e0788
+.PoliTwo:
 	ld e, $6
 	jr .CheckWin72
 
-.OddTwo: ; e078c
+.OddTwo:
 	ld e, $7
 	jr .CheckWin72
 
-.PikaThree: ; e0790
+.PikaThree:
 	ld e, $8
 	jr .CheckWin72
 
-.JigglyThree: ; e0794
+.JigglyThree:
 	ld e, $9
 	jr .CheckWin72
 
-.PoliThree: ; e0798
+.PoliThree:
 	ld e, $a
 	jr .CheckWin72
 
-.OddThree: ; e079c
+.OddThree:
 	ld e, $b
 	jr .CheckWin72
 
-.PikaFour: ; e07a0
+.PikaFour:
 	ld e, $c
 	jr .CheckWin72
 
-.JigglyFour: ; e07a4
+.JigglyFour:
 	ld e, $d
 	jr .CheckWin72
 
-.PoliFour: ; e07a8
+.PoliFour:
 	ld e, $e
 	jr .CheckWin72
 
-.OddFour: ; e07ac
+.OddFour:
 	ld e, $f
 	jr .CheckWin72
 
-.PikaFive: ; e07b0
+.PikaFive:
 	ld e, $10
 	jr .CheckWin72
 
-.JigglyFive: ; e07b4
+.JigglyFive:
 	ld e, $11
 	jr .CheckWin72
 
-.PoliFive: ; e07b8
+.PoliFive:
 	ld e, $12
 	jr .CheckWin72
 
-.OddFive: ; e07bc
+.OddFive:
 	ld e, $13
 	jr .CheckWin72
 
-.PikaSix: ; e07c0
+.PikaSix:
 	ld e, $14
 	jr .CheckWin72
 
-.JigglySix: ; e07c4
+.JigglySix:
 	ld e, $15
 	jr .CheckWin72
 
-.PoliSix: ; e07c8
+.PoliSix:
 	ld e, $16
 	jr .CheckWin72
 
-.OddSix: ; e07cc
+.OddSix:
 	ld e, $17
 
-.CheckWin72: ; e07ce
+.CheckWin72:
 	ld a, [wCardFlipFaceUpCard]
 	cp e
 	jr nz, .Lose
@@ -1128,7 +1080,7 @@ CardFlip_CheckWinCondition: ; e0637
 	ld de, SFX_2ND_PLACE
 	jr .Payout
 
-.Lose: ; e07db
+.Lose:
 	ld de, SFX_WRONG
 	call PlaySFX
 	ld hl, .Text_Darn
@@ -1136,7 +1088,7 @@ CardFlip_CheckWinCondition: ; e0637
 	call WaitSFX
 	ret
 
-.Payout: ; e07eb
+.Payout:
 	push bc
 	push de
 	ld hl, .Text_Yeah
@@ -1159,21 +1111,18 @@ CardFlip_CheckWinCondition: ; e0637
 	dec c
 	jr nz, .loop
 	ret
-; e0811
 
-.Text_Yeah: ; 0xe0811
+.Text_Yeah:
 	; Yeah!
 	text_jump UnknownText_0x1c5813
 	db "@"
-; 0xe0816
 
-.Text_Darn: ; 0xe0816
+.Text_Darn:
 	; Darn…
 	text_jump UnknownText_0x1c581a
 	db "@"
-; 0xe081b
 
-.AddCoinPlaySFX: ; e081b
+.AddCoinPlaySFX:
 	ld a, [wCoins]
 	ld h, a
 	ld a, [wCoins + 1]
@@ -1186,9 +1135,8 @@ CardFlip_CheckWinCondition: ; e0637
 	ld de, SFX_PAY_DAY
 	call PlaySFX
 	ret
-; e0833
 
-.IsCoinCaseFull: ; e0833
+.IsCoinCaseFull:
 	ld a, [wCoins]
 	cp HIGH(MAX_COINS)
 	jr c, .less
@@ -1207,16 +1155,14 @@ CardFlip_CheckWinCondition: ; e0637
 .less
 	and a
 	ret
-; e0849
 
-PlaceOAMCardBorder: ; e0849
+PlaceOAMCardBorder:
 	call GetCoordsOfChosenCard
 	ld hl, .SpriteData
 	call CardFlip_CopyOAM
 	ret
-; e0853
 
-.SpriteData: ; e0853
+.SpriteData:
 	db 18
 	dsprite 0, 0, 0, 0, $04, 0
 	dsprite 0, 0, 1, 0, $06, 0
@@ -1241,9 +1187,8 @@ PlaceOAMCardBorder: ; e0849
 	dsprite 5, 0, 2, 0, $06, 0 | Y_FLIP
 	dsprite 5, 0, 3, 0, $06, 0 | Y_FLIP
 	dsprite 5, 0, 4, 0, $04, 0 | X_FLIP | Y_FLIP
-; e089c
 
-ChooseCard_HandleJoypad: ; e089c
+ChooseCard_HandleJoypad:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_LEFT
@@ -1258,9 +1203,8 @@ ChooseCard_HandleJoypad: ; e089c
 	and D_DOWN
 	jp nz, .d_down
 	ret
-; e08b8
 
-.d_left ; e08b8
+.d_left
 	ld hl, wCardFlipCursorX
 	ld a, [wCardFlipCursorY]
 	and a
@@ -1296,9 +1240,8 @@ ChooseCard_HandleJoypad: ; e089c
 	ld a, $1
 	ld [wCardFlipCursorX], a
 	jp .play_sound
-; e08ef
 
-.d_right ; e08ef
+.d_right
 	ld hl, wCardFlipCursorX
 	ld a, [wCardFlipCursorY]
 	and a
@@ -1319,7 +1262,7 @@ ChooseCard_HandleJoypad: ; e089c
 	inc [hl]
 	jr .play_sound
 
-.d_up ; e090a
+.d_up
 	ld hl, wCardFlipCursorY
 	ld a, [wCardFlipCursorX]
 	and a
@@ -1356,7 +1299,7 @@ ChooseCard_HandleJoypad: ; e089c
 	ld [wCardFlipCursorX], a
 	jr .play_sound
 
-.d_down ; e093d
+.d_down
 	ld hl, wCardFlipCursorY
 	ld a, [wCardFlipCursorX]
 	and a
@@ -1377,13 +1320,12 @@ ChooseCard_HandleJoypad: ; e089c
 	inc [hl]
 	inc [hl]
 
-.play_sound ; e0959
+.play_sound
 	ld de, SFX_POKEBALLS_PLACED_ON_TABLE
 	call PlaySFX
 	ret
-; e0960
 
-CardFlip_UpdateCursorOAM: ; e0960
+CardFlip_UpdateCursorOAM:
 	call ClearSprites
 	ld a, [hCGB]
 	and a
@@ -1407,9 +1349,8 @@ CardFlip_UpdateCursorOAM: ; e0960
 	ld l, a
 	call CardFlip_CopyOAM
 	ret
-; e0981
 
-.OAMData: ; e0981
+.OAMData:
 cardflip_cursor: MACRO
 if _NARG >= 5
 	dbpixel \1, \2, \3, \4
@@ -1475,9 +1416,8 @@ ENDM
 	cardflip_cursor 15, 12, 0, 4, .SingleTile
 	cardflip_cursor 17, 12, 0, 4, .SingleTile
 	cardflip_cursor 19, 12, 0, 4, .SingleTile
-; e0a41
 
-.SingleTile: ; e0a41
+.SingleTile:
 	db 6
 	dsprite  0, 0,  -1, 7, $00, 0 | PRIORITY
 	dsprite  0, 0,   0, 0, $02, 0 | PRIORITY
@@ -1486,7 +1426,7 @@ ENDM
 	dsprite  0, 5,   0, 0, $02, 0 | Y_FLIP | PRIORITY
 	dsprite  0, 5,   1, 0, $03, 0 | PRIORITY
 
-.PokeGroup: ; e0a5a
+.PokeGroup:
 	db 26
 	dsprite  0, 0,  -1, 7, $00, 0 | PRIORITY
 	dsprite  0, 0,   0, 0, $02, 0 | PRIORITY
@@ -1515,7 +1455,7 @@ ENDM
 	dsprite 10, 1,   0, 0, $02, 0 | Y_FLIP | PRIORITY
 	dsprite 10, 1,   1, 0, $03, 0 | PRIORITY
 
-.NumGroup: ; e0ac3
+.NumGroup:
 	db 20
 	dsprite  0, 0,  -1, 7, $00, 0 | PRIORITY
 	dsprite  0, 0,   0, 0, $02, 0 | PRIORITY
@@ -1538,7 +1478,7 @@ ENDM
 	dsprite  0, 5,   7, 0, $02, 0 | Y_FLIP | PRIORITY
 	dsprite  0, 5,   8, 0, $03, 0 | PRIORITY
 
-.NumGroupPair: ; e0b14
+.NumGroupPair:
 	db 30
 	dsprite  0, 0,   0, 0, $00, 0 | PRIORITY
 	dsprite  0, 0,   1, 0, $02, 0 | PRIORITY
@@ -1571,7 +1511,7 @@ ENDM
 	dsprite  2, 1,   8, 0, $03, 0 | PRIORITY
 	dsprite  2, 1,   9, 0, $03, 0 | PRIORITY
 
-.PokeGroupPair: ; e0b8d
+.PokeGroupPair:
 	db 38
 	dsprite  0, 0,  -1, 7, $00, 0 | PRIORITY
 	dsprite  0, 0,   3, 0, $00, 0 | X_FLIP | PRIORITY
@@ -1612,15 +1552,14 @@ ENDM
 	dsprite 11, 1,   2, 0, $02, 0 | Y_FLIP | PRIORITY
 	dsprite 11, 1,   3, 0, $03, 0 | X_FLIP | Y_FLIP | PRIORITY
 
-.Impossible: ; e0c26
+.Impossible:
 	db 4
 	dsprite  0, 0,   0, 0, $00, 0 | PRIORITY
 	dsprite  0, 0,   1, 0, $00, 0 | X_FLIP | PRIORITY
 	dsprite  1, 0,   0, 0, $00, 0 | Y_FLIP | PRIORITY
 	dsprite  1, 0,   1, 0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY
-; e0c37
 
-CardFlip_InitAttrPals: ; e0c37 (38:4c37)
+CardFlip_InitAttrPals:
 	ld a, [hCGB]
 	and a
 	ret z
@@ -1666,27 +1605,24 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37)
 	pop af
 	ld [rSVBK], a
 	ret
-; e0c93 (38:4c93)
 
-.palettes ; e0c93
+.palettes
 INCLUDE "gfx/card_flip/card_flip.pal"
-; e0cdb
 
-CardFlipLZ03: ; e0cdb
+CardFlipLZ03:
 INCBIN "gfx/card_flip/card_flip_3.2bpp.lz"
 
-CardFlipOffButtonGFX: ; e0cf6
+CardFlipOffButtonGFX:
 INCBIN "gfx/card_flip/off.2bpp"
 
-CardFlipOnButtonGFX: ; e0d06
+CardFlipOnButtonGFX:
 INCBIN "gfx/card_flip/on.2bpp"
 
-CardFlipLZ01: ; e0d16
+CardFlipLZ01:
 INCBIN "gfx/card_flip/card_flip_1.2bpp.lz"
 
-CardFlipLZ02: ; e0ea8
+CardFlipLZ02:
 INCBIN "gfx/card_flip/card_flip_2.2bpp.lz"
 
-CardFlipTilemap: ; e110c
+CardFlipTilemap:
 INCBIN "gfx/card_flip/card_flip.tilemap"
-; e1190
diff --git a/engine/dummy_game.asm b/engine/games/dummy_game.asm
index 6d7e12196..c500dbf66 100755..100644
--- a/engine/dummy_game.asm
+++ b/engine/games/dummy_game.asm
@@ -1,4 +1,4 @@
-_DummyGame: ; e1e5b (38:5e5b)
+_DummyGame:
 	call .LoadGFXAndPals
 	call DelayFrame
 .loop
@@ -243,9 +243,7 @@ endr
 	ld [wJumptableIndex], a
 	ret
 
-; e2010
-
-DummyGame_CheckMatch: ; e2010
+DummyGame_CheckMatch:
 	ld hl, wDummyGameCard1
 	ld a, [hli]
 	cp [hl]
@@ -322,21 +320,17 @@ DummyGame_CheckMatch: ; e2010
 	inc bc
 	ret
 
-; e2093
-
-DummyGameText_Yeah: ; 0xe2093
+DummyGameText_Yeah:
 	; , yeah!
 	text_jump UnknownText_0x1c1a5b
 	db "@"
-; 0xe2098
 
-DummyGameText_Darn: ; 0xe2098
+DummyGameText_Darn:
 	; Darn…
 	text_jump UnknownText_0x1c1a65
 	db "@"
-; 0xe209d
 
-DummyGame_InitBoard: ; e209d
+DummyGame_InitBoard:
 	ld hl, wDummyGameCards
 	ld bc, wDummyGameCardsEnd - wDummyGameCards
 	xor a
@@ -385,9 +379,7 @@ DummyGame_InitBoard: ; e209d
 	jr nz, .loop
 	ret
 
-; e20e5
-
-DummyGame_SampleTilePlacement: ; e20e5
+DummyGame_SampleTilePlacement:
 	push hl
 	ld de, wDummyGameCards
 .loop
@@ -408,9 +400,7 @@ DummyGame_SampleTilePlacement: ; e20e5
 	inc hl
 	ret
 
-; e2101
-
-DummyGame_GetDistributionOfTiles: ; e2101
+DummyGame_GetDistributionOfTiles:
 	ld a, [wMenuCursorY]
 	dec a
 	ld l, a
@@ -426,9 +416,8 @@ DummyGame_GetDistributionOfTiles: ; e2101
 	db $02, $03, $06, $06, $06, $08, $08, $06
 	db $02, $02, $04, $06, $06, $08, $08, $09
 	db $02, $02, $02, $04, $07, $08, $08, $0c
-; e2128
 
-DummyGame_PlaceCard: ; e2128
+DummyGame_PlaceCard:
 	ld a, [wDummyGameLastCardPicked]
 	sla a
 	sla a
@@ -446,9 +435,7 @@ DummyGame_PlaceCard: ; e2128
 	call DelayFrames
 	ret
 
-; e2142
-
-DummyGame_DeleteCard: ; e2142
+DummyGame_DeleteCard:
 	ld a, $1
 	ld [hli], a
 	ld [hld], a
@@ -460,9 +447,7 @@ DummyGame_DeleteCard: ; e2142
 	call DelayFrames
 	ret
 
-; e2152
-
-DummyGame_InitStrings: ; e2152
+DummyGame_InitStrings:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, $1
@@ -483,9 +468,8 @@ DummyGame_InitStrings: ; e2152
 	db "とったもの@"
 .japstr2
 	db "あと　かい@"
-; e2183
 
-DummyGame_Card2Coord: ; e2183
+DummyGame_Card2Coord:
 	ld d, 0
 .find_row
 	sub 9
@@ -511,9 +495,7 @@ DummyGame_Card2Coord: ; e2183
 	add hl, de
 	ret
 
-; e21a1
-
-DummyGame_InterpretJoypad_AnimateCursor: ; e21a1 (38:61a1)
+DummyGame_InterpretJoypad_AnimateCursor:
 	ld a, [wJumptableIndex]
 	cp $7
 	jr nc, .quit
@@ -606,7 +588,5 @@ DummyGame_InterpretJoypad_AnimateCursor: ; e21a1 (38:61a1)
 	ld [hl], a
 	ret
 
-; e2221 (38:6221)
-
-LZ_e2221: ; e2221
+LZ_e2221:
 INCBIN "gfx/dummy_game/dummy_game.2bpp.lz"
diff --git a/engine/slot_machine.asm b/engine/games/slot_machine.asm
index fe9ea52d9..0e7a566b9 100755..100644
--- a/engine/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -94,7 +94,7 @@ _SlotMachine:
 	res rLCDC_SPRITE_SIZE, [hl] ; 8x8
 	ret
 
-.InitGFX: ; 926f7 (24:66f7)
+.InitGFX:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -163,7 +163,7 @@ _SlotMachine:
 	ld [wKeepSevenBiasChance], a ; 12.5% chance
 	ret
 
-Slots_GetPals: ; 9279b (24:679b)
+Slots_GetPals:
 	ld a, %11100100
 	call DmgToCgbBGPals
 	lb de, %11100100, %11100100
@@ -175,7 +175,7 @@ Slots_GetPals: ; 9279b (24:679b)
 	call DmgToCgbObjPals
 	ret
 
-SlotsLoop: ; 927af (24:67af)
+SlotsLoop:
 	ld a, [wJumptableIndex]
 	bit SLOTS_END_LOOP_F, a
 	jr nz, .stop
@@ -194,7 +194,7 @@ SlotsLoop: ; 927af (24:67af)
 	scf
 	ret
 
-.Stubbed_Function927d3: ; 927d3 (24:67d3)
+.Stubbed_Function927d3:
 ; dummied out
 	ret
 	ld a, [wReel1ReelAction]
@@ -219,9 +219,7 @@ SlotsLoop: ; 927af (24:67af)
 	call DmgToCgbBGPals
 	ret
 
-; 927f8
-
-.PrintCoinsAndPayout: ; 927f8 (24:67f8)
+.PrintCoinsAndPayout:
 	hlcoord 5, 1
 	ld de, wCoins
 	lb bc, PRINTNUM_LEADINGZEROS | 2, 4
@@ -232,9 +230,7 @@ SlotsLoop: ; 927af (24:67af)
 	call PrintNum
 	ret
 
-; 92811 (24:6811)
-
-Unreferenced_Function92811: ; 92811
+Unreferenced_Function92811:
 ; debug function?
 	ld a, [wSlotBias]
 	add 0
@@ -252,9 +248,7 @@ Unreferenced_Function92811: ; 92811
 	ld [hl], a
 	ret
 
-; 9282c
-
-Unreferenced_Function9282c: ; 9282c
+Unreferenced_Function9282c:
 ; animate OAM tiles?
 	ld hl, wcf66
 	ld a, [hl]
@@ -267,16 +261,14 @@ Unreferenced_Function9282c: ; 9282c
 	ld a, [hl]
 	xor %00100000
 	ld [hli], a ; tile id
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	dec c
 	jr nz, .loop
 	ret
 
-; 92844
-
-SlotsJumptable: ; 92844 (24:6844)
+SlotsJumptable:
 	jumptable .Jumptable, wJumptableIndex
 
 .Jumptable:
@@ -300,12 +292,12 @@ SlotsJumptable: ; 92844 (24:6844)
 	dw SlotsAction_RestartOrQuit     ; 11
 	dw SlotsAction_Quit              ; 12
 
-SlotsAction_Next: ; 92879 (24:6879)
+SlotsAction_Next:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 
-SlotsAction_Init: ; 9287e (24:687e)
+SlotsAction_Init:
 	call SlotsAction_Next
 	xor a
 	ld [wFirstTwoReelsMatching], a
@@ -314,7 +306,7 @@ SlotsAction_Init: ; 9287e (24:687e)
 	ld [wSlotMatched], a
 	ret
 
-SlotsAction_BetAndStart: ; 9288e (24:688e)
+SlotsAction_BetAndStart:
 	call Slots_AskBet
 	jr nc, .proceed
 	ld a, SLOTS_QUIT
@@ -340,7 +332,7 @@ SlotsAction_BetAndStart: ; 9288e (24:688e)
 	call Slots_PlaySFX
 	ret
 
-SlotsAction_WaitStart: ; 928c6 (24:68c6)
+SlotsAction_WaitStart:
 	ld hl, wSlotsDelay
 	ld a, [hl]
 	and a
@@ -354,7 +346,7 @@ SlotsAction_WaitStart: ; 928c6 (24:68c6)
 	ld [hJoypadSum], a
 	ret
 
-SlotsAction_WaitReel1: ; 928d6 (24:68d6)
+SlotsAction_WaitReel1:
 	ld hl, hJoypadSum
 	ld a, [hl]
 	and A_BUTTON
@@ -362,7 +354,7 @@ SlotsAction_WaitReel1: ; 928d6 (24:68d6)
 	call SlotsAction_Next
 	call Slots_StopReel1
 	ld [wReel1ReelAction], a
-SlotsAction_WaitStopReel1: ; 928e6 (24:68e6)
+SlotsAction_WaitStopReel1:
 	ld a, [wReel1ReelAction]
 	cp REEL_ACTION_DO_NOTHING
 	ret nz
@@ -374,7 +366,7 @@ SlotsAction_WaitStopReel1: ; 928e6 (24:68e6)
 	call SlotsAction_Next
 	xor a
 	ld [hJoypadSum], a
-SlotsAction_WaitReel2: ; 92900 (24:6900)
+SlotsAction_WaitReel2:
 	ld hl, hJoypadSum
 	ld a, [hl]
 	and A_BUTTON
@@ -382,7 +374,7 @@ SlotsAction_WaitReel2: ; 92900 (24:6900)
 	call SlotsAction_Next
 	call Slots_StopReel2
 	ld [wReel2ReelAction], a
-SlotsAction_WaitStopReel2: ; 92910 (24:6910)
+SlotsAction_WaitStopReel2:
 	ld a, [wReel2ReelAction]
 	cp REEL_ACTION_DO_NOTHING
 	ret nz
@@ -394,7 +386,7 @@ SlotsAction_WaitStopReel2: ; 92910 (24:6910)
 	call SlotsAction_Next
 	xor a
 	ld [hJoypadSum], a
-SlotsAction_WaitReel3: ; 9292a (24:692a)
+SlotsAction_WaitReel3:
 	ld hl, hJoypadSum
 	ld a, [hl]
 	and A_BUTTON
@@ -402,7 +394,7 @@ SlotsAction_WaitReel3: ; 9292a (24:692a)
 	call SlotsAction_Next
 	call Slots_StopReel3
 	ld [wReel3ReelAction], a
-SlotsAction_WaitStopReel3: ; 9293a (24:693a)
+SlotsAction_WaitStopReel3:
 	ld a, [wReel3ReelAction]
 	cp REEL_ACTION_DO_NOTHING
 	ret nz
@@ -416,7 +408,7 @@ SlotsAction_WaitStopReel3: ; 9293a (24:693a)
 	ld [hJoypadSum], a
 	ret
 
-SlotsAction_FlashIfWin: ; 92955 (24:6955)
+SlotsAction_FlashIfWin:
 	ld a, [wSlotMatched]
 	cp SLOTS_NO_MATCH
 	jr nz, .GotIt
@@ -428,7 +420,7 @@ SlotsAction_FlashIfWin: ; 92955 (24:6955)
 	call SlotsAction_Next
 	ld a, 16
 	ld [wSlotsDelay], a
-SlotsAction_FlashScreen: ; 9296b (24:696b)
+SlotsAction_FlashScreen:
 	ld hl, wSlotsDelay
 	ld a, [hl]
 	and a
@@ -449,7 +441,7 @@ SlotsAction_FlashScreen: ; 9296b (24:696b)
 	call SlotsAction_Next
 	ret
 
-SlotsAction_GiveEarnedCoins: ; 92987 (24:6987)
+SlotsAction_GiveEarnedCoins:
 	xor a
 	ld [wFirstTwoReelsMatching], a
 	ld [wFirstTwoReelsMatchingSevens], a
@@ -461,10 +453,10 @@ SlotsAction_GiveEarnedCoins: ; 92987 (24:6987)
 	call SlotsAction_Next
 	ret
 
-SlotsAction_PayoutTextAndAnim: ; 9299e (24:699e)
+SlotsAction_PayoutTextAndAnim:
 	call Slots_PayoutText
 	call SlotsAction_Next
-SlotsAction_PayoutAnim: ; 929a4 (24:69a4)
+SlotsAction_PayoutAnim:
 	ld hl, wSlotsDelay
 	ld a, [hl]
 	inc [hl]
@@ -502,7 +494,7 @@ SlotsAction_PayoutAnim: ; 929a4 (24:69a4)
 	call SlotsAction_Next
 	ret
 
-SlotsAction_RestartOrQuit: ; 929d9 (24:69d9)
+SlotsAction_RestartOrQuit:
 	call Slots_DeilluminateBetLights
 	call WaitPressAorB_BlinkCursor
 	call Slots_AskPlayAgain
@@ -516,12 +508,12 @@ SlotsAction_RestartOrQuit: ; 929d9 (24:69d9)
 	ld [wJumptableIndex], a
 	ret
 
-SlotsAction_Quit: ; 929f0 (24:69f0)
+SlotsAction_Quit:
 	ld hl, wJumptableIndex
 	set SLOTS_END_LOOP_F, [hl]
 	ret
 
-Slots_LoadReelState: ; 929f6 (24:69f6)
+Slots_LoadReelState:
 	push de
 	call Slots_GetCurrentReelState
 	pop de
@@ -535,7 +527,7 @@ Slots_LoadReelState: ; 929f6 (24:69f6)
 	ld [de], a
 	ret
 
-Slots_CheckCoinCaseFull: ; 92a04 (24:6a04)
+Slots_CheckCoinCaseFull:
 	ld a, d
 	cp HIGH(MAX_COINS)
 	jr c, .not_full
@@ -549,7 +541,7 @@ Slots_CheckCoinCaseFull: ; 92a04 (24:6a04)
 	and a
 	ret
 
-Slots_GetCurrentReelState: ; 92a12 (24:6a12)
+Slots_GetCurrentReelState:
 	ld hl, REEL_POSITION
 	add hl, bc
 	ld a, [hl]
@@ -569,12 +561,12 @@ Slots_GetCurrentReelState: ; 92a12 (24:6a12)
 	add hl, de
 	ret
 
-Slots_StopReel1: ; 92a2b (24:6a2b)
+Slots_StopReel1:
 ; Always set the REEL_ACTION_STOP_REEL1 action.
 	ld a, REEL_ACTION_STOP_REEL1
 	ret
 
-Slots_StopReel2: ; 92a2e (24:6a2e)
+Slots_StopReel2:
 ; As long as, the following three meet, there's a 31.25% chance
 ; to set action REEL_ACTION_SET_UP_REEL2_SKIP_TO_7:
 ; - Bet is >= 2 coins
@@ -603,7 +595,7 @@ Slots_StopReel2: ; 92a2e (24:6a2e)
 	ld a, REEL_ACTION_STOP_REEL2
 	ret
 
-.CheckReel1ForASeven: ; 92a51 (24:6a51)
+.CheckReel1ForASeven:
 	ld a, [wReel1Stopped]
 	and a
 	ret z
@@ -614,7 +606,7 @@ Slots_StopReel2: ; 92a2e (24:6a2e)
 	and a
 	ret
 
-Slots_StopReel3: ; 92a60 (24:6a60)
+Slots_StopReel3:
 ; If no matching SEVEN symbols in reels #1 and #2:
 ; - REEL_ACTION_STOP_REEL3, 100%
 
@@ -667,7 +659,7 @@ Slots_StopReel3: ; 92a60 (24:6a60)
 	ld a, REEL_ACTION_STOP_REEL3
 	ret
 
-Slots_InitReelTiles: ; 92a98 (24:6a98)
+Slots_InitReelTiles:
 	ld bc, wReel1
 	ld hl, REEL_OAM_ADDR
 	add hl, bc
@@ -723,7 +715,7 @@ Slots_InitReelTiles: ; 92a98 (24:6a98)
 	call .OAM
 	ret
 
-.OAM: ; 92af9 (24:6af9)
+.OAM:
 	ld hl, REEL_ACTION
 	add hl, bc
 	ld [hl], REEL_ACTION_DO_NOTHING
@@ -736,7 +728,7 @@ Slots_InitReelTiles: ; 92a98 (24:6a98)
 	call Slots_UpdateReelPositionAndOAM
 	ret
 
-Slots_SpinReels: ; 92b0f (24:6b0f)
+Slots_SpinReels:
 	ld bc, wReel1
 	call .SpinReel
 	ld bc, wReel2
@@ -745,7 +737,7 @@ Slots_SpinReels: ; 92b0f (24:6b0f)
 	call .SpinReel
 	ret
 
-.SpinReel: ; 92b22 (24:6b22)
+.SpinReel:
 	ld hl, REEL_SPIN_DISTANCE
 	add hl, bc
 	ld a, [hl]
@@ -782,7 +774,7 @@ Slots_SpinReels: ; 92b0f (24:6b0f)
 	jr nz, .loop
 	ret
 
-Slots_UpdateReelPositionAndOAM: ; 92b53 (24:6b53)
+Slots_UpdateReelPositionAndOAM:
 	ld hl, REEL_X_COORD
 	add hl, bc
 	ld a, [hl]
@@ -814,7 +806,7 @@ Slots_UpdateReelPositionAndOAM: ; 92b53 (24:6b53)
 	ld [hl], a
 	ret
 
-.LoadOAM: ; 92b83 (24:6b83)
+.LoadOAM:
 	ld hl, REEL_OAM_ADDR
 	add hl, bc
 	ld a, [hli]
@@ -853,9 +845,7 @@ Slots_UpdateReelPositionAndOAM: ; 92b53 (24:6b53)
 	jr nz, .loop
 	ret
 
-; 92bbe (24:6bbe)
-
-Unreferenced_Function92bbe: ; 92bbe
+Unreferenced_Function92bbe:
 	push hl
 	srl a
 	srl a
@@ -868,13 +858,10 @@ Unreferenced_Function92bbe: ; 92bbe
 	pop hl
 	ret
 
-; 92bce
-
-.Unknown_92bce: ; 92bce
+.Unknown_92bce:
 	db 0, 1, 2, 3, 4, 5
-; 92bd4
 
-ReelActionJumptable: ; 92bd4 (24:6bd4)
+ReelActionJumptable:
 	ld hl, REEL_ACTION
 	add hl, bc
 	ld e, [hl]
@@ -887,9 +874,7 @@ ReelActionJumptable: ; 92bd4 (24:6bd4)
 	ld l, a
 	jp hl
 
-; 92be4 (24:6be4)
-
-.Jumptable: ; 92be4
+.Jumptable:
 	dw ReelAction_DoNothing                   ; 00
 	dw ReelAction_StopReelIgnoreJoypad        ; 01
 	dw ReelAction_QuadrupleRate               ; 02
@@ -915,54 +900,41 @@ ReelActionJumptable: ; 92bd4 (24:6bd4)
 	dw ReelAction_WaitChansey                 ; 16
 	dw ReelAction_WaitEgg                     ; 17
 	dw ReelAction_DropReel                    ; 18
-; 92c16
 
-ReelAction_DoNothing: ; 92c16
+ReelAction_DoNothing:
 	ret
 
-; 92c17
-
-ReelAction_QuadrupleRate: ; 92c17
+ReelAction_QuadrupleRate:
 	ld hl, REEL_SPIN_RATE
 	add hl, bc
 	ld [hl], 16
 	ret
 
-; 92c1e
-
-ReelAction_DoubleRate: ; 92c1e
+ReelAction_DoubleRate:
 	ld hl, REEL_SPIN_RATE
 	add hl, bc
 	ld [hl], 8
 	ret
 
-; 92c25
-
-ReelAction_NormalRate: ; 92c25
+ReelAction_NormalRate:
 	ld hl, REEL_SPIN_RATE
 	add hl, bc
 	ld [hl], 4
 	ret
 
-; 92c2c
-
-ReelAction_HalfRate: ; 92c2c
+ReelAction_HalfRate:
 	ld hl, REEL_SPIN_RATE
 	add hl, bc
 	ld [hl], 2
 	ret
 
-; 92c33
-
-ReelAction_QuarterRate: ; 92c33
+ReelAction_QuarterRate:
 	ld hl, REEL_SPIN_RATE
 	add hl, bc
 	ld [hl], 1
 	ret
 
-; 92c3a
-
-Slots_StopReel: ; 92c3a
+Slots_StopReel:
 	ld hl, REEL_SPIN_RATE
 	add hl, bc
 	ld [hl], 0
@@ -972,7 +944,7 @@ Slots_StopReel: ; 92c3a
 	ld hl, REEL_STOP_DELAY
 	add hl, bc
 	ld [hl], 3
-ReelAction_StopReelIgnoreJoypad: ; 92c4c
+ReelAction_StopReelIgnoreJoypad:
 	ld hl, REEL_STOP_DELAY
 	add hl, bc
 	ld a, [hl]
@@ -988,9 +960,7 @@ ReelAction_StopReelIgnoreJoypad: ; 92c4c
 	ld [hl], a
 	ret
 
-; 92c5e
-
-ReelAction_StopReel1: ; 92c5e
+ReelAction_StopReel1:
 ; If no bias: don't manipulate reel.
 ; If bias: manipulate reel up to wReel1ManipCounter (i.e. 4) slots,
 ; stoping early if the biased symbol shows up anywhere in reel #1,
@@ -1011,9 +981,7 @@ ReelAction_StopReel1: ; 92c5e
 	call Slots_StopReel
 	ret
 
-; 92c76
-
-.CheckForBias: ; 92c76
+.CheckForBias:
 	call Slots_GetCurrentReelState
 	ld a, [wSlotBias]
 	ld e, a
@@ -1027,9 +995,7 @@ ReelAction_StopReel1: ; 92c5e
 	cp e
 	ret
 
-; 92c86
-
-ReelAction_StopReel2: ; 92c86
+ReelAction_StopReel2:
 ; If no bias: don't manipulate reel.
 ; If bias: manipulate reel up to wReel2ManipCounter (i.e. 4) slots,
 ; stoping early if the biased symbol is lined up in the first two
@@ -1057,9 +1023,7 @@ ReelAction_StopReel2: ; 92c86
 	call Slots_StopReel
 	ret
 
-; 92ca9
-
-ReelAction_StopReel3: ; 92ca9
+ReelAction_StopReel3:
 ; Manipulate the reel up to wReel3ManipCounter (i.e. 4) slots,
 ; stopping early if the bias symbol is lined up for a win.
 ; If not biased to any symbols, stop as soon as nothing is lined up.
@@ -1093,9 +1057,7 @@ ReelAction_StopReel3: ; 92ca9
 	call Slots_StopReel
 	ret
 
-; 92cd2
-
-ReelAction_SetUpReel2SkipTo7: ; 92cd2
+ReelAction_SetUpReel2SkipTo7:
 ; Unique reel 2 action (see Slots_StopReel2)
 ; Ensures that 7 symbols become lined up in the first two reels,
 ; but more often than not, this is only a way to get our hopes up, as
@@ -1123,9 +1085,7 @@ ReelAction_SetUpReel2SkipTo7: ; 92cd2
 	ld [hl], 0
 	ret
 
-; 92cf8
-
-ReelAction_WaitReel2SkipTo7: ; 92cf8
+ReelAction_WaitReel2SkipTo7:
 	ld hl, REEL_MANIP_DELAY
 	add hl, bc
 	ld a, [hl]
@@ -1145,9 +1105,7 @@ ReelAction_WaitReel2SkipTo7: ; 92cf8
 	ld [hl], 8
 	ret
 
-; 92d13
-
-ReelAction_FastSpinReel2UntilLinedUp7s: ; 92d13
+ReelAction_FastSpinReel2UntilLinedUp7s:
 	call Slots_CheckMatchedFirstTwoReels
 	ret nc
 	ld a, [wFirstTwoReelsMatchingSevens]
@@ -1156,9 +1114,7 @@ ReelAction_FastSpinReel2UntilLinedUp7s: ; 92d13
 	call Slots_StopReel
 	ret
 
-; 92d20
-
-ReelAction_InitGolem: ; 92d20
+ReelAction_InitGolem:
 ; Ensures SEVENs are lined up if there's bias to SEVEN.
 ; Ensures nothing is lined up if there's no bias symbols.
 ; No other bias symbols are compatible with this mode.
@@ -1191,7 +1147,7 @@ ReelAction_InitGolem: ; 92d20
 	pop bc
 	xor a
 	ld [wSlotsDelay], a
-ReelAction_WaitGolem: ; 92d4f
+ReelAction_WaitGolem:
 	ld a, [wSlotsDelay]
 	cp 2
 	jr z, .two
@@ -1213,9 +1169,7 @@ ReelAction_WaitGolem: ; 92d4f
 	ld [hl], 8
 	ret
 
-; 92d6e
-
-ReelAction_EndGolem: ; 92d6e
+ReelAction_EndGolem:
 	xor a
 	ld [wSlotsDelay], a
 	ld hl, REEL_ACTION
@@ -1226,9 +1180,7 @@ ReelAction_EndGolem: ; 92d6e
 	ld [hl], 0
 	ret
 
-; 92d7e
-
-ReelAction_InitChansey: ; 92d7e
+ReelAction_InitChansey:
 ; Ensures the lining up of SEVEN symbols, but this mode is only possible
 ; when there is bias to SEVEN symbols (and even then, it's still rare).
 ; Chansey releases and egg and reel #3 is made to advance 17 slots very
@@ -1254,9 +1206,7 @@ ReelAction_InitChansey: ; 92d7e
 	ld [wSlotsDelay], a
 	ret
 
-; 92da4
-
-ReelAction_WaitChansey: ; 92da4
+ReelAction_WaitChansey:
 	ld a, [wSlotsDelay]
 	and a
 	ret z
@@ -1265,7 +1215,7 @@ ReelAction_WaitChansey: ; 92da4
 	inc [hl] ; REEL_ACTION_WAIT_EGG
 	ld a, 2
 	ld [wSlotsDelay], a
-ReelAction_WaitEgg: ; 92db3
+ReelAction_WaitEgg:
 	ld a, [wSlotsDelay]
 	cp $4
 	ret c
@@ -1278,7 +1228,7 @@ ReelAction_WaitEgg: ; 92db3
 	ld hl, REEL_MANIP_DELAY
 	add hl, bc
 	ld [hl], 17
-ReelAction_DropReel: ; 92dca
+ReelAction_DropReel:
 	ld hl, REEL_MANIP_DELAY
 	add hl, bc
 	ld a, [hl]
@@ -1309,9 +1259,7 @@ ReelAction_DropReel: ; 92dca
 	ld [wSlotsDelay], a
 	ret
 
-; 92df7
-
-ReelAction_Unused: ; 92df7
+ReelAction_Unused:
 	call Slots_CheckMatchedAllThreeReels
 	ret c
 	ld a, SFX_STOP_SLOT
@@ -1324,7 +1272,7 @@ ReelAction_Unused: ; 92df7
 	ld hl, REEL_MANIP_DELAY
 	add hl, bc
 	ld [hl], a
-ReelAction_CheckDropReel: ; 92e10
+ReelAction_CheckDropReel:
 	ld hl, REEL_MANIP_DELAY
 	add hl, bc
 	ld a, [hl]
@@ -1345,7 +1293,7 @@ ReelAction_CheckDropReel: ; 92e10
 	ld hl, REEL_SPIN_RATE
 	add hl, bc
 	ld [hl], 0
-ReelAction_WaitDropReel: ; 92e31
+ReelAction_WaitDropReel:
 	ld hl, REEL_FIELD_0B
 	add hl, bc
 	ld a, [hl]
@@ -1363,9 +1311,7 @@ ReelAction_WaitDropReel: ; 92e31
 	ld [hl], 8
 	ret
 
-; 92e47
-
-ReelAction_StartSlowAdvanceReel3: ; 92e47
+ReelAction_StartSlowAdvanceReel3:
 ; Ensures SEVENs are lined up if there's bias to SEVEN.
 ; Ensures nothing is lined up if there's no bias symbols.
 ; No other bias symbols are compatible with this mode.
@@ -1387,7 +1333,7 @@ ReelAction_StartSlowAdvanceReel3: ; 92e47
 	ld hl, REEL_MANIP_DELAY
 	add hl, bc
 	ld [hl], 16
-ReelAction_WaitSlowAdvanceReel3: ; 92e64
+ReelAction_WaitSlowAdvanceReel3:
 	ld hl, REEL_MANIP_DELAY
 	add hl, bc
 	ld a, [hl]
@@ -1418,9 +1364,7 @@ ReelAction_WaitSlowAdvanceReel3: ; 92e64
 	call WaitSFX
 	ret
 
-; 92e94
-
-Slots_CheckMatchedFirstTwoReels: ; 92e94
+Slots_CheckMatchedFirstTwoReels:
 	xor a
 	ld [wFirstTwoReelsMatching], a
 	ld [wFirstTwoReelsMatchingSevens], a
@@ -1447,77 +1391,62 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94
 	scf
 	ret
 
-; 92ebd
-
-.Jumptable: ; 92ebd
+.Jumptable:
 	dw .zero
 	dw .one
 	dw .two
 	dw .three
-; 92ec5
 
-.three ; 92ec5
+.three
 	call .CheckUpwardsDiag
 	call .CheckDownwardsDiag
 
-.two ; 92ecb
+.two
 	call .CheckBottomRow
 	call .CheckTopRow
 
-.one ; 92ed1
+.one
 	call .CheckMiddleRow
 
-.zero ; 92ed4
+.zero
 	ret
 
-; 92ed5
-
-.CheckBottomRow: ; 92ed5
+.CheckBottomRow:
 	ld hl, wCurrReelStopped
 	ld a, [wReel1Stopped]
 	cp [hl]
 	call z, .StoreResult
 	ret
 
-; 92ee0
-
-.CheckUpwardsDiag: ; 92ee0
+.CheckUpwardsDiag:
 	ld hl, wCurrReelStopped + 1
 	ld a, [wReel1Stopped]
 	cp [hl]
 	call z, .StoreResult
 	ret
 
-; 92eeb
-
-.CheckMiddleRow: ; 92eeb
+.CheckMiddleRow:
 	ld hl, wCurrReelStopped + 1
 	ld a, [wReel1Stopped + 1]
 	cp [hl]
 	call z, .StoreResult
 	ret
 
-; 92ef6
-
-.CheckDownwardsDiag: ; 92ef6
+.CheckDownwardsDiag:
 	ld hl, wCurrReelStopped + 1
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
 	call z, .StoreResult
 	ret
 
-; 92f01
-
-.CheckTopRow: ; 92f01
+.CheckTopRow:
 	ld hl, wCurrReelStopped + 2
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
 	call z, .StoreResult
 	ret
 
-; 92f0c
-
-.StoreResult: ; 92f0c
+.StoreResult:
 	ld [wSlotBuildingMatch], a
 	and a
 	jr nz, .matching_sevens
@@ -1529,9 +1458,7 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94
 	ld [wFirstTwoReelsMatching], a
 	ret
 
-; 92f1d
-
-Slots_CheckMatchedAllThreeReels: ; 92f1d
+Slots_CheckMatchedAllThreeReels:
 	ld a, SLOTS_NO_MATCH
 	ld [wSlotMatched], a
 	call Slots_GetCurrentReelState
@@ -1561,32 +1488,27 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
 	scf
 	ret
 
-; 92f48
-
-.Jumptable: ; 92f48
+.Jumptable:
 	dw .zero
 	dw .one
 	dw .two
 	dw .three
-; 92f50
 
-.three ; 92f50
+.three
 	call .CheckUpwardsDiag
 	call .CheckDownwardsDiag
 
-.two ; 92f56
+.two
 	call .CheckBottomRow
 	call .CheckTopRow
 
-.one ; 92f5c
+.one
 	call .CheckMiddleRow
 
-.zero ; 92f5f
+.zero
 	ret
 
-; 92f60
-
-.CheckBottomRow: ; 92f60
+.CheckBottomRow:
 	ld hl, wCurrReelStopped
 	ld a, [wReel1Stopped]
 	cp [hl]
@@ -1596,9 +1518,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
 	call z, .StoreResult
 	ret
 
-; 92f70
-
-.CheckUpwardsDiag: ; 92f70
+.CheckUpwardsDiag:
 	ld hl, wCurrReelStopped + 2
 	ld a, [wReel1Stopped]
 	cp [hl]
@@ -1608,9 +1528,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
 	call z, .StoreResult
 	ret
 
-; 92f80
-
-.CheckMiddleRow: ; 92f80
+.CheckMiddleRow:
 	ld hl, wCurrReelStopped + 1
 	ld a, [wReel1Stopped + 1]
 	cp [hl]
@@ -1620,9 +1538,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
 	call z, .StoreResult
 	ret
 
-; 92f90
-
-.CheckDownwardsDiag: ; 92f90
+.CheckDownwardsDiag:
 	ld hl, wCurrReelStopped
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
@@ -1632,9 +1548,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
 	call z, .StoreResult
 	ret
 
-; 92fa0
-
-.CheckTopRow: ; 92fa0
+.CheckTopRow:
 	ld hl, wCurrReelStopped + 2
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
@@ -1644,15 +1558,11 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
 	call z, .StoreResult
 	ret
 
-; 92fb0
-
-.StoreResult: ; 92fb0
+.StoreResult:
 	ld [wSlotMatched], a
 	ret
 
-; 92fb4
-
-Slots_CopyReelState: ; 92fb4
+Slots_CopyReelState:
 	ld de, wCurrReelStopped
 	ld a, [hli]
 	ld [de], a
@@ -1664,9 +1574,7 @@ Slots_CopyReelState: ; 92fb4
 	ld [de], a
 	ret
 
-; 92fc0
-
-Slots_GetNumberOfGolems: ; 92fc0
+Slots_GetNumberOfGolems:
 	ld hl, REEL_POSITION
 	add hl, bc
 	ld a, [hl]
@@ -1679,9 +1587,7 @@ Slots_GetNumberOfGolems: ; 92fc0
 	ld a, e
 	ret
 
-; 92fcf
-
-.Check7Bias: ; 92fcf
+.Check7Bias:
 	ld a, [wSlotBias]
 	and a
 	jr nz, .not_biased_to_seven
@@ -1718,9 +1624,7 @@ Slots_GetNumberOfGolems: ; 92fc0
 	jr c, .loop2
 	ret
 
-; 93002
-
-Slots_InitBias: ; 93002 (24:7002)
+Slots_InitBias:
 	ld a, [wSlotBias]
 	and a
 	ret z
@@ -1744,9 +1648,7 @@ Slots_InitBias: ; 93002 (24:7002)
 	ld [wSlotBias], a
 	ret
 
-; 93023 (24:7023)
-
-.Normal: ; 93023
+.Normal:
 	db $01, SLOTS_SEVEN    ; 1/256
 	db $03, SLOTS_POKEBALL ; 1/128
 	db $0a, SLOTS_STARYU   ; 7/256
@@ -1754,9 +1656,8 @@ Slots_InitBias: ; 93002 (24:7002)
 	db $28, SLOTS_PIKACHU  ; 5/64
 	db $30, SLOTS_CHERRY   ; 1/32
 	db $ff, SLOTS_NO_BIAS   ; everything else
-; 93031
 
-.Lucky: ; 93031
+.Lucky:
 	db $02, SLOTS_SEVEN    ;  1/128
 	db $03, SLOTS_POKEBALL ;  1/256
 	db $08, SLOTS_STARYU   ;  5/256
@@ -1764,9 +1665,8 @@ Slots_InitBias: ; 93002 (24:7002)
 	db $1e, SLOTS_PIKACHU  ;  7/128
 	db $50, SLOTS_CHERRY   ; 25/128
 	db $ff, SLOTS_NO_BIAS   ; everything else
-; 9303f
 
-Slots_IlluminateBetLights: ; 9303f (24:703f)
+Slots_IlluminateBetLights:
 	ld b, $14 ; turned on
 	ld a, [wSlotBet]
 	dec a
@@ -1775,22 +1675,22 @@ Slots_IlluminateBetLights: ; 9303f (24:703f)
 	jr z, Slots_Lights2OnOff
 	jr Slots_Lights3OnOff
 
-Slots_DeilluminateBetLights: ; 9304c (24:704c)
+Slots_DeilluminateBetLights:
 	ld b, $23 ; turned off
-Slots_Lights3OnOff: ; 9304e (24:704e)
+Slots_Lights3OnOff:
 	hlcoord 3, 2
 	call Slots_TurnLightsOnOrOff
 	hlcoord 3, 10
 	call Slots_TurnLightsOnOrOff
-Slots_Lights2OnOff: ; 9305a (24:705a)
+Slots_Lights2OnOff:
 	hlcoord 3, 4
 	call Slots_TurnLightsOnOrOff
 	hlcoord 3, 8
 	call Slots_TurnLightsOnOrOff
-Slots_Lights1OnOff: ; 93066 (24:7066)
+Slots_Lights1OnOff:
 	hlcoord 3, 6
 
-Slots_TurnLightsOnOrOff: ; 93069 (24:7069)
+Slots_TurnLightsOnOrOff:
 	ld a, b
 	ld [hl], a
 	ld de, SCREEN_WIDTH / 2 + 3
@@ -1805,12 +1705,12 @@ Slots_TurnLightsOnOrOff: ; 93069 (24:7069)
 	ld [hl], a
 	ret
 
-Slots_AskBet: ; 9307c (24:707c)
+Slots_AskBet:
 .loop
 	ld hl, .Text_BetHowManyCoins
 	call PrintText
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	call VerticalMenu
 	call CloseWindow
 	ret c
@@ -1847,42 +1747,35 @@ Slots_AskBet: ; 9307c (24:707c)
 	and a
 	ret
 
-; 930c7 (24:70c7)
-
-.Text_BetHowManyCoins: ; 0x930c7
+.Text_BetHowManyCoins:
 	; Bet how many coins?
 	text_jump UnknownText_0x1c5049
 	db "@"
-; 0x930cc
 
-.Text_Start: ; 0x930cc
+.Text_Start:
 	; Start!
 	text_jump UnknownText_0x1c505e
 	db "@"
-; 0x930d1
 
-.Text_NotEnoughCoins: ; 0x930d1
+.Text_NotEnoughCoins:
 	; Not enough coins.
 	text_jump UnknownText_0x1c5066
 	db "@"
-; 0x930d6
 
-.MenuDataHeader: ; 0x930d6
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x930de
 
-.MenuData2: ; 0x930de
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db " 3@"
 	db " 2@"
 	db " 1@"
-; 0x930e9
 
-Slots_AskPlayAgain: ; 930e9 (24:70e9)
+Slots_AskPlayAgain:
 	ld hl, wCoins
 	ld a, [hli]
 	or [hl]
@@ -1911,17 +1804,15 @@ Slots_AskPlayAgain: ; 930e9 (24:70e9)
 	scf
 	ret
 
-; 9311a (24:711a)
-
-.Text_OutOfCoins: ; 9311a
+.Text_OutOfCoins:
 	text_jump UnknownText_0x1c5079
 	db "@"
 
-.Text_PlayAgain: ; 9311f
+.Text_PlayAgain:
 	text_jump UnknownText_0x1c5092
 	db "@"
 
-Slots_GetPayout: ; 93124 (24:7124)
+Slots_GetPayout:
 	ld a, [wSlotMatched]
 	cp SLOTS_NO_MATCH
 	jr z, .no_win
@@ -1954,7 +1845,7 @@ Slots_GetPayout: ; 93124 (24:7124)
 	ld [hl], a
 	ret
 
-Slots_PayoutText: ; 93158 (24:7158)
+Slots_PayoutText:
 	ld a, [wSlotMatched]
 	cp SLOTS_NO_MATCH
 	jr nz, .MatchedSomething
@@ -1987,18 +1878,15 @@ Slots_PayoutText: ; 93158 (24:7158)
 	farcall StubbedTrainerRankings_AddToSlotsWinStreak
 	ret
 
-; 93195 (24:7195)
-
-.PayoutStrings: ; 93195
+.PayoutStrings:
 	dbw "300@", .LinedUpSevens
 	dbw "50@@", .LinedUpPokeballs
 	dbw "6@@@", .LinedUpMonOrCherry
 	dbw "8@@@", .LinedUpMonOrCherry
 	dbw "10@@", .LinedUpMonOrCherry
 	dbw "15@@", .LinedUpMonOrCherry
-; 931b9
 
-.Text_PrintPayout: ; 0x931b9
+.Text_PrintPayout:
 	start_asm
 	ld a, [wSlotMatched]
 	add $25
@@ -2017,21 +1905,17 @@ rept 4
 endr
 	ret
 
-; 931db
-
-.Text_LinedUpWonCoins: ; 0x931db
+.Text_LinedUpWonCoins:
 	; lined up! Won @  coins!
 	text_jump UnknownText_0x1c509f
 	db "@"
-; 0x931e0
 
-.Text_Darn: ; 0x931e0
+.Text_Darn:
 	; Darn!
 	text_jump UnknownText_0x1c50bb
 	db "@"
-; 0x931e5
 
-.LinedUpSevens: ; 931e5
+.LinedUpSevens:
 	ld a, SFX_2ND_PLACE
 	call Slots_PlaySFX
 	call WaitSFX
@@ -2058,25 +1942,19 @@ endr
 	ld [wSlotBias], a
 	ret
 
-; 9320b
-
-.LinedUpPokeballs: ; 9320b
+.LinedUpPokeballs:
 	ld a, SFX_3RD_PLACE
 	call Slots_PlaySFX
 	call WaitSFX
 	ret
 
-; 93214
-
-.LinedUpMonOrCherry: ; 93214
+.LinedUpMonOrCherry:
 	ld a, SFX_PRESENT
 	call Slots_PlaySFX
 	call WaitSFX
 	ret
 
-; 9321d
-
-Slots_AnimateGolem: ; 9321d (24:721d)
+Slots_AnimateGolem:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld e, [hl]
@@ -2089,12 +1967,12 @@ Slots_AnimateGolem: ; 9321d (24:721d)
 	ld l, a
 	jp hl
 
-.Jumptable: ; 9322d (24:722d)
+.Jumptable:
 	dw .init
 	dw .fall
 	dw .roll
 
-.init ; 93233 (24:7233)
+.init
 	ld hl, SPRITEANIMSTRUCT_0E
 	add hl, bc
 	ld a, [hl]
@@ -2119,7 +1997,7 @@ Slots_AnimateGolem: ; 9321d (24:721d)
 	add hl, bc
 	ld [hl], $0
 
-.fall ; 93259 (24:7259)
+.fall
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -2148,7 +2026,7 @@ Slots_AnimateGolem: ; 9321d (24:721d)
 	call Slots_PlaySFX
 	ret
 
-.roll ; 93289 (24:7289)
+.roll
 	ld hl, SPRITEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -2175,7 +2053,7 @@ Slots_AnimateGolem: ; 9321d (24:721d)
 	ld [hSCY], a
 	ret
 
-Slots_AnimateChansey: ; 932ac (24:72ac)
+Slots_AnimateChansey:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld e, [hl]
@@ -2188,12 +2066,12 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
 	ld l, a
 	jp hl
 
-.Jumptable: ; 932bc (24:72bc)
+.Jumptable:
 	dw .walk
 	dw .one
 	dw .two
 
-.walk ; 932c2 (24:72c2)
+.walk
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2213,7 +2091,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
 	ld a, 1
 	ld [wSlotsDelay], a
 
-.one ; 932e0 (24:72e0)
+.one
 	ld a, [wSlotsDelay]
 	cp $2
 	jr z, .retain
@@ -2231,7 +2109,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld [hl], $8
-.two ; 932fc (24:72fc)
+.two
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -2251,18 +2129,14 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
 	pop bc
 	ret
 
-; 93316 (24:7316)
-
-Slots_WaitSFX: ; 93316
+Slots_WaitSFX:
 	push bc
 	ld c, 16
 	call DelayFrames
 	pop bc
 	ret
 
-; 9331e
-
-Slots_PlaySFX: ; 9331e (24:731e)
+Slots_PlaySFX:
 	push de
 	ld e, a
 	ld d, 0
@@ -2270,11 +2144,9 @@ Slots_PlaySFX: ; 9331e (24:731e)
 	pop de
 	ret
 
-; 93327 (24:7327)
-
 ; The first three positions are repeated to
 ; avoid needing to check indices when copying.
-Reel1Tilemap: ; 93327
+Reel1Tilemap:
 	db SLOTS_SEVEN    ;  0
 	db SLOTS_CHERRY   ;  1
 	db SLOTS_STARYU   ;  2
@@ -2294,7 +2166,7 @@ Reel1Tilemap: ; 93327
 	db SLOTS_CHERRY   ;  1
 	db SLOTS_STARYU   ;  2
 
-Reel2Tilemap: ; 93339
+Reel2Tilemap:
 	db SLOTS_SEVEN    ;  0
 	db SLOTS_PIKACHU  ;  1
 	db SLOTS_CHERRY   ;  2
@@ -2314,7 +2186,7 @@ Reel2Tilemap: ; 93339
 	db SLOTS_PIKACHU  ;  1
 	db SLOTS_CHERRY   ;  2
 
-Reel3Tilemap: ; 9334b
+Reel3Tilemap:
 	db SLOTS_SEVEN    ;  0
 	db SLOTS_PIKACHU  ;  1
 	db SLOTS_CHERRY   ;  2
@@ -2333,20 +2205,15 @@ Reel3Tilemap: ; 9334b
 	db SLOTS_SEVEN    ;  0
 	db SLOTS_PIKACHU  ;  1
 	db SLOTS_CHERRY   ;  2
-; 9335d
 
-SlotsTilemap: ; 9335d
+SlotsTilemap:
 INCBIN "gfx/slots/slots.tilemap"
-; 9344d
 
-Slots1LZ: ; 9344d
+Slots1LZ:
 INCBIN "gfx/slots/slots_1.2bpp.lz"
-; 935cd
 
-Slots2LZ: ; 935cd
+Slots2LZ:
 INCBIN "gfx/slots/slots_2.2bpp.lz"
-; 9382d
 
-Slots3LZ: ; 9382d
+Slots3LZ:
 INCBIN "gfx/slots/slots_3.2bpp.lz"
-; 93a3d
diff --git a/engine/unown_puzzle.asm b/engine/games/unown_puzzle.asm
index dcad1ce20..40c6527d9 100755..100644
--- a/engine/unown_puzzle.asm
+++ b/engine/games/unown_puzzle.asm
@@ -3,7 +3,7 @@ PUZZLE_VOID   EQU $ef
 
 puzcoord EQUS "* 6 +"
 
-UnownPuzzle: ; e1190
+_UnownPuzzle:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -14,16 +14,16 @@ UnownPuzzle: ; e1190
 	xor a
 	ld [hBGMapMode], a
 	call DisableLCD
-	ld hl, wMisc ; includes wPuzzlePieces
-	ld bc, wMiscEnd - wMisc
+	ld hl, wc608 ; includes wPuzzlePieces
+	ld bc, wc7e8 - wc608
 	xor a
 	call ByteFill
 	ld hl, UnownPuzzleCursorGFX
-	ld de, vTiles1 tile $60
+	ld de, vTiles0 tile $e0
 	ld bc, 4 tiles
 	call CopyBytes
 	ld hl, UnownPuzzleStartCancelLZ
-	ld de, vTiles1 tile $6d
+	ld de, vTiles0 tile $ed
 	call Decompress
 	call LoadUnownPuzzlePiecesGFX
 	hlcoord 0, 0
@@ -88,9 +88,8 @@ UnownPuzzle: ; e1190
 	ld a, LCDC_DEFAULT
 	ld [rLCDC], a
 	ret
-; e124e
 
-InitUnownPuzzlePiecePositions: ; e124e
+InitUnownPuzzlePiecePositions:
 	ld c,  1
 	ld b, 16
 .load_loop
@@ -111,9 +110,8 @@ InitUnownPuzzlePiecePositions: ; e124e
 	dec b
 	jr nz, .load_loop
 	ret
-; e126d
 
-.PuzzlePieceInitialPositions: ; e126d
+.PuzzlePieceInitialPositions:
 initpuzcoord: MACRO
 rept _NARG / 2
 	db \1 puzcoord \2
@@ -128,9 +126,8 @@ ENDM
 	initpuzcoord 4,0,                     4,5
 	initpuzcoord 5,0,                     5,5
 	                   ; START > CANCEL
-; e127d
 
-PlaceStartCancelBox: ; e127d
+PlaceStartCancelBox:
 	call PlaceStartCancelBoxBorder
 	hlcoord 5, 16
 	ld a, $f6
@@ -141,9 +138,8 @@ PlaceStartCancelBox: ; e127d
 	dec c
 	jr nz, .loop
 	ret
-; e128d
 
-PlaceStartCancelBoxBorder: ; e128d
+PlaceStartCancelBoxBorder:
 	hlcoord 4, 15
 	ld a, $f0
 	ld [hli], a
@@ -172,9 +168,8 @@ PlaceStartCancelBoxBorder: ; e128d
 	ld a, $f5
 	ld [hl], a
 	ret
-; e12ca
 
-UnownPuzzleJumptable: ; e12ca
+UnownPuzzleJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -185,13 +180,11 @@ UnownPuzzleJumptable: ; e12ca
 	ld h, [hl]
 	ld l, a
 	jp hl
-; e12d9
 
-.Jumptable: ; e12d9
+.Jumptable:
 	dw .Function
-; e12db
 
-.Function: ; e12db
+.Function:
 	ld a, [hJoyPressed]
 	and START
 	jp nz, UnownPuzzle_Quit
@@ -299,9 +292,8 @@ UnownPuzzleJumptable: ; e12ca
 .play_sfx
 	call PlaySFX
 	ret
-; e1376
 
-UnownPuzzle_A: ; e1376
+UnownPuzzle_A:
 	ld a, [wHoldingUnownPuzzlePiece]
 	and a
 	jr nz, .TryPlacePiece
@@ -348,19 +340,18 @@ UnownPuzzle_A: ; e1376
 	call SimpleWaitPressAorB
 	ld a, TRUE
 	ld [wSolvedUnownPuzzle], a
-UnownPuzzle_Quit: ; e13de
+UnownPuzzle_Quit:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
 
-UnownPuzzle_InvalidAction: ; e13e4
+UnownPuzzle_InvalidAction:
 	ld de, SFX_WRONG
 	call PlaySFX
 	call WaitSFX
 	ret
-; e13ee
 
-UnownPuzzle_FillBox: ; e13ee
+UnownPuzzle_FillBox:
 	ld de, SCREEN_WIDTH
 .row
 	push bc
@@ -375,9 +366,8 @@ UnownPuzzle_FillBox: ; e13ee
 	dec b
 	jr nz, .row
 	ret
-; e13fe
 
-UnownPuzzle_UpdateTilemap: ; e13fe
+UnownPuzzle_UpdateTilemap:
 	xor a
 	ld [wUnownPuzzleCursorPosition], a
 	ld c, 6 * 6
@@ -400,9 +390,8 @@ UnownPuzzle_UpdateTilemap: ; e13fe
 	dec c
 	jr nz, .loop
 	ret
-; e141f
 
-PlaceUnownPuzzlePieceGFX: ; e141f
+PlaceUnownPuzzlePieceGFX:
 	ld a, $2 ; tilemap coords
 	call GetUnownPuzzleCoordData
 	ld a, [hli]
@@ -427,9 +416,8 @@ PlaceUnownPuzzlePieceGFX: ; e141f
 	dec b
 	jr nz, .row
 	ret
-; e1441
 
-FillUnoccupiedPuzzleSpace: ; e1441
+FillUnoccupiedPuzzleSpace:
 	ld a, 2 ; tilemap coords
 	call GetUnownPuzzleCoordData
 	ld a, [hli]
@@ -454,9 +442,8 @@ FillUnoccupiedPuzzleSpace: ; e1441
 	dec b
 	jr nz, .row
 	ret
-; e1463
 
-GetUnownPuzzleCoordData: ; e1463
+GetUnownPuzzleCoordData:
 	ld e, a
 	ld d, 0
 	ld hl, UnownPuzzleCoordData
@@ -467,9 +454,8 @@ rept 6
 	add hl, de
 endr
 	ret
-; e1475
 
-UnownPuzzle_CheckCurrentTileOccupancy: ; e1475
+UnownPuzzle_CheckCurrentTileOccupancy:
 	ld hl, wPuzzlePieces
 	ld a, [wUnownPuzzleCursorPosition]
 	ld e, a
@@ -477,9 +463,8 @@ UnownPuzzle_CheckCurrentTileOccupancy: ; e1475
 	add hl, de
 	ld a, [hl]
 	ret
-; e1481
 
-GetCurrentPuzzlePieceVTileCorner: ; e1481
+GetCurrentPuzzlePieceVTileCorner:
 	ld a, [wUnownPuzzleHeldPiece]
 	ld hl, .Corners
 	add l
@@ -489,9 +474,8 @@ GetCurrentPuzzlePieceVTileCorner: ; e1481
 	ld h, a
 	ld a, [hl]
 	ret
-; e148f
 
-.Corners: ; e148f
+.Corners:
 ; 00, 01, 02
 ; 0c, 0d, 0e
 ; 18, 19, 1a
@@ -500,9 +484,8 @@ GetCurrentPuzzlePieceVTileCorner: ; e1481
 	db $24, $27, $2a, $2d
 	db $48, $4b, $4e, $51
 	db $6c, $6f, $72, $75
-; e14a0
 
-CheckSolvedUnownPuzzle: ; e14a0
+CheckSolvedUnownPuzzle:
 	ld hl, .SolvedPuzzleConfiguration
 	ld de, wPuzzlePieces
 	ld c, 6 * 6
@@ -520,18 +503,16 @@ CheckSolvedUnownPuzzle: ; e14a0
 .not_solved
 	and a
 	ret
-; e14b5
 
-.SolvedPuzzleConfiguration: ; e14b5
+.SolvedPuzzleConfiguration:
 	db $00, $00, $00, $00, $00, $00
 	db $00, $01, $02, $03, $04, $00
 	db $00, $05, $06, $07, $08, $00
 	db $00, $09, $0a, $0b, $0c, $00
 	db $00, $0d, $0e, $0f, $10, $00
 	db $00, $00, $00, $00, $00, $00
-; e14d9
 
-RedrawUnownPuzzlePieces: ; e14d9
+RedrawUnownPuzzlePieces:
 	call GetCurrentPuzzlePieceVTileCorner
 	ld [wd002], a
 	xor a
@@ -570,9 +551,8 @@ RedrawUnownPuzzlePieces: ; e14d9
 	ld [de], a ; attributes
 	inc de
 	jr .loop
-; e150f
 
-.OAM_HoldingPiece: ; e150f
+.OAM_HoldingPiece:
 	dsprite -1, -4, -1, -4, $00, 0
 	dsprite -1, -4,  0, -4, $01, 0
 	dsprite -1, -4,  0,  4, $02, 0
@@ -584,7 +564,7 @@ RedrawUnownPuzzlePieces: ; e14d9
 	dsprite  0,  4,  0,  4, $1a, 0
 	db -1
 
-.OAM_NotHoldingPiece: ; e1534
+.OAM_NotHoldingPiece:
 	dsprite -1, -4, -1, -4, $00, 0
 	dsprite -1, -4,  0, -4, $01, 0
 	dsprite -1, -4,  0,  4, $00, 0 | X_FLIP
@@ -596,7 +576,7 @@ RedrawUnownPuzzlePieces: ; e14d9
 	dsprite  0,  4,  0,  4, $00, 0 | X_FLIP | Y_FLIP
 	db -1
 
-UnownPuzzleCoordData: ; e1559
+UnownPuzzleCoordData:
 
 puzzle_coords: MACRO
 	dbpixel \1, \2, \3, \4
@@ -646,7 +626,7 @@ ENDM
 	puzzle_coords 15, 18, 4, 4, 13, 15, PUZZLE_BORDER, 0
 	puzzle_coords 18, 18, 4, 4, 16, 15, PUZZLE_BORDER, 0
 
-ConvertLoadedPuzzlePieces: ; e1631
+ConvertLoadedPuzzlePieces:
 	ld hl, vTiles2
 	ld de, vTiles0
 	ld b, 6
@@ -667,9 +647,8 @@ ConvertLoadedPuzzlePieces: ; e1631
 	jr nz, .loop
 	call UnownPuzzle_AddPuzzlePieceBorders
 	ret
-; e1654
 
-.EnlargePuzzlePieceTiles: ; e1654
+.EnlargePuzzlePieceTiles:
 ; double size
 	ld c, 6
 .loop1
@@ -738,9 +717,8 @@ ConvertLoadedPuzzlePieces: ; e1631
 	dec c
 	jr nz, .loop1
 	ret
-; e16aa
 
-.GetEnlargedTile: ; e16aa
+.GetEnlargedTile:
 	push hl
 	ld hl, .EnlargedTiles
 	add l
@@ -751,18 +729,15 @@ ConvertLoadedPuzzlePieces: ; e1631
 	ld a, [hl]
 	pop hl
 	ret
-; e16b7
-
-.EnlargedTiles: ; e16b7
 
+.EnlargedTiles:
 x = 0
 rept 16
 	db ((x & %1000) * %11000) + ((x & %0100) * %1100) + ((x & %0010) * %110) + ((x & %0001) * %11)
 x = x + 1
 endr
-; e16c7
 
-UnownPuzzle_AddPuzzlePieceBorders: ; e16c7
+UnownPuzzle_AddPuzzlePieceBorders:
 	ld hl, PuzzlePieceBorderData
 	ld a, 8
 .loop
@@ -784,9 +759,8 @@ endr
 	dec a
 	jr nz, .loop
 	ret
-; e16e2
 
-.LoadGFX: ; e16e2
+.LoadGFX:
 	lb bc, 4, 4
 .loop1
 	push bc
@@ -817,9 +791,8 @@ endr
 	dec b
 	jr nz, .loop1
 	ret
-; e1703
 
-PuzzlePieceBorderData: ; e1703
+PuzzlePieceBorderData:
 	dw .TileBordersGFX + 0 tiles, vTiles0 tile $00
 	dw .TileBordersGFX + 1 tiles, vTiles0 tile $01
 	dw .TileBordersGFX + 2 tiles, vTiles0 tile $02
@@ -828,12 +801,11 @@ PuzzlePieceBorderData: ; e1703
 	dw .TileBordersGFX + 5 tiles, vTiles0 tile $18
 	dw .TileBordersGFX + 6 tiles, vTiles0 tile $19
 	dw .TileBordersGFX + 7 tiles, vTiles0 tile $1a
-; e1723
 
-.TileBordersGFX: ; e1723
+.TileBordersGFX:
 INCBIN "gfx/unown_puzzle/tile_borders.2bpp"
 
-LoadUnownPuzzlePiecesGFX: ; e17a3
+LoadUnownPuzzlePiecesGFX:
 	ld a, [wScriptVar]
 	maskbits NUM_UNOWN_PUZZLES
 	ld e, a
@@ -848,30 +820,28 @@ LoadUnownPuzzlePiecesGFX: ; e17a3
 	call Decompress
 	call ConvertLoadedPuzzlePieces
 	ret
-; e17bd
 
-.LZPointers: ; e17bd
+.LZPointers:
 ; entries correspond to UNOWNPUZZLE_* constants
 	dw KabutoPuzzleLZ
 	dw OmanytePuzzleLZ
 	dw AerodactylPuzzleLZ
 	dw HoOhPuzzleLZ
-; e17c5
 
-UnownPuzzleCursorGFX: ; e17c5
+UnownPuzzleCursorGFX:
 INCBIN "gfx/unown_puzzle/cursor.2bpp"
 
-UnownPuzzleStartCancelLZ: ; e1805
+UnownPuzzleStartCancelLZ:
 INCBIN "gfx/unown_puzzle/start_cancel.2bpp.lz"
 
-HoOhPuzzleLZ: ; e18ab
+HoOhPuzzleLZ:
 INCBIN "gfx/unown_puzzle/hooh.2bpp.lz"
 
-AerodactylPuzzleLZ: ; e19fb
+AerodactylPuzzleLZ:
 INCBIN "gfx/unown_puzzle/aerodactyl.2bpp.lz"
 
-KabutoPuzzleLZ: ; e1bab
+KabutoPuzzleLZ:
 INCBIN "gfx/unown_puzzle/kabuto.2bpp.lz"
 
-OmanytePuzzleLZ: ; e1c9b
+OmanytePuzzleLZ:
 INCBIN "gfx/unown_puzzle/omanyte.2bpp.lz"
diff --git a/engine/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index 1c2dfb7aa..d8f53d7fc 100644
--- a/engine/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -1,12 +1,11 @@
 ; Replaces the functionality of sgb.asm to work with CGB hardware.
 
-CheckCGB: ; 8d55
+CheckCGB:
 	ld a, [hCGB]
 	and a
 	ret
-; 8d59
 
-LoadSGBLayoutCGB: ; 8d59
+LoadSGBLayoutCGB:
 	ld a, b
 	cp SCGB_RAM
 	jr nz, .not_ram
@@ -26,13 +25,11 @@ LoadSGBLayoutCGB: ; 8d59
 	ld de, .ReturnFromJumpTable
 	push de
 	jp hl
-; 8d79
 
-.ReturnFromJumpTable: ; 8d79
+.ReturnFromJumpTable:
 	ret
-; 8d7a
 
-.dw ; 8d7a
+.dw
 	dw _CGB_BattleGrayscale
 	dw _CGB_BattleColors
 	dw _CGB_PokegearPals
@@ -48,7 +45,7 @@ LoadSGBLayoutCGB: ; 8d59
 	dw _CGB_GSTitleScreen
 	dw _CGB0d
 	dw _CGB_MoveList
-	dw _CGB0f
+	dw _CGB_BetaPikachuMinigame
 	dw _CGB_PokedexSearchOption
 	dw _CGB11
 	dw _CGB_Pokepic
@@ -64,9 +61,8 @@ LoadSGBLayoutCGB: ; 8d59
 	dw _CGB_TrainerOrMonFrontpicPals
 	dw _CGB_MysteryGift
 	dw _CGB1e
-; 8db8
 
-_CGB_BattleGrayscale: ; 8db8
+_CGB_BattleGrayscale:
 	ld hl, PalPacket_BattleGrayscale + 1
 	ld de, wBGPals1
 	ld c, 4
@@ -81,7 +77,7 @@ _CGB_BattleGrayscale: ; 8db8
 	call CopyPalettes
 	jr _CGB_FinishBattleScreenLayout
 
-_CGB_BattleColors: ; 8ddb
+_CGB_BattleColors:
 	ld de, wBGPals1
 	call GetBattlemonBackpicPalettePointer
 	push hl
@@ -115,7 +111,7 @@ _CGB_BattleColors: ; 8ddb
 	ld a, SCGB_BATTLE_COLORS
 	ld [wSGBPredef], a
 	call ApplyPals
-_CGB_FinishBattleScreenLayout: ; 8e23
+_CGB_FinishBattleScreenLayout:
 	call InitPartyMenuBGPal7
 	hlcoord 0, 0, wAttrMap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@@ -152,12 +148,10 @@ _CGB_FinishBattleScreenLayout: ; 8e23
 	call FarCopyWRAM
 	call ApplyAttrMap
 	ret
-; 8e85
 
-
-InitPartyMenuBGPal7: ; 8e85
+InitPartyMenuBGPal7:
 	farcall Function100dc0
-Mobile_InitPartyMenuBGPal7: ; 8e8b
+Mobile_InitPartyMenuBGPal7:
 	ld hl, PartyMenuBGPalette
 	jr nc, .not_mobile
 	ld hl, PartyMenuBGMobilePalette
@@ -167,9 +161,8 @@ Mobile_InitPartyMenuBGPal7: ; 8e8b
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	ret
-; 8e9f
 
-InitPartyMenuBGPal0: ; 8e9f
+InitPartyMenuBGPal0:
 	farcall Function100dc0
 	ld hl, PartyMenuBGPalette
 	jr nc, .not_mobile
@@ -180,11 +173,10 @@ InitPartyMenuBGPal0: ; 8e9f
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	ret
-; 8eb9
 
-_CGB_PokegearPals: ; 8eb9
+_CGB_PokegearPals:
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .male
 	ld hl, FemalePokegearPals
 	jr .got_pals
@@ -200,9 +192,8 @@ _CGB_PokegearPals: ; 8eb9
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 8edb
 
-_CGB_StatsScreenHPPals: ; 8edb
+_CGB_StatsScreenHPPals:
 	ld de, wBGPals1
 	ld a, [wCurHPPal]
 	ld l, a
@@ -255,17 +246,14 @@ _CGB_StatsScreenHPPals: ; 8edb
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 8f52
 
-StatsScreenPagePals: ; 8f52
+StatsScreenPagePals:
 INCLUDE "gfx/stats/pages.pal"
-; 8f6a
 
-StatsScreenPals: ; 8f6a
+StatsScreenPals:
 INCLUDE "gfx/stats/stats.pal"
-; 8f70
 
-_CGB_Pokedex: ; 8f70
+_CGB_Pokedex:
 	ld de, wBGPals1
 	ld a, PREDEFPAL_POKEDEX
 	call GetPredefPal
@@ -297,17 +285,14 @@ _CGB_Pokedex: ; 8f70
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 8fba
 
-.PokedexQuestionMarkPalette: ; 8fba
+.PokedexQuestionMarkPalette:
 INCLUDE "gfx/pokedex/question_mark.pal"
-; 8fc2
 
-.PokedexCursorPalette: ; 8fc2
+.PokedexCursorPalette:
 INCLUDE "gfx/pokedex/cursor.pal"
-; 8fca
 
-_CGB_BillsPC: ; 8fca
+_CGB_BillsPC:
 	ld de, wBGPals1
 	ld a, PREDEFPAL_POKEDEX
 	call GetPredefPal
@@ -335,9 +320,8 @@ _CGB_BillsPC: ; 8fca
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 9009
 
-.Function9009: ; 9009
+.Function9009:
 	ld hl, .BillsPCOrangePalette
 	call LoadHLPaletteIntoDE
 	jr .asm_901a
@@ -358,13 +342,11 @@ _CGB_BillsPC: ; 8fca
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 9036
 
-.BillsPCOrangePalette: ; 9036
+.BillsPCOrangePalette:
 INCLUDE "gfx/pc/orange.pal"
-; 903e
 
-_CGB_PokedexUnownMode: ; 903e
+_CGB_PokedexUnownMode:
 	ld de, wBGPals1
 	ld a, PREDEFPAL_POKEDEX
 	call GetPredefPal
@@ -383,9 +365,8 @@ _CGB_PokedexUnownMode: ; 903e
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 906e
 
-_CGB_SlotMachine: ; 906e
+_CGB_SlotMachine:
 	ld hl, SlotMachinePals
 	ld de, wBGPals1
 	ld bc, 16 palettes
@@ -437,9 +418,8 @@ _CGB_SlotMachine: ; 906e
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 90f8
 
-_CGB06: ; 90f8
+_CGB06:
 	ld hl, PalPacket_SCGB_06 + 1
 	call CopyFourPalettes
 	call WipeAttrMap
@@ -456,9 +436,8 @@ _CGB06: ; 90f8
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 9122
 
-_CGB_GSIntro: ; 9122
+_CGB_GSIntro:
 	ld b, 0
 	ld hl, .Jumptable
 	add hl, bc
@@ -467,15 +446,13 @@ _CGB_GSIntro: ; 9122
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 912d
 
-.Jumptable: ; 912d
+.Jumptable:
 	dw .ShellderLaprasScene
 	dw .JigglypuffPikachuScene
 	dw .StartersCharizardScene
-; 9133
 
-.ShellderLaprasScene: ; 9133
+.ShellderLaprasScene:
 	ld hl, .ShellderLaprasBGPalette
 	ld de, wBGPals1
 	call LoadHLPaletteIntoDE
@@ -486,15 +463,14 @@ _CGB_GSIntro: ; 9122
 	call FarCopyWRAM
 	call WipeAttrMap
 	ret
-; 914e
 
-.ShellderLaprasBGPalette: ; 914e
+.ShellderLaprasBGPalette:
 	RGB 19, 31, 19
 	RGB 18, 23, 31
 	RGB 11, 21, 28
 	RGB 04, 16, 24
 
-.ShellderLaprasOBPals: ; 9156
+.ShellderLaprasOBPals:
 	RGB 29, 29, 29
 	RGB 20, 19, 20
 	RGB 19, 06, 04
@@ -504,9 +480,8 @@ _CGB_GSIntro: ; 9122
 	RGB 31, 31, 31
 	RGB 31, 00, 00
 	RGB 03, 04, 06
-; 9166
 
-.JigglypuffPikachuScene: ; 9166
+.JigglypuffPikachuScene:
 	ld de, wBGPals1
 	ld a, PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
 	call GetPredefPal
@@ -518,9 +493,8 @@ _CGB_GSIntro: ; 9122
 	call LoadHLPaletteIntoDE
 	call WipeAttrMap
 	ret
-; 9180
 
-.StartersCharizardScene: ; 9180
+.StartersCharizardScene:
 	ld hl, PalPacket_Pack + 1
 	call CopyFourPalettes
 	ld de, wOBPals1
@@ -529,10 +503,9 @@ _CGB_GSIntro: ; 9122
 	call LoadHLPaletteIntoDE
 	call WipeAttrMap
 	ret
-; 9195
 
-_CGB11: ; 9195
-	ld hl, Palettes_SCGB_11
+_CGB11:
+	ld hl, BetaPokerPals
 	ld de, wBGPals1
 	ld bc, 5 palettes
 	ld a, BANK(wBGPals1)
@@ -541,9 +514,8 @@ _CGB11: ; 9195
 	call WipeAttrMap
 	call ApplyAttrMap
 	ret
-; 91ad
 
-_CGB_Diploma: ; 91ad
+_CGB_Diploma:
 	ld hl, DiplomaPalettes
 	ld de, wBGPals1
 	ld bc, 16 palettes
@@ -555,16 +527,14 @@ _CGB_Diploma: ; 91ad
 	call WipeAttrMap
 	call ApplyAttrMap
 	ret
-; 91c8
 
-_CGB_MapPals: ; 91c8
+_CGB_MapPals:
 	call LoadMapPals
 	ld a, SCGB_MAPPALS
 	ld [wSGBPredef], a
 	ret
-; 91d1
 
-_CGB_PartyMenu: ; 91d1
+_CGB_PartyMenu:
 	ld hl, PalPacket_PartyMenu + 1
 	call CopyFourPalettes
 	call InitPartyMenuBGPal0
@@ -572,9 +542,8 @@ _CGB_PartyMenu: ; 91d1
 	call InitPartyMenuOBPals
 	call ApplyAttrMap
 	ret
-; 91e4
 
-_CGB_Evolution: ; 91e4
+_CGB_Evolution:
 	ld de, wBGPals1
 	ld a, c
 	and a
@@ -607,9 +576,8 @@ _CGB_Evolution: ; 91e4
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 9228
 
-_CGB_GSTitleScreen: ; 9228
+_CGB_GSTitleScreen:
 	ld hl, UnusedGSTitleBGPals
 	ld de, wBGPals1
 	ld bc, 5 palettes
@@ -626,17 +594,15 @@ _CGB_GSTitleScreen: ; 9228
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 9251
 
-_CGB0d: ; 9251
+_CGB0d:
 	ld hl, PalPacket_Diploma + 1
 	call CopyFourPalettes
 	call WipeAttrMap
 	call ApplyAttrMap
 	ret
-; 925e
 
-_CGB_UnownPuzzle: ; 925e
+_CGB_UnownPuzzle:
 	ld hl, PalPacket_UnownPuzzle + 1
 	call CopyFourPalettes
 	ld de, wOBPals1
@@ -657,9 +623,8 @@ _CGB_UnownPuzzle: ; 925e
 	call WipeAttrMap
 	call ApplyAttrMap
 	ret
-; 9289
 
-_CGB_TrainerCard: ; 9289
+_CGB_TrainerCard:
 	ld de, wBGPals1
 	xor a ; CHRIS
 	call GetTrainerPalettePointer
@@ -763,9 +728,8 @@ _CGB_TrainerCard: ; 9289
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 9373
 
-_CGB_MoveList: ; 9373
+_CGB_MoveList:
 	ld de, wBGPals1
 	ld a, PREDEFPAL_GOLDENROD
 	call GetPredefPal
@@ -788,10 +752,9 @@ _CGB_MoveList: ; 9373
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 93a6
 
-_CGB0f: ; 93a6
-	ld hl, PalPacket_SCGB_0F + 1
+_CGB_BetaPikachuMinigame:
+	ld hl, PalPacket_BetaPikachuMinigame + 1
 	call CopyFourPalettes
 	call WipeAttrMap
 	call ApplyAttrMap
@@ -799,9 +762,8 @@ _CGB0f: ; 93a6
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 93ba
 
-_CGB_PokedexSearchOption: ; 93ba
+_CGB_PokedexSearchOption:
 	ld de, wBGPals1
 	ld a, PREDEFPAL_POKEDEX
 	call GetPredefPal
@@ -812,16 +774,15 @@ _CGB_PokedexSearchOption: ; 93ba
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 93d3
 
-_CGB_PackPals: ; 93d3
+_CGB_PackPals:
 ; pack pals
 	ld a, [wBattleType]
 	cp BATTLETYPE_TUTORIAL
 	jr z, .tutorial_male
 
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .tutorial_male
 
 	ld hl, .KrisPackPals
@@ -861,17 +822,14 @@ _CGB_PackPals: ; 93d3
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 9439
 
-.ChrisPackPals: ; 9439
+.ChrisPackPals:
 INCLUDE "gfx/pack/pack.pal"
-; 9469
 
-.KrisPackPals: ; 9469
+.KrisPackPals:
 INCLUDE "gfx/pack/pack_f.pal"
-; 9499
 
-_CGB_Pokepic: ; 9499
+_CGB_Pokepic:
 	call _CGB_MapPals
 	ld de, SCREEN_WIDTH
 	hlcoord 0, 0, wAttrMap
@@ -904,9 +862,8 @@ _CGB_Pokepic: ; 9499
 	call FillBoxCGB
 	call ApplyAttrMap
 	ret
-; 94d0
 
-_CGB13: ; 94d0
+_CGB13:
 	ld hl, PalPacket_SCGB_13 + 1
 	call CopyFourPalettes
 	call WipeAttrMap
@@ -923,9 +880,8 @@ _CGB13: ; 94d0
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 94fa
 
-_CGB_GamefreakLogo: ; 94fa
+_CGB_GamefreakLogo:
 	ld de, wBGPals1
 	ld a, PREDEFPAL_GAMEFREAK_LOGO
 	call GetPredefPal
@@ -940,13 +896,11 @@ _CGB_GamefreakLogo: ; 94fa
 	call ApplyAttrMap
 	call ApplyPals
 	ret
-; 9521
 
-.Palette: ; 9521
+.Palette:
 INCLUDE "gfx/splash/logo.pal"
-; 9529
 
-_CGB_PlayerOrMonFrontpicPals: ; 9529
+_CGB_PlayerOrMonFrontpicPals:
 	ld de, wBGPals1
 	ld a, [wCurPartySpecies]
 	ld bc, wTempMonDVs
@@ -956,9 +910,8 @@ _CGB_PlayerOrMonFrontpicPals: ; 9529
 	call ApplyAttrMap
 	call ApplyPals
 	ret
-; 9542
 
-_CGB1e: ; 9542
+_CGB1e:
 	ld de, wBGPals1
 	ld a, [wCurPartySpecies]
 	call GetMonPalettePointer_
@@ -966,9 +919,8 @@ _CGB1e: ; 9542
 	call WipeAttrMap
 	call ApplyAttrMap
 	ret
-; 9555
 
-_CGB_TradeTube: ; 9555
+_CGB_TradeTube:
 	ld hl, PalPacket_TradeTube + 1
 	call CopyFourPalettes
 	ld hl, PartyMenuOBPals
@@ -982,9 +934,8 @@ _CGB_TradeTube: ; 9555
 	call LoadHLPaletteIntoDE
 	call WipeAttrMap
 	ret
-; 9578
 
-_CGB_TrainerOrMonFrontpicPals: ; 9578
+_CGB_TrainerOrMonFrontpicPals:
 	ld de, wBGPals1
 	ld a, [wCurPartySpecies]
 	ld bc, wTempMonDVs
@@ -994,9 +945,8 @@ _CGB_TrainerOrMonFrontpicPals: ; 9578
 	call ApplyAttrMap
 	call ApplyPals
 	ret
-; 9591
 
-_CGB_MysteryGift: ; 9591
+_CGB_MysteryGift:
 	ld hl, .Palettes
 	ld de, wBGPals1
 	ld bc, 2 palettes
@@ -1026,8 +976,6 @@ _CGB_MysteryGift: ; 9591
 	call FillBoxCGB
 	call ApplyAttrMap
 	ret
-; 95e0
 
-.Palettes: ; 95e0
+.Palettes:
 INCLUDE "gfx/mystery_gift/mystery_gift.pal"
-; 95f0
diff --git a/engine/color.asm b/engine/gfx/color.asm
index 4f07d0fdb..9a3b4f8ef 100644
--- a/engine/color.asm
+++ b/engine/gfx/color.asm
@@ -1,4 +1,4 @@
-INCLUDE "engine/sgb_layouts.asm"
+INCLUDE "engine/gfx/sgb_layouts.asm"
 
 SHINY_ATK_BIT EQU 5
 SHINY_DEF_VAL EQU 10
@@ -43,37 +43,36 @@ CheckShininess:
 	and a
 	ret
 
-Unused_CheckContestMon:
-; Check a mon's DVs at hl in the bug catching contest.
-; Return carry if its DVs are good enough to place in the contest.
+Unused_CheckShininess:
+; Return carry if the DVs at hl are all 10 or higher.
 
 ; Attack
 	ld a, [hl]
 	cp 10 << 4
-	jr c, .Bad
+	jr c, .NotShiny
 
 ; Defense
 	ld a, [hli]
 	and $f
 	cp 10
-	jr c, .Bad
+	jr c, .NotShiny
 
 ; Speed
 	ld a, [hl]
 	cp 10 << 4
-	jr c, .Bad
+	jr c, .NotShiny
 
 ; Special
 	ld a, [hl]
 	and $f
 	cp 10
-	jr c, .Bad
+	jr c, .NotShiny
 
-.Good:
+.Shiny:
 	scf
 	ret
 
-.Bad:
+.NotShiny:
 	and a
 	ret
 
@@ -108,7 +107,7 @@ InitPartyMenuPalettes:
 	ret
 
 ; SGB layout for SCGB_PARTY_MENU_HP_PALS
-SGB_ApplyPartyMenuHPPals: ; 8ade
+SGB_ApplyPartyMenuHPPals:
 	ld hl, wHPPals
 	ld a, [wSGBPals]
 	ld e, a
@@ -182,12 +181,12 @@ Unreferenced_Function8b4d:
 	ld a, [hSGB]
 	and a
 	ret z
-	ld hl, PalPacket_Function8b4d
+	ld hl, PalPacket_BetaIntroVenusaur
 	jp PushSGBPals_
 
 .cgb
 	ld de, wOBPals1
-	ld a, PREDEFPAL_3B
+	ld a, PREDEFPAL_BETA_INTRO_VENUSAUR
 	call GetPredefPal
 	jp LoadHLPaletteIntoDE
 
@@ -337,11 +336,11 @@ ApplyHPBarPals:
 	ret
 
 .Enemy:
-	ld de, wBGPals2 palette PAL_BATTLE_BG_ENEMY_HP + 2
+	ld de, wBGPals2 palette PAL_BATTLE_BG_ENEMY_HP color 1
 	jr .okay
 
 .Player:
-	ld de, wBGPals2 palette PAL_BATTLE_BG_PLAYER_HP + 2
+	ld de, wBGPals2 palette PAL_BATTLE_BG_PLAYER_HP color 1
 
 .okay
 	ld l, c
@@ -445,7 +444,7 @@ LoadMailPalettes:
 .MailPals:
 INCLUDE "gfx/mail/mail.pal"
 
-INCLUDE "engine/cgb_layouts.asm"
+INCLUDE "engine/gfx/cgb_layouts.asm"
 
 Unreferenced_Function95f0:
 	ld hl, .Palette
@@ -497,7 +496,7 @@ LoadHLPaletteIntoDE:
 	push af
 	ld a, BANK(wOBPals1)
 	ld [rSVBK], a
-	ld c, $8
+	ld c, 1 palettes
 .loop
 	ld a, [hli]
 	ld [de], a
@@ -521,7 +520,7 @@ LoadPalette_White_Col1_Col2_Black:
 	ld [de], a
 	inc de
 
-	ld c, 2 * 2
+	ld c, 2 * PAL_COLOR_SIZE
 .loop
 	ld a, [hli]
 	ld [de], a
@@ -649,7 +648,7 @@ ApplyAttrMap:
 	ret
 
 ; CGB layout for SCGB_PARTY_MENU_HP_PALS
-CGB_ApplyPartyMenuHPPals: ; 96f3
+CGB_ApplyPartyMenuHPPals:
 	ld hl, wHPPals
 	ld a, [wSGBPals]
 	ld e, a
@@ -707,7 +706,7 @@ GetPlayerOrMonPalettePointer:
 	and a
 	jp nz, GetMonNormalOrShinyPalettePointer
 	ld a, [wPlayerSpriteSetupFlags]
-	bit 2, a ; transformed to male
+	bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a
 	jr nz, .male
 	ld a, [wPlayerGender]
 	and a
@@ -1129,7 +1128,7 @@ SGBBorder_YetMorePalPushing:
 	ld [rBGP], a
 	ret
 
-CopyData: ; 0x9a52
+CopyData:
 ; copy bc bytes of data from hl to de
 .loop
 	ld a, [hli]
@@ -1140,9 +1139,8 @@ CopyData: ; 0x9a52
 	or b
 	jr nz, .loop
 	ret
-; 0x9a5b
 
-ClearBytes: ; 0x9a5b
+ClearBytes:
 ; clear bc bytes of data starting from de
 .loop
 	xor a
@@ -1153,9 +1151,8 @@ ClearBytes: ; 0x9a5b
 	or b
 	jr nz, .loop
 	ret
-; 0x9a64
 
-DrawDefaultTiles: ; 0x9a64
+DrawDefaultTiles:
 ; Draw 240 tiles (2/3 of the screen) from tiles in VRAM
 	hlbgcoord 0, 0 ; BG Map 0
 	ld de, BG_MAP_WIDTH - SCREEN_WIDTH
@@ -1173,7 +1170,6 @@ DrawDefaultTiles: ; 0x9a64
 	dec c
 	jr nz, .line
 	ret
-; 0x9a7a
 
 SGBDelayCycles:
 	ld de, 7000
@@ -1308,7 +1304,7 @@ rept 4
 	inc hl
 endr
 .morn_day
-	ld de, wBGPals1 palette PAL_BG_ROOF + 2
+	ld de, wBGPals1 palette PAL_BG_ROOF color 1
 	ld bc, 4
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
@@ -1349,8 +1345,8 @@ INCLUDE "gfx/pokegear/pokegear.pal"
 FemalePokegearPals:
 INCLUDE "gfx/pokegear/pokegear_f.pal"
 
-Palettes_SCGB_11:
-INCLUDE "gfx/unknown/b789.pal"
+BetaPokerPals:
+INCLUDE "gfx/beta_poker/beta_poker.pal"
 
 SlotMachinePals:
 INCLUDE "gfx/slots/slots.pal"
diff --git a/engine/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm
index 1fbba9a5f..b9686701c 100755..100644
--- a/engine/crystal_layouts.asm
+++ b/engine/gfx/crystal_layouts.asm
@@ -1,4 +1,4 @@
-GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile)
+GetMysteryGift_MobileAdapterLayout:
 	ld a, b
 	cp SCGB_RAM
 	jr nz, .not_ram
@@ -20,15 +20,13 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile)
 	jp hl
 .done
 	ret
-; 49330 (12:5330)
 
-.dw ; 49330
+.dw
 	dw MG_Mobile_Layout00
 	dw MG_Mobile_Layout01
 	dw MG_Mobile_Layout02
-; 49336
 
-MG_Mobile_Layout_FillBox: ; 49336
+MG_Mobile_Layout_FillBox:
 .row
 	push bc
 	push hl
@@ -43,18 +41,17 @@ MG_Mobile_Layout_FillBox: ; 49336
 	dec b
 	jr nz, .row
 	ret
-; 49346
 
-MG_Mobile_Layout_WipeAttrMap: ; 49346 (12:5346)
+MG_Mobile_Layout_WipeAttrMap:
 	hlcoord 0, 0, wAttrMap
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	xor a
 	call ByteFill
 	ret
 
-MG_Mobile_Layout_LoadPals: ; 49351 (12:5351)
+MG_Mobile_Layout_LoadPals:
 	ld de, wBGPals1
-	ld hl, Palette_493e1
+	ld hl, Palette_MysteryGiftMobile
 	ld bc, 5 palettes
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
@@ -65,7 +62,7 @@ MG_Mobile_Layout_LoadPals: ; 49351 (12:5351)
 	call FarCopyWRAM
 	ret
 
-MG_Mobile_Layout00: ; 4936e (12:536e)
+MG_Mobile_Layout00:
 	call MG_Mobile_Layout_LoadPals
 	call MG_Mobile_Layout_WipeAttrMap
 	call MG_Mobile_Layout_CreatePalBoxes
@@ -73,7 +70,7 @@ MG_Mobile_Layout00: ; 4936e (12:536e)
 	farcall ApplyPals
 	ret
 
-MG_Mobile_Layout_CreatePalBoxes: ; 49384 (12:5384)
+MG_Mobile_Layout_CreatePalBoxes:
 	hlcoord 0, 0, wAttrMap
 	lb bc, 4, 1
 	ld a, $1
@@ -109,35 +106,30 @@ MG_Mobile_Layout_CreatePalBoxes: ; 49384 (12:5384)
 	ld a, $7
 	call ByteFill
 	ret
-; 493e1 (12:53e1)
 
-Palette_493e1: ; 493e1
+Palette_MysteryGiftMobile:
 INCLUDE "gfx/mystery_gift/mg_mobile.pal"
-; 49409
 
-LoadOW_BGPal7:: ; 49409
+LoadOW_BGPal7::
 	ld hl, Palette_TextBG7
 	ld de, wBGPals1 palette PAL_BG_TEXT
 	ld bc, 1 palettes
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	ret
-; 49418
 
-Palette_TextBG7: ; 49418
+Palette_TextBG7:
 INCLUDE "gfx/font/bg_text.pal"
-; 49420
 
-Function49420:: ; 49420 (12:5420)
+Function49420::
 	ld hl, MansionPalette1 + 8 palettes
 	ld de, wBGPals1 palette PAL_BG_ROOF
 	ld bc, 1 palettes
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	ret
-; 4942f (12:542f)
 
-MG_Mobile_Layout01: ; 4942f
+MG_Mobile_Layout01:
 	call MG_Mobile_Layout_LoadPals
 	ld de, wBGPals1 palette PAL_BG_TEXT
 	ld hl, .Palette_49478
@@ -168,16 +160,14 @@ MG_Mobile_Layout01: ; 4942f
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 49478
 
-.Palette_49478: ; 49478
+.Palette_49478:
 	RGB 31, 31, 31
 	RGB 26, 31, 00
 	RGB 20, 16, 03
 	RGB 00, 00, 00
-; 49480
 
-Function49480: ; 49480
+Function49480:
 	hlcoord 0, 0, wAttrMap
 	lb bc, 4, SCREEN_WIDTH
 	ld a, $7
@@ -188,9 +178,8 @@ Function49480: ; 49480
 	hlcoord 19, 2, wAttrMap
 	ld [hl], a
 	ret
-; 49496
 
-Function49496: ; 49496
+Function49496:
 	hlcoord 0, 0, wAttrMap
 	lb bc, 2, SCREEN_WIDTH
 	ld a, $7
@@ -201,11 +190,10 @@ Function49496: ; 49496
 	hlcoord 19, 1, wAttrMap
 	ld [hl], a
 	ret
-; 494ac
 
-INCLUDE "engine/tileset_palettes.asm"
+INCLUDE "engine/tilesets/tileset_palettes.asm"
 
-MG_Mobile_Layout02: ; 49706
+MG_Mobile_Layout02:
 	ld hl, .Palette_49732
 	ld de, wBGPals1
 	ld bc, 1 palettes
@@ -220,23 +208,20 @@ MG_Mobile_Layout02: ; 49706
 	ld a, BANK(wOBPals1)
 	call FarCopyWRAM
 	ret
-; 49732
 
-.Palette_49732: ; 49732
+.Palette_49732:
 	RGB 31, 31, 31
 	RGB 23, 16, 07
 	RGB 23, 07, 07
 	RGB 03, 07, 20
-; 4973a
 
-.Palette_4973a: ; 4973a
+.Palette_4973a:
 	RGB 00, 00, 00
 	RGB 07, 05, 31
 	RGB 14, 18, 31
 	RGB 31, 31, 31
-; 49742
 
-Function49742: ; 49742
+Function49742:
 	ld hl, .Palette_49757
 	ld de, wBGPals1
 	ld bc, 8 palettes
@@ -244,13 +229,11 @@ Function49742: ; 49742
 	call FarCopyWRAM
 	farcall ApplyPals
 	ret
-; 49757
 
-.Palette_49757: ; 49757
+.Palette_49757:
 INCLUDE "gfx/unknown/49757.pal"
-; 49797
 
-_InitMG_Mobile_LinkTradePalMap: ; 49797
+_InitMG_Mobile_LinkTradePalMap:
 	hlcoord 0, 0, wAttrMap
 	lb bc, 16, 2
 	ld a, $4
@@ -300,9 +283,8 @@ _InitMG_Mobile_LinkTradePalMap: ; 49797
 	ld bc, 6
 	call ByteFill
 	ret
-; 49811
 
-LoadTradeRoomBGPals: ; 49811
+LoadTradeRoomBGPals:
 	ld hl, TradeRoomPalette
 	ld de, wBGPals1 palette PAL_BG_GREEN
 	ld bc, 6 palettes
@@ -310,16 +292,13 @@ LoadTradeRoomBGPals: ; 49811
 	call FarCopyWRAM
 	farcall ApplyPals
 	ret
-; 49826
 
-TradeRoomPalette: ; 49826
+TradeRoomPalette:
 INCLUDE "gfx/trade/border.pal"
-; 49856
 
-InitMG_Mobile_LinkTradePalMap: ; 49856
+InitMG_Mobile_LinkTradePalMap:
 	call _InitMG_Mobile_LinkTradePalMap
 	ret
-; 4985a
 
 ; unused
 INCLUDE "gfx/unknown/4985a.asm"
diff --git a/engine/dma_transfer.asm b/engine/gfx/dma_transfer.asm
index b4a500545..241649dc5 100755..100644
--- a/engine/dma_transfer.asm
+++ b/engine/gfx/dma_transfer.asm
@@ -1,4 +1,4 @@
-HDMATransferAttrMapAndTileMapToWRAMBank3:: ; 104000
+HDMATransferAttrMapAndTileMapToWRAMBank3::
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
@@ -18,9 +18,8 @@ HDMATransferAttrMapAndTileMapToWRAMBank3:: ; 104000
 	ld hl, wScratchAttrMap
 	call HDMATransferToWRAMBank3
 	ret
-; 10402d
 
-HDMATransferTileMapToWRAMBank3:: ; 10402d
+HDMATransferTileMapToWRAMBank3::
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
@@ -33,9 +32,8 @@ HDMATransferTileMapToWRAMBank3:: ; 10402d
 	ld hl, wScratchTileMap
 	call HDMATransferToWRAMBank3
 	ret
-; 104047
 
-HDMATransferAttrMapToWRAMBank3: ; 104047
+HDMATransferAttrMapToWRAMBank3:
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
@@ -48,9 +46,8 @@ HDMATransferAttrMapToWRAMBank3: ; 104047
 	ld hl, wScratchAttrMap
 	call HDMATransferToWRAMBank3
 	ret
-; 104061
 
-ReloadMapPart:: ; 104061
+ReloadMapPart::
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
@@ -80,7 +77,7 @@ ReloadMapPart:: ; 104061
 
 	ret
 
-Mobile_ReloadMapPart: ; 104099
+Mobile_ReloadMapPart:
 	ld hl, ReloadMapPart ; useless
 	ld hl, .Function
 	jp CallInSafeGFXMode
@@ -110,7 +107,6 @@ Mobile_ReloadMapPart: ; 104099
 	ei
 
 	ret
-; 1040d4
 
 ; unused
 	ld hl, .unreferenced_1040da
@@ -134,7 +130,6 @@ Mobile_ReloadMapPart: ; 104099
 	ld [hDMATransfer], a
 	call WaitDMATransfer
 	ret
-; 1040fb
 
 ; unused
 	ld hl, .unreferenced_104101
@@ -148,9 +143,8 @@ Mobile_ReloadMapPart: ; 104099
 	ld hl, w3_d800
 	call HDMATransferToWRAMBank3
 	ret
-; 104110
 
-OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 104110
+OpenAndCloseMenu_HDMATransferTileMapAndAttrMap::
 ; OpenText
 	ld hl, .Function
 	jp CallInSafeGFXMode
@@ -182,9 +176,8 @@ OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 104110
 	ld [rVBK], a
 	ei
 	ret
-; 104148
 
-Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap: ; 104148 (41:4148)
+Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
@@ -209,9 +202,8 @@ Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap: ; 104148 (41:4148)
 	ld hl, wScratchTileMap
 	call HDMATransfer_Wait127Scanlines_toBGMap
 	ret
-; 104177
 
-CallInSafeGFXMode: ; 104177
+CallInSafeGFXMode:
 	ld a, [hBGMapMode]
 	push af
 	ld a, [hMapAnims]
@@ -237,19 +229,16 @@ CallInSafeGFXMode: ; 104177
 	pop af
 	ld [hBGMapMode], a
 	ret
-; 10419c
 
-._hl_ ; 10419c
+._hl_
 	jp hl
-; 10419d
 
-
-HDMATransferToWRAMBank3: ; 10419d (41:419d)
+HDMATransferToWRAMBank3:
 	call _LoadHDMAParameters
 	ld a, $23
 	ld [hDMATransfer], a
 
-WaitDMATransfer: ; 104a14
+WaitDMATransfer:
 .loop
 	call DelayFrame
 	ld a, [hDMATransfer]
@@ -257,7 +246,7 @@ WaitDMATransfer: ; 104a14
 	jr nz, .loop
 	ret
 
-HDMATransfer_Wait127Scanlines_toBGMap: ; 1041ad (41:41ad)
+HDMATransfer_Wait127Scanlines_toBGMap:
 ; HDMA transfer from hl to [hBGMapAddress]
 ; hBGMapAddress -> de
 ; 2 * SCREEN_HEIGHT -> c
@@ -268,7 +257,7 @@ HDMATransfer_Wait127Scanlines_toBGMap: ; 1041ad (41:41ad)
 	ld c, 2 * SCREEN_HEIGHT
 	jr HDMATransfer_Wait127Scanlines
 
-HDMATransfer_Wait123Scanlines_toBGMap: ; 1041b7 (41:41b7)
+HDMATransfer_Wait123Scanlines_toBGMap:
 ; HDMA transfer from hl to [hBGMapAddress]
 ; hBGMapAddress -> de
 ; 2 * SCREEN_HEIGHT -> c
@@ -279,9 +268,8 @@ HDMATransfer_Wait123Scanlines_toBGMap: ; 1041b7 (41:41b7)
 	ld e, a
 	ld c, 2 * SCREEN_HEIGHT
 	jr HDMATransfer_Wait123Scanlines
-; 1041c1 (41:41c1)
 
-HDMATransfer_NoDI: ; 1041c1
+HDMATransfer_NoDI:
 ; HDMA transfer from hl to [hBGMapAddress]
 ; [hBGMapAddress] --> de
 ; 2 * SCREEN_HEIGHT --> c
@@ -339,13 +327,11 @@ HDMATransfer_NoDI: ; 1041c1
 	ld hl, rHDMA5
 	res 7, [hl]
 	ret
-; 104205
 
 HDMATransfer_Wait123Scanlines:
 	ld b, $7b
 	jr _continue_HDMATransfer
 
-
 HDMATransfer_Wait127Scanlines:
 	ld b, $7f
 _continue_HDMATransfer:
@@ -407,10 +393,8 @@ _continue_HDMATransfer:
 	ei
 
 	ret
-; 10424e
 
-
-_LoadHDMAParameters: ; 10424e (41:424e)
+_LoadHDMAParameters:
 	ld a, h
 	ld [rHDMA1], a
 	ld a, l
@@ -422,14 +406,14 @@ _LoadHDMAParameters: ; 10424e (41:424e)
 	ld [rHDMA4], a
 	ret
 
-PadTilemapForHDMATransfer: ; 10425f (41:425f)
+PadTilemapForHDMATransfer:
 	ld c, " "
 	jr PadMapForHDMATransfer
 
-PadAttrMapForHDMATransfer: ; 104263 (41:4263)
+PadAttrMapForHDMATransfer:
 	ld c, $0
 
-PadMapForHDMATransfer: ; 104265 (41:4265)
+PadMapForHDMATransfer:
 ; pad a 20x18 map to 32x18 for HDMA transfer
 ; back up the padding value in c to hMapObjectIndexBuffer
 	ld a, [hMapObjectIndexBuffer]
@@ -466,8 +450,7 @@ PadMapForHDMATransfer: ; 104265 (41:4265)
 	ld [hMapObjectIndexBuffer], a
 	ret
 
-
-_Get2bpp:: ; 104284
+_Get2bpp::
 	; 2bpp when [rLCDC] & $80
 	; switch to WRAM bank 6
 	ld a, [rSVBK]
@@ -510,9 +493,8 @@ _Get2bpp:: ; 104284
 	pop af
 	ld [rSVBK], a
 	ret
-; 1042b2
 
-_Get1bpp:: ; 1042b2
+_Get1bpp::
 	; 1bpp when [rLCDC] & $80
 .loop
 	ld a, c
@@ -537,9 +519,8 @@ _Get1bpp:: ; 1042b2
 	sub $10
 	ld c, a
 	jr .loop
-; 1042d6
 
-.bankswitch ; 1042d6
+.bankswitch
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wScratchTileMap)
@@ -576,12 +557,10 @@ _Get1bpp:: ; 1042b2
 	pop af
 	ld [rSVBK], a
 	ret
-; 104303
 
-HDMATransfer_OnlyTopFourRows: ; 104303
+HDMATransfer_OnlyTopFourRows:
 	ld hl, .Function
 	jp CallInSafeGFXMode
-; 104309
 
 .Function:
 	ld hl, wScratchTileMap
@@ -604,7 +583,7 @@ HDMATransfer_OnlyTopFourRows: ; 104303
 	call HDMATransfer_Wait127Scanlines
 	ret
 
-.Copy: ; 10433a (41:433a)
+.Copy:
 	ld b, 4
 .outer_loop
 	ld c, SCREEN_WIDTH
@@ -618,9 +597,8 @@ HDMATransfer_OnlyTopFourRows: ; 104303
 	add BG_MAP_WIDTH - SCREEN_WIDTH
 	ld l, a
 	ld a, h
-	adc $0
+	adc 0
 	ld h, a
 	dec b
 	jr nz, .outer_loop
 	ret
-; 104350
diff --git a/engine/load_font.asm b/engine/gfx/load_font.asm
index 40dbb9c10..41c0721d6 100644
--- a/engine/load_font.asm
+++ b/engine/gfx/load_font.asm
@@ -5,22 +5,20 @@ INCLUDE "gfx/font.asm"
 Unreferenced_fb434:
 	db 0
 
-Unreferenced_Functionfb435: ; 4b435
+Unreferenced_Functionfb435:
 	ld a, [Unreferenced_fb434]
 	and a
 	jp nz, Get1bpp_2
 	jp Get1bpp
-; fb43f
 
-Unreferenced_Functionfb43f: ; fb43f
+Unreferenced_Functionfb43f:
 	ld a, [Unreferenced_fb434]
 	and a
 	jp nz, Get2bpp_2
 	jp Get2bpp
 ; End unreferenced block
-; fb449
 
-_LoadStandardFont:: ; fb449
+_LoadStandardFont::
 	ld de, Font
 	ld hl, vTiles1
 	lb bc, BANK(Font), 128 ; "A" to "9"
@@ -45,9 +43,8 @@ _LoadStandardFont:: ; fb449
 	lb bc, BANK(Font), 32 ; "'" to "9"
 	call Get1bpp_2
 	ret
-; fb48a
 
-_LoadFontsExtra1:: ; fb48a
+_LoadFontsExtra1::
 	ld de, FontsExtra_SolidBlackGFX
 	ld hl, vTiles2 tile "■" ; $60
 	lb bc, BANK(FontsExtra_SolidBlackGFX), 1
@@ -61,26 +58,23 @@ _LoadFontsExtra1:: ; fb48a
 	lb bc, BANK(FontExtra), 22 ; "<BOLD_D>" to "ぉ"
 	call Get2bpp_2
 	jr LoadFrame
-; fb4b0
 
-_LoadFontsExtra2:: ; fb4b0
+_LoadFontsExtra2::
 	ld de, FontsExtra2_UpArrowGFX
 	ld hl, vTiles2 tile "▲" ; $61
 	ld b, BANK(FontsExtra2_UpArrowGFX)
 	ld c, 1
 	call Get2bpp_2
 	ret
-; fb4be
 
-_LoadFontsBattleExtra:: ; fb4be
+_LoadFontsBattleExtra::
 	ld de, FontBattleExtra
 	ld hl, vTiles2 tile $60
 	lb bc, BANK(FontBattleExtra), 25
 	call Get2bpp_2
 	jr LoadFrame
-; fb4cc
 
-LoadFrame: ; fb4cc
+LoadFrame:
 	ld a, [wTextBoxFrame]
 	maskbits NUM_FRAMES
 	ld bc, 6 * LEN_1BPP_TILE
@@ -96,9 +90,8 @@ LoadFrame: ; fb4cc
 	lb bc, BANK(TextBoxSpaceGFX), 1
 	call Get1bpp_2
 	ret
-; fb4f2
 
-LoadBattleFontsHPBar: ; fb4f2
+LoadBattleFontsHPBar:
 	ld de, FontBattleExtra
 	ld hl, vTiles2 tile $60
 	lb bc, BANK(FontBattleExtra), 12
@@ -109,7 +102,7 @@ LoadBattleFontsHPBar: ; fb4f2
 	call Get2bpp_2
 	call LoadFrame
 
-LoadHPBar: ; fb50d
+LoadHPBar:
 	ld de, EnemyHPBarBorderGFX
 	ld hl, vTiles2 tile $6c
 	lb bc, BANK(EnemyHPBarBorderGFX), 4
@@ -127,9 +120,8 @@ LoadHPBar: ; fb50d
 	lb bc, BANK(MobilePhoneTilesGFX), 2
 	call Get2bpp_2
 	ret
-; fb53e
 
-StatsScreen_LoadFont: ; fb53e
+StatsScreen_LoadFont:
 	call _LoadFontsBattleExtra
 	ld de, EnemyHPBarBorderGFX
 	ld hl, vTiles2 tile $6c
@@ -147,10 +139,9 @@ StatsScreen_LoadFont: ; fb53e
 	ld hl, vTiles2 tile $55
 	lb bc, BANK(ExpBarGFX), 8
 	call Get2bpp_2
-LoadStatsScreenPageTilesGFX: ; fb571
+LoadStatsScreenPageTilesGFX:
 	ld de, StatsScreenPageTilesGFX
 	ld hl, vTiles2 tile $31
 	lb bc, BANK(StatsScreenPageTilesGFX), 17
 	call Get2bpp_2
 	ret
-; fb57e
diff --git a/engine/routines/loadoverworldfont.asm b/engine/gfx/load_overworld_font.asm
index f23f01c4e..f4ef84619 100644
--- a/engine/routines/loadoverworldfont.asm
+++ b/engine/gfx/load_overworld_font.asm
@@ -1,4 +1,4 @@
-LoadOverworldFont:: ; 106594
+LoadOverworldFont::
 	ld de, .OverworldFontGFX
 	ld hl, vTiles1
 	lb bc, BANK(.OverworldFontGFX), $80
@@ -8,7 +8,6 @@ LoadOverworldFont:: ; 106594
 	lb bc, BANK(.OverworldFontSpaceGFX), 1
 	call Get2bpp
 	ret
-; 1065ad
 
 .OverworldFontGFX:
 INCBIN "gfx/font/overworld.2bpp"
diff --git a/engine/load_pics.asm b/engine/gfx/load_pics.asm
index 0558fb7f7..64190083d 100755..100644
--- a/engine/load_pics.asm
+++ b/engine/gfx/load_pics.asm
@@ -1,4 +1,4 @@
-GetUnownLetter: ; 51040
+GetUnownLetter:
 ; Return Unown letter in wUnownLetter based on DVs at hl
 
 ; Take the middle 2 bits of each DV and place them in order:
@@ -48,7 +48,7 @@ GetUnownLetter: ; 51040
 	ld [wUnownLetter], a
 	ret
 
-GetMonFrontpic: ; 51077
+GetMonFrontpic:
 	ld a, [wCurPartySpecies]
 	ld [wCurSpecies], a
 	call IsAPokemon
@@ -60,7 +60,7 @@ GetMonFrontpic: ; 51077
 	ld [rSVBK], a
 	ret
 
-GetAnimatedFrontpic: ; 5108b
+GetAnimatedFrontpic:
 	ld a, [wCurPartySpecies]
 	ld [wCurSpecies], a
 	call IsAPokemon
@@ -75,7 +75,7 @@ GetAnimatedFrontpic: ; 5108b
 	ld [rSVBK], a
 	ret
 
-_GetFrontpic: ; 510a5
+_GetFrontpic:
 	push de
 	call GetBaseData
 	ld a, [wBasePicSize]
@@ -102,9 +102,7 @@ _GetFrontpic: ; 510a5
 	pop hl
 	ret
 
-GetFrontpicPointer: ; 510d7
-GLOBAL PokemonPicPointers, UnownPicPointers
-
+GetFrontpicPointer:
 	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr z, .unown
@@ -131,7 +129,7 @@ GLOBAL PokemonPicPointers, UnownPicPointers
 	pop bc
 	ret
 
-GetAnimatedEnemyFrontpic: ; 51103
+GetAnimatedEnemyFrontpic:
 	ld a, BANK(vTiles3)
 	ld [rVBK], a
 	push hl
@@ -160,7 +158,6 @@ GetAnimatedEnemyFrontpic: ; 51103
 	ld de, wDecompressEnemyFrontpic + 7 * 7 tiles
 	ld c, 7 * 7
 .got_dims
-
 	push hl
 	push bc
 	call LoadFrontpicTiles
@@ -174,7 +171,7 @@ GetAnimatedEnemyFrontpic: ; 51103
 	ld [rVBK], a
 	ret
 
-LoadFrontpicTiles: ; 5114f
+LoadFrontpicTiles:
 	ld hl, wDecompressScratch
 	swap c
 	ld a, c
@@ -195,7 +192,7 @@ LoadFrontpicTiles: ; 5114f
 	jr nz, .loop
 	ret
 
-GetMonBackpic: ; 5116c
+GetMonBackpic:
 	ld a, [wCurPartySpecies]
 	call IsAPokemon
 	ret c
@@ -211,7 +208,6 @@ GetMonBackpic: ; 5116c
 	push de
 
 	; These are assumed to be at the same address in their respective banks.
-	GLOBAL PokemonPicPointers,  UnownPicPointers
 	ld hl, PokemonPicPointers ; UnownPicPointers
 	ld a, b
 	ld d, BANK(PokemonPicPointers)
@@ -247,7 +243,7 @@ GetMonBackpic: ; 5116c
 	ld [rSVBK], a
 	ret
 
-FixPicBank: ; 511c5
+FixPicBank:
 ; This is a thing for some reason.
 
 PICS_FIX EQU $36
@@ -255,7 +251,7 @@ GLOBAL PICS_FIX
 
 	push hl
 	push bc
-	sub BANK(Pics_1) - PICS_FIX
+	sub BANK("Pics 1") - PICS_FIX
 	ld c, a
 	ld b, 0
 	ld hl, .PicsBanks
@@ -265,33 +261,33 @@ GLOBAL PICS_FIX
 	pop hl
 	ret
 
-.PicsBanks: ; 511d4
-	db BANK(Pics_1) + 0
-	db BANK(Pics_1) + 1
-	db BANK(Pics_1) + 2
-	db BANK(Pics_1) + 3
-	db BANK(Pics_1) + 4
-	db BANK(Pics_1) + 5
-	db BANK(Pics_1) + 6
-	db BANK(Pics_1) + 7
-	db BANK(Pics_1) + 8
-	db BANK(Pics_1) + 9
-	db BANK(Pics_1) + 10
-	db BANK(Pics_1) + 11
-	db BANK(Pics_1) + 12
-	db BANK(Pics_1) + 13
-	db BANK(Pics_1) + 14
-	db BANK(Pics_1) + 15
-	db BANK(Pics_1) + 16
-	db BANK(Pics_1) + 17
-	db BANK(Pics_1) + 18
-	db BANK(Pics_1) + 19
-	db BANK(Pics_1) + 20
-	db BANK(Pics_1) + 21
-	db BANK(Pics_1) + 22
-	db BANK(Pics_1) + 23
-
-Function511ec: ; 511ec
+.PicsBanks:
+	db BANK("Pics 1")  ; BANK("Pics 1") + 0
+	db BANK("Pics 2")  ; BANK("Pics 1") + 1
+	db BANK("Pics 3")  ; BANK("Pics 1") + 2
+	db BANK("Pics 4")  ; BANK("Pics 1") + 3
+	db BANK("Pics 5")  ; BANK("Pics 1") + 4
+	db BANK("Pics 6")  ; BANK("Pics 1") + 5
+	db BANK("Pics 7")  ; BANK("Pics 1") + 6
+	db BANK("Pics 8")  ; BANK("Pics 1") + 7
+	db BANK("Pics 9")  ; BANK("Pics 1") + 8
+	db BANK("Pics 10") ; BANK("Pics 1") + 9
+	db BANK("Pics 11") ; BANK("Pics 1") + 10
+	db BANK("Pics 12") ; BANK("Pics 1") + 11
+	db BANK("Pics 13") ; BANK("Pics 1") + 12
+	db BANK("Pics 14") ; BANK("Pics 1") + 13
+	db BANK("Pics 15") ; BANK("Pics 1") + 14
+	db BANK("Pics 16") ; BANK("Pics 1") + 15
+	db BANK("Pics 17") ; BANK("Pics 1") + 16
+	db BANK("Pics 18") ; BANK("Pics 1") + 17
+	db BANK("Pics 19") ; BANK("Pics 1") + 18
+	db BANK("Pics 20") ; BANK("Pics 1") + 19
+	db BANK("Pics 21") ; BANK("Pics 1") + 20
+	db BANK("Pics 22") ; BANK("Pics 1") + 21
+	db BANK("Pics 23") ; BANK("Pics 1") + 22
+	db BANK("Pics 24") ; BANK("Pics 1") + 23
+
+Function511ec:
 	ld a, c
 	push de
 	ld hl, PokemonPicPointers
@@ -310,7 +306,7 @@ Function511ec: ; 511ec
 	call FarDecompress
 	ret
 
-GetTrainerPic: ; 5120d
+GetTrainerPic:
 	ld a, [wTrainerClass]
 	and a
 	ret z
@@ -352,7 +348,7 @@ GetTrainerPic: ; 5120d
 	ld [hBGMapMode], a
 	ret
 
-DecompressGet2bpp: ; 5125d
+DecompressGet2bpp:
 ; Decompress lz data from b:hl to scratch space at 6:d000, then copy it to address de.
 
 	ld a, [rSVBK]
@@ -376,7 +372,7 @@ DecompressGet2bpp: ; 5125d
 	ld [rSVBK], a
 	ret
 
-FixBackpicAlignment: ; 5127c
+FixBackpicAlignment:
 	push de
 	push bc
 	ld a, [wBoxAlignment]
@@ -412,7 +408,7 @@ FixBackpicAlignment: ; 5127c
 	pop de
 	ret
 
-PadFrontpic: ; 512ab
+PadFrontpic:
 ; pads frontpic to fill 7x7 box
 	ld a, b
 	cp 6
@@ -421,39 +417,39 @@ PadFrontpic: ; 512ab
 	jr z, .five
 
 .seven_loop
-	ld c, $70
+	ld c, 7 << 4
 	call LoadOrientedFrontpic
 	dec b
 	jr nz, .seven_loop
 	ret
 
 .six
-	ld c, $70
+	ld c, 7 << 4
 	xor a
 	call .Fill
 .six_loop
-	ld c, $10
+	ld c, (7 - 6) << 4
 	xor a
 	call .Fill
-	ld c, $60
+	ld c, 6 << 4
 	call LoadOrientedFrontpic
 	dec b
 	jr nz, .six_loop
 	ret
 
 .five
-	ld c, $70
+	ld c, 7 << 4
 	xor a
 	call .Fill
 .five_loop
-	ld c, $20
+	ld c, (7 - 5) << 4
 	xor a
 	call .Fill
-	ld c, $50
+	ld c, 5 << 4
 	call LoadOrientedFrontpic
 	dec b
 	jr nz, .five_loop
-	ld c, $70
+	ld c, 7 << 4
 	xor a
 	call .Fill
 	ret
@@ -464,7 +460,7 @@ PadFrontpic: ; 512ab
 	jr nz, .Fill
 	ret
 
-LoadOrientedFrontpic: ; 512f2
+LoadOrientedFrontpic:
 	ld a, [wBoxAlignment]
 	and a
 	jr nz, .x_flip
diff --git a/engine/routines/loadpushoam.asm b/engine/gfx/load_push_oam.asm
index 95f67ff73..11045bb9d 100644
--- a/engine/routines/loadpushoam.asm
+++ b/engine/gfx/load_push_oam.asm
@@ -1,4 +1,4 @@
-WriteOAMDMACodeToHRAM:: ; 4031
+WriteOAMDMACodeToHRAM::
 	ld c, hTransferVirtualOAM - $ff00
 	ld b, .PushOAMEnd - .PushOAM
 	ld hl, .PushOAM
@@ -10,7 +10,7 @@ WriteOAMDMACodeToHRAM:: ; 4031
 	jr nz, .loop
 	ret
 
-.PushOAM: ; 403f
+.PushOAM:
 	ld a, HIGH(wVirtualOAM)
 	ld [rDMA], a
 	ld a, NUM_SPRITE_OAM_STRUCTS
diff --git a/engine/mon_icons.asm b/engine/gfx/mon_icons.asm
index 5a26d2d7c..5ae2fbf8b 100755..100644
--- a/engine/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
@@ -1,4 +1,4 @@
-LoadOverworldMonIcon: ; 8e82b
+LoadOverworldMonIcon:
 	ld a, e
 	call ReadMonMenuIcon
 	ld l, a
@@ -12,9 +12,8 @@ LoadOverworldMonIcon: ; 8e82b
 	ld b, BANK(Icons)
 	ld c, 8
 	ret
-; 8e83f
 
-LoadMenuMonIcon: ; 8e83f
+LoadMenuMonIcon:
 	push hl
 	push de
 	push bc
@@ -23,9 +22,8 @@ LoadMenuMonIcon: ; 8e83f
 	pop de
 	pop hl
 	ret
-; 8e849
 
-.LoadIcon: ; 8e849
+.LoadIcon:
 	ld d, 0
 	ld hl, .Jumptable
 	add hl, de
@@ -34,10 +32,8 @@ LoadMenuMonIcon: ; 8e83f
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 8e854
 
-
-.Jumptable: ; 8e854 (23:6854)
+.Jumptable:
 	dw PartyMenu_InitAnimatedMonIcon ; party menu
 	dw NamingScreen_InitAnimatedMonIcon ; naming screen
 	dw MoveList_InitAnimatedMonIcon ; moves (?)
@@ -46,13 +42,13 @@ LoadMenuMonIcon: ; 8e83f
 	dw Mobile_InitPartyMenuBGPal71 ; mobile
 	dw .GetPartyMenuMonIcon ; unused
 
-.GetPartyMenuMonIcon: ; 8e862 (23:6862)
+.GetPartyMenuMonIcon:
 	call InitPartyMenuIcon
 	call .GetPartyMonItemGFX
 	call SetPartyMonIconAnimSpeed
 	ret
 
-.GetPartyMonItemGFX: ; 8e86c (23:686c)
+.GetPartyMonItemGFX:
 	push bc
 	ld a, [hObjectStructIndexBuffer]
 	ld hl, wPartyMon1Item
@@ -83,7 +79,7 @@ LoadMenuMonIcon: ; 8e83f
 	ld [hl], a
 	ret
 
-Mobile_InitAnimatedMonIcon: ; 8e898 (23:6898)
+Mobile_InitAnimatedMonIcon:
 	call PartyMenu_InitAnimatedMonIcon
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
@@ -99,7 +95,7 @@ Mobile_InitAnimatedMonIcon: ; 8e898 (23:6898)
 	ld [hl], a
 	ret
 
-Mobile_InitPartyMenuBGPal71: ; 8e8b1 (23:68b1)
+Mobile_InitPartyMenuBGPal71:
 	call InitPartyMenuIcon
 	call SetPartyMonIconAnimSpeed
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
@@ -120,13 +116,13 @@ Mobile_InitPartyMenuBGPal71: ; 8e8b1 (23:68b1)
 	ld [wc608 + 1], a
 	ret
 
-PartyMenu_InitAnimatedMonIcon: ; 8e8d5 (23:68d5)
+PartyMenu_InitAnimatedMonIcon:
 	call InitPartyMenuIcon
 	call .SpawnItemIcon
 	call SetPartyMonIconAnimSpeed
 	ret
 
-.SpawnItemIcon: ; 8e8df (23:68df)
+.SpawnItemIcon:
 	push bc
 	ld a, [hObjectStructIndexBuffer]
 	ld hl, wPartyMon1Item
@@ -154,7 +150,7 @@ PartyMenu_InitAnimatedMonIcon: ; 8e8d5 (23:68d5)
 	ld [hl], a
 	ret
 
-InitPartyMenuIcon: ; 8e908 (23:6908)
+InitPartyMenuIcon:
 	ld a, [wCurIconTile]
 	push af
 	ld a, [hObjectStructIndexBuffer]
@@ -185,7 +181,7 @@ InitPartyMenuIcon: ; 8e908 (23:6908)
 	ld [hl], a
 	ret
 
-SetPartyMonIconAnimSpeed: ; 8e936 (23:6936)
+SetPartyMonIconAnimSpeed:
 	push bc
 	ld a, [hObjectStructIndexBuffer]
 	ld b, a
@@ -202,7 +198,7 @@ SetPartyMonIconAnimSpeed: ; 8e936 (23:6936)
 	ld [hl], a
 	ret
 
-.getspeed ; 8e94c (23:694c)
+.getspeed
 	farcall PlacePartymonHPBar
 	call GetHPPal
 	ld e, d
@@ -211,15 +207,13 @@ SetPartyMonIconAnimSpeed: ; 8e936 (23:6936)
 	add hl, de
 	ld b, [hl]
 	ret
-; 8e95e (23:695e)
 
-.speeds ; 8e95e
+.speeds
 	db $00 ; HP_GREEN
 	db $40 ; HP_YELLOW
 	db $80 ; HP_RED
-; 8e961
 
-NamingScreen_InitAnimatedMonIcon: ; 8e961 (23:6961)
+NamingScreen_InitAnimatedMonIcon:
 	ld a, [wd265]
 	call ReadMonMenuIcon
 	ld [wCurIcon], a
@@ -233,7 +227,7 @@ NamingScreen_InitAnimatedMonIcon: ; 8e961 (23:6961)
 	ld [hl], SPRITE_ANIM_SEQ_NULL
 	ret
 
-MoveList_InitAnimatedMonIcon: ; 8e97d (23:697d)
+MoveList_InitAnimatedMonIcon:
 	ld a, [wd265]
 	call ReadMonMenuIcon
 	ld [wCurIcon], a
@@ -248,7 +242,7 @@ MoveList_InitAnimatedMonIcon: ; 8e97d (23:697d)
 	ld [hl], SPRITE_ANIM_SEQ_NULL
 	ret
 
-Trade_LoadMonIconGFX: ; 8e99a (23:699a)
+Trade_LoadMonIconGFX:
 	ld a, [wd265]
 	call ReadMonMenuIcon
 	ld [wCurIcon], a
@@ -257,7 +251,7 @@ Trade_LoadMonIconGFX: ; 8e99a (23:699a)
 	call GetMemIconGFX
 	ret
 
-GetSpeciesIcon: ; 8e9ac
+GetSpeciesIcon:
 ; Load species icon into VRAM at tile a
 	push de
 	ld a, [wd265]
@@ -267,10 +261,8 @@ GetSpeciesIcon: ; 8e9ac
 	ld a, e
 	call GetIconGFX
 	ret
-; 8e9bc
-
 
-FlyFunction_GetMonIcon: ; 8e9bc (23:69bc)
+FlyFunction_GetMonIcon:
 	push de
 	ld a, [wd265]
 	call ReadMonMenuIcon
@@ -279,9 +271,8 @@ FlyFunction_GetMonIcon: ; 8e9bc (23:69bc)
 	ld a, e
 	call GetIcon_a
 	ret
-; 8e9cc (23:69cc)
 
-Unreferenced_GetMonIcon2: ; 8e9cc
+Unreferenced_GetMonIcon2:
 	push de
 	ld a, [wd265]
 	call ReadMonMenuIcon
@@ -289,11 +280,10 @@ Unreferenced_GetMonIcon2: ; 8e9cc
 	pop de
 	call GetIcon_de
 	ret
-; 8e9db
 
-GetMemIconGFX: ; 8e9db (23:69db)
+GetMemIconGFX:
 	ld a, [wCurIconTile]
-GetIconGFX: ; 8e9de
+GetIconGFX:
 	call GetIcon_a
 	ld de, 8 tiles
 	add hl, de
@@ -308,20 +298,19 @@ GetIconGFX: ; 8e9de
 HeldItemIcons:
 INCBIN "gfx/icons/mail.2bpp"
 INCBIN "gfx/icons/item.2bpp"
-; 8ea17
 
-GetIcon_de: ; 8ea17
+GetIcon_de:
 ; Load icon graphics into VRAM starting from tile de.
 	ld l, e
 	ld h, d
 	jr GetIcon
 
-GetIcon_a: ; 8ea1b
+GetIcon_a:
 ; Load icon graphics into VRAM starting from tile a.
 	ld l, a
 	ld h, 0
 
-GetIcon: ; 8ea1e
+GetIcon:
 ; Load icon graphics into VRAM starting from tile hl.
 
 ; One tile is 16 bytes long.
@@ -352,16 +341,14 @@ endr
 
 	pop hl
 	ret
-; 8ea3f
 
-GetGFXUnlessMobile: ; 8ea3f
+GetGFXUnlessMobile:
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
 	jp nz, Request2bpp
 	jp Get2bpp_2
-; 8ea4a
 
-FreezeMonIcons: ; 8ea4a
+FreezeMonIcons:
 	ld hl, wSpriteAnimationStructs
 	ld e, PARTY_LENGTH
 	ld a, [wMenuCursorY]
@@ -393,9 +380,8 @@ FreezeMonIcons: ; 8ea4a
 	dec e
 	jr nz, .loop
 	ret
-; 8ea71
 
-UnfreezeMonIcons: ; 8ea71
+UnfreezeMonIcons:
 	ld hl, wSpriteAnimationStructs
 	ld e, PARTY_LENGTH
 .loop
@@ -415,9 +401,8 @@ UnfreezeMonIcons: ; 8ea71
 	dec e
 	jr nz, .loop
 	ret
-; 8ea8c (23:6a8c)
 
-HoldSwitchmonIcon: ; 8ea8c
+HoldSwitchmonIcon:
 	ld hl, wSpriteAnimationStructs
 	ld e, PARTY_LENGTH
 	ld a, [wSwitchMon]
@@ -448,7 +433,7 @@ HoldSwitchmonIcon: ; 8ea8c
 	jr nz, .loop
 	ret
 
-ReadMonMenuIcon: ; 8eab3
+ReadMonMenuIcon:
 	cp EGG
 	jr z, .egg
 	dec a
@@ -461,8 +446,6 @@ ReadMonMenuIcon: ; 8eab3
 .egg
 	ld a, ICON_EGG
 	ret
-; 8eac4
-
 
 INCLUDE "data/pokemon/menu_icons.asm"
 
diff --git a/engine/pic_animation.asm b/engine/gfx/pic_animation.asm
index a84c3f449..843e5cba4 100644
--- a/engine/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
@@ -1,6 +1,6 @@
 ; Pic animation arrangement.
 
-Unused_AnimateMon_Slow_Normal: ; d0000
+Unused_AnimateMon_Slow_Normal:
 	hlcoord 12, 0
 	ld a, [wBattleMode]
 	cp WILD_BATTLE
@@ -15,56 +15,50 @@ Unused_AnimateMon_Slow_Normal: ; d0000
 	ld d, $0
 	call AnimateFrontpic
 	ret
-; d001a
 
-AnimateMon_Menu: ; d001a
+AnimateMon_Menu:
 	ld e, ANIM_MON_MENU
 	ld d, $0
 	call AnimateFrontpic
 	ret
-; d0022
 
-AnimateMon_Trade: ; d0022
+AnimateMon_Trade:
 	ld e, ANIM_MON_TRADE
 	ld d, $0
 	call AnimateFrontpic
 	ret
-; d002a
 
-AnimateMon_Evolve: ; d002a
+AnimateMon_Evolve:
 	ld e, ANIM_MON_EVOLVE
 	ld d, $0
 	call AnimateFrontpic
 	ret
-; d0032
 
-AnimateMon_Hatch: ; d0032
+AnimateMon_Hatch:
 	ld e, ANIM_MON_HATCH
 	ld d, $0
 	call AnimateFrontpic
 	ret
-; d003a
 
-AnimateMon_Unused: ; d003a
+AnimateMon_Unused:
 	ld e, ANIM_MON_UNUSED
 	ld d, $0
 	call AnimateFrontpic
 	ret
-; d0042
 
 pokeanim: MACRO
-	rept _NARG
+rept _NARG
 ; Workaround for a bug where macro args can't come after the start of a symbol
 if !DEF(\1_POKEANIM)
 \1_POKEANIM EQUS "PokeAnim_\1_"
 endc
 	db (\1_POKEANIM - PokeAnim_SetupCommands) / 2
 	shift
-	endr
+endr
 	db (PokeAnim_Finish_ - PokeAnim_SetupCommands) / 2
 ENDM
 
-PokeAnims: ; d0042
+PokeAnims:
 	dw .Slow
 	dw .Normal
 	dw .Menu
@@ -85,8 +79,7 @@ PokeAnims: ; d0042
 .Egg1:   pokeanim Setup, Play
 .Egg2:   pokeanim Idle, Play
 
-
-AnimateFrontpic: ; d008e
+AnimateFrontpic:
 	call AnimateMon_CheckIfPokemon
 	ret c
 	call LoadMonAnimation
@@ -97,9 +90,8 @@ AnimateFrontpic: ; d008e
 	pop af
 	jr nc, .loop
 	ret
-; d00a3
 
-LoadMonAnimation: ; d00a3
+LoadMonAnimation:
 	push hl
 	ld c, e
 	ld b, 0
@@ -112,9 +104,8 @@ LoadMonAnimation: ; d00a3
 	pop hl
 	call PokeAnim_InitPicAttributes
 	ret
-; d00b4
 
-SetUpPokeAnim: ; d00b4
+SetUpPokeAnim:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wPokeAnimSceneIndex)
@@ -139,9 +130,8 @@ SetUpPokeAnim: ; d00b4
 	ret z
 	scf
 	ret
-; d00da
 
-PokeAnim_SetupCommands: ; d00da
+PokeAnim_SetupCommands:
 setup_command: MACRO
 \1_: dw \1
 ENDM
@@ -157,16 +147,15 @@ ENDM
 	setup_command PokeAnim_Cry
 	setup_command PokeAnim_CryNoWait
 	setup_command PokeAnim_StereoCry
-; d00f2
 
-PokeAnim_SetWait: ; d00f2
+PokeAnim_SetWait:
 	ld a, 18
 	ld [wPokeAnimWaitCounter], a
 	ld a, [wPokeAnimSceneIndex]
 	inc a
 	ld [wPokeAnimSceneIndex], a
 
-PokeAnim_Wait: ; d00fe
+PokeAnim_Wait:
 	ld hl, wPokeAnimWaitCounter
 	dec [hl]
 	ret nz
@@ -174,9 +163,8 @@ PokeAnim_Wait: ; d00fe
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d010b
 
-PokeAnim_Setup: ; d010b
+PokeAnim_Setup:
 	ld c, FALSE
 	ld b, 0
 	call PokeAnim_InitAnim
@@ -185,9 +173,8 @@ PokeAnim_Setup: ; d010b
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d011d
 
-PokeAnim_Setup2: ; d011d
+PokeAnim_Setup2:
 	ld c, FALSE
 	ld b, 4
 	call PokeAnim_InitAnim
@@ -196,9 +183,8 @@ PokeAnim_Setup2: ; d011d
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d012f
 
-PokeAnim_Idle: ; d012f
+PokeAnim_Idle:
 	ld c, TRUE
 	ld b, 0
 	call PokeAnim_InitAnim
@@ -207,9 +193,8 @@ PokeAnim_Idle: ; d012f
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d0141
 
-PokeAnim_Play: ; d0141
+PokeAnim_Play:
 	call PokeAnim_DoAnimScript
 	ld a, [wPokeAnimJumptableIndex]
 	bit 7, a
@@ -219,9 +204,8 @@ PokeAnim_Play: ; d0141
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d0155
 
-PokeAnim_Play2: ; d0155
+PokeAnim_Play2:
 	call PokeAnim_DoAnimScript
 	ld a, [wPokeAnimJumptableIndex]
 	bit 7, a
@@ -230,42 +214,37 @@ PokeAnim_Play2: ; d0155
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d0166
 
-PokeAnim_BasePic: ; d0166
+PokeAnim_BasePic:
 	call PokeAnim_DeinitFrames
 	ld a, [wPokeAnimSceneIndex]
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d0171
 
-PokeAnim_Finish: ; d0171
+PokeAnim_Finish:
 	call PokeAnim_DeinitFrames
 	ld hl, wPokeAnimSceneIndex
 	set 7, [hl]
 	ret
-; d017a
 
-PokeAnim_Cry: ; d017a
+PokeAnim_Cry:
 	ld a, [wPokeAnimSpecies]
 	call _PlayMonCry
 	ld a, [wPokeAnimSceneIndex]
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d0188
 
-PokeAnim_CryNoWait: ; d0188
+PokeAnim_CryNoWait:
 	ld a, [wPokeAnimSpecies]
 	call PlayMonCry2
 	ld a, [wPokeAnimSceneIndex]
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d0196
 
-PokeAnim_StereoCry: ; d0196
+PokeAnim_StereoCry:
 	ld a, $f
 	ld [wCryTracks], a
 	ld a, [wPokeAnimSpecies]
@@ -274,9 +253,8 @@ PokeAnim_StereoCry: ; d0196
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d01a9
 
-PokeAnim_DeinitFrames: ; d01a9
+PokeAnim_DeinitFrames:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wPokeAnimCoord)
@@ -288,9 +266,8 @@ PokeAnim_DeinitFrames: ; d01a9
 	pop af
 	ld [rSVBK], a
 	ret
-; d01c6
 
-AnimateMon_CheckIfPokemon: ; d01c6
+AnimateMon_CheckIfPokemon:
 	ld a, [wCurPartySpecies]
 	cp EGG
 	jr z, .fail
@@ -302,9 +279,8 @@ AnimateMon_CheckIfPokemon: ; d01c6
 .fail
 	scf
 	ret
-; d01d6
 
-PokeAnim_InitPicAttributes: ; d01d6
+PokeAnim_InitPicAttributes:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wPokeAnimSceneIndex)
@@ -355,9 +331,8 @@ PokeAnim_InitPicAttributes: ; d01d6
 	pop af
 	ld [rSVBK], a
 	ret
-; d0228
 
-PokeAnim_InitAnim: ; d0228
+PokeAnim_InitAnim:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wPokeAnimIdleFlag)
@@ -378,9 +353,8 @@ PokeAnim_InitAnim: ; d0228
 	pop af
 	ld [rSVBK], a
 	ret
-; d0250
 
-PokeAnim_DoAnimScript: ; d0250
+PokeAnim_DoAnimScript:
 	xor a
 	ld [hBGMapMode], a
 .loop
@@ -389,43 +363,39 @@ PokeAnim_DoAnimScript: ; d0250
 	ld hl, .Jumptable
 	rst JumpTable
 	ret
-; d025d
 
-.Jumptable: ; d025d
+.Jumptable:
 	dw .RunAnim
 	dw .WaitAnim
-; d0261
 
-.RunAnim: ; d0261
+.RunAnim:
 	call PokeAnim_GetPointer
 	ld a, [wPokeAnimCommand]
-	cp -1
+	cp endanim_command
 	jr z, PokeAnim_End
-	cp -2
+	cp setrepeat_command
 	jr z, .SetRepeat
-	cp -3
+	cp dorepeat_command
 	jr z, .DoRepeat
 	call PokeAnim_GetFrame
 	ld a, [wPokeAnimParameter]
 	call PokeAnim_GetDuration
 	ld [wPokeAnimWaitCounter], a
 	call PokeAnim_StartWaitAnim
-.WaitAnim: ; d0282
+.WaitAnim:
 	ld a, [wPokeAnimWaitCounter]
 	dec a
 	ld [wPokeAnimWaitCounter], a
 	ret nz
 	call PokeAnim_StopWaitAnim
 	ret
-; d028e
 
-.SetRepeat: ; d028e
+.SetRepeat:
 	ld a, [wPokeAnimParameter]
 	ld [wPokeAnimRepeatTimer], a
 	jr .loop
-; d0296
 
-.DoRepeat: ; d0296
+.DoRepeat:
 	ld a, [wPokeAnimRepeatTimer]
 	and a
 	ret z
@@ -435,15 +405,13 @@ PokeAnim_DoAnimScript: ; d0250
 	ld a, [wPokeAnimParameter]
 	ld [wPokeAnimFrame], a
 	jr .loop
-; d02a8
 
-PokeAnim_End: ; d02a8
+PokeAnim_End:
 	ld hl, wPokeAnimJumptableIndex
 	set 7, [hl]
 	ret
-; d02ae
 
-PokeAnim_GetDuration: ; d02ae
+PokeAnim_GetDuration:
 ; a * (1 + [wPokeAnimSpeed] / 16)
 	ld c, a
 	ld b, $0
@@ -460,9 +428,8 @@ PokeAnim_GetDuration: ; d02ae
 	or h
 	add c
 	ret
-; d02c8
 
-PokeAnim_GetFrame: ; d02c8
+PokeAnim_GetFrame:
 	call PokeAnim_PlaceGraphic
 	ld a, [wPokeAnimCommand]
 	and a
@@ -473,35 +440,30 @@ PokeAnim_GetFrame: ; d02c8
 	pop hl
 	call PokeAnim_ConvertAndApplyBitmask
 	ret
-; d02dc
 
-PokeAnim_StartWaitAnim: ; d02dc
+PokeAnim_StartWaitAnim:
 	ld a, [wPokeAnimJumptableIndex]
 	inc a
 	ld [wPokeAnimJumptableIndex], a
 	ret
-; d02e4
 
-PokeAnim_StopWaitAnim: ; d02e4
+PokeAnim_StopWaitAnim:
 	ld a, [wPokeAnimJumptableIndex]
 	dec a
 	ld [wPokeAnimJumptableIndex], a
 	ret
-; d02ec
 
-PokeAnim_IsUnown: ; d02ec
+PokeAnim_IsUnown:
 	ld a, [wPokeAnimSpecies]
 	cp UNOWN
 	ret
-; d02f2
 
-PokeAnim_IsEgg: ; d02f2
+PokeAnim_IsEgg:
 	ld a, [wPokeAnimSpecies]
 	cp EGG
 	ret
-; d02f8
 
-PokeAnim_GetPointer: ; d02f8
+PokeAnim_GetPointer:
 	push hl
 	ld a, [wPokeAnimFrame]
 	ld e, a
@@ -522,9 +484,8 @@ PokeAnim_GetPointer: ; d02f8
 	inc [hl]
 	pop hl
 	ret
-; d031b
 
-PokeAnim_GetBitmaskIndex: ; d031b
+PokeAnim_GetBitmaskIndex:
 	ld a, [wPokeAnimCommand]
 	dec a
 	ld c, a
@@ -542,9 +503,8 @@ PokeAnim_GetBitmaskIndex: ; d031b
 	ld [wPokeAnimCurBitmask], a
 	inc hl
 	ret
-; d033b
 
-PokeAnim_CopyBitmaskToBuffer: ; d033b
+PokeAnim_CopyBitmaskToBuffer:
 	call .GetSize
 	push bc
 	ld hl, wPokeAnimBitmaskAddr
@@ -558,9 +518,8 @@ PokeAnim_CopyBitmaskToBuffer: ; d033b
 	ld a, [wPokeAnimBitmaskBank]
 	call FarCopyBytes
 	ret
-; d0356
 
-.GetSize: ; d0356
+.GetSize:
 	push hl
 	ld a, [wPokeAnimFrontpicHeight]
 	sub 5 ; to get a number 0, 1, or 2
@@ -572,14 +531,13 @@ PokeAnim_CopyBitmaskToBuffer: ; d033b
 	ld b, 0
 	pop hl
 	ret
-; d0368
 
 .Sizes: db 4, 5, 7
 
 poke_anim_box: MACRO
 y = 7
 rept \1
-x = 7 +- \1
+x = 7 + -\1
 rept \1
 	db x + y
 x = x + 1
@@ -588,7 +546,7 @@ y = y + 7
 endr
 ENDM
 
-PokeAnim_ConvertAndApplyBitmask: ; d036b
+PokeAnim_ConvertAndApplyBitmask:
 	xor a
 	ld [wPokeAnimBitmaskCurBit], a
 	ld [wPokeAnimBitmaskCurRow], a
@@ -614,9 +572,8 @@ PokeAnim_ConvertAndApplyBitmask: ; d036b
 	pop hl
 	jr nc, .loop
 	ret
-; d0392
 
-.IsCurBitSet: ; d0392
+.IsCurBitSet:
 ; which byte
 	ld a, [wPokeAnimBitmaskCurBit]
 	and $f8
@@ -652,9 +609,8 @@ PokeAnim_ConvertAndApplyBitmask: ; d036b
 	ld hl, wPokeAnimBitmaskCurBit
 	inc [hl]
 	ret
-; d03bd
 
-.ApplyFrame: ; d03bd
+.ApplyFrame:
 	push af
 	call .GetCoord
 	pop af
@@ -665,9 +621,8 @@ PokeAnim_ConvertAndApplyBitmask: ; d036b
 	pop hl
 	ld [hl], a
 	ret
-; d03cd
 
-.GetCoord: ; d03cd
+.GetCoord:
 	call .GetStartCoord
 	ld a, [wPokeAnimBitmaskCurRow]
 	ld bc, SCREEN_WIDTH
@@ -693,12 +648,11 @@ PokeAnim_ConvertAndApplyBitmask: ; d036b
 
 .skip2
 	ret
-; d03f4
 
 ; unused
 	db 6, 5, 4
 
-.GetTilemap: ; d03f7
+.GetTilemap:
 	push af
 	ld a, [wPokeAnimFrontpicHeight]
 	cp 5
@@ -745,7 +699,6 @@ PokeAnim_ConvertAndApplyBitmask: ; d036b
 .add_13
 	add 13
 	ret
-; d042f
 
 ._5by5:
 	poke_anim_box 5
@@ -764,8 +717,7 @@ PokeAnim_ConvertAndApplyBitmask: ; d036b
 	; db 36, 37, 38, 39, 40, 41
 	; db 43, 44, 45, 46, 47, 48
 
-
-.GetStartCoord: ; d046c
+.GetStartCoord:
 	ld hl, wPokeAnimCoord
 	ld a, [hli]
 	ld h, [hl]
@@ -793,9 +745,8 @@ PokeAnim_ConvertAndApplyBitmask: ; d036b
 .add_bc
 	add hl, bc
 	ret
-; d0499
 
-.NextBit: ; d0499
+.NextBit:
 	ld a, [wPokeAnimBitmaskCurRow]
 	inc a
 	ld [wPokeAnimBitmaskCurRow], a
@@ -818,9 +769,8 @@ PokeAnim_ConvertAndApplyBitmask: ; d036b
 .no_carry
 	xor a
 	ret
-; d04bd
 
-PokeAnim_PlaceGraphic: ; d04bd
+PokeAnim_PlaceGraphic:
 	call .ClearBox
 	ld a, [wBoxAlignment]
 	and a
@@ -860,9 +810,8 @@ PokeAnim_PlaceGraphic: ; d04bd
 	dec c
 	jr nz, .loop
 	ret
-; d04f6
 
-.ClearBox: ; d04f6
+.ClearBox:
 	ld hl, wPokeAnimCoord
 	ld a, [hli]
 	ld h, [hl]
@@ -871,9 +820,8 @@ PokeAnim_PlaceGraphic: ; d04bd
 	ld c, 7
 	call ClearBox
 	ret
-; d0504
 
-PokeAnim_SetVBank1: ; d0504
+PokeAnim_SetVBank1:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wPokeAnimCoord)
@@ -885,9 +833,8 @@ PokeAnim_SetVBank1: ; d0504
 	pop af
 	ld [rSVBK], a
 	ret
-; d051b
 
-.SetFlag: ; d051b
+.SetFlag:
 	call PokeAnim_GetAttrMapCoord
 	ld b, 7
 	ld c, 7
@@ -908,9 +855,8 @@ PokeAnim_SetVBank1: ; d0504
 	dec b
 	jr nz, .row
 	ret
-; d0536
 
-PokeAnim_SetVBank0: ; d0536
+PokeAnim_SetVBank0:
 	call PokeAnim_GetAttrMapCoord
 	ld b, 7
 	ld c, 7
@@ -931,9 +877,8 @@ PokeAnim_SetVBank0: ; d0536
 	dec b
 	jr nz, .row
 	ret
-; d0551
 
-PokeAnim_GetAttrMapCoord: ; d0551
+PokeAnim_GetAttrMapCoord:
 	ld hl, wPokeAnimCoord
 	ld a, [hli]
 	ld h, [hl]
@@ -941,9 +886,8 @@ PokeAnim_GetAttrMapCoord: ; d0551
 	ld de, wAttrMap - wTileMap
 	add hl, de
 	ret
-; d055c
 
-GetMonAnimPointer: ; d055c
+GetMonAnimPointer:
 	call PokeAnim_IsEgg
 	jr z, .egg
 
@@ -996,9 +940,8 @@ GetMonAnimPointer: ; d055c
 	ld a, h
 	ld [wPokeAnimPointerAddr + 1], a
 	ret
-; d05b4
 
-PokeAnim_GetFrontpicDims: ; d05b4
+PokeAnim_GetFrontpicDims:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wCurPartySpecies)
@@ -1012,9 +955,8 @@ PokeAnim_GetFrontpicDims: ; d05b4
 	pop af
 	ld [rSVBK], a
 	ret
-; d05ce
 
-GetMonFramesPointer: ; d05ce
+GetMonFramesPointer:
 	call PokeAnim_IsEgg
 	jr z, .egg
 
@@ -1058,9 +1000,8 @@ GetMonFramesPointer: ; d05ce
 	ld a, h
 	ld [wPokeAnimFramesAddr + 1], a
 	ret
-; d061b
 
-GetMonBitmaskPointer: ; d061b
+GetMonBitmaskPointer:
 	call PokeAnim_IsEgg
 	jr z, .egg
 
@@ -1097,9 +1038,8 @@ GetMonBitmaskPointer: ; d061b
 	ld a, h
 	ld [wPokeAnimBitmaskAddr + 1], a
 	ret
-; d065c
 
-PokeAnim_GetSpeciesOrUnown: ; d065c
+PokeAnim_GetSpeciesOrUnown:
 	call PokeAnim_IsUnown
 	jr z, .unown
 	ld a, [wPokeAnimSpecies]
@@ -1108,13 +1048,12 @@ PokeAnim_GetSpeciesOrUnown: ; d065c
 .unown
 	ld a, [wPokeAnimUnownLetter]
 	ret
-; d0669
 
-Unused_HOF_AnimateAlignedFrontpic: ; d0669
+Unused_HOF_AnimateAlignedFrontpic:
 	ld a, $1
 	ld [wBoxAlignment], a
 
-HOF_AnimateFrontpic: ; d066e
+HOF_AnimateFrontpic:
 	call AnimateMon_CheckIfPokemon
 	jr c, .fail
 	ld h, d
@@ -1138,4 +1077,3 @@ HOF_AnimateFrontpic: ; d066e
 	inc a
 	ld [wCurPartySpecies], a
 	ret
-; d0695
diff --git a/engine/routines/placegraphic.asm b/engine/gfx/place_graphic.asm
index 21b914950..628c72413 100644
--- a/engine/routines/placegraphic.asm
+++ b/engine/gfx/place_graphic.asm
@@ -1,4 +1,4 @@
-PlaceGraphic: ; 2ef6e
+PlaceGraphic:
 ; Fill wBoxAlignment-aligned box width b height c
 ; with iterating tile starting from hGraphicStartTile at hl.
 
diff --git a/engine/player_gfx.asm b/engine/gfx/player_gfx.asm
index 282d2e22f..9954143a8 100644
--- a/engine/player_gfx.asm
+++ b/engine/gfx/player_gfx.asm
@@ -1,7 +1,7 @@
-Unreferenced_Function88248: ; 88248
+Unreferenced_Function88248:
 	ld c, CAL
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .okay
 	ld c, KAREN
 
@@ -10,17 +10,17 @@ Unreferenced_Function88248: ; 88248
 	ld [wTrainerClass], a
 	ret
 
-MovePlayerPicRight: ; 88258
+MovePlayerPicRight:
 	hlcoord 6, 4
 	ld de, 1
 	jr MovePlayerPic
 
-MovePlayerPicLeft: ; 88260
+MovePlayerPicLeft:
 	hlcoord 13, 4
 	ld de, -1
 	; fallthrough
 
-MovePlayerPic: ; 88266
+MovePlayerPic:
 ; Move player pic at hl by de * 7 tiles.
 	ld c, $8
 .loop
@@ -55,14 +55,14 @@ MovePlayerPic: ; 88266
 	pop hl
 	jr .loop
 
-ShowPlayerNamingChoices: ; 88297
-	ld hl, ChrisNameMenuDataHeader
+ShowPlayerNamingChoices:
+	ld hl, ChrisNameMenuHeader
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .GotGender
-	ld hl, KrisNameMenuDataHeader
+	ld hl, KrisNameMenuHeader
 .GotGender:
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 	call VerticalMenu
 	ld a, [wMenuCursorY]
 	dec a
@@ -72,11 +72,11 @@ ShowPlayerNamingChoices: ; 88297
 
 INCLUDE "data/player_names.asm"
 
-GetPlayerNameArray: ; 88318 This Function is never called
+Unreferenced_GetPlayerNameArray:
 	ld hl, wPlayerName
 	ld de, MalePlayerNameArray
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .done
 	ld de, FemalePlayerNameArray
 
@@ -84,7 +84,7 @@ GetPlayerNameArray: ; 88318 This Function is never called
 	call InitName
 	ret
 
-GetPlayerIcon: ; 8832c
+GetPlayerIcon:
 ; Get the player icon corresponding to gender
 
 ; Male
@@ -92,7 +92,7 @@ GetPlayerIcon: ; 8832c
 	ld b, BANK(ChrisSpriteGFX)
 
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .done
 
 ; Female
@@ -102,10 +102,10 @@ GetPlayerIcon: ; 8832c
 .done
 	ret
 
-GetCardPic: ; 8833e
+GetCardPic:
 	ld hl, ChrisCardPic
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .GotClass
 	ld hl, KrisCardPic
 .GotClass:
@@ -120,23 +120,23 @@ GetCardPic: ; 8833e
 	call FarCopyBytes
 	ret
 
-ChrisCardPic: ; 88365
+ChrisCardPic:
 INCBIN "gfx/trainer_card/chris_card.2bpp"
 
-KrisCardPic: ; 88595
+KrisCardPic:
 INCBIN "gfx/trainer_card/kris_card.2bpp"
 
-CardGFX: ; 887c5
+CardGFX:
 INCBIN "gfx/trainer_card/trainer_card.2bpp"
 
-GetPlayerBackpic: ; 88825
+GetPlayerBackpic:
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, GetChrisBackpic
 	call GetKrisBackpic
 	ret
 
-GetChrisBackpic: ; 88830
+GetChrisBackpic:
 	ld hl, ChrisBackpic
 	ld b, BANK(ChrisBackpic)
 	ld de, vTiles2 tile $31
@@ -144,13 +144,13 @@ GetChrisBackpic: ; 88830
 	predef DecompressGet2bpp
 	ret
 
-HOF_LoadTrainerFrontpic: ; 88840
+HOF_LoadTrainerFrontpic:
 	call WaitBGMap
 	xor a
 	ld [hBGMapMode], a
 	ld e, 0
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .GotClass
 	ld e, 1
 
@@ -159,7 +159,7 @@ HOF_LoadTrainerFrontpic: ; 88840
 	ld [wTrainerClass], a
 	ld de, ChrisPic
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .GotPic
 	ld de, KrisPic
 
@@ -173,13 +173,13 @@ HOF_LoadTrainerFrontpic: ; 88840
 	ld [hBGMapMode], a
 	ret
 
-DrawIntroPlayerPic: ; 88874
+DrawIntroPlayerPic:
 ; Draw the player pic at (6,4).
 
 ; Get class
 	ld e, CHRIS
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .GotClass
 	ld e, KRIS
 .GotClass:
@@ -189,7 +189,7 @@ DrawIntroPlayerPic: ; 88874
 ; Load pic
 	ld de, ChrisPic
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .GotPic
 	ld de, KrisPic
 .GotPic:
@@ -206,13 +206,13 @@ DrawIntroPlayerPic: ; 88874
 	predef PlaceGraphic
 	ret
 
-ChrisPic: ; 888a9
+ChrisPic:
 INCBIN "gfx/player/chris.2bpp"
 
-KrisPic: ; 88bb9
+KrisPic:
 INCBIN "gfx/player/kris.2bpp"
 
-GetKrisBackpic: ; 88ec9
+GetKrisBackpic:
 ; Kris's backpic is uncompressed.
 	ld de, KrisBackpic
 	ld hl, vTiles2 tile $31
@@ -220,5 +220,5 @@ GetKrisBackpic: ; 88ec9
 	call Get2bpp
 	ret
 
-KrisBackpic: ; 88ed6
+KrisBackpic:
 INCBIN "gfx/player/kris_back.2bpp"
diff --git a/engine/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index 24bdc952e..538132ce2 100644
--- a/engine/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -1,4 +1,4 @@
-LoadSGBLayout: ; 864c
+LoadSGBLayout:
 	call CheckCGB
 	jp nz, LoadSGBLayoutCGB
 
@@ -20,9 +20,8 @@ LoadSGBLayout: ; 864c
 	ld de, _LoadSGBLayout_ReturnFromJumpTable
 	push de
 	jp hl
-; 866f
 
-.Jumptable: ; 866f
+.Jumptable:
 	dw .SGB_BattleGrayscale
 	dw .SGB_BattleColors
 	dw .SGB_PokegearPals
@@ -38,9 +37,9 @@ LoadSGBLayout: ; 864c
 	dw .SGB_GSTitleScreen
 	dw .SGB0d
 	dw .SGB_MoveList
-	dw .SGB0f
+	dw .SGB_BetaPikachuMinigame
 	dw .SGB_PokedexSearchOption
-	dw .SGB11
+	dw .SGB_BetaPoker
 	dw .SGB12
 	dw .SGB13
 	dw .SGB_PackPals
@@ -54,15 +53,13 @@ LoadSGBLayout: ; 864c
 	dw .SGB_TrainerOrMonFrontpicPals
 	dw .SGB_MysteryGift
 	dw .SGB1e
-; 86ad
 
-.SGB_BattleGrayscale: ; 86ad
+.SGB_BattleGrayscale:
 	ld hl, PalPacket_BattleGrayscale
 	ld de, BlkPacket_Battle
 	ret
-; 86b4
 
-.SGB_BattleColors: ; 86b4
+.SGB_BattleColors:
 	ld hl, BlkPacket_Battle
 	call PushSGBPals_
 
@@ -135,9 +132,8 @@ LoadSGBLayout: ; 864c
 	ld a, SCGB_BATTLE_COLORS
 	ld [wSGBPredef], a
 	ret
-; 873c
 
-.SGB_MoveList: ; 873c
+.SGB_MoveList:
 	ld hl, PalPacket_9bd6
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
@@ -154,15 +150,13 @@ LoadSGBLayout: ; 864c
 	ld hl, wSGBPals
 	ld de, BlkPacket_MoveList
 	ret
-; 875c
 
-.SGB_PokegearPals: ; 875c
+.SGB_PokegearPals:
 	ld hl, PalPacket_Pokegear
 	ld de, BlkPacket_9a86
 	ret
-; 8763
 
-.SGB_StatsScreenHPPals: ; 8763
+.SGB_StatsScreenHPPals:
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
@@ -196,15 +190,13 @@ LoadSGBLayout: ; 864c
 	ld hl, wSGBPals
 	ld de, BlkPacket_StatsScreen
 	ret
-; 87ab
 
-.SGB_PartyMenu: ; 87ab
+.SGB_PartyMenu:
 	ld hl, PalPacket_PartyMenu
 	ld de, wSGBPals + 1
 	ret
-; 87b2
 
-.SGB_Pokedex: ; 87b2
+.SGB_Pokedex:
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
@@ -230,9 +222,8 @@ LoadSGBLayout: ; 864c
 	ld hl, wSGBPals
 	ld de, BlkPacket_Pokedex_PC
 	ret
-; 87e9
 
-.SGB_BillsPC: ; 87e9
+.SGB_BillsPC:
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
@@ -259,15 +250,13 @@ LoadSGBLayout: ; 864c
 	ld hl, wSGBPals
 	ld de, BlkPacket_Pokedex_PC
 	ret
-; 8823
 
-.SGB_PokedexUnownMode: ; 8823
+.SGB_PokedexUnownMode:
 	call .SGB_Pokedex
 	ld de, BlkPacket_PokedexUnownMode
 	ret
-; 882a
 
-.SGB_PokedexSearchOption: ; 882a
+.SGB_PokedexSearchOption:
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
@@ -283,34 +272,29 @@ LoadSGBLayout: ; 864c
 	ld hl, wSGBPals
 	ld de, BlkPacket_9a86
 	ret
-; 884b
 
-.SGB_PackPals: ; 884b
+.SGB_PackPals:
 	ld hl, PalPacket_Pack
 	ld de, BlkPacket_9a86
 	ret
-; 8852
 
-.SGB_SlotMachine: ; 8852
+.SGB_SlotMachine:
 	ld hl, PalPacket_SlotMachine
 	ld de, BlkPacket_SlotMachine
 	ret
-; 8859
 
-.SGB06: ; 8859
+.SGB06:
 	ld hl, PalPacket_SCGB_06
 	ld de, BlkPacket_SCGB_06
 	ret
-; 8860
 
 .SGB_Diploma:
-.SGB_MysteryGift: ; 8860
+.SGB_MysteryGift:
 	ld hl, PalPacket_Diploma
 	ld de, BlkPacket_9a86
 	ret
-; 8867
 
-.SGB_GSIntro: ; 8867
+.SGB_GSIntro:
 	ld b, 0
 	ld hl, .BlkPacketTable_GSIntro
 rept 4
@@ -324,45 +308,39 @@ endr
 	ld h, [hl]
 	ld l, a
 	ret
-; 8878
 
-.BlkPacketTable_GSIntro: ; 8878
+.BlkPacketTable_GSIntro:
 	dw BlkPacket_9a86, PalPacket_GSIntroShellderLapras
 	dw BlkPacket_GSIntroJigglypuffPikachu, PalPacket_GSIntroJigglypuffPikachu
 	dw BlkPacket_9a86, PalPacket_GSIntroStartersTransition
-; 8884
 
-.SGB_GSTitleScreen: ; 8884
+.SGB_GSTitleScreen:
 	ld hl, PalPacket_GSTitleScreen
 	ld de, BlkPacket_GSTitleScreen
 	ld a, SCGB_DIPLOMA
 	ld [wSGBPredef], a
 	ret
-; 8890
 
-.SGB13: ; 8890
+.SGB13:
 	ld hl, PalPacket_SCGB_13
 	ld de, BlkPacket_SCGB_13
 	ret
-; 8897
 
-.SGB0f: ; 8897
-	ld hl, PalPacket_SCGB_0F
+.SGB_BetaPikachuMinigame:
+	ld hl, PalPacket_BetaPikachuMinigame
 	ld de, BlkPacket_9a86
 	ret
-; 889e
 
-.SGB11: ; 889e
+.SGB_BetaPoker:
 	ld hl, BlkPacket_9a86
 	ld de, wPlayerLightScreenCount ; ???
 	ld bc, PALPACKET_LENGTH
 	call CopyBytes
-	ld hl, PalPacket_SCGB_11
+	ld hl, PalPacket_BetaPoker
 	ld de, BlkPacket_9a86
 	ret
-; 88b1
 
-.SGB_MapPals: ; 88b1
+.SGB_MapPals:
 	ld hl, PalPacket_9bd6
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
@@ -374,9 +352,8 @@ endr
 	ld a, SCGB_MAPPALS
 	ld [wSGBPredef], a
 	ret
-; 88cd
 
-.SGB_Evolution: ; 88cd
+.SGB_Evolution:
 	push bc
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
@@ -419,22 +396,19 @@ endr
 	ld hl, wSGBPals
 	ld de, BlkPacket_9a86
 	ret
-; 891a
 
 .SGB0d:
-.SGB_TrainerCard: ; 891a
+.SGB_TrainerCard:
 	ld hl, PalPacket_Diploma
 	ld de, BlkPacket_9a86
 	ret
-; 8921
 
-.SGB_UnownPuzzle: ; 8921
+.SGB_UnownPuzzle:
 	ld hl, PalPacket_UnownPuzzle
 	ld de, BlkPacket_9a86
 	ret
-; 8928
 
-.SGB12: ; 8928
+.SGB12:
 	ld hl, PalPacket_9bd6
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
@@ -462,9 +436,8 @@ endr
 	ld hl, wSGBPals
 	ld de, wSGBPals + PALPACKET_LENGTH
 	ret
-; 8969
 
-.SGB1e: ; 8969
+.SGB1e:
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
@@ -495,15 +468,13 @@ endr
 	ld hl, wSGBPals
 	ld de, BlkPacket_9a86
 	ret
-; 89a6
 
-.SGB_GamefreakLogo: ; 89a6
+.SGB_GamefreakLogo:
 	ld hl, PalPacket_GamefreakLogo
 	ld de, BlkPacket_9a86
 	ret
-; 89ad
 
-.SGB_PlayerOrMonFrontpicPals: ; 89ad
+.SGB_PlayerOrMonFrontpicPals:
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
@@ -522,15 +493,13 @@ endr
 	ld hl, wSGBPals
 	ld de, BlkPacket_9a86
 	ret
-; 89d9
 
-.SGB_TradeTube: ; 89d9
+.SGB_TradeTube:
 	ld hl, PalPacket_TradeTube
 	ld de, BlkPacket_9a86
 	ret
-; 89e0
 
-.SGB_TrainerOrMonFrontpicPals: ; 89e0
+.SGB_TrainerOrMonFrontpicPals:
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
 	ld bc, PALPACKET_LENGTH
@@ -549,9 +518,8 @@ endr
 	ld hl, wSGBPals
 	ld de, BlkPacket_9a86
 	ret
-; 8a0c
 
-.GetMapPalsIndex: ; 8a0c
+.GetMapPalsIndex:
 	ld a, [wTimeOfDayPal]
 	cp NITE_F
 	jr c, .morn_day
@@ -593,13 +561,11 @@ endr
 .gate
 	ld a, PREDEFPAL_PEWTER
 	ret
-; 8a45
 
 INCLUDE "data/maps/sgb_roof_pal_inds.asm"
 
-_LoadSGBLayout_ReturnFromJumpTable: ; 8a60
+_LoadSGBLayout_ReturnFromJumpTable:
 	push de
 	call PushSGBPals_
 	pop hl
 	jp PushSGBPals_
-; 8a68
diff --git a/engine/sprite_anims.asm b/engine/gfx/sprite_anims.asm
index 9353b71c9..1d3aa6a8b 100755..100644
--- a/engine/sprite_anims.asm
+++ b/engine/gfx/sprite_anims.asm
@@ -1,4 +1,4 @@
-DoAnimFrame: ; 8d24b
+DoAnimFrame:
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
 	ld e, [hl]
@@ -10,9 +10,8 @@ DoAnimFrame: ; 8d24b
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 8d25b
 
-.Jumptable: ; 8d25b (23:525b)
+.Jumptable:
 ; entries correspond to SPRITE_ANIM_SEQ_* constants
 	dw .Null
 	dw .PartyMon
@@ -50,10 +49,10 @@ DoAnimFrame: ; 8d24b
 	dw .IntroUnownF
 	dw .IntroSuicuneAway
 
-.Null: ; 8d2a1 (23:52a1)
+.Null:
 	ret
 
-.PartyMon ; 8d2a2 (23:52a2)
+.PartyMon
 	ld a, [wMenuCursorY]
 
 	ld hl, SPRITEANIMSTRUCT_INDEX
@@ -70,7 +69,7 @@ DoAnimFrame: ; 8d24b
 	ld [hl], $0
 	ret
 
-.PartyMonSwitch ; 8d2b9 (23:52b9)
+.PartyMonSwitch
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld [hl], 8 * 3
@@ -112,7 +111,7 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.PartyMonSelected ; 8d2ea (23:52ea)
+.PartyMonSelected
 	ld a, [wMenuCursorY]
 
 	ld hl, SPRITEANIMSTRUCT_INDEX
@@ -131,17 +130,15 @@ DoAnimFrame: ; 8d24b
 	ld [hl], 8 * 3
 	ret
 
-.GSTitleTrail ; 8d302 (23:5302)
+.GSTitleTrail
 	call .AnonymousJumptable
 	jp hl
-; 8d306 (23:5306)
 
 ; Anonymous dw (see .AnonymousJumptable)
 	dw .four_zero
 	dw .four_one
-; 8d30a
 
-.four_zero ; 8d30a
+.four_zero
 	call .IncrementJumptableIndex
 
 	ld hl, SPRITEANIMSTRUCT_INDEX
@@ -159,7 +156,7 @@ DoAnimFrame: ; 8d24b
 	add hl, bc
 	ld [hl], a
 
-.four_one ; 8d321
+.four_one
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -200,9 +197,8 @@ DoAnimFrame: ; 8d24b
 .asm_8d356
 	call DeinitializeSprite
 	ret
-; 8d35a
 
-.GSIntroHoOh ; 8d35a (23:535a)
+.GSIntroHoOh
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -216,19 +212,19 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.NamingScreenCursor ; 8d36c (23:536c)
+.NamingScreenCursor
 	callfar NamingScreen_AnimateCursor
 	ret
 
-.MailCursor ; 8d373 (23:5373)
+.MailCursor
 	callfar ComposeMail_AnimateCursor
 	ret
 
-.GameFreakLogo: ; 8d37a (23:537a)
+.GameFreakLogo:
 	callfar GameFreakLogoJumper
 	ret
 
-.GSIntroStar ; 8d381 (23:5381)
+.GSIntroStar
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -278,7 +274,7 @@ DoAnimFrame: ; 8d24b
 	call DeinitializeSprite
 	ret
 
-.GSIntroSparkle ; 8d3c3 (23:53c3)
+.GSIntroSparkle
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hli]
@@ -355,11 +351,11 @@ DoAnimFrame: ; 8d24b
 	call DeinitializeSprite
 	ret
 
-.SlotsGolem: ; 8d422 (23:5422)
+.SlotsGolem:
 	callfar Slots_AnimateGolem
 	ret
 
-.SlotsChansey: ; 8d429 (23:5429)
+.SlotsChansey:
 	callfar Slots_AnimateChansey
 	ld hl, wcf64
 	ld a, [hl]
@@ -370,7 +366,7 @@ DoAnimFrame: ; 8d24b
 	call _ReinitSpriteAnimFrame
 	ret
 
-.SlotsChanseyEgg: ; 8d43e (23:543e)
+.SlotsChanseyEgg:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld a, [hl]
@@ -403,22 +399,21 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.UnusedCursor ; 8d46e (23:546e)
+.UnusedCursor
 	callfar ret_e00ed
 	ret
 
-.PokegearArrow ; 8d475 (23:5475)
+.PokegearArrow
 	callfar AnimatePokegearModeIndicatorArrow
 	ret
 
-.DummyGameCursor ; 8d47c (23:547c)
+.DummyGameCursor
 	callfar DummyGame_InterpretJoypad_AnimateCursor
 	ret
 
-.TradePokeBall ; 8d483 (23:5483)
+.TradePokeBall
 	call .AnonymousJumptable
 	jp hl
-; 8d487 (23:5487)
 
 ; Anonymous dw (see .AnonymousJumptable)
 	dw .TradePokeBall_zero
@@ -427,9 +422,8 @@ DoAnimFrame: ; 8d24b
 	dw .TradePokeBall_three
 	dw .TradePokeBall_four
 	dw .TradePokeBall_five
-; 8d493
 
-.TradePokeBall_zero ; 8d493
+.TradePokeBall_zero
 	ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WOBBLE
 	call _ReinitSpriteAnimFrame
 
@@ -441,9 +435,8 @@ DoAnimFrame: ; 8d24b
 	add hl, bc
 	ld [hl], $20
 	ret
-; 8d4a5
 
-.TradePokeBall_two ; 8d4a5
+.TradePokeBall_two
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -459,7 +452,7 @@ DoAnimFrame: ; 8d24b
 	add hl, bc
 	ld [hl], $40
 
-.TradePokeBall_three ; 8d4b8
+.TradePokeBall_three
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -478,9 +471,8 @@ DoAnimFrame: ; 8d24b
 	ld de, SFX_GOT_SAFARI_BALLS
 	call PlaySFX
 	jr .TradePokeBall_five
-; 8d4d5
 
-.TradePokeBall_one ; 8d4d5
+.TradePokeBall_one
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], $4
@@ -493,9 +485,8 @@ DoAnimFrame: ; 8d24b
 	add hl, bc
 	ld [hl], $24
 	ret
-; 8d4e8
 
-.TradePokeBall_four ; 8d4e8
+.TradePokeBall_four
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
@@ -541,12 +532,11 @@ DoAnimFrame: ; 8d24b
 	call .IncrementJumptableIndex
 	ret
 
-.TradePokeBall_five ; 8d526
+.TradePokeBall_five
 	call DeinitializeSprite
 	ret
-; 8d52a
 
-.TradeTubeBulge ; 8d52a (23:552a)
+.TradeTubeBulge
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -564,11 +554,11 @@ DoAnimFrame: ; 8d24b
 	call DeinitializeSprite
 	ret
 
-.TrademonInTube ; 8d543 (23:5543)
+.TrademonInTube
 	callfar TradeAnim_AnimateTrademonInTube
 	ret
 
-.RevealNewMon: ; 8d54a (23:554a)
+.RevealNewMon:
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -605,11 +595,11 @@ DoAnimFrame: ; 8d24b
 	call DeinitializeSprite
 	ret
 
-.RadioTuningKnob: ; 8d578 (23:5578)
+.RadioTuningKnob:
 	callfar AnimateTuningKnob
 	ret
 
-.CutLeaves ; 8d57f (23:557f)
+.CutLeaves
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld e, [hl]
@@ -648,7 +638,7 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.FlyFrom: ; 8d5b0 (23:55b0)
+.FlyFrom:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -687,7 +677,7 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.FlyLeaf: ; 8d5e2 (23:55e2)
+.FlyLeaf:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -716,7 +706,7 @@ DoAnimFrame: ; 8d24b
 	call DeinitializeSprite
 	ret
 
-.FlyTo: ; 8d607 (23:5607)
+.FlyTo:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -748,15 +738,15 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.MobileTradeSentPulse ; 8d630 (23:5630)
+.MobileTradeSentPulse
 	farcall Function108bc7
 	ret
 
-.MobileTradeOTPulse ; 8d637 (23:5637)
+.MobileTradeOTPulse
 	farcall Function108be0
 	ret
 
-.IntroSuicune ; 8d63e (23:563e)
+.IntroSuicune
 	ld a, [wcf65]
 	and a
 	jr nz, .asm_8d645
@@ -783,7 +773,7 @@ DoAnimFrame: ; 8d24b
 	call _ReinitSpriteAnimFrame
 	ret
 
-.IntroPichuWooper ; 8d666 (23:5666)
+.IntroPichuWooper
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -802,7 +792,7 @@ DoAnimFrame: ; 8d24b
 .asm_8d67f
 	ret
 
-.IntroUnown ; 8d680 (23:5680)
+.IntroUnown
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld d, [hl]
@@ -829,7 +819,7 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.IntroUnownF ; 8d6a2 (23:56a2)
+.IntroUnownF
 	ld a, [wcf64]
 	cp $40
 	ret nz
@@ -837,7 +827,7 @@ DoAnimFrame: ; 8d24b
 	call _ReinitSpriteAnimFrame
 	ret
 
-.IntroSuicuneAway ; 8d6ae (23:56ae)
+.IntroSuicuneAway
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -845,15 +835,15 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.EZChatCursor ; 8d6b7 (23:56b7)
+.EZChatCursor
 	farcall AnimateEZChatCursor
 	ret
 
-.Celebi ; 8d6be (23:56be)
+.Celebi
 	farcall UpdateCelebiPosition
 	ret
 
-.AnonymousJumptable: ; 8d6c5 (23:56c5)
+.AnonymousJumptable:
 	ld hl, sp+$0
 	ld e, [hl]
 	inc hl
@@ -870,20 +860,17 @@ DoAnimFrame: ; 8d24b
 	ld h, [hl]
 	ld l, a
 	ret
-; 8d6d8 (23:56d8)
 
-.IncrementJumptableIndex: ; 8d6d8
+.IncrementJumptableIndex:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ret
-; 8d6de
 
-.Sprites_Sine: ; 8d6de (23:56de)
+.Sprites_Sine:
 	call Sprites_Sine
 	ret
 
-.Sprites_Cosine: ; 8d6e2 (23:56e2)
+.Sprites_Cosine:
 	call Sprites_Cosine
 	ret
-; 8d6e6 (23:56e6)
diff --git a/engine/sprites.asm b/engine/gfx/sprites.asm
index 277b75124..1b22e5832 100755..100644
--- a/engine/sprites.asm
+++ b/engine/gfx/sprites.asm
@@ -1,4 +1,4 @@
-ClearSpriteAnims: ; 8cf53
+ClearSpriteAnims:
 	ld hl, wSpriteAnimDict
 	ld bc, wSpriteAnimsEnd - wSpriteAnimDict
 .loop
@@ -9,15 +9,13 @@ ClearSpriteAnims: ; 8cf53
 	or b
 	jr nz, .loop
 	ret
-; 8cf62
 
-PlaySpriteAnimationsAndDelayFrame: ; 8cf62
+PlaySpriteAnimationsAndDelayFrame:
 	call PlaySpriteAnimations
 	call DelayFrame
 	ret
-; 8cf69
 
-PlaySpriteAnimations: ; 8cf69
+PlaySpriteAnimations:
 	push hl
 	push de
 	push bc
@@ -32,9 +30,8 @@ PlaySpriteAnimations: ; 8cf69
 	pop de
 	pop hl
 	ret
-; 8cf7a
 
-DoNextFrameForAllSprites: ; 8cf7a
+DoNextFrameForAllSprites:
 	ld hl, wSpriteAnimationStructs
 	ld e, NUM_SPRITE_ANIM_STRUCTS
 
@@ -72,9 +69,8 @@ DoNextFrameForAllSprites: ; 8cf7a
 
 .done
 	ret
-; 8cfa8
 
-DoNextFrameForFirst16Sprites: ; 8cfa8 (23:4fa8)
+DoNextFrameForFirst16Sprites:
 	ld hl, wSpriteAnimationStructs
 	ld e, NUM_SPRITE_ANIM_STRUCTS
 
@@ -113,7 +109,7 @@ DoNextFrameForFirst16Sprites: ; 8cfa8 (23:4fa8)
 .done
 	ret
 
-InitSpriteAnimStruct:: ; 8cfd6
+InitSpriteAnimStruct::
 ; Initialize animation a at pixel x=e, y=d
 ; Find if there's any room in the wSpriteAnimationStructs array, which is 10x16
 	push de
@@ -208,18 +204,15 @@ endr
 	ld a, b
 	ld [wSpriteAnimAddrBackup + 1], a
 	ret
-; 8d036
 
-DeinitializeSprite: ; 8d036
+DeinitializeSprite:
 ; Clear the index field of the struct in bc.
 	ld hl, SPRITEANIMSTRUCT_INDEX
 	add hl, bc
 	ld [hl], $0
 	ret
-; 8d03d
 
-
-DeinitializeAllSprites: ; 8d03d (23:503d)
+DeinitializeAllSprites:
 ; Clear the index field of every struct in the wSpriteAnimationStructs array.
 	ld hl, wSpriteAnimationStructs
 	ld bc, SPRITEANIMSTRUCT_LENGTH
@@ -232,8 +225,7 @@ DeinitializeAllSprites: ; 8d03d (23:503d)
 	jr nz, .loop
 	ret
 
-
-UpdateAnimFrame: ; 8d04c
+UpdateAnimFrame:
 	call InitSpriteAnimBuffer ; init WRAM
 	call GetSpriteAnimFrame ; read from a memory array
 	cp -3
@@ -319,9 +311,8 @@ UpdateAnimFrame: ; 8d04c
 	pop bc
 	scf
 	ret
-; 8d0be
 
-AddOrSubtractY: ; 8d0be
+AddOrSubtractY:
 	push hl
 	ld a, [hl]
 	ld hl, wCurrSpriteAddSubFlags
@@ -335,9 +326,8 @@ AddOrSubtractY: ; 8d0be
 .ok
 	pop hl
 	ret
-; 8d0ce
 
-AddOrSubtractX: ; 8d0ce
+AddOrSubtractX:
 	push hl
 	ld a, [hl]
 	ld hl, wCurrSpriteAddSubFlags
@@ -351,9 +341,8 @@ AddOrSubtractX: ; 8d0ce
 .ok
 	pop hl
 	ret
-; 8d0de
 
-GetSpriteOAMAttr: ; 8d0de
+GetSpriteOAMAttr:
 	ld a, [wCurrSpriteAddSubFlags]
 	ld b, a
 	ld a, [hl]
@@ -364,9 +353,8 @@ GetSpriteOAMAttr: ; 8d0de
 	and $1f
 	or b
 	ret
-; 8d0ec
 
-InitSpriteAnimBuffer: ; 8d0ec
+InitSpriteAnimBuffer:
 	xor a
 	ld [wCurrSpriteAddSubFlags], a
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
@@ -382,9 +370,8 @@ InitSpriteAnimBuffer: ; 8d0ec
 	ld a, [hli]
 	ld [wCurrAnimYOffset], a
 	ret
-; 8d109
 
-GetSpriteAnimVTile: ; 8d109
+GetSpriteAnimVTile:
 ; a = wSpriteAnimDict[a] if a in wSpriteAnimDict else 0
 ; vTiles offset
 	push hl
@@ -409,9 +396,8 @@ GetSpriteAnimVTile: ; 8d109
 	pop bc
 	pop hl
 	ret
-; 8d120
 
-_ReinitSpriteAnimFrame:: ; 8d120
+_ReinitSpriteAnimFrame::
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld [hl], a
@@ -422,10 +408,8 @@ _ReinitSpriteAnimFrame:: ; 8d120
 	add hl, bc
 	ld [hl], -1
 	ret
-; 8d132
 
-
-GetSpriteAnimFrame: ; 8d132
+GetSpriteAnimFrame:
 .loop
 	ld hl, SPRITEANIMSTRUCT_DURATION
 	add hl, bc
@@ -491,9 +475,8 @@ GetSpriteAnimFrame: ; 8d132
 	add hl, bc
 	ld [hl], a
 	jr .loop
-; 8d189
 
-.GetPointer: ; 8d189
+.GetPointer:
 	; Get the data for the current frame for the current animation sequence
 
 	; SpriteAnimFrameData[SpriteAnim[SPRITEANIMSTRUCT_FRAMESET_ID]][SpriteAnim[SPRITEANIMSTRUCT_FRAME]]
@@ -514,9 +497,8 @@ GetSpriteAnimFrame: ; 8d132
 	add hl, hl
 	add hl, de
 	ret
-; 8d1a2
 
-GetFrameOAMPointer: ; 8d1a2
+GetFrameOAMPointer:
 ; Load OAM data pointer
 	ld e, a
 	ld d, 0
@@ -525,9 +507,8 @@ GetFrameOAMPointer: ; 8d1a2
 	add hl, de
 	add hl, de
 	ret
-; 8d1ac
 
-Unreferenced_BrokenGetStdGraphics: ; 8d1ac
+Unreferenced_BrokenGetStdGraphics:
 	push hl
 	ld l, a
 	ld h, 0
@@ -547,82 +528,39 @@ Unreferenced_BrokenGetStdGraphics: ; 8d1ac
 	call Request2bpp
 	pop bc
 	ret
-; 8d1c4
-
 
 INCLUDE "data/sprite_anims/sequences.asm"
 
-INCLUDE "engine/sprite_anims.asm"
+INCLUDE "engine/gfx/sprite_anims.asm"
 
 INCLUDE "data/sprite_anims/framesets.asm"
 
 INCLUDE "data/sprite_anims/oam.asm"
 
-
-BrokenStdGFXPointers: ; Broken 2bpp pointers
-	dbbw $80, $01, .deleted ; 128-tile 2bpp at 1:672a (inside Multiply)
-	dbbw $80, $01, .deleted
-	dbbw $80, $01, .deleted
-	dbbw $80, $01, .deleted
-	dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within TilesetTrainStationGFX)
-	dbbw $10, $11, .deleted ; 16-tile 2bpp at 11:672a (empty data)
-	dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data)
-	dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7)
-	dbbw $10, $21, .deleted ; 16-tile 2bpp at 21:672a (inside Function8671c)
+BrokenStdGFXPointers:
+	; tile count, bank, pointer
+	; (all pointers were dummied out to .deleted)
+	dbbw 128, $01, .deleted
+	dbbw 128, $01, .deleted
+	dbbw 128, $01, .deleted
+	dbbw 128, $01, .deleted
+	dbbw 16, $37, .deleted
+	dbbw 16, $11, .deleted
+	dbbw 16, $39, .deleted
+	dbbw 16, $24, .deleted
+	dbbw 16, $21, .deleted
 
 .deleted
-; 8e72a (23:672a)
-
 
-Sprites_Cosine: ; 8e72a
+Sprites_Cosine:
 ; a = d * cos(a * pi/32)
-	add %010000
-Sprites_Sine: ; 8e72c
+	add %010000 ; cos(x) = sin(x + pi/2)
+	; fallthrough
+Sprites_Sine:
 ; a = d * sin(a * pi/32)
-	and %111111
-	cp %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-; 8e741
-
-.ApplySineWave: ; 8e741
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, .sinewave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
-; 8e75d
-
-.sinewave ; 8e75d
-	sine_wave $100
-
+	calc_sine_wave
 
-AnimateEndOfExpBar: ; 8e79d
+AnimateEndOfExpBar:
 	ld a, [hSGB]
 	ld de, EndOfExpBarGFX
 	and a
@@ -646,9 +584,8 @@ AnimateEndOfExpBar: ; 8e79d
 	jr nz, .loop
 	call ClearSprites
 	ret
-; 8e7c6
 
-.AnimateFrame: ; 8e7c6
+.AnimateFrame:
 	ld hl, wVirtualOAMSprite00
 	ld c, 8 ; number of animated circles
 .anim_loop
@@ -685,14 +622,13 @@ AnimateEndOfExpBar: ; 8e79d
 	ld a, PAL_BATTLE_OB_BLUE
 	ld [hli], a ; attributes
 	jr .anim_loop
-; 8e7f4
 
-EndOfExpBarGFX: ; 8e7f4
+EndOfExpBarGFX:
 INCBIN "gfx/battle/expbarend.2bpp"
-SGBEndOfExpBarGFX: ; 8e804
+SGBEndOfExpBarGFX:
 INCBIN "gfx/battle/expbarend_sgb.2bpp"
 
-ClearSpriteAnims2: ; 8e814
+ClearSpriteAnims2:
 	push hl
 	push de
 	push bc
@@ -711,4 +647,3 @@ ClearSpriteAnims2: ; 8e814
 	pop de
 	pop hl
 	ret
-; 8e82b
diff --git a/engine/routines/trademonfrontpic.asm b/engine/gfx/trademon_frontpic.asm
index d5f7b55de..d557123e9 100644
--- a/engine/routines/trademonfrontpic.asm
+++ b/engine/gfx/trademon_frontpic.asm
@@ -1,4 +1,4 @@
-GetTrademonFrontpic: ; 4d7fd
+GetTrademonFrontpic:
 	ld a, [wOTTrademonSpecies]
 	ld hl, wOTTrademonDVs
 	ld de, vTiles2
@@ -13,7 +13,7 @@ GetTrademonFrontpic: ; 4d7fd
 	predef GetAnimatedFrontpic
 	ret
 
-AnimateTrademonFrontpic: ; 4d81e
+AnimateTrademonFrontpic:
 	ld a, [wOTTrademonSpecies]
 	call IsAPokemon
 	ret c
diff --git a/engine/buy_sell_toss.asm b/engine/items/buy_sell_toss.asm
index d2cf14628..3303f4319 100755..100644
--- a/engine/buy_sell_toss.asm
+++ b/engine/items/buy_sell_toss.asm
@@ -1,36 +1,33 @@
-SelectQuantityToToss: ; 24fbf
-	ld hl, TossItem_MenuDataHeader
-	call LoadMenuDataHeader
+SelectQuantityToToss:
+	ld hl, TossItem_MenuHeader
+	call LoadMenuHeader
 	call Toss_Sell_Loop
 	ret
-; 24fc9
 
-SelectQuantityToBuy: ; 24fc9
+SelectQuantityToBuy:
 	farcall GetItemPrice
-RooftopSale_SelectQuantityToBuy: ; 24fcf
+RooftopSale_SelectQuantityToBuy:
 	ld a, d
 	ld [wBuffer1], a
 	ld a, e
 	ld [wBuffer2], a
-	ld hl, BuyItem_MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, BuyItem_MenuHeader
+	call LoadMenuHeader
 	call Toss_Sell_Loop
 	ret
-; 24fe1
 
-SelectQuantityToSell: ; 24fe1
+SelectQuantityToSell:
 	farcall GetItemPrice
 	ld a, d
 	ld [wBuffer1], a
 	ld a, e
 	ld [wBuffer2], a
-	ld hl, SellItem_MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, SellItem_MenuHeader
+	call LoadMenuHeader
 	call Toss_Sell_Loop
 	ret
-; 24ff9
 
-Toss_Sell_Loop: ; 24ff9
+Toss_Sell_Loop:
 	ld a, 1
 	ld [wItemQuantityChangeBuffer], a
 .loop
@@ -45,9 +42,8 @@ Toss_Sell_Loop: ; 24ff9
 .nope
 	and a
 	ret
-; 2500e
 
-BuySellToss_InterpretJoypad: ; 2500e
+BuySellToss_InterpretJoypad:
 	call JoyTextDelay_ForcehJoyDown ; get joypad
 	bit B_BUTTON_F, c
 	jr nz, .b
@@ -126,9 +122,8 @@ BuySellToss_InterpretJoypad: ; 2500e
 	ld [wItemQuantityChangeBuffer], a
 	and a
 	ret
-; 25072
 
-BuySellToss_UpdateQuantityDisplay: ; 25072
+BuySellToss_UpdateQuantityDisplay:
 	call MenuBox
 	call MenuBoxCoord2Tile
 	ld de, SCREEN_WIDTH + 1
@@ -138,33 +133,29 @@ BuySellToss_UpdateQuantityDisplay: ; 25072
 	ld de, wItemQuantityChangeBuffer
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2
 	call PrintNum
-	ld a, [wMenuData2Pointer]
+	ld a, [wMenuDataPointer]
 	ld e, a
-	ld a, [wMenuData2Pointer + 1]
+	ld a, [wMenuDataPointer + 1]
 	ld d, a
 	ld a, [wMenuDataBank]
 	call FarCall_de
 	ret
-; 25097
 
-ret_25097: ; 25097
+ret_25097:
 	ret
-; 25098
 
-DisplayPurchasePrice: ; 25098
+DisplayPurchasePrice:
 	call BuySell_MultiplyPrice
 	call BuySell_DisplaySubtotal
 	ret
-; 2509f
 
-DisplaySellingPrice: ; 2509f
+DisplaySellingPrice:
 	call BuySell_MultiplyPrice
 	call Sell_HalvePrice
 	call BuySell_DisplaySubtotal
 	ret
-; 250a9
 
-BuySell_MultiplyPrice: ; 250a9
+BuySell_MultiplyPrice:
 	xor a
 	ld [hMultiplicand + 0], a
 	ld a, [wBuffer1]
@@ -177,9 +168,8 @@ BuySell_MultiplyPrice: ; 250a9
 	call Multiply
 	pop hl
 	ret
-; 250c1
 
-Sell_HalvePrice: ; 250c1
+Sell_HalvePrice:
 	push hl
 	ld hl, hProduct + 1
 	ld a, [hl]
@@ -193,9 +183,8 @@ Sell_HalvePrice: ; 250c1
 	ld [hl], a
 	pop hl
 	ret
-; 250d1
 
-BuySell_DisplaySubtotal: ; 250d1
+BuySell_DisplaySubtotal:
 	push hl
 	ld hl, hMoneyTemp
 	ld a, [hProduct + 1]
@@ -211,25 +200,21 @@ BuySell_DisplaySubtotal: ; 250d1
 	call PrintNum
 	call WaitBGMap
 	ret
-; 250ed
 
-TossItem_MenuDataHeader: ; 0x250ed
+TossItem_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 15, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw ret_25097
 	db 0 ; default option
-; 0x250f5
 
-BuyItem_MenuDataHeader: ; 0x250f5
+BuyItem_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw DisplayPurchasePrice
 	db -1 ; default option
-; 0x250fd
 
-SellItem_MenuDataHeader: ; 0x250fd
+SellItem_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw DisplaySellingPrice
 	db 0 ; default option
-; 0x25105
diff --git a/engine/item_effects.asm b/engine/items/item_effects.asm
index 114b2cb70..1439b2c6d 100644
--- a/engine/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1,4 +1,4 @@
-_DoItemEffect:: ; e722
+_DoItemEffect::
 	ld a, [wCurItem]
 	ld [wd265], a
 	call GetItemName
@@ -10,205 +10,190 @@ _DoItemEffect:: ; e722
 	ld hl, ItemEffects
 	rst JumpTable
 	ret
-; e73c
-
-
-ItemEffects: ; e73c
-; entries correspond to item ids (see constants/item_constants.asm)
-	dw MasterBall
-	dw UltraBall
-	dw Brightpowder
-	dw GreatBall
-	dw PokeBall
-	dw TownMap
-	dw Bicycle
-	dw MoonStone
-	dw Antidote
-	dw BurnHeal
-	dw IceHeal
-	dw Awakening
-	dw ParlyzHeal
-	dw FullRestore
-	dw MaxPotion
-	dw HyperPotion
-	dw SuperPotion
-	dw Potion
-	dw EscapeRope
-	dw Repel
-	dw MaxElixer
-	dw FireStone
-	dw Thunderstone
-	dw WaterStone
-	dw Item19
-	dw HPUp
-	dw Protein
-	dw Iron
-	dw Carbos
-	dw LuckyPunch
-	dw Calcium
-	dw RareCandy
-	dw XAccuracy
-	dw LeafStone
-	dw MetalPowder
-	dw Nugget
-	dw PokeDoll
-	dw FullHeal
-	dw Revive
-	dw MaxRevive
-	dw GuardSpec
-	dw SuperRepel
-	dw MaxRepel
-	dw DireHit
-	dw Item2D
-	dw FreshWater
-	dw SodaPop
-	dw Lemonade
-	dw XAttack
-	dw Item32
-	dw XDefend
-	dw XSpeed
-	dw XSpecial
-	dw CoinCase
-	dw Itemfinder
-	dw PokeFlute
-	dw ExpShare
-	dw OldRod
-	dw GoodRod
-	dw SilverLeaf
-	dw SuperRod
-	dw PPUp
-	dw Ether
-	dw MaxEther
-	dw Elixer
-	dw RedScale
-	dw Secretpotion
-	dw SSTicket
-	dw MysteryEgg
-	dw ClearBell
-	dw SilverWing
-	dw MoomooMilk
-	dw QuickClaw
-	dw Psncureberry
-	dw GoldLeaf
-	dw SoftSand
-	dw SharpBeak
-	dw Przcureberry
-	dw BurntBerry
-	dw IceBerry
-	dw PoisonBarb
-	dw KingsRock
-	dw BitterBerry
-	dw MintBerry
-	dw RedApricorn
-	dw Tinymushroom
-	dw BigMushroom
-	dw Silverpowder
-	dw BluApricorn
-	dw Item5A
-	dw AmuletCoin
-	dw YlwApricorn
-	dw GrnApricorn
-	dw CleanseTag
-	dw MysticWater
-	dw Twistedspoon
-	dw WhtApricorn
-	dw Blackbelt
-	dw BlkApricorn
-	dw Item64
-	dw PnkApricorn
-	dw Blackglasses
-	dw Slowpoketail
-	dw PinkBow
-	dw Stick
-	dw SmokeBall
-	dw Nevermeltice
-	dw Magnet
-	dw Miracleberry
-	dw Pearl
-	dw BigPearl
-	dw Everstone
-	dw SpellTag
-	dw Ragecandybar
-	dw GsBall
-	dw BlueCard
-	dw MiracleSeed
-	dw ThickClub
-	dw FocusBand
-	dw Item78
-	dw Energypowder
-	dw EnergyRoot
-	dw HealPowder
-	dw RevivalHerb
-	dw HardStone
-	dw LuckyEgg
-	dw CardKey
-	dw MachinePart
-	dw EggTicket
-	dw LostItem
-	dw Stardust
-	dw StarPiece
-	dw BasementKey
-	dw Pass
-	dw Item87
-	dw Item88
-	dw Item89
-	dw Charcoal
-	dw BerryJuice
-	dw ScopeLens
-	dw Item8D
-	dw Item8E
-	dw MetalCoat
-	dw DragonFang
-	dw Item91
-	dw Leftovers
-	dw Item93
-	dw Item94
-	dw Item95
-	dw Mysteryberry
-	dw DragonScale
-	dw BerserkGene
-	dw Item99
-	dw Item9A
-	dw Item9B
-	dw SacredAsh
-	dw HeavyBall
-	dw FlowerMail
-	dw LevelBall
-	dw LureBall
-	dw FastBall
-	dw ItemA2
-	dw LightBall
-	dw FriendBall
-	dw MoonBall
-	dw LoveBall
-	dw NormalBox
-	dw GorgeousBox
-	dw SunStone
-	dw PolkadotBow
-	dw ItemAB
-	dw UpGrade
-	dw Berry
-	dw GoldBerry
-	dw Squirtbottle
-	dw ItemB0
-	dw ParkBall
-	dw RainbowWing
-	dw ItemB3
-; e8a2
-
-
-MasterBall:
-UltraBall:
-GreatBall:
-PokeBall:
-HeavyBall:
-LevelBall:
-LureBall:
-FastBall:
-FriendBall:
-MoonBall:
-LoveBall:
-ParkBall: ; e8a2
+
+ItemEffects:
+; entries correspond to item ids
+	dw PokeBallEffect      ; MASTER_BALL
+	dw PokeBallEffect      ; ULTRA_BALL
+	dw NoEffect            ; BRIGHTPOWDER
+	dw PokeBallEffect      ; GREAT_BALL
+	dw PokeBallEffect      ; POKE_BALL
+	dw TownMapEffect       ; TOWN_MAP
+	dw BicycleEffect       ; BICYCLE
+	dw EvoStoneEffect      ; MOON_STONE
+	dw StatusHealingEffect ; ANTIDOTE
+	dw StatusHealingEffect ; BURN_HEAL
+	dw StatusHealingEffect ; ICE_HEAL
+	dw StatusHealingEffect ; AWAKENING
+	dw StatusHealingEffect ; PARLYZ_HEAL
+	dw FullRestoreEffect   ; FULL_RESTORE
+	dw RestoreHPEffect     ; MAX_POTION
+	dw RestoreHPEffect     ; HYPER_POTION
+	dw RestoreHPEffect     ; SUPER_POTION
+	dw RestoreHPEffect     ; POTION
+	dw EscapeRopeEffect    ; ESCAPE_ROPE
+	dw RepelEffect         ; REPEL
+	dw RestorePPEffect     ; MAX_ELIXER
+	dw EvoStoneEffect      ; FIRE_STONE
+	dw EvoStoneEffect      ; THUNDERSTONE
+	dw EvoStoneEffect      ; WATER_STONE
+	dw NoEffect            ; ITEM_19
+	dw VitaminEffect       ; HP_UP
+	dw VitaminEffect       ; PROTEIN
+	dw VitaminEffect       ; IRON
+	dw VitaminEffect       ; CARBOS
+	dw NoEffect            ; LUCKY_PUNCH
+	dw VitaminEffect       ; CALCIUM
+	dw RareCandyEffect     ; RARE_CANDY
+	dw XAccuracyEffect     ; X_ACCURACY
+	dw EvoStoneEffect      ; LEAF_STONE
+	dw NoEffect            ; METAL_POWDER
+	dw NoEffect            ; NUGGET
+	dw PokeDollEffect      ; POKE_DOLL
+	dw StatusHealingEffect ; FULL_HEAL
+	dw ReviveEffect        ; REVIVE
+	dw ReviveEffect        ; MAX_REVIVE
+	dw GuardSpecEffect     ; GUARD_SPEC
+	dw SuperRepelEffect    ; SUPER_REPEL
+	dw MaxRepelEffect      ; MAX_REPEL
+	dw DireHitEffect       ; DIRE_HIT
+	dw NoEffect            ; ITEM_2D
+	dw RestoreHPEffect     ; FRESH_WATER
+	dw RestoreHPEffect     ; SODA_POP
+	dw RestoreHPEffect     ; LEMONADE
+	dw XItemEffect         ; X_ATTACK
+	dw NoEffect            ; ITEM_32
+	dw XItemEffect         ; X_DEFEND
+	dw XItemEffect         ; X_SPEED
+	dw XItemEffect         ; X_SPECIAL
+	dw CoinCaseEffect      ; COIN_CASE
+	dw ItemfinderEffect    ; ITEMFINDER
+	dw PokeFluteEffect     ; POKE_FLUTE
+	dw NoEffect            ; EXP_SHARE
+	dw OldRodEffect        ; OLD_ROD
+	dw GoodRodEffect       ; GOOD_ROD
+	dw NoEffect            ; SILVER_LEAF
+	dw SuperRodEffect      ; SUPER_ROD
+	dw RestorePPEffect     ; PP_UP
+	dw RestorePPEffect     ; ETHER
+	dw RestorePPEffect     ; MAX_ETHER
+	dw RestorePPEffect     ; ELIXER
+	dw NoEffect            ; RED_SCALE
+	dw NoEffect            ; SECRETPOTION
+	dw NoEffect            ; S_S_TICKET
+	dw NoEffect            ; MYSTERY_EGG
+	dw NoEffect            ; CLEAR_BELL
+	dw NoEffect            ; SILVER_WING
+	dw RestoreHPEffect     ; MOOMOO_MILK
+	dw NoEffect            ; QUICK_CLAW
+	dw StatusHealingEffect ; PSNCUREBERRY
+	dw NoEffect            ; GOLD_LEAF
+	dw NoEffect            ; SOFT_SAND
+	dw NoEffect            ; SHARP_BEAK
+	dw StatusHealingEffect ; PRZCUREBERRY
+	dw StatusHealingEffect ; BURNT_BERRY
+	dw StatusHealingEffect ; ICE_BERRY
+	dw NoEffect            ; POISON_BARB
+	dw NoEffect            ; KINGS_ROCK
+	dw BitterBerryEffect   ; BITTER_BERRY
+	dw StatusHealingEffect ; MINT_BERRY
+	dw NoEffect            ; RED_APRICORN
+	dw NoEffect            ; TINYMUSHROOM
+	dw NoEffect            ; BIG_MUSHROOM
+	dw NoEffect            ; SILVERPOWDER
+	dw NoEffect            ; BLU_APRICORN
+	dw NoEffect            ; ITEM_5A
+	dw NoEffect            ; AMULET_COIN
+	dw NoEffect            ; YLW_APRICORN
+	dw NoEffect            ; GRN_APRICORN
+	dw NoEffect            ; CLEANSE_TAG
+	dw NoEffect            ; MYSTIC_WATER
+	dw NoEffect            ; TWISTEDSPOON
+	dw NoEffect            ; WHT_APRICORN
+	dw NoEffect            ; BLACKBELT
+	dw NoEffect            ; BLK_APRICORN
+	dw NoEffect            ; ITEM_64
+	dw NoEffect            ; PNK_APRICORN
+	dw NoEffect            ; BLACKGLASSES
+	dw NoEffect            ; SLOWPOKETAIL
+	dw NoEffect            ; PINK_BOW
+	dw NoEffect            ; STICK
+	dw NoEffect            ; SMOKE_BALL
+	dw NoEffect            ; NEVERMELTICE
+	dw NoEffect            ; MAGNET
+	dw StatusHealingEffect ; MIRACLEBERRY
+	dw NoEffect            ; PEARL
+	dw NoEffect            ; BIG_PEARL
+	dw NoEffect            ; EVERSTONE
+	dw NoEffect            ; SPELL_TAG
+	dw RestoreHPEffect     ; RAGECANDYBAR
+	dw NoEffect            ; GS_BALL
+	dw BlueCardEffect      ; BLUE_CARD
+	dw NoEffect            ; MIRACLE_SEED
+	dw NoEffect            ; THICK_CLUB
+	dw NoEffect            ; FOCUS_BAND
+	dw NoEffect            ; ITEM_78
+	dw EnergypowderEffect  ; ENERGYPOWDER
+	dw EnergyRootEffect    ; ENERGY_ROOT
+	dw HealPowderEffect    ; HEAL_POWDER
+	dw RevivalHerbEffect   ; REVIVAL_HERB
+	dw NoEffect            ; HARD_STONE
+	dw NoEffect            ; LUCKY_EGG
+	dw CardKeyEffect       ; CARD_KEY
+	dw NoEffect            ; MACHINE_PART
+	dw NoEffect            ; EGG_TICKET
+	dw NoEffect            ; LOST_ITEM
+	dw NoEffect            ; STARDUST
+	dw NoEffect            ; STAR_PIECE
+	dw BasementKeyEffect   ; BASEMENT_KEY
+	dw NoEffect            ; PASS
+	dw NoEffect            ; ITEM_87
+	dw NoEffect            ; ITEM_88
+	dw NoEffect            ; ITEM_89
+	dw NoEffect            ; CHARCOAL
+	dw RestoreHPEffect     ; BERRY_JUICE
+	dw NoEffect            ; SCOPE_LENS
+	dw NoEffect            ; ITEM_8D
+	dw NoEffect            ; ITEM_8E
+	dw NoEffect            ; METAL_COAT
+	dw NoEffect            ; DRAGON_FANG
+	dw NoEffect            ; ITEM_91
+	dw NoEffect            ; LEFTOVERS
+	dw NoEffect            ; ITEM_93
+	dw NoEffect            ; ITEM_94
+	dw NoEffect            ; ITEM_95
+	dw RestorePPEffect     ; MYSTERYBERRY
+	dw NoEffect            ; DRAGON_SCALE
+	dw NoEffect            ; BERSERK_GENE
+	dw NoEffect            ; ITEM_99
+	dw NoEffect            ; ITEM_9A
+	dw NoEffect            ; ITEM_9B
+	dw SacredAshEffect     ; SACRED_ASH
+	dw PokeBallEffect      ; HEAVY_BALL
+	dw NoEffect            ; FLOWER_MAIL
+	dw PokeBallEffect      ; LEVEL_BALL
+	dw PokeBallEffect      ; LURE_BALL
+	dw PokeBallEffect      ; FAST_BALL
+	dw NoEffect            ; ITEM_A2
+	dw NoEffect            ; LIGHT_BALL
+	dw PokeBallEffect      ; FRIEND_BALL
+	dw PokeBallEffect      ; MOON_BALL
+	dw PokeBallEffect      ; LOVE_BALL
+	dw NormalBoxEffect     ; NORMAL_BOX
+	dw GorgeousBoxEffect   ; GORGEOUS_BOX
+	dw EvoStoneEffect      ; SUN_STONE
+	dw NoEffect            ; POLKADOT_BOW
+	dw NoEffect            ; ITEM_AB
+	dw NoEffect            ; UP_GRADE
+	dw RestoreHPEffect     ; BERRY
+	dw RestoreHPEffect     ; GOLD_BERRY
+	dw SquirtbottleEffect  ; SQUIRTBOTTLE
+	dw NoEffect            ; ITEM_B0
+	dw PokeBallEffect      ; PARK_BALL
+	dw NoEffect            ; RAINBOW_WING
+	dw NoEffect            ; ITEM_B3
+
+PokeBallEffect:
 	ld a, [wBattleMode]
 	dec a
 	jp nz, UseBallInTrainerBattle
@@ -355,33 +340,25 @@ ParkBall: ; e8a2
 	ld a, $ff
 .max_1
 
+	; BUG: farcall overwrites a, and GetItemHeldEffect takes b anyway.
+	; This is probably the reason the HELD_CATCH_CHANCE effect is never used.
+	; Uncomment the line below to fix.
 	ld d, a
 	push de
-
-	; BUG: farcall overwrites a,
-	; and GetItemHeldEffect takes b anyway.
-
-	; This is probably the reason
-	; the HELD_CATCH_CHANCE effect
-	; is never used.
-
-	; Uncomment the line below to fix.
-
 	ld a, [wBattleMonItem]
-;	ld b, a
+	; ld b, a
 	farcall GetItemHeldEffect
 	ld a, b
 	cp HELD_CATCH_CHANCE
-
 	pop de
 	ld a, d
-
-	jr nz, .skip_hp_calc
+	jr nz, .max_2
 	add c
-	jr nc, .skip_hp_calc
+	jr nc, .max_2
 	ld a, $ff
-.skip_hp_calc
+.max_2
 
+.skip_hp_calc
 	ld b, a
 	ld [wBuffer1], a
 	call Random
@@ -507,8 +484,8 @@ ParkBall: ; e8a2
 	ld de, wEnemyMonPP
 	ld bc, NUM_MOVES
 	call CopyBytes
-.Transformed:
 
+.Transformed:
 	ld a, [wEnemyMonSpecies]
 	ld [wWildMon], a
 	ld [wCurPartySpecies], a
@@ -556,7 +533,7 @@ ParkBall: ; e8a2
 	cp BATTLETYPE_CELEBI
 	jr nz, .not_celebi
 	ld hl, wBattleResult
-	set 6, [hl]
+	set BATTLERESULT_CAUGHT_CELEBI, [hl]
 .not_celebi
 
 	ld a, [wPartyCount]
@@ -583,8 +560,8 @@ ParkBall: ; e8a2
 
 	ld a, FRIEND_BALL_HAPPINESS
 	ld [hl], a
-.SkipPartyMonFriendBall:
 
+.SkipPartyMonFriendBall:
 	ld hl, Text_AskNicknameNewlyCaughtMon
 	call PrintText
 
@@ -623,7 +600,7 @@ ParkBall: ; e8a2
 .SendToPC:
 	call ClearSprites
 
-	predef SendPkmnIntoBox
+	predef SendMonIntoBox
 
 	farcall SetBoxMonCaughtData
 
@@ -634,7 +611,7 @@ ParkBall: ; e8a2
 	cp MONS_PER_BOX
 	jr nz, .BoxNotFullYet
 	ld hl, wBattleResult
-	set 7, [hl]
+	set BATTLERESULT_BOX_FULL, [hl]
 .BoxNotFullYet:
 	ld a, [wCurItem]
 	cp FRIEND_BALL
@@ -732,8 +709,6 @@ ParkBall: ; e8a2
 	ld hl, wParkBallsRemaining
 	dec [hl]
 	ret
-; ec0a
-
 
 BallMultiplierFunctionTable:
 ; table of routines that increase or decrease the catch rate based on
@@ -786,10 +761,10 @@ GetPokedexEntryBank:
 	ret
 
 .PokedexEntryBanks:
-	db BANK(PokedexEntries1)
-	db BANK(PokedexEntries2)
-	db BANK(PokedexEntries3)
-	db BANK(PokedexEntries4)
+	db BANK("Pokedex Entries 001-064")
+	db BANK("Pokedex Entries 065-128")
+	db BANK("Pokedex Entries 129-192")
+	db BANK("Pokedex Entries 193-251")
 
 HeavyBallMultiplier:
 ; subtract 20 from catch rate if weight < 102.4 kg
@@ -825,10 +800,10 @@ HeavyBallMultiplier:
 	ld b, h
 	ld c, l
 
-	rept 4
+rept 4
 	srl b
 	rr c
-	endr
+endr
 	call .subbc
 
 	srl b
@@ -913,10 +888,6 @@ MoonBallMultiplier:
 ; This function is buggy.
 ; Intent:  multiply catch rate by 4 if mon evolves with moon stone
 ; Reality: no boost
-
-GLOBAL EvosAttacks
-GLOBAL EvosAttacksPointers
-
 	push bc
 	ld a, [wTempEnemyMonSpecies]
 	dec a
@@ -930,7 +901,7 @@ GLOBAL EvosAttacksPointers
 	pop bc
 
 	push bc
-	ld a, BANK(EvosAttacks)
+	ld a, BANK("Evolutions and Attacks")
 	call GetFarByte
 	cp EVOLVE_ITEM
 	pop bc
@@ -944,7 +915,7 @@ GLOBAL EvosAttacksPointers
 ; No Pokémon evolve with Burn Heal,
 ; so Moon Balls always have a catch rate of 1×.
 	push bc
-	ld a, BANK(EvosAttacks)
+	ld a, BANK("Evolutions and Attacks")
 	call GetFarByte
 	cp MOON_STONE_RED ; BURN_HEAL
 	pop bc
@@ -1090,43 +1061,37 @@ LevelBallMultiplier:
 ; These two texts were carried over from gen 1.
 ; They are not used in gen 2, and are dummied out.
 
-Text_RBY_CatchMarowak: ; 0xedab
+Text_RBY_CatchMarowak:
 	; It dodged the thrown BALL! This #MON can't be caught!
 	text_jump UnknownText_0x1c5a5a
 	db "@"
-; 0xedb0
 
-Text_RBY_NoShake: ; 0xedb0
+Text_RBY_NoShake:
 	; You missed the #MON!
 	text_jump UnknownText_0x1c5a90
 	db "@"
-; 0xedb5
 
-Text_NoShake: ; 0xedb5
+Text_NoShake:
 	; Oh no! The #MON broke free!
 	text_jump UnknownText_0x1c5aa6
 	db "@"
-; 0xedba
 
-Text_OneShake: ; 0xedba
+Text_OneShake:
 	; Aww! It appeared to be caught!
 	text_jump UnknownText_0x1c5ac3
 	db "@"
-; 0xedbf
 
-Text_TwoShakes: ; 0xedbf
+Text_TwoShakes:
 	; Aargh! Almost had it!
 	text_jump UnknownText_0x1c5ae3
 	db "@"
-; 0xedc4
 
-Text_ThreeShakes: ; 0xedc4
+Text_ThreeShakes:
 	; Shoot! It was so close too!
 	text_jump UnknownText_0x1c5afa
 	db "@"
-; 0xedc9
 
-Text_GotchaMonWasCaught: ; 0xedc9
+Text_GotchaMonWasCaught:
 	; Gotcha! @ was caught!@ @
 	text_jump UnknownText_0x1c5b17
 	start_asm
@@ -1140,54 +1105,40 @@ Text_GotchaMonWasCaught: ; 0xedc9
 	pop bc
 	ld hl, TextJump_Waitbutton
 	ret
-; ede6
 
-TextJump_Waitbutton: ; 0xede6
+TextJump_Waitbutton:
 	; @
 	text_jump Text_Waitbutton_2
 	db "@"
-; 0xedeb
 
-Text_SentToBillsPC: ; 0xedeb
+Text_SentToBillsPC:
 	; was sent to BILL's PC.
 	text_jump UnknownText_0x1c5b38
 	db "@"
-; 0xedf0
 
-Text_AddedToPokedex: ; 0xedf0
+Text_AddedToPokedex:
 	; 's data was newly added to the #DEX.@ @
 	text_jump UnknownText_0x1c5b53
 	db "@"
-; 0xedf5
 
-Text_AskNicknameNewlyCaughtMon: ; 0xedf5
+Text_AskNicknameNewlyCaughtMon:
 	; Give a nickname to @ ?
 	text_jump UnknownText_0x1c5b7f
 	db "@"
-; 0xedfa
 
-ReturnToBattle_UseBall: ; edfa (3:6dfa)
+ReturnToBattle_UseBall:
 	farcall _ReturnToBattle_UseBall
 	ret
 
-TownMap: ; ee01
+TownMapEffect:
 	farcall PokegearMap
 	ret
-; ee08
-
 
-Bicycle: ; ee08
+BicycleEffect:
 	farcall BikeFunction
 	ret
-; ee0f
-
 
-MoonStone:
-FireStone:
-Thunderstone:
-WaterStone:
-LeafStone:
-SunStone: ; ee0f
+EvoStoneEffect:
 	ld b, PARTYMENUACTION_EVO_STONE
 	call UseItem_SelectMon
 
@@ -1217,14 +1168,8 @@ SunStone: ; ee0f
 	xor a
 	ld [wItemEffectSucceeded], a
 	ret
-; ee3d
 
-
-HPUp:
-Protein:
-Iron:
-Carbos:
-Calcium: ; ee3d
+VitaminEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 
@@ -1267,40 +1212,32 @@ Calcium: ; ee3d
 
 	jp UseDisposableItem
 
-
-NoEffectMessage: ; ee83
+NoEffectMessage:
 	ld hl, WontHaveAnyEffectText
 	call PrintText
 	jp ClearPalettes
-; ee8c
 
-
-UpdateStatsAfterItem: ; ee8c
+UpdateStatsAfterItem:
 	ld a, MON_MAXHP
 	call GetPartyParamLocation
 	ld d, h
 	ld e, l
 	ld a, MON_STAT_EXP - 1
 	call GetPartyParamLocation
-	ld b, $1
-	predef_jump CalcPkmnStats
-; ee9f
+	ld b, TRUE
+	predef_jump CalcMonStats
 
-RareCandy_StatBooster_ExitMenu: ; ee9f
+RareCandy_StatBooster_ExitMenu:
 	xor a
 	ld [wItemEffectSucceeded], a
 	jp ClearPalettes
-; eea6
 
-
-Text_StatRose: ; 0xeea6
+Text_StatRose:
 	; 's @  rose.
 	text_jump UnknownText_0x1c5b9a
 	db "@"
-; 0xeeab
-
 
-StatStrings: ; eeab
+StatStrings:
 	dw .health
 	dw .attack
 	dw .defense
@@ -1312,10 +1249,8 @@ StatStrings: ; eeab
 .defense db "DEFENSE@"
 .speed   db "SPEED@"
 .special db "SPECIAL@"
-; eed9
 
-
-GetStatExpRelativePointer: ; eed9
+GetStatExpRelativePointer:
 	ld a, [wCurItem]
 	ld hl, Table_eeeb
 .next
@@ -1330,18 +1265,15 @@ GetStatExpRelativePointer: ; eed9
 	ld c, a
 	ld b, 0
 	ret
-; eeeb
 
-Table_eeeb: ; eeeb
+Table_eeeb:
 	db HP_UP,    MON_HP_EXP - MON_STAT_EXP
 	db PROTEIN, MON_ATK_EXP - MON_STAT_EXP
 	db IRON,    MON_DEF_EXP - MON_STAT_EXP
 	db CARBOS,  MON_SPD_EXP - MON_STAT_EXP
 	db CALCIUM, MON_SPC_EXP - MON_STAT_EXP
-; eef5
-
 
-RareCandy_StatBooster_GetParameters: ; eef5
+RareCandy_StatBooster_GetParameters:
 	ld a, [wCurPartySpecies]
 	ld [wCurSpecies], a
 	ld [wd265], a
@@ -1354,10 +1286,8 @@ RareCandy_StatBooster_GetParameters: ; eef5
 	ld hl, wPartyMonNicknames
 	call GetNick
 	ret
-; 0xef14
 
-
-RareCandy: ; ef14
+RareCandyEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 
@@ -1422,7 +1352,7 @@ RareCandy: ; ef14
 
 	xor a ; PARTYMON
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 
 	hlcoord 9, 0
 	ld b, 10
@@ -1446,10 +1376,8 @@ RareCandy: ; ef14
 	farcall EvolvePokemon
 
 	jp UseDisposableItem
-; efad
-
 
-HealPowder: ; efad
+HealPowderEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 
@@ -1468,32 +1396,17 @@ HealPowder: ; efad
 
 .asm_efc9
 	jp StatusHealer_Jumptable
-; efcc
-
-
-Antidote:
-BurnHeal:
-IceHeal:
-Awakening:
-ParlyzHeal:
-FullHeal:
-Psncureberry:
-Przcureberry:
-BurntBerry:
-IceBerry:
-MintBerry:
-Miracleberry: ; efcc
+
+StatusHealingEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, StatusHealer_ExitMenu
 
-FullyHealStatus: ; efd4
+FullyHealStatus:
 	call UseStatusHealer
 	jp StatusHealer_Jumptable
-; efda
-
 
-UseStatusHealer: ; efda (3:6fda)
+UseStatusHealer:
 	call IsMonFainted
 	ld a, $1
 	ret z
@@ -1519,7 +1432,7 @@ UseStatusHealer: ; efda (3:6fda)
 	ld a, $0
 	ret
 
-IsItemUsedOnConfusedMon: ; f009 (3:7009)
+IsItemUsedOnConfusedMon:
 	call IsItemUsedOnBattleMon
 	jr nc, .nope
 	ld a, [wPlayerSubStatus3]
@@ -1535,7 +1448,7 @@ IsItemUsedOnConfusedMon: ; f009 (3:7009)
 	and a
 	ret
 
-BattlemonRestoreHealth: ; f01e (3:701e)
+BattlemonRestoreHealth:
 	call IsItemUsedOnBattleMon
 	ret nc
 	ld a, MON_HP
@@ -1546,7 +1459,7 @@ BattlemonRestoreHealth: ; f01e (3:701e)
 	ld [wBattleMonHP + 1], a
 	ret
 
-HealStatus: ; f030 (3:7030)
+HealStatus:
 	call IsItemUsedOnBattleMon
 	ret nc
 	xor a
@@ -1567,7 +1480,7 @@ HealStatus: ; f030 (3:7030)
 	pop bc
 	ret
 
-GetItemHealingAction: ; f058 (3:7058)
+GetItemHealingAction:
 	push hl
 	ld a, [wCurItem]
 	ld hl, StatusHealingActions
@@ -1587,22 +1500,20 @@ GetItemHealingAction: ; f058 (3:7058)
 	cp %11111111
 	pop hl
 	ret
-; f071 (3:7071)
 
 INCLUDE "data/items/heal_status.asm"
 
-StatusHealer_Jumptable: ; f09e (3:709e)
+StatusHealer_Jumptable:
 	ld hl, .dw
 	rst JumpTable
 	ret
 
-.dw ; f0a3 (3:70a3)
+.dw
 	dw StatusHealer_ClearPalettes
 	dw StatusHealer_NoEffect
 	dw StatusHealer_ExitMenu
 
-
-RevivalHerb: ; f0a9
+RevivalHerbEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, StatusHealer_ExitMenu
@@ -1618,21 +1529,16 @@ RevivalHerb: ; f0a9
 
 .asm_f0c5
 	jp StatusHealer_Jumptable
-; f0c8
-
 
-Revive:
-MaxRevive: ; f0c8
+ReviveEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, StatusHealer_ExitMenu
 
 	call RevivePokemon
 	jp StatusHealer_Jumptable
-; f0d6
 
-
-RevivePokemon: ; f0d6
+RevivePokemon:
 	call IsMonFainted
 	ld a, 1
 	ret nz
@@ -1677,10 +1583,8 @@ RevivePokemon: ; f0d6
 	call UseDisposableItem
 	ld a, 0
 	ret
-; f128
-
 
-FullRestore: ; f128
+FullRestoreEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, StatusHealer_ExitMenu
@@ -1696,10 +1600,8 @@ FullRestore: ; f128
 .NotAtFullHealth:
 	call .FullRestore
 	jp StatusHealer_Jumptable
-; f144
-
 
-.FullRestore: ; f144
+.FullRestore:
 	xor a
 	ld [wLowHealthAlarm], a
 	call ReviveFullHP
@@ -1717,10 +1619,8 @@ FullRestore: ; f128
 	call UseDisposableItem
 	ld a, 0
 	ret
-; f16a
 
-
-BitterBerry: ; f16a
+BitterBerryEffect:
 	ld hl, wPlayerSubStatus3
 	bit SUBSTATUS_CONFUSED, [hl]
 	ld a, 1
@@ -1738,36 +1638,19 @@ BitterBerry: ; f16a
 
 .done
 	jp StatusHealer_Jumptable
-; f186
-
-
-MaxPotion:
-HyperPotion:
-SuperPotion:
-Potion:
-FreshWater:
-SodaPop:
-Lemonade:
-MoomooMilk:
-Ragecandybar:
-BerryJuice:
-Berry:
-GoldBerry: ; f186
+
+RestoreHPEffect:
 	call ItemRestoreHP
 	jp StatusHealer_Jumptable
-; f18c
 
-
-Energypowder: ; f18c
+EnergypowderEffect:
 	ld c, HAPPINESS_BITTERPOWDER
 	jr EnergypowderEnergyRootCommon
-; f190
 
-EnergyRoot: ; f190
+EnergyRootEffect:
 	ld c, HAPPINESS_ENERGYROOT
-; f192
 
-EnergypowderEnergyRootCommon: ; f192
+EnergypowderEnergyRootCommon:
 	push bc
 	call ItemRestoreHP
 	pop bc
@@ -1780,10 +1663,8 @@ EnergypowderEnergyRootCommon: ; f192
 
 .skip_happiness
 	jp StatusHealer_Jumptable
-; f1a9
-
 
-ItemRestoreHP: ; f1a9 (3:71a9)
+ItemRestoreHP:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	ld a, 2
@@ -1810,7 +1691,7 @@ ItemRestoreHP: ; f1a9 (3:71a9)
 	ld a, 0
 	ret
 
-HealHP_SFX_GFX: ; f1db (3:71db)
+HealHP_SFX_GFX:
 	push de
 	ld de, SFX_POTION
 	call WaitPlaySFX
@@ -1823,7 +1704,7 @@ HealHP_SFX_GFX: ; f1db (3:71db)
 	ld [wWhichHPBar], a
 	predef_jump AnimateHPBar
 
-UseItem_SelectMon: ; f1f9 (3:71f9)
+UseItem_SelectMon:
 	call .SelectMon
 	ret c
 
@@ -1839,20 +1720,20 @@ UseItem_SelectMon: ; f1f9 (3:71f9)
 	and a
 	ret
 
-.SelectMon: ; f20b (3:720b)
+.SelectMon:
 	ld a, b
 	ld [wPartyMenuActionText], a
 	push hl
 	push de
 	push bc
 	call ClearBGPalettes
-	call ChoosePkmnToUseItemOn
+	call ChooseMonToUseItemOn
 	pop bc
 	pop de
 	pop hl
 	ret
 
-ChoosePkmnToUseItemOn: ; f21c (3:721c)
+ChooseMonToUseItemOn:
 	farcall LoadPartyMenuGFX
 	farcall InitPartyMenuWithCancel
 	farcall InitPartyMenuGFX
@@ -1864,7 +1745,7 @@ ChoosePkmnToUseItemOn: ; f21c (3:721c)
 	farcall PartyMenuSelect
 	ret
 
-ItemActionText: ; f24a (3:724a)
+ItemActionText:
 	ld [wPartyMenuActionText], a
 	ld a, [wCurPartySpecies]
 	push af
@@ -1887,7 +1768,7 @@ ItemActionText: ; f24a (3:724a)
 	ld [wCurPartySpecies], a
 	ret
 
-ItemActionTextWaitButton: ; f279 (3:7279)
+ItemActionTextWaitButton:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -1902,18 +1783,18 @@ ItemActionTextWaitButton: ; f279 (3:7279)
 	call DelayFrames
 	jp WaitPressAorB_BlinkCursor
 
-StatusHealer_NoEffect: ; f299 (3:7299)
+StatusHealer_NoEffect:
 	call WontHaveAnyEffectMessage
 	jr StatusHealer_ClearPalettes
 
-StatusHealer_ExitMenu: ; f29e (3:729e)
+StatusHealer_ExitMenu:
 	xor a
 	ld [wItemEffectSucceeded], a
-StatusHealer_ClearPalettes: ; f2a2 (3:72a2)
+StatusHealer_ClearPalettes:
 	call ClearPalettes
 	ret
 
-IsItemUsedOnBattleMon: ; f2a6 (3:72a6)
+IsItemUsedOnBattleMon:
 	ld a, [wBattleMode]
 	and a
 	ret z
@@ -1930,15 +1811,15 @@ IsItemUsedOnBattleMon: ; f2a6 (3:72a6)
 	xor a
 	ret
 
-ReviveHalfHP: ; f2ba (3:72ba)
+ReviveHalfHP:
 	call LoadHPFromBuffer1
 	srl d
 	rr e
 	jr ContinueRevive
 
-ReviveFullHP: ; f2c3 (3:72c3)
+ReviveFullHP:
 	call LoadHPFromBuffer1
-ContinueRevive: ; f2c6 (3:72c6)
+ContinueRevive:
 	ld a, MON_HP
 	call GetPartyParamLocation
 	ld [hl], d
@@ -1946,7 +1827,7 @@ ContinueRevive: ; f2c6 (3:72c6)
 	ld [hl], e
 	jp LoadCurHPIntoBuffer5
 
-RestoreHealth: ; f2d1 (3:72d1)
+RestoreHealth:
 	ld a, MON_HP + 1
 	call GetPartyParamLocation
 	ld a, [hl]
@@ -1975,7 +1856,7 @@ RestoreHealth: ; f2d1 (3:72d1)
 .finish
 	ret
 
-RemoveHP: ; f2f9 (3:72f9)
+RemoveHP:
 	ld a, MON_HP + 1
 	call GetPartyParamLocation
 	ld a, [hl]
@@ -1992,7 +1873,7 @@ RemoveHP: ; f2f9 (3:72f9)
 	call LoadCurHPIntoBuffer5
 	ret
 
-IsMonFainted: ; f30d (3:730d)
+IsMonFainted:
 	push de
 	call LoadMaxHPToBuffer1
 	call LoadCurHPToBuffer3
@@ -2002,7 +1883,7 @@ IsMonFainted: ; f30d (3:730d)
 	pop de
 	ret
 
-IsMonAtFullHealth: ; f31b (3:731b)
+IsMonAtFullHealth:
 	call LoadHPFromBuffer3
 	ld h, d
 	ld l, e
@@ -2013,7 +1894,7 @@ IsMonAtFullHealth: ; f31b (3:731b)
 	sbc d
 	ret
 
-LoadCurHPIntoBuffer5: ; f328 (3:7328)
+LoadCurHPIntoBuffer5:
 	ld a, MON_HP
 	call GetPartyParamLocation
 	ld a, [hli]
@@ -2021,25 +1902,22 @@ LoadCurHPIntoBuffer5: ; f328 (3:7328)
 	ld a, [hl]
 	ld [wBuffer5], a
 	ret
-; f336 (3:7336)
 
-LoadHPIntoBuffer5: ; f336
+LoadHPIntoBuffer5:
 	ld a, d
 	ld [wBuffer6], a
 	ld a, e
 	ld [wBuffer5], a
 	ret
-; f33f
 
-LoadHPFromBuffer5: ; f33f
+LoadHPFromBuffer5:
 	ld a, [wBuffer6]
 	ld d, a
 	ld a, [wBuffer5]
 	ld e, a
 	ret
-; f348
 
-LoadCurHPToBuffer3: ; f348 (3:7348)
+LoadCurHPToBuffer3:
 	ld a, MON_HP
 	call GetPartyParamLocation
 	ld a, [hli]
@@ -2048,14 +1926,14 @@ LoadCurHPToBuffer3: ; f348 (3:7348)
 	ld [wBuffer3], a
 	ret
 
-LoadHPFromBuffer3: ; f356 (3:7356)
+LoadHPFromBuffer3:
 	ld a, [wBuffer4]
 	ld d, a
 	ld a, [wBuffer3]
 	ld e, a
 	ret
 
-LoadMaxHPToBuffer1: ; f35f (3:735f)
+LoadMaxHPToBuffer1:
 	push hl
 	ld a, MON_MAXHP
 	call GetPartyParamLocation
@@ -2066,14 +1944,14 @@ LoadMaxHPToBuffer1: ; f35f (3:735f)
 	pop hl
 	ret
 
-LoadHPFromBuffer1: ; f36f (3:736f)
+LoadHPFromBuffer1:
 	ld a, [wBuffer2]
 	ld d, a
 	ld a, [wBuffer1]
 	ld e, a
 	ret
 
-GetOneFifthMaxHP: ; f378 (3:7378)
+GetOneFifthMaxHP:
 	push bc
 	ld a, MON_MAXHP
 	call GetPartyParamLocation
@@ -2092,7 +1970,7 @@ GetOneFifthMaxHP: ; f378 (3:7378)
 	pop bc
 	ret
 
-GetHealingItemAmount: ; f395 (3:7395)
+GetHealingItemAmount:
 	push hl
 	ld a, [wCurItem]
 	ld hl, HealingHPAmounts
@@ -2115,11 +1993,10 @@ GetHealingItemAmount: ; f395 (3:7395)
 	ld d, [hl]
 	pop hl
 	ret
-; f3af (3:73af)
 
 INCLUDE "data/items/heal_hp.asm"
 
-Softboiled_MilkDrinkFunction: ; f3df (3:73df)
+Softboiled_MilkDrinkFunction:
 ; Softboiled/Milk Drink in the field
 	ld a, [wPartyMenuCursor]
 	dec a
@@ -2149,12 +2026,12 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df)
 	ld [wPartyMenuCursor], a
 	ret
 
-.SelectMilkDrinkRecipient: ; f419 (3:7419)
+.SelectMilkDrinkRecipient:
 .loop
 	push bc
 	ld a, PARTYMENUACTION_HEALING_ITEM
 	ld [wPartyMenuActionText], a
-	call ChoosePkmnToUseItemOn
+	call ChooseMonToUseItemOn
 	pop bc
 	jr c, .set_carry
 	ld a, [wPartyMenuCursor]
@@ -2182,16 +2059,13 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df)
 	call MenuTextBoxBackup
 	pop bc
 	jr .loop
-; f44a (3:744a)
 
-.Text_CantBeUsed: ; 0xf44a
+.Text_CantBeUsed:
 	; That can't be used on this #MON.
 	text_jump UnknownText_0x1c5bac
 	db "@"
-; 0xf44f
 
-
-EscapeRope: ; f44f
+EscapeRopeEffect:
 	xor a
 	ld [wItemEffectSucceeded], a
 	farcall EscapeRopeFunction
@@ -2200,24 +2074,19 @@ EscapeRope: ; f44f
 	cp 1
 	call z, UseDisposableItem
 	ret
-; f462
-
 
-SuperRepel: ; f462
+SuperRepelEffect:
 	ld b, 200
 	jr UseRepel
-; f466
 
-MaxRepel: ; f466
+MaxRepelEffect:
 	ld b, 250
 	jr UseRepel
-; f466
 
-Repel: ; f46a
+RepelEffect:
 	ld b, 100
-; f46c
 
-UseRepel: ; f46c
+UseRepel:
 	ld a, [wRepelEffect]
 	and a
 	ld hl, TextJump_RepelUsedEarlierIsStillInEffect
@@ -2227,32 +2096,27 @@ UseRepel: ; f46c
 	ld [wRepelEffect], a
 	jp UseItemText
 
-
-TextJump_RepelUsedEarlierIsStillInEffect: ; 0xf47d
+TextJump_RepelUsedEarlierIsStillInEffect:
 	; The REPEL used earlier is still in effect.
 	text_jump Text_RepelUsedEarlierIsStillInEffect
 	db "@"
-; 0xf482
-
 
-XAccuracy: ; f482
+XAccuracyEffect:
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_X_ACCURACY, [hl]
 	jp nz, WontHaveAnyEffect_NotUsedMessage
 	set SUBSTATUS_X_ACCURACY, [hl]
 	jp UseItemText
-; f48f
 
-
-PokeDoll: ; f48f
+PokeDollEffect:
 	ld a, [wBattleMode]
 	dec a
 	jr nz, .asm_f4a6
 	inc a
 	ld [wForcedSwitch], a
 	ld a, [wBattleResult]
-	and $c0
-	or $2
+	and BATTLERESULT_BITMASK
+	or DRAW
 	ld [wBattleResult], a
 	jp UseItemText
 
@@ -2260,31 +2124,22 @@ PokeDoll: ; f48f
 	xor a
 	ld [wItemEffectSucceeded], a
 	ret
-; f4ab
-
 
-GuardSpec: ; f4ab
+GuardSpecEffect:
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_MIST, [hl]
 	jp nz, WontHaveAnyEffect_NotUsedMessage
 	set SUBSTATUS_MIST, [hl]
 	jp UseItemText
-; f4b8
 
-
-DireHit: ; f4b8
+DireHitEffect:
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_FOCUS_ENERGY, [hl]
 	jp nz, WontHaveAnyEffect_NotUsedMessage
 	set SUBSTATUS_FOCUS_ENERGY, [hl]
 	jp UseItemText
-; f4c5
-
 
-XAttack:
-XDefend:
-XSpeed:
-XSpecial: ; f4c5
+XItemEffect:
 	call UseItemText
 
 	ld a, [wCurItem]
@@ -2315,12 +2170,10 @@ XSpecial: ; f4c5
 	ld c, HAPPINESS_USEDXITEM
 	farcall ChangeHappiness
 	ret
-; f504
 
 INCLUDE "data/items/x_stats.asm"
 
-
-PokeFlute: ; f50c
+PokeFluteEffect:
 	ld a, [wBattleMode]
 	and a
 	jr nz, .dummy
@@ -2364,7 +2217,6 @@ PokeFlute: ; f50c
 	ld hl, .AllSleepingMonWokeUp
 	jp PrintText
 
-
 .CureSleep:
 	ld de, PARTYMON_STRUCT_LENGTH
 	ld c, PARTY_LENGTH
@@ -2384,22 +2236,18 @@ PokeFlute: ; f50c
 	dec c
 	jr nz, .loop
 	ret
-; f56c
 
-
-.CatchyTune: ; 0xf56c
+.CatchyTune:
 	; Played the # FLUTE. Now, that's a catchy tune!
 	text_jump UnknownText_0x1c5bf9
 	db "@"
-; 0xf571
 
-.AllSleepingMonWokeUp: ; 0xf571
+.AllSleepingMonWokeUp:
 	; All sleeping #MON woke up.
 	text_jump UnknownText_0x1c5c28
 	db "@"
-; 0xf576
 
-.PlayedTheFlute: ; 0xf576
+.PlayedTheFlute:
 	; played the # FLUTE.@ @
 	text_jump UnknownText_0x1c5c44
 	start_asm
@@ -2415,67 +2263,49 @@ PokeFlute: ; f50c
 
 .battle
 	jp PokeFluteTerminatorCharacter
-; f58f
-
 
-BlueCard: ; f58f
+BlueCardEffect:
 	ld hl, .bluecardtext
 	jp MenuTextBoxWaitButton
 
 .bluecardtext
 	text_jump UnknownText_0x1c5c5e
 	db "@"
-; f59a
-
 
-CoinCase: ; f59a
+CoinCaseEffect:
 	ld hl, .coincasetext
 	jp MenuTextBoxWaitButton
 
 .coincasetext
 	text_jump UnknownText_0x1c5c7b
 	db "@"
-; f5a5
 
-
-OldRod: ; f5a5
+OldRodEffect:
 	ld e, $0
 	jr UseRod
-; f5a9
 
-GoodRod: ; f5a9
+GoodRodEffect:
 	ld e, $1
 	jr UseRod
-; f5ad
 
-SuperRod: ; f5ad
+SuperRodEffect:
 	ld e, $2
 	jr UseRod
-; f5b1
 
-UseRod: ; f5b1
+UseRod:
 	farcall FishFunction
 	ret
-; f5b8
-
 
-Itemfinder: ; f5b8
+ItemfinderEffect:
 	farcall ItemFinder
 	ret
-; f5bf
 
-
-MaxElixer:
-PPUp:
-Ether:
-MaxEther:
-Elixer:
-Mysteryberry: ; f5bf
+RestorePPEffect:
 	ld a, [wCurItem]
 	ld [wd002], a
 
 .loop
-	; Party Screen opens to choose on which Pkmn to use the Item
+	; Party Screen opens to choose on which mon to use the Item
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, PPRestoreItem_Cancel
@@ -2551,12 +2381,11 @@ Mysteryberry: ; f5bf
 	ld hl, TextJump_PPsIncreased
 	call PrintText
 
-FinishPPRestore: ; f64c
+FinishPPRestore:
 	call ClearPalettes
 	jp UseDisposableItem
-; f652
 
-BattleRestorePP: ; f652
+BattleRestorePP:
 	ld a, [wBattleMode]
 	and a
 	jr z, .not_in_battle
@@ -2592,9 +2421,9 @@ BattleRestorePP: ; f652
 	push hl
 	push de
 	push bc
-	rept NUM_MOVES + 2 ; wBattleMonPP - wBattleMonMoves
+rept NUM_MOVES + 2 ; wBattleMonPP - wBattleMonMoves
 	inc de
-	endr
+endr
 	ld bc, MON_PP - MON_MOVES
 	add hl, bc
 	ld a, [hl]
@@ -2611,15 +2440,13 @@ BattleRestorePP: ; f652
 
 .done
 	ret
-; f6a7
 
-Not_PP_Up: ; f6a7
+Not_PP_Up:
 	call RestorePP
 	jr nz, BattleRestorePP
 	jp PPRestoreItem_NoEffect
-; f6af
 
-Elixer_RestorePPofAllMoves: ; f6af
+Elixer_RestorePPofAllMoves:
 	xor a
 	ld hl, wMenuCursorY
 	ld [hli], a
@@ -2649,17 +2476,16 @@ Elixer_RestorePPofAllMoves: ; f6af
 	and a
 	jp nz, BattleRestorePP
 
-PPRestoreItem_NoEffect: ; f6dd
+PPRestoreItem_NoEffect:
 	call WontHaveAnyEffectMessage
 
-PPRestoreItem_Cancel: ; f6e0
+PPRestoreItem_Cancel:
 	call ClearPalettes
 	xor a
 	ld [wItemEffectSucceeded], a
 	ret
-; f6e8
 
-RestorePP: ; f6e8
+RestorePP:
 	xor a ; PARTYMON
 	ld [wMonType], a
 	call GetMaxPPOfMove
@@ -2703,205 +2529,93 @@ RestorePP: ; f6e8
 .dont_restore
 	xor a
 	ret
-; f725
 
-TextJump_RaiseThePPOfWhichMove: ; 0xf725
+TextJump_RaiseThePPOfWhichMove:
 	; Raise the PP of which move?
 	text_jump Text_RaiseThePPOfWhichMove
 	db "@"
-; 0xf72a
 
-TextJump_RestoreThePPOfWhichMove: ; 0xf72a
+TextJump_RestoreThePPOfWhichMove:
 	; Restore the PP of which move?
 	text_jump Text_RestoreThePPOfWhichMove
 	db "@"
-; 0xf72f
 
-TextJump_PPIsMaxedOut: ; 0xf72f
+TextJump_PPIsMaxedOut:
 	; 's PP is maxed out.
 	text_jump Text_PPIsMaxedOut
 	db "@"
-; 0xf734
 
-TextJump_PPsIncreased: ; 0xf734
+TextJump_PPsIncreased:
 	; 's PP increased.
 	text_jump Text_PPsIncreased
 	db "@"
-; 0xf739
 
-UnknownText_0xf739: ; 0xf739
+UnknownText_0xf739:
 	; PP was restored.
 	text_jump UnknownText_0x1c5cf1
 	db "@"
-; 0xf73e
-
 
-Squirtbottle: ; f73e
+SquirtbottleEffect:
 	farcall _Squirtbottle
 	ret
-; f745
 
-
-CardKey: ; f745
+CardKeyEffect:
 	farcall _CardKey
 	ret
-; f74c
-
 
-BasementKey: ; f74c
+BasementKeyEffect:
 	farcall _BasementKey
 	ret
-; f753
 
-
-SacredAsh: ; f753
+SacredAshEffect:
 	farcall _SacredAsh
 	ld a, [wItemEffectSucceeded]
 	cp $1
 	ret nz
 	call UseDisposableItem
 	ret
-; f763
-
 
-NormalBox: ; f763
+NormalBoxEffect:
 	ld c, DECOFLAG_SILVER_TROPHY_DOLL
 	jr OpenBox
-; f767
 
-GorgeousBox: ; f767
+GorgeousBoxEffect:
 	ld c, DECOFLAG_GOLD_TROPHY_DOLL
-OpenBox: ; f769
+OpenBox:
 	farcall SetSpecificDecorationFlag
 
 	ld hl, .text
 	call PrintText
 
 	jp UseDisposableItem
-; f778
 
-.text ; 0xf778
+.text
 	; There was a trophy inside!
 	text_jump UnknownText_0x1c5d03
 	db "@"
-; 0xf77d
-
-Brightpowder:
-Item19:
-LuckyPunch:
-MetalPowder:
-Nugget:
-Item2D:
-Item32:
-ExpShare:
-SilverLeaf:
-RedScale:
-Secretpotion:
-SSTicket:
-MysteryEgg:
-ClearBell:
-SilverWing:
-QuickClaw:
-GoldLeaf:
-SoftSand:
-SharpBeak:
-PoisonBarb:
-KingsRock:
-RedApricorn:
-Tinymushroom:
-BigMushroom:
-Silverpowder:
-BluApricorn:
-Item5A:
-AmuletCoin:
-YlwApricorn:
-GrnApricorn:
-CleanseTag:
-MysticWater:
-Twistedspoon:
-WhtApricorn:
-Blackbelt:
-BlkApricorn:
-Item64:
-PnkApricorn:
-Blackglasses:
-Slowpoketail:
-PinkBow:
-Stick:
-SmokeBall:
-Nevermeltice:
-Magnet:
-Pearl:
-BigPearl:
-Everstone:
-SpellTag:
-GsBall:
-MiracleSeed:
-ThickClub:
-FocusBand:
-Item78:
-HardStone:
-LuckyEgg:
-MachinePart:
-EggTicket:
-LostItem:
-Stardust:
-StarPiece:
-Pass:
-Item87:
-Item88:
-Item89:
-Charcoal:
-ScopeLens:
-Item8D:
-Item8E:
-MetalCoat:
-DragonFang:
-Item91:
-Leftovers:
-Item93:
-Item94:
-Item95:
-DragonScale:
-BerserkGene:
-Item99:
-Item9A:
-Item9B:
-FlowerMail:
-ItemA2:
-LightBall:
-PolkadotBow:
-ItemAB:
-UpGrade:
-ItemB0:
-RainbowWing:
-ItemB3:
-TeruSama: ; f77d
-	jp IsntTheTimeMessage
-; f780
 
+NoEffect:
+	jp IsntTheTimeMessage
 
-Play_SFX_FULL_HEAL: ; f780
+Play_SFX_FULL_HEAL:
 	push de
 	ld de, SFX_FULL_HEAL
 	call WaitPlaySFX
 	pop de
 	ret
-; f789
 
-UseItemText: ; f789
+UseItemText:
 	ld hl, UsedItemText
 	call PrintText
 	call Play_SFX_FULL_HEAL
 	call WaitPressAorB_BlinkCursor
-UseDisposableItem: ; f795
+UseDisposableItem:
 	ld hl, wNumItems
 	ld a, 1
 	ld [wItemQuantityChangeBuffer], a
 	jp TossItem
-; f7a0
 
-UseBallInTrainerBattle: ; f7a0
+UseBallInTrainerBattle:
 	call ReturnToBattle_UseBall
 	ld de, ANIM_THROW_POKE_BALL
 	ld a, e
@@ -2918,9 +2632,8 @@ UseBallInTrainerBattle: ; f7a0
 	ld hl, DontBeAThiefText
 	call PrintText
 	jr UseDisposableItem
-; f7ca
 
-WontHaveAnyEffect_NotUsedMessage: ; f7ca
+WontHaveAnyEffect_NotUsedMessage:
 	ld hl, WontHaveAnyEffectText
 	call PrintText
 
@@ -2928,14 +2641,12 @@ WontHaveAnyEffect_NotUsedMessage: ; f7ca
 	ld a, $2
 	ld [wItemEffectSucceeded], a
 	ret
-; f7d6
 
-LooksBitterMessage: ; f7d6
+LooksBitterMessage:
 	ld hl, LooksBitterText
 	jp PrintText
-; f7dc
 
-Ball_BoxIsFullMessage: ; f7dc
+Ball_BoxIsFullMessage:
 	ld hl, Ball_BoxIsFullText
 	call PrintText
 
@@ -2943,118 +2654,102 @@ Ball_BoxIsFullMessage: ; f7dc
 	ld a, $2
 	ld [wItemEffectSucceeded], a
 	ret
-; f7e8
 
-CantUseOnEggMessage: ; f7e8
+CantUseOnEggMessage:
 	ld hl, CantUseOnEggText
 	jr CantUseItemMessage
 
-IsntTheTimeMessage: ; f7ed
+IsntTheTimeMessage:
 	ld hl, IsntTheTimeText
 	jr CantUseItemMessage
 
-WontHaveAnyEffectMessage: ; f7f2
+WontHaveAnyEffectMessage:
 	ld hl, WontHaveAnyEffectText
 	jr CantUseItemMessage
 
-BelongsToSomeoneElseMessage: ; f7f7
+BelongsToSomeoneElseMessage:
 	ld hl, BelongsToSomeoneElseText
 	jr CantUseItemMessage
 
-CyclingIsntAllowedMessage: ; f7fc
+CyclingIsntAllowedMessage:
 	ld hl, CyclingIsntAllowedText
 	jr CantUseItemMessage
 
-CantGetOnYourBikeMessage: ; f801
+CantGetOnYourBikeMessage:
 	ld hl, CantGetOnYourBikeText
 
-CantUseItemMessage: ; f804
+CantUseItemMessage:
 ; Item couldn't be used.
 	xor a
 	ld [wItemEffectSucceeded], a
 	jp PrintText
-; f80b
 
-LooksBitterText: ; 0xf80b
+LooksBitterText:
 	; It looks bitter…
 	text_jump UnknownText_0x1c5d3e
 	db "@"
-; 0xf810
 
-CantUseOnEggText: ; 0xf810
+CantUseOnEggText:
 	; That can't be used on an EGG.
 	text_jump UnknownText_0x1c5d50
 	db "@"
-; 0xf815
 
-IsntTheTimeText: ; 0xf815
+IsntTheTimeText:
 	; OAK:  ! This isn't the time to use that!
 	text_jump UnknownText_0x1c5d6e
 	db "@"
-; 0xf81a
 
-BelongsToSomeoneElseText: ; 0xf81a
+BelongsToSomeoneElseText:
 	; That belongs to someone else!
 	text_jump UnknownText_0x1c5d97
 	db "@"
-; 0xf81f
 
-WontHaveAnyEffectText: ; 0xf81f
+WontHaveAnyEffectText:
 	; It won't have any effect.
 	text_jump UnknownText_0x1c5db6
 	db "@"
-; 0xf824
 
-BlockedTheBallText: ; 0xf824
+BlockedTheBallText:
 	; The trainer blocked the BALL!
 	text_jump UnknownText_0x1c5dd0
 	db "@"
-; 0xf829
 
-DontBeAThiefText: ; 0xf829
+DontBeAThiefText:
 	; Don't be a thief!
 	text_jump UnknownText_0x1c5def
 	db "@"
-; 0xf82e
 
-CyclingIsntAllowedText: ; 0xf82e
+CyclingIsntAllowedText:
 	; Cycling isn't allowed here.
 	text_jump UnknownText_0x1c5e01
 	db "@"
-; 0xf833
 
-CantGetOnYourBikeText: ; 0xf833
+CantGetOnYourBikeText:
 	; Can't get on your @  now.
 	text_jump UnknownText_0x1c5e1d
 	db "@"
-; 0xf838
 
-Ball_BoxIsFullText: ; 0xf838
+Ball_BoxIsFullText:
 	; The #MON BOX is full. That can't be used now.
 	text_jump UnknownText_0x1c5e3a
 	db "@"
-; 0xf83d
 
-UsedItemText: ; 0xf83d
+UsedItemText:
 	; used the@ .
 	text_jump UnknownText_0x1c5e68
 	db "@"
-; 0xf842
 
-GotOnTheItemText: ; 0xf842
+GotOnTheItemText:
 	; got on the@ .
 	text_jump UnknownText_0x1c5e7b
 	db "@"
-; 0xf847
 
-GotOffTheItemText: ; 0xf847
+GotOffTheItemText:
 	; got off@ the @ .
 	text_jump UnknownText_0x1c5e90
 	db "@"
-; 0xf84c
 
-
-ApplyPPUp: ; f84c
+ApplyPPUp:
 	ld a, MON_MOVES
 	call GetPartyParamLocation
 	push hl
@@ -3088,11 +2783,8 @@ ApplyPPUp: ; f84c
 	inc hl
 	inc de
 	jr .loop
-; f881
-
 
-
-ComputeMaxPP: ; f881
+ComputeMaxPP:
 	push bc
 	; Divide the base PP by 5.
 	ld a, [de]
@@ -3140,9 +2832,8 @@ ComputeMaxPP: ; f881
 	ld [hl], b
 	pop bc
 	ret
-; f8b9
 
-RestoreAllPP: ; f8b9
+RestoreAllPP:
 	ld a, MON_PP
 	call GetPartyParamLocation
 	push hl
@@ -3176,10 +2867,8 @@ RestoreAllPP: ; f8b9
 	dec c
 	jr nz, .loop
 	ret
-; f8ec
-
 
-GetMaxPPOfMove: ; f8ec
+GetMaxPPOfMove:
 	ld a, [wStringBuffer1 + 0]
 	push af
 	ld a, [wStringBuffer1 + 1]
@@ -3256,16 +2945,14 @@ GetMaxPPOfMove: ; f8ec
 	pop af
 	ld [wStringBuffer1 + 0], a
 	ret
-; f963
 
-GetMthMoveOfNthPartymon: ; f963
+GetMthMoveOfNthPartymon:
 	ld a, [wCurPartyMon]
 	call AddNTimes
 
-GetMthMoveOfCurrentMon: ; f969
+GetMthMoveOfCurrentMon:
 	ld a, [wMenuCursorY]
 	ld c, a
 	ld b, 0
 	add hl, bc
 	ret
-; f971
diff --git a/engine/items.asm b/engine/items/items.asm
index 7246d5609..28c79f4cc 100755..100644
--- a/engine/items.asm
+++ b/engine/items/items.asm
@@ -1,4 +1,4 @@
-_ReceiveItem:: ; d1d5
+_ReceiveItem::
 	call DoesHLEqualNumItems
 	jp nz, PutItemInPocket
 	push hl
@@ -10,27 +10,28 @@ _ReceiveItem:: ; d1d5
 	rst JumpTable
 	ret
 
-.Pockets: ; d1e9
+.Pockets:
+; entries correspond to item types
 	dw .Item
 	dw .KeyItem
 	dw .Ball
 	dw .TMHM
 
-.Item: ; d1f1
+.Item:
 	ld h, d
 	ld l, e
 	jp PutItemInPocket
 
-.KeyItem: ; d1f6
+.KeyItem:
 	ld h, d
 	ld l, e
 	jp ReceiveKeyItem
 
-.Ball: ; d1fb
+.Ball:
 	ld hl, wNumBalls
 	jp PutItemInPocket
 
-.TMHM: ; d201
+.TMHM:
 	ld h, d
 	ld l, e
 	ld a, [wCurItem]
@@ -38,7 +39,7 @@ _ReceiveItem:: ; d1d5
 	call GetTMHMNumber
 	jp ReceiveTMHM
 
-_TossItem:: ; d20d
+_TossItem::
 	call DoesHLEqualNumItems
 	jr nz, .remove
 	push hl
@@ -51,16 +52,17 @@ _TossItem:: ; d20d
 	ret
 
 .Pockets:
+; entries correspond to item types
 	dw .Item
 	dw .KeyItem
 	dw .Ball
 	dw .TMHM
 
-.Ball: ; d228
+.Ball:
 	ld hl, wNumBalls
 	jp RemoveItemFromPocket
 
-.TMHM: ; d22e
+.TMHM:
 	ld h, d
 	ld l, e
 	ld a, [wCurItem]
@@ -68,19 +70,19 @@ _TossItem:: ; d20d
 	call GetTMHMNumber
 	jp TossTMHM
 
-.KeyItem: ; d23a
+.KeyItem:
 	ld h, d
 	ld l, e
 	jp TossKeyItem
 
-.Item: ; d23f
+.Item:
 	ld h, d
 	ld l, e
 
 .remove
 	jp RemoveItemFromPocket
 
-_CheckItem:: ; d244
+_CheckItem::
 	call DoesHLEqualNumItems
 	jr nz, .nope
 	push hl
@@ -93,16 +95,17 @@ _CheckItem:: ; d244
 	ret
 
 .Pockets:
+; entries correspond to item types
 	dw .Item
 	dw .KeyItem
 	dw .Ball
 	dw .TMHM
 
-.Ball: ; d25f
+.Ball:
 	ld hl, wNumBalls
 	jp CheckTheItem
 
-.TMHM: ; d265
+.TMHM:
 	ld h, d
 	ld l, e
 	ld a, [wCurItem]
@@ -110,19 +113,19 @@ _CheckItem:: ; d244
 	call GetTMHMNumber
 	jp CheckTMHM
 
-.KeyItem: ; d271
+.KeyItem:
 	ld h, d
 	ld l, e
 	jp CheckKeyItems
 
-.Item: ; d276
+.Item:
 	ld h, d
 	ld l, e
 
 .nope
 	jp CheckTheItem
 
-DoesHLEqualNumItems: ; d27b
+DoesHLEqualNumItems:
 	ld a, l
 	cp LOW(wNumItems)
 	ret nz
@@ -130,7 +133,7 @@ DoesHLEqualNumItems: ; d27b
 	cp HIGH(wNumItems)
 	ret
 
-GetPocketCapacity: ; d283
+GetPocketCapacity:
 	ld c, MAX_ITEMS
 	ld a, e
 	cp LOW(wNumItems)
@@ -152,7 +155,7 @@ GetPocketCapacity: ; d283
 	ld c, MAX_BALLS
 	ret
 
-PutItemInPocket: ; d29c
+PutItemInPocket:
 	ld d, h
 	ld e, l
 	inc hl
@@ -228,7 +231,7 @@ PutItemInPocket: ; d29c
 	scf
 	ret
 
-RemoveItemFromPocket: ; d2ff
+RemoveItemFromPocket:
 	ld d, h
 	ld e, l
 	ld a, [hli]
@@ -293,7 +296,7 @@ RemoveItemFromPocket: ; d2ff
 	and a
 	ret
 
-CheckTheItem: ; d349
+CheckTheItem:
 	ld a, [wCurItem]
 	ld c, a
 .loop
@@ -310,7 +313,7 @@ CheckTheItem: ; d349
 	and a
 	ret
 
-ReceiveKeyItem: ; d35a
+ReceiveKeyItem:
 	ld hl, wNumKeyItems
 	ld a, [hli]
 	cp MAX_KEY_ITEMS
@@ -330,7 +333,7 @@ ReceiveKeyItem: ; d35a
 	and a
 	ret
 
-TossKeyItem: ; d374
+TossKeyItem:
 	ld a, [wCurItemQuantity]
 	ld e, a
 	ld d, 0
@@ -360,7 +363,7 @@ TossKeyItem: ; d374
 	scf
 	ret
 
-.Toss: ; d396
+.Toss:
 	ld hl, wNumKeyItems
 	ld a, [wCurItem]
 	ld c, a
@@ -381,7 +384,7 @@ TossKeyItem: ; d374
 	scf
 	ret
 
-CheckKeyItems: ; d3b1
+CheckKeyItems:
 	ld a, [wCurItem]
 	ld c, a
 	ld hl, wKeyItems
@@ -398,7 +401,7 @@ CheckKeyItems: ; d3b1
 	scf
 	ret
 
-ReceiveTMHM: ; d3c4
+ReceiveTMHM:
 	dec c
 	ld b, 0
 	ld hl, wTMsHMs
@@ -415,7 +418,7 @@ ReceiveTMHM: ; d3c4
 	and a
 	ret
 
-TossTMHM: ; d3d8
+TossTMHM:
 	dec c
 	ld b, 0
 	ld hl, wTMsHMs
@@ -442,7 +445,7 @@ TossTMHM: ; d3d8
 	and a
 	ret
 
-CheckTMHM: ; d3fb
+CheckTMHM:
 	dec c
 	ld b, $0
 	ld hl, wTMsHMs
@@ -453,7 +456,7 @@ CheckTMHM: ; d3fb
 	scf
 	ret
 
-GetTMHMNumber:: ; d407
+GetTMHMNumber::
 ; Return the number of a TM/HM by item id c.
 	ld a, c
 ; Skip any dummy items.
@@ -470,7 +473,7 @@ GetTMHMNumber:: ; d407
 	ld c, a
 	ret
 
-GetNumberedTMHM: ; d417
+GetNumberedTMHM:
 ; Return the item id of a TM/HM by number c.
 	ld a, c
 ; Skip any gaps.
@@ -488,25 +491,25 @@ GetNumberedTMHM: ; d417
 	ld c, a
 	ret
 
-_CheckTossableItem:: ; d427
+_CheckTossableItem::
 ; Return 1 in wItemAttributeParamBuffer and carry if wCurItem can't be removed from the bag.
 	ld a, ITEMATTR_PERMISSIONS
 	call GetItemAttr
-	bit 7, a
+	bit CANT_TOSS_F, a
 	jr nz, ItemAttr_ReturnCarry
 	and a
 	ret
 
-CheckSelectableItem: ; d432
+CheckSelectableItem:
 ; Return 1 in wItemAttributeParamBuffer and carry if wCurItem can't be selected.
 	ld a, ITEMATTR_PERMISSIONS
 	call GetItemAttr
-	bit 6, a
+	bit CANT_SELECT_F, a
 	jr nz, ItemAttr_ReturnCarry
 	and a
 	ret
 
-CheckItemPocket:: ; d43d
+CheckItemPocket::
 ; Return the pocket for wCurItem in wItemAttributeParamBuffer.
 	ld a, ITEMATTR_POCKET
 	call GetItemAttr
@@ -514,7 +517,7 @@ CheckItemPocket:: ; d43d
 	ld [wItemAttributeParamBuffer], a
 	ret
 
-CheckItemContext: ; d448
+CheckItemContext:
 ; Return the context for wCurItem in wItemAttributeParamBuffer.
 	ld a, ITEMATTR_HELP
 	call GetItemAttr
@@ -522,7 +525,7 @@ CheckItemContext: ; d448
 	ld [wItemAttributeParamBuffer], a
 	ret
 
-CheckItemMenu: ; d453
+CheckItemMenu:
 ; Return the menu for wCurItem in wItemAttributeParamBuffer.
 	ld a, ITEMATTR_HELP
 	call GetItemAttr
@@ -531,7 +534,7 @@ CheckItemMenu: ; d453
 	ld [wItemAttributeParamBuffer], a
 	ret
 
-GetItemAttr: ; d460
+GetItemAttr:
 ; Get attribute a of wCurItem.
 
 	push hl
@@ -557,13 +560,13 @@ GetItemAttr: ; d460
 	pop hl
 	ret
 
-ItemAttr_ReturnCarry: ; d47f
+ItemAttr_ReturnCarry:
 	ld a, 1
 	ld [wItemAttributeParamBuffer], a
 	scf
 	ret
 
-GetItemPrice: ; d486
+GetItemPrice:
 ; Return the price of wCurItem in de.
 	push hl
 	push bc
diff --git a/engine/mart.asm b/engine/items/mart.asm
index 84888eccc..7e185662b 100755..100644
--- a/engine/mart.asm
+++ b/engine/items/mart.asm
@@ -6,7 +6,7 @@
 	const MARTTEXT_HERE_YOU_GO
 	const MARTTEXT_SOLD_OUT
 
-OpenMartDialog:: ; 15a45
+OpenMartDialog::
 	call GetMart
 	ld a, c
 	ld [wEngineBuffer1], a
@@ -15,7 +15,6 @@ OpenMartDialog:: ; 15a45
 	ld hl, .dialogs
 	rst JumpTable
 	ret
-; 15a57
 
 .dialogs
 	dw MartDialog
@@ -23,34 +22,31 @@ OpenMartDialog:: ; 15a45
 	dw BargainShop
 	dw Pharmacist
 	dw RooftopSale
-; 15a61
 
-MartDialog: ; 15a61
+MartDialog:
 	ld a, 0
 	ld [wEngineBuffer1], a
-	xor a
+	xor a ; STANDARDMART_HOWMAYIHELPYOU
 	ld [wEngineBuffer5], a
 	call StandardMart
 	ret
-; 15a6e
 
-HerbShop: ; 15a6e
+HerbShop:
 	call FarReadMart
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	ld hl, Text_HerbShop_Intro
 	call MartTextBox
 	call BuyMenu
 	ld hl, Text_HerbShop_ComeAgain
 	call MartTextBox
 	ret
-; 15a84
 
-BargainShop: ; 15a84
+BargainShop:
 	ld b, BANK(BargainShopData)
 	ld de, BargainShopData
 	call LoadMartPointer
 	call ReadMart
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	ld hl, Text_BargainShop_Intro
 	call MartTextBox
 	call BuyMenu
@@ -59,49 +55,46 @@ BargainShop: ; 15a84
 	or [hl]
 	jr z, .skip_set
 	ld hl, wDailyFlags
-	set 6, [hl]
+	set DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F, [hl]
 
 .skip_set
 	ld hl, Text_BargainShop_ComeAgain
 	call MartTextBox
 	ret
-; 15aae
 
-Pharmacist: ; 15aae
+Pharmacist:
 	call FarReadMart
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	ld hl, Text_Pharmacist_Intro
 	call MartTextBox
 	call BuyMenu
 	ld hl, Text_Pharmacist_ComeAgain
 	call MartTextBox
 	ret
-; 15ac4
 
-RooftopSale: ; 15ac4
-	ld b, BANK(RooftopSaleData1)
-	ld de, RooftopSaleData1
+RooftopSale:
+	ld b, BANK(RooftopSaleMart1)
+	ld de, RooftopSaleMart1
 	ld hl, wStatusFlags
-	bit 6, [hl] ; hall of fame
+	bit STATUSFLAGS_HALL_OF_FAME_F, [hl]
 	jr z, .ok
-	ld b, BANK(RooftopSaleData2)
-	ld de, RooftopSaleData2
+	ld b, BANK(RooftopSaleMart2)
+	ld de, RooftopSaleMart2
 
 .ok
 	call LoadMartPointer
 	call ReadMart
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	ld hl, Text_Mart_HowMayIHelpYou
 	call MartTextBox
 	call BuyMenu
 	ld hl, Text_Mart_ComeAgain
 	call MartTextBox
 	ret
-; 15aee
 
 INCLUDE "data/items/rooftop_sale.asm"
 
-LoadMartPointer: ; 15b10
+LoadMartPointer:
 	ld a, b
 	ld [wMartPointerBank], a
 	ld a, e
@@ -110,18 +103,17 @@ LoadMartPointer: ; 15b10
 	ld [wMartPointer + 1], a
 	ld hl, wCurMart
 	xor a
-	ld bc, 16
+	ld bc, wCurMartEnd - wCurMart
 	call ByteFill
 	xor a
 	ld [wEngineBuffer5], a
 	ld [wBargainShopFlags], a
 	ld [wFacingDirection], a
 	ret
-; 15b31
 
-GetMart: ; 15b31
+GetMart:
 	ld a, e
-	cp (MartsEnd - Marts) / 2
+	cp (Marts.End - Marts) / 2
 	jr c, .IsAMart
 	ld b, BANK(DefaultMart)
 	ld de, DefaultMart
@@ -136,38 +128,45 @@ GetMart: ; 15b31
 	ld d, [hl]
 	ld b, BANK(Marts)
 	ret
-; 15b47
 
-StandardMart: ; 15b47
+; StandardMart.MartFunctions indexes
+	const_def
+	const STANDARDMART_HOWMAYIHELPYOU ; 0
+	const STANDARDMART_TOPMENU        ; 1
+	const STANDARDMART_BUY            ; 2
+	const STANDARDMART_SELL           ; 3
+	const STANDARDMART_QUIT           ; 4
+	const STANDARDMART_ANYTHINGELSE   ; 5
+
+StandardMart:
 .loop
 	ld a, [wEngineBuffer5]
 	ld hl, .MartFunctions
 	rst JumpTable
 	ld [wEngineBuffer5], a
-	cp $ff
+	cp -1
 	jr nz, .loop
 	ret
 
 .MartFunctions:
+; entries correspond to STANDARDMART_* constants
 	dw .HowMayIHelpYou
 	dw .TopMenu
 	dw .Buy
 	dw .Sell
 	dw .Quit
 	dw .AnythingElse
-; 15b62
 
-.HowMayIHelpYou: ; 15b62
-	call LoadStandardMenuDataHeader
+.HowMayIHelpYou:
+	call LoadStandardMenuHeader
 	ld hl, Text_Mart_HowMayIHelpYou
 	call PrintText
-	ld a, $1 ; top menu
+	ld a, STANDARDMART_TOPMENU
 	ret
-; 15b6e
 
-.TopMenu: ; 15b6e
-	ld hl, MenuDataHeader_BuySell
-	call CopyMenuDataHeader
+.TopMenu:
+	ld hl, MenuHeader_BuySell
+	call CopyMenuHeader
 	call VerticalMenu
 	jr c, .quit
 	ld a, [wMenuCursorY]
@@ -176,49 +175,44 @@ StandardMart: ; 15b47
 	cp $2
 	jr z, .sell
 .quit
-	ld a, $4 ;  Come again!
+	ld a, STANDARDMART_QUIT
 	ret
 .buy
-	ld a, $2 ; buy
+	ld a, STANDARDMART_BUY
 	ret
 .sell
-	ld a, $3 ; sell
+	ld a, STANDARDMART_SELL
 	ret
-; 15b8d
 
-.Buy: ; 15b8d
+.Buy:
 	call ExitMenu
 	call FarReadMart
 	call BuyMenu
 	and a
-	ld a, $5 ; Anything else?
+	ld a, STANDARDMART_ANYTHINGELSE
 	ret
-; 15b9a
 
-.Sell: ; 15b9a
+.Sell:
 	call ExitMenu
 	call SellMenu
-	ld a, $5 ; Anything else?
+	ld a, STANDARDMART_ANYTHINGELSE
 	ret
-; 15ba3
 
-.Quit: ; 15ba3
+.Quit:
 	call ExitMenu
 	ld hl, Text_Mart_ComeAgain
 	call MartTextBox
-	ld a, $ff ; exit
+	ld a, -1
 	ret
-; 15baf
 
-.AnythingElse: ; 15baf
-	call LoadStandardMenuDataHeader
+.AnythingElse:
+	call LoadStandardMenuHeader
 	ld hl, Text_Mart_AnythingElse
 	call PrintText
-	ld a, $1 ; top menu
+	ld a, STANDARDMART_TOPMENU
 	ret
-; 15bbb
 
-FarReadMart: ; 15bbb
+FarReadMart:
 	ld hl, wMartPointer
 	ld a, [hli]
 	ld h, [hl]
@@ -246,16 +240,15 @@ FarReadMart: ; 15bbb
 
 .done
 	ret
-; 15be5
 
-GetMartItemPrice: ; 15be5
+GetMartItemPrice:
 ; Return the price of item a in BCD at hl and in tiles at wStringBuffer1.
 	push hl
 	ld [wCurItem], a
 	farcall GetItemPrice
 	pop hl
 
-GetMartPrice: ; 15bf0
+GetMartPrice:
 ; Return price de in BCD at hl and in tiles at wStringBuffer1.
 	push hl
 	ld a, d
@@ -280,9 +273,8 @@ GetMartPrice: ; 15bf0
 	dec c
 	jr nz, .loop
 	ret
-; 15c1a
 
-.CharToNybble: ; 15c1a
+.CharToNybble:
 	ld a, [de]
 	inc de
 	cp " "
@@ -292,9 +284,8 @@ GetMartPrice: ; 15bf0
 .not_space
 	sub "0"
 	ret
-; 15c25
 
-ReadMart: ; 15c25
+ReadMart:
 ; Load the mart pointer.  Mart data is local (no need for bank).
 	ld hl, wMartPointer
 	ld a, [hli]
@@ -337,12 +328,10 @@ ReadMart: ; 15c25
 	ld a, [hl]
 	ld [wCurMart], a
 	ret
-; 15c51
 
 INCLUDE "data/items/bargain_shop.asm"
 
-
-BuyMenu: ; 15c62
+BuyMenu:
 	call FadeToMenu
 	farcall BlankScreen
 	xor a
@@ -354,9 +343,8 @@ BuyMenu: ; 15c62
 	jr nc, .loop
 	call CloseSubmenu
 	ret
-; 15c7d
 
-LoadBuyMenuText: ; 15c7d
+LoadBuyMenuText:
 ; load text from a nested table
 ; which table is in wEngineBuffer1
 ; which entry is in register a
@@ -375,9 +363,8 @@ LoadBuyMenuText: ; 15c7d
 	ld l, a
 	call PrintText
 	ret
-; 15c91
 
-MartAskPurchaseQuantity: ; 15c91
+MartAskPurchaseQuantity:
 	call GetMartDialogGroup ; gets a pointer from GetMartDialogGroup.MartTextFunctionPointers
 	inc hl
 	inc hl
@@ -387,9 +374,8 @@ MartAskPurchaseQuantity: ; 15c91
 	cp 1
 	jp z, BargainShopAskPurchaseQuantity
 	jp RooftopSaleAskPurchaseQuantity
-; 15ca3
 
-GetMartDialogGroup: ; 15ca3
+GetMartDialogGroup:
 	ld a, [wEngineBuffer1]
 	ld e, a
 	ld d, 0
@@ -398,17 +384,15 @@ GetMartDialogGroup: ; 15ca3
 	add hl, de
 	add hl, de
 	ret
-; 15cb0
 
-.MartTextFunctionPointers: ; 15cb0
+.MartTextFunctionPointers:
 	dwb .StandardMartPointers, 0
 	dwb .HerbShopPointers, 0
 	dwb .BargainShopPointers, 1
 	dwb .PharmacyPointers, 0
 	dwb .StandardMartPointers, 2
-; 15cbf
 
-.StandardMartPointers: ; 15cbf
+.StandardMartPointers:
 	dw Text_Mart_HowMany
 	dw Text_Mart_CostsThisMuch
 	dw Text_Mart_InsufficientFunds
@@ -416,7 +400,7 @@ GetMartDialogGroup: ; 15ca3
 	dw Text_Mart_HereYouGo
 	dw BuyMenuLoop
 
-.HerbShopPointers: ; 15ccb
+.HerbShopPointers:
 	dw Text_HerbShop_HowMany
 	dw Text_HerbShop_CostsThisMuch
 	dw Text_HerbShop_InsufficientFunds
@@ -424,7 +408,7 @@ GetMartDialogGroup: ; 15ca3
 	dw Text_HerbShop_HereYouGo
 	dw BuyMenuLoop
 
-.BargainShopPointers: ; 15cd7
+.BargainShopPointers:
 	dw BuyMenuLoop
 	dw Text_BargainShop_CostsThisMuch
 	dw Text_BargainShop_InsufficientFunds
@@ -432,21 +416,19 @@ GetMartDialogGroup: ; 15ca3
 	dw Text_BargainShop_HereYouGo
 	dw Text_BargainShop_SoldOut
 
-.PharmacyPointers: ; 15ce3
+.PharmacyPointers:
 	dw Text_Pharmacy_HowMany
 	dw Text_Pharmacy_CostsThisMuch
 	dw Text_Pharmacy_InsufficientFunds
 	dw Text_Pharmacy_BagFull
 	dw Text_Pharmacy_HereYouGo
 	dw BuyMenuLoop
-; 15cef
-
 
-BuyMenuLoop: ; 15cef
-	farcall Special_PlaceMoneyTopRight
+BuyMenuLoop:
+	farcall PlaceMoneyTopRight
 	call UpdateSprites
-	ld hl, MenuDataHeader_Buy
-	call CopyMenuDataHeader
+	ld hl, MenuHeader_Buy
+	call CopyMenuHeader
 	ld a, [wMenuCursorBufferBackup]
 	ld [wMenuCursorBuffer], a
 	ld a, [wMenuScrollPositionBackup]
@@ -470,7 +452,7 @@ BuyMenuLoop: ; 15cef
 	jr c, .cancel
 	ld de, wMoney
 	ld bc, hMoneyTemp
-	ld a, $3 ; useless load
+	ld a, 3 ; useless load
 	call CompareMoney
 	jr c, .insufficient_funds
 	ld hl, wNumItems
@@ -478,7 +460,7 @@ BuyMenuLoop: ; 15cef
 	jr nc, .insufficient_bag_space
 	ld a, [wMartItemID]
 	ld e, a
-	ld d, $0
+	ld d, 0
 	ld b, SET_FLAG
 	ld hl, wBargainShopFlags
 	call FlagAction
@@ -512,7 +494,6 @@ BuyMenuLoop: ; 15cef
 	call JoyWaitAorB
 	and a
 	ret
-; 15d83
 
 StandardMartAskPurchaseQuantity:
 	ld a, 99
@@ -522,22 +503,20 @@ StandardMartAskPurchaseQuantity:
 	farcall SelectQuantityToBuy
 	call ExitMenu
 	ret
-; 15d97
 
-MartConfirmPurchase: ; 15d97
+MartConfirmPurchase:
 	predef PartyMonItemName
 	ld a, MARTTEXT_COSTS_THIS_MUCH
 	call LoadBuyMenuText
 	call YesNoBox
 	ret
-; 15da5
 
 BargainShopAskPurchaseQuantity:
 	ld a, 1
 	ld [wItemQuantityChangeBuffer], a
 	ld a, [wMartItemID]
 	ld e, a
-	ld d, $0
+	ld d, 0
 	ld b, CHECK_FLAG
 	ld hl, wBargainShopFlags
 	call FlagAction
@@ -546,7 +525,7 @@ BargainShopAskPurchaseQuantity:
 	jr nz, .SoldOut
 	ld a, [wMartItemID]
 	ld e, a
-	ld d, $0
+	ld d, 0
 	ld hl, wMartPointer
 	ld a, [hli]
 	ld h, [hl]
@@ -571,7 +550,6 @@ BargainShopAskPurchaseQuantity:
 	call JoyWaitAorB
 	scf
 	ret
-; 15de2
 
 RooftopSaleAskPurchaseQuantity:
 	ld a, MARTTEXT_HOW_MANY
@@ -582,9 +560,8 @@ RooftopSaleAskPurchaseQuantity:
 	farcall RooftopSale_SelectQuantityToBuy
 	call ExitMenu
 	ret
-; 15df9
 
-.GetSalePrice: ; 15df9
+.GetSalePrice:
 	ld a, [wMartItemID]
 	ld e, a
 	ld d, 0
@@ -601,29 +578,24 @@ RooftopSaleAskPurchaseQuantity:
 	inc hl
 	ld d, [hl]
 	ret
-; 15e0e
-
 
-Text_Mart_HowMany: ; 0x15e0e
+Text_Mart_HowMany:
 	; How many?
 	text_jump UnknownText_0x1c4bfd
 	db "@"
-; 0x15e13
 
-Text_Mart_CostsThisMuch: ; 0x15e13
+Text_Mart_CostsThisMuch:
 	; @ (S) will be ¥@ .
 	text_jump UnknownText_0x1c4c08
 	db "@"
-; 0x15e18
 
-MenuDataHeader_Buy: ; 0x15e18
+MenuHeader_Buy:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .menudata2
+	dw .MenuData
 	db 1 ; default option
-; 0x15e20
 
-.menudata2 ; 0x15e20
+.MenuData
 	db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags
 	db 4, 8 ; rows, columns
 	db 1 ; horizontal spacing
@@ -631,9 +603,8 @@ MenuDataHeader_Buy: ; 0x15e18
 	dba PlaceMenuItemName
 	dba .PrintBCDPrices
 	dba UpdateItemDescription
-; 15e30
 
-.PrintBCDPrices: ; 15e30
+.PrintBCDPrices:
 	ld a, [wScrollingMenuCursorPosition]
 	ld c, a
 	ld b, 0
@@ -650,136 +621,113 @@ MenuDataHeader_Buy: ; 0x15e18
 	ld c, PRINTNUM_LEADINGZEROS | PRINTNUM_MONEY | 3
 	call PrintBCDNumber
 	ret
-; 15e4a (5:5e4a)
 
-Text_HerbShop_Intro: ; 0x15e4a
+Text_HerbShop_Intro:
 	; Hello, dear. I sell inexpensive herbal medicine. They're good, but a trifle bitter. Your #MON may not like them. Hehehehe…
 	text_jump UnknownText_0x1c4c28
 	db "@"
-; 0x15e4f
 
-Text_HerbShop_HowMany: ; 0x15e4f
+Text_HerbShop_HowMany:
 	; How many?
 	text_jump UnknownText_0x1c4ca3
 	db "@"
-; 0x15e54
 
-Text_HerbShop_CostsThisMuch: ; 0x15e54
+Text_HerbShop_CostsThisMuch:
 	; @ (S) will be ¥@ .
 	text_jump UnknownText_0x1c4cae
 	db "@"
-; 0x15e59
 
-Text_HerbShop_HereYouGo: ; 0x15e59
+Text_HerbShop_HereYouGo:
 	; Thank you, dear. Hehehehe…
 	text_jump UnknownText_0x1c4cce
 	db "@"
-; 0x15e5e
 
-Text_HerbShop_BagFull: ; 0x15e5e
+Text_HerbShop_BagFull:
 	; Oh? Your PACK is full, dear.
 	text_jump UnknownText_0x1c4cea
 	db "@"
-; 0x15e63
 
-Text_HerbShop_InsufficientFunds: ; 0x15e63
+Text_HerbShop_InsufficientFunds:
 	; Hehehe… You don't have the money.
 	text_jump UnknownText_0x1c4d08
 	db "@"
-; 0x15e68
 
-Text_HerbShop_ComeAgain: ; 0x15e68
+Text_HerbShop_ComeAgain:
 	; Come again, dear. Hehehehe…
 	text_jump UnknownText_0x1c4d2a
 	db "@"
-; 0x15e6d
 
-Text_BargainShop_Intro: ; 0x15e6d
+Text_BargainShop_Intro:
 	; Hiya! Care to see some bargains? I sell rare items that nobody else carries--but only one of each item.
 	text_jump UnknownText_0x1c4d47
 	db "@"
-; 0x15e72
 
-Text_BargainShop_CostsThisMuch: ; 0x15e72
+Text_BargainShop_CostsThisMuch:
 	; costs ¥@ . Want it?
 	text_jump UnknownText_0x1c4db0
 	db "@"
-; 0x15e77
 
-Text_BargainShop_HereYouGo: ; 0x15e77
+Text_BargainShop_HereYouGo:
 	; Thanks.
 	text_jump UnknownText_0x1c4dcd
 	db "@"
-; 0x15e7c
 
-Text_BargainShop_BagFull: ; 0x15e7c
+Text_BargainShop_BagFull:
 	; Uh-oh, your PACK is chock-full.
 	text_jump UnknownText_0x1c4dd6
 	db "@"
-; 0x15e81
 
-Text_BargainShop_SoldOut: ; 0x15e81
+Text_BargainShop_SoldOut:
 	; You bought that already. I'm all sold out of it.
 	text_jump UnknownText_0x1c4df7
 	db "@"
-; 0x15e86
 
-Text_BargainShop_InsufficientFunds: ; 0x15e86
+Text_BargainShop_InsufficientFunds:
 	; Uh-oh, you're short on funds.
 	text_jump UnknownText_0x1c4e28
 	db "@"
-; 0x15e8b
 
-Text_BargainShop_ComeAgain: ; 0x15e8b
+Text_BargainShop_ComeAgain:
 	; Come by again sometime.
 	text_jump UnknownText_0x1c4e46
 	db "@"
-; 0x15e90
 
-Text_Pharmacist_Intro: ; 0x15e90
+Text_Pharmacist_Intro:
 	; What's up? Need some medicine?
 	text_jump UnknownText_0x1c4e5f
 	db "@"
-; 0x15e95
 
-Text_Pharmacy_HowMany: ; 0x15e95
+Text_Pharmacy_HowMany:
 	; How many?
 	text_jump UnknownText_0x1c4e7e
 	db "@"
-; 0x15e9a
 
-Text_Pharmacy_CostsThisMuch: ; 0x15e9a
+Text_Pharmacy_CostsThisMuch:
 	; @ (S) will cost ¥@ .
 	text_jump UnknownText_0x1c4e89
 	db "@"
-; 0x15e9f
 
-Text_Pharmacy_HereYouGo: ; 0x15e9f
+Text_Pharmacy_HereYouGo:
 	; Thanks much!
 	text_jump UnknownText_0x1c4eab
 	db "@"
-; 0x15ea4
 
-Text_Pharmacy_BagFull: ; 0x15ea4
+Text_Pharmacy_BagFull:
 	; You don't have any more space.
 	text_jump UnknownText_0x1c4eb9
 	db "@"
-; 0x15ea9
 
-Text_Pharmacy_InsufficientFunds: ; 0x15ea9
+Text_Pharmacy_InsufficientFunds:
 	; Huh? That's not enough money.
 	text_jump UnknownText_0x1c4ed8
 	db "@"
-; 0x15eae
 
-Text_Pharmacist_ComeAgain: ; 0x15eae
+Text_Pharmacist_ComeAgain:
 	; All right. See you around.
 	text_jump UnknownText_0x1c4ef6
 	db "@"
-; 0x15eb3
 
-
-SellMenu: ; 15eb3
+SellMenu:
 	call DisableSpriteUpdates
 	farcall DepositSellInitPackBuffers
 .loop
@@ -794,31 +742,26 @@ SellMenu: ; 15eb3
 	call ReturnToMapWithSpeechTextbox
 	and a
 	ret
-; 15ed3
 
 .Unreferenced_NothingToSell:
 	ld hl, .NothingToSellText
 	call MenuTextBoxBackup
 	and a
 	ret
-; 15edb
 
-.NothingToSellText: ; 0x15edb
+.NothingToSellText:
 	; You don't have anything to sell.
 	text_jump UnknownText_0x1c4f12
 	db "@"
-; 0x15ee0
-
 
-.TryToSellItem: ; 15ee0
+.TryToSellItem:
 	farcall CheckItemMenu
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, .dw
 	rst JumpTable
 	ret
-; 15eee
 
-.dw ; 15eee
+.dw
 	dw .try_sell
 	dw .cant_buy
 	dw .cant_buy
@@ -826,14 +769,11 @@ SellMenu: ; 15eb3
 	dw .try_sell
 	dw .try_sell
 	dw .try_sell
-; 15efc
 
-.cant_buy ; 15efc
+.cant_buy
 	ret
-; 15efd
-
 
-.try_sell ; 15efd
+.try_sell
 	farcall _CheckTossableItem
 	ld a, [wItemAttributeParamBuffer]
 	and a
@@ -877,94 +817,79 @@ SellMenu: ; 15eb3
 	call ExitMenu
 	and a
 	ret
-; 15f73
 
-Text_Mart_SellHowMany: ; 0x15f73
+Text_Mart_SellHowMany:
 	; How many?
 	text_jump UnknownText_0x1c4f33
 	db "@"
-; 0x15f78
 
-Text_Mart_ICanPayThisMuch: ; 0x15f78
+Text_Mart_ICanPayThisMuch:
 	; I can pay you ¥@ . Is that OK?
 	text_jump UnknownText_0x1c4f3e
 	db "@"
-; 0x15f7d
 
-.UnusedString15f7d: ; 15f7d
+.UnusedString15f7d:
 	db "！ダミー！@"
 
-Text_Mart_HowMayIHelpYou: ; 0x15f83
+Text_Mart_HowMayIHelpYou:
 	; Welcome! How may I help you?
 	text_jump UnknownText_0x1c4f62
 	db "@"
-; 0x15f88
 
-MenuDataHeader_BuySell: ; 0x15f88
+MenuHeader_BuySell:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 7, 8
-	dw .menudata2
+	dw .MenuData
 	db 1 ; default option
-; 0x15f90
 
-.menudata2 ; 0x15f90
+.MenuData
 	db STATICMENU_CURSOR ; strings
 	db 3 ; items
 	db "BUY@"
 	db "SELL@"
 	db "QUIT@"
-; 0x15f96
 
-Text_Mart_HereYouGo: ; 0x15fa0
+Text_Mart_HereYouGo:
 	; Here you are. Thank you!
 	text_jump UnknownText_0x1c4f80
 	db "@"
-; 0x15fa5
 
-Text_Mart_InsufficientFunds: ; 0x15fa5
+Text_Mart_InsufficientFunds:
 	; You don't have enough money.
 	text_jump UnknownText_0x1c4f9a
 	db "@"
-; 0x15faa
 
-Text_Mart_BagFull: ; 0x15faa
+Text_Mart_BagFull:
 	; You can't carry any more items.
 	text_jump UnknownText_0x1c4fb7
 	db "@"
-; 0x15faf
 
-TextMart_CantBuyFromYou: ; 0x15faf
+TextMart_CantBuyFromYou:
 	; Sorry, I can't buy that from you.
 	text_jump UnknownText_0x1c4fd7
 	db "@"
-; 0x15fb4
 
-Text_Mart_ComeAgain: ; 0x15fb4
+Text_Mart_ComeAgain:
 	; Please come again!
 	text_jump UnknownText_0x1c4ff9
 	db "@"
-; 0x15fb9
 
-Text_Mart_AnythingElse: ; 0x15fb9
+Text_Mart_AnythingElse:
 	text_jump UnknownText_0x1c500d
 	db "@"
-; 0x15fbe
 
-Text_Mart_SoldForAmount: ; 0x15fbe
+Text_Mart_SoldForAmount:
 	text_jump UnknownText_0x1c502e
 	db "@"
-; 0x15fc3
 
-PlayTransactionSound: ; 15fc3
+PlayTransactionSound:
 	call WaitSFX
 	ld de, SFX_TRANSACTION
 	call PlaySFX
 	ret
-; 15fcd
 
-MartTextBox: ; 15fcd
+MartTextBox:
 	call MenuTextBox
 	call JoyWaitAorB
 	call ExitMenu
 	ret
-; 15fd7
diff --git a/engine/pack.asm b/engine/items/pack.asm
index e900c75b8..67e9fe900 100644
--- a/engine/pack.asm
+++ b/engine/items/pack.asm
@@ -12,7 +12,7 @@
 	const PACKSTATE_QUITNOSCRIPT       ;  9
 	const PACKSTATE_QUITRUNSCRIPT      ; 10
 
-Pack: ; 10000
+Pack:
 	ld hl, wOptions
 	set NO_TEXT_SCROLL, [hl]
 	call InitPackBuffers
@@ -31,17 +31,14 @@ Pack: ; 10000
 	ld hl, wOptions
 	res NO_TEXT_SCROLL, [hl]
 	ret
-; 10026
 
-.RunJumptable: ; 10026
+.RunJumptable:
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pack_GetJumptablePointer
 	jp hl
 
-; 10030
-
-.Jumptable: ; 10030 (4:4030)
+.Jumptable:
 ; entries correspond to PACKSTATE_* constants
 	dw .InitGFX            ;  0
 	dw .InitItemsPocket    ;  1
@@ -55,7 +52,7 @@ Pack: ; 10000
 	dw Pack_QuitNoScript   ;  9
 	dw Pack_QuitRunScript  ; 10
 
-.InitGFX: ; 10046 (4:4046)
+.InitGFX:
 	xor a
 	ld [hBGMapMode], a
 	call Pack_InitGFX
@@ -64,7 +61,7 @@ Pack: ; 10000
 	call Pack_InitColors
 	ret
 
-.InitItemsPocket: ; 10056 (4:4056)
+.InitItemsPocket:
 	xor a ; ITEM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -73,9 +70,9 @@ Pack: ; 10000
 	call Pack_JumptableNext
 	ret
 
-.ItemsPocketMenu: ; 10067 (4:4067)
-	ld hl, ItemsPocketMenuDataHeader
-	call CopyMenuDataHeader
+.ItemsPocketMenu:
+	ld hl, ItemsPocketMenuHeader
+	call CopyMenuHeader
 	ld a, [wItemsPocketCursor]
 	ld [wMenuCursorBuffer], a
 	ld a, [wItemsPocketScrollPosition]
@@ -92,7 +89,7 @@ Pack: ; 10000
 	call .ItemBallsKey_LoadSubmenu
 	ret
 
-.InitKeyItemsPocket: ; 10094 (4:4094)
+.InitKeyItemsPocket:
 	ld a, KEY_ITEM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -101,9 +98,9 @@ Pack: ; 10000
 	call Pack_JumptableNext
 	ret
 
-.KeyItemsPocketMenu: ; 100a6 (4:40a6)
-	ld hl, KeyItemsPocketMenuDataHeader
-	call CopyMenuDataHeader
+.KeyItemsPocketMenu:
+	ld hl, KeyItemsPocketMenuHeader
+	call CopyMenuHeader
 	ld a, [wKeyItemsPocketCursor]
 	ld [wMenuCursorBuffer], a
 	ld a, [wKeyItemsPocketScrollPosition]
@@ -120,7 +117,7 @@ Pack: ; 10000
 	call .ItemBallsKey_LoadSubmenu
 	ret
 
-.InitTMHMPocket: ; 100d3 (4:40d3)
+.InitTMHMPocket:
 	ld a, TM_HM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -131,7 +128,7 @@ Pack: ; 10000
 	call Pack_JumptableNext
 	ret
 
-.TMHMPocketMenu: ; 100e8 (4:40e8)
+.TMHMPocketMenu:
 	farcall TMHMPocket
 	ld b, PACKSTATE_INITKEYITEMSPOCKET ; left
 	ld c, PACKSTATE_INITITEMSPOCKET ; right
@@ -141,16 +138,16 @@ Pack: ; 10000
 	ld a, [wItemAttributeParamBuffer]
 	and a
 	jr nz, .use_quit
-	ld hl, .MenuDataHeader2
+	ld hl, .MenuHeader2
 	ld de, .Jumptable2
 	jr .load_jump
 
 .use_quit
-	ld hl, .MenuDataHeader1
+	ld hl, .MenuHeader1
 	ld de, .Jumptable1
 .load_jump
 	push de
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 	call VerticalMenu
 	call ExitMenu
 	pop hl
@@ -160,49 +157,41 @@ Pack: ; 10000
 	call Pack_GetJumptablePointer
 	jp hl
 
-; 10124 (4:4124)
-.MenuDataHeader1: ; 0x10124
+.MenuHeader1:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2_1
+	dw .MenuData_1
 	db 1 ; default option
-; 0x1012c
 
-.MenuData2_1: ; 0x1012c
+.MenuData_1:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "USE@"
 	db "QUIT@"
-; 0x10137
 
-.Jumptable1: ; 10137
+.Jumptable1:
 	dw .UseItem
 	dw QuitItemSubmenu
 
-; 1013b
-
-.MenuDataHeader2: ; 0x1013b
+.MenuHeader2:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2_2
+	dw .MenuData_2
 	db 1 ; default option
-; 0x10143
 
-.MenuData2_2: ; 0x10143
+.MenuData_2:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 3 ; items
 	db "USE@"
 	db "GIVE@"
 	db "QUIT@"
-; 0x10153
 
-.Jumptable2: ; 10153
+.Jumptable2:
 	dw .UseItem
 	dw GiveItem
 	dw QuitItemSubmenu
-; 10159
 
-.UseItem: ; 10159
+.UseItem:
 	farcall AskTeachTMHM
 	ret c
 	farcall ChooseMonToLearnTMHM
@@ -222,7 +211,7 @@ Pack: ; 10000
 	call Pack_InitColors
 	ret
 
-.InitBallsPocket: ; 10186 (4:4186)
+.InitBallsPocket:
 	ld a, BALL_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -231,9 +220,9 @@ Pack: ; 10000
 	call Pack_JumptableNext
 	ret
 
-.BallsPocketMenu: ; 10198 (4:4198)
-	ld hl, BallsPocketMenuDataHeader
-	call CopyMenuDataHeader
+.BallsPocketMenu:
+	ld hl, BallsPocketMenuHeader
+	call CopyMenuHeader
 	ld a, [wBallsPocketCursor]
 	ld [wMenuCursorBuffer], a
 	ld a, [wBallsPocketScrollPosition]
@@ -250,7 +239,7 @@ Pack: ; 10000
 	call .ItemBallsKey_LoadSubmenu
 	ret
 
-.ItemBallsKey_LoadSubmenu: ; 101c5 (4:41c5)
+.ItemBallsKey_LoadSubmenu:
 	farcall _CheckTossableItem
 	ld a, [wItemAttributeParamBuffer]
 	and a
@@ -280,36 +269,36 @@ Pack: ; 10000
 	jr .tossable_unselectable
 
 .usable
-	ld hl, MenuDataHeader_UsableKeyItem
+	ld hl, MenuHeader_UsableKeyItem
 	ld de, Jumptable_UseGiveTossRegisterQuit
 	jr .build_menu
 
 .selectable_usable
-	ld hl, MenuDataHeader_UsableItem
+	ld hl, MenuHeader_UsableItem
 	ld de, Jumptable_UseGiveTossQuit
 	jr .build_menu
 
 .tossable_selectable
-	ld hl, MenuDataHeader_UnusableItem
+	ld hl, MenuHeader_UnusableItem
 	ld de, Jumptable_UseQuit
 	jr .build_menu
 
 .tossable_unselectable
-	ld hl, MenuDataHeader_UnusableKeyItem
+	ld hl, MenuHeader_UnusableKeyItem
 	ld de, Jumptable_UseRegisterQuit
 	jr .build_menu
 
 .unusable
-	ld hl, MenuDataHeader_HoldableKeyItem
+	ld hl, MenuHeader_HoldableKeyItem
 	ld de, Jumptable_GiveTossRegisterQuit
 	jr .build_menu
 
 .selectable_unusable
-	ld hl, MenuDataHeader_HoldableItem
+	ld hl, MenuHeader_HoldableItem
 	ld de, Jumptable_GiveTossQuit
 .build_menu
 	push de
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 	call VerticalMenu
 	call ExitMenu
 	pop hl
@@ -319,15 +308,13 @@ Pack: ; 10000
 	call Pack_GetJumptablePointer
 	jp hl
 
-; 10249 (4:4249)
-MenuDataHeader_UsableKeyItem: ; 0x10249
+MenuHeader_UsableKeyItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x10251
 
-.MenuData2: ; 0x10251
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 5 ; items
 	db "USE@"
@@ -335,133 +322,114 @@ MenuDataHeader_UsableKeyItem: ; 0x10249
 	db "TOSS@"
 	db "SEL@"
 	db "QUIT@"
-; 0x1026a
 
-Jumptable_UseGiveTossRegisterQuit: ; 1026a
+Jumptable_UseGiveTossRegisterQuit:
 	dw UseItem
 	dw GiveItem
 	dw TossMenu
 	dw RegisterItem
 	dw QuitItemSubmenu
-; 10274
 
-MenuDataHeader_UsableItem: ; 0x10274
+MenuHeader_UsableItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x1027c
 
-.MenuData2: ; 0x1027c
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 4 ; items
 	db "USE@"
 	db "GIVE@"
 	db "TOSS@"
 	db "QUIT@"
-; 0x10291
 
-Jumptable_UseGiveTossQuit: ; 10291
+Jumptable_UseGiveTossQuit:
 	dw UseItem
 	dw GiveItem
 	dw TossMenu
 	dw QuitItemSubmenu
-; 10299
 
-MenuDataHeader_UnusableItem: ; 0x10299
+MenuHeader_UnusableItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x102a1
 
-.MenuData2: ; 0x102a1
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "USE@"
 	db "QUIT@"
-; 0x102ac
 
-Jumptable_UseQuit: ; 102ac
+Jumptable_UseQuit:
 	dw UseItem
 	dw QuitItemSubmenu
-; 102b0
 
-MenuDataHeader_UnusableKeyItem: ; 0x102b0
+MenuHeader_UnusableKeyItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x102b8
 
-.MenuData2: ; 0x102b8
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 3 ; items
 	db "USE@"
 	db "SEL@"
 	db "QUIT@"
-; 0x102c7
 
-Jumptable_UseRegisterQuit: ; 102c7
+Jumptable_UseRegisterQuit:
 	dw UseItem
 	dw RegisterItem
 	dw QuitItemSubmenu
-; 102cd
 
-MenuDataHeader_HoldableKeyItem: ; 0x102cd
+MenuHeader_HoldableKeyItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x102d5
 
-.MenuData2: ; 0x102d5
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 4 ; items
 	db "GIVE@"
 	db "TOSS@"
 	db "SEL@"
 	db "QUIT@"
-; 0x102ea
 
-Jumptable_GiveTossRegisterQuit: ; 102ea
+Jumptable_GiveTossRegisterQuit:
 	dw GiveItem
 	dw TossMenu
 	dw RegisterItem
 	dw QuitItemSubmenu
-; 102f2
 
-MenuDataHeader_HoldableItem: ; 0x102f2
+MenuHeader_HoldableItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x102fa
 
-.MenuData2: ; 0x102fa
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 3 ; items
 	db "GIVE@"
 	db "TOSS@"
 	db "QUIT@"
-; 0x1030b
 
-Jumptable_GiveTossQuit: ; 1030b
+Jumptable_GiveTossQuit:
 	dw GiveItem
 	dw TossMenu
 	dw QuitItemSubmenu
 
-; 10311
-
-UseItem: ; 10311
+UseItem:
 	farcall CheckItemMenu
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, .dw
 	rst JumpTable
 	ret
-; 1031f
 
-.dw ; 1031f (4:431f)
+.dw
 ; entries correspond to ITEMMENU_* constants
 	dw .Oak     ; ITEMMENU_NOUSE
 	dw .Oak
@@ -470,18 +438,17 @@ UseItem: ; 10311
 	dw .Current ; ITEMMENU_CURRENT
 	dw .Party   ; ITEMMENU_PARTY
 	dw .Field   ; ITEMMENU_CLOSE
-; 1035c
 
-.Oak: ; 1032d (4:432d)
+.Oak:
 	ld hl, Text_ThisIsntTheTime
 	call Pack_PrintTextNoScroll
 	ret
 
-.Current: ; 10334 (4:4334)
+.Current:
 	call DoItemEffect
 	ret
 
-.Party: ; 10338 (4:4338)
+.Party:
 	ld a, [wPartyCount]
 	and a
 	jr z, .NoPokemon
@@ -494,11 +461,11 @@ UseItem: ; 10311
 	ret
 
 .NoPokemon:
-	ld hl, TextJump_YouDontHaveAPkmn
+	ld hl, TextJump_YouDontHaveAMon
 	call Pack_PrintTextNoScroll
 	ret
 
-.Field: ; 10355 (4:4355)
+.Field:
 	call DoItemEffect
 	ld a, [wItemEffectSucceeded]
 	and a
@@ -506,9 +473,8 @@ UseItem: ; 10311
 	ld a, PACKSTATE_QUITRUNSCRIPT
 	ld [wJumptableIndex], a
 	ret
-; 10364 (4:4364)
 
-TossMenu: ; 10364
+TossMenu:
 	ld hl, Text_ThrowAwayHowMany
 	call Pack_PrintTextNoScroll
 	farcall SelectQuantityToToss
@@ -532,9 +498,8 @@ TossMenu: ; 10364
 	call Pack_PrintTextNoScroll
 .finish
 	ret
-; 1039d
 
-Unreferenced_ResetPocketCursorPositions: ; 1039d
+Unreferenced_ResetPocketCursorPositions:
 	ld a, [wCurrPocket]
 	and a ; ITEM_POCKET
 	jr z, .items
@@ -561,9 +526,8 @@ Unreferenced_ResetPocketCursorPositions: ; 1039d
 	ld [wKeyItemsPocketCursor], a
 	ld [wKeyItemsPocketScrollPosition], a
 	ret
-; 103c2
 
-RegisterItem: ; 103c2
+RegisterItem:
 	farcall CheckSelectableItem
 	ld a, [wItemAttributeParamBuffer]
 	and a
@@ -571,11 +535,11 @@ RegisterItem: ; 103c2
 	ld a, [wCurrPocket]
 	rrca
 	rrca
-	and $c0
+	and REGISTERED_POCKET
 	ld b, a
 	ld a, [wCurItemQuantity]
 	inc a
-	and $3f
+	and REGISTERED_NUMBER
 	or b
 	ld [wWhichRegisteredItem], a
 	ld a, [wCurItem]
@@ -591,9 +555,8 @@ RegisterItem: ; 103c2
 	ld hl, Text_CantRegister
 	call Pack_PrintTextNoScroll
 	ret
-; 103fd
 
-GiveItem: ; 103fd
+GiveItem:
 	ld a, [wPartyCount]
 	and a
 	jp z, .NoPokemon
@@ -647,22 +610,19 @@ GiveItem: ; 103fd
 	call Pack_InitColors
 	ret
 
-.NoPokemon: ; 10486 (4:4486)
-	ld hl, TextJump_YouDontHaveAPkmn
+.NoPokemon:
+	ld hl, TextJump_YouDontHaveAMon
 	call Pack_PrintTextNoScroll
 	ret
-; 1048d (4:448d)
-.Egg: ; 0x1048d
+.Egg:
 	; An EGG can't hold an item.
 	text_jump Text_AnEGGCantHoldAnItem
 	db "@"
-; 0x10492
 
-QuitItemSubmenu: ; 10492
+QuitItemSubmenu:
 	ret
-; 10493
 
-BattlePack: ; 10493
+BattlePack:
 	ld hl, wOptions
 	set NO_TEXT_SCROLL, [hl]
 	call InitPackBuffers
@@ -681,17 +641,14 @@ BattlePack: ; 10493
 	ld hl, wOptions
 	res NO_TEXT_SCROLL, [hl]
 	ret
-; 104b9
 
-.RunJumptable: ; 104b9
+.RunJumptable:
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pack_GetJumptablePointer
 	jp hl
 
-; 104c3
-
-.Jumptable: ; 104c3 (4:44c3)
+.Jumptable:
 ; entries correspond to PACKSTATE_* constants
 	dw .InitGFX            ;  0
 	dw .InitItemsPocket    ;  1
@@ -705,7 +662,7 @@ BattlePack: ; 10493
 	dw Pack_QuitNoScript   ;  9
 	dw Pack_QuitRunScript  ; 10
 
-.InitGFX: ; 104d9 (4:44d9)
+.InitGFX:
 	xor a
 	ld [hBGMapMode], a
 	call Pack_InitGFX
@@ -714,7 +671,7 @@ BattlePack: ; 10493
 	call Pack_InitColors
 	ret
 
-.InitItemsPocket: ; 104e9 (4:44e9)
+.InitItemsPocket:
 	xor a ; ITEM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -723,9 +680,9 @@ BattlePack: ; 10493
 	call Pack_JumptableNext
 	ret
 
-.ItemsPocketMenu: ; 104fa (4:44fa)
-	ld hl, ItemsPocketMenuDataHeader
-	call CopyMenuDataHeader
+.ItemsPocketMenu:
+	ld hl, ItemsPocketMenuHeader
+	call CopyMenuHeader
 	ld a, [wItemsPocketCursor]
 	ld [wMenuCursorBuffer], a
 	ld a, [wItemsPocketScrollPosition]
@@ -742,7 +699,7 @@ BattlePack: ; 10493
 	call ItemSubmenu
 	ret
 
-.InitKeyItemsPocket: ; 10527 (4:4527)
+.InitKeyItemsPocket:
 	ld a, KEY_ITEM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -751,9 +708,9 @@ BattlePack: ; 10493
 	call Pack_JumptableNext
 	ret
 
-.KeyItemsPocketMenu: ; 10539 (4:4539)
-	ld hl, KeyItemsPocketMenuDataHeader
-	call CopyMenuDataHeader
+.KeyItemsPocketMenu:
+	ld hl, KeyItemsPocketMenuHeader
+	call CopyMenuHeader
 	ld a, [wKeyItemsPocketCursor]
 	ld [wMenuCursorBuffer], a
 	ld a, [wKeyItemsPocketScrollPosition]
@@ -770,7 +727,7 @@ BattlePack: ; 10493
 	call ItemSubmenu
 	ret
 
-.InitTMHMPocket: ; 10566 (4:4566)
+.InitTMHMPocket:
 	ld a, TM_HM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -783,7 +740,7 @@ BattlePack: ; 10493
 	call Pack_JumptableNext
 	ret
 
-.TMHMPocketMenu: ; 10581 (4:4581)
+.TMHMPocketMenu:
 	farcall TMHMPocket
 	ld b, PACKSTATE_INITKEYITEMSPOCKET ; left
 	ld c, PACKSTATE_INITITEMSPOCKET ; right
@@ -793,7 +750,7 @@ BattlePack: ; 10493
 	call TMHMSubmenu
 	ret
 
-.InitBallsPocket: ; 10594 (4:4594)
+.InitBallsPocket:
 	ld a, BALL_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -802,9 +759,9 @@ BattlePack: ; 10493
 	call Pack_JumptableNext
 	ret
 
-.BallsPocketMenu: ; 105a6 (4:45a6)
-	ld hl, BallsPocketMenuDataHeader
-	call CopyMenuDataHeader
+.BallsPocketMenu:
+	ld hl, BallsPocketMenuHeader
+	call CopyMenuHeader
 	ld a, [wBallsPocketCursor]
 	ld [wMenuCursorBuffer], a
 	ld a, [wBallsPocketScrollPosition]
@@ -821,22 +778,22 @@ BattlePack: ; 10493
 	call ItemSubmenu
 	ret
 
-ItemSubmenu: ; 105d3 (4:45d3)
+ItemSubmenu:
 	farcall CheckItemContext
 	ld a, [wItemAttributeParamBuffer]
-TMHMSubmenu: ; 105dc (4:45dc)
+TMHMSubmenu:
 	and a
 	jr z, .NoUse
-	ld hl, .UsableMenuDataHeader
+	ld hl, .UsableMenuHeader
 	ld de, .UsableJumptable
 	jr .proceed
 
 .NoUse:
-	ld hl, .UnusableMenuDataHeader
+	ld hl, .UnusableMenuHeader
 	ld de, .UnusableJumptable
 .proceed
 	push de
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 	call VerticalMenu
 	call ExitMenu
 	pop hl
@@ -846,51 +803,44 @@ TMHMSubmenu: ; 105dc (4:45dc)
 	call Pack_GetJumptablePointer
 	jp hl
 
-; 10601 (4:4601)
-.UsableMenuDataHeader: ; 0x10601
+.UsableMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .UsableMenuData2
+	dw .UsableMenuData
 	db 1 ; default option
-; 0x10609
 
-.UsableMenuData2: ; 0x10609
+.UsableMenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "USE@"
 	db "QUIT@"
-; 0x10614
 
-.UsableJumptable: ; 10614
+.UsableJumptable:
 	dw .Use
 	dw .Quit
-; 10618
 
-.UnusableMenuDataHeader: ; 0x10618
+.UnusableMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .UnusableMenuData2
+	dw .UnusableMenuData
 	db 1 ; default option
-; 0x10620
 
-.UnusableMenuData2: ; 0x10620
+.UnusableMenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 1 ; items
 	db "QUIT@"
-; 0x10627
 
-.UnusableJumptable: ; 10627
+.UnusableJumptable:
 	dw .Quit
-; 10629
 
-.Use: ; 10629
+.Use:
 	farcall CheckItemContext
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, .ItemFunctionJumptable
 	rst JumpTable
 	ret
 
-.ItemFunctionJumptable: ; 10637 (4:4637)
+.ItemFunctionJumptable:
 ; entries correspond to ITEMMENU_* constants
 	dw .Oak         ; ITEMMENU_NOUSE
 	dw .Oak
@@ -900,19 +850,19 @@ TMHMSubmenu: ; 105dc (4:45dc)
 	dw .BattleField ; ITEMMENU_PARTY
 	dw .BattleOnly  ; ITEMMENU_CLOSE
 
-.Oak: ; 10645 (4:4645)
+.Oak:
 	ld hl, Text_ThisIsntTheTime
 	call Pack_PrintTextNoScroll
 	ret
 
-.Unused: ; 1064c (4:464c)
+.Unused:
 	call DoItemEffect
 	ld a, [wItemEffectSucceeded]
 	and a
 	jr nz, .ReturnToBattle
 	ret
 
-.BattleField: ; 10656 (4:4656)
+.BattleField:
 	call DoItemEffect
 	ld a, [wItemEffectSucceeded]
 	and a
@@ -924,32 +874,30 @@ TMHMSubmenu: ; 105dc (4:45dc)
 	call Pack_InitColors
 	ret
 
-.ReturnToBattle: ; 1066c (4:466c)
+.ReturnToBattle:
 	call ClearBGPalettes
 	jr .quit_run_script
 
-.BattleOnly: ; 10671 (4:4671)
+.BattleOnly:
 	call DoItemEffect
 	ld a, [wItemEffectSucceeded]
 	and a
 	jr z, .Oak
 	cp $2
 	jr z, .didnt_use_item
-.quit_run_script ; 1067e (4:467e)
+.quit_run_script
 	ld a, PACKSTATE_QUITRUNSCRIPT
 	ld [wJumptableIndex], a
 	ret
 
-.didnt_use_item ; 10684 (4:4684)
+.didnt_use_item
 	xor a
 	ld [wItemEffectSucceeded], a
 	ret
-; 10689 (4:4689)
-.Quit: ; 10689
+.Quit:
 	ret
-; 1068a
 
-InitPackBuffers: ; 1068a
+InitPackBuffers:
 	xor a
 	ld [wJumptableIndex], a
 	; pocket id -> jumptable index
@@ -965,9 +913,8 @@ InitPackBuffers: ; 1068a
 	xor a
 	ld [wSwitchItem], a
 	ret
-; 106a5
 
-DepositSellInitPackBuffers: ; 106a5
+DepositSellInitPackBuffers:
 	xor a
 	ld [hBGMapMode], a
 	ld [wJumptableIndex], a ; PACKSTATE_INITGFX
@@ -978,36 +925,32 @@ DepositSellInitPackBuffers: ; 106a5
 	call Pack_InitGFX
 	call Pack_InitColors
 	ret
-; 106be
 
-DepositSellPack: ; 106be
+DepositSellPack:
 .loop
 	call .RunJumptable
 	call DepositSellTutorial_InterpretJoypad
 	jr c, .loop
 	ret
-; 106c7
 
-.RunJumptable: ; 106c7
+.RunJumptable:
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pack_GetJumptablePointer
 	jp hl
 
-; 106d1
-
-.Jumptable: ; 106d1 (4:46d1)
+.Jumptable:
 ; entries correspond to *_POCKET constants
 	dw .ItemsPocket
 	dw .BallsPocket
 	dw .KeyItemsPocket
 	dw .TMHMPocket
 
-.ItemsPocket: ; 106d9 (4:46d9)
+.ItemsPocket:
 	xor a ; ITEM_POCKET
 	call InitPocket
-	ld hl, PC_Mart_ItemsPocketMenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, PC_Mart_ItemsPocketMenuHeader
+	call CopyMenuHeader
 	ld a, [wItemsPocketCursor]
 	ld [wMenuCursorBuffer], a
 	ld a, [wItemsPocketScrollPosition]
@@ -1019,11 +962,11 @@ DepositSellPack: ; 106be
 	ld [wItemsPocketCursor], a
 	ret
 
-.KeyItemsPocket: ; 106ff (4:46ff)
+.KeyItemsPocket:
 	ld a, KEY_ITEM_POCKET
 	call InitPocket
-	ld hl, PC_Mart_KeyItemsPocketMenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, PC_Mart_KeyItemsPocketMenuHeader
+	call CopyMenuHeader
 	ld a, [wKeyItemsPocketCursor]
 	ld [wMenuCursorBuffer], a
 	ld a, [wKeyItemsPocketScrollPosition]
@@ -1035,7 +978,7 @@ DepositSellPack: ; 106be
 	ld [wKeyItemsPocketCursor], a
 	ret
 
-.TMHMPocket: ; 10726 (4:4726)
+.TMHMPocket:
 	ld a, TM_HM_POCKET
 	call InitPocket
 	call WaitBGMap_DrawPackGFX
@@ -1044,11 +987,11 @@ DepositSellPack: ; 106be
 	ld [wCurItem], a
 	ret
 
-.BallsPocket: ; 1073b (4:473b)
+.BallsPocket:
 	ld a, BALL_POCKET
 	call InitPocket
-	ld hl, PC_Mart_BallsPocketMenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, PC_Mart_BallsPocketMenuHeader
+	call CopyMenuHeader
 	ld a, [wBallsPocketCursor]
 	ld [wMenuCursorBuffer], a
 	ld a, [wBallsPocketScrollPosition]
@@ -1060,14 +1003,14 @@ DepositSellPack: ; 106be
 	ld [wBallsPocketCursor], a
 	ret
 
-InitPocket: ; 10762 (4:4762)
+InitPocket:
 	ld [wCurrPocket], a
 	call ClearPocketList
 	call DrawPocketName
 	call WaitBGMap_DrawPackGFX
 	ret
 
-DepositSellTutorial_InterpretJoypad: ; 1076f
+DepositSellTutorial_InterpretJoypad:
 	ld hl, wMenuJoypad
 	ld a, [hl]
 	and A_BUTTON
@@ -1119,9 +1062,8 @@ DepositSellTutorial_InterpretJoypad: ; 1076f
 	pop de
 	scf
 	ret
-; 107bb
 
-TutorialPack: ; 107bb
+TutorialPack:
 	call DepositSellInitPackBuffers
 	ld a, [wInputType]
 	or a
@@ -1134,37 +1076,32 @@ TutorialPack: ; 107bb
 	xor a ; FALSE
 	ld [wPackUsedItem], a
 	ret
-; 107d7
 
-.RunJumptable: ; 107d7
+.RunJumptable:
 	ld a, [wJumptableIndex]
 	ld hl, .dw
 	call Pack_GetJumptablePointer
 	jp hl
 
-; 107e1
-
-.dw ; 107e1 (4:47e1)
+.dw
 ; entries correspond to *_POCKET constants
 	dw .Items
 	dw .Balls
 	dw .KeyItems
 	dw .TMHM
 
-.Items: ; 107e9 (4:47e9)
+.Items:
 	xor a ; ITEM_POCKET
-	ld hl, .ItemsMenuDataHeader
+	ld hl, .ItemsMenuHeader
 	jr .DisplayPocket
 
-; 107ef (4:47ef)
-.ItemsMenuDataHeader: ; 0x107ef
+.ItemsMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .ItemsMenuData2
+	dw .ItemsMenuData
 	db 1 ; default option
-; 0x107f7
 
-.ItemsMenuData2: ; 0x107f7
+.ItemsMenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1172,22 +1109,19 @@ TutorialPack: ; 107bb
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10807
 
-.KeyItems: ; 10807 (4:4807)
+.KeyItems:
 	ld a, KEY_ITEM_POCKET
-	ld hl, .KeyItemsMenuDataHeader
+	ld hl, .KeyItemsMenuHeader
 	jr .DisplayPocket
 
-; 1080e (4:480e)
-.KeyItemsMenuDataHeader: ; 0x1080e
+.KeyItemsMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .KeyItemsMenuData2
+	dw .KeyItemsMenuData
 	db 1 ; default option
-; 0x10816
 
-.KeyItemsMenuData2: ; 0x10816
+.KeyItemsMenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 1 ; horizontal spacing
@@ -1195,9 +1129,8 @@ TutorialPack: ; 107bb
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10826
 
-.TMHM: ; 10826 (4:4826)
+.TMHM:
 	ld a, TM_HM_POCKET
 	call InitPocket
 	call WaitBGMap_DrawPackGFX
@@ -1206,20 +1139,18 @@ TutorialPack: ; 107bb
 	ld [wCurItem], a
 	ret
 
-.Balls: ; 1083b (4:483b)
+.Balls:
 	ld a, BALL_POCKET
-	ld hl, .BallsMenuDataHeader
+	ld hl, .BallsMenuHeader
 	jr .DisplayPocket
 
-; 10842 (4:4842)
-.BallsMenuDataHeader: ; 0x10842
+.BallsMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .BallsMenuData2
+	dw .BallsMenuData
 	db 1 ; default option
-; 0x1084a
 
-.BallsMenuData2: ; 0x1084a
+.BallsMenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1227,22 +1158,21 @@ TutorialPack: ; 107bb
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 1085a
 
-.DisplayPocket: ; 1085a (4:485a)
+.DisplayPocket:
 	push hl
 	call InitPocket
 	pop hl
-	call CopyMenuDataHeader
+	call CopyMenuHeader
 	call ScrollingMenu
 	ret
 
-Pack_JumptableNext: ; 10866 (4:4866)
+Pack_JumptableNext:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 
-Pack_GetJumptablePointer: ; 1086b
+Pack_GetJumptablePointer:
 	ld e, a
 	ld d, 0
 	add hl, de
@@ -1251,23 +1181,22 @@ Pack_GetJumptablePointer: ; 1086b
 	ld h, [hl]
 	ld l, a
 	ret
-; 10874
 
-Pack_QuitNoScript: ; 10874 (4:4874)
+Pack_QuitNoScript:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	xor a ; FALSE
 	ld [wPackUsedItem], a
 	ret
 
-Pack_QuitRunScript: ; 1087e (4:487e)
+Pack_QuitRunScript:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ld a, TRUE
 	ld [wPackUsedItem], a
 	ret
 
-Pack_PrintTextNoScroll: ; 10889 (4:4889)
+Pack_PrintTextNoScroll:
 	ld a, [wOptions]
 	push af
 	set NO_TEXT_SCROLL, a
@@ -1277,18 +1206,18 @@ Pack_PrintTextNoScroll: ; 10889 (4:4889)
 	ld [wOptions], a
 	ret
 
-WaitBGMap_DrawPackGFX: ; 1089a (4:489a)
+WaitBGMap_DrawPackGFX:
 	call WaitBGMap
-DrawPackGFX: ; 1089d
+DrawPackGFX:
 	ld a, [wCurrPocket]
 	maskbits NUM_POCKETS
 	ld e, a
-	ld d, $0
+	ld d, 0
 	ld a, [wBattleType]
 	cp BATTLETYPE_TUTORIAL
 	jr z, .male_dude
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr nz, .female
 .male_dude
 	ld hl, PackGFXPointers
@@ -1305,16 +1234,14 @@ DrawPackGFX: ; 1089d
 .female
 	farcall DrawKrisPackGFX
 	ret
-; 108cc
 
-PackGFXPointers: ; 108cc
+PackGFXPointers:
 	dw PackGFX + (15 tiles) * 1 ; ITEM_POCKET
 	dw PackGFX + (15 tiles) * 3 ; BALL_POCKET
 	dw PackGFX + (15 tiles) * 0 ; KEY_ITEM_POCKET
 	dw PackGFX + (15 tiles) * 2 ; TM_HM_POCKET
-; 108d4
 
-Pack_InterpretJoypad: ; 108d4 (4:48d4)
+Pack_InterpretJoypad:
 	ld hl, wMenuJoypad
 	ld a, [wSwitchItem]
 	and a
@@ -1398,7 +1325,7 @@ Pack_InterpretJoypad: ; 108d4 (4:48d4)
 	scf
 	ret
 
-Pack_InitGFX: ; 10955
+Pack_InitGFX:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -1435,9 +1362,8 @@ Pack_InitGFX: ; 10955
 	call EnableLCD
 	call DrawPackGFX
 	ret
-; 109a5
 
-PlacePackGFX: ; 109a5
+PlacePackGFX:
 	hlcoord 0, 3
 	ld a, $50
 	ld de, SCREEN_WIDTH - 5
@@ -1453,9 +1379,8 @@ PlacePackGFX: ; 109a5
 	dec b
 	jr nz, .row
 	ret
-; 109bb
 
-DrawPocketName: ; 109bb
+DrawPocketName:
 	ld a, [wCurrPocket]
 	; * 15
 	ld d, a
@@ -1484,9 +1409,8 @@ DrawPocketName: ; 109bb
 	dec c
 	jr nz, .row
 	ret
-; 109e1
 
-.tilemap ; 109e1
+.tilemap
 ; ITEM_POCKET
 	db $00, $04, $04, $04, $01 ; top border
 	db $06, $07, $08, $09, $0a ; Items
@@ -1503,47 +1427,42 @@ DrawPocketName: ; 109bb
 	db $00, $04, $04, $04, $01 ; top border
 	db $10, $11, $12, $13, $14 ; TM/HM
 	db $02, $05, $05, $05, $03 ; bottom border
-; 10a1d
 
-Pack_GetItemName: ; 10a1d
+Pack_GetItemName:
 	ld a, [wCurItem]
 	ld [wNamedObjectIndexBuffer], a
 	call GetItemName
 	call CopyName1
 	ret
-; 10a2a
 
-Unreferenced_Pack_ClearTilemap: ; 10a2a
+Unreferenced_Pack_ClearTilemap:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "
 	call ByteFill
 	ret
-; 10a36
 
-ClearPocketList: ; 10a36 (4:4a36)
+ClearPocketList:
 	hlcoord 5, 2
 	lb bc, 10, SCREEN_WIDTH - 5
 	call ClearBox
 	ret
 
-Pack_InitColors: ; 10a40
+Pack_InitColors:
 	call WaitBGMap
 	ld b, SCGB_PACKPALS
 	call GetSGBLayout
 	call SetPalettes
 	call DelayFrame
 	ret
-; 10a4f
 
-ItemsPocketMenuDataHeader: ; 0x10a4f
+ItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x10a57
 
-.MenuData2: ; 0x10a57
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1551,16 +1470,14 @@ ItemsPocketMenuDataHeader: ; 0x10a4f
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10a67
 
-PC_Mart_ItemsPocketMenuDataHeader: ; 0x10a67
+PC_Mart_ItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x10a6f
 
-.MenuData2: ; 0x10a6f
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1568,16 +1485,14 @@ PC_Mart_ItemsPocketMenuDataHeader: ; 0x10a67
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10a7f
 
-KeyItemsPocketMenuDataHeader: ; 0x10a7f
+KeyItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x10a87
 
-.MenuData2: ; 0x10a87
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 1 ; horizontal spacing
@@ -1585,16 +1500,14 @@ KeyItemsPocketMenuDataHeader: ; 0x10a7f
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10a97
 
-PC_Mart_KeyItemsPocketMenuDataHeader: ; 0x10a97
+PC_Mart_KeyItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x10a9f
 
-.MenuData2: ; 0x10a9f
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
 	db 5, 8 ; rows, columns
 	db 1 ; horizontal spacing
@@ -1602,16 +1515,14 @@ PC_Mart_KeyItemsPocketMenuDataHeader: ; 0x10a97
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10aaf
 
-BallsPocketMenuDataHeader: ; 0x10aaf
+BallsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x10ab7
 
-.MenuData2: ; 0x10ab7
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1619,16 +1530,14 @@ BallsPocketMenuDataHeader: ; 0x10aaf
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10ac7
 
-PC_Mart_BallsPocketMenuDataHeader: ; 0x10ac7
+PC_Mart_BallsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x10acf
 
-.MenuData2: ; 0x10acf
+.MenuData:
 	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
@@ -1636,74 +1545,62 @@ PC_Mart_BallsPocketMenuDataHeader: ; 0x10ac7
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10adf
 
-Text_PackNoItems: ; 0x10adf
+Text_PackNoItems:
 	; No items.
 	text_jump UnknownText_0x1c0b9a
 	db "@"
-; 0x10ae4
 
-Text_ThrowAwayHowMany: ; 0x10ae4
+Text_ThrowAwayHowMany:
 	; Throw away how many?
 	text_jump UnknownText_0x1c0ba5
 	db "@"
-; 0x10ae9
 
-Text_ConfirmThrowAway: ; 0x10ae9
+Text_ConfirmThrowAway:
 	; Throw away @ @ (S)?
 	text_jump UnknownText_0x1c0bbb
 	db "@"
-; 0x10aee
 
-Text_ThrewAway: ; 0x10aee
+Text_ThrewAway:
 	; Threw away @ (S).
 	text_jump UnknownText_0x1c0bd8
 	db "@"
-; 0x10af3
 
-Text_ThisIsntTheTime: ; 0x10af3
+Text_ThisIsntTheTime:
 	; OAK:  ! This isn't the time to use that!
 	text_jump UnknownText_0x1c0bee
 	db "@"
-; 0x10af8
 
-TextJump_YouDontHaveAPkmn: ; 0x10af8
+TextJump_YouDontHaveAMon:
 	; You don't have a #MON!
-	text_jump Text_YouDontHaveAPkmn
+	text_jump Text_YouDontHaveAMon
 	db "@"
-; 0x10afd
 
-Text_RegisteredItem: ; 0x10afd
+Text_RegisteredItem:
 	; Registered the @ .
 	text_jump UnknownText_0x1c0c2e
 	db "@"
-; 0x10b02
 
-Text_CantRegister: ; 0x10b02
+Text_CantRegister:
 	; You can't register that item.
 	text_jump UnknownText_0x1c0c45
 	db "@"
-; 0x10b07
 
-Text_MoveItemWhere: ; 0x10b07
+Text_MoveItemWhere:
 	; Where should this be moved to?
 	text_jump UnknownText_0x1c0c63
 	db "@"
-; 0x10b0c
 
-Text_PackEmptyString: ; 0x10b0c
+Text_PackEmptyString:
 	;
 	text_jump UnknownText_0x1c0c83
 	db "@"
-; 0x10b11
 
-TextJump_YouCantUseItInABattle: ; 0x10b11
+TextJump_YouCantUseItInABattle:
 	; Doesn't seem to be used anywhere
 	; "You can't use it in a battle."
 	text_jump Text_YouCantUseItInABattle
 	db "@"
-; 0x10b16
 
 PackMenuGFX:
 INCBIN "gfx/pack/pack_menu.2bpp"
diff --git a/engine/routines/drawkrispackgfx.asm b/engine/items/pack_kris.asm
index 54a21e447..1a169ea6e 100644
--- a/engine/routines/drawkrispackgfx.asm
+++ b/engine/items/pack_kris.asm
@@ -1,4 +1,4 @@
-DrawKrisPackGFX: ; 48e81
+DrawKrisPackGFX:
 	ld hl, PackFGFXPointers
 	add hl, de
 	add hl, de
@@ -10,11 +10,11 @@ DrawKrisPackGFX: ; 48e81
 	call Request2bpp
 	ret
 
-PackFGFXPointers: ; 48e93
+PackFGFXPointers:
 	dw PackFGFX + (15 tiles) * 1 ; ITEM_POCKET
 	dw PackFGFX + (15 tiles) * 3 ; BALL_POCKET
 	dw PackFGFX + (15 tiles) * 0 ; KEY_ITEM_POCKET
 	dw PackFGFX + (15 tiles) * 2 ; TM_HM_POCKET
 
-PackFGFX: ; 48e9b
+PackFGFX:
 INCBIN "gfx/pack/pack_f.2bpp"
diff --git a/engine/routines/printitemdescription.asm b/engine/items/print_item_description.asm
index 2a9007b97..b0a3a0b33 100644
--- a/engine/routines/printitemdescription.asm
+++ b/engine/items/print_item_description.asm
@@ -1,4 +1,4 @@
-PrintItemDescription: ; 0x1c8955
+PrintItemDescription:
 ; Print the description for item [wCurSpecies] at de.
 
 	ld a, [wCurSpecies]
@@ -28,4 +28,5 @@ PrintItemDescription: ; 0x1c8955
 	ld d, [hl]
 	pop hl
 	jp PlaceString
-; 0x1c8987
+
+INCLUDE "data/items/descriptions.asm"
diff --git a/engine/switch_items.asm b/engine/items/switch_items.asm
index b699d4719..81b5ac6a5 100755..100644
--- a/engine/switch_items.asm
+++ b/engine/items/switch_items.asm
@@ -1,4 +1,4 @@
-SwitchItemsInBag: ; 2490c (9:490c)
+SwitchItemsInBag:
 	ld a, [wSwitchItem]
 	and a
 	jr z, .init
@@ -84,7 +84,7 @@ SwitchItemsInBag: ; 2490c (9:490c)
 	ld [wSwitchItem], a
 	ret
 
-Function249a7: ; 249a7 (9:49a7)
+Function249a7:
 	ld a, [wSwitchItem]
 	call ItemSwitch_GetNthItem
 	ld d, h
@@ -110,7 +110,7 @@ Function249a7: ; 249a7 (9:49a7)
 	scf
 	ret
 
-Function249d1: ; 249d1 (9:49d1)
+Function249d1:
 	ld a, [wSwitchItem]
 	call ItemSwitch_GetNthItem
 	inc hl
@@ -145,7 +145,7 @@ Function249d1: ; 249d1 (9:49d1)
 	inc hl
 	pop af
 	ld [hl], a
-	ld hl, wMenuData2_ItemsPointerAddr
+	ld hl, wMenuData_ItemsPointerAddr
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -180,14 +180,14 @@ Function249d1: ; 249d1 (9:49d1)
 	ld [wSwitchItem], a
 	ret
 
-Function24a40: ; 24a40 (9:4a40)
+Function24a40:
 	call ItemSwitch_GetNthItem
 	ld de, wd002
 	call ItemSwitch_ConvertSpacingToDW
 	call CopyBytes
 	ret
 
-Function24a4d: ; 24a4d (9:4a4d)
+Function24a4d:
 	call ItemSwitch_GetNthItem
 	ld d, h
 	ld e, l
@@ -196,10 +196,10 @@ Function24a4d: ; 24a4d (9:4a4d)
 	call CopyBytes
 	ret
 
-ItemSwitch_GetNthItem: ; 24a5c (9:4a5c)
+ItemSwitch_GetNthItem:
 	push af
 	call ItemSwitch_ConvertSpacingToDW
-	ld hl, wMenuData2_ItemsPointerAddr
+	ld hl, wMenuData_ItemsPointerAddr
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -208,7 +208,7 @@ ItemSwitch_GetNthItem: ; 24a5c (9:4a5c)
 	call AddNTimes
 	ret
 
-Function24a6c: ; 24a6c (9:4a6c)
+Function24a6c:
 	push hl
 	call ItemSwitch_ConvertSpacingToDW
 	ld a, d
@@ -224,10 +224,10 @@ Function24a6c: ; 24a6c (9:4a6c)
 	pop hl
 	ret
 
-ItemSwitch_ConvertSpacingToDW: ; 24a80 (9:4a80)
+ItemSwitch_ConvertSpacingToDW:
 ; This function is absolutely idiotic.
 	push hl
-	ld a, [wMenuData2_ScrollingMenuSpacing]
+	ld a, [wMenuData_ScrollingMenuSpacing]
 	ld c, a
 	ld b, 0
 	ld hl, .spacing_dws
@@ -239,13 +239,10 @@ ItemSwitch_ConvertSpacingToDW: ; 24a80 (9:4a80)
 	pop hl
 	ret
 
-; 24a91 (9:4a91)
-
-.spacing_dws ; 24a91
+.spacing_dws
 	dw 0, 1, 2
-; 24a97
 
-Function24a97: ; 24a97 (9:4a97)
+Function24a97:
 	push af
 	call ItemSwitch_ConvertSpacingToDW
 	ld a, c
@@ -262,7 +259,7 @@ Function24a97: ; 24a97 (9:4a97)
 	ld a, $1
 	ret
 
-Function24aab: ; 24aab (9:4aab)
+Function24aab:
 .loop
 	ld a, [hld]
 	ld [de], a
diff --git a/engine/tmhm2.asm b/engine/items/tmhm.asm
index 442f73cfa..4958d2afc 100755..100644
--- a/engine/tmhm2.asm
+++ b/engine/items/tmhm.asm
@@ -1,4 +1,4 @@
-TMHMPocket: ; 2c76f (b:476f)
+TMHMPocket:
 	ld a, $1
 	ld [hInMenu], a
 	call TMHM_PocketLoop
@@ -20,7 +20,7 @@ TMHMPocket: ; 2c76f (b:476f)
 	scf
 	ret
 
-.ConvertItemToTMHMNumber: ; 2c798 (b:4798)
+.ConvertItemToTMHMNumber:
 	ld a, [wCurItem]
 	ld c, a
 	callfar GetNumberedTMHM
@@ -28,7 +28,7 @@ TMHMPocket: ; 2c76f (b:476f)
 	ld [wCurItem], a
 	ret
 
-ConvertCurItemIntoCurTMHM: ; 2c7a7 (b:47a7)
+ConvertCurItemIntoCurTMHM:
 	ld a, [wCurItem]
 	ld c, a
 	callfar GetTMHMNumber
@@ -36,12 +36,12 @@ ConvertCurItemIntoCurTMHM: ; 2c7a7 (b:47a7)
 	ld [wCurTMHM], a
 	ret
 
-GetTMHMItemMove: ; 2c7b6 (b:47b6)
+GetTMHMItemMove:
 	call ConvertCurItemIntoCurTMHM
 	predef GetTMHMMove
 	ret
 
-AskTeachTMHM: ; 2c7bf (b:47bf)
+AskTeachTMHM:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -70,13 +70,13 @@ AskTeachTMHM: ; 2c7bf (b:47bf)
 	ld [wOptions], a
 	ret
 
-ChooseMonToLearnTMHM: ; 2c7fb
+ChooseMonToLearnTMHM:
 	ld hl, wStringBuffer2
 	ld de, wTMHMMoveNameBackup
 	ld bc, 12
 	call CopyBytes
 	call ClearBGPalettes
-ChooseMonToLearnTMHM_NoRefresh: ; 2c80a
+ChooseMonToLearnTMHM_NoRefresh:
 	farcall LoadPartyMenuGFX
 	farcall InitPartyMenuWithCancel
 	farcall InitPartyMenuGFX
@@ -115,9 +115,8 @@ ChooseMonToLearnTMHM_NoRefresh: ; 2c80a
 	pop de
 	pop hl
 	jr .loopback
-; 2c867
 
-TeachTMHM: ; 2c867
+TeachTMHM:
 	predef CanLearnTMHMMove
 
 	push bc
@@ -166,33 +165,28 @@ TeachTMHM: ; 2c867
 .learned_move
 	scf
 	ret
-; 2c8bf (b:48bf)
 
-Text_BootedTM: ; 0x2c8bf
+Text_BootedTM:
 	; Booted up a TM.
 	text_jump UnknownText_0x1c0373
 	db "@"
-; 0x2c8c4
 
-Text_BootedHM: ; 0x2c8c4
+Text_BootedHM:
 	; Booted up an HM.
 	text_jump UnknownText_0x1c0384
 	db "@"
-; 0x2c8c9
 
-Text_ItContained: ; 0x2c8c9
+Text_ItContained:
 	; It contained @ . Teach @ to a #MON?
 	text_jump UnknownText_0x1c0396
 	db "@"
-; 0x2c8ce
 
-Text_TMHMNotCompatible: ; 0x2c8ce
+Text_TMHMNotCompatible:
 	; is not compatible with @ . It can't learn @ .
 	text_jump UnknownText_0x1c03c2
 	db "@"
-; 0x2c8d3
 
-TMHM_PocketLoop: ; 2c8d3 (b:48d3)
+TMHM_PocketLoop:
 	xor a
 	ld [hBGMapMode], a
 	call TMHM_DisplayPocketItems
@@ -225,7 +219,7 @@ TMHM_PocketLoop: ; 2c8d3 (b:48d3)
 	ld [wMenuCursorX], a
 	jr TMHM_ShowTMMoveDescription
 
-TMHM_JoypadLoop: ; 2c915 (b:4915)
+TMHM_JoypadLoop:
 	call TMHM_DisplayPocketItems
 	call StaticMenuJoypad
 	ld b, a
@@ -247,7 +241,7 @@ TMHM_JoypadLoop: ; 2c915 (b:4915)
 	jp nz, TMHM_ExitPocket
 	bit D_LEFT_F, a
 	jp nz, TMHM_ExitPocket
-TMHM_ShowTMMoveDescription: ; 2c946 (b:4946)
+TMHM_ShowTMMoveDescription:
 	call TMHM_CheckHoveringOverCancel
 	jp nc, TMHM_ExitPocket
 	hlcoord 0, 12
@@ -265,7 +259,7 @@ TMHM_ShowTMMoveDescription: ; 2c946 (b:4946)
 	call PrintMoveDesc
 	jp TMHM_JoypadLoop
 
-TMHM_ChooseTMorHM: ; 2c974 (b:4974)
+TMHM_ChooseTMorHM:
 	call TMHM_PlaySFX_ReadText2
 	call CountTMsHMs ; This stores the count to wd265.
 	ld a, [wMenuCursorY]
@@ -277,7 +271,7 @@ TMHM_ChooseTMorHM: ; 2c974 (b:4974)
 	ld a, [wd265]
 	cp b
 	jr z, _TMHM_ExitPack ; our cursor was hovering over CANCEL
-TMHM_CheckHoveringOverCancel: ; 2c98a (b:498a)
+TMHM_CheckHoveringOverCancel:
 	call TMHM_GetCurrentPocketPosition
 	ld a, [wMenuCursorY]
 	ld b, a
@@ -297,19 +291,19 @@ TMHM_CheckHoveringOverCancel: ; 2c98a (b:498a)
 	cp -1
 	ret
 
-TMHM_ExitPack: ; 2c9a5 (b:49a5)
+TMHM_ExitPack:
 	call TMHM_PlaySFX_ReadText2
-_TMHM_ExitPack: ; 2c9a8 (b:49a8)
+_TMHM_ExitPack:
 	ld a, $2
 	ld [wMenuJoypad], a
 	and a
 	ret
 
-TMHM_ExitPocket: ; 2c9af (b:49af)
+TMHM_ExitPocket:
 	and a
 	ret
 
-TMHM_ScrollPocket: ; 2c9b1 (b:49b1)
+TMHM_ScrollPocket:
 	ld a, b
 	bit 7, a
 	jr nz, .skip
@@ -339,7 +333,7 @@ TMHM_ScrollPocket: ; 2c9b1 (b:49b1)
 	call TMHM_DisplayPocketItems
 	jp TMHM_ShowTMMoveDescription
 
-TMHM_DisplayPocketItems: ; 2c9e2 (b:49e2)
+TMHM_DisplayPocketItems:
 	ld a, [wBattleType]
 	cp BATTLETYPE_TUTORIAL
 	jp z, Tutorial_TMHMPocket
@@ -433,7 +427,7 @@ TMHM_DisplayPocketItems: ; 2c9e2 (b:49e2)
 .done
 	ret
 
-TMHMPocket_GetCurrentLineCoord: ; 2ca86 (b:4a86)
+TMHMPocket_GetCurrentLineCoord:
 	hlcoord 5, 0
 	ld bc, 2 * SCREEN_WIDTH
 	ld a, 6
@@ -445,9 +439,8 @@ TMHMPocket_GetCurrentLineCoord: ; 2ca86 (b:4a86)
 	dec e
 	jr nz, .loop
 	ret
-; 2ca95 (b:4a95)
 
-Unreferenced_Function2ca95: ; 2ca95
+Unreferenced_Function2ca95:
 	pop hl
 	ld bc, 3
 	add hl, bc
@@ -459,13 +452,11 @@ Unreferenced_Function2ca95: ; 2ca95
 	call PlaceString
 	pop hl
 	ret
-; 2caae
 
-TMHM_String_Cancel: ; 2caae
+TMHM_String_Cancel:
 	db "CANCEL@"
-; 2cab5
 
-TMHM_GetCurrentPocketPosition: ; 2cab5 (b:4ab5)
+TMHM_GetCurrentPocketPosition:
 	ld hl, wTMsHMs
 	ld a, [wTMHMPocketScrollPosition]
 	ld b, a
@@ -482,7 +473,7 @@ TMHM_GetCurrentPocketPosition: ; 2cab5 (b:4ab5)
 	dec c
 	ret
 
-Tutorial_TMHMPocket: ; 2caca (b:4aca)
+Tutorial_TMHMPocket:
 	hlcoord 9, 3
 	push de
 	ld de, TMHM_String_Cancel
@@ -490,15 +481,14 @@ Tutorial_TMHMPocket: ; 2caca (b:4aca)
 	pop de
 	ret
 
-TMHM_PlaySFX_ReadText2: ; 2cad6 (b:4ad6)
+TMHM_PlaySFX_ReadText2:
 	push de
 	ld de, SFX_READ_TEXT_2
 	call PlaySFX
 	pop de
 	ret
-; 2cadf (b:4adf)
 
-Unreferenced_Function2cadf: ; 2cadf
+Unreferenced_Function2cadf:
 	call ConvertCurItemIntoCurTMHM
 	call .CheckHaveRoomForTMHM
 	ld hl, .NoRoomText
@@ -506,21 +496,18 @@ Unreferenced_Function2cadf: ; 2cadf
 	ld hl, .ReceivedText
 .print
 	jp PrintText
-; 2caf0
 
-.NoRoomText: ; 0x2caf0
+.NoRoomText:
 	; You have no room for any more @ S.
 	text_jump UnknownText_0x1c03fa
 	db "@"
-; 0x2caf5
 
-.ReceivedText: ; 0x2caf5
+.ReceivedText:
 	; You received @ !
 	text_jump UnknownText_0x1c0421
 	db "@"
-; 0x2cafa
 
-.CheckHaveRoomForTMHM: ; 2cafa
+.CheckHaveRoomForTMHM:
 	ld a, [wd265]
 	dec a
 	ld hl, wTMsHMs
@@ -533,9 +520,8 @@ Unreferenced_Function2cadf: ; 2cadf
 	ret nc
 	ld [hl], a
 	ret
-; 2cb0c
 
-ConsumeTM: ; 2cb0c (b:4b0c)
+ConsumeTM:
 	call ConvertCurItemIntoCurTMHM
 	ld a, [wd265]
 	dec a
@@ -556,7 +542,7 @@ ConsumeTM: ; 2cb0c (b:4b0c)
 	ld [wTMHMPocketScrollPosition], a
 	ret
 
-CountTMsHMs: ; 2cb2a (b:4b2a)
+CountTMsHMs:
 	ld b, 0
 	ld c, NUM_TMS + NUM_HMS
 	ld hl, wTMsHMs
@@ -572,7 +558,7 @@ CountTMsHMs: ; 2cb2a (b:4b2a)
 	ld [wd265], a
 	ret
 
-PrintMoveDesc: ; 2cb3e
+PrintMoveDesc:
 	push hl
 	ld hl, MoveDescriptions
 	ld a, [wCurSpecies]
@@ -586,4 +572,3 @@ PrintMoveDesc: ; 2cb3e
 	ld d, [hl]
 	pop hl
 	jp PlaceString
-; 2cb52
diff --git a/engine/tmhm.asm b/engine/items/tmhm2.asm
index 9db3dc291..10206d36b 100755..100644
--- a/engine/tmhm.asm
+++ b/engine/items/tmhm2.asm
@@ -1,4 +1,4 @@
-CanLearnTMHMMove: ; 11639
+CanLearnTMHMMove:
 	ld a, [wCurPartySpecies]
 	ld [wCurSpecies], a
 	call GetBaseData
@@ -31,9 +31,8 @@ CanLearnTMHMMove: ; 11639
 	pop hl
 	ld c, 0
 	ret
-; 1166a
 
-GetTMHMMove: ; 1166a
+GetTMHMMove:
 	ld a, [wd265]
 	dec a
 	ld hl, TMHMMoves
@@ -43,7 +42,5 @@ GetTMHMMove: ; 1166a
 	ld a, [hl]
 	ld [wd265], a
 	ret
-; 1167a
-
 
 INCLUDE "data/moves/tmhm_moves.asm"
diff --git a/engine/routines/updateitemdescription.asm b/engine/items/update_item_description.asm
index fdb1e864d..d4bc731a1 100644
--- a/engine/routines/updateitemdescription.asm
+++ b/engine/items/update_item_description.asm
@@ -1,4 +1,4 @@
-UpdateItemDescription: ; 0x244c3
+UpdateItemDescription:
 	ld a, [wMenuSelection]
 	ld [wCurSpecies], a
 	hlcoord 0, 12
diff --git a/engine/routines/initlist.asm b/engine/link/init_list.asm
index 26c77b5bb..8557b2e9f 100644
--- a/engine/routines/initlist.asm
+++ b/engine/link/init_list.asm
@@ -1,4 +1,4 @@
-InitList: ; 50db9
+InitList:
 	ld a, [wInitListType]
 
 	cp INIT_ENEMYOT_LIST
diff --git a/engine/link.asm b/engine/link/link.asm
index 59d1a149a..e5f354f57 100755..100644
--- a/engine/link.asm
+++ b/engine/link/link.asm
@@ -1,4 +1,4 @@
-LinkCommunications: ; 28000
+LinkCommunications:
 	call ClearBGPalettes
 	ld c, 80
 	call DelayFrames
@@ -35,7 +35,7 @@ LinkCommunications: ; 28000
 	cp LINK_TIMECAPSULE
 	jp nz, Gen2ToGen2LinkComms
 
-TimeCapsule: ; 2805d
+Gen2ToGen1LinkComms:
 	call ClearLinkData
 	call Link_PrepPartyData_Gen1
 	call FixDataForLinkTransfer
@@ -84,9 +84,9 @@ TimeCapsule: ; 2805d
 	call Serial_ExchangeBytes
 	ld a, SERIAL_NO_DATA_BYTE
 	ld [de], a
-	ld hl, wMisc
-	ld de, wPlayerTrademonSpecies
-	ld bc, wPlayerTrademonSpecies - wMisc
+	ld hl, wLink_c608
+	ld de, wTrademons
+	ld bc, wTrademons - wLink_c608
 	call Serial_ExchangeBytes
 	xor a
 	ld [rIF], a
@@ -177,9 +177,8 @@ TimeCapsule: ; 2805d
 	ld de, MUSIC_ROUTE_30
 	call PlayMusic
 	jp InitTradeMenuDisplay
-; 28177
 
-Gen2ToGen2LinkComms: ; 28177
+Gen2ToGen2LinkComms:
 	call ClearLinkData
 	call Link_PrepPartyData_Gen2
 	call FixDataForLinkTransfer
@@ -229,9 +228,9 @@ Gen2ToGen2LinkComms: ; 28177
 	call Serial_ExchangeBytes
 	ld a, SERIAL_NO_DATA_BYTE
 	ld [de], a
-	ld hl, wMisc
-	ld de, wPlayerTrademonSpecies
-	ld bc, $c8
+	ld hl, wLink_c608
+	ld de, wTrademons
+	ld bc, wTrademons - wLink_c608
 	call Serial_ExchangeBytes
 	ld a, [wLinkMode]
 	cp LINK_TRADECENTER
@@ -474,9 +473,8 @@ Gen2ToGen2LinkComms: ; 28177
 	ld de, MUSIC_ROUTE_30
 	call PlayMusic
 	jp InitTradeMenuDisplay
-; 283b2
 
-LinkTimeout: ; 283b2
+LinkTimeout:
 	ld de, .TooMuchTimeHasElapsed
 	ld b, 10
 .loop
@@ -506,15 +504,13 @@ LinkTimeout: ; 283b2
 	call GetSGBLayout
 	call WaitBGMap2
 	ret
-; 283ed
 
-.TooMuchTimeHasElapsed: ; 0x283ed
+.TooMuchTimeHasElapsed:
 	; Too much time has elapsed. Please try again.
 	text_jump UnknownText_0x1c4183
 	db "@"
-; 0x283f2
 
-ExchangeBytes: ; 283f2
+ExchangeBytes:
 	ld a, TRUE
 	ld [hSerialIgnoringInitialData], a
 .loop
@@ -546,13 +542,11 @@ ExchangeBytes: ; 283f2
 	or c
 	jr nz, .loop
 	ret
-; 28419
 
-String_PleaseWait: ; 28419
+String_PleaseWait:
 	db "PLEASE WAIT!@"
-; 28426
 
-ClearLinkData: ; 28426
+ClearLinkData:
 	ld hl, wLinkData
 	ld bc, wLinkDataEnd - wLinkData
 .loop
@@ -563,9 +557,8 @@ ClearLinkData: ; 28426
 	or c
 	jr nz, .loop
 	ret
-; 28434
 
-FixDataForLinkTransfer: ; 28434
+FixDataForLinkTransfer:
 	ld hl, wd1f3
 	ld a, SERIAL_PREAMBLE_BYTE
 	ld b, wLinkBattleRNs - wd1f3
@@ -581,7 +574,7 @@ FixDataForLinkTransfer: ; 28434
 	ld [hli], a
 	dec b
 	jr nz, .loop2
-	ld hl, wMisc
+	ld hl, wLink_c608
 	ld a, SERIAL_PREAMBLE_BYTE
 	ld [hli], a
 	ld [hli], a
@@ -636,9 +629,8 @@ FixDataForLinkTransfer: ; 28434
 	ld a, SERIAL_PATCH_LIST_PART_TERMINATOR
 	ld [de], a
 	ret
-; 28499
 
-Link_PrepPartyData_Gen1: ; 28499
+Link_PrepPartyData_Gen1:
 	ld de, wLinkData
 	ld a, SERIAL_PREAMBLE_BYTE
 	ld b, PARTY_LENGTH
@@ -693,9 +685,8 @@ Link_PrepPartyData_Gen1: ; 28499
 .copy_ot_nicks
 	ld bc, PARTY_LENGTH * NAME_LENGTH
 	jp CopyBytes
-; 284f6
 
-.ConvertPartyStruct2to1: ; 284f6
+.ConvertPartyStruct2to1:
 	ld b, h
 	ld c, l
 	push de
@@ -790,7 +781,7 @@ Link_PrepPartyData_Gen1: ; 28499
 	add hl, bc
 	ld c, STAT_SATK
 	ld b, TRUE
-	predef CalcPkmnStatC
+	predef CalcMonStatC
 
 	pop bc
 	pop de
@@ -804,9 +795,8 @@ Link_PrepPartyData_Gen1: ; 28499
 	ld h, b
 	ld l, c
 	ret
-; 28595
 
-Link_PrepPartyData_Gen2: ; 28595
+Link_PrepPartyData_Gen2:
 	ld de, wLinkData
 	ld a, SERIAL_PREAMBLE_BYTE
 	ld b, PARTY_LENGTH
@@ -942,9 +932,8 @@ Link_PrepPartyData_Gen2: ; 28595
 	ld a, SERIAL_PATCH_LIST_PART_TERMINATOR
 	ld [de], a
 	ret
-; 28682
 
-Function28682: ; 28682
+Function28682:
 	ld c, 5
 .loop
 	ld [de], a
@@ -952,9 +941,8 @@ Function28682: ; 28682
 	dec c
 	jr nz, .loop
 	ret
-; 2868a
 
-Function2868a: ; 2868a
+Function2868a:
 	push hl
 	ld d, h
 	ld e, l
@@ -980,9 +968,8 @@ Function2868a: ; 2868a
 	ld de, wOTPartyMonNicknames
 	ld bc, PARTY_LENGTH * MON_NAME_LENGTH
 	jp CopyBytes
-; 286ba
 
-.ConvertToGen2: ; 286ba
+.ConvertToGen2:
 	ld b, h
 	ld c, l
 	ld a, [de]
@@ -1069,7 +1056,7 @@ Function2868a: ; 2868a
 	add hl, bc
 	ld c, STAT_SATK
 	ld b, TRUE
-	predef CalcPkmnStatC
+	predef CalcMonStatC
 	pop bc
 	pop hl
 	ld a, [hQuotient + 1]
@@ -1082,7 +1069,7 @@ Function2868a: ; 2868a
 	add hl, bc
 	ld c, STAT_SDEF
 	ld b, TRUE
-	predef CalcPkmnStatC
+	predef CalcMonStatC
 	pop bc
 	pop hl
 	ld a, [hQuotient + 1]
@@ -1102,9 +1089,8 @@ Function2868a: ; 2868a
 	inc de
 	inc de
 	ret
-; 28771
 
-TimeCapsule_ReplaceTeruSama: ; 28771
+TimeCapsule_ReplaceTeruSama:
 	ld a, b
 	and a
 	ret z
@@ -1126,11 +1112,9 @@ TimeCapsule_ReplaceTeruSama: ; 28771
 	pop hl
 	ret
 
-
 INCLUDE "data/items/catch_rate_items.asm"
 
-
-Link_CopyOTData: ; 2879e
+Link_CopyOTData:
 .loop
 	ld a, [hli]
 	cp SERIAL_NO_DATA_BYTE
@@ -1142,9 +1126,8 @@ Link_CopyOTData: ; 2879e
 	or c
 	jr nz, .loop
 	ret
-; 287ab
 
-Link_CopyRandomNumbers: ; 287ab
+Link_CopyRandomNumbers:
 	ld a, [hSerialConnectionStatus]
 	cp USING_INTERNAL_CLOCK
 	ret z
@@ -1163,9 +1146,8 @@ Link_CopyRandomNumbers: ; 287ab
 	dec c
 	jr nz, .loop
 	ret
-; 287ca
 
-Link_FindFirstNonControlCharacter_SkipZero: ; 287ca
+Link_FindFirstNonControlCharacter_SkipZero:
 .loop
 	ld a, [hli]
 	and a
@@ -1176,9 +1158,8 @@ Link_FindFirstNonControlCharacter_SkipZero: ; 287ca
 	jr z, .loop
 	dec hl
 	ret
-; 287d8
 
-Link_FindFirstNonControlCharacter_AllowZero: ; 287d8
+Link_FindFirstNonControlCharacter_AllowZero:
 .loop
 	ld a, [hli]
 	cp SERIAL_PREAMBLE_BYTE
@@ -1187,9 +1168,8 @@ Link_FindFirstNonControlCharacter_AllowZero: ; 287d8
 	jr z, .loop
 	dec hl
 	ret
-; 287e3
 
-InitTradeMenuDisplay: ; 287e3
+InitTradeMenuDisplay:
 	call ClearScreen
 	call LoadTradeScreenBorder
 	farcall InitTradeSpeciesList
@@ -1204,9 +1184,8 @@ InitTradeMenuDisplay: ; 287e3
 	inc a
 	ld [wPlayerLinkAction], a
 	jp LinkTrade_PlayerPartyMenu
-; 28803
 
-LinkTrade_OTPartyMenu: ; 28803
+LinkTrade_OTPartyMenu:
 	ld a, OTPARTYMON
 	ld [wMonType], a
 	ld a, A_BUTTON | D_UP | D_DOWN
@@ -1228,7 +1207,7 @@ LinkTrade_OTPartyMenu: ; 28803
 	xor a
 	ld [w2DMenuFlags2], a
 
-LinkTradeOTPartymonMenuLoop: ; 28835
+LinkTradeOTPartymonMenuLoop:
 	farcall LinkTradeMenu
 	ld a, d
 	and a
@@ -1268,9 +1247,8 @@ LinkTradeOTPartymonMenuLoop: ; 28835
 	bit D_DOWN_F, a
 	jp z, LinkTradePartiesMenuMasterLoop
 	jp Function28ac9
-; 2888b
 
-LinkTrade_PlayerPartyMenu: ; 2888b
+LinkTrade_PlayerPartyMenu:
 	farcall InitMG_Mobile_LinkTradePalMap
 	xor a
 	ld [wMonType], a
@@ -1294,7 +1272,7 @@ LinkTrade_PlayerPartyMenu: ; 2888b
 	ld [w2DMenuFlags2], a
 	call WaitBGMap2
 
-LinkTradePartymonMenuLoop: ; 288c5
+LinkTradePartymonMenuLoop:
 	farcall LinkTradeMenu
 	ld a, d
 	and a
@@ -1343,16 +1321,14 @@ LinkTradePartymonMenuLoop: ; 288c5
 	pop bc
 	pop hl
 	jp Function28ade
-; 2891c
 
-LinkTradePartiesMenuMasterLoop: ; 2891c
+LinkTradePartiesMenuMasterLoop:
 	ld a, [wMonType]
 	and a
 	jp z, LinkTradePartymonMenuLoop ; PARTYMON
 	jp LinkTradeOTPartymonMenuLoop  ; OTPARTYMON
-; 28926
 
-Function28926: ; 28926
+Function28926:
 	call LoadTileMapToTempTileMap
 	ld a, [wMenuCursorY]
 	push af
@@ -1510,26 +1486,21 @@ Function28926: ; 28926
 	ld c, 100
 	call DelayFrames
 	jp InitTradeMenuDisplay
-; 28aaf
 
-
-.Text_CantTradeLastMon: ; 0x28aaf
+.Text_CantTradeLastMon:
 	; If you trade that #MON, you won't be able to battle.
 	text_jump UnknownText_0x1c41b1
 	db "@"
-; 0x28ab4
 
-.String_Stats_Trade: ; 28ab4
+.String_Stats_Trade:
 	db "STATS     TRADE@"
 
-.Text_Abnormal: ; 0x28ac4
+.Text_Abnormal:
 	; Your friend's @  appears to be abnormal!
 	text_jump UnknownText_0x1c41e6
 	db "@"
-; 0x28ac9
-
 
-Function28ac9: ; 28ac9
+Function28ac9:
 	ld a, [wMenuCursorY]
 	cp 1
 	jp nz, LinkTradePartiesMenuMasterLoop
@@ -1541,7 +1512,7 @@ Function28ac9: ; 28ac9
 	ld [hl], " "
 	pop bc
 	pop hl
-Function28ade: ; 28ade
+Function28ade:
 .loop1
 	ld a, "▶"
 	ldcoord_a 9, 17
@@ -1576,7 +1547,7 @@ Function28ade: ; 28ade
 	ld a, [wOtherPlayerLinkMode]
 	cp $f
 	jr nz, .loop1
-Function28b22: ; 28b22
+Function28b22:
 	call RotateThreePalettesRight
 	call ClearScreen
 	ld b, SCGB_DIPLOMA
@@ -1592,9 +1563,8 @@ Function28b22: ; 28b22
 	ld a, (1 << rSC_ON) | 1
 	ld [rSC], a
 	ret
-; 28b42
 
-Unreferenced_Function28b42: ; 28b42
+Unreferenced_Function28b42:
 	hlcoord 0, 16
 	ld a, "┘"
 	ld bc, 2 * SCREEN_WIDTH
@@ -1606,22 +1576,19 @@ Unreferenced_Function28b42: ; 28b42
 	hlcoord 2, 16
 	ld de, .Cancel
 	jp PlaceString
-; 28b61
 
-.Cancel: ; 28b61
+.Cancel:
 	db "CANCEL@"
-; 28b68
 
-Function28b68: ; 28b68
+Function28b68:
 	ld a, [wOtherPlayerLinkMode]
 	hlcoord 6, 9
 	ld bc, SCREEN_WIDTH
 	call AddNTimes
 	ld [hl], "▷"
 	ret
-; 28b77
 
-LinkEngine_FillBox: ; 28b77
+LinkEngine_FillBox:
 .row
 	push bc
 	push hl
@@ -1636,9 +1603,8 @@ LinkEngine_FillBox: ; 28b77
 	dec b
 	jr nz, .row
 	ret
-; 28b87
 
-LinkTrade: ; 28b87
+LinkTrade:
 	xor a
 	ld [wcf57], a
 	ld [wOtherPlayerLinkAction], a
@@ -1670,7 +1636,7 @@ LinkTrade: ; 28b87
 	ld hl, UnknownText_0x28eb8
 	bccoord 1, 14
 	call PlaceHLTextAtBC
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	hlcoord 10, 7
 	ld b, 3
 	ld c, 7
@@ -1863,7 +1829,7 @@ LinkTrade: ; 28b87
 	add hl, bc
 	ld a, [hl]
 	ld [wd002], a
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	callfar RemoveMonFromPartyOrBox
 	ld a, [wPartyCount]
@@ -1970,53 +1936,46 @@ LinkTrade: ; 28b87
 	call DelayFrames
 	ld a, [wLinkMode]
 	cp LINK_TIMECAPSULE
-	jp z, TimeCapsule
+	jp z, Gen2ToGen1LinkComms
 	jp Gen2ToGen2LinkComms
-; 28ea3
 
-Function28ea3: ; 28ea3
+Function28ea3:
 	ld c, 100
 	call DelayFrames
 	jp InitTradeMenuDisplay
-; 28eab
 
-String28eab: ; 28eab
+String28eab:
 	db   "TRADE"
 	next "CANCEL@"
 
-UnknownText_0x28eb8: ; 0x28eb8
+UnknownText_0x28eb8:
 	; Trade @ for @ ?
 	text_jump UnknownText_0x1c4212
 	db "@"
-; 0x28ebd
 
-String28ebd: ; 28ebd
+String28ebd:
 	db   "Trade completed!@"
 
-String_TooBadTheTradeWasCanceled: ; 28ece
+String_TooBadTheTradeWasCanceled:
 	db   "Too bad! The trade"
 	next "was canceled!@"
 
-
-LinkTextboxAtHL: ; 28eef
+LinkTextboxAtHL:
 	ld d, h
 	ld e, l
 	farcall LinkTextbox
 	ret
-; 28ef8
 
-LoadTradeScreenBorder: ; 28ef8
+LoadTradeScreenBorder:
 	farcall _LoadTradeScreenBorder
 	ret
-; 28eff
 
-SetTradeRoomBGPals: ; 28eff
+SetTradeRoomBGPals:
 	farcall LoadTradeRoomBGPals_ ; just a nested farcall; so wasteful
 	call SetPalettes
 	ret
-; 28f09
 
-Unreferenced_Function28f09: ; 28f09
+Unreferenced_Function28f09:
 	hlcoord 0, 0
 	ld b, 6
 	ld c, 18
@@ -2027,18 +1986,18 @@ Unreferenced_Function28f09: ; 28f09
 	call LinkTextboxAtHL
 	farcall PlaceTradePartnerNamesAndParty
 	ret
-; 28f24
 
-INCLUDE "engine/trade_animation.asm"
+INCLUDE "engine/movie/trade_animation.asm"
 
-Special_CheckTimeCapsuleCompatibility: ; 29bfb
-; Checks to see if your Party is compatible with the generation 1 games.  Returns the following in wScriptVar:
+CheckTimeCapsuleCompatibility:
+; Checks to see if your party is compatible with the Gen 1 games.
+; Returns the following in wScriptVar:
 ; 0: Party is okay
-; 1: At least one Pokemon was introduced in GS
-; 2: At least one Pokemon has a move that was introduced in GS
-; 3: At least one Pokemon is holding mail
+; 1: At least one Pokémon was introduced in Gen 2
+; 2: At least one Pokémon has a move that was introduced in Gen 2
+; 3: At least one Pokémon is holding mail
 
-; If any party Pokemon was introduced in the generation 2 games, don't let it in.
+; If any party Pokémon was introduced in the Gen 2 games, don't let it in.
 	ld hl, wPartySpecies
 	ld b, PARTY_LENGTH
 .loop
@@ -2050,7 +2009,7 @@ Special_CheckTimeCapsuleCompatibility: ; 29bfb
 	dec b
 	jr nz, .loop
 
-; If any party Pokemon is holding mail, don't let it in.
+; If any party Pokémon is holding mail, don't let it in.
 .checkitem
 	ld a, [wPartyCount]
 	ld b, a
@@ -2068,7 +2027,7 @@ Special_CheckTimeCapsuleCompatibility: ; 29bfb
 	dec b
 	jr nz, .itemloop
 
-; If any party Pokemon has a move that was introduced in the generation 2 games, don't let it in.
+; If any party Pokémon has a move that was introduced in the Gen 2 games, don't let it in.
 	ld hl, wPartyMon1Moves
 	ld a, [wPartyCount]
 	ld b, a
@@ -2080,7 +2039,7 @@ Special_CheckTimeCapsuleCompatibility: ; 29bfb
 	jr nc, .move_too_new
 	dec c
 	jr nz, .move_next
-	ld de, wPartyMon2 - (wPartyMon1 + NUM_MOVES)
+	ld de, PARTYMON_STRUCT_LENGTH - NUM_MOVES
 	add hl, de
 	dec b
 	jr nz, .move_loop
@@ -2110,9 +2069,8 @@ Special_CheckTimeCapsuleCompatibility: ; 29bfb
 .done
 	ld [wScriptVar], a
 	ret
-; 29c67
 
-Function29c67: ; 29c67
+Function29c67:
 	ld a, [wPartyCount]
 	sub b
 	ld c, a
@@ -2124,9 +2082,8 @@ Function29c67: ; 29c67
 	ld [wd265], a
 	call GetPokemonName
 	ret
-; 29c7b
 
-Special_EnterTimeCapsule: ; 29c7b
+EnterTimeCapsule:
 	ld c, 10
 	call DelayFrames
 	ld a, $4
@@ -2138,9 +2095,8 @@ Special_EnterTimeCapsule: ; 29c7b
 	inc a
 	ld [wLinkMode], a
 	ret
-; 29c92
 
-Special_WaitForOtherPlayerToExit: ; 29c92
+WaitForOtherPlayerToExit:
 	ld c, 3
 	call DelayFrames
 	ld a, CONNECTION_NOT_ESTABLISHED
@@ -2186,23 +2142,20 @@ Special_WaitForOtherPlayerToExit: ; 29c92
 	ld [hVBlank], a
 	ld [wLinkMode], a
 	ret
-; 29ce8
 
-Special_SetBitsForLinkTradeRequest: ; 29ce8
+SetBitsForLinkTradeRequest:
 	ld a, LINK_TRADECENTER - 1
 	ld [wPlayerLinkAction], a
 	ld [wd265], a
 	ret
-; 29cf1
 
-Special_SetBitsForBattleRequest: ; 29cf1
+SetBitsForBattleRequest:
 	ld a, LINK_COLOSSEUM - 1
 	ld [wPlayerLinkAction], a
 	ld [wd265], a
 	ret
-; 29cfa
 
-Special_SetBitsForTimeCapsuleRequest: ; 29cfa
+SetBitsForTimeCapsuleRequest:
 	ld a, $2
 	ld [rSB], a
 	xor a
@@ -2215,9 +2168,8 @@ Special_SetBitsForTimeCapsuleRequest: ; 29cfa
 	ld [wPlayerLinkAction], a
 	ld [wd265], a
 	ret
-; 29d11
 
-Special_WaitForLinkedFriend: ; 29d11
+WaitForLinkedFriend:
 	ld a, [wPlayerLinkAction]
 	and a
 	jr z, .no_link_action
@@ -2287,9 +2239,8 @@ Special_WaitForLinkedFriend: ; 29d11
 	xor a
 	ld [wScriptVar], a
 	ret
-; 29d92
 
-Special_CheckLinkTimeout: ; 29d92
+CheckLinkTimeout:
 	ld a, $1
 	ld [wPlayerLinkAction], a
 	ld hl, wLinkTimeoutFrames
@@ -2309,9 +2260,8 @@ Special_CheckLinkTimeout: ; 29d92
 	and a
 	ret nz
 	jp Link_ResetSerialRegistersAfterLinkClosure
-; 29dba
 
-Function29dba: ; 29dba
+Function29dba:
 	ld a, $5
 	ld [wPlayerLinkAction], a
 	ld hl, wLinkTimeoutFrames
@@ -2357,9 +2307,8 @@ Function29dba: ; 29dba
 	xor a
 	ld [hVBlank], a
 	ret
-; 29e0c
 
-Link_CheckCommunicationError: ; 29e0c
+Link_CheckCommunicationError:
 	xor a
 	ld [hSerialReceivedNewData], a
 	ld a, [wLinkTimeoutFrames]
@@ -2388,9 +2337,8 @@ Link_CheckCommunicationError: ; 29e0c
 	ld [hli], a
 	ld [hl], a
 	ret
-; 29e3b
 
-.CheckConnected: ; 29e3b
+.CheckConnected:
 	call WaitLinkTransfer
 	ld hl, wLinkTimeoutFrames
 	ld a, [hli]
@@ -2399,9 +2347,8 @@ Link_CheckCommunicationError: ; 29e0c
 	ld a, [hl]
 	inc a
 	ret
-; 29e47
 
-.AcknowledgeSerial: ; 29e47
+.AcknowledgeSerial:
 	ld b, 10
 .loop
 	call DelayFrame
@@ -2409,9 +2356,8 @@ Link_CheckCommunicationError: ; 29e0c
 	dec b
 	jr nz, .loop
 	ret
-; 29e53
 
-.ConvertDW: ; 29e53
+.ConvertDW:
 	; [wLinkTimeoutFrames] = ((hl - $100) / 4) + $100
 	;                      = (hl / 4) + $c0
 	dec h
@@ -2425,9 +2371,8 @@ Link_CheckCommunicationError: ; 29e0c
 	ld a, l
 	ld [wLinkTimeoutFrames + 1], a
 	ret
-; 29e66
 
-Special_TryQuickSave: ; 29e66
+TryQuickSave:
 	ld a, [wd265]
 	push af
 	farcall Link_SaveGame
@@ -2441,9 +2386,8 @@ Special_TryQuickSave: ; 29e66
 	pop af
 	ld [wd265], a
 	ret
-; 29e82
 
-Special_CheckBothSelectedSameRoom: ; 29e82
+CheckBothSelectedSameRoom:
 	ld a, [wd265]
 	call Link_EnsureSync
 	push af
@@ -2468,9 +2412,8 @@ Special_CheckBothSelectedSameRoom: ; 29e82
 	xor a ; FALSE
 	ld [wScriptVar], a
 	ret
-; 29eaf
 
-Special_TimeCapsule: ; 29eaf
+TimeCapsule:
 	ld a, LINK_TIMECAPSULE
 	ld [wLinkMode], a
 	call DisableSpriteUpdates
@@ -2479,9 +2422,8 @@ Special_TimeCapsule: ; 29eaf
 	xor a
 	ld [hVBlank], a
 	ret
-; 29ec4
 
-Special_TradeCenter: ; 29ec4
+TradeCenter:
 	ld a, LINK_TRADECENTER
 	ld [wLinkMode], a
 	call DisableSpriteUpdates
@@ -2490,9 +2432,8 @@ Special_TradeCenter: ; 29ec4
 	xor a
 	ld [hVBlank], a
 	ret
-; 29ed9
 
-Special_Colosseum: ; 29ed9
+Colosseum:
 	ld a, LINK_COLOSSEUM
 	ld [wLinkMode], a
 	call DisableSpriteUpdates
@@ -2501,24 +2442,21 @@ Special_Colosseum: ; 29ed9
 	xor a
 	ld [hVBlank], a
 	ret
-; 29eee
 
-Special_CloseLink: ; 29eee
+CloseLink:
 	xor a
 	ld [wLinkMode], a
 	ld c, 3
 	call DelayFrames
 	jp Link_ResetSerialRegistersAfterLinkClosure
-; 29efa
 
-Special_FailedLinkToPast: ; 29efa
+FailedLinkToPast:
 	ld c, 40
 	call DelayFrames
 	ld a, $e
 	jp Link_EnsureSync
-; 29f04
 
-Link_ResetSerialRegistersAfterLinkClosure: ; 29f04
+Link_ResetSerialRegistersAfterLinkClosure:
 	ld c, 3
 	call DelayFrames
 	ld a, CONNECTION_NOT_ESTABLISHED
@@ -2529,9 +2467,8 @@ Link_ResetSerialRegistersAfterLinkClosure: ; 29f04
 	ld [hSerialReceive], a
 	ld [rSC], a
 	ret
-; 29f17
 
-Link_EnsureSync: ; 29f17
+Link_EnsureSync:
 	add $d0
 	ld [wPlayerLinkAction], a
 	ld [wcf57], a
@@ -2558,9 +2495,8 @@ Link_EnsureSync: ; 29f17
 	ld a, b
 	and $f
 	ret
-; 29f47
 
-Special_CableClubCheckWhichChris: ; 29f47
+CableClubCheckWhichChris:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	ld a, TRUE
@@ -2570,11 +2506,9 @@ Special_CableClubCheckWhichChris: ; 29f47
 .yes
 	ld [wScriptVar], a
 	ret
-; 29f54
 
-Unreferenced_Gen1LinkCommsBorderGFX: ; 29f54
+Unreferenced_Gen1LinkCommsBorderGFX:
 INCBIN "gfx/trade/unused_gen_1_border_tiles.2bpp"
-; 29fe4
 
 Unreferenced_Function29fe4:
 	ld a, BANK(sPartyMail)
diff --git a/engine/link_2.asm b/engine/link/link_2.asm
index e2fe47dc5..9406e43bb 100644
--- a/engine/link_2.asm
+++ b/engine/link/link_2.asm
@@ -1,4 +1,4 @@
-LinkMonStatsScreen: ; 4d319
+LinkMonStatsScreen:
 	ld a, [wMenuCursorY]
 	dec a
 	ld [wCurPartyMon], a
@@ -17,12 +17,12 @@ LinkMonStatsScreen: ; 4d319
 	call WaitBGMap2
 	ret
 
-Link_WaitBGMap: ; 4d354
+Link_WaitBGMap:
 	call WaitBGMap
 	call WaitBGMap2
 	ret
 
-LinkTextbox2: ; 4d35b
+LinkTextbox2:
 	ld h, d
 	ld l, e
 	push bc
@@ -52,9 +52,8 @@ LinkTextbox2: ; 4d35b
 	dec b
 	jr nz, .row
 	ret
-; 4d37e
 
-.PlaceBorder: ; 4d37e
+.PlaceBorder:
 	push hl
 	ld a, $76
 	ld [hli], a
@@ -67,26 +66,25 @@ LinkTextbox2: ; 4d35b
 	add hl, de
 .loop
 	push hl
-	ld a, "┌"
+	ld a, $79
 	ld [hli], a
 	ld a, " "
 	call .PlaceRow
-	ld [hl], "─"
+	ld [hl], $7a
 	pop hl
 	ld de, SCREEN_WIDTH
 	add hl, de
 	dec b
 	jr nz, .loop
 
-	ld a, "┐"
+	ld a, $7b
 	ld [hli], a
-	ld a, "│"
+	ld a, $7c
 	call .PlaceRow
-	ld [hl], "└"
+	ld [hl], $7d
 	ret
-; 4d3ab
 
-.PlaceRow: ; 4d3ab
+.PlaceRow:
 	ld d, c
 .row_loop
 	ld [hli], a
diff --git a/engine/link_trade.asm b/engine/link/link_trade.asm
index bb3423051..a3c596bfe 100755..100644
--- a/engine/link_trade.asm
+++ b/engine/link/link_trade.asm
@@ -1,25 +1,22 @@
 LinkCommsBorderGFX:
 INCBIN "gfx/trade/border_tiles.2bpp"
-; 16d421
 
-__LoadTradeScreenBorder: ; 16d421
+__LoadTradeScreenBorder:
 	ld de, LinkCommsBorderGFX
 	ld hl, vTiles2
 	lb bc, BANK(LinkCommsBorderGFX), 70
 	call Get2bpp
 	ret
-; 16d42e
 
-Function16d42e: ; 16d42e
-	ld hl, Tilemap_16d465
+Function16d42e:
+	ld hl, Tilemap_MobileTradeBorderFullscreen
 	decoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call CopyBytes
 	ret
-; 16d43b
 
-Function16d43b: ; 16d43b
-	call LoadStandardMenuDataHeader
+Function16d43b:
+	call LoadStandardMenuHeader
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -32,18 +29,17 @@ Function16d43b: ; 16d43b
 	call JoyWaitAorB
 	call Call_ExitMenu
 	ret
-; 16d465
 
-Tilemap_16d465:
+Tilemap_MobileTradeBorderFullscreen:
 INCBIN "gfx/trade/border_mobile_fullscreen.tilemap"
 
-Tilemap_16d5cd:
+Tilemap_CableTradeBorderTop:
 INCBIN "gfx/trade/border_cable_top.tilemap"
 
-Tilemap_16d5f5:
+Tilemap_CableTradeBorderBottom:
 INCBIN "gfx/trade/border_cable_bottom.tilemap"
 
-_LinkTextbox: ; 16d61d
+_LinkTextbox:
 	ld h, d
 	ld l, e
 	push bc
@@ -73,9 +69,8 @@ _LinkTextbox: ; 16d61d
 	dec b
 	jr nz, .row
 	ret
-; 16d640
 
-.PlaceBorder ; 16d640
+.PlaceBorder
 	push hl
 	ld a, $30
 	ld [hli], a
@@ -105,18 +100,16 @@ _LinkTextbox: ; 16d61d
 	call .PlaceRow
 	ld [hl], $37
 	ret
-; 16d66d
 
-.PlaceRow ; 16d66d
+.PlaceRow
 	ld d, c
 .row_loop
 	ld [hli], a
 	dec d
 	jr nz, .row_loop
 	ret
-; 16d673
 
-InitTradeSpeciesList: ; 16d673
+InitTradeSpeciesList:
 	call _LoadTradeScreenBorder
 	call Function16d6ae
 	farcall InitMG_Mobile_LinkTradePalMap
@@ -125,59 +118,50 @@ InitTradeSpeciesList: ; 16d673
 	ld de, .CANCEL
 	call PlaceString
 	ret
-; 16d68f
 
-.CANCEL: ; 16d68f
+.CANCEL:
 	db "CANCEL@"
-; 16d696
 
-_LoadTradeScreenBorder: ; 16d696
+_LoadTradeScreenBorder:
 	call __LoadTradeScreenBorder
 	ret
-; 16d69a
 
-
-LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a
+LinkComms_LoadPleaseWaitTextboxBorderGFX:
 	ld de, LinkCommsBorderGFX + $30 tiles
 	ld hl, vTiles2 tile $76
 	lb bc, BANK(LinkCommsBorderGFX), 8
 	call Get2bpp
 	ret
-; 16d6a7
 
-LoadTradeRoomBGPals_: ; 16d6a7
+LoadTradeRoomBGPals_:
 	farcall LoadTradeRoomBGPals
 	ret
-; 16d6ae
 
-Function16d6ae: ; 16d6ae
+Function16d6ae:
 	call Function16d42e
-	ld hl, Tilemap_16d5cd
+	ld hl, Tilemap_CableTradeBorderTop
 	decoord 0, 0
 	ld bc, 2 * SCREEN_WIDTH
 	call CopyBytes
-	ld hl, Tilemap_16d5f5
+	ld hl, Tilemap_CableTradeBorderBottom
 	decoord 0, 16
 	ld bc, 2 * SCREEN_WIDTH
 	call CopyBytes
 	ret
-; 16d6ca
 
-LinkTextbox: ; 16d6ca
+LinkTextbox:
 	call _LinkTextbox
 	ret
-; 16d6ce
 
-Function16d6ce: ; 16d6ce
-	call LoadStandardMenuDataHeader
+Function16d6ce:
+	call LoadStandardMenuHeader
 	call Function16d6e1
 	farcall WaitLinkTransfer
 	call Call_ExitMenu
 	call WaitBGMap2
 	ret
-; 16d6e1
 
-Function16d6e1: ; 16d6e1
+Function16d6e1:
 	hlcoord 4, 10
 	ld b, 1
 	ld c, 10
@@ -189,19 +173,16 @@ Function16d6e1: ; 16d6e1
 	call WaitBGMap2
 	ld c, 50
 	jp DelayFrames
-; 16d701
 
-.Waiting: ; 16d701
+.Waiting:
 	db "WAITING..!@"
-; 16d70c
 
-LinkTradeMenu: ; 16d70c
+LinkTradeMenu:
 	call .MenuAction
 	call .GetJoypad
 	ret
-; 16d713
 
-.GetJoypad: ; 16d713
+.GetJoypad:
 	push bc
 	push af
 	ld a, [hJoyLast]
@@ -216,9 +197,8 @@ LinkTradeMenu: ; 16d70c
 	pop bc
 	ld d, a
 	ret
-; 16d725
 
-.MenuAction: ; 16d725
+.MenuAction:
 	ld hl, w2DMenuFlags2
 	res 7, [hl]
 	ld a, [hBGMapMode]
@@ -246,9 +226,8 @@ LinkTradeMenu: ; 16d70c
 
 .done
 	ret
-; 16d759
 
-.UpdateBGMapAndOAM: ; 16d759
+.UpdateBGMapAndOAM:
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -269,9 +248,8 @@ LinkTradeMenu: ; 16d70c
 	jr z, .loop2
 	and a
 	ret
-; 16d77a
 
-.UpdateCursor: ; 16d77a
+.UpdateCursor:
 	ld hl, wCursorCurrentTile
 	ld a, [hli]
 	ld h, [hl]
@@ -346,9 +324,8 @@ LinkTradeMenu: ; 16d70c
 	ld a, h
 	ld [wCursorCurrentTile + 1], a
 	ret
-; 16d7e7
 
-.TryAnims: ; 16d7e7
+.TryAnims:
 	ld a, [w2DMenuFlags1]
 	bit 6, a
 	jr z, .skip_anims
@@ -360,4 +337,3 @@ LinkTradeMenu: ; 16d70c
 	ret z
 	scf
 	ret
-; 16d7fe
diff --git a/engine/mystery_gift.asm b/engine/link/mystery_gift.asm
index dc1daa1a3..0a5dfcec3 100755..100644
--- a/engine/mystery_gift.asm
+++ b/engine/link/mystery_gift.asm
@@ -1,4 +1,4 @@
-DoMysteryGift: ; 1048ba (41:48ba)
+DoMysteryGift:
 	call ClearTileMap
 	call ClearSprites
 	call WaitBGMap
@@ -98,84 +98,74 @@ DoMysteryGift: ; 1048ba (41:48ba)
 	ld hl, .Text_Sent ; sent item
 	jr .PrintTextAndExit
 
-.LinkCanceled: ; 1049af (41:49af)
+.LinkCanceled:
 	ld hl, .Text_LinkCanceled ; Link has been canceled
 	jr .PrintTextAndExit
 
-.CommunicationError: ; 1049b4 (41:49b4)
+.CommunicationError:
 	ld hl, .Text_CommunicationError ; Communication error
 	call PrintText
 	jp DoMysteryGift
 
-.GiftWaiting: ; 1049bd (41:49bd)
+.GiftWaiting:
 	ld hl, .Text_ReceiveGiftAtCounter ; receive gift at counter
 	jr .PrintTextAndExit
 
-.FriendNotReady: ; 1049c2 (41:49c2)
+.FriendNotReady:
 	ld hl, .Text_FriendNotReady ; friend not ready
 
-.PrintTextAndExit: ; 1049c5 (41:49c5)
+.PrintTextAndExit:
 	call PrintText
 	ld a, LCDC_DEFAULT
 	ld [rLCDC], a
 	ret
-; 1049cd (41:49cd)
 
-.String_PressAToLink_BToCancel: ; 1049cd
+.String_PressAToLink_BToCancel:
 	db   "Press A to"
 	next "link IR-Device"
 	next "Press B to"
 	next "cancel it."
 	db   "@"
-; 1049fd
 
-.Text_LinkCanceled: ; 1049fd
+.Text_LinkCanceled:
 	text_jump UnknownText_0x1c0436
 	db "@"
-; 104a02
 
-.Text_CommunicationError: ; 104a02
+.Text_CommunicationError:
 	text_jump UnknownText_0x1c0454
 	db "@"
-; 104a07
 
-.Text_ReceiveGiftAtCounter: ; 104a07
+.Text_ReceiveGiftAtCounter:
 	text_jump UnknownText_0x1c046a
 	db "@"
-; 104a0c
 
-.Text_FriendNotReady: ; 104a0c
+.Text_FriendNotReady:
 	text_jump UnknownText_0x1c048e
 	db "@"
-; 104a11
 
-.Text_MaxFiveGifts: ; 104a11
+.Text_MaxFiveGifts:
 	text_jump UnknownText_0x1c04a7
 	db "@"
-; 104a16
 
-.Text_MaxOneGiftPerPerson: ; 104a16
+.Text_MaxOneGiftPerPerson:
 	text_jump UnknownText_0x1c04c6
 	db "@"
-; 104a1b
 
-.Text_Sent: ; 104a1b
+.Text_Sent:
 	text_jump UnknownText_0x1c04e9
 	db "@"
-; 104a20
 
-.Text_SentToHome: ; 104a20
+.Text_SentToHome:
 	text_jump UnknownText_0x1c04fa
 	db "@"
-; 104a25
 
-.CheckAlreadyGotFiveGiftsToday: ; 104a25 (41:4a25)
+.CheckAlreadyGotFiveGiftsToday:
 	call GetMysteryGiftBank
 	ld a, [sNumDailyMysteryGiftPartnerIDs]
 	cp $5
 	jp CloseSRAM
 
-.CheckAlreadyGotAGiftFromThatPerson: ; 104a30 (41:4a30)
+.CheckAlreadyGotAGiftFromThatPerson:
 	call GetMysteryGiftBank
 	ld a, [wMysteryGiftPartnerID]
 	ld b, a
@@ -203,7 +193,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
 .No:
 	jp CloseSRAM
 
-.AddMysteryGiftPartnerID: ; 104a56 (41:4a56)
+.AddMysteryGiftPartnerID:
 	call GetMysteryGiftBank
 	ld hl, sNumDailyMysteryGiftPartnerIDs
 	ld a, [hl]
@@ -219,7 +209,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
 	ld [hl], a
 	jp CloseSRAM
 
-.SaveMysteryGiftTrainerName: ; 104a71 (41:4a71)
+.SaveMysteryGiftTrainerName:
 	call GetMysteryGiftBank
 	ld a, $1
 	ld [sMysteryGiftTrainerHouseFlag], a
@@ -235,7 +225,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
 	call CopyBytes
 	jp CloseSRAM
 
-Function104a95: ; 104a95 (41:4a95)
+Function104a95:
 	di
 	farcall ClearChannels
 	call Function104d5e
@@ -305,10 +295,10 @@ Function104a95: ; 104a95 (41:4a95)
 	ld [hMGStatusFlags], a
 	jp Function104bd0
 
-Function104b04: ; 104b04 (41:4b04)
+Function104b04:
 	call Function104b40
 	jp nz, Function104bd0
-Function104b0a: ; 104b0a (41:4b0a)
+Function104b0a:
 	call Function104d38
 	jp nz, Function104bd0
 	call Function104b88
@@ -318,7 +308,7 @@ Function104b0a: ; 104b0a (41:4b0a)
 	call Function105033
 	jp Function104bd0
 
-Function104b22: ; 104b22 (41:4b22)
+Function104b22:
 	call Function104b88
 	jp nz, Function104bd0
 	call Function104d43
@@ -330,13 +320,13 @@ Function104b22: ; 104b22 (41:4b22)
 	call Function10502e
 	jp Function104bd0
 
-Function104b40: ; 104b40 (41:4b40)
+Function104b40:
 	ld hl, hPrintNum1
 	ld b, $1
 	call Function104d56
 	ret nz
 
-Function104b49: ; 104b49 (41:4b49)
+Function104b49:
 	call Function105033
 	ld a, [hMGStatusFlags]
 	cp $6c
@@ -368,7 +358,7 @@ Function104b49: ; 104b49 (41:4b49)
 	cp $6c
 	ret
 
-Function104b88: ; 104b88 (41:4b88)
+Function104b88:
 	ld a, $96
 	ld [hPrintNum1], a
 	ld hl, hPrintNum1
@@ -394,7 +384,7 @@ Function104b88: ; 104b88 (41:4b88)
 	jp nz, Function104d32
 	call Function104d38
 	ret nz
-	ld hl, wOverworldMap
+	ld hl, wLinkData
 	ld a, [wca02]
 	ld b, a
 	call Function104d4e
@@ -404,7 +394,7 @@ Function104b88: ; 104b88 (41:4b88)
 	cp $6c
 	ret
 
-Function104bd0: ; 104bd0 (41:4bd0)
+Function104bd0:
 	nop
 	ld a, [hMGStatusFlags]
 	cp $10
@@ -451,7 +441,7 @@ Function104bd0: ; 104bd0 (41:4bd0)
 	pop af
 	ret
 
-Function104c2d: ; 104c2d (41:4c2d)
+Function104c2d:
 	di
 	farcall ClearChannels
 	call Function104d5e
@@ -488,7 +478,7 @@ Function104c2d: ; 104c2d (41:4c2d)
 	call Function10502e
 	jp Function104d1c
 
-Function104c8a: ; 104c8a (41:4c8a)
+Function104c8a:
 	ld hl, hPrintNum1
 	ld b, $1
 	call Function104d56
@@ -524,7 +514,7 @@ Function104c8a: ; 104c8a (41:4c8a)
 	cp $6c
 	ret
 
-Function104cd2: ; 104cd2 (41:4cd2)
+Function104cd2:
 	ld a, $3c
 	ld [hPrintNum1], a
 	ld hl, hPrintNum1
@@ -551,7 +541,7 @@ Function104cd2: ; 104cd2 (41:4cd2)
 	jp nz, Function104d32
 	call Function104d38
 	ret nz
-	ld hl, wOverworldMap
+	ld hl, wLinkData
 	ld a, [wca02]
 	ld b, a
 	call Function104d4e
@@ -561,7 +551,7 @@ Function104cd2: ; 104cd2 (41:4cd2)
 	cp $6c
 	ret
 
-Function104d1c: ; 104d1c (41:4d1c)
+Function104d1c:
 	nop
 	ld a, [hMGStatusFlags]
 	push af
@@ -576,39 +566,39 @@ Function104d1c: ; 104d1c (41:4d1c)
 	pop af
 	ret
 
-Function104d32: ; 104d32 (41:4d32)
+Function104d32:
 	ld a, $80
 	ld [hMGStatusFlags], a
 	and a
 	ret
 
-Function104d38: ; 104d38 (41:4d38)
+Function104d38:
 	call Function104d96
 	call Function104e46
 	ld a, [hMGStatusFlags]
 	cp $6c
 	ret
 
-Function104d43: ; 104d43 (41:4d43)
+Function104d43:
 	call Function104d96
 	call Function104dfe
 	ld a, [hMGStatusFlags]
 	cp $6c
 	ret
 
-Function104d4e: ; 104d4e (41:4d4e)
+Function104d4e:
 	call Function104e93
 	ld a, [hMGStatusFlags]
 	cp $6c
 	ret
 
-Function104d56: ; 104d56 (41:4d56)
+Function104d56:
 	call Function104f57
 	ld a, [hMGStatusFlags]
 	cp $6c
 	ret
 
-Function104d5e: ; 104d5e (41:4d5e)
+Function104d5e:
 	call Function104d74
 	ld a, $4
 	ld [rIE], a
@@ -624,7 +614,7 @@ Function104d5e: ; 104d5e (41:4d5e)
 	jr nz, .asm_104d6d
 	ret
 
-Function104d74: ; 104d74 (41:4d74)
+Function104d74:
 	xor a
 	ld [rTAC], a
 	ld a, $fe
@@ -636,7 +626,7 @@ Function104d74: ; 104d74 (41:4d74)
 	ld [rTAC], a
 	ret
 
-Function104d86: ; 104d86 (41:4d86)
+Function104d86:
 	xor a
 	ld [rTAC], a
 	ld [rTMA], a
@@ -647,21 +637,21 @@ Function104d86: ; 104d86 (41:4d86)
 	ld [rTAC], a
 	ret
 
-Function104d96: ; 104d96 (41:4d96)
+Function104d96:
 	ld a, $c0
 	call Function104e8c
 	ld a, $1
 	ld [hPrintNum9], a
 	ret
 
-Function104da0: ; 104da0 (41:4da0)
+Function104da0:
 	xor a
 	call Function104e8c
 	ld a, $2
 	ld [rTAC], a
 	ret
 
-Function104da9: ; 104da9 (41:4da9)
+Function104da9:
 	inc d
 	ret z
 	xor a
@@ -673,7 +663,7 @@ Function104da9: ; 104da9 (41:4da9)
 	or a
 	ret
 
-Function104db7: ; 104db7 (41:4db7)
+Function104db7:
 	inc d
 	ret z
 	xor a
@@ -685,7 +675,7 @@ Function104db7: ; 104db7 (41:4db7)
 	or a
 	ret
 
-Function104dc5: ; 104dc5 (41:4dc5)
+Function104dc5:
 	ld a, $c1
 	ld [$ff00+c], a
 .wait
@@ -696,7 +686,7 @@ Function104dc5: ; 104dc5 (41:4dc5)
 	halt
 	jr .wait
 
-Function104dd1: ; 104dd1 (41:4dd1)
+Function104dd1:
 	ld a, $c0
 	ld [$ff00+c], a
 .wait
@@ -707,7 +697,7 @@ Function104dd1: ; 104dd1 (41:4dd1)
 	halt
 	jr .wait
 
-Function104ddd: ; 104ddd (41:4ddd)
+Function104ddd:
 	ld d, $0
 	ld e, d
 	ld a, $1
@@ -730,7 +720,7 @@ Function104ddd: ; 104ddd (41:4ddd)
 	and b
 	jr nz, .loop
 
-Function104dfe: ; 104dfe (41:4dfe)
+Function104dfe:
 	ld c, LOW(rRP)
 	ld d, $0
 	ld e, d
@@ -757,7 +747,7 @@ Function104dfe: ; 104dfe (41:4dfe)
 	call Function104dd1
 	ret
 
-Function104e3a: ; 104e3a (41:4e3a)
+Function104e3a:
 	; Wait a random amount of time
 	call Random
 	ld e, a
@@ -768,7 +758,7 @@ Function104e3a: ; 104e3a (41:4e3a)
 	ld a, d
 	or e
 	jr nz, .loop
-Function104e46: ; 104e46 (41:4e46)
+Function104e46:
 	ld a, $2
 	ld [hPrintNum9], a
 	ld c, LOW(rRP)
@@ -800,13 +790,13 @@ Function104e46: ; 104e46 (41:4e46)
 	ld [hMGStatusFlags], a
 	ret
 
-Function104e8c: ; 104e8c (41:4e8c)
+Function104e8c:
 	ld [rRP], a
 	ld a, $ff
 	ld [hMGStatusFlags], a
 	ret
 
-Function104e93: ; 104e93 (41:4e93)
+Function104e93:
 	xor a
 	ld [hPrintNum5], a
 	ld [hPrintNum6], a
@@ -843,7 +833,7 @@ Function104e93: ; 104e93 (41:4e93)
 	pop hl
 	ret
 
-Function104ed6: ; 104ed6 (41:4ed6)
+Function104ed6:
 	ld c, LOW(rRP)
 	ld d, $5
 	call Function104dd1
@@ -867,7 +857,7 @@ Function104ed6: ; 104ed6 (41:4ed6)
 	add e
 	ld [hPrintNum5], a
 	ld a, [hPrintNum6]
-	adc $0
+	adc 0
 	ld [hPrintNum6], a
 .asm_104f02
 	xor a
@@ -910,25 +900,25 @@ Function104ed6: ; 104ed6 (41:4ed6)
 	call Function104dd1
 	ret
 
-Function104f42: ; 104f42 (41:4f42)
+Function104f42:
 	ld a, [hMGStatusFlags]
 	or $2
 	ld [hMGStatusFlags], a
 	ret
 
-Function104f49: ; 104f49 (41:4f49)
+Function104f49:
 	ld a, [hMGStatusFlags]
 	or $1
 	ld [hMGStatusFlags], a
 	ret
 
-Function104f50: ; 104f50 (41:4f50)
+Function104f50:
 	ld a, [hMGStatusFlags]
 	or $80
 	ld [hMGStatusFlags], a
 	ret
 
-Function104f57: ; 104f57 (41:4f57)
+Function104f57:
 	xor a
 	ld [hPrintNum5], a
 	ld [hPrintNum6], a
@@ -980,7 +970,7 @@ Function104f57: ; 104f57 (41:4f57)
 	ld [hPrintNum6], a
 	ret
 
-Function104faf: ; 104faf (41:4faf)
+Function104faf:
 	ld c, LOW(rRP)
 	ld d, $0
 	call Function104db7
@@ -1045,7 +1035,7 @@ Function104faf: ; 104faf (41:4faf)
 	add e
 	ld [hPrintNum5], a
 	ld a, [hPrintNum6]
-	adc $0
+	adc 0
 	ld [hPrintNum6], a
 	jr .asm_104fd2
 .asm_10501a
@@ -1059,15 +1049,15 @@ Function104faf: ; 104faf (41:4faf)
 	call Function104dd1
 	ret
 
-Function10502e: ; 10502e (41:502e)
+Function10502e:
 	ld b, $0
 	jp Function104e93
 
-Function105033: ; 105033 (41:5033)
+Function105033:
 	ld b, $0
 	jp Function104f57
 
-MysteryGift_ReadJoypad: ; 105038 (41:5038)
+MysteryGift_ReadJoypad:
 ; We can only get four inputs at a time.
 ; We take d-pad first for no particular reason.
 	ld a, R_DPAD
@@ -1112,7 +1102,7 @@ endr
 	ld [rJOYP], a
 	ret
 
-MysteryGift_CheckAndSetDecorationAlreadyReceived: ; 105069 (41:5069)
+MysteryGift_CheckAndSetDecorationAlreadyReceived:
 	call GetMysteryGiftBank
 	ld d, $0
 	ld b, CHECK_FLAG
@@ -1134,7 +1124,7 @@ MysteryGift_CheckAndSetDecorationAlreadyReceived: ; 105069 (41:5069)
 	xor a
 	ret
 
-MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091)
+MysteryGift_CopyReceivedDecosToPC:
 	call GetMysteryGiftBank
 	ld c, $0
 .loop
@@ -1157,7 +1147,7 @@ MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091)
 	jr c, .loop
 	jp CloseSRAM
 
-Special_UnlockMysteryGift: ; 1050b9
+UnlockMysteryGift:
 	call GetMysteryGiftBank
 	ld hl, sMysteryGiftUnlocked
 	ld a, [hl]
@@ -1167,9 +1157,8 @@ Special_UnlockMysteryGift: ; 1050b9
 	ld [hl], a
 .ok
 	jp CloseSRAM
-; 1050c8
 
-Function1050c8: ; 1050c8
+Function1050c8:
 	call GetMysteryGiftBank
 	ld a, [sNumDailyMysteryGiftPartnerIDs]
 	cp $ff
@@ -1178,10 +1167,8 @@ Function1050c8: ; 1050c8
 	ld [sNumDailyMysteryGiftPartnerIDs], a
 .okay
 	jp CloseSRAM
-; 1050d9
 
-
-BackupMysteryGift: ; 1050d9
+BackupMysteryGift:
 	call GetMysteryGiftBank
 	ld hl, sMysteryGiftItem
 	ld de, sBackupMysteryGiftItem
@@ -1191,10 +1178,8 @@ BackupMysteryGift: ; 1050d9
 	ld a, [hl]
 	ld [de], a
 	jp CloseSRAM
-; 1050ea
-
 
-RestoreMysteryGift: ; 1050ea (41:50ea)
+RestoreMysteryGift:
 	call GetMysteryGiftBank
 	ld hl, sBackupMysteryGiftItem
 	ld de, sMysteryGiftItem
@@ -1205,7 +1190,7 @@ RestoreMysteryGift: ; 1050ea (41:50ea)
 	ld [de], a
 	jp CloseSRAM
 
-MysteryGift_ClearTrainerData: ; 1050fb (41:50fb)
+MysteryGift_ClearTrainerData:
 	ld hl, wMysteryGiftTrainerData
 	xor a
 	ld b, wMysteryGiftTrainerDataEnd - wMysteryGiftTrainerData
@@ -1215,14 +1200,11 @@ MysteryGift_ClearTrainerData: ; 1050fb (41:50fb)
 	jr nz, .loop
 	ret
 
-
-GetMysteryGiftBank: ; 105106
+GetMysteryGiftBank:
 	ld a, BANK(sBackupMysteryGiftItem)
 	jp GetSRAMBank
-; 10510b
 
-
-StagePartyDataForMysteryGift: ; 10510b (41:510b)
+StagePartyDataForMysteryGift:
 ; You will be sending this data to your mystery gift partner.
 ; Structure is the same as a trainer with species and moves
 ; defined.
@@ -1273,13 +1255,13 @@ StagePartyDataForMysteryGift: ; 10510b (41:510b)
 	ld [wca00], a
 	jp CloseSRAM
 
-InitMysteryGiftLayout: ; 105153 (41:5153)
+InitMysteryGiftLayout:
 	call ClearBGPalettes
 	call DisableLCD
 	ld hl, MysteryGiftGFX
 	ld de, vTiles2 tile $00
 	ld a, BANK(MysteryGiftGFX)
-	ld bc, MysteryGiftGFXEnd - MysteryGiftGFX
+	ld bc, MysteryGiftGFX.End - MysteryGiftGFX
 	call FarCopyBytes
 	hlcoord 0, 0
 	ld a, $42
@@ -1364,37 +1346,36 @@ InitMysteryGiftLayout: ; 105153 (41:5153)
 	call SetPalettes
 	ret
 
-.Load5GFX: ; 10522e (41:522e)
+.Load5GFX:
 	ld b,  5
 	jr .gfx_loop
-; 105232 (41:5232)
 
 .Unreferenced_Load6GFX:
 	ld b,  6
 	jr .gfx_loop
 
-.Load16GFX: ; 105236 (41:5236)
+.Load16GFX:
 	ld b, 16
 
-.gfx_loop ; 105238 (41:5238)
+.gfx_loop
 	ld [hli], a
 	inc a
 	dec b
 	jr nz, .gfx_loop
 	ret
 
-.Load9Column: ; 10523e (41:523e)
+.Load9Column:
 	ld b,  9
 	jr .col_loop
 
-.Load11Column: ; 105242 (41:5242)
+.Load11Column:
 	ld b, 11
 	jr .col_loop
 
-.Load14Column: ; 105246 (41:5246)
+.Load14Column:
 	ld b, 14
 
-.col_loop ; 105248 (41:5248)
+.col_loop
 	ld [hl], a
 	ld de, SCREEN_WIDTH
 	add hl, de
@@ -1402,7 +1383,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153)
 	jr nz, .col_loop
 	ret
 
-.Load16Row: ; 105251 (41:5251)
+.Load16Row:
 	ld b, 16
 .row_loop
 	ld [hli], a
@@ -1410,17 +1391,17 @@ InitMysteryGiftLayout: ; 105153 (41:5153)
 	jr nz, .row_loop
 	ret
 
-MysteryGiftGFX: ; 105258
+MysteryGiftGFX:
 INCBIN "gfx/mystery_gift/mystery_gift.2bpp"
-MysteryGiftGFXEnd:
+.End
 
-Function105688: ; 105688 (41:5688)
+Function105688:
 	call ClearTileMap
 	call ClearSprites
 	call WaitBGMap
 	call Function1057d7
 	hlcoord 3, 8
-	ld de, String_10572e
+	ld de, String_PressAToLink_BToCancel_JP
 	call PlaceString
 	call WaitBGMap
 	call Function10578c
@@ -1451,11 +1432,11 @@ Function105688: ; 105688 (41:5688)
 	ld a, c
 	ld [wd265], a
 	ld hl, Text_CardNotRegistered
-	jr c, asm_105726
+	jr c, PrintTextAndExit_JP
 	ld hl, Text_ListedCardAsNumber
-	jr asm_105726
+	jr PrintTextAndExit_JP
 
-Function1056eb: ; 1056eb (41:56eb)
+Function1056eb:
 	ld c, 16
 .loop
 	ld hl, wVirtualOAMSprite00YCoord
@@ -1484,55 +1465,51 @@ endr
 	pop bc
 	jr .loop
 
-Function105712: ; 105712 (41:5712)
+Function105712:
 	call Function105777
 	ld hl, Text_MGLinkCanceled
-	jr asm_105726
+	jr PrintTextAndExit_JP
 
-Function10571a: ; 10571a (41:571a)
+Function10571a:
 	call Function105777
 	ld hl, Text_MGCommError
 	call PrintText
 	jp Function105688
 
-asm_105726: ; 105726 (41:5726)
+PrintTextAndExit_JP:
 	call PrintText
 	ld a, LCDC_DEFAULT
 	ld [rLCDC], a
 	ret
-; 10572e (41:572e)
 
-String_10572e: ; 10572e
-	db   "エーボタン¯おすと"
+String_PressAToLink_BToCancel_JP:
+	db   "エーボタン<WO>おすと"
 	next "つうしん<PKMN>おこなわれるよ！"
-	next "ビーボタン¯おすと"
-	next "つうしん¯ちゅうし　します"
+	next "ビーボタン<WO>おすと"
+	next "つうしん<WO>ちゅうし　します"
 	db   "@"
 
-; 10575e
-
-Text_ReceivedCard: ; 10575e
+Text_ReceivedCard:
 	text_jump UnknownText_0x1c051a
 	db "@"
 
-Text_ListedCardAsNumber: ; 105763
+Text_ListedCardAsNumber:
 	text_jump UnknownText_0x1c0531
 	db "@"
 
-Text_CardNotRegistered: ; 105768
+Text_CardNotRegistered:
 	text_jump UnknownText_0x1c0555
 	db "@"
 
-Text_MGLinkCanceled: ; 10576d
+Text_MGLinkCanceled:
 	text_jump UnknownText_0x1c0573
 	db "@"
 
-Text_MGCommError: ; 105772
+Text_MGCommError:
 	text_jump UnknownText_0x1c0591
 	db "@"
-; 105777
 
-Function105777: ; 105777 (41:5777)
+Function105777:
 	call ClearSprites
 	call ClearTileMap
 	call EnableLCD
@@ -1542,8 +1519,8 @@ Function105777: ; 105777 (41:5777)
 	call SetPalettes
 	ret
 
-Function10578c: ; 10578c (41:578c)
-	ld de, wOverworldMap
+Function10578c:
+	ld de, wLinkData
 	ld a, BANK(sPlayerData)
 	call GetSRAMBank
 	ld hl, sPlayerData + wPlayerName - wPlayerData
@@ -1572,7 +1549,7 @@ Function10578c: ; 10578c (41:578c)
 	call CloseSRAM
 	ret
 
-Function1057d7: ; 1057d7 (41:57d7)
+Function1057d7:
 	call ClearBGPalettes
 	call DisableLCD
 	ld hl, MysteryGiftJP_GFX
@@ -1666,36 +1643,36 @@ Function1057d7: ; 1057d7 (41:57d7)
 	farcall GetMysteryGift_MobileAdapterLayout
 	jp SetPalettes
 
-.Load6Row: ; 1058c6 (41:58c6)
+.Load6Row:
 	ld b,  6
 	jr .row_loop
 
-.Load11Row: ; 1058ca (41:58ca)
+.Load11Row:
 	ld b, 11
 	jr .row_loop
 
-.Load12Row: ; 1058ce (41:58ce)
+.Load12Row:
 	ld b, 12
 
-.row_loop ; 1058d0 (41:58d0)
+.row_loop
 	ld [hli], a
 	inc a
 	dec b
 	jr nz, .row_loop
 	ret
 
-.Load9Column: ; 1058d6 (41:58d6)
+.Load9Column:
 	ld b,  9
 	jr .column_loop
 
-.Load11Column: ; 1058da (41:58da)
+.Load11Column:
 	ld b, 11
 	jr .column_loop
 
-.Load14Column: ; 1058de (41:58de)
+.Load14Column:
 	ld b, 14
 
-.column_loop ; 1058e0 (41:58e0)
+.column_loop
 	ld [hl], a
 	ld de, SCREEN_WIDTH
 	add hl, de
@@ -1703,16 +1680,15 @@ Function1057d7: ; 1057d7 (41:57d7)
 	jr nz, .column_loop
 	ret
 
-.Load16Row: ; 1058e9 (41:58e9)
+.Load16Row:
 	ld b, 16
 .row_loop_no_inc
 	ld [hli], a
 	dec b
 	jr nz, .row_loop_no_inc
 	ret
-; 1058f0 (41:58f0)
 
-.OAM_data: ; 1058f0
+.OAM_data:
 	dsprite  2, 1,  6, 4, $00, 0
 	dsprite  2, 1,  7, 4, $01, 0
 	dsprite  2, 1,  8, 4, $02, 0
@@ -1731,5 +1707,5 @@ Function1057d7: ; 1057d7 (41:57d7)
 	dsprite  1, 1, 14, 4, $07, 0
 
 ; japanese mystery gift gfx
-MysteryGiftJP_GFX: ; 105930
+MysteryGiftJP_GFX:
 INCBIN "gfx/mystery_gift/mystery_gift_jp.2bpp"
diff --git a/engine/mystery_gift_2.asm b/engine/link/mystery_gift_2.asm
index bb86e1ae6..c1b258724 100755..100644
--- a/engine/mystery_gift_2.asm
+++ b/engine/link/mystery_gift_2.asm
@@ -1,4 +1,4 @@
-PrepMysteryGiftDataToSend: ; 2c642 (b:4642)
+PrepMysteryGiftDataToSend:
 	ld de, wMysteryGiftStaging
 	ld a, $1
 	ld [de], a
@@ -56,7 +56,7 @@ PrepMysteryGiftDataToSend: ; 2c642 (b:4642)
 	ld bc, wMysteryGiftPlayerDataEnd - wMysteryGiftPlayerData
 	jp CopyBytes
 
-.RandomSample: ; 2c6ac (b:46ac)
+.RandomSample:
 	push de
 	call Random
 	cp 10 percent
@@ -121,9 +121,9 @@ PrepMysteryGiftDataToSend: ; 2c642 (b:4642)
 	pop de
 	ret
 
-MysteryGiftGetItemHeldEffect: ; 2c708 (b:4708)
+MysteryGiftGetItemHeldEffect:
 	ld a, c
-	cp MysteryGiftItemsEnd - MysteryGiftItems
+	cp MysteryGiftItems.End - MysteryGiftItems
 	jr nc, MysteryGiftFallbackItem
 	ld hl, MysteryGiftItems
 	ld b, 0
@@ -131,9 +131,9 @@ MysteryGiftGetItemHeldEffect: ; 2c708 (b:4708)
 	ld c, [hl]
 	ret
 
-MysteryGiftGetDecoration: ; 2c715 (b:4715)
+MysteryGiftGetDecoration:
 	ld a, c
-	cp MysteryGiftDecosEnd - MysteryGiftDecos
+	cp MysteryGiftDecos.End - MysteryGiftDecos
 	jr nc, MysteryGiftFallbackItem
 	ld hl, MysteryGiftDecos
 	ld b, 0
@@ -141,11 +141,9 @@ MysteryGiftGetDecoration: ; 2c715 (b:4715)
 	ld c, [hl]
 	ret
 
-MysteryGiftFallbackItem: ; 2c722 (b:4722)
+MysteryGiftFallbackItem:
 	ld c, DECO_POLKADOT_BED ; GREAT_BALL
 	ret
-; 2c725 (b:4725)
-
 
 INCLUDE "data/items/mystery_gift_items.asm"
 
diff --git a/engine/routines/placewaitingtext.asm b/engine/link/place_waiting_text.asm
index 9b2260722..147683042 100644
--- a/engine/routines/placewaitingtext.asm
+++ b/engine/link/place_waiting_text.asm
@@ -1,4 +1,4 @@
-PlaceWaitingText:: ; 4000
+PlaceWaitingText::
 	hlcoord 3, 10
 	ld b, 1
 	ld c, 11
@@ -20,5 +20,5 @@ PlaceWaitingText:: ; 4000
 	ld c, 50
 	jp DelayFrames
 
-.Waiting: ; 4025
+.Waiting:
 	db "Waiting...!@"
diff --git a/engine/time_capsule.asm b/engine/link/time_capsule.asm
index e366c1bbd..195062c1e 100755..100644
--- a/engine/time_capsule.asm
+++ b/engine/link/time_capsule.asm
@@ -1,6 +1,6 @@
 ; These functions seem to be related to backwards compatibility
 
-ValidateOTTrademon: ; fb57e
+ValidateOTTrademon:
 	ld a, [wd003]
 	ld hl, wOTPartyMon1Species
 	call GetPartyLocation
@@ -63,9 +63,8 @@ ValidateOTTrademon: ; fb57e
 .abnormal
 	scf
 	ret
-; fb5dd
 
-Functionfb5dd: ; fb5dd
+Functionfb5dd:
 	ld a, [wd002]
 	ld d, a
 	ld a, [wPartyCount]
@@ -100,9 +99,8 @@ Functionfb5dd: ; fb5dd
 .done
 	and a
 	ret
-; fb60d
 
-PlaceTradePartnerNamesAndParty: ; fb60d
+PlaceTradePartnerNamesAndParty:
 	hlcoord 4, 0
 	ld de, wPlayerName
 	call PlaceString
@@ -118,7 +116,7 @@ PlaceTradePartnerNamesAndParty: ; fb60d
 	call .PlaceSpeciesNames
 	hlcoord 7, 9
 	ld de, wOTPartySpecies
-.PlaceSpeciesNames: ; fb634
+.PlaceSpeciesNames:
 	ld c, $0
 .loop
 	ld a, [de]
@@ -142,6 +140,5 @@ PlaceTradePartnerNamesAndParty: ; fb60d
 	pop bc
 	inc c
 	jr .loop
-; fb656
 
-INCLUDE "data/pokemon/rby_base_special.asm"
+INCLUDE "data/pokemon/gen1_base_special.asm"
diff --git a/engine/time_capsule_2.asm b/engine/link/time_capsule_2.asm
index 0378ed697..be7027f34 100644
--- a/engine/time_capsule_2.asm
+++ b/engine/link/time_capsule_2.asm
@@ -1,4 +1,4 @@
-ConvertMon_2to1: ; fb8f1
+ConvertMon_2to1:
 ; Takes the Gen-2 Pokemon number stored in wd265, finds it in the Pokered_MonIndices table, and returns its index in wd265.
 	push bc
 	push hl
@@ -16,9 +16,8 @@ ConvertMon_2to1: ; fb8f1
 	pop hl
 	pop bc
 	ret
-; fb908
 
-ConvertMon_1to2: ; fb908
+ConvertMon_1to2:
 ; Takes the Gen-1 Pokemon number stored in wd265 and returns the corresponding value from Pokered_MonIndices in wd265.
 	push bc
 	push hl
@@ -33,7 +32,5 @@ ConvertMon_1to2: ; fb908
 	pop hl
 	pop bc
 	ret
-; fb91c
 
-
-INCLUDE "data/pokemon/rby_order.asm"
+INCLUDE "data/pokemon/gen1_order.asm"
diff --git a/engine/routines/getsquareroot.asm b/engine/math/get_square_root.asm
index 412fd04ff..6791fd7b8 100644
--- a/engine/routines/getsquareroot.asm
+++ b/engine/math/get_square_root.asm
@@ -1,6 +1,6 @@
 NUM_SQUARE_ROOTS EQU 255
 
-GetSquareRoot: ; 13b87
+GetSquareRoot:
 ; Return the square root of de in b.
 
 ; Rather than calculating the result, we take the index of the
@@ -24,7 +24,7 @@ GetSquareRoot: ; 13b87
 	jr c, .loop
 	ret
 
-.Squares: ; 13b98
+.Squares:
 x = 1
 rept NUM_SQUARE_ROOTS
 	dw x * x
diff --git a/engine/math.asm b/engine/math/math.asm
index 0cd6b0b47..c2e5f70a3 100755..100644
--- a/engine/math.asm
+++ b/engine/math/math.asm
@@ -1,5 +1,4 @@
-_Multiply:: ; 66de
-
+_Multiply::
 ; hMultiplier is one byte.
 	ld a, 8
 	ld b, a
@@ -11,7 +10,6 @@ _Multiply:: ; 66de
 	ld [hMathBuffer + 3], a
 	ld [hMathBuffer + 4], a
 
-
 .loop
 	ld a, [hMultiplier]
 	srl a
@@ -46,7 +44,6 @@ _Multiply:: ; 66de
 	dec b
 	jr z, .done
 
-
 ; hMultiplicand <<= 1
 
 	ld a, [hMultiplicand + 2]
@@ -67,7 +64,6 @@ _Multiply:: ; 66de
 
 	jr .loop
 
-
 .done
 	ld a, [hMathBuffer + 4]
 	ld [hProduct + 3], a
@@ -82,10 +78,8 @@ _Multiply:: ; 66de
 	ld [hProduct + 0], a
 
 	ret
-; 673e
-
 
-_Divide:: ; 673e
+_Divide::
 	xor a
 	ld [hMathBuffer + 0], a
 	ld [hMathBuffer + 1], a
@@ -193,4 +187,3 @@ _Divide:: ; 673e
 	ld [hDividend + 0], a
 
 	ret
-; 67c1
diff --git a/engine/printnum.asm b/engine/math/print_num.asm
index fec798d5c..c8899be6c 100755..100644
--- a/engine/printnum.asm
+++ b/engine/math/print_num.asm
@@ -1,4 +1,4 @@
-_PrintNum:: ; c4c7
+_PrintNum::
 ; Print c digits of the b-byte value from de to hl.
 ; Allows 2 to 7 digits. For 1-digit numbers, add
 ; the value to char "0" instead of calling PrintNum.
@@ -178,7 +178,7 @@ _PrintNum:: ; c4c7
 	pop bc
 	ret
 
-.PrintYen: ; c5ba
+.PrintYen:
 	push af
 	ld a, [hPrintNum1]
 	and a
@@ -193,7 +193,7 @@ _PrintNum:: ; c4c7
 	pop af
 	ret
 
-.PrintDigit: ; c5cb (3:45cb)
+.PrintDigit:
 	dec e
 	jr nz, .ok
 	ld a, "0"
@@ -278,14 +278,14 @@ _PrintNum:: ; c4c7
 	ld [hl], "<DOT>"
 	ret
 
-.PrintLeadingZero: ; c644
+.PrintLeadingZero:
 ; prints a leading zero unless they are turned off in the flags
 	bit 7, d ; print leading zeroes?
 	ret z
 	ld [hl], "0"
 	ret
 
-.AdvancePointer: ; c64a
+.AdvancePointer:
 ; increments the pointer unless leading zeroes are not being printed,
 ; the number is left-aligned, and no nonzero digits have been printed yet
 	bit 7, d ; print leading zeroes?
diff --git a/engine/math/sine.asm b/engine/math/sine.asm
new file mode 100644
index 000000000..c7422aaf8
--- /dev/null
+++ b/engine/math/sine.asm
@@ -0,0 +1,4 @@
+_Sine::
+; a = d * sin(e * pi/32)
+	ld a, e
+	calc_sine_wave
diff --git a/engine/debug.asm b/engine/menus/debug.asm
index 52bd15f28..a48322488 100755..100644
--- a/engine/debug.asm
+++ b/engine/menus/debug.asm
@@ -1,4 +1,4 @@
-const_value set $6a
+	const_def $6a
 	const DEBUGTEST_UP_ARROW ; $6a
 	const DEBUGTEST_TICKS    ; $6b
 	const DEBUGTEST_WHITE    ; $6c
@@ -22,7 +22,7 @@ const_value set $6a
 	const DEBUGTEST_E        ; $7e
 	const DEBUGTEST_F        ; $7f
 
-ColorTest: ; 818ac
+ColorTest:
 ; A debug menu to test monster and trainer palettes at runtime.
 
 	ld a, [hCGB]
@@ -62,16 +62,15 @@ ColorTest: ; 818ac
 	pop af
 	ld [hInMenu], a
 	ret
-; 818f4
 
-Function818f4: ; 818f4
+Function818f4:
 	ld a, [wd002]
 	and a
 	jr nz, Function81911
 	ld hl, PokemonPalettes
 
-Function818fd: ; 818fd
-	ld de, wOverworldMap
+Function818fd:
+	ld de, wOverworldMapBlocks
 	ld c, NUM_POKEMON + 1
 .asm_81902
 	push bc
@@ -85,9 +84,9 @@ Function818fd: ; 818fd
 	jr nz, .asm_81902
 	ret
 
-Function81911: ; 81911
+Function81911:
 	ld hl, TrainerPalettes
-	ld de, wOverworldMap
+	ld de, wOverworldMapBlocks
 	ld c, NUM_TRAINER_CLASSES
 .asm_81919
 	push bc
@@ -100,9 +99,8 @@ Function81911: ; 81911
 	dec c
 	jr nz, .asm_81919
 	ret
-; 81928
 
-Function81928: ; 81928
+Function81928:
 	ld a, BANK(PokemonPalettes) ; BANK(TrainerPalettes)
 	call GetFarByte
 	ld [de], a
@@ -123,9 +121,8 @@ Function81928: ; 81928
 	ld [de], a
 	inc de
 	ret
-; 81948
 
-Function81948: ; 81948
+Function81948:
 	ld a, $1
 	ld [rVBK], a
 	ld hl, vTiles0
@@ -148,9 +145,8 @@ Function81948: ; 81948
 	call ByteFill
 	call ClearSprites
 	ret
-; 8197c
 
-Function8197c: ; 8197c
+Function8197c:
 	ld hl, DebugColorTestGFX + 1 tiles
 	ld de, vTiles2 tile DEBUGTEST_UP_ARROW
 	ld bc, 22 tiles
@@ -171,9 +167,8 @@ Function8197c: ; 8197c
 	or b
 	jr nz, .asm_8199d
 	ret
-; 819a7
 
-Function819a7: ; 819a7
+Function819a7:
 	ld a, [hCGB]
 	and a
 	ret z
@@ -181,13 +176,13 @@ Function819a7: ; 819a7
 	push af
 	ld a, BANK(wBGPals2)
 	ld [rSVBK], a
-	ld hl, Palette_819f4
+	ld hl, Palette_DebugBG
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
 	ld a, 1 << rBGPI_AUTO_INCREMENT
 	ld [rBGPI], a
-	ld hl, Palette_819f4
+	ld hl, Palette_DebugBG
 	ld c, 8 palettes
 	xor a
 .asm_819c8
@@ -196,7 +191,7 @@ Function819a7: ; 819a7
 	jr nz, .asm_819c8
 	ld a, 1 << rOBPI_AUTO_INCREMENT
 	ld [rOBPI], a
-	ld hl, Palette_81a34
+	ld hl, Palette_DebugOB
 	ld c, 8 palettes
 .asm_819d6
 	ld a, [hli]
@@ -214,16 +209,14 @@ Function819a7: ; 819a7
 	pop af
 	ld [rSVBK], a
 	ret
-; 819f4
 
-Palette_819f4: ; 819f4
+Palette_DebugBG:
 INCLUDE "gfx/debug/bg.pal"
 
-Palette_81a34: ; 81a34
+Palette_DebugOB:
 INCLUDE "gfx/debug/ob.pal"
-; 81a74
 
-Function81a74: ; 81a74
+Function81a74:
 	call JoyTextDelay
 	ld a, [wJumptableIndex]
 	cp $4
@@ -273,9 +266,8 @@ Function81a74: ; 81a74
 	ld a, $0
 	ld [wJumptableIndex], a
 	ret
-; 81ac3
 
-Function81ac3: ; 81ac3
+Function81ac3:
 ; Looping back around the pic set.
 	ld a, [wd002]
 	and a
@@ -286,18 +278,16 @@ Function81ac3: ; 81ac3
 .asm_81acc
 	ld a, NUM_TRAINER_CLASSES - 1 ; MYSTICALMAN
 	ret
-; 81acf
 
-Jumptable_81acf: ; 81acf
+Jumptable_81acf:
 	dw Function81adb
 	dw Function81c18
 	dw Function81c33
 	dw Function81cc2
 	dw Function81d8e
 	dw Function81daf
-; 81adb
 
-Function81adb: ; 81adb
+Function81adb:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -382,14 +372,12 @@ Function81adb: ; 81adb
 	ld a, $1
 	ld [wJumptableIndex], a
 	ret
-; 81baf
 
 String_81baf: db "レア", DEBUGTEST_BLACK, DEBUGTEST_BLACK, "@" ; rare (shiny)
 String_81bb4: db "ノーマル@" ; normal
 String_81bb9: db DEBUGTEST_A, "きりかえ▶@" ; (A) switches
-; 81bc0
 
-Function81bc0: ; 81bc0
+Function81bc0:
 	decoord 0, 11, wAttrMap
 	hlcoord 2, 11
 	ld a, $1
@@ -402,7 +390,7 @@ Function81bc0: ; 81bc0
 	hlcoord 2, 15
 	ld a, $3
 
-Function81bde: ; 81bde
+Function81bde:
 	push af
 	ld a, DEBUGTEST_UP_ARROW
 	ld [hli], a
@@ -415,16 +403,15 @@ Function81bde: ; 81bde
 	ld bc, $28
 	call ByteFill
 	ret
-; 81bf4
 
-Function81bf4: ; 81bf4
+Function81bf4:
 	ld a, [wcf66]
 	inc a
 	ld l, a
 	ld h, $0
 	add hl, hl
 	add hl, hl
-	ld de, wOverworldMap
+	ld de, wOverworldMapBlocks
 	add hl, de
 	ld de, wc608
 	ld bc, 4
@@ -435,9 +422,8 @@ Function81bf4: ; 81bf4
 	ld de, wc608
 	call Function81ea5
 	ret
-; 81c18
 
-Function81c18: ; 81c18
+Function81c18:
 	ld a, [hCGB]
 	and a
 	jr z, .asm_81c2a
@@ -452,9 +438,8 @@ Function81c18: ; 81c18
 	ld a, $2
 	ld [wJumptableIndex], a
 	ret
-; 81c33
 
-Function81c33: ; 81c33
+Function81c33:
 	ld a, [hCGB]
 	and a
 	jr z, .asm_81c69
@@ -511,9 +496,8 @@ Function81c33: ; 81c33
 	ld a, $3
 	ld [wJumptableIndex], a
 	ret
-; 81ca7
 
-Function81ca7: ; 81ca7
+Function81ca7:
 	inc hl
 	inc hl
 	inc hl
@@ -528,14 +512,13 @@ Function81ca7: ; 81ca7
 	ld a, [de]
 	swap a
 
-Function81cbc: ; 81cbc
+Function81cbc:
 	and $f
 	add DEBUGTEST_0
 	ld [hld], a
 	ret
-; 81cc2
 
-Function81cc2: ; 81cc2
+Function81cc2:
 	ld a, [hJoyLast]
 	and B_BUTTON
 	jr nz, .asm_81cdf
@@ -574,16 +557,14 @@ Function81cc2: ; 81cc2
 	ld a, $0
 	ld [wJumptableIndex], a
 	ret
-; 81d02
 
-Jumptable_81d02: ; 81d02
+Jumptable_81d02:
 	dw Function81d0a
 	dw Function81d34
 	dw Function81d46
 	dw Function81d58
-; 81d0a
 
-Function81d0a: ; 81d0a
+Function81d0a:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -610,7 +591,7 @@ Function81d0a: ; 81d0a
 	call Function81ea5
 	ret
 
-Function81d34: ; 81d34
+Function81d34:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -621,7 +602,7 @@ Function81d34: ; 81d34
 	ld hl, wc608 + 10
 	jr Function81d63
 
-Function81d46: ; 81d46
+Function81d46:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -632,14 +613,14 @@ Function81d46: ; 81d46
 	ld hl, wc608 + 11
 	jr Function81d63
 
-Function81d58: ; 81d58
+Function81d58:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
 	jr nz, Function81d84
 	ld hl, wc608 + 12
 
-Function81d63: ; 81d63
+Function81d63:
 	ld a, [hJoyLast]
 	and D_RIGHT
 	jr nz, Function81d70
@@ -648,37 +629,36 @@ Function81d63: ; 81d63
 	jr nz, Function81d77
 	ret
 
-Function81d70: ; 81d70
+Function81d70:
 	ld a, [hl]
 	cp $1f
 	ret nc
 	inc [hl]
 	jr Function81d7b
 
-Function81d77: ; 81d77
+Function81d77:
 	ld a, [hl]
 	and a
 	ret z
 	dec [hl]
 
-Function81d7b: ; 81d7b
+Function81d7b:
 	call Function81e67
 	ld a, $2
 	ld [wJumptableIndex], a
 	ret
 
-Function81d84: ; 81d84
+Function81d84:
 	ld hl, wcf64
 	dec [hl]
 	ret
 
-Function81d89: ; 81d89
+Function81d89:
 	ld hl, wcf64
 	inc [hl]
 	ret
-; 81d8e
 
-Function81d8e: ; 81d8e
+Function81d8e:
 	hlcoord 0, 10
 	ld bc, $a0
 	ld a, DEBUGTEST_BLACK
@@ -692,9 +672,8 @@ Function81d8e: ; 81d8e
 	ld a, $5
 	ld [wJumptableIndex], a
 	ret
-; 81daf
 
-Function81daf: ; 81daf
+Function81daf:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -706,15 +685,13 @@ Function81daf: ; 81daf
 	ld a, $0
 	ld [wJumptableIndex], a
 	ret
-; 81dc1
 
-Function81dc1: ; 81dc1
+Function81dc1:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
-; 81dc7
 
-Function81dc7: ; 81dc7
+Function81dc7:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
@@ -749,9 +726,8 @@ Function81dc7: ; 81dc7
 	ld [wd004], a
 	call Function81df4
 	ret
-; 81df4
 
-Function81df4: ; 81df4
+Function81df4:
 	hlcoord 10, 11
 	call Function81e5e
 	hlcoord 10, 12
@@ -783,13 +759,11 @@ Function81df4: ; 81df4
 	hlcoord 10, 14
 	call PlaceString
 	ret
-; 81e46
 
 String_81e46: db "おぼえられる@" ; can be taught
 String_81e4d: db "おぼえられない@" ; cannot be taught
-; 81e55
 
-Function81e55: ; 81e55
+Function81e55:
 	cp $32
 	jr c, .asm_81e5b
 	inc a
@@ -798,16 +772,14 @@ Function81e55: ; 81e55
 .asm_81e5b
 	add $bf
 	ret
-; 81e5e
 
-Function81e5e: ; 81e5e
+Function81e5e:
 	ld bc, 10
 	ld a, DEBUGTEST_BLACK
 	call ByteFill
 	ret
-; 81e67
 
-Function81e67: ; 81e67
+Function81e67:
 	ld a, [wc608 + 10]
 	and $1f
 	ld e, a
@@ -843,9 +815,8 @@ Function81e67: ; 81e67
 	ld a, d
 	ld [wc608 + 1], a
 	ret
-; 81ea5
 
-Function81ea5: ; 81ea5
+Function81ea5:
 	ld a, [de]
 	and $1f
 	ld [wc608 + 10], a
@@ -867,16 +838,15 @@ Function81ea5: ; 81ea5
 	srl a
 	ld [wc608 + 12], a
 	ret
-; 81eca
 
-Function81eca: ; 81eca
+Function81eca:
 	ld a, [wcf66]
 	inc a
 	ld l, a
 	ld h, $0
 	add hl, hl
 	add hl, hl
-	ld de, wOverworldMap
+	ld de, wOverworldMapBlocks
 	add hl, de
 	ld e, l
 	ld d, h
@@ -884,9 +854,8 @@ Function81eca: ; 81eca
 	ld bc, 4
 	call CopyBytes
 	ret
-; 81ee3
 
-Function81ee3: ; 81ee3
+Function81ee3:
 .asm_81ee3
 	ld a, LOW(PALRGB_WHITE)
 	ld [hli], a
@@ -910,9 +879,8 @@ Function81ee3: ; 81ee3
 	dec c
 	jr nz, .asm_81ee3
 	ret
-; 81efc
 
-Bank20_FillBoxWithByte: ; 81efc
+Bank20_FillBoxWithByte:
 ; For some reason, we have another copy of FillBoxWithByte here
 .row
 	push bc
@@ -928,9 +896,8 @@ Bank20_FillBoxWithByte: ; 81efc
 	dec b
 	jr nz, .row
 	ret
-; 81f0c
 
-Function81f0c: ; 81f0c
+Function81f0c:
 	ld a, [wcfbe]
 	push af
 	set 7, a
@@ -939,9 +906,8 @@ Function81f0c: ; 81f0c
 	pop af
 	ld [wcfbe], a
 	ret
-; 81f1d
 
-Function81f1d: ; 81f1d
+Function81f1d:
 	ld a, [hl]
 	and $7
 	ret z
@@ -989,9 +955,8 @@ Function81f1d: ; 81f1d
 	dec b
 	jr nz, .asm_81f22
 	ret
-; 81f5e
 
-Function81f5e: ; 81f5e
+Function81f5e:
 	ld a, DEBUGTEST_BLACK
 	hlcoord 10, 0
 	ld [hl], a
@@ -1059,19 +1024,16 @@ Function81f5e: ; 81f5e
 .asm_81fc9
 	call ClearSprites
 	ret
-; 81fcd
 
-String_81fcd: ; 81fcd
+String_81fcd:
 	db   "おわりますか？" ; Are you finished?
 	next "はい<DOT><DOT><DOT>", DEBUGTEST_A ; YES...(A)
 	next "いいえ<DOT><DOT>", DEBUGTEST_B ; NO..(B)
 	db   "@"
-; 81fe3
 
 DebugColorTestGFX:
 INCBIN "gfx/debug/color_test.2bpp"
 
-
 TilesetColorTest:
 	ret
 	xor a
@@ -1122,17 +1084,16 @@ TilesetColorTest:
 	ld a, $40
 	ld [hWY], a
 	ret
-; 821d2
 
-Function821d2: ; 821d2
+Function821d2:
 	hlcoord 0, 0
 	call Function821de
 
-Function821d8: ; 821d8
+Function821d8:
 	ld a, [wcf64]
 	hlcoord 0, 0, wAttrMap
 
-Function821de: ; 821de
+Function821de:
 	add hl, de
 rept 4
 	ld [hli], a
@@ -1148,25 +1109,23 @@ rept 4
 	ld [hli], a
 endr
 	ret
-; 821f4
 
-Function821f4: ; 821f4
+Function821f4:
 	hlcoord 2, 4
 	call Function82203
 	hlcoord 2, 6
 	call Function82203
 	hlcoord 2, 8
 
-Function82203: ; 82203
+Function82203:
 	ld a, DEBUGTEST_UP_ARROW
 	ld [hli], a
 	ld bc, $10 - 1
 	ld a, DEBUGTEST_TICKS
 	call ByteFill
 	ret
-; 8220f
 
-Function8220f: ; 8220f
+Function8220f:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
@@ -1187,10 +1146,8 @@ Function8220f: ; 8220f
 	pop af
 	ld [rSVBK], a
 	ret
-; 82236
-
 
-Function82236: ; 82236
+Function82236:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and SELECT
@@ -1247,9 +1204,8 @@ Function82236: ; 82236
 	xor $d0
 	ld [hWY], a
 	ret
-; 822a3
 
-Function822a3: ; 822a3
+Function822a3:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals2)
@@ -1281,9 +1237,8 @@ Function822a3: ; 822a3
 	ld [hCGBPalUpdate], a
 	call DelayFrame
 	ret
-; 822f0
 
-Function822f0: ; 822f0
+Function822f0:
 	ld a, [wcf65]
 	and 3
 	ld e, a
@@ -1295,16 +1250,14 @@ Function822f0: ; 822f0
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 82301
 
-.dw ; 82301
+.dw
 	dw Function82309
 	dw Function82339
 	dw Function8234b
 	dw Function8235d
-; 82309
 
-Function82309: ; 82309
+Function82309:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -1339,7 +1292,7 @@ Function82309: ; 82309
 	call Function81ea5
 	ret
 
-Function82339: ; 82338
+Function82339:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -1350,7 +1303,7 @@ Function82339: ; 82338
 	ld hl, wc608 + 10
 	jr Function82368
 
-Function8234b: ; 8234b
+Function8234b:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -1361,14 +1314,14 @@ Function8234b: ; 8234b
 	ld hl, wc608 + 11
 	jr Function82368
 
-Function8235d: ; 8235d
+Function8235d:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
 	jr nz, Function82387
 	ld hl, wc608 + 12
 
-Function82368: ; 82368
+Function82368:
 	ld a, [hJoyLast]
 	and D_RIGHT
 	jr nz, .asm_82375
@@ -1395,18 +1348,17 @@ Function82368: ; 82368
 	call Function822a3
 	ret
 
-Function82387: ; 82387
+Function82387:
 	ld hl, wcf65
 	dec [hl]
 	ret
 
-Function8238c: ; 8238c
+Function8238c:
 	ld hl, wcf65
 	inc [hl]
 	ret
-; 82391
 
-Function82391: ; 82391
+Function82391:
 	ld a, [wc608 + 10]
 	and $1f
 	ld e, a
@@ -1437,11 +1389,9 @@ Function82391: ; 82391
 	ld [hli], a
 	ld [hl], d
 	ret
-; 823c6
 
-Function823c6: ; 823c6
+Function823c6:
 	ret
 
-Function823c7: ; 823c7
+Function823c7:
 	ret
-; 823c8
diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm
new file mode 100644
index 000000000..8be78e979
--- /dev/null
+++ b/engine/menus/delete_save.asm
@@ -0,0 +1,36 @@
+_DeleteSaveData:
+	farcall BlankScreen
+	ld b, SCGB_DIPLOMA
+	call GetSGBLayout
+	call LoadStandardFont
+	call LoadFontsExtra
+	ld de, MUSIC_MAIN_MENU
+	call PlayMusic
+	ld hl, .Text_ClearAllSaveData
+	call PrintText
+	ld hl, .NoYesMenuHeader
+	call CopyMenuHeader
+	call VerticalMenu
+	ret c
+	ld a, [wMenuCursorY]
+	cp $1
+	ret z
+	farcall EmptyAllSRAMBanks
+	ret
+
+.Text_ClearAllSaveData:
+	; Clear all save data?
+	text_jump UnknownText_0x1c564a
+	db "@"
+
+.NoYesMenuHeader:
+	db 0 ; flags
+	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
+	dw .MenuData
+	db 1 ; default option
+
+.MenuData:
+	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
+	db 2 ; items
+	db "NO@"
+	db "YES@"
diff --git a/engine/routines/emptyallsrambanks.asm b/engine/menus/empty_sram.asm
index 8b060f3ef..45a4a8884 100644
--- a/engine/routines/emptyallsrambanks.asm
+++ b/engine/menus/empty_sram.asm
@@ -1,4 +1,4 @@
-EmptyAllSRAMBanks: ; 4cf1f
+EmptyAllSRAMBanks:
 	ld a, 0
 	call .EmptyBank
 	ld a, 1
@@ -9,7 +9,7 @@ EmptyAllSRAMBanks: ; 4cf1f
 	call .EmptyBank
 	ret
 
-.EmptyBank: ; 4cf34
+.EmptyBank:
 	call GetSRAMBank
 	ld hl, SRAM_Begin
 	ld bc, SRAM_End - SRAM_Begin
diff --git a/engine/init_gender.asm b/engine/menus/init_gender.asm
index 945e9f61f..21871d0ab 100755..100644
--- a/engine/init_gender.asm
+++ b/engine/menus/init_gender.asm
@@ -1,4 +1,4 @@
-InitCrystalData: ; 48000
+InitCrystalData:
 	ld a, $1
 	ld [wd474], a
 	xor a
@@ -18,11 +18,10 @@ InitCrystalData: ; 48000
 	res 1, a
 	ld [wd479], a
 	ret
-; 4802f
 
 INCLUDE "mobile/mobile_12.asm"
 
-InitGender: ; 48dcb (12:4dcb)
+InitGender:
 	call InitGenderScreen
 	call LoadGenderScreenPal
 	call LoadGenderScreenLightBlueTile
@@ -30,8 +29,8 @@ InitGender: ; 48dcb (12:4dcb)
 	call SetPalettes
 	ld hl, TextJump_AreYouABoyOrAreYouAGirl
 	call PrintText
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	call WaitBGMap2
 	call VerticalMenu
 	call CloseWindow
@@ -41,29 +40,25 @@ InitGender: ; 48dcb (12:4dcb)
 	ld c, 10
 	call DelayFrames
 	ret
-; 48dfc (12:4dfc)
 
-.MenuDataHeader: ; 0x48dfc
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 4, 12, 9
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x48e04
 
-.MenuData2: ; 0x48e04
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_WRAP | STATICMENU_DISABLE_B ; flags
 	db 2 ; items
 	db "Boy@"
 	db "Girl@"
-; 0x48e0f
 
-TextJump_AreYouABoyOrAreYouAGirl: ; 0x48e0f
+TextJump_AreYouABoyOrAreYouAGirl:
 	; Are you a boy? Or are you a girl?
 	text_jump Text_AreYouABoyOrAreYouAGirl
 	db "@"
-; 0x48e14
 
-InitGenderScreen: ; 48e14 (12:4e14)
+InitGenderScreen:
 	ld a, $10
 	ld [wMusicFade], a
 	ld a, MUSIC_NONE
@@ -85,7 +80,7 @@ InitGenderScreen: ; 48e14 (12:4e14)
 	call ByteFill
 	ret
 
-LoadGenderScreenPal: ; 48e47 (12:4e47)
+LoadGenderScreenPal:
 	ld hl, .Palette
 	ld de, wBGPals1
 	ld bc, 1 palettes
@@ -93,19 +88,16 @@ LoadGenderScreenPal: ; 48e47 (12:4e47)
 	call FarCopyWRAM
 	farcall ApplyPals
 	ret
-; 48e5c (12:4e5c)
 
-.Palette: ; 48e5c
+.Palette:
 INCLUDE "gfx/new_game/gender_screen.pal"
-; 48e64
 
-LoadGenderScreenLightBlueTile: ; 48e64 (12:4e64)
+LoadGenderScreenLightBlueTile:
 	ld de, .LightBlueTile
 	ld hl, vTiles2 tile $00
 	lb bc, BANK(.LightBlueTile), 1
 	call Get2bpp
 	ret
-; 48e71 (12:4e71)
 
-.LightBlueTile: ; 48e71
+.LightBlueTile:
 INCBIN "gfx/new_game/gender_screen.2bpp"
diff --git a/engine/intro_menu.asm b/engine/menus/intro_menu.asm
index 74daec6d8..9652dd73e 100755..100644
--- a/engine/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -1,4 +1,4 @@
-_MainMenu: ; 5ae8
+_MainMenu:
 	ld de, MUSIC_NONE
 	call PlayMusic
 	call DelayFrame
@@ -8,13 +8,11 @@ _MainMenu: ; 5ae8
 	call PlayMusic
 	farcall MainMenu
 	jp StartTitleScreen
-; 5b04
 
 ; unused
 	ret
-; 5b05
 
-PrintDayOfWeek: ; 5b05
+PrintDayOfWeek:
 	push de
 	ld hl, .Days
 	ld a, b
@@ -28,9 +26,8 @@ PrintDayOfWeek: ; 5b05
 	ld de, .Day
 	call PlaceString
 	ret
-; 5b1c
 
-.Days: ; 5b1c
+.Days:
 	db "SUN@"
 	db "MON@"
 	db "TUES@"
@@ -38,13 +35,11 @@ PrintDayOfWeek: ; 5b05
 	db "THURS@"
 	db "FRI@"
 	db "SATUR@"
-; 5b40
 
-.Day: ; 5b40
+.Day:
 	db "DAY@"
-; 5b44
 
-NewGame_ClearTileMapEtc: ; 5b44
+NewGame_ClearTileMapEtc:
 	xor a
 	ld [hMapAnims], a
 	call ClearTileMap
@@ -52,21 +47,18 @@ NewGame_ClearTileMapEtc: ; 5b44
 	call LoadStandardFont
 	call ClearWindowData
 	ret
-; 5b54
 
-MysteryGift: ; 5b54
+MysteryGift:
 	call UpdateTime
 	farcall DoMysteryGiftIfDayHasPassed
 	farcall DoMysteryGift
 	ret
-; 5b64
 
-OptionsMenu: ; 5b64
+OptionsMenu:
 	farcall _OptionsMenu
 	ret
-; 5b6b
 
-NewGame: ; 5b6b
+NewGame:
 	xor a
 	ld [wMonStatusFlags], a
 	call ResetWRAM
@@ -83,9 +75,8 @@ NewGame: ; 5b6b
 	ld a, MAPSETUP_WARP
 	ld [hMapEntryMethod], a
 	jp FinishContinueFunction
-; 5b8f
 
-AreYouABoyOrAreYouAGirl: ; 5b8f
+AreYouABoyOrAreYouAGirl:
 	farcall Mobile_AlwaysReturnNotCarry ; some mobile stuff
 	jr c, .ok
 	farcall InitGender
@@ -95,17 +86,14 @@ AreYouABoyOrAreYouAGirl: ; 5b8f
 	ld c, 0
 	farcall InitMobileProfile ; mobile
 	ret
-; 5ba7
 
-ResetWRAM: ; 5ba7
+ResetWRAM:
 	xor a
 	ld [hBGMapMode], a
 	call _ResetWRAM
 	ret
-; 5bae
-
-_ResetWRAM: ; 5bae
 
+_ResetWRAM:
 	ld hl, wVirtualOAM
 	ld bc, wOptions - wVirtualOAM
 	xor a
@@ -228,18 +216,16 @@ endc
 
 	call ResetGameTime
 	ret
-; 5ca1
 
-.InitList: ; 5ca1
+.InitList:
 ; Loads 0 in the count and -1 in the first item or mon slot.
 	xor a
 	ld [hli], a
 	dec a
 	ld [hl], a
 	ret
-; 5ca6
 
-SetDefaultBoxNames: ; 5ca6
+SetDefaultBoxNames:
 	ld hl, wBoxNames
 	ld c, 0
 .loop
@@ -270,9 +256,8 @@ SetDefaultBoxNames: ; 5ca6
 
 .Box:
 	db "BOX@"
-; 5cd3
 
-InitializeMagikarpHouse: ; 5cd3
+InitializeMagikarpHouse:
 	ld hl, wBestMagikarpLengthFeet
 	ld a, $3
 	ld [hli], a
@@ -281,13 +266,11 @@ InitializeMagikarpHouse: ; 5cd3
 	ld de, .Ralph
 	call CopyName2
 	ret
-; 5ce3
 
-.Ralph: ; 5ce3
+.Ralph:
 	db "RALPH@"
-; 5ce9
 
-InitializeNPCNames: ; 5ce9
+InitializeNPCNames:
 	ld hl, .Rival
 	ld de, wRivalName
 	call .Copy
@@ -312,16 +295,14 @@ InitializeNPCNames: ; 5ce9
 .Red:    db "RED@"
 .Green:  db "GREEN@"
 .Mom:    db "MOM@"
-; 5d23
 
-InitializeWorld: ; 5d23
+InitializeWorld:
 	call ShrinkPlayer
 	farcall SpawnPlayer
 	farcall _InitializeStartDay
 	ret
-; 5d33
 
-LoadOrRegenerateLuckyIDNumber: ; 5d33
+LoadOrRegenerateLuckyIDNumber:
 	ld a, BANK(sLuckyIDNumber)
 	call GetSRAMBank
 	ld a, [wCurDay]
@@ -346,13 +327,12 @@ LoadOrRegenerateLuckyIDNumber: ; 5d33
 	ld [wLuckyIDNumber + 1], a
 	ld [sLuckyIDNumber + 1], a
 	jp CloseSRAM
-; 5d65
 
-Continue: ; 5d65
+Continue:
 	farcall TryLoadSaveFile
 	jr c, .FailToLoad
 	farcall _LoadData
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call DisplaySaveInfoOnContinue
 	ld a, $1
 	ld [hBGMapMode], a
@@ -400,22 +380,19 @@ Continue: ; 5d65
 	ld [wDefaultSpawnpoint], a
 	call PostCreditsSpawn
 	jp FinishContinueFunction
-; 5de2
 
-SpawnAfterRed: ; 5de2
+SpawnAfterRed:
 	ld a, SPAWN_MT_SILVER
 	ld [wDefaultSpawnpoint], a
-; 5de7
 
-PostCreditsSpawn: ; 5de7
+PostCreditsSpawn:
 	xor a
 	ld [wSpawnAfterChampion], a
 	ld a, MAPSETUP_WARP
 	ld [hMapEntryMethod], a
 	ret
-; 5df0
 
-Continue_MobileAdapterMenu: ; 5df0
+Continue_MobileAdapterMenu:
 	farcall Mobile_AlwaysReturnNotCarry ; mobile check
 	ret nc
 
@@ -444,9 +421,8 @@ Continue_MobileAdapterMenu: ; 5df0
 	ld c, 35
 	call DelayFrames
 	ret
-; 5e34
 
-ConfirmContinue: ; 5e34
+ConfirmContinue:
 .loop
 	call DelayFrame
 	call GetJoypad
@@ -460,9 +436,8 @@ ConfirmContinue: ; 5e34
 
 .PressA:
 	ret
-; 5e48
 
-Continue_CheckRTC_RestartClock: ; 5e48
+Continue_CheckRTC_RestartClock:
 	call CheckRTCStatus
 	and %10000000 ; Day count exceeded 16383
 	jr z, .pass
@@ -476,16 +451,15 @@ Continue_CheckRTC_RestartClock: ; 5e48
 .pass
 	xor a
 	ret
-; 5e5d
 
-FinishContinueFunction: ; 5e5d
+FinishContinueFunction:
 .loop
 	xor a
 	ld [wDontPlayMapMusicOnReload], a
 	ld [wLinkMode], a
 	ld hl, wGameTimerPause
-	set 0, [hl]
-	res 7, [hl]
+	set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
+	res GAMETIMERPAUSE_MOBILE_7_F, [hl]
 	ld hl, wEnteredMapFromContinue
 	set 1, [hl]
 	farcall OverworldLoop
@@ -497,9 +471,8 @@ FinishContinueFunction: ; 5e5d
 .AfterRed:
 	call SpawnAfterRed
 	jr .loop
-; 5e85
 
-DisplaySaveInfoOnContinue: ; 5e85
+DisplaySaveInfoOnContinue:
 	call CheckRTCStatus
 	and %10000000
 	jr z, .clock_ok
@@ -511,81 +484,71 @@ DisplaySaveInfoOnContinue: ; 5e85
 	lb de, 4, 8
 	call DisplayNormalContinueData
 	ret
-; 5e9a
 
-DisplaySaveInfoOnSave: ; 5e9a
+DisplaySaveInfoOnSave:
 	lb de, 4, 0
 	jr DisplayNormalContinueData
-; 5e9f
 
-DisplayNormalContinueData: ; 5e9f
+DisplayNormalContinueData:
 	call Continue_LoadMenuHeader
 	call Continue_DisplayBadgesDexPlayerName
 	call Continue_PrintGameTime
 	call LoadFontsExtra
 	call UpdateSprites
 	ret
-; 5eaf
 
-DisplayContinueDataWithRTCError: ; 5eaf
+DisplayContinueDataWithRTCError:
 	call Continue_LoadMenuHeader
 	call Continue_DisplayBadgesDexPlayerName
 	call Continue_UnknownGameTime
 	call LoadFontsExtra
 	call UpdateSprites
 	ret
-; 5ebf
 
-Continue_LoadMenuHeader: ; 5ebf
+Continue_LoadMenuHeader:
 	xor a
 	ld [hBGMapMode], a
-	ld hl, .MenuDataHeader_Dex
+	ld hl, .MenuHeader_Dex
 	ld a, [wStatusFlags]
-	bit 0, a ; pokedex
+	bit STATUSFLAGS_POKEDEX_F, a
 	jr nz, .show_menu
-	ld hl, .MenuDataHeader_NoDex
+	ld hl, .MenuHeader_NoDex
 
 .show_menu
-	call _OffsetMenuDataHeader
+	call _OffsetMenuHeader
 	call MenuBox
 	call PlaceVerticalMenuItems
 	ret
-; 5ed9
 
-.MenuDataHeader_Dex: ; 5ed9
+.MenuHeader_Dex:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 15, 9
-	dw .MenuData2_Dex
+	dw .MenuData_Dex
 	db 1 ; default option
-; 5ee1
 
-.MenuData2_Dex: ; 5ee1
+.MenuData_Dex:
 	db 0 ; flags
 	db 4 ; items
 	db "PLAYER@"
 	db "BADGES@"
 	db "#DEX@"
 	db "TIME@"
-; 5efb
 
-.MenuDataHeader_NoDex: ; 5efb
+.MenuHeader_NoDex:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 15, 9
-	dw .MenuData2_NoDex
+	dw .MenuData_NoDex
 	db 1 ; default option
-; 5f03
 
-.MenuData2_NoDex: ; 5f03
+.MenuData_NoDex:
 	db 0 ; flags
 	db 4 ; items
 	db "PLAYER <PLAYER>@"
 	db "BADGES@"
 	db " @"
 	db "TIME@"
-; 5f1c
-
 
-Continue_DisplayBadgesDexPlayerName: ; 5f1c
+Continue_DisplayBadgesDexPlayerName:
 	call MenuBoxCoord2Tile
 	push hl
 	decoord 13, 4, 0
@@ -607,16 +570,14 @@ Continue_DisplayBadgesDexPlayerName: ; 5f1c
 
 .Player:
 	db "<PLAYER>@"
-; 5f40
 
-Continue_PrintGameTime: ; 5f40
+Continue_PrintGameTime:
 	decoord 9, 8, 0
 	add hl, de
 	call Continue_DisplayGameTime
 	ret
-; 5f48
 
-Continue_UnknownGameTime: ; 5f48
+Continue_UnknownGameTime:
 	decoord 9, 8, 0
 	add hl, de
 	ld de, .three_question_marks
@@ -625,9 +586,8 @@ Continue_UnknownGameTime: ; 5f48
 
 .three_question_marks
 	db " ???@"
-; 5f58
 
-Continue_DisplayBadgeCount: ; 5f58
+Continue_DisplayBadgeCount:
 	push hl
 	ld hl, wJohtoBadges
 	ld b, 2
@@ -636,11 +596,10 @@ Continue_DisplayBadgeCount: ; 5f58
 	ld de, wd265
 	lb bc, 1, 2
 	jp PrintNum
-; 5f6b
 
-Continue_DisplayPokedexNumCaught: ; 5f6b
+Continue_DisplayPokedexNumCaught:
 	ld a, [wStatusFlags]
-	bit 0, a ; Pokedex
+	bit STATUSFLAGS_POKEDEX_F, a
 	ret z
 	push hl
 	ld hl, wPokedexCaught
@@ -654,9 +613,8 @@ endc
 	ld de, wd265
 	lb bc, 1, 3
 	jp PrintNum
-; 5f84
 
-Continue_DisplayGameTime: ; 5f84
+Continue_DisplayGameTime:
 	ld de, wGameTimeHours
 	lb bc, 2, 3
 	call PrintNum
@@ -665,10 +623,8 @@ Continue_DisplayGameTime: ; 5f84
 	ld de, wGameTimeMinutes
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2
 	jp PrintNum
-; 5f99
 
-
-OakSpeech: ; 0x5f99
+OakSpeech:
 	farcall InitClock
 	call RotateFourPalettesLeft
 	call ClearTileMap
@@ -746,11 +702,11 @@ OakSpeech: ; 0x5f99
 	call PrintText
 	ret
 
-OakText1: ; 0x6045
+OakText1:
 	text_jump _OakText1
 	db "@"
 
-OakText2: ; 0x604a
+OakText2:
 	text_jump _OakText2
 	start_asm
 	ld a, WOOPER
@@ -759,27 +715,27 @@ OakText2: ; 0x604a
 	ld hl, OakText3
 	ret
 
-OakText3: ; 0x605b
+OakText3:
 	text_jump _OakText3
 	db "@"
 
-OakText4: ; 0x6060
+OakText4:
 	text_jump _OakText4
 	db "@"
 
-OakText5: ; 0x6065
+OakText5:
 	text_jump _OakText5
 	db "@"
 
-OakText6: ; 0x606a
+OakText6:
 	text_jump _OakText6
 	db "@"
 
-OakText7: ; 0x606f
+OakText7:
 	text_jump _OakText7
 	db "@"
 
-NamePlayer: ; 0x6074
+NamePlayer:
 	farcall MovePlayerPicRight
 	farcall ShowPlayerNamingChoices
 	ld a, [wMenuCursorY]
@@ -812,7 +768,7 @@ NamePlayer: ; 0x6074
 	ld hl, wPlayerName
 	ld de, .Chris
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .Male
 	ld de, .Kris
 .Male:
@@ -823,19 +779,17 @@ NamePlayer: ; 0x6074
 	db "CHRIS@@@@@@"
 .Kris:
 	db "KRIS@@@@@@@"
-; 60e9
 
 Unreferenced_Function60e9:
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 	call VerticalMenu
 	ld a, [wMenuCursorY]
 	dec a
 	call CopyNameFromMenu
 	call CloseWindow
 	ret
-; 60fa
 
-StorePlayerName: ; 60fa
+StorePlayerName:
 	ld a, "@"
 	ld bc, NAME_LENGTH
 	ld hl, wPlayerName
@@ -844,10 +798,8 @@ StorePlayerName: ; 60fa
 	ld de, wStringBuffer2
 	call CopyName2
 	ret
-; 610f
-
-ShrinkPlayer: ; 610f
 
+ShrinkPlayer:
 	ld a, [hROMBank]
 	push af
 
@@ -898,11 +850,10 @@ ShrinkPlayer: ; 610f
 	call RotateThreePalettesRight
 	call ClearTileMap
 	ret
-; 616a
 
-Intro_RotatePalettesLeftFrontpic: ; 616a
+Intro_RotatePalettesLeftFrontpic:
 	ld hl, IntroFadePalettes
-	ld b, IntroFadePalettesEnd - IntroFadePalettes
+	ld b, IntroFadePalettes.End - IntroFadePalettes
 .loop
 	ld a, [hli]
 	call DmgToCgbBGPals
@@ -911,19 +862,17 @@ Intro_RotatePalettesLeftFrontpic: ; 616a
 	dec b
 	jr nz, .loop
 	ret
-; 617c
 
-IntroFadePalettes: ; 0x617c
+IntroFadePalettes:
 	db %01010100
 	db %10101000
 	db %11111100
 	db %11111000
 	db %11110100
 	db %11100100
-IntroFadePalettesEnd
-; 6182
+.End
 
-Intro_WipeInFrontpic: ; 6182
+Intro_WipeInFrontpic:
 	ld a, $77
 	ld [hWX], a
 	call DelayFrame
@@ -937,9 +886,8 @@ Intro_WipeInFrontpic: ; 6182
 	ret z
 	ld [hWX], a
 	jr .loop
-; 619c
 
-Intro_PrepTrainerPic: ; 619c
+Intro_PrepTrainerPic:
 	ld de, vTiles2
 	farcall GetTrainerPic
 	xor a
@@ -948,9 +896,8 @@ Intro_PrepTrainerPic: ; 619c
 	lb bc, 7, 7
 	predef PlaceGraphic
 	ret
-; 61b4
 
-ShrinkFrame: ; 61b4
+ShrinkFrame:
 	ld de, vTiles2
 	ld c, 7 * 7
 	predef DecompressGet2bpp
@@ -960,10 +907,8 @@ ShrinkFrame: ; 61b4
 	lb bc, 7, 7
 	predef PlaceGraphic
 	ret
-; 61cd
-
-Intro_PlacePlayerSprite: ; 61cd
 
+Intro_PlacePlayerSprite:
 	farcall GetPlayerIcon
 	ld c, $c
 	ld hl, vTiles0
@@ -988,7 +933,7 @@ Intro_PlacePlayerSprite: ; 61cd
 
 	ld b, PAL_OW_RED
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .male
 	ld b, PAL_OW_BLUE
 .male
@@ -998,24 +943,21 @@ Intro_PlacePlayerSprite: ; 61cd
 	dec c
 	jr nz, .loop
 	ret
-; 61fe
 
-.sprites ; 61fe
+.sprites
 	db 4
 	; y pxl, x pxl, tile offset
 	db  9 * 8 + 4,  9 * 8, 0
 	db  9 * 8 + 4, 10 * 8, 1
 	db 10 * 8 + 4,  9 * 8, 2
 	db 10 * 8 + 4, 10 * 8, 3
-; 620b
-
 
-CrystalIntroSequence: ; 620b
+CrystalIntroSequence:
 	callfar Copyright_GFPresents
 	jr c, StartTitleScreen
 	farcall CrystalIntro
 
-StartTitleScreen: ; 6219
+StartTitleScreen:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
@@ -1062,7 +1004,6 @@ StartTitleScreen: ; 6219
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 626a
 
 .dw
 	dw _MainMenu
@@ -1070,15 +1011,12 @@ StartTitleScreen: ; 6219
 	dw CrystalIntroSequence
 	dw CrystalIntroSequence
 	dw ResetClock
-; 6274
-
 
-.TitleScreen: ; 6274
+.TitleScreen:
 	farcall _TitleScreen
 	ret
-; 627b
 
-RunTitleScreen: ; 627b
+RunTitleScreen:
 	ld a, [wJumptableIndex]
 	bit 7, a
 	jr nz, .done_title
@@ -1091,9 +1029,8 @@ RunTitleScreen: ; 627b
 .done_title
 	scf
 	ret
-; 6292
 
-Unreferenced_Function6292: ; 6292
+Unreferenced_Function6292:
 	ld a, [hVBlankCounter]
 	and $7
 	ret nz
@@ -1103,9 +1040,8 @@ Unreferenced_Function6292: ; 6292
 	ld bc, 2 * SCREEN_WIDTH
 	call ByteFill
 	ret
-; 62a3
 
-TitleScreenScene: ; 62a3
+TitleScreenScene:
 	ld e, a
 	ld d, 0
 	ld hl, .scenes
@@ -1115,24 +1051,19 @@ TitleScreenScene: ; 62a3
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 62af
 
 .scenes
 	dw TitleScreenEntrance
 	dw TitleScreenTimer
 	dw TitleScreenMain
 	dw TitleScreenEnd
-; 62b7
 
 .Unreferenced_NextScene:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
-; 62bc
-
-
-TitleScreenEntrance: ; 62bc
 
+TitleScreenEntrance:
 ; Animate the logo:
 ; Move each line by 4 pixels until our count hits 0.
 	ld a, [hSCX]
@@ -1178,11 +1109,8 @@ TitleScreenEntrance: ; 62bc
 	ld a, $88
 	ld [hWY], a
 	ret
-; 62f6
-
-
-TitleScreenTimer: ; 62f6
 
+TitleScreenTimer:
 ; Next scene
 	ld hl, wJumptableIndex
 	inc [hl]
@@ -1194,10 +1122,8 @@ TitleScreenTimer: ; 62f6
 	inc hl
 	ld [hl], d
 	ret
-; 6304
-
-TitleScreenMain: ; 6304
 
+TitleScreenMain:
 ; Run the timer down.
 	ld hl, wTitleScreenTimer
 	ld e, [hl]
@@ -1296,10 +1222,8 @@ TitleScreenMain: ; 6304
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
-; 6375
-
-TitleScreenEnd: ; 6375
 
+TitleScreenEnd:
 ; Wait until the music is done fading.
 
 	ld hl, wTitleScreenTimer
@@ -1316,17 +1240,14 @@ TitleScreenEnd: ; 6375
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
-; 6389
 
-DeleteSaveData: ; 6389
+DeleteSaveData:
 	farcall _DeleteSaveData
 	jp Init
-; 6392
 
-ResetClock: ; 6392
+ResetClock:
 	farcall _ResetClock
 	jp Init
-; 639b
 
 Unreferenced_Function639b:
 	; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here.
@@ -1359,9 +1280,8 @@ Unreferenced_Function639b:
 	ld a, SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
 	call _InitSpriteAnimStruct
 	ret
-; 63ca
 
-.Data63ca: ; 63ca
+.Data63ca:
 ; frame 0 y, x; frame 1 y, x
 	db 11 * 8 + 4, 10 * 8,  0 * 8,      0 * 8
 	db 11 * 8 + 4, 13 * 8, 11 * 8 + 4, 11 * 8
@@ -1369,9 +1289,8 @@ Unreferenced_Function639b:
 	db 11 * 8 + 4, 17 * 8, 11 * 8 + 4, 15 * 8
 	db  0 * 8,      0 * 8, 11 * 8 + 4, 15 * 8
 	db  0 * 8,      0 * 8, 11 * 8 + 4, 11 * 8
-; 63e2
 
-Copyright: ; 63e2
+Copyright:
 	call ClearTileMap
 	call LoadFontsExtra
 	ld de, CopyrightGFX
@@ -1381,9 +1300,8 @@ Copyright: ; 63e2
 	hlcoord 2, 7
 	ld de, CopyrightString
 	jp PlaceString
-; 63fd
 
-CopyrightString: ; 63fd
+CopyrightString:
 	; ©1995-2001 Nintendo
 	db   $60, $61, $62, $63, $64, $65, $66
 	db   $67, $68, $69, $6a, $6b, $6c
@@ -1397,9 +1315,8 @@ CopyrightString: ; 63fd
 	db   $73, $74, $75, $76, $77, $78, $79, $7a, $7b, $7c
 
 	db "@"
-; 642e
 
-GameInit:: ; 642e
+GameInit::
 	farcall TryLoadSaveData
 	call ClearWindowData
 	call ClearBGPalettes
@@ -1415,4 +1332,3 @@ GameInit:: ; 642e
 	ld [hWY], a
 	call WaitBGMap
 	jp CrystalIntroSequence
-; 6454
diff --git a/engine/main_menu.asm b/engine/menus/main_menu.asm
index 9d3d8cbdb..d6afda483 100755..100644
--- a/engine/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -1,8 +1,7 @@
-GFX_49c0c: ; 49c0c
+GFX_49c0c:
 INCBIN "gfx/unknown/049c0c.2bpp"
-; 49cdc
 
-MainMenu: ; 49cdc
+MainMenu:
 	xor a
 	ld [wDisableTextAcceleration], a
 	call Function49ed0
@@ -10,12 +9,12 @@ MainMenu: ; 49cdc
 	call GetSGBLayout
 	call SetPalettes
 	ld hl, wGameTimerPause
-	res 0, [hl]
+	res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
 	call MainMenu_GetWhichMenu
 	ld [wWhichIndexSet], a
 	call MainMenu_PrintCurrentTimeAndDay
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	call MainMenuJoypadLoop
 	call CloseWindow
 	jr c, .quit
@@ -27,24 +26,21 @@ MainMenu: ; 49cdc
 
 .quit
 	ret
-; 49d14
 
-.MenuDataHeader: ; 49d14
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 16, 7
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 49d1c
 
-.MenuData2: ; 49d1c
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 0 ; items
 	dw MainMenuItems
 	dw PlaceMenuStrings
 	dw .Strings
-; 49d20
 
-.Strings: ; 49d24
+.Strings:
 	db "CONTINUE@"
 	db "NEW GAME@"
 	db "OPTION@"
@@ -52,14 +48,13 @@ MainMenu: ; 49cdc
 	db "MOBILE@"
 	db "MOBILE STUDIUM@"
 
-.Jumptable: ; 0x49d60
+.Jumptable:
 	dw MainMenu_Continue
 	dw MainMenu_NewGame
 	dw MainMenu_Options
 	dw MainMenu_MysteryGift
 	dw MainMenu_Mobile
 	dw MainMenu_MobileStudium
-; 0x49d6c
 
 CONTINUE       EQU 0
 NEW_GAME       EQU 1
@@ -70,20 +65,20 @@ MOBILE_STUDIUM EQU 5
 
 MainMenuItems:
 
-NewGameMenu: ; 0x49d6c
+NewGameMenu:
 	db 2
 	db NEW_GAME
 	db OPTION
 	db -1
 
-ContinueMenu: ; 0x49d70
+ContinueMenu:
 	db 3
 	db CONTINUE
 	db NEW_GAME
 	db OPTION
 	db -1
 
-MobileMysteryMenu: ; 0x49d75
+MobileMysteryMenu:
 	db 5
 	db CONTINUE
 	db NEW_GAME
@@ -92,7 +87,7 @@ MobileMysteryMenu: ; 0x49d75
 	db MOBILE
 	db -1
 
-MobileMenu: ; 0x49d7c
+MobileMenu:
 	db 4
 	db CONTINUE
 	db NEW_GAME
@@ -100,7 +95,7 @@ MobileMenu: ; 0x49d7c
 	db MOBILE
 	db -1
 
-MobileStudiumMenu: ; 0x49d82
+MobileStudiumMenu:
 	db 5
 	db CONTINUE
 	db NEW_GAME
@@ -109,7 +104,7 @@ MobileStudiumMenu: ; 0x49d82
 	db MOBILE_STUDIUM
 	db -1
 
-MysteryMobileStudiumMenu: ; 0x49d89
+MysteryMobileStudiumMenu:
 	db 6
 	db CONTINUE
 	db NEW_GAME
@@ -119,7 +114,7 @@ MysteryMobileStudiumMenu: ; 0x49d89
 	db MOBILE_STUDIUM
 	db -1
 
-MysteryMenu: ; 0x49d91
+MysteryMenu:
 	db 4
 	db CONTINUE
 	db NEW_GAME
@@ -127,7 +122,7 @@ MysteryMenu: ; 0x49d91
 	db MYSTERY_GIFT
 	db -1
 
-MysteryStudiumMenu: ; 0x49d97
+MysteryStudiumMenu:
 	db 5
 	db CONTINUE
 	db NEW_GAME
@@ -136,7 +131,7 @@ MysteryStudiumMenu: ; 0x49d97
 	db MOBILE_STUDIUM
 	db -1
 
-StudiumMenu: ; 0x49d9e
+StudiumMenu:
 	db 4
 	db CONTINUE
 	db NEW_GAME
@@ -144,8 +139,7 @@ StudiumMenu: ; 0x49d9e
 	db MOBILE_STUDIUM
 	db -1
 
-
-MainMenu_GetWhichMenu: ; 49da4
+MainMenu_GetWhichMenu:
 	nop
 	nop
 	nop
@@ -166,8 +160,9 @@ MainMenu_GetWhichMenu: ; 49da4
 	cp -1
 	call CloseSRAM
 	jr nz, .mystery_gift
+	; This check makes no difference.
 	ld a, [wStatusFlags]
-	bit 7, a
+	bit STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F, a
 	ld a, $1 ; Continue
 	jr z, .ok
 	jr .ok
@@ -180,8 +175,9 @@ MainMenu_GetWhichMenu: ; 49da4
 	ret
 
 .mystery_gift
+	; This check makes no difference.
 	ld a, [wStatusFlags]
-	bit 7, a
+	bit STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F, a
 	jr z, .ok3
 	jr .ok3
 
@@ -191,9 +187,8 @@ MainMenu_GetWhichMenu: ; 49da4
 .ok4
 	ld a, $6 ; Mystery Gift
 	ret
-; 49de4
 
-MainMenuJoypadLoop: ; 49de4
+MainMenuJoypadLoop:
 	call SetUpMenu
 .loop
 	call MainMenu_PrintCurrentTimeAndDay
@@ -216,9 +211,8 @@ MainMenuJoypadLoop: ; 49de4
 .b_button
 	scf
 	ret
-; 49e09
 
-MainMenu_PrintCurrentTimeAndDay: ; 49e09
+MainMenu_PrintCurrentTimeAndDay:
 	ld a, [wSaveFileExists]
 	and a
 	ret z
@@ -235,10 +229,8 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; 49e27
-
 
-.PlaceBox: ; 49e27
+.PlaceBox:
 	call CheckRTCStatus
 	and $80
 	jr nz, .TimeFail
@@ -251,10 +243,8 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
 .TimeFail:
 	call SpeechTextBox
 	ret
-; 49e3d
 
-
-.PlaceTime: ; 49e3d
+.PlaceTime:
 	ld a, [wSaveFileExists]
 	and a
 	ret z
@@ -280,26 +270,22 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
 .min
 ; unused
 	db "min.@"
-; 49e75
 
-.PrintTimeNotSet: ; 49e75
+.PrintTimeNotSet:
 	hlcoord 1, 14
 	ld de, .TimeNotSet
 	call PlaceString
 	ret
-; 49e7f
 
-.TimeNotSet: ; 49e7f
+.TimeNotSet:
 	db "TIME NOT SET@"
-; 49e8c
 
-.UnusedText: ; 49e8c
+.UnusedText:
 	; Clock time unknown
 	text_jump UnknownText_0x1c5182
 	db "@"
-; 49e91
 
-.PlaceCurrentDay: ; 49e91
+.PlaceCurrentDay:
 	push de
 	ld hl, .Days
 	ld a, b
@@ -313,7 +299,6 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
 	ld de, .Day
 	call PlaceString
 	ret
-; 49ea8
 
 .Days:
 	db "SUN@"
@@ -325,9 +310,8 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
 	db "SATUR@"
 .Day:
 	db "DAY@"
-; 49ed0
 
-Function49ed0: ; 49ed0
+Function49ed0:
 	xor a
 	ld [hMapAnims], a
 	call ClearTileMap
@@ -335,25 +319,19 @@ Function49ed0: ; 49ed0
 	call LoadStandardFont
 	call ClearWindowData
 	ret
-; 49ee0
-
 
-MainMenu_NewGame: ; 49ee0
+MainMenu_NewGame:
 	farcall NewGame
 	ret
-; 49ee7
 
-MainMenu_Options: ; 49ee7
+MainMenu_Options:
 	farcall OptionsMenu
 	ret
-; 49eee
 
-MainMenu_Continue: ; 49eee
+MainMenu_Continue:
 	farcall Continue
 	ret
-; 49ef5
 
-MainMenu_MysteryGift: ; 49ef5
+MainMenu_MysteryGift:
 	farcall MysteryGift
 	ret
-; 49efc
diff --git a/engine/menu.asm b/engine/menus/menu.asm
index 846ad0ad9..c9ce72b13 100755..100644
--- a/engine/menu.asm
+++ b/engine/menus/menu.asm
@@ -1,6 +1,6 @@
-_2DMenu_:: ; 2400e
-	ld hl, CopyMenuData2
-	ld a, [wMenuData2_2DMenuItemStringsBank]
+_2DMenu_::
+	ld hl, CopyMenuData
+	ld a, [wMenuData_2DMenuItemStringsBank]
 	rst FarCall
 
 	call Draw2DMenu
@@ -8,11 +8,10 @@ _2DMenu_:: ; 2400e
 	call ApplyTilemap
 	call Get2DMenuSelection
 	ret
-; 24022
 
-_InterpretBattleMenu:: ; 24022
-	ld hl, CopyMenuData2
-	ld a, [wMenuData2_2DMenuItemStringsBank]
+_InterpretBattleMenu::
+	ld hl, CopyMenuData
+	ld a, [wMenuData_2DMenuItemStringsBank]
 	rst FarCall
 
 	call Draw2DMenu
@@ -21,11 +20,10 @@ _InterpretBattleMenu:: ; 24022
 	call ApplyTilemap
 	call Get2DMenuSelection
 	ret
-; 2403c
 
-_InterpretMobileMenu:: ; 2403c
-	ld hl, CopyMenuData2
-	ld a, [wMenuData2_2DMenuItemStringsBank]
+_InterpretMobileMenu::
+	ld hl, CopyMenuData
+	ld a, [wMenuData_2DMenuItemStringsBank]
 	rst FarCall
 
 	call Draw2DMenu
@@ -56,24 +54,20 @@ _InterpretMobileMenu:: ; 2403c
 	ld [wMenuCursorBuffer], a
 	and a
 	ret
-; 24085
 
-
-
-Draw2DMenu: ; 24085
+Draw2DMenu:
 	xor a
 	ld [hBGMapMode], a
 	call MenuBox
 	call Place2DMenuItemStrings
 	ret
-; 2408f
 
-Get2DMenuSelection: ; 2408f
+Get2DMenuSelection:
 	call Init2DMenuCursorPosition
 	call StaticMenuJoypad
 	call MenuClickSound
-Mobile_GetMenuSelection: ; 24098
-	ld a, [wMenuData2Flags]
+Mobile_GetMenuSelection:
+	ld a, [wMenuDataFlags]
 	bit 1, a
 	jr z, .skip
 	call GetMenuJoypad
@@ -81,7 +75,7 @@ Mobile_GetMenuSelection: ; 24098
 	jr nz, .quit1
 
 .skip
-	ld a, [wMenuData2Flags]
+	ld a, [wMenuDataFlags]
 	bit 0, a
 	jr nz, .skip2
 	call GetMenuJoypad
@@ -108,23 +102,20 @@ Mobile_GetMenuSelection: ; 24098
 .quit2
 	scf
 	ret
-; 240cd
 
-Get2DMenuNumberOfColumns: ; 240cd
-	ld a, [wMenuData2_2DMenuDimensions]
+Get2DMenuNumberOfColumns:
+	ld a, [wMenuData_2DMenuDimensions]
 	and $f
 	ret
-; 240d3
 
-Get2DMenuNumberOfRows: ; 240d3
-	ld a, [wMenuData2_2DMenuDimensions]
+Get2DMenuNumberOfRows:
+	ld a, [wMenuData_2DMenuDimensions]
 	swap a
 	and $f
 	ret
-; 240db
 
-Place2DMenuItemStrings: ; 240db
-	ld hl, wMenuData2_2DMenuItemStringsAddr
+Place2DMenuItemStrings:
+	ld hl, wMenuData_2DMenuItemStringsAddr
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
@@ -139,10 +130,10 @@ Place2DMenuItemStrings: ; 240db
 	ld c, a
 .col
 	push bc
-	ld a, [wMenuData2_2DMenuItemStringsBank]
+	ld a, [wMenuData_2DMenuItemStringsBank]
 	call Place2DMenuItemName
 	inc de
-	ld a, [wMenuData2_2DMenuSpacing]
+	ld a, [wMenuData_2DMenuSpacing]
 	ld c, a
 	ld b, 0
 	add hl, bc
@@ -155,19 +146,17 @@ Place2DMenuItemStrings: ; 240db
 	pop bc
 	dec b
 	jr nz, .row
-	ld hl, wMenuData2_2DMenuFunctionAddr
+	ld hl, wMenuData_2DMenuFunctionAddr
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	or h
 	ret z
-	ld a, [wMenuData2_2DMenuFunctionBank]
+	ld a, [wMenuData_2DMenuFunctionBank]
 	rst FarCall
 	ret
-; 2411a
-
 
-Init2DMenuCursorPosition: ; 2411a (9:411a)
+Init2DMenuCursorPosition:
 	call GetMenuTextStartCoord
 	ld a, b
 	ld [w2DMenuCursorInitY], a
@@ -222,30 +211,27 @@ Init2DMenuCursorPosition: ; 2411a (9:411a)
 	ld [wCursorCurrentTile], a
 	ld [wCursorCurrentTile + 1], a
 	ret
-; 24179
 
-.InitFlags_a: ; 24179
+.InitFlags_a:
 	xor a
 	ld hl, w2DMenuFlags1
 	ld [hli], a
 	ld [hld], a
-	ld a, [wMenuData2Flags]
+	ld a, [wMenuDataFlags]
 	bit 5, a
 	ret z
 	set 5, [hl]
 	set 4, [hl]
 	ret
-; 2418a
 
-.InitFlags_b: ; 2418a
-	ld a, [wMenuData2_2DMenuSpacing]
+.InitFlags_b:
+	ld a, [wMenuData_2DMenuSpacing]
 	or $20
 	ld [w2DMenuCursorOffsets], a
 	ret
-; 24193
 
-.InitFlags_c: ; 24193
-	ld hl, wMenuData2Flags
+.InitFlags_c:
+	ld hl, wMenuDataFlags
 	ld a, A_BUTTON
 	bit 0, [hl]
 	jr nz, .skip
@@ -257,12 +243,10 @@ Init2DMenuCursorPosition: ; 2411a (9:411a)
 .skip2
 	ld [wMenuJoypadFilter], a
 	ret
-; 241a8
 
-
-_StaticMenuJoypad:: ; 241a8
+_StaticMenuJoypad::
 	call Place2DMenuCursor
-_ScrollingMenuJoypad:: ; 241ab
+_ScrollingMenuJoypad::
 	ld hl, w2DMenuFlags2
 	res 7, [hl]
 	ld a, [hBGMapMode]
@@ -271,9 +255,8 @@ _ScrollingMenuJoypad:: ; 241ab
 	pop af
 	ld [hBGMapMode], a
 	ret
-; 241ba
 
-MobileMenuJoypad: ; 241ba
+MobileMenuJoypad:
 	ld hl, w2DMenuFlags2
 	res 7, [hl]
 	ld a, [hBGMapMode]
@@ -288,10 +271,8 @@ MobileMenuJoypad: ; 241ba
 	call GetMenuJoypad
 	ld c, a
 	ret
-; 241d5
-
 
-Unreferenced_Function241d5: ; 241d5
+Unreferenced_Function241d5:
 	call Place2DMenuCursor
 .loop
 	call Move2DMenuCursor
@@ -328,10 +309,8 @@ Unreferenced_Function241d5: ; 241d5
 	jr z, .loop2
 	and a
 	ret
-; 24216
-
 
-MenuJoypadLoop: ; 24216
+MenuJoypadLoop:
 .loop
 	call Move2DMenuCursor
 	call .BGMap_OAM
@@ -350,9 +329,8 @@ MenuJoypadLoop: ; 24216
 
 .done
 	ret
-; 24238
 
-.BGMap_OAM: ; 24238
+.BGMap_OAM:
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -363,9 +341,8 @@ MenuJoypadLoop: ; 24216
 	xor a
 	ld [hBGMapMode], a
 	ret
-; 24249
 
-Do2DMenuRTCJoypad: ; 24249
+Do2DMenuRTCJoypad:
 .loopRTC
 	call RTC
 	call Menu_WasButtonPressed
@@ -375,9 +352,8 @@ Do2DMenuRTCJoypad: ; 24249
 	jr z, .loopRTC
 	and a
 	ret
-; 24259
 
-Menu_WasButtonPressed: ; 24259
+Menu_WasButtonPressed:
 	ld a, [w2DMenuFlags1]
 	bit 6, a
 	jr z, .skip_to_joypad
@@ -390,9 +366,8 @@ Menu_WasButtonPressed: ; 24259
 	ret z
 	scf
 	ret
-; 24270
 
-_2DMenuInterpretJoypad: ; 24270
+_2DMenuInterpretJoypad:
 	call GetMenuJoypad
 	bit A_BUTTON_F, a
 	jp nz, .a_b_start_select
@@ -413,7 +388,7 @@ _2DMenuInterpretJoypad: ; 24270
 	and a
 	ret
 
-.set_bit_7 ; 24299
+.set_bit_7
 	ld hl, w2DMenuFlags2
 	set 7, [hl]
 	scf
@@ -512,14 +487,12 @@ _2DMenuInterpretJoypad: ; 24270
 	ld [hl], $1
 	xor a
 	ret
-; 24318
 
-.a_b_start_select ; 24318
+.a_b_start_select
 	xor a
 	ret
-; 2431a
 
-Move2DMenuCursor: ; 2431a
+Move2DMenuCursor:
 	ld hl, wCursorCurrentTile
 	ld a, [hli]
 	ld h, [hl]
@@ -529,7 +502,7 @@ Move2DMenuCursor: ; 2431a
 	jr nz, Place2DMenuCursor
 	ld a, [wCursorOffCharacter]
 	ld [hl], a
-Place2DMenuCursor: ; 24329
+Place2DMenuCursor:
 	ld a, [w2DMenuCursorInitY]
 	ld b, a
 	ld a, [w2DMenuCursorInitX]
@@ -580,9 +553,8 @@ Place2DMenuCursor: ; 24329
 	ld a, h
 	ld [wCursorCurrentTile + 1], a
 	ret
-; 24374
 
-_PushWindow:: ; 24374
+_PushWindow::
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wWindowStack)
@@ -651,9 +623,8 @@ _PushWindow:: ; 24374
 	ld hl, wWindowStackSize
 	inc [hl]
 	ret
-; 243cd
 
-.copy ; 243cd
+.copy
 	call GetMenuBoxDims
 	inc b
 	inc c
@@ -678,13 +649,11 @@ _PushWindow:: ; 24374
 	jr nz, .row
 
 	ret
-; 243e7
 
-.ret ; 243e7
+.ret
 	ret
-; 243e8
 
-_ExitMenu:: ; 243e8
+_ExitMenu::
 	xor a
 	ld [hBGMapMode], a
 
@@ -722,9 +691,8 @@ _ExitMenu:: ; 243e8
 	ld hl, wWindowStackSize
 	dec [hl]
 	ret
-; 24423
 
-Unreferenced_Function24423: ; 24423
+Unreferenced_Function24423:
 	ld a, [wVramState]
 	bit 0, a
 	ret z
@@ -755,23 +723,20 @@ Unreferenced_Function24423: ; 24423
 	jr nz, .loop
 	call CloseSRAM
 	ret
-; 2445d
 
-Error_Cant_ExitMenu: ; 2445d
+Error_Cant_ExitMenu:
 	ld hl, .Text_NoWindowsAvailableForPopping
 	call PrintText
 	call WaitBGMap
 .InfiniteLoop:
 	jr .InfiniteLoop
-; 24468
 
-.Text_NoWindowsAvailableForPopping: ; 24468
+.Text_NoWindowsAvailableForPopping:
 	text_jump UnknownText_0x1c46b7
 	db "@"
-; 2446d
 
-_InitVerticalMenuCursor:: ; 2446d
-	ld a, [wMenuData2Flags]
+_InitVerticalMenuCursor::
+	ld a, [wMenuDataFlags]
 	ld b, a
 	ld hl, w2DMenuCursorInitY
 	ld a, [wMenuBorderTopCoord]
@@ -786,7 +751,7 @@ _InitVerticalMenuCursor:: ; 2446d
 	inc a
 	ld [hli], a
 ; w2DMenuNumRows
-	ld a, [wMenuData2Items]
+	ld a, [wMenuDataItems]
 	ld [hli], a
 ; w2DMenuNumCols
 	ld a, 1
@@ -821,7 +786,7 @@ _InitVerticalMenuCursor:: ; 2446d
 	and a
 	jr z, .load_at_the_top
 	ld c, a
-	ld a, [wMenuData2Items]
+	ld a, [wMenuDataItems]
 	cp c
 	jr nc, .load_position
 .load_at_the_top
@@ -838,4 +803,3 @@ _InitVerticalMenuCursor:: ; 2446d
 	ld [hli], a
 	ld [hli], a
 	ret
-; 244c3
diff --git a/engine/menu_2.asm b/engine/menus/menu_2.asm
index 44960783f..b039b590f 100644
--- a/engine/menu_2.asm
+++ b/engine/menus/menu_2.asm
@@ -1,4 +1,4 @@
-PlaceMenuItemName: ; 0x24ab4
+PlaceMenuItemName:
 	push de
 	ld a, [wMenuSelection]
 	ld [wNamedObjectIndexBuffer], a
@@ -7,7 +7,7 @@ PlaceMenuItemName: ; 0x24ab4
 	call PlaceString
 	ret
 
-PlaceMenuItemQuantity: ; 0x24ac3
+PlaceMenuItemQuantity:
 	push de
 	ld a, [wMenuSelection]
 	ld [wCurItem], a
@@ -27,22 +27,22 @@ PlaceMenuItemQuantity: ; 0x24ac3
 .done
 	ret
 
-Special_PlaceMoneyTopRight: ; 24ae8
-	ld hl, MenuDataHeader_0x24b15
-	call CopyMenuDataHeader
-	jr PlaceMoneyDataHeader
+PlaceMoneyTopRight:
+	ld hl, MenuHeader_0x24b15
+	call CopyMenuHeader
+	jr PlaceMoneyTextBox
 
-PlaceMoneyBottomLeft: ; 24af0
-	ld hl, MenuDataHeader_0x24b1d
-	call CopyMenuDataHeader
-	jr PlaceMoneyDataHeader
+PlaceMoneyBottomLeft:
+	ld hl, MenuHeader_0x24b1d
+	call CopyMenuHeader
+	jr PlaceMoneyTextBox
 
-PlaceMoneyAtTopLeftOfTextbox: ; 24af8
-	ld hl, MenuDataHeader_0x24b15
+PlaceMoneyAtTopLeftOfTextbox:
+	ld hl, MenuHeader_0x24b15
 	lb de, 0, 11
-	call OffsetMenuDataHeader
+	call OffsetMenuHeader
 
-PlaceMoneyDataHeader: ; 24b01
+PlaceMoneyTextBox:
 	call MenuBox
 	call MenuBoxCoord2Tile
 	ld de, SCREEN_WIDTH + 1
@@ -52,19 +52,19 @@ PlaceMoneyDataHeader: ; 24b01
 	call PrintNum
 	ret
 
-MenuDataHeader_0x24b15: ; 0x24b15
+MenuHeader_0x24b15:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 0, SCREEN_WIDTH - 1, 2
 	dw NULL
 	db 1 ; default option
 
-MenuDataHeader_0x24b1d: ; 0x24b1d
+MenuHeader_0x24b1d:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 11, 8, 13
 	dw NULL
 	db 1 ; default option
 
-Special_DisplayCoinCaseBalance: ; 24b25
+DisplayCoinCaseBalance:
 	; Place a text box of size 1x7 at 11, 0.
 	hlcoord 11, 0
 	ld b, 1
@@ -82,7 +82,7 @@ Special_DisplayCoinCaseBalance: ; 24b25
 	call PrintNum
 	ret
 
-Special_DisplayMoneyAndCoinBalance: ; 24b4e
+DisplayMoneyAndCoinBalance:
 	hlcoord 5, 0
 	ld b, 3
 	ld c, 13
@@ -103,14 +103,14 @@ Special_DisplayMoneyAndCoinBalance: ; 24b4e
 	call PrintNum
 	ret
 
-MoneyString: ; 24b83
+MoneyString:
 	db "MONEY@"
-CoinString: ; 24b89
+CoinString:
 	db "COIN@"
-ShowMoney_TerminatorString: ; 24b8e
+ShowMoney_TerminatorString:
 	db "@"
 
-Unreferenced_Function24b8f: ; 24b8f
+Unreferenced_Function24b8f:
 ; related to safari?
 	ld hl, wOptions
 	ld a, [hl]
@@ -138,19 +138,19 @@ Unreferenced_Function24b8f: ; 24b8f
 	ld [wOptions], a
 	ret
 
-.slash_500 ; 24bcf
+.slash_500
 	db "／５００@"
-.booru_ko ; 24bd4
+.booru_ko
 	db "ボール　　　こ@"
 
-StartMenu_DrawBugContestStatusBox: ; 24bdc
+StartMenu_DrawBugContestStatusBox:
 	hlcoord 0, 0
 	ld b, 5
 	ld c, 17
 	call TextBox
 	ret
 
-StartMenu_PrintBugContestStatus: ; 24be7
+StartMenu_PrintBugContestStatus:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -194,18 +194,18 @@ StartMenu_PrintBugContestStatus: ; 24be7
 	ld [wOptions], a
 	ret
 
-.Balls_JP: ; 24c43
+.Balls_JP:
 	db "ボール　　　こ@"
-.CAUGHT: ; 24c4b
+.CAUGHT:
 	db "CAUGHT@"
-.Balls_EN: ; 24c52
+.Balls_EN:
 	db "BALLS:@"
-.None: ; 24c59
+.None:
 	db "None@"
-.LEVEL: ; 24c5e
+.LEVEL:
 	db "LEVEL@"
 
-FindApricornsInBag: ; 24c64
+FindApricornsInBag:
 ; Checks the bag for Apricorns.
 	ld hl, wBuffer1
 	xor a
@@ -239,7 +239,7 @@ FindApricornsInBag: ; 24c64
 	scf
 	ret
 
-.addtobuffer ; 24c94
+.addtobuffer
 	push hl
 	ld hl, wBuffer1
 	inc [hl]
diff --git a/engine/naming_screen.asm b/engine/menus/naming_screen.asm
index 859e7a515..8a8303067 100755..100644
--- a/engine/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -4,15 +4,13 @@ NAMINGSCREEN_BORDER     EQUS "\"■\"" ; $60
 NAMINGSCREEN_MIDDLELINE EQUS "\"→\"" ; $eb
 NAMINGSCREEN_UNDERLINE  EQUS "\"<DOT>\"" ; $f2
 
-_NamingScreen: ; 0x116b7
+_NamingScreen:
 	call DisableSpriteUpdates
 	call NamingScreen
 	call ReturnToMapWithSpeechTextbox
 	ret
 
-; 0x116c1
-
-NamingScreen: ; 116c1
+NamingScreen:
 	ld hl, wNamingScreenDestinationPointer
 	ld [hl], e
 	inc hl
@@ -45,9 +43,7 @@ NamingScreen: ; 116c1
 	call ClearJoypad
 	ret
 
-; 116f8
-
-.SetUpNamingScreen: ; 116f8
+.SetUpNamingScreen:
 	call ClearBGPalettes
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
@@ -63,9 +59,7 @@ NamingScreen: ; 116c1
 	call NamingScreen_InitNameEntry
 	ret
 
-; 1171d
-
-.GetNamingScreenSetup: ; 1171d
+.GetNamingScreenSetup:
 	ld a, [wNamingScreenType]
 	and 7
 	ld e, a
@@ -78,9 +72,7 @@ NamingScreen: ; 116c1
 	ld l, a
 	jp hl
 
-; 1172e
-
-.Jumptable: ; 1172e (4:572e)
+.Jumptable:
 	dw .Pokemon
 	dw .Player
 	dw .Rival
@@ -90,7 +82,7 @@ NamingScreen: ; 116c1
 	dw .Pokemon
 	dw .Pokemon
 
-.Pokemon: ; 1173e (4:573e)
+.Pokemon:
 	ld a, [wCurPartySpecies]
 	ld [wd265], a
 	ld hl, LoadMenuMonIcon
@@ -121,15 +113,11 @@ NamingScreen: ; 116c1
 	call .StoreMonIconParams
 	ret
 
-; 11780 (4:5780)
-
-.NicknameStrings: ; 11780
+.NicknameStrings:
 	db "'S@"
 	db "NICKNAME?@"
 
-; 1178d
-
-.Player: ; 1178d (4:578d)
+.Player:
 	farcall GetPlayerIcon
 	call .LoadSprite
 	hlcoord 5, 2
@@ -138,14 +126,10 @@ NamingScreen: ; 116c1
 	call .StoreSpriteIconParams
 	ret
 
-; 117a3 (4:57a3)
-
-.PlayerNameString: ; 117a3
+.PlayerNameString:
 	db "YOUR NAME?@"
 
-; 117ae
-
-.Rival: ; 117ae (4:57ae)
+.Rival:
 	ld de, SilverSpriteGFX
 	ld b, BANK(SilverSpriteGFX)
 	call .LoadSprite
@@ -155,14 +139,10 @@ NamingScreen: ; 116c1
 	call .StoreSpriteIconParams
 	ret
 
-; 117c3 (4:57c3)
-
-.RivalNameString: ; 117c3
+.RivalNameString:
 	db "RIVAL'S NAME?@"
 
-; 117d1
-
-.Mom: ; 117d1 (4:57d1)
+.Mom:
 	ld de, MomSpriteGFX
 	ld b, BANK(MomSpriteGFX)
 	call .LoadSprite
@@ -172,14 +152,10 @@ NamingScreen: ; 116c1
 	call .StoreSpriteIconParams
 	ret
 
-; 117e6 (4:57e6)
-
-.MomNameString: ; 117e6
+.MomNameString:
 	db "MOTHER'S NAME?@"
 
-; 117f5
-
-.Box: ; 117f5 (4:57f5)
+.Box:
 	ld de, PokeBallSpriteGFX
 	ld hl, vTiles0 tile $00
 	lb bc, BANK(PokeBallSpriteGFX), 4
@@ -200,28 +176,20 @@ NamingScreen: ; 116c1
 	call .StoreBoxIconParams
 	ret
 
-; 11822 (4:5822)
-
-.BoxNameString: ; 11822
+.BoxNameString:
 	db "BOX NAME?@"
 
-; 1182c
-
-.Tomodachi: ; 1182c (4:582c)
+.Tomodachi:
 	hlcoord 3, 2
 	ld de, .oTomodachi_no_namae_sutoringu
 	call PlaceString
 	call .StoreSpriteIconParams
 	ret
 
-; 11839 (4:5839)
-
-.oTomodachi_no_namae_sutoringu ; 11839
+.oTomodachi_no_namae_sutoringu
 	db "おともだち　の　なまえは？@"
 
-; 11847
-
-.LoadSprite: ; 11847 (4:5847)
+.LoadSprite:
 	push de
 	ld hl, vTiles0 tile $00
 	ld c, $4
@@ -253,22 +221,22 @@ NamingScreen: ; 116c1
 	call _InitSpriteAnimStruct
 	ret
 
-.StoreMonIconParams: ; 1187b (4:587b)
+.StoreMonIconParams:
 	ld a, MON_NAME_LENGTH - 1
 	hlcoord 5, 6
 	jr .StoreParams
 
-.StoreSpriteIconParams: ; 11882 (4:5882)
+.StoreSpriteIconParams:
 	ld a, PLAYER_NAME_LENGTH - 1
 	hlcoord 5, 6
 	jr .StoreParams
 
-.StoreBoxIconParams: ; 11889 (4:5889)
+.StoreBoxIconParams:
 	ld a, BOX_NAME_LENGTH - 1
 	hlcoord 5, 4
 	jr .StoreParams
 
-.StoreParams: ; 11890 (4:5890)
+.StoreParams:
 	ld [wNamingScreenMaxNameLength], a
 	ld a, l
 	ld [wNamingScreenStringEntryCoord], a
@@ -276,7 +244,7 @@ NamingScreen: ; 116c1
 	ld [wNamingScreenStringEntryCoord + 1], a
 	ret
 
-NamingScreen_IsTargetBox: ; 1189c
+NamingScreen_IsTargetBox:
 	push bc
 	push af
 	ld a, [wNamingScreenType]
@@ -287,9 +255,7 @@ NamingScreen_IsTargetBox: ; 1189c
 	pop bc
 	ret
 
-; 118a8
-
-NamingScreen_InitText: ; 118a8
+NamingScreen_InitText:
 	call WaitTop
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@@ -304,7 +270,7 @@ NamingScreen_InitText: ; 118a8
 .not_box
 	call ClearBox
 	ld de, NameInputUpper
-NamingScreen_ApplyTextInputMode: ; 118ca
+NamingScreen_ApplyTextInputMode:
 	call NamingScreen_IsTargetBox
 	jr nz, .not_box
 	ld hl, BoxNameInputLower - NameInputLower
@@ -350,9 +316,7 @@ NamingScreen_ApplyTextInputMode: ; 118ca
 	jr nz, .row
 	ret
 
-; 11915
-
-NamingScreenJoypadLoop: ; 11915
+NamingScreenJoypadLoop:
 	call JoyTextDelay
 	ld a, [wJumptableIndex]
 	bit 7, a
@@ -373,9 +337,7 @@ NamingScreenJoypadLoop: ; 11915
 	scf
 	ret
 
-; 11940
-
-.UpdateStringEntry: ; 11940
+.UpdateStringEntry:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 1, 5
@@ -399,9 +361,7 @@ NamingScreenJoypadLoop: ; 11915
 	ld [hBGMapMode], a
 	ret
 
-; 11968
-
-.RunJumptable: ; 11968
+.RunJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, $0
@@ -413,13 +373,11 @@ NamingScreenJoypadLoop: ; 11915
 	ld l, a
 	jp hl
 
-; 11977
-
-.Jumptable: ; 11977 (4:5977)
+.Jumptable:
 	dw .InitCursor
 	dw .ReadButtons
 
-.InitCursor: ; 1197b (4:597b)
+.InitCursor:
 	depixel 10, 3
 	call NamingScreen_IsTargetBox
 	jr nz, .got_cursor_position
@@ -441,7 +399,7 @@ NamingScreenJoypadLoop: ; 11915
 	inc [hl]
 	ret
 
-.ReadButtons: ; 119a1 (4:59a1)
+.ReadButtons:
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and A_BUTTON
@@ -510,13 +468,13 @@ NamingScreenJoypadLoop: ; 11915
 	call NamingScreen_ApplyTextInputMode
 	ret
 
-.GetCursorPosition: ; 11a0b (4:5a0b)
+.GetCursorPosition:
 	ld hl, wNamingScreenCursorObjectPointer
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
 
-NamingScreen_GetCursorPosition: ; 11a11 (4:5a11)
+NamingScreen_GetCursorPosition:
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
@@ -551,7 +509,7 @@ NamingScreen_GetCursorPosition: ; 11a11 (4:5a11)
 	xor a
 	ret
 
-NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
+NamingScreen_AnimateCursor:
 	call .GetDPad
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
@@ -590,17 +548,13 @@ NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
 	ld [hl], a
 	ret
 
-; 11a79 (4:5a79)
-
-.LetterEntries: ; 11a79
+.LetterEntries:
 	db $00, $10, $20, $30, $40, $50, $60, $70, $80
 
-.CaseDelEnd: ; 11a82
+.CaseDelEnd:
 	db $00, $00, $00, $30, $30, $30, $60, $60, $60
 
-; 11a8b
-
-.GetDPad: ; 11a8b (4:5a8b)
+.GetDPad:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
@@ -713,9 +667,9 @@ NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
 	inc [hl]
 	ret
 
-NamingScreen_TryAddCharacter: ; 11b14 (4:5b14)
+NamingScreen_TryAddCharacter:
 	ld a, [wNamingScreenLastCharacter] ; lost
-MailComposition_TryAddCharacter: ; 11b17 (4:5b17)
+MailComposition_TryAddCharacter:
 	ld a, [wNamingScreenMaxNameLength]
 	ld c, a
 	ld a, [wNamingScreenCurrNameLength]
@@ -724,11 +678,11 @@ MailComposition_TryAddCharacter: ; 11b17 (4:5b17)
 
 	ld a, [wNamingScreenLastCharacter]
 
-NamingScreen_LoadNextCharacter: ; 11b23
+NamingScreen_LoadNextCharacter:
 	call NamingScreen_GetTextCursorPosition
 	ld [hl], a
 
-NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27
+NamingScreen_AdvanceCursor_CheckEndOfString:
 	ld hl, wNamingScreenCurrNameLength
 	inc [hl]
 	call NamingScreen_GetTextCursorPosition
@@ -743,8 +697,6 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27
 	scf
 	ret
 
-; 11b39 (4:5b39)
-
 ; unused
 	ld a, [wNamingScreenCurrNameLength]
 	and a
@@ -769,13 +721,9 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27
 	ld a, [hl]
 	jr NamingScreen_LoadNextCharacter
 
-; 11b56
+INCLUDE "data/text/unused_dakutens.asm"
 
-INCLUDE "data/unused/dakutens.asm"
-
-; 11bbc
-
-NamingScreen_DeleteCharacter: ; 11bbc (4:5bbc)
+NamingScreen_DeleteCharacter:
 	ld hl, wNamingScreenCurrNameLength
 	ld a, [hl]
 	and a
@@ -790,7 +738,7 @@ NamingScreen_DeleteCharacter: ; 11bbc (4:5bbc)
 	ld [hl], NAMINGSCREEN_MIDDLELINE
 	ret
 
-NamingScreen_GetTextCursorPosition: ; 11bd0 (4:5bd0)
+NamingScreen_GetTextCursorPosition:
 	push af
 	ld hl, wNamingScreenDestinationPointer
 	ld a, [hli]
@@ -803,9 +751,7 @@ NamingScreen_GetTextCursorPosition: ; 11bd0 (4:5bd0)
 	pop af
 	ret
 
-; 11be0
-
-NamingScreen_InitNameEntry: ; 11be0
+NamingScreen_InitNameEntry:
 ; load NAMINGSCREEN_UNDERLINE, (NAMINGSCREEN_MIDDLELINE * [wNamingScreenMaxNameLength]), "@" into the dw address at wNamingScreenDestinationPointer
 	ld hl, wNamingScreenDestinationPointer
 	ld a, [hli]
@@ -824,9 +770,7 @@ NamingScreen_InitNameEntry: ; 11be0
 	ld [hl], "@"
 	ret
 
-; 11bf7
-
-NamingScreen_StoreEntry: ; 11bf7 (4:5bf7)
+NamingScreen_StoreEntry:
 	ld hl, wNamingScreenDestinationPointer
 	ld a, [hli]
 	ld h, [hl]
@@ -847,7 +791,7 @@ NamingScreen_StoreEntry: ; 11bf7 (4:5bf7)
 	jr nz, .loop
 	ret
 
-NamingScreen_GetLastCharacter: ; 11c11 (4:5c11)
+NamingScreen_GetLastCharacter:
 	ld hl, wNamingScreenCursorObjectPointer
 	ld c, [hl]
 	inc hl
@@ -890,7 +834,7 @@ NamingScreen_GetLastCharacter: ; 11c11 (4:5c11)
 	ld [wNamingScreenLastCharacter], a
 	ret
 
-LoadNamingScreenGFX: ; 11c51
+LoadNamingScreenGFX:
 	call ClearSprites
 	callfar ClearSpriteAnims
 	call LoadStandardFont
@@ -935,32 +879,24 @@ LoadNamingScreenGFX: ; 11c51
 	ld [hWX], a
 	ret
 
-; 11cb7
-
-NamingScreenGFX_Border: ; 11cb7
+NamingScreenGFX_Border:
 INCBIN "gfx/naming_screen/border.2bpp"
-; 11cc7
 
-NamingScreenGFX_Cursor: ; 11cc7
+NamingScreenGFX_Cursor:
 INCBIN "gfx/naming_screen/cursor.2bpp"
-; 11ce7
 
-INCLUDE "data/name_input_chars.asm"
-; 11e5d
+INCLUDE "data/text/name_input_chars.asm"
 
 NamingScreenGFX_End: ; unused
 INCBIN "gfx/naming_screen/end.1bpp"
-; 11e6d
 
 NamingScreenGFX_MiddleLine:
 INCBIN "gfx/naming_screen/middle_line.1bpp"
-; 11e6d
 
-NamingScreenGFX_UnderLine: ; 11e6d
+NamingScreenGFX_UnderLine:
 INCBIN "gfx/naming_screen/underline.1bpp"
-; 11e75
 
-_ComposeMailMessage: ; 11e75 (mail?)
+_ComposeMailMessage:
 	ld hl, wNamingScreenDestinationPointer
 	ld [hl], e
 	inc hl
@@ -986,7 +922,7 @@ _ComposeMailMessage: ; 11e75 (mail?)
 	ld [hMapAnims], a
 	ret
 
-.InitBlankMail: ; 11e9a (4:5e9a)
+.InitBlankMail:
 	call ClearBGPalettes
 	call DisableLCD
 	call LoadNamingScreenGFX
@@ -1030,25 +966,18 @@ _ComposeMailMessage: ; 11e75 (mail?)
 	ld [hl], "<NEXT>"
 	ret
 
-; 11ef4 (4:5ef4)
-
-.MailIcon: ; 11ef4
+.MailIcon:
 INCBIN "gfx/icons/mail_big.2bpp"
-; 11f74
 
-.initwNamingScreenMaxNameLength ; 11f74 (4:5f74)
+.initwNamingScreenMaxNameLength
 	ld a, MAIL_MSG_LENGTH + 1
 	ld [wNamingScreenMaxNameLength], a
 	ret
 
-; 11f7a (4:5f7a)
-
 .UnusedString11f7a:
 	db "メールを　かいてね@"
 
-; 11f84
-
-.InitCharset: ; 11f84 (4:5f84)
+.InitCharset:
 	call WaitTop
 	hlcoord 0, 0
 	ld bc, 6 * SCREEN_WIDTH
@@ -1063,7 +992,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
 	call ClearBox
 	ld de, MailEntry_Uppercase
 
-.PlaceMailCharset: ; 11fa9 (4:5fa9)
+.PlaceMailCharset:
 	hlcoord 1, 7
 	ld b, 6
 .next
@@ -1082,7 +1011,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
 	jr nz, .next
 	ret
 
-.DoMailEntry: ; 11fc0 (4:5fc0)
+.DoMailEntry:
 	call JoyTextDelay
 	ld a, [wJumptableIndex]
 	bit 7, a
@@ -1103,7 +1032,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
 	scf
 	ret
 
-.Update: ; 11feb (4:5feb)
+.Update:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 1, 1
@@ -1119,7 +1048,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
 	ld [hBGMapMode], a
 	ret
 
-.DoJumptable: ; 12008 (4:6008)
+.DoJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -1131,11 +1060,11 @@ INCBIN "gfx/icons/mail_big.2bpp"
 	ld l, a
 	jp hl
 
-.Jumptable: ; 12017 (4:6017)
+.Jumptable:
 	dw .init_blinking_cursor
 	dw .process_joypad
 
-.init_blinking_cursor ; 1201b (4:601b)
+.init_blinking_cursor
 	depixel 9, 2
 	ld a, SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
 	call _InitSpriteAnimStruct
@@ -1153,7 +1082,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
 	inc [hl]
 	ret
 
-.process_joypad ; 1203a (4:603a)
+.process_joypad
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and A_BUTTON
@@ -1240,7 +1169,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
 
 ; called from engine/sprite_anims.asm
 
-ComposeMail_AnimateCursor: ; 120c1 (4:60c1)
+ComposeMail_AnimateCursor:
 	call .GetDPad
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
@@ -1274,17 +1203,13 @@ ComposeMail_AnimateCursor: ; 120c1 (4:60c1)
 	ld [hl], a
 	ret
 
-; 120f8 (4:60f8)
-
-.LetterEntries: ; 120f8
+.LetterEntries:
 	db $00, $10, $20, $30, $40, $50, $60, $70, $80, $90
 
-.CaseDelEnd: ; 12102
+.CaseDelEnd:
 	db $00, $00, $00, $30, $30, $30, $60, $60, $60, $60
 
-; 1210c
-
-.GetDPad: ; 1210c (4:610c)
+.GetDPad:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
@@ -1386,13 +1311,13 @@ ComposeMail_AnimateCursor: ; 120c1 (4:60c1)
 	ld [hl], $5
 	ret
 
-NamingScreen_PressedA_GetCursorCommand: ; 12185 (4:6185)
+NamingScreen_PressedA_GetCursorCommand:
 	ld hl, wNamingScreenCursorObjectPointer
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
 
-ComposeMail_GetCursorPosition: ; 1218b (4:618b)
+ComposeMail_GetCursorPosition:
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
@@ -1420,12 +1345,10 @@ ComposeMail_GetCursorPosition: ; 1218b (4:618b)
 	xor a
 	ret
 
-MailComposition_TryAddLastCharacter: ; 121ac (4:61ac)
+MailComposition_TryAddLastCharacter:
 	ld a, [wNamingScreenLastCharacter]
 	jp MailComposition_TryAddCharacter
 
-; 121b2 (4:61b2)
-
 ; unused
 	ld a, [wNamingScreenCurrNameLength]
 	and a
@@ -1460,8 +1383,4 @@ MailComposition_TryAddLastCharacter: ; 121ac (4:61ac)
 	ld a, [hl]
 	jp NamingScreen_LoadNextCharacter
 
-; 121dd
-
-INCLUDE "data/mail_input_chars.asm"
-
-; 122c1
+INCLUDE "data/text/mail_input_chars.asm"
diff --git a/engine/options_menu.asm b/engine/menus/options_menu.asm
index b6ca978d1..4dc6c0fe1 100755..100644
--- a/engine/options_menu.asm
+++ b/engine/menus/options_menu.asm
@@ -1,4 +1,4 @@
-_OptionsMenu: ; e41d0
+_OptionsMenu:
 	ld hl, hInMenu
 	ld a, [hl]
 	push af
@@ -59,28 +59,25 @@ _OptionsMenu: ; e41d0
 	pop af
 	ld [hInMenu], a
 	ret
-; e4241
-
-StringOptions: ; e4241
-	db "TEXT SPEED<LNBRK>"
-	db "        :<LNBRK>"
-	db "BATTLE SCENE<LNBRK>"
-	db "        :<LNBRK>"
-	db "BATTLE STYLE<LNBRK>"
-	db "        :<LNBRK>"
-	db "SOUND<LNBRK>"
-	db "        :<LNBRK>"
-	db "PRINT<LNBRK>"
-	db "        :<LNBRK>"
-	db "MENU ACCOUNT<LNBRK>"
-	db "        :<LNBRK>"
-	db "FRAME<LNBRK>"
-	db "        :TYPE<LNBRK>"
-	db "CANCEL@"
-; e42d6
 
+StringOptions:
+	db "TEXT SPEED<LF>"
+	db "        :<LF>"
+	db "BATTLE SCENE<LF>"
+	db "        :<LF>"
+	db "BATTLE STYLE<LF>"
+	db "        :<LF>"
+	db "SOUND<LF>"
+	db "        :<LF>"
+	db "PRINT<LF>"
+	db "        :<LF>"
+	db "MENU ACCOUNT<LF>"
+	db "        :<LF>"
+	db "FRAME<LF>"
+	db "        :TYPE<LF>"
+	db "CANCEL@"
 
-GetOptionPointer: ; e42d6
+GetOptionPointer:
 	ld a, [wJumptableIndex] ; load the cursor position to a
 	ld e, a ; copy it to de
 	ld d, 0
@@ -91,7 +88,6 @@ GetOptionPointer: ; e42d6
 	ld h, [hl]
 	ld l, a
 	jp hl ; jump to the code of the current highlighted item
-; e42e5
 
 .Pointers:
 	dw Options_TextSpeed
@@ -102,15 +98,13 @@ GetOptionPointer: ; e42d6
 	dw Options_MenuAccount
 	dw Options_Frame
 	dw Options_Cancel
-; e42f5
-
 
 	const_def
 	const OPT_TEXT_SPEED_FAST ; 0
 	const OPT_TEXT_SPEED_MED  ; 1
 	const OPT_TEXT_SPEED_SLOW ; 2
 
-Options_TextSpeed: ; e42f5
+Options_TextSpeed:
 	call GetTextSpeed
 	ld a, [hJoyPressed]
 	bit D_LEFT_F, a
@@ -120,7 +114,7 @@ Options_TextSpeed: ; e42f5
 	ld a, c ; right pressed
 	cp OPT_TEXT_SPEED_SLOW
 	jr c, .Increase
-	ld c, OPT_TEXT_SPEED_FAST +- 1
+	ld c, OPT_TEXT_SPEED_FAST + -1
 
 .Increase:
 	inc c
@@ -156,7 +150,6 @@ Options_TextSpeed: ; e42f5
 	call PlaceString
 	and a
 	ret
-; e4331
 
 .Strings:
 ; entries correspond to OPT_TEXT_SPEED_* constants
@@ -167,14 +160,12 @@ Options_TextSpeed: ; e42f5
 .Fast: db "FAST@"
 .Mid:  db "MID @"
 .Slow: db "SLOW@"
-; e4346
 
-
-GetTextSpeed: ; e4346
+GetTextSpeed:
 ; converts TEXT_DELAY_* value in a to OPT_TEXT_SPEED_* value in c,
 ; with previous/next TEXT_DELAY_* values in d/e
 	ld a, [wOptions]
-	and $7
+	and TEXT_DELAY_MASK
 	cp TEXT_DELAY_SLOW
 	jr z, .slow
 	cp TEXT_DELAY_FAST
@@ -193,10 +184,8 @@ GetTextSpeed: ; e4346
 	ld c, OPT_TEXT_SPEED_FAST
 	lb de, TEXT_DELAY_SLOW, TEXT_DELAY_MED
 	ret
-; e4365
-
 
-Options_BattleScene: ; e4365
+Options_BattleScene:
 	ld hl, wOptions
 	ld a, [hJoyPressed]
 	bit D_LEFT_F, a
@@ -231,14 +220,11 @@ Options_BattleScene: ; e4365
 	call PlaceString
 	and a
 	ret
-; e4398
 
 .On:  db "ON @"
 .Off: db "OFF@"
-; e43a0
 
-
-Options_BattleStyle: ; e43a0
+Options_BattleStyle:
 	ld hl, wOptions
 	ld a, [hJoyPressed]
 	bit D_LEFT_F, a
@@ -272,14 +258,11 @@ Options_BattleStyle: ; e43a0
 	call PlaceString
 	and a
 	ret
-; e43d1
 
 .Shift: db "SHIFT@"
 .Set:   db "SET  @"
-; e43dd
-
 
-Options_Sound: ; e43dd
+Options_Sound:
 	ld hl, wOptions
 	ld a, [hJoyPressed]
 	bit D_LEFT_F, a
@@ -320,12 +303,9 @@ Options_Sound: ; e43dd
 	call PlaceString
 	and a
 	ret
-; e4416
 
 .Mono:   db "MONO  @"
 .Stereo: db "STEREO@"
-; e4424
-
 
 	const_def
 	const OPT_PRINT_LIGHTEST ; 0
@@ -334,7 +314,7 @@ Options_Sound: ; e43dd
 	const OPT_PRINT_DARKER   ; 3
 	const OPT_PRINT_DARKEST  ; 4
 
-Options_Print: ; e4424
+Options_Print:
 	call GetPrinterSetting
 	ld a, [hJoyPressed]
 	bit D_LEFT_F, a
@@ -377,7 +357,6 @@ Options_Print: ; e4424
 	call PlaceString
 	and a
 	ret
-; e445a
 
 .Strings:
 ; entries correspond to OPT_PRINT_* constants
@@ -392,10 +371,8 @@ Options_Print: ; e4424
 .Normal:   db "NORMAL  @"
 .Darker:   db "DARKER  @"
 .Darkest:  db "DARKEST @"
-; e4491
 
-
-GetPrinterSetting: ; e4491
+GetPrinterSetting:
 ; converts GBPRINTER_* value in a to OPT_PRINT_* value in c,
 ; with previous/next GBPRINTER_* values in d/e
 	ld a, [wGBPrinter]
@@ -431,9 +408,8 @@ GetPrinterSetting: ; e4491
 	ld c, OPT_PRINT_DARKEST
 	lb de, GBPRINTER_DARKER, GBPRINTER_LIGHTEST
 	ret
-; e44c1
 
-Options_MenuAccount: ; e44c1
+Options_MenuAccount:
 	ld hl, wOptions2
 	ld a, [hJoyPressed]
 	bit D_LEFT_F, a
@@ -467,14 +443,11 @@ Options_MenuAccount: ; e44c1
 	call PlaceString
 	and a
 	ret
-; e44f2
 
 .Off: db "OFF@"
 .On:  db "ON @"
-; e44fa
-
 
-Options_Frame: ; e44fa
+Options_Frame:
 	ld hl, wTextBoxFrame
 	ld a, [hJoyPressed]
 	bit D_LEFT_F, a
@@ -494,9 +467,9 @@ Options_Frame: ; e44fa
 	dec a
 
 .Save:
-	and $7
+	maskbits NUM_FRAMES
 	ld [hl], a
-UpdateFrame: ; e4512
+UpdateFrame:
 	ld a, [wTextBoxFrame]
 	hlcoord 16, 15 ; where on the screen the number is drawn
 	add "1"
@@ -504,9 +477,8 @@ UpdateFrame: ; e4512
 	call LoadFontsExtra
 	and a
 	ret
-; e4520
 
-Options_Cancel: ; e4520
+Options_Cancel:
 	ld a, [hJoyPressed]
 	and A_BUTTON
 	jr nz, .Exit
@@ -516,9 +488,8 @@ Options_Cancel: ; e4520
 .Exit:
 	scf
 	ret
-; e452a
 
-OptionsControl: ; e452a
+OptionsControl:
 	ld hl, wJumptableIndex
 	ld a, [hJoyLast]
 	cp D_DOWN
@@ -563,9 +534,8 @@ OptionsControl: ; e452a
 	dec [hl]
 	scf
 	ret
-; e455c
 
-Options_UpdateCursorPosition: ; e455c
+Options_UpdateCursorPosition:
 	hlcoord 1, 1
 	ld de, SCREEN_WIDTH
 	ld c, $10
@@ -580,4 +550,3 @@ Options_UpdateCursorPosition: ; e455c
 	call AddNTimes
 	ld [hl], "▶"
 	ret
-; e4579
diff --git a/engine/save.asm b/engine/menus/save.asm
index c519e50ad..190f5f887 100644
--- a/engine/save.asm
+++ b/engine/menus/save.asm
@@ -1,5 +1,5 @@
-SaveMenu: ; 14a1a
-	call LoadStandardMenuDataHeader
+SaveMenu:
+	call LoadStandardMenuHeader
 	farcall DisplaySaveInfoOnSave
 	call SpeechTextBox
 	call UpdateSprites
@@ -23,7 +23,7 @@ SaveMenu: ; 14a1a
 	scf
 	ret
 
-SaveAfterLinkTrade: ; 14a58
+SaveAfterLinkTrade:
 	call PauseGameLogic
 	farcall StageRTCTimeForSave
 	farcall BackupMysteryGift
@@ -35,10 +35,8 @@ SaveAfterLinkTrade: ; 14a58
 	farcall SaveRTC
 	call ResumeGameLogic
 	ret
-; 14a83
 
-
-ChangeBoxSaveGame: ; 14a83 (5:4a83)
+ChangeBoxSaveGame:
 	push de
 	ld hl, Text_SaveOnBoxSwitch
 	call MenuTextBox
@@ -62,7 +60,7 @@ ChangeBoxSaveGame: ; 14a83 (5:4a83)
 	pop de
 	ret
 
-Link_SaveGame: ; 14ab2
+Link_SaveGame:
 	call AskOverwriteSaveFile
 	jr c, .refused
 	call PauseGameLogic
@@ -72,9 +70,8 @@ Link_SaveGame: ; 14ab2
 
 .refused
 	ret
-; 14ac2
 
-MovePkmnWOMail_SaveGame: ; 14ac2
+MoveMonWOMail_SaveGame:
 	call PauseGameLogic
 	push de
 	call SaveBox
@@ -84,16 +81,15 @@ MovePkmnWOMail_SaveGame: ; 14ac2
 	call LoadBox
 	call ResumeGameLogic
 	ret
-; 14ad5
 
-MovePkmnWOMail_InsertMon_SaveGame: ; 14ad5
+MoveMonWOMail_InsertMon_SaveGame:
 	call PauseGameLogic
 	push de
 	call SaveBox
 	pop de
 	ld a, e
 	ld [wCurBox], a
-	ld a, $1
+	ld a, TRUE
 	ld [wSaveFileExists], a
 	farcall StageRTCTimeForSave
 	farcall BackupMysteryGift
@@ -117,10 +113,9 @@ MovePkmnWOMail_InsertMon_SaveGame: ; 14ad5
 	ld c, 24
 	call DelayFrames
 	ret
-; 14b34
 
-StartMovePkmnWOMail_SaveGame: ; 14b34
-	ld hl, Text_SaveOnMovePkmnWOMail
+StartMoveMonWOMail_SaveGame:
+	ld hl, Text_SaveOnMoveMonWOMail
 	call MenuTextBox
 	call YesNoBox
 	call ExitMenu
@@ -136,22 +131,18 @@ StartMovePkmnWOMail_SaveGame: ; 14b34
 .refused
 	scf
 	ret
-; 14b54
 
-PauseGameLogic: ; 14b54
+PauseGameLogic:
 	ld a, $1
 	ld [wGameLogicPaused], a
 	ret
-; 14b5a
 
-ResumeGameLogic: ; 14b5a
+ResumeGameLogic:
 	xor a
 	ld [wGameLogicPaused], a
 	ret
-; 14b5f
-
 
-AddHallOfFameEntry: ; 14b5f
+AddHallOfFameEntry:
 	ld a, BANK(sHallOfFame)
 	call GetSRAMBank
 	ld hl, sHallOfFame + HOF_LENGTH * (NUM_HOF_TEAMS - 1) - 1
@@ -165,20 +156,18 @@ AddHallOfFameEntry: ; 14b5f
 	ld a, c
 	or b
 	jr nz, .loop
-	ld hl, wOverworldMap
+	ld hl, wHallOfFamePokemonList
 	ld de, sHallOfFame
-	ld bc, HOF_LENGTH
+	ld bc, wHallOfFamePokemonListEnd - wHallOfFamePokemonList + 1
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 14b85
 
-SaveGameData: ; 14b85
+SaveGameData:
 	call SaveGameData_
 	ret
-; 14b89
 
-AskOverwriteSaveFile: ; 14b89
+AskOverwriteSaveFile:
 	ld a, [wSaveFileExists]
 	and a
 	jr z, .erase
@@ -205,9 +194,8 @@ AskOverwriteSaveFile: ; 14b89
 .refused
 	scf
 	ret
-; 14baf
 
-SaveTheGame_yesorno: ; 14baf
+SaveTheGame_yesorno:
 	ld b, BANK(Text_WouldYouLikeToSaveTheGame)
 	call MapTextbox
 	call LoadMenuTextBox
@@ -221,9 +209,8 @@ SaveTheGame_yesorno: ; 14baf
 	pop af
 	and a
 	ret
-; 14bcb
 
-CompareLoadedAndSavedPlayerID: ; 14bcb
+CompareLoadedAndSavedPlayerID:
 	ld a, BANK(sPlayerData)
 	call GetSRAMBank
 	ld hl, sPlayerData + (wPlayerID - wPlayerData)
@@ -237,11 +224,10 @@ CompareLoadedAndSavedPlayerID: ; 14bcb
 	ld a, [wPlayerID + 1]
 	cp c
 	ret
-; 14be3
 
-_SavingDontTurnOffThePower: ; 14be3
+_SavingDontTurnOffThePower:
 	call SavingDontTurnOffThePower
-SavedTheGame: ; 14be6
+SavedTheGame:
 	call SaveGameData_
 	; wait 32 frames
 	ld c, $20
@@ -265,11 +251,9 @@ SavedTheGame: ; 14be6
 	ld c, $1e
 	call DelayFrames
 	ret
-; 14c10
 
-
-SaveGameData_: ; 14c10
-	ld a, 1
+SaveGameData_:
+	ld a, TRUE
 	ld [wSaveFileExists], a
 	farcall StageRTCTimeForSave
 	farcall BackupMysteryGift
@@ -298,9 +282,8 @@ SaveGameData_: ; 14c10
 .ok
 	call CloseSRAM
 	ret
-; 14c6b
 
-UpdateStackTop: ; 14c6b
+UpdateStackTop:
 ; sStackTop appears to be unused.
 ; It could have been used to debug stack overflow during saving.
 	call FindStackTop
@@ -327,9 +310,8 @@ UpdateStackTop: ; 14c6b
 .done
 	call CloseSRAM
 	ret
-; 14c90
 
-FindStackTop: ; 14c90
+FindStackTop:
 ; Find the furthest point that sp has traversed to.
 ; This is distinct from the current value of sp.
 	ld hl, wStack - $ff
@@ -339,9 +321,8 @@ FindStackTop: ; 14c90
 	ret nz
 	inc hl
 	jr .loop
-; 14c99
 
-SavingDontTurnOffThePower: ; 14c99
+SavingDontTurnOffThePower:
 	; Prevent joypad interrupts
 	xor a
 	ld [hJoypadReleased], a
@@ -364,10 +345,8 @@ SavingDontTurnOffThePower: ; 14c99
 	ld c, $10
 	call DelayFrames
 	ret
-; 14cbb
-
 
-ErasePreviousSave: ; 14cbb
+ErasePreviousSave:
 	call EraseBoxes
 	call EraseHallOfFame
 	call EraseLinkBattleStats
@@ -383,9 +362,8 @@ ErasePreviousSave: ; 14cbb
 	ld a, $1
 	ld [wSavedAtLeastOnce], a
 	ret
-; 14ce2
 
-EraseLinkBattleStats: ; 14ce2
+EraseLinkBattleStats:
 	ld a, BANK(sLinkBattleStats)
 	call GetSRAMBank
 	ld hl, sLinkBattleStats
@@ -393,9 +371,8 @@ EraseLinkBattleStats: ; 14ce2
 	xor a
 	call ByteFill
 	jp CloseSRAM
-; 14cf4
 
-EraseMysteryGift: ; 14cf4
+EraseMysteryGift:
 	ld a, BANK(sBackupMysteryGiftItem)
 	call GetSRAMBank
 	ld hl, sBackupMysteryGiftItem
@@ -403,9 +380,8 @@ EraseMysteryGift: ; 14cf4
 	xor a
 	call ByteFill
 	jp CloseSRAM
-; 14d06
 
-EraseHallOfFame: ; 14d06
+EraseHallOfFame:
 	ld a, BANK(sHallOfFame)
 	call GetSRAMBank
 	ld hl, sHallOfFame
@@ -413,9 +389,8 @@ EraseHallOfFame: ; 14d06
 	xor a
 	call ByteFill
 	jp CloseSRAM
-; 14d18
 
-Unreferenced_Function14d18: ; 14d18
+Unreferenced_Function14d18:
 ; copy .Data to SRA4:a007
 	ld a, 4 ; MBC30 bank used by JP Crystal; inaccessible by MBC3
 	call GetSRAMBank
@@ -424,9 +399,8 @@ Unreferenced_Function14d18: ; 14d18
 	ld bc, .DataEnd - .Data
 	call CopyBytes
 	jp CloseSRAM
-; 14d2c
 
-.Data: ; 14d2c
+.Data:
 	db $0d, $02, $00, $05, $00, $00
 	db $22, $02, $01, $05, $00, $00
 	db $03, $04, $05, $08, $03, $05
@@ -435,23 +409,20 @@ Unreferenced_Function14d18: ; 14d18
 	db $04, $07, $01, $05, $00, $00
 	db $0f, $05, $14, $07, $05, $05
 	db $11, $0c, $0c, $06, $06, $04
-; 14d5c
 .DataEnd
 
-EraseBattleTowerStatus: ; 14d5c
+EraseBattleTowerStatus:
 	ld a, BANK(sBattleTowerChallengeState)
 	call GetSRAMBank
 	xor a
 	ld [sBattleTowerChallengeState], a
 	jp CloseSRAM
-; 14d68
 
-SaveData: ; 14d68
+SaveData:
 	call _SaveData
 	ret
-; 14d6c
 
-Unreferenced_Function14d6c: ; 14d6c
+Unreferenced_Function14d6c:
 	ld a, 4 ; MBC30 bank used by JP Crystal; inaccessible by MBC3
 	call GetSRAMBank
 	ld a, [$a60b] ; address of MBC30 bank
@@ -465,9 +436,8 @@ Unreferenced_Function14d6c: ; 14d6c
 	ld [$a60b], a ; address of MBC30 bank
 	call CloseSRAM
 	ret
-; 14d83
 
-Unreferenced_Function14d83: ; 14d83
+Unreferenced_Function14d83:
 	ld a, 4 ; MBC30 bank used by JP Crystal; inaccessible by MBC3
 	call GetSRAMBank
 	xor a
@@ -475,27 +445,23 @@ Unreferenced_Function14d83: ; 14d83
 	ld [$a60d], a ; address of MBC30 bank
 	call CloseSRAM
 	ret
-; 14d93
 
-Unreferenced_Function14d93: ; 14d93
+Unreferenced_Function14d93:
 	ld a, 7 ; MBC30 bank used by JP Crystal; inaccessible by MBC3
 	call GetSRAMBank
 	xor a
 	ld [$a000], a ; address of MBC30 bank
 	call CloseSRAM
 	ret
-; 14da0
 
-
-HallOfFame_InitSaveIfNeeded: ; 14da0
+HallOfFame_InitSaveIfNeeded:
 	ld a, [wSavedAtLeastOnce]
 	and a
 	ret nz
 	call ErasePreviousSave
 	ret
-; 14da9
 
-ValidateSave: ; 14da9
+ValidateSave:
 	ld a, BANK(sCheckValue1) ; BANK(sCheckValue2)
 	call GetSRAMBank
 	ld a, SAVE_CHECK_VALUE_1
@@ -503,9 +469,8 @@ ValidateSave: ; 14da9
 	ld a, SAVE_CHECK_VALUE_2
 	ld [sCheckValue2], a
 	jp CloseSRAM
-; 14dbb
 
-SaveOptions: ; 14dbb
+SaveOptions:
 	ld a, BANK(sOptions)
 	call GetSRAMBank
 	ld hl, wOptions
@@ -516,9 +481,8 @@ SaveOptions: ; 14dbb
 	and $ff ^ (1 << NO_TEXT_SCROLL)
 	ld [sOptions], a
 	jp CloseSRAM
-; 14dd7
 
-SavePlayerData: ; 14dd7
+SavePlayerData:
 	ld a, BANK(sPlayerData)
 	call GetSRAMBank
 	ld hl, wPlayerData
@@ -530,9 +494,8 @@ SavePlayerData: ; 14dd7
 	ld bc, wCurrMapDataEnd - wCurrMapData
 	call CopyBytes
 	jp CloseSRAM
-; 14df7
 
-SavePokemonData: ; 14df7
+SavePokemonData:
 	ld a, BANK(sPokemonData)
 	call GetSRAMBank
 	ld hl, wPokemonData
@@ -541,15 +504,13 @@ SavePokemonData: ; 14df7
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 14e0c
 
-SaveBox: ; 14e0c
+SaveBox:
 	call GetBoxAddress
 	call SaveBoxAddress
 	ret
-; 14e13
 
-SaveChecksum: ; 14e13
+SaveChecksum:
 	ld hl, sGameData
 	ld bc, sGameDataEnd - sGameData
 	ld a, BANK(sGameData)
@@ -561,9 +522,8 @@ SaveChecksum: ; 14e13
 	ld [sChecksum + 1], a
 	call CloseSRAM
 	ret
-; 14e2d
 
-ValidateBackupSave: ; 14e2d
+ValidateBackupSave:
 	ld a, BANK(sBackupCheckValue1) ; BANK(sBackupCheckValue2)
 	call GetSRAMBank
 	ld a, SAVE_CHECK_VALUE_1
@@ -572,9 +532,8 @@ ValidateBackupSave: ; 14e2d
 	ld [sBackupCheckValue2], a
 	call CloseSRAM
 	ret
-; 14e40
 
-SaveBackupOptions: ; 14e40
+SaveBackupOptions:
 	ld a, BANK(sBackupOptions)
 	call GetSRAMBank
 	ld hl, wOptions
@@ -583,9 +542,8 @@ SaveBackupOptions: ; 14e40
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 14e55
 
-SaveBackupPlayerData: ; 14e55
+SaveBackupPlayerData:
 	ld a, BANK(sBackupPlayerData)
 	call GetSRAMBank
 	ld hl, wPlayerData
@@ -598,9 +556,8 @@ SaveBackupPlayerData: ; 14e55
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 14e76
 
-SaveBackupPokemonData: ; 14e76
+SaveBackupPokemonData:
 	ld a, BANK(sBackupPokemonData)
 	call GetSRAMBank
 	ld hl, wPokemonData
@@ -609,9 +566,8 @@ SaveBackupPokemonData: ; 14e76
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 14e8b
 
-SaveBackupChecksum: ; 14e8b
+SaveBackupChecksum:
 	ld hl, sBackupGameData
 	ld bc, sBackupGameDataEnd - sBackupGameData
 	ld a, BANK(sBackupGameData)
@@ -623,10 +579,8 @@ SaveBackupChecksum: ; 14e8b
 	ld [sBackupChecksum + 1], a
 	call CloseSRAM
 	ret
-; 14ea5
-
 
-TryLoadSaveFile: ; 14ea5 (5:4ea5)
+TryLoadSaveFile:
 	call VerifyChecksum
 	jr nz, .backup
 	call LoadPlayerData
@@ -672,9 +626,8 @@ TryLoadSaveFile: ; 14ea5 (5:4ea5)
 	scf
 	ret
 
-
-TryLoadSaveData: ; 14f1c
-	xor a
+TryLoadSaveData:
+	xor a ; FALSE
 	ld [wSaveFileExists], a
 	call CheckPrimarySaveFile
 	ld a, [wSaveFileExists]
@@ -720,13 +673,10 @@ TryLoadSaveData: ; 14f1c
 	call CopyBytes
 	call PanicResetClock
 	ret
-; 14f7c
-
 
 INCLUDE "data/default_options.asm"
 
-
-CheckPrimarySaveFile: ; 14f84
+CheckPrimarySaveFile:
 	ld a, BANK(sCheckValue1) ; BANK(sCheckValue2)
 	call GetSRAMBank
 	ld a, [sCheckValue1]
@@ -740,15 +690,14 @@ CheckPrimarySaveFile: ; 14f84
 	ld bc, wOptionsEnd - wOptions
 	call CopyBytes
 	call CloseSRAM
-	ld a, $1
+	ld a, TRUE
 	ld [wSaveFileExists], a
 
 .nope
 	call CloseSRAM
 	ret
-; 14faf
 
-CheckBackupSaveFile: ; 14faf
+CheckBackupSaveFile:
 	ld a, BANK(sBackupCheckValue1) ; BANK(sBackupCheckValue2)
 	call GetSRAMBank
 	ld a, [sBackupCheckValue1]
@@ -767,10 +716,8 @@ CheckBackupSaveFile: ; 14faf
 .nope
 	call CloseSRAM
 	ret
-; 14fd7
-
 
-LoadPlayerData: ; 14fd7 (5:4fd7)
+LoadPlayerData:
 	ld a, BANK(sPlayerData)
 	call GetSRAMBank
 	ld hl, sPlayerData
@@ -793,7 +740,7 @@ LoadPlayerData: ; 14fd7 (5:4fd7)
 	call CloseSRAM
 	ret
 
-LoadPokemonData: ; 1500c
+LoadPokemonData:
 	ld a, BANK(sPokemonData)
 	call GetSRAMBank
 	ld hl, sPokemonData
@@ -802,14 +749,13 @@ LoadPokemonData: ; 1500c
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 15021
 
-LoadBox: ; 15021 (5:5021)
+LoadBox:
 	call GetBoxAddress
 	call LoadBoxAddress
 	ret
 
-VerifyChecksum: ; 15028 (5:5028)
+VerifyChecksum:
 	ld hl, sGameData
 	ld bc, sGameDataEnd - sGameData
 	ld a, BANK(sGameData)
@@ -826,7 +772,7 @@ VerifyChecksum: ; 15028 (5:5028)
 	pop af
 	ret
 
-LoadBackupPlayerData: ; 15046 (5:5046)
+LoadBackupPlayerData:
 	ld a, BANK(sBackupPlayerData)
 	call GetSRAMBank
 	ld hl, sBackupPlayerData
@@ -840,7 +786,7 @@ LoadBackupPlayerData: ; 15046 (5:5046)
 	call CloseSRAM
 	ret
 
-LoadBackupPokemonData: ; 15067 (5:5067)
+LoadBackupPokemonData:
 	ld a, BANK(sBackupPokemonData)
 	call GetSRAMBank
 	ld hl, sBackupPokemonData
@@ -850,7 +796,7 @@ LoadBackupPokemonData: ; 15067 (5:5067)
 	call CloseSRAM
 	ret
 
-VerifyBackupChecksum: ; 1507c (5:507c)
+VerifyBackupChecksum:
 	ld hl, sBackupGameData
 	ld bc, sBackupGameDataEnd - sBackupGameData
 	ld a, BANK(sBackupGameData)
@@ -867,8 +813,7 @@ VerifyBackupChecksum: ; 1507c (5:507c)
 	pop af
 	ret
 
-
-_SaveData: ; 1509a
+_SaveData:
 	; This is called within two scenarios:
 	;   a) ErasePreviousSave (the process of erasing the save from a previous game file)
 	;   b) unused mobile functionality
@@ -894,8 +839,7 @@ _SaveData: ; 1509a
 
 	jp CloseSRAM
 
-
-_LoadData: ; 150b9
+_LoadData:
 	ld a, BANK(sCrystalData)
 	call GetSRAMBank
 	ld hl, sCrystalData
@@ -914,8 +858,7 @@ _LoadData: ; 150b9
 
 	jp CloseSRAM
 
-
-GetBoxAddress: ; 150d8
+GetBoxAddress:
 	ld a, [wCurBox]
 	cp NUM_BOXES
 	jr c, .ok
@@ -940,11 +883,10 @@ endr
 	ld l, a
 	pop af
 	ret
-; 150f9
 
-SaveBoxAddress: ; 150f9
-; Save box via wMisc.
-; We do this in three steps because the size of wMisc is less than
+SaveBoxAddress:
+; Save box via wBoxPartialData.
+; We do this in three steps because the size of wBoxPartialData is less than
 ; the size of sBox.
 	push hl
 ; Load the first part of the active box.
@@ -953,8 +895,8 @@ SaveBoxAddress: ; 150f9
 	ld a, BANK(sBox)
 	call GetSRAMBank
 	ld hl, sBox
-	ld de, wMisc
-	ld bc, (wMiscEnd - wMisc)
+	ld de, wBoxPartialData
+	ld bc, (wBoxPartialDataEnd - wBoxPartialData)
 	call CopyBytes
 	call CloseSRAM
 	pop de
@@ -963,23 +905,23 @@ SaveBoxAddress: ; 150f9
 	push af
 	push de
 	call GetSRAMBank
-	ld hl, wMisc
-	ld bc, (wMiscEnd - wMisc)
+	ld hl, wBoxPartialData
+	ld bc, (wBoxPartialDataEnd - wBoxPartialData)
 	call CopyBytes
 	call CloseSRAM
 
 ; Load the second part of the active box.
 	ld a, BANK(sBox)
 	call GetSRAMBank
-	ld hl, sBox + (wMiscEnd - wMisc)
-	ld de, wMisc
-	ld bc, (wMiscEnd - wMisc)
+	ld hl, sBox + (wBoxPartialDataEnd - wBoxPartialData)
+	ld de, wBoxPartialData
+	ld bc, (wBoxPartialDataEnd - wBoxPartialData)
 	call CopyBytes
 	call CloseSRAM
 	pop de
 	pop af
 
-	ld hl, (wMiscEnd - wMisc)
+	ld hl, (wBoxPartialDataEnd - wBoxPartialData)
 	add hl, de
 	ld e, l
 	ld d, h
@@ -987,41 +929,39 @@ SaveBoxAddress: ; 150f9
 	push af
 	push de
 	call GetSRAMBank
-	ld hl, wMisc
-	ld bc, (wMiscEnd - wMisc)
+	ld hl, wBoxPartialData
+	ld bc, (wBoxPartialDataEnd - wBoxPartialData)
 	call CopyBytes
 	call CloseSRAM
 
 ; Load the third and final part of the active box.
 	ld a, BANK(sBox)
 	call GetSRAMBank
-	ld hl, sBox + (wMiscEnd - wMisc) * 2
-	ld de, wMisc
-	ld bc, sBoxEnd - (sBox + (wMiscEnd - wMisc) * 2) ; $8e
+	ld hl, sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2
+	ld de, wBoxPartialData
+	ld bc, sBoxEnd - (sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2) ; $8e
 	call CopyBytes
 	call CloseSRAM
 	pop de
 	pop af
 
-	ld hl, (wMiscEnd - wMisc)
+	ld hl, (wBoxPartialDataEnd - wBoxPartialData)
 	add hl, de
 	ld e, l
 	ld d, h
 ; Save it to the final part of the target box.
 	call GetSRAMBank
-	ld hl, wMisc
-	ld bc, sBoxEnd - (sBox + (wMiscEnd - wMisc) * 2) ; $8e
+	ld hl, wBoxPartialData
+	ld bc, sBoxEnd - (sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2) ; $8e
 	call CopyBytes
 	call CloseSRAM
 
 	pop hl
 	ret
-; 1517d
-
 
-LoadBoxAddress: ; 1517d (5:517d)
-; Load box via wMisc.
-; We do this in three steps because the size of wMisc is less than
+LoadBoxAddress:
+; Load box via wBoxPartialData.
+; We do this in three steps because the size of wBoxPartialData is less than
 ; the size of sBox.
 	push hl
 	ld l, e
@@ -1030,60 +970,59 @@ LoadBoxAddress: ; 1517d (5:517d)
 	push af
 	push hl
 	call GetSRAMBank
-	ld de, wMisc
-	ld bc, (wMiscEnd - wMisc)
+	ld de, wBoxPartialData
+	ld bc, (wBoxPartialDataEnd - wBoxPartialData)
 	call CopyBytes
 	call CloseSRAM
 	ld a, BANK(sBox)
 	call GetSRAMBank
-	ld hl, wMisc
+	ld hl, wBoxPartialData
 	ld de, sBox
-	ld bc, (wMiscEnd - wMisc)
+	ld bc, (wBoxPartialDataEnd - wBoxPartialData)
 	call CopyBytes
 	call CloseSRAM
 	pop hl
 	pop af
 
-	ld de, (wMiscEnd - wMisc)
+	ld de, (wBoxPartialDataEnd - wBoxPartialData)
 	add hl, de
 ; Load part 2
 	push af
 	push hl
 	call GetSRAMBank
-	ld de, wMisc
-	ld bc, (wMiscEnd - wMisc)
+	ld de, wBoxPartialData
+	ld bc, (wBoxPartialDataEnd - wBoxPartialData)
 	call CopyBytes
 	call CloseSRAM
 	ld a, BANK(sBox)
 	call GetSRAMBank
-	ld hl, wMisc
-	ld de, sBox + (wMiscEnd - wMisc)
-	ld bc, (wMiscEnd - wMisc)
+	ld hl, wBoxPartialData
+	ld de, sBox + (wBoxPartialDataEnd - wBoxPartialData)
+	ld bc, (wBoxPartialDataEnd - wBoxPartialData)
 	call CopyBytes
 	call CloseSRAM
 	pop hl
 	pop af
 ; Load part 3
-	ld de, (wMiscEnd - wMisc)
+	ld de, (wBoxPartialDataEnd - wBoxPartialData)
 	add hl, de
 	call GetSRAMBank
-	ld de, wMisc
-	ld bc, sBoxEnd - (sBox + (wMiscEnd - wMisc) * 2) ; $8e
+	ld de, wBoxPartialData
+	ld bc, sBoxEnd - (sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2) ; $8e
 	call CopyBytes
 	call CloseSRAM
 	ld a, BANK(sBox)
 	call GetSRAMBank
-	ld hl, wMisc
-	ld de, sBox + (wMiscEnd - wMisc) * 2
-	ld bc, sBoxEnd - (sBox + (wMiscEnd - wMisc) * 2) ; $8e
+	ld hl, wBoxPartialData
+	ld de, sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2
+	ld bc, sBoxEnd - (sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2) ; $8e
 	call CopyBytes
 	call CloseSRAM
 
 	pop hl
 	ret
 
-
-EraseBoxes: ; 151fb
+EraseBoxes:
 	ld hl, BoxAddresses
 	ld c, NUM_BOXES
 .next
@@ -1123,9 +1062,8 @@ EraseBoxes: ; 151fb
 	dec c
 	jr nz, .next
 	ret
-; 1522d
 
-BoxAddresses: ; 1522d
+BoxAddresses:
 ; dbww bank, address, address
 	dbww BANK(sBox1),  sBox1,  sBox1End
 	dbww BANK(sBox2),  sBox2,  sBox2End
@@ -1141,10 +1079,8 @@ BoxAddresses: ; 1522d
 	dbww BANK(sBox12), sBox12, sBox12End
 	dbww BANK(sBox13), sBox13, sBox13End
 	dbww BANK(sBox14), sBox14, sBox14End
-; 15273
 
-
-Checksum: ; 15273
+Checksum:
 	ld de, 0
 .loop
 	ld a, [hli]
@@ -1158,53 +1094,43 @@ Checksum: ; 15273
 	or c
 	jr nz, .loop
 	ret
-; 15283
-
 
-Text_WouldYouLikeToSaveTheGame: ; 0x15283
+Text_WouldYouLikeToSaveTheGame:
 	; Would you like to save the game?
 	text_jump UnknownText_0x1c454b
 	db "@"
-; 0x15288
 
-Text_SavingDontTurnOffThePower: ; 0x15288
+Text_SavingDontTurnOffThePower:
 	; SAVING… DON'T TURN OFF THE POWER.
 	text_jump UnknownText_0x1c456d
 	db "@"
-; 0x1528d
 
-Text_PlayerSavedTheGame: ; 0x1528d
+Text_PlayerSavedTheGame:
 	; saved the game.
 	text_jump UnknownText_0x1c4590
 	db "@"
-; 0x15292
 
-Text_AlreadyASaveFile: ; 0x15292
+Text_AlreadyASaveFile:
 	; There is already a save file. Is it OK to overwrite?
 	text_jump UnknownText_0x1c45a3
 	db "@"
-; 0x15297
 
-Text_AnotherSaveFile: ; 0x15297
+Text_AnotherSaveFile:
 	; There is another save file. Is it OK to overwrite?
 	text_jump UnknownText_0x1c45d9
 	db "@"
-; 0x1529c
 
-Text_SaveFileCorrupted: ; 0x1529c
+Text_SaveFileCorrupted:
 	; The save file is corrupted!
 	text_jump UnknownText_0x1c460d
 	db "@"
-; 0x152a1
 
-Text_SaveOnBoxSwitch: ; 0x152a1
+Text_SaveOnBoxSwitch:
 	; When you change a #MON BOX, data will be saved. OK?
 	text_jump UnknownText_0x1c462a
 	db "@"
-; 0x152a6
 
-Text_SaveOnMovePkmnWOMail: ; 0x152a6
+Text_SaveOnMoveMonWOMail:
 	; Each time you move a #MON, data will be saved. OK?
 	text_jump UnknownText_0x1c465f
 	db "@"
-; 0x152ab
diff --git a/engine/routines/savemenu_copytilemapatonce.asm b/engine/menus/savemenu_copytilemapatonce.asm
index 9b50494a4..8271603d9 100644
--- a/engine/routines/savemenu_copytilemapatonce.asm
+++ b/engine/menus/savemenu_copytilemapatonce.asm
@@ -1,4 +1,4 @@
-SaveMenu_CopyTilemapAtOnce: ; 4cf45 (13:4f45)
+SaveMenu_CopyTilemapAtOnce:
 	ld a, [hCGB]
 	and a
 	jp z, WaitBGMap
@@ -38,7 +38,7 @@ SaveMenu_CopyTilemapAtOnce: ; 4cf45 (13:4f45)
 	ld [hBGMapMode], a
 	ret
 
-.CopyTilemapAtOnce: ; 4cf80 (13:4f80)
+.CopyTilemapAtOnce:
 	ld [hSPBuffer], sp ; $ffd9
 	ld sp, hl
 	ld a, [hBGMapAddress + 1]
diff --git a/engine/scrolling_menu.asm b/engine/menus/scrolling_menu.asm
index e12d4254d..a313c6646 100755..100644
--- a/engine/scrolling_menu.asm
+++ b/engine/menus/scrolling_menu.asm
@@ -1,4 +1,4 @@
-_InitScrollingMenu:: ; 245af
+_InitScrollingMenu::
 	xor a
 	ld [wMenuJoypad], a
 	ld [hBGMapMode], a
@@ -12,25 +12,22 @@ _InitScrollingMenu:: ; 245af
 	xor a
 	ld [hBGMapMode], a
 	ret
-; 245cb
 
-_ScrollingMenu:: ; 245cb
+_ScrollingMenu::
 .loop
 	call ScrollingMenuJoyAction
 	jp c, .exit
 	call z, .zero
 	jr .loop
-; 245d6
 
-.exit ; 245d6
+.exit
 	call MenuClickSound
 	ld [wMenuJoypad], a
 	ld a, 0
 	ld [hInMenu], a
 	ret
-; 245e1
 
-.zero ; 245e1
+.zero
 	call ScrollingMenu_InitDisplay
 	ld a, 1
 	ld [hBGMapMode], a
@@ -39,9 +36,8 @@ _ScrollingMenu:: ; 245cb
 	xor a
 	ld [hBGMapMode], a
 	ret
-; 245f1
 
-ScrollingMenu_InitDisplay: ; 245f1
+ScrollingMenu_InitDisplay:
 	xor a
 	ld [hBGMapMode], a
 	ld hl, wOptions
@@ -54,9 +50,8 @@ ScrollingMenu_InitDisplay: ; 245f1
 	pop af
 	ld [wOptions], a
 	ret
-; 24609
 
-ScrollingMenuJoyAction: ; 24609
+ScrollingMenuJoyAction:
 .loop
 	call ScrollingMenuJoypad
 	ld a, [hJoyLast]
@@ -82,15 +77,13 @@ ScrollingMenuJoyAction: ; 24609
 	bit D_DOWN_F, a
 	jp nz, .d_down
 	jr .loop
-; 24640
 
 .unreferenced ; unused
 	ld a, -1
 	and a
 	ret
-; 24644
 
-.a_button ; 24644
+.a_button
 	call PlaceHollowCursor
 	ld a, [wMenuCursorY]
 	dec a
@@ -109,16 +102,14 @@ ScrollingMenuJoyAction: ; 24609
 	ld a, A_BUTTON
 	scf
 	ret
-; 2466f
 
-.b_button ; 2466f
+.b_button
 	ld a, B_BUTTON
 	scf
 	ret
-; 24673
 
-.select ; 24673
-	ld a, [wMenuData2Flags]
+.select
+	ld a, [wMenuDataFlags]
 	bit 7, a
 	jp z, xor_a_dec_a
 	ld a, [wMenuCursorY]
@@ -133,42 +124,38 @@ ScrollingMenuJoyAction: ; 24609
 	ld a, SELECT
 	scf
 	ret
-; 24695
 
-.start ; 24695
-	ld a, [wMenuData2Flags]
+.start
+	ld a, [wMenuDataFlags]
 	bit 6, a
 	jp z, xor_a_dec_a
 	ld a, START
 	scf
 	ret
-; 246a1
 
-.d_left ; 246a1
+.d_left
 	ld hl, w2DMenuFlags2
 	bit 7, [hl]
 	jp z, xor_a_dec_a
-	ld a, [wMenuData2Flags]
+	ld a, [wMenuDataFlags]
 	bit 3, a
 	jp z, xor_a_dec_a
 	ld a, D_LEFT
 	scf
 	ret
-; 246b5
 
-.d_right ; 246b5
+.d_right
 	ld hl, w2DMenuFlags2
 	bit 7, [hl]
 	jp z, xor_a_dec_a
-	ld a, [wMenuData2Flags]
+	ld a, [wMenuDataFlags]
 	bit 2, a
 	jp z, xor_a_dec_a
 	ld a, D_RIGHT
 	scf
 	ret
-; 246c9
 
-.d_up ; 246c9
+.d_up
 	ld hl, w2DMenuFlags2
 	bit 7, [hl]
 	jp z, xor_a
@@ -181,14 +168,13 @@ ScrollingMenuJoyAction: ; 24609
 
 .xor_dec_up
 	jp xor_a_dec_a
-; 246df
 
-.d_down ; 246df
+.d_down
 	ld hl, w2DMenuFlags2
 	bit 7, [hl]
 	jp z, xor_a
 	ld hl, wMenuScrollPosition
-	ld a, [wMenuData2_ScrollingMenuHeight]
+	ld a, [wMenuData_ScrollingMenuHeight]
 	add [hl]
 	ld b, a
 	ld a, [wScrollingMenuListSize]
@@ -199,23 +185,21 @@ ScrollingMenuJoyAction: ; 24609
 
 .xor_dec_down
 	jp xor_a_dec_a
-; 246fc
 
-ScrollingMenu_GetCursorPosition: ; 246fc
+ScrollingMenu_GetCursorPosition:
 	ld a, [wMenuScrollPosition]
 	ld c, a
 	ld a, [wMenuCursorY]
 	add c
 	ld c, a
 	ret
-; 24706
 
-ScrollingMenu_ClearLeftColumn: ; 24706 (9:4706)
+ScrollingMenu_ClearLeftColumn:
 	call MenuBoxCoord2Tile
 	ld de, SCREEN_WIDTH
 	add hl, de
 	ld de, 2 * SCREEN_WIDTH
-	ld a, [wMenuData2_ScrollingMenuHeight]
+	ld a, [wMenuData_ScrollingMenuHeight]
 .loop
 	ld [hl], " "
 	add hl, de
@@ -223,15 +207,15 @@ ScrollingMenu_ClearLeftColumn: ; 24706 (9:4706)
 	jr nz, .loop
 	ret
 
-InitScrollingMenuCursor: ; 2471a
-	ld hl, wMenuData2_ItemsPointerAddr
+InitScrollingMenuCursor:
+	ld hl, wMenuData_ItemsPointerAddr
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wMenuData2_ItemsPointerBank]
+	ld a, [wMenuData_ItemsPointerBank]
 	call GetFarByte
 	ld [wScrollingMenuListSize], a
-	ld a, [wMenuData2_ScrollingMenuHeight]
+	ld a, [wMenuData_ScrollingMenuHeight]
 	ld c, a
 	ld a, [wMenuScrollPosition]
 	add c
@@ -240,7 +224,7 @@ InitScrollingMenuCursor: ; 2471a
 	inc a
 	cp c
 	jr nc, .skip
-	ld a, [wMenuData2_ScrollingMenuHeight]
+	ld a, [wMenuData_ScrollingMenuHeight]
 	ld c, a
 	ld a, [wScrollingMenuListSize]
 	inc a
@@ -271,10 +255,9 @@ InitScrollingMenuCursor: ; 2471a
 
 .asm_24763
 	ret
-; 24764
 
-ScrollingMenu_InitFlags: ; 24764
-	ld a, [wMenuData2Flags]
+ScrollingMenu_InitFlags:
+	ld a, [wMenuDataFlags]
 	ld c, a
 	ld a, [wScrollingMenuListSize]
 	ld b, a
@@ -284,7 +267,7 @@ ScrollingMenu_InitFlags: ; 24764
 	ld a, [wMenuBorderLeftCoord]
 	add 0
 	ld [w2DMenuCursorInitX], a
-	ld a, [wMenuData2_ScrollingMenuHeight]
+	ld a, [wMenuData_ScrollingMenuHeight]
 	cp b
 	jr c, .no_extra_row
 	jr z, .no_extra_row
@@ -343,9 +326,8 @@ ScrollingMenu_InitFlags: ; 24764
 	ld [wCursorCurrentTile + 1], a
 	ld [wCursorOffCharacter], a
 	ret
-; 247dd
 
-ScrollingMenu_ValidateSwitchItem: ; 247dd
+ScrollingMenu_ValidateSwitchItem:
 	ld a, [wScrollingMenuListSize]
 	ld c, a
 	ld a, [wSwitchItem]
@@ -359,11 +341,10 @@ ScrollingMenu_ValidateSwitchItem: ; 247dd
 
 .done
 	ret
-; 247f0
 
-ScrollingMenu_UpdateDisplay: ; 247f0
+ScrollingMenu_UpdateDisplay:
 	call ClearWholeMenuBox
-	ld a, [wMenuData2Flags]
+	ld a, [wMenuDataFlags]
 	bit 4, a ; place arrows
 	jr z, .okay
 	ld a, [wMenuScrollPosition]
@@ -380,7 +361,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0
 	call MenuBoxCoord2Tile
 	ld bc, SCREEN_WIDTH + 1
 	add hl, bc
-	ld a, [wMenuData2_ScrollingMenuHeight]
+	ld a, [wMenuData_ScrollingMenuHeight]
 	ld b, a
 	ld c, $0
 .loop
@@ -403,7 +384,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0
 	ld a, c
 	cp b
 	jr nz, .loop
-	ld a, [wMenuData2Flags]
+	ld a, [wMenuDataFlags]
 	bit 4, a ; place arrows
 	jr z, .done
 	ld a, [wMenuBorderBottomCoord]
@@ -417,7 +398,7 @@ ScrollingMenu_UpdateDisplay: ; 247f0
 	ret
 
 .cancel
-	ld a, [wMenuData2Flags]
+	ld a, [wMenuDataFlags]
 	bit 0, a ; call function on cancel
 	jr nz, .call_function
 	ld de, .string_2485f
@@ -430,18 +411,17 @@ ScrollingMenu_UpdateDisplay: ; 247f0
 .call_function
 	ld d, h
 	ld e, l
-	ld hl, wMenuData2_ScrollingMenuFunction1
+	ld hl, wMenuData_ScrollingMenuFunction1
 	jp CallPointerAt
-; 2486e
 
-ScrollingMenu_CallFunctions1and2: ; 2486e
+ScrollingMenu_CallFunctions1and2:
 	push hl
 	ld d, h
 	ld e, l
-	ld hl, wMenuData2_ScrollingMenuFunction1
+	ld hl, wMenuData_ScrollingMenuFunction1
 	call CallPointerAt
 	pop hl
-	ld a, [wMenuData2_ScrollingMenuWidth]
+	ld a, [wMenuData_ScrollingMenuWidth]
 	and a
 	jr z, .done
 	ld e, a
@@ -449,14 +429,13 @@ ScrollingMenu_CallFunctions1and2: ; 2486e
 	add hl, de
 	ld d, h
 	ld e, l
-	ld hl, wMenuData2_ScrollingMenuFunction2
+	ld hl, wMenuData_ScrollingMenuFunction2
 	call CallPointerAt
 
 .done
 	ret
-; 2488b
 
-ScrollingMenu_PlaceCursor: ; 2488b
+ScrollingMenu_PlaceCursor:
 	ld a, [wSwitchItem]
 	and a
 	jr z, .done
@@ -465,7 +444,7 @@ ScrollingMenu_PlaceCursor: ; 2488b
 	cp b
 	jr nc, .done
 	ld c, a
-	ld a, [wMenuData2_ScrollingMenuHeight]
+	ld a, [wMenuData_ScrollingMenuHeight]
 	add c
 	cp b
 	jr c, .done
@@ -486,10 +465,9 @@ ScrollingMenu_PlaceCursor: ; 2488b
 
 .done
 	ret
-; 248b8
 
-ScrollingMenu_CheckCallFunction3: ; 248b8
-	ld a, [wMenuData2Flags]
+ScrollingMenu_CheckCallFunction3:
+	ld a, [wMenuDataFlags]
 	bit 5, a ; call function 3
 	ret z
 	bit 1, a ; call function 3 if not switching items
@@ -502,12 +480,11 @@ ScrollingMenu_CheckCallFunction3: ; 248b8
 	ld a, [wMenuCursorY]
 	dec a
 	call ScrollingMenu_GetListItemCoordAndFunctionArgs
-	ld hl, wMenuData2_ScrollingMenuFunction3
+	ld hl, wMenuData_ScrollingMenuFunction3
 	call CallPointerAt
 	ret
-; 248d5
 
-ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5
+ScrollingMenu_GetListItemCoordAndFunctionArgs:
 	push de
 	push hl
 	ld e, a
@@ -515,12 +492,12 @@ ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5
 	add e
 	ld e, a
 	ld d, $0
-	ld hl, wMenuData2_ItemsPointerAddr
+	ld hl, wMenuData_ItemsPointerAddr
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	inc hl ; items
-	ld a, [wMenuData2_ScrollingMenuSpacing]
+	ld a, [wMenuData_ScrollingMenuSpacing]
 	cp 1
 	jr z, .got_spacing
 	cp 2
@@ -529,15 +506,14 @@ ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5
 	add hl, de
 .got_spacing
 	add hl, de
-	ld a, [wMenuData2_ItemsPointerBank]
+	ld a, [wMenuData_ItemsPointerBank]
 	call GetFarByte
 	ld [wMenuSelection], a
 	ld [wCurItem], a
 	inc hl
-	ld a, [wMenuData2_ItemsPointerBank]
+	ld a, [wMenuData_ItemsPointerBank]
 	call GetFarByte
 	ld [wMenuSelectionQuantity], a
 	pop hl
 	pop de
 	ret
-; 2490c
diff --git a/engine/start_menu.asm b/engine/menus/start_menu.asm
index f0cacc5b1..108a4edf6 100755..100644
--- a/engine/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -1,5 +1,16 @@
-StartMenu:: ; 125cd
-
+; StartMenu.Items indexes
+	const_def
+	const STARTMENUITEM_POKEDEX  ; 0
+	const STARTMENUITEM_POKEMON  ; 1
+	const STARTMENUITEM_PACK     ; 2
+	const STARTMENUITEM_STATUS   ; 3
+	const STARTMENUITEM_SAVE     ; 4
+	const STARTMENUITEM_OPTION   ; 5
+	const STARTMENUITEM_EXIT     ; 6
+	const STARTMENUITEM_POKEGEAR ; 7
+	const STARTMENUITEM_QUIT     ; 8
+
+StartMenu::
 	call ClearWindowData
 
 	ld de, SFX_MENU
@@ -8,13 +19,13 @@ StartMenu:: ; 125cd
 	farcall ReanchorBGMap_NoOAMUpdate
 
 	ld hl, wStatusFlags2
-	bit 2, [hl] ; bug catching contest
-	ld hl, .MenuDataHeader
+	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
+	ld hl, .MenuHeader
 	jr z, .GotMenuData
-	ld hl, .ContestMenuDataHeader
-.GotMenuData:
+	ld hl, .ContestMenuHeader
 
-	call LoadMenuDataHeader
+.GotMenuData:
+	call LoadMenuHeader
 	call .SetUpMenuItems
 	ld a, [wBattleMenuCursorBuffer]
 	ld [wMenuCursorBuffer], a
@@ -105,23 +116,20 @@ StartMenu:: ; 125cd
 .b
 	scf
 	ret
-; 12691
 
-.ExitMenuRunScript: ; 12691
+.ExitMenuRunScript:
 	call ExitMenu
 	ld a, HMENURETURN_SCRIPT
 	ld [hMenuReturn], a
 	ret
-; 12699
 
-.ExitMenuRunScriptCloseText: ; 12699
+.ExitMenuRunScriptCloseText:
 	call ExitMenu
 	ld a, HMENURETURN_SCRIPT
 	ld [hMenuReturn], a
 	jr .ReturnEnd2
-; 126a2
 
-.ExitMenuCallFuncCloseText: ; 126a2
+.ExitMenuCallFuncCloseText:
 	call ExitMenu
 	ld hl, wQueuedScriptAddr
 	ld a, [hli]
@@ -130,14 +138,12 @@ StartMenu:: ; 125cd
 	ld a, [wQueuedScriptBank]
 	rst FarCall
 	jr .ReturnEnd2
-; 126b1
 
-.ReturnRedraw: ; 126b1
+.ReturnRedraw:
 	call .Clear
 	jp .Reopen
-; 126b7
 
-.Clear: ; 126b7
+.Clear:
 	call ClearBGPalettes
 	call Call_ExitMenu
 	call ReloadTilesetAndPalettes
@@ -148,16 +154,14 @@ StartMenu:: ; 125cd
 	call ret_d90
 	call FinishExitMenu
 	ret
-; 126d3
-
 
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData
 	db 1 ; default selection
 
-.ContestMenuDataHeader:
+.ContestMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 2, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData
@@ -171,6 +175,7 @@ StartMenu:: ; 125cd
 	dw .Items
 
 .Items:
+; entries correspond to STARTMENUITEM_* constants
 	dw StartMenu_Pokedex,  .PokedexString,  .PokedexDesc
 	dw StartMenu_Pokemon,  .PartyString,    .PartyDesc
 	dw StartMenu_Pack,     .PackString,     .PackDesc
@@ -181,54 +186,61 @@ StartMenu:: ; 125cd
 	dw StartMenu_Pokegear, .PokegearString, .PokegearDesc
 	dw StartMenu_Quit,     .QuitString,     .QuitDesc
 
-.PokedexString: 	db "#DEX@"
-.PartyString:   	db "#MON@"
-.PackString:    	db "PACK@"
-.StatusString:  	db "<PLAYER>@"
-.SaveString:    	db "SAVE@"
-.OptionString:  	db "OPTION@"
-.ExitString:    	db "EXIT@"
-.PokegearString:	db "<POKE>GEAR@"
-.QuitString:    	db "QUIT@"
-
-.PokedexDesc:  db   "#MON"
+.PokedexString:  db "#DEX@"
+.PartyString:    db "#MON@"
+.PackString:     db "PACK@"
+.StatusString:   db "<PLAYER>@"
+.SaveString:     db "SAVE@"
+.OptionString:   db "OPTION@"
+.ExitString:     db "EXIT@"
+.PokegearString: db "<POKE>GEAR@"
+.QuitString:     db "QUIT@"
+
+.PokedexDesc:
+	db   "#MON"
 	next "database@"
 
-.PartyDesc:    db   "Party <PKMN>"
+.PartyDesc:
+	db   "Party <PKMN>"
 	next "status@"
 
-.PackDesc:     db   "Contains"
+.PackDesc:
+	db   "Contains"
 	next "items@"
 
-.PokegearDesc: db   "Trainer's"
+.PokegearDesc:
+	db   "Trainer's"
 	next "key device@"
 
-.StatusDesc:   db   "Your own"
+.StatusDesc:
+	db   "Your own"
 	next "status@"
 
-.SaveDesc:     db   "Save your"
+.SaveDesc:
+	db   "Save your"
 	next "progress@"
 
-.OptionDesc:   db   "Change"
+.OptionDesc:
+	db   "Change"
 	next "settings@"
 
-.ExitDesc:     db   "Close this"
+.ExitDesc:
+	db   "Close this"
 	next "menu@"
 
-.QuitDesc:     db   "Quit and"
+.QuitDesc:
+	db   "Quit and"
 	next "be judged.@"
 
-
-.OpenMenu: ; 127e5
+.OpenMenu:
 	ld a, [wMenuSelection]
 	call .GetMenuAccountTextPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 127ef
 
-.MenuString: ; 127ef
+.MenuString:
 	push de
 	ld a, [wMenuSelection]
 	call .GetMenuAccountTextPointer
@@ -240,9 +252,8 @@ StartMenu:: ; 125cd
 	pop hl
 	call PlaceString
 	ret
-; 12800
 
-.MenuDesc: ; 12800
+.MenuDesc:
 	push de
 	ld a, [wMenuSelection]
 	cp $ff
@@ -260,13 +271,11 @@ endr
 .none
 	pop de
 	ret
-; 12819
-
 
-.GetMenuAccountTextPointer: ; 12819
+.GetMenuAccountTextPointer:
 	ld e, a
 	ld d, 0
-	ld hl, wMenuData2PointerTableAddr
+	ld hl, wMenuDataPointerTableAddr
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -274,25 +283,23 @@ rept 6
 	add hl, de
 endr
 	ret
-; 12829
-
 
-.SetUpMenuItems: ; 12829
+.SetUpMenuItems:
 	xor a
 	ld [wWhichIndexSet], a
 	call .FillMenuList
 
 	ld hl, wStatusFlags
-	bit 0, [hl]
+	bit STATUSFLAGS_POKEDEX_F, [hl]
 	jr z, .no_pokedex
-	ld a, 0 ; pokedex
+	ld a, STARTMENUITEM_POKEDEX
 	call .AppendMenuList
 .no_pokedex
 
 	ld a, [wPartyCount]
 	and a
 	jr z, .no_pokemon
-	ld a, 1 ; pokemon
+	ld a, STARTMENUITEM_POKEMON
 	call .AppendMenuList
 .no_pokemon
 
@@ -300,45 +307,43 @@ endr
 	and a
 	jr nz, .no_pack
 	ld hl, wStatusFlags2
-	bit 2, [hl] ; bug catching contest
+	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
 	jr nz, .no_pack
-	ld a, 2 ; pack
+	ld a, STARTMENUITEM_PACK
 	call .AppendMenuList
 .no_pack
 
 	ld hl, wPokegearFlags
-	bit 7, [hl]
+	bit POKEGEAR_OBTAINED_F, [hl]
 	jr z, .no_pokegear
-	ld a, 7 ; pokegear
+	ld a, STARTMENUITEM_POKEGEAR
 	call .AppendMenuList
 .no_pokegear
 
-	ld a, 3 ; status
+	ld a, STARTMENUITEM_STATUS
 	call .AppendMenuList
 
 	ld a, [wLinkMode]
 	and a
 	jr nz, .no_save
 	ld hl, wStatusFlags2
-	bit 2, [hl] ; bug catching contest
-	ld a, 8 ; quit
+	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
+	ld a, STARTMENUITEM_QUIT
 	jr nz, .write
-	ld a, 4 ; save
+	ld a, STARTMENUITEM_SAVE
 .write
 	call .AppendMenuList
 .no_save
 
-	ld a, 5 ; option
+	ld a, STARTMENUITEM_OPTION
 	call .AppendMenuList
-	ld a, 6 ; exit
+	ld a, STARTMENUITEM_EXIT
 	call .AppendMenuList
 	ld a, c
 	ld [wMenuItemsList], a
 	ret
-; 1288d
 
-
-.FillMenuList: ; 1288d
+.FillMenuList:
 	xor a
 	ld hl, wMenuItemsList
 	ld [hli], a
@@ -348,28 +353,24 @@ endr
 	ld de, wMenuItemsList + 1
 	ld c, 0
 	ret
-; 128a0
 
-.AppendMenuList: ; 128a0
+.AppendMenuList:
 	ld [de], a
 	inc de
 	inc c
 	ret
-; 128a4
 
-.DrawMenuAccount_: ; 128a4
+.DrawMenuAccount_:
 	jp .DrawMenuAccount
-; 128a7
 
-.PrintMenuAccount: ; 128a7
+.PrintMenuAccount:
 	call .IsMenuAccountOn
 	ret z
 	call .DrawMenuAccount
 	decoord 0, 14
 	jp .MenuDesc
-; 128b4
 
-.DrawMenuAccount: ; 128b4
+.DrawMenuAccount:
 	call .IsMenuAccountOn
 	ret z
 	hlcoord 0, 13
@@ -379,42 +380,35 @@ endr
 	ld b, 3
 	ld c, 8
 	jp TextBoxPalette
-; 128cb
 
-.IsMenuAccountOn: ; 128cb
+.IsMenuAccountOn:
 	ld a, [wOptions2]
-	and 1
+	and 1 << MENU_ACCOUNT
 	ret
-; 128d1
 
-.DrawBugContestStatusBox: ; 128d1
+.DrawBugContestStatusBox:
 	ld hl, wStatusFlags2
-	bit 2, [hl] ; bug catching contest
+	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
 	ret z
 	farcall StartMenu_DrawBugContestStatusBox
 	ret
-; 128de
 
-.DrawBugContestStatus: ; 128de
+.DrawBugContestStatus:
 	ld hl, wStatusFlags2
-	bit 2, [hl] ; bug catching contest
+	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
 	jr nz, .contest
 	ret
 .contest
 	farcall StartMenu_PrintBugContestStatus
 	ret
-; 128ed
-
 
-StartMenu_Exit: ; 128ed
+StartMenu_Exit:
 ; Exit the menu.
 
 	ld a, 1
 	ret
-; 128f0
-
 
-StartMenu_Quit: ; 128f0
+StartMenu_Quit:
 ; Retire from the bug catching contest.
 
 	ld hl, .EndTheContestText
@@ -433,10 +427,8 @@ StartMenu_Quit: ; 128f0
 .EndTheContestText:
 	text_jump UnknownText_0x1c1a6c
 	db "@"
-; 1290b
 
-
-StartMenu_Save: ; 1290b
+StartMenu_Save:
 ; Save the game.
 
 	call BufferScreen
@@ -447,20 +439,16 @@ StartMenu_Save: ; 1290b
 .asm_12919
 	ld a, 1
 	ret
-; 1291c
-
 
-StartMenu_Option: ; 1291c
+StartMenu_Option:
 ; Game options.
 
 	call FadeToMenu
 	farcall OptionsMenu
 	ld a, 6
 	ret
-; 12928
-
 
-StartMenu_Status: ; 12928
+StartMenu_Status:
 ; Player status.
 
 	call FadeToMenu
@@ -468,11 +456,8 @@ StartMenu_Status: ; 12928
 	call CloseSubmenu
 	ld a, 0
 	ret
-; 12937
-
-
-StartMenu_Pokedex: ; 12937
 
+StartMenu_Pokedex:
 	ld a, [wPartyCount]
 	and a
 	jr z, .asm_12949
@@ -484,21 +469,15 @@ StartMenu_Pokedex: ; 12937
 .asm_12949
 	ld a, 0
 	ret
-; 1294c
-
-
-StartMenu_Pokegear: ; 1294c
 
+StartMenu_Pokegear:
 	call FadeToMenu
 	farcall PokeGear
 	call CloseSubmenu
 	ld a, 0
 	ret
-; 1295b
-
-
-StartMenu_Pack: ; 1295b
 
+StartMenu_Pack:
 	call FadeToMenu
 	farcall Pack
 	ld a, [wPackUsedItem]
@@ -512,11 +491,8 @@ StartMenu_Pack: ; 1295b
 	call ExitAllMenus
 	ld a, 4
 	ret
-; 12976
-
-
-StartMenu_Pokemon: ; 12976
 
+StartMenu_Pokemon:
 	ld a, [wPartyCount]
 	and a
 	jr z, .return
@@ -563,9 +539,8 @@ StartMenu_Pokemon: ; 12976
 	call ExitAllMenus
 	pop af
 	ret
-; 129d5
 
-HasNoItems: ; 129d5
+HasNoItems:
 	ld a, [wNumItems]
 	and a
 	ret nz
@@ -589,7 +564,7 @@ HasNoItems: ; 129d5
 	and a
 	ret
 
-TossItemFromPC: ; 129f4
+TossItemFromPC:
 	push de
 	call PartyMonItemName
 	farcall _CheckTossableItem
@@ -652,38 +627,30 @@ TossItemFromPC: ; 129f4
 	; That's too impor- tant to toss out!
 	text_jump UnknownText_0x1c1adf
 	db "@"
-; 0x12a60
 
-CantUseItem: ; 12a60
+CantUseItem:
 	ld hl, CantUseItemText
 	call MenuTextBoxWaitButton
 	ret
-; 12a67
 
-CantUseItemText: ; 12a67
+CantUseItemText:
 	text_jump UnknownText_0x1c1b03
 	db "@"
-; 12a6c
-
 
-PartyMonItemName: ; 12a6c
+PartyMonItemName:
 	ld a, [wCurItem]
 	ld [wd265], a
 	call GetItemName
 	call CopyName1
 	ret
-; 12a79
-
 
-CancelPokemonAction: ; 12a79
+CancelPokemonAction:
 	farcall InitPartyMenuWithCancel
 	farcall UnfreezeMonIcons
 	ld a, 1
 	ret
-; 12a88
 
-
-PokemonActionSubmenu: ; 12a88
+PokemonActionSubmenu:
 	hlcoord 1, 15
 	lb bc, 2, 18
 	call ClearBox
@@ -706,31 +673,28 @@ PokemonActionSubmenu: ; 12a88
 	ret
 
 .Actions:
-	dbw MONMENU_CUT,        MonMenu_Cut ; Cut
-	dbw MONMENU_FLY,        MonMenu_Fly ; Fly
-	dbw MONMENU_SURF,       MonMenu_Surf ; Surf
-	dbw MONMENU_STRENGTH,   MonMenu_Strength ; Strength
-	dbw MONMENU_FLASH,      MonMenu_Flash ; Flash
-	dbw MONMENU_WHIRLPOOL,  MonMenu_Whirlpool ; Whirlpool
-	dbw MONMENU_DIG,        MonMenu_Dig ; Dig
-	dbw MONMENU_TELEPORT,   MonMenu_Teleport ; Teleport
-	dbw MONMENU_SOFTBOILED, MonMenu_Softboiled_MilkDrink ; Softboiled
-	dbw MONMENU_MILKDRINK,  MonMenu_Softboiled_MilkDrink ; MilkDrink
-	dbw MONMENU_HEADBUTT,   MonMenu_Headbutt ; Headbutt
-	dbw MONMENU_WATERFALL,  MonMenu_Waterfall ; Waterfall
-	dbw MONMENU_ROCKSMASH,  MonMenu_RockSmash ; RockSmash
-	dbw MONMENU_SWEETSCENT, MonMenu_SweetScent ; SweetScent
-	dbw MONMENU_STATS,      OpenPartyStats
-	dbw MONMENU_SWITCH,     SwitchPartyMons
-	dbw MONMENU_ITEM,       GiveTakePartyMonItem
-	dbw MONMENU_CANCEL,     CancelPokemonAction
-	dbw MONMENU_MOVE,       ManagePokemonMoves ; move
-	dbw MONMENU_MAIL,       MonMailAction ; mail
-; 12aec
-
-
-SwitchPartyMons: ; 12aec
-
+	dbw MONMENUITEM_CUT,        MonMenu_Cut
+	dbw MONMENUITEM_FLY,        MonMenu_Fly
+	dbw MONMENUITEM_SURF,       MonMenu_Surf
+	dbw MONMENUITEM_STRENGTH,   MonMenu_Strength
+	dbw MONMENUITEM_FLASH,      MonMenu_Flash
+	dbw MONMENUITEM_WHIRLPOOL,  MonMenu_Whirlpool
+	dbw MONMENUITEM_DIG,        MonMenu_Dig
+	dbw MONMENUITEM_TELEPORT,   MonMenu_Teleport
+	dbw MONMENUITEM_SOFTBOILED, MonMenu_Softboiled_MilkDrink
+	dbw MONMENUITEM_MILKDRINK,  MonMenu_Softboiled_MilkDrink
+	dbw MONMENUITEM_HEADBUTT,   MonMenu_Headbutt
+	dbw MONMENUITEM_WATERFALL,  MonMenu_Waterfall
+	dbw MONMENUITEM_ROCKSMASH,  MonMenu_RockSmash
+	dbw MONMENUITEM_SWEETSCENT, MonMenu_SweetScent
+	dbw MONMENUITEM_STATS,      OpenPartyStats
+	dbw MONMENUITEM_SWITCH,     SwitchPartyMons
+	dbw MONMENUITEM_ITEM,       GiveTakePartyMonItem
+	dbw MONMENUITEM_CANCEL,     CancelPokemonAction
+	dbw MONMENUITEM_MOVE,       ManagePokemonMoves
+	dbw MONMENUITEM_MAIL,       MonMailAction
+
+SwitchPartyMons:
 ; Don't try if there's nothing to switch!
 	ld a, [wPartyCount]
 	cp 2
@@ -749,7 +713,7 @@ SwitchPartyMons: ; 12aec
 	farcall PrintPartyMenuText
 
 	hlcoord 0, 1
-	ld bc, 20 * 2
+	ld bc, SCREEN_WIDTH * 2
 	ld a, [wSwitchMon]
 	dec a
 	call AddNTimes
@@ -779,18 +743,15 @@ SwitchPartyMons: ; 12aec
 	ld [wPartyMenuActionText], a
 	call CancelPokemonAction
 	ret
-; 12b60
-
-
-GiveTakePartyMonItem: ; 12b60
 
+GiveTakePartyMonItem:
 ; Eggs can't hold items!
 	ld a, [wCurPartySpecies]
 	cp EGG
 	jr z, .cancel
 
 	ld hl, GiveTakeItemMenuData
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 	call VerticalMenu
 	call ExitMenu
 	jr c, .cancel
@@ -804,7 +765,7 @@ GiveTakePartyMonItem: ; 12b60
 	cp 1
 	jr nz, .take
 
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call ClearPalettes
 	call .GiveItem
 	call ClearPalettes
@@ -821,11 +782,8 @@ GiveTakePartyMonItem: ; 12b60
 .cancel
 	ld a, 3
 	ret
-; 12ba9
-
 
 .GiveItem:
-
 	farcall DepositSellInitPackBuffers
 
 .loop
@@ -854,11 +812,8 @@ GiveTakePartyMonItem: ; 12b60
 
 .quit
 	ret
-; 12bd9
-
-
-TryGiveItemToPartymon: ; 12bd9
 
+TryGiveItemToPartymon:
 	call SpeechTextBox
 	call PartyMonItemName
 	call GetPartyItemLocation
@@ -919,11 +874,8 @@ TryGiveItemToPartymon: ; 12bd9
 
 .abort
 	ret
-; 12c4c
-
-
-GivePartyItem: ; 12c4c
 
+GivePartyItem:
 	call GetPartyItemLocation
 	ld a, [wCurItem]
 	ld [hl], a
@@ -934,11 +886,8 @@ GivePartyItem: ; 12c4c
 
 .done
 	ret
-; 12c60
-
-
-TakePartyItem: ; 12c60
 
+TakePartyItem:
 	call SpeechTextBox
 	call GetPartyItemLocation
 	ld a, [hl]
@@ -970,10 +919,8 @@ TakePartyItem: ; 12c60
 
 .asm_12c9a
 	ret
-; 12c9b
-
 
-GiveTakeItemMenuData: ; 12c9b
+GiveTakeItemMenuData:
 	db MENU_SPRITE_ANIMS | MENU_BACKUP_TILES ; flags
 	menu_coords 12, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .Items
@@ -984,81 +931,64 @@ GiveTakeItemMenuData: ; 12c9b
 	db 2 ; # items
 	db "GIVE@"
 	db "TAKE@"
-; 12caf
 
-
-TookAndMadeHoldText: ; 12caf
+TookAndMadeHoldText:
 	text_jump UnknownText_0x1c1b2c
 	db "@"
-; 12cb4
 
-MadeHoldText: ; 12cb4
+MadeHoldText:
 	text_jump UnknownText_0x1c1b57
 	db "@"
-; 12cb9
 
-PleaseRemoveMailText: ; 12cb9
+PleaseRemoveMailText:
 	text_jump UnknownText_0x1c1b6f
 	db "@"
-; 12cbe
 
-IsntHoldingAnythingText: ; 12cbe
+IsntHoldingAnythingText:
 	text_jump UnknownText_0x1c1b8e
 	db "@"
-; 12cc3
 
-ItemStorageIsFullText: ; 12cc3
+ItemStorageIsFullText:
 	text_jump UnknownText_0x1c1baa
 	db "@"
-; 12cc8
 
-TookFromText: ; 12cc8
+TookFromText:
 	text_jump UnknownText_0x1c1bc4
 	db "@"
-; 12ccd
 
-SwitchAlreadyHoldingText: ; 12ccd
+SwitchAlreadyHoldingText:
 	text_jump UnknownText_0x1c1bdc
 	db "@"
-; 12cd2
 
-CantBeHeldText: ; 12cd2
+CantBeHeldText:
 	text_jump UnknownText_0x1c1c09
 	db "@"
-; 12cd7
-
 
-GetPartyItemLocation: ; 12cd7
+GetPartyItemLocation:
 	push af
 	ld a, MON_ITEM
 	call GetPartyParamLocation
 	pop af
 	ret
-; 12cdf
-
 
-ReceiveItemFromPokemon: ; 12cdf
-	ld a, $1
+ReceiveItemFromPokemon:
+	ld a, 1
 	ld [wItemQuantityChangeBuffer], a
 	ld hl, wNumItems
 	jp ReceiveItem
-; 12cea
 
-
-GiveItemToPokemon: ; 12cea (4:6cea)
-	ld a, $1
+GiveItemToPokemon:
+	ld a, 1
 	ld [wItemQuantityChangeBuffer], a
 	ld hl, wNumItems
 	jp TossItem
 
-StartMenuYesNo: ; 12cf5
+StartMenuYesNo:
 	call MenuTextBox
 	call YesNoBox
 	jp ExitMenu
-; 12cfe
-
 
-ComposeMailMessage: ; 12cfe (4:6cfe)
+ComposeMailMessage:
 	ld de, wTempMailMessage
 	farcall _ComposeMailMessage
 	ld hl, wPlayerName
@@ -1087,7 +1017,7 @@ ComposeMailMessage: ; 12cfe (4:6cfe)
 	call CloseSRAM
 	ret
 
-MonMailAction: ; 12d45
+MonMailAction:
 ; If in the time capsule or trade center,
 ; selecting the mail only allows you to
 ; read the mail.
@@ -1098,8 +1028,8 @@ MonMailAction: ; 12d45
 	jr z, .read
 
 ; Show the READ/TAKE/QUIT menu.
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	call VerticalMenu
 	call ExitMenu
 
@@ -1158,64 +1088,52 @@ MonMailAction: ; 12d45
 .done
 	ld a, $3
 	ret
-; 12dc9
-
 
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 12, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x12dd1
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "READ@"
 	db "TAKE@"
 	db "QUIT@"
-; 0x12de2
-
 
 .mailwilllosemessagetext
 ; The MAIL will lose its message. OK?
 	text_jump UnknownText_0x1c1c22
 	db "@"
-; 0x12de7
 
 .tookmailfrommontext
 ; MAIL detached from <POKEMON>.
 	text_jump UnknownText_0x1c1c47
 	db "@"
-; 0x12dec
 
 .bagfulltext
 ; There's no space for removing MAIL.
 	text_jump UnknownText_0x1c1c62
 	db "@"
-; 0x12df1
 
 .sendmailtopctext
 ; Send the removed MAIL to your PC?
 	text_jump UnknownText_0x1c1c86
 	db "@"
-; 0x12df6
 
 .mailboxfulltext
 ; Your PC's MAILBOX is full.
 	text_jump UnknownText_0x1c1ca9
 	db "@"
-; 0x12dfb
 
 .sentmailtopctext
 ; The MAIL was sent to your PC.
 	text_jump UnknownText_0x1c1cc4
 	db "@"
-; 0x12e00
 
-
-OpenPartyStats: ; 12e00
-	call LoadStandardMenuDataHeader
+OpenPartyStats:
+	call LoadStandardMenuHeader
 	call ClearSprites
 ; PartyMon
 	xor a
@@ -1226,10 +1144,8 @@ OpenPartyStats: ; 12e00
 	call Call_ExitMenu
 	ld a, 0
 	ret
-; 12e1b
-
 
-MonMenu_Cut: ; 12e1b
+MonMenu_Cut:
 	farcall CutFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1241,10 +1157,8 @@ MonMenu_Cut: ; 12e1b
 .Fail:
 	ld a, $3
 	ret
-; 12e30
-
 
-MonMenu_Fly: ; 12e30
+MonMenu_Fly:
 	farcall FlyFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $2
@@ -1267,9 +1181,8 @@ MonMenu_Fly: ; 12e30
 .Unreferenced:
 	ld a, $1
 	ret
-; 12e55
 
-MonMenu_Flash: ; 12e55
+MonMenu_Flash:
 	farcall OWFlash
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1281,9 +1194,8 @@ MonMenu_Flash: ; 12e55
 .Fail:
 	ld a, $3
 	ret
-; 12e6a
 
-MonMenu_Strength: ; 12e6a
+MonMenu_Strength:
 	farcall StrengthFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1295,9 +1207,8 @@ MonMenu_Strength: ; 12e6a
 .Fail:
 	ld a, $3
 	ret
-; 12e7f
 
-MonMenu_Whirlpool: ; 12e7f
+MonMenu_Whirlpool:
 	farcall WhirlpoolFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1309,9 +1220,8 @@ MonMenu_Whirlpool: ; 12e7f
 .Fail:
 	ld a, $3
 	ret
-; 12e94
 
-MonMenu_Waterfall: ; 12e94
+MonMenu_Waterfall:
 	farcall WaterfallFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1323,9 +1233,8 @@ MonMenu_Waterfall: ; 12e94
 .Fail:
 	ld a, $3
 	ret
-; 12ea9
 
-MonMenu_Teleport: ; 12ea9
+MonMenu_Teleport:
 	farcall TeleportFunction
 	ld a, [wFieldMoveSucceeded]
 	and a
@@ -1337,9 +1246,8 @@ MonMenu_Teleport: ; 12ea9
 .Fail:
 	ld a, $3
 	ret
-; 12ebd
 
-MonMenu_Surf: ; 12ebd
+MonMenu_Surf:
 	farcall SurfFunction
 	ld a, [wFieldMoveSucceeded]
 	and a
@@ -1351,9 +1259,8 @@ MonMenu_Surf: ; 12ebd
 .Fail:
 	ld a, $3
 	ret
-; 12ed1
 
-MonMenu_Dig: ; 12ed1
+MonMenu_Dig:
 	farcall DigFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1365,9 +1272,8 @@ MonMenu_Dig: ; 12ed1
 .Fail:
 	ld a, $3
 	ret
-; 12ee6
 
-MonMenu_Softboiled_MilkDrink: ; 12ee6
+MonMenu_Softboiled_MilkDrink:
 	call .CheckMonHasEnoughHP
 	jr nc, .NotEnoughHP
 	farcall Softboiled_MilkDrinkFunction
@@ -1382,13 +1288,11 @@ MonMenu_Softboiled_MilkDrink: ; 12ee6
 	ld [wPartyMenuActionText], a
 	ld a, $3
 	ret
-; 12f00
 
 .Text_NotEnoughHP:
 	; Not enough HP!
 	text_jump UnknownText_0x1c1ce3
 	db "@"
-; 0x12f05
 
 .CheckMonHasEnoughHP:
 ; Need to have at least (MaxHP / 5) HP left.
@@ -1410,9 +1314,8 @@ MonMenu_Softboiled_MilkDrink: ; 12ee6
 	ld a, [hQuotient + 1]
 	sbc [hl]
 	ret
-; 12f26
 
-MonMenu_Headbutt: ; 12f26
+MonMenu_Headbutt:
 	farcall HeadbuttFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1424,9 +1327,8 @@ MonMenu_Headbutt: ; 12f26
 .Fail:
 	ld a, $3
 	ret
-; 12f3b
 
-MonMenu_RockSmash: ; 12f3b
+MonMenu_RockSmash:
 	farcall RockSmashFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1438,16 +1340,14 @@ MonMenu_RockSmash: ; 12f3b
 .Fail:
 	ld a, $3
 	ret
-; 12f50
 
-MonMenu_SweetScent: ; 12f50
+MonMenu_SweetScent:
 	farcall SweetScentFromMenu
 	ld b, $4
 	ld a, $2
 	ret
-; 12f5b
 
-ChooseMoveToDelete: ; 12f5b
+ChooseMoveToDelete:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -1461,7 +1361,6 @@ ChooseMoveToDelete: ; 12f5b
 	call ClearBGPalettes
 	pop af
 	ret
-; 12f73
 
 .ChooseMoveToDelete
 	call SetUpMoveScreenBG
@@ -1483,7 +1382,6 @@ ChooseMoveToDelete: ; 12f5b
 	call PrepareToPlaceMoveData
 	call PlaceMoveData
 	jp .loop
-; 12f9c
 
 .a_button
 	and a
@@ -1502,17 +1400,15 @@ ChooseMoveToDelete: ; 12f5b
 	call ClearTileMap
 	pop af
 	ret
-; 12fb2
 
-DeleteMoveScreenAttrs: ; 12fb2
+DeleteMoveScreenAttrs:
 	db 3, 1
 	db 3, 1
 	db $40, $00
 	dn 2, 0
 	db D_UP | D_DOWN | A_BUTTON | B_BUTTON
-; 12fba
 
-ManagePokemonMoves: ; 12fba
+ManagePokemonMoves:
 	ld a, [wCurPartySpecies]
 	cp EGG
 	jr z, .egg
@@ -1528,9 +1424,8 @@ ManagePokemonMoves: ; 12fba
 .egg
 	ld a, $0
 	ret
-; 12fd5
 
-MoveScreenLoop: ; 12fd5
+MoveScreenLoop:
 	ld a, [wCurPartyMon]
 	inc a
 	ld [wPartyMenuCursor], a
@@ -1572,7 +1467,7 @@ MoveScreenLoop: ; 12fd5
 	lb bc, 5, SCREEN_WIDTH - 2
 	call ClearBox
 	hlcoord 1, 12
-	ld de, String_1316b
+	ld de, String_MoveWhere
 	call PlaceString
 	jp .joy_loop
 .b_button
@@ -1590,7 +1485,6 @@ MoveScreenLoop: ; 12fd5
 	lb bc, 8, SCREEN_WIDTH - 2
 	call ClearBox
 	jp .loop
-; 1305b
 
 .d_right
 	ld a, [wMoveSwapBuffer]
@@ -1655,7 +1549,6 @@ MoveScreenLoop: ; 12fd5
 	and a
 	jr z, .cycle_right
 	jr .cycle_left_loop
-; 130c6
 
 .a_button
 	call PlayClickSFX
@@ -1706,7 +1599,6 @@ MoveScreenLoop: ; 12fd5
 	lb bc, 1, 9
 	call ClearBox
 	jp .loop
-; 1313a
 
 .copy_move
 	push hl
@@ -1729,7 +1621,6 @@ MoveScreenLoop: ; 12fd5
 	ld a, b
 	ld [de], a
 	ret
-; 13154
 
 .exit
 	xor a
@@ -1738,21 +1629,18 @@ MoveScreenLoop: ; 12fd5
 	res 6, [hl]
 	call ClearSprites
 	jp ClearTileMap
-; 13163
 
-MoveScreenAttributes: ; 13163
+MoveScreenAttributes:
 	db 3, 1
 	db 3, 1
 	db $40, $00
 	dn 2, 0
 	db D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON
-; 1316b
 
-String_1316b: ; 1316b
+String_MoveWhere:
 	db "Where?@"
-; 13172
 
-SetUpMoveScreenBG: ; 13172
+SetUpMoveScreenBG:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -1788,7 +1676,7 @@ SetUpMoveScreenBG: ; 13172
 	hlcoord 5, 1
 	call PlaceString
 	push bc
-	farcall CopyPkmnToTempMon
+	farcall CopyMonToTempMon
 	pop hl
 	call PrintLevel
 	ld hl, wPlayerHPPal
@@ -1798,14 +1686,13 @@ SetUpMoveScreenBG: ; 13172
 	hlcoord 16, 0
 	lb bc, 1, 3
 	jp ClearBox
-; 131ef
 
-SetUpMoveList: ; 131ef
+SetUpMoveList:
 	xor a
 	ld [hBGMapMode], a
 	ld [wMoveSwapBuffer], a
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	ld hl, wTempMonMoves
 	ld de, wListMoves_MoveIndicesBuffer
 	ld bc, NUM_MOVES
@@ -1825,9 +1712,8 @@ SetUpMoveList: ; 131ef
 	ld b, 5
 	ld c, 18
 	jp TextBox
-; 13235
 
-PrepareToPlaceMoveData: ; 13235
+PrepareToPlaceMoveData:
 	ld hl, wPartyMon1Moves
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wCurPartyMon]
@@ -1842,19 +1728,18 @@ PrepareToPlaceMoveData: ; 13235
 	hlcoord 1, 12
 	lb bc, 5, 18
 	jp ClearBox
-; 13256
 
-PlaceMoveData: ; 13256
+PlaceMoveData:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 10
-	ld de, String_132ba
+	ld de, String_MoveType_Top
 	call PlaceString
 	hlcoord 0, 11
-	ld de, String_132c2
+	ld de, String_MoveType_Bottom
 	call PlaceString
 	hlcoord 12, 12
-	ld de, String_132ca
+	ld de, String_MoveAtk
 	call PlaceString
 	ld a, [wCurMove]
 	ld b, a
@@ -1877,7 +1762,7 @@ PlaceMoveData: ; 13256
 	jr .description
 
 .no_power
-	ld de, String_132cf
+	ld de, String_MoveNoPower
 	call PlaceString
 
 .description
@@ -1886,28 +1771,22 @@ PlaceMoveData: ; 13256
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; 132ba
 
-String_132ba: ; 132ba
+String_MoveType_Top:
 	db "┌─────┐@"
-; 132c2
-String_132c2: ; 132c2
+String_MoveType_Bottom:
 	db "│TYPE/└@"
-; 132ca
-String_132ca: ; 132ca
+String_MoveAtk:
 	db "ATK/@"
-; 132cf
-String_132cf: ; 132cf
+String_MoveNoPower:
 	db "---@"
-; 132d3
 
-Function132d3: ; 132d3
+Function132d3:
 	call Function132da
 	call Function132fe
 	ret
-; 132da
 
-Function132da: ; 132da
+Function132da:
 	ld a, [wCurPartyMon]
 	and a
 	ret z
@@ -1935,9 +1814,8 @@ Function132da: ; 132da
 	hlcoord 16, 0
 	ld [hl], "◀"
 	ret
-; 132fe
 
-Function132fe: ; 132fe
+Function132fe:
 	ld a, [wCurPartyMon]
 	inc a
 	ld c, a
@@ -1967,4 +1845,3 @@ Function132fe: ; 132fe
 	hlcoord 18, 0
 	ld [hl], "▶"
 	ret
-; 13327
diff --git a/engine/trainer_card.asm b/engine/menus/trainer_card.asm
index cd6705e5c..f48636f67 100755..100644
--- a/engine/trainer_card.asm
+++ b/engine/menus/trainer_card.asm
@@ -8,7 +8,7 @@
 	const TRAINERCARDSTATE_PAGE3_JOYPAD  ; 5
 	const TRAINERCARDSTATE_QUIT          ; 6
 
-TrainerCard: ; 25105
+TrainerCard:
 	ld a, [wVramState]
 	push af
 	xor a
@@ -38,7 +38,7 @@ TrainerCard: ; 25105
 	ld [wVramState], a
 	ret
 
-.InitRAM: ; 2513b (9:513b)
+.InitRAM:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -78,10 +78,10 @@ TrainerCard: ; 25105
 	ld [hl], a  ; wTrainerCardBadgeAttributes
 	ret
 
-.RunJumptable: ; 2518e (9:518e)
+.RunJumptable:
 	jumptable .Jumptable, wJumptableIndex
 
-.Jumptable: ; 2519d (9:519d)
+.Jumptable:
 ; entries correspond to TRAINERCARDSTATE_* constants
 	dw TrainerCard_Page1_LoadGFX
 	dw TrainerCard_Page1_Joypad
@@ -91,17 +91,17 @@ TrainerCard: ; 25105
 	dw TrainerCard_Page3_Joypad
 	dw TrainerCard_Quit
 
-TrainerCard_IncrementJumptable: ; 251ab (9:51ab)
+TrainerCard_IncrementJumptable:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 
-TrainerCard_Quit: ; 251b0 (9:51b0)
+TrainerCard_Quit:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
 
-TrainerCard_Page1_LoadGFX: ; 251b6 (9:51b6)
+TrainerCard_Page1_LoadGFX:
 	call ClearSprites
 	hlcoord 0, 8
 	ld d, 6
@@ -115,7 +115,7 @@ TrainerCard_Page1_LoadGFX: ; 251b6 (9:51b6)
 	call TrainerCard_IncrementJumptable
 	ret
 
-TrainerCard_Page1_Joypad: ; 251d7 (9:51d7)
+TrainerCard_Page1_Joypad:
 	call TrainerCard_Page1_PrintGameTime
 	ld hl, hJoyLast
 	ld a, [hl]
@@ -136,9 +136,7 @@ TrainerCard_Page1_Joypad: ; 251d7 (9:51d7)
 	ld [wJumptableIndex], a
 	ret
 
-; 251f4
-
-TrainerCard_Page2_LoadGFX: ; 251f4 (9:51f4)
+TrainerCard_Page2_LoadGFX:
 	call ClearSprites
 	hlcoord 0, 8
 	ld d, 6
@@ -156,7 +154,7 @@ TrainerCard_Page2_LoadGFX: ; 251f4 (9:51f4)
 	call TrainerCard_IncrementJumptable
 	ret
 
-TrainerCard_Page2_Joypad: ; 25221 (9:5221)
+TrainerCard_Page2_Joypad:
 	ld hl, TrainerCard_JohtoBadgesOAM
 	call TrainerCard_Page2_3_AnimateBadges
 	ld hl, hJoyLast
@@ -186,7 +184,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221)
 	ld [wJumptableIndex], a
 	ret
 
-TrainerCard_Page3_LoadGFX: ; 2524c (9:524c)
+TrainerCard_Page3_LoadGFX:
 	call ClearSprites
 	hlcoord 0, 8
 	ld d, 6
@@ -204,7 +202,7 @@ TrainerCard_Page3_LoadGFX: ; 2524c (9:524c)
 	call TrainerCard_IncrementJumptable
 	ret
 
-TrainerCard_Page3_Joypad: ; 25279 (9:5279)
+TrainerCard_Page3_Joypad:
 	ld hl, TrainerCard_JohtoBadgesOAM
 	call TrainerCard_Page2_3_AnimateBadges
 	ld hl, hJoyLast
@@ -226,7 +224,7 @@ TrainerCard_Page3_Joypad: ; 25279 (9:5279)
 	ld [wJumptableIndex], a
 	ret
 
-TrainerCard_PrintTopHalfOfCard: ; 25299 (9:5299)
+TrainerCard_PrintTopHalfOfCard:
 	hlcoord 0, 0
 	ld d, 5
 	call TrainerCard_InitBorder
@@ -257,21 +255,18 @@ TrainerCard_PrintTopHalfOfCard: ; 25299 (9:5299)
 	predef PlaceGraphic
 	ret
 
-; 252ec (9:52ec)
-
-.Name_Money: ; 252ec
+.Name_Money:
 	db   "NAME/"
 	next ""
 	next "MONEY@"
 
-.ID_No: ; 252f9
+.ID_No:
 	db $27, $28, -1 ; ID NO
 
-.HorizontalDivider: ; 252fc
+.HorizontalDivider:
 	db $25, $25, $25, $25, $25, $25, $25, $25, $25, $25, $25, $25, $26, -1 ; ____________>
-; 2530a
 
-TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a)
+TrainerCard_Page1_PrintDexCaught_GameTime:
 	hlcoord 2, 10
 	ld de, .Dex_PlayTime
 	call PlaceString
@@ -290,7 +285,7 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a)
 	ld de, .StatusTilemap
 	call TrainerCardSetup_PlaceTilemapString
 	ld a, [wStatusFlags]
-	bit 0, a ; ENGINE_POKEDEX
+	bit STATUSFLAGS_POKEDEX_F, a
 	ret nz
 	hlcoord 1, 9
 	lb bc, 2, 17
@@ -304,11 +299,10 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a)
 .Badges:
 	db "  BADGES▶@"
 
-.StatusTilemap: ; 25366
+.StatusTilemap:
 	db $29, $2a, $2b, $2c, $2d, -1
-; 2536c
 
-TrainerCard_Page2_3_InitObjectsAndStrings: ; 2536c (9:536c)
+TrainerCard_Page2_3_InitObjectsAndStrings:
 	hlcoord 2, 8
 	ld de, .BadgesTilemap
 	call TrainerCardSetup_PlaceTilemapString
@@ -338,13 +332,10 @@ endr
 	call TrainerCard_Page2_3_OAMUpdate
 	ret
 
-; 253a2 (9:53a2)
-
-.BadgesTilemap: ; 253a2
+.BadgesTilemap:
 	db $79, $7a, $7b, $7c, $7d, -1 ; "BADGES"
-; 253a8
 
-TrainerCardSetup_PlaceTilemapString: ; 253a8 (9:53a8)
+TrainerCardSetup_PlaceTilemapString:
 .loop
 	ld a, [de]
 	cp -1
@@ -353,7 +344,7 @@ TrainerCardSetup_PlaceTilemapString: ; 253a8 (9:53a8)
 	inc de
 	jr .loop
 
-TrainerCard_InitBorder: ; 253b0 (9:53b0)
+TrainerCard_InitBorder:
 	ld e, SCREEN_WIDTH
 .loop1
 	ld a, $23
@@ -411,7 +402,7 @@ TrainerCard_InitBorder: ; 253b0 (9:53b0)
 	jr nz, .loop6
 	ret
 
-TrainerCard_Page2_3_PlaceLeadersFaces: ; 253f4 (9:53f4)
+TrainerCard_Page2_3_PlaceLeadersFaces:
 	push de
 	push hl
 	ld [hli], a
@@ -442,7 +433,7 @@ TrainerCard_Page2_3_PlaceLeadersFaces: ; 253f4 (9:53f4)
 	pop de
 	ret
 
-TrainerCard_Page1_PrintGameTime: ; 25415 (9:5415)
+TrainerCard_Page1_PrintGameTime:
 	hlcoord 11, 12
 	ld de, wGameTimeHours
 	lb bc, 2, 4
@@ -460,7 +451,7 @@ TrainerCard_Page1_PrintGameTime: ; 25415 (9:5415)
 	ld [hl], a
 	ret
 
-TrainerCard_Page2_3_AnimateBadges: ; 25438 (9:5438)
+TrainerCard_Page2_3_AnimateBadges:
 	ld a, [hVBlankCounter]
 	and %111
 	ret nz
@@ -470,7 +461,7 @@ TrainerCard_Page2_3_AnimateBadges: ; 25438 (9:5438)
 	ld [wTrainerCardBadgeFrameCounter], a
 	jr TrainerCard_Page2_3_OAMUpdate
 
-TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448)
+TrainerCard_Page2_3_OAMUpdate:
 ; copy flag array pointer
 	ld a, [hli]
 	ld e, a
@@ -510,7 +501,7 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448)
 	jr nz, .loop
 	ret
 
-.PrepOAM: ; 2547b (9:547b)
+.PrepOAM:
 	ld a, [wTrainerCardBadgeTileID]
 	and 1 << 7
 	jr nz, .xflip
@@ -546,23 +537,21 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448)
 	inc de
 	jr .loop2
 
-; 254a7 (9:54a7)
-
-.facing1 ; 254a7
+.facing1
 	dsprite  0,  0,  0,  0, $00, 0
 	dsprite  0,  0,  1,  0, $01, 0
 	dsprite  1,  0,  0,  0, $02, 0
 	dsprite  1,  0,  1,  0, $03, 0
 	db -1
 
-.facing2 ; 254b8
+.facing2
 	dsprite  0,  0,  0,  0, $01, 0 | X_FLIP
 	dsprite  0,  0,  1,  0, $00, 0 | X_FLIP
 	dsprite  1,  0,  0,  0, $03, 0 | X_FLIP
 	dsprite  1,  0,  1,  0, $02, 0 | X_FLIP
 	db -1
 
-TrainerCard_JohtoBadgesOAM: ; 254c9
+TrainerCard_JohtoBadgesOAM:
 ; Template OAM data for each badge on the trainer card.
 ; Format:
 	; y, x, palette
@@ -611,7 +600,6 @@ TrainerCard_JohtoBadgesOAM: ; 254c9
 	db $80, $78, 0
 	db $1c,            $20, $24, $20 | (1 << 7)
 	db $1c | (1 << 7), $20, $24, $20 | (1 << 7)
-; 25523
 
 CardStatusGFX: INCBIN "gfx/trainer_card/card_status.2bpp"
 
diff --git a/engine/credits.asm b/engine/movie/credits.asm
index 1aaecf64a..97828ab58 100644
--- a/engine/credits.asm
+++ b/engine/movie/credits.asm
@@ -3,7 +3,7 @@ INCLUDE "constants.asm"
 
 SECTION "Credits", ROMX
 
-Credits:: ; 109847
+Credits::
 	bit 6, b ; Hall Of Fame
 	ld a, $0
 	jr z, .okay
@@ -104,18 +104,16 @@ Credits:: ; 109847
 	pop af
 	ld [rSVBK], a
 	ret
-; 1098fd
 
-Credits_HandleAButton: ; 1098fd
+Credits_HandleAButton:
 	ld a, [hJoypadDown]
 	and A_BUTTON
 	ret z
 	ld a, [wJumptableIndex]
 	bit 7, a
 	ret
-; 109908
 
-Credits_HandleBButton: ; 109908
+Credits_HandleBButton:
 	ld a, [hJoypadDown]
 	and B_BUTTON
 	ret z
@@ -136,9 +134,8 @@ Credits_HandleBButton: ; 109908
 	ret z
 	dec [hl]
 	ret
-; 109926
 
-Credits_Jumptable: ; 109926
+Credits_Jumptable:
 	ld a, [wJumptableIndex]
 	and $f
 	ld e, a
@@ -150,9 +147,8 @@ Credits_Jumptable: ; 109926
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 109937
 
-.Jumptable: ; 109937 (42:5937)
+.Jumptable:
 	dw ParseCredits
 	dw Credits_Next
 	dw Credits_Next
@@ -167,24 +163,24 @@ Credits_Jumptable: ; 109926
 	dw Credits_RequestGFX
 	dw Credits_LoopBack
 
-Credits_Next: ; 109951 (42:5951)
+Credits_Next:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 
-Credits_LoopBack: ; 109956 (42:5956)
+Credits_LoopBack:
 	ld hl, wJumptableIndex
 	ld a, [hl]
 	and $f0
 	ld [hl], a
 	ret
 
-Credits_PrepBGMapUpdate: ; 10995e (42:595e)
+Credits_PrepBGMapUpdate:
 	xor a
 	ld [hBGMapMode], a
 	jp Credits_Next
 
-Credits_UpdateGFXRequestPath: ; 109964 (42:5964)
+Credits_UpdateGFXRequestPath:
 	call Credits_LoadBorderGFX
 	ld a, l
 	ld [wRequested2bppSource], a
@@ -196,14 +192,14 @@ Credits_UpdateGFXRequestPath: ; 109964 (42:5964)
 	ld [wRequested2bppDest + 1], a
 	jr Credits_RequestGFX
 
-Credits_RequestGFX: ; 10997b (42:597b)
+Credits_RequestGFX:
 	xor a
 	ld [hBGMapMode], a
 	ld a, $8
 	ld [wRequested2bpp], a
 	jp Credits_Next
 
-Credits_LYOverride: ; 109986 (42:5986)
+Credits_LYOverride:
 	ld a, [rLY]
 	cp $30
 	jr c, Credits_LYOverride
@@ -217,17 +213,15 @@ Credits_LYOverride: ; 109986 (42:5986)
 	call .Fill
 	jp Credits_Next
 
-.Fill: ; 1099a3 (42:59a3)
+.Fill:
 	ld c, $8
 .loop
 	ld [hli], a
 	dec c
 	jr nz, .loop
 	ret
-; 1099aa
 
-
-ParseCredits: ; 1099aa
+ParseCredits:
 	ld hl, wJumptableIndex
 	bit 7, [hl]
 	jp nz, .done
@@ -397,10 +391,8 @@ ParseCredits: ; 1099aa
 	pop de
 	pop hl
 	ret
-; 109a95
-
 
-ConstructCreditsTilemap: ; 109a95 (42:5a95)
+ConstructCreditsTilemap:
 	xor a
 	ld [hBGMapMode], a
 	ld a, $c
@@ -453,7 +445,7 @@ ConstructCreditsTilemap: ; 109a95 (42:5a95)
 	call WaitBGMap2
 	ret
 
-.InitTopPortion: ; 109aff (42:5aff)
+.InitTopPortion:
 	ld b, 5
 .outer_loop
 	push hl
@@ -478,7 +470,7 @@ endr
 	jr nz, .outer_loop
 	ret
 
-DrawCreditsBorder: ; 109b1d (42:5b1d)
+DrawCreditsBorder:
 	ld c, SCREEN_WIDTH / 4
 .loop
 	push af
@@ -492,7 +484,7 @@ endr
 	jr nz, .loop
 	ret
 
-GetCreditsPalette: ; 109b2c
+GetCreditsPalette:
 	call .GetPalAddress
 
 	push hl
@@ -541,9 +533,8 @@ GetCreditsPalette: ; 109b2c
 
 CreditsPalettes:
 INCLUDE "gfx/credits/credits.pal"
-; 109bca
 
-Credits_LoadBorderGFX: ; 109bca (42:5bca)
+Credits_LoadBorderGFX:
 	ld hl, wCreditsBorderFrame
 	ld a, [hl]
 	cp $ff
@@ -572,9 +563,8 @@ Credits_LoadBorderGFX: ; 109bca (42:5bca)
 .init
 	ld hl, wCreditsFaux2bpp
 	ret
-; 109bf1 (42:5bf1)
 
-.Frames: ; 109bf1
+.Frames:
 	dw CreditsPichuGFX
 	dw CreditsPichuGFX     + 16 tiles
 	dw CreditsPichuGFX     + 32 tiles
@@ -591,14 +581,13 @@ Credits_LoadBorderGFX: ; 109bca (42:5bca)
 	dw CreditsIgglybuffGFX + 16 tiles
 	dw CreditsIgglybuffGFX + 32 tiles
 	dw CreditsIgglybuffGFX + 48 tiles
-; 109c11
 
-Credits_TheEnd: ; 109c11 (42:5c11)
+Credits_TheEnd:
 	ld a, $40
 	hlcoord 6, 9
 	call .Load
 	hlcoord 6, 10
-.Load: ; 109c1c (42:5c1c)
+.Load:
 	ld c, 8
 .loop
 	ld [hli], a
@@ -606,12 +595,10 @@ Credits_TheEnd: ; 109c11 (42:5c11)
 	dec c
 	jr nz, .loop
 	ret
-; 109c24 (42:5c24)
-
 
 CreditsBorderGFX:    INCBIN "gfx/credits/border.2bpp"
 
-CreditsMonsGFX:
+CreditsMonsGFX: ; used only for BANK(CreditsMonsGFX)
 CreditsPichuGFX:     INCBIN "gfx/credits/pichu.2bpp"
 CreditsSmoochumGFX:  INCBIN "gfx/credits/smoochum.2bpp"
 CreditsDittoGFX:     INCBIN "gfx/credits/ditto.2bpp"
diff --git a/engine/crystal_intro.asm b/engine/movie/crystal_intro.asm
index d6c467867..467c1671a 100755..100644
--- a/engine/crystal_intro.asm
+++ b/engine/movie/crystal_intro.asm
@@ -1,4 +1,4 @@
-Copyright_GFPresents: ; e4579
+Copyright_GFPresents:
 	ld de, MUSIC_NONE
 	call PlayMusic
 	call ClearBGPalettes
@@ -47,9 +47,8 @@ Copyright_GFPresents: ; e4579
 	call .StopGamefreakAnim
 	and a
 	ret
-; e45e8
 
-.GetGFLogoGFX: ; e45e8
+.GetGFLogoGFX:
 	ld de, GameFreakLogo
 	ld hl, vTiles2
 	lb bc, BANK(GameFreakLogo), 28
@@ -104,18 +103,16 @@ Copyright_GFPresents: ; e4579
 	lb de, %11100100, %11100100
 	call DmgToCgbObjPals
 	ret
-; e465e
 
-.StopGamefreakAnim: ; e465e
+.StopGamefreakAnim:
 	farcall ClearSpriteAnims
 	call ClearTileMap
 	call ClearSprites
 	ld c, 16
 	call DelayFrames
 	ret
-; e4670
 
-PlaceGameFreakPresents: ; e4670
+PlaceGameFreakPresents:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -126,26 +123,22 @@ PlaceGameFreakPresents: ; e4670
 	ld h, [hl]
 	ld l, a
 	jp hl
-; e467f
 
-.dw ; e467f
+.dw
 	dw PlaceGameFreakPresents_0
 	dw PlaceGameFreakPresents_1
 	dw PlaceGameFreakPresents_2
 	dw PlaceGameFreakPresents_3
-; e4687
 
-PlaceGameFreakPresents_AdvanceIndex: ; e4687
+PlaceGameFreakPresents_AdvanceIndex:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
-; e468c
 
-PlaceGameFreakPresents_0: ; e468c
+PlaceGameFreakPresents_0:
 	ret
-; e468d
 
-PlaceGameFreakPresents_1: ; e468d
+PlaceGameFreakPresents_1:
 	ld hl, wIntroSceneTimer
 	ld a, [hl]
 	cp $20
@@ -163,16 +156,14 @@ PlaceGameFreakPresents_1: ; e468d
 	ld de, SFX_GAME_FREAK_PRESENTS
 	call PlaySFX
 	ret
-; e46af
 
 .GAME_FREAK:
 	;  G  A  M  E   _  F  R  E  A  K
 	db 0, 1, 2, 3, 13, 4, 5, 3, 1, 6
 .end
 	db "@"
-; e46ba
 
-PlaceGameFreakPresents_2: ; e46ba
+PlaceGameFreakPresents_2:
 	ld hl, wIntroSceneTimer
 	ld a, [hl]
 	cp $40
@@ -188,15 +179,13 @@ PlaceGameFreakPresents_2: ; e46ba
 	call CopyBytes
 	call PlaceGameFreakPresents_AdvanceIndex
 	ret
-; e46d6
 
 .presents
 	db 7, 8, 9, 10, 11, 12
 .end
 	db "@"
-; e46dd
 
-PlaceGameFreakPresents_3: ; e46dd
+PlaceGameFreakPresents_3:
 	ld hl, wIntroSceneTimer
 	ld a, [hl]
 	cp $80
@@ -208,10 +197,8 @@ PlaceGameFreakPresents_3: ; e46dd
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
-; e46ed
 
-
-GameFreakLogoJumper: ; e46ed (39:46ed)
+GameFreakLogoJumper:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld e, [hl]
@@ -224,20 +211,20 @@ GameFreakLogoJumper: ; e46ed (39:46ed)
 	ld l, a
 	jp hl
 
-GameFreakLogoScenes: ; e46fd (39:46fd)
+GameFreakLogoScenes:
 	dw GameFreakLogoScene1
 	dw GameFreakLogoScene2
 	dw GameFreakLogoScene3
 	dw GameFreakLogoScene4
 	dw GameFreakLogoScene5
 
-GameFreakLogoScene1: ; e4707 (39:4707)
+GameFreakLogoScene1:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ret
 
-GameFreakLogoScene2: ; e470d (39:470d)
+GameFreakLogoScene2:
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -283,7 +270,7 @@ GameFreakLogoScene2: ; e470d (39:470d)
 	call PlaySFX
 	ret
 
-GameFreakLogoScene3: ; e4759 (39:4759)
+GameFreakLogoScene3:
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
@@ -303,7 +290,7 @@ GameFreakLogoScene3: ; e4759 (39:4759)
 	call PlaySFX
 	ret
 
-GameFreakLogoScene4: ; e4776 (39:4776)
+GameFreakLogoScene4:
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
@@ -336,20 +323,17 @@ GameFreakLogoScene4: ; e4776 (39:4776)
 	add hl, bc
 	inc [hl]
 	call PlaceGameFreakPresents_AdvanceIndex
-GameFreakLogoScene5: ; e47ab (39:47ab)
+GameFreakLogoScene5:
 	ret
-; e47ac (39:47ac)
 
-GameFreakLogoPalettes: ; e47ac
+GameFreakLogoPalettes:
 INCLUDE "gfx/intro/gamefreak_logo.pal"
-; e47cc
 
-GameFreakLogo: ; e47cc
+GameFreakLogo:
 INCBIN "gfx/splash/logo1.1bpp"
 INCBIN "gfx/splash/logo2.1bpp"
-; e48ac
 
-CrystalIntro: ; e48ac
+CrystalIntro:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wGBCPalettes)
@@ -359,7 +343,7 @@ CrystalIntro: ; e48ac
 	ld a, [hVBlank]
 	push af
 	call .InitRAMAddrs
-.loop ; e48bc
+.loop
 	call JoyTextDelay
 	ld a, [hJoyLast]
 	and BUTTONS
@@ -394,9 +378,8 @@ CrystalIntro: ; e48ac
 	pop af
 	ld [rSVBK], a
 	ret
-; e4901
 
-.InitRAMAddrs: ; e4901
+.InitRAMAddrs:
 	xor a
 	ld [hVBlank], a
 	ld a, $1
@@ -405,9 +388,8 @@ CrystalIntro: ; e48ac
 	ld [hMapAnims], a
 	ld [wJumptableIndex], a
 	ret
-; e490f
 
-IntroSceneJumper: ; e490f
+IntroSceneJumper:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -418,9 +400,8 @@ IntroSceneJumper: ; e490f
 	ld h, [hl]
 	ld l, a
 	jp hl
-; e491e
 
-IntroScenes: ; e491e (39:491e)
+IntroScenes:
 	dw IntroScene1
 	dw IntroScene2
 	dw IntroScene3
@@ -450,12 +431,12 @@ IntroScenes: ; e491e (39:491e)
 	dw IntroScene27
 	dw IntroScene28
 
-NextIntroScene: ; e4956 (39:4956)
+NextIntroScene:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 
-IntroScene1: ; e495b (39:495b)
+IntroScene1:
 ; Setup the next scene.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -482,11 +463,11 @@ IntroScene1: ; e495b (39:495b)
 	push af
 	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
-	ld hl, Palette_365ad
+	ld hl, IntroPalette2
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, Palette_365ad
+	ld hl, IntroPalette2
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -507,7 +488,7 @@ IntroScene1: ; e495b (39:495b)
 	call NextIntroScene
 	ret
 
-IntroScene2: ; e49d6 (39:49d6)
+IntroScene2:
 ; First Unown (A) fades in, pulses, then fades out.
 	ld hl, wIntroSceneFrameCounter
 	ld a, [hl]
@@ -531,7 +512,7 @@ IntroScene2: ; e49d6 (39:49d6)
 	call NextIntroScene
 	ret
 
-IntroScene3: ; e49fd (39:49fd)
+IntroScene3:
 ; More setup. Transition to the outdoor scene.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -555,11 +536,11 @@ IntroScene3: ; e49fd (39:49fd)
 	push af
 	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
-	ld hl, Palette_e5edd
+	ld hl, IntroPalette1
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, Palette_e5edd
+	ld hl, IntroPalette1
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -579,7 +560,7 @@ IntroScene3: ; e49fd (39:49fd)
 	call NextIntroScene
 	ret
 
-IntroScene4: ; e4a69 (39:4a69)
+IntroScene4:
 ; Scroll the outdoor panorama for a bit.
 	call Intro_PerspectiveScrollBG
 	ld hl, wIntroSceneFrameCounter
@@ -593,7 +574,7 @@ IntroScene4: ; e4a69 (39:4a69)
 	call NextIntroScene
 	ret
 
-IntroScene5: ; e4a7a (39:4a7a)
+IntroScene5:
 ; Go back to the Unown.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -621,11 +602,11 @@ IntroScene5: ; e4a7a (39:4a7a)
 	push af
 	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
-	ld hl, Palette_365ad
+	ld hl, IntroPalette2
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, Palette_365ad
+	ld hl, IntroPalette2
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -646,7 +627,7 @@ IntroScene5: ; e4a7a (39:4a7a)
 	call NextIntroScene
 	ret
 
-IntroScene6: ; e4af7 (39:4af7)
+IntroScene6:
 ; Two more Unown (I, H) fade in.
 	ld hl, wIntroSceneFrameCounter
 	ld a, [hl]
@@ -691,7 +672,7 @@ IntroScene6: ; e4af7 (39:4af7)
 	call NextIntroScene
 	ret
 
-IntroScene7: ; e4b3f (39:4b3f)
+IntroScene7:
 ; Back to the outdoor scene.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -728,12 +709,12 @@ IntroScene7: ; e4b3f (39:4b3f)
 	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
 
-	ld hl, Palette_e5edd
+	ld hl, IntroPalette1
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
 
-	ld hl, Palette_e5edd
+	ld hl, IntroPalette1
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -762,7 +743,7 @@ IntroScene7: ; e4b3f (39:4b3f)
 	call NextIntroScene
 	ret
 
-IntroScene8: ; e4bd3 (39:4bd3)
+IntroScene8:
 ; Scroll the scene, then show Suicune running across the screen.
 	ld hl, wIntroSceneFrameCounter
 	ld a, [hl]
@@ -791,7 +772,7 @@ IntroScene8: ; e4bd3 (39:4bd3)
 	call NextIntroScene
 	ret
 
-IntroScene9: ; e4c04 (39:4c04)
+IntroScene9:
 ; Set up the next scene (same bg).
 	xor a
 	ld [hLCDCPointer], a
@@ -828,7 +809,7 @@ IntroScene9: ; e4c04 (39:4c04)
 	call NextIntroScene
 	ret
 
-IntroScene10: ; e4c4f (39:4c4f)
+IntroScene10:
 ; Wooper and Pichu enter.
 	call Intro_RustleGrass
 	ld hl, wIntroSceneFrameCounter
@@ -861,7 +842,7 @@ IntroScene10: ; e4c4f (39:4c4f)
 	call NextIntroScene
 	ret
 
-IntroScene11: ; e4c86 (39:4c86)
+IntroScene11:
 ; Back to Unown again.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -886,11 +867,11 @@ IntroScene11: ; e4c86 (39:4c86)
 	push af
 	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
-	ld hl, Palette_365ad
+	ld hl, IntroPalette2
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, Palette_365ad
+	ld hl, IntroPalette2
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -911,7 +892,7 @@ IntroScene11: ; e4c86 (39:4c86)
 	call NextIntroScene
 	ret
 
-IntroScene12: ; e4cfa (39:4cfa)
+IntroScene12:
 ; Even more Unown.
 	call .PlayUnownSound
 	ld hl, wIntroSceneFrameCounter
@@ -951,7 +932,7 @@ IntroScene12: ; e4cfa (39:4cfa)
 	call NextIntroScene
 	ret
 
-.PlayUnownSound: ; e4d36 (39:4d36)
+.PlayUnownSound:
 	ld a, [wIntroSceneFrameCounter]
 	ld c, a
 	ld hl, .UnownSounds
@@ -973,9 +954,8 @@ IntroScene12: ; e4cfa (39:4cfa)
 	pop de
 	call PlaySFX
 	ret
-; e4d54 (39:4d54)
 
-.UnownSounds: ; e4d54
+.UnownSounds:
 	dbw $00, SFX_INTRO_UNOWN_3
 	dbw $20, SFX_INTRO_UNOWN_2
 	dbw $40, SFX_INTRO_UNOWN_1
@@ -984,9 +964,9 @@ IntroScene12: ; e4cfa (39:4cfa)
 	dbw $90, SFX_INTRO_UNOWN_2
 	dbw $a0, SFX_INTRO_UNOWN_1
 	dbw $b0, SFX_INTRO_UNOWN_2
-	db -1 ; e4d6d
+	db -1
 
-IntroScene13: ; e4d6d (39:4d6d)
+IntroScene13:
 ; Switch scenes again.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -1013,11 +993,11 @@ IntroScene13: ; e4d6d (39:4d6d)
 	push af
 	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
-	ld hl, Palette_e5edd
+	ld hl, IntroPalette1
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, Palette_e5edd
+	ld hl, IntroPalette1
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -1045,7 +1025,7 @@ IntroScene13: ; e4d6d (39:4d6d)
 	call NextIntroScene
 	ret
 
-IntroScene14: ; e4dfa (39:4dfa)
+IntroScene14:
 ; Suicune runs then jumps.
 	ld a, [hSCX]
 	sub 10
@@ -1090,7 +1070,7 @@ IntroScene14: ; e4dfa (39:4dfa)
 	call NextIntroScene
 	ret
 
-IntroScene15: ; e4e40 (39:4e40)
+IntroScene15:
 ; Transition to a new scene.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -1122,11 +1102,11 @@ IntroScene15: ; e4e40 (39:4e40)
 	push af
 	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
-	ld hl, Palette_e77dd
+	ld hl, IntroPalette5
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, Palette_e77dd
+	ld hl, IntroPalette5
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -1154,7 +1134,7 @@ IntroScene15: ; e4e40 (39:4e40)
 	call NextIntroScene
 	ret
 
-IntroScene16: ; e4edc (39:4edc)
+IntroScene16:
 ; Suicune shows its face. An Unown appears in front.
 	ld hl, wIntroSceneFrameCounter
 	ld a, [hl]
@@ -1172,7 +1152,7 @@ IntroScene16: ; e4edc (39:4edc)
 	call NextIntroScene
 	ret
 
-IntroScene17: ; e4ef5 (39:4ef5)
+IntroScene17:
 ; ...
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -1196,11 +1176,11 @@ IntroScene17: ; e4ef5 (39:4ef5)
 	push af
 	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
-	ld hl, Palette_e6d6d
+	ld hl, IntroPalette4
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, Palette_e6d6d
+	ld hl, IntroPalette4
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -1221,7 +1201,7 @@ IntroScene17: ; e4ef5 (39:4ef5)
 	call NextIntroScene
 	ret
 
-IntroScene18: ; e4f67 (39:4f67)
+IntroScene18:
 ; Suicune close up.
 	ld hl, wIntroSceneFrameCounter
 	ld a, [hl]
@@ -1238,7 +1218,7 @@ IntroScene18: ; e4f67 (39:4f67)
 	call NextIntroScene
 	ret
 
-IntroScene19: ; e4f7e (39:4f7e)
+IntroScene19:
 ; More setup.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -1270,11 +1250,11 @@ IntroScene19: ; e4f7e (39:4f7e)
 	push af
 	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
-	ld hl, Palette_e77dd
+	ld hl, IntroPalette5
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, Palette_e77dd
+	ld hl, IntroPalette5
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -1303,7 +1283,7 @@ IntroScene19: ; e4f7e (39:4f7e)
 	call NextIntroScene
 	ret
 
-IntroScene20: ; e5019 (39:5019)
+IntroScene20:
 ; Suicune running away. A bunch of Unown appear.
 	ld hl, wIntroSceneFrameCounter
 	ld a, [hl]
@@ -1335,7 +1315,6 @@ IntroScene20: ; e5019 (39:5019)
 	xor a
 	call Intro_Scene20_AppearUnown
 	ret
-; e5049 (39:5049)
 ; unused
 	ld a, c
 	and $1c
@@ -1350,7 +1329,7 @@ IntroScene20: ; e5019 (39:5019)
 	call NextIntroScene
 	ret
 
-IntroScene21: ; e505d (39:505d)
+IntroScene21:
 ; Suicune gets more distant and turns black.
 	call Intro_ColoredSuicuneFrameSwap
 	ld c, 3
@@ -1362,7 +1341,7 @@ IntroScene21: ; e505d (39:505d)
 	call NextIntroScene
 	ret
 
-IntroScene22: ; e5072 (39:5072)
+IntroScene22:
 	ld hl, wIntroSceneFrameCounter
 	ld a, [hl]
 	inc [hl]
@@ -1374,13 +1353,13 @@ IntroScene22: ; e5072 (39:5072)
 	call NextIntroScene
 	ret
 
-IntroScene23: ; e5086 (39:5086)
+IntroScene23:
 	xor a
 	ld [wIntroSceneFrameCounter], a
 	call NextIntroScene
 	ret
 
-IntroScene24: ; e508e (39:508e)
+IntroScene24:
 ; Fade to white.
 	ld hl, wIntroSceneFrameCounter
 	ld a, [hl]
@@ -1404,7 +1383,7 @@ IntroScene24: ; e508e (39:508e)
 	call NextIntroScene
 	ret
 
-IntroScene25: ; e50ad (39:50ad)
+IntroScene25:
 ; Wait around a bit.
 	ld a, [wIntroSceneFrameCounter]
 	dec a
@@ -1416,7 +1395,7 @@ IntroScene25: ; e50ad (39:50ad)
 	call NextIntroScene
 	ret
 
-IntroScene26: ; e50bb (39:50bb)
+IntroScene26:
 ; Load the final scene.
 	call ClearBGPalettes
 	call ClearSprites
@@ -1440,11 +1419,11 @@ IntroScene26: ; e50bb (39:50bb)
 	push af
 	ld a, BANK(wBGPals1)
 	ld [rSVBK], a
-	ld hl, Palette_e679d
+	ld hl, IntroPalette3
 	ld de, wBGPals1
 	ld bc, 16 palettes
 	call CopyBytes
-	ld hl, Palette_e679d
+	ld hl, IntroPalette3
 	ld de, wBGPals2
 	ld bc, 16 palettes
 	call CopyBytes
@@ -1465,7 +1444,7 @@ IntroScene26: ; e50bb (39:50bb)
 	call NextIntroScene
 	ret
 
-IntroScene27: ; e512d (39:512d)
+IntroScene27:
 ; Spell out C R Y S T A L with Unown.
 	ld hl, wIntroSceneTimer
 	inc [hl]
@@ -1490,7 +1469,7 @@ IntroScene27: ; e512d (39:512d)
 	ld [wIntroSceneFrameCounter], a
 	ret
 
-IntroScene28: ; e5152 (39:5152)
+IntroScene28:
 ; Cut out when the music ends, and lead into the title screen.
 	ld hl, wIntroSceneFrameCounter
 	ld a, [hl]
@@ -1502,7 +1481,7 @@ IntroScene28: ; e5152 (39:5152)
 	cp $8
 	ret nz
 
-	ld de, SFX_UNKNOWN_CB
+	ld de, SFX_INTRO_WHOOSH
 	call PlaySFX
 	ret
 
@@ -1515,7 +1494,7 @@ IntroScene28: ; e5152 (39:5152)
 	set 7, [hl]
 	ret
 
-Intro_Scene24_ApplyPaletteFade: ; e5172 (39:5172)
+Intro_Scene24_ApplyPaletteFade:
 ; load the (a)th palette from .FadePals to all wBGPals2
 	ld hl, .FadePals
 	add l
@@ -1547,13 +1526,11 @@ Intro_Scene24_ApplyPaletteFade: ; e5172 (39:5172)
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; e519c (39:519c)
 
-.FadePals: ; e519c
+.FadePals:
 INCLUDE "gfx/intro/fade.pal"
-; e51dc
 
-CrystalIntro_InitUnownAnim: ; e51dc (39:51dc)
+CrystalIntro_InitUnownAnim:
 	push de
 	ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
 	call _InitSpriteAnimStruct
@@ -1593,7 +1570,7 @@ CrystalIntro_InitUnownAnim: ; e51dc (39:51dc)
 	call ReinitSpriteAnimFrame
 	ret
 
-CrystalIntro_UnownFade: ; e5223 (39:5223)
+CrystalIntro_UnownFade:
 	add a
 	add a
 	add a
@@ -1673,36 +1650,32 @@ CrystalIntro_UnownFade: ; e5223 (39:5223)
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; e5288 (39:5288)
 
-.BWFade: ; e5288
+.BWFade:
 ; Fade between black and white.
 hue = 0
 rept 32
 	RGB hue, hue, hue
 hue = hue + 1
 endr
-; e52c8
 
-.BlackLBlueFade: ; e52c8
+.BlackLBlueFade:
 ; Fade between black and light blue.
 hue = 0
 rept 32
 	RGB 0, hue / 2, hue
 hue = hue + 1
 endr
-; e5308
 
-.BlackBlueFade: ; e5308
+.BlackBlueFade:
 ; Fade between black and blue.
 hue = 0
 rept 32
 	RGB 0, 0, hue
 hue = hue + 1
 endr
-; e5348
 
-Intro_Scene20_AppearUnown: ; e5348 (39:5348)
+Intro_Scene20_AppearUnown:
 ; Spawn the palette for the nth Unown
 	and a
 	jr nz, .load_pal_2
@@ -1755,25 +1728,20 @@ Intro_Scene20_AppearUnown: ; e5348 (39:5348)
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; e538d (39:538d)
 
-.pal1 ; e538d
+.pal1
 	RGB 24, 12, 09
 	RGB 31, 31, 31
 	RGB 12, 00, 31
 	RGB 00, 00, 00
 
-; e5395
-
-.pal2 ; e5395
+.pal2
 	RGB 24, 12, 09
 	RGB 31, 31, 31
 	RGB 31, 31, 31
 	RGB 31, 31, 31
 
-; e539d
-
-Intro_FadeUnownWordPals: ; e539d (39:539d)
+Intro_FadeUnownWordPals:
 	add a
 	add a
 	add a
@@ -1823,9 +1791,8 @@ endr
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; e53db (39:53db)
 
-.FastFadePalettes: ; e53db
+.FastFadePalettes:
 hue = 31
 rept 8
 	RGB hue, hue, hue
@@ -1833,17 +1800,15 @@ hue = hue + -1
 	RGB hue, hue, hue
 hue = hue + -2
 endr
-; e53fb
 
-.SlowFadePalettes: ; e53fb
+.SlowFadePalettes:
 hue = 31
 rept 16
 	RGB hue, hue, hue
 hue = hue + -1
 endr
-; e541b
 
-Intro_LoadTilemap: ; e541b (39:541b)
+Intro_LoadTilemap:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -1860,11 +1825,10 @@ Intro_LoadTilemap: ; e541b (39:541b)
 	inc de
 	dec c
 	jr nz, .col
-	; add hl, $20 - SCREEN_WIDTH
-	ld a, $20 - SCREEN_WIDTH
+	ld a, BG_MAP_WIDTH - SCREEN_WIDTH
 	add l
 	ld l, a
-	ld a, $0
+	ld a, 0
 	adc h
 	ld h, a
 	dec b
@@ -1874,7 +1838,7 @@ Intro_LoadTilemap: ; e541b (39:541b)
 	ld [rSVBK], a
 	ret
 
-Intro_Scene16_AnimateSuicune: ; e5441 (39:5441)
+Intro_Scene16_AnimateSuicune:
 	ld a, [wIntroSceneFrameCounter]
 	and $3
 	jr z, Intro_ColoredSuicuneFrameSwap
@@ -1887,7 +1851,7 @@ Intro_Scene16_AnimateSuicune: ; e5441 (39:5441)
 	ld [hBGMapMode], a
 	ret
 
-Intro_ColoredSuicuneFrameSwap: ; e5451 (39:5451)
+Intro_ColoredSuicuneFrameSwap:
 	hlcoord 0, 0
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 .loop
@@ -1908,7 +1872,7 @@ Intro_ColoredSuicuneFrameSwap: ; e5451 (39:5451)
 	ld [hBGMapMode], a
 	ret
 
-Intro_RustleGrass: ; e546d (39:546d)
+Intro_RustleGrass:
 	ld a, [wIntroSceneFrameCounter]
 	cp 36
 	ret nc
@@ -1929,21 +1893,19 @@ Intro_RustleGrass: ; e546d (39:546d)
 	ld a, 4
 	ld [wRequested2bppSize], a
 	ret
-; e5496 (39:5496)
 
-.RustlingGrassPointers: ; e5496
+.RustlingGrassPointers:
 	dw IntroGrass1GFX
 	dw IntroGrass2GFX
 	dw IntroGrass3GFX
 	dw IntroGrass2GFX
-; e549e
 
-Intro_SetCGBPalUpdate: ; e549e (39:549e)
+Intro_SetCGBPalUpdate:
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
 
-Intro_ClearBGPals: ; e54a3 (39:54a3)
+Intro_ClearBGPals:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals2)
@@ -1962,7 +1924,7 @@ Intro_ClearBGPals: ; e54a3 (39:54a3)
 	call DelayFrame
 	ret
 
-Intro_DecompressRequest2bpp_128Tiles: ; e54c2 (39:54c2)
+Intro_DecompressRequest2bpp_128Tiles:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -1981,7 +1943,7 @@ Intro_DecompressRequest2bpp_128Tiles: ; e54c2 (39:54c2)
 	ld [rSVBK], a
 	ret
 
-Intro_DecompressRequest2bpp_255Tiles: ; e54de (39:54de)
+Intro_DecompressRequest2bpp_255Tiles:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -2000,7 +1962,7 @@ Intro_DecompressRequest2bpp_255Tiles: ; e54de (39:54de)
 	ld [rSVBK], a
 	ret
 
-Intro_DecompressRequest2bpp_64Tiles: ; e54fa (39:54fa)
+Intro_DecompressRequest2bpp_64Tiles:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -2019,7 +1981,7 @@ Intro_DecompressRequest2bpp_64Tiles: ; e54fa (39:54fa)
 	ld [rSVBK], a
 	ret
 
-Intro_ResetLYOverrides: ; e5516 (39:5516)
+Intro_ResetLYOverrides:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wLYOverrides)
@@ -2036,7 +1998,7 @@ Intro_ResetLYOverrides: ; e5516 (39:5516)
 	ld [hLCDCPointer], a
 	ret
 
-Intro_PerspectiveScrollBG: ; e552f (39:552f)
+Intro_PerspectiveScrollBG:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wLYOverrides)
@@ -2067,134 +2029,104 @@ Intro_PerspectiveScrollBG: ; e552f (39:552f)
 	ld [rSVBK], a
 	ret
 
-IntroSuicuneRunGFX: ; e555d
+IntroSuicuneRunGFX:
 INCBIN "gfx/intro/suicune_run.2bpp.lz"
-; e592d
 
-IntroPichuWooperGFX: ; e592d
+IntroPichuWooperGFX:
 INCBIN "gfx/intro/pichu_wooper.2bpp.lz"
-; e5c7d
 
-IntroBackgroundGFX: ; e5c7d
+IntroBackgroundGFX:
 INCBIN "gfx/intro/background.2bpp.lz"
-; e5e6d
 
-IntroTilemap004: ; e5e6d
+IntroTilemap004:
 INCBIN "gfx/intro/004.tilemap.lz"
-; e5ecd
 
-IntroTilemap003: ; e5ecd
+IntroTilemap003:
 INCBIN "gfx/intro/003.tilemap.lz"
-; e5edd
 
-Palette_e5edd: ; e5edd
+IntroPalette1:
 INCLUDE "gfx/intro/intro_1.pal"
-; e5f5d
 
-IntroUnownsGFX: ; e5f5d
+IntroUnownsGFX:
 INCBIN "gfx/intro/unowns.2bpp.lz"
-; e634d
 
-IntroPulseGFX: ; e634d
+IntroPulseGFX:
 INCBIN "gfx/intro/pulse.2bpp.lz"
-; e63dd
 
-IntroTilemap002: ; e63dd
+IntroTilemap002:
 INCBIN "gfx/intro/002.tilemap.lz"
-; e641d
 
-IntroTilemap001: ; e641d
+IntroTilemap001:
 INCBIN "gfx/intro/001.tilemap.lz"
-; e642d
 
-IntroTilemap006: ; e642d
+IntroTilemap006:
 INCBIN "gfx/intro/006.tilemap.lz"
-; e647d
 
-IntroTilemap005: ; e647d
+IntroTilemap005:
 INCBIN "gfx/intro/005.tilemap.lz"
-; e649d
 
-IntroTilemap008: ; e649d
+IntroTilemap008:
 INCBIN "gfx/intro/008.tilemap.lz"
-; e655d
 
-IntroTilemap007: ; e655d
+IntroTilemap007:
 INCBIN "gfx/intro/007.tilemap.lz"
-; e65ad
 
-Palette_365ad: ; e65ad
+IntroPalette2:
 INCLUDE "gfx/intro/intro_2.pal"
-; e662d
 
-IntroCrystalUnownsGFX: ; e662d
+IntroCrystalUnownsGFX:
 INCBIN "gfx/intro/crystal_unowns.2bpp.lz"
-; e672d
 
-IntroTilemap017: ; e672d
+IntroTilemap017:
 INCBIN "gfx/intro/017.tilemap.lz"
-; e676d
 
-IntroTilemap015: ; e676d
+IntroTilemap015:
 INCBIN "gfx/intro/015.tilemap.lz"
-; e679d
 
-Palette_e679d: ; e679d
+IntroPalette3:
 INCLUDE "gfx/intro/intro_3.pal"
-; e681d
 
-IntroSuicuneCloseGFX: ; e681d
+IntroSuicuneCloseGFX:
 INCBIN "gfx/intro/suicune_close.2bpp.lz"
-; e6c3d
 
-IntroTilemap012: ; e6c3d
+IntroTilemap012:
 INCBIN "gfx/intro/012.tilemap.lz"
-; e6d0d
 
-IntroTilemap011: ; e6d0d
+IntroTilemap011:
 INCBIN "gfx/intro/011.tilemap.lz"
-; e6d6d
 
-Palette_e6d6d: ; e6d6d
+IntroPalette4:
 INCLUDE "gfx/intro/intro_4.pal"
-; e6ded
 
-IntroSuicuneJumpGFX: ; e6ded
+IntroSuicuneJumpGFX:
 INCBIN "gfx/intro/suicune_jump.2bpp.lz"
-; e72ad
 
-IntroSuicuneBackGFX: ; e72ad
+IntroSuicuneBackGFX:
 INCBIN "gfx/intro/suicune_back.2bpp.lz"
-; e764d
 
-IntroTilemap010: ; e764d
+IntroTilemap010:
 INCBIN "gfx/intro/010.tilemap.lz"
-; e76ad
 
-IntroTilemap009: ; e76ad
+IntroTilemap009:
 INCBIN "gfx/intro/009.tilemap.lz"
-; e76bd
 
-IntroTilemap014: ; e76bd
+IntroTilemap014:
 INCBIN "gfx/intro/014.tilemap.lz"
-; e778d
 
-IntroTilemap013: ; e778d
+IntroTilemap013:
 INCBIN "gfx/intro/013.tilemap.lz"
-; e77dd
 
-Palette_e77dd: ; e77dd
+IntroPalette5:
 INCLUDE "gfx/intro/intro_5.pal"
 
-IntroUnownBackGFX: ; e785d
+IntroUnownBackGFX:
 INCBIN "gfx/intro/unown_back.2bpp.lz"
-; e799d
 
-IntroGrass1GFX: ; e799d
+IntroGrass1GFX:
 INCBIN "gfx/intro/grass1.2bpp"
-IntroGrass2GFX: ; e79dd
+IntroGrass2GFX:
 INCBIN "gfx/intro/grass2.2bpp"
-IntroGrass3GFX: ; e7a1d
+IntroGrass3GFX:
 INCBIN "gfx/intro/grass3.2bpp"
-IntroGrass4GFX: ; e7a5d
+IntroGrass4GFX:
 INCBIN "gfx/intro/grass4.2bpp"
diff --git a/engine/evolution_animation.asm b/engine/movie/evolution_animation.asm
index e78423ef1..8f245f003 100755..100644
--- a/engine/evolution_animation.asm
+++ b/engine/movie/evolution_animation.asm
@@ -1,4 +1,4 @@
-EvolutionAnimation: ; 4e5e1
+EvolutionAnimation:
 	push hl
 	push de
 	push bc
@@ -27,9 +27,8 @@ EvolutionAnimation: ; 4e5e1
 
 	scf
 	ret
-; 4e607
 
-.EvolutionAnimation: ; 4e607
+.EvolutionAnimation:
 	ld a, %11100100
 	ld [rOBP0], a
 
@@ -150,20 +149,17 @@ EvolutionAnimation: ; 4e5e1
 	ld a, [wPlayerHPPal]
 	call PlayMonCry
 	ret
-; 4e703
 
-.GetSGBLayout: ; 4e703
+.GetSGBLayout:
 	ld b, SCGB_EVOLUTION
 	jp GetSGBLayout
-; 4e708
 
-.PlaceFrontpic: ; 4e708
+.PlaceFrontpic:
 	call GetBaseData
 	hlcoord 7, 2
 	jp PrepMonFrontpic
-; 4e711
 
-.LoadFrontpic: ; 4e711
+.LoadFrontpic:
 	call GetBaseData
 	ld a, $1
 	ld [wBoxAlignment], a
@@ -172,9 +168,8 @@ EvolutionAnimation: ; 4e5e1
 	xor a
 	ld [wBoxAlignment], a
 	ret
-; 4e726
 
-.AnimationSequence: ; 4e726
+.AnimationSequence:
 	call ClearJoypad
 	lb bc, 1, 2 * 7 ; flash b times, wait c frames in between
 .loop
@@ -195,9 +190,8 @@ EvolutionAnimation: ; 4e5e1
 .exit_sequence
 	scf
 	ret
-; 4e741
 
-.Flash: ; 4e741
+.Flash:
 	ld a, -7 * 7 ; new stage
 	ld [wEvolutionPicOffset], a
 	call .ReplaceFrontpic
@@ -207,9 +201,8 @@ EvolutionAnimation: ; 4e5e1
 	dec b
 	jr nz, .Flash
 	ret
-; 4e755
 
-.ReplaceFrontpic: ; 4e755
+.ReplaceFrontpic:
 	push bc
 	xor a
 	ld [hBGMapMode], a
@@ -233,9 +226,8 @@ EvolutionAnimation: ; 4e5e1
 	call WaitBGMap
 	pop bc
 	ret
-; 4e779
 
-.WaitFrames_CheckPressedB: ; 4e779
+.WaitFrames_CheckPressedB:
 	call DelayFrame
 	push bc
 	call JoyTextDelay
@@ -255,9 +247,8 @@ EvolutionAnimation: ; 4e5e1
 	jr nz, .loop3
 	scf
 	ret
-; 4e794
 
-.check_statused ; 4e794
+.check_statused
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMon1Species
 	call GetPartyLocation
@@ -265,9 +256,8 @@ EvolutionAnimation: ; 4e5e1
 	ld c, l
 	farcall CheckFaintedFrzSlp
 	ret
-; 4e7a6
 
-.PlayEvolvedSFX: ; 4e7a6
+.PlayEvolvedSFX:
 	ld a, [wEvolutionCanceled]
 	and a
 	ret nz
@@ -292,9 +282,8 @@ EvolutionAnimation: ; 4e5e1
 	pop af
 	ld [wJumptableIndex], a
 	ret
-; 4e7cf
 
-.balls_of_light ; 4e7cf
+.balls_of_light
 	ld hl, wJumptableIndex
 	ld a, [hl]
 	cp 32
@@ -311,9 +300,8 @@ EvolutionAnimation: ; 4e5e1
 .done_balls
 	scf
 	ret
-; 4e7e8
 
-.GenerateBallOfLight: ; 4e7e8
+.GenerateBallOfLight:
 	push de
 	depixel 9, 11
 	ld a, SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
@@ -333,9 +321,8 @@ EvolutionAnimation: ; 4e5e1
 	add hl, bc
 	ld [hl], $10
 	ret
-; 4e80c
 
-.AnimateBallsOfLight: ; 4e80c
+.AnimateBallsOfLight:
 	push bc
 	callfar PlaySpriteAnimations
 	; a = (([hVBlankCounter] + 4) / 2) % NUM_PALETTES
@@ -352,7 +339,7 @@ EvolutionAnimation: ; 4e5e1
 	ld a, [hl]
 	or b
 	ld [hli], a ; attributes
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	dec c
@@ -360,8 +347,6 @@ endr
 	pop bc
 	call DelayFrame
 	ret
-; 4e831
-
 
 .GFX:
 INCBIN "gfx/evo/bubble_large.2bpp"
diff --git a/engine/gbc_only.asm b/engine/movie/gbc_only.asm
index badd953aa..2ea8ff33c 100644
--- a/engine/gbc_only.asm
+++ b/engine/movie/gbc_only.asm
@@ -1,5 +1,4 @@
-GBCOnlyScreen: ; 4ea82
-
+GBCOnlyScreen:
 	ld a, [hCGB]
 	and a
 	ret nz
@@ -37,11 +36,8 @@ GBCOnlyScreen: ; 4ea82
 .loop
 	call DelayFrame
 	jr .loop
-; 4eac5
-
-
-DrawGBCOnlyScreen: ; 4eac5
 
+DrawGBCOnlyScreen:
 	call DrawGBCOnlyBorder
 
 	; Pokemon
@@ -63,11 +59,8 @@ DrawGBCOnlyScreen: ; 4eac5
 	call PlaceString
 
 	ret
-; 4eaea
-
-
-DrawGBCOnlyBorder: ; 4eaea
 
+DrawGBCOnlyBorder:
 	hlcoord 0, 0
 	ld [hl], 0 ; top-left
 
@@ -94,18 +87,16 @@ DrawGBCOnlyBorder: ; 4eaea
 
 	ld [hl], 7 ; bottom-right
 	ret
-; 4eb15
 
-.FillRow: ; 4eb15
+.FillRow:
 	ld c, SCREEN_WIDTH - 2
 .next_column
 	ld [hli], a
 	dec c
 	jr nz, .next_column
 	ret
-; 4eb1c
 
-.FillColumn: ; 4eb1c
+.FillColumn:
 	ld de, SCREEN_WIDTH
 	ld c, SCREEN_HEIGHT - 2
 .next_row
@@ -114,10 +105,8 @@ DrawGBCOnlyBorder: ; 4eaea
 	dec c
 	jr nz, .next_row
 	ret
-; 4eb27
-
 
-DrawGBCOnlyGraphic: ; 4eb27
+DrawGBCOnlyGraphic:
 	ld de, SCREEN_WIDTH
 .y
 	push bc
@@ -133,17 +122,12 @@ DrawGBCOnlyGraphic: ; 4eb27
 	dec c
 	jr nz, .y
 	ret
-; 4eb38
 
-
-GBCOnlyString: ; 4eb38
+GBCOnlyString:
 	db   "This Game Pak is"
 	next "designed only for"
 	next "use on the"
 	next "Game Boy Color.@"
-; 4eb76
-
 
-GBCOnlyGFX: ; 4eb76
+GBCOnlyGFX:
 INCBIN "gfx/sgb/gbc_only.2bpp.lz"
-; 4f0bc
diff --git a/engine/init_hof_credits.asm b/engine/movie/init_hof_credits.asm
index e8e98a0e1..152167b76 100644
--- a/engine/init_hof_credits.asm
+++ b/engine/movie/init_hof_credits.asm
@@ -1,4 +1,4 @@
-InitDisplayForHallOfFame: ; 4e881
+InitDisplayForHallOfFame:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -23,12 +23,12 @@ InitDisplayForHallOfFame: ; 4e881
 	call SetPalettes
 	ret
 
-.SavingRecordDontTurnOff: ; 0x4e8bd
+.SavingRecordDontTurnOff:
 	; SAVING RECORD… DON'T TURN OFF!
 	text_jump UnknownText_0x1bd39e
 	db "@"
 
-InitDisplayForRedCredits: ; 4e8c2
+InitDisplayForRedCredits:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -60,7 +60,7 @@ InitDisplayForRedCredits: ; 4e8c2
 	call SetPalettes
 	ret
 
-ResetDisplayBetweenHallOfFameMons: ; 4e906
+ResetDisplayBetweenHallOfFameMons:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
diff --git a/engine/title.asm b/engine/movie/title.asm
index 310e4d164..eb639489f 100644
--- a/engine/title.asm
+++ b/engine/movie/title.asm
@@ -1,5 +1,4 @@
-_TitleScreen: ; 10ed67
-
+_TitleScreen:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -18,25 +17,21 @@ _TitleScreen: ; 10ed67
 ; Turn LCD off
 	call DisableLCD
 
-
 ; VRAM bank 1
 	ld a, 1
 	ld [rVBK], a
 
-
 ; Decompress running Suicune gfx
 	ld hl, TitleSuicuneGFX
 	ld de, vTiles1
 	call Decompress
 
-
 ; Clear screen palettes
 	hlbgcoord 0, 0
 	ld bc, 20 * BG_MAP_WIDTH
 	xor a
 	call ByteFill
 
-
 ; Fill tile palettes:
 
 ; BG Map 1:
@@ -47,7 +42,6 @@ _TitleScreen: ; 10ed67
 	ld a, 7 ; palette
 	call ByteFill
 
-
 ; BG Map 0:
 
 ; Apply logo gradient:
@@ -78,7 +72,6 @@ _TitleScreen: ; 10ed67
 	ld a, 6
 	call ByteFill
 
-
 ; 'CRYSTAL VERSION'
 	hlbgcoord 5, 9
 	ld bc, NAME_LENGTH ; length of version text
@@ -91,12 +84,10 @@ _TitleScreen: ; 10ed67
 	ld a, 0 | VRAM_BANK_1
 	call ByteFill
 
-
 ; Back to VRAM bank 0
 	ld a, $0
 	ld [rVBK], a
 
-
 ; Decompress logo
 	ld hl, TitleLogoGFX
 	ld de, vTiles1
@@ -107,7 +98,6 @@ _TitleScreen: ; 10ed67
 	ld de, vTiles0
 	call Decompress
 
-
 ; Clear screen tiles
 	hlbgcoord 0, 0
 	ld bc, 64 * BG_MAP_WIDTH
@@ -157,7 +147,6 @@ _TitleScreen: ; 10ed67
 	pop af
 	ld [rSVBK], a
 
-
 ; LY/SCX trickery starts here
 
 	ld a, [rSVBK]
@@ -194,7 +183,6 @@ _TitleScreen: ; 10ed67
 	pop af
 	ld [rSVBK], a
 
-
 ; Reset audio
 	call ChannelsOff
 	call EnableLCD
@@ -220,7 +208,7 @@ _TitleScreen: ; 10ed67
 	ld [hBGMapMode], a
 
 	xor a
-	ld [wBGPals1 + 2], a
+	ld [wd002], a
 
 ; Play starting sound effect
 	call SFXChannelsOff
@@ -228,10 +216,9 @@ _TitleScreen: ; 10ed67
 	call PlaySFX
 
 	ret
-; 10eea7
 
-SuicuneFrameIterator: ; 10eea7
-	ld hl, wBGPals1 + 2
+SuicuneFrameIterator:
+	ld hl, wd002
 	ld a, [hl]
 	ld c, a
 	inc [hl]
@@ -257,17 +244,14 @@ SuicuneFrameIterator: ; 10eea7
 	ld a, $3
 	ld [hBGMapThird], a
 	ret
-; 10eece
 
-.Frames: ; 10eece
-	db $80 ; vTiles4 tile $00
-	db $88 ; vTiles4 tile $08
+.Frames:
+	db $80 ; vTiles3 tile $80
+	db $88 ; vTiles3 tile $88
 	db $00 ; vTiles5 tile $00
 	db $08 ; vTiles5 tile $08
-; 10eed2
-
 
-LoadSuicuneFrame: ; 10eed2
+LoadSuicuneFrame:
 	hlcoord 6, 12
 	ld b, 6
 .bgrows
@@ -290,9 +274,8 @@ LoadSuicuneFrame: ; 10eed2
 	dec b
 	jr nz, .bgrows
 	ret
-; 10eeef
 
-DrawTitleGraphic: ; 10eeef
+DrawTitleGraphic:
 ; input:
 ;   hl: draw location
 ;   b: height
@@ -320,9 +303,8 @@ DrawTitleGraphic: ; 10eeef
 	dec b
 	jr nz, .bgrows
 	ret
-; 10ef06
 
-InitializeBackground: ; 10ef06
+InitializeBackground:
 	ld hl, wVirtualOAMSprite00
 	ld d, -$22
 	ld e, $0
@@ -337,9 +319,8 @@ InitializeBackground: ; 10ef06
 	dec c
 	jr nz, .loop
 	ret
-; 10ef1c
 
-.InitColumn: ; 10ef1c
+.InitColumn:
 	ld c, $6
 	ld b, $40
 .loop2
@@ -358,10 +339,8 @@ InitializeBackground: ; 10ef06
 	dec c
 	jr nz, .loop2
 	ret
-; 10ef32
-
 
-AnimateTitleCrystal: ; 10ef32
+AnimateTitleCrystal:
 ; Move the title screen crystal downward until it's fully visible
 
 ; Stop at y=6
@@ -377,26 +356,22 @@ AnimateTitleCrystal: ; 10ef32
 	ld a, [hl]
 	add 2
 	ld [hli], a ; y
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
 endr
 	dec c
 	jr nz, .loop
 
 	ret
-; 10ef46
 
-TitleSuicuneGFX: ; 10ef46
+TitleSuicuneGFX:
 INCBIN "gfx/title/suicune.2bpp.lz"
-; 10f326
 
-TitleLogoGFX: ; 10f326
+TitleLogoGFX:
 INCBIN "gfx/title/logo.2bpp.lz"
-; 10fcee
 
-TitleCrystalGFX: ; 10fcee
+TitleCrystalGFX:
 INCBIN "gfx/title/crystal.2bpp.lz"
-; 10fede
 
 TitleScreenPalettes:
 INCLUDE "gfx/title/title.pal"
diff --git a/engine/trade_animation.asm b/engine/movie/trade_animation.asm
index 04c31df80..e60344430 100755..100644
--- a/engine/trade_animation.asm
+++ b/engine/movie/trade_animation.asm
@@ -1,5 +1,5 @@
-TRADEANIM_RIGHT_ARROW EQU $ed
-TRADEANIM_LEFT_ARROW  EQU $ee
+TRADEANIM_RIGHT_ARROW EQUS "\"▶\"" ; $ed
+TRADEANIM_LEFT_ARROW  EQUS "\"▼\"" ; $ee
 
 ; TradeAnim_TubeAnimJumptable.Jumptable indexes
 	const_def
@@ -9,7 +9,7 @@ TRADEANIM_LEFT_ARROW  EQU $ee
 	const TRADEANIMSTATE_3 ; 3
 TRADEANIMJUMPTABLE_LENGTH EQU const_value
 
-TradeAnimation: ; 28f24
+TradeAnimation:
 	xor a
 	ld [wcf66], a
 	ld hl, wPlayerTrademonSenderName
@@ -60,7 +60,7 @@ TradeAnimation: ; 28f24
 	tradeanim_scroll_out_right
 	tradeanim_end
 
-TradeAnimationPlayer2: ; 28f63
+TradeAnimationPlayer2:
 	xor a
 	ld [wcf66], a
 	ld hl, wOTTrademonSenderName
@@ -110,7 +110,7 @@ TradeAnimationPlayer2: ; 28f63
 	tradeanim_scroll_out_right
 	tradeanim_end
 
-RunTradeAnimScript: ; 28fa1
+RunTradeAnimScript:
 	ld hl, wTradeAnimAddress
 	ld [hl], e
 	inc hl
@@ -126,7 +126,7 @@ RunTradeAnimScript: ; 28fa1
 	ld hl, wOptions
 	ld a, [hl]
 	push af
-	set 4, [hl]
+	set NO_TEXT_SCROLL, [hl]
 	call .TradeAnimLayout
 	ld a, [wcf66]
 	and a
@@ -144,9 +144,7 @@ RunTradeAnimScript: ; 28fa1
 	ld [hMapAnims], a
 	ret
 
-; 28fdb
-
-.TradeAnimLayout: ; 28fdb
+.TradeAnimLayout:
 	xor a
 	ld [wJumptableIndex], a
 	call ClearBGPalettes
@@ -212,9 +210,7 @@ RunTradeAnimScript: ; 28fa1
 	call TradeAnim_NormalPals
 	ret
 
-; 29082
-
-DoTradeAnimation: ; 29082
+DoTradeAnimation:
 	ld a, [wJumptableIndex]
 	bit 7, a
 	jr nz, .finished
@@ -231,9 +227,7 @@ DoTradeAnimation: ; 29082
 	scf
 	ret
 
-; 290a0
-
-.DoTradeAnimCommand: ; 290a0
+.DoTradeAnimCommand:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -244,9 +238,8 @@ DoTradeAnimation: ; 29082
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 290af
 
-.JumpTable: ; 290af
+.JumpTable:
 ; entries correspond to macros/scripts/trade_anims.asm enumeration
 	dw TradeAnim_AdvanceScriptPointer ; 00
 	dw TradeAnim_ShowGivemonData      ; 01
@@ -296,16 +289,13 @@ DoTradeAnimation: ; 29082
 	dw TraideAnim_Wait96              ; 2d
 	dw TraideAnim_Wait80IfOTEgg       ; 2e
 	dw TraideAnim_Wait180IfOTEgg      ; 2f
-; 2910f
 
-TradeAnim_IncrementJumptableIndex: ; 2910f
+TradeAnim_IncrementJumptableIndex:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 
-; 29114
-
-TradeAnim_AdvanceScriptPointer: ; 29114
+TradeAnim_AdvanceScriptPointer:
 	ld hl, wTradeAnimAddress
 	ld e, [hl]
 	inc hl
@@ -318,16 +308,12 @@ TradeAnim_AdvanceScriptPointer: ; 29114
 	ld [hl], e
 	ret
 
-; 29123
-
-TradeAnim_End: ; 29123
+TradeAnim_End:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
 
-; 29129
-
-TradeAnim_TubeToOT1: ; 29129
+TradeAnim_TubeToOT1:
 	ld a, TRADEANIM_RIGHT_ARROW
 	call TradeAnim_PlaceTrademonStatsOnTubeAnim
 	ld a, [wLinkTradeSendmonSpecies]
@@ -337,7 +323,7 @@ TradeAnim_TubeToOT1: ; 29129
 	ld b, $0
 	jr TradeAnim_InitTubeAnim
 
-TradeAnim_TubeToPlayer1: ; 2913c
+TradeAnim_TubeToPlayer1:
 	ld a, TRADEANIM_LEFT_ARROW
 	call TradeAnim_PlaceTrademonStatsOnTubeAnim
 	ld a, [wLinkTradeGetmonSpecies]
@@ -345,7 +331,7 @@ TradeAnim_TubeToPlayer1: ; 2913c
 	ld a, TRADEANIMSTATE_2
 	depixel 9, 18, 4, 4
 	ld b, $4
-TradeAnim_InitTubeAnim: ; 2914e
+TradeAnim_InitTubeAnim:
 	push bc
 	push de
 	push bc
@@ -402,9 +388,7 @@ TradeAnim_InitTubeAnim: ; 2914e
 	ld [wFrameCounter], a
 	ret
 
-; 291af
-
-TradeAnim_TubeToOT2: ; 291af
+TradeAnim_TubeToOT2:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	add $2
@@ -416,9 +400,7 @@ TradeAnim_TubeToOT2: ; 291af
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 291c4
-
-TradeAnim_TubeToOT3: ; 291c4
+TradeAnim_TubeToOT3:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	add $2
@@ -430,9 +412,7 @@ TradeAnim_TubeToOT3: ; 291c4
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 291d9
-
-TradeAnim_TubeToOT4: ; 291d9
+TradeAnim_TubeToOT4:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	add $2
@@ -442,9 +422,7 @@ TradeAnim_TubeToOT4: ; 291d9
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 291e8
-
-TradeAnim_TubeToPlayer3: ; 291e8
+TradeAnim_TubeToPlayer3:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	sub $2
@@ -456,9 +434,7 @@ TradeAnim_TubeToPlayer3: ; 291e8
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 291fd
-
-TradeAnim_TubeToPlayer4: ; 291fd
+TradeAnim_TubeToPlayer4:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	sub $2
@@ -470,9 +446,7 @@ TradeAnim_TubeToPlayer4: ; 291fd
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 29211
-
-TradeAnim_TubeToPlayer5: ; 29211
+TradeAnim_TubeToPlayer5:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	sub $2
@@ -482,19 +456,15 @@ TradeAnim_TubeToPlayer5: ; 29211
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 29220
-
 TradeAnim_TubeToOT6:
-TradeAnim_TubeToPlayer6: ; 29220
+TradeAnim_TubeToPlayer6:
 	ld a, 128
 	ld [wFrameCounter], a
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 29229
-
 TradeAnim_TubeToOT8:
-TradeAnim_TubeToPlayer8: ; 29229
+TradeAnim_TubeToPlayer8:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -515,12 +485,10 @@ TradeAnim_TubeToPlayer8: ; 29229
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 2925d
-
 TradeAnim_TubeToOT5:
 TradeAnim_TubeToOT7:
 TradeAnim_TubeToPlayer2:
-TradeAnim_TubeToPlayer7: ; 2925d
+TradeAnim_TubeToPlayer7:
 	call TradeAnim_FlashBGPals
 	ld hl, wFrameCounter
 	ld a, [hl]
@@ -533,25 +501,19 @@ TradeAnim_TubeToPlayer7: ; 2925d
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 2926d
-
-TradeAnim_GiveTrademonSFX: ; 2926d
+TradeAnim_GiveTrademonSFX:
 	call TradeAnim_AdvanceScriptPointer
 	ld de, SFX_GIVE_TRADEMON
 	call PlaySFX
 	ret
 
-; 29277
-
-TradeAnim_GetTrademonSFX: ; 29277
+TradeAnim_GetTrademonSFX:
 	call TradeAnim_AdvanceScriptPointer
 	ld de, SFX_GET_TRADEMON
 	call PlaySFX
 	ret
 
-; 29281
-
-TradeAnim_TubeAnimJumptable: ; 29281
+TradeAnim_TubeAnimJumptable:
 	maskbits TRADEANIMJUMPTABLE_LENGTH
 	ld e, a
 	ld d, 0
@@ -562,18 +524,16 @@ TradeAnim_TubeAnimJumptable: ; 29281
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 2928f
 
-.Jumptable: ; 2928f
+.Jumptable:
 ; entries correspond to TRADEANIMSTATE_* constants
 	dw .Zero
 	dw .One
 	dw .Two
 	dw .Three
-; 29297
 
-.Zero: ; 29297
-.Three: ; 29297
+.Zero:
+.Three:
 	call TradeAnim_BlankTileMap
 	hlcoord 9, 3
 	ld [hl], $5b
@@ -585,9 +545,7 @@ TradeAnim_TubeAnimJumptable: ; 29281
 	call TradeAnim_CopyTradeGameBoyTilemap
 	ret
 
-; 292af
-
-.One: ; 292af
+.One:
 	call TradeAnim_BlankTileMap
 	hlcoord 0, 3
 	ld bc, SCREEN_WIDTH
@@ -595,9 +553,7 @@ TradeAnim_TubeAnimJumptable: ; 29281
 	call ByteFill
 	ret
 
-; 292be
-
-.Two: ; 292be
+.Two:
 	call TradeAnim_BlankTileMap
 	hlcoord 0, 3
 	ld bc, $11
@@ -625,17 +581,13 @@ TradeAnim_TubeAnimJumptable: ; 29281
 	call TradeAnim_CopyTradeGameBoyTilemap
 	ret
 
-; 292ec
-
-TradeAnim_CopyTradeGameBoyTilemap: ; 292ec
+TradeAnim_CopyTradeGameBoyTilemap:
 	ld de, TradeGameBoyTilemap
 	lb bc, 8, 6
 	call TradeAnim_CopyBoxFromDEtoHL
 	ret
 
-; 292f6
-
-TradeAnim_PlaceTrademonStatsOnTubeAnim: ; 292f6
+TradeAnim_PlaceTrademonStatsOnTubeAnim:
 	push af
 	call ClearBGPalettes
 	call WaitTop
@@ -674,9 +626,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim: ; 292f6
 	call ClearTileMap
 	ret
 
-; 29348
-
-TradeAnim_EnterLinkTube1: ; 29348
+TradeAnim_EnterLinkTube1:
 	call ClearTileMap
 	call WaitTop
 	ld a, $a0
@@ -698,9 +648,7 @@ TradeAnim_EnterLinkTube1: ; 29348
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 2937e
-
-TradeAnim_EnterLinkTube2: ; 2937e
+TradeAnim_EnterLinkTube2:
 	ld a, [hSCX]
 	and a
 	jr z, .done
@@ -714,9 +662,7 @@ TradeAnim_EnterLinkTube2: ; 2937e
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29391
-
-TradeAnim_ExitLinkTube: ; 29391
+TradeAnim_ExitLinkTube:
 	ld a, [hSCX]
 	cp $a0
 	jr z, .done
@@ -731,9 +677,7 @@ TradeAnim_ExitLinkTube: ; 29391
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 293a6
-
-TradeAnim_SetupGivemonScroll: ; 293a6
+TradeAnim_SetupGivemonScroll:
 	ld a, $8f
 	ld [hWX], a
 	ld a, $88
@@ -743,9 +687,7 @@ TradeAnim_SetupGivemonScroll: ; 293a6
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 293b6
-
-TradeAnim_DoGivemonScroll: ; 293b6
+TradeAnim_DoGivemonScroll:
 	ld a, [hWX]
 	cp $7
 	jr z, .done
@@ -764,9 +706,7 @@ TradeAnim_DoGivemonScroll: ; 293b6
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 293d2
-
-TradeAnim_FrontpicScrollStart: ; 293d2
+TradeAnim_FrontpicScrollStart:
 	ld a, $7
 	ld [hWX], a
 	ld a, $50
@@ -774,9 +714,7 @@ TradeAnim_FrontpicScrollStart: ; 293d2
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 293de
-
-TradeAnim_TextboxScrollStart: ; 293de
+TradeAnim_TextboxScrollStart:
 	ld a, $7
 	ld [hWX], a
 	ld a, $90
@@ -784,9 +722,7 @@ TradeAnim_TextboxScrollStart: ; 293de
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 293ea
-
-TradeAnim_ScrollOutRight: ; 293ea
+TradeAnim_ScrollOutRight:
 	call WaitTop
 	ld a, HIGH(vBGMap1)
 	ld [hBGMapAddress + 1], a
@@ -803,9 +739,7 @@ TradeAnim_ScrollOutRight: ; 293ea
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 2940c
-
-TradeAnim_ScrollOutRight2: ; 2940c
+TradeAnim_ScrollOutRight2:
 	ld a, [hWX]
 	cp $a1
 	jr nc, .done
@@ -826,9 +760,7 @@ TradeAnim_ScrollOutRight2: ; 2940c
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 2942e
-
-TradeAnim_ShowGivemonData: ; 2942e
+TradeAnim_ShowGivemonData:
 	call ShowPlayerTrademonStats
 	ld a, [wPlayerTrademonSpecies]
 	ld [wCurPartySpecies], a
@@ -853,9 +785,7 @@ TradeAnim_ShowGivemonData: ; 2942e
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29461
-
-TradeAnim_ShowGetmonData: ; 29461
+TradeAnim_ShowGetmonData:
 	call ShowOTTrademonStats
 	ld a, [wOTTrademonSpecies]
 	ld [wCurPartySpecies], a
@@ -871,16 +801,12 @@ TradeAnim_ShowGetmonData: ; 29461
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29487
-
-TradeAnim_AnimateFrontpic: ; 29487
+TradeAnim_AnimateFrontpic:
 	farcall AnimateTrademonFrontpic
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29491
-
-TradeAnim_GetFrontpic: ; 29491
+TradeAnim_GetFrontpic:
 	push de
 	push af
 	predef GetUnownLetter
@@ -892,9 +818,7 @@ TradeAnim_GetFrontpic: ; 29491
 	predef GetMonFrontpic
 	ret
 
-; 294a9
-
-TradeAnim_GetNickname: ; 294a9
+TradeAnim_GetNickname:
 	push de
 	ld [wd265], a
 	call GetPokemonName
@@ -904,15 +828,13 @@ TradeAnim_GetNickname: ; 294a9
 	call CopyBytes
 	ret
 
-; 294bb
-
-TradeAnim_ShowGivemonFrontpic: ; 294bb
+TradeAnim_ShowGivemonFrontpic:
 	ld de, vTiles0
 	jr TradeAnim_ShowFrontpic
 
-TradeAnim_ShowGetmonFrontpic: ; 294c0
+TradeAnim_ShowGetmonFrontpic:
 	ld de, vTiles0 tile $31
-TradeAnim_ShowFrontpic: ; 294c3
+TradeAnim_ShowFrontpic:
 	call DelayFrame
 	ld hl, vTiles2
 	lb bc, 10, $31
@@ -927,58 +849,45 @@ TradeAnim_ShowFrontpic: ; 294c3
 	call WaitBGMap
 	ret
 
-; 294e7
-
-TraideAnim_Wait80: ; 294e7
+TraideAnim_Wait80:
 	ld c, 80
 	call DelayFrames
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 294f0
-
-TraideAnim_Wait40: ; 294f0
+TraideAnim_Wait40:
 	ld c, 40
 	call DelayFrames
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 294f9
-
-TraideAnim_Wait96: ; 294f9
+TraideAnim_Wait96:
 	ld c, 96
 	call DelayFrames
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29502
-
-TraideAnim_Wait80IfOTEgg: ; 29502
+TraideAnim_Wait80IfOTEgg:
 	call IsOTTrademonEgg
 	ret nz
 	ld c, 80
 	call DelayFrames
 	ret
 
-; 2950c
-
-TraideAnim_Wait180IfOTEgg: ; 2950c
+TraideAnim_Wait180IfOTEgg:
 	call IsOTTrademonEgg
 	ret nz
 	ld c, 180
 	call DelayFrames
 	ret
 
-; 29516
-
-IsOTTrademonEgg: ; 29516
+IsOTTrademonEgg:
 	call TradeAnim_AdvanceScriptPointer
 	ld a, [wOTTrademonSpecies]
 	cp EGG
 	ret
 
-; 2951f
-ShowPlayerTrademonStats: ; 2951f
+ShowPlayerTrademonStats:
 	ld de, wPlayerTrademonSpecies
 	ld a, [de]
 	cp EGG
@@ -996,9 +905,7 @@ ShowPlayerTrademonStats: ; 2951f
 	call TrademonStats_WaitBGMap
 	ret
 
-; 29549
-
-ShowOTTrademonStats: ; 29549
+ShowOTTrademonStats:
 	ld de, wOTTrademonSpecies
 	ld a, [de]
 	cp EGG
@@ -1016,9 +923,7 @@ ShowOTTrademonStats: ; 29549
 	call TrademonStats_WaitBGMap
 	ret
 
-; 29573
-
-TrademonStats_MonTemplate: ; 29573
+TrademonStats_MonTemplate:
 	call WaitTop
 	call TradeAnim_BlankTileMap
 	ld a, HIGH(vBGMap1)
@@ -1032,16 +937,13 @@ TrademonStats_MonTemplate: ; 29573
 	call PlaceString
 	ret
 
-; 29591
-
-.OTMonData: ; 29591
+.OTMonData:
 	db   "─── №."
 	next ""
 	next "OT/"
 	next "<ID>№.@"
-; 295a1
 
-TrademonStats_Egg: ; 295a1
+TrademonStats_Egg:
 	call WaitTop
 	call TradeAnim_BlankTileMap
 	ld a, HIGH(vBGMap1)
@@ -1056,40 +958,31 @@ TrademonStats_Egg: ; 295a1
 	call TrademonStats_WaitBGMap
 	ret
 
-; 295c2
-
-.EggData: ; 295c2
+.EggData:
 	db   "EGG"
 	next "OT/?????"
 	next "<ID>№.?????@"
-; 295d8
 
-TrademonStats_WaitBGMap: ; 295d8
+TrademonStats_WaitBGMap:
 	call WaitBGMap
 	call WaitTop
 	ld a, HIGH(vBGMap0)
 	ld [hBGMapAddress + 1], a
 	ret
 
-; 295e3
-
-TrademonStats_PrintSpeciesNumber: ; 295e3
+TrademonStats_PrintSpeciesNumber:
 	hlcoord 10, 0
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 3
 	call PrintNum
 	ld [hl], " "
 	ret
 
-; 295ef
-
-TrademonStats_PrintSpeciesName: ; 295ef
+TrademonStats_PrintSpeciesName:
 	hlcoord 4, 2
 	call PlaceString
 	ret
 
-; 295f6
-
-TrademonStats_PrintOTName: ; 295f6
+TrademonStats_PrintOTName:
 	cp 3
 	jr c, .caught_gender_okay
 	xor a
@@ -1107,21 +1000,16 @@ TrademonStats_PrintOTName: ; 295f6
 	ld [bc], a
 	ret
 
-; 2960e
-
-.Gender: ; 2960e
+.Gender:
 	db " ", "♂", "♀"
-; 29611
 
-TrademonStats_PrintTrademonID: ; 29611
+TrademonStats_PrintTrademonID:
 	hlcoord 7, 6
 	lb bc, PRINTNUM_LEADINGZEROS | 2, 5
 	call PrintNum
 	ret
 
-; 2961b
-
-TradeAnim_RockingBall: ; 2961b
+TradeAnim_RockingBall:
 	depixel 10, 11, 4, 0
 	ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
 	call _InitSpriteAnimStruct
@@ -1130,9 +1018,7 @@ TradeAnim_RockingBall: ; 2961b
 	ld [wFrameCounter], a
 	ret
 
-; 2962c
-
-TradeAnim_DropBall: ; 2962c
+TradeAnim_DropBall:
 	depixel 10, 11, 4, 0
 	ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
 	call _InitSpriteAnimStruct
@@ -1147,9 +1033,7 @@ TradeAnim_DropBall: ; 2962c
 	ld [wFrameCounter], a
 	ret
 
-; 29649
-
-TradeAnim_Poof: ; 29649
+TradeAnim_Poof:
 	depixel 10, 11, 4, 0
 	ld a, SPRITE_ANIM_INDEX_TRADE_POOF
 	call _InitSpriteAnimStruct
@@ -1160,9 +1044,7 @@ TradeAnim_Poof: ; 29649
 	call PlaySFX
 	ret
 
-; 29660
-
-TradeAnim_BulgeThroughTube: ; 29660
+TradeAnim_BulgeThroughTube:
 	ld a, %11100100 ; 3,2,1,0
 	call DmgToCgbObjPal0
 	depixel 5, 11
@@ -1173,9 +1055,7 @@ TradeAnim_BulgeThroughTube: ; 29660
 	ld [wFrameCounter], a
 	ret
 
-; 29676
-
-TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
+TradeAnim_AnimateTrademonInTube:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld e, [hl]
@@ -1187,9 +1067,8 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 29686
 
-.Jumptable: ; 29686 (a:5686)
+.Jumptable:
 	dw .InitTimer
 	dw .WaitTimer1
 	dw .MoveRight
@@ -1197,22 +1076,21 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
 	dw .MoveUp
 	dw .MoveLeft
 	dw .WaitTimer2
-; 2969a
 
-.JumptableNext: ; 29694 (a:5694)
+.JumptableNext:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ret
 
-.InitTimer: ; 2969a (a:569a)
+.InitTimer:
 	call .JumptableNext
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld [hl], $80
 	ret
 
-.WaitTimer1: ; 296a4 (a:56a4)
+.WaitTimer1:
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -1221,7 +1099,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
 	ret nz
 	call .JumptableNext
 
-.MoveRight: ; 296af (a:56af)
+.MoveRight:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1233,7 +1111,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
 .done_move_right
 	call .JumptableNext
 
-.MoveDown: ; 296bd (a:56bd)
+.MoveDown:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1248,7 +1126,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
 	ld [hl], $0
 	ret
 
-.MoveUp: ; 296cf (a:56cf)
+.MoveUp:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1260,7 +1138,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
 .done_move_up
 	call .JumptableNext
 
-.MoveLeft: ; 296dd (a:56dd)
+.MoveLeft:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1276,7 +1154,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
 	ld [hl], $80
 	ret
 
-.WaitTimer2: ; 296f2 (a:56f2)
+.WaitTimer2:
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -1288,9 +1166,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
 	ld [hl], $0
 	ret
 
-; 29701 (a:5701)
-
-TradeAnim_SentToOTText: ; 29701
+TradeAnim_SentToOTText:
 	ld a, [wLinkMode]
 	cp LINK_TIMECAPSULE
 	jr z, .time_capsule
@@ -1313,21 +1189,17 @@ TradeAnim_SentToOTText: ; 29701
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29732
-
-.Text_WasSentTo: ; 0x29732
+.Text_WasSentTo:
 	; was sent to @ .
 	text_jump UnknownText_0x1bc6e9
 	db "@"
-; 0x29737
 
-.Text_MonName: ; 0x29737
+.Text_MonName:
 	;
 	text_jump UnknownText_0x1bc701
 	db "@"
-; 0x2973c
 
-TradeAnim_OTBidsFarewell: ; 2973c
+TradeAnim_OTBidsFarewell:
 	ld hl, .Text_BidsFarewellToMon
 	call PrintText
 	call TradeAnim_Wait80Frames
@@ -1337,21 +1209,17 @@ TradeAnim_OTBidsFarewell: ; 2973c
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29752
-
-.Text_BidsFarewellToMon: ; 0x29752
+.Text_BidsFarewellToMon:
 	; bids farewell to
 	text_jump UnknownText_0x1bc703
 	db "@"
-; 0x29757
 
-.Text_MonName: ; 0x29757
+.Text_MonName:
 	; .
 	text_jump UnknownText_0x1bc719
 	db "@"
-; 0x2975c
 
-TradeAnim_TakeCareOfText: ; 2975c
+TradeAnim_TakeCareOfText:
 	call WaitTop
 	hlcoord 0, 10
 	ld bc, 8 * SCREEN_WIDTH
@@ -1364,15 +1232,12 @@ TradeAnim_TakeCareOfText: ; 2975c
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 2977a
-
-.Text_TakeGoodCareOfMon: ; 0x2977a
+.Text_TakeGoodCareOfMon:
 	; Take good care of @ .
 	text_jump UnknownText_0x1bc71f
 	db "@"
-; 0x2977f
 
-TradeAnim_OTSendsText1: ; 2977f
+TradeAnim_OTSendsText1:
 	ld hl, .Text_ForYourMon
 	call PrintText
 	call TradeAnim_Wait80Frames
@@ -1384,21 +1249,17 @@ TradeAnim_OTSendsText1: ; 2977f
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 2979a
-
-.Text_ForYourMon: ; 0x2979a
+.Text_ForYourMon:
 	; For @ 's @ ,
 	text_jump UnknownText_0x1bc739
 	db "@"
-; 0x2979f
 
-.Text_OTSends: ; 0x2979f
+.Text_OTSends:
 	; sends @ .
 	text_jump UnknownText_0x1bc74c
 	db "@"
-; 0x297a4
 
-TradeAnim_OTSendsText2: ; 297a4
+TradeAnim_OTSendsText2:
 	ld hl, .Text_WillTrade
 	call PrintText
 	call TradeAnim_Wait80Frames
@@ -1410,37 +1271,29 @@ TradeAnim_OTSendsText2: ; 297a4
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 297bf
-
-.Text_WillTrade: ; 0x297bf
+.Text_WillTrade:
 	; will trade @ @
 	text_jump UnknownText_0x1bc75e
 	db "@"
-; 0x297c4
 
-.Text_ForYourMon: ; 0x297c4
+.Text_ForYourMon:
 	; for @ 's @ .
 	text_jump UnknownText_0x1bc774
 	db "@"
-; 0x297c9
 
-TradeAnim_Wait80Frames: ; 297c9
+TradeAnim_Wait80Frames:
 	ld c, 80
 	call DelayFrames
 	ret
 
-; 297cf
-
-TradeAnim_BlankTileMap: ; 297cf
+TradeAnim_BlankTileMap:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "
 	call ByteFill
 	ret
 
-; 297db
-
-TradeAnim_CopyBoxFromDEtoHL: ; 297db
+TradeAnim_CopyBoxFromDEtoHL:
 .row
 	push bc
 	push hl
@@ -1458,9 +1311,7 @@ TradeAnim_CopyBoxFromDEtoHL: ; 297db
 	jr nz, .row
 	ret
 
-; 297ed
-
-TradeAnim_NormalPals: ; 297ed
+TradeAnim_NormalPals:
 	ld a, [hSGB]
 	and a
 	ld a, %11100100 ; 3,2,1,0
@@ -1473,9 +1324,7 @@ TradeAnim_NormalPals: ; 297ed
 	call DmgToCgbBGPals
 	ret
 
-; 297ff
-
-LinkTradeAnim_LoadTradePlayerNames: ; 297ff
+LinkTradeAnim_LoadTradePlayerNames:
 	push de
 	ld de, wLinkPlayer1Name
 	ld bc, NAME_LENGTH
@@ -1486,18 +1335,14 @@ LinkTradeAnim_LoadTradePlayerNames: ; 297ff
 	call CopyBytes
 	ret
 
-; 29814
-
-LinkTradeAnim_LoadTradeMonSpecies: ; 29814
+LinkTradeAnim_LoadTradeMonSpecies:
 	ld a, [hl]
 	ld [wLinkTradeSendmonSpecies], a
 	ld a, [de]
 	ld [wLinkTradeGetmonSpecies], a
 	ret
 
-; 2981d
-
-TradeAnim_FlashBGPals: ; 2981d
+TradeAnim_FlashBGPals:
 	ld a, [wcf65]
 	and $7
 	ret nz
@@ -1506,9 +1351,7 @@ TradeAnim_FlashBGPals: ; 2981d
 	call DmgToCgbBGPals
 	ret
 
-; 2982b
-
-LoadTradeBallAndCableGFX: ; 2982b
+LoadTradeBallAndCableGFX:
 	call DelayFrame
 	ld de, TradeBallGFX
 	ld hl, vTiles0 tile $62
@@ -1528,9 +1371,7 @@ LoadTradeBallAndCableGFX: ; 2982b
 	ld [hl], $62
 	ret
 
-; 2985a
-
-LoadTradeBubbleGFX: ; 2985a
+LoadTradeBubbleGFX:
 	call DelayFrame
 	ld e, $3
 	callfar LoadMenuMonIcon
@@ -1544,9 +1385,7 @@ LoadTradeBubbleGFX: ; 2985a
 	ld [hl], $62
 	ret
 
-; 29879
-
-TradeAnim_WaitAnim: ; 29879
+TradeAnim_WaitAnim:
 	ld hl, wFrameCounter
 	ld a, [hl]
 	and a
@@ -1558,9 +1397,7 @@ TradeAnim_WaitAnim: ; 29879
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29886
-
-TradeAnim_WaitAnim2: ; 29886
+TradeAnim_WaitAnim2:
 	ld hl, wFrameCounter
 	ld a, [hl]
 	and a
@@ -1572,10 +1409,7 @@ TradeAnim_WaitAnim2: ; 29886
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29893
-
-
-Unreferenced_DebugTrade: ; 29893
+Unreferenced_DebugTrade:
 ; This function is not referenced.
 ; It was meant for use in Japanese versions, so the
 ; constant used for copy length was changed by accident.
@@ -1605,21 +1439,17 @@ Unreferenced_DebugTrade: ; 29893
 	jr nz, .loop2
 	ret
 
-; 298b5
-
 debugtrade: MACRO
 ; species, ot name, ot id (?)
 	db \1, \2
 	dw \3
 ENDM
 
-.DebugTradeData: ; 298b5
+.DebugTradeData:
 	debugtrade VENUSAUR, "ゲーフり@@", $0123 ; GAME FREAK
 	debugtrade CHARIZARD, "クりーチャ@", $0456 ; Creatures Inc.
-; 298c7
-
 
-TradeGameBoyTilemap: ; 298c7
+TradeGameBoyTilemap:
 ; 6x8
 	db $31, $32, $32, $32, $32, $33
 	db $34, $35, $36, $36, $37, $38
@@ -1629,14 +1459,12 @@ TradeGameBoyTilemap: ; 298c7
 	db $46, $47, $43, $48, $49, $4a
 	db $41, $43, $4b, $4c, $4d, $4e
 	db $4f, $50, $50, $50, $51, $52
-; 297f7
 
-TradeLinkTubeTilemap: ; 297f7
+TradeLinkTubeTilemap:
 ; 12x3
 	db $43, $55, $56, $53, $53, $53, $53, $53, $53, $53, $53, $53
 	db $43, $57, $58, $54, $54, $54, $54, $54, $54, $54, $54, $54
 	db $43, $59, $5a, $43, $43, $43, $43, $43, $43, $43, $43, $43
-; 2991b
 
 TradeArrowGFX:  INCBIN "gfx/trade/arrow.2bpp"
 TradeCableGFX:  INCBIN "gfx/trade/cable.2bpp"
diff --git a/engine/unused_title.asm b/engine/movie/unused_title.asm
index 8e52a71bb..0c97c840a 100644
--- a/engine/unused_title.asm
+++ b/engine/movie/unused_title.asm
@@ -1,5 +1,4 @@
-UnusedTitleScreen: ; 10c000
-
+UnusedTitleScreen:
 	call ClearBGPalettes
 	call ClearTileMap
 	call DisableLCD
@@ -96,30 +95,24 @@ UnusedTitleScreen: ; 10c000
 	call PlayMusic
 
 	ret
-; 10c0b1
 
-UnusedTitleBG_GFX: ; 10c0b1
+UnusedTitleBG_GFX:
 INCBIN "gfx/title/old_bg.2bpp"
-; 10d0b1
 
-UnusedTitleBG_Tilemap: ; 10d0b1
+UnusedTitleBG_Tilemap:
 ; 32x32 (alternating tiles and attributes)
 INCBIN "gfx/title/old_bg.tilemap"
-; 10d8b1
 
-UnusedTitleBG_Palettes: ; 10d8b1
+UnusedTitleBG_Palettes:
 INCLUDE "gfx/title/old_bg.pal"
-; 10dab1
 
-UnusedTitleFG_GFX: ; 10dab1
+UnusedTitleFG_GFX:
 INCBIN "gfx/title/old_fg.2bpp"
-; 10eab1
 
-UnusedTitleFG_Palettes: ; 10eab1
+UnusedTitleFG_Palettes:
 INCLUDE "gfx/title/old_fg.pal"
-; 10ecb1
 
-UnusedTitleFG_OAM: ; 10ecb1
+UnusedTitleFG_OAM:
 	dsprite  3,  0,  7,  0, $00, 1
 	dsprite  3,  0,  8,  0, $02, 1
 	dsprite  3,  0,  9,  0, $04, 1
@@ -160,9 +153,8 @@ UnusedTitleFG_OAM: ; 10ecb1
 	dsprite 11,  0, 12,  0, $4a, 1
 	dsprite 11,  0, 13,  0, $4c, 1
 	dsprite 11,  0, 14,  0, $4e, 1
-; 10ed51
 
-Function10ed51: ; 10ed51
+Function10ed51:
 	call _TitleScreen
 .loop
 	call JoyTextDelay
@@ -175,4 +167,3 @@ Function10ed51: ; 10ed51
 	jr .loop
 .done
 	ret
-; 10ed67
diff --git a/engine/decorations.asm b/engine/overworld/decorations.asm
index cf372159a..bea2e0cdb 100755..100644
--- a/engine/decorations.asm
+++ b/engine/overworld/decorations.asm
@@ -1,15 +1,15 @@
-InitDecorations: ; 26751 (9:6751)
+InitDecorations:
 	ld a, DECO_FEATHERY_BED
 	ld [wDecoBed], a
 	ld a, DECO_TOWN_MAP
 	ld [wDecoPoster], a
 	ret
 
-_KrisDecorationMenu: ; 0x2675c
+_PlayerDecorationMenu:
 	ld a, [wWhichIndexSet]
 	push af
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	xor a
 	ld [wBuffer5], a
 	ld a, $1
@@ -34,24 +34,21 @@ _KrisDecorationMenu: ; 0x2675c
 	ld a, [wBuffer5]
 	ld c, a
 	ret
-; 0x2679a
 
-.MenuDataHeader: ; 0x2679a
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 5, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0x267a2
 
-.MenuData2: ; 0x267a2
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw wd002
 	dw PlaceNthMenuStrings
 	dw .pointers
-; 0x267aa
 
-.pointers ; 267aa
+.pointers
 	dw DecoBedMenu, .bed
 	dw DecoCarpetMenu, .carpet
 	dw DecoPlantMenu, .plant
@@ -69,9 +66,8 @@ _KrisDecorationMenu: ; 0x2675c
 .ornament db "ORNAMENT@"
 .big_doll db "BIG DOLL@"
 .exit     db "EXIT@"
-; 26806
 
-.FindCategoriesWithOwnedDecos: ; 26806
+.FindCategoriesWithOwnedDecos:
 	xor a
 	ld [wWhichIndexSet], a
 	call .ClearStringBuffer2
@@ -84,7 +80,7 @@ _KrisDecorationMenu: ; 0x2675c
 	call CopyBytes
 	ret
 
-.ClearStringBuffer2: ; 26822 (9:6822)
+.ClearStringBuffer2:
 	ld hl, wStringBuffer2
 	xor a
 	ld [hli], a
@@ -93,7 +89,7 @@ _KrisDecorationMenu: ; 0x2675c
 	call ByteFill
 	ret
 
-.AppendToStringBuffer2: ; 26830 (9:6830)
+.AppendToStringBuffer2:
 	ld hl, wStringBuffer2
 	inc [hl]
 	ld e, [hl]
@@ -102,7 +98,7 @@ _KrisDecorationMenu: ; 0x2675c
 	ld [hl], a
 	ret
 
-.FindOwndDecos: ; 2683a (9:683a)
+.FindOwndDecos:
 	ld hl, .dw
 .loop
 	ld a, [hli]
@@ -124,9 +120,8 @@ _KrisDecorationMenu: ; 0x2675c
 	jr .loop
 .done
 	ret
-; 26855 (9:6855)
 
-.dw ; 26855
+.dw
 	dwb FindOwnedBeds, 0 ; bed
 	dwb FindOwnedCarpets, 1 ; carpet
 	dwb FindOwnedPlants, 2 ; plant
@@ -135,9 +130,8 @@ _KrisDecorationMenu: ; 0x2675c
 	dwb FindOwnedOrnaments, 5 ; ornament
 	dwb FindOwnedBigDolls, 6 ; big doll
 	dw 0 ; end
-; 2686c
 
-Deco_FillTempWithMinusOne: ; 2686c
+Deco_FillTempWithMinusOne:
 	xor a
 	ld hl, wd002
 	ld [hli], a
@@ -145,9 +139,8 @@ Deco_FillTempWithMinusOne: ; 2686c
 	ld bc, $10
 	call ByteFill
 	ret
-; 2687a
 
-CheckAllDecorationFlags: ; 2687a
+CheckAllDecorationFlags:
 .loop
 	ld a, [hli]
 	cp -1
@@ -166,9 +159,8 @@ CheckAllDecorationFlags: ; 2687a
 
 .done
 	ret
-; 26891
 
-AppendDecoIndex: ; 26891
+AppendDecoIndex:
 	ld hl, wd002
 	inc [hl]
 	ld e, [hl]
@@ -176,9 +168,8 @@ AppendDecoIndex: ; 26891
 	add hl, de
 	ld [hl], a
 	ret
-; 2689b
 
-FindOwnedDecosInCategory: ; 2689b
+FindOwnedDecosInCategory:
 	push bc
 	push hl
 	call Deco_FillTempWithMinusOne
@@ -195,126 +186,108 @@ FindOwnedDecosInCategory: ; 2689b
 	call AppendDecoIndex
 	scf
 	ret
-; 268b5
 
-DecoBedMenu: ; 268b5
+DecoBedMenu:
 	call FindOwnedBeds
 	call PopulateDecoCategoryMenu
 	xor a
 	ret
-; 268bd
 
-FindOwnedBeds: ; 268bd
+FindOwnedBeds:
 	ld hl, .beds
 	ld c, BEDS
 	jp FindOwnedDecosInCategory
-; 268c5
 
-.beds ; 268c5
+.beds
 	db DECO_FEATHERY_BED ; 2
 	db DECO_PINK_BED ; 3
 	db DECO_POLKADOT_BED ; 4
 	db DECO_PIKACHU_BED ; 5
 	db -1
-; 268ca
 
-DecoCarpetMenu: ; 268ca
+DecoCarpetMenu:
 	call FindOwnedCarpets
 	call PopulateDecoCategoryMenu
 	xor a
 	ret
-; 268d2
 
-FindOwnedCarpets: ; 268d2
+FindOwnedCarpets:
 	ld hl, .carpets
 	ld c, CARPETS
 	jp FindOwnedDecosInCategory
-; 268da
 
-.carpets ; 268da
+.carpets
 	db DECO_RED_CARPET ; 7
 	db DECO_BLUE_CARPET ; 8
 	db DECO_YELLOW_CARPET ; 9
 	db DECO_GREEN_CARPET ; a
 	db -1
-; 268df
 
-DecoPlantMenu: ; 268df
+DecoPlantMenu:
 	call FindOwnedPlants
 	call PopulateDecoCategoryMenu
 	xor a
 	ret
-; 268e7
 
-FindOwnedPlants: ; 268e7
+FindOwnedPlants:
 	ld hl, .plants
 	ld c, PLANTS
 	jp FindOwnedDecosInCategory
-; 268ef
 
-.plants ; 268ef
+.plants
 	db DECO_MAGNAPLANT ; c
 	db DECO_TROPICPLANT ; d
 	db DECO_JUMBOPLANT ; e
 	db -1
-; 268f3
 
-DecoPosterMenu: ; 268f3
+DecoPosterMenu:
 	call FindOwnedPosters
 	call PopulateDecoCategoryMenu
 	xor a
 	ret
-; 268fb
 
-FindOwnedPosters: ; 268fb
+FindOwnedPosters:
 	ld hl, .posters
 	ld c, POSTERS
 	jp FindOwnedDecosInCategory
-; 26903
 
-.posters ; 26903
+.posters
 	db DECO_TOWN_MAP ; 10
 	db DECO_PIKACHU_POSTER ; 11
 	db DECO_CLEFAIRY_POSTER ; 12
 	db DECO_JIGGLYPUFF_POSTER ; 13
 	db -1
-; 26908
 
-DecoConsoleMenu: ; 26908
+DecoConsoleMenu:
 	call FindOwnedConsoles
 	call PopulateDecoCategoryMenu
 	xor a
 	ret
-; 26910
 
-FindOwnedConsoles: ; 26910
+FindOwnedConsoles:
 	ld hl, .consoles
 	ld c, CONSOLES
 	jp FindOwnedDecosInCategory
-; 26918
 
-.consoles ; 26918
+.consoles
 	db DECO_FAMICOM ; 15
 	db DECO_SNES ; 16
 	db DECO_N64 ; 17
 	db DECO_VIRTUAL_BOY ; 18
 	db -1
-; 2691d
 
-DecoOrnamentMenu: ; 2691d
+DecoOrnamentMenu:
 	call FindOwnedOrnaments
 	call PopulateDecoCategoryMenu
 	xor a
 	ret
-; 26925
 
-FindOwnedOrnaments: ; 26925
+FindOwnedOrnaments:
 	ld hl, .ornaments
 	ld c, DOLLS
 	jp FindOwnedDecosInCategory
-; 2692d
 
-.ornaments ; 2692d
+.ornaments
 	db DECO_PIKACHU_DOLL ; 1e
 	db DECO_SURF_PIKACHU_DOLL ; 1f
 	db DECO_CLEFAIRY_DOLL ; 20
@@ -339,34 +312,29 @@ FindOwnedOrnaments: ; 26925
 	db DECO_GOLD_TROPHY_DOLL ; 33
 	db DECO_SILVER_TROPHY_DOLL ; 34
 	db -1
-; 26945
 
-DecoBigDollMenu: ; 26945
+DecoBigDollMenu:
 	call FindOwnedBigDolls
 	call PopulateDecoCategoryMenu
 	xor a
 	ret
-; 2694d
 
-FindOwnedBigDolls: ; 2694d
+FindOwnedBigDolls:
 	ld hl, .big_dolls
 	ld c, BIG_DOLLS
 	jp FindOwnedDecosInCategory
-; 26955
 
-.big_dolls ; 26955
+.big_dolls
 	db DECO_BIG_SNORLAX_DOLL ; 1a
 	db DECO_BIG_ONIX_DOLL ; 1b
 	db DECO_BIG_LAPRAS_DOLL ; 1c
 	db -1
-; 26959
 
-DecoExitMenu: ; 26959
+DecoExitMenu:
 	scf
 	ret
-; 2695b
 
-PopulateDecoCategoryMenu: ; 2695b
+PopulateDecoCategoryMenu:
 	ld a, [wd002]
 	and a
 	jr z, .empty
@@ -374,8 +342,8 @@ PopulateDecoCategoryMenu: ; 2695b
 	jr nc, .beyond_eight
 	xor a
 	ld [wWhichIndexSet], a
-	ld hl, .NonscrollingMenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, .NonscrollingMenuHeader
+	call LoadMenuHeader
 	call DoNthMenu
 	jr c, .no_action_1
 	call DoDecorationAction2
@@ -391,9 +359,9 @@ PopulateDecoCategoryMenu: ; 2695b
 	ld d, 0
 	add hl, de
 	ld [hl], -1
-	call LoadStandardMenuDataHeader
-	ld hl, .ScrollingMenuDataHeader
-	call CopyMenuDataHeader
+	call LoadStandardMenuHeader
+	ld hl, .ScrollingMenuHeader
+	call CopyMenuHeader
 	xor a
 	ld [hBGMapMode], a
 	call InitScrollingMenu
@@ -413,37 +381,32 @@ PopulateDecoCategoryMenu: ; 2695b
 	ld hl, .Text_nothing_to_choose
 	call MenuTextBoxBackup
 	ret
-; 269b0
 
-.Text_nothing_to_choose: ; 0x269b0
+.Text_nothing_to_choose:
 	; There's nothing to choose.
 	text_jump UnknownText_0x1bc471
 	db "@"
-; 0x269b5
 
-.NonscrollingMenuDataHeader: ; 0x269b5
+.NonscrollingMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-	dw .NonscrollingMenuData2
+	dw .NonscrollingMenuData
 	db 1 ; default option
-; 0x269bd
 
-.NonscrollingMenuData2: ; 0x269bd
+.NonscrollingMenuData:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw wd002
 	dw DecorationMenuFunction
 	dw DecorationAttributes
-; 0x269c5
 
-.ScrollingMenuDataHeader: ; 0x269c5
+.ScrollingMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2
-	dw .ScrollingMenuData2
+	dw .ScrollingMenuData
 	db 1 ; default option
-; 0x269cd
 
-.ScrollingMenuData2: ; 0x269cd
+.ScrollingMenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 8, 0 ; rows, columns
 	db 1 ; horizontal spacing
@@ -451,26 +414,22 @@ PopulateDecoCategoryMenu: ; 2695b
 	dba DecorationMenuFunction
 	dbw 0, 0
 	dbw 0, 0
-; 269dd
 
-
-GetDecorationData: ; 269dd
+GetDecorationData:
 	ld hl, DecorationAttributes
 	ld bc, 6
 	call AddNTimes
 	ret
-; 269e7
 
-GetDecorationName: ; 269e7
+GetDecorationName:
 	push hl
 	call GetDecorationData
 	call GetDecoName
 	pop hl
 	call CopyName2
 	ret
-; 269f3
 
-DecorationMenuFunction: ; 269f3
+DecorationMenuFunction:
 	ld a, [wMenuSelection]
 	push de
 	call GetDecorationData
@@ -478,9 +437,8 @@ DecorationMenuFunction: ; 269f3
 	pop hl
 	call PlaceString
 	ret
-; 26a02
 
-DoDecorationAction2: ; 26a02
+DoDecorationAction2:
 	ld a, [wMenuSelection]
 	call GetDecorationData
 	ld de, 2 ; function 2
@@ -489,9 +447,8 @@ DoDecorationAction2: ; 26a02
 	ld hl, .DecoActions
 	rst JumpTable
 	ret
-; 26a12
 
-.DecoActions: ; 26a12
+.DecoActions:
 	dw DecoAction_nothing
 	dw DecoAction_setupbed
 	dw DecoAction_putawaybed
@@ -507,10 +464,8 @@ DoDecorationAction2: ; 26a02
 	dw DecoAction_putawaybigdoll
 	dw DecoAction_setupornament
 	dw DecoAction_putawayornament
-; 26a30
-
 
-GetDecorationFlag: ; 26a30
+GetDecorationFlag:
 	call GetDecorationData
 	ld de, 3 ; event flag
 	add hl, de
@@ -518,17 +473,15 @@ GetDecorationFlag: ; 26a30
 	ld d, [hl]
 	ld e, a
 	ret
-; 26a3b
 
-DecorationFlagAction: ; 26a3b
+DecorationFlagAction:
 	push bc
 	call GetDecorationFlag
 	pop bc
 	call EventFlagAction
 	ret
-; 26a44
 
-GetDecorationSprite: ; 26a44
+GetDecorationSprite:
 	ld a, c
 	call GetDecorationData
 	ld de, 5 ; sprite
@@ -536,13 +489,12 @@ GetDecorationSprite: ; 26a44
 	ld a, [hl]
 	ld c, a
 	ret
-; 26a4f
 
 INCLUDE "data/decorations/attributes.asm"
 
 INCLUDE "data/decorations/names.asm"
 
-GetDecoName: ; 26c72
+GetDecoName:
 	ld a, [hli]
 	ld e, [hl]
 	ld bc, wStringBuffer2
@@ -551,9 +503,8 @@ GetDecoName: ; 26c72
 	rst JumpTable
 	pop de
 	ret
-; 26c7e
 
-.NameFunctions: ; 26c7e
+.NameFunctions:
 	dw .invalid
 	dw .plant
 	dw .bed
@@ -561,40 +512,37 @@ GetDecoName: ; 26c72
 	dw .poster
 	dw .doll
 	dw .bigdoll
-; 26c8c
 
-
-.invalid ; 26c8c
+.invalid
 	ret
-; 26c8d
 
-.plant ; 26c8d
+.plant
 	ld a, e
 	jr .getdeconame
 
-.bed ; 26c90
+.bed
 	call .plant
 	ld a, _BED
 	jr .getdeconame
 
-.carpet ; 26c97
+.carpet
 	call .plant
 	ld a, _CARPET
 	jr .getdeconame
 
-.poster ; 26c9e
+.poster
 	ld a, e
 	call .getpokename
 	ld a, _POSTER
 	jr .getdeconame
 
-.doll ; 26ca6
+.doll
 	ld a, e
 	call .getpokename
 	ld a, _DOLL
 	jr .getdeconame
 
-.bigdoll ; 26cae
+.bigdoll
 	push de
 	ld a, BIG_
 	call .getdeconame
@@ -602,25 +550,25 @@ GetDecoName: ; 26c72
 	ld a, e
 	jr .getpokename
 
-.unused ; 26cb8
+.unused
 	push de
 	call .getdeconame
 	pop de
 	ld a, e
 	jr .getdeconame
 
-.getpokename ; 26cc0
+.getpokename
 	push bc
 	ld [wd265], a
 	call GetPokemonName
 	pop bc
 	jr .copy
 
-.getdeconame ; 26cca
+.getdeconame
 	call ._getdeconame
 	jr .copy
 
-._getdeconame ; 26ccf
+._getdeconame
 	push bc
 	ld hl, DecorationNames
 	call GetNthString
@@ -629,7 +577,7 @@ GetDecoName: ; 26c72
 	pop bc
 	ret
 
-.copy ; 26cda
+.copy
 	ld h, b
 	ld l, c
 	call CopyName2
@@ -637,74 +585,60 @@ GetDecoName: ; 26c72
 	ld b, h
 	ld c, l
 	ret
-; 26ce3
 
-DecoAction_nothing: ; 26ce3
+DecoAction_nothing:
 	scf
 	ret
-; 26ce5
 
-DecoAction_setupbed: ; 26ce5
+DecoAction_setupbed:
 	ld hl, wDecoBed
 	jp DecoAction_TrySetItUp
-; 26ceb
 
-DecoAction_putawaybed: ; 26ceb
+DecoAction_putawaybed:
 	ld hl, wDecoBed
 	jp DecoAction_TryPutItAway
-; 26cf1
 
-DecoAction_setupcarpet: ; 26cf1
+DecoAction_setupcarpet:
 	ld hl, wDecoCarpet
 	jp DecoAction_TrySetItUp
-; 26cf7
 
-DecoAction_putawaycarpet: ; 26cf7
+DecoAction_putawaycarpet:
 	ld hl, wDecoCarpet
 	jp DecoAction_TryPutItAway
-; 26cfd
 
-DecoAction_setupplant: ; 26cfd
+DecoAction_setupplant:
 	ld hl, wDecoPlant
 	jp DecoAction_TrySetItUp
-; 26d03
 
-DecoAction_putawayplant: ; 26d03
+DecoAction_putawayplant:
 	ld hl, wDecoPlant
 	jp DecoAction_TryPutItAway
-; 26d09
 
-DecoAction_setupposter: ; 26d09
+DecoAction_setupposter:
 	ld hl, wDecoPoster
 	jp DecoAction_TrySetItUp
-; 26d0f
 
-DecoAction_putawayposter: ; 26d0f
+DecoAction_putawayposter:
 	ld hl, wDecoPoster
 	jp DecoAction_TryPutItAway
-; 26d15
 
-DecoAction_setupconsole: ; 26d15
+DecoAction_setupconsole:
 	ld hl, wDecoConsole
 	jp DecoAction_TrySetItUp
-; 26d1b
 
-DecoAction_putawayconsole: ; 26d1b
+DecoAction_putawayconsole:
 	ld hl, wDecoConsole
 	jp DecoAction_TryPutItAway
-; 26d21
 
-DecoAction_setupbigdoll: ; 26d21
+DecoAction_setupbigdoll:
 	ld hl, wDecoBigDoll
 	jp DecoAction_TrySetItUp
-; 26d27
 
-DecoAction_putawaybigdoll: ; 26d27
+DecoAction_putawaybigdoll:
 	ld hl, wDecoBigDoll
 	jp DecoAction_TryPutItAway
-; 26d2d
 
-DecoAction_TrySetItUp: ; 26d2d
+DecoAction_TrySetItUp:
 	ld a, [hl]
 	ld [wBuffer1], a
 	push hl
@@ -722,9 +656,8 @@ DecoAction_TrySetItUp: ; 26d2d
 	pop hl
 	xor a
 	ret
-; 26d46
 
-DecoAction_SetItUp: ; 26d46
+DecoAction_SetItUp:
 ; See if there's anything of the same type already out
 	ld a, [wBuffer1]
 	and a
@@ -760,9 +693,8 @@ DecoAction_SetItUp: ; 26d46
 	call MenuTextBoxBackup
 	scf
 	ret
-; 26d86
 
-DecoAction_TryPutItAway: ; 26d86
+DecoAction_TryPutItAway:
 ; If there is no item of that type already set, there is nothing to put away.
 	ld a, [hl]
 	ld [wBuffer1], a
@@ -788,9 +720,8 @@ DecoAction_TryPutItAway: ; 26d86
 	call MenuTextBoxBackup
 	xor a
 	ret
-; 26db3
 
-DecoAction_setupornament: ; 26db3
+DecoAction_setupornament:
 	ld hl, UnknownText_0x26e41
 	call DecoAction_AskWhichSide
 	jr c, .cancel
@@ -804,7 +735,7 @@ DecoAction_setupornament: ; 26db3
 	xor a
 	ret
 
-DecoAction_putawayornament: ; 26dc9
+DecoAction_putawayornament:
 	ld hl, DecoText_WhichSide
 	call DecoAction_AskWhichSide
 	jr nc, .incave
@@ -814,7 +745,7 @@ DecoAction_putawayornament: ; 26dc9
 .incave
 	call DecoAction_PutItAway_Ornament
 
-DecoAction_FinishUp_Ornament: ; 26dd6
+DecoAction_FinishUp_Ornament:
 	call QueryWhichSide
 	ld a, [wSelectedDecoration]
 	ld [hl], a
@@ -822,9 +753,8 @@ DecoAction_FinishUp_Ornament: ; 26dd6
 	ld [de], a
 	xor a
 	ret
-; 26de3
 
-DecoAction_SetItUp_Ornament: ; 26de3
+DecoAction_SetItUp_Ornament:
 	ld a, [wSelectedDecoration]
 	and a
 	jr z, .nothingthere
@@ -863,9 +793,8 @@ DecoAction_SetItUp_Ornament: ; 26de3
 	call MenuTextBoxBackup
 	scf
 	ret
-; 26e33
 
-.getwhichside ; 26e33
+.getwhichside
 	ld a, [wMenuSelection]
 	ld b, a
 	ld a, [wOtherDecoration]
@@ -874,15 +803,13 @@ DecoAction_SetItUp_Ornament: ; 26de3
 	xor a
 	ld [wOtherDecoration], a
 	ret
-; 26e41
 
-UnknownText_0x26e41: ; 0x26e41
+UnknownText_0x26e41:
 	; Which side do you want to put it on?
 	text_jump UnknownText_0x1bc48c
 	db "@"
-; 0x26e46
 
-DecoAction_PutItAway_Ornament: ; 26e46
+DecoAction_PutItAway_Ornament:
 	ld a, [wSelectedDecoration]
 	and a
 	jr z, .nothingthere
@@ -902,20 +829,18 @@ DecoAction_PutItAway_Ornament: ; 26e46
 	call MenuTextBoxBackup
 	xor a
 	ret
-; 26e6b
 
-DecoText_WhichSide: ; 0x26e6b
+DecoText_WhichSide:
 	; Which side do you want to put away?
 	text_jump UnknownText_0x1bc4b2
 	db "@"
-; 0x26e70
 
-DecoAction_AskWhichSide: ; 26e70
+DecoAction_AskWhichSide:
 	call MenuTextBox
-	ld hl, MenuDataHeader_0x26eab
+	ld hl, MenuHeader_0x26eab
 	call GetMenu2
 	call ExitMenu
-	call CopyMenuData2
+	call CopyMenuData
 	jr c, .nope
 	ld a, [wMenuCursorY]
 	cp 3
@@ -932,9 +857,8 @@ DecoAction_AskWhichSide: ; 26e70
 .nope
 	scf
 	ret
-; 26e9a
 
-QueryWhichSide: ; 26e9a
+QueryWhichSide:
 	ld hl, wDecoRightOrnament
 	ld de, wDecoLeftOrnament
 	ld a, [wBuffer2]
@@ -945,68 +869,57 @@ QueryWhichSide: ; 26e9a
 	ld l, e
 	pop de
 	ret
-; 26eab
 
-MenuDataHeader_0x26eab: ; 0x26eab
+MenuHeader_0x26eab:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 13, 7
-	dw MenuData2_0x26eb3
+	dw MenuData_0x26eb3
 	db 1 ; default option
-; 0x26eb3
 
-MenuData2_0x26eb3: ; 0x26eb3
+MenuData_0x26eb3:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "RIGHT SIDE@"
 	db "LEFT SIDE@"
 	db "CANCEL@"
-; 0x26ed1
 
-DecoText_PutAwayTheDeco: ; 0x26ed1
+DecoText_PutAwayTheDeco:
 	; Put away the @ .
 	text_jump UnknownText_0x1bc4d7
 	db "@"
-; 0x26ed6
 
-DecoText_NothingToPutAway: ; 0x26ed6
+DecoText_NothingToPutAway:
 	; There's nothing to put away.
 	text_jump UnknownText_0x1bc4ec
 	db "@"
-; 0x26edb
 
-DecoText_SetUpTheDeco: ; 0x26edb
+DecoText_SetUpTheDeco:
 	; Set up the @ .
 	text_jump UnknownText_0x1bc509
 	db "@"
-; 0x26ee0
 
-DecoText_PutAwayAndSetUp: ; 0x26ee0
+DecoText_PutAwayAndSetUp:
 	; Put away the @ and set up the @ .
 	text_jump UnknownText_0x1bc51c
 	db "@"
-; 0x26ee5
 
-DecoText_AlreadySetUp: ; 0x26ee5
+DecoText_AlreadySetUp:
 	; That's already set up.
 	text_jump UnknownText_0x1bc546
 	db "@"
-; 0x26eea
 
-GetDecorationName_c_de: ; 26eea
+GetDecorationName_c_de:
 	ld a, c
 	ld h, d
 	ld l, e
 	call GetDecorationName
 	ret
-; 26ef1
 
-DecorationFlagAction_c: ; 26ef1
+DecorationFlagAction_c:
 	ld a, c
 	jp DecorationFlagAction
-; 26ef5
-
 
-GetDecorationName_c: ; 26ef5 (9:6ef5)
+GetDecorationName_c:
 	ld a, c
 	call GetDecorationID
 	ld hl, wStringBuffer1
@@ -1015,16 +928,14 @@ GetDecorationName_c: ; 26ef5 (9:6ef5)
 	pop de
 	ret
 
-
-SetSpecificDecorationFlag: ; 26f02
+SetSpecificDecorationFlag:
 	ld a, c
 	call GetDecorationID
 	ld b, SET_FLAG
 	call DecorationFlagAction
 	ret
-; 26f0c
 
-GetDecorationID: ; 26f0c
+GetDecorationID:
 	push hl
 	push de
 	ld e, a
@@ -1035,9 +946,8 @@ GetDecorationID: ; 26f0c
 	pop de
 	pop hl
 	ret
-; 26f19
 
-SetAllDecorationFlags: ; 26f19
+SetAllDecorationFlags:
 	ld hl, DecorationIDs
 .loop
 	ld a, [hli]
@@ -1051,27 +961,24 @@ SetAllDecorationFlags: ; 26f19
 
 .done
 	ret
-; 26f2b
 
 INCLUDE "data/decorations/decorations.asm"
 
-DescribeDecoration:: ; 26f59
+DescribeDecoration::
 	ld a, b
 	ld hl, .JumpTable
 	rst JumpTable
 	ret
-; 26f5f
 
-.JumpTable: ; 26f5f
+.JumpTable:
 ; entries correspond to DECODESC_* constants
 	dw DecorationDesc_Poster
 	dw DecorationDesc_LeftOrnament
 	dw DecorationDesc_RightOrnament
 	dw DecorationDesc_GiantOrnament
 	dw DecorationDesc_Console
-; 26f69
 
-DecorationDesc_Poster: ; 26f69
+DecorationDesc_Poster:
 	ld a, [wDecoPoster]
 	ld hl, DecorationDesc_PosterPointers
 	ld de, 3
@@ -1088,124 +995,108 @@ DecorationDesc_Poster: ; 26f69
 	ld d, [hl]
 	ld e, a
 	ret
-; 26f84
 
-DecorationDesc_PosterPointers: ; 26f84
+DecorationDesc_PosterPointers:
 	dbw DECO_TOWN_MAP, DecorationDesc_TownMapPoster
 	dbw DECO_PIKACHU_POSTER, DecorationDesc_PikachuPoster
 	dbw DECO_CLEFAIRY_POSTER, DecorationDesc_ClefairyPoster
 	dbw DECO_JIGGLYPUFF_POSTER, DecorationDesc_JigglypuffPoster
 	db -1
-; 26f91
 
-DecorationDesc_TownMapPoster: ; 0x26f91
+DecorationDesc_TownMapPoster:
 	opentext
 	writetext .TownMapText
 	waitbutton
-	special Special_TownMap
+	special OverworldTownMap
 	closetext
 	end
-; 0x26f9b
 
-.TownMapText: ; 0x26f9b
+.TownMapText:
 	; It's the TOWN MAP.
 	text_jump UnknownText_0x1bc55d
 	db "@"
-; 0x26fa0
 
-DecorationDesc_PikachuPoster: ; 0x26fa0
+DecorationDesc_PikachuPoster:
 	jumptext .PikaPosterText
-; 0x26fa3
 
-.PikaPosterText: ; 0x26fa3
+.PikaPosterText:
 	; It's a poster of a cute PIKACHU.
 	text_jump UnknownText_0x1bc570
 	db "@"
-; 0x26fa8
 
-DecorationDesc_ClefairyPoster: ; 0x26fa8
+DecorationDesc_ClefairyPoster:
 	jumptext .ClefairyPosterText
-; 0x26fab
 
-.ClefairyPosterText: ; 0x26fab
+.ClefairyPosterText:
 	; It's a poster of a cute CLEFAIRY.
 	text_jump UnknownText_0x1bc591
 	db "@"
-; 0x26fb0
 
-DecorationDesc_JigglypuffPoster: ; 0x26fb0
+DecorationDesc_JigglypuffPoster:
 	jumptext .JigglypuffPosterText
-; 0x26fb3
 
-.JigglypuffPosterText: ; 0x26fb3
+.JigglypuffPosterText:
 	; It's a poster of a cute JIGGLYPUFF.
 	text_jump UnknownText_0x1bc5b3
 	db "@"
-; 0x26fb8
 
-DecorationDesc_NullPoster: ; 26fb8
+DecorationDesc_NullPoster:
 	end
-; 26fb9
 
-DecorationDesc_LeftOrnament: ; 26fb9
+DecorationDesc_LeftOrnament:
 	ld a, [wDecoLeftOrnament]
 	jr DecorationDesc_OrnamentOrConsole
 
-DecorationDesc_RightOrnament: ; 26fbe
+DecorationDesc_RightOrnament:
 	ld a, [wDecoRightOrnament]
 	jr DecorationDesc_OrnamentOrConsole
 
-DecorationDesc_Console: ; 26fc3
+DecorationDesc_Console:
 	ld a, [wDecoConsole]
 	jr DecorationDesc_OrnamentOrConsole
 
-DecorationDesc_OrnamentOrConsole: ; 26fc8
+DecorationDesc_OrnamentOrConsole:
 	ld c, a
 	ld de, wStringBuffer3
 	call GetDecorationName_c_de
 	ld b, BANK(.OrnamentConsoleScript)
 	ld de, .OrnamentConsoleScript
 	ret
-; 26fd5
 
-.OrnamentConsoleScript: ; 26fd5
+.OrnamentConsoleScript:
 	jumptext .OrnamentConsoleText
-; 26fd8
 
-.OrnamentConsoleText: ; 0x26fd8
+.OrnamentConsoleText:
 	; It's an adorable @ .
 	text_jump UnknownText_0x1bc5d7
 	db "@"
-; 0x26fdd
 
-DecorationDesc_GiantOrnament: ; 26fdd
+DecorationDesc_GiantOrnament:
 	ld b, BANK(.BigDollScript)
 	ld de, .BigDollScript
 	ret
-; 26fe3
 
-.BigDollScript: ; 26fe3
+.BigDollScript:
 	jumptext .BigDollText
-; 26fe6
 
-.BigDollText: ; 0x26fe6
+.BigDollText:
 	; A giant doll! It's fluffy and cuddly.
 	text_jump UnknownText_0x1bc5ef
 	db "@"
-; 0x26feb
 
-Special_ToggleMaptileDecorations: ; 26feb
-	lb de, 0, 4
+ToggleMaptileDecorations:
+	; tile coordinates work the same way as for changeblock
+	lb de, 0, 4 ; bed coordinates
 	ld a, [wDecoBed]
 	call SetDecorationTile
-	lb de, 7, 4
+	lb de, 7, 4 ; plant coordinates
 	ld a, [wDecoPlant]
 	call SetDecorationTile
-	lb de, 6, 0
+	lb de, 6, 0 ; poster coordinates
 	ld a, [wDecoPoster]
 	call SetDecorationTile
 	call SetPosterVisibility
-	lb de, 0, 0
+	lb de, 0, 0 ; carpet top-left coordinates
 	call PadCoords_de
 	ld a, [wDecoCarpet]
 	and a
@@ -1213,19 +1104,18 @@ Special_ToggleMaptileDecorations: ; 26feb
 	call _GetDecorationSprite
 	ld [hl], a
 	push af
-	lb de, 0, 2
+	lb de, 0, 2 ; carpet bottom-left coordinates
 	call PadCoords_de
 	pop af
 	inc a
-	ld [hli], a
+	ld [hli], a ; carpet bottom-left block
 	inc a
-	ld [hli], a
+	ld [hli], a ; carpet bottom-middle block
 	dec a
-	ld [hl], a
+	ld [hl], a ; carpet bottom-right block
 	ret
-; 27027
 
-SetPosterVisibility: ; 27027
+SetPosterVisibility:
 	ld b, SET_FLAG
 	ld a, [wDecoPoster]
 	and a
@@ -1233,11 +1123,10 @@ SetPosterVisibility: ; 27027
 	ld b, RESET_FLAG
 
 .ok
-	ld de, EVENT_KRISS_ROOM_POSTER
+	ld de, EVENT_PLAYERS_ROOM_POSTER
 	jp EventFlagAction
-; 27037
 
-SetDecorationTile: ; 27037
+SetDecorationTile:
 	push af
 	call PadCoords_de
 	pop af
@@ -1246,29 +1135,27 @@ SetDecorationTile: ; 27037
 	call _GetDecorationSprite
 	ld [hl], a
 	ret
-; 27043
 
-Special_ToggleDecorationsVisibility: ; 27043
-	ld de, EVENT_KRISS_HOUSE_2F_CONSOLE
+ToggleDecorationsVisibility:
+	ld de, EVENT_PLAYERS_HOUSE_2F_CONSOLE
 	ld hl, wVariableSprites + SPRITE_CONSOLE - SPRITE_VARS
 	ld a, [wDecoConsole]
 	call ToggleDecorationVisibility
-	ld de, EVENT_KRISS_HOUSE_2F_DOLL_1
+	ld de, EVENT_PLAYERS_HOUSE_2F_DOLL_1
 	ld hl, wVariableSprites + SPRITE_DOLL_1 - SPRITE_VARS
 	ld a, [wDecoLeftOrnament]
 	call ToggleDecorationVisibility
-	ld de, EVENT_KRISS_HOUSE_2F_DOLL_2
+	ld de, EVENT_PLAYERS_HOUSE_2F_DOLL_2
 	ld hl, wVariableSprites + SPRITE_DOLL_2 - SPRITE_VARS
 	ld a, [wDecoRightOrnament]
 	call ToggleDecorationVisibility
-	ld de, EVENT_KRISS_HOUSE_2F_BIG_DOLL
+	ld de, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
 	ld hl, wVariableSprites + SPRITE_BIG_DOLL - SPRITE_VARS
 	ld a, [wDecoBigDoll]
 	call ToggleDecorationVisibility
 	ret
-; 27074
 
-ToggleDecorationVisibility: ; 27074
+ToggleDecorationVisibility:
 	and a
 	jr z, .hide
 	call _GetDecorationSprite
@@ -1279,9 +1166,8 @@ ToggleDecorationVisibility: ; 27074
 .hide
 	ld b, SET_FLAG
 	jp EventFlagAction
-; 27085
 
-_GetDecorationSprite: ; 27085
+_GetDecorationSprite:
 	ld c, a
 	push de
 	push hl
@@ -1290,9 +1176,9 @@ _GetDecorationSprite: ; 27085
 	pop de
 	ld a, c
 	ret
-; 27092
 
-PadCoords_de: ; 27092
+PadCoords_de:
+; adjusts coordinates, the same way as Script_changeblock
 	ld a, d
 	add 4
 	ld d, a
diff --git a/engine/events.asm b/engine/overworld/events.asm
index 2b4cfd586..e4defbc2b 100644
--- a/engine/events.asm
+++ b/engine/overworld/events.asm
@@ -3,7 +3,7 @@ INCLUDE "constants.asm"
 
 SECTION "Events", ROMX
 
-OverworldLoop:: ; 966b0
+OverworldLoop::
 	xor a
 	ld [wMapStatus], a
 .loop
@@ -21,99 +21,83 @@ OverworldLoop:: ; 966b0
 	dw EnterMap
 	dw HandleMap
 	dw .done
-; 966cb
 
-DisableEvents: ; 966cb
+DisableEvents:
 	xor a
 	ld [wScriptFlags3], a
 	ret
-; 966d0
 
-EnableEvents:: ; 966d0
+EnableEvents::
 	ld a, $ff
 	ld [wScriptFlags3], a
 	ret
-; 966d6
 
-CheckBit5_ScriptFlags3: ; 966d6
+CheckBit5_ScriptFlags3:
 	ld hl, wScriptFlags3
 	bit 5, [hl]
 	ret
-; 966dc
 
-DisableWarpsConnxns: ; 966dc
+DisableWarpsConnxns:
 	ld hl, wScriptFlags3
 	res 2, [hl]
 	ret
-; 966e2
 
-DisableCoordEvents: ; 966e2
+DisableCoordEvents:
 	ld hl, wScriptFlags3
 	res 1, [hl]
 	ret
-; 966e8
 
-DisableStepCount: ; 966e8
+DisableStepCount:
 	ld hl, wScriptFlags3
 	res 0, [hl]
 	ret
-; 966ee
 
-DisableWildEncounters: ; 966ee
+DisableWildEncounters:
 	ld hl, wScriptFlags3
 	res 4, [hl]
 	ret
-; 966f4
 
-EnableWarpsConnxns: ; 966f4
+EnableWarpsConnxns:
 	ld hl, wScriptFlags3
 	set 2, [hl]
 	ret
-; 966fa
 
-EnableCoordEvents: ; 966fa
+EnableCoordEvents:
 	ld hl, wScriptFlags3
 	set 1, [hl]
 	ret
-; 96700
 
-EnableStepCount: ; 96700
+EnableStepCount:
 	ld hl, wScriptFlags3
 	set 0, [hl]
 	ret
-; 96706
 
-EnableWildEncounters: ; 96706
+EnableWildEncounters:
 	ld hl, wScriptFlags3
 	set 4, [hl]
 	ret
-; 9670c
 
-CheckWarpConnxnScriptFlag: ; 9670c
+CheckWarpConnxnScriptFlag:
 	ld hl, wScriptFlags3
 	bit 2, [hl]
 	ret
-; 96712
 
-CheckCoordEventScriptFlag: ; 96712
+CheckCoordEventScriptFlag:
 	ld hl, wScriptFlags3
 	bit 1, [hl]
 	ret
-; 96718
 
-CheckStepCountScriptFlag: ; 96718
+CheckStepCountScriptFlag:
 	ld hl, wScriptFlags3
 	bit 0, [hl]
 	ret
-; 9671e
 
-CheckWildEncountersScriptFlag: ; 9671e
+CheckWildEncountersScriptFlag:
 	ld hl, wScriptFlags3
 	bit 4, [hl]
 	ret
-; 96724
 
-StartMap: ; 96724
+StartMap:
 	xor a
 	ld [wScriptVar], a
 	xor a
@@ -123,7 +107,7 @@ StartMap: ; 96724
 	call ByteFill
 	farcall InitCallReceiveDelay
 	call ClearJoypad
-EnterMap: ; 9673e
+EnterMap:
 	xor a
 	ld [wXYComparePointer], a
 	ld [wXYComparePointer + 1], a
@@ -149,15 +133,13 @@ EnterMap: ; 9673e
 	ld a, 2 ; HandleMap
 	ld [wMapStatus], a
 	ret
-; 9676d
 
-UnusedWait30Frames: ; 9676d
+UnusedWait30Frames:
 	ld c, 30
 	call DelayFrames
 	ret
-; 96773
 
-HandleMap: ; 96773
+HandleMap:
 	call ResetOverworldDelay
 	call HandleMapTimeAndJoypad
 	farcall HandleCmdQueue ; no need to farcall
@@ -173,9 +155,8 @@ HandleMap: ; 96773
 	call HandleMapBackground
 	call CheckPlayerState
 	ret
-; 96795
 
-MapEvents: ; 96795
+MapEvents:
 	ld a, [wMapEventStatus]
 	ld hl, .jumps
 	rst JumpTable
@@ -184,39 +165,33 @@ MapEvents: ; 96795
 .jumps
 	dw .events
 	dw .no_events
-; 967a1
 
-.events ; 967a1
+.events
 	call PlayerEvents
 	call DisableEvents
 	farcall ScriptEvents
 	ret
-; 967ae
 
-.no_events ; 967ae
+.no_events
 	ret
-; 967af
 
-MaxOverworldDelay: ; 967af
+MaxOverworldDelay:
 	db 2
-; 967b0
 
-ResetOverworldDelay: ; 967b0
+ResetOverworldDelay:
 	ld a, [MaxOverworldDelay]
 	ld [wOverworldDelay], a
 	ret
-; 967b7
 
-NextOverworldFrame: ; 967b7
+NextOverworldFrame:
 	ld a, [wOverworldDelay]
 	and a
 	ret z
 	ld c, a
 	call DelayFrames
 	ret
-; 967c1
 
-HandleMapTimeAndJoypad: ; 967c1
+HandleMapTimeAndJoypad:
 	ld a, [wMapEventStatus]
 	cp 1 ; no events
 	ret z
@@ -225,23 +200,20 @@ HandleMapTimeAndJoypad: ; 967c1
 	call GetJoypad
 	call TimeOfDayPals
 	ret
-; 967d1
 
-HandleMapObjects: ; 967d1
+HandleMapObjects:
 	farcall HandleNPCStep ; engine/map_objects.asm
 	farcall _HandlePlayerStep
 	call _CheckObjectEnteringVisibleRange
 	ret
-; 967e1
 
-HandleMapBackground: ; 967e1
+HandleMapBackground:
 	farcall _UpdateSprites
 	farcall ScrollScreen
 	farcall PlaceMapNameSign
 	ret
-; 967f4
 
-CheckPlayerState: ; 967f4
+CheckPlayerState:
 	ld a, [wPlayerStepFlags]
 	bit 5, a ; in the middle of step
 	jr z, .events
@@ -259,17 +231,15 @@ CheckPlayerState: ; 967f4
 	ld a, 1 ; no events
 	ld [wMapEventStatus], a
 	ret
-; 96812
 
-_CheckObjectEnteringVisibleRange: ; 96812
+_CheckObjectEnteringVisibleRange:
 	ld hl, wPlayerStepFlags
 	bit 6, [hl]
 	ret z
 	farcall CheckObjectEnteringVisibleRange
 	ret
-; 9681f
 
-PlayerEvents: ; 9681f
+PlayerEvents:
 	xor a
 ; If there's already a player event, don't interrupt it.
 	ld a, [wScriptRunning]
@@ -318,9 +288,8 @@ PlayerEvents: ; 9681f
 .ok2
 	scf
 	ret
-; 96867
 
-CheckTrainerBattle3: ; 96867
+CheckTrainerBattle3:
 	nop
 	nop
 	call CheckTrainerBattle2
@@ -333,9 +302,8 @@ CheckTrainerBattle3: ; 96867
 .nope
 	xor a
 	ret
-; 96874
 
-CheckTileEvent: ; 96874
+CheckTileEvent:
 ; Check for warps, coord events, or wild battles.
 
 	call CheckWarpConnxnScriptFlag
@@ -399,9 +367,8 @@ CheckTileEvent: ; 96874
 	call GetMapScriptsBank
 	call CallScript
 	ret
-; 968c7
 
-CheckWildEncounterCooldown:: ; 968c7
+CheckWildEncounterCooldown::
 	ld hl, wWildEncounterCooldown
 	ld a, [hl]
 	and a
@@ -410,35 +377,30 @@ CheckWildEncounterCooldown:: ; 968c7
 	ret z
 	scf
 	ret
-; 968d1
 
-SetUpFiveStepWildEncounterCooldown: ; 968d1
+SetUpFiveStepWildEncounterCooldown:
 	ld a, 5
 	ld [wWildEncounterCooldown], a
 	ret
-; 968d7
 
-ret_968d7: ; 968d7
+ret_968d7:
 	ret
-;968d8
 
-SetMinTwoStepWildEncounterCooldown: ; 968d8
+SetMinTwoStepWildEncounterCooldown:
 	ld a, [wWildEncounterCooldown]
 	cp 2
 	ret nc
 	ld a, 2
 	ld [wWildEncounterCooldown], a
 	ret
-; 968e4
 
-Dummy_CheckScriptFlags3Bit5: ; 968e4
+Dummy_CheckScriptFlags3Bit5:
 	call CheckBit5_ScriptFlags3
 	ret z
 	call ret_2f3e
 	ret
-; 968ec
 
-RunSceneScript: ; 968ec
+RunSceneScript:
 	ld a, [wCurrMapSceneScriptCount]
 	and a
 	jr z, .nope
@@ -485,15 +447,14 @@ endr
 .nope
 	xor a
 	ret
-; 9693a
 
-CheckTimeEvents: ; 9693a
+CheckTimeEvents:
 	ld a, [wLinkMode]
 	and a
 	jr nz, .nothing
 
 	ld hl, wStatusFlags2
-	bit 2, [hl] ; bug contest
+	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
 	jr z, .do_daily
 
 	farcall CheckBugContestTimer
@@ -517,16 +478,13 @@ CheckTimeEvents: ; 9693a
 	call CallScript
 	scf
 	ret
-; 96970
 
-.unused ; 96970
+.unused
 	ld a, 8
 	scf
 	ret
-; 96974
-
-OWPlayerInput: ; 96974
 
+OWPlayerInput:
 	call PlayerMovement
 	ret c
 	and a
@@ -552,9 +510,8 @@ OWPlayerInput: ; 96974
 	pop af
 	scf
 	ret
-; 96999
 
-CheckAPressOW: ; 96999
+CheckAPressOW:
 	ld a, [hJoyPressed]
 	and A_BUTTON
 	ret z
@@ -566,17 +523,15 @@ CheckAPressOW: ; 96999
 	ret c
 	xor a
 	ret
-; 969ac
 
-PlayTalkObject: ; 969ac
+PlayTalkObject:
 	push de
 	ld de, SFX_READ_TEXT_2
 	call PlaySFX
 	pop de
 	ret
-; 969b5
 
-TryObjectEvent: ; 969b5
+TryObjectEvent:
 	farcall CheckFacingObject
 	jr c, .IsObject
 	xor a
@@ -627,9 +582,8 @@ TryObjectEvent: ; 969b5
 	dbw OBJECTTYPE_5, .five
 	dbw OBJECTTYPE_6, .six
 	db -1
-; 96a04
 
-.script ; 96a04
+.script
 	ld hl, MAPOBJECT_SCRIPT_POINTER
 	add hl, bc
 	ld a, [hli]
@@ -638,9 +592,8 @@ TryObjectEvent: ; 969b5
 	call GetMapScriptsBank
 	call CallScript
 	ret
-; 96a12
 
-.itemball ; 96a12
+.itemball
 	ld hl, MAPOBJECT_SCRIPT_POINTER
 	add hl, bc
 	ld a, [hli]
@@ -653,36 +606,30 @@ TryObjectEvent: ; 969b5
 	ld a, PLAYEREVENT_ITEMBALL
 	scf
 	ret
-; 96a29
 
-.trainer ; 96a29
+.trainer
 	call TalkToTrainer
 	ld a, PLAYEREVENT_TALKTOTRAINER
 	scf
 	ret
-; 96a30
 
-.three ; 96a30
+.three
 	xor a
 	ret
-; 96a32
 
-.four ; 96a32
+.four
 	xor a
 	ret
-; 96a34
 
-.five ; 96a34
+.five
 	xor a
 	ret
-; 96a36
 
-.six ; 96a36
+.six
 	xor a
 	ret
-; 96a38
 
-TryBGEvent: ; 96a38
+TryBGEvent:
 	call CheckFacingBGEvent
 	jr c, .is_bg_event
 	xor a
@@ -704,7 +651,6 @@ TryBGEvent: ; 96a38
 	dw .ifnotset
 	dw .itemifset
 	dw .copy
-; 96a59
 
 .up
 	ld b, OW_UP
@@ -784,9 +730,8 @@ TryBGEvent: ; 96a38
 .dontread
 	xor a
 	ret
-; 96ad8
 
-CheckBGEventFlag: ; 96ad8
+CheckBGEventFlag:
 	ld hl, wEngineBuffer4
 	ld a, [hli]
 	ld h, [hl]
@@ -802,16 +747,14 @@ CheckBGEventFlag: ; 96ad8
 	and a
 	pop hl
 	ret
-; 96af0
 
-PlayerMovement: ; 96af0
+PlayerMovement:
 	farcall DoPlayerMovement
 	ld a, c
 	ld hl, .pointers
 	rst JumpTable
 	ld a, c
 	ret
-; 96afd
 
 .pointers
 	dw .zero
@@ -824,34 +767,30 @@ PlayerMovement: ; 96af0
 	dw .seven
 
 .zero
-.four ; 96b0d
+.four
 	xor a
 	ld c, a
 	ret
-; 96b10
 
-.seven ; 96b10
+.seven
 	call ret_968d7 ; mobile
 	xor a
 	ld c, a
 	ret
-; 96b16
 
-.one ; 96b16
+.one
 	ld a, 5
 	ld c, a
 	scf
 	ret
-; 96b1b
 
-.two ; 96b1b
+.two
 	ld a, 9
 	ld c, a
 	scf
 	ret
-; 96b20
 
-.three ; 96b20
+.three
 ; force the player to move in some direction
 	ld a, BANK(Script_ForcedMovement)
 	ld hl, Script_ForcedMovement
@@ -860,17 +799,15 @@ PlayerMovement: ; 96af0
 	ld c, a
 	scf
 	ret
-; 96b2b
 
 .five
-.six ; 96b2b
+.six
 	ld a, -1
 	ld c, a
 	and a
 	ret
-; 96b30
 
-CheckMenuOW: ; 96b30
+CheckMenuOW:
 	xor a
 	ld [hMenuReturn], a
 	ld [hMenuReturn + 1], a
@@ -899,36 +836,30 @@ CheckMenuOW: ; 96b30
 	call CallScript
 	scf
 	ret
-; 96b58
 
-StartMenuScript: ; 96b58
+StartMenuScript:
 	callasm StartMenu
 	jump StartMenuCallback
-; 96b5f
 
-SelectMenuScript: ; 96b5f
+SelectMenuScript:
 	callasm SelectMenu
 	jump SelectMenuCallback
-; 96b66
 
 StartMenuCallback:
-SelectMenuCallback: ; 96b66
+SelectMenuCallback:
 	copybytetovar hMenuReturn
-	if_equal HMENURETURN_SCRIPT, .Script
-	if_equal HMENURETURN_ASM, .Asm
+	ifequal HMENURETURN_SCRIPT, .Script
+	ifequal HMENURETURN_ASM, .Asm
 	end
-; 96b72
 
-.Script: ; 96b72
+.Script:
 	ptjump wQueuedScriptBank
-; 96b75
 
-.Asm: ; 96b75
+.Asm:
 	ptcallasm wQueuedScriptBank
 	end
-; 96b79
 
-CountStep: ; 96b79
+CountStep:
 	; Don't count steps in link communication rooms.
 	ld a, [wLinkMode]
 	and a
@@ -993,16 +924,14 @@ CountStep: ; 96b79
 	ld a, 8
 	scf
 	ret
-; 96bd3
 
 ; unused
-.unreferenced ; 96bd3
+.unreferenced
 	ld a, 7
 	scf
 	ret
-; 96bd7
 
-DoRepelStep: ; 96bd7
+DoRepelStep:
 	ld a, [wRepelEffect]
 	and a
 	ret z
@@ -1016,9 +945,8 @@ DoRepelStep: ; 96bd7
 	call CallScript
 	scf
 	ret
-; 96beb
 
-DoPlayerEvent: ; 96beb
+DoPlayerEvent:
 	ld a, [wScriptRunning]
 	and a
 	ret z
@@ -1042,9 +970,8 @@ DoPlayerEvent: ; 96beb
 	ld a, [hl]
 	ld [wScriptPos + 1], a
 	ret
-; 96c0c
 
-PlayerEventScriptPointers: ; 96c0c
+PlayerEventScriptPointers:
 	dba Invalid_0x96c2d          ; 0
 	dba SeenByTrainerScript      ; 1
 	dba TalkToTrainerScript      ; 2
@@ -1056,56 +983,656 @@ PlayerEventScriptPointers: ; 96c0c
 	dba HatchEggScript           ; 8
 	dba ChangeDirectionScript    ; 9
 	dba Invalid_0x96c2d          ; 10
-; 96c2d
 
-Invalid_0x96c2d: ; 96c2d
+Invalid_0x96c2d:
 	end
-; 96c2e
 
 ; unused
 	end
-; 96c2f
 
-HatchEggScript: ; 96c2f
+HatchEggScript:
 	callasm OverworldHatchEgg
 	end
-; 96c34
 
-WarpToNewMapScript: ; 96c34
+WarpToNewMapScript:
 	warpsound
 	newloadmap MAPSETUP_DOOR
 	end
-; 96c38
 
-FallIntoMapScript: ; 96c38
+FallIntoMapScript:
 	newloadmap MAPSETUP_FALL
 	playsound SFX_KINESIS
 	applymovement PLAYER, MovementData_0x96c48
 	playsound SFX_STRENGTH
 	scall LandAfterPitfallScript
 	end
-; 96c48
 
-MovementData_0x96c48: ; 96c48
+MovementData_0x96c48:
 	skyfall
 	step_end
-; 96c4a
 
-LandAfterPitfallScript: ; 96c4a
+LandAfterPitfallScript:
 	earthquake 16
 	end
-; 96c4d
 
 EdgeWarpScript: ; 4
 	reloadandreturn MAPSETUP_CONNECTION
-; 96c4f
 
 ChangeDirectionScript: ; 9
 	deactivatefacing 3
 	callasm EnableWildEncounters
 	end
-; 96c56
 
-INCLUDE "engine/scripting.asm"
+INCLUDE "engine/overworld/scripting.asm"
+
+WarpToSpawnPoint::
+	ld hl, wStatusFlags2
+	res STATUSFLAGS2_SAFARI_GAME_F, [hl]
+	res STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
+	ret
+
+RunMemScript::
+; If there is no script here, we don't need to be here.
+	ld a, [wMapReentryScriptQueueFlag]
+	and a
+	ret z
+; Execute the script at (wMapReentryScriptBank):(wMapReentryScriptAddress).
+	ld hl, wMapReentryScriptAddress
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ld a, [wMapReentryScriptBank]
+	call CallScript
+	scf
+; Clear the buffer for the next script.
+	push af
+	xor a
+	ld hl, wMapReentryScriptQueueFlag
+	ld bc, 8
+	call ByteFill
+	pop af
+	ret
+
+LoadScriptBDE::
+; If there's already a script here, don't overwrite.
+	ld hl, wMapReentryScriptQueueFlag
+	ld a, [hl]
+	and a
+	ret nz
+; Set the flag
+	ld [hl], 1
+	inc hl
+; Load the script pointer b:de into (wMapReentryScriptBank):(wMapReentryScriptAddress)
+	ld [hl], b
+	inc hl
+	ld [hl], e
+	inc hl
+	ld [hl], d
+	scf
+	ret
+
+TryTileCollisionEvent::
+	call GetFacingTileCoord
+	ld [wEngineBuffer1], a
+	ld c, a
+	farcall CheckFacingTileForStdScript
+	jr c, .done
+
+	call CheckCutTreeTile
+	jr nz, .whirlpool
+	farcall TryCutOW
+	jr .done
+
+.whirlpool
+	ld a, [wEngineBuffer1]
+	call CheckWhirlpoolTile
+	jr nz, .waterfall
+	farcall TryWhirlpoolOW
+	jr .done
+
+.waterfall
+	ld a, [wEngineBuffer1]
+	call CheckWaterfallTile
+	jr nz, .headbutt
+	farcall TryWaterfallOW
+	jr .done
+
+.headbutt
+	ld a, [wEngineBuffer1]
+	call CheckHeadbuttTreeTile
+	jr nz, .surf
+	farcall TryHeadbuttOW
+	jr c, .done
+	jr .noevent
+
+.surf
+	farcall TrySurfOW
+	jr nc, .noevent
+	jr .done
+
+.noevent
+	xor a
+	ret
+
+.done
+	call PlayClickSFX
+	ld a, $ff
+	scf
+	ret
+
+RandomEncounter::
+; Random encounter
+
+	call CheckWildEncounterCooldown
+	jr c, .nope
+	call CanUseSweetScent
+	jr nc, .nope
+	ld hl, wStatusFlags2
+	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
+	jr nz, .bug_contest
+	farcall TryWildEncounter
+	jr nz, .nope
+	jr .ok
+
+.bug_contest
+	call _TryWildEncounter_BugContest
+	jr nc, .nope
+	jr .ok_bug_contest
+
+.nope
+	ld a, 1
+	and a
+	ret
+
+.ok
+	ld a, BANK(WildBattleScript)
+	ld hl, WildBattleScript
+	jr .done
+
+.ok_bug_contest
+	ld a, BANK(BugCatchingContestBattleScript)
+	ld hl, BugCatchingContestBattleScript
+	jr .done
+
+.done
+	call CallScript
+	scf
+	ret
+
+WildBattleScript:
+	randomwildmon
+	startbattle
+	reloadmapafterbattle
+	end
+
+CanUseSweetScent::
+	ld hl, wStatusFlags
+	bit STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
+	jr nz, .no
+	ld a, [wEnvironment]
+	cp CAVE
+	jr z, .ice_check
+	cp DUNGEON
+	jr z, .ice_check
+	farcall CheckGrassCollision
+	jr nc, .no
+
+.ice_check
+	ld a, [wPlayerStandingTile]
+	call CheckIceTile
+	jr z, .no
+	scf
+	ret
+
+.no
+	and a
+	ret
+
+_TryWildEncounter_BugContest:
+	call TryWildEncounter_BugContest
+	ret nc
+	call ChooseWildEncounter_BugContest
+	farcall CheckRepelEffect
+	ret
+
+ChooseWildEncounter_BugContest::
+; Pick a random mon out of ContestMons.
+
+.loop
+	call Random
+	cp 100 << 1
+	jr nc, .loop
+	srl a
+
+	ld hl, ContestMons
+	ld de, 4
+.CheckMon:
+	sub [hl]
+	jr c, .GotMon
+	add hl, de
+	jr .CheckMon
+
+.GotMon:
+	inc hl
+
+; Species
+	ld a, [hli]
+	ld [wTempWildMonSpecies], a
+
+; Min level
+	ld a, [hli]
+	ld d, a
+
+; Max level
+	ld a, [hl]
+
+	sub d
+	jr nz, .RandomLevel
+
+; If min and max are the same.
+	ld a, d
+	jr .GotLevel
+
+.RandomLevel:
+; Get a random level between the min and max.
+	ld c, a
+	inc c
+	call Random
+	ld a, [hRandomAdd]
+	call SimpleDivide
+	add d
+
+.GotLevel:
+	ld [wCurPartyLevel], a
+
+	xor a
+	ret
+
+TryWildEncounter_BugContest:
+	ld a, [wPlayerStandingTile]
+	call CheckSuperTallGrassTile
+	ld b, 40 percent
+	jr z, .ok
+	ld b, 20 percent
+
+.ok
+	farcall ApplyMusicEffectOnEncounterRate
+	farcall ApplyCleanseTagEffectOnEncounterRate
+	call Random
+	ld a, [hRandomAdd]
+	cp b
+	ret c
+	ld a, 1
+	and a
+	ret
+
+INCLUDE "data/wild/bug_contest_mons.asm"
+
+DoBikeStep::
+	nop
+	nop
+	; If the bike shop owner doesn't have our number, or
+	; if we've already gotten the call, we don't have to
+	; be here.
+	ld hl, wStatusFlags2
+	bit STATUSFLAGS2_BIKE_SHOP_CALL_F, [hl]
+	jr z, .NoCall
+
+	; If we're not on the bike, we don't have to be here.
+	ld a, [wPlayerState]
+	cp PLAYER_BIKE
+	jr nz, .NoCall
+
+	; If we're not in an area of phone service, we don't
+	; have to be here.
+	call GetMapPhoneService
+	and a
+	jr nz, .NoCall
+
+	; Check the bike step count and check whether we've
+	; taken 65536 of them yet.
+	ld hl, wBikeStep
+	ld a, [hli]
+	ld d, a
+	ld e, [hl]
+	cp 255
+	jr nz, .increment
+	ld a, e
+	cp 255
+	jr z, .dont_increment
+
+.increment
+	inc de
+	ld [hl], e
+	dec hl
+	ld [hl], d
+
+.dont_increment
+	; If we've taken at least 1024 steps, have the bike
+	;  shop owner try to call us.
+	ld a, d
+	cp HIGH(1024)
+	jr c, .NoCall
+
+	; If a call has already been queued, don't overwrite
+	; that call.
+	ld a, [wSpecialPhoneCallID]
+	and a
+	jr nz, .NoCall
+
+	; Queue the call.
+	ld a, SPECIALCALL_BIKESHOP
+	ld [wSpecialPhoneCallID], a
+	xor a
+	ld [wSpecialPhoneCallID + 1], a
+	ld hl, wStatusFlags2
+	res STATUSFLAGS2_BIKE_SHOP_CALL_F, [hl]
+	scf
+	ret
+
+.NoCall:
+	xor a
+	ret
+
+ClearCmdQueue::
+	ld hl, wCmdQueue
+	ld de, CMDQUEUE_ENTRY_SIZE
+	ld c, CMDQUEUE_CAPACITY
+	xor a
+.loop
+	ld [hl], a
+	add hl, de
+	dec c
+	jr nz, .loop
+	ret
 
-INCLUDE "engine/events_2.asm"
+HandleCmdQueue::
+	ld hl, wCmdQueue
+	xor a
+.loop
+	ld [hMapObjectIndexBuffer], a
+	ld a, [hl]
+	and a
+	jr z, .skip
+	push hl
+	ld b, h
+	ld c, l
+	call HandleQueuedCommand
+	pop hl
+
+.skip
+	ld de, CMDQUEUE_ENTRY_SIZE
+	add hl, de
+	ld a, [hMapObjectIndexBuffer]
+	inc a
+	cp CMDQUEUE_CAPACITY
+	jr nz, .loop
+	ret
+
+Unreferenced_GetNthCmdQueueEntry:
+	ld hl, wCmdQueue
+	ld bc, CMDQUEUE_ENTRY_SIZE
+	call AddNTimes
+	ld b, h
+	ld c, l
+	ret
+
+WriteCmdQueue::
+	push bc
+	push de
+	call .GetNextEmptyEntry
+	ld d, h
+	ld e, l
+	pop hl
+	pop bc
+	ret c
+	ld a, b
+	ld bc, CMDQUEUE_ENTRY_SIZE - 1
+	call FarCopyBytes
+	xor a
+	ld [hl], a
+	ret
+
+.GetNextEmptyEntry:
+	ld hl, wCmdQueue
+	ld de, CMDQUEUE_ENTRY_SIZE
+	ld c, CMDQUEUE_CAPACITY
+.loop
+	ld a, [hl]
+	and a
+	jr z, .done
+	add hl, de
+	dec c
+	jr nz, .loop
+	scf
+	ret
+
+.done
+	ld a, CMDQUEUE_CAPACITY
+	sub c
+	and a
+	ret
+
+DelCmdQueue::
+	ld hl, wCmdQueue
+	ld de, CMDQUEUE_ENTRY_SIZE
+	ld c, CMDQUEUE_CAPACITY
+.loop
+	ld a, [hl]
+	cp b
+	jr z, .done
+	add hl, de
+	dec c
+	jr nz, .loop
+	and a
+	ret
+
+.done
+	xor a
+	ld [hl], a
+	scf
+	ret
+
+_DelCmdQueue:
+	ld hl, CMDQUEUE_TYPE
+	add hl, bc
+	ld [hl], 0
+	ret
+
+HandleQueuedCommand:
+	ld hl, CMDQUEUE_TYPE
+	add hl, bc
+	ld a, [hl]
+	cp NUM_CMDQUEUE_TYPES
+	jr c, .okay
+	xor a
+
+.okay
+	ld e, a
+	ld d, 0
+	ld hl, .Jumptable
+	add hl, de
+	add hl, de
+	add hl, de
+	ld a, [hli]
+	push af
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	pop af
+	rst FarCall
+	ret
+
+.Jumptable:
+	dba CmdQueue_Null
+	dba CmdQueue_Null2
+	dba CmdQueue_StoneTable
+	dba CmdQueue_Type3
+	dba CmdQueue_Type4
+
+CmdQueueAnonymousJumptable:
+	ld hl, CMDQUEUE_05
+	add hl, bc
+	ld a, [hl]
+	pop hl
+	rst JumpTable
+	ret
+
+CmdQueueAnonJT_Increment:
+	ld hl, CMDQUEUE_05
+	add hl, bc
+	inc [hl]
+	ret
+
+CmdQueueAnonJT_Decrement:
+	ld hl, CMDQUEUE_05
+	add hl, bc
+	dec [hl]
+	ret
+
+CmdQueue_Null:
+	ret
+
+CmdQueue_Null2:
+	call ret_2f3e
+	ret
+
+CmdQueue_Type4:
+	call CmdQueueAnonymousJumptable
+	; anonymous dw
+	dw .zero
+	dw .one
+
+.zero
+	ld a, [hSCY]
+	ld hl, 4
+	add hl, bc
+	ld [hl], a
+	call CmdQueueAnonJT_Increment
+.one
+	ld hl, 1
+	add hl, bc
+	ld a, [hl]
+	dec a
+	ld [hl], a
+	jr z, .finish
+	and $1
+	jr z, .add
+	ld hl, 2
+	add hl, bc
+	ld a, [hSCY]
+	sub [hl]
+	ld [hSCY], a
+	ret
+
+.add
+	ld hl, 2
+	add hl, bc
+	ld a, [hSCY]
+	add [hl]
+	ld [hSCY], a
+	ret
+
+.finish
+	ld hl, 4
+	add hl, bc
+	ld a, [hl]
+	ld [hSCY], a
+	call _DelCmdQueue
+	ret
+
+CmdQueue_Type3:
+	call CmdQueueAnonymousJumptable
+	; anonymous dw
+	dw .zero
+	dw .one
+	dw .two
+
+.zero
+	call .IsPlayerFacingDown
+	jr z, .PlayerNotFacingDown
+	call CmdQueueAnonJT_Increment
+.one
+	call .IsPlayerFacingDown
+	jr z, .PlayerNotFacingDown
+	call CmdQueueAnonJT_Increment
+
+	ld hl, 2
+	add hl, bc
+	ld a, [hl]
+	ld [wd173], a
+	ret
+
+.two
+	call .IsPlayerFacingDown
+	jr z, .PlayerNotFacingDown
+	call CmdQueueAnonJT_Decrement
+
+	ld hl, 3
+	add hl, bc
+	ld a, [hl]
+	ld [wd173], a
+	ret
+
+.PlayerNotFacingDown:
+	ld a, $7f
+	ld [wd173], a
+	ld hl, 5
+	add hl, bc
+	ld [hl], 0
+	ret
+
+.IsPlayerFacingDown:
+	push bc
+	ld bc, wPlayerStruct
+	call GetSpriteDirection
+	and a
+	pop bc
+	ret
+
+CmdQueue_StoneTable:
+	ld de, wPlayerStruct
+	ld a, NUM_OBJECT_STRUCTS
+.loop
+	push af
+
+	ld hl, OBJECT_SPRITE
+	add hl, de
+	ld a, [hl]
+	and a
+	jr z, .next
+
+	ld hl, OBJECT_MOVEMENTTYPE
+	add hl, de
+	ld a, [hl]
+	cp SPRITEMOVEDATA_STRENGTH_BOULDER
+	jr nz, .next
+
+	ld hl, OBJECT_NEXT_TILE
+	add hl, de
+	ld a, [hl]
+	call CheckPitTile
+	jr nz, .next
+
+	ld hl, OBJECT_DIRECTION_WALKING
+	add hl, de
+	ld a, [hl]
+	cp STANDING
+	jr nz, .next
+	call HandleStoneQueue
+	jr c, .fall_down_hole
+
+.next
+	ld hl, OBJECT_STRUCT_LENGTH
+	add hl, de
+	ld d, h
+	ld e, l
+
+	pop af
+	dec a
+	jr nz, .loop
+	ret
+
+.fall_down_hole
+	pop af
+	ret
diff --git a/engine/init_map.asm b/engine/overworld/init_map.asm
index 2eb4998a6..ba1e74295 100644
--- a/engine/init_map.asm
+++ b/engine/overworld/init_map.asm
@@ -1,4 +1,4 @@
-ReanchorBGMap_NoOAMUpdate:: ; 6454
+ReanchorBGMap_NoOAMUpdate::
 	call DelayFrame
 	ld a, [hOAMUpdate]
 	push af
@@ -50,13 +50,13 @@ ReanchorBGMap_NoOAMUpdate:: ; 6454
 	call ApplyBGMapAnchorToObjects
 	ret
 
-.LoadBGMapAddrIntoHRAM: ; 64b9
+.LoadBGMapAddrIntoHRAM:
 	ld [hBGMapAddress + 1], a
 	xor a
 	ld [hBGMapAddress], a
 	ret
 
-LoadFonts_NoOAMUpdate:: ; 64bf
+LoadFonts_NoOAMUpdate::
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -76,7 +76,7 @@ LoadFonts_NoOAMUpdate:: ; 64bf
 	call LoadStandardFont
 	ret
 
-HDMATransfer_FillBGMap0WithBlack: ; 64db
+HDMATransfer_FillBGMap0WithBlack:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
diff --git a/engine/landmarks.asm b/engine/overworld/landmarks.asm
index f16f48e67..9deafb8e6 100644
--- a/engine/landmarks.asm
+++ b/engine/overworld/landmarks.asm
@@ -1,4 +1,4 @@
-GetLandmarkCoords: ; 0x1ca896
+GetLandmarkCoords:
 ; Return coordinates (d, e) of landmark e.
 	push hl
 	ld l, e
@@ -12,10 +12,8 @@ GetLandmarkCoords: ; 0x1ca896
 	ld d, [hl]
 	pop hl
 	ret
-; 0x1ca8a5
 
-
-GetLandmarkName:: ; 0x1ca8a5
+GetLandmarkName::
 ; Copy the name of landmark e to wStringBuffer1.
 	push hl
 	push de
@@ -44,13 +42,10 @@ GetLandmarkName:: ; 0x1ca8a5
 	pop de
 	pop hl
 	ret
-; 0x1ca8c3
-
 
 INCLUDE "data/maps/landmarks.asm"
 
-
-RegionCheck: ; 0x1caea1
+RegionCheck:
 ; Checks if the player is in Kanto or Johto.
 ; If in Johto, returns 0 in e.
 ; If in Kanto, returns 1 in e.
diff --git a/engine/routines/loadmappart.asm b/engine/overworld/load_map_part.asm
index 2184ebf7e..da1436406 100644
--- a/engine/routines/loadmappart.asm
+++ b/engine/overworld/load_map_part.asm
@@ -1,9 +1,9 @@
-_LoadMapPart:: ; 4d15b
-	ld hl, wMisc
+_LoadMapPart::
+	ld hl, wSurroundingTiles
 	ld a, [wMetatileStandingY]
 	and a
 	jr z, .top_row
-	ld bc, WMISC_WIDTH * 2
+	ld bc, SURROUNDING_WIDTH * 2
 	add hl, bc
 
 .top_row
@@ -25,7 +25,7 @@ _LoadMapPart:: ; 4d15b
 	dec c
 	jr nz, .loop2
 	ld a, l
-	add 4
+	add METATILE_WIDTH
 	ld l, a
 	jr nc, .carry
 	inc h
diff --git a/engine/map_object_action.asm b/engine/overworld/map_object_action.asm
index c82cd80a2..2c4834a3d 100755..100644
--- a/engine/map_object_action.asm
+++ b/engine/overworld/map_object_action.asm
@@ -1,4 +1,4 @@
-ObjectActionPairPointers: ; 445f
+ObjectActionPairPointers:
 ; entries correspond to OBJECT_ACTION_* constants
 	dw SetFacingStanding,              SetFacingStanding
 	dw SetFacingStandAction,           SetFacingCurrent
@@ -17,37 +17,33 @@ ObjectActionPairPointers: ; 445f
 	dw SetFacingBoulderDust,           SetFacingStanding
 	dw SetFacingGrassShake,            SetFacingStanding
 	dw SetFacingSkyfall,               SetFacingCurrent
-; 44a3
 
-SetFacingStanding: ; 44a3
+SetFacingStanding:
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], STANDING
 	ret
-; 44aa
 
-SetFacingCurrent: ; 44aa
+SetFacingCurrent:
 	call GetSpriteDirection
 	or FACING_STEP_DOWN_0 ; useless
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], a
 	ret
-; 44b5
 
-SetFacingStandAction: ; 44b5
+SetFacingStandAction:
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld a, [hl]
 	and 1
 	jr nz, SetFacingStepAction
 	jp SetFacingCurrent
-; 44c1
 
-SetFacingStepAction: ; 44c1
+SetFacingStepAction:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit SLIDING, [hl]
+	bit SLIDING_F, [hl]
 	jp nz, SetFacingCurrent
 
 	ld hl, OBJECT_STEP_FRAME
@@ -59,7 +55,7 @@ SetFacingStepAction: ; 44c1
 
 	rrca
 	rrca
-	and %00000011
+	maskbits NUM_DIRECTIONS
 	ld d, a
 
 	call GetSpriteDirection
@@ -69,12 +65,11 @@ SetFacingStepAction: ; 44c1
 	add hl, bc
 	ld [hl], a
 	ret
-; 44e4
 
-SetFacingSkyfall: ; 44e4
+SetFacingSkyfall:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit SLIDING, [hl]
+	bit SLIDING_F, [hl]
 	jp nz, SetFacingCurrent
 
 	ld hl, OBJECT_STEP_FRAME
@@ -86,7 +81,7 @@ SetFacingSkyfall: ; 44e4
 
 	rrca
 	rrca
-	and %00000011
+	maskbits NUM_DIRECTIONS
 	ld d, a
 
 	call GetSpriteDirection
@@ -96,12 +91,11 @@ SetFacingSkyfall: ; 44e4
 	add hl, bc
 	ld [hl], a
 	ret
-; 4508
 
-SetFacingBumpAction: ; 4508
+SetFacingBumpAction:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit SLIDING, [hl]
+	bit SLIDING_F, [hl]
 	jp nz, SetFacingCurrent
 
 	ld hl, OBJECT_STEP_FRAME
@@ -112,7 +106,7 @@ SetFacingBumpAction: ; 4508
 	rrca
 	rrca
 	rrca
-	and %00000011
+	maskbits NUM_DIRECTIONS
 	ld d, a
 
 	call GetSpriteDirection
@@ -122,9 +116,8 @@ SetFacingBumpAction: ; 4508
 	add hl, bc
 	ld [hl], a
 	ret
-; 4529
 
-SetFacingCounterclockwiseSpin: ; 4529
+SetFacingCounterclockwiseSpin:
 	call CounterclockwiseSpinAction
 	ld hl, OBJECT_FACING
 	add hl, bc
@@ -134,14 +127,12 @@ SetFacingCounterclockwiseSpin: ; 4529
 	add hl, bc
 	ld [hl], a
 	ret
-; 4539
 
-SetFacingCounterclockwiseSpin2: ; 4539
+SetFacingCounterclockwiseSpin2:
 	call CounterclockwiseSpinAction
 	jp SetFacingStanding
-; 453f
 
-CounterclockwiseSpinAction: ; 453f
+CounterclockwiseSpinAction:
 ; Here, OBJECT_STEP_FRAME consists of two 2-bit components,
 ; using only bits 0,1 and 4,5.
 ; bits 0,1 is a timer (4 overworld frames)
@@ -179,13 +170,11 @@ CounterclockwiseSpinAction: ; 453f
 	add hl, bc
 	ld [hl], a
 	ret
-; 456a
 
-.Directions: ; 456a
+.Directions:
 	db OW_DOWN, OW_RIGHT, OW_UP, OW_LEFT
-; 456e
 
-SetFacingFish: ; 456e
+SetFacingFish:
 	call GetSpriteDirection
 	rrca
 	rrca
@@ -194,30 +183,26 @@ SetFacingFish: ; 456e
 	add hl, bc
 	ld [hl], a
 	ret
-; 457b
 
-SetFacingShadow: ; 457b
+SetFacingShadow:
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], FACING_SHADOW
 	ret
-; 4582
 
-SetFacingEmote: ; 4582 emote
+SetFacingEmote:
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], FACING_EMOTE
 	ret
-; 4589
 
-SetFacingBigDollSym: ; 4589
+SetFacingBigDollSym:
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], FACING_BIG_DOLL_SYM
 	ret
-; 4590
 
-SetFacingBounce: ; 4590
+SetFacingBounce:
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	ld a, [hl]
@@ -230,22 +215,20 @@ SetFacingBounce: ; 4590
 	add hl, bc
 	ld [hl], FACING_STEP_UP_0
 	ret
-; 45a4
 
-SetFacingFreezeBounce: ; 45a4
+SetFacingFreezeBounce:
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], FACING_STEP_DOWN_0
 	ret
-; 45ab
 
-SetFacingWeirdTree: ; 45ab
+SetFacingWeirdTree:
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	ld a, [hl]
 	inc a
 	ld [hl], a
-	and %00001100
+	maskbits NUM_DIRECTIONS, 2
 	rrca
 	rrca
 	add FACING_WEIRD_TREE_0
@@ -253,16 +236,14 @@ SetFacingWeirdTree: ; 45ab
 	add hl, bc
 	ld [hl], a
 	ret
-; 45be
 
-SetFacingBigDollAsym: ; 45be
+SetFacingBigDollAsym:
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], FACING_BIG_DOLL_ASYM
 	ret
-; 45c5
 
-SetFacingBigDoll: ; 45c5
+SetFacingBigDoll:
 	ld a, [wVariableSprites + SPRITE_BIG_DOLL - SPRITE_VARS]
 	ld d, FACING_BIG_DOLL_SYM ; symmetric
 	cp SPRITE_BIG_SNORLAX
@@ -276,9 +257,8 @@ SetFacingBigDoll: ; 45c5
 	add hl, bc
 	ld [hl], d
 	ret
-; 45da
 
-SetFacingBoulderDust: ; 45da
+SetFacingBoulderDust:
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	inc [hl]
@@ -293,9 +273,8 @@ SetFacingBoulderDust: ; 45da
 .ok
 	ld [hl], a
 	ret
-; 45ed
 
-SetFacingGrassShake: ; 45ed
+SetFacingGrassShake:
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	inc [hl]
@@ -310,4 +289,3 @@ SetFacingGrassShake: ; 45ed
 .ok
 	ld [hl], a
 	ret
-; 4600
diff --git a/engine/map_objects.asm b/engine/overworld/map_objects.asm
index b3efc5fb7..8c1171981 100644
--- a/engine/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -2,9 +2,7 @@ INCLUDE "data/sprites/facings.asm"
 
 INCLUDE "data/sprites/map_objects.asm"
 
-
-; 4357
-DeleteMapObject:: ; 4357
+DeleteMapObject::
 	push bc
 	ld hl, OBJECT_MAP_OBJECT_INDEX
 	add hl, bc
@@ -27,9 +25,8 @@ DeleteMapObject:: ; 4357
 .ok
 	pop bc
 	ret
-; 437b
 
-Function437b: ; 437b
+Function437b:
 	call .CheckObjectStillVisible
 	ret c
 	call .HandleStepType
@@ -93,7 +90,7 @@ Function437b: ; 437b
 .ok2
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit 1, [hl]
+	bit WONT_DELETE_F, [hl]
 	jr nz, .yes2
 	call DeleteMapObject
 	scf
@@ -146,7 +143,7 @@ Function437b: ; 437b
 .HandleObjectAction:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit INVISIBLE, [hl]
+	bit INVISIBLE_F, [hl]
 	jr nz, SetFacingStanding
 	ld hl, OBJECT_FLAGS2
 	add hl, bc
@@ -156,19 +153,17 @@ Function437b: ; 437b
 	jr nz, asm_4448
 	ld de, ObjectActionPairPointers ; use first column
 	jr _HandleObjectAction
-; 4440
 
-Function4440: ; 4440
+Function4440:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit INVISIBLE, [hl]
+	bit INVISIBLE_F, [hl]
 	jr nz, SetFacingStanding
-asm_4448
+asm_4448:
 	ld de, ObjectActionPairPointers + 2 ; use second column
 	jr _HandleObjectAction
-; 444d
 
-_HandleObjectAction
+_HandleObjectAction:
 ; call [4 * wObjectStructs[ObjInd, OBJECT_ACTION] + de]
 	ld hl, OBJECT_ACTION
 	add hl, bc
@@ -183,11 +178,10 @@ _HandleObjectAction
 	ld l, a
 	call _hl_
 	ret
-; 445f
 
-INCLUDE "engine/map_object_action.asm"
+INCLUDE "engine/overworld/map_object_action.asm"
 
-CopyNextCoordsTileToStandingCoordsTile: ; 4600
+CopyNextCoordsTileToStandingCoordsTile:
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld a, [hl]
@@ -212,9 +206,8 @@ CopyNextCoordsTileToStandingCoordsTile: ; 4600
 	ld a, [hl]
 	call UselessAndA
 	ret
-; 462a
 
-Function462a: ; 462a
+Function462a:
 	ld hl, OBJECT_MAP_X
 	add hl, bc
 	ld a, [hl]
@@ -228,12 +221,11 @@ Function462a: ; 462a
 	add hl, bc
 	ld [hl], a
 	ret
-; 463f
 
-UpdateTallGrassFlags: ; 463f
+UpdateTallGrassFlags:
 	ld hl, OBJECT_FLAGS2
 	add hl, bc
-	bit 3, [hl] ; is current tile grass?
+	bit OVERHEAD_F, [hl]
 	jr z, .ok
 	ld hl, OBJECT_NEXT_TILE
 	add hl, bc
@@ -250,9 +242,8 @@ UpdateTallGrassFlags: ; 463f
 	ld a, [hl]
 	call UselessAndA
 	ret
-; 4661
 
-SetTallGrassFlags: ; 4661
+SetTallGrassFlags:
 	call CheckSuperTallGrassTile
 	jr z, .set
 	call CheckGrassTile
@@ -260,22 +251,20 @@ SetTallGrassFlags: ; 4661
 .set
 	ld hl, OBJECT_FLAGS2
 	add hl, bc
-	set 3, [hl]
+	set OVERHEAD_F, [hl]
 	ret
 
 .reset
 	ld hl, OBJECT_FLAGS2
 	add hl, bc
-	res 3, [hl]
+	res OVERHEAD_F, [hl]
 	ret
-; 4679
 
-UselessAndA: ; 4679
+UselessAndA:
 	and a
 	ret
-; 467b
 
-EndSpriteMovement: ; 467b
+EndSpriteMovement:
 	xor a
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
@@ -290,15 +279,14 @@ EndSpriteMovement: ; 467b
 	add hl, bc
 	ld [hl], STANDING
 	ret
-; 4690
 
-InitStep: ; 4690
+InitStep:
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
 	ld [hl], a
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit FIXED_FACING, [hl]
+	bit FIXED_FACING_F, [hl]
 	jr nz, GetNextTile
 	add a
 	add a
@@ -306,7 +294,7 @@ InitStep: ; 4690
 	ld hl, OBJECT_FACING
 	add hl, bc
 	ld [hl], a
-GetNextTile: ; 46a6
+GetNextTile:
 	call GetStepVector
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
@@ -336,9 +324,8 @@ GetNextTile: ; 46a6
 	add hl, bc
 	ld [hl], a
 	ret
-; 46d7
 
-AddStepVector: ; 46d7
+AddStepVector:
 	call GetStepVector
 	ld hl, OBJECT_SPRITE_X
 	add hl, bc
@@ -351,9 +338,8 @@ AddStepVector: ; 46d7
 	add e
 	ld [hl], a
 	ret
-; 46e9
 
-GetStepVector: ; 46e9
+GetStepVector:
 ; Return (x, y, duration, speed) in (d, e, a, h).
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
@@ -372,9 +358,8 @@ GetStepVector: ; 46e9
 	ld a, [hli]
 	ld h, [hl]
 	ret
-; 4700
 
-StepVectors: ; 4700
+StepVectors:
 ; x,  y, duration, speed
 	; slow
 	db  0,  1, 16, 1
@@ -391,18 +376,16 @@ StepVectors: ; 4700
 	db  0, -4,  4, 4
 	db -4,  0,  4, 4
 	db  4,  0,  4, 4
-; 4730
 
-GetStepVectorSign: ; 4730
+GetStepVectorSign:
 	add a
 	ret z  ; 0 or 128
 	ld a, 1
 	ret nc ; 1 - 127
 	ld a, -1
 	ret    ; 129 - 255
-; 4738
 
-UpdatePlayerStep: ; 4738
+UpdatePlayerStep:
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
 	ld a, [hl]
@@ -418,9 +401,8 @@ UpdatePlayerStep: ; 4738
 	ld hl, wPlayerStepFlags
 	set 5, [hl]
 	ret
-; 4759
 
-Unreferenced_Function4759: ; 4759
+Unreferenced_Function4759:
 	push bc
 	ld e, a
 	ld d, 0
@@ -432,9 +414,8 @@ Unreferenced_Function4759: ; 4759
 	ld a, [hl]
 	pop bc
 	ret
-; 4769
 
-RestoreDefaultMovement: ; 4769
+RestoreDefaultMovement:
 	ld hl, OBJECT_MAP_OBJECT_INDEX
 	add hl, bc
 	ld a, [hl]
@@ -451,76 +432,66 @@ RestoreDefaultMovement: ; 4769
 .ok
 	ld a, SPRITEMOVEFN_STANDING
 	ret
-; 4780
 
-ClearObjectMovementByteIndex: ; 4780
+ClearObjectMovementByteIndex:
 	ld hl, OBJECT_MOVEMENT_BYTE_INDEX
 	add hl, bc
 	ld [hl], 0
 	ret
-; 4787
 
-IncrementObjectMovementByteIndex: ; 4787
+IncrementObjectMovementByteIndex:
 	ld hl, OBJECT_MOVEMENT_BYTE_INDEX
 	add hl, bc
 	inc [hl]
 	ret
-; 478d
 
-DecrementObjectMovementByteIndex: ; 478d
+DecrementObjectMovementByteIndex:
 	ld hl, OBJECT_MOVEMENT_BYTE_INDEX
 	add hl, bc
 	dec [hl]
 	ret
-; 4793
 
-MovementAnonymousJumptable: ; 4793
+MovementAnonymousJumptable:
 	ld hl, OBJECT_MOVEMENT_BYTE_INDEX
 	add hl, bc
 	ld a, [hl]
 	pop hl
 	rst JumpTable
 	ret
-; 479b
 
-ClearObjectStructField1c: ; 479b
+ClearObjectStructField1c:
 	ld hl, OBJECT_1C
 	add hl, bc
 	ld [hl], 0
 	ret
-; 47a2
 
-IncrementObjectStructField1c: ; 47a2
+IncrementObjectStructField1c:
 	ld hl, OBJECT_1C
 	add hl, bc
 	inc [hl]
 	ret
-; 47a8
 
-Field1cAnonymousJumptable: ; 47a8
+Field1cAnonymousJumptable:
 	ld hl, OBJECT_1C
 	add hl, bc
 	ld a, [hl]
 	pop hl
 	rst JumpTable
 	ret
-; 47b0
 
-GetValueObjectStructField1c: ; 47b0
+GetValueObjectStructField1c:
 	ld hl, OBJECT_1C
 	add hl, bc
 	ld a, [hl]
 	ret
-; 47b6
 
-SetValueObjectStructField1c: ; 47b6
+SetValueObjectStructField1c:
 	ld hl, OBJECT_1C
 	add hl, bc
 	ld [hl], a
 	ret
-; 47bc
 
-ObjectMovementReset: ; 47bc
+ObjectMovementReset:
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld d, [hl]
@@ -539,9 +510,8 @@ ObjectMovementReset: ; 47bc
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 47dd
 
-MapObjectMovementPattern: ; 47dd
+MapObjectMovementPattern:
 	call ClearObjectStructField1c
 	call GetSpriteMovementFunction
 	ld a, [hl]
@@ -549,7 +519,7 @@ MapObjectMovementPattern: ; 47dd
 	rst JumpTable
 	ret
 
-.Pointers: ; 47e9
+.Pointers:
 ; entries correspond to SPRITEMOVEFN_* constants
 	dw .Null_00 ; 00
 	dw .RandomWalkY ; 01
@@ -696,7 +666,7 @@ MapObjectMovementPattern: ; 47dd
 	and %00000011
 	or 0
 	call InitStep
-	call Function6ec1
+	call CanObjectMoveInDirection
 	jr c, .ok2
 	ld de, SFX_STRENGTH
 	call PlaySFX
@@ -792,7 +762,7 @@ MapObjectMovementPattern: ; 47dd
 	ld [hl], STANDING
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], OBJECT_ACTION_BIG_SNORLAX
+	ld [hl], OBJECT_ACTION_BIG_DOLL_SYM
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_04
@@ -848,7 +818,7 @@ MapObjectMovementPattern: ; 47dd
 	call .MovementSpinNextFacing
 	jr .MovementSpinCounterclockwise
 
-.DirectionData_Counterclockwise: ; 49c0
+.DirectionData_Counterclockwise:
 	db OW_RIGHT, OW_LEFT, OW_DOWN, OW_UP
 
 .MovementSpinTurnRight:
@@ -856,7 +826,7 @@ MapObjectMovementPattern: ; 47dd
 	call .MovementSpinNextFacing
 	jr .MovementSpinClockwise
 
-.DirectionData_Clockwise: ; 49cc
+.DirectionData_Clockwise:
 	db OW_LEFT, OW_RIGHT, OW_UP, OW_DOWN
 
 .MovementSpinNextFacing:
@@ -969,7 +939,7 @@ MapObjectMovementPattern: ; 47dd
 	ld [hl], STEP_TYPE_TRACKING_OBJECT
 	ret
 
-.data_4a81  ; 4a81
+.data_4a81
 	;   x,  y
 	db  0, -4
 	db  0,  8
@@ -1049,7 +1019,7 @@ MapObjectMovementPattern: ; 47dd
 
 .RandomWalkContinue:
 	call InitStep
-	call Function6ec1 ; check whether the object can move in that direction
+	call CanObjectMoveInDirection ; check whether the object can move in that direction
 	jr c, .NewDuration
 	call UpdateTallGrassFlags
 	ld hl, OBJECT_ACTION
@@ -1073,18 +1043,17 @@ MapObjectMovementPattern: ; 47dd
 .NewDuration:
 	call EndSpriteMovement
 	call Function462a
-RandomStepDuration_Slow: ; 4b1d
+RandomStepDuration_Slow:
 	call Random
 	ld a, [hRandomAdd]
 	and %01111111
 	jr SetRandomStepDuration
-; 4b26
 
-RandomStepDuration_Fast: ; 4b26
+RandomStepDuration_Fast:
 	call Random
 	ld a, [hRandomAdd]
 	and %00011111
-SetRandomStepDuration: ; 4b2d
+SetRandomStepDuration:
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld [hl], a
@@ -1098,25 +1067,24 @@ SetRandomStepDuration: ; 4b2d
 	add hl, bc
 	ld [hl], STEP_TYPE_03
 	ret
-; 4b45
 
-StepTypesJumptable: ; 4b45
+StepTypesJumptable:
 ; entries correspond to STEP_TYPE_* constants
 	dw ObjectMovementReset ; 00
-	dw MapObjectMovementPattern ; unused
-	dw NPCStep ; 02 npc walk
+	dw MapObjectMovementPattern ; 01
+	dw NPCStep ; 02
 	dw StepType03 ; 03
 	dw StepType04 ; 04
 	dw StepType05 ; 05
-	dw PlayerStep ; 06 player walk
+	dw PlayerStep ; 06
 	dw StepType07 ; 07
-	dw NPCJump ; 08 npc jump step
-	dw PlayerJump ; 09 player jump step
-	dw PlayerOrNPCTurnStep ; 0a half step
+	dw NPCJump ; 08
+	dw PlayerJump ; 09
+	dw PlayerOrNPCTurnStep ; 0a
 	dw StepTypeBump ; 0b
-	dw TeleportFrom ; 0c teleport from
-	dw TeleportTo ; 0d teleport to
-	dw Skyfall ; 0e skyfall
+	dw TeleportFrom ; 0c
+	dw TeleportTo ; 0d
+	dw Skyfall ; 0e
 	dw StepType0f ; 0f
 	dw GotBiteStep ; 10
 	dw RockSmashStep ; 11
@@ -1128,9 +1096,8 @@ StepTypesJumptable: ; 4b45
 	dw StepType17 ; 17
 	dw StepType18 ; 18
 	dw SkyfallTop ; 19
-; 4b79
 
-WaitStep_InPlace: ; 4b79
+WaitStep_InPlace:
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	dec [hl]
@@ -1139,9 +1106,8 @@ WaitStep_InPlace: ; 4b79
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4b86
 
-NPCJump: ; 4b86
+NPCJump:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .Jump
@@ -1174,9 +1140,8 @@ NPCJump: ; 4b86
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4bbf
 
-PlayerJump: ; 4bbf
+PlayerJump:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .initjump
@@ -1224,16 +1189,14 @@ PlayerJump: ; 4bbf
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4c18
 
-TeleportFrom: ; 4c18
+TeleportFrom:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .InitSpin
 	dw .DoSpin
 	dw .InitSpinRise
 	dw .DoSpinRise
-; 4c23
 
 .InitSpin:
 	ld hl, OBJECT_STEP_FRAME
@@ -1294,9 +1257,8 @@ TeleportFrom: ; 4c18
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4c89
 
-TeleportTo: ; 4c89
+TeleportTo:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .InitWait
@@ -1306,7 +1268,6 @@ TeleportTo: ; 4c89
 	dw .InitFinalSpin
 	dw .DoFinalSpin
 	dw .FinishStep
-; 4c9a
 
 .InitWait:
 	ld hl, OBJECT_ACTION
@@ -1317,7 +1278,6 @@ TeleportTo: ; 4c89
 	ld [hl], 16
 	call IncrementObjectStructField1c
 	ret
-; 4caa
 
 .DoWait:
 	ld hl, OBJECT_STEP_DURATION
@@ -1337,7 +1297,6 @@ TeleportTo: ; 4c89
 	ld [hl], 16
 	call IncrementObjectStructField1c
 	ret
-; 4cc9
 
 .DoDescent:
 	ld hl, OBJECT_ACTION
@@ -1365,7 +1324,6 @@ TeleportTo: ; 4c89
 	ld [hl], 16
 	call IncrementObjectStructField1c
 	ret
-; 4cf5
 
 .DoFinalSpin:
 	ld hl, OBJECT_ACTION
@@ -1386,16 +1344,14 @@ TeleportTo: ; 4c89
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4d14
 
-Skyfall: ; 4d14
+Skyfall:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .Init
 	dw .Step
 	dw .Fall
 	dw .Finish
-; 4d1f
 
 .Init:
 	ld hl, OBJECT_ACTION
@@ -1451,14 +1407,12 @@ Skyfall: ; 4d14
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4d7e
 
-GotBiteStep: ; 4d7e
+GotBiteStep:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .Init
 	dw .Run
-; 4d85
 
 .Init:
 	ld hl, OBJECT_STEP_DURATION
@@ -1485,12 +1439,10 @@ GotBiteStep: ; 4d7e
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4daf
 
-RockSmashStep: ; 4daf
+RockSmashStep:
 	call .Step
 	jp WaitStep_InPlace
-; 4db5
 
 .Step:
 	ld hl, OBJECT_STEP_DURATION
@@ -1505,9 +1457,8 @@ RockSmashStep: ; 4daf
 	add hl, bc
 	ld [hl], a
 	ret
-; 4dc8
 
-ReturnDigStep: ; 4dc8
+ReturnDigStep:
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld a, [hl]
@@ -1520,9 +1471,8 @@ ReturnDigStep: ; 4dc8
 	add hl, bc
 	ld [hl], a
 	jp WaitStep_InPlace
-; 4ddd
 
-StepType03: ; 4ddd
+StepType03:
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
 	ld [hl], STANDING
@@ -1534,9 +1484,8 @@ StepType03: ; 4ddd
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4df0
 
-StepType18: ; 4df0
+StepType18:
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
 	ld [hl], STANDING
@@ -1545,9 +1494,8 @@ StepType18: ; 4df0
 	dec [hl]
 	ret nz
 	jp DeleteMapObject
-; 4dff
 
-StepTypeBump: ; 4dff
+StepTypeBump:
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	dec [hl]
@@ -1556,9 +1504,8 @@ StepTypeBump: ; 4dff
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4e0c
 
-StepType05: ; 4e0c
+StepType05:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .Reset
@@ -1571,15 +1518,14 @@ StepType05: ; 4e0c
 	add hl, bc
 	ld [hl], a
 	call IncrementObjectStructField1c
-StepType04: ; 4e21
+StepType04:
 	call Stubbed_Function4fb2
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
 	ld [hl], STANDING
 	ret
-; 4e2b
 
-NPCStep: ; 4e2b
+NPCStep:
 	call Stubbed_Function4fb2
 	call AddStepVector
 	ld hl, OBJECT_STEP_DURATION
@@ -1594,9 +1540,8 @@ NPCStep: ; 4e2b
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4e47
 
-StepType07: ; 4e47
+StepType07:
 	call AddStepVector
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
@@ -1604,9 +1549,8 @@ StepType07: ; 4e47
 	ret nz
 	call CopyNextCoordsTileToStandingCoordsTile
 	jp RandomStepDuration_Slow
-; 4e56
 
-PlayerStep: ; 4e56
+PlayerStep:
 ; AnimateStep?
 	call Field1cAnonymousJumptable
 ; anonymous dw
@@ -1633,9 +1577,8 @@ PlayerStep: ; 4e56
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4e83
 
-PlayerOrNPCTurnStep: ; 4e83
+PlayerOrNPCTurnStep:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .init1
@@ -1681,9 +1624,8 @@ PlayerOrNPCTurnStep: ; 4e83
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4ecd
 
-StepType0f: ; 4ecd
+StepType0f:
 	call AddStepVector
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
@@ -1713,9 +1655,8 @@ StepType0f: ; 4ecd
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4f04
 
-StepTypeTrackingObject: ; 4f04
+StepTypeTrackingObject:
 	ld hl, OBJECT_1D
 	add hl, bc
 	ld e, [hl]
@@ -1747,10 +1688,9 @@ StepTypeTrackingObject: ; 4f04
 	ret nz
 .nope
 	jp DeleteMapObject
-; 4f33
 
-StepType14: ; 4f33
-StepType15: ; 4f33
+StepType14:
+StepType15:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .Init
@@ -1797,21 +1737,18 @@ StepType15: ; 4f33
 	cpl
 	inc a
 	ret
-; 4f77
 
-StepType16: ; 4f77
+StepType16:
 	call Field1cAnonymousJumptable ; ????
-; 4f7a
-StepType17: ; 4f7a
+StepType17:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .null
 	dw .null
 	dw .null
 .null
-; 4f83
 
-SkyfallTop: ; 4f83
+SkyfallTop:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .Init
@@ -1841,7 +1778,6 @@ SkyfallTop: ; 4f83
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4fb2
 
 Stubbed_Function4fb2:
 	ret
@@ -1862,10 +1798,9 @@ Stubbed_Function4fb2:
 	ld [hl], a
 	ret
 
-.y ; 4fcd
+.y
 	db 0, -1, -2, -3, -4, -3, -2, -1
-; 4fd5
-UpdateJumpPosition: ; 4fd5
+UpdateJumpPosition:
 	call GetStepVector
 	ld a, h
 	ld hl, OBJECT_1F
@@ -1884,10 +1819,9 @@ UpdateJumpPosition: ; 4fd5
 	ld [hl], a
 	ret
 
-.y ; 4ff0
+.y
 	db  -4,  -6,  -8, -10, -11, -12, -12, -12
 	db -11, -10,  -9,  -8,  -6,  -4,   0,   0
-; 5000
 Function5000: ; unscripted?
 ; copy [wPlayerNextMovement] to [wPlayerMovement]
 	ld a, [wPlayerNextMovement]
@@ -1899,15 +1833,13 @@ Function5000: ; unscripted?
 ; recover the previous value of [wPlayerNextMovement]
 	ld a, [hl]
 	ret
-; 500e
 
 GetMovementByte:
 	ld hl, wMovementDataPointer
 	call _GetMovementByte
 	ret
-; 5015
 
-Function5015: ; 5015
+Function5015:
 	ld hl, OBJECT_MOVEMENT_BYTE_INDEX
 	add hl, bc
 	ld e, [hl]
@@ -1920,9 +1852,8 @@ Function5015: ; 5015
 	add hl, de
 	ld a, [hl]
 	ret
-; 5026
 
-Function5026: ; 5026
+Function5026:
 	ld hl, OBJECT_MOVEMENT_BYTE_INDEX
 	add hl, bc
 	ld e, [hl]
@@ -1935,19 +1866,16 @@ Function5026: ; 5026
 	add hl, de
 	ld a, [hl]
 	ret
-; 5037
 
-_GetMovementObject: ; 5037
+_GetMovementObject:
 	ld hl, GetMovementObject
 	jp HandleMovementData
-; 503d
 
-GetMovementObject: ; 503d
+GetMovementObject:
 	ld a, [wMovementObject]
 	ret
-; 5041
 
-HandleMovementData: ; 5041
+HandleMovementData:
 	call .StorePointer
 .loop
 	xor a
@@ -1965,35 +1893,30 @@ HandleMovementData: ; 5041
 	ld a, h
 	ld [wMovementPointer + 1], a
 	ret
-; 505e
 
-JumpMovementPointer: ; 505e
+JumpMovementPointer:
 	ld hl, wMovementPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 5065
 
-ContinueReadingMovement: ; 5065
+ContinueReadingMovement:
 	ld a, 1
 	ld [wMovementByteWasControlSwitch], a
 	ret
-; 506b
 
-DoMovementFunction: ; 506b
+DoMovementFunction:
 	push af
 	call ApplyMovementToFollower
 	pop af
 	ld hl, MovementPointers
 	rst JumpTable
 	ret
-; 5075
 
-INCLUDE "engine/movement.asm"
-; 54b8
+INCLUDE "engine/overworld/movement.asm"
 
-ApplyMovementToFollower: ; 54b8
+ApplyMovementToFollower:
 	ld e, a
 	ld a, [wObjectFollow_Follower]
 	cp -1
@@ -2024,9 +1947,8 @@ ApplyMovementToFollower: ; 54b8
 	pop af
 	ld [hl], a
 	ret
-; 54e6
 
-GetFollowerNextMovementByte: ; 54e6
+GetFollowerNextMovementByte:
 	ld hl, wFollowerMovementQueueLength
 	ld a, [hl]
 	and a
@@ -2075,9 +1997,8 @@ GetFollowerNextMovementByte: ; 54e6
 	ld a, movement_step_end
 	scf
 	ret
-; 5529
 
-SpawnShadow: ; 5529
+SpawnShadow:
 	push bc
 	ld de, .ShadowObject
 	call CopyTempObjectData
@@ -2088,9 +2009,8 @@ SpawnShadow: ; 5529
 .ShadowObject:
 	; vtile, palette, movement
 	db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SHADOW
-; 5538
 
-SpawnStrengthBoulderDust: ; 5538
+SpawnStrengthBoulderDust:
 	push bc
 	ld de, .BoulderDustObject
 	call CopyTempObjectData
@@ -2100,9 +2020,8 @@ SpawnStrengthBoulderDust: ; 5538
 
 .BoulderDustObject:
 	db $00, PAL_OW_SILVER, SPRITEMOVEDATA_BOULDERDUST
-; 5547
 
-SpawnEmote: ; 5547
+SpawnEmote:
 	push bc
 	ld de, .EmoteObject
 	call CopyTempObjectData
@@ -2112,21 +2031,19 @@ SpawnEmote: ; 5547
 
 .EmoteObject:
 	db $00, PAL_OW_SILVER, SPRITEMOVEDATA_EMOTE
-; 5556
 
-ShakeGrass: ; 5556
+ShakeGrass:
 	push bc
-	ld de, .data_5562
+	ld de, .GrassObject
 	call CopyTempObjectData
 	call InitTempObject
 	pop bc
 	ret
 
-.data_5562
+.GrassObject
 	db $00, PAL_OW_TREE, SPRITEMOVEDATA_GRASS
-; 5565
 
-ShakeScreen: ; 5565
+ShakeScreen:
 	push bc
 	push af
 	ld de, .ScreenShakeObject
@@ -2139,8 +2056,8 @@ ShakeScreen: ; 5565
 
 .ScreenShakeObject:
 	db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE
-; 5579
-DespawnEmote: ; 5579
+
+DespawnEmote:
 	push bc
 	ld a, [hMapObjectIndexBuffer]
 	ld c, a
@@ -2155,7 +2072,7 @@ DespawnEmote: ; 5579
 	push af
 	ld hl, OBJECT_FLAGS1
 	add hl, de
-	bit EMOTE_OBJECT, [hl]
+	bit EMOTE_OBJECT_F, [hl]
 	jr z, .next
 	ld hl, OBJECT_SPRITE
 	add hl, de
@@ -2176,18 +2093,16 @@ DespawnEmote: ; 5579
 	dec a
 	jr nz, .loop
 	ret
-; 55ac
 
-InitTempObject: ; 55ac
+InitTempObject:
 	call FindFirstEmptyObjectStruct
 	ret nc
 	ld d, h
 	ld e, l
 	farcall CopyTempObjectToObjectStruct
 	ret
-; 55b9
 
-CopyTempObjectData: ; 55b9
+CopyTempObjectData:
 ; load into wTempObjectCopy:
 ; -1, -1, [de], [de + 1], [de + 2], [hMapObjectIndexBuffer], [NextMapX], [NextMapY], -1
 ; This spawns the object at the same place as whichever object is loaded into bc.
@@ -2220,9 +2135,8 @@ CopyTempObjectData: ; 55b9
 	inc hl
 	ld [hl], -1
 	ret
-; 55e0
 
-Function55e0:: ; 55e0
+Function55e0::
 	ld a, [wVramState]
 	bit 0, a
 	ret z
@@ -2243,9 +2157,9 @@ Function55e0:: ; 55e0
 	cp NUM_OBJECT_STRUCTS
 	jr nz, .loop
 	ret
-; 5602
 
-Function5602: ; 5602, called at battle start
+Function5602:
+; called at battle start
 	call Function5645 ; clear sprites
 	ld a, PLAYER
 	call Function5629 ; respawn player
@@ -2259,17 +2173,15 @@ Function5602: ; 5602, called at battle start
 .ok
 	call _UpdateSprites
 	ret
-; 561d
 
-Function561d: ; 561d
+Function561d:
 	call Function5645 ; clear sprites
 	ld a, PLAYER
 	call Function5629 ; respawn player
 	call _UpdateSprites
 	ret
-; 5629
 
-Function5629: ; 5629
+Function5629:
 	cp NUM_OBJECTS
 	ret nc
 	call GetMapObject
@@ -2285,9 +2197,8 @@ Function5629: ; 5629
 	ret z
 	call Function5673
 	ret
-; 5645
 
-Function5645: ; 5645
+Function5645:
 	xor a
 	ld bc, wObjectStructs
 .loop
@@ -2302,9 +2213,8 @@ Function5645: ; 5645
 	cp NUM_OBJECT_STRUCTS
 	jr nz, .loop
 	ret
-; 565c
 
-Function565c: ; 565c
+Function565c:
 	push bc
 	call Function56cd
 	pop bc
@@ -2315,25 +2225,22 @@ Function565c: ; 565c
 	farcall Function4440
 	xor a
 	ret
-; 5673
 
-Function5673: ; 5673
+Function5673:
 	call Function56a3
 	jr c, SetFacing_Standing
 	farcall Function4440 ; no need to farcall
 	xor a
 	ret
-; 5680
 
-SetFacing_Standing: ; 5680
+SetFacing_Standing:
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], STANDING
 	scf
 	ret
-; 5688
 
-Function5688: ; 5688
+Function5688:
 	push bc
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
@@ -2348,9 +2255,8 @@ Function5688: ; 5688
 	ld [hl], a
 	farcall UpdateTallGrassFlags ; no need to farcall
 	ret
-; 56a3
 
-Function56a3: ; 56a3
+Function56a3:
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld d, [hl]
@@ -2381,9 +2287,8 @@ Function56a3: ; 56a3
 .nope
 	scf
 	ret
-; 56cd
 
-Function56cd: ; 56cd
+Function56cd:
 	ld a, [wPlayerBGMapOffsetX]
 	ld d, a
 	ld hl, OBJECT_SPRITE_X_OFFSET
@@ -2444,7 +2349,7 @@ Function56cd: ; 56cd
 	ld [hUsedSpriteTile], a
 	ld hl, OBJECT_PALETTE
 	add hl, bc
-	bit 7, [hl]
+	bit BIG_OBJECT_F, [hl]
 	jr z, .ok7
 	ld a, d
 	add 2
@@ -2491,9 +2396,8 @@ Function56cd: ; 56cd
 .nope
 	scf
 	ret
-; 576a
 
-HandleNPCStep:: ; 576a
+HandleNPCStep::
 	call .ResetStepVector
 	call .DoStepsForAllObjects
 	ret
@@ -2525,9 +2429,8 @@ HandleNPCStep:: ; 576a
 	cp NUM_OBJECT_STRUCTS
 	jr nz, .loop
 	ret
-; 579d
 
-RefreshPlayerSprite: ; 579d
+RefreshPlayerSprite:
 	ld a, movement_step_sleep
 	ld [wPlayerNextMovement], a
 	ld [wPlayerMovement], a
@@ -2539,11 +2442,10 @@ RefreshPlayerSprite: ; 579d
 	call c, SpawnInFacingDown
 	call .SpawnInCustomFacing
 	ret
-; 57bc
 
-.TryResetPlayerAction: ; 57bc
+.TryResetPlayerAction:
 	ld hl, wPlayerSpriteSetupFlags
-	bit 7, [hl]
+	bit PLAYERSPRITESETUP_RESET_ACTION_F, [hl]
 	jr nz, .ok
 	ret
 
@@ -2551,30 +2453,27 @@ RefreshPlayerSprite: ; 579d
 	ld a, OBJECT_ACTION_00
 	ld [wPlayerAction], a
 	ret
-; 57ca
 
-.SpawnInCustomFacing: ; 57ca
+.SpawnInCustomFacing:
 	ld hl, wPlayerSpriteSetupFlags
-	bit 5, [hl]
+	bit PLAYERSPRITESETUP_CUSTOM_FACING_F, [hl]
 	ret z
 	ld a, [wPlayerSpriteSetupFlags]
-	and 3
+	and PLAYERSPRITESETUP_FACING_MASK
 	add a
 	add a
 	jr ContinueSpawnFacing
-; 57d9
 
-SpawnInFacingDown: ; 57d9
+SpawnInFacingDown:
 	ld a, 0
-ContinueSpawnFacing: ; 57db
+ContinueSpawnFacing:
 	ld bc, wPlayerStruct
 	call SetSpriteDirection
 	ret
-; 57e2
 
-SetPlayerPalette: ; 57e2
+_SetPlayerPalette:
 	ld a, d
-	and %10000000
+	and 1 << 7
 	ret z
 	ld bc, 0 ; debug?
 	ld hl, OBJECT_FACING
@@ -2584,19 +2483,18 @@ SetPlayerPalette: ; 57e2
 	ld [hl], a
 	ld a, d
 	swap a
-	and %00000111
+	and PALETTE_MASK
 	ld d, a
 	ld bc, wPlayerStruct
 	ld hl, OBJECT_PALETTE
 	add hl, bc
 	ld a, [hl]
-	and %11111000
+	and $ff ^ PALETTE_MASK
 	or d
 	ld [hl], a
 	ret
-; 5803
 
-StartFollow:: ; 5803
+StartFollow::
 	push bc
 	ld a, b
 	call SetLeaderIfVisible
@@ -2606,29 +2504,25 @@ StartFollow:: ; 5803
 	call SetFollowerIfVisible
 	farcall QueueFollowerFirstStep
 	ret
-; 5815
 
-SetLeaderIfVisible: ; 5815
+SetLeaderIfVisible:
 	call CheckObjectVisibility
 	ret c
 	ld a, [hObjectStructIndexBuffer]
 	ld [wObjectFollow_Leader], a
 	ret
-; 581f
 
-StopFollow:: ; 581f
+StopFollow::
 	call ResetLeader
 	call ResetFollower
 	ret
-; 5826
 
-ResetLeader: ; 5826
+ResetLeader:
 	ld a, -1
 	ld [wObjectFollow_Leader], a
 	ret
-; 582c
 
-SetFollowerIfVisible: ; 582c
+SetFollowerIfVisible:
 	push af
 	call ResetFollower
 	pop af
@@ -2643,9 +2537,8 @@ SetFollowerIfVisible: ; 582c
 	ld a, [hObjectStructIndexBuffer]
 	ld [wObjectFollow_Follower], a
 	ret
-; 5847
 
-ResetFollower: ; 5847
+ResetFollower:
 	ld a, [wObjectFollow_Follower]
 	cp -1
 	ret z
@@ -2654,9 +2547,8 @@ ResetFollower: ; 5847
 	ld a, -1
 	ld [wObjectFollow_Follower], a
 	ret
-; 585c
 
-SetFlagsForMovement_1:: ; 585c
+SetFlagsForMovement_1::
 	ld a, c
 	call CheckObjectVisibility
 	ret c
@@ -2668,9 +2560,8 @@ SetFlagsForMovement_1:: ; 585c
 	res 5, [hl]
 	xor a
 	ret
-; 586e
 
-Function586e: ; 586e
+Function586e:
 	call CheckObjectVisibility
 	ret c
 	ld hl, OBJECT_FLAGS2
@@ -2678,9 +2569,8 @@ Function586e: ; 586e
 	set 5, [hl]
 	xor a
 	ret
-; 587a
 
-Function587a: ; 587a
+Function587a:
 	ld bc, wObjectStructs
 	xor a
 .loop
@@ -2700,9 +2590,8 @@ Function587a: ; 587a
 	cp NUM_OBJECT_STRUCTS
 	jr nz, .loop
 	ret
-; 5897
 
-_SetFlagsForMovement_2:: ; 5897
+_SetFlagsForMovement_2::
 	ld a, [wObjectFollow_Leader]
 	cp -1
 	ret z
@@ -2722,9 +2611,8 @@ _SetFlagsForMovement_2:: ; 5897
 	add hl, bc
 	res 5, [hl]
 	ret
-; 58b9
 
-Function58b9:: ; 58b9
+Function58b9::
 	push bc
 	ld bc, wObjectStructs
 	xor a
@@ -2746,18 +2634,16 @@ Function58b9:: ; 58b9
 	jr nz, .loop
 	pop bc
 	ret
-; 58d8
 
-Function58d8: ; 58d8
+Function58d8:
 	call CheckObjectVisibility
 	ret c
 	ld hl, OBJECT_FLAGS2
 	add hl, bc
 	res 5, [hl]
 	ret
-; 58e3
 
-Function58e3: ; 58e3
+Function58e3:
 	ld hl, OBJECT_MAP_OBJECT_INDEX
 	add hl, bc
 	ld a, [hl]
@@ -2776,9 +2662,8 @@ Function58e3: ; 58e3
 	add hl, bc
 	ld [hl], STEP_TYPE_00
 	ret
-; 5903
 
-Function5903: ; 5903
+Function5903:
 	call GetSpriteDirection
 	rrca
 	rrca
@@ -2800,9 +2685,8 @@ Function5903: ; 5903
 	db SPRITEMOVEDATA_STANDING_UP
 	db SPRITEMOVEDATA_STANDING_LEFT
 	db SPRITEMOVEDATA_STANDING_RIGHT
-; 5920
 
-_UpdateSprites:: ; 5920
+_UpdateSprites::
 	ld a, [wVramState]
 	bit 0, a
 	ret z
@@ -2839,9 +2723,8 @@ _UpdateSprites:: ; 5920
 	cp l
 	jr nz, .loop
 	ret
-; 5958
 
-ApplyBGMapAnchorToObjects: ; 5958
+ApplyBGMapAnchorToObjects:
 	push hl
 	push de
 	push bc
@@ -2880,14 +2763,12 @@ ApplyBGMapAnchorToObjects: ; 5958
 	pop de
 	pop hl
 	ret
-; 5991
-
 
 PRIORITY_LOW  EQU $10
 PRIORITY_NORM EQU $20
 PRIORITY_HIGH EQU $30
 
-InitSprites: ; 5991
+InitSprites:
 	call .DeterminePriorities
 	ld c, PRIORITY_HIGH
 	call .InitSpritesByPriority
@@ -2918,10 +2799,10 @@ InitSprites: ; 5991
 	ld e, PRIORITY_LOW
 	ld hl, OBJECT_FLAGS2
 	add hl, bc
-	bit 0, [hl]
+	bit LOW_PRIORITY_F, [hl]
 	jr nz, .add
 	ld e, PRIORITY_NORM
-	bit 1, [hl]
+	bit HIGH_PRIORITY_F, [hl]
 	jr z, .add
 	ld e, PRIORITY_HIGH
 	jr .add
@@ -2973,35 +2854,35 @@ InitSprites: ; 5991
 	ld hl, OBJECT_SPRITE_TILE
 	add hl, bc
 	ld a, [hl]
-	and %01111111
+	and $ff ^ (1 << 7)
 	ld [hFFC1], a
 	xor a
 	bit 7, [hl]
 	jr nz, .skip1
-	or %00001000
+	or VRAM_BANK_1
 .skip1
 	ld hl, OBJECT_FLAGS2
 	add hl, bc
 	ld e, [hl]
 	bit 7, e
 	jr z, .skip2
-	or %10000000
+	or PRIORITY
 .skip2
-	bit 4, e
+	bit USE_OBP1_F, e
 	jr z, .skip3
-	or %00010000
+	or OBP_NUM
 .skip3
 	ld hl, OBJECT_PALETTE
 	add hl, bc
 	ld d, a
 	ld a, [hl]
-	and %00000111
+	and PALETTE_MASK
 	or d
 	ld d, a
 	xor a
-	bit 3, e
+	bit OVERHEAD_F, e
 	jr z, .skip4
-	or %10000000
+	or PRIORITY
 .skip4
 	ld [hFFC2], a
 	ld hl, OBJECT_SPRITE_X
@@ -3063,7 +2944,7 @@ InitSprites: ; 5991
 	ld e, [hl]
 	inc hl
 	ld a, [hFFC1]
-	bit 2, e
+	bit ABSOLUTE_TILE_ID_F, e
 	jr z, .nope1
 	xor a
 .nope1
@@ -3072,7 +2953,7 @@ InitSprites: ; 5991
 	ld [bc], a ; tile id
 	inc c
 	ld a, e
-	bit 1, a
+	bit RELATIVE_ATTRIBUTES_F, a
 	jr z, .nope2
 	ld a, [hFFC2]
 	or e
@@ -3106,7 +2987,7 @@ InitSprites: ; 5991
 	ld b, [hl]
 	ret
 
-.Addresses: ; 5ace
+.Addresses:
 	dw wPlayerStruct
 	dw wObject1Struct
 	dw wObject2Struct
@@ -3120,4 +3001,3 @@ InitSprites: ; 5991
 	dw wObject10Struct
 	dw wObject11Struct
 	dw wObject12Struct
-; 5ae8
diff --git a/engine/map_objects_2.asm b/engine/overworld/map_objects_2.asm
index 038e2b49b..f055e0fd9 100644
--- a/engine/map_objects_2.asm
+++ b/engine/overworld/map_objects_2.asm
@@ -1,4 +1,4 @@
-LoadObjectMasks: ; 2454f
+LoadObjectMasks:
 	ld hl, wObjectMasks
 	xor a
 	ld bc, NUM_OBJECTS
@@ -29,7 +29,7 @@ LoadObjectMasks: ; 2454f
 	jr nz, .loop
 	ret
 
-CheckObjectFlag: ; 2457d (9:457d)
+CheckObjectFlag:
 	ld hl, MAPOBJECT_SPRITE
 	add hl, bc
 	ld a, [hl]
@@ -62,7 +62,7 @@ CheckObjectFlag: ; 2457d (9:457d)
 	scf
 	ret
 
-GetObjectTimeMask: ; 245a7 (9:45a7)
+GetObjectTimeMask:
 	call CheckObjectTime
 	ld a, -1
 	ret c
diff --git a/engine/map_setup.asm b/engine/overworld/map_setup.asm
index 1cd660f86..b09404240 100644
--- a/engine/map_setup.asm
+++ b/engine/overworld/map_setup.asm
@@ -1,4 +1,4 @@
-RunMapSetupScript:: ; 15363
+RunMapSetupScript::
 	ld a, [hMapEntryMethod]
 	and $f
 	dec a
@@ -12,11 +12,10 @@ RunMapSetupScript:: ; 15363
 	ld l, a
 	call ReadMapSetupScript
 	ret
-; 15377
 
 INCLUDE "data/maps/setup_scripts.asm"
 
-ReadMapSetupScript: ; 1541d
+ReadMapSetupScript:
 .loop
 	ld a, [hli]
 	cp -1
@@ -58,9 +57,8 @@ ReadMapSetupScript: ; 1541d
 
 	pop hl
 	jr .loop
-; 15440
 
-MapSetupCommands: ; 15440
+MapSetupCommands:
 ; entries correspond to command indexes in constants/map_setup_constants.asm
 	dba EnableLCD ; 00
 	dba DisableLCD ; 01
@@ -79,7 +77,7 @@ MapSetupCommands: ; 15440
 	dba LoadGraphics ; 0e
 	dba LoadTileset ; 0f
 	dba LoadMapTimeOfDay ; 10
-	dba Special_LoadMapPalettes ; 11
+	dba LoadMapPalettes ; 11
 	dba LoadWildMonData ; 12
 	dba RefreshMapSprites ; 13
 	dba HandleNewMap ; 14
@@ -91,8 +89,8 @@ MapSetupCommands: ; 15440
 	dba LoadMapAttributes ; 1a
 	dba LoadMapAttributes_SkipPeople ; 1b
 	dba ClearBGPalettes ; 1c
-	dba Special_FadeOutPalettes ; 1d
-	dba Special_FadeInPalettes ; 1e
+	dba FadeOutPalettes ; 1d
+	dba FadeInPalettes ; 1e
 	dba GetCoordOfUpperLeftCorner ; 1f
 	dba RestoreFacingAfterWarp ; 20
 	dba SpawnInFacingDown ; 21
@@ -108,51 +106,43 @@ MapSetupCommands: ; 15440
 	dba RetainOldPalettes ; 2b
 	dba DontScrollText ; 2c
 	dba ReturnFromMapSetupScript ; 2d
-; 154ca
 
-
-DontScrollText: ; 154ca
+DontScrollText:
 	xor a
 	ld [wDisableTextAcceleration], a
 	ret
-; 154cf
 
-ActivateMapAnims: ; 154cf
+ActivateMapAnims:
 	ld a, $1
 	ld [hMapAnims], a
 	ret
-; 154d3
 
-SuspendMapAnims: ; 154d3
+SuspendMapAnims:
 	xor a
 	ld [hMapAnims], a
 	ret
-; 154d7
 
-LoadObjectsRunCallback_02: ; 154d7
+LoadObjectsRunCallback_02:
 	ld a, MAPCALLBACK_OBJECTS
 	call RunMapCallback
 	farcall LoadObjectMasks
 	farcall InitializeVisibleSprites
 	ret
-; 154ea (5:54ea)
 
 ; unused
 	ret
-; 154eb
 
-DelayClearingOldSprites: ; 154eb
+DelayClearingOldSprites:
 	ld hl, wPlayerSpriteSetupFlags
-	set 7, [hl]
+	set PLAYERSPRITESETUP_RESET_ACTION_F, [hl]
 	ret
-; 154f1
 
-DelayLoadingNewSprites: ; 154f1
+DelayLoadingNewSprites:
 	ld hl, wPlayerSpriteSetupFlags
-	set 6, [hl]
+	set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
 	ret
 
-CheckReplaceKrisSprite: ; 154f7
+CheckReplaceKrisSprite:
 	nop
 	call .CheckBiking
 	jr c, .ok
@@ -166,17 +156,17 @@ CheckReplaceKrisSprite: ; 154f7
 	call ReplaceKrisSprite
 	ret
 
-.CheckBiking: ; 1550c (5:550c)
+.CheckBiking:
 	and a
 	ld hl, wBikeFlags
-	bit 1, [hl]
+	bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl]
 	ret z
 	ld a, PLAYER_BIKE
 	ld [wPlayerState], a
 	scf
 	ret
 
-.CheckSurfing2: ; 1551a (5:551a)
+.CheckSurfing2:
 	ld a, [wPlayerState]
 	cp PLAYER_NORMAL
 	jr z, .nope
@@ -208,7 +198,7 @@ CheckReplaceKrisSprite: ; 154f7
 	and a
 	ret
 
-.CheckSurfing: ; 1554e (5:554e)
+.CheckSurfing:
 	call CheckOnWater
 	jr nz, .ret_nc
 	ld a, [wPlayerState]
@@ -224,19 +214,17 @@ CheckReplaceKrisSprite: ; 154f7
 .ret_nc
 	and a
 	ret
-; 15567
 
-FadeOldMapMusic: ; 15567
+FadeOldMapMusic:
 	ld a, 6
 	call SkipMusic
 	ret
-; 1556d
 
-RetainOldPalettes: ; 1556d
+RetainOldPalettes:
 	farcall _UpdateTimePals
 	ret
 
-RotatePalettesRightMapAndMusic: ; 15574
+RotatePalettesRightMapAndMusic:
 	ld e, 0
 	ld a, [wMusicFadeID]
 	ld d, 0
@@ -245,9 +233,8 @@ RotatePalettesRightMapAndMusic: ; 15574
 	ld [wMusicFade], a
 	call RotateThreePalettesRight
 	ret
-; 15587
 
-ForceMapMusic: ; 15587
+ForceMapMusic:
 	ld a, [wPlayerState]
 	cp PLAYER_BIKE
 	jr nz, .notbiking
@@ -257,4 +244,3 @@ ForceMapMusic: ; 15587
 .notbiking
 	call TryRestartMapMusic
 	ret
-; 1559a
diff --git a/engine/movement.asm b/engine/overworld/movement.asm
index a701ff6f9..f7054c680 100644
--- a/engine/movement.asm
+++ b/engine/overworld/movement.asm
@@ -1,4 +1,4 @@
-MovementPointers: ; 5075
+MovementPointers:
 ; entries correspond to macros/scripts/movement.asm enumeration
 	dw Movement_turn_head_down        ; 00
 	dw Movement_turn_head_up          ; 01
@@ -90,38 +90,32 @@ MovementPointers: ; 5075
 	dw Movement_rock_smash            ; 57
 	dw Movement_return_dig            ; 58
 	dw Movement_skyfall_top           ; 59
-; 5129
 
-
-Movement_teleport_from: ; 5129
+Movement_teleport_from:
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_TELEPORT_FROM
 	ret
-; 5130
 
-Movement_teleport_to: ; 5130
+Movement_teleport_to:
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_TELEPORT_TO
 	ret
-; 5137
 
-Movement_skyfall: ; 5137
+Movement_skyfall:
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_SKYFALL
 	ret
-; 513e
 
-Movement_skyfall_top: ; 513e
+Movement_skyfall_top:
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_SKYFALL_TOP
 	ret
-; 5145
 
-Movement_step_dig: ; 5145
+Movement_step_dig:
 	call GetSpriteDirection
 	rlca
 	rlca
@@ -142,9 +136,8 @@ Movement_step_dig: ; 5145
 	add hl, bc
 	ld [hl], STANDING
 	ret
-; 516a
 
-Movement_return_dig: ; 516a
+Movement_return_dig:
 	call GetSpriteDirection
 	rlca
 	rlca
@@ -162,9 +155,8 @@ Movement_return_dig: ; 516a
 	add hl, bc
 	ld [hl], STEP_TYPE_RETURN_DIG
 	ret
-; 5189
 
-Movement_fish_got_bite: ; 5189
+Movement_fish_got_bite:
 	ld hl, OBJECT_ACTION
 	add hl, bc
 	ld [hl], OBJECT_ACTION_FISHING
@@ -172,9 +164,8 @@ Movement_fish_got_bite: ; 5189
 	add hl, bc
 	ld [hl], STEP_TYPE_GOT_BITE
 	ret
-; 5196
 
-Movement_rock_smash: ; 5196
+Movement_rock_smash:
 	call JumpMovementPointer
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
@@ -186,9 +177,8 @@ Movement_rock_smash: ; 5196
 	add hl, bc
 	ld [hl], STEP_TYPE_ROCK_SMASH
 	ret
-; 51ab
 
-Movement_fish_cast_rod: ; 51ab
+Movement_fish_cast_rod:
 	ld hl, OBJECT_ACTION
 	add hl, bc
 	ld [hl], OBJECT_ACTION_FISHING
@@ -196,16 +186,14 @@ Movement_fish_cast_rod: ; 51ab
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 51b8
 
-Movement_step_loop: ; 51b8
+Movement_step_loop:
 	ld hl, OBJECT_MOVEMENT_BYTE_INDEX
 	add hl, bc
 	ld [hl], $0
 	jp ContinueReadingMovement
-; 51c1
 
-Movement_step_end: ; 51c1
+Movement_step_end:
 	call RestoreDefaultMovement
 	ld hl, OBJECT_MOVEMENTTYPE
 	add hl, bc
@@ -222,9 +210,8 @@ Movement_step_end: ; 51c1
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 51db
 
-Movement_48: ; 51db
+Movement_48:
 	call RestoreDefaultMovement
 	ld hl, OBJECT_MOVEMENTTYPE
 	add hl, bc
@@ -246,9 +233,8 @@ Movement_48: ; 51db
 	ld hl, wVramState
 	res 7, [hl]
 	ret
-; 51fd
 
-Movement_remove_object: ; 51fd
+Movement_remove_object:
 	call DeleteMapObject
 	ld hl, wObjectFollow_Leader
 	ld a, [hMapObjectIndexBuffer]
@@ -260,9 +246,8 @@ Movement_remove_object: ; 51fd
 	ld hl, wVramState
 	res 7, [hl]
 	ret
-; 5210
 
-Movement_4b: ; 5210
+Movement_4b:
 	ld hl, OBJECT_ACTION
 	add hl, bc
 	ld [hl], OBJECT_ACTION_STAND
@@ -274,48 +259,47 @@ Movement_4b: ; 5210
 	ld hl, wVramState
 	res 7, [hl]
 	ret
-; 5222
 
-Movement_step_sleep_1: ; 5222
+Movement_step_sleep_1:
 	ld a, 1
 	jr Movement_step_sleep_common
 
-Movement_step_sleep_2: ; 5226
+Movement_step_sleep_2:
 	ld a, 2
 	jr Movement_step_sleep_common
 
-Movement_step_sleep_3: ; 522a
+Movement_step_sleep_3:
 	ld a, 3
 	jr Movement_step_sleep_common
 
-Movement_step_sleep_4: ; 522e
+Movement_step_sleep_4:
 	ld a, 4
 	jr Movement_step_sleep_common
 
-Movement_step_sleep_5: ; 5232
+Movement_step_sleep_5:
 	ld a, 5
 	jr Movement_step_sleep_common
 
-Movement_step_sleep_6: ; 5236
+Movement_step_sleep_6:
 	ld a, 6
 	jr Movement_step_sleep_common
 
-Movement_step_sleep_7: ; 523a
+Movement_step_sleep_7:
 	ld a, 7
 	jr Movement_step_sleep_common
 
-Movement_step_sleep_8: ; 523e
+Movement_step_sleep_8:
 	ld a, 8
 	jr Movement_step_sleep_common
 
-Movement_step_sleep: ; 5242
+Movement_step_sleep:
 ; parameters:
 ;	duration (DecimalParam)
 
 	call JumpMovementPointer
 	jr Movement_step_sleep_common
 
-Movement_step_sleep_common: ; 5247
+Movement_step_sleep_common:
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld [hl], a
@@ -332,9 +316,8 @@ Movement_step_sleep_common: ; 5247
 	add hl, bc
 	ld [hl], STANDING
 	ret
-; 525f
 
-Movement_step_bump: ; 525f
+Movement_step_bump:
 	ld a, 1
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
@@ -352,9 +335,8 @@ Movement_step_bump: ; 525f
 	add hl, bc
 	ld [hl], STANDING
 	ret
-; 5279
 
-Movement_tree_shake: ; 5279
+Movement_tree_shake:
 	ld a, 24
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
@@ -372,86 +354,76 @@ Movement_tree_shake: ; 5279
 	add hl, bc
 	ld [hl], STANDING
 	ret
-; 5293
 
-Movement_remove_sliding: ; 5293
+Movement_remove_sliding:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	res SLIDING, [hl]
+	res SLIDING_F, [hl]
 	jp ContinueReadingMovement
-; 529c
 
-Movement_set_sliding: ; 529c
+Movement_set_sliding:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	set SLIDING, [hl]
+	set SLIDING_F, [hl]
 	jp ContinueReadingMovement
-; 52a5
 
-Movement_remove_fixed_facing: ; 52a5
+Movement_remove_fixed_facing:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	res FIXED_FACING, [hl]
+	res FIXED_FACING_F, [hl]
 	jp ContinueReadingMovement
-; 52ae
 
-Movement_fix_facing: ; 52ae
+Movement_fix_facing:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	set FIXED_FACING, [hl]
+	set FIXED_FACING_F, [hl]
 	jp ContinueReadingMovement
-; 52b7
 
-Movement_show_object: ; 52b7
+Movement_show_object:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	res INVISIBLE, [hl]
+	res INVISIBLE_F, [hl]
 	jp ContinueReadingMovement
-; 52c0
 
-Movement_hide_object: ; 52c0
+Movement_hide_object:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	set INVISIBLE, [hl]
+	set INVISIBLE_F, [hl]
 	jp ContinueReadingMovement
-; 52c9
 
-Movement_hide_emote: ; 52c9
+Movement_hide_emote:
 	call DespawnEmote
 	jp ContinueReadingMovement
-; 52cf
 
-Movement_show_emote: ; 52cf
+Movement_show_emote:
 	call SpawnEmote
 	jp ContinueReadingMovement
-; 52d5
 
-Movement_step_shake: ; 52d5
+Movement_step_shake:
 ; parameters:
 ;	displacement (DecimalParam)
 
 	call JumpMovementPointer
 	call ShakeScreen
 	jp ContinueReadingMovement
-; 52de
 
-Movement_turn_head_down: ; 52de
+Movement_turn_head_down:
 	ld a, OW_DOWN
 	jr TurnHead
 
-Movement_turn_head_up: ; 52e2
+Movement_turn_head_up:
 	ld a, OW_UP
 	jr TurnHead
 
-Movement_turn_head_left: ; 52e6
+Movement_turn_head_left:
 	ld a, OW_LEFT
 	jr TurnHead
 
-Movement_turn_head_right: ; 52ea
+Movement_turn_head_right:
 	ld a, OW_RIGHT
 	jr TurnHead
 
-TurnHead: ; 52ee
+TurnHead:
 	ld hl, OBJECT_FACING
 	add hl, bc
 	ld [hl], a
@@ -464,269 +436,216 @@ TurnHead: ; 52ee
 	add hl, bc
 	ld [hl], STANDING
 	ret
-; 5300
 
-Movement_slow_step_down: ; 5300
+Movement_slow_step_down:
 	ld a, STEP_SLOW << 2 | DOWN
 	jp NormalStep
-; 5305
 
-Movement_slow_step_up: ; 5305
+Movement_slow_step_up:
 	ld a, STEP_SLOW << 2 | UP
 	jp NormalStep
-; 530a
 
-Movement_slow_step_left: ; 530a
+Movement_slow_step_left:
 	ld a, STEP_SLOW << 2 | LEFT
 	jp NormalStep
-; 530f
 
-Movement_slow_step_right: ; 530f
+Movement_slow_step_right:
 	ld a, STEP_SLOW << 2 | RIGHT
 	jp NormalStep
-; 5314
 
-Movement_step_down: ; 5314
+Movement_step_down:
 	ld a, STEP_WALK << 2 | DOWN
 	jp NormalStep
-; 5319
 
-Movement_step_up: ; 5319
+Movement_step_up:
 	ld a, STEP_WALK << 2 | UP
 	jp NormalStep
-; 531e
 
-Movement_step_left: ; 531e
+Movement_step_left:
 	ld a, STEP_WALK << 2 | LEFT
 	jp NormalStep
-; 5323
 
-Movement_step_right: ; 5323
+Movement_step_right:
 	ld a, STEP_WALK << 2 | RIGHT
 	jp NormalStep
-; 5328
 
-Movement_big_step_down: ; 5328
+Movement_big_step_down:
 	ld a, STEP_BIKE << 2 | DOWN
 	jp NormalStep
-; 532d
 
-Movement_big_step_up: ; 532d
+Movement_big_step_up:
 	ld a, STEP_BIKE << 2 | UP
 	jp NormalStep
-; 5332
 
-Movement_big_step_left: ; 5332
+Movement_big_step_left:
 	ld a, STEP_BIKE << 2 | LEFT
 	jp NormalStep
-; 5337
 
-Movement_big_step_right: ; 5337
+Movement_big_step_right:
 	ld a, STEP_BIKE << 2 | RIGHT
 	jp NormalStep
-; 533c
-
 
-Movement_turn_away_down: ; 533c
+Movement_turn_away_down:
 	ld a, STEP_SLOW << 2 | DOWN
 	jp TurningStep
-; 5341
 
-Movement_turn_away_up: ; 5341
+Movement_turn_away_up:
 	ld a, STEP_SLOW << 2 | UP
 	jp TurningStep
-; 5346
 
-Movement_turn_away_left: ; 5346
+Movement_turn_away_left:
 	ld a, STEP_SLOW << 2 | LEFT
 	jp TurningStep
-; 534b
 
-Movement_turn_away_right: ; 534b
+Movement_turn_away_right:
 	ld a, STEP_SLOW << 2 | RIGHT
 	jp TurningStep
-; 5350
 
-Movement_turn_in_down: ; 5350
+Movement_turn_in_down:
 	ld a, STEP_WALK << 2 | DOWN
 	jp TurningStep
-; 5355
 
-Movement_turn_in_up: ; 5355
+Movement_turn_in_up:
 	ld a, STEP_WALK << 2 | UP
 	jp TurningStep
-; 535a
 
-Movement_turn_in_left: ; 535a
+Movement_turn_in_left:
 	ld a, STEP_WALK << 2 | LEFT
 	jp TurningStep
-; 535f
 
-Movement_turn_in_right: ; 535f
+Movement_turn_in_right:
 	ld a, STEP_WALK << 2 | RIGHT
 	jp TurningStep
-; 5364
 
-Movement_turn_waterfall_down: ; 5364
+Movement_turn_waterfall_down:
 	ld a, STEP_BIKE << 2 | DOWN
 	jp TurningStep
-; 5369
 
-Movement_turn_waterfall_up: ; 5369
+Movement_turn_waterfall_up:
 	ld a, STEP_BIKE << 2 | UP
 	jp TurningStep
-; 536e
 
-Movement_turn_waterfall_left: ; 536e
+Movement_turn_waterfall_left:
 	ld a, STEP_BIKE << 2 | LEFT
 	jp TurningStep
-; 5373
 
-Movement_turn_waterfall_right: ; 5373
+Movement_turn_waterfall_right:
 	ld a, STEP_BIKE << 2 | RIGHT
 	jp TurningStep
-; 5378
 
-
-Movement_slow_slide_step_down: ; 5378
+Movement_slow_slide_step_down:
 	ld a, STEP_SLOW << 2 | DOWN
 	jp SlideStep
-; 537d
 
-Movement_slow_slide_step_up: ; 537d
+Movement_slow_slide_step_up:
 	ld a, STEP_SLOW << 2 | UP
 	jp SlideStep
-; 5382
 
-Movement_slow_slide_step_left: ; 5382
+Movement_slow_slide_step_left:
 	ld a, STEP_SLOW << 2 | LEFT
 	jp SlideStep
-; 5387
 
-Movement_slow_slide_step_right: ; 5387
+Movement_slow_slide_step_right:
 	ld a, STEP_SLOW << 2 | RIGHT
 	jp SlideStep
-; 538c
 
-Movement_slide_step_down: ; 538c
+Movement_slide_step_down:
 	ld a, STEP_WALK << 2 | DOWN
 	jp SlideStep
-; 5391
 
-Movement_slide_step_up: ; 5391
+Movement_slide_step_up:
 	ld a, STEP_WALK << 2 | UP
 	jp SlideStep
-; 5396
 
-Movement_slide_step_left: ; 5396
+Movement_slide_step_left:
 	ld a, STEP_WALK << 2 | LEFT
 	jp SlideStep
-; 539b
 
-Movement_slide_step_right: ; 539b
+Movement_slide_step_right:
 	ld a, STEP_WALK << 2 | RIGHT
 	jp SlideStep
-; 53a0
 
-Movement_fast_slide_step_down: ; 53a0
+Movement_fast_slide_step_down:
 	ld a, STEP_BIKE << 2 | DOWN
 	jp SlideStep
-; 53a5
 
-Movement_fast_slide_step_up: ; 53a5
+Movement_fast_slide_step_up:
 	ld a, STEP_BIKE << 2 | UP
 	jp SlideStep
-; 53aa
 
-Movement_fast_slide_step_left: ; 53aa
+Movement_fast_slide_step_left:
 	ld a, STEP_BIKE << 2 | LEFT
 	jp SlideStep
-; 53af
 
-Movement_fast_slide_step_right: ; 53af
+Movement_fast_slide_step_right:
 	ld a, STEP_BIKE << 2 | RIGHT
 	jp SlideStep
-; 53b4
-
 
-Movement_slow_jump_step_down: ; 53b4
+Movement_slow_jump_step_down:
 	ld a, STEP_SLOW << 2 | DOWN
 	jp JumpStep
-; 53b9
 
-Movement_slow_jump_step_up: ; 53b9
+Movement_slow_jump_step_up:
 	ld a, STEP_SLOW << 2 | UP
 	jp JumpStep
-; 53be
 
-Movement_slow_jump_step_left: ; 53be
+Movement_slow_jump_step_left:
 	ld a, STEP_SLOW << 2 | LEFT
 	jp JumpStep
-; 53c3
 
-Movement_slow_jump_step_right: ; 53c3
+Movement_slow_jump_step_right:
 	ld a, STEP_SLOW << 2 | RIGHT
 	jp JumpStep
-; 53c8
 
-Movement_jump_step_down: ; 53c8
+Movement_jump_step_down:
 	ld a, STEP_WALK << 2 | DOWN
 	jp JumpStep
-; 53cd
 
-Movement_jump_step_up: ; 53cd
+Movement_jump_step_up:
 	ld a, STEP_WALK << 2 | UP
 	jp JumpStep
-; 53d2
 
-Movement_jump_step_left: ; 53d2
+Movement_jump_step_left:
 	ld a, STEP_WALK << 2 | LEFT
 	jp JumpStep
-; 53d7
 
-Movement_jump_step_right: ; 53d7
+Movement_jump_step_right:
 	ld a, STEP_WALK << 2 | RIGHT
 	jp JumpStep
-; 53dc
 
-Movement_fast_jump_step_down: ; 53dc
+Movement_fast_jump_step_down:
 	ld a, STEP_BIKE << 2 | DOWN
 	jp JumpStep
-; 53e1
 
-Movement_fast_jump_step_up: ; 53e1
+Movement_fast_jump_step_up:
 	ld a, STEP_BIKE << 2 | UP
 	jp JumpStep
-; 53e6
 
-Movement_fast_jump_step_left: ; 53e6
+Movement_fast_jump_step_left:
 	ld a, STEP_BIKE << 2 | LEFT
 	jp JumpStep
-; 53eb
 
-Movement_fast_jump_step_right: ; 53eb
+Movement_fast_jump_step_right:
 	ld a, STEP_BIKE << 2 | RIGHT
 	jp JumpStep
-; 53f0
 
-
-Movement_turn_step_down: ; 53f0
+Movement_turn_step_down:
 	ld a, OW_DOWN
 	jr TurnStep
 
-Movement_turn_step_up: ; 53f4
+Movement_turn_step_up:
 	ld a, OW_UP
 	jr TurnStep
 
-Movement_turn_step_left: ; 53f8
+Movement_turn_step_left:
 	ld a, OW_LEFT
 	jr TurnStep
 
-Movement_turn_step_right: ; 53fc
+Movement_turn_step_right:
 	ld a, OW_RIGHT
 	jr TurnStep
 
-TurnStep: ; 5400
+TurnStep:
 	ld hl, OBJECT_1D ; new facing
 	add hl, bc
 	ld [hl], a
@@ -739,9 +658,8 @@ TurnStep: ; 5400
 	add hl, bc
 	ld [hl], STEP_TYPE_HALF_STEP
 	ret
-; 5412
 
-NormalStep: ; 5412
+NormalStep:
 	call InitStep
 	call UpdateTallGrassFlags
 	ld hl, OBJECT_ACTION
@@ -776,9 +694,8 @@ NormalStep: ; 5412
 	add hl, bc
 	ld [hl], STEP_TYPE_PLAYER_WALK
 	ret
-; 5446
 
-TurningStep: ; 5446
+TurningStep:
 	call InitStep
 	call UpdateTallGrassFlags
 
@@ -801,10 +718,8 @@ TurningStep: ; 5446
 	add hl, bc
 	ld [hl], STEP_TYPE_PLAYER_WALK
 	ret
-; 5468
-
 
-SlideStep: ; 5468
+SlideStep:
 	call InitStep
 	call UpdateTallGrassFlags
 
@@ -827,10 +742,8 @@ SlideStep: ; 5468
 	add hl, bc
 	ld [hl], STEP_TYPE_PLAYER_WALK
 	ret
-; 548a
-
 
-JumpStep: ; 548a
+JumpStep:
 	call InitStep
 	ld hl, OBJECT_1F
 	add hl, bc
@@ -838,7 +751,7 @@ JumpStep: ; 548a
 
 	ld hl, OBJECT_FLAGS2
 	add hl, bc
-	res 3, [hl]
+	res OVERHEAD_F, [hl]
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
@@ -861,4 +774,3 @@ JumpStep: ; 548a
 	add hl, bc
 	ld [hl], STEP_TYPE_PLAYER_JUMP
 	ret
-; 54b8
diff --git a/engine/npc_movement.asm b/engine/overworld/npc_movement.asm
index ecb520554..b4b5ef467 100755..100644
--- a/engine/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -1,37 +1,37 @@
-Function6ec1: ; 6ec1
-
+CanObjectMoveInDirection:
 	ld hl, OBJECT_PALETTE
 	add hl, bc
-	bit 5, [hl]
-	jr z, .not_bit_5
+	bit SWIMMING_F, [hl]
+	jr z, .not_swimming
 
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit 4, [hl] ; lost, uncomment next line to fix
-;	jr nz, .resume
+	bit NOCLIP_TILES_F, [hl] ; lost, uncomment next line to fix
+	; jr nz, .noclip_tiles
 	push hl
 	push bc
-	call Function6f2c
+	call WillObjectBumpIntoLand
 	pop bc
 	pop hl
 	ret c
-	jr .resume
+	jr .continue
 
-.not_bit_5
+.not_swimming
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit 4, [hl]
-	jr nz, .resume
+	bit NOCLIP_TILES_F, [hl]
+	jr nz, .noclip_tiles
 	push hl
 	push bc
-	call Function6f07
+	call WillObjectBumpIntoWater
 	pop bc
 	pop hl
 	ret c
 
-.resume
-	bit 6, [hl]
-	jr nz, .bit_6
+.noclip_tiles
+.continue
+	bit NOCLIP_OBJS_F, [hl]
+	jr nz, .noclip_objs
 
 	push hl
 	push bc
@@ -40,9 +40,9 @@ Function6ec1: ; 6ec1
 	pop hl
 	ret c
 
-.bit_6
-	bit 5, [hl]
-	jr nz, .bit_5
+.noclip_objs
+	bit MOVE_ANYWHERE_F, [hl]
+	jr nz, .move_anywhere
 	push hl
 	call HasObjectReachedMovementLimit
 	pop hl
@@ -53,13 +53,11 @@ Function6ec1: ; 6ec1
 	pop hl
 	ret c
 
-.bit_5
+.move_anywhere
 	and a
 	ret
-; 6f07
 
-
-Function6f07: ; 6f07
+WillObjectBumpIntoWater:
 	call Function6f5f
 	ret c
 	ld hl, OBJECT_NEXT_MAP_X
@@ -78,12 +76,11 @@ Function6f07: ; 6f07
 	ld d, a
 	call GetTileCollision
 	and a ; LANDTILE
-	jr z, Function6f3e
+	jr z, WillObjectBumpIntoTile
 	scf
 	ret
-; 6f2c
 
-Function6f2c: ; 6f2c
+WillObjectBumpIntoLand:
 	call Function6f5f
 	ret c
 	ld hl, OBJECT_NEXT_TILE
@@ -91,12 +88,11 @@ Function6f2c: ; 6f2c
 	ld a, [hl]
 	call GetTileCollision
 	cp WATERTILE
-	jr z, Function6f3e
+	jr z, WillObjectBumpIntoTile
 	scf
 	ret
-; 6f3e
 
-Function6f3e: ; 6f3e
+WillObjectBumpIntoTile:
 	ld hl, OBJECT_NEXT_TILE
 	add hl, bc
 	ld a, [hl]
@@ -116,13 +112,11 @@ Function6f3e: ; 6f3e
 	ret z
 	scf
 	ret
-; 6f5b
 
 .data_6f5b
 	db DOWN_MASK, UP_MASK, RIGHT_MASK, LEFT_MASK
-; 6f5f
 
-Function6f5f: ; 6f5f
+Function6f5f:
 	ld hl, OBJECT_STANDING_TILE
 	add hl, bc
 	ld a, [hl]
@@ -141,18 +135,16 @@ Function6f5f: ; 6f5f
 	ret z
 	scf
 	ret
-; 6f7b
 
 .data_6f7b
 	db UP_MASK, DOWN_MASK, LEFT_MASK, RIGHT_MASK
-; 6f7f
 
-Function6f7f: ; 6f7f
+Function6f7f:
 	ld d, a
 	and $f0
-	cp $b0
+	cp HI_NYBBLE_SIDE_WALLS
 	jr z, .done
-	cp $c0
+	cp HI_NYBBLE_UNUSED_C0
 	jr z, .done
 	xor a
 	ret
@@ -167,14 +159,12 @@ Function6f7f: ; 6f7f
 	ld a, [hl]
 	scf
 	ret
-; 6f99
 
 .data_6f99
 	db  8, 4, 1, 2
 	db 10, 6, 9, 5
-; 6fa1
 
-Function6fa1: ; 6fa1
+Function6fa1:
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
 	ld a, [hl]
@@ -223,12 +213,8 @@ Function6fa1: ; 6fa1
 .not_land
 	scf
 	ret
-; 6fd9
-
-
-
-CheckFacingObject:: ; 6fd9
 
+CheckFacingObject::
 	call GetFacingTileCoord
 
 ; Double the distance for counter tiles.
@@ -266,10 +252,8 @@ CheckFacingObject:: ; 6fd9
 .standing
 	scf
 	ret
-; 7009
-
 
-WillObjectBumpIntoSomeoneElse: ; 7009
+WillObjectBumpIntoSomeoneElse:
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld d, [hl]
@@ -277,7 +261,6 @@ WillObjectBumpIntoSomeoneElse: ; 7009
 	add hl, bc
 	ld e, [hl]
 	jr IsNPCAtCoord
-; 7015
 
 Unreferenced_Function7015:
 	ld a, [hMapObjectIndexBuffer]
@@ -286,7 +269,7 @@ Unreferenced_Function7015:
 	call IsNPCAtCoord
 	ret
 
-.CheckWillBeFacingNPC: ; 7021
+.CheckWillBeFacingNPC:
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld d, [hl]
@@ -314,9 +297,8 @@ Unreferenced_Function7015:
 .left
 	dec d
 	ret
-; 7041
 
-IsNPCAtCoord: ; 7041
+IsNPCAtCoord:
 	ld bc, wObjectStructs
 	xor a
 .loop
@@ -331,7 +313,7 @@ IsNPCAtCoord: ; 7041
 
 	ld hl, OBJECT_PALETTE
 	add hl, bc
-	bit 7, [hl]
+	bit BIG_OBJECT_F, [hl]
 	jr z, .got
 
 	call Function7171
@@ -389,9 +371,8 @@ IsNPCAtCoord: ; 7041
 .setcarry
 	scf
 	ret
-; 70a4
 
-HasObjectReachedMovementLimit: ; 70a4
+HasObjectReachedMovementLimit:
 	ld hl, OBJECT_RADIUS
 	add hl, bc
 	ld a, [hl]
@@ -449,9 +430,8 @@ HasObjectReachedMovementLimit: ; 70a4
 .yes
 	scf
 	ret
-; 70ed
 
-IsObjectMovingOffEdgeOfScreen: ; 70ed
+IsObjectMovingOffEdgeOfScreen:
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld a, [wXCoord]
@@ -480,7 +460,6 @@ IsObjectMovingOffEdgeOfScreen: ; 70ed
 .yes
 	scf
 	ret
-; 7113
 
 Unreferenced_Function7113:
 	ld a, [wPlayerStandingMapX]
@@ -496,7 +475,7 @@ Unreferenced_Function7113:
 	ld hl, OBJECT_MOVEMENTTYPE
 	add hl, bc
 	ld a, [hl]
-	cp SPRITEMOVEDATA_SNORLAX
+	cp SPRITEMOVEDATA_BIGDOLLSYM
 	jr nz, .not_snorlax
 	call Function7171
 	jr c, .yes
@@ -546,10 +525,8 @@ Unreferenced_Function7113:
 .yes
 	scf
 	ret
-; 7171
-
 
-Function7171: ; 7171
+Function7171:
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld a, d
@@ -570,4 +547,3 @@ Function7171: ; 7171
 .nope
 	and a
 	ret
-; 718d
diff --git a/engine/overworld.asm b/engine/overworld/overworld.asm
index 79c6ed526..f3dcb5b96 100755..100644
--- a/engine/overworld.asm
+++ b/engine/overworld/overworld.asm
@@ -1,13 +1,12 @@
-GetEmote2bpp: ; 1412a
+GetEmote2bpp:
 	ld a, $1
 	ld [rVBK], a
 	call Get2bpp
 	xor a
 	ld [rVBK], a
 	ret
-; 14135
 
-_ReplaceKrisSprite:: ; 14135
+_ReplaceKrisSprite::
 	call GetPlayerSprite
 	ld a, [wUsedSprites]
 	ld [hUsedSpriteIndex], a
@@ -15,7 +14,6 @@ _ReplaceKrisSprite:: ; 14135
 	ld [hUsedSpriteTile], a
 	call GetUsedSprite
 	ret
-; 14146
 
 Function14146: ; mobile
 	ld hl, wSpriteFlags
@@ -23,11 +21,10 @@ Function14146: ; mobile
 	push af
 	res 7, [hl]
 	set 6, [hl]
-	call Special_LoadUsedSpritesGFX
+	call LoadUsedSpritesGFX
 	pop af
 	ld [wSpriteFlags], a
 	ret
-; 14157
 
 Function14157: ; mobile
 	ld hl, wSpriteFlags
@@ -35,19 +32,17 @@ Function14157: ; mobile
 	push af
 	set 7, [hl]
 	res 6, [hl]
-	call Special_LoadUsedSpritesGFX
+	call LoadUsedSpritesGFX
 	pop af
 	ld [wSpriteFlags], a
 	ret
-; 14168
 
-Special_RefreshSprites:: ; 14168
+RefreshSprites::
 	call .Refresh
-	call Special_LoadUsedSpritesGFX
+	call LoadUsedSpritesGFX
 	ret
-; 1416f
 
-.Refresh: ; 1416f
+.Refresh:
 	xor a
 	ld bc, wUsedSpritesEnd - wUsedSprites
 	ld hl, wUsedSprites
@@ -56,18 +51,17 @@ Special_RefreshSprites:: ; 14168
 	call AddMapSprites
 	call LoadAndSortSprites
 	ret
-; 14183
 
-GetPlayerSprite: ; 14183
+GetPlayerSprite:
 ; Get Chris or Kris's sprite.
-	ld hl, .Chris
+	ld hl, ChrisStateSprites
 	ld a, [wPlayerSpriteSetupFlags]
-	bit 2, a
+	bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a
 	jr nz, .go
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .go
-	ld hl, .Kris
+	ld hl, KrisStateSprites
 
 .go
 	ld a, [wPlayerState]
@@ -95,23 +89,9 @@ GetPlayerSprite: ; 14183
 	ld [wPlayerObjectSprite], a
 	ret
 
-.Chris:
-	db PLAYER_NORMAL,    SPRITE_CHRIS
-	db PLAYER_BIKE,      SPRITE_CHRIS_BIKE
-	db PLAYER_SURF,      SPRITE_SURF
-	db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
-	db -1 ; end
+INCLUDE "data/sprites/player_sprites.asm"
 
-.Kris:
-	db PLAYER_NORMAL,    SPRITE_KRIS
-	db PLAYER_BIKE,      SPRITE_KRIS_BIKE
-	db PLAYER_SURF,      SPRITE_SURF
-	db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
-	db -1 ; end
-; 141c9
-
-
-AddMapSprites: ; 141c9
+AddMapSprites:
 	call GetMapEnvironment
 	call CheckOutdoorMap
 	jr z, .outdoor
@@ -121,10 +101,8 @@ AddMapSprites: ; 141c9
 .outdoor
 	call AddOutdoorSprites
 	ret
-; 141d9
-
 
-AddIndoorSprites: ; 141d9
+AddIndoorSprites:
 	ld hl, wMap1ObjectSprite
 	ld a, 1
 .loop
@@ -138,10 +116,8 @@ AddIndoorSprites: ; 141d9
 	cp NUM_OBJECTS
 	jr nz, .loop
 	ret
-; 141ee
 
-
-AddOutdoorSprites: ; 141ee
+AddOutdoorSprites:
 	ld a, [wMapGroup]
 	dec a
 	ld c, a
@@ -161,18 +137,15 @@ AddOutdoorSprites: ; 141ee
 	dec c
 	jr nz, .loop
 	ret
-; 14209
-
 
-Special_LoadUsedSpritesGFX: ; 14209
+LoadUsedSpritesGFX:
 	ld a, MAPCALLBACK_SPRITES
 	call RunMapCallback
 	call GetUsedSprites
 	call .LoadMiscTiles
 	ret
-; 14215
 
-.LoadMiscTiles: ; 14215
+.LoadMiscTiles:
 	ld a, [wSpriteFlags]
 	bit 6, a
 	ret nz
@@ -187,18 +160,14 @@ Special_LoadUsedSpritesGFX: ; 14209
 .outdoor
 	farcall LoadEmote
 	ret
-; 14236
 
-
-
-SafeGetSprite: ; 14236
+SafeGetSprite:
 	push hl
 	call GetSprite
 	pop hl
 	ret
-; 1423c
 
-GetSprite: ; 1423c
+GetSprite:
 	call GetMonSprite
 	ret c
 
@@ -224,10 +193,8 @@ GetSprite: ; 1423c
 	ld l, [hl]
 	ld h, a
 	ret
-; 14259
 
-
-GetMonSprite: ; 14259
+GetMonSprite:
 ; Return carry if a monster sprite was loaded.
 
 	cp SPRITE_POKEMON
@@ -288,10 +255,8 @@ GetMonSprite: ; 14259
 	ld h, 0
 	and a
 	ret
-; 142a7
-
 
-_DoesSpriteHaveFacings:: ; 142a7
+_DoesSpriteHaveFacings::
 ; Checks to see whether we can apply a facing to a sprite.
 ; Returns carry unless the sprite is a Pokemon or a Still Sprite.
 	cp SPRITE_POKEMON
@@ -316,10 +281,8 @@ _DoesSpriteHaveFacings:: ; 142a7
 .only_down
 	and a
 	ret
-; 142c4
 
-
-_GetSpritePalette:: ; 142c4
+_GetSpritePalette::
 	ld a, c
 	call GetMonSprite
 	jr c, .is_pokemon
@@ -337,18 +300,14 @@ _GetSpritePalette:: ; 142c4
 	xor a
 	ld c, a
 	ret
-; 142db
-
 
-LoadAndSortSprites: ; 142db
+LoadAndSortSprites:
 	call LoadSpriteGFX
 	call SortUsedSprites
 	call ArrangeUsedSprites
 	ret
-; 142e5
-
 
-AddSpriteGFX: ; 142e5
+AddSpriteGFX:
 ; Add any new sprite ids to a list of graphics to be loaded.
 ; Return carry if the list is full.
 
@@ -385,10 +344,8 @@ AddSpriteGFX: ; 142e5
 	pop hl
 	and a
 	ret
-; 14306
 
-
-LoadSpriteGFX: ; 14306
+LoadSpriteGFX:
 ; Bug: b is not preserved, so it's useless as a next count.
 ; Uncomment the lines below to fix.
 
@@ -414,10 +371,8 @@ LoadSpriteGFX: ; 14306
 	; pop bc
 	ld a, l
 	ret
-; 1431e
-
 
-SortUsedSprites: ; 1431e
+SortUsedSprites:
 ; Bubble-sort sprites by type.
 
 ; Run backwards through wUsedSprites to find the last one.
@@ -486,10 +441,8 @@ SortUsedSprites: ; 1431e
 
 .quit
 	ret
-; 14355
 
-
-ArrangeUsedSprites: ; 14355
+ArrangeUsedSprites:
 ; Get the length of each sprite and space them out in VRAM.
 ; Crystal introduces a second table in VRAM bank 0.
 
@@ -546,10 +499,8 @@ ArrangeUsedSprites: ; 14355
 
 .quit
 	ret
-; 14386
-
 
-GetSpriteLength: ; 14386
+GetSpriteLength:
 ; Return the length of sprite type a in tiles.
 
 	cp WALKING_SPRITE
@@ -569,10 +520,8 @@ GetSpriteLength: ; 14386
 .OneDirection:
 	ld a, 4
 	ret
-; 1439b
 
-
-GetUsedSprites: ; 1439b
+GetUsedSprites:
 	ld hl, wUsedSprites
 	ld c, SPRITE_GFX_LIST_CAPACITY
 
@@ -607,9 +556,8 @@ GetUsedSprites: ; 1439b
 
 .done
 	ret
-; 143c8
 
-GetUsedSprite: ; 143c8
+GetUsedSprite:
 	ld a, [hUsedSpriteIndex]
 	call SafeGetSprite
 	ld a, [hUsedSpriteTile]
@@ -652,9 +600,8 @@ endr
 
 .done
 	ret
-; 14406
 
-.GetTileAddr: ; 14406
+.GetTileAddr:
 ; Return the address of tile (a) in (hl).
 	and $7f
 	ld l, a
@@ -669,9 +616,8 @@ endr
 	adc HIGH(vTiles0)
 	ld h, a
 	ret
-; 14418
 
-.CopyToVram: ; 14418
+.CopyToVram:
 	ld a, [rVBK]
 	push af
 	ld a, [wSpriteFlags]
@@ -686,9 +632,8 @@ endr
 	pop af
 	ld [rVBK], a
 	ret
-; 1442f
 
-LoadEmote:: ; 1442f
+LoadEmote::
 ; Get the address of the pointer to emote c.
 	ld a, c
 	ld bc, 6 ; sizeof(emote)
@@ -716,8 +661,6 @@ LoadEmote:: ; 1442f
 	ret z
 	call GetEmote2bpp
 	ret
-; 1444d
-
 
 INCLUDE "data/sprites/emotes.asm"
 
diff --git a/engine/player_movement.asm b/engine/overworld/player_movement.asm
index 83fdf64ba..a4926e7e5 100755..100644
--- a/engine/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -1,4 +1,4 @@
-DoPlayerMovement:: ; 80000
+DoPlayerMovement::
 
 	call .GetDPad
 	ld a, movement_step_sleep
@@ -19,7 +19,7 @@ DoPlayerMovement:: ; 80000
 ; Standing downhill instead moves down.
 
 	ld hl, wBikeFlags
-	bit 2, [hl] ; downhill
+	bit BIKEFLAGS_DOWNHILL_F, [hl]
 	ret z
 
 	ld c, a
@@ -30,7 +30,6 @@ DoPlayerMovement:: ; 80000
 	or D_DOWN
 	ld [wCurInput], a
 	ret
-; 8002d
 
 .TranslateIntoMovement:
 	ld a, [wPlayerState]
@@ -112,9 +111,8 @@ DoPlayerMovement:: ; 80000
 	call .StandInPlace
 	xor a
 	ret
-; 800b7
 
-.CheckTile: ; 800b7
+.CheckTile:
 ; Tiles such as waterfalls and warps move the player
 ; in a given direction, overriding input.
 
@@ -227,9 +225,8 @@ DoPlayerMovement:: ; 80000
 	ld a, 5
 	scf
 	ret
-; 80147
 
-.CheckTurning: ; 80147
+.CheckTurning:
 ; If the player is turning, change direction first. This also lets
 ; the player change facing without moving by tapping a direction.
 
@@ -257,10 +254,8 @@ DoPlayerMovement:: ; 80000
 .not_turning
 	xor a
 	ret
-; 8016b
-
-.TryStep: ; 8016b
 
+.TryStep:
 ; Surfing actually calls .TrySurf directly instead of passing through here.
 	ld a, [wPlayerState]
 	cp PLAYER_SURF
@@ -286,7 +281,7 @@ DoPlayerMovement:: ; 80000
 	jr nz, .walk
 
 	ld hl, wBikeFlags
-	bit 2, [hl] ; downhill
+	bit BIKEFLAGS_DOWNHILL_F, [hl]
 	jr z, .fast
 
 	ld a, [wWalkingDirection]
@@ -323,10 +318,8 @@ DoPlayerMovement:: ; 80000
 .bump
 	xor a
 	ret
-; 801c0
-
-.TrySurf: ; 801c0
 
+.TrySurf:
 	call .CheckSurfPerms
 	ld [wd040], a
 	jr c, .surf_bump
@@ -359,9 +352,8 @@ DoPlayerMovement:: ; 80000
 .surf_bump
 	xor a
 	ret
-; 801f3
 
-.TryJump: ; 801f3
+.TryJump:
 	ld a, [wPlayerStandingTile]
 	ld e, a
 	and $f0
@@ -399,10 +391,8 @@ DoPlayerMovement:: ; 80000
 	db FACE_DOWN | FACE_LEFT  ; COLL_HOP_DOWN_LEFT
 	db FACE_UP | FACE_RIGHT   ; COLL_HOP_UP_RIGHT
 	db FACE_UP | FACE_LEFT    ; COLL_HOP_UP_LEFT
-; 80226
-
-.CheckWarp: ; 80226
 
+.CheckWarp:
 ; Bug: Since no case is made for STANDING here, it will check
 ; [.edgewarps + $ff]. This resolves to $3e at $8035a.
 ; This causes wd041 to be nonzero when standing on tile $3e,
@@ -450,7 +440,6 @@ DoPlayerMovement:: ; 80000
 	db COLL_WARP_CARPET_UP
 	db COLL_WARP_CARPET_LEFT
 	db COLL_WARP_CARPET_RIGHT
-; 8025f
 
 .DoStep:
 	ld e, a
@@ -529,27 +518,24 @@ DoPlayerMovement:: ; 80000
 	db $80 + UP
 	db $80 + LEFT
 	db $80 + RIGHT
-; 802b3
 
-.StandInPlace: ; 802b3
+.StandInPlace:
 	ld a, 0
 	ld [wPlayerTurningDirection], a
 	ld a, movement_step_sleep
 	ld [wMovementAnimation], a
 	xor a
 	ret
-; 802bf
 
-._WalkInPlace: ; 802bf
+._WalkInPlace:
 	ld a, 0
 	ld [wPlayerTurningDirection], a
 	ld a, movement_step_bump
 	ld [wMovementAnimation], a
 	xor a
 	ret
-; 802cb
 
-.CheckForced: ; 802cb
+.CheckForced:
 ; When sliding on ice, input is forced to remain in the same direction.
 
 	call CheckStandingOnIce
@@ -572,13 +558,12 @@ DoPlayerMovement:: ; 80000
 
 .forced_dpad
 	db D_DOWN, D_UP, D_LEFT, D_RIGHT
-; 802ec
 
-.GetAction: ; 802ec
+.GetAction:
 ; Poll player input and update movement info.
 
-	ld hl, .table
-	ld de, .table2 - .table1
+	ld hl, .action_table
+	ld de, .action_table_1_end - .action_table_1
 	ld a, [wCurInput]
 	bit D_DOWN_F, a
 	jr nz, .d_down
@@ -612,28 +597,22 @@ DoPlayerMovement:: ; 80000
 	ld [wWalkingTile], a
 	ret
 
-.table
-; struct:
-;	walk direction
-;	facing
-;	x movement
-;	y movement
-;	tile collision pointer
-.table1
-	db STANDING, FACE_CURRENT, 0, 0
-	dw wPlayerStandingTile
-.table2
-	db RIGHT, FACE_RIGHT,  1,  0
-	dw wTileRight
-	db LEFT,  FACE_LEFT,  -1,  0
-	dw wTileLeft
-	db UP,    FACE_UP,     0, -1
-	dw wTileUp
-	db DOWN,  FACE_DOWN,   0,  1
-	dw wTileDown
-; 80341
-
-.CheckNPC: ; 80341
+player_action: MACRO
+; walk direction, facing, x movement, y movement, tile collision pointer
+	db \1, \2, \3, \4
+	dw \5
+ENDM
+
+.action_table:
+.action_table_1
+	player_action STANDING, FACE_CURRENT, 0,  0, wPlayerStandingTile
+.action_table_1_end
+	player_action RIGHT,    FACE_RIGHT,   1,  0, wTileRight
+	player_action LEFT,     FACE_LEFT,   -1,  0, wTileLeft
+	player_action UP,       FACE_UP,      0, -1, wTileUp
+	player_action DOWN,     FACE_DOWN,    0,  1, wTileDown
+
+.CheckNPC:
 ; Returns 0 if there is an NPC in front that you can't move
 ; Returns 1 if there is no NPC in front
 ; Returns 2 if there is a movable NPC in front
@@ -668,12 +647,10 @@ DoPlayerMovement:: ; 80000
 .no_bump
 	ld a, 2
 	ret
-; 8036f
-
-.CheckStrengthBoulder: ; 8036f
 
+.CheckStrengthBoulder:
 	ld hl, wBikeFlags
-	bit 0, [hl] ; using strength
+	bit BIKEFLAGS_STRENGTH_ACTIVE_F, [hl]
 	jr z, .not_boulder
 
 	ld hl, OBJECT_DIRECTION_WALKING
@@ -684,7 +661,7 @@ DoPlayerMovement:: ; 80000
 
 	ld hl, OBJECT_PALETTE
 	add hl, bc
-	bit 6, [hl]
+	bit STRENGTH_BOULDER_F, [hl]
 	jr z, .not_boulder
 
 	ld hl, OBJECT_FLAGS2
@@ -696,7 +673,7 @@ DoPlayerMovement:: ; 80000
 	ld hl, OBJECT_RANGE
 	add hl, bc
 	ld a, [hl]
-	and $fc
+	and %11111100
 	or d
 	ld [hl], a
 
@@ -706,9 +683,8 @@ DoPlayerMovement:: ; 80000
 .not_boulder
 	xor a
 	ret
-; 8039e
 
-.CheckLandPerms: ; 8039e
+.CheckLandPerms:
 ; Return 0 if walking onto land and tile permissions allow it.
 ; Otherwise, return carry.
 
@@ -728,9 +704,8 @@ DoPlayerMovement:: ; 80000
 .NotWalkable:
 	scf
 	ret
-; 803b4
 
-.CheckSurfPerms: ; 803b4
+.CheckSurfPerms:
 ; Return 0 if moving in water, or 1 if moving onto land.
 ; Otherwise, return carry.
 
@@ -750,17 +725,15 @@ DoPlayerMovement:: ; 80000
 .NotSurfable:
 	scf
 	ret
-; 803ca
 
-.BikeCheck: ; 803ca
+.BikeCheck:
 	ld a, [wPlayerState]
 	cp PLAYER_BIKE
 	ret z
 	cp PLAYER_SKATE
 	ret
-; 803d3
 
-.CheckWalkable: ; 803d3
+.CheckWalkable:
 ; Return 0 if tile a is land. Otherwise, return carry.
 
 	call GetTileCollision
@@ -768,9 +741,8 @@ DoPlayerMovement:: ; 80000
 	ret z
 	scf
 	ret
-; 803da
 
-.CheckSurfable: ; 803da
+.CheckSurfable:
 ; Return 0 if tile a is water, or 1 if land.
 ; Otherwise, return carry.
 
@@ -796,27 +768,23 @@ DoPlayerMovement:: ; 80000
 .Neither:
 	scf
 	ret
-; 803ee
-
-.BumpSound: ; 803ee
 
+.BumpSound:
 	call CheckSFX
 	ret c
 	ld de, SFX_BUMP
 	call PlaySFX
 	ret
-; 803f9
 
-.GetOutOfWater: ; 803f9
+.GetOutOfWater:
 	push bc
 	ld a, PLAYER_NORMAL
 	ld [wPlayerState], a
 	call ReplaceKrisSprite ; UpdateSprites
 	pop bc
 	ret
-; 80404
 
-CheckStandingOnIce:: ; 80404
+CheckStandingOnIce::
 	ld a, [wPlayerTurningDirection]
 	cp 0
 	jr z, .not_ice
@@ -836,9 +804,8 @@ CheckStandingOnIce:: ; 80404
 .not_ice
 	and a
 	ret
-; 80422
 
-StopPlayerForEvent:: ; 80422
+StopPlayerForEvent::
 	ld hl, wPlayerNextMovement
 	ld a, movement_step_sleep
 	cp [hl]
@@ -848,4 +815,3 @@ StopPlayerForEvent:: ; 80422
 	ld a, 0
 	ld [wPlayerTurningDirection], a
 	ret
-; 80430
diff --git a/engine/player_object.asm b/engine/overworld/player_object.asm
index b16afda5c..08a990f4b 100755..100644
--- a/engine/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -1,4 +1,4 @@
-BlankScreen: ; 8000
+BlankScreen:
 	call DisableSpriteUpdates
 	xor a
 	ld [hBGMapMode], a
@@ -16,7 +16,7 @@ BlankScreen: ; 8000
 	call SetPalettes
 	ret
 
-SpawnPlayer: ; 8029
+SpawnPlayer:
 	ld a, -1
 	ld [wObjectFollow_Leader], a
 	ld [wObjectFollow_Follower], a
@@ -25,25 +25,25 @@ SpawnPlayer: ; 8029
 	call CopyPlayerObjectTemplate
 	ld b, $0
 	call PlayerSpawn_ConvertCoords
-	ld a, $0
+	ld a, PLAYER_OBJECT
 	call GetMapObject
 	ld hl, MAPOBJECT_COLOR
 	add hl, bc
 	ln e, PAL_NPC_RED, OBJECTTYPE_SCRIPT
 	ld a, [wPlayerSpriteSetupFlags]
-	bit 2, a
+	bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a
 	jr nz, .ok
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .ok
 	ln e, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT
 
 .ok
 	ld [hl], e
-	ld a, $0
+	ld a, PLAYER_OBJECT
 	ld [hMapObjectIndexBuffer], a
 	ld bc, wMapObjects
-	ld a, $0
+	ld a, PLAYER_OBJECT
 	ld [hObjectStructIndexBuffer], a
 	ld de, wObjectStructs
 	call CopyMapObjectToObjectStruct
@@ -51,13 +51,13 @@ SpawnPlayer: ; 8029
 	ld [wCenteredObject], a
 	ret
 
-PlayerObjectTemplate: ; 8071
+PlayerObjectTemplate:
 ; A dummy map object used to initialize the player object.
 ; Shorter than the actual amount copied by two bytes.
 ; Said bytes seem to be unused.
 	object_event -4, -4, SPRITE_CHRIS, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1
 
-CopyDECoordsToMapObject:: ; 807e
+CopyDECoordsToMapObject::
 	push de
 	ld a, b
 	call GetMapObject
@@ -70,7 +70,7 @@ CopyDECoordsToMapObject:: ; 807e
 	ld [hl], e
 	ret
 
-PlayerSpawn_ConvertCoords: ; 808f
+PlayerSpawn_ConvertCoords:
 	push bc
 	ld a, [wXCoord]
 	add 4
@@ -82,7 +82,7 @@ PlayerSpawn_ConvertCoords: ; 808f
 	call CopyDECoordsToMapObject
 	ret
 
-WriteObjectXY:: ; 80a1
+WriteObjectXY::
 	ld a, b
 	call CheckObjectVisibility
 	ret c
@@ -99,7 +99,7 @@ WriteObjectXY:: ; 80a1
 	and a
 	ret
 
-RefreshPlayerCoords: ; 80b8
+RefreshPlayerCoords:
 	ld a, [wXCoord]
 	add 4
 	ld d, a
@@ -127,7 +127,7 @@ RefreshPlayerCoords: ; 80b8
 	ret nz ; wtf
 	ret
 
-CopyObjectStruct:: ; 80e7
+CopyObjectStruct::
 	call CheckObjectMask
 	and a
 	ret nz ; masked
@@ -161,12 +161,12 @@ CopyObjectStruct:: ; 80e7
 	set 5, [hl]
 	ret
 
-CopyMapObjectToObjectStruct: ; 8116
+CopyMapObjectToObjectStruct:
 	call .CopyMapObjectToTempObject
 	call CopyTempObjectToObjectStruct
 	ret
 
-.CopyMapObjectToTempObject: ; 811d
+.CopyMapObjectToTempObject:
 	ld a, [hObjectStructIndexBuffer]
 	ld hl, MAPOBJECT_OBJECT_STRUCT_ID
 	add hl, bc
@@ -223,7 +223,7 @@ CopyMapObjectToObjectStruct: ; 8116
 	ld [wTempObjectCopyRadius], a
 	ret
 
-InitializeVisibleSprites: ; 8177
+InitializeVisibleSprites:
 	ld bc, wMapObjects + OBJECT_LENGTH
 	ld a, 1
 .loop
@@ -281,10 +281,10 @@ InitializeVisibleSprites: ; 8177
 	jr nz, .loop
 	ret
 
-.ret ; 81c9
+.ret
 	ret
 
-CheckObjectEnteringVisibleRange:: ; 81ca
+CheckObjectEnteringVisibleRange::
 	nop
 	ld a, [wPlayerStepDirection]
 	cp STANDING
@@ -293,21 +293,21 @@ CheckObjectEnteringVisibleRange:: ; 81ca
 	rst JumpTable
 	ret
 
-.dw ; 81d6
+.dw
 	dw .Down
 	dw .Up
 	dw .Left
 	dw .Right
 
-.Up: ; 81de
+.Up:
 	ld a, [wYCoord]
 	sub 1
 	jr .Vertical
 
-.Down: ; 81e5
+.Down:
 	ld a, [wYCoord]
 	add 9
-.Vertical: ; 81ea
+.Vertical:
 	ld d, a
 	ld a, [wXCoord]
 	ld e, a
@@ -355,15 +355,15 @@ CheckObjectEnteringVisibleRange:: ; 81ca
 	jr nz, .loop_v
 	ret
 
-.Left: ; 8232
+.Left:
 	ld a, [wXCoord]
 	sub 1
 	jr .Horizontal
 
-.Right: ; 8239
+.Right:
 	ld a, [wXCoord]
 	add 10
-.Horizontal: ; 823e
+.Horizontal:
 	ld e, a
 	ld a, [wYCoord]
 	ld d, a
@@ -411,7 +411,7 @@ CheckObjectEnteringVisibleRange:: ; 81ca
 	jr nz, .loop_h
 	ret
 
-CopyTempObjectToObjectStruct: ; 8286
+CopyTempObjectToObjectStruct:
 	ld a, [wTempObjectCopyMapObjectIndex]
 	ld hl, OBJECT_MAP_OBJECT_INDEX
 	add hl, de
@@ -461,7 +461,7 @@ CopyTempObjectToObjectStruct: ; 8286
 	and a
 	ret
 
-.InitYCoord: ; 82d5
+.InitYCoord:
 	ld hl, OBJECT_INIT_Y
 	add hl, de
 	ld [hl], a
@@ -481,7 +481,7 @@ CopyTempObjectToObjectStruct: ; 8286
 	ld [hl], a
 	ret
 
-.InitXCoord: ; 82f1
+.InitXCoord:
 	ld hl, OBJECT_INIT_X
 	add hl, de
 	ld [hl], a
@@ -499,7 +499,7 @@ CopyTempObjectToObjectStruct: ; 8286
 	ld [hl], a
 	ret
 
-.InitRadius: ; 830d
+.InitRadius:
 	ld h, a
 	inc a
 	and $f
@@ -513,7 +513,7 @@ CopyTempObjectToObjectStruct: ; 8286
 	ld [hl], a
 	ret
 
-TrainerWalkToPlayer: ; 831e
+TrainerWalkToPlayer:
 	ld a, [hLastTalked]
 	call InitMovementBuffer
 	ld a, movement_step_sleep
@@ -533,7 +533,7 @@ TrainerWalkToPlayer: ; 831e
 	call AppendToMovementBuffer
 	ret
 
-.GetPathToPlayer: ; 8341
+.GetPathToPlayer:
 	push de
 	push bc
 ; get player object struct, load to de
@@ -577,7 +577,7 @@ TrainerWalkToPlayer: ; 831e
 	call ComputePathToWalkToPlayer
 	ret
 
-Special_SurfStartStep: ; 8379
+SurfStartStep:
 	call InitMovementBuffer
 	call .GetMovementData
 	call AppendToMovementBuffer
@@ -585,7 +585,7 @@ Special_SurfStartStep: ; 8379
 	call AppendToMovementBuffer
 	ret
 
-.GetMovementData: ; 8388
+.GetMovementData:
 	ld a, [wPlayerDirection]
 	srl a
 	srl a
@@ -603,7 +603,7 @@ Special_SurfStartStep: ; 8379
 	slow_step LEFT
 	slow_step RIGHT
 
-FollowNotExact:: ; 839e
+FollowNotExact::
 	push bc
 	ld a, c
 	call CheckObjectVisibility
@@ -690,7 +690,7 @@ FollowNotExact:: ; 839e
 	ld [hl], STEP_TYPE_00
 	ret
 
-GetRelativeFacing:: ; 8417
+GetRelativeFacing::
 ; Determines which way map object e would have to turn to face map object d.  Returns carry if it's impossible for whatever reason.
 	ld a, d
 	call GetMapObject
@@ -715,7 +715,7 @@ GetRelativeFacing:: ; 8417
 	scf
 	ret
 
-.GetFacing_e_relativeto_d: ; 8439
+.GetFacing_e_relativeto_d:
 ; Determines which way object e would have to turn to face object d.  Returns carry if it's impossible.
 ; load the coordinates of object d into bc
 	ld a, d
@@ -796,7 +796,7 @@ GetRelativeFacing:: ; 8417
 	scf
 	ret
 
-QueueFollowerFirstStep: ; 848a
+QueueFollowerFirstStep:
 	call .QueueFirstStep
 	jr c, .same
 	ld [wFollowMovementQueue], a
diff --git a/engine/player_step.asm b/engine/overworld/player_step.asm
index 675c6553b..eba149b57 100755..100644
--- a/engine/player_step.asm
+++ b/engine/overworld/player_step.asm
@@ -1,4 +1,4 @@
-_HandlePlayerStep:: ; d497 (3:5497)
+_HandlePlayerStep::
 	ld a, [wPlayerStepFlags]
 	and a
 	ret z
@@ -34,7 +34,7 @@ _HandlePlayerStep:: ; d497 (3:5497)
 	ld [wPlayerBGMapOffsetY], a
 	ret
 
-ScrollScreen:: ; d4d2 (3:54d2)
+ScrollScreen::
 	ld a, [wPlayerStepVectorX]
 	ld d, a
 	ld a, [wPlayerStepVectorY]
@@ -47,7 +47,7 @@ ScrollScreen:: ; d4d2 (3:54d2)
 	ld [hSCY], a
 	ret
 
-HandlePlayerStep: ; d4e5 (3:54e5)
+HandlePlayerStep:
 	ld hl, wHandlePlayerStep
 	ld a, [hl]
 	and a
@@ -58,7 +58,7 @@ HandlePlayerStep: ; d4e5 (3:54e5)
 	rst JumpTable
 	ret
 
-.Jumptable: ; d4f2 (3:54f2)
+.Jumptable:
 	dw GetMovementPermissions
 	dw BufferScreen
 	dw .mobile
@@ -72,17 +72,17 @@ HandlePlayerStep: ; d4e5 (3:54e5)
 	dw .fail1
 	dw .fail1
 
-.fail1 ; d508 (3:5508)
+.fail1
 	ret
 
-.mobile ; d509 (3:5509)
+.mobile
 	farcall StubbedTrainerRankings_StepCount
 	ret
 
-.fail2 ; d510 (3:5510)
+.fail2
 	ret
 
-UpdatePlayerCoords: ; d511 (3:5511)
+UpdatePlayerCoords:
 	ld a, [wPlayerStepDirection]
 	and a
 	jr nz, .check_step_down
@@ -111,7 +111,7 @@ UpdatePlayerCoords: ; d511 (3:5511)
 	inc [hl]
 	ret
 
-UpdateOverworldMap: ; d536 (3:5536)
+UpdateOverworldMap:
 	ld a, [wPlayerStepDirection]
 	and a
 	jr z, .step_down
@@ -147,7 +147,7 @@ UpdateOverworldMap: ; d536 (3:5536)
 	call ScrollMapLeft
 	ret
 
-.ScrollOverworldMapDown: ; d571 (3:5571)
+.ScrollOverworldMapDown:
 	ld a, [wBGMapAnchor]
 	add 2 * BG_MAP_WIDTH
 	ld [wBGMapAnchor], a
@@ -168,7 +168,7 @@ UpdateOverworldMap: ; d536 (3:5536)
 .done_down
 	ret
 
-.Add6ToOverworldMapAnchor: ; d595 (3:5595)
+.Add6ToOverworldMapAnchor:
 	ld hl, wOverworldMapAnchor
 	ld a, [wMapWidth]
 	add 6
@@ -178,7 +178,7 @@ UpdateOverworldMap: ; d536 (3:5536)
 	inc [hl]
 	ret
 
-.ScrollOverworldMapUp: ; d5a2 (3:55a2)
+.ScrollOverworldMapUp:
 	ld a, [wBGMapAnchor]
 	sub 2 * BG_MAP_WIDTH
 	ld [wBGMapAnchor], a
@@ -199,7 +199,7 @@ UpdateOverworldMap: ; d536 (3:5536)
 .done_up
 	ret
 
-.Sub6FromOverworldMapAnchor: ; d5c6 (3:55c6)
+.Sub6FromOverworldMapAnchor:
 	ld hl, wOverworldMapAnchor
 	ld a, [wMapWidth]
 	add 6
@@ -211,7 +211,7 @@ UpdateOverworldMap: ; d536 (3:5536)
 	dec [hl]
 	ret
 
-.ScrollOverworldMapLeft: ; d5d5 (3:55d5)
+.ScrollOverworldMapLeft:
 	ld a, [wBGMapAnchor]
 	ld e, a
 	and $e0
@@ -231,7 +231,7 @@ UpdateOverworldMap: ; d536 (3:5536)
 .done_left
 	ret
 
-.DecrementwOverworldMapAnchor: ; d5f4 (3:55f4)
+.DecrementwOverworldMapAnchor:
 	ld hl, wOverworldMapAnchor
 	ld a, [hl]
 	sub 1
@@ -240,7 +240,7 @@ UpdateOverworldMap: ; d536 (3:5536)
 	dec [hl]
 	ret
 
-.ScrollOverworldMapRight: ; d5fe (3:55fe)
+.ScrollOverworldMapRight:
 	ld a, [wBGMapAnchor]
 	ld e, a
 	and $e0
@@ -260,7 +260,7 @@ UpdateOverworldMap: ; d536 (3:5536)
 .done_right
 	ret
 
-.IncrementwOverworldMapAnchor: ; d61d (3:561d)
+.IncrementwOverworldMapAnchor:
 	ld hl, wOverworldMapAnchor
 	ld a, [hl]
 	add 1
diff --git a/engine/scripting.asm b/engine/overworld/scripting.asm
index dd2cfffe8..f8e702eb9 100644
--- a/engine/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -1,6 +1,5 @@
 ; Event scripting commands.
 
-
 EnableScriptMode::
 	push af
 	ld a, SCRIPT_READ
@@ -62,7 +61,6 @@ RunScriptCommand:
 	rst JumpTable
 	ret
 
-
 ScriptCommandTable:
 ; entries correspond to macros/scripts/events.asm enumeration
 	dw Script_scall                      ; 00
@@ -71,12 +69,12 @@ ScriptCommandTable:
 	dw Script_jump                       ; 03
 	dw Script_farjump                    ; 04
 	dw Script_ptjump                     ; 05
-	dw Script_if_equal                   ; 06
-	dw Script_if_not_equal               ; 07
+	dw Script_ifequal                    ; 06
+	dw Script_ifnotequal                 ; 07
 	dw Script_iffalse                    ; 08
 	dw Script_iftrue                     ; 09
-	dw Script_if_greater_than            ; 0a
-	dw Script_if_less_than               ; 0b
+	dw Script_ifgreater                  ; 0a
+	dw Script_ifless                     ; 0b
 	dw Script_jumpstd                    ; 0c
 	dw Script_callstd                    ; 0d
 	dw Script_callasm                    ; 0e
@@ -112,8 +110,8 @@ ScriptCommandTable:
 	dw Script_checkpoke                  ; 2c
 	dw Script_givepoke                   ; 2d
 	dw Script_giveegg                    ; 2e
-	dw Script_givepokeitem               ; 2f
-	dw Script_checkpokeitem              ; 30
+	dw Script_givepokemail               ; 2f
+	dw Script_checkpokemail              ; 30
 	dw Script_checkevent                 ; 31
 	dw Script_clearevent                 ; 32
 	dw Script_setevent                   ; 33
@@ -136,7 +134,7 @@ ScriptCommandTable:
 	dw Script_stringtotext               ; 44
 	dw Script_itemnotify                 ; 45
 	dw Script_pocketisfull               ; 46
-	dw Script_textbox                    ; 47
+	dw Script_opentext                   ; 47
 	dw Script_refreshscreen              ; 48
 	dw Script_closetext                  ; 49
 	dw Script_loadbytec2cf               ; 4a
@@ -144,7 +142,7 @@ ScriptCommandTable:
 	dw Script_writetext                  ; 4c
 	dw Script_repeattext                 ; 4d
 	dw Script_yesorno                    ; 4e
-	dw Script_loadmenudata               ; 4f
+	dw Script_loadmenu                   ; 4f
 	dw Script_closewindow                ; 50
 	dw Script_jumptextfaceplayer         ; 51
 if _CRYSTAL
@@ -169,8 +167,8 @@ endc
 	dw Script_trainerflagaction          ; 63
 	dw Script_winlosstext                ; 64
 	dw Script_scripttalkafter            ; 65
-	dw Script_end_if_just_battled        ; 66
-	dw Script_check_just_battled         ; 67
+	dw Script_endifjustbattled           ; 66
+	dw Script_checkjustbattled           ; 67
 	dw Script_setlasttalked              ; 68
 	dw Script_applymovement              ; 69
 	dw Script_applymovement2             ; 6a
@@ -185,7 +183,7 @@ endc
 	dw Script_writeobjectxy              ; 73
 	dw Script_loademote                  ; 74
 	dw Script_showemote                  ; 75
-	dw Script_spriteface                 ; 76
+	dw Script_turnobject                 ; 76
 	dw Script_follownotexact             ; 77
 	dw Script_earthquake                 ; 78
 	dw Script_changemap                  ; 79
@@ -214,7 +212,7 @@ endc
 	dw Script_return                     ; 90
 	dw Script_end                        ; 91
 	dw Script_reloadandreturn            ; 92
-	dw Script_end_all                    ; 93
+	dw Script_endall                     ; 93
 	dw Script_pokemart                   ; 94
 	dw Script_elevator                   ; 95
 	dw Script_trade                      ; 96
@@ -236,7 +234,7 @@ endc
 	dw Script_trainerclassname           ; a6
 	dw Script_name                       ; a7
 	dw Script_wait                       ; a8
-	dw Script_check_save                 ; a9
+	dw Script_checksave                  ; a9
 
 StartScript:
 	ld hl, wScriptFlags
@@ -332,7 +330,6 @@ JumpTextScript:
 	closetext
 	end
 
-
 if _CRYSTAL
 
 Script_farjumptext:
@@ -351,7 +348,6 @@ Script_farjumptext:
 
 endc
 
-
 Script_writetext:
 ; script command 0x4c
 ; parameters: text_pointer
@@ -432,15 +428,15 @@ Script_yesorno:
 	ld [wScriptVar], a
 	ret
 
-Script_loadmenudata:
+Script_loadmenu:
 ; script command 0x4f
-; parameters: data
+; parameters: menu_header
 
 	call GetScriptByte
 	ld l, a
 	call GetScriptByte
 	ld h, a
-	ld de, LoadMenuDataHeader
+	ld de, LoadMenuHeader
 	ld a, [wScriptBank]
 	call Call_a_de
 	call UpdateSprites
@@ -521,7 +517,6 @@ Script_verbosegiveitem:
 	ld de, GiveItemScript
 	jp ScriptCall
 
-
 ret_96f76:
 	ret
 
@@ -544,7 +539,6 @@ ReceivedItemText:
 	text_jump UnknownText_0x1c4719
 	db "@"
 
-
 Script_verbosegiveitem2:
 ; script command 0x9f
 ; parameters: item, var
@@ -608,12 +602,11 @@ Script_specialsound:
 	call WaitSFX
 	ret
 
-
 GetPocketName:
 	farcall CheckItemPocket
 	ld a, [wItemAttributeParamBuffer]
 	dec a
-	ld hl, .Pockets
+	ld hl, ItemPocketNames
 	maskbits NUM_POCKETS
 	add a
 	ld e, a
@@ -626,20 +619,7 @@ GetPocketName:
 	call CopyName2
 	ret
 
-.Pockets:
-	dw .Item
-	dw .Key
-	dw .Ball
-	dw .TM
-
-.Item:
-	db "ITEM POCKET@"
-.Key:
-	db "KEY POCKET@"
-.Ball:
-	db "BALL POCKET@"
-.TM:
-	db "TM POCKET@"
+INCLUDE "data/items/pocket_names.asm"
 
 CurItemName:
 	ld a, [wCurItem]
@@ -647,7 +627,6 @@ CurItemName:
 	call GetItemName
 	ret
 
-
 PutItemInPocketText:
 	text_jump UnknownText_0x1c472c
 	db "@"
@@ -656,7 +635,6 @@ PocketIsFullText:
 	text_jump UnknownText_0x1c474b
 	db "@"
 
-
 Script_pokemart:
 ; script command 0x94
 ; parameters: dialog_id, mart_id
@@ -839,7 +817,7 @@ Script_winlosstext:
 	ld [hli], a
 	ret
 
-Script_end_if_just_battled:
+Script_endifjustbattled:
 ; script command 0x66
 
 	ld a, [wRunningTrainerBattleScript]
@@ -847,7 +825,7 @@ Script_end_if_just_battled:
 	ret z
 	jp Script_end
 
-Script_check_just_battled:
+Script_checkjustbattled:
 ; script command 0x67
 
 	ld a, TRUE
@@ -1052,7 +1030,7 @@ Script_faceobject:
 	call ApplyObjectFacing
 	ret
 
-Script_spriteface:
+Script_turnobject:
 ; script command 0x76
 ; parameters: object_id, facing
 
@@ -1084,7 +1062,7 @@ ApplyObjectFacing:
 	jr c, .not_visible ; STILL_SPRITE
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
-	bit FIXED_FACING, [hl]
+	bit FIXED_FACING_F, [hl]
 	jr nz, .not_visible
 	pop de
 	ld a, e
@@ -1287,14 +1265,13 @@ ShowEmoteScript:
 	step_sleep 1
 	step_end
 
-
 Script_earthquake:
 ; script command 0x78
 ; parameters: param
 
 	ld hl, EarthquakeMovement
 	ld de, wEarthquakeMovementDataBuffer
-	ld bc, EarthquakeMovementEnd - EarthquakeMovement
+	ld bc, EarthquakeMovement.End - EarthquakeMovement
 	call CopyBytes
 	call GetScriptByte
 	ld [wEarthquakeMovementDataBuffer + 1], a
@@ -1312,8 +1289,7 @@ EarthquakeMovement:
 	step_shake 16 ; the 16 gets overwritten with the script byte
 	step_sleep 16 ; the 16 gets overwritten with the lower 6 bits of the script byte
 	step_end
-EarthquakeMovementEnd
-
+.End
 
 Script_loadpikachudata:
 ; script command 0x5a
@@ -1372,7 +1348,7 @@ Script_startbattle:
 	call BufferScreen
 	predef StartBattle
 	ld a, [wBattleResult]
-	and $3f
+	and $ff ^ BATTLERESULT_BITMASK
 	ld [wScriptVar], a
 	ret
 
@@ -1391,10 +1367,10 @@ Script_reloadmapafterbattle:
 
 	ld hl, wBattleScriptFlags
 	ld d, [hl]
-	ld [hl], $0
+	ld [hl], 0
 	ld a, [wBattleResult]
-	and $3f
-	cp $1
+	and $ff ^ BATTLERESULT_BITMASK
+	cp LOSE
 	jr nz, .notblackedout
 	ld b, BANK(Script_BattleWhiteout)
 	ld hl, Script_BattleWhiteout
@@ -1408,7 +1384,7 @@ Script_reloadmapafterbattle:
 
 .was_wild
 	ld a, [wBattleResult]
-	bit 7, a
+	bit BATTLERESULT_BOX_FULL, a
 	jr z, .done
 	ld b, BANK(Script_SpecialBillCall)
 	ld de, Script_SpecialBillCall
@@ -1561,7 +1537,7 @@ Script_iftrue:
 	jp nz, Script_jump
 	jp SkipTwoScriptBytes
 
-Script_if_equal:
+Script_ifequal:
 ; script command 0x6
 ; parameters: byte, pointer
 
@@ -1571,7 +1547,7 @@ Script_if_equal:
 	jr z, Script_jump
 	jr SkipTwoScriptBytes
 
-Script_if_not_equal:
+Script_ifnotequal:
 ; script command 0x7
 ; parameters: byte, pointer
 
@@ -1581,7 +1557,7 @@ Script_if_not_equal:
 	jr nz, Script_jump
 	jr SkipTwoScriptBytes
 
-Script_if_greater_than:
+Script_ifgreater:
 ; script command 0xa
 ; parameters: byte, pointer
 
@@ -1592,7 +1568,7 @@ Script_if_greater_than:
 	jr c, Script_jump
 	jr SkipTwoScriptBytes
 
-Script_if_less_than:
+Script_ifless:
 ; script command 0xb
 ; parameters: byte, pointer
 
@@ -2032,7 +2008,7 @@ Script_stringtotext:
 	ld de, wStringBuffer2
 	jp ConvertMemToText
 
-Script_givepokeitem:
+Script_givepokemail:
 ; script command 0x2f
 ; parameters: pointer
 
@@ -2050,10 +2026,10 @@ Script_givepokeitem:
 	ld a, [wScriptBank]
 	call FarCopyBytes
 	pop bc
-	farcall GivePokeItem
+	farcall GivePokeMail
 	ret
 
-Script_checkpokeitem:
+Script_checkpokemail:
 ; script command 0x30
 ; parameters: pointer
 
@@ -2063,7 +2039,7 @@ Script_checkpokeitem:
 	ld d, a
 	ld a, [wScriptBank]
 	ld b, a
-	farcall CheckPokeItem
+	farcall CheckPokeMail
 	ret
 
 Script_giveitem:
@@ -2449,14 +2425,14 @@ Script_wildoff:
 ; script command 0x38
 
 	ld hl, wStatusFlags
-	set 5, [hl]
+	set STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
 	ret
 
 Script_wildon:
 ; script command 0x37
 
 	ld hl, wStatusFlags
-	res 5, [hl]
+	res STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
 	ret
 
 Script_xycompare:
@@ -2477,7 +2453,7 @@ Script_warpfacing:
 	maskbits NUM_DIRECTIONS
 	ld c, a
 	ld a, [wPlayerSpriteSetupFlags]
-	set 5, a
+	set PLAYERSPRITESETUP_CUSTOM_FACING_F, a
 	or c
 	ld [wPlayerSpriteSetupFlags], a
 ; fall through
@@ -2646,7 +2622,7 @@ Script_reloadandreturn:
 	call Script_newloadmap
 	jp Script_end
 
-Script_textbox:
+Script_opentext:
 ; script command 0x47
 
 	call OpenText
@@ -2677,7 +2653,6 @@ Script_closetext:
 	call CloseText
 	ret
 
-
 Script_passtoengine:
 ; script command 0x89
 ; parameters: data_pointer
@@ -2787,7 +2762,7 @@ ExitScriptSubroutine:
 	scf
 	ret
 
-Script_end_all:
+Script_endall:
 ; script command 0x93
 
 	xor a
@@ -2804,12 +2779,12 @@ Script_halloffame:
 ; script command 0xa1
 
 	ld hl, wGameTimerPause
-	res 0, [hl]
+	res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
 	farcall StubbedTrainerRankings_HallOfFame
 	farcall StubbedTrainerRankings_HallOfFame2
 	farcall HallOfFame
 	ld hl, wGameTimerPause
-	set 0, [hl]
+	set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
 	jr ReturnFromCredits
 
 Script_credits:
@@ -2817,7 +2792,7 @@ Script_credits:
 
 	farcall RedCredits
 ReturnFromCredits:
-	call Script_end_all
+	call Script_endall
 	ld a, $3
 	call LoadMapStatus
 	call StopScript
@@ -2839,7 +2814,7 @@ Script_wait:
 	pop bc
 	ret
 
-Script_check_save:
+Script_checksave:
 ; script command 0xa9
 
 	farcall CheckSave
@@ -2847,7 +2822,6 @@ Script_check_save:
 	ld [wScriptVar], a
 	ret
 
-
 ; unused
 	ld a, [.byte]
 	ld [wScriptVar], a
diff --git a/engine/select_menu.asm b/engine/overworld/select_menu.asm
index 2135cd5bf..9eba9de83 100755..100644
--- a/engine/select_menu.asm
+++ b/engine/overworld/select_menu.asm
@@ -1,5 +1,4 @@
-SelectMenu:: ; 13327
-
+SelectMenu::
 	call CheckRegisteredItem
 	jr c, .NotRegistered
 	jp UseRegisteredItem
@@ -11,17 +10,12 @@ SelectMenu:: ; 13327
 	call MapTextbox
 	call WaitButton
 	jp CloseText
-; 13340
-
 
-ItemMayBeRegisteredText: ; 13340
+ItemMayBeRegisteredText:
 	text_jump UnknownText_0x1c1cf3
 	db "@"
-; 13345
-
-
-CheckRegisteredItem: ; 13345
 
+CheckRegisteredItem:
 	ld a, [wWhichRegisteredItem]
 	and a
 	jr z, .NoRegisteredItem
@@ -33,6 +27,7 @@ CheckRegisteredItem: ; 13345
 	ret
 
 .Pockets:
+; entries correspond to *_POCKET constants
 	dw .CheckItem
 	dw .CheckBall
 	dw .CheckKeyItem
@@ -85,10 +80,8 @@ CheckRegisteredItem: ; 13345
 	ld [wRegisteredItem], a
 	scf
 	ret
-; 133a6
 
-
-.CheckRegisteredNo: ; 133a6
+.CheckRegisteredNo:
 	ld a, [wWhichRegisteredItem]
 	and REGISTERED_NUMBER
 	dec a
@@ -101,10 +94,8 @@ CheckRegisteredItem: ; 13345
 .NotEnoughItems:
 	scf
 	ret
-; 133b6
-
 
-.IsSameItem: ; 133b6
+.IsSameItem:
 	ld a, [wRegisteredItem]
 	cp [hl]
 	jr nz, .NotSameItem
@@ -115,11 +106,8 @@ CheckRegisteredItem: ; 13345
 .NotSameItem:
 	scf
 	ret
-; 133c3
-
-
-UseRegisteredItem: ; 133c3
 
+UseRegisteredItem:
 	farcall CheckItemMenu
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, .SwitchTo
@@ -127,6 +115,7 @@ UseRegisteredItem: ; 133c3
 	ret
 
 .SwitchTo:
+; entries correspond to ITEMMENU_* constants
 	dw .CantUse
 	dw .NoFunction
 	dw .NoFunction
@@ -134,25 +123,22 @@ UseRegisteredItem: ; 133c3
 	dw .Current
 	dw .Party
 	dw .Overworld
-; 133df
 
-.NoFunction: ; 133df
+.NoFunction:
 	call OpenText
 	call CantUseItem
 	call CloseText
 	and a
 	ret
-; 133ea
 
-.Current: ; 133ea
+.Current:
 	call OpenText
 	call DoItemEffect
 	call CloseText
 	and a
 	ret
-; 133f5
 
-.Party: ; 133f5
+.Party:
 	call RefreshScreen
 	call FadeToMenu
 	call DoItemEffect
@@ -160,9 +146,8 @@ UseRegisteredItem: ; 133c3
 	call CloseText
 	and a
 	ret
-; 13406
 
-.Overworld: ; 13406
+.Overworld:
 	call RefreshScreen
 	ld a, 1
 	ld [wUsingItemWithSelect], a
@@ -176,9 +161,8 @@ UseRegisteredItem: ; 133c3
 	ld a, HMENURETURN_SCRIPT
 	ld [hMenuReturn], a
 	ret
-; 13422
 
-.CantUse: ; 13422
+.CantUse:
 	call RefreshScreen
 
 ._cantuse
@@ -186,4 +170,3 @@ UseRegisteredItem: ; 133c3
 	call CloseText
 	and a
 	ret
-; 1342d
diff --git a/engine/spawn_points.asm b/engine/overworld/spawn_points.asm
index 1a3d12441..6b4476f2b 100644
--- a/engine/spawn_points.asm
+++ b/engine/overworld/spawn_points.asm
@@ -1,7 +1,6 @@
 INCLUDE "data/maps/spawn_points.asm"
 
-
-LoadSpawnPoint: ; 1531f
+LoadSpawnPoint:
 	; loads the spawn point in wDefaultSpawnpoint
 	push hl
 	push de
@@ -26,10 +25,8 @@ LoadSpawnPoint: ; 1531f
 	pop de
 	pop hl
 	ret
-; 15344
-
 
-IsSpawnPoint: ; 15344
+IsSpawnPoint:
 ; Checks if the map loaded in de is a spawn point.  Returns carry if it's a spawn point.
 	ld hl, SpawnPoints
 	ld c, 0
@@ -59,4 +56,3 @@ IsSpawnPoint: ; 15344
 .yes
 	scf
 	ret
-; 15363
diff --git a/engine/tile_events.asm b/engine/overworld/tile_events.asm
index 705c0e427..bb566c997 100755..100644
--- a/engine/tile_events.asm
+++ b/engine/overworld/tile_events.asm
@@ -1,4 +1,4 @@
-CheckWarpCollision:: ; 1499a
+CheckWarpCollision::
 ; Is this tile a warp?
 	ld a, [wPlayerStandingTile]
 	cp COLL_PIT
@@ -14,9 +14,8 @@ CheckWarpCollision:: ; 1499a
 .warp
 	scf
 	ret
-; 149af
 
-CheckDirectionalWarp:: ; 149af
+CheckDirectionalWarp::
 ; If this is a directional warp, clear carry (press the designated button to warp).
 ; Else, set carry (immediate warp).
 	ld a, [wPlayerStandingTile]
@@ -34,17 +33,15 @@ CheckDirectionalWarp:: ; 149af
 .directional
 	xor a
 	ret
-; 149c6
 
-CheckWarpFacingDown: ; 149c6
+CheckWarpFacingDown:
 	ld de, 1
 	ld hl, .blocks
 	ld a, [wPlayerStandingTile]
 	call IsInArray
 	ret
-; 149d3
 
-.blocks ; 149d3
+.blocks
 	db COLL_DOOR
 	db COLL_DOOR_79
 	db COLL_STAIRCASE
@@ -55,17 +52,15 @@ CheckWarpFacingDown: ; 149c6
 	db COLL_DOOR_75
 	db COLL_DOOR_7D
 	db -1
-; 149dd
 
-CheckGrassCollision:: ; 149dd
+CheckGrassCollision::
 	ld a, [wPlayerStandingTile]
 	ld hl, .blocks
 	ld de, 1
 	call IsInArray
 	ret
-; 149ea
 
-.blocks ; 149ea
+.blocks
 	db COLL_CUT_08
 	db COLL_TALL_GRASS
 	db COLL_LONG_GRASS
@@ -77,17 +72,15 @@ CheckGrassCollision:: ; 149dd
 	db COLL_GRASS_4B
 	db COLL_GRASS_4C
 	db -1
-; 149f5
 
-CheckCutCollision: ; 149f5
+CheckCutCollision:
 	ld a, c
 	ld hl, .blocks
 	ld de, 1
 	call IsInArray
 	ret
-; 14a00
 
-.blocks ; 14a00
+.blocks
 	db COLL_CUT_TREE
 	db COLL_CUT_TREE_1A
 	db COLL_TALL_GRASS_10
@@ -95,9 +88,8 @@ CheckCutCollision: ; 149f5
 	db COLL_LONG_GRASS
 	db COLL_LONG_GRASS_1C
 	db -1
-; 14a07
 
-GetWarpSFX:: ; 14a07
+GetWarpSFX::
 	ld a, [wPlayerStandingTile]
 	ld de, SFX_ENTER_DOOR
 	cp COLL_DOOR
@@ -107,4 +99,3 @@ GetWarpSFX:: ; 14a07
 	ret z
 	ld de, SFX_EXIT_BUILDING
 	ret
-; 14a1a
diff --git a/engine/time.asm b/engine/overworld/time.asm
index 9013fd79f..abb12d87d 100755..100644
--- a/engine/time.asm
+++ b/engine/overworld/time.asm
@@ -1,21 +1,19 @@
-_InitializeStartDay: ; 113d6
+_InitializeStartDay:
 	call InitializeStartDay
 	ret
-; 113da
 
-ClearDailyTimers: ; 113da
+ClearDailyTimers:
 	xor a
 	ld [wLuckyNumberDayBuffer], a
 	ld [wUnusedTwoDayTimer], a
 	ld [wDailyResetTimer], a
 	ret
-; 113e5
 
-InitCallReceiveDelay:: ; 113e5
+InitCallReceiveDelay::
 	xor a
 	ld [wTimeCyclesSinceLastCall], a
 
-NextCallReceiveDelay: ; 113e9
+NextCallReceiveDelay:
 	ld a, [wTimeCyclesSinceLastCall]
 	cp 3
 	jr c, .okay
@@ -28,13 +26,11 @@ NextCallReceiveDelay: ; 113e9
 	add hl, de
 	ld a, [hl]
 	jp RestartReceiveCallDelay
-; 113fd
 
 .ReceiveCallDelays:
 	db 20, 10, 5, 3
-; 11401
 
-CheckReceiveCallTimer: ; 11401
+CheckReceiveCallTimer:
 	call CheckReceiveCallDelay ; check timer
 	ret nc
 	ld hl, wTimeCyclesSinceLastCall
@@ -47,12 +43,11 @@ CheckReceiveCallTimer: ; 11401
 	call NextCallReceiveDelay ; restart timer
 	scf
 	ret
-; 11413
 
-InitOneDayCountdown: ; 11413
+InitOneDayCountdown:
 	ld a, 1
 
-InitNDaysCountdown: ; 11415
+InitNDaysCountdown:
 	ld [hl], a
 	push hl
 	call UpdateTime
@@ -60,9 +55,8 @@ InitNDaysCountdown: ; 11415
 	inc hl
 	call CopyDayToHL
 	ret
-; 11420
 
-CheckDayDependentEventHL: ; 11420
+CheckDayDependentEventHL:
 	inc hl
 	push hl
 	call CalcDaysSince
@@ -71,41 +65,37 @@ CheckDayDependentEventHL: ; 11420
 	dec hl
 	call UpdateTimeRemaining
 	ret
-; 1142e
 
-RestartReceiveCallDelay: ; 1142e
+RestartReceiveCallDelay:
 	ld hl, wReceiveCallDelay_MinsRemaining
 	ld [hl], a
 	call UpdateTime
 	ld hl, wReceiveCallDelay_StartTime
 	call CopyDayHourMinToHL
 	ret
-; 1143c
 
-CheckReceiveCallDelay: ; 1143c
+CheckReceiveCallDelay:
 	ld hl, wReceiveCallDelay_StartTime
 	call CalcMinsHoursDaysSince
 	call GetMinutesSinceIfLessThan60
 	ld hl, wReceiveCallDelay_MinsRemaining
 	call UpdateTimeRemaining
 	ret
-; 1144c
 
-RestartDailyResetTimer: ; 1144c
+RestartDailyResetTimer:
 	ld hl, wDailyResetTimer
 	jp InitOneDayCountdown
-; 11452
 
-CheckDailyResetTimer:: ; 11452
+CheckDailyResetTimer::
 	ld hl, wDailyResetTimer
 	call CheckDayDependentEventHL
 	ret nc
 	xor a
 	ld hl, wDailyFlags
-	ld [hli], a
-	ld [hli], a
-	ld [hli], a
-	ld [hl], a
+	ld [hli], a ; wDailyFlags
+	ld [hli], a ; wWeeklyFlags
+	ld [hli], a ; wSwarmFlags
+	ld [hl], a  ; wSwarmFlags + 1
 	ld hl, wDailyRematchFlags
 rept 4
 	ld [hli], a
@@ -125,21 +115,19 @@ endr
 	dec [hl]
 	jr nz, .DontRestartKenjiBreakCountdown
 .RestartKenjiBreakCountdown:
-	call Special_SampleKenjiBreakCountdown
+	call SampleKenjiBreakCountdown
 .DontRestartKenjiBreakCountdown:
 	jr RestartDailyResetTimer
-; 11485
 
-Special_SampleKenjiBreakCountdown: ; 11485
+SampleKenjiBreakCountdown:
 ; Generate a random number between 3 and 6
 	call Random
 	and %11
 	add 3
 	ld [wKenjiBreakTimer], a
 	ret
-; 11490
 
-StartBugContestTimer: ; 11490
+StartBugContestTimer:
 	ld a, BUG_CONTEST_MINUTES
 	ld [wBugContestMinsRemaining], a
 	ld a, BUG_CONTEST_SECONDS
@@ -148,10 +136,8 @@ StartBugContestTimer: ; 11490
 	ld hl, wBugContestStartTime
 	call CopyDayHourMinSecToHL
 	ret
-; 114a4
-
 
-CheckBugContestTimer:: ; 114a4 (4:54a4)
+CheckBugContestTimer::
 	ld hl, wBugContestStartTime
 	call CalcSecsMinsHoursDaysSince
 	ld a, [wDaysSince]
@@ -185,15 +171,13 @@ CheckBugContestTimer:: ; 114a4 (4:54a4)
 	scf
 	ret
 
-
-InitializeStartDay: ; 114dd
+InitializeStartDay:
 	call UpdateTime
 	ld hl, wTimerEventStartDay
 	call CopyDayToHL
 	ret
-; 114e7
 
-CheckPokerusTick:: ; 114e7
+CheckPokerusTick::
 	ld hl, wTimerEventStartDay
 	call CalcDaysSince
 	call GetDaysSince
@@ -204,9 +188,8 @@ CheckPokerusTick:: ; 114e7
 .done
 	xor a
 	ret
-; 114fc
 
-SetUnusedTwoDayTimer: ; 114fc
+SetUnusedTwoDayTimer:
 	ld a, 2
 	ld hl, wUnusedTwoDayTimer
 	ld [hl], a
@@ -214,39 +197,34 @@ SetUnusedTwoDayTimer: ; 114fc
 	ld hl, wUnusedTwoDayTimerStartDate
 	call CopyDayToHL
 	ret
-; 1150c
 
-CheckUnusedTwoDayTimer: ; 1150c
+CheckUnusedTwoDayTimer:
 	ld hl, wUnusedTwoDayTimerStartDate
 	call CalcDaysSince
 	call GetDaysSince
 	ld hl, wUnusedTwoDayTimer
 	call UpdateTimeRemaining
 	ret
-; 1151c
 
 ; unused
 	ld hl, wDailyFlags
-	set 2, [hl]
+	set DAILYFLAGS_FISH_SWARM_F, [hl]
 	ret
-; 11522
 
 ; unused
 	and a
 	ld hl, wDailyFlags
-	bit 2, [hl]
+	bit DAILYFLAGS_FISH_SWARM_F, [hl]
 	ret nz
 	scf
 	ret
-; 1152b
 
-RestartLuckyNumberCountdown: ; 1152b
+RestartLuckyNumberCountdown:
 	call .GetDaysUntilNextFriday
 	ld hl, wLuckyNumberDayBuffer
 	jp InitNDaysCountdown
-; 11534
 
-.GetDaysUntilNextFriday: ; 11534
+.GetDaysUntilNextFriday:
 	call GetWeekday
 	ld c, a
 	ld a, FRIDAY
@@ -259,14 +237,12 @@ RestartLuckyNumberCountdown: ; 1152b
 
 .earlier
 	ret
-; 11542
 
-CheckLuckyNumberShowFlag: ; 11542
+_CheckLuckyNumberShowFlag:
 	ld hl, wLuckyNumberDayBuffer
 	jp CheckDayDependentEventHL
-; 11548
 
-DoMysteryGiftIfDayHasPassed: ; 11548
+DoMysteryGiftIfDayHasPassed:
 	ld a, BANK(sMysteryGiftTimer)
 	call GetSRAMBank
 	ld hl, sMysteryGiftTimer
@@ -294,9 +270,8 @@ DoMysteryGiftIfDayHasPassed: ; 11548
 	ld [sMysteryGiftTimer + 1], a
 	call CloseSRAM
 	ret
-; 11586
 
-UpdateTimeRemaining: ; 11586
+UpdateTimeRemaining:
 ; If the amount of time elapsed exceeds the capacity of its
 ; unit, skip this part.
 	cp -1
@@ -318,9 +293,8 @@ UpdateTimeRemaining: ; 11586
 	ld [hl], a
 	scf
 	ret
-; 11599
 
-GetSecondsSinceIfLessThan60: ; 11599
+GetSecondsSinceIfLessThan60:
 	ld a, [wDaysSince]
 	and a
 	jr nz, GetTimeElapsed_ExceedsUnitLimit
@@ -331,9 +305,8 @@ GetSecondsSinceIfLessThan60: ; 11599
 	jr nz, GetTimeElapsed_ExceedsUnitLimit
 	ld a, [wSecondsSince]
 	ret
-; 115ae
 
-GetMinutesSinceIfLessThan60: ; 115ae
+GetMinutesSinceIfLessThan60:
 	ld a, [wDaysSince]
 	and a
 	jr nz, GetTimeElapsed_ExceedsUnitLimit
@@ -342,45 +315,38 @@ GetMinutesSinceIfLessThan60: ; 115ae
 	jr nz, GetTimeElapsed_ExceedsUnitLimit
 	ld a, [wMinutesSince]
 	ret
-; 115be
 
-GetHoursSinceIfLessThan24: ; 115be
+GetHoursSinceIfLessThan24:
 	ld a, [wDaysSince]
 	and a
 	jr nz, GetTimeElapsed_ExceedsUnitLimit
 	ld a, [wHoursSince]
 	ret
-; 115c8
 
-GetDaysSince: ; 115c8
+GetDaysSince:
 	ld a, [wDaysSince]
 	ret
-; 115cc
 
-GetTimeElapsed_ExceedsUnitLimit: ; 115cc
+GetTimeElapsed_ExceedsUnitLimit:
 	ld a, -1
 	ret
-; 115cf
 
-CalcDaysSince: ; 115cf
+CalcDaysSince:
 	xor a
 	jr _CalcDaysSince
-; 115d2
 
-CalcHoursDaysSince: ; 115d2
+CalcHoursDaysSince:
 	inc hl
 	xor a
 	jr _CalcHoursDaysSince
-; 115d6
 
-CalcMinsHoursDaysSince: ; 115d6
+CalcMinsHoursDaysSince:
 	inc hl
 	inc hl
 	xor a
 	jr _CalcMinsHoursDaysSince
-; 115db
 
-CalcSecsMinsHoursDaysSince: ; 115db
+CalcSecsMinsHoursDaysSince:
 	inc hl
 	inc hl
 	inc hl
@@ -394,7 +360,7 @@ CalcSecsMinsHoursDaysSince: ; 115db
 	dec hl
 	ld [wSecondsSince], a ; seconds since
 
-_CalcMinsHoursDaysSince: ; 115eb
+_CalcMinsHoursDaysSince:
 	ld a, [hMinutes]
 	ld c, a
 	sbc [hl]
@@ -405,7 +371,7 @@ _CalcMinsHoursDaysSince: ; 115eb
 	dec hl
 	ld [wMinutesSince], a ; minutes since
 
-_CalcHoursDaysSince: ; 115f8
+_CalcHoursDaysSince:
 	ld a, [hHours]
 	ld c, a
 	sbc [hl]
@@ -426,9 +392,8 @@ _CalcDaysSince:
 	ld [hl], c ; current days
 	ld [wDaysSince], a ; days since
 	ret
-; 11613
 
-CopyDayHourMinSecToHL: ; 11613
+CopyDayHourMinSecToHL:
 	ld a, [wCurDay]
 	ld [hli], a
 	ld a, [hHours]
@@ -438,23 +403,20 @@ CopyDayHourMinSecToHL: ; 11613
 	ld a, [hSeconds]
 	ld [hli], a
 	ret
-; 11621
 
-CopyDayToHL: ; 11621
+CopyDayToHL:
 	ld a, [wCurDay]
 	ld [hl], a
 	ret
-; 11626
 
-CopyDayHourToHL: ; 11626
+CopyDayHourToHL:
 	ld a, [wCurDay]
 	ld [hli], a
 	ld a, [hHours]
 	ld [hli], a
 	ret
-; 1162e
 
-CopyDayHourMinToHL: ; 1162e
+CopyDayHourMinToHL:
 	ld a, [wCurDay]
 	ld [hli], a
 	ld a, [hHours]
@@ -462,4 +424,3 @@ CopyDayHourMinToHL: ; 1162e
 	ld a, [hMinutes]
 	ld [hli], a
 	ret
-; 11639
diff --git a/engine/variables.asm b/engine/overworld/variables.asm
index 89026fdba..9b5e3846c 100755..100644
--- a/engine/variables.asm
+++ b/engine/overworld/variables.asm
@@ -1,4 +1,4 @@
-_GetVarAction:: ; 80648 (20:4648)
+_GetVarAction::
 	ld a, c
 	cp NUM_VARS
 	jr c, .valid
@@ -28,13 +28,12 @@ _GetVarAction:: ; 80648 (20:4648)
 	call _de_
 	ret
 
-.loadstringbuffer2 ; 8066c (20:466c)
+.loadstringbuffer2
 	ld de, wStringBuffer2
 	ld [de], a
 	ret
-; 80671 (20:4671)
 
-.VarActionTable: ; 80671
+.VarActionTable:
 ; entries correspond to VAR_* constants
 	; RETVAR_STRBUF2: copy [de] to wStringBuffer2
 	; RETVAR_ADDR_DE: return address in de
@@ -67,51 +66,45 @@ _GetVarAction:: ; 80648 (20:4648)
 	dwb wBuenasPassword,                RETVAR_ADDR_DE
 	dwb wKenjiBreakTimer,               RETVAR_STRBUF2
 	dwb NULL,                           RETVAR_STRBUF2
-; 806c5
 
-.CountCaughtMons: ; 806c5
+.CountCaughtMons:
 ; Caught mons.
 	ld hl, wPokedexCaught
 	ld b, wEndPokedexCaught - wPokedexCaught
 	call CountSetBits
 	ld a, [wd265]
 	jp .loadstringbuffer2
-; 806d3
 
-.CountSeenMons: ; 806d3
+.CountSeenMons:
 ; Seen mons.
 	ld hl, wPokedexSeen
 	ld b, wEndPokedexSeen - wPokedexSeen
 	call CountSetBits
 	ld a, [wd265]
 	jp .loadstringbuffer2
-; 806e1
 
-.CountBadges: ; 806e1
+.CountBadges:
 ; Number of owned badges.
 	ld hl, wBadges
 	ld b, 2
 	call CountSetBits
 	ld a, [wd265]
 	jp .loadstringbuffer2
-; 806ef
 
-.PlayerFacing: ; 806ef
+.PlayerFacing:
 ; The direction the player is facing.
 	ld a, [wPlayerDirection]
 	and $c
 	rrca
 	rrca
 	jp .loadstringbuffer2
-; 806f9
 
-.DayOfWeek: ; 806f9
+.DayOfWeek:
 ; The day of the week.
 	call GetWeekday
 	jp .loadstringbuffer2
-; 806ff
 
-.UnownCaught: ; 806ff
+.UnownCaught:
 ; Number of unique Unown caught.
 	call .count
 	ld a, b
@@ -129,9 +122,8 @@ _GetVarAction:: ; 80648 (20:4648)
 	cp NUM_UNOWN
 	jr c, .loop
 	ret
-; 80715
 
-.BoxFreeSpace: ; 80715
+.BoxFreeSpace:
 ; Remaining slots in the current box.
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
@@ -142,10 +134,8 @@ _GetVarAction:: ; 80648 (20:4648)
 	call CloseSRAM
 	ld a, b
 	jp .loadstringbuffer2
-; 80728
 
-.BattleResult: ; 80728
+.BattleResult:
 	ld a, [wBattleResult]
-	and $3f
+	and $ff ^ BATTLERESULT_BITMASK
 	jp .loadstringbuffer2
-; 80730
diff --git a/engine/warp_connection.asm b/engine/overworld/warp_connection.asm
index 8d673de44..54df4a97f 100755..100644
--- a/engine/warp_connection.asm
+++ b/engine/overworld/warp_connection.asm
@@ -1,5 +1,5 @@
 
-HandleNewMap: ; 1045b0
+HandleNewMap:
 	call Clearwc7e8
 	call ResetMapBufferEventFlags
 	call ResetFlashIfOutOfCave
@@ -7,7 +7,7 @@ HandleNewMap: ; 1045b0
 	call ResetBikeFlags
 	ld a, MAPCALLBACK_NEWMAP
 	call RunMapCallback
-InitCommandQueue: ; 1045c4
+InitCommandQueue:
 	farcall ClearCmdQueue
 	ld a, MAPCALLBACK_CMDQUEUE
 	call RunMapCallback
@@ -15,8 +15,7 @@ InitCommandQueue: ; 1045c4
 	ld [wMapTimeOfDay], a
 	ret
 
-
-EnterMapConnection: ; 1045d6
+EnterMapConnection:
 ; Return carry if a connection has been entered.
 	ld a, [wPlayerStepDirection]
 	and a
@@ -150,9 +149,8 @@ EnterMapConnection: ; 1045d6
 .done
 	scf
 	ret
-; 1046c6
 
-LoadWarpData: ; 1046c6
+LoadWarpData:
 	call .SaveDigWarp
 	call .SetSpawn
 	ld a, [wNextWarp]
@@ -163,7 +161,7 @@ LoadWarpData: ; 1046c6
 	ld [wMapNumber], a
 	ret
 
-.SaveDigWarp: ; 1046df (41:46df)
+.SaveDigWarp:
 	call GetMapEnvironment
 	call CheckOutdoorMap
 	ret nz
@@ -195,7 +193,7 @@ LoadWarpData: ; 1046c6
 	ld [wDigMapNumber], a
 	ret
 
-.SetSpawn: ; 104718 (41:4718)
+.SetSpawn:
 	call GetMapEnvironment
 	call CheckOutdoorMap
 	ret nz
@@ -227,7 +225,7 @@ LoadWarpData: ; 1046c6
 	ld [wLastSpawnMapNumber], a
 	ret
 
-LoadMapTimeOfDay: ; 104750
+LoadMapTimeOfDay:
 	ld hl, wVramState
 	res 6, [hl]
 	ld a, $1
@@ -239,7 +237,7 @@ LoadMapTimeOfDay: ; 104750
 	call .PushAttrMap
 	ret
 
-.ClearBGMap: ; 104770 (41:4770)
+.ClearBGMap:
 	ld a, HIGH(vBGMap0)
 	ld [wBGMapAnchor + 1], a
 	xor a ; LOW(vBGMap0)
@@ -267,7 +265,7 @@ LoadMapTimeOfDay: ; 104750
 	call ByteFill
 	ret
 
-.PushAttrMap: ; 1047a3 (41:47a3)
+.PushAttrMap:
 	decoord 0, 0
 	call .copy
 	ld a, [hCGB]
@@ -298,31 +296,30 @@ LoadMapTimeOfDay: ; 104750
 	ld [rVBK], a
 	ret
 
-LoadGraphics: ; 1047cf
+LoadGraphics:
 	call LoadTileset
 	call LoadTilesetGFX
 	xor a
 	ld [hMapAnims], a
 	xor a
 	ld [hTileAnimFrame], a
-	farcall Special_RefreshSprites
+	farcall RefreshSprites
 	call LoadFontsExtra
 	farcall LoadOverworldFont
 	ret
 
-Special_LoadMapPalettes: ; 1047eb
+LoadMapPalettes:
 	ld b, SCGB_MAPPALS
 	jp GetSGBLayout
-; 1047f0
 
-RefreshMapSprites: ; 1047f0
+RefreshMapSprites:
 	call ClearSprites
 	farcall ReturnFromMapSetupScript
 	call GetMovementPermissions
 	farcall RefreshPlayerSprite
 	farcall CheckReplaceKrisSprite
 	ld hl, wPlayerSpriteSetupFlags
-	bit 6, [hl]
+	bit PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
 	jr nz, .skip
 	ld hl, wVramState
 	set 0, [hl]
@@ -333,7 +330,7 @@ RefreshMapSprites: ; 1047f0
 	ld [wPlayerSpriteSetupFlags], a
 	ret
 
-CheckMovingOffEdgeOfMap:: ; 104820 (41:4820)
+CheckMovingOffEdgeOfMap::
 	ld a, [wPlayerStepDirection]
 	cp STANDING
 	ret z
@@ -390,9 +387,8 @@ CheckMovingOffEdgeOfMap:: ; 104820 (41:4820)
 	scf
 	ret
 
-
-GetCoordOfUpperLeftCorner:: ; 10486d
-	ld hl, wOverworldMap
+GetCoordOfUpperLeftCorner::
+	ld hl, wOverworldMapBlocks
 	ld a, [wXCoord]
 	bit 0, a
 	jr nz, .increment_then_halve1
@@ -436,4 +432,3 @@ GetCoordOfUpperLeftCorner:: ; 10486d
 	and $1
 	ld [wMetatileStandingX], a
 	ret
-; 1048ba
diff --git a/engine/wildmons.asm b/engine/overworld/wildmons.asm
index f578a4f84..d88e5908f 100755..100644
--- a/engine/wildmons.asm
+++ b/engine/overworld/wildmons.asm
@@ -1,4 +1,4 @@
-LoadWildMonData: ; 29ff8
+LoadWildMonData:
 	call _GrassWildmonLookup
 	jr c, .copy
 	ld hl, wMornEncounterRate
@@ -25,7 +25,7 @@ LoadWildMonData: ; 29ff8
 	ld [wWaterEncounterRate], a
 	ret
 
-FindNest: ; 2a01f
+FindNest:
 ; Parameters:
 ; e: 0 = Johto, 1 = Kanto
 ; wNamedObjectIndexBuffer: species
@@ -51,9 +51,8 @@ FindNest: ; 2a01f
 	call .FindGrass
 	ld hl, KantoWaterWildMons
 	jp .FindWater
-; 2a052
 
-.FindGrass: ; 2a052
+.FindGrass:
 	ld a, [hl]
 	cp -1
 	ret z
@@ -76,9 +75,8 @@ FindNest: ; 2a01f
 	ld bc, GRASS_WILDDATA_LENGTH
 	add hl, bc
 	jr .FindGrass
-; 2a06e
 
-.FindWater: ; 2a06e
+.FindWater:
 	ld a, [hl]
 	cp -1
 	ret z
@@ -88,7 +86,7 @@ FindNest: ; 2a01f
 	ld a, [hli]
 	ld c, a
 	inc hl
-	ld a, 3
+	ld a, NUM_WATERMON
 	call .SearchMapForMon
 	jr nc, .next_water
 	ld [de], a
@@ -96,12 +94,11 @@ FindNest: ; 2a01f
 
 .next_water
 	pop hl
-	ld bc, 3 * 3
+	ld bc, WATER_WILDDATA_LENGTH
 	add hl, bc
 	jr .FindWater
-; 2a088
 
-.SearchMapForMon: ; 2a088
+.SearchMapForMon:
 	inc hl
 .ScanMapLoop:
 	push af
@@ -119,9 +116,8 @@ FindNest: ; 2a01f
 .found
 	pop af
 	jp .AppendNest
-; 2a09c
 
-.AppendNest: ; 2a09c
+.AppendNest:
 	push de
 	call GetWorldMapLocation
 	ld c, a
@@ -144,9 +140,8 @@ FindNest: ; 2a01f
 	pop de
 	and a
 	ret
-; 2a0b7
 
-.RoamMon1: ; 2a0b7
+.RoamMon1:
 	ld a, [wRoamMon1Species]
 	ld b, a
 	ld a, [wNamedObjectIndexBuffer]
@@ -161,9 +156,8 @@ FindNest: ; 2a01f
 	ld [de], a
 	inc de
 	ret
-; 2a0cf
 
-.RoamMon2: ; 2a0cf
+.RoamMon2:
 	ld a, [wRoamMon2Species]
 	ld b, a
 	ld a, [wNamedObjectIndexBuffer]
@@ -178,9 +172,8 @@ FindNest: ; 2a01f
 	ld [de], a
 	inc de
 	ret
-; 2a0e7
 
-TryWildEncounter:: ; 2a0e7
+TryWildEncounter::
 ; Try to trigger a wild encounter.
 	call .EncounterRate
 	jr nc, .no_battle
@@ -198,18 +191,16 @@ TryWildEncounter:: ; 2a0e7
 	ld a, 1
 	and a
 	ret
-; 2a103
 
-.EncounterRate: ; 2a103
+.EncounterRate:
 	call GetMapEncounterRate
 	call ApplyMusicEffectOnEncounterRate
 	call ApplyCleanseTagEffectOnEncounterRate
 	call Random
 	cp b
 	ret
-; 2a111
 
-GetMapEncounterRate: ; 2a111
+GetMapEncounterRate:
 	ld hl, wMornEncounterRate
 	call CheckOnWater
 	ld a, wWaterEncounterRate - wMornEncounterRate
@@ -221,9 +212,8 @@ GetMapEncounterRate: ; 2a111
 	add hl, bc
 	ld b, [hl]
 	ret
-; 2a124
 
-ApplyMusicEffectOnEncounterRate:: ; 2a124
+ApplyMusicEffectOnEncounterRate::
 ; Pokemon March and Ruins of Alph signal double encounter rate.
 ; Pokemon Lullaby halves encounter rate.
 	ld a, [wMapMusic]
@@ -239,9 +229,8 @@ ApplyMusicEffectOnEncounterRate:: ; 2a124
 .double
 	sla b
 	ret
-; 2a138
 
-ApplyCleanseTagEffectOnEncounterRate:: ; 2a138
+ApplyCleanseTagEffectOnEncounterRate::
 ; Cleanse Tag halves encounter rate.
 	ld hl, wPartyMon1Item
 	ld de, PARTYMON_STRUCT_LENGTH
@@ -259,9 +248,8 @@ ApplyCleanseTagEffectOnEncounterRate:: ; 2a138
 .cleansetag
 	srl b
 	ret
-; 2a14f
 
-ChooseWildEncounter: ; 2a14f
+ChooseWildEncounter:
 	call LoadWildMonDataPointer
 	jp nc, .nowildbattle
 	call CheckEncounterRoamMon
@@ -276,7 +264,7 @@ ChooseWildEncounter: ; 2a14f
 	inc hl
 	inc hl
 	ld a, [wTimeOfDay]
-	ld bc, $e
+	ld bc, NUM_GRASSMON * 2
 	call AddNTimes
 	ld de, GrassMonProbTable
 
@@ -355,11 +343,10 @@ ChooseWildEncounter: ; 2a14f
 .startwildbattle
 	xor a
 	ret
-; 2a1cb
 
 INCLUDE "data/wild/probabilities.asm"
 
-CheckRepelEffect:: ; 2a1df
+CheckRepelEffect::
 ; If there is no active Repel, there's no need to be here.
 	ld a, [wRepelEffect]
 	and a
@@ -389,13 +376,12 @@ endr
 .encounter
 	scf
 	ret
-; 2a200
 
-LoadWildMonDataPointer: ; 2a200
+LoadWildMonDataPointer:
 	call CheckOnWater
 	jr z, _WaterWildmonLookup
 
-_GrassWildmonLookup: ; 2a205
+_GrassWildmonLookup:
 	ld hl, SwarmGrassWildMons
 	ld bc, GRASS_WILDDATA_LENGTH
 	call _SwarmWildmonCheck
@@ -406,7 +392,7 @@ _GrassWildmonLookup: ; 2a205
 	ld bc, GRASS_WILDDATA_LENGTH
 	jr _NormalWildmonOK
 
-_WaterWildmonLookup: ; 2a21d
+_WaterWildmonLookup:
 	ld hl, SwarmWaterWildMons
 	ld bc, WATER_WILDDATA_LENGTH
 	call _SwarmWildmonCheck
@@ -417,7 +403,7 @@ _WaterWildmonLookup: ; 2a21d
 	ld bc, WATER_WILDDATA_LENGTH
 	jr _NormalWildmonOK
 
-_JohtoWildmonCheck
+_JohtoWildmonCheck:
 	call IsInJohto
 	and a
 	ret z
@@ -425,11 +411,11 @@ _JohtoWildmonCheck
 	ld l, e
 	ret
 
-_SwarmWildmonCheck
+_SwarmWildmonCheck:
 	call CopyCurrMapDE
 	push hl
 	ld hl, wSwarmFlags
-	bit 2, [hl]
+	bit SWARMFLAGS_DUNSPARCE_SWARM_F, [hl]
 	pop hl
 	jr z, .CheckYanma
 	ld a, [wDunsparceMapGroup]
@@ -446,7 +432,7 @@ _SwarmWildmonCheck
 .CheckYanma:
 	push hl
 	ld hl, wSwarmFlags
-	bit 3, [hl]
+	bit SWARMFLAGS_YANMA_SWARM_F, [hl]
 	pop hl
 	jr z, _NoSwarmWildmon
 	ld a, [wYanmaMapGroup]
@@ -460,24 +446,22 @@ _SwarmWildmonCheck
 	scf
 	ret
 
-_NoSwarmWildmon
+_NoSwarmWildmon:
 	and a
 	ret
 
-_NormalWildmonOK
+_NormalWildmonOK:
 	call CopyCurrMapDE
 	jr LookUpWildmonsForMapDE
-; 2a27f
 
-CopyCurrMapDE: ; 2a27f
+CopyCurrMapDE:
 	ld a, [wMapGroup]
 	ld d, a
 	ld a, [wMapNumber]
 	ld e, a
 	ret
-; 2a288
 
-LookUpWildmonsForMapDE: ; 2a288
+LookUpWildmonsForMapDE:
 .loop
 	push hl
 	ld a, [hl]
@@ -505,10 +489,8 @@ LookUpWildmonsForMapDE: ; 2a288
 	pop hl
 	scf
 	ret
-; 2a2a0
-
 
-Special_InitRoamMons: ; 2a2a0
+InitRoamMons:
 ; initialize wRoamMon structs
 
 ; species
@@ -516,14 +498,11 @@ Special_InitRoamMons: ; 2a2a0
 	ld [wRoamMon1Species], a
 	ld a, ENTEI
 	ld [wRoamMon2Species], a
-;	ld a, SUICUNE
-;	ld [wRoamMon3Species], a
 
 ; level
 	ld a, 40
 	ld [wRoamMon1Level], a
 	ld [wRoamMon2Level], a
-;	ld [wRoamMon3Level], a
 
 ; raikou starting map
 	ld a, GROUP_ROUTE_42
@@ -537,23 +516,14 @@ Special_InitRoamMons: ; 2a2a0
 	ld a, MAP_ROUTE_37
 	ld [wRoamMon2MapNumber], a
 
-; suicune starting map
-;	ld a, GROUP_ROUTE_38
-;	ld [wRoamMon3MapGroup], a
-;	ld a, MAP_ROUTE_38
-;	ld [wRoamMon3MapNumber], a
-
 ; hp
 	xor a ; generate new stats
 	ld [wRoamMon1HP], a
 	ld [wRoamMon2HP], a
-;	ld [wRoamMon3HP], a
 
 	ret
-; 2a2ce
-
 
-CheckEncounterRoamMon: ; 2a2ce
+CheckEncounterRoamMon:
 	push hl
 ; Don't trigger an encounter if we're on water.
 	call CheckOnWater
@@ -599,10 +569,8 @@ CheckEncounterRoamMon: ; 2a2ce
 	pop hl
 	and a
 	ret
-; 2a30d
 
-
-UpdateRoamMons: ; 2a30d
+UpdateRoamMons:
 	ld a, [wRoamMon1MapGroup]
 	cp GROUP_N_A
 	jr z, .SkipRaikou
@@ -631,7 +599,7 @@ UpdateRoamMons: ; 2a30d
 .SkipEntei:
 	ld a, [wRoamMon3MapGroup]
 	cp GROUP_N_A
-	jr z, .SkipSuicune
+	jr z, .Finished
 	ld b, a
 	ld a, [wRoamMon3MapNumber]
 	ld c, a
@@ -641,12 +609,10 @@ UpdateRoamMons: ; 2a30d
 	ld a, c
 	ld [wRoamMon3MapNumber], a
 
-.SkipSuicune:
+.Finished:
 	jp _BackUpMapIndices
-; 2a355
-
 
-.Update: ; 2a355
+.Update:
 	ld hl, RoamMaps
 .loop
 ; Are we at the end of the table?
@@ -685,7 +651,7 @@ UpdateRoamMons: ; 2a30d
 	jr nc, .update_loop ; invalid index, try again
 	inc hl
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	add hl, bc
 	ld a, [wRoamMons_LastMapGroup]
@@ -703,7 +669,7 @@ UpdateRoamMons: ; 2a30d
 	ld c, [hl]
 	ret
 
-JumpRoamMons: ; 2a394
+JumpRoamMons:
 	ld a, [wRoamMon1MapGroup]
 	cp GROUP_N_A
 	jr z, .SkipRaikou
@@ -712,8 +678,8 @@ JumpRoamMons: ; 2a394
 	ld [wRoamMon1MapGroup], a
 	ld a, c
 	ld [wRoamMon1MapNumber], a
-.SkipRaikou:
 
+.SkipRaikou:
 	ld a, [wRoamMon2MapGroup]
 	cp GROUP_N_A
 	jr z, .SkipEntei
@@ -722,21 +688,21 @@ JumpRoamMons: ; 2a394
 	ld [wRoamMon2MapGroup], a
 	ld a, c
 	ld [wRoamMon2MapNumber], a
-.SkipEntei:
 
+.SkipEntei:
 	ld a, [wRoamMon3MapGroup]
 	cp GROUP_N_A
-	jr z, .SkipSuicune
+	jr z, .Finished
 	call JumpRoamMon
 	ld a, b
 	ld [wRoamMon3MapGroup], a
 	ld a, c
 	ld [wRoamMon3MapNumber], a
-.SkipSuicune:
 
+.Finished:
 	jp _BackUpMapIndices
 
-JumpRoamMon: ; 2a3cd
+JumpRoamMon:
 .loop
 	ld hl, RoamMaps
 .innerloop1                   ; This loop happens to be unnecessary.
@@ -770,9 +736,8 @@ JumpRoamMon: ; 2a3cd
 	ld b, a
 	ld c, [hl]
 	ret
-; 2a3f6
 
-_BackUpMapIndices: ; 2a3f6
+_BackUpMapIndices:
 	ld a, [wRoamMons_CurrentMapNumber]
 	ld [wRoamMons_LastMapNumber], a
 	ld a, [wRoamMons_CurrentMapGroup]
@@ -782,13 +747,10 @@ _BackUpMapIndices: ; 2a3f6
 	ld a, [wMapGroup]
 	ld [wRoamMons_CurrentMapGroup], a
 	ret
-; 2a40f
-
 
 INCLUDE "data/wild/roammon_maps.asm"
 
-
-ValidateTempWildMonSpecies: ; 2a4a0
+ValidateTempWildMonSpecies:
 ; Due to a development oversight, this function is called with the wild Pokemon's level, not its species, in a.
 	and a
 	jr z, .nowildmon ; = 0
@@ -800,11 +762,10 @@ ValidateTempWildMonSpecies: ; 2a4a0
 .nowildmon
 	scf
 	ret
-; 2a4ab
 
 ; Finds a rare wild Pokemon in the route of the trainer calling, then checks if it's been Seen already.
 ; The trainer will then tell you about the Pokemon if you haven't seen it.
-Special_RandomUnseenWildMon: ; 2a4ab
+RandomUnseenWildMon:
 	farcall GetCallerLocation
 	ld d, b
 	ld e, c
@@ -829,7 +790,7 @@ Special_RandomUnseenWildMon: ; 2a4ab
 	jr z, .randloop1
 	dec a
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	add hl, bc
 ; We now have the pointer to one of the last (rarest) three wild Pokemon found in that area.
@@ -875,9 +836,8 @@ Special_RandomUnseenWildMon: ; 2a4ab
 	; I just saw some rare @  in @ . I'll call you if I see another rare #MON, OK?
 	text_jump UnknownText_0x1bd34b
 	db "@"
-; 0x2a51f
 
-Special_RandomPhoneWildMon: ; 2a51f
+RandomPhoneWildMon:
 	farcall GetCallerLocation
 	ld d, b
 	ld e, c
@@ -904,7 +864,7 @@ Special_RandomPhoneWildMon: ; 2a51f
 	call Random
 	and %11
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	add hl, bc
 	inc hl
@@ -915,9 +875,8 @@ Special_RandomPhoneWildMon: ; 2a51f
 	ld de, wStringBuffer4
 	ld bc, MON_NAME_LENGTH
 	jp CopyBytes
-; 2a567
 
-Special_RandomPhoneMon: ; 2a567
+RandomPhoneMon:
 ; Get a random monster owned by the trainer who's calling.
 	farcall GetCallerLocation
 	ld hl, TrainerGroups
@@ -999,8 +958,6 @@ Special_RandomPhoneMon: ; 2a567
 	ld de, wStringBuffer4
 	ld bc, MON_NAME_LENGTH
 	jp CopyBytes
-; 2a5e9
-
 
 INCLUDE "data/wild/johto_grass.asm"
 INCLUDE "data/wild/johto_water.asm"
diff --git a/engine/phone/buenas_password.asm b/engine/phone/buenas_password.asm
index 0d144afa6..68c5c01b9 100644
--- a/engine/phone/buenas_password.asm
+++ b/engine/phone/buenas_password.asm
@@ -2,7 +2,7 @@ BuenaPhoneScript1:
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
 	iftrue BuenaPhoneScript_Rocket
 	checkcode VAR_HOUR
-	if_greater_than 17, BuenaPhoneScript_AfterMidnight1
+	ifgreater 17, BuenaPhoneScript_AfterMidnight1
 	scall BuenaPhoneScript_CheckTimeOfDay1
 	jump BuenaPhoneScript_Random1
 
@@ -13,9 +13,9 @@ BuenaPhoneScript2:
 	jump BuenaPhoneScript_Random2
 
 BuenaPhoneScript_CheckTimeOfDay1:
-	checkmorn
+	checktime MORN
 	iftrue .morn
-	checkday
+	checktime DAY
 	iftrue .day
 	writetext UnknownText_0xa0d42
 	buttonsound
@@ -37,10 +37,10 @@ BuenaPhoneScript_AfterMidnight1:
 
 BuenaPhoneScript_CheckTimeOfDay2:
 	checkcode VAR_HOUR
-	if_greater_than 17, BuenaPhoneScript_AfterMidnight2
-	checkmorn
+	ifgreater 17, BuenaPhoneScript_AfterMidnight2
+	checktime MORN
 	iftrue .morn
-	checkday
+	checktime DAY
 	iftrue .day
 	writetext UnknownText_0xa0e29
 	buttonsound
@@ -75,20 +75,20 @@ BuenaPhoneScript_Random2:
 	random 14
 
 .Jumptable:
-	if_equal 0, .zero
-	if_equal 1, .one
-	if_equal 2, .two
-	if_equal 3, .three
-	if_equal 4, .four
-	if_equal 5, .five
-	if_equal 6, .six
-	if_equal 7, .seven
-	if_equal 8, .eight
-	if_equal 9, .nine
-	if_equal 10, .ten
-	if_equal 11, .eleven
-	if_equal 12, .twelve
-	if_equal 13, .thirteen
+	ifequal 0, .zero
+	ifequal 1, .one
+	ifequal 2, .two
+	ifequal 3, .three
+	ifequal 4, .four
+	ifequal 5, .five
+	ifequal 6, .six
+	ifequal 7, .seven
+	ifequal 8, .eight
+	ifequal 9, .nine
+	ifequal 10, .ten
+	ifequal 11, .eleven
+	ifequal 12, .twelve
+	ifequal 13, .thirteen
 
 .zero
 	writetext UnknownText_0xa0efb
@@ -150,9 +150,9 @@ BuenaPhoneScript_Random2:
 
 BuenaPhoneScript_Random1:
 	random 3
-	if_equal 0, .zero
-	if_equal 1, .one
-	if_equal 2, .two
+	ifequal 0, .zero
+	ifequal 1, .one
+	ifequal 2, .two
 
 .zero
 	writetext UnknownText_0xa1c88
@@ -165,6 +165,5 @@ BuenaPhoneScript_Random1:
 .two
 	writetext UnknownText_0xa1e2f
 	end
-; a0c28
 
 INCLUDE "data/phone/text/buena.asm"
diff --git a/engine/phone/generic_calls.asm b/engine/phone/generic_calls.asm
index 937fc67c0..407480d36 100644
--- a/engine/phone/generic_calls.asm
+++ b/engine/phone/generic_calls.asm
@@ -19,31 +19,31 @@ PhoneScript_Random11:
 	end
 
 PhoneScript_AnswerPhone_Male:
-	checkday
+	checktime DAY
 	iftrue PhoneScript_AnswerPhone_Male_Day
-	checknite
+	checktime NITE
 	iftrue PhoneScript_AnswerPhone_Male_Nite
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4dc5
@@ -147,26 +147,26 @@ PhoneScript_AnswerPhone_Male:
 
 PhoneScript_AnswerPhone_Male_Day:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4ded
@@ -270,26 +270,26 @@ PhoneScript_AnswerPhone_Male_Day:
 
 PhoneScript_AnswerPhone_Male_Nite:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4e16
@@ -392,19 +392,19 @@ PhoneScript_AnswerPhone_Male_Nite:
 	end
 
 PhoneScript_AnswerPhone_Female:
-	checkday
+	checktime DAY
 	iftrue PhoneScript_AnswerPhone_Female_Day
-	checknite
+	checktime NITE
 	iftrue PhoneScript_AnswerPhone_Female_Nite
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b4f21
@@ -448,14 +448,14 @@ PhoneScript_AnswerPhone_Female:
 
 PhoneScript_AnswerPhone_Female_Day:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b4f4d
@@ -499,14 +499,14 @@ PhoneScript_AnswerPhone_Female_Day:
 
 PhoneScript_AnswerPhone_Female_Nite:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b4f75
@@ -549,31 +549,31 @@ PhoneScript_AnswerPhone_Female_Nite:
 	end
 
 PhoneScript_GreetPhone_Male:
-	checkday
+	checktime DAY
 	iftrue PhoneScript_GreetPhone_Male_Day
-	checknite
+	checktime NITE
 	iftrue PhoneScript_GreetPhone_Male_Nite
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4e3e
@@ -677,26 +677,26 @@ PhoneScript_GreetPhone_Male:
 
 PhoneScript_GreetPhone_Male_Day:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4e72
@@ -800,26 +800,26 @@ PhoneScript_GreetPhone_Male_Day:
 
 PhoneScript_GreetPhone_Male_Nite:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4e9e
@@ -922,19 +922,19 @@ PhoneScript_GreetPhone_Male_Nite:
 	end
 
 PhoneScript_GreetPhone_Female:
-	checkday
+	checktime DAY
 	iftrue PhoneScript_GreetPhone_Female_Day
-	checknite
+	checktime NITE
 	iftrue PhoneScript_GreetPhone_Female_Nite
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b4fa1
@@ -978,14 +978,14 @@ PhoneScript_GreetPhone_Female:
 
 PhoneScript_GreetPhone_Female_Day:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b4fda
@@ -1029,14 +1029,14 @@ PhoneScript_GreetPhone_Female_Day:
 
 PhoneScript_GreetPhone_Female_Nite:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b5004
@@ -1080,23 +1080,23 @@ PhoneScript_GreetPhone_Female_Nite:
 
 PhoneScript_Generic_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1b4ecd
@@ -1190,14 +1190,14 @@ PhoneScript_Generic_Male:
 
 PhoneScript_Generic_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1b502b
@@ -1240,9 +1240,9 @@ PhoneScript_Generic_Female:
 	end
 
 PhoneScript_MonFlavorText:
-	special Special_RandomPhoneMon
+	special RandomPhoneMon
 	farscall PhoneScript_Random2
-	if_equal $0, .TooEnergetic
+	ifequal $0, .TooEnergetic
 	farwritetext UnknownText_0x1b518b
 	buttonsound
 	farjump PhoneScript_HangupText_Male
@@ -1254,8 +1254,6 @@ PhoneScript_MonFlavorText:
 	farwritetext UnknownText_0x1b522b
 	buttonsound
 	farjump PhoneScript_HangupText_Male
-; be643
-
 
 GrandmaString: db "Grandma@"
 GrandpaString: db "Grandpa@"
@@ -1263,4 +1261,3 @@ MomString: db "Mom@"
 DadString: db "Dad@"
 SisterString: db "Sister@"
 BrotherString: db "Brother@"
-
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
index fad859bfe..06a241cad 100644
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -1,4 +1,4 @@
-AddPhoneNumber:: ; 90000
+AddPhoneNumber::
 	call _CheckCellNum
 	jr c, .cant_add
 	call Phone_FindOpenSlot
@@ -10,10 +10,8 @@ AddPhoneNumber:: ; 90000
 .cant_add
 	scf
 	ret
-; 9000f
 
-
-DelCellNum:: ; 9000f
+DelCellNum::
 	call _CheckCellNum
 	jr nc, .not_in_list
 	xor a
@@ -23,13 +21,11 @@ DelCellNum:: ; 9000f
 .not_in_list
 	scf
 	ret
-; 90019
 
-CheckCellNum:: ; 90019
+CheckCellNum::
 	jp _CheckCellNum ; wtf
-; 9001c
 
-_CheckCellNum: ; 9001c
+_CheckCellNum:
 	ld hl, wPhoneList
 	ld b, CONTACT_LIST_SIZE
 .loop
@@ -45,9 +41,8 @@ _CheckCellNum: ; 9001c
 	dec hl
 	scf
 	ret
-; 9002d
 
-Phone_FindOpenSlot: ; 9002d
+Phone_FindOpenSlot:
 	call GetRemainingSpaceInPhoneList
 	ld b, a
 	ld hl, wPhoneList
@@ -64,9 +59,8 @@ Phone_FindOpenSlot: ; 9002d
 	dec hl
 	scf
 	ret
-; 90040
 
-GetRemainingSpaceInPhoneList: ; 90040
+GetRemainingSpaceInPhoneList:
 	xor a
 	ld [wBuffer1], a
 	ld hl, PermanentNumbers
@@ -96,12 +90,10 @@ GetRemainingSpaceInPhoneList: ; 90040
 	ld hl, wBuffer1
 	sub [hl]
 	ret
-; 90066
 
 INCLUDE "data/phone/permanent_numbers.asm"
 
-
-FarPlaceString: ; 90069
+FarPlaceString:
 	ld a, [hROMBank]
 	push af
 	ld a, b
@@ -112,10 +104,8 @@ FarPlaceString: ; 90069
 	pop af
 	rst Bankswitch
 	ret
-; 90074
 
-
-CheckPhoneCall:: ; 90074 (24:4074)
+CheckPhoneCall::
 ; Check if the phone is ringing in the overworld.
 
 	call CheckStandingOnEntrance
@@ -151,11 +141,11 @@ CheckPhoneCall:: ; 90074 (24:4074)
 	xor a
 	ret
 
-.timecheck ; 900a6 (24:40a6)
+.timecheck
 	farcall CheckReceiveCallTimer
 	ret
 
-CheckPhoneContactTimeOfDay: ; 900ad (24:40ad)
+CheckPhoneContactTimeOfDay:
 	push hl
 	push bc
 	push de
@@ -171,7 +161,7 @@ CheckPhoneContactTimeOfDay: ; 900ad (24:40ad)
 	pop hl
 	ret
 
-ChooseRandomCaller: ; 900bf (24:40bf)
+ChooseRandomCaller:
 ; If no one is available to call, don't return anything.
 	ld a, [wEngineBuffer3]
 	and a
@@ -198,7 +188,7 @@ ChooseRandomCaller: ; 900bf (24:40bf)
 	xor a
 	ret
 
-GetAvailableCallers: ; 900de (24:40de)
+GetAvailableCallers:
 	farcall CheckTime
 	ld a, c
 	ld [wEngineBuffer1], a
@@ -246,7 +236,7 @@ GetAvailableCallers: ; 900de (24:40de)
 	jr nz, .loop
 	ret
 
-CheckSpecialPhoneCall:: ; 90136 (24:4136)
+CheckSpecialPhoneCall::
 	ld a, [wSpecialPhoneCallID]
 	and a
 	jr z, .NoPhoneCall
@@ -288,14 +278,12 @@ CheckSpecialPhoneCall:: ; 90136 (24:4136)
 .NoPhoneCall:
 	xor a
 	ret
-; 90173 (24:4173)
 
-.script ; 0x90173
+.script
 	pause 30
 	jump Script_ReceivePhoneCall
-; 0x90178
 
-.DoSpecialPhoneCall: ; 90178 (24:4178)
+.DoSpecialPhoneCall:
 	ld a, [wSpecialPhoneCallID]
 	dec a
 	ld c, a
@@ -305,7 +293,7 @@ CheckSpecialPhoneCall:: ; 90136 (24:4136)
 	call AddNTimes
 	ret
 
-SpecialCallOnlyWhenOutside: ; 90188
+SpecialCallOnlyWhenOutside:
 	ld a, [wEnvironment]
 	cp TOWN
 	jr z, .outside
@@ -318,11 +306,11 @@ SpecialCallOnlyWhenOutside: ; 90188
 	scf
 	ret
 
-SpecialCallWhereverYouAre: ; 90197
+SpecialCallWhereverYouAre:
 	scf
 	ret
 
-Function90199: ; 90199 (24:4199)
+Function90199:
 	; Don't do the call if you're in a link communication
 	ld a, [wLinkMode]
 	and a
@@ -388,19 +376,16 @@ Function90199: ; 90199 (24:4199)
 	ld de, UnknownScript_0x90205
 	call ExecuteCallbackScript
 	ret
-; 90205 (24:4205)
 
-UnknownScript_0x90205: ; 0x90205
+UnknownScript_0x90205:
 	ptcall wd002
 	return
-; 0x90209
 
-UnknownScript_0x90209: ; 0x90209
+UnknownScript_0x90209:
 	scall UnknownScript_0x90657
 	return
-; 0x9020d
 
-LoadCallerScript: ; 9020d (24:420d)
+LoadCallerScript:
 	nop
 	nop
 	ld a, e
@@ -422,9 +407,8 @@ LoadCallerScript: ; 9020d (24:420d)
 	ld bc, 12
 	call FarCopyBytes
 	ret
-; 90233 (24:4233)
 
-WrongNumber: ; 90233
+WrongNumber:
 	db TRAINER_NONE, PHONE_00
 	dba .script
 .script
@@ -434,9 +418,8 @@ WrongNumber: ; 90233
 	; Huh? Sorry, wrong number!
 	text_jump UnknownText_0x1c5565
 	db "@"
-; 90241
 
-Script_ReceivePhoneCall: ; 0x90241
+Script_ReceivePhoneCall:
 	refreshscreen
 	callasm RingTwice_StartCall
 	ptcall wPhoneScriptPointer
@@ -445,18 +428,16 @@ Script_ReceivePhoneCall: ; 0x90241
 	closetext
 	callasm InitCallReceiveDelay
 	end
-; 0x90255
 
-Script_SpecialBillCall:: ; 0x90255
+Script_SpecialBillCall::
 	callasm .LoadBillScript
 	jump Script_ReceivePhoneCall
 
 .LoadBillScript:
 	ld e, PHONE_BILL
 	jp LoadCallerScript
-; 90261
 
-UnknownScript_0x90261: ; 0x90261
+UnknownScript_0x90261:
 	callasm .LoadElmScript
 	pause 30
 	jump Script_ReceivePhoneCall
@@ -464,16 +445,14 @@ UnknownScript_0x90261: ; 0x90261
 .LoadElmScript:
 	ld e, PHONE_ELM
 	jp LoadCallerScript
-; 9026f
 
-RingTwice_StartCall: ; 9026f
+RingTwice_StartCall:
 	call .Ring
 	call .Ring
 	farcall StubbedTrainerRankings_PhoneCalls
 	ret
-; 9027c
 
-.Ring: ; 9027c (24:427c)
+.Ring:
 	call Phone_StartRinging
 	call Phone_Wait20Frames
 	call Phone_CallerTextboxWithName
@@ -483,13 +462,13 @@ RingTwice_StartCall: ; 9026f
 	call Phone_CallerTextboxWithName
 	ret
 
-Phone_CallerTextboxWithName: ; 90292 (24:4292)
+Phone_CallerTextboxWithName:
 	ld a, [wCurrentCaller]
 	ld b, a
 	call Function90363
 	ret
 
-PhoneCall:: ; 9029a
+PhoneCall::
 	ld a, b
 	ld [wPhoneScriptBank], a
 	ld a, e
@@ -500,9 +479,8 @@ PhoneCall:: ; 9029a
 	call Phone_FirstOfTwoRings
 	farcall StubbedTrainerRankings_PhoneCalls
 	ret
-; 902b3
 
-Phone_FirstOfTwoRings: ; 902b3
+Phone_FirstOfTwoRings:
 	call Phone_StartRinging
 	call Phone_Wait20Frames
 	call Phone_CallerTextboxWithName2
@@ -511,9 +489,8 @@ Phone_FirstOfTwoRings: ; 902b3
 	call Phone_Wait20Frames
 	call Phone_CallerTextboxWithName2
 	ret
-; 902c9
 
-Phone_CallerTextboxWithName2: ; 902c9
+Phone_CallerTextboxWithName2:
 	call Phone_CallerTextbox
 	hlcoord 1, 2
 	ld [hl], "☎"
@@ -527,15 +504,13 @@ Phone_CallerTextboxWithName2: ; 902c9
 	ld d, a
 	call FarPlaceString
 	ret
-; 902e3
 
-
-Phone_NoSignal: ; 902e3 (24:42e3)
+Phone_NoSignal:
 	ld de, SFX_NO_SIGNAL
 	call PlaySFX
 	jr Phone_CallEnd
 
-HangUp:: ; 902eb
+HangUp::
 	call HangUp_Beep
 	call HangUp_Wait20Frames
 Phone_CallEnd:
@@ -552,46 +527,37 @@ Phone_CallEnd:
 	call HangUp_BoopOff
 	call HangUp_Wait20Frames
 	ret
-; 90316
 
-Function90316: ; 90316
+Function90316:
 	ld de, SFX_SHUT_DOWN_PC
 	call PlaySFX
 	ret
-; 9031d
 
-HangUp_Beep: ; 9031d
+HangUp_Beep:
 	ld hl, UnknownText_0x9032a
 	call PrintText
 	ld de, SFX_HANG_UP
 	call PlaySFX
 	ret
-; 9032a
 
-UnknownText_0x9032a: ; 9032a
+UnknownText_0x9032a:
 	text_jump UnknownText_0x1c5580
 	db "@"
-; 9032f
-
 
-HangUp_BoopOn: ; 9032f
+HangUp_BoopOn:
 	ld hl, UnknownText_0x90336
 	call PrintText
 	ret
-; 90336
 
-UnknownText_0x90336: ; 0x90336
+UnknownText_0x90336:
 	text_jump UnknownText_0x1c5588
 	db "@"
-; 0x9033b
 
-
-HangUp_BoopOff: ; 9033b
+HangUp_BoopOff:
 	call SpeechTextBox
 	ret
-; 9033f
 
-Phone_StartRinging: ; 9033f
+Phone_StartRinging:
 	call WaitSFX
 	ld de, SFX_CALL
 	call PlaySFX
@@ -599,20 +565,17 @@ Phone_StartRinging: ; 9033f
 	call UpdateSprites
 	farcall PhoneRing_CopyTilemapAtOnce
 	ret
-; 90355
 
-HangUp_Wait20Frames: ; 90355
+HangUp_Wait20Frames:
 	jr Phone_Wait20Frames
 
-Phone_Wait20Frames
+Phone_Wait20Frames:
 	ld c, 20
 	call DelayFrames
 	farcall PhoneRing_CopyTilemapAtOnce
 	ret
-; 90363
-
 
-Function90363: ; 90363 (24:4363)
+Function90363:
 	push bc
 	call Phone_CallerTextbox
 	hlcoord 1, 1
@@ -625,17 +588,14 @@ Function90363: ; 90363 (24:4363)
 	call Function90380
 	ret
 
-
-Phone_CallerTextbox: ; 90375
+Phone_CallerTextbox:
 	hlcoord 0, 0
 	ld b, 2
 	ld c, SCREEN_WIDTH - 2
 	call TextBox
 	ret
-; 90380
-
 
-Function90380: ; 90380 (24:4380)
+Function90380:
 	ld h, d
 	ld l, e
 	ld a, b
@@ -643,7 +603,7 @@ Function90380: ; 90380 (24:4380)
 	call GetCallerName
 	ret
 
-CheckCanDeletePhoneNumber: ; 9038a (24:438a)
+CheckCanDeletePhoneNumber:
 	ld a, c
 	call GetCallerTrainerClass
 	ld a, c
@@ -657,7 +617,7 @@ CheckCanDeletePhoneNumber: ; 9038a (24:438a)
 	ld c, $1
 	ret
 
-GetCallerTrainerClass: ; 9039a
+GetCallerTrainerClass:
 	push hl
 	ld hl, PhoneContacts + PHONE_CONTACT_TRAINER_CLASS
 	ld bc, PHONE_TABLE_WIDTH
@@ -667,10 +627,8 @@ GetCallerTrainerClass: ; 9039a
 	ld c, a
 	pop hl
 	ret
-; 903a9
 
-
-GetCallerName: ; 903a9 (24:43a9)
+GetCallerName:
 	ld a, c
 	and a
 	jr z, .NotTrainer
@@ -702,25 +660,10 @@ GetCallerName: ; 903a9 (24:43a9)
 	pop hl
 	call PlaceString
 	ret
-; 903d6 (24:43d6)
-
-NonTrainerCallerNames: ; 903d6
-	dw .none
-	dw .mom
-	dw .bikeshop
-	dw .bill
-	dw .elm
-	dw .buena
-
-.none db "----------@"
-.mom db "MOM:@"
-.bill db "BILL:@"
-.elm db "PROF.ELM:@"
-.bikeshop db "BIKE SHOP:@"
-.buena db "BUENA:<LNBRK>   DISC JOCKEY@"
-; 90423
-
-Phone_GetTrainerName: ; 90423 (24:4423)
+
+INCLUDE "data/phone/non_trainer_names.asm"
+
+Phone_GetTrainerName:
 	push hl
 	push bc
 	farcall GetTrainerName
@@ -728,7 +671,7 @@ Phone_GetTrainerName: ; 90423 (24:4423)
 	pop hl
 	ret
 
-Phone_GetTrainerClassName: ; 9042e (24:442e)
+Phone_GetTrainerClassName:
 	push hl
 	push bc
 	farcall GetTrainerClassName
@@ -736,7 +679,7 @@ Phone_GetTrainerClassName: ; 9042e (24:442e)
 	pop hl
 	ret
 
-GetCallerLocation: ; 90439
+GetCallerLocation:
 	ld a, [wCurrentCaller]
 	call GetCallerTrainerClass
 	ld d, c
@@ -756,43 +699,34 @@ GetCallerLocation: ; 90439
 	pop bc
 	pop de
 	ret
-; 9045f
-
 
 INCLUDE "data/phone/phone_contacts.asm"
 
 INCLUDE "data/phone/special_calls.asm"
 
-
-UnknownScript_0x90657: ; 0x90657
+UnknownScript_0x90657:
 	writetext UnknownText_0x9065b
 	end
-; 0x9065b
 
-UnknownText_0x9065b: ; 0x9065b
+UnknownText_0x9065b:
 	; That number is out of the area.
 	text_jump UnknownText_0x1c558b
 	db "@"
-; 0x90660
 
-PhoneScript_JustTalkToThem: ; 0x90660
+PhoneScript_JustTalkToThem:
 	writetext UnknownText_0x90664
 	end
-; 0x90664
 
-UnknownText_0x90664: ; 0x90664
+UnknownText_0x90664:
 	; Just go talk to that person!
 	text_jump UnknownText_0x1c55ac
 	db "@"
-; 0x90669
 
-UnknownScript_0x90669: ; 0x90669
+UnknownScript_0x90669:
 	writetext UnknownText_0x9066d
 	end
-; 0x9066d
 
-UnknownText_0x9066d: ; 0x9066d
+UnknownText_0x9066d:
 	; Thank you!
 	text_jump UnknownText_0x1c55ca
 	db "@"
-; 0x90672
diff --git a/engine/phone/phone_callers.asm b/engine/phone/phone_callers.asm
index cb333ae8d..a929ba1d8 100644
--- a/engine/phone/phone_callers.asm
+++ b/engine/phone/phone_callers.asm
@@ -1,7 +1,7 @@
 Phone_GenericCall_Male:
-	special Special_RandomPhoneMon
+	special RandomPhoneMon
 	farscall PhoneScript_Random2
-	if_equal 0, .Bragging
+	ifequal 0, .Bragging
 	farscall PhoneScript_Generic_Male
 	farjump Phone_FoundAMon_Male
 
@@ -9,9 +9,9 @@ Phone_GenericCall_Male:
 	farjump Phone_BraggingCall_Male
 
 Phone_GenericCall_Female:
-	special Special_RandomPhoneMon
+	special RandomPhoneMon
 	farscall PhoneScript_Random2
-	if_equal 0, .Bragging
+	ifequal 0, .Bragging
 	farscall PhoneScript_Generic_Female
 	farjump Phone_FoundAMon_Female
 
@@ -27,9 +27,9 @@ Phone_BraggingCall_Female:
 	farjump Phone_FoundAMon_Female
 
 Phone_FoundAMon_Male:
-	special Special_RandomPhoneWildMon
+	special RandomPhoneWildMon
 	farscall PhoneScript_Random2
-	if_equal 0, .GotAway
+	ifequal 0, .GotAway
 	farscall Phone_WhoDefeatedMon_Male
 	farjump PhoneScript_HangupText_Male
 
@@ -37,9 +37,9 @@ Phone_FoundAMon_Male:
 	farjump Phone_GotAwayCall_Male
 
 Phone_FoundAMon_Female:
-	special Special_RandomPhoneWildMon
+	special RandomPhoneWildMon
 	farscall PhoneScript_Random2
-	if_equal 0, .GotAway
+	ifequal 0, .GotAway
 	farscall Phone_WhoDefeatedMon_Female
 	farjump PhoneScript_HangupText_Female
 
@@ -56,23 +56,23 @@ Phone_GotAwayCall_Female:
 
 Phone_WhosBragging_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackIntelligenceText
@@ -161,14 +161,14 @@ Phone_WhosBragging_Male:
 
 Phone_WhosBragging_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x174688
@@ -212,23 +212,23 @@ Phone_WhosBragging_Female:
 
 Phone_WhoDefeatedMon_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext JackDefeatedMonText
@@ -317,14 +317,14 @@ Phone_WhoDefeatedMon_Male:
 
 Phone_WhoDefeatedMon_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1746c3
@@ -368,23 +368,23 @@ Phone_WhoDefeatedMon_Female:
 
 Phone_WhoLostAMon_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x174165
@@ -473,14 +473,14 @@ Phone_WhoLostAMon_Male:
 
 Phone_WhoLostAMon_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x174734
@@ -532,23 +532,23 @@ PhoneScript_WantsToBattle_Female:
 
 PhoneScript_RematchText_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x1741e1
@@ -637,13 +637,13 @@ PhoneScript_RematchText_Male:
 
 PhoneScript_RematchText_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beth:
 	farwritetext UnknownText_0x174e4e
@@ -690,26 +690,26 @@ TiffanyItsAwful:
 
 PhoneScript_HangupText_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_SCHOOLBOY_JACK, .Jack
-	if_equal PHONE_SAILOR_HUEY, .Huey
-	if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_YOUNGSTER_JOEY, .Joey
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_FISHER_RALPH, .Ralph
-	if_equal PHONE_HIKER_ANTHONY, .Anthony
-	if_equal PHONE_CAMPER_TODD, .Todd
-	if_equal PHONE_JUGGLER_IRWIN, .Irwin
-	if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_SCHOOLBOY_CHAD, .Chad
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_POKEMANIAC_BRENT, .Brent
-	if_equal PHONE_BIRDKEEPER_VANCE, .Vance
-	if_equal PHONE_FISHER_WILTON, .Wilton
-	if_equal PHONE_BLACKBELT_KENJI, .Kenji
-	if_equal PHONE_HIKER_PARRY, .Parry
+	ifequal PHONE_SCHOOLBOY_JACK, .Jack
+	ifequal PHONE_SAILOR_HUEY, .Huey
+	ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_YOUNGSTER_JOEY, .Joey
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_FISHER_RALPH, .Ralph
+	ifequal PHONE_HIKER_ANTHONY, .Anthony
+	ifequal PHONE_CAMPER_TODD, .Todd
+	ifequal PHONE_JUGGLER_IRWIN, .Irwin
+	ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_POKEMANIAC_BRENT, .Brent
+	ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+	ifequal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BLACKBELT_KENJI, .Kenji
+	ifequal PHONE_HIKER_PARRY, .Parry
 
 .Jack:
 	farwritetext UnknownText_0x174251
@@ -793,14 +793,14 @@ PhoneScript_HangupText_Male:
 
 PhoneScript_HangupText_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_COOLTRAINERF_BETH, .Beth
-	if_equal PHONE_COOLTRAINERF_REENA, .Reena
-	if_equal PHONE_PICNICKER_LIZ, .Liz
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
-	if_equal PHONE_PICNICKER_ERIN, .Erin
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_COOLTRAINERF_BETH, .Beth
+	ifequal PHONE_COOLTRAINERF_REENA, .Reena
+	ifequal PHONE_PICNICKER_LIZ, .Liz
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_PICNICKER_ERIN, .Erin
 
 .Beverly:
 	farwritetext UnknownText_0x1747ac
@@ -851,13 +851,13 @@ Phone_CheckIfUnseenRare_Female:
 	farjump PhoneScript_HangupText_Female
 
 PhoneScriptRareWildMon:
-	special Special_RandomUnseenWildMon
+	special RandomUnseenWildMon
 	end
 
 PhoneScript_BugCatchingContest:
 	checkcode VAR_CALLERID
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_POKEFANM_DEREK, .Derek
 
 .Wade:
 	farwritetext WadeBugCatchingContestText
@@ -896,12 +896,12 @@ UnknownScript_0xa05de:
 
 PhoneScript_FoundItem_Male:
 	checkcode VAR_CALLERID
-	if_equal PHONE_BIRDKEEPER_JOSE, .Jose
-	if_equal PHONE_BUG_CATCHER_WADE, .Wade
-	if_equal PHONE_SCHOOLBOY_ALAN, .Alan
-	if_equal PHONE_POKEFANM_DEREK, .Derek
-	if_equal PHONE_FISHER_TULLY, .Tully
-	if_equal PHONE_FISHER_WILTON, .Wilton
+	ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+	ifequal PHONE_BUG_CATCHER_WADE, .Wade
+	ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+	ifequal PHONE_POKEFANM_DEREK, .Derek
+	ifequal PHONE_FISHER_TULLY, .Tully
+	ifequal PHONE_FISHER_WILTON, .Wilton
 
 .Jose:
 	farwritetext JoseFoundSomethingText
@@ -929,10 +929,10 @@ PhoneScript_FoundItem_Male:
 
 PhoneScript_FoundItem_Female:
 	checkcode VAR_CALLERID
-	if_equal PHONE_POKEFAN_BEVERLY, .Beverly
-	if_equal PHONE_PICNICKER_GINA, .Gina
-	if_equal PHONE_LASS_DANA, .Dana
-	if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+	ifequal PHONE_PICNICKER_GINA, .Gina
+	ifequal PHONE_LASS_DANA, .Dana
+	ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
 
 .Beverly:
 	farwritetext BeverlyFoundNuggetText
diff --git a/engine/phone/phone_gossip.asm b/engine/phone/phone_gossip.asm
index 8f45c8807..bf3da8d30 100644
--- a/engine/phone/phone_gossip.asm
+++ b/engine/phone/phone_gossip.asm
@@ -1,16 +1,16 @@
 JackTriviaScript:
 	random 11
-	if_equal  0, .Thunder
-	if_equal  1, .Rollout
-	if_equal  2, .Solarbeam
-	if_equal  3, .Stomp
-	if_equal  4, .Gust
-	if_equal  5, .Twister
-	if_equal  6, .Earthquake
-	if_equal  7, .Magnitude
-	if_equal  8, .Sandstorm
-	if_equal  9, .SunnyDay
-	if_equal 10, .RainDance
+	ifequal  0, .Thunder
+	ifequal  1, .Rollout
+	ifequal  2, .Solarbeam
+	ifequal  3, .Stomp
+	ifequal  4, .Gust
+	ifequal  5, .Twister
+	ifequal  6, .Earthquake
+	ifequal  7, .Magnitude
+	ifequal  8, .Sandstorm
+	ifequal  9, .SunnyDay
+	ifequal 10, .RainDance
 
 .Thunder:
 	farwritetext JackThunderTriviaText
@@ -69,16 +69,16 @@ JackTriviaScript:
 
 UnknownScript_0xa06da:
 	random 10
-	if_equal 0, .RuinsOfAlph
-	if_equal 1, .Falkner
-	if_equal 2, .Earl
-	if_equal 3, .SurfPikachu
-	if_equal 4, .MooMooMilk
-	if_equal 5, .Salon
-	if_equal 6, .Whitney
-	if_equal 7, .BugCatchingContest
-	if_equal 8, .BeautifulMon
-	if_equal 9, .Forgot
+	ifequal 0, .RuinsOfAlph
+	ifequal 1, .Falkner
+	ifequal 2, .Earl
+	ifequal 3, .SurfPikachu
+	ifequal 4, .MooMooMilk
+	ifequal 5, .Salon
+	ifequal 6, .Whitney
+	ifequal 7, .BugCatchingContest
+	ifequal 8, .BeautifulMon
+	ifequal 9, .Forgot
 
 .RuinsOfAlph:
 	farwritetext UnknownText_0x176223
@@ -132,16 +132,16 @@ UnknownScript_0xa06da:
 
 ChadOakGossipScript:
 	random 10
-	if_equal 0, .Blue
-	if_equal 1, .Daisy
-	if_equal 2, .ProfElm
-	if_equal 3, .Dream
-	if_equal 4, .Kurt
-	if_equal 5, .League
-	if_equal 6, .RadioShow
-	if_equal 7, .Battling
-	if_equal 8, .DaisyTea
-	if_equal 9, .Traveled
+	ifequal 0, .Blue
+	ifequal 1, .Daisy
+	ifequal 2, .ProfElm
+	ifequal 3, .Dream
+	ifequal 4, .Kurt
+	ifequal 5, .League
+	ifequal 6, .RadioShow
+	ifequal 7, .Battling
+	ifequal 8, .DaisyTea
+	ifequal 9, .Traveled
 
 .Blue:
 	farwritetext ChadBlueGossipText
@@ -195,16 +195,16 @@ ChadOakGossipScript:
 
 BrentBillTriviaScript:
 	random 10
-	if_equal 0, .Father
-	if_equal 1, .Grandpa
-	if_equal 2, .Goldenrod
-	if_equal 3, .Route25
-	if_equal 4, .Abra
-	if_equal 5, .Sister
-	if_equal 6, .Milk
-	if_equal 7, .Battling
-	if_equal 8, .FlowerShop
-	if_equal 9, .KimonoGirl
+	ifequal 0, .Father
+	ifequal 1, .Grandpa
+	ifequal 2, .Goldenrod
+	ifequal 3, .Route25
+	ifequal 4, .Abra
+	ifequal 5, .Sister
+	ifequal 6, .Milk
+	ifequal 7, .Battling
+	ifequal 8, .FlowerShop
+	ifequal 9, .KimonoGirl
 
 .Father:
 	farwritetext UnknownText_0x662bc
@@ -258,89 +258,89 @@ BrentBillTriviaScript:
 
 IrwinRumorScript:
 	checkevent EVENT_OPENED_MT_SILVER
-	iftrue IrwinMtSilver
+	iftrue .MtSilver
 	checkevent EVENT_FOUGHT_SNORLAX
-	iftrue IrwinSnorlax
+	iftrue .Snorlax
 	checkevent EVENT_GOT_PASS_FROM_COPYCAT
-	iftrue IrwinTrainPass
+	iftrue .TrainPass
 	checkflag ENGINE_MARSHBADGE
-	iftrue IrwinMarshBadge
+	iftrue .MarshBadge
 	checkflag ENGINE_FLYPOINT_VERMILION
-	iftrue IrwinVermilionCity
+	iftrue .VermilionCity
 	checkevent EVENT_BEAT_ELITE_FOUR
-	iftrue IrwinEliteFour
+	iftrue .EliteFour
 	checkflag ENGINE_RISINGBADGE
-	iftrue IrwinRisingBadge
+	iftrue .RisingBadge
 	checkevent EVENT_CLEARED_RADIO_TOWER
-	iftrue IrwinRadioTower
+	iftrue .RadioTower
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
-	iftrue IrwinRocketHideout
+	iftrue .RocketHideout
 	checkevent EVENT_JASMINE_RETURNED_TO_GYM
-	iftrue IrwinJasmineReturned
+	iftrue .JasmineReturned
 	checkflag ENGINE_FOGBADGE
-	iftrue IrwinFogBadge
+	iftrue .FogBadge
 	checkflag ENGINE_PLAINBADGE
-	iftrue IrwinPlainBadge
+	iftrue .PlainBadge
 	farwritetext IrwinCalledRightAwayText
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinPlainBadge:
+.PlainBadge:
 	farwritetext UnknownText_0x64099
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinJasmineReturned:
+.JasmineReturned:
 	farwritetext UnknownText_0x640e6
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinRocketHideout:
+.RocketHideout:
 	farwritetext UnknownText_0x6416d
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinRadioTower:
+.RadioTower:
 	farwritetext UnknownText_0x641e8
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinRisingBadge:
+.RisingBadge:
 	farwritetext UnknownText_0x64247
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinEliteFour:
+.EliteFour:
 	farwritetext UnknownText_0x642bb
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinVermilionCity:
+.VermilionCity:
 	farwritetext UnknownText_0x643d4
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinTrainPass:
+.TrainPass:
 	farwritetext UnknownText_0x64448
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinSnorlax:
+.Snorlax:
 	farwritetext UnknownText_0x6455b
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinMtSilver:
+.MtSilver:
 	farwritetext UnknownText_0x645ff
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinFogBadge:
+.FogBadge:
 	farwritetext UnknownText_0x646df
 	buttonsound
 	jump PhoneScript_HangupText_Male
 
-IrwinMarshBadge:
+.MarshBadge:
 	farwritetext UnknownText_0x647d8
 	buttonsound
 	jump PhoneScript_HangupText_Male
@@ -477,9 +477,9 @@ ErinWorkingHardScript:
 
 UnknownScript_0xa09c8:
 	random 3
-	if_equal 0, UnknownScript_0xa09d6
-	if_equal 1, UnknownScript_0xa09de
-	if_equal 2, UnknownScript_0xa09e6
+	ifequal 0, UnknownScript_0xa09d6
+	ifequal 1, UnknownScript_0xa09de
+	ifequal 2, UnknownScript_0xa09e6
 
 UnknownScript_0xa09d6:
 	farwritetext UnknownText_0x64846
@@ -498,8 +498,8 @@ UnknownScript_0xa09e6:
 
 KenjiAnswerPhoneScript:
 	checkcode VAR_KENJI_BREAK
-	if_equal 2, .Training
-	if_equal 1, .OnBreak
+	ifequal 2, .Training
+	ifequal 1, .OnBreak
 	farwritetext UnknownText_0x66e17
 	buttonsound
 	jump PhoneScript_HangupText_Male
@@ -510,9 +510,9 @@ KenjiAnswerPhoneScript:
 	jump PhoneScript_HangupText_Male
 
 .OnBreak:
-	checkmorn
+	checktime MORN
 	iftrue .Morning
-	checknite
+	checktime NITE
 	iftrue .Night
 	setevent EVENT_KENJI_ON_BREAK
 	farwritetext KenjiBreakText
diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm
index 646040641..4296b9023 100644
--- a/engine/phone/phone_scripts.asm
+++ b/engine/phone/phone_scripts.asm
@@ -1,10 +1,10 @@
-UnusedPhoneScript: ; 0xbcea5
+UnusedPhoneScript:
 	farwritetext UnusedPhoneText
 	end
 
 ; Mom
 
-MomPhoneScript: ; 0xbceaa
+MomPhoneScript:
 	checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
 	iftrue .bcec5
 	checkevent EVENT_DUDE_TALKED_TO_YOU
@@ -15,132 +15,132 @@ MomPhoneScript: ; 0xbceaa
 	iftrue MomPhoneNoPokedexScript
 	jump MomPhoneNoPokemonScript
 
-.bcec5 ; 0xbcec5
-	checkevent EVENT_IN_YOUR_ROOM
+.bcec5
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
 	iftrue MomPhoneHangUpScript
 	farwritetext MomPhoneGreetingText
 	buttonsound
 	mapnametotext MEM_BUFFER_0
 	checkcode VAR_ROOFPALETTE
-	if_equal 1, MomPhonePalette1
-	if_equal 2, MomPhonePalette2
+	ifequal 1, MomPhonePalette1
+	ifequal 2, MomPhonePalette2
 	jump MomPhoneOther
 
-MomPhoneLandmark: ; 0xbcedf
+MomPhoneLandmark:
 	farwritetext MomPhoneLandmarkText
 	buttonsound
 	jump MomSavingMoney
 
-MomPhonePalette1: ; 0xbcee7
+MomPhonePalette1:
 	checkcode VAR_MAPGROUP
-	if_equal GROUP_NEW_BARK_TOWN, .newbark
-	if_equal GROUP_CHERRYGROVE_CITY, .cherrygrove
-	if_equal GROUP_VIOLET_CITY, .violet
-	if_equal GROUP_AZALEA_TOWN, .azalea
-	if_equal GROUP_GOLDENROD_CITY, .goldenrod
+	ifequal GROUP_NEW_BARK_TOWN, .newbark
+	ifequal GROUP_CHERRYGROVE_CITY, .cherrygrove
+	ifequal GROUP_VIOLET_CITY, .violet
+	ifequal GROUP_AZALEA_TOWN, .azalea
+	ifequal GROUP_GOLDENROD_CITY, .goldenrod
 	farwritetext MomPhoneGenericAreaText
 	buttonsound
 	jump MomSavingMoney
 
-.newbark ; 0xbcf05
+.newbark
 	farwritetext MomPhoneNewBarkText
 	buttonsound
 	jump MomSavingMoney
 
-.cherrygrove ; 0xbcf0d
+.cherrygrove
 	farwritetext MomPhoneCherrygroveText
 	buttonsound
 	jump MomSavingMoney
 
-.violet ; 0xbcf15
+.violet
 	landmarktotext SPROUT_TOWER, MEM_BUFFER_1
 	jump MomPhoneLandmark
-.azalea ; 0xbcf1b
+.azalea
 	landmarktotext SLOWPOKE_WELL, MEM_BUFFER_1
 	jump MomPhoneLandmark
-.goldenrod ; 0xbcf21
+.goldenrod
 	landmarktotext RADIO_TOWER, MEM_BUFFER_1
 	jump MomPhoneLandmark
 
-MomPhonePalette2: ; 0xbcf27
+MomPhonePalette2:
 	farwritetext MomOtherAreaText
 	buttonsound
 	jump MomSavingMoney
 
-MomPhoneOther: ; 0xbcf2f
+MomPhoneOther:
 	farwritetext MomDeterminedText
 	buttonsound
 	jump MomSavingMoney
 
-MomSavingMoney: ; 0xbcf37
+MomSavingMoney:
 	checkflag ENGINE_MOM_SAVING_MONEY
-	iffalse MomIsNotSaving
+	iffalse .NotSaving
 	checkmoney MOMS_MONEY, 0
-	if_equal HAVE_MORE, MomSavingHasMoney
-	jump MomSavingButBroke
+	ifequal HAVE_MORE, .SavingHasMoney
+	jump .SavingNoMoney
 
-MomIsNotSaving: ; 0xbcf49
+.NotSaving:
 	checkmoney MOMS_MONEY, 0
-	if_equal HAVE_MORE, MomHasMoney
-	jump MomHasNoMoney
+	ifequal HAVE_MORE, .HasMoney
+	jump .NoMoney
 
-MomSavingHasMoney: ; 0xbcf55
+.SavingHasMoney:
 	readmoney MOMS_MONEY, MEM_BUFFER_0
 	farwritetext MomCheckBalanceText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
 	jump MomPhoneWontSaveMoneyScript
 
-MomSavingButBroke: ; 0xbcf63
+.SavingNoMoney:
 	farwritetext MomImportantToSaveText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
 	jump MomPhoneWontSaveMoneyScript
 
-MomHasNoMoney: ; 0xbcf6e
+.NoMoney:
 	farwritetext MomYoureNotSavingText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
 	jump MomPhoneWontSaveMoneyScript
 
-MomHasMoney: ; 0xbcf79
+.HasMoney:
 	readmoney MOMS_MONEY, MEM_BUFFER_0
 	farwritetext MomYouveSavedText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
 	jump MomPhoneWontSaveMoneyScript
 
-MomPhoneSaveMoneyScript: ; 0xbcf87
+MomPhoneSaveMoneyScript:
 	setflag ENGINE_MOM_SAVING_MONEY
 	farwritetext MomOKIllSaveText
 	buttonsound
 	jump MomPhoneHangUpScript
 
-MomPhoneWontSaveMoneyScript: ; 0xbcf92
+MomPhoneWontSaveMoneyScript:
 	clearflag ENGINE_MOM_SAVING_MONEY
 	farwritetext MomPhoneWontSaveMoneyText
 	buttonsound
 	jump MomPhoneHangUpScript
 
-MomPhoneHangUpScript: ; 0xbcf9d
+MomPhoneHangUpScript:
 	farwritetext MomPhoneHangUpText
 	end
 
-MomPhoneNoPokemonScript: ; 0xbcfa2
+MomPhoneNoPokemonScript:
 	farwritetext MomPhoneNoPokemonText
 	end
 
-MomPhoneNoPokedexScript: ; 0xbcfa7
+MomPhoneNoPokedexScript:
 	farwritetext MomPhoneNoPokedexText
 	end
 
-MomPhoneNoGymQuestScript: ; 0xbcfac
+MomPhoneNoGymQuestScript:
 	farwritetext MomPhoneNoGymQuestText
 	end
 
-MomPhoneLectureScript: ; 0xbcfb1
+MomPhoneLectureScript:
 	setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
-	setflag ENGINE_DST
+	setflag ENGINE_MOM_ACTIVE
 	specialphonecall SPECIALCALL_NONE
 	farwritetext MomPhoneLectureText
 	yesorno
@@ -149,53 +149,53 @@ MomPhoneLectureScript: ; 0xbcfb1
 
 ; Bill
 
-BillPhoneScript1: ; 0xbcfc5
-	checkday
+BillPhoneScript1:
+	checktime DAY
 	iftrue .daygreet
-	checknite
+	checktime NITE
 	iftrue .nitegreet
 	farwritetext BillPhoneMornGreetingText
 	buttonsound
 	jump .main
 
-.daygreet ; 0xbcfd7
+.daygreet
 	farwritetext BillPhoneDayGreetingText
 	buttonsound
 	jump .main
 
-.nitegreet ; 0xbcfdf
+.nitegreet
 	farwritetext BillPhoneNiteGreetingText
 	buttonsound
 	jump .main
 
-.main ; 0xbcfe7
-	farwritetext BillPhoneGeneriText
+.main
+	farwritetext BillPhoneGenericText
 	buttonsound
 	checkcode VAR_BOXSPACE
 	vartomem MEM_BUFFER_0
-	if_equal 0, .full
-	if_less_than PARTY_LENGTH, .nearlyfull
+	ifequal 0, .full
+	ifless PARTY_LENGTH, .nearlyfull
 	farwritetext BillPhoneNotFullText
 	end
 
-.nearlyfull ; 0xbcffd
+.nearlyfull
 	farwritetext BillPhoneNearlyFullText
 	end
 
-.full ; 0xbd002
+.full
 	farwritetext BillPhoneFullText
 	end
 
-BillPhoneScript2: ; 0xbd007
+BillPhoneScript2:
 	farwritetext BillPhoneNewlyFullText
 	waitbutton
 	end
 
 ; Elm
 
-ElmPhoneScript1: ; 0xbd00d
+ElmPhoneScript1:
 	checkcode VAR_SPECIALPHONECALL
-	if_equal SPECIALCALL_POKERUS, .pokerus
+	ifequal SPECIALCALL_POKERUS, .pokerus
 	checkevent EVENT_SHOWED_TOGEPI_TO_ELM
 	iftrue .discovery
 	checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
@@ -216,85 +216,84 @@ ElmPhoneScript1: ; 0xbd00d
 	farwritetext ElmPhoneStartText
 	end
 
-.sawmrpokemon ; 0xbd048
+.sawmrpokemon
 	farwritetext ElmPhoneSawMrPokemonText
 	end
 
-.stolen ; 0xbd04d
+.stolen
 	farwritetext ElmPhonePokemonStolenText
 	end
 
-.checkingegg ; 0xbd052
+.checkingegg
 	farwritetext ElmPhoneCheckingEggText
 	end
 
-.assistant ; 0xbd057
+.assistant
 	farwritetext ElmPhoneAssistantText
 	end
 
-.eggunhatched ; 0xbd05c
+.eggunhatched
 	farwritetext ElmPhoneEggUnhatchedText
 	end
 
-.egghatched ; 0xbd061
+.egghatched
 	farwritetext ElmPhoneEggHatchedText
 	setevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
 	end
 
-.discovery ; 0xbd069
+.discovery
 	random 2
-	if_equal 0, .nextdiscovery
+	ifequal 0, .nextdiscovery
 	farwritetext ElmPhoneDiscovery1Text
 	end
 
-.nextdiscovery ; 0xbd074
+.nextdiscovery
 	farwritetext ElmPhoneDiscovery2Text
 	end
 
-.pokerus ; 0xbd079
+.pokerus
 	farwritetext ElmPhonePokerusText
 	specialphonecall SPECIALCALL_NONE
 	end
 
-ElmPhoneScript2: ; 0xbd081
+ElmPhoneScript2:
 	checkcode VAR_SPECIALPHONECALL
-	if_equal SPECIALCALL_ROBBED, .disaster
-	if_equal SPECIALCALL_ASSISTANT, .assistant
-	if_equal SPECIALCALL_WEIRDBROADCAST, .rocket
-	if_equal SPECIALCALL_SSTICKET, .gift
-	if_equal SPECIALCALL_MASTERBALL, .gift
+	ifequal SPECIALCALL_ROBBED, .disaster
+	ifequal SPECIALCALL_ASSISTANT, .assistant
+	ifequal SPECIALCALL_WEIRDBROADCAST, .rocket
+	ifequal SPECIALCALL_SSTICKET, .gift
+	ifequal SPECIALCALL_MASTERBALL, .gift
 	farwritetext ElmPhonePokerusText
 	specialphonecall SPECIALCALL_NONE
 	end
 
-.disaster ; 0xbd09f
+.disaster
 	farwritetext ElmPhoneDisasterText
 	specialphonecall SPECIALCALL_NONE
 	setevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
 	end
 
-.assistant ; 0xbd0aa
+.assistant
 	farwritetext ElmPhoneEggAssistantText
 	specialphonecall SPECIALCALL_NONE
 	clearevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
 	setevent EVENT_ELMS_AIDE_IN_LAB
 	end
 
-.rocket ; 0xbd0b8
+.rocket
 	farwritetext ElmPhoneRocketText
 	specialphonecall SPECIALCALL_NONE
 	end
 
-.gift ; 0xbd0c0
+.gift
 	farwritetext ElmPhoneGiftText
 	specialphonecall SPECIALCALL_NONE
 	end
 
-.unused ; 0xbd0c8
+.unused
 	farwritetext ElmPhoneUnusedText
 	specialphonecall SPECIALCALL_NONE
 	end
-; bd0d0
 
 ; Jack
 
@@ -306,8 +305,8 @@ JackPhoneScript1:
 	checkflag ENGINE_JACK_MONDAY_MORNING
 	iftrue .NotMonday
 	checkcode VAR_WEEKDAY
-	if_not_equal MONDAY, .NotMonday
-	checkmorn
+	ifnotequal MONDAY, .NotMonday
+	checktime MORN
 	iftrue JackMondayMorning
 
 .NotMonday:
@@ -321,17 +320,17 @@ JackPhoneScript2:
 	trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
-	if_equal 0, JackBattleTrivia
+	ifequal 0, JackBattleTrivia
 	checkflag ENGINE_JACK
 	iftrue .WaitingForBattle
 	checkflag ENGINE_JACK_MONDAY_MORNING
 	iftrue .WaitingForBattle
 	farscall PhoneScript_Random2
-	if_equal 0, JackWantsToBattle
+	ifequal 0, JackWantsToBattle
 
 .WaitingForBattle:
 	farscall PhoneScript_Random3
-	if_equal 0, JackFindsRare
+	ifequal 0, JackFindsRare
 	farjump Phone_GenericCall_Male
 
 JackMondayMorning:
@@ -367,7 +366,7 @@ BeverlyPhoneScript2:
 	checkflag ENGINE_BEVERLY_HAS_NUGGET
 	iftrue .HasNugget
 	farscall PhoneScript_Random4
-	if_equal 0, .FoundNugget
+	ifequal 0, .FoundNugget
 
 .HasNugget:
 	farjump Phone_GenericCall_Female
@@ -387,12 +386,12 @@ HueyPhoneScript1:
 	checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
 	iftrue .NotWednesday
 	checkcode VAR_WEEKDAY
-	if_not_equal WEDNESDAY, .NotWednesday
-	checknite
+	ifnotequal WEDNESDAY, .NotWednesday
+	checktime NITE
 	iftrue HueyWednesdayNight
 
 .NotWednesday:
-	special Special_RandomPhoneMon
+	special RandomPhoneMon
 	farjump UnknownScript_0xa0908
 
 .WantsBattle:
@@ -407,8 +406,8 @@ HueyPhoneScript2:
 	checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
 	iftrue .Flavor
 	farscall PhoneScript_Random3
-	if_equal 0, HueyWantsBattle
-	if_equal 1, HueyWantsBattle
+	ifequal 0, HueyWantsBattle
+	ifequal 1, HueyWantsBattle
 
 .Flavor:
 	farjump PhoneScript_MonFlavorText
@@ -431,8 +430,8 @@ GavenPhoneScript1:
 	checkflag ENGINE_GAVEN_THURSDAY_MORNING
 	iftrue .NotThursday
 	checkcode VAR_WEEKDAY
-	if_not_equal THURSDAY, .NotThursday
-	checkmorn
+	ifnotequal THURSDAY, .NotThursday
+	checktime MORN
 	iftrue GavenThursdayMorning
 
 .NotThursday:
@@ -450,11 +449,11 @@ GavenPhoneScript2:
 	checkflag ENGINE_GAVEN_THURSDAY_MORNING
 	iftrue .WaitingForBattle
 	farscall PhoneScript_Random2
-	if_equal 0, GavenWantsRematch
+	ifequal 0, GavenWantsRematch
 
 .WaitingForBattle:
 	farscall PhoneScript_Random3
-	if_equal 0, GavenFoundRare
+	ifequal 0, GavenFoundRare
 	farjump Phone_GenericCall_Male
 
 GavenThursdayMorning:
@@ -478,8 +477,8 @@ BethPhoneScript1:
 	checkflag ENGINE_BETH_FRIDAY_AFTERNOON
 	iftrue .NotFriday
 	checkcode VAR_WEEKDAY
-	if_not_equal FRIDAY, .NotFriday
-	checkday
+	ifnotequal FRIDAY, .NotFriday
+	checktime DAY
 	iftrue BethFridayAfternoon
 
 .NotFriday:
@@ -497,7 +496,7 @@ BethPhoneScript2:
 	checkflag ENGINE_BETH_FRIDAY_AFTERNOON
 	iftrue .Generic
 	farscall PhoneScript_Random2
-	if_equal 0, BethWantsBattle
+	ifequal 0, BethWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Female
@@ -522,8 +521,8 @@ JosePhoneScript1:
 	checkflag ENGINE_JOSE_HAS_STAR_PIECE
 	iftrue .HasItem
 	checkcode VAR_WEEKDAY
-	if_not_equal SATURDAY, .NotSaturday
-	checknite
+	ifnotequal SATURDAY, .NotSaturday
+	checktime NITE
 	iftrue JoseSaturdayNight
 
 .NotSaturday:
@@ -547,13 +546,13 @@ JosePhoneScript2:
 	checkflag ENGINE_JOSE_HAS_STAR_PIECE
 	iftrue .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, JoseWantsBattle
+	ifequal 0, JoseWantsBattle
 	farscall PhoneScript_Random3
-	if_equal 0, JoseHasStarPiece
+	ifequal 0, JoseHasStarPiece
 
 .Generic:
 	farscall PhoneScript_Random3
-	if_equal 0, JoseFoundRare
+	ifequal 0, JoseFoundRare
 	farjump Phone_GenericCall_Male
 
 JoseSaturdayNight:
@@ -582,8 +581,8 @@ ReenaPhoneScript1:
 	checkflag ENGINE_REENA_SUNDAY_MORNING
 	iftrue .NotSunday
 	checkcode VAR_WEEKDAY
-	if_not_equal SUNDAY, .NotSunday
-	checkmorn
+	ifnotequal SUNDAY, .NotSunday
+	checktime MORN
 	iftrue ReenaSundayMorning
 
 .NotSunday:
@@ -601,7 +600,7 @@ ReenaPhoneScript2:
 	checkflag ENGINE_REENA_SUNDAY_MORNING
 	iftrue .Generic
 	farscall PhoneScript_Random2
-	if_equal 0, ReenaWantsBattle
+	ifequal 0, ReenaWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Female
@@ -624,12 +623,12 @@ JoeyPhoneScript1:
 	checkflag ENGINE_JOEY_MONDAY_AFTERNOON
 	iftrue .NotMonday
 	checkcode VAR_WEEKDAY
-	if_not_equal MONDAY, .NotMonday
-	checkday
+	ifnotequal MONDAY, .NotMonday
+	checktime DAY
 	iftrue JoeyMondayAfternoon
 
 .NotMonday:
-	special Special_RandomPhoneMon
+	special RandomPhoneMon
 	farjump UnknownScript_0xa0930
 
 .WantsBattle:
@@ -644,8 +643,8 @@ JoeyPhoneScript2:
 	checkflag ENGINE_JOEY_MONDAY_AFTERNOON
 	iftrue .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, JoeyWantsBattle
-	if_equal 1, JoeyWantsBattle
+	ifequal 0, JoeyWantsBattle
+	ifequal 1, JoeyWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Male
@@ -663,38 +662,38 @@ JoeyWantsBattle:
 WadePhoneScript1:
 	trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
 	checkflag ENGINE_WADE
-	iftrue WadeWantsBattle
+	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_WADE_TUESDAY_NIGHT
 	iftrue .NotTuesday
 	checkflag ENGINE_WADE_HAS_ITEM
-	iftrue WadeHasItem
+	iftrue .HasItem
 	checkcode VAR_WEEKDAY
-	if_not_equal TUESDAY, .NotTuesday
-	checknite
+	ifnotequal TUESDAY, .NotTuesday
+	checktime NITE
 	iftrue WadeTuesdayNight
 
 .NotTuesday:
 	farscall PhoneScript_Random2
-	if_equal 0, .NoContest
+	ifequal 0, .NoContest
 	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue .NoContest
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, WadeContestToday
-	if_equal THURSDAY, WadeContestToday
-	if_equal SATURDAY, WadeContestToday
+	ifequal TUESDAY, .ContestToday
+	ifequal THURSDAY, .ContestToday
+	ifequal SATURDAY, .ContestToday
 
 .NoContest:
 	farjump UnknownScript_0xa0938
 
-WadeContestToday:
+.ContestToday:
 	farjump PhoneScript_BugCatchingContest
 
-WadeWantsBattle:
+.WantsBattle:
 	landmarktotext ROUTE_31, MEM_BUFFER_2
 	farjump UnknownScript_0xa0a50
 
-WadeHasItem:
+.HasItem:
 	landmarktotext ROUTE_31, MEM_BUFFER_2
 	farjump UnknownScript_0xa0ab5
 
@@ -702,13 +701,13 @@ WadePhoneScript2:
 	trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
-	if_equal 0, .NoContest
+	ifequal 0, .NoContest
 	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue .NoContest
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, Wade_ContestToday
-	if_equal THURSDAY, Wade_ContestToday
-	if_equal SATURDAY, Wade_ContestToday
+	ifequal TUESDAY, .ContestToday
+	ifequal THURSDAY, .ContestToday
+	ifequal SATURDAY, .ContestToday
 
 .NoContest:
 	checkflag ENGINE_WADE
@@ -718,18 +717,18 @@ WadePhoneScript2:
 	checkflag ENGINE_WADE_HAS_ITEM
 	iftrue .next
 	farscall PhoneScript_Random2
-	if_equal 0, WadeHasItem2
+	ifequal 0, WadeHasItem2
 	checkflag ENGINE_FLYPOINT_GOLDENROD
 	iffalse .next
 	farscall PhoneScript_Random2
-	if_equal 0, WadeWantsBattle2
+	ifequal 0, WadeWantsBattle2
 
 .next:
 	farscall PhoneScript_Random3
-	if_equal 0, WadeFoundRare
+	ifequal 0, WadeFoundRare
 	farjump Phone_GenericCall_Male
 
-Wade_ContestToday:
+.ContestToday:
 	farjump PhoneScript_BugCatchingContest
 
 WadeTuesdayNight:
@@ -751,10 +750,10 @@ WadeHasItem2:
 	clearevent EVENT_WADE_HAS_PRZCUREBERRY
 	clearevent EVENT_WADE_HAS_BITTER_BERRY
 	random 4
-	if_equal 0, .Berry
-	if_equal 1, .PsnCureBerry
-	if_equal 2, .PrzCureBerry
-	if_equal 3, .Bitterberry
+	ifequal 0, .Berry
+	ifequal 1, .PsnCureBerry
+	ifequal 2, .PrzCureBerry
+	ifequal 3, .Bitterberry
 
 .Berry:
 	setevent EVENT_WADE_HAS_BERRY
@@ -779,24 +778,24 @@ WadeHasItem2:
 RalphPhoneScript1:
 	trainertotext FISHER, RALPH1, MEM_BUFFER_0
 	checkflag ENGINE_RALPH
-	iftrue Ralph_Rematch
+	iftrue .Rematch
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_RALPH_WEDNESDAY_MORNING
-	iftrue Ralph_CheckSwarm
+	iftrue .CheckSwarm
 	checkcode VAR_WEEKDAY
-	if_not_equal WEDNESDAY, Ralph_CheckSwarm
-	checkmorn
+	ifnotequal WEDNESDAY, .CheckSwarm
+	checktime MORN
 	iftrue Ralph_WednesdayMorning
-Ralph_CheckSwarm:
-	checkflag ENGINE_SPECIAL_WILDDATA
-	iftrue Ralph_ReportSwarm
+.CheckSwarm:
+	checkflag ENGINE_FISH_SWARM
+	iftrue .ReportSwarm
 	farjump UnknownScript_0xa0940
 
-Ralph_Rematch:
+.Rematch:
 	landmarktotext ROUTE_32, MEM_BUFFER_2
 	farjump UnknownScript_0xa0a55
 
-Ralph_ReportSwarm:
+.ReportSwarm:
 	landmarktotext ROUTE_32, MEM_BUFFER_2
 	farjump UnknownScript_0xa0af5
 
@@ -804,16 +803,16 @@ RalphPhoneScript2:
 	trainertotext FISHER, RALPH1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	checkflag ENGINE_FLYPOINT_GOLDENROD
-	iffalse Ralph_CheckSwarm2
+	iffalse .CheckSwarm
 	checkflag ENGINE_RALPH
-	iftrue Ralph_CheckSwarm2
+	iftrue .CheckSwarm
 	checkflag ENGINE_RALPH_WEDNESDAY_MORNING
-	iftrue Ralph_CheckSwarm2
+	iftrue .CheckSwarm
 	farscall PhoneScript_Random2
-	if_equal 0, Ralph_FightMe
-Ralph_CheckSwarm2:
+	ifequal 0, Ralph_FightMe
+.CheckSwarm:
 	farscall PhoneScript_Random5
-	if_equal 0, Ralph_SetUpSwarm
+	ifequal 0, Ralph_SetUpSwarm
 	farjump Phone_GenericCall_Male
 
 Ralph_WednesdayMorning:
@@ -824,13 +823,13 @@ Ralph_FightMe:
 	farjump PhoneScript_WantsToBattle_Male
 
 Ralph_SetUpSwarm:
-	checkflag ENGINE_SPECIAL_WILDDATA
+	checkflag ENGINE_FISH_SWARM
 	iftrue .Generic
-	setflag ENGINE_SPECIAL_WILDDATA
+	setflag ENGINE_FISH_SWARM
 	pokenamemem QWILFISH, MEM_BUFFER_1
 	landmarktotext ROUTE_32, MEM_BUFFER_2
 	writebyte FISHSWARM_QWILFISH
-	special Special_ActivateFishingSwarm
+	special ActivateFishingSwarm
 	farjump UnknownScript_0xa05d6
 
 .Generic:
@@ -846,12 +845,12 @@ LizPhoneScript1:
 	checkflag ENGINE_LIZ_THURSDAY_AFTERNOON
 	iftrue .NotThursday
 	checkcode VAR_WEEKDAY
-	if_not_equal THURSDAY, .NotThursday
-	checkday
+	ifnotequal THURSDAY, .NotThursday
+	checktime DAY
 	iftrue LizThursdayAfternoon
 
 .NotThursday:
-	special Special_RandomPhoneMon
+	special RandomPhoneMon
 	farjump UnknownScript_0xa0948
 
 .WantsBattle:
@@ -861,7 +860,7 @@ LizPhoneScript1:
 LizPhoneScript2:
 	trainertotext PICNICKER, LIZ1, MEM_BUFFER_0
 	farscall PhoneScript_Random4
-	if_equal 0, LizWrongNumber
+	ifequal 0, LizWrongNumber
 	farscall PhoneScript_GreetPhone_Female
 	checkflag ENGINE_LIZ
 	iftrue .next
@@ -870,11 +869,11 @@ LizPhoneScript2:
 
 .next:
 	farscall PhoneScript_Random2
-	if_equal 0, LizGossip
+	ifequal 0, LizGossip
 	checkflag ENGINE_FLYPOINT_GOLDENROD
 	iffalse .Generic
 	farscall PhoneScript_Random2
-	if_equal 0, LizWantsBattle
+	ifequal 0, LizWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Female
@@ -892,15 +891,15 @@ LizWrongNumber:
 
 LizGossip:
 	random 9
-	if_equal 0, .CoolTrainerM
-	if_equal 1, .Beauty
-	if_equal 2, .Grunt
-	if_equal 3, .Teacher
-	if_equal 4, .SwimmerF
-	if_equal 5, .KimonoGirl
-	if_equal 6, .Skier
-	if_equal 7, .Medium
-	if_equal 8, .PokefanM
+	ifequal 0, .CoolTrainerM
+	ifequal 1, .Beauty
+	ifequal 2, .Grunt
+	ifequal 3, .Teacher
+	ifequal 4, .SwimmerF
+	ifequal 5, .KimonoGirl
+	ifequal 6, .Skier
+	ifequal 7, .Medium
+	ifequal 8, .PokefanM
 
 .CoolTrainerM:
 	trainerclassname COOLTRAINERM, NICK
@@ -951,8 +950,8 @@ AnthonyPhoneScript1:
 	checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
 	iftrue .NotFriday
 	checkcode VAR_WEEKDAY
-	if_not_equal FRIDAY, .NotFriday
-	checknite
+	ifnotequal FRIDAY, .NotFriday
+	checktime NITE
 	iftrue AnthonyFridayNight
 
 .NotFriday:
@@ -978,11 +977,11 @@ AnthonyPhoneScript2:
 	checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
 	iftrue .TriesSwarm
 	farscall PhoneScript_Random2
-	if_equal 0, AnthonyWantsBattle
+	ifequal 0, AnthonyWantsBattle
 
 .TriesSwarm:
 	farscall PhoneScript_Random5
-	if_equal 0, AnthonyTriesDunsparceSwarm
+	ifequal 0, AnthonyTriesDunsparceSwarm
 	farjump Phone_GenericCall_Male
 
 AnthonyFridayNight:
@@ -1015,8 +1014,8 @@ ToddPhoneScript1:
 	checkflag ENGINE_TODD_SATURDAY_MORNING
 	iftrue .NotSaturday
 	checkcode VAR_WEEKDAY
-	if_not_equal SATURDAY, .NotSaturday
-	checkmorn
+	ifnotequal SATURDAY, .NotSaturday
+	checktime MORN
 	iftrue ToddSaturdayMorning
 
 .NotSaturday:
@@ -1039,17 +1038,17 @@ ToddPhoneScript2:
 	checkflag ENGINE_TODD_SATURDAY_MORNING
 	iftrue .TryForSale
 	checkflag ENGINE_FLYPOINT_GOLDENROD
-	iffalse ToddNoGoldenrod
+	iffalse .NoGoldenrod
 	farscall PhoneScript_Random2
-	if_equal 0, ToddWantsBattle
+	ifequal 0, ToddWantsBattle
 
 .TryForSale:
 	farscall PhoneScript_Random2
-	if_equal 0, ToddDeptStoreSale
+	ifequal 0, ToddDeptStoreSale
 
-ToddNoGoldenrod:
+.NoGoldenrod:
 	farscall PhoneScript_Random3
-	if_equal 0, ToddFoundRare
+	ifequal 0, ToddFoundRare
 	farjump Phone_GenericCall_Male
 
 ToddSaturdayMorning:
@@ -1079,8 +1078,8 @@ GinaPhoneScript1:
 	checkflag ENGINE_GINA_HAS_LEAF_STONE
 	iftrue .HasLeafStone
 	checkcode VAR_WEEKDAY
-	if_not_equal SUNDAY, .NotSunday
-	checkday
+	ifnotequal SUNDAY, .NotSunday
+	checktime DAY
 	iftrue GinaSundayDay
 
 .NotSunday:
@@ -1113,15 +1112,15 @@ GinaPhoneScript2:
 	checkevent EVENT_GINA_GAVE_LEAF_STONE
 	iftrue .GaveLeafStone
 	farscall PhoneScript_Random2
-	if_equal 0, GinaHasLeafStone
+	ifequal 0, GinaHasLeafStone
 
 .GaveLeafStone:
 	farscall PhoneScript_Random11
-	if_equal 0, GinaHasLeafStone
+	ifequal 0, GinaHasLeafStone
 	checkflag ENGINE_FLYPOINT_GOLDENROD
 	iffalse .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, GinaWantsBattle
+	ifequal 0, GinaWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Female
@@ -1174,8 +1173,8 @@ ArniePhoneScript1:
 	checkflag ENGINE_ARNIE_TUESDAY_MORNING
 	iftrue .NotTuesday
 	checkcode VAR_WEEKDAY
-	if_not_equal TUESDAY, .NotTuesday
-	checkmorn
+	ifnotequal TUESDAY, .NotTuesday
+	checktime MORN
 	iftrue ArnieTuesdayMorning
 
 .NotTuesday:
@@ -1199,13 +1198,13 @@ ArniePhoneScript2:
 	checkflag ENGINE_ARNIE_TUESDAY_MORNING
 	iftrue .Swarm
 	farscall PhoneScript_Random2
-	if_equal 0, ArnieWantsBattle
+	ifequal 0, ArnieWantsBattle
 
 .Swarm:
 	farscall PhoneScript_Random5
-	if_equal 0, ArnieYanmaSwarm
+	ifequal 0, ArnieYanmaSwarm
 	farscall PhoneScript_Random3
-	if_equal 0, ArnieFoundRare
+	ifequal 0, ArnieFoundRare
 	farjump Phone_GenericCall_Male
 
 ArnieTuesdayMorning:
@@ -1243,8 +1242,8 @@ AlanPhoneScript1:
 	checkflag ENGINE_ALAN_HAS_FIRE_STONE
 	iftrue .FireStone
 	checkcode VAR_WEEKDAY
-	if_not_equal WEDNESDAY, .NotWednesday
-	checkday
+	ifnotequal WEDNESDAY, .NotWednesday
+	checktime DAY
 	iftrue AlanWednesdayDay
 
 .NotWednesday:
@@ -1262,23 +1261,23 @@ AlanPhoneScript2:
 	trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	checkflag ENGINE_ALAN
-	iftrue AlanGenericCall
+	iftrue .Generic
 	checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
-	iftrue AlanGenericCall
+	iftrue .Generic
 	checkflag ENGINE_ALAN_HAS_FIRE_STONE
-	iftrue AlanGenericCall
+	iftrue .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, AlanWantsBattle
+	ifequal 0, AlanWantsBattle
 	checkevent EVENT_ALAN_GAVE_FIRE_STONE
 	iftrue .FireStone
 	farscall PhoneScript_Random2
-	if_equal 0, AlanHasFireStone
+	ifequal 0, AlanHasFireStone
 
 .FireStone:
 	farscall PhoneScript_Random11
-	if_equal 0, AlanHasFireStone
+	ifequal 0, AlanHasFireStone
 
-AlanGenericCall:
+.Generic:
 	farjump Phone_GenericCall_Male
 
 AlanWednesdayDay:
@@ -1306,8 +1305,8 @@ DanaPhoneScript1:
 	checkflag ENGINE_DANA_HAS_THUNDERSTONE
 	iftrue .HasThunderstone
 	checkcode VAR_WEEKDAY
-	if_not_equal THURSDAY, .NotThursday
-	checknite
+	ifnotequal THURSDAY, .NotThursday
+	checktime NITE
 	iftrue DanaThursdayNight
 
 .NotThursday:
@@ -1331,19 +1330,19 @@ DanaPhoneScript2:
 	checkflag ENGINE_DANA_HAS_THUNDERSTONE
 	iftrue .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, DanaWantsBattle
+	ifequal 0, DanaWantsBattle
 	checkevent EVENT_DANA_GAVE_THUNDERSTONE
 	iftrue .Thunderstone
 	farscall PhoneScript_Random2
-	if_equal 0, DanaHasThunderstone
+	ifequal 0, DanaHasThunderstone
 
 .Thunderstone:
 	farscall PhoneScript_Random11
-	if_equal 0, DanaHasThunderstone
+	ifequal 0, DanaHasThunderstone
 
 .Generic:
 	farscall PhoneScript_Random3
-	if_equal 0, DanaFoundRare
+	ifequal 0, DanaFoundRare
 	farjump Phone_GenericCall_Female
 
 DanaThursdayNight:
@@ -1372,8 +1371,8 @@ ChadPhoneScript1:
 	checkflag ENGINE_CHAD_FRIDAY_MORNING
 	iftrue .NotFriday
 	checkcode VAR_WEEKDAY
-	if_not_equal FRIDAY, .NotFriday
-	checkmorn
+	ifnotequal FRIDAY, .NotFriday
+	checktime MORN
 	iftrue ChadFridayMorning
 
 .NotFriday:
@@ -1387,17 +1386,17 @@ ChadPhoneScript2:
 	trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
-	if_equal 0, ChadOakGossip
+	ifequal 0, ChadOakGossip
 	checkflag ENGINE_CHAD
 	iftrue .Generic
 	checkflag ENGINE_CHAD_FRIDAY_MORNING
 	iftrue .Generic
 	farscall PhoneScript_Random2
-	if_equal 0, ChadWantsBattle
+	ifequal 0, ChadWantsBattle
 
 .Generic:
 	farscall PhoneScript_Random3
-	if_equal 0, ChadFoundRare
+	ifequal 0, ChadFoundRare
 	farjump Phone_GenericCall_Male
 
 ChadFridayMorning:
@@ -1420,13 +1419,13 @@ DerekPhoneScript1:
 	checkflag ENGINE_DEREK_HAS_NUGGET
 	iftrue .Nugget
 	farscall PhoneScript_Random2
-	if_equal 0, .NoContest
+	ifequal 0, .NoContest
 	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue .NoContest
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .ContestToday
-	if_equal THURSDAY, .ContestToday
-	if_equal SATURDAY, .ContestToday
+	ifequal TUESDAY, .ContestToday
+	ifequal THURSDAY, .ContestToday
+	ifequal SATURDAY, .ContestToday
 
 .NoContest:
 	farjump UnknownScript_0xa0988
@@ -1442,17 +1441,17 @@ DerekPhoneScript2:
 	trainertotext POKEFANM, DEREK1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
-	if_equal 0, .NoContest
+	ifequal 0, .NoContest
 	checkflag ENGINE_DAILY_BUG_CONTEST
 	iftrue .NoContest
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .ContestToday
-	if_equal THURSDAY, .ContestToday
-	if_equal SATURDAY, .ContestToday
+	ifequal TUESDAY, .ContestToday
+	ifequal THURSDAY, .ContestToday
+	ifequal SATURDAY, .ContestToday
 
 .NoContest:
 	farscall PhoneScript_Random4
-	if_equal 0, .Nugget
+	ifequal 0, .Nugget
 	farjump Phone_GenericCall_Male
 
 .ContestToday:
@@ -1471,10 +1470,10 @@ TullyPhoneScript1:
 	checkflag ENGINE_TULLY_SUNDAY_NIGHT
 	iftrue .NotSunday
 	checkflag ENGINE_TULLY_HAS_WATER_STONE
-	iftrue TullyHasWaterStone
+	iftrue .WaterStone
 	checkcode VAR_WEEKDAY
-	if_not_equal SUNDAY, .NotSunday
-	checknite
+	ifnotequal SUNDAY, .NotSunday
+	checktime NITE
 	iftrue TullySundayNight
 
 .NotSunday:
@@ -1484,7 +1483,7 @@ TullyPhoneScript1:
 	landmarktotext ROUTE_42, MEM_BUFFER_2
 	farjump UnknownScript_0xa0a82
 
-TullyHasWaterStone:
+.WaterStone:
 	landmarktotext ROUTE_42, MEM_BUFFER_2
 	farjump UnknownScript_0xa0add
 
@@ -1498,15 +1497,15 @@ TullyPhoneScript2:
 	checkflag ENGINE_TULLY_HAS_WATER_STONE
 	iftrue .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, TullyWantsBattle
+	ifequal 0, TullyWantsBattle
 	checkevent EVENT_TULLY_GAVE_WATER_STONE
 	iftrue .WaterStone
 	farscall PhoneScript_Random2
-	if_equal 0, TullyFoundWaterStone
+	ifequal 0, TullyFoundWaterStone
 
 .WaterStone:
 	farscall PhoneScript_Random11
-	if_equal 0, TullyFoundWaterStone
+	ifequal 0, TullyFoundWaterStone
 
 .Generic:
 	farjump Phone_GenericCall_Male
@@ -1532,8 +1531,8 @@ BrentPhoneScript1:
 	checkflag ENGINE_BRENT_MONDAY_MORNING
 	iftrue .NotMonday
 	checkcode VAR_WEEKDAY
-	if_not_equal MONDAY, .NotMonday
-	checkmorn
+	ifnotequal MONDAY, .NotMonday
+	checktime MORN
 	iftrue BrentMondayMorning
 
 .NotMonday:
@@ -1547,13 +1546,13 @@ BrentPhoneScript2:
 	trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0
 	farscall PhoneScript_GreetPhone_Male
 	farscall PhoneScript_Random2
-	if_equal 0, BrentBillTrivia
+	ifequal 0, BrentBillTrivia
 	checkflag ENGINE_BRENT
 	iftrue .Generic
 	checkflag ENGINE_BRENT_MONDAY_MORNING
 	iftrue .Generic
 	farscall PhoneScript_Random2
-	if_equal 0, BrentWantsBattle
+	ifequal 0, BrentWantsBattle
 
 .Generic:
 	farjump Phone_GenericCall_Male
@@ -1579,8 +1578,8 @@ TiffanyPhoneScript1:
 	checkflag ENGINE_TIFFANY_HAS_PINK_BOW
 	iftrue .HasItem
 	checkcode VAR_WEEKDAY
-	if_not_equal TUESDAY, .NotTuesday
-	checkday
+	ifnotequal TUESDAY, .NotTuesday
+	checktime DAY
 	iftrue TiffanyTuesdayAfternoon
 
 .NotTuesday:
@@ -1597,26 +1596,26 @@ TiffanyPhoneScript1:
 TiffanyPhoneScript2:
 	trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0
 	farscall PhoneScript_Random4
-	if_equal 0, TiffanysFamilyMembers
+	ifequal 0, TiffanysFamilyMembers
 	farscall PhoneScript_GreetPhone_Female
 	checkflag ENGINE_TIFFANY
-	iftrue TiffanyGenericCall
+	iftrue .Generic
 	checkflag ENGINE_TIFFANY_TUESDAY_AFTERNOON
-	iftrue TiffanyGenericCall
+	iftrue .Generic
 	checkflag ENGINE_TIFFANY_HAS_PINK_BOW
-	iftrue TiffanyGenericCall
+	iftrue .Generic
 	farscall PhoneScript_Random3
-	if_equal 0, TiffanyWantsBattle
+	ifequal 0, TiffanyWantsBattle
 	checkevent EVENT_TIFFANY_GAVE_PINK_BOW
 	iftrue .PinkBow
 	farscall PhoneScript_Random2
-	if_equal 0, TiffanyHasPinkBow
+	ifequal 0, TiffanyHasPinkBow
 
 .PinkBow:
 	farscall PhoneScript_Random11
-	if_equal 0, TiffanyHasPinkBow
+	ifequal 0, TiffanyHasPinkBow
 
-TiffanyGenericCall:
+.Generic:
 	farjump Phone_GenericCall_Female
 
 TiffanyTuesdayAfternoon:
@@ -1629,38 +1628,38 @@ TiffanyWantsBattle:
 
 TiffanysFamilyMembers:
 	random 6
-	if_equal 0, .Grandma
-	if_equal 1, .Grandpa
-	if_equal 2, .Mom
-	if_equal 3, .Dad
-	if_equal 4, .Sister
-	if_equal 5, .Brother
+	ifequal 0, .Grandma
+	ifequal 1, .Grandpa
+	ifequal 2, .Mom
+	ifequal 3, .Dad
+	ifequal 4, .Sister
+	ifequal 5, .Brother
 
 .Grandma:
 	stringtotext GrandmaString, MEM_BUFFER_1
-	jump TiffanysPoorClefairy
+	jump .PoorClefairy
 
 .Grandpa:
 	stringtotext GrandpaString, MEM_BUFFER_1
-	jump TiffanysPoorClefairy
+	jump .PoorClefairy
 
 .Mom:
 	stringtotext MomString, MEM_BUFFER_1
-	jump TiffanysPoorClefairy
+	jump .PoorClefairy
 
 .Dad:
 	stringtotext DadString, MEM_BUFFER_1
-	jump TiffanysPoorClefairy
+	jump .PoorClefairy
 
 .Sister:
 	stringtotext SisterString, MEM_BUFFER_1
-	jump TiffanysPoorClefairy
+	jump .PoorClefairy
 
 .Brother:
 	stringtotext BrotherString, MEM_BUFFER_1
-	jump TiffanysPoorClefairy
+	jump .PoorClefairy
 
-TiffanysPoorClefairy:
+.PoorClefairy:
 	farjump TiffanyItsAwful
 
 TiffanyHasPinkBow:
@@ -1673,19 +1672,19 @@ TiffanyHasPinkBow:
 VancePhoneScript1:
 	trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0
 	checkflag ENGINE_VANCE
-	iftrue VanceWantsBattle
+	iftrue .WantsBattle
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_VANCE_WEDNESDAY_NIGHT
 	iftrue .NotWednesday
 	checkcode VAR_WEEKDAY
-	if_not_equal WEDNESDAY, .NotWednesday
-	checknite
+	ifnotequal WEDNESDAY, .NotWednesday
+	checktime NITE
 	iftrue VanceWednesdayNight
 
 .NotWednesday:
 	farjump VanceLookingForward
 
-VanceWantsBattle:
+.WantsBattle:
 	landmarktotext ROUTE_44, MEM_BUFFER_2
 	farjump VanceHurryHurry
 
@@ -1697,8 +1696,8 @@ VancePhoneScript2:
 	checkflag ENGINE_VANCE_WEDNESDAY_NIGHT
 	iftrue .WantsBattle
 	farscall PhoneScript_Random3
-	if_equal 0, VanceWantsRematch
-	if_equal 1, VanceWantsRematch
+	ifequal 0, VanceWantsRematch
+	ifequal 1, VanceWantsRematch
 
 .WantsBattle:
 	farjump Phone_GenericCall_Male
@@ -1721,8 +1720,8 @@ WiltonPhoneScript1:
 	checkflag ENGINE_WILTON_HAS_ITEM
 	iftrue .HasItem
 	checkcode VAR_WEEKDAY
-	if_not_equal THURSDAY, .NotThursday
-	checkmorn
+	ifnotequal THURSDAY, .NotThursday
+	checktime MORN
 	iftrue WiltonThursdayMorning
 
 .NotThursday:
@@ -1746,9 +1745,9 @@ WiltonPhoneScript2:
 	checkflag ENGINE_WILTON_HAS_ITEM
 	iftrue .GenericCall
 	farscall PhoneScript_Random2
-	if_equal 0, WiltonWantsBattle
+	ifequal 0, WiltonWantsBattle
 	farscall PhoneScript_Random2
-	if_equal 0, WiltonHasItem
+	ifequal 0, WiltonHasItem
 
 .GenericCall:
 	farjump Phone_GenericCall_Male
@@ -1768,9 +1767,9 @@ WiltonHasItem:
 	clearevent EVENT_WILTON_HAS_GREAT_BALL
 	clearevent EVENT_WILTON_HAS_POKE_BALL
 	random 5
-	if_equal 0, .UltraBall
+	ifequal 0, .UltraBall
 	random 3
-	if_equal 0, .GreatBall
+	ifequal 0, .GreatBall
 	jump .PokeBall
 
 .UltraBall:
@@ -1809,8 +1808,8 @@ ParryPhoneScript1:
 	checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
 	iftrue .WantsRematch
 	checkcode VAR_WEEKDAY
-	if_not_equal FRIDAY, .WantsRematch
-	checkday
+	ifnotequal FRIDAY, .WantsRematch
+	checktime DAY
 	iftrue ParryFridayDay
 
 .WantsRematch:
@@ -1828,8 +1827,8 @@ ParryPhoneScript2:
 	checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
 	iftrue .GenericCall
 	farscall PhoneScript_Random2
-	if_equal 0, ParryWantsBattle
-	if_equal 1, ParryWantsBattle
+	ifequal 0, ParryWantsBattle
+	ifequal 1, ParryWantsBattle
 
 .GenericCall:
 	farjump Phone_GenericCall_Male
@@ -1852,8 +1851,8 @@ ErinPhoneScript1:
 	checkflag ENGINE_ERIN_SATURDAY_NIGHT
 	iftrue .NotSaturday
 	checkcode VAR_WEEKDAY
-	if_not_equal SATURDAY, .NotSaturday
-	checknite
+	ifnotequal SATURDAY, .NotSaturday
+	checktime NITE
 	iftrue ErinSaturdayNight
 
 .NotSaturday:
@@ -1871,8 +1870,8 @@ ErinPhoneScript2:
 	checkflag ENGINE_ERIN_SATURDAY_NIGHT
 	iftrue .GenericCall
 	farscall PhoneScript_Random3
-	if_equal 0, ErinWantsBattle
-	if_equal 1, ErinWantsBattle
+	ifequal 0, ErinWantsBattle
+	ifequal 1, ErinWantsBattle
 
 .GenericCall:
 	farjump Phone_GenericCall_Female
diff --git a/engine/routines/phonering_copytilemapatonce.asm b/engine/phone/phonering_copytilemapatonce.asm
index b0d4ffa1e..41f92a5e3 100644
--- a/engine/routines/phonering_copytilemapatonce.asm
+++ b/engine/phone/phonering_copytilemapatonce.asm
@@ -1,4 +1,4 @@
-PhoneRing_CopyTilemapAtOnce: ; 4d188
+PhoneRing_CopyTilemapAtOnce:
 	ld a, [hCGB]
 	and a
 	jp z, WaitBGMap
@@ -41,7 +41,7 @@ PhoneRing_CopyTilemapAtOnce: ; 4d188
 	ld [hBGMapMode], a
 	ret
 
-.CopyTilemapAtOnce: ; 4d1cb
+.CopyTilemapAtOnce:
 	ld [hSPBuffer], sp
 	ld sp, hl
 	ld a, [hBGMapAddress + 1]
diff --git a/engine/pokedex/newpokedexentry.asm b/engine/pokedex/new_pokedex_entry.asm
index 365cf1b70..765f2f576 100644
--- a/engine/pokedex/newpokedexentry.asm
+++ b/engine/pokedex/new_pokedex_entry.asm
@@ -1,4 +1,4 @@
-NewPokedexEntry: ; fb877
+NewPokedexEntry:
 	ld a, [hMapAnims]
 	push af
 	xor a
@@ -32,9 +32,8 @@ NewPokedexEntry: ; fb877
 	pop af
 	ld [hMapAnims], a
 	ret
-; fb8c8
 
-.ReturnFromDexRegistration: ; fb8c8
+.ReturnFromDexRegistration:
 	call ClearTileMap
 	call LoadFontsExtra
 	call LoadStandardFont
@@ -49,4 +48,3 @@ NewPokedexEntry: ; fb877
 	call GetSGBLayout
 	call SetPalettes
 	ret
-; fb8f1
diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm
index 04b4a6472..787645823 100644
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -18,8 +18,7 @@
 POKEDEX_SCX EQU 5
 GLOBAL POKEDEX_SCX
 
-Pokedex: ; 40000
-
+Pokedex:
 	ld a, [hWX]
 	ld l, a
 	ld a, [hWY]
@@ -77,7 +76,7 @@ Pokedex: ; 40000
 	ld [hWY], a
 	ret
 
-InitPokedex: ; 40063
+InitPokedex:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -106,9 +105,9 @@ InitPokedex: ; 40063
 	call Pokedex_ResetBGMapMode
 	ret
 
-Pokedex_CheckUnlockedUnownMode: ; 400a2
+Pokedex_CheckUnlockedUnownMode:
 	ld a, [wStatusFlags]
-	bit 1, a
+	bit STATUSFLAGS_UNOWN_DEX_F, a
 	jr nz, .unlocked
 
 	xor a
@@ -120,7 +119,7 @@ Pokedex_CheckUnlockedUnownMode: ; 400a2
 	ld [wUnlockedUnownMode], a
 	ret
 
-Pokedex_InitCursorPosition: ; 400b4
+Pokedex_InitCursorPosition:
 	ld hl, wPokedexOrder
 	ld a, [wPrevDexEntry]
 	and a
@@ -162,7 +161,7 @@ Pokedex_InitCursorPosition: ; 400b4
 .done
 	ret
 
-Pokedex_GetLandmark: ; 400ed
+Pokedex_GetLandmark:
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
@@ -182,13 +181,13 @@ Pokedex_GetLandmark: ; 400ed
 	ld [wDexCurrentLocation], a
 	ret
 
-Pokedex_RunJumptable: ; 4010b
+Pokedex_RunJumptable:
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call Pokedex_LoadPointer
 	jp hl
 
-.Jumptable: ; 40115 (10:4115)
+.Jumptable:
 ; entries correspond to DEXSTATE_* constants
 	dw Pokedex_InitMainScreen
 	dw Pokedex_UpdateMainScreen
@@ -205,17 +204,17 @@ Pokedex_RunJumptable: ; 4010b
 	dw Pokedex_UpdateUnownMode
 	dw Pokedex_Exit
 
-Pokedex_IncrementDexPointer: ; 40131 (10:4131)
+Pokedex_IncrementDexPointer:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 
-Pokedex_Exit: ; 40136 (10:4136)
+Pokedex_Exit:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
 
-Pokedex_InitMainScreen: ; 4013c (10:413c)
+Pokedex_InitMainScreen:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -263,7 +262,7 @@ Pokedex_InitMainScreen: ; 4013c (10:413c)
 	call Pokedex_IncrementDexPointer
 	ret
 
-Pokedex_UpdateMainScreen: ; 401ae (10:41ae)
+Pokedex_UpdateMainScreen:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -324,7 +323,7 @@ Pokedex_UpdateMainScreen: ; 401ae (10:41ae)
 	ld [wJumptableIndex], a
 	ret
 
-Pokedex_InitDexEntryScreen: ; 40217 (10:4217)
+Pokedex_InitDexEntryScreen:
 	call LowVolume
 	xor a ; page 1
 	ld [wPokedexStatus], a
@@ -350,7 +349,7 @@ Pokedex_InitDexEntryScreen: ; 40217 (10:4217)
 	call Pokedex_IncrementDexPointer
 	ret
 
-Pokedex_UpdateDexEntryScreen: ; 40258 (10:4258)
+Pokedex_UpdateDexEntryScreen:
 	ld de, DexEntryScreen_ArrowCursorData
 	call Pokedex_MoveArrowCursor
 	ld hl, hJoyPressed
@@ -384,7 +383,7 @@ Pokedex_UpdateDexEntryScreen: ; 40258 (10:4258)
 	ld [wJumptableIndex], a
 	ret
 
-Pokedex_Page: ; 40292
+Pokedex_Page:
 	ld a, [wPokedexStatus]
 	xor 1 ; toggle page
 	ld [wPokedexStatus], a
@@ -394,7 +393,7 @@ Pokedex_Page: ; 40292
 	call WaitBGMap
 	ret
 
-Pokedex_ReinitDexEntryScreen: ; 402aa (10:42aa)
+Pokedex_ReinitDexEntryScreen:
 ; Reinitialize the Pokédex entry screen after changing the selected mon.
 	call Pokedex_BlackOutBG
 	xor a ; page 1
@@ -420,21 +419,20 @@ Pokedex_ReinitDexEntryScreen: ; 402aa (10:42aa)
 	dec [hl]
 	ret
 
-DexEntryScreen_ArrowCursorData: ; 402e8
+DexEntryScreen_ArrowCursorData:
 	db D_RIGHT | D_LEFT, 4
 	dwcoord 1, 17  ; PAGE
 	dwcoord 6, 17  ; AREA
 	dwcoord 11, 17 ; CRY
 	dwcoord 15, 17 ; PRNT
 
-
-DexEntryScreen_MenuActionJumptable: ; 402f2
+DexEntryScreen_MenuActionJumptable:
 	dw Pokedex_Page
 	dw .Area
 	dw .Cry
 	dw .Print
 
-.Area: ; 402fa
+.Area:
 	call Pokedex_BlackOutBG
 	xor a
 	ld [hSCX], a
@@ -465,7 +463,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
 	call Pokedex_GetSGBLayout
 	ret
 
-.Cry: ; 40340
+.Cry:
 	call Pokedex_GetSelectedMon
 	ld a, [wd265]
 	call GetCryIndex
@@ -474,7 +472,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
 	call PlayCry
 	ret
 
-.Print: ; 4034f
+.Print:
 	call Pokedex_ApplyPrintPals
 	xor a
 	ld [hSCX], a
@@ -502,14 +500,14 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
 	call Pokedex_ApplyUsualPals
 	ret
 
-Pokedex_RedisplayDexEntry: ; 4038d
+Pokedex_RedisplayDexEntry:
 	call Pokedex_DrawDexEntryScreenBG
 	call Pokedex_GetSelectedMon
 	farcall DisplayDexEntry
 	call Pokedex_DrawFootprint
 	ret
 
-Pokedex_InitOptionScreen: ; 4039d (10:439d)
+Pokedex_InitOptionScreen:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -524,7 +522,7 @@ Pokedex_InitOptionScreen: ; 4039d (10:439d)
 	call Pokedex_IncrementDexPointer
 	ret
 
-Pokedex_UpdateOptionScreen: ; 403be (10:43be)
+Pokedex_UpdateOptionScreen:
 	ld a, [wUnlockedUnownMode]
 	and a
 	jr nz, .okay
@@ -556,37 +554,37 @@ Pokedex_UpdateOptionScreen: ; 403be (10:43be)
 	ld [wJumptableIndex], a
 	ret
 
-.NoUnownModeArrowCursorData: ; 403f3
+.NoUnownModeArrowCursorData:
 	db D_UP | D_DOWN, 3
 	dwcoord 2,  4 ; NEW
 	dwcoord 2,  6 ; OLD
 	dwcoord 2,  8 ; ABC
 
-.ArrowCursorData: ; 403fb
+.ArrowCursorData:
 	db D_UP | D_DOWN, 4
 	dwcoord 2,  4 ; NEW
 	dwcoord 2,  6 ; OLD
 	dwcoord 2,  8 ; ABC
 	dwcoord 2, 10 ; UNOWN
 
-.MenuActionJumptable: ; 40405 (10:4405)
+.MenuActionJumptable:
 	dw .MenuAction_NewMode
 	dw .MenuAction_OldMode
 	dw .MenuAction_ABCMode
 	dw .MenuAction_UnownMode
 
-.MenuAction_NewMode: ; 4040d (10:440d)
+.MenuAction_NewMode:
 	ld b, DEXMODE_NEW
 	jr .ChangeMode
 
-.MenuAction_OldMode: ; 40411 (10:4411)
+.MenuAction_OldMode:
 	ld b, DEXMODE_OLD
 	jr .ChangeMode
 
-.MenuAction_ABCMode: ; 40415 (10:4415)
+.MenuAction_ABCMode:
 	ld b, DEXMODE_ABC
 
-.ChangeMode: ; 40417 (10:4417)
+.ChangeMode:
 	ld a, [wCurrentDexMode]
 	cp b
 	jr z, .skip_changing_mode ; Skip if new mode is same as current.
@@ -606,13 +604,13 @@ Pokedex_UpdateOptionScreen: ; 403be (10:43be)
 	ld [wJumptableIndex], a
 	ret
 
-.MenuAction_UnownMode: ; 4043a (10:443a)
+.MenuAction_UnownMode:
 	call Pokedex_BlackOutBG
 	ld a, DEXSTATE_UNOWN_MODE
 	ld [wJumptableIndex], a
 	ret
 
-Pokedex_InitSearchScreen: ; 40443 (10:4443)
+Pokedex_InitSearchScreen:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -632,7 +630,7 @@ Pokedex_InitSearchScreen: ; 40443 (10:4443)
 	call Pokedex_IncrementDexPointer
 	ret
 
-Pokedex_UpdateSearchScreen: ; 40471 (10:4471)
+Pokedex_UpdateSearchScreen:
 	ld de, .ArrowCursorData
 	call Pokedex_MoveArrowCursor
 	call Pokedex_UpdateSearchMonType
@@ -658,25 +656,25 @@ Pokedex_UpdateSearchScreen: ; 40471 (10:4471)
 	ld [wJumptableIndex], a
 	ret
 
-.ArrowCursorData: ; 4049e
+.ArrowCursorData:
 	db D_UP | D_DOWN, 4
 	dwcoord 2, 4  ; TYPE 1
 	dwcoord 2, 6  ; TYPE 2
 	dwcoord 2, 13 ; BEGIN SEARCH
 	dwcoord 2, 15 ; CANCEL
 
-.MenuActionJumptable: ; 404a8
+.MenuActionJumptable:
 	dw .MenuAction_MonSearchType
 	dw .MenuAction_MonSearchType
 	dw .MenuAction_BeginSearch
 	dw .MenuAction_Cancel
 
-.MenuAction_MonSearchType: ; 404b0
+.MenuAction_MonSearchType:
 	call Pokedex_NextSearchMonType
 	call Pokedex_PlaceSearchScreenTypeStrings
 	ret
 
-.MenuAction_BeginSearch: ; 404b7
+.MenuAction_BeginSearch:
 	call Pokedex_SearchForMons
 	farcall AnimateDexSearchSlowpoke
 	ld a, [wDexSearchResultCount]
@@ -710,13 +708,13 @@ Pokedex_UpdateSearchScreen: ; 40471 (10:4471)
 	ld [wJumptableIndex], a
 	ret
 
-.MenuAction_Cancel: ; 40501
+.MenuAction_Cancel:
 	call Pokedex_BlackOutBG
 	ld a, DEXSTATE_MAIN_SCR
 	ld [wJumptableIndex], a
 	ret
 
-Pokedex_InitSearchResultsScreen: ; 4050a (10:450a)
+Pokedex_InitSearchResultsScreen:
 	xor a
 	ld [hBGMapMode], a
 	xor a
@@ -751,7 +749,7 @@ Pokedex_InitSearchResultsScreen: ; 4050a (10:450a)
 	call Pokedex_IncrementDexPointer
 	ret
 
-Pokedex_UpdateSearchResultsScreen: ; 40562 (10:4562)
+Pokedex_UpdateSearchResultsScreen:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -797,7 +795,7 @@ Pokedex_UpdateSearchResultsScreen: ; 40562 (10:4562)
 	ld [hWX], a
 	ret
 
-Pokedex_InitUnownMode: ; 405bd (10:45bd)
+Pokedex_InitUnownMode:
 	call Pokedex_LoadUnownFont
 	call Pokedex_DrawUnownModeBG
 	xor a
@@ -811,7 +809,7 @@ Pokedex_InitUnownMode: ; 405bd (10:45bd)
 	call Pokedex_IncrementDexPointer
 	ret
 
-Pokedex_UpdateUnownMode: ; 405df (10:45df)
+Pokedex_UpdateUnownMode:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and A_BUTTON | B_BUTTON
@@ -838,7 +836,7 @@ Pokedex_UpdateUnownMode: ; 405df (10:45df)
 .done
 	ret
 
-Pokedex_UnownModeHandleDPadInput: ; 40610 (10:4610)
+Pokedex_UnownModeHandleDPadInput:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_RIGHT
@@ -883,15 +881,15 @@ Pokedex_UnownModeHandleDPadInput: ; 40610 (10:4610)
 	call DelayFrame
 	ret
 
-Pokedex_UnownModeEraseCursor: ; 40654 (10:4654)
+Pokedex_UnownModeEraseCursor:
 	ld c, " "
 	jr Pokedex_UnownModeUpdateCursorGfx
 
-Pokedex_UnownModePlaceCursor: ; 40658 (10:4658)
+Pokedex_UnownModePlaceCursor:
 	ld a, [wDexCurrentUnownIndex]
 	ld c, $5a ; diamond cursor
 
-Pokedex_UnownModeUpdateCursorGfx: ; 4065d (10:465d)
+Pokedex_UnownModeUpdateCursorGfx:
 	ld e, a
 	ld d, 0
 	ld hl, UnownModeLetterAndCursorCoords + 2
@@ -904,7 +902,7 @@ endr
 	ld [hl], c
 	ret
 
-Pokedex_NextOrPreviousDexEntry: ; 4066c (10:466c)
+Pokedex_NextOrPreviousDexEntry:
 	ld a, [wDexListingCursor]
 	ld [wBackupDexListingCursor], a
 	ld a, [wDexListingScrollOffset]
@@ -955,7 +953,7 @@ Pokedex_NextOrPreviousDexEntry: ; 4066c (10:466c)
 	and a
 	ret
 
-Pokedex_ListingHandleDPadInput: ; 406c5 (10:46c5)
+Pokedex_ListingHandleDPadInput:
 ; Handles D-pad input for a list of Pokémon.
 	ld a, [wDexListingHeight]
 	ld d, a
@@ -979,7 +977,7 @@ Pokedex_ListingHandleDPadInput: ; 406c5 (10:46c5)
 	jr nz, Pokedex_ListingMoveDownOnePage
 	jr Pokedex_ListingPosStayedSame
 
-Pokedex_ListingMoveCursorUp: ; 406ea (10:46ea)
+Pokedex_ListingMoveCursorUp:
 	ld hl, wDexListingCursor
 	ld a, [hl]
 	and a
@@ -994,7 +992,7 @@ Pokedex_ListingMoveCursorUp: ; 406ea (10:46ea)
 	dec [hl]
 	jr Pokedex_ListingPosChanged
 
-Pokedex_ListingMoveCursorDown: ; 406fe (10:46fe)
+Pokedex_ListingMoveCursorDown:
 	ld hl, wDexListingCursor
 	ld a, [hl]
 	inc a
@@ -1012,7 +1010,7 @@ Pokedex_ListingMoveCursorDown: ; 406fe (10:46fe)
 	inc [hl]
 	jr Pokedex_ListingPosChanged
 
-Pokedex_ListingMoveUpOnePage: ; 40716 (10:4716)
+Pokedex_ListingMoveUpOnePage:
 	ld hl, wDexListingScrollOffset
 	ld a, [hl]
 	and a
@@ -1028,7 +1026,7 @@ Pokedex_ListingMoveUpOnePage: ; 40716 (10:4716)
 	ld [hl], a
 	jr Pokedex_ListingPosChanged
 
-Pokedex_ListingMoveDownOnePage: ; 40728 (10:4728)
+Pokedex_ListingMoveDownOnePage:
 ; When moving down a page, the return value always report a change in position.
 	ld hl, wDexListingScrollOffset
 	ld a, d
@@ -1048,15 +1046,15 @@ Pokedex_ListingMoveDownOnePage: ; 40728 (10:4728)
 	ld [hl], a
 	jr Pokedex_ListingPosChanged
 
-Pokedex_ListingPosStayedSame: ; 4073d (10:473d)
+Pokedex_ListingPosStayedSame:
 	and a
 	ret
 
-Pokedex_ListingPosChanged: ; 4073f (10:473f)
+Pokedex_ListingPosChanged:
 	scf
 	ret
 
-Pokedex_FillColumn: ; 40741
+Pokedex_FillColumn:
 ; Fills a column starting at HL, going downwards.
 ; B is the height of the column and A is the tile it's filled with.
 	push de
@@ -1069,8 +1067,7 @@ Pokedex_FillColumn: ; 40741
 	pop de
 	ret
 
-
-Pokedex_DrawMainScreenBG: ; 4074c (10:474c)
+Pokedex_DrawMainScreenBG:
 ; Draws the left sidebar and the bottom bar on the main screen.
 	hlcoord 0, 17
 	ld de, String_START_SEARCH
@@ -1127,17 +1124,17 @@ Pokedex_DrawMainScreenBG: ; 4074c (10:474c)
 	call Pokedex_PlaceFrontpicTopLeftCorner
 	ret
 
-String_SEEN: ; 407e1
+String_SEEN:
 	db "SEEN", -1
-String_OWN: ; 407e6
+String_OWN:
 	db "OWN", -1
-String_SELECT_OPTION: ; 407ea
+String_SELECT_OPTION:
 	db $3b, $48, $49, $4a, $44, $45, $46, $47 ; SELECT > OPTION
 	; fallthrough
-String_START_SEARCH: ; 407f2
+String_START_SEARCH:
 	db $3c, $3b, $41, $42, $43, $4b, $4c, $4d, $4e, $3c, -1 ; START > SEARCH
 
-Pokedex_DrawDexEntryScreenBG: ; 407fd
+Pokedex_DrawDexEntryScreenBG:
 	call Pokedex_FillBackgroundColor2
 	hlcoord 0, 0
 	lb bc, 15, 18
@@ -1169,16 +1166,16 @@ Pokedex_DrawDexEntryScreenBG: ; 407fd
 	call Pokedex_PlaceFrontpicTopLeftCorner
 	ret
 
-.Unused: ; 4084f
+.Unused:
 	db $5c, $5d, -1 ; No.
-.Height: ; 40852
+.Height:
 	db "HT  ?", $5e, "??", $5f, -1 ; HT  ?'??"
-.Weight: ; 4085c
+.Weight:
 	db "WT   ???lb", -1 ; WT   ???lb
-.MenuItems: ; 40867
+.MenuItems:
 	db $3b, " PAGE AREA CRY PRNT", -1
 
-Pokedex_DrawOptionScreenBG: ; 4087c (10:487c)
+Pokedex_DrawOptionScreenBG:
 	call Pokedex_FillBackgroundColor2
 	hlcoord 0, 2
 	lb bc, 8, 18
@@ -1200,19 +1197,19 @@ Pokedex_DrawOptionScreenBG: ; 4087c (10:487c)
 	call PlaceString
 	ret
 
-.Title: ; 408b2
+.Title:
 	db $3b, " OPTION ", $3c, -1
 
-.Modes: ; 408bd
+.Modes:
 	db   "NEW #DEX MODE"
 	next "OLD #DEX MODE"
 	next "A to Z MODE"
 	db "@"
 
-.UnownMode: ; 408e5
+.UnownMode:
 	db "UNOWN MODE@"
 
-Pokedex_DrawSearchScreenBG: ; 408f0 (10:48f0)
+Pokedex_DrawSearchScreenBG:
 	call Pokedex_FillBackgroundColor2
 	hlcoord 0, 2
 	lb bc, 14, 18
@@ -1234,23 +1231,23 @@ Pokedex_DrawSearchScreenBG: ; 408f0 (10:48f0)
 	call PlaceString
 	ret
 
-.Title: ; 4092a
+.Title:
 	db $3b, " SEARCH ", $3c, -1
 
-.TypeLeftRightArrows: ; 40935
+.TypeLeftRightArrows:
 	db $3d, "        ", $3e, -1
 
-.Types: ; 40940
+.Types:
 	db   "TYPE1"
 	next "TYPE2"
 	db   "@"
 
-.Menu: ; 4094c
+.Menu:
 	db   "BEGIN SEARCH!!"
 	next "CANCEL"
 	db   "@"
 
-Pokedex_DrawSearchResultsScreenBG: ; 40962 (10:4962)
+Pokedex_DrawSearchResultsScreenBG:
 	call Pokedex_FillBackgroundColor2
 	hlcoord 0, 0
 	lb bc, 7, 7
@@ -1280,13 +1277,13 @@ Pokedex_DrawSearchResultsScreenBG: ; 40962 (10:4962)
 	call Pokedex_PlaceFrontpicTopLeftCorner
 	ret
 
-.BottomWindowText: ; 409ae
+.BottomWindowText:
 	db   "SEARCH RESULTS"
 	next "  TYPE"
 	next "    FOUND!"
 	db   "@"
 
-Pokedex_PlaceSearchResultsTypeStrings: ; 409cf (10:49cf)
+Pokedex_PlaceSearchResultsTypeStrings:
 	ld a, [wDexSearchMonType1]
 	hlcoord 0, 14
 	call Pokedex_PlaceTypeString
@@ -1304,7 +1301,7 @@ Pokedex_PlaceSearchResultsTypeStrings: ; 409cf (10:49cf)
 .done
 	ret
 
-Pokedex_DrawUnownModeBG: ; 409f1 (10:49f1)
+Pokedex_DrawUnownModeBG:
 	call Pokedex_FillBackgroundColor2
 	hlcoord 2, 1
 	lb bc, 10, 13
@@ -1320,7 +1317,7 @@ Pokedex_DrawUnownModeBG: ; 409f1 (10:49f1)
 	call Pokedex_PlaceFrontpicAtHL
 	ld de, 0
 	ld b, 0
-	ld c, 26
+	ld c, NUM_UNOWN
 .loop
 	ld hl, wUnownDex
 	add hl, de
@@ -1347,7 +1344,7 @@ endr
 	ld [wDexUnownCount], a
 	ret
 
-UnownModeLetterAndCursorCoords: ; 40a3e
+UnownModeLetterAndCursorCoords:
 ; entries correspond to Unown forms
 ;           letter, cursor
 	dwcoord   4,11,   3,11 ; A
@@ -1377,16 +1374,16 @@ UnownModeLetterAndCursorCoords: ; 40a3e
 	dwcoord  14, 9,  15, 9 ; Y
 	dwcoord  14,10,  15,10 ; Z
 
-Pokedex_FillBackgroundColor2: ; 40aa6
+Pokedex_FillBackgroundColor2:
 	hlcoord 0, 0
 	ld a, $32
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	ret
 
-Pokedex_PlaceFrontpicTopLeftCorner: ; 40ab2
+Pokedex_PlaceFrontpicTopLeftCorner:
 	hlcoord 1, 1
-Pokedex_PlaceFrontpicAtHL: ; 40ab5
+Pokedex_PlaceFrontpicAtHL:
 	xor a
 	ld b, $7
 .row
@@ -1407,7 +1404,7 @@ Pokedex_PlaceFrontpicAtHL: ; 40ab5
 	jr nz, .row
 	ret
 
-Pokedex_PlaceString: ; 40acd
+Pokedex_PlaceString:
 .loop
 	ld a, [de]
 	cp -1
@@ -1416,8 +1413,7 @@ Pokedex_PlaceString: ; 40acd
 	ld [hli], a
 	jr .loop
 
-
-Pokedex_PlaceBorder: ; 40ad5
+Pokedex_PlaceBorder:
 	push hl
 	ld a, $33
 	ld [hli], a
@@ -1449,7 +1445,7 @@ Pokedex_PlaceBorder: ; 40ad5
 	ld [hl], a
 	ret
 
-.FillRow: ; 40b06
+.FillRow:
 	ld e, c
 .row_loop
 	ld a, e
@@ -1460,8 +1456,7 @@ Pokedex_PlaceBorder: ; 40ad5
 	dec e
 	jr .row_loop
 
-
-Pokedex_PrintListing: ; 40b0f (10:4b0f)
+Pokedex_PrintListing:
 ; Prints the list of Pokémon on the main Pokédex screen.
 
 ; This check is completely useless.
@@ -1512,7 +1507,7 @@ Pokedex_PrintListing: ; 40b0f (10:4b0f)
 	call Pokedex_LoadSelectedMonTiles
 	ret
 
-.PrintEntry: ; 40b55 (10:4b55)
+.PrintEntry:
 ; Prints one entry in the list of Pokémon on the main Pokédex screen.
 	and a
 	ret z
@@ -1526,7 +1521,7 @@ Pokedex_PrintListing: ; 40b0f (10:4b0f)
 	call PlaceString
 	ret
 
-Pokedex_PrintNumberIfOldMode: ; 40b6a (10:4b6a)
+Pokedex_PrintNumberIfOldMode:
 	ld a, [wCurrentDexMode]
 	cp DEXMODE_OLD
 	jr z, .printnum
@@ -1542,7 +1537,7 @@ Pokedex_PrintNumberIfOldMode: ; 40b6a (10:4b6a)
 	pop hl
 	ret
 
-Pokedex_PlaceCaughtSymbolIfCaught: ; 40b82 (10:4b82)
+Pokedex_PlaceCaughtSymbolIfCaught:
 	call Pokedex_CheckCaught
 	jr nz, .place_caught_symbol
 	inc hl
@@ -1553,7 +1548,7 @@ Pokedex_PlaceCaughtSymbolIfCaught: ; 40b82 (10:4b82)
 	ld [hli], a
 	ret
 
-Pokedex_PlaceDefaultStringIfNotSeen: ; 40b8d (10:4b8d)
+Pokedex_PlaceDefaultStringIfNotSeen:
 	call Pokedex_CheckSeen
 	ret nz
 	inc hl
@@ -1562,10 +1557,10 @@ Pokedex_PlaceDefaultStringIfNotSeen: ; 40b8d (10:4b8d)
 	scf
 	ret
 
-.NameNotSeen: ; 40b9a
+.NameNotSeen:
 	db "-----@"
 
-Pokedex_DrawFootprint: ; 40ba0
+Pokedex_DrawFootprint:
 	hlcoord 18, 1
 	ld a, $62
 	ld [hli], a
@@ -1578,8 +1573,7 @@ Pokedex_DrawFootprint: ; 40ba0
 	ld [hl], a
 	ret
 
-
-Pokedex_GetSelectedMon: ; 40bb1
+Pokedex_GetSelectedMon:
 ; Gets the species of the currently selected Pokémon. This corresponds to the
 ; position of the cursor in the main listing, but this function can be used
 ; on all Pokédex screens.
@@ -1594,8 +1588,7 @@ Pokedex_GetSelectedMon: ; 40bb1
 	ld [wd265], a
 	ret
 
-
-Pokedex_CheckCaught: ; 40bc4 (10:4bc4)
+Pokedex_CheckCaught:
 	push de
 	push hl
 	ld a, [wd265]
@@ -1605,8 +1598,7 @@ Pokedex_CheckCaught: ; 40bc4 (10:4bc4)
 	pop de
 	ret
 
-
-Pokedex_CheckSeen: ; 40bd0
+Pokedex_CheckSeen:
 	push de
 	push hl
 	ld a, [wd265]
@@ -1616,9 +1608,7 @@ Pokedex_CheckSeen: ; 40bd0
 	pop de
 	ret
 
-
-
-Pokedex_OrderMonsByMode: ; 40bdc
+Pokedex_OrderMonsByMode:
 	ld hl, wPokedexOrder
 	ld bc, wPokedexOrderEnd - wPokedexOrder
 	xor a
@@ -1628,12 +1618,12 @@ Pokedex_OrderMonsByMode: ; 40bdc
 	call Pokedex_LoadPointer
 	jp hl
 
-.Jumptable: ; 40bf0 (10:4bf0)
+.Jumptable:
 	dw .NewMode
 	dw .OldMode
 	dw Pokedex_ABCMode
 
-.NewMode: ; 40bf6 (10:4bf6)
+.NewMode:
 	ld de, NewPokedexOrder
 	ld hl, wPokedexOrder
 	ld c, NUM_POKEMON
@@ -1646,7 +1636,7 @@ Pokedex_OrderMonsByMode: ; 40bdc
 	call .FindLastSeen
 	ret
 
-.OldMode: ; 40c08 (10:4c08)
+.OldMode:
 	ld hl, wPokedexOrder
 	ld a, $1
 	ld c, NUM_POKEMON
@@ -1658,7 +1648,7 @@ Pokedex_OrderMonsByMode: ; 40bdc
 	call .FindLastSeen
 	ret
 
-.FindLastSeen: ; 40c18 (10:4c18)
+.FindLastSeen:
 	ld hl, wPokedexOrder + NUM_POKEMON - 1
 	ld d, NUM_POKEMON
 	ld e, d
@@ -1675,7 +1665,7 @@ Pokedex_OrderMonsByMode: ; 40bdc
 	ld [wDexListingEnd], a
 	ret
 
-Pokedex_ABCMode: ; 40c30
+Pokedex_ABCMode:
 	xor a
 	ld [wDexListingEnd], a
 	ld hl, wPokedexOrder
@@ -1711,13 +1701,11 @@ Pokedex_ABCMode: ; 40c30
 .doneabc
 	ret
 
-
 INCLUDE "data/pokemon/dex_order_alpha.asm"
 
 INCLUDE "data/pokemon/dex_order_new.asm"
 
-
-Pokedex_DisplayModeDescription: ; 40e5b
+Pokedex_DisplayModeDescription:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 12
@@ -1734,29 +1722,29 @@ Pokedex_DisplayModeDescription: ; 40e5b
 	ld [hBGMapMode], a
 	ret
 
-.Modes: ; 40e7d
+.Modes:
 	dw .NewMode
 	dw .OldMode
 	dw .ABCMode
 	dw .UnownMode
 
-.NewMode: ; 40e85
+.NewMode:
 	db   "<PK><MN> are listed by"
 	next "evolution type.@"
 
-.OldMode: ; 40ea6
+.OldMode:
 	db   "<PK><MN> are listed by"
 	next "official type.@"
 
-.ABCMode: ; 40ec6
+.ABCMode:
 	db   "<PK><MN> are listed"
 	next "alphabetically.@"
 
-.UnownMode: ; 40ee4
+.UnownMode:
 	db   "UNOWN are listed"
 	next "in catching order.@"
 
-Pokedex_DisplayChangingModesMessage: ; 40f08 (10:4f08)
+Pokedex_DisplayChangingModesMessage:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 12
@@ -1775,11 +1763,11 @@ Pokedex_DisplayChangingModesMessage: ; 40f08 (10:4f08)
 	call DelayFrames
 	ret
 
-String_ChangingModesPleaseWait: ; 40f32
+String_ChangingModesPleaseWait:
 	db   "Changing modes."
 	next "Please wait.@"
 
-Pokedex_UpdateSearchMonType: ; 40f4f (10:4f4f)
+Pokedex_UpdateSearchMonType:
 	ld a, [wDexArrowCursorPosIndex]
 	cp 2
 	jr nc, .no_change
@@ -1794,7 +1782,7 @@ Pokedex_UpdateSearchMonType: ; 40f4f (10:4f4f)
 	and a
 	ret
 
-Pokedex_PrevSearchMonType: ; 40f65
+Pokedex_PrevSearchMonType:
 	ld a, [wDexArrowCursorPosIndex]
 	and a
 	jr nz, .type2
@@ -1821,7 +1809,7 @@ Pokedex_PrevSearchMonType: ; 40f65
 	scf
 	ret
 
-Pokedex_NextSearchMonType: ; 40f84
+Pokedex_NextSearchMonType:
 	ld a, [wDexArrowCursorPosIndex]
 	and a
 	jr nz, .type2
@@ -1850,7 +1838,7 @@ Pokedex_NextSearchMonType: ; 40f84
 	scf
 	ret
 
-Pokedex_PlaceSearchScreenTypeStrings: ; 40fa8 (10:4fa8)
+Pokedex_PlaceSearchScreenTypeStrings:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 9, 3
@@ -1867,7 +1855,7 @@ Pokedex_PlaceSearchScreenTypeStrings: ; 40fa8 (10:4fa8)
 	ld [hBGMapMode], a
 	ret
 
-Pokedex_PlaceTypeString: ; 40fcd (10:4fcd)
+Pokedex_PlaceTypeString:
 	push hl
 	ld e, a
 	ld d, 0
@@ -1883,7 +1871,7 @@ endr
 
 INCLUDE "data/types/search_strings.asm"
 
-Pokedex_SearchForMons: ; 41086
+Pokedex_SearchForMons:
 	ld a, [wDexSearchMonType2]
 	and a
 	call nz, .Search
@@ -1892,7 +1880,7 @@ Pokedex_SearchForMons: ; 41086
 	call nz, .Search
 	ret
 
-.Search: ; 41095
+.Search:
 	dec a
 	ld e, a
 	ld d, 0
@@ -1960,7 +1948,7 @@ Pokedex_SearchForMons: ; 41086
 
 INCLUDE "data/types/search_types.asm"
 
-Pokedex_DisplayTypeNotFoundMessage: ; 41107
+Pokedex_DisplayTypeNotFoundMessage:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 12
@@ -1975,11 +1963,11 @@ Pokedex_DisplayTypeNotFoundMessage: ; 41107
 	call DelayFrames
 	ret
 
-.TypeNotFound: ; 41126
+.TypeNotFound:
 	db   "The specified type"
 	next "was not found.@"
 
-Pokedex_UpdateCursorOAM: ; 41148 (10:5148)
+Pokedex_UpdateCursorOAM:
 	ld a, [wCurrentDexMode]
 	cp DEXMODE_OLD
 	jp z, Pokedex_PutOldModeCursorOAM
@@ -1987,7 +1975,7 @@ Pokedex_UpdateCursorOAM: ; 41148 (10:5148)
 	call Pokedex_PutScrollbarOAM
 	ret
 
-Pokedex_PutOldModeCursorOAM: ; 41157 (10:5157)
+Pokedex_PutOldModeCursorOAM:
 	ld hl, .CursorOAM
 	ld a, [wDexListingCursor]
 	or a
@@ -1997,7 +1985,7 @@ Pokedex_PutOldModeCursorOAM: ; 41157 (10:5157)
 	call Pokedex_LoadCursorOAM
 	ret
 
-.CursorOAM: ; 41167
+.CursorOAM:
 	dsprite  3,  0,  9, -1, $30, 7
 	dsprite  2,  0,  9, -1, $31, 7
 	dsprite  2,  0, 10, -1, $32, 7
@@ -2024,7 +2012,7 @@ Pokedex_PutOldModeCursorOAM: ; 41157 (10:5157)
 	dsprite  4,  0, 20, -2, $30, 7 | X_FLIP | Y_FLIP
 	db -1
 
-.CursorAtTopOAM: ; 411c8
+.CursorAtTopOAM:
 ; OAM data for when the cursor is at the top of the list. The tiles at the top
 ; are cut off so they don't show up outside the list area.
 	dsprite  3,  0,  9, -1, $30, 7
@@ -2053,12 +2041,12 @@ Pokedex_PutOldModeCursorOAM: ; 41157 (10:5157)
 	dsprite  4,  0, 20, -2, $30, 7 | X_FLIP | Y_FLIP
 	db -1
 
-Pokedex_PutNewModeABCModeCursorOAM: ; 41229 (10:5229)
+Pokedex_PutNewModeABCModeCursorOAM:
 	ld hl, .CursorOAM
 	call Pokedex_LoadCursorOAM
 	ret
 
-.CursorOAM: ; 41230
+.CursorOAM:
 	dsprite  3,  3,  9, -1, $30, 7
 	dsprite  2,  3,  9, -1, $31, 7
 	dsprite  2,  3, 10, -1, $32, 7
@@ -2081,7 +2069,7 @@ Pokedex_PutNewModeABCModeCursorOAM: ; 41229 (10:5229)
 	dsprite  4,  3, 19,  0, $30, 7 | X_FLIP | Y_FLIP
 	db -1
 
-Pokedex_UpdateSearchResultsCursorOAM: ; 41281 (10:5281)
+Pokedex_UpdateSearchResultsCursorOAM:
 	ld a, [wCurrentDexMode]
 	cp DEXMODE_OLD
 	jp z, Pokedex_PutOldModeCursorOAM
@@ -2089,7 +2077,7 @@ Pokedex_UpdateSearchResultsCursorOAM: ; 41281 (10:5281)
 	call Pokedex_LoadCursorOAM
 	ret
 
-.CursorOAM: ; 41290
+.CursorOAM:
 	dsprite  3,  3,  9, -1, $30, 7
 	dsprite  2,  3,  9, -1, $31, 7
 	dsprite  2,  3, 10, -1, $32, 7
@@ -2116,7 +2104,7 @@ Pokedex_UpdateSearchResultsCursorOAM: ; 41281 (10:5281)
 	dsprite  4,  3, 20, -2, $30, 7 | X_FLIP | Y_FLIP
 	db -1
 
-Pokedex_LoadCursorOAM: ; 412f1 (10:52f1)
+Pokedex_LoadCursorOAM:
 	ld de, wVirtualOAMSprite00
 .loop
 	ld a, [hl]
@@ -2140,7 +2128,7 @@ Pokedex_LoadCursorOAM: ; 412f1 (10:52f1)
 	inc de
 	jr .loop
 
-Pokedex_PutScrollbarOAM: ; 4130e (10:530e)
+Pokedex_PutScrollbarOAM:
 ; Writes the OAM data for the scrollbar in the new mode and ABC mode.
 	push de
 	ld a, [wDexListingEnd]
@@ -2186,14 +2174,14 @@ Pokedex_PutScrollbarOAM: ; 4130e (10:530e)
 	ld [hl], $0
 	ret
 
-Pokedex_InitArrowCursor: ; 4134f (10:534f)
+Pokedex_InitArrowCursor:
 	xor a
 	ld [wDexArrowCursorPosIndex], a
 	ld [wDexArrowCursorDelayCounter], a
 	ld [wDexArrowCursorBlinkCounter], a
 	ret
 
-Pokedex_MoveArrowCursor: ; 4135a (10:535a)
+Pokedex_MoveArrowCursor:
 ; bc = [de] - 1
 	ld a, [de]
 	ld b, a
@@ -2275,7 +2263,7 @@ Pokedex_MoveArrowCursor: ; 4135a (10:535a)
 	ld [wDexArrowCursorPosIndex], a
 	jr .update_cursor_pos
 
-Pokedex_GetArrowCursorPos: ; 413d4 (10:53d4)
+Pokedex_GetArrowCursorPos:
 	ld a, [wDexArrowCursorPosIndex]
 	add a
 	ld l, a
@@ -2286,7 +2274,7 @@ Pokedex_GetArrowCursorPos: ; 413d4 (10:53d4)
 	ld l, a
 	ret
 
-Pokedex_BlinkArrowCursor: ; 413e0 (10:53e0)
+Pokedex_BlinkArrowCursor:
 	ld hl, wDexArrowCursorBlinkCounter
 	ld a, [hl]
 	inc [hl]
@@ -2301,7 +2289,7 @@ Pokedex_BlinkArrowCursor: ; 413e0 (10:53e0)
 	ld [hl], "▶"
 	ret
 
-Pokedex_ArrowCursorDelay: ; 413f5 (10:53f5)
+Pokedex_ArrowCursorDelay:
 ; Updates the delay counter set when moving the arrow cursor.
 ; Returns whether the delay is active in carry.
 	ld hl, wDexArrowCursorDelayCounter
@@ -2313,10 +2301,10 @@ Pokedex_ArrowCursorDelay: ; 413f5 (10:53f5)
 	scf
 	ret
 
-Pokedex_FillBox: ; 413fe (10:53fe)
+Pokedex_FillBox:
 	jp FillBoxWithByte
 
-Pokedex_BlackOutBG: ; 41401 (10:5401)
+Pokedex_BlackOutBG:
 ; Make BG palettes black so that the BG becomes all black.
 	ld a, [rSVBK]
 	push af
@@ -2329,7 +2317,7 @@ Pokedex_BlackOutBG: ; 41401 (10:5401)
 	pop af
 	ld [rSVBK], a
 
-Pokedex_ApplyPrintPals: ; 41415
+Pokedex_ApplyPrintPals:
 	ld a, $ff
 	call DmgToCgbBGPals
 	ld a, $ff
@@ -2337,11 +2325,11 @@ Pokedex_ApplyPrintPals: ; 41415
 	call DelayFrame
 	ret
 
-Pokedex_GetSGBLayout: ; 41423
+Pokedex_GetSGBLayout:
 	ld b, a
 	call GetSGBLayout
 
-Pokedex_ApplyUsualPals: ; 41427
+Pokedex_ApplyUsualPals:
 ; This applies the palettes used for most Pokédex screens.
 	ld a, $e4
 	call DmgToCgbBGPals
@@ -2349,8 +2337,7 @@ Pokedex_ApplyUsualPals: ; 41427
 	call DmgToCgbObjPal0
 	ret
 
-
-Pokedex_LoadPointer: ; 41432
+Pokedex_LoadPointer:
 	ld e, a
 	ld d, 0
 	add hl, de
@@ -2360,7 +2347,7 @@ Pokedex_LoadPointer: ; 41432
 	ld l, a
 	ret
 
-Pokedex_LoadSelectedMonTiles: ; 4143b
+Pokedex_LoadSelectedMonTiles:
 ; Loads the tiles of the currently selected Pokémon.
 	call Pokedex_GetSelectedMon
 	call Pokedex_CheckSeen
@@ -2387,11 +2374,10 @@ Pokedex_LoadSelectedMonTiles: ; 4143b
 	call CloseSRAM
 	ret
 
-
-Pokedex_LoadCurrentFootprint: ; 41478 (10:5478)
+Pokedex_LoadCurrentFootprint:
 	call Pokedex_GetSelectedMon
 
-Pokedex_LoadAnyFootprint: ; 4147b
+Pokedex_LoadAnyFootprint:
 	ld a, [wd265]
 	dec a
 	and %11111000
@@ -2431,8 +2417,7 @@ Pokedex_LoadAnyFootprint: ; 4147b
 
 	ret
 
-
-Pokedex_LoadGFX: ; 414b7
+Pokedex_LoadGFX:
 	call DisableLCD
 	ld hl, vTiles2
 	ld bc, $31 tiles
@@ -2462,12 +2447,12 @@ Pokedex_LoadGFX: ; 414b7
 	call EnableLCD
 	ret
 
-Pokedex_LoadInvertedFont: ; 414fb
+Pokedex_LoadInvertedFont:
 	call LoadStandardFont
 	ld hl, vTiles1
 	ld bc, $80 tiles
 
-Pokedex_InvertTiles: ; 41504
+Pokedex_InvertTiles:
 .loop
 	ld a, [hl]
 	xor $ff
@@ -2478,13 +2463,13 @@ Pokedex_InvertTiles: ; 41504
 	jr nz, .loop
 	ret
 
-PokedexLZ: ; 4150e
+PokedexLZ:
 INCBIN "gfx/pokedex/pokedex.2bpp.lz"
 
-PokedexSlowpokeLZ: ; 416b0
+PokedexSlowpokeLZ:
 INCBIN "gfx/pokedex/slowpoke.2bpp.lz"
 
-Pokedex_CheckSGB: ; 41a24
+Pokedex_CheckSGB:
 	ld a, [hCGB]
 	or a
 	ret nz
@@ -2492,7 +2477,7 @@ Pokedex_CheckSGB: ; 41a24
 	dec a
 	ret
 
-Pokedex_LoadUnownFont: ; 41a2c
+Pokedex_LoadUnownFont:
 	ld a, BANK(sScratch)
 	call GetSRAMBank
 	ld hl, UnownFont
@@ -2501,16 +2486,16 @@ Pokedex_LoadUnownFont: ; 41a2c
 	ld a, BANK(UnownFont)
 	call FarCopyBytes
 	ld hl, sScratch + $188
-	ld bc, 27 tiles
+	ld bc, (NUM_UNOWN + 1) tiles
 	call Pokedex_InvertTiles
 	ld de, sScratch + $188
 	ld hl, vTiles2 tile $40
-	lb bc, BANK(Pokedex_LoadUnownFont), 27
+	lb bc, BANK(Pokedex_LoadUnownFont), NUM_UNOWN + 1
 	call Request2bpp
 	call CloseSRAM
 	ret
 
-Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58)
+Pokedex_LoadUnownFrontpicTiles:
 	ld a, [wUnownLetter]
 	push af
 	ld a, [wDexCurrentUnownIndex]
@@ -2529,7 +2514,7 @@ Pokedex_LoadUnownFrontpicTiles: ; 41a58 (10:5a58)
 	ld [wUnownLetter], a
 	ret
 
-_NewPokedexEntry: ; 41a7f
+_NewPokedexEntry:
 	xor a
 	ld [hBGMapMode], a
 	farcall DrawDexEntryScreenRightEdge
@@ -2561,22 +2546,21 @@ _NewPokedexEntry: ; 41a7f
 	call PlayMonCry
 	ret
 
-
-Pokedex_SetBGMapMode3: ; 41ad7 (10:5ad7)
+Pokedex_SetBGMapMode3:
 	ld a, $3
 	ld [hBGMapMode], a
 	ld c, 4
 	call DelayFrames
 	ret
 
-Pokedex_SetBGMapMode4: ; 41ae1 (10:5ae1)
+Pokedex_SetBGMapMode4:
 	ld a, $4
 	ld [hBGMapMode], a
 	ld c, 4
 	call DelayFrames
 	ret
 
-Pokedex_SetBGMapMode_3ifDMG_4ifCGB: ; 41aeb (10:5aeb)
+Pokedex_SetBGMapMode_3ifDMG_4ifCGB:
 	ld a, [hCGB]
 	and a
 	jr z, .DMG
@@ -2585,8 +2569,7 @@ Pokedex_SetBGMapMode_3ifDMG_4ifCGB: ; 41aeb (10:5aeb)
 	call Pokedex_SetBGMapMode3
 	ret
 
-
-Pokedex_ResetBGMapMode: ; 41af7
+Pokedex_ResetBGMapMode:
 	xor a
 	ld [hBGMapMode], a
 	ret
diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm
index a467fe02c..8105a080a 100644
--- a/engine/pokedex/pokedex_2.asm
+++ b/engine/pokedex/pokedex_2.asm
@@ -1,4 +1,4 @@
-AnimateDexSearchSlowpoke: ; 441cf
+AnimateDexSearchSlowpoke:
 	ld hl, .FrameIDs
 	ld b, 25
 .loop
@@ -29,7 +29,7 @@ AnimateDexSearchSlowpoke: ; 441cf
 	call DelayFrames
 	ret
 
-.FrameIDs: ; 441fc
+.FrameIDs:
 	; frame ID, duration
 	db 0, 7
 	db 1, 7
@@ -38,7 +38,7 @@ AnimateDexSearchSlowpoke: ; 441cf
 	db 4, 7
 	db -2
 
-DoDexSearchSlowpokeFrame: ; 44207
+DoDexSearchSlowpokeFrame:
 	ld a, [wDexSearchSlowpokeFrame]
 	ld hl, .SlowpokeSpriteData
 	ld de, wVirtualOAMSprite00
@@ -64,7 +64,7 @@ DoDexSearchSlowpokeFrame: ; 44207
 	inc de
 	jr .loop
 
-.SlowpokeSpriteData: ; 44228
+.SlowpokeSpriteData:
 	dsprite 11, 0,  9, 0, $00, 0
 	dsprite 11, 0, 10, 0, $01, 0
 	dsprite 11, 0, 11, 0, $02, 0
@@ -76,7 +76,7 @@ DoDexSearchSlowpokeFrame: ; 44207
 	dsprite 13, 0, 11, 0, $22, 0
 	db -1
 
-DisplayDexEntry: ; 4424d
+DisplayDexEntry:
 	call GetPokemonName
 	hlcoord 9, 3
 	call PlaceString ; mon species
@@ -211,10 +211,11 @@ DisplayDexEntry: ; 4424d
 	call FarString
 	ret
 
-String_44331: ; 44331
+UnreferencedPOKeString:
+; unused
 	db "#@"
 
-GetDexEntryPointer: ; 44333
+GetDexEntryPointer:
 ; return dex entry pointer b:de
 	push hl
 	ld hl, PokedexDataPointerTable
@@ -240,14 +241,14 @@ GetDexEntryPointer: ; 44333
 	pop hl
 	ret
 
-.PokedexEntryBanks: ; 44351
-	db BANK(PokedexEntries1)
-	db BANK(PokedexEntries2)
-	db BANK(PokedexEntries3)
-	db BANK(PokedexEntries4)
+.PokedexEntryBanks:
+	db BANK("Pokedex Entries 001-064")
+	db BANK("Pokedex Entries 065-128")
+	db BANK("Pokedex Entries 129-192")
+	db BANK("Pokedex Entries 193-251")
 
-GetDexEntryPagePointer: ; 44355
-	call GetDexEntryPointer ; b:de
+GetDexEntryPagePointer:
+	call GetDexEntryPointer
 	push hl
 	ld h, d
 	ld l, e
@@ -278,3 +279,5 @@ endr
 	ld e, l
 	pop hl
 	ret
+
+INCLUDE "data/pokemon/dex_entry_pointers.asm"
diff --git a/engine/pokedex/pokedex_3.asm b/engine/pokedex/pokedex_3.asm
index f5247f2da..d11c18fc6 100644
--- a/engine/pokedex/pokedex_3.asm
+++ b/engine/pokedex/pokedex_3.asm
@@ -1,29 +1,29 @@
-LoadSGBPokedexGFX: ; 1ddf1c
+LoadSGBPokedexGFX:
 	ld hl, SGBPokedexGFX_LZ
 	ld de, vTiles2 tile $31
 	call Decompress
 	ret
 
-LoadSGBPokedexGFX2: ; 1ddf26 (77:5f26)
+LoadSGBPokedexGFX2:
 	ld hl, SGBPokedexGFX_LZ
 	ld de, vTiles2 tile $31
 	lb bc, BANK(SGBPokedexGFX_LZ), 58
 	call DecompressRequest2bpp
 	ret
 
-SGBPokedexGFX_LZ: ; 1ddf33
+SGBPokedexGFX_LZ:
 INCBIN "gfx/pokedex/sgb.2bpp.lz"
 
-LoadQuestionMarkPic: ; 1de0d7
+LoadQuestionMarkPic:
 	ld hl, .QuestionMarkLZ
 	ld de, sScratch
 	call Decompress
 	ret
 
-.QuestionMarkLZ: ; 1de0e1
-INCBIN "gfx/pokemon/questionmark/front.2bpp.lz"
+.QuestionMarkLZ:
+INCBIN "gfx/pokedex/question_mark.2bpp.lz"
 
-DrawPokedexListWindow: ; 1de171 (77:6171)
+DrawPokedexListWindow:
 	ld a, $32
 	hlcoord 0, 17
 	ld bc, 12
@@ -68,7 +68,7 @@ DrawPokedexListWindow: ; 1de171 (77:6171)
 .Done:
 	ret
 
-DrawPokedexSearchResultsWindow: ; 1de1d1 (77:61d1)
+DrawPokedexSearchResultsWindow:
 	ld a, $34
 	hlcoord 0, 0
 	ld bc, 11
@@ -111,14 +111,14 @@ DrawPokedexSearchResultsWindow: ; 1de1d1 (77:61d1)
 	call PlaceString
 	ret
 
-.esults_D ; 1de23c
+.esults_D
 ; (SEARCH R)
 	db   "ESULTS"
 	next ""
 ; (### FOUN)
 	next "D!@"
 
-DrawDexEntryScreenRightEdge: ; 1de247
+DrawDexEntryScreenRightEdge:
 	ld a, [hBGMapAddress]
 	ld l, a
 	ld a, [hBGMapAddress + 1]
@@ -150,7 +150,7 @@ DrawDexEntryScreenRightEdge: ; 1de247
 	ld [hBGMapAddress + 1], a
 	ret
 
-Bank77_FillColumn: ; 1de27f
+Bank77_FillColumn:
 	push de
 	ld de, SCREEN_WIDTH
 .loop
diff --git a/engine/pokedex/unown_dex.asm b/engine/pokedex/unown_dex.asm
index cc3d4a273..054c945cf 100755..100644
--- a/engine/pokedex/unown_dex.asm
+++ b/engine/pokedex/unown_dex.asm
@@ -1,4 +1,4 @@
-UpdateUnownDex: ; fba18
+UpdateUnownDex:
 	ld a, [wUnownLetter]
 	ld c, a
 	ld b, NUM_UNOWN
@@ -17,9 +17,8 @@ UpdateUnownDex: ; fba18
 	dec hl
 	ld [hl], c
 	ret
-; fba2e
 
-PrintUnownWord: ; fba2e (3e:7a2e)
+PrintUnownWord:
 	hlcoord 4, 15
 	ld bc, 12
 	ld a, " "
@@ -46,7 +45,5 @@ PrintUnownWord: ; fba2e (3e:7a2e)
 	inc de
 	ld [hli], a
 	jr .loop
-; fba5a (3e:7a5a)
 
-
-INCLUDE "data/unown_words.asm"
+INCLUDE "data/pokemon/unown_words.asm"
diff --git a/engine/pokegear.asm b/engine/pokegear/pokegear.asm
index ea2afdc78..8fc5ffa3d 100755..100644
--- a/engine/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -22,7 +22,7 @@ NUM_POKEGEAR_CARDS EQU const_value
 	const POKEGEARSTATE_RADIOINIT       ; b
 	const POKEGEARSTATE_RADIOJOYPAD     ; c
 
-PokeGear: ; 90b8d (24:4b8d)
+PokeGear:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -68,7 +68,7 @@ PokeGear: ; 90b8d (24:4b8d)
 	call ExitPokegearRadio_HandleMusic
 	ret
 
-.InitTilemap: ; 90bea (24:4bea)
+.InitTilemap:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -109,7 +109,7 @@ PokeGear: ; 90b8d (24:4b8d)
 	call DmgToCgbObjPal0
 	ret
 
-Pokegear_LoadGFX: ; 90c4e
+Pokegear_LoadGFX:
 	call ClearVBank1
 	ld hl, TownMapGFX
 	ld de, vTiles2
@@ -157,13 +157,10 @@ Pokegear_LoadGFX: ; 90c4e
 	call CopyBytes
 	ret
 
-; 90cb2
-
-FastShipGFX: ; 90cb2
+FastShipGFX:
 INCBIN "gfx/pokegear/fast_ship.2bpp"
-; 90d32
 
-InitPokegearModeIndicatorArrow: ; 90d32 (24:4d32)
+InitPokegearModeIndicatorArrow:
 	depixel 4, 2, 4, 0
 	ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
 	call _InitSpriteAnimStruct
@@ -172,7 +169,7 @@ InitPokegearModeIndicatorArrow: ; 90d32 (24:4d32)
 	ld [hl], $0
 	ret
 
-AnimatePokegearModeIndicatorArrow: ; 90d41 (24:4d41)
+AnimatePokegearModeIndicatorArrow:
 	ld hl, wPokegearCard
 	ld e, [hl]
 	ld d, 0
@@ -184,16 +181,13 @@ AnimatePokegearModeIndicatorArrow: ; 90d41 (24:4d41)
 	ld [hl], a
 	ret
 
-; 90d52 (24:4d52)
-
-.XCoords: ; 90d52
+.XCoords:
 	db $00 ; POKEGEARCARD_CLOCK
 	db $10 ; POKEGEARCARD_MAP
 	db $20 ; POKEGEARCARD_PHONE
 	db $30 ; POKEGEARCARD_RADIO
-; 90d56
 
-TownMap_GetCurrentLandmark: ; 90d56
+TownMap_GetCurrentLandmark:
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
@@ -208,9 +202,7 @@ TownMap_GetCurrentLandmark: ; 90d56
 	call GetWorldMapLocation
 	ret
 
-; 90d70
-
-TownMap_InitCursorAndPlayerIconPositions: ; 90d70 (24:4d70)
+TownMap_InitCursorAndPlayerIconPositions:
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
@@ -236,14 +228,14 @@ TownMap_InitCursorAndPlayerIconPositions: ; 90d70 (24:4d70)
 	ld [wPokegearMapCursorLandmark], a
 	ret
 
-Pokegear_InitJumptableIndices: ; 90d9e (24:4d9e)
+Pokegear_InitJumptableIndices:
 	ld a, POKEGEARSTATE_CLOCKINIT
 	ld [wJumptableIndex], a
 	xor a ; POKEGEARCARD_CLOCK
 	ld [wPokegearCard], a
 	ret
 
-InitPokegearTilemap: ; 90da8 (24:4da8)
+InitPokegearTilemap:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -294,7 +286,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	ld [wPokegearMapRegion], a
 	ret
 
-.UpdateBGMap: ; 90e00 (24:4e00)
+.UpdateBGMap:
 	ld a, [hCGB]
 	and a
 	jr z, .dmg
@@ -306,17 +298,14 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	call WaitBGMap
 	ret
 
-; 90e12 (24:4e12)
-
-.Jumptable: ; 90e12
+.Jumptable:
 ; entries correspond to POKEGEARCARD_* constants
 	dw .Clock
 	dw .Map
 	dw .Phone
 	dw .Radio
-; 90e1a
 
-.Clock: ; 90e1a
+.Clock:
 	ld de, ClockTilemapRLE
 	call Pokegear_LoadTilemapRLE
 	hlcoord 12, 1
@@ -328,13 +317,10 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	call Pokegear_UpdateClock
 	ret
 
-; 90e36 (24:4e36)
-
 .switch
 	db " SWITCH▶@"
-; 90e3f
 
-.Map: ; 90e3f
+.Map:
 	ld a, [wPokegearMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .johto
@@ -360,9 +346,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	call PokegearMap_UpdateLandmarkName
 	ret
 
-; 90e72
-
-.Radio: ; 90e72
+.Radio:
 	ld de, RadioTilemapRLE
 	call Pokegear_LoadTilemapRLE
 	hlcoord 0, 12
@@ -370,9 +354,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	call TextBox
 	ret
 
-; 90e82
-
-.Phone: ; 90e82
+.Phone:
 	ld de, PhoneTilemapRLE
 	call Pokegear_LoadTilemapRLE
 	hlcoord 0, 12
@@ -382,9 +364,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	call PokegearPhone_UpdateDisplayList
 	ret
 
-; 90e98
-
-.PlacePhoneBars: ; 90e98 (24:4e98)
+.PlacePhoneBars:
 	hlcoord 17, 1
 	ld a, $3c
 	ld [hli], a
@@ -400,7 +380,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	ld [hl], $3f
 	ret
 
-Pokegear_FinishTilemap: ; 90eb0 (24:4eb0)
+Pokegear_FinishTilemap:
 	hlcoord 0, 0
 	ld bc, $8
 	ld a, $4f
@@ -411,33 +391,33 @@ Pokegear_FinishTilemap: ; 90eb0 (24:4eb0)
 	call ByteFill
 	ld de, wPokegearFlags
 	ld a, [de]
-	bit 0, a ; ENGINE_MAP_CARD
+	bit POKEGEAR_MAP_CARD_F, a
 	call nz, .PlaceMapIcon
 	ld a, [de]
-	bit 2, a ; ENGINE_PHONE_CARD
+	bit POKEGEAR_PHONE_CARD_F, a
 	call nz, .PlacePhoneIcon
 	ld a, [de]
-	bit 1, a ; ENGINE_RADIO_CARD
+	bit POKEGEAR_RADIO_CARD_F, a
 	call nz, .PlaceRadioIcon
 	hlcoord 0, 0
 	ld a, $46
 	call .PlacePokegearCardIcon
 	ret
 
-.PlaceMapIcon: ; 90ee4 (24:4ee4)
+.PlaceMapIcon:
 	hlcoord 2, 0
 	ld a, $40
 	jr .PlacePokegearCardIcon
 
-.PlacePhoneIcon: ; 90eeb (24:4eeb)
+.PlacePhoneIcon:
 	hlcoord 4, 0
 	ld a, $44
 	jr .PlacePokegearCardIcon
 
-.PlaceRadioIcon: ; 90ef2 (24:4ef2)
+.PlaceRadioIcon:
 	hlcoord 6, 0
 	ld a, $42
-.PlacePokegearCardIcon: ; 90ef7 (24:4ef7)
+.PlacePokegearCardIcon:
 	ld [hli], a
 	inc a
 	ld [hld], a
@@ -449,7 +429,7 @@ Pokegear_FinishTilemap: ; 90eb0 (24:4eb0)
 	ld [hld], a
 	ret
 
-PokegearJumptable: ; 90f04 (24:4f04)
+PokegearJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -461,7 +441,7 @@ PokegearJumptable: ; 90f04 (24:4f04)
 	ld l, a
 	jp hl
 
-.Jumptable: ; 90f13 (24:4f13)
+.Jumptable:
 ; entries correspond to POKEGEARSTATE_* constants
 	dw PokegearClock_Init
 	dw PokegearClock_Joypad
@@ -477,7 +457,7 @@ PokegearJumptable: ; 90f04 (24:4f04)
 	dw PokegearRadio_Init
 	dw PokegearRadio_Joypad
 
-PokegearClock_Init: ; 90f2d (24:4f2d)
+PokegearClock_Init:
 	call InitPokegearTilemap
 	ld hl, PokegearText_PressAnyButtonToExit
 	call PrintText
@@ -486,7 +466,7 @@ PokegearClock_Init: ; 90f2d (24:4f2d)
 	call ExitPokegearRadio_HandleMusic
 	ret
 
-PokegearClock_Joypad: ; 90f3e (24:4f3e)
+PokegearClock_Joypad:
 	call .UpdateClock
 	ld hl, hJoyLast
 	ld a, [hl]
@@ -496,7 +476,7 @@ PokegearClock_Joypad: ; 90f3e (24:4f3e)
 	and D_RIGHT
 	ret z
 	ld a, [wPokegearFlags]
-	bit 0, a ; ENGINE_MAP_CARD
+	bit POKEGEAR_MAP_CARD_F, a
 	jr z, .no_map_card
 	ld c, POKEGEARSTATE_MAPCHECKREGION
 	ld b, POKEGEARCARD_MAP
@@ -504,7 +484,7 @@ PokegearClock_Joypad: ; 90f3e (24:4f3e)
 
 .no_map_card
 	ld a, [wPokegearFlags]
-	bit 2, a ; ENGINE_PHONE_CARD
+	bit POKEGEAR_PHONE_CARD_F, a
 	jr z, .no_phone_card
 	ld c, POKEGEARSTATE_PHONEINIT
 	ld b, POKEGEARCARD_PHONE
@@ -512,7 +492,7 @@ PokegearClock_Joypad: ; 90f3e (24:4f3e)
 
 .no_phone_card
 	ld a, [wPokegearFlags]
-	bit 1, a ; ENGINE_RADIO_CARD
+	bit POKEGEAR_RADIO_CARD_F, a
 	ret z
 	ld c, POKEGEARSTATE_RADIOINIT
 	ld b, POKEGEARCARD_RADIO
@@ -525,7 +505,7 @@ PokegearClock_Joypad: ; 90f3e (24:4f3e)
 	set 7, [hl]
 	ret
 
-.UpdateClock: ; 90f7b (24:4f7b)
+.UpdateClock:
 	xor a
 	ld [hBGMapMode], a
 	call Pokegear_UpdateClock
@@ -533,7 +513,7 @@ PokegearClock_Joypad: ; 90f3e (24:4f3e)
 	ld [hBGMapMode], a
 	ret
 
-Pokegear_UpdateClock: ; 90f86 (24:4f86)
+Pokegear_UpdateClock:
 	hlcoord 3, 5
 	lb bc, 5, 14
 	call ClearBox
@@ -548,17 +528,14 @@ Pokegear_UpdateClock: ; 90f86 (24:4f86)
 	call PlaceHLTextAtBC
 	ret
 
-; 90fa8 (24:4fa8)
 	db "ごぜん@"
 	db "ごご@"
 
-.DayText: ; 0x90faf
+.DayText:
 	text_jump UnknownText_0x1c5821
 	db "@"
 
-; 0x90fb4
-
-PokegearMap_CheckRegion: ; 90fb4 (24:4fb4)
+PokegearMap_CheckRegion:
 	ld a, [wPokegearMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .johto
@@ -576,7 +553,7 @@ PokegearMap_CheckRegion: ; 90fb4 (24:4fb4)
 	call ExitPokegearRadio_HandleMusic
 	ret
 
-PokegearMap_Init: ; 90fcd (24:4fcd)
+PokegearMap_Init:
 	call InitPokegearTilemap
 	ld a, [wPokegearMapPlayerIconLandmark]
 	call PokegearMap_InitPlayerIcon
@@ -590,14 +567,14 @@ PokegearMap_Init: ; 90fcd (24:4fcd)
 	inc [hl]
 	ret
 
-PokegearMap_KantoMap: ; 90fe9 (24:4fe9)
+PokegearMap_KantoMap:
 	call TownMap_GetKantoLandmarkLimits
 	jr PokegearMap_ContinueMap
 
-PokegearMap_JohtoMap: ; 90fee (24:4fee)
+PokegearMap_JohtoMap:
 	ld d, SILVER_CAVE
 	ld e, NEW_BARK_TOWN
-PokegearMap_ContinueMap: ; 90ff2 (24:4ff2)
+PokegearMap_ContinueMap:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and B_BUTTON
@@ -613,7 +590,7 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2)
 
 .right
 	ld a, [wPokegearFlags]
-	bit 2, a ; ENGINE_PHONE_CARD
+	bit POKEGEAR_PHONE_CARD_F, a
 	jr z, .no_phone
 	ld c, POKEGEARSTATE_PHONEINIT
 	ld b, POKEGEARCARD_PHONE
@@ -621,7 +598,7 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2)
 
 .no_phone
 	ld a, [wPokegearFlags]
-	bit 1, a ; ENGINE_RADIO_CARD
+	bit POKEGEAR_RADIO_CARD_F, a
 	ret z
 	ld c, POKEGEARSTATE_RADIOINIT
 	ld b, POKEGEARCARD_RADIO
@@ -639,7 +616,7 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2)
 	set 7, [hl]
 	ret
 
-.DPad: ; 9102f (24:502f)
+.DPad:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
@@ -682,12 +659,12 @@ PokegearMap_ContinueMap: ; 90ff2 (24:4ff2)
 	call PokegearMap_UpdateCursorPosition
 	ret
 
-PokegearMap_InitPlayerIcon: ; 9106a
+PokegearMap_InitPlayerIcon:
 	push af
 	depixel 0, 0
 	ld b, SPRITE_ANIM_INDEX_RED_WALK
 	ld a, [wPlayerGender]
-	bit 0, a ; ENGINE_PLAYER_IS_FEMALE
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .got_gender
 	ld b, SPRITE_ANIM_INDEX_BLUE_WALK
 .got_gender
@@ -709,9 +686,7 @@ PokegearMap_InitPlayerIcon: ; 9106a
 	ld [hl], d
 	ret
 
-; 91098
-
-PokegearMap_InitCursor: ; 91098
+PokegearMap_InitCursor:
 	push af
 	depixel 0, 0
 	ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
@@ -728,9 +703,7 @@ PokegearMap_InitCursor: ; 91098
 	pop bc
 	ret
 
-; 910b4
-
-PokegearMap_UpdateLandmarkName: ; 910b4
+PokegearMap_UpdateLandmarkName:
 	push af
 	hlcoord 8, 0
 	lb bc, 2, 12
@@ -745,9 +718,7 @@ PokegearMap_UpdateLandmarkName: ; 910b4
 	ld [hl], $34
 	ret
 
-; 910d4
-
-PokegearMap_UpdateCursorPosition: ; 910d4
+PokegearMap_UpdateCursorPosition:
 	push bc
 	ld e, a
 	farcall GetLandmarkCoords
@@ -760,11 +731,9 @@ PokegearMap_UpdateCursorPosition: ; 910d4
 	ld [hl], d
 	ret
 
-; 910e8
-
-TownMap_GetKantoLandmarkLimits: ; 910e8
+TownMap_GetKantoLandmarkLimits:
 	ld a, [wStatusFlags]
-	bit 6, a ; ENGINE_CREDITS_SKIP
+	bit STATUSFLAGS_HALL_OF_FAME_F, a
 	jr z, .not_hof
 	ld d, ROUTE_28
 	ld e, PALLET_TOWN
@@ -775,9 +744,7 @@ TownMap_GetKantoLandmarkLimits: ; 910e8
 	ld e, VICTORY_ROAD
 	ret
 
-; 910f9
-
-PokegearRadio_Init: ; 910f9 (24:50f9)
+PokegearRadio_Init:
 	call InitPokegearTilemap
 	depixel 4, 10, 4, 4
 	ld a, SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
@@ -790,7 +757,7 @@ PokegearRadio_Init: ; 910f9 (24:50f9)
 	inc [hl]
 	ret
 
-PokegearRadio_Joypad: ; 91112 (24:5112)
+PokegearRadio_Joypad:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and B_BUTTON
@@ -810,7 +777,7 @@ PokegearRadio_Joypad: ; 91112 (24:5112)
 
 .left
 	ld a, [wPokegearFlags]
-	bit 2, a ; ENGINE_PHONE_CARD
+	bit POKEGEAR_PHONE_CARD_F, a
 	jr z, .no_phone
 	ld c, POKEGEARSTATE_PHONEINIT
 	ld b, POKEGEARCARD_PHONE
@@ -818,7 +785,7 @@ PokegearRadio_Joypad: ; 91112 (24:5112)
 
 .no_phone
 	ld a, [wPokegearFlags]
-	bit 0, a ; ENGINE_MAP_CARD
+	bit POKEGEAR_MAP_CARD_F, a
 	jr z, .no_map
 	ld c, POKEGEARSTATE_MAPCHECKREGION
 	ld b, POKEGEARCARD_MAP
@@ -836,7 +803,7 @@ PokegearRadio_Joypad: ; 91112 (24:5112)
 	set 7, [hl]
 	ret
 
-PokegearPhone_Init: ; 91156 (24:5156)
+PokegearPhone_Init:
 	ld hl, wJumptableIndex
 	inc [hl]
 	xor a
@@ -849,7 +816,7 @@ PokegearPhone_Init: ; 91156 (24:5156)
 	call PrintText
 	ret
 
-PokegearPhone_Joypad: ; 91171 (24:5171)
+PokegearPhone_Joypad:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -869,7 +836,7 @@ PokegearPhone_Joypad: ; 91171 (24:5171)
 
 .left
 	ld a, [wPokegearFlags]
-	bit 0, a ; ENGINE_MAP_CARD
+	bit POKEGEAR_MAP_CARD_F, a
 	jr z, .no_map
 	ld c, POKEGEARSTATE_MAPCHECKREGION
 	ld b, POKEGEARCARD_MAP
@@ -882,7 +849,7 @@ PokegearPhone_Joypad: ; 91171 (24:5171)
 
 .right
 	ld a, [wPokegearFlags]
-	bit 1, a ; ENGINE_RADIO_CARD
+	bit POKEGEAR_RADIO_CARD_F, a
 	ret z
 	ld c, POKEGEARSTATE_RADIOINIT
 	ld b, POKEGEARCARD_RADIO
@@ -925,7 +892,7 @@ PokegearPhone_Joypad: ; 91171 (24:5171)
 	ld [wJumptableIndex], a
 	ret
 
-PokegearPhone_MakePhoneCall: ; 911eb (24:51eb)
+PokegearPhone_MakePhoneCall:
 	call GetMapPhoneService
 	and a
 	jr nz, .no_service
@@ -967,23 +934,17 @@ PokegearPhone_MakePhoneCall: ; 911eb (24:51eb)
 	call PrintText
 	ret
 
-; 9124c (24:524c)
-
-.dotdotdot ; 0x9124c
+.dotdotdot
 	;
 	text_jump UnknownText_0x1c5824
 	db "@"
 
-; 0x91251
-
-.OutOfServiceArea: ; 0x91251
+.OutOfServiceArea:
 	; You're out of the service area.
 	text_jump UnknownText_0x1c5827
 	db "@"
 
-; 0x91256
-
-PokegearPhone_FinishPhoneCall: ; 91256 (24:5256)
+PokegearPhone_FinishPhoneCall:
 	ld a, [hJoyPressed]
 	and A_BUTTON | B_BUTTON
 	ret z
@@ -994,7 +955,7 @@ PokegearPhone_FinishPhoneCall: ; 91256 (24:5256)
 	call PrintText
 	ret
 
-PokegearPhone_GetDPad: ; 9126d (24:526d)
+PokegearPhone_GetDPad:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
@@ -1050,7 +1011,7 @@ PokegearPhone_GetDPad: ; 9126d (24:526d)
 	call WaitBGMap
 	ret
 
-PokegearPhone_UpdateCursor: ; 912b7 (24:52b7)
+PokegearPhone_UpdateCursor:
 	ld a, " "
 	hlcoord 1, 4
 	ld [hl], a
@@ -1067,7 +1028,7 @@ PokegearPhone_UpdateCursor: ; 912b7 (24:52b7)
 	ld [hl], "▶"
 	ret
 
-PokegearPhone_UpdateDisplayList: ; 912d8 (24:52d8)
+PokegearPhone_UpdateDisplayList:
 	hlcoord 1, 3
 	ld b, 9
 	ld a, " "
@@ -1110,9 +1071,7 @@ PokegearPhone_UpdateDisplayList: ; 912d8 (24:52d8)
 	call PokegearPhone_UpdateCursor
 	ret
 
-; 9131e (24:531e)
-
-PokegearPhone_DeletePhoneNumber: ; 9131e
+PokegearPhone_DeletePhoneNumber:
 	ld hl, wPhoneList
 	ld a, [wPokegearPhoneScrollPosition]
 	ld e, a
@@ -1137,9 +1096,7 @@ PokegearPhone_DeletePhoneNumber: ; 9131e
 	jr nz, .loop
 	ret
 
-; 91342
-
-PokegearPhoneContactSubmenu: ; 91342 (24:5342)
+PokegearPhoneContactSubmenu:
 	ld hl, wPhoneList
 	ld a, [wPokegearPhoneScrollPosition]
 	ld e, a
@@ -1248,15 +1205,13 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342)
 	ld l, a
 	jp hl
 
-.Cancel: ; 913f1
+.Cancel:
 	ld hl, PokegearText_WhomToCall
 	call PrintText
 	scf
 	ret
 
-; 913f9 (24:53f9)
-
-.Delete: ; 913f9
+.Delete:
 	ld hl, PokegearText_DeleteStoredNumber
 	call MenuTextBox
 	call YesNoBox
@@ -1273,15 +1228,11 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342)
 	scf
 	ret
 
-; 9141b
-
-.Call: ; 9141b
+.Call:
 	and a
 	ret
 
-; 9141d
-
-.UpdateCursor: ; 9141d (24:541d)
+.UpdateCursor:
 	push de
 	ld a, [de]
 	inc de
@@ -1307,38 +1258,30 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342)
 	pop de
 	ret
 
-; 9143f (24:543f)
-
-.CallDeleteCancelStrings: ; 9143f
+.CallDeleteCancelStrings:
 	dwcoord 10, 6
 	db 3
 	db   "CALL"
 	next "DELETE"
 	next "CANCEL"
 	db   "@"
-; 91455
 
-.CallDeleteCancelJumptable: ; 91455
+.CallDeleteCancelJumptable:
 	dw .Call
 	dw .Delete
 	dw .Cancel
 
-; 9145b
-
-.CallCancelStrings: ; 9145b
+.CallCancelStrings:
 	dwcoord 10, 8
 	db 2
 	db   "CALL"
 	next "CANCEL"
 	db   "@"
-; 9146a
 
-.CallCancelJumptable: ; 9146a
+.CallCancelJumptable:
 	dw .Call
 	dw .Cancel
 
-; 9146e
-
 ; unused
 	ld a, [hHours]
 	cp 12
@@ -1353,9 +1296,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342)
 	and a
 	ret
 
-; 91480
-
-Pokegear_SwitchPage: ; 91480 (24:5480)
+Pokegear_SwitchPage:
 	ld de, SFX_READ_TEXT_2
 	call PlaySFX
 	ld a, c
@@ -1365,7 +1306,7 @@ Pokegear_SwitchPage: ; 91480 (24:5480)
 	call DeleteSpriteAnimStruct2ToEnd
 	ret
 
-ExitPokegearRadio_HandleMusic: ; 91492
+ExitPokegearRadio_HandleMusic:
 	ld a, [wPokegearRadioMusicPlaying]
 	cp RESTART_MAP_MUSIC
 	jr z, .restart_map_music
@@ -1381,9 +1322,7 @@ ExitPokegearRadio_HandleMusic: ; 91492
 	ld [wPokegearRadioMusicPlaying], a
 	ret
 
-; 914ab
-
-DeleteSpriteAnimStruct2ToEnd: ; 914ab (24:54ab)
+DeleteSpriteAnimStruct2ToEnd:
 	ld hl, wSpriteAnim2
 	ld bc, wSpriteAnimationStructsEnd - wSpriteAnim2
 	xor a
@@ -1392,7 +1331,7 @@ DeleteSpriteAnimStruct2ToEnd: ; 914ab (24:54ab)
 	ld [wSpriteAnimCount], a
 	ret
 
-Pokegear_LoadTilemapRLE: ; 914bb (24:54bb)
+Pokegear_LoadTilemapRLE:
 	; Format: repeat count, tile ID
 	; Terminated with -1
 	hlcoord 0, 0
@@ -1412,47 +1351,37 @@ Pokegear_LoadTilemapRLE: ; 914bb (24:54bb)
 	jr nz, .load
 	jr .loop
 
-; 914ce (24:54ce)
-
-PokegearText_WhomToCall: ; 0x914ce
+PokegearText_WhomToCall:
 	; Whom do you want to call?
 	text_jump UnknownText_0x1c5847
 	db "@"
 
-; 0x914d3
-
-PokegearText_PressAnyButtonToExit: ; 0x914d3
+PokegearText_PressAnyButtonToExit:
 	; Press any button to exit.
 	text_jump UnknownText_0x1c5862
 	db "@"
 
-; 0x914d8
-
-PokegearText_DeleteStoredNumber: ; 0x914d8
+PokegearText_DeleteStoredNumber:
 	; Delete this stored phone number?
 	text_jump UnknownText_0x1c587d
 	db "@"
 
-; 0x914dd
-
-PokegearSpritesGFX: ; 914dd
+PokegearSpritesGFX:
 INCBIN "gfx/pokegear/pokegear_sprites.2bpp.lz"
-; 9150d
 
-RadioTilemapRLE: ; 9150d
+RadioTilemapRLE:
 INCBIN "gfx/pokegear/radio.tilemap.rle"
-PhoneTilemapRLE: ; 9158a
+PhoneTilemapRLE:
 INCBIN "gfx/pokegear/phone.tilemap.rle"
-ClockTilemapRLE: ; 915db
+ClockTilemapRLE:
 INCBIN "gfx/pokegear/clock.tilemap.rle"
-; 9163e
 
-_UpdateRadioStation: ; 9163e (24:563e)
+_UpdateRadioStation:
 	jr UpdateRadioStation
 
 ; called from engine/sprite_anims.asm
 
-AnimateTuningKnob: ; 91640 (24:5640)
+AnimateTuningKnob:
 	push bc
 	call .TuningKnob
 	pop bc
@@ -1462,7 +1391,7 @@ AnimateTuningKnob: ; 91640 (24:5640)
 	ld [hl], a
 	ret
 
-.TuningKnob: ; 9164e (24:564e)
+.TuningKnob:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -1489,7 +1418,7 @@ AnimateTuningKnob: ; 91640 (24:5640)
 	inc [hl]
 	inc [hl]
 .update
-UpdateRadioStation: ; 9166f (24:566f)
+UpdateRadioStation:
 	ld hl, wRadioTuningKnob
 	ld d, [hl]
 	ld hl, RadioChannels
@@ -1527,8 +1456,6 @@ UpdateRadioStation: ; 9166f (24:566f)
 	ld [hBGMapMode], a
 	ret
 
-; 916a1 (24:56a1)
-
 ; unused
 	ld [wPokegearRadioChannelBank], a
 	ld a, [hli]
@@ -1537,13 +1464,11 @@ UpdateRadioStation: ; 9166f (24:566f)
 	ld [wPokegearRadioChannelAddr + 1], a
 	ret
 
-; 916ad
-
 RadioChannels:
 ; entries correspond to constants/radio_constants.asm
 
 ; frequency value given here = 4 × ingame_frequency − 2
-	dbw 16, .PkmnTalkAndPokedexShow
+	dbw 16, .PKMNTalkAndPokedexShow
 	dbw 28, .PokemonMusic
 	dbw 32, .LuckyChannel
 	dbw 40, .BuenasPassword
@@ -1554,7 +1479,7 @@ RadioChannels:
 	dbw 80, .EvolutionRadio
 	db -1
 
-.PkmnTalkAndPokedexShow:
+.PKMNTalkAndPokedexShow:
 ; Pokédex Show in the morning
 
 ; Oak's Pokémon Talk in the afternoon and evening
@@ -1590,7 +1515,7 @@ RadioChannels:
 	call .InJohto
 	jr c, .NoSignal
 	ld a, [wPokegearFlags]
-	bit 3, a ; ENGINE_EXPN_CARD
+	bit POKEGEAR_EXPN_CARD_F, a
 	jr z, .NoSignal
 	jp LoadStation_PlacesAndPeople
 
@@ -1598,7 +1523,7 @@ RadioChannels:
 	call .InJohto
 	jr c, .NoSignal
 	ld a, [wPokegearFlags]
-	bit 3, a ; ENGINE_EXPN_CARD
+	bit POKEGEAR_EXPN_CARD_F, a
 	jr z, .NoSignal
 	jp LoadStation_LetsAllSing
 
@@ -1606,14 +1531,14 @@ RadioChannels:
 	call .InJohto
 	jr c, .NoSignal
 	ld a, [wPokegearFlags]
-	bit 3, a ; ENGINE_EXPN_CARD
+	bit POKEGEAR_EXPN_CARD_F, a
 	jr z, .NoSignal
 	jp LoadStation_PokeFluteRadio
 
 .EvolutionRadio:
-; This station airs in the Lake of Rage area when Rocket are still in Mahogany.
+; This station airs in the Lake of Rage area when Team Rocket is still in Mahogany.
 	ld a, [wStatusFlags]
-	bit 4, a ; ENGINE_ROCKET_SIGNAL_ON_CH20
+	bit STATUSFLAGS_ROCKET_SIGNAL_F, a
 	jr z, .NoSignal
 	ld a, [wPokegearMapPlayerIconLandmark]
 	cp MAHOGANY_TOWN
@@ -1646,17 +1571,17 @@ RadioChannels:
 	scf
 	ret
 
-LoadStation_OaksPokemonTalk: ; 91753 (24:5753)
+LoadStation_OaksPokemonTalk:
 	xor a ; OAKS_POKEMON_TALK
 	ld [wCurrentRadioLine], a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
 	call Radio_BackUpFarCallParams
-	ld de, OaksPkmnTalkName
+	ld de, OaksPKMNTalkName
 	ret
 
-LoadStation_PokedexShow: ; 91766 (24:5766)
+LoadStation_PokedexShow:
 	ld a, POKEDEX_SHOW
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1667,7 +1592,7 @@ LoadStation_PokedexShow: ; 91766 (24:5766)
 	ld de, PokedexShowName
 	ret
 
-LoadStation_PokemonMusic: ; 9177b (24:577b)
+LoadStation_PokemonMusic:
 	ld a, POKEMON_MUSIC
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1678,7 +1603,7 @@ LoadStation_PokemonMusic: ; 9177b (24:577b)
 	ld de, PokemonMusicName
 	ret
 
-LoadStation_LuckyChannel: ; 91790 (24:5790)
+LoadStation_LuckyChannel:
 	ld a, LUCKY_CHANNEL
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1689,7 +1614,7 @@ LoadStation_LuckyChannel: ; 91790 (24:5790)
 	ld de, LuckyChannelName
 	ret
 
-LoadStation_BuenasPassword: ; 917a5 (24:57a5)
+LoadStation_BuenasPassword:
 	ld a, BUENAS_PASSWORD
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1699,17 +1624,15 @@ LoadStation_BuenasPassword: ; 917a5 (24:57a5)
 	call Radio_BackUpFarCallParams
 	ld de, NotBuenasPasswordName
 	ld a, [wStatusFlags2]
-	bit 0, a ; ENGINE_ROCKETS_IN_RADIO_TOWER
+	bit STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F, a
 	ret z
 	ld de, BuenasPasswordName
 	ret
 
-; 917c3 (24:57c3)
-
 BuenasPasswordName:    db "BUENA'S PASSWORD@"
 NotBuenasPasswordName: db "@"
 
-LoadStation_UnownRadio: ; 917d5 (24:57d5)
+LoadStation_UnownRadio:
 	ld a, UNOWN_RADIO
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1720,7 +1643,7 @@ LoadStation_UnownRadio: ; 917d5 (24:57d5)
 	ld de, UnownStationName
 	ret
 
-LoadStation_PlacesAndPeople: ; 917ea (24:57ea)
+LoadStation_PlacesAndPeople:
 	ld a, PLACES_AND_PEOPLE
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1731,7 +1654,7 @@ LoadStation_PlacesAndPeople: ; 917ea (24:57ea)
 	ld de, PlacesAndPeopleName
 	ret
 
-LoadStation_LetsAllSing: ; 917ff (24:57ff)
+LoadStation_LetsAllSing:
 	ld a, LETS_ALL_SING
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1742,9 +1665,7 @@ LoadStation_LetsAllSing: ; 917ff (24:57ff)
 	ld de, LetsAllSingName
 	ret
 
-; 91814 (24:5814)
-
-LoadStation_RocketRadio: ; 91814
+LoadStation_RocketRadio:
 	ld a, ROCKET_RADIO
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1755,9 +1676,7 @@ LoadStation_RocketRadio: ; 91814
 	ld de, LetsAllSingName
 	ret
 
-; 91829
-
-LoadStation_PokeFluteRadio: ; 91829 (24:5829)
+LoadStation_PokeFluteRadio:
 	ld a, POKE_FLUTE_RADIO
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1768,7 +1687,7 @@ LoadStation_PokeFluteRadio: ; 91829 (24:5829)
 	ld de, PokeFluteStationName
 	ret
 
-LoadStation_EvolutionRadio: ; 9183e (24:583e)
+LoadStation_EvolutionRadio:
 	ld a, EVOLUTION_RADIO
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1779,12 +1698,10 @@ LoadStation_EvolutionRadio: ; 9183e (24:583e)
 	ld de, UnownStationName
 	ret
 
-; 91853 (24:5853)
-
-Unreferenced_LoadStation: ; 91853
+Unreferenced_LoadStation:
 	ret
 
-RadioMusicRestartDE: ; 91854 (24:5854)
+RadioMusicRestartDE:
 	push de
 	ld a, e
 	ld [wPokegearRadioMusicPlaying], a
@@ -1796,7 +1713,7 @@ RadioMusicRestartDE: ; 91854 (24:5854)
 	call PlayMusic
 	ret
 
-RadioMusicRestartPokemonChannel: ; 91868 (24:5868)
+RadioMusicRestartPokemonChannel:
 	push de
 	ld a, RESTART_MAP_MUSIC
 	ld [wPokegearRadioMusicPlaying], a
@@ -1807,7 +1724,7 @@ RadioMusicRestartPokemonChannel: ; 91868 (24:5868)
 	call PlayMusic
 	ret
 
-Radio_BackUpFarCallParams: ; 9187c (24:587c)
+Radio_BackUpFarCallParams:
 	ld [wPokegearRadioChannelBank], a
 	ld a, l
 	ld [wPokegearRadioChannelAddr], a
@@ -1815,7 +1732,7 @@ Radio_BackUpFarCallParams: ; 9187c (24:587c)
 	ld [wPokegearRadioChannelAddr + 1], a
 	ret
 
-NoRadioStation: ; 91888 (24:5888)
+NoRadioStation:
 	call NoRadioMusic
 	call NoRadioName
 	xor a
@@ -1826,14 +1743,14 @@ NoRadioStation: ; 91888 (24:5888)
 	ld [hBGMapMode], a
 	ret
 
-NoRadioMusic: ; 9189d (24:589d)
+NoRadioMusic:
 	ld de, MUSIC_NONE
 	call PlayMusic
 	ld a, ENTER_MAP_MUSIC
 	ld [wPokegearRadioMusicPlaying], a
 	ret
 
-NoRadioName: ; 918a9 (24:58a9)
+NoRadioName:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 1, 8
@@ -1844,9 +1761,7 @@ NoRadioName: ; 918a9 (24:58a9)
 	call TextBox
 	ret
 
-; 918bf
-
-OaksPkmnTalkName:     db "OAK's <PK><MN> Talk@"
+OaksPKMNTalkName:     db "OAK's <PK><MN> Talk@"
 PokedexShowName:      db "#DEX Show@"
 PokemonMusicName:     db "#MON Music@"
 LuckyChannelName:     db "Lucky Channel@"
@@ -1855,9 +1770,8 @@ UnownStationName:     db "?????@"
 PlacesAndPeopleName:  db "Places & People@"
 LetsAllSingName:      db "Let's All Sing!@"
 PokeFluteStationName: db "# FLUTE@"
-; 9191c
 
-_TownMap: ; 9191c
+_TownMap:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -1990,9 +1904,8 @@ _TownMap: ; 9191c
 	call PokegearMap_UpdateCursorPosition
 	pop de
 	jr .loop2
-; 91a04
 
-.InitTilemap: ; 91a04
+.InitTilemap:
 	ld a, [wTownMapPlayerIconLandmark]
 	cp KANTO_LANDMARK
 	jr nc, .kanto2
@@ -2025,9 +1938,8 @@ _TownMap: ; 9191c
 	call PokegearMap_UpdateLandmarkName
 	farcall TownMapPals
 	ret
-; 91a53
 
-PlayRadio: ; 91a53
+PlayRadio:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -2058,9 +1970,7 @@ PlayRadio: ; 91a53
 	call ExitPokegearRadio_HandleMusic
 	ret
 
-; 91a87
-
-.PlayStation: ; 91a87
+.PlayStation:
 	ld a, ENTER_MAP_MUSIC
 	ld [wPokegearRadioMusicPlaying], a
 	ld hl, .StationPointers
@@ -2080,19 +1990,17 @@ PlayRadio: ; 91a53
 	lb bc, 4, 18
 	call TextBox
 	hlcoord 1, 14
-	ld [hl], $72
+	ld [hl], "“"
 	pop de
 	hlcoord 2, 14
 	call PlaceString
 	ld h, b
 	ld l, c
-	ld [hl], $73
+	ld [hl], "”"
 	call WaitBGMap
 	ret
 
-; 91ab9
-
-.StationPointers: ; 91ab9
+.StationPointers:
 ; entries correspond to MAPRADIO_* constants
 	dw .OakOrPnP
 	dw LoadStation_OaksPokemonTalk
@@ -2104,9 +2012,7 @@ PlayRadio: ; 91a53
 	dw LoadStation_LetsAllSing
 	dw LoadStation_RocketRadio
 
-; 91acb
-
-.OakOrPnP: ; 91acb
+.OakOrPnP:
 	call IsInJohto
 	and a
 	jr nz, .kanto
@@ -2119,9 +2025,7 @@ PlayRadio: ; 91a53
 .kanto
 	jp LoadStation_PlacesAndPeople
 
-; 91ae1
-
-PokegearMap: ; 91ae1
+PokegearMap:
 	ld a, e
 	and a
 	jr nz, .kanto
@@ -2134,9 +2038,7 @@ PokegearMap: ; 91ae1
 	call FillKantoMap
 	ret
 
-; 91af3
-
-_FlyMap: ; 91af3
+_FlyMap:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -2199,9 +2101,7 @@ _FlyMap: ; 91af3
 	ld e, a
 	ret
 
-; 91b73
-
-FlyMapScroll: ; 91b73
+FlyMapScroll:
 	ld a, [wStartFlypoint]
 	ld e, a
 	ld a, [wEndFlypoint]
@@ -2248,9 +2148,7 @@ FlyMapScroll: ; 91b73
 	ld [hBGMapMode], a
 	ret
 
-; 91bb5
-
-TownMapBubble: ; 91bb5
+TownMapBubble:
 ; Draw the bubble containing the location text in the town map HUD
 
 ; Top-left corner
@@ -2312,9 +2210,7 @@ TownMapBubble: ; 91bb5
 	call PlaceString
 	ret
 
-; 91c17
-
-GetMapCursorCoordinates: ; 91c17
+GetMapCursorCoordinates:
 	ld a, [wTownMapPlayerIconLandmark]
 	ld l, a
 	ld h, 0
@@ -2335,9 +2231,7 @@ GetMapCursorCoordinates: ; 91c17
 	ld [hl], d
 	ret
 
-; 91c3c
-
-CheckIfVisitedFlypoint: ; 91c3c
+CheckIfVisitedFlypoint:
 ; Check if the flypoint loaded in [hl] has been visited yet.
 	push bc
 	push de
@@ -2355,9 +2249,7 @@ CheckIfVisitedFlypoint: ; 91c3c
 	and a
 	ret
 
-; 91c50
-
-HasVisitedSpawn: ; 91c50
+HasVisitedSpawn:
 ; Check if spawn point c has been visited.
 	ld hl, wVisitedSpawns
 	ld b, CHECK_FLAG
@@ -2366,16 +2258,12 @@ HasVisitedSpawn: ; 91c50
 	ld a, c
 	ret
 
-; 91c5e
-
 INCLUDE "data/maps/flypoints.asm"
 
-ret_91c8f: ; 91c8f
+ret_91c8f:
 	ret
 
-; 91c90
-
-FlyMap: ; 91c90
+FlyMap:
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
@@ -2469,9 +2357,7 @@ FlyMap: ; 91c90
 	ld [wTownMapCursorCoordinates + 1], a
 	ret
 
-; 91d11
-
-Pokedex_GetArea: ; 91d11
+Pokedex_GetArea:
 ; e: Current landmark
 	ld a, [wTownMapPlayerIconLandmark]
 	push af
@@ -2537,9 +2423,7 @@ Pokedex_GetArea: ; 91d11
 	ld [wTownMapPlayerIconLandmark], a
 	ret
 
-; 91d9b
-
-.LeftRightInput: ; 91d9b
+.LeftRightInput:
 	ld a, [hl]
 	and D_LEFT
 	jr nz, .left
@@ -2561,7 +2445,7 @@ Pokedex_GetArea: ; 91d11
 
 .right
 	ld a, [wStatusFlags]
-	bit 6, a ; ENGINE_CREDITS_SKIP
+	bit STATUSFLAGS_HALL_OF_FAME_F, a
 	ret z
 	ld a, [hWY]
 	and a
@@ -2573,9 +2457,7 @@ Pokedex_GetArea: ; 91d11
 	call .GetAndPlaceNest
 	ret
 
-; 91dcd
-
-.BlinkNestIcons: ; 91dcd
+.BlinkNestIcons:
 	ld a, [hVBlankCounter]
 	ld e, a
 	and $f
@@ -2593,9 +2475,7 @@ Pokedex_GetArea: ; 91d11
 	call CopyBytes
 	ret
 
-; 91de9
-
-.PlaceString_MonsNest: ; 91de9
+.PlaceString_MonsNest:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH
 	ld a, " "
@@ -2616,13 +2496,10 @@ Pokedex_GetArea: ; 91d11
 	call PlaceString
 	ret
 
-; 91e16
-
 .String_SNest:
 	db "'S NEST@"
-; 91e1e
 
-.GetAndPlaceNest: ; 91e1e
+.GetAndPlaceNest:
 	ld [wTownMapCursorLandmark], a
 	ld e, a
 	farcall FindNest ; load nest landmarks into wTileMap[0,0]
@@ -2660,9 +2537,7 @@ Pokedex_GetArea: ; 91d11
 	call CopyBytes
 	ret
 
-; 91e5a
-
-.HideNestsShowPlayer: ; 91e5a
+.HideNestsShowPlayer:
 	call .CheckPlayerLocation
 	ret c
 	ld a, [wTownMapPlayerIconLandmark]
@@ -2690,7 +2565,7 @@ Pokedex_GetArea: ; 91d11
 	push bc
 	ld c, PAL_OW_RED
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .male
 	inc c ; PAL_OW_BLUE
 .male
@@ -2706,18 +2581,15 @@ Pokedex_GetArea: ; 91d11
 	call ByteFill
 	ret
 
-; 91e9c
-
-.PlayerOAM: ; 91e9c
+.PlayerOAM:
 	; y pxl, x pxl, tile offset
 	db -1 * 8, -1 * 8, 0 ; top left
 	db -1 * 8,  0 * 8, 1 ; top right
 	db  0 * 8, -1 * 8, 2 ; bottom left
 	db  0 * 8,  0 * 8, 3 ; bottom right
 	db $80 ; terminator
-; 91ea9
 
-.CheckPlayerLocation: ; 91ea9
+.CheckPlayerLocation:
 ; Don't show the player's sprite if you're
 ; not in the same region as what's currently
 ; on the screen.
@@ -2748,9 +2620,7 @@ Pokedex_GetArea: ; 91d11
 	scf
 	ret
 
-; 91ed0
-
-.GetPlayerOrFastShipIcon: ; 91ed0
+.GetPlayerOrFastShipIcon:
 	ld a, [wTownMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .FastShip
@@ -2762,9 +2632,7 @@ Pokedex_GetArea: ; 91d11
 	ld b, BANK(FastShipGFX)
 	ret
 
-; 91ee4
-
-TownMapBGUpdate: ; 91ee4
+TownMapBGUpdate:
 ; Update BG Map tiles and attributes
 
 ; BG Map address
@@ -2792,15 +2660,13 @@ TownMapBGUpdate: ; 91ee4
 	ld [hBGMapMode], a
 	ret
 
-; 91eff
-
-FillJohtoMap: ; 91eff
+FillJohtoMap:
 	ld de, JohtoMap
 	jr FillTownMap
 
-FillKantoMap: ; 91f04
+FillKantoMap:
 	ld de, KantoMap
-FillTownMap: ; 91f07
+FillTownMap:
 	hlcoord 0, 0
 .loop
 	ld a, [de]
@@ -2811,9 +2677,7 @@ FillTownMap: ; 91f07
 	inc de
 	jr .loop
 
-; 91f13
-
-TownMapPals: ; 91f13
+TownMapPals:
 ; Assign palettes based on tile ids
 	hlcoord 0, 0
 	decoord 0, 0, wAttrMap
@@ -2866,9 +2730,8 @@ TownMapPals: ; 91f13
 
 .PalMap:
 INCLUDE "gfx/pokegear/town_map_palette_map.asm"
-; 91f7b
 
-TownMapMon: ; 91f7b
+TownMapMon:
 ; Draw the FlyMon icon at town map location
 
 ; Get FlyMon species
@@ -2894,9 +2757,7 @@ TownMapMon: ; 91f7b
 	ld [hl], SPRITE_ANIM_SEQ_NULL
 	ret
 
-; 91fa6
-
-TownMapPlayerIcon: ; 91fa6
+TownMapPlayerIcon:
 ; Draw the player icon at town map location in a
 	push af
 	farcall GetPlayerIcon
@@ -2917,7 +2778,7 @@ TownMapPlayerIcon: ; 91fa6
 	depixel 0, 0
 	ld b, SPRITE_ANIM_INDEX_RED_WALK ; Male
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .got_gender
 	ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female
 .got_gender
@@ -2939,28 +2800,22 @@ TownMapPlayerIcon: ; 91fa6
 	ld [hl], d
 	ret
 
-; 0x91ff2
-
-LoadTownMapGFX: ; 91ff2
+LoadTownMapGFX:
 	ld hl, TownMapGFX
 	ld de, vTiles2
 	lb bc, BANK(TownMapGFX), 48
 	call DecompressRequest2bpp
 	ret
 
-; 91fff
-
-JohtoMap: ; 91fff
+JohtoMap:
 INCBIN "gfx/pokegear/johto.bin"
-; 92168
 
-KantoMap: ; 92168
+KantoMap:
 INCBIN "gfx/pokegear/kanto.bin"
-; 922d1
 
-PokedexNestIconGFX: ; 922d1
+PokedexNestIconGFX:
 INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp"
-FlyMapLabelBorderGFX: ; 922e1
+FlyMapLabelBorderGFX:
 INCBIN "gfx/pokegear/flymap_label_border.1bpp"
 
 Unreferenced_Function92311:
@@ -3041,9 +2896,7 @@ Unreferenced_Function92311:
 	ld e, a
 	ret
 
-; 923b8
-
-.HandleDPad: ; 923b8
+.HandleDPad:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN | D_RIGHT
@@ -3093,5 +2946,3 @@ Unreferenced_Function92311:
 	xor a
 	ld [hBGMapMode], a
 	ret
-
-; 92402
diff --git a/engine/radio.asm b/engine/pokegear/radio.asm
index e6ee257ee..b76cad13e 100644
--- a/engine/radio.asm
+++ b/engine/pokegear/radio.asm
@@ -5,7 +5,7 @@ PlayRadioShow:
 	jr nc, .ok
 ; If Team Rocket is not occupying the radio tower, we don't need to be here.
 	ld a, [wStatusFlags2]
-	bit 0, a ; checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
+	bit STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F, a
 	jr z, .ok
 ; If we're in Kanto, we don't need to be here.
 	call IsInJohto
@@ -29,7 +29,7 @@ PlayRadioShow:
 
 RadioJumptable:
 ; entries correspond to constants/radio_constants.asm
-	dw OaksPkmnTalk1  ; $00
+	dw OaksPKMNTalk1  ; $00
 	dw PokedexShow1 ; $01
 	dw BenMonMusic1  ; $02
 	dw LuckyNumberShow1 ; $03
@@ -40,15 +40,15 @@ RadioJumptable:
 	dw PokeFluteRadio ; $08
 	dw UnownRadio ; $09
 	dw EvolutionRadio ; $0a
-; OaksPkmnTalk
-	dw OaksPkmnTalk2  ; $0b
-	dw OaksPkmnTalk3  ; $0c
-	dw OaksPkmnTalk4  ; $0d
-	dw OaksPkmnTalk5  ; $0e
-	dw OaksPkmnTalk6  ; $0f
-	dw OaksPkmnTalk7  ; $10
-	dw OaksPkmnTalk8  ; $11
-	dw OaksPkmnTalk9  ; $12
+; OaksPKMNTalk
+	dw OaksPKMNTalk2  ; $0b
+	dw OaksPKMNTalk3  ; $0c
+	dw OaksPKMNTalk4  ; $0d
+	dw OaksPKMNTalk5  ; $0e
+	dw OaksPKMNTalk6  ; $0f
+	dw OaksPKMNTalk7  ; $10
+	dw OaksPKMNTalk8  ; $11
+	dw OaksPKMNTalk9  ; $12
 	dw PokedexShow2 ; $13
 	dw PokedexShow3 ; $14
 	dw PokedexShow4 ; $15
@@ -94,11 +94,11 @@ RadioJumptable:
 	dw RocketRadio9 ; $39
 	dw RocketRadio10 ; $3a
 ; More Pokemon Channel stuff
-	dw OaksPkmnTalk10 ; $3b
-	dw OaksPkmnTalk11 ; $3c
-	dw OaksPkmnTalk12 ; $3d
-	dw OaksPkmnTalk13 ; $3e
-	dw OaksPkmnTalk14 ; $3f
+	dw OaksPKMNTalk10 ; $3b
+	dw OaksPKMNTalk11 ; $3c
+	dw OaksPKMNTalk12 ; $3d
+	dw OaksPKMNTalk13 ; $3e
+	dw OaksPKMNTalk14 ; $3f
 ; Buenas Password
 	dw BuenasPassword2 ; $40
 	dw BuenasPassword3 ; $41
@@ -126,7 +126,6 @@ RadioJumptable:
 	dw PokedexShow7 ; $56
 	dw PokedexShow8 ; $57
 
-
 PrintRadioLine:
 	ld [wNextRadioLine], a
 	ld hl, wRadioText
@@ -182,33 +181,33 @@ RadioScroll:
 	call nz, CopyBottomLineToTopLine
 	jp ClearBottomLine
 
-OaksPkmnTalk1:
+OaksPKMNTalk1:
 	ld a, 5
-	ld [wOaksPkmnTalkSegmentCounter], a
+	ld [wOaksPKMNTalkSegmentCounter], a
 	call StartRadioStation
 	ld hl, OPT_IntroText1
 	ld a, OAKS_POKEMON_TALK_2
 	jp NextRadioLine
 
-OaksPkmnTalk2:
+OaksPKMNTalk2:
 	ld hl, OPT_IntroText2
 	ld a, OAKS_POKEMON_TALK_3
 	jp NextRadioLine
 
-OaksPkmnTalk3:
+OaksPKMNTalk3:
 	ld hl, OPT_IntroText3
 	ld a, OAKS_POKEMON_TALK_4
 	jp NextRadioLine
 
-OaksPkmnTalk4:
+OaksPKMNTalk4:
 ; Choose a random route, and a random Pokemon from that route.
 .sample
 	call Random
 	and %11111
-	cp (OaksPkmnTalkRoutesEnd - OaksPkmnTalkRoutes) / 2
+	cp (OaksPKMNTalkRoutes.End - OaksPKMNTalkRoutes) / 2
 	jr nc, .sample
 	; We now have a number between 0 and 14.
-	ld hl, OaksPkmnTalkRoutes
+	ld hl, OaksPKMNTalkRoutes
 	ld c, a
 	ld b, 0
 	add hl, bc
@@ -294,12 +293,12 @@ endr
 
 INCLUDE "data/radio/oaks_pkmn_talk_routes.asm"
 
-OaksPkmnTalk5:
+OaksPKMNTalk5:
 	ld hl, OPT_OakText2
 	ld a, OAKS_POKEMON_TALK_6
 	jp NextRadioLine
 
-OaksPkmnTalk6:
+OaksPKMNTalk6:
 	ld hl, OPT_OakText3
 	ld a, OAKS_POKEMON_TALK_7
 	jp NextRadioLine
@@ -334,7 +333,7 @@ OPT_OakText3:
 	text_jump _OPT_OakText3
 	db "@"
 
-OaksPkmnTalk7:
+OaksPKMNTalk7:
 	ld a, [wCurPartySpecies]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
@@ -347,11 +346,11 @@ OPT_MaryText1:
 	text_jump _OPT_MaryText1
 	db "@"
 
-OaksPkmnTalk8:
+OaksPKMNTalk8:
 	; 0-15 are all valid indexes into .Adverbs,
 	; so no need for a retry loop
 	call Random
-	maskbits NUM_OAKS_MON_TALK_ADVERBS
+	maskbits NUM_OAKS_POKEMON_TALK_ADVERBS
 	ld e, a
 	ld d, 0
 	ld hl, .Adverbs
@@ -364,7 +363,7 @@ OaksPkmnTalk8:
 	jp NextRadioLine
 
 .Adverbs:
-; there are NUM_OAKS_MON_TALK_ADVERBS entries
+; there are NUM_OAKS_POKEMON_TALK_ADVERBS entries
 	dw .sweetadorably
 	dw .wigglyslickly
 	dw .aptlynamed
@@ -462,11 +461,11 @@ OaksPkmnTalk8:
 	text_jump OPT_HeartMeltingly
 	db "@"
 
-OaksPkmnTalk9:
+OaksPKMNTalk9:
 	; 0-15 are all valid indexes into .Adjectives,
 	; so no need for a retry loop
 	call Random
-	maskbits NUM_OAKS_MON_TALK_ADJECTIVES
+	maskbits NUM_OAKS_POKEMON_TALK_ADJECTIVES
 	ld e, a
 	ld d, 0
 	ld hl, .Adjectives
@@ -475,19 +474,19 @@ OaksPkmnTalk9:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wOaksPkmnTalkSegmentCounter]
+	ld a, [wOaksPKMNTalkSegmentCounter]
 	dec a
-	ld [wOaksPkmnTalkSegmentCounter], a
+	ld [wOaksPKMNTalkSegmentCounter], a
 	ld a, OAKS_POKEMON_TALK_4
 	jr nz, .ok
 	ld a, 5
-	ld [wOaksPkmnTalkSegmentCounter], a
+	ld [wOaksPKMNTalkSegmentCounter], a
 	ld a, OAKS_POKEMON_TALK_10
 .ok
 	jp NextRadioLine
 
 .Adjectives:
-; there are NUM_OAKS_MON_TALK_ADJECTIVES entries
+; there are NUM_OAKS_POKEMON_TALK_ADJECTIVES entries
 	dw .cute
 	dw .weird
 	dw .pleasant
@@ -585,7 +584,7 @@ OaksPkmnTalk9:
 	text_jump OPT_Speedy
 	db "@"
 
-OaksPkmnTalk10:
+OaksPKMNTalk10:
 	farcall RadioMusicRestartPokemonChannel
 	ld hl, OPT_RestartText
 	call PrintText
@@ -606,7 +605,7 @@ OPT_PokemonChannelText:
 OPT_RestartText:
 	db "@"
 
-OaksPkmnTalk11:
+OaksPKMNTalk11:
 	ld hl, wRadioTextDelay
 	dec [hl]
 	ret nz
@@ -618,7 +617,7 @@ OaksPkmnTalk11:
 .pokemon_string
 	db "#MON@"
 
-OaksPkmnTalk12:
+OaksPKMNTalk12:
 	ld hl, wRadioTextDelay
 	dec [hl]
 	ret nz
@@ -630,7 +629,7 @@ OaksPkmnTalk12:
 .pokemon_channel_string
 	db "#MON Channel@"
 
-OaksPkmnTalk13:
+OaksPKMNTalk13:
 	ld hl, wRadioTextDelay
 	dec [hl]
 	ret nz
@@ -642,7 +641,7 @@ OaksPkmnTalk13:
 .terminator
 	db "@"
 
-OaksPkmnTalk14:
+OaksPKMNTalk14:
 	ld hl, wRadioTextDelay
 	dec [hl]
 	ret nz
@@ -702,11 +701,11 @@ PokedexShow_GetDexEntryBank:
 	pop hl
 	ret
 
-.PokedexEntryBanks
-	db BANK(PokedexEntries1)
-	db BANK(PokedexEntries2)
-	db BANK(PokedexEntries3)
-	db BANK(PokedexEntries4)
+.PokedexEntryBanks:
+	db BANK("Pokedex Entries 001-064")
+	db BANK("Pokedex Entries 065-128")
+	db BANK("Pokedex Entries 129-192")
+	db BANK("Pokedex Entries 193-251")
 
 PokedexShow1:
 	call StartRadioStation
@@ -972,9 +971,9 @@ BenFernText3B:
 
 LuckyNumberShow1:
 	call StartRadioStation
-	callfar Special_CheckLuckyNumberShowFlag
+	callfar CheckLuckyNumberShowFlag
 	jr nc, .dontreset
-	callfar Special_ResetLuckyNumberShowFlag
+	callfar ResetLuckyNumberShowFlag
 .dontreset
 	ld hl, LC_Text1
 	ld a, LUCKY_NUMBER_SHOW_2
@@ -1171,7 +1170,7 @@ PeoplePlaces4: ; People
 	push af
 	ld hl, PnP_HiddenPeople
 	ld a, [wStatusFlags]
-	bit 6, a ; ENGINE_CREDITS_SKIP
+	bit STATUSFLAGS_HALL_OF_FAME_F, a
 	jr z, .ok
 	ld hl, PnP_HiddenPeople_BeatE4
 	ld a, [wKantoBadges]
@@ -1330,7 +1329,7 @@ PnP_odd:
 
 PeoplePlaces6: ; Places
 	call Random
-	cp (PnP_HiddenPlacesEnd - PnP_HiddenPlaces) / 2
+	cp (PnP_HiddenPlaces.End - PnP_HiddenPlaces) / 2
 	jr nc, PeoplePlaces6
 	ld hl, PnP_HiddenPlaces
 	ld c, a
@@ -1560,7 +1559,7 @@ BuenasPassword4:
 	ld a, [wBuenasPassword]
 ; If we already generated the password today, we don't need to generate a new one.
 	ld hl, wWeeklyFlags
-	bit 7, [hl] ; ENGINE_BUENAS_PASSWORD
+	bit WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl]
 	jr nz, .AlreadyGotIt
 ; There are only 11 groups to choose from.
 .greater_than_11
@@ -1582,7 +1581,7 @@ BuenasPassword4:
 	ld [wBuenasPassword], a
 ; Set the flag so that we don't generate a new password this week.
 	ld hl, wWeeklyFlags
-	set 7, [hl] ; ENGINE_BUENAS_PASSWORD
+	set WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl]
 .AlreadyGotIt:
 	ld c, a
 	call GetBuenasPassword
@@ -1703,14 +1702,14 @@ BuenasPassword7:
 BuenasPasswordAfterMidnight:
 	push hl
 	ld hl, wWeeklyFlags
-	res 7, [hl] ; ENGINE_BUENAS_PASSWORD
+	res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl]
 	pop hl
 	ld a, BUENAS_PASSWORD_8
 	jp NextRadioLine
 
 BuenasPassword8:
 	ld hl, wWeeklyFlags
-	res 7, [hl] ; ENGINE_BUENAS_PASSWORD
+	res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl]
 	ld hl, BuenaRadioMidnightText10
 	ld a, BUENAS_PASSWORD_9
 	jp NextRadioLine
@@ -1778,7 +1777,7 @@ BuenasPassword20:
 	pop af
 	ld [hBGMapMode], a
 	ld hl, wWeeklyFlags
-	res 7, [hl]
+	res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl]
 	ld a, BUENAS_PASSWORD
 	ld [wCurrentRadioLine], a
 	xor a
diff --git a/engine/routines/townmap_convertlinebreakcharacters.asm b/engine/pokegear/townmap_convertlinebreakcharacters.asm
index 6ccd79aae..a881b9260 100644
--- a/engine/routines/townmap_convertlinebreakcharacters.asm
+++ b/engine/pokegear/townmap_convertlinebreakcharacters.asm
@@ -1,18 +1,18 @@
-TownMap_ConvertLineBreakCharacters: ; 1de2c5
+TownMap_ConvertLineBreakCharacters:
 	ld hl, wStringBuffer1
 .loop
 	ld a, [hl]
 	cp "@"
 	jr z, .end
 	cp "%"
-	jr z, .line_break
+	jr z, .line_feed
 	cp "¯"
-	jr z, .line_break
+	jr z, .line_feed
 	inc hl
 	jr .loop
 
-.line_break
-	ld [hl], "<LNBRK>"
+.line_feed
+	ld [hl], "<LF>"
 
 .end
 	ld de, wStringBuffer1
diff --git a/engine/billspc.asm b/engine/pokemon/bills_pc.asm
index 57c4faac4..65621192d 100755..100644
--- a/engine/billspc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -1,8 +1,8 @@
-_DepositPKMN: ; e2391 (38:6391)
+_DepositPKMN:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
-	set 4, [hl]
+	set NO_TEXT_SCROLL, [hl]
 	ld a, [wVramState]
 	push af
 	xor a
@@ -35,20 +35,20 @@ _DepositPKMN: ; e2391 (38:6391)
 	ld [wOptions], a
 	ret
 
-.RunJumptable: ; e23d5 (38:63d5)
+.RunJumptable:
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call BillsPC_Jumptable
 	jp hl
 
-.Jumptable: ; e23df (38:63df)
+.Jumptable:
 	dw .Init
 	dw .HandleJoypad
 	dw .WhatsUp
 	dw .Submenu
 	dw BillsPC_EndJumptableLoop
 
-.Init: ; e23e9 (38:63e9)
+.Init:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -69,7 +69,7 @@ _DepositPKMN: ; e2391 (38:6391)
 	call BillsPC_IncrementJumptableIndex
 	ret
 
-.HandleJoypad: ; e241a (38:641a)
+.HandleJoypad:
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and B_BUTTON
@@ -100,7 +100,6 @@ _DepositPKMN: ; e2391 (38:6391)
 	ld a, $2
 	ld [wJumptableIndex], a
 	ret
-; e2452 (38:6452)
 
 .go_back
 	ld hl, wJumptableIndex
@@ -112,7 +111,7 @@ _DepositPKMN: ; e2391 (38:6391)
 	ld [wJumptableIndex], a
 	ret
 
-.WhatsUp: ; e245d (38:645d)
+.WhatsUp:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -127,9 +126,9 @@ _DepositPKMN: ; e2391 (38:6391)
 	call BillsPC_IncrementJumptableIndex
 	ret
 
-.Submenu: ; e247d (38:647d)
-	ld hl, BillsPCDepositMenuDataHeader
-	call CopyMenuDataHeader
+.Submenu:
+	ld hl, BillsPCDepositMenuHeader
+	call CopyMenuHeader
 	ld a, [wMenuCursorY]
 	call StoreTo_wMenuCursorBuffer
 	call VerticalMenu
@@ -147,14 +146,13 @@ _DepositPKMN: ; e2391 (38:6391)
 	ld l, a
 	jp hl
 
-BillsPCDepositJumptable: ; e24a1 (38:64a1)
+BillsPCDepositJumptable:
 	dw BillsPCDepositFuncDeposit ; Deposit Pokemon
 	dw BillsPCDepositFuncStats ; Pokemon Stats
 	dw BillsPCDepositFuncRelease ; Release Pokemon
 	dw BillsPCDepositFuncCancel ; Cancel
 
-
-BillsPCDepositFuncDeposit: ; e24a9 (38:64a9)
+BillsPCDepositFuncDeposit:
 	call BillsPC_CheckMail_PreventBlackout
 	jp c, BillsPCDepositFuncCancel
 	call DepositPokemon
@@ -171,8 +169,8 @@ BillsPCDepositFuncDeposit: ; e24a9 (38:64a9)
 	call BillsPC_PlaceString
 	ret
 
-BillsPCDepositFuncStats: ; e24c8 (38:64c8)
-	call LoadStandardMenuDataHeader
+BillsPCDepositFuncStats:
+	call LoadStandardMenuHeader
 	call BillsPC_StatsScreen
 	call ExitMenu
 	call PCMonInfo
@@ -182,7 +180,7 @@ BillsPCDepositFuncStats: ; e24c8 (38:64c8)
 	call BillsPC_ApplyPalettes
 	ret
 
-BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
+BillsPCDepositFuncRelease:
 	call BillsPC_CheckMail_PreventBlackout
 	jr c, BillsPCDepositFuncCancel
 	call BillsPC_IsMonAnEgg
@@ -191,7 +189,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
 	push af
 	ld de, PCString_ReleasePKMN
 	call BillsPC_PlaceString
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	lb bc, 14, 11
 	call PlaceYesNoBox
 	ld a, [wMenuCursorY]
@@ -203,7 +201,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
 	ld [wCurPartyMon], a
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	call ReleasePKMN_ByePKMN
@@ -222,29 +220,26 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
 	ld [wMenuCursorY], a
 	ret
 
-BillsPCDepositFuncCancel: ; e2537 (38:6537)
+BillsPCDepositFuncCancel:
 	ld a, $0
 	ld [wJumptableIndex], a
 	ret
-; e253d (38:653d)
 
-BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d)
+BillsPCDepositMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0xe2545
 
-.MenuData2: ; 0xe2545 (38:6545)
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "DEPOSIT@"
 	db "STATS@"
 	db "RELEASE@"
 	db "CANCEL@"
-; 0xe2564 (38:6564)
 
-Unreferenced_BillsPCClearThreeBoxes: ; e2564
+Unreferenced_BillsPCClearThreeBoxes:
 	hlcoord 0, 0
 	ld b,  4
 	ld c,  8
@@ -258,13 +253,12 @@ Unreferenced_BillsPCClearThreeBoxes: ; e2564
 	ld c,  8
 	call ClearBox
 	ret
-; e2583
 
-_WithdrawPKMN: ; e2583 (38:6583)
+_WithdrawPKMN:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
-	set 4, [hl]
+	set NO_TEXT_SCROLL, [hl]
 	ld a, [wVramState]
 	push af
 	xor a
@@ -297,20 +291,20 @@ _WithdrawPKMN: ; e2583 (38:6583)
 	ld [wOptions], a
 	ret
 
-.RunJumptable: ; e25c8 (38:65c8)
+.RunJumptable:
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call BillsPC_Jumptable
 	jp hl
 
-.Jumptable: ; e25d2 (38:65d2)
+.Jumptable:
 	dw .Init
 	dw .Joypad
 	dw .PrepSubmenu
 	dw BillsPC_Withdraw
 	dw BillsPC_EndJumptableLoop
 
-.Init: ; e25dc (38:65dc)
+.Init:
 	ld a, NUM_BOXES + 1
 	ld [wBillsPC_LoadedBox], a
 	xor a
@@ -333,7 +327,7 @@ _WithdrawPKMN: ; e2583 (38:6583)
 	call BillsPC_IncrementJumptableIndex
 	ret
 
-.Joypad: ; e2612 (38:6612)
+.Joypad:
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and B_BUTTON
@@ -362,7 +356,7 @@ _WithdrawPKMN: ; e2583 (38:6583)
 	jr z, .b_button
 	ld a, $2
 	ld [wJumptableIndex], a
-	ret ; e264a (38:664a)
+	ret
 
 .unused
 	ld hl, wJumptableIndex
@@ -373,9 +367,8 @@ _WithdrawPKMN: ; e2583 (38:6583)
 	ld a, $4
 	ld [wJumptableIndex], a
 	ret
-; e2655
 
-.PrepSubmenu: ; e2655 (38:6655)
+.PrepSubmenu:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -390,9 +383,9 @@ _WithdrawPKMN: ; e2583 (38:6583)
 	call BillsPC_IncrementJumptableIndex
 	ret
 
-BillsPC_Withdraw: ; e2675 (38:6675)
-	ld hl, .MenuDataHeader
-	call CopyMenuDataHeader
+BillsPC_Withdraw:
+	ld hl, .MenuHeader
+	call CopyMenuHeader
 	ld a, [wMenuCursorY]
 	call StoreTo_wMenuCursorBuffer
 	call VerticalMenu
@@ -410,14 +403,13 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 	ld l, a
 	jp hl
 
-.dw ; e2699 (38:6699) #mark
+.dw
 	dw .withdraw ; Withdraw
 	dw .stats ; Stats
 	dw .release ; Release
 	dw .cancel ; Cancel
 
-
-.withdraw ; e26a1 (38:66a1)
+.withdraw
 	call BillsPC_CheckMail_PreventBlackout
 	jp c, .cancel
 	call TryWithdrawPokemon
@@ -433,8 +425,8 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 	call BillsPC_PlaceString
 	ret
 
-.stats ; e26c0 (38:66c0)
-	call LoadStandardMenuDataHeader
+.stats
+	call LoadStandardMenuHeader
 	call BillsPC_StatsScreen
 	call ExitMenu
 	call PCMonInfo
@@ -444,14 +436,14 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 	call BillsPC_ApplyPalettes
 	ret
 
-.release ; e26d8 (38:66d8)
+.release
 	ld a, [wMenuCursorY]
 	push af
 	call BillsPC_IsMonAnEgg
 	jr c, .FailedRelease
 	ld de, PCString_ReleasePKMN
 	call BillsPC_PlaceString
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	lb bc, 14, 11
 	call PlaceYesNoBox
 	ld a, [wMenuCursorY]
@@ -463,7 +455,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
 	ld [wCurPartyMon], a
-	ld a, PC_DEPOSIT
+	ld a, REMOVE_BOX
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	call ReleasePKMN_ByePKMN
@@ -481,33 +473,30 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 	ld [wMenuCursorY], a
 	ret
 
-.cancel ; e272b (38:672b)
+.cancel
 	ld a, $0
 	ld [wJumptableIndex], a
 	ret
-; e2731 (38:6731)
 
-.MenuDataHeader: ; 0xe2731
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData
 	db 1 ; default option
-; 0xe2739
 
-.MenuData: ; 0xe2739
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "WITHDRAW@"
 	db "STATS@"
 	db "RELEASE@"
 	db "CANCEL@"
-; 0xe2759
 
-_MovePKMNWithoutMail: ; e2759
+_MovePKMNWithoutMail:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
-	set 4, [hl]
+	set NO_TEXT_SCROLL, [hl]
 	ld a, [wVramState]
 	push af
 	xor a
@@ -542,16 +531,14 @@ _MovePKMNWithoutMail: ; e2759
 	pop af
 	ld [wOptions], a
 	ret
-; e27a2
 
-.RunJumptable: ; e27a2
+.RunJumptable:
 	ld a, [wJumptableIndex]
 	ld hl, .Jumptable
 	call BillsPC_Jumptable
 	jp hl
-; e27ac
 
-.Jumptable: ; e27ac
+.Jumptable:
 	dw .Init
 	dw .Joypad
 	dw .PrepSubmenu
@@ -559,9 +546,8 @@ _MovePKMNWithoutMail: ; e2759
 	dw .PrepInsertCursor
 	dw .Joypad2
 	dw BillsPC_EndJumptableLoop
-; e27ba
 
-.Init: ; e27ba
+.Init:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -581,9 +567,8 @@ _MovePKMNWithoutMail: ; e2759
 	call BillsPC_UpdateSelectionCursor
 	call BillsPC_IncrementJumptableIndex
 	ret
-; e27eb
 
-.Joypad: ; e27eb
+.Joypad:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -591,7 +576,7 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, [hl]
 	and A_BUTTON
 	jr nz, .a_button
-	call MovePkmnWithoutMail_DPad
+	call MoveMonWithoutMail_DPad
 	jr c, .d_pad
 	and a
 	ret z
@@ -633,9 +618,8 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, $6
 	ld [wJumptableIndex], a
 	ret
-; e283d
 
-.PrepSubmenu: ; e283d
+.PrepSubmenu:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -649,11 +633,10 @@ _MovePKMNWithoutMail: ; e2759
 	ld [wMenuCursorY], a
 	call BillsPC_IncrementJumptableIndex
 	ret
-; e285d
 
-.MoveMonWOMailSubmenu: ; e285d
-	ld hl, .MenuDataHeader
-	call CopyMenuDataHeader
+.MoveMonWOMailSubmenu:
+	ld hl, .MenuHeader
+	call CopyMenuHeader
 	ld a, [wMenuCursorY]
 	call StoreTo_wMenuCursorBuffer
 	call VerticalMenu
@@ -670,15 +653,13 @@ _MovePKMNWithoutMail: ; e2759
 	ld h, [hl]
 	ld l, a
 	jp hl
-; e2881
 
-.Jumptable2: ; e2881
+.Jumptable2:
 	dw .Move
 	dw .Stats
 	dw .Cancel
-; e2887
 
-.Move: ; e2887
+.Move:
 	call BillsPC_CheckMail_PreventBlackout
 	jp c, .Cancel
 	ld a, [wBillsPC_ScrollPosition]
@@ -690,10 +671,9 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, $4
 	ld [wJumptableIndex], a
 	ret
-; e28a5
 
-.Stats: ; e28a5
-	call LoadStandardMenuDataHeader
+.Stats:
+	call LoadStandardMenuHeader
 	call BillsPC_StatsScreen
 	call ExitMenu
 	call PCMonInfo
@@ -702,30 +682,26 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, SCGB_BILLS_PC
 	call BillsPC_ApplyPalettes
 	ret
-; e28bd
 
-.Cancel: ; e28bd
+.Cancel:
 	ld a, $0
 	ld [wJumptableIndex], a
 	ret
-; e28c3
 
-.MenuDataHeader: ; 0xe28c3
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0xe28cb
 
-.MenuData2: ; 0xe28cb
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "MOVE@"
 	db "STATS@"
 	db "CANCEL@"
-; 0xe28df
 
-.PrepInsertCursor: ; e28df
+.PrepInsertCursor:
 	xor a
 	ld [hBGMapMode], a
 	call CopyBoxmonSpecies
@@ -740,9 +716,8 @@ _MovePKMNWithoutMail: ; e2759
 	call WaitBGMap
 	call BillsPC_IncrementJumptableIndex
 	ret
-; e2903
 
-.Joypad2: ; e2903
+.Joypad2:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -750,7 +725,7 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, [hl]
 	and A_BUTTON
 	jr nz, .a_button_2
-	call MovePkmnWithoutMail_DPad_2
+	call MoveMonWithoutMail_DPad_2
 	jr c, .dpad_2
 	and a
 	ret z
@@ -795,9 +770,8 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, $0
 	ld [wJumptableIndex], a
 	ret
-; e2963
 
-BillsPC_InitRAM: ; e2963 (38:6963)
+BillsPC_InitRAM:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -815,17 +789,17 @@ BillsPC_InitRAM: ; e2963 (38:6963)
 	ld [wBillsPC_ScrollPosition], a
 	ret
 
-BillsPC_IncrementJumptableIndex: ; e298d (38:698d)
+BillsPC_IncrementJumptableIndex:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 
-BillsPC_EndJumptableLoop: ; e2992 (38:6992)
+BillsPC_EndJumptableLoop:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
 
-_StatsScreenDPad: ; e2998 (38:6998)
+_StatsScreenDPad:
 	ld a, [wBillsPC_NumMonsOnScreen]
 	ld d, a
 	ld a, [wBillsPC_NumMonsInBox]
@@ -844,7 +818,7 @@ _StatsScreenDPad: ; e2998 (38:6998)
 .empty
 	jp BillsPC_JoypadDidNothing
 
-Withdraw_UpDown: ; e29b5 (38:69b5)
+Withdraw_UpDown:
 	ld hl, hJoyLast
 	ld a, [wBillsPC_NumMonsOnScreen]
 	ld d, a
@@ -860,9 +834,8 @@ Withdraw_UpDown: ; e29b5 (38:69b5)
 	jr nz, BillsPC_PressDown
 .empty
 	jp BillsPC_JoypadDidNothing
-; e29d0 (38:69d0)
 
-MovePkmnWithoutMail_DPad: ; e29d0
+MoveMonWithoutMail_DPad:
 	ld hl, hJoyLast
 	ld a, [wBillsPC_NumMonsOnScreen]
 	ld d, a
@@ -886,7 +859,7 @@ MovePkmnWithoutMail_DPad: ; e29d0
 	jr nz, BillsPC_PressRight
 	jr BillsPC_JoypadDidNothing
 
-MovePkmnWithoutMail_DPad_2: ; e29f4
+MoveMonWithoutMail_DPad_2:
 	ld hl, hJoyLast
 	ld a, [wBillsPC_NumMonsOnScreen]
 	ld d, a
@@ -911,7 +884,7 @@ MovePkmnWithoutMail_DPad_2: ; e29f4
 	jr nz, BillsPC_PressRight
 	jr BillsPC_JoypadDidNothing
 
-BillsPC_PressUp: ; e2a18 (38:6a18)
+BillsPC_PressUp:
 	ld hl, wBillsPC_CursorPosition
 	ld a, [hl]
 	and a
@@ -927,7 +900,7 @@ BillsPC_PressUp: ; e2a18 (38:6a18)
 	dec [hl]
 	jr BillsPC_UpDownDidSomething
 
-BillsPC_PressDown: ; e2a2c (38:6a2c)
+BillsPC_PressDown:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -947,9 +920,8 @@ BillsPC_PressDown: ; e2a2c (38:6a2c)
 	ld hl, wBillsPC_ScrollPosition
 	inc [hl]
 	jr BillsPC_UpDownDidSomething
-; e2a48 (38:6a48)
 
-BillsPC_PressLeft: ; e2a48
+BillsPC_PressLeft:
 	ld hl, wBillsPC_LoadedBox
 	ld a, [hl]
 	and a
@@ -961,7 +933,7 @@ BillsPC_PressLeft: ; e2a48
 	ld [hl], NUM_BOXES
 	jr BillsPC_LeftRightDidSomething
 
-BillsPC_PressRight: ; e2a56
+BillsPC_PressRight:
 	ld hl, wBillsPC_LoadedBox
 	ld a, [hl]
 	cp NUM_BOXES
@@ -973,23 +945,21 @@ BillsPC_PressRight: ; e2a56
 	ld [hl], 0
 	jr BillsPC_LeftRightDidSomething
 
-BillsPC_JoypadDidNothing: ; e2a65 (38:6a65)
+BillsPC_JoypadDidNothing:
 	xor a
 	and a
 	ret
 
-BillsPC_UpDownDidSomething: ; e2a68 (38:6a68)
+BillsPC_UpDownDidSomething:
 	ld a, TRUE
 	and a
 	ret
-; e2a6c (38:6a6c)
 
-BillsPC_LeftRightDidSomething: ; e2a6c
+BillsPC_LeftRightDidSomething:
 	scf
 	ret
-; e2a6e
 
-BillsPC_PlaceString: ; e2a6e (38:6a6e)
+BillsPC_PlaceString:
 	push de
 	hlcoord 0, 15
 	lb bc, 1, 18
@@ -998,18 +968,16 @@ BillsPC_PlaceString: ; e2a6e (38:6a6e)
 	hlcoord 1, 16
 	call PlaceString
 	ret
-; e2a80 (38:6a80)
 
-BillsPC_MoveMonWOMail_BoxNameAndArrows: ; e2a80
+BillsPC_MoveMonWOMail_BoxNameAndArrows:
 	call BillsPC_BoxName
 	hlcoord 8, 1
 	ld [hl], $5f
 	hlcoord 19, 1
 	ld [hl], $5e
 	ret
-; e2a8e
 
-BillsPC_BoxName: ; e2a8e (38:6a8e)
+BillsPC_BoxName:
 	hlcoord 8, 0
 	lb bc, 1, 10
 	call TextBox
@@ -1038,13 +1006,11 @@ BillsPC_BoxName: ; e2a8e (38:6a8e)
 	hlcoord 10, 1
 	call PlaceString
 	ret
-; e2abd (38:6abd)
 
 .PartyPKMN:
 	db "PARTY <PK><MN>@"
-; e2ac6
 
-PCMonInfo: ; e2ac6 (38:6ac6)
+PCMonInfo:
 ; Display a monster's pic and
 ; attributes when highlighting
 ; it in a PC menu.
@@ -1143,7 +1109,7 @@ PCMonInfo: ; e2ac6 (38:6ac6)
 	ld [hl], a
 	ret
 
-BillsPC_LoadMonStats: ; e2b6d (38:6b6d)
+BillsPC_LoadMonStats:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -1250,7 +1216,7 @@ BillsPC_LoadMonStats: ; e2b6d (38:6b6d)
 	call CloseSRAM
 	ret
 
-BillsPC_RefreshTextboxes: ; e2c2c (38:6c2c)
+BillsPC_RefreshTextboxes:
 	hlcoord 8, 2
 	lb bc, 10, 10
 	call TextBox
@@ -1287,13 +1253,11 @@ BillsPC_RefreshTextboxes: ; e2c2c (38:6c2c)
 	dec a
 	jr nz, .loop
 	ret
-; e2c67 (38:6c67)
 
 .CancelString:
 	db "CANCEL@"
-; e2c6e
 
-.PlaceNickname: ; e2c6e (38:6c6e)
+.PlaceNickname:
 	ld a, [de]
 	and a
 	ret z
@@ -1402,11 +1366,9 @@ BillsPC_RefreshTextboxes: ; e2c2c (38:6c2c)
 	ld de, .Placeholder
 	call PlaceString
 	ret
-; e2d2a (38:6d2a)
 
 .Placeholder:
 	db "-----@"
-; e2d30
 
 copy_box_data: MACRO
 .loop\@
@@ -1442,7 +1404,7 @@ endc
 	ld [wBillsPC_NumMonsInBox], a
 ENDM
 
-CopyBoxmonSpecies: ; e2d30 (38:6d30)
+CopyBoxmonSpecies:
 	xor a
 	ld hl, wBillsPCPokemonList
 	ld bc, 3 * 30
@@ -1476,7 +1438,7 @@ CopyBoxmonSpecies: ; e2d30 (38:6d30)
 	copy_box_data 1
 	ret
 
-BillsPC_GetSelectedPokemonSpecies: ; e2def (38:6def)
+BillsPC_GetSelectedPokemonSpecies:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -1489,7 +1451,7 @@ BillsPC_GetSelectedPokemonSpecies: ; e2def (38:6def)
 	ld a, [hl]
 	ret
 
-BillsPC_UpdateSelectionCursor: ; e2e01 (38:6e01)
+BillsPC_UpdateSelectionCursor:
 	ld a, [wBillsPC_NumMonsInBox]
 	and a
 	jr nz, .place_cursor
@@ -1510,15 +1472,14 @@ BillsPC_UpdateSelectionCursor: ; e2e01 (38:6e01)
 	inc hl
 	ld [de], a ; y
 	inc de
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	ld a, [hli]
 	ld [de], a
 	inc de
 endr
 	jr .loop
-; e2e2b (38:6e2b)
 
-.OAM: ; e2e2b
+.OAM:
 	dsprite 4, 6, 10, 0, $00, 0
 	dsprite 4, 6, 11, 0, $00, 0
 	dsprite 4, 6, 12, 0, $00, 0
@@ -1544,9 +1505,8 @@ endr
 	dsprite 5, 6, 19, 1, $01, 0 | X_FLIP
 	dsprite 6, 1, 19, 1, $01, 0 | X_FLIP | Y_FLIP
 	db -1
-; e2e8c
 
-BillsPC_UpdateInsertCursor: ; e2e8c
+BillsPC_UpdateInsertCursor:
 	ld hl, .OAM
 	ld de, wVirtualOAMSprite00
 .loop
@@ -1560,15 +1520,14 @@ BillsPC_UpdateInsertCursor: ; e2e8c
 	inc hl
 	ld [de], a ; y
 	inc de
-rept SPRITEOAMSTRUCT_LENGTH +- 1
+rept SPRITEOAMSTRUCT_LENGTH + -1
 	ld a, [hli]
 	ld [de], a
 	inc de
 endr
 	jr .loop
-; e2eac
 
-.OAM: ; e2eac
+.OAM:
 	dsprite 4, 7, 10, 0, $06, 0
 	dsprite 5, 3, 11, 0, $00, 0 | Y_FLIP
 	dsprite 5, 3, 12, 0, $00, 0 | Y_FLIP
@@ -1580,9 +1539,8 @@ endr
 	dsprite 5, 3, 18, 0, $00, 0 | Y_FLIP
 	dsprite 4, 7, 19, 0, $07, 0
 	db -1
-; e2ed5
 
-Unreferenced_BillsPC_FillBox: ; e2ed5
+Unreferenced_BillsPC_FillBox:
 .row
 	push bc
 	push hl
@@ -1597,9 +1555,8 @@ Unreferenced_BillsPC_FillBox: ; e2ed5
 	dec b
 	jr nz, .row
 	ret
-; e2ee5
 
-BillsPC_CheckSpaceInDestination: ; e2ee5
+BillsPC_CheckSpaceInDestination:
 ; If moving within a box, no need to be here.
 	ld hl, wBillsPC_LoadedBox
 	ld a, [wBillsPC_BackupLoadedBox]
@@ -1633,9 +1590,8 @@ BillsPC_CheckSpaceInDestination: ; e2ee5
 	call DelayFrames
 	scf
 	ret
-; e2f18
 
-BillsPC_CheckMail_PreventBlackout: ; e2f18 (38:6f18)
+BillsPC_CheckMail_PreventBlackout:
 	ld a, [wBillsPC_LoadedBox]
 	and a
 	jr nz, .Okay
@@ -1675,7 +1631,7 @@ BillsPC_CheckMail_PreventBlackout: ; e2f18 (38:6f18)
 	scf
 	ret
 
-BillsPC_IsMonAnEgg: ; e2f5f (38:6f5f)
+BillsPC_IsMonAnEgg:
 	ld a, [wCurPartySpecies]
 	cp EGG
 	jr z, .egg
@@ -1693,7 +1649,7 @@ BillsPC_IsMonAnEgg: ; e2f5f (38:6f5f)
 	scf
 	ret
 
-BillsPC_StatsScreen: ; e2f7e (38:6f7e)
+BillsPC_StatsScreen:
 	call LowVolume
 	call BillsPC_CopyMon
 	ld a, $3
@@ -1703,7 +1659,7 @@ BillsPC_StatsScreen: ; e2f7e (38:6f7e)
 	call MaxVolume
 	ret
 
-StatsScreenDPad: ; e2f95 (38:6f95)
+StatsScreenDPad:
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and A_BUTTON | B_BUTTON | D_RIGHT | D_LEFT
@@ -1737,7 +1693,7 @@ StatsScreenDPad: ; e2f95 (38:6f95)
 	ld [wMenuJoypad], a
 	ret
 
-BillsPC_CopyMon: ; e2fd6 (38:6fd6)
+BillsPC_CopyMon:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -1763,7 +1719,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6)
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyBytes
 	call CloseSRAM
-	farcall CalcwBufferMonStats
+	farcall CalcBufferMonStats
 	ret
 
 .party
@@ -1806,10 +1762,10 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6)
 	ld bc, BOXMON_STRUCT_LENGTH
 	call CopyMonToTemp
 	call CloseSRAM
-	farcall CalcwBufferMonStats
+	farcall CalcBufferMonStats
 	ret
 
-DepositPokemon: ; e307c (38:707c)
+DepositPokemon:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -1819,9 +1775,9 @@ DepositPokemon: ; e307c (38:707c)
 	call GetNick
 	ld a, PC_DEPOSIT
 	ld [wPokemonWithdrawDepositParameter], a
-	predef SendGetPkmnIntoFromBox
+	predef SendGetMonIntoFromBox
 	jr c, .asm_boxisfull
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ld a, [wCurPartySpecies]
@@ -1861,7 +1817,7 @@ DepositPokemon: ; e307c (38:707c)
 	scf
 	ret
 
-TryWithdrawPokemon: ; e30fa (38:70fa)
+TryWithdrawPokemon:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -1874,9 +1830,9 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
 	call CloseSRAM
 	xor a
 	ld [wPokemonWithdrawDepositParameter], a
-	predef SendGetPkmnIntoFromBox
+	predef SendGetMonIntoFromBox
 	jr c, .PartyFull
-	ld a, PC_DEPOSIT
+	ld a, REMOVE_BOX
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ld a, [wCurPartySpecies]
@@ -1916,8 +1872,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
 	scf
 	ret
 
-
-ReleasePKMN_ByePKMN: ; e3180 (38:7180)
+ReleasePKMN_ByePKMN:
 	hlcoord 0, 0
 	lb bc, 15, 8
 	call ClearBox
@@ -1962,9 +1917,8 @@ ReleasePKMN_ByePKMN: ; e3180 (38:7180)
 	ld c, 50
 	call DelayFrames
 	ret
-; e31e7 (38:71e7)
 
-MovePKMNWitoutMail_InsertMon: ; e31e7
+MovePKMNWitoutMail_InsertMon:
 	push hl
 	push de
 	push bc
@@ -2005,27 +1959,23 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld de, .dw_return
 	push de
 	jp hl
-; e322a
 
-.dw_return ; e322a
+.dw_return
 	pop af
 	ld e, a
-	farcall MovePkmnWOMail_InsertMon_SaveGame
+	farcall MoveMonWOMail_InsertMon_SaveGame
 	ret
-; e3233
 
 .Saving_LeaveOn:
 	db "Saving… Leave ON!@"
-; e3245
 
-.Jumptable: ; e3245
+.Jumptable:
 	dw .BoxToBox
 	dw .PartyToBox
 	dw .BoxToParty
 	dw .PartyToParty
-; e324d
 
-.BoxToBox: ; e324d
+.BoxToBox:
 	ld hl, wBillsPC_BackupLoadedBox
 	ld a, [wBillsPC_LoadedBox]
 	cp [hl]
@@ -2039,9 +1989,8 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	call .CheckTrivialMove
 	call .CopyToBox
 	ret
-; e3267
 
-.PartyToBox: ; e3267
+.PartyToBox:
 	call .CopyFromParty
 	ld a, $1
 	ld [wGameLogicPaused], a
@@ -2050,22 +1999,19 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld [wGameLogicPaused], a
 	call .CopyToBox
 	ret
-; e327d
 
-.BoxToParty: ; e327d
+.BoxToParty:
 	call .CopyFromBox
 	call .CopyToParty
 	ret
-; e3284
 
-.PartyToParty: ; e3284
+.PartyToParty:
 	call .CopyFromParty
 	call .CheckTrivialMove
 	call .CopyToParty
 	ret
-; e328e
 
-.CheckTrivialMove: ; e328e
+.CheckTrivialMove:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -2089,13 +2035,12 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ret z
 	dec [hl]
 	ret
-; e32b0
 
-.CopyFromBox: ; e32b0
+.CopyFromBox:
 	ld a, [wBillsPC_BackupLoadedBox]
 	dec a
 	ld e, a
-	farcall MovePkmnWOMail_SaveGame
+	farcall MoveMonWOMail_SaveGame
 	ld a, [wBillsPC_BackupCursorPosition]
 	ld hl, wBillsPC_BackupScrollPosition
 	add [hl]
@@ -2112,27 +2057,25 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld bc, BOXMON_STRUCT_LENGTH
 	call CopyMonToTemp
 	call CloseSRAM
-	farcall CalcwBufferMonStats
-	ld a, PC_DEPOSIT
+	farcall CalcBufferMonStats
+	ld a, REMOVE_BOX
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ret
-; e32fa
 
-.CopyToBox: ; e32fa
+.CopyToBox:
 	ld a, [wBillsPC_LoadedBox]
 	dec a
 	ld e, a
-	farcall MovePkmnWOMail_SaveGame
+	farcall MoveMonWOMail_SaveGame
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
 	ld [wCurPartyMon], a
 	farcall InsertPokemonIntoBox
 	ret
-; e3316
 
-.CopyFromParty: ; e3316
+.CopyFromParty:
 	ld a, [wBillsPC_BackupCursorPosition]
 	ld hl, wBillsPC_BackupScrollPosition
 	add [hl]
@@ -2146,22 +2089,20 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld hl, wPartyMon1Species
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyMonToTemp
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ret
-; e3346
 
-.CopyToParty: ; e3346
+.CopyToParty:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
 	ld [wCurPartyMon], a
 	farcall InsertPokemonIntoParty
 	ret
-; e3357
 
-CopySpeciesToTemp: ; e3357 (38:7357)
+CopySpeciesToTemp:
 	ld a, [wCurPartyMon]
 	ld c, a
 	ld b, $0
@@ -2170,7 +2111,7 @@ CopySpeciesToTemp: ; e3357 (38:7357)
 	ld [wCurPartySpecies], a
 	ret
 
-CopyNicknameToTemp: ; e3363 (38:7363)
+CopyNicknameToTemp:
 	ld bc, MON_NAME_LENGTH
 	ld a, [wCurPartyMon]
 	call AddNTimes
@@ -2179,7 +2120,7 @@ CopyNicknameToTemp: ; e3363 (38:7363)
 	call CopyBytes
 	ret
 
-CopyOTNameToTemp: ; e3376 (38:7376)
+CopyOTNameToTemp:
 	ld bc, NAME_LENGTH
 	ld a, [wCurPartyMon]
 	call AddNTimes
@@ -2188,14 +2129,14 @@ CopyOTNameToTemp: ; e3376 (38:7376)
 	call CopyBytes
 	ret
 
-CopyMonToTemp: ; e3389 (38:7389)
+CopyMonToTemp:
 	ld a, [wCurPartyMon]
 	call AddNTimes
 	ld de, wBufferMon
 	call CopyBytes
 	ret
 
-GetBoxPointer: ; e3396 (38:7396)
+GetBoxPointer:
 	dec b
 	ld c, b
 	ld b, 0
@@ -2209,9 +2150,8 @@ GetBoxPointer: ; e3396 (38:7396)
 	ld h, [hl]
 	ld l, a
 	ret
-; e33a6 (38:73a6)
 
-.boxes ; e33a6
+.boxes
 	;  bank, address
 	dba sBox1
 	dba sBox2
@@ -2227,9 +2167,8 @@ GetBoxPointer: ; e3396 (38:7396)
 	dba sBox12
 	dba sBox13
 	dba sBox14
-; e33d0
 
-BillsPC_ApplyPalettes: ; e33d0 (38:73d0)
+BillsPC_ApplyPalettes:
 	ld b, a
 	call GetSGBLayout
 	ld a, %11100100
@@ -2238,7 +2177,7 @@ BillsPC_ApplyPalettes: ; e33d0 (38:73d0)
 	call DmgToCgbObjPal0
 	ret
 
-BillsPC_Jumptable: ; e33df (38:73df)
+BillsPC_Jumptable:
 	ld e, a
 	ld d, $0
 	add hl, de
@@ -2248,7 +2187,7 @@ BillsPC_Jumptable: ; e33df (38:73df)
 	ld l, a
 	ret
 
-BillsPC_InitGFX: ; e33e8 (38:73e8)
+BillsPC_InitGFX:
 	call DisableLCD
 	ld hl, vTiles2 tile $00
 	ld bc, $31 tiles
@@ -2267,11 +2206,9 @@ BillsPC_InitGFX: ; e33e8 (38:73e8)
 	call SkipMusic
 	call EnableLCD
 	ret
-; e3419 (38:7419)
 
 PCSelectLZ: INCBIN "gfx/pc/pc.2bpp.lz"
 PCMailGFX:  INCBIN "gfx/pc/pc_mail.2bpp"
-; e34dd
 
 PCString_ChooseaPKMN: db "Choose a <PK><MN>.@"
 PCString_WhatsUp: db "What's up?@"
@@ -2289,19 +2226,17 @@ PCString_Non: db "Non.@"
 PCString_BoxFull: db "The BOX is full.@"
 PCString_PartyFull: db "The party's full!@"
 PCString_NoReleasingEGGS: db "No releasing EGGS!@"
-; e35aa
 
-
-_ChangeBox: ; e35aa (38:75aa)
-	call LoadStandardMenuDataHeader
+_ChangeBox:
+	call LoadStandardMenuHeader
 	call BillsPC_ClearTilemap
 .loop
 	xor a
 	ld [hBGMapMode], a
 	call BillsPC_PrintBoxName
 	call BillsPC_PlaceChooseABoxString
-	ld hl, _ChangeBox_menudataheader
-	call CopyMenuDataHeader
+	ld hl, _ChangeBox_MenuHeader
+	call CopyMenuHeader
 	xor a
 	ld [wMenuScrollPosition], a
 	hlcoord 0, 4
@@ -2318,7 +2253,7 @@ _ChangeBox: ; e35aa (38:75aa)
 	call CloseWindow
 	ret
 
-BillsPC_ClearTilemap: ; e35e2 (38:75e2)
+BillsPC_ClearTilemap:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -2326,16 +2261,14 @@ BillsPC_ClearTilemap: ; e35e2 (38:75e2)
 	ld a, " "
 	call ByteFill
 	ret
-; e35f1 (38:75f1)
 
-_ChangeBox_menudataheader: ; 0xe35f1
+_ChangeBox_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 5, 9, 12
-	dw .menudata2
+	dw .MenuData
 	db 1 ; default option
-; 0xe35f9
 
-.menudata2 ; 0xe35f9
+.MenuData
 	db MENU_UNUSED_1 | MENU_UNUSED_3 ; flags
 	db 4, 0
 	db 1
@@ -2343,9 +2276,8 @@ _ChangeBox_menudataheader: ; 0xe35f1
 	dba .boxnames
 	dba NULL
 	dba BillsPC_PrintBoxCountAndCapacity
-; e3609
 
-.boxes ; e3609
+.boxes
 	db NUM_BOXES
 x = 1
 rept NUM_BOXES
@@ -2353,9 +2285,8 @@ rept NUM_BOXES
 x = x + 1
 endr
 	db -1
-; e3619
 
-.boxnames ; e3619
+.boxnames
 	push de
 	ld a, [wMenuSelection]
 	dec a
@@ -2363,18 +2294,16 @@ endr
 	pop hl
 	call PlaceString
 	ret
-; e3626
 
-GetBoxName: ; e3626 (38:7626)
+GetBoxName:
 	ld bc, BOX_NAME_LENGTH
 	ld hl, wBoxNames
 	call AddNTimes
 	ld d, h
 	ld e, l
 	ret
-; e3632 (38:7632)
 
-BillsPC_PrintBoxCountAndCapacity: ; e3632
+BillsPC_PrintBoxCountAndCapacity:
 	hlcoord 11, 7
 	lb bc, 5, 7
 	call TextBox
@@ -2393,21 +2322,18 @@ BillsPC_PrintBoxCountAndCapacity: ; e3632
 	ld de, .out_of_20
 	call PlaceString
 	ret
-; e3663
 
-.Pokemon: ; e3663
+.Pokemon:
 	db "#MON@"
-; e3668
 
-.out_of_20 ; e3668
+.out_of_20
 	; db "/20@"
 	db "/"
 	db "0" + MONS_PER_BOX / 10 ; "2"
 	db "0" + MONS_PER_BOX % 10 ; "0"
 	db "@"
-; e366c
 
-GetBoxCount: ; e366c (38:766c)
+GetBoxCount:
 	ld a, [wCurBox]
 	ld c, a
 	ld a, [wMenuSelection]
@@ -2447,9 +2373,8 @@ GetBoxCount: ; e366c (38:766c)
 	ld a, [hl]
 	call CloseSRAM
 	ret
-; e36a5 (38:76a5)
 
-.boxbanks ; e36a5
+.boxbanks
 	dba sBox1
 	dba sBox2
 	dba sBox3
@@ -2464,9 +2389,8 @@ GetBoxCount: ; e366c (38:766c)
 	dba sBox12
 	dba sBox13
 	dba sBox14
-; e36cf
 
-BillsPC_PrintBoxName: ; e36cf (38:76cf)
+BillsPC_PrintBoxName:
 	hlcoord 0, 0
 	ld b, 2
 	ld c, 18
@@ -2480,15 +2404,13 @@ BillsPC_PrintBoxName: ; e36cf (38:76cf)
 	hlcoord 11, 2
 	call PlaceString
 	ret
-; e36f1 (38:76f1)
 
-.Current: ; e36f1
+.Current:
 	db "CURRENT@"
-; e36f9
 
-BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+BillsPC_ChangeBoxSubmenu:
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	call VerticalMenu
 	call ExitMenu
 	ret c
@@ -2552,45 +2474,38 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
 	ld de, wd002
 	call CopyName2
 	ret
-; e3778 (38:7778)
 
 	hlcoord 11, 7 ; unused
 
-.MenuDataHeader: ; 0xe377b
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 4, SCREEN_WIDTH - 1, 13
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 0xe3783
 
-.MenuData2: ; 0xe3783
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "SWITCH@"
 	db "NAME@"
 	db "PRINT@"
 	db "QUIT@"
-; 0xe379c
 
-BillsPC_PlaceChooseABoxString: ; e379c (38:779c)
+BillsPC_PlaceChooseABoxString:
 	ld de, .ChooseABox
 	jr BillsPC_PlaceChangeBoxString
-; e37a1 (38:77a1)
 
-.ChooseABox: ; e37a1
+.ChooseABox:
 	db "Choose a BOX.@"
-; e37af
 
-BillsPC_PlaceWhatsUpString: ; e37af (38:77af)
+BillsPC_PlaceWhatsUpString:
 	ld de, .WhatsUp
 	jr BillsPC_PlaceChangeBoxString
-; e37b4 (38:77b4)
 
-.WhatsUp: ; e37b4
+.WhatsUp:
 	db "What's up?@"
-; e37be
 
-BillsPC_PlaceEmptyBoxString_SFX: ; e37be (38:77be)
+BillsPC_PlaceEmptyBoxString_SFX:
 	ld de, .NoMonString
 	call BillsPC_PlaceChangeBoxString
 	ld de, SFX_WRONG
@@ -2599,13 +2514,11 @@ BillsPC_PlaceEmptyBoxString_SFX: ; e37be (38:77be)
 	ld c, 50
 	call DelayFrames
 	ret
-; e37d3 (38:77d3)
 
-.NoMonString: ; e37d3
+.NoMonString:
 	db "There's no #MON.@"
-; e37e3
 
-BillsPC_PlaceChangeBoxString: ; e37e3 (38:77e3)
+BillsPC_PlaceChangeBoxString:
 	push de
 	hlcoord 0, 14
 	lb bc, 2, 18
diff --git a/engine/billspctop.asm b/engine/pokemon/bills_pc_top.asm
index 2c0a110ba..550892f65 100755..100644
--- a/engine/billspctop.asm
+++ b/engine/pokemon/bills_pc_top.asm
@@ -1,11 +1,11 @@
-_BillsPC: ; e3fd
+_BillsPC:
 	call .CheckCanUsePC
 	ret c
 	call .LogIn
 	call .UseBillsPC
 	jp .LogOut
 
-.CheckCanUsePC: ; e40a (3:640a)
+.CheckCanUsePC:
 	ld a, [wPartyCount]
 	and a
 	ret nz
@@ -14,15 +14,15 @@ _BillsPC: ; e3fd
 	scf
 	ret
 
-.Text_GottaHavePokemon: ; 0xe417
+.Text_GottaHavePokemon:
 	; You gotta have #MON to call!
 	text_jump UnknownText_0x1c1006
 	db "@"
 
-.LogIn: ; e41c (3:641c)
+.LogIn:
 	xor a
 	ld [hBGMapMode], a
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call ClearPCItemScreen
 	ld hl, wOptions
 	ld a, [hl]
@@ -35,18 +35,18 @@ _BillsPC: ; e3fd
 	call LoadFontsBattleExtra
 	ret
 
-.Text_What: ; 0xe43a
+.Text_What:
 	; What?
 	text_jump UnknownText_0x1c1024
 	db "@"
 
-.LogOut: ; e43f (3:643f)
+.LogOut:
 	call CloseSubmenu
 	ret
 
-.UseBillsPC: ; e443 (3:6443)
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+.UseBillsPC:
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	ld a, $1
 .loop
 	ld [wMenuCursorBuffer], a
@@ -68,48 +68,48 @@ _BillsPC: ; e3fd
 	call CloseWindow
 	ret
 
-.MenuDataHeader: ; 0xe46f
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2: ; 0xe477
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 0 ; items
 	dw .items
 	dw PlaceMenuStrings
 	dw .strings
 
-.strings ; e47f
+.strings
 	db "WITHDRAW <PK><MN>@"
 	db "DEPOSIT <PK><MN>@"
 	db "CHANGE BOX@"
 	db "MOVE <PK><MN> W/O MAIL@"
 	db "SEE YA!@"
 
-.Jumptable: ; e4ba (3:64ba)
+.Jumptable:
 	dw BillsPC_WithdrawMenu
 	dw BillsPC_DepositMenu
 	dw BillsPC_ChangeBoxMenu
 	dw BillsPC_MovePKMNMenu
 	dw BillsPC_SeeYa
 
-.items ; e4c4
-	db 5
+.items
+	db 5 ; # items
 	db 0 ; WITHDRAW
-	db 1;  DEPOSIT
+	db 1 ; DEPOSIT
 	db 2 ; CHANGE BOX
 	db 3 ; MOVE PKMN
 	db 4 ; SEE YA!
 	db -1
 
-BillsPC_SeeYa: ; e4cb
+BillsPC_SeeYa:
 	scf
 	ret
 
-BillsPC_MovePKMNMenu: ; e4cd
-	call LoadStandardMenuDataHeader
+BillsPC_MovePKMNMenu:
+	call LoadStandardMenuHeader
 	farcall IsAnyMonHoldingMail
 	jr nc, .no_mail
 	ld hl, .Text_MonHoldingMail
@@ -117,7 +117,7 @@ BillsPC_MovePKMNMenu: ; e4cd
 	jr .quit
 
 .no_mail
-	farcall StartMovePkmnWOMail_SaveGame
+	farcall StartMoveMonWOMail_SaveGame
 	jr c, .quit
 	farcall _MovePKMNWithoutMail
 	call ReturnToMapFromSubmenu
@@ -128,13 +128,13 @@ BillsPC_MovePKMNMenu: ; e4cd
 	and a
 	ret
 
-.Text_MonHoldingMail: ; 0xe4f9
+.Text_MonHoldingMail:
 	; There is a #MON holding MAIL. Please remove the MAIL.
 	text_jump UnknownText_0x1c102b
 	db "@"
 
-BillsPC_DepositMenu: ; e4fe (3:64fe)
-	call LoadStandardMenuDataHeader
+BillsPC_DepositMenu:
+	call LoadStandardMenuHeader
 	farcall _DepositPKMN
 	call ReturnToMapFromSubmenu
 	call ClearPCItemScreen
@@ -145,35 +145,35 @@ BillsPC_DepositMenu: ; e4fe (3:64fe)
 Unreferenced_Functione512:
 	ld a, [wPartyCount]
 	and a
-	jr z, .no_pkmn
+	jr z, .no_mon
 	cp 2
-	jr c, .only_one_pkmn
+	jr c, .only_one_mon
 	and a
 	ret
 
-.no_pkmn
-	ld hl, .Text_NoPKMN
+.no_mon
+	ld hl, .Text_NoMon
 	call MenuTextBoxBackup
 	scf
 	ret
 
-.only_one_pkmn
-	ld hl, .Text_ItsYourLastPKMN
+.only_one_mon
+	ld hl, .Text_ItsYourLastMon
 	call MenuTextBoxBackup
 	scf
 	ret
 
-.Text_NoPKMN: ; 0xe52e
+.Text_NoMon:
 	; You don't have a single #MON!
 	text_jump UnknownText_0x1c1062
 	db "@"
 
-.Text_ItsYourLastPKMN: ; 0xe533
+.Text_ItsYourLastMon:
 	; You can't deposit your last #MON!
 	text_jump UnknownText_0x1c1080
 	db "@"
 
-CheckCurPartyMonFainted: ; e538
+CheckCurPartyMonFainted:
 	ld hl, wPartyMon1HP
 	ld de, PARTYMON_STRUCT_LENGTH
 	ld b, $0
@@ -202,8 +202,8 @@ CheckCurPartyMonFainted: ; e538
 	and a
 	ret
 
-BillsPC_WithdrawMenu: ; e559 (3:6559)
-	call LoadStandardMenuDataHeader
+BillsPC_WithdrawMenu:
+	call LoadStandardMenuHeader
 	farcall _WithdrawPKMN
 	call ReturnToMapFromSubmenu
 	call ClearPCItemScreen
@@ -224,17 +224,17 @@ Unreferenced_Functione56d:
 	scf
 	ret
 
-UnknownText_0xe57e: ; 0xe57e
+UnknownText_0xe57e:
 	; You can't take any more #MON.
 	text_jump UnknownText_0x1c10a2
 	db "@"
 
-BillsPC_ChangeBoxMenu: ; e583 (3:6583)
+BillsPC_ChangeBoxMenu:
 	farcall _ChangeBox
 	and a
 	ret
 
-ClearPCItemScreen: ; e58b
+ClearPCItemScreen:
 	call DisableSpriteUpdates
 	xor a
 	ld [hBGMapMode], a
@@ -254,7 +254,7 @@ ClearPCItemScreen: ; e58b
 	call SetPalettes ; load regular palettes?
 	ret
 
-CopyBoxmonToTempMon: ; e5bb
+CopyBoxmonToTempMon:
 	ld a, [wCurPartyMon]
 	ld hl, sBoxMon1Species
 	ld bc, BOXMON_STRUCT_LENGTH
@@ -370,7 +370,7 @@ Unreferenced_Functione5d9:
 	call CloseSRAM
 	ret
 
-.BoxAddrs: ; e66e
+.BoxAddrs:
 	dba sBox1
 	dba sBox2
 	dba sBox3
diff --git a/engine/breeding.asm b/engine/pokemon/breeding.asm
index 7756d30ef..7e7f0e097 100755..100644
--- a/engine/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -1,4 +1,4 @@
-CheckBreedmonCompatibility: ; 16e1d
+CheckBreedmonCompatibility:
 	call .CheckBreedingGroupCompatibility
 	ld c, $0
 	jp nc, .done
@@ -24,7 +24,7 @@ CheckBreedmonCompatibility: ; 16e1d
 	ld [wTempMonDVs], a
 	ld a, [wBreedMon2DVs + 1]
 	ld [wTempMonDVs + 1], a
-	ld a, $3
+	ld a, TEMPMON
 	ld [wMonType], a
 	predef GetGender
 	pop bc
@@ -83,10 +83,8 @@ CheckBreedmonCompatibility: ; 16e1d
 	ld a, c
 	ld [wd265], a
 	ret
-; 16ebc
-
 
-.CheckDVs: ; 16ebc (5:6ebc)
+.CheckDVs:
 ; If Defense DVs match and the lower 3 bits of the Special DVs match,
 ; avoid breeding
 	ld a, [wBreedMon1DVs]
@@ -103,23 +101,22 @@ CheckBreedmonCompatibility: ; 16e1d
 	and %111
 	cp b
 	ret
-; 16ed6
 
-.CheckBreedingGroupCompatibility: ; 16ed6
+.CheckBreedingGroupCompatibility:
 ; If either mon is in the No Eggs group,
 ; they are not compatible.
 	ld a, [wBreedMon2Species]
 	ld [wCurSpecies], a
 	call GetBaseData
 	ld a, [wBaseEggGroups]
-	cp NO_EGGS * $11
+	cp EGG_NONE * $11
 	jr z, .Incompatible
 
 	ld a, [wBreedMon1Species]
 	ld [wCurSpecies], a
 	call GetBaseData
 	ld a, [wBaseEggGroups]
-	cp NO_EGGS * $11
+	cp EGG_NONE * $11
 	jr z, .Incompatible
 
 ; Ditto is automatically compatible with everything.
@@ -173,9 +170,8 @@ CheckBreedmonCompatibility: ; 16e1d
 .Compatible:
 	scf
 	ret
-; 16f3e
 
-DoEggStep:: ; 16f3e
+DoEggStep::
 	ld de, wPartySpecies
 	ld hl, wPartyMon1Happiness
 	ld c, 0
@@ -198,24 +194,22 @@ DoEggStep:: ; 16f3e
 	add hl, de
 	pop de
 	jr .loop
-; 16f5e
 
-OverworldHatchEgg:: ; 16f5e
+OverworldHatchEgg::
 	call RefreshScreen
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call HatchEggs
 	call ExitAllMenus
 	call RestartMapMusic
 	jp CloseText
-; 16f70
 
-HatchEggs: ; 16f70 (5:6f70)
+HatchEggs:
 	ld de, wPartySpecies
 	ld hl, wPartyMon1Happiness
 	xor a
 	ld [wCurPartyMon], a
 
-.loop ; 16f7a (5:6f7a)
+.loop
 	ld a, [de]
 	inc de
 	cp -1
@@ -288,8 +282,8 @@ HatchEggs: ; 16f70 (5:6f70)
 	push hl
 	ld bc, MON_STAT_EXP - 1
 	add hl, bc
-	ld b, $0
-	predef CalcPkmnStats
+	ld b, FALSE
+	predef CalcMonStats
 	pop bc
 	ld hl, MON_MAXHP
 	add hl, bc
@@ -348,7 +342,7 @@ HatchEggs: ; 16f70 (5:6f70)
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
-.next ; 1707d (5:707d)
+.next
 	ld hl, wCurPartyMon
 	inc [hl]
 	pop hl
@@ -357,11 +351,10 @@ HatchEggs: ; 16f70 (5:6f70)
 	pop de
 	jp .loop
 
-.done ; 1708a (5:708a)
+.done
 	ret
-; 1708b (5:708b)
 
-.Text_HatchEgg: ; 0x1708b
+.Text_HatchEgg:
 	; Huh? @ @
 	text_jump UnknownText_0x1c0db0
 	start_asm
@@ -382,27 +375,23 @@ HatchEggs: ; 16f70 (5:6f70)
 	pop hl
 	ld hl, .CameOutOfItsEgg
 	ret
-; 170b0 (5:70b0)
 
-.ClearTextbox: ; 0x170b0
+.ClearTextbox:
 	;
 	text_jump UnknownText_0x1c0db8
 	db "@"
-; 0x170b5
 
-.CameOutOfItsEgg: ; 0x170b5
+.CameOutOfItsEgg:
 	; came out of its EGG!@ @
 	text_jump UnknownText_0x1c0dba
 	db "@"
-; 0x170ba
 
-.Text_NicknameHatchling: ; 0x170ba
+.Text_NicknameHatchling:
 	; Give a nickname to @ ?
 	text_jump UnknownText_0x1c0dd8
 	db "@"
-; 0x170bf
 
-InitEggMoves: ; 170bf
+InitEggMoves:
 	call GetHeritableMoves
 	ld d, h
 	ld e, l
@@ -431,11 +420,8 @@ InitEggMoves: ; 170bf
 
 .done
 	ret
-; 170e4
-
-GetEggMove: ; 170e4
-GLOBAL EggMoves
 
+GetEggMove:
 	push bc
 	ld a, [wEggMonSpecies]
 	dec a
@@ -447,7 +433,7 @@ GLOBAL EggMoves
 	ld a, BANK(EggMovePointers)
 	call GetFarHalfword
 .loop
-	ld a, BANK(EggMoves)
+	ld a, BANK("Egg Moves")
 	call GetFarByte
 	cp -1
 	jr z, .reached_end
@@ -481,18 +467,18 @@ GLOBAL EggMoves
 	ld a, BANK(EvosAttacksPointers)
 	call GetFarHalfword
 .loop3
-	ld a, BANK(EvosAttacks)
+	ld a, BANK("Evolutions and Attacks")
 	call GetFarByte
 	inc hl
 	and a
 	jr nz, .loop3
 .loop4
-	ld a, BANK(EvosAttacks)
+	ld a, BANK("Evolutions and Attacks")
 	call GetFarByte
 	and a
 	jr z, .inherit_tmhm
 	inc hl
-	ld a, BANK(EvosAttacks)
+	ld a, BANK("Evolutions and Attacks")
 	call GetFarByte
 	ld b, a
 	ld a, [de]
@@ -528,9 +514,8 @@ GLOBAL EggMoves
 	pop bc
 	and a
 	ret
-; 17169
 
-LoadEggMove: ; 17169
+LoadEggMove:
 	push de
 	push bc
 	ld a, [de]
@@ -563,9 +548,8 @@ LoadEggMove: ; 17169
 	pop bc
 	pop de
 	ret
-; 17197
 
-GetHeritableMoves: ; 17197
+GetHeritableMoves:
 	ld hl, wBreedMon2Moves
 	ld a, [wBreedMon1Species]
 	cp DITTO
@@ -621,9 +605,8 @@ GetHeritableMoves: ; 17197
 	pop af
 	ld [wCurPartySpecies], a
 	ret
-; 1720b
 
-GetBreedmonMovePointer: ; 1720b
+GetBreedmonMovePointer:
 	ld hl, wBreedMon1Moves
 	ld a, [wBreedMon1Species]
 	cp DITTO
@@ -638,10 +621,8 @@ GetBreedmonMovePointer: ; 1720b
 .ditto
 	ld hl, wBreedMon2Moves
 	ret
-; 17224
-
 
-GetEggFrontpic: ; 17224 (5:7224)
+GetEggFrontpic:
 	push de
 	ld [wCurPartySpecies], a
 	ld [wCurSpecies], a
@@ -651,7 +632,7 @@ GetEggFrontpic: ; 17224 (5:7224)
 	pop de
 	predef_jump GetMonFrontpic
 
-GetHatchlingFrontpic: ; 1723c (5:723c)
+GetHatchlingFrontpic:
 	push de
 	ld [wCurPartySpecies], a
 	ld [wCurSpecies], a
@@ -661,7 +642,7 @@ GetHatchlingFrontpic: ; 1723c (5:723c)
 	pop de
 	predef_jump GetAnimatedFrontpic
 
-Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
+Hatch_UpdateFrontpicBGMapCenter:
 	push af
 	call WaitTop
 	push hl
@@ -683,7 +664,7 @@ Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
 	call SetPalettes
 	jp WaitBGMap
 
-EggHatch_DoAnimFrame: ; 1727f (5:727f)
+EggHatch_DoAnimFrame:
 	push hl
 	push de
 	push bc
@@ -694,7 +675,7 @@ EggHatch_DoAnimFrame: ; 1727f (5:727f)
 	pop hl
 	ret
 
-EggHatch_AnimationSequence: ; 1728f (5:728f)
+EggHatch_AnimationSequence:
 	ld a, [wd265]
 	ld [wJumptableIndex], a
 	ld a, [wCurSpecies]
@@ -705,7 +686,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
 	call DisableLCD
 	ld hl, EggHatchGFX
 	ld de, vTiles0 tile $00
-	ld bc, $20
+	ld bc, 2 tiles
 	ld a, BANK(EggHatchGFX)
 	call FarCopyBytes
 	farcall ClearSpriteAnims
@@ -784,13 +765,13 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
 	ld [wCurSpecies], a
 	ret
 
-Hatch_LoadFrontpicPal: ; 17363 (5:7363)
+Hatch_LoadFrontpicPal:
 	ld [wPlayerHPPal], a
 	ld b, SCGB_EVOLUTION
 	ld c, $0
 	jp GetSGBLayout
 
-EggHatch_CrackShell: ; 1736d (5:736d)
+EggHatch_CrackShell:
 	ld a, [wFrameCounter]
 	dec a
 	and $7
@@ -810,13 +791,11 @@ EggHatch_CrackShell: ; 1736d (5:736d)
 	ld [hl], $0
 	ld de, SFX_EGG_CRACK
 	jp PlaySFX
-; 17393 (5:7393)
 
-EggHatchGFX: ; 17393
+EggHatchGFX:
 INCBIN "gfx/evo/egg_hatch.2bpp"
-; 173b3
 
-Hatch_InitShellFragments: ; 173b3 (5:73b3)
+Hatch_InitShellFragments:
 	farcall ClearSpriteAnims
 	ld hl, .SpriteData
 .loop
@@ -858,14 +837,13 @@ Hatch_InitShellFragments: ; 173b3 (5:73b3)
 	call PlaySFX
 	call EggHatch_DoAnimFrame
 	ret
-; 173ef (5:73ef)
 
 shell_fragment: MACRO
 ; y tile, y pxl, x tile, x pxl, frameset offset, ???
 	db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5 - SPRITE_ANIM_FRAMESET_EGG_HATCH_1, \6
 ENDM
 
-.SpriteData: ; 173ef
+.SpriteData:
 	shell_fragment 10, 4,  9, 0, SPRITE_ANIM_FRAMESET_EGG_HATCH_1, $3c
 	shell_fragment 11, 4,  9, 0, SPRITE_ANIM_FRAMESET_EGG_HATCH_2, $04
 	shell_fragment 10, 4, 10, 0, SPRITE_ANIM_FRAMESET_EGG_HATCH_1, $30
@@ -877,9 +855,8 @@ ENDM
 	shell_fragment 10, 0, 10, 4, SPRITE_ANIM_FRAMESET_EGG_HATCH_3, $2a
 	shell_fragment 12, 0, 10, 4, SPRITE_ANIM_FRAMESET_EGG_HATCH_4, $16
 	db -1
-; 17418
 
-Hatch_ShellFragmentLoop: ; 17418 (5:7418)
+Hatch_ShellFragmentLoop:
 	ld c, 129
 .loop
 	call EggHatch_DoAnimFrame
@@ -887,49 +864,46 @@ Hatch_ShellFragmentLoop: ; 17418 (5:7418)
 	jr nz, .loop
 	ret
 
-Special_DayCareMon1: ; 17421
+DayCareMon1:
 	ld hl, DayCareMon1Text
 	call PrintText
 	ld a, [wBreedMon1Species]
 	call PlayMonCry
 	ld a, [wDayCareLady]
-	bit 0, a
+	bit DAYCARELADY_HAS_MON_F, a
 	jr z, DayCareMonCursor
 	call ButtonSound
 	ld hl, wBreedMon2Nick
 	call DayCareMonCompatibilityText
 	jp PrintText
 
-Special_DayCareMon2: ; 17440
+DayCareMon2:
 	ld hl, DayCareMon2Text
 	call PrintText
 	ld a, [wBreedMon2Species]
 	call PlayMonCry
 	ld a, [wDayCareMan]
-	bit 0, a
+	bit DAYCAREMAN_HAS_MON_F, a
 	jr z, DayCareMonCursor
 	call ButtonSound
 	ld hl, wBreedMon1Nick
 	call DayCareMonCompatibilityText
 	jp PrintText
 
-DayCareMonCursor: ; 1745f
+DayCareMonCursor:
 	jp WaitPressAorB_BlinkCursor
-; 17462
 
-DayCareMon2Text: ; 0x17462
+DayCareMon2Text:
 	; It's @ that was left with the DAY-CARE LADY.
 	text_jump UnknownText_0x1c0df3
 	db "@"
-; 0x17467
 
-DayCareMon1Text: ; 0x17467
+DayCareMon1Text:
 	; It's @ that was left with the DAY-CARE MAN.
 	text_jump UnknownText_0x1c0e24
 	db "@"
-; 0x1746c
 
-DayCareMonCompatibilityText: ; 1746c
+DayCareMonCompatibilityText:
 	push bc
 	ld de, wStringBuffer1
 	ld bc, NAME_LENGTH
@@ -953,44 +927,35 @@ DayCareMonCompatibilityText: ; 1746c
 
 .done
 	ret
-; 1749c
 
-.AllAlone: ; 0x1749c
+.AllAlone:
 	; It's brimming with energy.
 	text_jump UnknownText_0x1c0e54
 	db "@"
-; 0x174a1
 
-.Incompatible: ; 0x174a1
+.Incompatible:
 	; It has no interest in @ .
 	text_jump UnknownText_0x1c0e6f
 	db "@"
-; 0x174a6
 
-.HighCompatibility: ; 0x174a6
+.HighCompatibility:
 	; It appears to care for @ .
 	text_jump UnknownText_0x1c0e8d
 	db "@"
-; 0x174ab
 
-.ModerateCompatibility: ; 0x174ab
+.ModerateCompatibility:
 	; It's friendly with @ .
 	text_jump UnknownText_0x1c0eac
 	db "@"
-; 0x174b0
 
-.SlightCompatibility: ; 0x174b0
+.SlightCompatibility:
 	; It shows interest in @ .
 	text_jump UnknownText_0x1c0ec6
 	db "@"
-; 0x174b5
 
-Unreferenced_DayCareMonPrintEmptyString: ; 174b5
+Unreferenced_DayCareMonPrintEmptyString:
 	ld hl, .string
 	ret
-; 174b9
 
-.string ; 174b9
+.string
 	db "@"
-; 174ba
-
diff --git a/engine/routines/getbreedmonlevelgrowth.asm b/engine/pokemon/breedmon_level_growth.asm
index dc22db798..c6356dd6e 100644
--- a/engine/routines/getbreedmonlevelgrowth.asm
+++ b/engine/pokemon/breedmon_level_growth.asm
@@ -1,4 +1,4 @@
-GetBreedMon1LevelGrowth: ; e698
+GetBreedMon1LevelGrowth:
 	ld hl, wBreedMon1Stats
 	ld de, wTempMon
 	ld bc, BOXMON_STRUCT_LENGTH
@@ -12,7 +12,7 @@ GetBreedMon1LevelGrowth: ; e698
 	ld d, a
 	ret
 
-GetBreedMon2LevelGrowth: ; e6b3
+GetBreedMon2LevelGrowth:
 	ld hl, wBreedMon2Stats
 	ld de, wTempMon
 	ld bc, BOXMON_STRUCT_LENGTH
diff --git a/engine/caught_data.asm b/engine/pokemon/caught_data.asm
index 997d708c1..89d22fdf6 100644
--- a/engine/caught_data.asm
+++ b/engine/pokemon/caught_data.asm
@@ -1,4 +1,4 @@
-Special_CheckPartyFullAfterContest: ; 4d9e5
+CheckPartyFullAfterContest:
 	ld a, [wContestMon]
 	and a
 	jp z, .DidntCatchAnything
@@ -85,7 +85,7 @@ Special_CheckPartyFullAfterContest: ; 4d9e5
 	ld [wScriptVar], a
 	ret
 
-.TryAddToBox: ; 4daa3
+.TryAddToBox:
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
 	ld hl, sBoxCount
@@ -146,27 +146,27 @@ Special_CheckPartyFullAfterContest: ; 4d9e5
 	ld [wScriptVar], a
 	ret
 
-.DidntCatchAnything: ; 4db35
+.DidntCatchAnything:
 	ld a, BUGCONTEST_NO_CATCH
 	ld [wScriptVar], a
 	ret
 
-GiveANickname_YesNo: ; 4db3b
+GiveANickname_YesNo:
 	ld hl, TextJump_GiveANickname
 	call PrintText
 	jp YesNoBox
 
-TextJump_GiveANickname: ; 0x4db44
+TextJump_GiveANickname:
 	; Give a nickname to the @  you received?
 	text_jump UnknownText_0x1c12fc
 	db "@"
 
-SetCaughtData: ; 4db49
+SetCaughtData:
 	ld a, [wPartyCount]
 	dec a
 	ld hl, wPartyMon1CaughtLevel
 	call GetPartyLocation
-SetBoxmonOrEggmonCaughtData: ; 4db53
+SetBoxmonOrEggmonCaughtData:
 	ld a, [wTimeOfDay]
 	inc a
 	rrca
@@ -194,12 +194,12 @@ SetBoxmonOrEggmonCaughtData: ; 4db53
 	call GetWorldMapLocation
 	ld b, a
 	ld a, [wPlayerGender]
-	rrca
+	rrca ; shift bit 0 (PLAYERGENDER_FEMALE_F) to bit 7 (CAUGHT_GENDER_MASK)
 	or b
 	ld [hl], a
 	ret
 
-SetBoxMonCaughtData: ; 4db83
+SetBoxMonCaughtData:
 	ld a, BANK(sBoxMon1CaughtLevel)
 	call GetSRAMBank
 	ld hl, sBoxMon1CaughtLevel
@@ -207,7 +207,7 @@ SetBoxMonCaughtData: ; 4db83
 	call CloseSRAM
 	ret
 
-SetGiftBoxMonCaughtData: ; 4db92
+SetGiftBoxMonCaughtData:
 	push bc
 	ld a, BANK(sBoxMon1CaughtLevel)
 	call GetSRAMBank
@@ -217,14 +217,14 @@ SetGiftBoxMonCaughtData: ; 4db92
 	call CloseSRAM
 	ret
 
-SetGiftPartyMonCaughtData: ; 4dba3
+SetGiftPartyMonCaughtData:
 	ld a, [wPartyCount]
 	dec a
 	ld hl, wPartyMon1CaughtLevel
 	push bc
 	call GetPartyLocation
 	pop bc
-SetGiftMonCaughtData: ; 4dbaf
+SetGiftMonCaughtData:
 	xor a
 	ld [hli], a
 	ld a, GIFT_LOCATION
@@ -233,7 +233,7 @@ SetGiftMonCaughtData: ; 4dbaf
 	ld [hl], a
 	ret
 
-SetEggMonCaughtData: ; 4dbb8 (13:5bb8)
+SetEggMonCaughtData:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMon1CaughtLevel
 	call GetPartyLocation
diff --git a/engine/routines/checknickerrors.asm b/engine/pokemon/correct_nick_errors.asm
index 87ebd6bb3..335540cfe 100644
--- a/engine/routines/checknickerrors.asm
+++ b/engine/pokemon/correct_nick_errors.asm
@@ -1,4 +1,4 @@
-CheckNickErrors:: ; 669f
+CorrectNickErrors::
 ; error-check monster nick before use
 ; must be a peace offering to gamesharkers
 
@@ -60,7 +60,7 @@ CheckNickErrors:: ; 669f
 	pop bc
 	ret
 
-.textcommands ; 66cf
+.textcommands
 ; table defining which characters are actually text commands
 ; format:
 	;      ≥           <
diff --git a/engine/routines/correcterrorsinplayerparty.asm b/engine/pokemon/correct_party_errors.asm
index 5f2bba6bc..50a9f3562 100644
--- a/engine/routines/correcterrorsinplayerparty.asm
+++ b/engine/pokemon/correct_party_errors.asm
@@ -1,4 +1,4 @@
-Unreferenced_CorrectErrorsInPlayerParty:
+Unreferenced_CorrectPartyErrors:
 	ld hl, wPartyCount
 	ld a, [hl]
 	and a
@@ -89,8 +89,8 @@ Unreferenced_CorrectErrorsInPlayerParty:
 	ld e, l
 	ld hl, MON_STAT_EXP - 1
 	add hl, bc
-	ld b, $1
-	predef CalcPkmnStats
+	ld b, TRUE
+	predef CalcMonStats
 	pop hl
 	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
@@ -201,13 +201,11 @@ Unreferenced_CorrectErrorsInPlayerParty:
 	dec b
 	jr nz, .loop5
 	ret
-; 13b6b
 
-.TAMAGO: ; 13b6b
+.TAMAGO:
 	db "タマゴ@@@"
-; 13b71
 
-.GetLengthOfStringWith6CharCap: ; 13b71
+.GetLengthOfStringWith6CharCap:
 	push de
 	ld c, 1
 	ld b, NAME_LENGTH_JAPANESE
@@ -226,4 +224,3 @@ Unreferenced_CorrectErrorsInPlayerParty:
 .done
 	pop de
 	ret
-; 13b87
diff --git a/engine/european_mail.asm b/engine/pokemon/european_mail.asm
index 8f037cc43..38c542d35 100644
--- a/engine/european_mail.asm
+++ b/engine/pokemon/european_mail.asm
@@ -1,4 +1,4 @@
-IsMailEuropean: ; 1de5c8
+IsMailEuropean:
 ; return 1 if French
 ; return 2 if German
 ; return 3 if Italian
@@ -27,18 +27,18 @@ IsMailEuropean: ; 1de5c8
 	ret
 
 ; The regular font.
-StandardEnglishFont: ; 1de5e6
+StandardEnglishFont:
 INCBIN "gfx/font/english.1bpp"
 
 ; An extended font.
-FrenchGermanFont: ; 1de9e6
+FrenchGermanFont:
 INCBIN "gfx/font/french_german.1bpp"
 
 ; An even more extended font.
-SpanishItalianFont: ; 1dede6
+SpanishItalianFont:
 INCBIN "gfx/font/spanish_italian.1bpp"
 
-HandleFrenchGermanMail: ; 1df1e6
+HandleFrenchGermanMail:
 ; called if mail is french or german
 ; fix 's 't 'v
 	ld b, sPartyMon1MailAuthor - sPartyMon1Mail
@@ -68,7 +68,7 @@ HandleFrenchGermanMail: ; 1df1e6
 	ret
 
 LireLeCourrierAnglais:
-DeutenEnglischenPost: ; 1df203
+DeutenEnglischenPost:
 ; Cette fonction convertit certains des caractères anglais pour
 ; leur équivalent dans le jeu de caractères français.
 ; Diese Funktion wandelt bestimmte englische Zeichen, um ihre
@@ -99,7 +99,7 @@ DeutenEnglischenPost: ; 1df203
 	jr nz, .loop
 	ret
 
-HandleSpanishItalianMail: ; 1df220
+HandleSpanishItalianMail:
 LeerCorreosIngleses:
 LeggiPostaInglese:
 ; This function converts certain characters between
diff --git a/engine/evolve.asm b/engine/pokemon/evolve.asm
index 5fb5aff46..571cff0b8 100755..100644
--- a/engine/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -1,4 +1,4 @@
-EvolvePokemon: ; 421d8
+EvolvePokemon:
 	ld hl, wEvolvableFlags
 	xor a
 	ld [hl], a
@@ -6,7 +6,7 @@ EvolvePokemon: ; 421d8
 	ld c, a
 	ld b, SET_FLAG
 	call EvoFlagAction
-EvolveAfterBattle: ; 421e6
+EvolveAfterBattle:
 	xor a
 	ld [wMonTriedToEvolve], a
 	dec a
@@ -18,7 +18,7 @@ EvolveAfterBattle: ; 421e6
 
 	push hl
 
-EvolveAfterBattle_MasterLoop
+EvolveAfterBattle_MasterLoop:
 	ld hl, wCurPartyMon
 	inc [hl]
 
@@ -55,7 +55,7 @@ EvolveAfterBattle_MasterLoop
 	push hl
 	xor a
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	pop hl
 
 .loop
@@ -87,7 +87,6 @@ EvolveAfterBattle_MasterLoop
 	cp EVOLVE_HAPPINESS
 	jr z, .happiness
 
-
 ; EVOLVE_STAT
 	ld a, [wTempMonLevel]
 	cp [hl]
@@ -116,7 +115,6 @@ EvolveAfterBattle_MasterLoop
 	inc hl
 	jr .proceed
 
-
 .happiness
 	ld a, [wTempMonHappiness]
 	cp HAPPINESS_TO_EVOLVE
@@ -143,7 +141,6 @@ EvolveAfterBattle_MasterLoop
 	jp z, .dont_evolve_3
 	jr .proceed
 
-
 .trade
 	ld a, [wLinkMode]
 	and a
@@ -169,7 +166,6 @@ EvolveAfterBattle_MasterLoop
 	ld [wTempMonItem], a
 	jr .proceed
 
-
 .item
 	ld a, [hli]
 	ld b, a
@@ -185,7 +181,6 @@ EvolveAfterBattle_MasterLoop
 	jp nz, .dont_evolve_3
 	jr .proceed
 
-
 .level
 	ld a, [hli]
 	ld b, a
@@ -264,8 +259,8 @@ EvolveAfterBattle_MasterLoop
 
 	ld hl, wTempMonExp + 2
 	ld de, wTempMonMaxHP
-	ld b, $1
-	predef CalcPkmnStats
+	ld b, TRUE
+	predef CalcMonStats
 
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMons
@@ -323,7 +318,6 @@ EvolveAfterBattle_MasterLoop
 	ld l, e
 	ld h, d
 	jp EvolveAfterBattle_MasterLoop
-; 423f8
 
 .dont_evolve_1
 	inc hl
@@ -349,9 +343,8 @@ EvolveAfterBattle_MasterLoop
 	and a
 	call nz, RestartMapMusic
 	ret
-; 42414
 
-UpdateSpeciesNameIfNotNicknamed: ; 42414
+UpdateSpeciesNameIfNotNicknamed:
 	ld a, [wCurSpecies]
 	push af
 	ld a, [wBaseDexNo]
@@ -382,17 +375,15 @@ UpdateSpeciesNameIfNotNicknamed: ; 42414
 	pop de
 	ld bc, MON_NAME_LENGTH
 	jp CopyBytes
-; 42454
 
-CancelEvolution: ; 42454
+CancelEvolution:
 	ld hl, Text_StoppedEvolving
 	call PrintText
 	call ClearTileMap
 	pop hl
 	jp EvolveAfterBattle_MasterLoop
-; 42461
 
-IsMonHoldingEverstone: ; 42461
+IsMonHoldingEverstone:
 	push hl
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMon1Item
@@ -402,34 +393,28 @@ IsMonHoldingEverstone: ; 42461
 	cp EVERSTONE
 	pop hl
 	ret
-; 42473
 
-Text_CongratulationsYourPokemon: ; 0x42473
+Text_CongratulationsYourPokemon:
 	; Congratulations! Your @ @
 	text_jump UnknownText_0x1c4b92
 	db "@"
-; 0x42478
 
-Text_EvolvedIntoPKMN: ; 0x42478
+Text_EvolvedIntoPKMN:
 	; evolved into @ !
 	text_jump UnknownText_0x1c4baf
 	db "@"
-; 0x4247d
 
-Text_StoppedEvolving: ; 0x4247d
+Text_StoppedEvolving:
 	; Huh? @ stopped evolving!
 	text_jump UnknownText_0x1c4bc5
 	db "@"
-; 0x42482
 
-Text_WhatEvolving: ; 0x42482
+Text_WhatEvolving:
 	; What? @ is evolving!
 	text_jump UnknownText_0x1c4be3
 	db "@"
-; 0x42487
-
 
-LearnLevelMoves: ; 42487
+LearnLevelMoves:
 	ld a, [wd265]
 	ld [wCurPartySpecies], a
 	dec a
@@ -492,10 +477,8 @@ LearnLevelMoves: ; 42487
 	ld a, [wCurPartySpecies]
 	ld [wd265], a
 	ret
-; 424e1
 
-
-FillMoves: ; 424e1
+FillMoves:
 ; Fill in moves at de for wCurPartySpecies at wCurPartyLevel
 
 	push hl
@@ -604,9 +587,8 @@ FillMoves: ; 424e1
 	pop de
 	pop hl
 	ret
-; 4256e
 
-ShiftMoves: ; 4256e
+ShiftMoves:
 	ld c, NUM_MOVES - 1
 .loop
 	inc de
@@ -615,18 +597,15 @@ ShiftMoves: ; 4256e
 	dec c
 	jr nz, .loop
 	ret
-; 42577
-
 
-EvoFlagAction: ; 42577
+EvoFlagAction:
 	push de
 	ld d, $0
 	predef SmallFarFlagAction
 	pop de
 	ret
-; 42581
 
-GetPreEvolution: ; 42581
+GetPreEvolution:
 ; Find the first mon to evolve into wCurPartySpecies.
 
 ; Return carry and the new species in wCurPartySpecies
@@ -673,4 +652,3 @@ GetPreEvolution: ; 42581
 	ld [wCurPartySpecies], a
 	scf
 	ret
-; 425b1
diff --git a/engine/experience.asm b/engine/pokemon/experience.asm
index 6b94ed357..3c3b10439 100644
--- a/engine/experience.asm
+++ b/engine/pokemon/experience.asm
@@ -1,4 +1,4 @@
-CalcLevel: ; 50e1b
+CalcLevel:
 	ld a, [wTempMonSpecies]
 	ld [wCurSpecies], a
 	call GetBaseData
@@ -30,7 +30,7 @@ CalcLevel: ; 50e1b
 	dec d
 	ret
 
-CalcExpAtLevel: ; 50e47
+CalcExpAtLevel:
 ; (a/b)*n**3 + c*n**2 + d*n - e
 	ld a, [wBaseGrowthRate]
 	add a
@@ -150,7 +150,7 @@ CalcExpAtLevel: ; 50e47
 	ld [hMultiplicand], a
 	ret
 
-.LevelSquared: ; 50eed
+.LevelSquared:
 	xor a
 	ld [hMultiplicand + 0], a
 	ld [hMultiplicand + 1], a
diff --git a/engine/health.asm b/engine/pokemon/health.asm
index cc47e8252..229da1e19 100755..100644
--- a/engine/health.asm
+++ b/engine/pokemon/health.asm
@@ -1,4 +1,4 @@
-HealParty: ; c658
+HealParty:
 	xor a
 	ld [wCurPartyMon], a
 	ld hl, wPartySpecies
@@ -22,7 +22,7 @@ HealParty: ; c658
 .done
 	ret
 
-HealPartyMon: ; c677
+HealPartyMon:
 	ld a, MON_SPECIES
 	call GetPartyParamLocation
 	ld d, h
@@ -52,7 +52,7 @@ HealPartyMon: ; c677
 	farcall RestoreAllPP
 	ret
 
-ComputeHPBarPixels: ; c699
+ComputeHPBarPixels:
 ; e = bc * (6 * 8) / de
 	ld a, b
 	or c
@@ -103,7 +103,7 @@ ComputeHPBarPixels: ; c699
 	ld e, 0
 	ret
 
-AnimateHPBar: ; c6e0
+AnimateHPBar:
 	call WaitBGMap
 	call _AnimateHPBar
 	call WaitBGMap
diff --git a/engine/routines/knowsmove.asm b/engine/pokemon/knows_move.asm
index 4ec3da347..d84a0d424 100644
--- a/engine/routines/knowsmove.asm
+++ b/engine/pokemon/knows_move.asm
@@ -1,4 +1,4 @@
-KnowsMove: ; f9ea
+KnowsMove:
 	ld a, MON_MOVES
 	call GetPartyParamLocation
 	ld a, [wPutativeTMHMMove]
@@ -19,7 +19,7 @@ KnowsMove: ; f9ea
 	scf
 	ret
 
-.Text_knows: ; 0xfa06
+.Text_knows:
 	; knows @ .
 	text_jump UnknownText_0x1c5ea8
 	db "@"
diff --git a/engine/learn.asm b/engine/pokemon/learn.asm
index 54ec8f6bb..20294c878 100755..100644
--- a/engine/learn.asm
+++ b/engine/pokemon/learn.asm
@@ -1,4 +1,4 @@
-LearnMove: ; 6508
+LearnMove:
 	call LoadTileMapToTempTileMap
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
@@ -117,9 +117,8 @@ LearnMove: ; 6508
 	call PrintText
 	ld b, 1
 	ret
-; 65d3
 
-ForgetMove: ; 65d3
+ForgetMove:
 	push hl
 	ld hl, Text_TryingToLearn
 	call PrintText
@@ -145,7 +144,7 @@ ForgetMove: ; 65d3
 	ld a, SCREEN_WIDTH * 2
 	ld [wBuffer1], a
 	predef ListMoves
-	; wMenuData3
+	; w2DMenuData
 	ld a, $4
 	ld [w2DMenuCursorInitY], a
 	ld a, $6
@@ -200,40 +199,34 @@ ForgetMove: ; 65d3
 .cancel
 	scf
 	ret
-; 666b
 
-Text_LearnedMove: ; 666b
+Text_LearnedMove:
 ; <MON> learned <MOVE>!
 	text_jump UnknownText_0x1c5660
 	db "@"
-; 6670
 
-Text_ForgetWhich: ; 6670
+Text_ForgetWhich:
 ; Which move should be forgotten?
 	text_jump UnknownText_0x1c5678
 	db "@"
-; 6675
 
-Text_StopLearning: ; 6675
+Text_StopLearning:
 ; Stop learning <MOVE>?
 	text_jump UnknownText_0x1c5699
 	db "@"
-; 667a
 
-Text_DidNotLearn: ; 667a
+Text_DidNotLearn:
 ; <MON> did not learn <MOVE>.
 	text_jump UnknownText_0x1c56af
 	db "@"
-; 667f
 
-Text_TryingToLearn: ; 667f
+Text_TryingToLearn:
 ; <MON> is trying to learn <MOVE>. But <MON> can't learn more than
 ; four moves. Delete an older move to make room for <MOVE>?
 	text_jump UnknownText_0x1c56c9
 	db "@"
-; 6684
 
-Text_1_2_and_Poof: ; 6684
+Text_1_2_and_Poof:
 	text_jump UnknownText_0x1c5740 ; 1, 2 and…
 	start_asm
 	push de
@@ -247,10 +240,8 @@ Text_1_2_and_Poof: ; 6684
 ; Poof! <MON> forgot <MOVE>. And…
 	text_jump UnknownText_0x1c574e
 	db "@"
-; 669a
 
-Text_CantForgetHM: ; 669a
+Text_CantForgetHM:
 ; HM moves can't be forgotten now.
 	text_jump UnknownText_0x1c5772
 	db "@"
-; 669f
diff --git a/engine/routines/leveluphappinessmod.asm b/engine/pokemon/level_up_happiness.asm
index 8c6dd92fe..533399d9f 100644
--- a/engine/routines/leveluphappinessmod.asm
+++ b/engine/pokemon/level_up_happiness.asm
@@ -1,4 +1,4 @@
-LevelUpHappinessMod: ; 2709e
+LevelUpHappinessMod:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMon1CaughtLocation
 	call GetPartyLocation
diff --git a/engine/mail.asm b/engine/pokemon/mail.asm
index c1a2db5aa..359d2ac8e 100755..100644
--- a/engine/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -1,4 +1,4 @@
-SendMailToPC: ; 4456e
+SendMailToPC:
 	ld a, MON_ITEM
 	call GetPartyParamLocation
 	ld d, [hl]
@@ -37,9 +37,8 @@ SendMailToPC: ; 4456e
 .full
 	scf
 	ret
-; 445c0
 
-DeleteMailFromPC: ; 445c0 (11:45c0)
+DeleteMailFromPC:
 ; Shift all mail messages in the mailbox
 	ld a, BANK(sMailboxCount)
 	call GetSRAMBank
@@ -71,9 +70,8 @@ DeleteMailFromPC: ; 445c0 (11:45c0)
 	ld hl, sMailboxCount
 	dec [hl]
 	jp CloseSRAM
-; 445f4 (11:45f4)
 
-ReadMailMessage: ; 445f4
+ReadMailMessage:
 	ld a, b
 	ld hl, sMailbox
 	ld bc, MAIL_STRUCT_LENGTH
@@ -83,7 +81,7 @@ ReadMailMessage: ; 445f4
 	farcall ReadAnyMail
 	ret
 
-MoveMailFromPCToParty: ; 44607
+MoveMailFromPCToParty:
 	ld a, BANK(sMailboxCount)
 	call GetSRAMBank
 	push bc
@@ -114,17 +112,15 @@ MoveMailFromPCToParty: ; 44607
 	call CloseSRAM
 	pop bc
 	jp DeleteMailFromPC
-; 44648 (11:4648)
 
-GetMailboxCount: ; 44648
+GetMailboxCount:
 	ld a, BANK(sMailboxCount)
 	call GetSRAMBank
 	ld a, [sMailboxCount]
 	ld c, a
 	jp CloseSRAM
-; 44654
 
-CheckPokeItem:: ; 44654
+CheckPokeMail::
 	push bc
 	push de
 	farcall SelectMonFromParty
@@ -175,7 +171,7 @@ CheckPokeItem:: ; 44654
 	farcall CheckCurPartyMonFainted
 	ld a, POKEMAIL_LAST_MON
 	jr c, .close_sram_return
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ld a, POKEMAIL_CORRECT
@@ -191,10 +187,8 @@ CheckPokeItem:: ; 44654
 .return
 	ld [wScriptVar], a
 	ret
-; 446cc
-
 
-GivePokeItem:: ; 446cc
+GivePokeMail::
 	ld a, [wPartyCount]
 	dec a
 	push af
@@ -241,10 +235,8 @@ GivePokeItem:: ; 446cc
 	ld a, b
 	ld [de], a
 	jp CloseSRAM
-; 44725
 
-
-BackupPartyMonMail: ; 44725
+BackupPartyMonMail:
 	ld a, BANK(sPartyMail)
 	call GetSRAMBank
 	ld hl, sPartyMail
@@ -256,9 +248,8 @@ BackupPartyMonMail: ; 44725
 	ld bc, 1 + 10 * MAIL_STRUCT_LENGTH
 	call CopyBytes
 	jp CloseSRAM
-; 44745
 
-RestorePartyMonMail: ; 44745 (11:4745)
+RestorePartyMonMail:
 	ld a, BANK(sPartyMail)
 	call GetSRAMBank
 	ld hl, sPartyMailBackup
@@ -271,7 +262,7 @@ RestorePartyMonMail: ; 44745 (11:4745)
 	call CopyBytes
 	jp CloseSRAM
 
-DeletePartyMonMail: ; 44765 (11:4765)
+DeletePartyMonMail:
 	ld a, BANK(sPartyMail)
 	call GetSRAMBank
 	xor a
@@ -283,10 +274,8 @@ DeletePartyMonMail: ; 44765 (11:4765)
 	ld bc, 1 + 10 * MAIL_STRUCT_LENGTH
 	call ByteFill
 	jp CloseSRAM
-; 44781 (11:4781)
-
 
-IsAnyMonHoldingMail: ; 44781
+IsAnyMonHoldingMail:
 	ld a, [wPartyCount]
 	and a
 	jr z, .no_mons
@@ -308,25 +297,23 @@ IsAnyMonHoldingMail: ; 44781
 .no_mons
 	and a
 	ret
-; 447a0
 
-_KrisMailBoxMenu: ; 0x447a0
+_PlayerMailBoxMenu:
 	call InitMail
 	jr z, .nomail
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call MailboxPC
 	jp CloseWindow
 
 .nomail
 	ld hl, .EmptyMailboxText
 	jp MenuTextBoxBackup
-; 0x447b4
 
-.EmptyMailboxText: ; 0x447b4
+.EmptyMailboxText:
 	text_jump _EmptyMailboxText
 	db "@"
 
-InitMail: ; 0x447b9
+InitMail:
 ; initialize wMailboxCount and beyond with incrementing values, one per mail
 ; set z if no mail
 	ld a, BANK(sMailboxCount)
@@ -353,9 +340,8 @@ InitMail: ; 0x447b9
 	ld a, [wMailboxCount]
 	and a
 	ret
-; 0x447da
 
-MailboxPC_GetMailAuthor: ; 0x447da
+MailboxPC_GetMailAuthor:
 	dec a
 	ld hl, sMailbox1Author
 	ld bc, MAIL_STRUCT_LENGTH
@@ -371,25 +357,23 @@ MailboxPC_GetMailAuthor: ; 0x447da
 	call CloseSRAM
 	pop de
 	ret
-; 0x447fb
 
-MailboxPC_PrintMailAuthor: ; 0x447fb
+MailboxPC_PrintMailAuthor:
 	push de
 	ld a, [wMenuSelection]
 	call MailboxPC_GetMailAuthor
 	pop hl
 	jp PlaceString
-; 0x44806
 
-MailboxPC: ; 0x44806
+MailboxPC:
 	xor a
 	ld [wCurMessageScrollPosition], a
 	ld a, 1
 	ld [wCurMessageIndex], a
 .loop
 	call InitMail
-	ld hl, .TopMenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, .TopMenuHeader
+	call CopyMenuHeader
 	xor a
 	ld [hBGMapMode], a
 	call InitScrollingMenu
@@ -414,11 +398,10 @@ MailboxPC: ; 0x44806
 .exit
 	xor a
 	ret
-; 0x4484a
 
-.Submenu: ; 0x4484a
-	ld hl, .SubMenuDataHeader
-	call LoadMenuDataHeader
+.Submenu:
+	ld hl, .SubMenuHeader
+	call LoadMenuHeader
 	call VerticalMenu
 	call ExitMenu
 	jr c, .subexit
@@ -429,7 +412,6 @@ MailboxPC: ; 0x44806
 
 .subexit
 	ret
-; 0x44861
 
 .JumpTable:
 	dw .ReadMail
@@ -437,16 +419,15 @@ MailboxPC: ; 0x44806
 	dw .AttachMail
 	dw .Cancel
 
-.ReadMail: ; 0x44869
+.ReadMail:
 	call FadeToMenu
 	ld a, [wMenuSelection]
 	dec a
 	ld b, a
 	call ReadMailMessage
 	jp CloseSubmenu
-; 0x44877
 
-.PutInPack: ; 0x44877
+.PutInPack:
 	ld hl, .MessageLostText
 	call MenuTextBox
 	call YesNoBox
@@ -470,21 +451,20 @@ MailboxPC: ; 0x44806
 	call DeleteMailFromPC
 	ld hl, .PutAwayText
 	jp MenuTextBoxBackup
-; 0x448ac
 
-.PutAwayText: ; 0x448ac
+.PutAwayText:
 	text_jump ClearedMailPutAwayText
 	db "@"
 
-.PackFullText: ; 0x448b1
+.PackFullText:
 	text_jump MailPackFullText
 	db "@"
 
-.MessageLostText: ; 0x448b6
+.MessageLostText:
 	text_jump MailMessageLostText
 	db "@"
 
-.GetMailType: ; 0x448bb
+.GetMailType:
 	push af
 	ld a, BANK(sMailboxCount)
 	call GetSRAMBank
@@ -495,9 +475,8 @@ MailboxPC: ; 0x44806
 	ld a, [hl]
 	ld [wCurItem], a
 	jp CloseSRAM
-; 0x448d2
 
-.AttachMail: ; 0x448d2
+.AttachMail:
 	call FadeToMenu
 	xor a
 	ld [wPartyMenuActionText], a
@@ -540,30 +519,29 @@ MailboxPC: ; 0x44806
 
 .exit2
 	jp CloseSubmenu
-; 0x4493c
 
-.HoldingMailText: ; 0x4493c
+.HoldingMailText:
 	text_jump MailAlreadyHoldingItemText
 	db "@"
 
-.EggText: ; 0x44941
+.EggText:
 	text_jump MailEggText
 	db "@"
 
-.MailMovedText: ; 0x44946
+.MailMovedText:
 	text_jump MailMovedFromBoxText
 	db "@"
 
 .Cancel:
 	ret
 
-.TopMenuDataHeader: ; 0x4494c
+.TopMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 8, 1, SCREEN_WIDTH - 2, 10
-	dw .TopMenuData2
+	dw .TopMenuData
 	db 1 ; default option
 
-.TopMenuData2:
+.TopMenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 0 ; rows/columns?
 	db 1 ; horizontal spacing?
@@ -572,13 +550,13 @@ MailboxPC: ; 0x44806
 	dba NULL
 	dba NULL
 
-.SubMenuDataHeader: ; 0x44964
+.SubMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 13, 9
-	dw .SubMenuData2
+	dw .SubMenuData
 	db 1 ; default option
 
-.SubMenuData2:
+.SubMenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "READ MAIL@"
diff --git a/engine/mail_2.asm b/engine/pokemon/mail_2.asm
index 6e326641b..1cc776706 100755..100644
--- a/engine/mail_2.asm
+++ b/engine/pokemon/mail_2.asm
@@ -1,11 +1,11 @@
-ReadPartyMonMail: ; b9229
+ReadPartyMonMail:
 	ld a, [wCurPartyMon]
 	ld hl, sPartyMail
 	ld bc, MAIL_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
 	ld e, l
-ReadAnyMail: ; b9237
+ReadAnyMail:
 	push de
 	call ClearBGPalettes
 	call ClearSprites
@@ -63,9 +63,8 @@ ReadAnyMail: ; b9237
 	pop af
 	ld [wJumptableIndex], a
 	jr .loop
-; b92b8
 
-.LoadGFX: ; b92b8
+.LoadGFX:
 	ld h, d
 	ld l, e
 	push hl
@@ -110,9 +109,8 @@ ReadAnyMail: ; b9237
 	jp hl
 .done
 	ret
-; b92f8
 
-MailGFXPointers: ; b92f8
+MailGFXPointers:
 	dbw FLOWER_MAIL,  LoadFlowerMailGFX
 	dbw SURF_MAIL,    LoadSurfMailGFX
 	dbw LITEBLUEMAIL, LoadLiteBlueMailGFX
@@ -124,9 +122,8 @@ MailGFXPointers: ; b92f8
 	dbw MUSIC_MAIL,   LoadMusicMailGFX
 	dbw MIRAGE_MAIL,  LoadMirageMailGFX
 	db -1
-; b9317
 
-LoadSurfMailGFX: ; b9317
+LoadSurfMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld de, SurfMailBorderGFX
@@ -140,7 +137,7 @@ LoadSurfMailGFX: ; b9317
 	call LoadMailGFX_Color2
 	jr FinishLoadingSurfLiteBlueMailGFX
 
-LoadLiteBlueMailGFX: ; b9335
+LoadLiteBlueMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld de, LiteBlueMailBorderGFX
@@ -153,7 +150,7 @@ LoadLiteBlueMailGFX: ; b9335
 	ld c, 1 * 8
 	call LoadMailGFX_Color2
 
-FinishLoadingSurfLiteBlueMailGFX: ; b9351
+FinishLoadingSurfLiteBlueMailGFX:
 	ld de, SurfLiteBlueMailSmallShapesGFX
 	ld c, 2 * 8
 	call LoadMailGFX_Color2
@@ -209,9 +206,8 @@ FinishLoadingSurfLiteBlueMailGFX: ; b9351
 	ld [hli], a
 	pop hl
 	jp MailGFX_PlaceMessage
-; b93d2
 
-LoadEonMailGFX: ; b93d2
+LoadEonMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld de, EonMailBorder1GFX
@@ -259,9 +255,8 @@ LoadEonMailGFX: ; b93d2
 	call LovelyEonMail_PlaceIcons
 	pop hl
 	jp MailGFX_PlaceMessage
-; b944b
 
-LoadLovelyMailGFX: ; b944b
+LoadLovelyMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld de, LovelyMailBorderGFX
@@ -290,9 +285,8 @@ LoadLovelyMailGFX: ; b944b
 	call LovelyEonMail_PlaceIcons
 	pop hl
 	jp MailGFX_PlaceMessage
-; b9491
 
-LovelyEonMail_PlaceIcons: ; b9491
+LovelyEonMail_PlaceIcons:
 	ld a, $3d
 	hlcoord 2, 2
 	call Mail_Draw2x2Graphic
@@ -322,9 +316,8 @@ LovelyEonMail_PlaceIcons: ; b9491
 	hlcoord 16, 12
 	ld [hl], a
 	ret
-; b94d6
 
-LoadMorphMailGFX: ; b94d6
+LoadMorphMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld bc, 5 * 8
@@ -398,9 +391,8 @@ LoadMorphMailGFX: ; b94d6
 	call Mail_Draw3x2Graphic
 	pop hl
 	jp MailGFX_PlaceMessage
-; b9582
 
-LoadBlueSkyMailGFX: ; b9582
+LoadBlueSkyMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld de, EonMailBorder1GFX
@@ -476,9 +468,8 @@ LoadBlueSkyMailGFX: ; b9582
 	call Mail_Draw2x2Graphic
 	pop hl
 	jp MailGFX_PlaceMessage
-; b9636
 
-Mail_Place6TileRow: ; b9636
+Mail_Place6TileRow:
 	ld b, $6
 .loop
 	ld [hli], a
@@ -486,9 +477,8 @@ Mail_Place6TileRow: ; b9636
 	dec b
 	jr nz, .loop
 	ret
-; b963e
 
-LoadFlowerMailGFX: ; b963e
+LoadFlowerMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld de, FlowerMailBorderGFX
@@ -541,9 +531,8 @@ LoadFlowerMailGFX: ; b963e
 	call Mail_Draw2x2Graphic
 	pop hl
 	jp MailGFX_PlaceMessage
-; b96ca
 
-LoadPortraitMailGFX: ; b96ca
+LoadPortraitMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld de, PortraitMailBorderGFX
@@ -572,9 +561,8 @@ LoadPortraitMailGFX: ; b96ca
 	call PrepMonFrontpic
 	pop hl
 	jp MailGFX_PlaceMessage
-; b9710
 
-LoadMusicMailGFX: ; b9710
+LoadMusicMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld de, MusicMailBorderGFX
@@ -615,9 +603,8 @@ LoadMusicMailGFX: ; b9710
 	call LovelyEonMail_PlaceIcons
 	pop hl
 	jp MailGFX_PlaceMessage
-; b9776
 
-LoadMirageMailGFX: ; b9776
+LoadMirageMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld bc, 5 * 8
@@ -676,9 +663,8 @@ LoadMirageMailGFX: ; b9776
 	call Mail_Draw16TileRow
 	pop hl
 	jp MailGFX_PlaceMessage
-; b97f8
 
-MailGFX_GenerateMonochromeTilesColor2: ; b97f8
+MailGFX_GenerateMonochromeTilesColor2:
 .loop
 	xor a
 	ld [hli], a
@@ -689,9 +675,8 @@ MailGFX_GenerateMonochromeTilesColor2: ; b97f8
 	or c
 	jr nz, .loop
 	ret
-; b9803
 
-MailGFX_PlaceMessage: ; b9803
+MailGFX_PlaceMessage:
 	ld bc, MAIL_STRUCT_LENGTH
 	ld de, wTempMail
 	ld a, BANK(sPartyMail)
@@ -723,9 +708,8 @@ MailGFX_PlaceMessage: ; b9803
 
 .place_author
 	jp PlaceString
-; b984e
 
-Unreferenced_Functionb984e: ; b984e
+Unreferenced_Functionb984e:
 .loop
 	ld a, [hl]
 	xor $ff
@@ -735,9 +719,8 @@ Unreferenced_Functionb984e: ; b984e
 	or c
 	jr nz, .loop
 	ret
-; b9858
 
-DrawMailBorder: ; b9858
+DrawMailBorder:
 	hlcoord 0, 0
 	ld a, $31
 	ld [hli], a
@@ -757,9 +740,8 @@ DrawMailBorder: ; b9858
 	ld a, $38
 	ld [hl], a
 	ret
-; b987b
 
-DrawMailBorder2: ; b987b
+DrawMailBorder2:
 	hlcoord 0, 0
 	ld a, $31
 	ld [hli], a
@@ -778,23 +760,22 @@ DrawMailBorder2: ; b987b
 	call Mail_DrawLeftRightBorder
 	ld [hl], $31
 	ret
-; b989e
 
-Mail_Place14TileAlternatingRow: ; b989e
+Mail_Place14TileAlternatingRow:
 	push af
 	ld b, 14 / 2
 	jr Mail_PlaceAlternatingRow
 
-Mail_Place16TileAlternatingRow: ; b98a3
+Mail_Place16TileAlternatingRow:
 	push af
 	ld b, 16 / 2
 	jr Mail_PlaceAlternatingRow
 
-Mail_Place18TileAlternatingRow: ; b98a8
+Mail_Place18TileAlternatingRow:
 	push af
 	ld b, 18 / 2
 
-Mail_PlaceAlternatingRow: ; b98ab
+Mail_PlaceAlternatingRow:
 .loop
 	ld [hli], a
 	inc a
@@ -805,18 +786,17 @@ Mail_PlaceAlternatingRow: ; b98ab
 	ld [hl], a
 	pop af
 	ret
-; b98b5
 
-Mail_Place14TileAlternatingColumn: ; b98b5
+Mail_Place14TileAlternatingColumn:
 	push af
 	ld b, 14 / 2
 	jr Mail_PlaceAlternatingColumn
 
-Mail_Place16TileAlternatingColumn: ; b98ba
+Mail_Place16TileAlternatingColumn:
 	push af
 	ld b, 16 / 2
 
-Mail_PlaceAlternatingColumn: ; b98bd
+Mail_PlaceAlternatingColumn:
 .loop
 	ld [hl], a
 	ld de, SCREEN_WIDTH
@@ -830,36 +810,34 @@ Mail_PlaceAlternatingColumn: ; b98bd
 	ld [hl], a
 	pop af
 	ret
-; b98cc
 
-Mail_Draw7TileRow: ; b98cc
+Mail_Draw7TileRow:
 	ld b, $7
 	jr Mail_DrawRowLoop
 
-Mail_Draw13TileRow: ; b98d0
+Mail_Draw13TileRow:
 	ld b, $d
 	jr Mail_DrawRowLoop
 
-Mail_Draw16TileRow: ; b98d4
+Mail_Draw16TileRow:
 	ld b, $10
 	jr Mail_DrawRowLoop
 
-Mail_DrawTopBottomBorder: ; b98d8
+Mail_DrawTopBottomBorder:
 	ld b, SCREEN_WIDTH - 2
 	jr Mail_DrawRowLoop
 
-Mail_DrawFullWidthBorder: ; b98dc
+Mail_DrawFullWidthBorder:
 	ld b, SCREEN_WIDTH
 
-Mail_DrawRowLoop: ; b98de
+Mail_DrawRowLoop:
 .loop
 	ld [hli], a
 	dec b
 	jr nz, .loop
 	ret
-; b98e3
 
-Mail_DrawLeftRightBorder: ; b98e3
+Mail_DrawLeftRightBorder:
 	ld b, SCREEN_HEIGHT - 2
 	ld de, SCREEN_WIDTH
 .loop
@@ -868,9 +846,8 @@ Mail_DrawLeftRightBorder: ; b98e3
 	dec b
 	jr nz, .loop
 	ret
-; b98ee
 
-Mail_Draw2x2Graphic: ; b98ee
+Mail_Draw2x2Graphic:
 	push af
 	ld [hli], a
 	inc a
@@ -883,9 +860,8 @@ Mail_Draw2x2Graphic: ; b98ee
 	ld [hl], a
 	pop af
 	ret
-; b98fc
 
-Mail_Draw3x2Graphic: ; b98fc
+Mail_Draw3x2Graphic:
 	ld [hli], a
 	inc a
 	ld [hli], a
@@ -900,9 +876,8 @@ Mail_Draw3x2Graphic: ; b98fc
 	inc a
 	ld [hl], a
 	ret
-; b990c
 
-LoadMailGFX_Color1: ; b990c
+LoadMailGFX_Color1:
 .loop
 	ld a, [de]
 	inc de
@@ -912,9 +887,8 @@ LoadMailGFX_Color1: ; b990c
 	dec c
 	jr nz, .loop
 	ret
-; b9915
 
-LoadMailGFX_Color2: ; b9915
+LoadMailGFX_Color2:
 .loop
 	xor a
 	ld [hli], a
@@ -924,9 +898,8 @@ LoadMailGFX_Color2: ; b9915
 	dec c
 	jr nz, .loop
 	ret
-; b991e
 
-LoadMailGFX_Color3: ; b991e
+LoadMailGFX_Color3:
 .loop
 	ld a, [de]
 	inc de
@@ -935,15 +908,13 @@ LoadMailGFX_Color3: ; b991e
 	dec c
 	jr nz, .loop
 	ret
-; b9926
 
 INCLUDE "gfx/mail.asm"
 
-ItemIsMail: ; b9e76
+ItemIsMail:
 	ld a, d
 	ld hl, MailItems
 	ld de, 1
 	jp IsInArray
-; b9e80
 
 INCLUDE "data/items/mail_items.asm"
diff --git a/engine/mon_menu.asm b/engine/pokemon/mon_menu.asm
index f398910ac..2d14bd603 100755..100644
--- a/engine/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -1,47 +1,12 @@
-MonMenuOptionStrings: ; 24caf
-	db "STATS@"
-	db "SWITCH@"
-	db "ITEM@"
-	db "CANCEL@"
-	db "MOVE@"
-	db "MAIL@"
-	db "ERROR!@"
-; 24cd9
+INCLUDE "data/mon_menu.asm"
 
-MonMenuOptions: ; 24cd9
-; moves
-	db MONMENU_FIELD_MOVE, MONMENU_CUT,        CUT
-	db MONMENU_FIELD_MOVE, MONMENU_FLY,        FLY
-	db MONMENU_FIELD_MOVE, MONMENU_SURF,       SURF
-	db MONMENU_FIELD_MOVE, MONMENU_STRENGTH,   STRENGTH
-	db MONMENU_FIELD_MOVE, MONMENU_FLASH,      FLASH
-	db MONMENU_FIELD_MOVE, MONMENU_WATERFALL,  WATERFALL
-	db MONMENU_FIELD_MOVE, MONMENU_WHIRLPOOL,  WHIRLPOOL
-	db MONMENU_FIELD_MOVE, MONMENU_DIG,        DIG
-	db MONMENU_FIELD_MOVE, MONMENU_TELEPORT,   TELEPORT
-	db MONMENU_FIELD_MOVE, MONMENU_SOFTBOILED, SOFTBOILED
-	db MONMENU_FIELD_MOVE, MONMENU_HEADBUTT,   HEADBUTT
-	db MONMENU_FIELD_MOVE, MONMENU_ROCKSMASH,  ROCK_SMASH
-	db MONMENU_FIELD_MOVE, MONMENU_MILKDRINK,  MILK_DRINK
-	db MONMENU_FIELD_MOVE, MONMENU_SWEETSCENT, SWEET_SCENT
-; options
-	db MONMENU_MENUOPTION, MONMENU_STATS,      1 ; STATS
-	db MONMENU_MENUOPTION, MONMENU_SWITCH,     2 ; SWITCH
-	db MONMENU_MENUOPTION, MONMENU_ITEM,       3 ; ITEM
-	db MONMENU_MENUOPTION, MONMENU_CANCEL,     4 ; CANCEL
-	db MONMENU_MENUOPTION, MONMENU_MOVE,       5 ; MOVE
-	db MONMENU_MENUOPTION, MONMENU_MAIL,       6 ; MAIL
-	db MONMENU_MENUOPTION, MONMENU_ERROR,      7 ; ERROR!
-	db -1
-; 24d19
-
-MonSubmenu: ; 24d19
+MonSubmenu:
 	xor a
 	ld [hBGMapMode], a
 	call GetMonSubmenuItems
 	farcall FreezeMonIcons
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	call .GetTopCoord
 	call PopulateMonMenu
 
@@ -52,16 +17,14 @@ MonSubmenu: ; 24d19
 
 	call ExitMenu
 	ret
-; 24d3f
 
-.MenuDataHeader: ; 24d3f
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw 0
 	db 1 ; default option
-; 24d47
 
-.GetTopCoord: ; 24d47
+.GetTopCoord:
 ; TopCoord = 1 + BottomCoord - 2 * (NumSubmenuItems + 1)
 	ld a, [wBuffer1]
 	inc a
@@ -73,14 +36,13 @@ MonSubmenu: ; 24d19
 	ld [wMenuBorderTopCoord], a
 	call MenuBox
 	ret
-; 24d59
 
-MonMenuLoop: ; 24d59
+MonMenuLoop:
 .loop
 	ld a, MENU_UNUSED_3 | MENU_BACKUP_TILES_2 ; flags
-	ld [wMenuData2Flags], a
+	ld [wMenuDataFlags], a
 	ld a, [wBuffer1] ; items
-	ld [wMenuData2Items], a
+	ld [wMenuDataItems], a
 	call InitVerticalMenuCursor
 	ld hl, w2DMenuFlags1
 	set 6, [hl]
@@ -95,7 +57,7 @@ MonMenuLoop: ; 24d59
 	jr .loop
 
 .cancel
-	ld a, MONMENU_CANCEL ; CANCEL
+	ld a, MONMENUITEM_CANCEL
 	ret
 
 .select
@@ -107,11 +69,10 @@ MonMenuLoop: ; 24d59
 	add hl, bc
 	ld a, [hl]
 	ret
-; 24d91
 
-PopulateMonMenu: ; 24d91
+PopulateMonMenu:
 	call MenuBoxCoord2Tile
-	ld bc, $2a ; 42
+	ld bc, 2 * SCREEN_WIDTH + 2
 	add hl, bc
 	ld de, wBuffer2
 .loop
@@ -124,19 +85,18 @@ PopulateMonMenu: ; 24d91
 	call GetMonMenuString
 	pop hl
 	call PlaceString
-	ld bc, $28 ; 40
+	ld bc, 2 * SCREEN_WIDTH
 	add hl, bc
 	pop de
 	jr .loop
-; 24db0
 
-GetMonMenuString: ; 24db0
+GetMonMenuString:
 	ld hl, MonMenuOptions + 1
 	ld de, 3
 	call IsInArray
 	dec hl
 	ld a, [hli]
-	cp 1
+	cp MONMENU_MENUOPTION
 	jr z, .NotMove
 	inc hl
 	ld a, [hl]
@@ -153,9 +113,8 @@ GetMonMenuString: ; 24db0
 	ld d, h
 	ld e, l
 	ret
-; 24dd4
 
-GetMonSubmenuItems: ; 24dd4
+GetMonSubmenuItems:
 	call ResetMonSubmenu
 	ld a, [wCurPartySpecies]
 	cp EGG
@@ -188,11 +147,11 @@ GetMonSubmenuItems: ; 24dd4
 	jr nz, .loop
 
 .skip_moves
-	ld a, MONMENU_STATS
+	ld a, MONMENUITEM_STATS
 	call AddMonMenuItem
-	ld a, MONMENU_SWITCH
+	ld a, MONMENUITEM_SWITCH
 	call AddMonMenuItem
-	ld a, MONMENU_MOVE
+	ld a, MONMENUITEM_MOVE
 	call AddMonMenuItem
 	ld a, [wLinkMode]
 	and a
@@ -203,9 +162,9 @@ GetMonSubmenuItems: ; 24dd4
 	ld d, [hl]
 	farcall ItemIsMail
 	pop hl
-	ld a, MONMENU_MAIL
+	ld a, MONMENUITEM_MAIL
 	jr c, .ok
-	ld a, MONMENU_ITEM
+	ld a, MONMENUITEM_ITEM
 
 .ok
 	call AddMonMenuItem
@@ -214,7 +173,7 @@ GetMonSubmenuItems: ; 24dd4
 	ld a, [wBuffer1]
 	cp NUM_MONMENU_ITEMS
 	jr z, .ok2
-	ld a, MONMENU_CANCEL
+	ld a, MONMENUITEM_CANCEL
 	call AddMonMenuItem
 
 .ok2
@@ -222,17 +181,16 @@ GetMonSubmenuItems: ; 24dd4
 	ret
 
 .egg
-	ld a, MONMENU_STATS
+	ld a, MONMENUITEM_STATS
 	call AddMonMenuItem
-	ld a, MONMENU_SWITCH
+	ld a, MONMENUITEM_SWITCH
 	call AddMonMenuItem
-	ld a, MONMENU_CANCEL
+	ld a, MONMENUITEM_CANCEL
 	call AddMonMenuItem
 	call TerminateMonSubmenu
 	ret
-; 24e52
 
-IsFieldMove: ; 24e52
+IsFieldMove:
 	ld b, a
 	ld hl, MonMenuOptions
 .next
@@ -251,28 +209,25 @@ IsFieldMove: ; 24e52
 
 .nope
 	ret
-; 24e68
 
-ResetMonSubmenu: ; 24e68
+ResetMonSubmenu:
 	xor a
 	ld [wBuffer1], a
 	ld hl, wBuffer2
 	ld bc, NUM_MONMENU_ITEMS + 1
 	call ByteFill
 	ret
-; 24e76
 
-TerminateMonSubmenu: ; 24e76
+TerminateMonSubmenu:
 	ld a, [wBuffer1]
 	ld e, a
-	ld d, $0
+	ld d, 0
 	ld hl, wBuffer2
 	add hl, de
 	ld [hl], -1
 	ret
-; 24e83
 
-AddMonMenuItem: ; 24e83
+AddMonMenuItem:
 	push hl
 	push de
 	push af
@@ -280,7 +235,7 @@ AddMonMenuItem: ; 24e83
 	ld e, a
 	inc a
 	ld [wBuffer1], a
-	ld d, $0
+	ld d, 0
 	ld hl, wBuffer2
 	add hl, de
 	pop af
@@ -288,19 +243,18 @@ AddMonMenuItem: ; 24e83
 	pop de
 	pop hl
 	ret
-; 24e99
 
-BattleMonMenu: ; 24e99
-	ld hl, MenuDataHeader_0x24ed4
-	call CopyMenuDataHeader
+BattleMonMenu:
+	ld hl, MenuHeader_0x24ed4
+	call CopyMenuHeader
 	xor a
 	ld [hBGMapMode], a
 	call MenuBox
 	call UpdateSprites
 	call PlaceVerticalMenuItems
 	call WaitBGMap
-	call CopyMenuData2
-	ld a, [wMenuData2Flags]
+	call CopyMenuData
+	ld a, [wMenuDataFlags]
 	bit 7, a
 	jr z, .set_carry
 	call InitVerticalMenuCursor
@@ -321,19 +275,16 @@ BattleMonMenu: ; 24e99
 .clear_carry
 	and a
 	ret
-; 24ed4
 
-MenuDataHeader_0x24ed4: ; 24ed4
+MenuHeader_0x24ed4:
 	db 0 ; flags
 	menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-	dw MenuData2_0x24edc
+	dw MenuData_0x24edc
 	db 1 ; default option
-; 24edc
 
-MenuData2_0x24edc: ; 24edc
+MenuData_0x24edc:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 3 ; items
 	db "SWITCH@"
 	db "STATS@"
 	db "CANCEL@"
-; 24ef2
diff --git a/engine/mon_stats.asm b/engine/pokemon/mon_stats.asm
index a06ad1a46..76f09b461 100644
--- a/engine/mon_stats.asm
+++ b/engine/pokemon/mon_stats.asm
@@ -1,11 +1,11 @@
-DrawPlayerHP: ; 50b0a
+DrawPlayerHP:
 	ld a, $1
 	jr DrawHP
 
-DrawEnemyHP: ; 50b0e
+DrawEnemyHP:
 	ld a, $2
 
-DrawHP: ; 50b10
+DrawHP:
 	ld [wWhichHPBar], a
 	push hl
 	push bc
@@ -82,7 +82,7 @@ DrawHP: ; 50b10
 	pop de
 	ret
 
-PrintTempMonStats: ; 50b7b
+PrintTempMonStats:
 ; Print wTempMon's stats at hl, with spacing bc.
 	push bc
 	push hl
@@ -105,7 +105,7 @@ PrintTempMonStats: ; 50b7b
 	ld de, wTempMonSpeed
 	jp PrintNum
 
-.PrintStat: ; 50bab
+.PrintStat:
 	push hl
 	call PrintNum
 	pop hl
@@ -113,7 +113,7 @@ PrintTempMonStats: ; 50b7b
 	add hl, de
 	ret
 
-.StatNames: ; 50bb5
+.StatNames:
 	db   "ATTACK"
 	next "DEFENSE"
 	next "SPCL.ATK"
@@ -121,8 +121,8 @@ PrintTempMonStats: ; 50b7b
 	next "SPEED"
 	next "@"
 
-GetGender: ; 50bdd
-; Return the gender of a given monster (wCurPartyMon/wCurOTMon/CurWildMon).
+GetGender:
+; Return the gender of a given monster (wCurPartyMon/wCurOTMon/wCurWildMon).
 ; When calling this function, a should be set to an appropriate wMonType value.
 
 ; return values:
@@ -170,7 +170,6 @@ GetGender: ; 50bdd
 	call AddNTimes
 
 .DVs:
-
 ; sBoxMon data is read directly from SRAM.
 	ld a, [wMonType]
 	cp BOXMON
@@ -209,7 +208,7 @@ GetGender: ; 50bdd
 
 ; The higher the ratio, the more likely the monster is to be female.
 
-	cp GENDERLESS
+	cp GENDER_UNKNOWN
 	jr z, .Genderless
 
 	and a ; GENDER_F0?
@@ -235,7 +234,7 @@ GetGender: ; 50bdd
 	scf
 	ret
 
-ListMovePP: ; 50c50
+ListMovePP:
 	ld a, [wNumMoves]
 	inc a
 	ld c, a
@@ -316,7 +315,7 @@ ListMovePP: ; 50c50
 .done
 	ret
 
-.load_loop ; 50cc9
+.load_loop
 	ld [hli], a
 	ld [hld], a
 	add hl, de
@@ -324,7 +323,7 @@ ListMovePP: ; 50c50
 	jr nz, .load_loop
 	ret
 
-Unreferenced_Function50cd0: ; 50cd0
+Unreferenced_Function50cd0:
 .loop
 	ld [hl], $32
 	inc hl
@@ -343,7 +342,7 @@ Unused_PlaceEnemyHPLevel:
 	call GetNick
 	pop hl
 	call PlaceString
-	call CopyPkmnToTempMon
+	call CopyMonToTempMon
 	pop hl
 	ld a, [wCurPartySpecies]
 	cp EGG
@@ -363,7 +362,7 @@ Unused_PlaceEnemyHPLevel:
 .egg
 	ret
 
-PlaceStatusString: ; 50d0a
+PlaceStatusString:
 	push de
 	inc de
 	inc de
@@ -382,10 +381,10 @@ PlaceStatusString: ; 50d0a
 	and a
 	ret
 
-FntString: ; 50d22
+FntString:
 	db "FNT@"
 
-CopyStatusString: ; 50d25
+CopyStatusString:
 	ld a, [de]
 	inc de
 	ld [hli], a
@@ -396,7 +395,7 @@ CopyStatusString: ; 50d25
 	ld [hl], a
 	ret
 
-PlaceNonFaintStatus: ; 50d2e
+PlaceNonFaintStatus:
 	push de
 	ld a, [de]
 	ld de, PsnString
@@ -430,7 +429,7 @@ BrnString: db "BRN@"
 FrzString: db "FRZ@"
 ParString: db "PAR@"
 
-ListMoves: ; 50d6f
+ListMoves:
 ; List moves at hl, spaced every [wBuffer1] tiles.
 	ld de, wListMoves_MoveIndicesBuffer
 	ld b, $0
diff --git a/engine/move_mon.asm b/engine/pokemon/move_mon.asm
index 0c0694851..128bbf200 100755..100644
--- a/engine/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -1,5 +1,5 @@
-TryAddMonToParty: ; d88c
-; Check if to copy wild Pkmn or generate new Pkmn
+TryAddMonToParty:
+; Check if to copy wild mon or generate a new one
 	; Whose is it?
 	ld de, wPartyCount
 	ld a, [wMonType]
@@ -47,6 +47,7 @@ TryAddMonToParty: ; d88c
 	ld hl, wPlayerName
 	ld bc, NAME_LENGTH
 	call CopyBytes
+	; Only initialize the nickname for party mon
 	ld a, [wMonType]
 	and a
 	jr nz, .skipnickname
@@ -75,25 +76,35 @@ TryAddMonToParty: ; d88c
 	dec a
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
-GeneratePartyMonStats: ; d906
+GeneratePartyMonStats:
+; wBattleMode specifies whether it's a wild mon or not.
+; wMonType specifies whether it's an opposing mon or not.
+; wCurPartySpecies/wCurPartyLevel specify the species and level.
+; hl points to the wPartyMon struct to fill.
+
 	ld e, l
 	ld d, h
 	push hl
+
+	; Initialize the species
 	ld a, [wCurPartySpecies]
 	ld [wCurSpecies], a
 	call GetBaseData
 	ld a, [wBaseDexNo]
 	ld [de], a
 	inc de
+
+	; Copy the item if it's a wild mon
 	ld a, [wBattleMode]
 	and a
 	ld a, $0
 	jr z, .skipitem
 	ld a, [wEnemyMonItem]
-
 .skipitem
 	ld [de], a
 	inc de
+
+	; Copy the moves if it's a wild mon
 	push de
 	ld h, d
 	ld l, e
@@ -104,35 +115,39 @@ GeneratePartyMonStats: ; d906
 	and a
 	jr nz, .randomlygeneratemoves
 	ld de, wEnemyMonMoves
-	rept NUM_MOVES + -1
+rept NUM_MOVES + -1
 	ld a, [de]
 	inc de
 	ld [hli], a
-	endr
+endr
 	ld a, [de]
 	ld [hl], a
 	jr .next
 
 .randomlygeneratemoves
 	xor a
-	rept NUM_MOVES + -1
+rept NUM_MOVES + -1
 	ld [hli], a
-	endr
+endr
 	ld [hl], a
 	ld [wBuffer1], a
 	predef FillMoves
 
 .next
 	pop de
-rept 4
+rept NUM_MOVES
 	inc de
 endr
+
+	; Initialize ID.
 	ld a, [wPlayerID]
 	ld [de], a
 	inc de
 	ld a, [wPlayerID + 1]
 	ld [de], a
 	inc de
+
+	; Initialize Exp.
 	push de
 	ld a, [wCurPartyLevel]
 	ld d, a
@@ -147,24 +162,28 @@ endr
 	ld a, [hProduct + 3]
 	ld [de], a
 	inc de
+
+	; Initialize stat experience.
 	xor a
-	ld b, $a
+	ld b, MON_DVS - MON_STAT_EXP
 .loop
 	ld [de], a
 	inc de
 	dec b
 	jr nz, .loop
+
 	pop hl
 	push hl
 	ld a, [wMonType]
 	and $f
-	jr z, .generateDVs
+	jr z, .registerpokedex
+
 	push hl
 	farcall GetTrainerDVs
 	pop hl
-	jr .initializetrainermonstats
+	jr .initializeDVs
 
-.generateDVs
+.registerpokedex
 	ld a, [wCurPartySpecies]
 	ld [wd265], a
 	dec a
@@ -174,23 +193,26 @@ endr
 	dec a
 	call SetSeenAndCaughtMon
 	pop de
+
 	pop hl
 	push hl
 	ld a, [wBattleMode]
 	and a
-	jr nz, .copywildmonstats
+	jr nz, .copywildmonDVs
+
 	call Random
 	ld b, a
 	call Random
 	ld c, a
-
-.initializetrainermonstats
+.initializeDVs
 	ld a, b
 	ld [de], a
 	inc de
 	ld a, c
 	ld [de], a
 	inc de
+
+	; Initialize PP.
 	push hl
 	push de
 	inc hl
@@ -198,42 +220,55 @@ endr
 	call FillPP
 	pop de
 	pop hl
-rept 4
+rept NUM_MOVES
 	inc de
 endr
-	ld a, 70
+
+	; Initialize happiness.
+	ld a, BASE_HAPPINESS
 	ld [de], a
 	inc de
+
 	xor a
+	; PokerusStatus
 	ld [de], a
 	inc de
+	; CaughtData/CaughtTime/CaughtLevel
 	ld [de], a
 	inc de
+	; CaughtGender/CaughtLocation
 	ld [de], a
 	inc de
+
+	; Initialize level.
 	ld a, [wCurPartyLevel]
 	ld [de], a
 	inc de
+
 	xor a
+	; Status
 	ld [de], a
 	inc de
+	; Unused
 	ld [de], a
 	inc de
-	ld bc, 10
+
+	; Initialize HP.
+	ld bc, MON_STAT_EXP - 1
 	add hl, bc
-	ld a, $1
+	ld a, 1
 	ld c, a
 	ld b, FALSE
-	call CalcPkmnStatC
+	call CalcMonStatC
 	ld a, [hProduct + 2]
 	ld [de], a
 	inc de
 	ld a, [hProduct + 3]
 	ld [de], a
 	inc de
-	jr .next2
+	jr .initstats
 
-.copywildmonstats
+.copywildmonDVs
 	ld a, [wEnemyMonDVs]
 	ld [de], a
 	inc de
@@ -252,19 +287,27 @@ endr
 	jr nz, .wildmonpploop
 	pop hl
 
+	; Initialize happiness.
 	ld a, BASE_HAPPINESS
 	ld [de], a
 	inc de
+
 	xor a
+	; PokerusStatus
 	ld [de], a
 	inc de
+	; CaughtData/CaughtTime/CaughtLevel
 	ld [de], a
 	inc de
+	; CaughtGender/CaughtLocation
 	ld [de], a
 	inc de
+
+	; Initialize level.
 	ld a, [wCurPartyLevel]
 	ld [de], a
 	inc de
+
 	ld hl, wEnemyMonStatus
 	; Copy wEnemyMonStatus
 	ld a, [hli]
@@ -282,24 +325,24 @@ endr
 	ld [de], a
 	inc de
 
-.next2
+.initstats
 	ld a, [wBattleMode]
 	dec a
 	jr nz, .generatestats
 	ld hl, wEnemyMonMaxHP
-	ld bc, 2 * 6 ; MaxHP + 5 Stats
+	ld bc, PARTYMON_STRUCT_LENGTH - MON_MAXHP
 	call CopyBytes
 	pop hl
-	jr .next3
+	jr .registerunowndex
 
 .generatestats
 	pop hl
 	ld bc, MON_STAT_EXP - 1
 	add hl, bc
-	ld b, $0 ; if b = 1, then stat calculation takes stat exp into account.
-	call CalcPkmnStats
+	ld b, FALSE
+	call CalcMonStats
 
-.next3
+.registerunowndex
 	ld a, [wMonType]
 	and $f
 	jr nz, .done
@@ -317,9 +360,8 @@ endr
 .done
 	scf ; When this function returns, the carry flag indicates success vs failure.
 	ret
-; da6d
 
-FillPP: ; da6d
+FillPP:
 	push bc
 	ld b, NUM_MOVES
 .loop
@@ -348,9 +390,8 @@ FillPP: ; da6d
 	jr nz, .loop
 	pop bc
 	ret
-; da96
 
-AddTempmonToParty: ; da96
+AddTempmonToParty:
 	ld hl, wPartyCount
 	ld a, [hl]
 	cp PARTY_LENGTH
@@ -434,12 +475,12 @@ AddTempmonToParty: ; da96
 	and a
 	ret
 
-SendGetPkmnIntoFromBox: ; db3f
-; Sents/Gets Pkmn into/from Box depending on Parameter
-; wPokemonWithdrawDepositParameter == 0: get Pkmn into Party
-; wPokemonWithdrawDepositParameter == 1: sent Pkmn into Box
-; wPokemonWithdrawDepositParameter == 2: get Pkmn from DayCare
-; wPokemonWithdrawDepositParameter == 3: put Pkmn into DayCare
+SendGetMonIntoFromBox:
+; Sents/Gets mon into/from Box depending on Parameter
+; wPokemonWithdrawDepositParameter == 0: get mon into Party
+; wPokemonWithdrawDepositParameter == 1: sent mon into Box
+; wPokemonWithdrawDepositParameter == 2: get mon from DayCare
+; wPokemonWithdrawDepositParameter == 3: put mon into DayCare
 
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
@@ -452,7 +493,7 @@ SendGetPkmnIntoFromBox: ; db3f
 	ld hl, wBreedMon1Species
 	jr z, .breedmon
 
-	; we want to sent a Pkmn into the Box
+	; we want to sent a mon into the Box
 	; so check if there's enough space
 	ld hl, sBoxCount
 	ld a, [hl]
@@ -597,7 +638,7 @@ SendGetPkmnIntoFromBox: ; db3f
 	srl a
 	add $2
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	callfar CalcLevel
 	ld a, d
 	ld [wCurPartyLevel], a
@@ -616,8 +657,8 @@ SendGetPkmnIntoFromBox: ; db3f
 	add hl, bc
 
 	push bc
-	ld b, $1
-	call CalcPkmnStats
+	ld b, TRUE
+	call CalcMonStats
 	pop bc
 
 	ld a, [wPokemonWithdrawDepositParameter]
@@ -659,15 +700,13 @@ SendGetPkmnIntoFromBox: ; db3f
 	call CloseSRAM
 	and a
 	ret
-; dcb1
 
-CloseSRAM_And_SetCarryFlag: ; dcb1
+CloseSRAM_And_SetCarryFlag:
 	call CloseSRAM
 	scf
 	ret
-; dcb6
 
-RestorePPofDepositedPokemon: ; dcb6
+RestorePPofDepositedPokemon:
 	ld a, b
 	ld hl, sBoxMons
 	ld bc, BOXMON_STRUCT_LENGTH
@@ -730,9 +769,8 @@ RestorePPofDepositedPokemon: ; dcb6
 	pop af
 	ld [wMenuCursorY], a
 	ret
-; dd21
 
-RetrievePokemonFromDayCareMan: ; dd21
+RetrieveMonFromDayCareMan:
 	ld a, [wBreedMon1Species]
 	ld [wCurPartySpecies], a
 	ld de, SFX_TRANSACTION
@@ -745,10 +783,9 @@ RetrievePokemonFromDayCareMan: ; dd21
 	ld [wCurPartyLevel], a
 	xor a
 	ld [wPokemonWithdrawDepositParameter], a
-	jp Functiondd64
-; dd42
+	jp RetrieveBreedmon
 
-RetrievePokemonFromDayCareLady: ; dd42
+RetrieveMonFromDayCareLady:
 	ld a, [wBreedMon2Species]
 	ld [wCurPartySpecies], a
 	ld de, SFX_TRANSACTION
@@ -761,10 +798,9 @@ RetrievePokemonFromDayCareLady: ; dd42
 	ld [wCurPartyLevel], a
 	ld a, PC_DEPOSIT
 	ld [wPokemonWithdrawDepositParameter], a
-	jp Functiondd64
-; dd64
+	jp RetrieveBreedmon
 
-Functiondd64: ; dd64
+RetrieveBreedmon:
 	ld hl, wPartyCount
 	ld a, [hl]
 	cp PARTY_LENGTH
@@ -810,12 +846,12 @@ Functiondd64: ; dd64
 	pop hl
 	call CopyBytes
 	push hl
-	call Functionde1a
+	call GetLastPartyMon
 	pop hl
 	ld bc, BOXMON_STRUCT_LENGTH
 	call CopyBytes
 	call GetBaseData
-	call Functionde1a
+	call GetLastPartyMon
 	ld b, d
 	ld c, e
 	ld hl, MON_LEVEL
@@ -829,8 +865,8 @@ Functiondd64: ; dd64
 	ld hl, $a
 	add hl, bc
 	push bc
-	ld b, $1
-	call CalcPkmnStats
+	ld b, TRUE
+	call CalcMonStats
 	ld hl, wPartyMon1Moves
 	ld a, [wPartyCount]
 	dec a
@@ -859,9 +895,8 @@ Functiondd64: ; dd64
 	ld [hl], a
 	and a
 	ret
-; de1a
 
-Functionde1a: ; de1a
+GetLastPartyMon:
 	ld a, [wPartyCount]
 	dec a
 	ld hl, wPartyMon1Species
@@ -870,25 +905,22 @@ Functionde1a: ; de1a
 	ld d, h
 	ld e, l
 	ret
-; de2a
 
-DepositMonWithDayCareMan: ; de2a
+DepositMonWithDayCareMan:
 	ld de, wBreedMon1Nick
 	call DepositBreedmon
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	jp RemoveMonFromPartyOrBox
-; de37
 
-DepositMonWithDayCareLady: ; de37
+DepositMonWithDayCareLady:
 	ld de, wBreedMon2Nick
 	call DepositBreedmon
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	jp RemoveMonFromPartyOrBox
-; de44
 
-DepositBreedmon: ; de44
+DepositBreedmon:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
 	call SkipNames
@@ -904,8 +936,8 @@ DepositBreedmon: ; de44
 	ld bc, BOXMON_STRUCT_LENGTH
 	jp CopyBytes
 
-SendPkmnIntoBox: ; de6e
-; Sends the Pkmn into one of Bills Boxes
+SendMonIntoBox:
+; Sends the mon into one of Bills Boxes
 ; the data comes mainly from 'wEnemyMon:'
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
@@ -1030,15 +1062,13 @@ SendPkmnIntoBox: ; de6e
 	call CloseSRAM
 	scf
 	ret
-; df42
 
-.full ; df42
+.full
 	call CloseSRAM
 	and a
 	ret
-; df47
 
-ShiftBoxMon: ; df47
+ShiftBoxMon:
 	ld hl, sBoxMonOT
 	ld bc, NAME_LENGTH
 	call .shift
@@ -1084,9 +1114,8 @@ ShiftBoxMon: ; df47
 	or b
 	jr nz, .loop
 	ret
-; df8c
 
-GiveEgg:: ; df8c
+GiveEgg::
 	ld a, [wCurPartySpecies]
 	push af
 	callfar GetPreEvolution
@@ -1183,13 +1212,11 @@ GiveEgg:: ; df8c
 	ld [hl], a
 	and a
 	ret
-; e035
 
-String_Egg: ; e035
+String_Egg:
 	db "EGG@"
-; e039
 
-RemoveMonFromPartyOrBox: ; e039
+RemoveMonFromPartyOrBox:
 	ld hl, wPartyCount
 
 	ld a, [wPokemonWithdrawDepositParameter]
@@ -1339,10 +1366,8 @@ RemoveMonFromPartyOrBox: ; e039
 	jr nz, .loop2
 .close_sram
 	jp CloseSRAM
-; e134
 
-
-ComputeNPCTrademonStats: ; e134
+ComputeNPCTrademonStats:
 	ld a, MON_LEVEL
 	call GetPartyParamLocation
 	ld a, [hl]
@@ -1359,8 +1384,8 @@ ComputeNPCTrademonStats: ; e134
 	push de
 	ld a, MON_STAT_EXP - 1
 	call GetPartyParamLocation
-	ld b, $1
-	call CalcPkmnStats
+	ld b, TRUE
+	call CalcMonStats
 	pop de
 	ld a, MON_HP
 	call GetPartyParamLocation
@@ -1370,19 +1395,18 @@ ComputeNPCTrademonStats: ; e134
 	ld a, [de]
 	ld [hl], a
 	ret
-; e167
 
-CalcPkmnStats: ; e167
-; Calculates all 6 Stats of a Pkmn
+CalcMonStats:
+; Calculates all 6 Stats of a mon
 ; b: Take into account stat EXP if TRUE
 ; 'c' counts from 1-6 and points with 'wBaseStats' to the base value
 ; hl is the path to the Stat EXP
-; results in $ffb5 and $ffb6 are saved in [de]
+; de points to where the final stats will be saved
 
-	ld c, $0
+	ld c, STAT_HP - 1 ; first stat
 .loop
 	inc c
-	call CalcPkmnStatC
+	call CalcMonStatC
 	ld a, [hMultiplicand + 1]
 	ld [de], a
 	inc de
@@ -1390,12 +1414,11 @@ CalcPkmnStats: ; e167
 	ld [de], a
 	inc de
 	ld a, c
-	cp STAT_SDEF
+	cp STAT_SDEF ; last stat
 	jr nz, .loop
 	ret
-; e17b
 
-CalcPkmnStatC: ; e17b
+CalcMonStatC:
 ; 'c' is 1-6 and points to the BaseStat
 ; 1: HP
 ; 2: Attack
@@ -1411,14 +1434,14 @@ CalcPkmnStatC: ; e17b
 	push hl
 	ld hl, wBaseStats
 	dec hl ; has to be decreased, because 'c' begins with 1
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	ld a, [hl]
 	ld e, a
 	pop hl
 	push hl
 	ld a, c
-	cp STAT_SDEF
+	cp STAT_SDEF ; last stat
 	jr nz, .not_spdef
 	dec hl
 	dec hl
@@ -1454,29 +1477,29 @@ CalcPkmnStatC: ; e17b
 	jr z, .Special
 	cp STAT_SDEF
 	jr z, .Special
-; DV_HP = (DV_ATK & 1) << 3 + (DV_DEF & 1) << 2 + (DV_SPD & 1) << 1 + (DV_SPC & 1)
+; DV_HP = (DV_ATK & 1) << 3 | (DV_DEF & 1) << 2 | (DV_SPD & 1) << 1 | (DV_SPC & 1)
 	push bc
 	ld a, [hl]
 	swap a
-	and $1
+	and 1
 	add a
 	add a
 	add a
 	ld b, a
 	ld a, [hli]
-	and $1
+	and 1
 	add a
 	add a
 	add b
 	ld b, a
 	ld a, [hl]
 	swap a
-	and $1
+	and 1
 	add a
 	add b
 	ld b, a
 	ld a, [hl]
-	and $1
+	and 1
 	add b
 	pop bc
 	jr .GotDV
@@ -1589,9 +1612,8 @@ CalcPkmnStatC: ; e17b
 	pop de
 	pop hl
 	ret
-; e277
 
-GivePoke:: ; e277
+GivePoke::
 	push de
 	push bc
 	xor a ; PARTYMON
@@ -1626,7 +1648,7 @@ GivePoke:: ; e277
 	ld a, [wCurPartySpecies]
 	ld [wTempEnemyMonSpecies], a
 	callfar LoadEnemyMon
-	call SendPkmnIntoBox
+	call SendMonIntoBox
 	jp nc, .FailedToGiveMon
 	ld a, BOXMON
 	ld [wMonType], a
@@ -1769,24 +1791,21 @@ GivePoke:: ; e277
 	call CloseSRAM
 	ld b, $1
 	ret
-; e3d4
 
-.FailedToGiveMon: ; e3d4
+.FailedToGiveMon:
 	pop bc
 	pop de
 	ld b, $2
 	ret
-; e3d9
 
-TextJump_WasSentToBillsPC: ; 0xe3d9
+TextJump_WasSentToBillsPC:
 	; was sent to BILL's PC.
 	text_jump Text_WasSentToBillsPC
 	db "@"
-; 0xe3de
 
-InitNickname: ; e3de
+InitNickname:
 	push de
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call DisableSpriteUpdates
 	pop de
 	push de
@@ -1799,4 +1818,3 @@ InitNickname: ; e3de
 	ld hl, ExitAllMenus
 	rst FarCall
 	ret
-; e3fd
diff --git a/engine/move_mon_wo_mail.asm b/engine/pokemon/move_mon_wo_mail.asm
index 5d81da8a0..1dab879c7 100755..100644
--- a/engine/move_mon_wo_mail.asm
+++ b/engine/pokemon/move_mon_wo_mail.asm
@@ -1,4 +1,4 @@
-InsertPokemonIntoBox: ; 51322
+InsertPokemonIntoBox:
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
 	ld hl, sBoxCount
@@ -37,7 +37,7 @@ InsertPokemonIntoBox: ; 51322
 	farcall RestorePPofDepositedPokemon
 	jp CloseSRAM
 
-InsertPokemonIntoParty: ; 5138b
+InsertPokemonIntoParty:
 	ld hl, wPartyCount
 	call InsertSpeciesIntoBoxOrParty
 	ld a, [wPartyCount]
@@ -63,7 +63,7 @@ InsertPokemonIntoParty: ; 5138b
 	call InsertDataIntoBoxOrParty
 	ret
 
-InsertSpeciesIntoBoxOrParty: ; 513cb
+InsertSpeciesIntoBoxOrParty:
 	inc [hl]
 	inc hl
 	ld a, [wCurPartyMon]
@@ -81,7 +81,7 @@ InsertSpeciesIntoBoxOrParty: ; 513cb
 	jr nz, .loop
 	ret
 
-InsertDataIntoBoxOrParty: ; 513e0
+InsertDataIntoBoxOrParty:
 	push de
 	push hl
 	push bc
diff --git a/engine/party_menu.asm b/engine/pokemon/party_menu.asm
index 9dffa4089..c3a70dbdc 100644
--- a/engine/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
@@ -1,4 +1,4 @@
-SelectMonFromParty: ; 50000
+SelectMonFromParty:
 	call DisableSpriteUpdates
 	xor a
 	ld [wPartyMenuActionText], a
@@ -10,10 +10,8 @@ SelectMonFromParty: ; 50000
 	call PartyMenuSelect
 	call ReturnToMapWithSpeechTextbox
 	ret
-; 5001d
 
-
-SelectTradeOrDayCareMon: ; 5001d
+SelectTradeOrDayCareMon:
 	ld a, b
 	ld [wPartyMenuActionText], a
 	call DisableSpriteUpdates
@@ -27,26 +25,22 @@ SelectTradeOrDayCareMon: ; 5001d
 	call PartyMenuSelect
 	call ReturnToMapWithSpeechTextbox
 	ret
-; 5003f
 
-InitPartyMenuLayout: ; 5003f
+InitPartyMenuLayout:
 	call LoadPartyMenuGFX
 	call InitPartyMenuWithCancel
 	call InitPartyMenuGFX
 	call WritePartyMenuTilemap
 	call PrintPartyMenuText
 	ret
-; 5004f
 
-LoadPartyMenuGFX: ; 5004f
+LoadPartyMenuGFX:
 	call LoadFontsBattleExtra
 	callfar InitPartyMenuPalettes ; engine/color.asm
 	callfar ClearSpriteAnims2
 	ret
-; 5005f
-
 
-WritePartyMenuTilemap: ; 0x5005f
+WritePartyMenuTilemap:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -71,9 +65,8 @@ WritePartyMenuTilemap: ; 0x5005f
 	pop af
 	ld [wOptions], a
 	ret
-; 0x50089
 
-.Jumptable: ; 50089
+.Jumptable:
 ; entries correspond to PARTYMENUQUALITY_* constants
 	dw PlacePartyNicknames
 	dw PlacePartyHPBar
@@ -84,9 +77,8 @@ WritePartyMenuTilemap: ; 0x5005f
 	dw PlacePartyMonEvoStoneCompatibility
 	dw PlacePartyMonGender
 	dw PlacePartyMonMobileBattleSelection
-; 5009b
 
-PlacePartyNicknames: ; 5009b
+PlacePartyNicknames:
 	hlcoord 3, 1
 	ld a, [wPartyCount]
 	and a
@@ -116,14 +108,11 @@ PlacePartyNicknames: ; 5009b
 	ld de, .CANCEL
 	call PlaceString
 	ret
-; 500c8
 
-.CANCEL: ; 500c8
+.CANCEL:
 	db "CANCEL@"
-; 500cf
-
 
-PlacePartyHPBar: ; 500cf
+PlacePartyHPBar:
 	xor a
 	ld [wSGBPals], a
 	ld a, [wPartyCount]
@@ -164,9 +153,8 @@ PlacePartyHPBar: ; 500cf
 	ld b, SCGB_PARTY_MENU
 	call GetSGBLayout
 	ret
-; 50117
 
-PlacePartymonHPBar: ; 50117
+PlacePartymonHPBar:
 	ld a, b
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, wPartyMon1HP
@@ -191,9 +179,8 @@ PlacePartymonHPBar: ; 50117
 	ld e, a
 	predef ComputeHPBarPixels
 	ret
-; 50138
 
-PlacePartyMenuHPDigits: ; 50138
+PlacePartyMenuHPDigits:
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -233,9 +220,8 @@ PlacePartyMenuHPDigits: ; 50138
 	dec c
 	jr nz, .loop
 	ret
-; 50176
 
-PlacePartyMonLevel: ; 50176
+PlacePartyMonLevel:
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -276,9 +262,8 @@ PlacePartyMonLevel: ; 50176
 	dec c
 	jr nz, .loop
 	ret
-; 501b2
 
-PlacePartyMonStatus: ; 501b2
+PlacePartyMonStatus:
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -309,9 +294,8 @@ PlacePartyMonStatus: ; 501b2
 	dec c
 	jr nz, .loop
 	ret
-; 501e0
 
-PlacePartyMonTMHMCompatibility: ; 501e0
+PlacePartyMonTMHMCompatibility:
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -344,9 +328,8 @@ PlacePartyMonTMHMCompatibility: ; 501e0
 	dec c
 	jr nz, .loop
 	ret
-; 50215
 
-.PlaceAbleNotAble: ; 50215
+.PlaceAbleNotAble:
 	ld a, c
 	and a
 	jr nz, .able
@@ -356,18 +339,14 @@ PlacePartyMonTMHMCompatibility: ; 501e0
 .able
 	ld de, .string_able
 	ret
-; 50221
 
-.string_able ; 50221
+.string_able
 	db "ABLE@"
-; 50226
 
-.string_not_able ; 50226
+.string_not_able
 	db "NOT ABLE@"
-; 5022f
 
-
-PlacePartyMonEvoStoneCompatibility: ; 5022f
+PlacePartyMonEvoStoneCompatibility:
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -404,9 +383,8 @@ PlacePartyMonEvoStoneCompatibility: ; 5022f
 	dec c
 	jr nz, .loop
 	ret
-; 50268
 
-.DetermineCompatibility: ; 50268
+.DetermineCompatibility:
 	ld de, wStringBuffer1
 	ld a, BANK(EvosAttacksPointers)
 	ld bc, 2
@@ -416,8 +394,8 @@ PlacePartyMonEvoStoneCompatibility: ; 5022f
 	ld h, [hl]
 	ld l, a
 	ld de, wStringBuffer1
-	ld a, BANK(EvosAttacks)
-	ld bc, $a
+	ld a, BANK("Evolutions and Attacks")
+	ld bc, 10
 	call FarCopyBytes
 	ld hl, wStringBuffer1
 .loop2
@@ -441,17 +419,13 @@ PlacePartyMonEvoStoneCompatibility: ; 5022f
 .nope
 	ld de, .string_not_able
 	ret
-; 502a3
 
-.string_able ; 502a3
+.string_able
 	db "ABLE@"
-; 502a8
-.string_not_able ; 502a8
+.string_not_able
 	db "NOT ABLE@"
-; 502b1
-
 
-PlacePartyMonGender: ; 502b1
+PlacePartyMonGender:
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -489,22 +463,17 @@ PlacePartyMonGender: ; 502b1
 	dec c
 	jr nz, .loop
 	ret
-; 502ee
 
-.male ; 502ee
+.male
 	db "♂…MALE@"
-; 502f5
 
-.female ; 502f5
+.female
 	db "♀…FEMALE@"
-; 502fe
 
-.unknown ; 502fe
+.unknown
 	db "…UNKNOWN@"
-; 50307
-
 
-PlacePartyMonMobileBattleSelection: ; 50307
+PlacePartyMonMobileBattleSelection:
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -571,23 +540,17 @@ PlacePartyMonMobileBattleSelection: ; 50307
 	dec b
 	ret z
 	jr .loop2
-; 5036b
 
-.String_Banme: ; 5036b
+.String_Banme:
 	db "　ばんめ　　@" ; Place
-; 50372
-.String_Sanka_Shinai: ; 50372
+.String_Sanka_Shinai:
 	db "さんかしない@" ; Cancel
-; 50379
-.String_Kettei_Yameru: ; 50379
+.String_Kettei_Yameru:
 	db "けってい　　やめる@" ; Quit
-; 50383
-.Strings_1_2_3: ; 50383
+.Strings_1_2_3:
 	db "１@", "２@", "３@" ; 1st, 2nd, 3rd
-; 50389
 
-
-PartyMenuCheckEgg: ; 50389
+PartyMenuCheckEgg:
 	ld a, LOW(wPartySpecies)
 	add b
 	ld e, a
@@ -597,9 +560,8 @@ PartyMenuCheckEgg: ; 50389
 	ld a, [de]
 	cp EGG
 	ret
-; 50396
 
-GetPartyMenuQualityIndexes: ; 50396
+GetPartyMenuQualityIndexes:
 	ld a, [wPartyMenuActionText]
 	and $f0
 	jr nz, .skip
@@ -618,12 +580,10 @@ GetPartyMenuQualityIndexes: ; 50396
 .skip
 	ld hl, PartyMenuQualityPointers.Default
 	ret
-; 503b2
 
 INCLUDE "data/party_menu_qualities.asm"
 
-
-InitPartyMenuGFX: ; 503e0
+InitPartyMenuGFX:
 	ld hl, wPartyCount
 	ld a, [hli]
 	and a
@@ -647,9 +607,8 @@ InitPartyMenuGFX: ; 503e0
 	jr nz, .loop
 	callfar PlaySpriteAnimations
 	ret
-; 50405
 
-InitPartyMenuWithCancel: ; 50405
+InitPartyMenuWithCancel:
 ; with cancel
 	xor a
 	ld [wSwitchMon], a
@@ -675,9 +634,8 @@ InitPartyMenuWithCancel: ; 50405
 	ld a, A_BUTTON | B_BUTTON
 	ld [wMenuJoypadFilter], a
 	ret
-; 5042d
 
-InitPartyMenuNoCancel: ; 0x5042d
+InitPartyMenuNoCancel:
 ; no cancel
 	ld de, PartyMenuAttributes
 	call SetMenuAttributes
@@ -697,9 +655,8 @@ InitPartyMenuNoCancel: ; 0x5042d
 	ld a, A_BUTTON | B_BUTTON
 	ld [wMenuJoypadFilter], a
 	ret
-; 5044f (14:444f)
 
-PartyMenuAttributes: ; 5044f
+PartyMenuAttributes:
 ; cursor y
 ; cursor x
 ; num rows
@@ -713,9 +670,8 @@ PartyMenuAttributes: ; 5044f
 	db $60, $00
 	dn 2, 0
 	db 0
-; 50457
 
-PartyMenuSelect: ; 0x50457
+PartyMenuSelect:
 ; sets carry if exitted menu.
 	call StaticMenuJoypad
 	call PlaceHollowCursor
@@ -752,10 +708,8 @@ PartyMenuSelect: ; 0x50457
 	call WaitSFX
 	scf
 	ret
-; 0x5049a
-
 
-PrintPartyMenuText: ; 5049a
+PrintPartyMenuText:
 	hlcoord 0, 14
 	lb bc, 2, 18
 	call TextBox
@@ -764,7 +718,7 @@ PrintPartyMenuText: ; 5049a
 	jr nz, .haspokemon
 	ld de, YouHaveNoPKMNString
 	jr .gotstring
-.haspokemon ; 504ae
+.haspokemon
 	ld a, [wPartyMenuActionText]
 	and $f ; drop high nibble
 	ld hl, PartyMenuStrings
@@ -775,19 +729,18 @@ PrintPartyMenuText: ; 5049a
 	ld a, [hli]
 	ld d, [hl]
 	ld e, a
-.gotstring ; 504be
+.gotstring
 	ld a, [wOptions]
 	push af
-	set 4, a ; disable text delay
+	set NO_TEXT_SCROLL, a
 	ld [wOptions], a
 	hlcoord 1, 16 ; Coord
 	call PlaceString
 	pop af
 	ld [wOptions], a
 	ret
-; 0x504d2
 
-PartyMenuStrings: ; 0x504d2
+PartyMenuStrings:
 	dw ChooseAMonString
 	dw UseOnWhichPKMNString
 	dw WhichPKMNString
@@ -798,36 +751,36 @@ PartyMenuStrings: ; 0x504d2
 	dw ChooseAMonString ; Probably used to be ChooseAMalePKMNString
 	dw ToWhichPKMNString
 
-ChooseAMonString: ; 0x504e4
+ChooseAMonString:
 	db "Choose a #MON.@"
 
-UseOnWhichPKMNString: ; 0x504f3
+UseOnWhichPKMNString:
 	db "Use on which <PK><MN>?@"
 
-WhichPKMNString: ; 0x50504
+WhichPKMNString:
 	db "Which <PK><MN>?@"
 
-TeachWhichPKMNString: ; 0x5050e
+TeachWhichPKMNString:
 	db "Teach which <PK><MN>?@"
 
-MoveToWhereString: ; 0x5051e
+MoveToWhereString:
 	db "Move to where?@"
 
-ChooseAFemalePKMNString: ; 0x5052d
+ChooseAFemalePKMNString:
 ; unused
 	db "Choose a ♀<PK><MN>.@"
 
-ChooseAMalePKMNString: ; 0x5053b
+ChooseAMalePKMNString:
 ; unused
 	db "Choose a ♂<PK><MN>.@"
 
-ToWhichPKMNString: ; 0x50549
+ToWhichPKMNString:
 	db "To which <PK><MN>?@"
 
-YouHaveNoPKMNString: ; 0x50556
+YouHaveNoPKMNString:
 	db "You have no <PK><MN>!@"
 
-PrintPartyMenuActionText: ; 50566
+PrintPartyMenuActionText:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
 	call GetNick
@@ -836,9 +789,9 @@ PrintPartyMenuActionText: ; 50566
 	ld hl, .MenuActionTexts
 	call .PrintText
 	ret
-; 5057b
 
-.MenuActionTexts: ; 5057b
+.MenuActionTexts:
+; entries correspond to PARTYMENUTEXT_* constants
 	dw .Text_CuredOfPoison
 	dw .Text_BurnWasHealed
 	dw .Text_Defrosted
@@ -849,70 +802,58 @@ PrintPartyMenuActionText: ; 50566
 	dw .Text_Revitalized
 	dw .Text_GrewToLevel
 	dw .Text_CameToItsSenses
-; 5058f
 
-.Text_RecoveredSomeHP: ; 0x5058f
+.Text_RecoveredSomeHP:
 	; recovered @ HP!
 	text_jump UnknownText_0x1bc0a2
 	db "@"
-; 0x50594
 
-.Text_CuredOfPoison: ; 0x50594
+.Text_CuredOfPoison:
 	; 's cured of poison.
 	text_jump UnknownText_0x1bc0bb
 	db "@"
-; 0x50599
 
-.Text_RidOfParalysis: ; 0x50599
+.Text_RidOfParalysis:
 	; 's rid of paralysis.
 	text_jump UnknownText_0x1bc0d2
 	db "@"
-; 0x5059e
 
-.Text_BurnWasHealed: ; 0x5059e
+.Text_BurnWasHealed:
 	; 's burn was healed.
 	text_jump UnknownText_0x1bc0ea
 	db "@"
-; 0x505a3
 
-.Text_Defrosted: ; 0x505a3
+.Text_Defrosted:
 	; was defrosted.
 	text_jump UnknownText_0x1bc101
 	db "@"
-; 0x505a8
 
-.Text_WokeUp: ; 0x505a8
+.Text_WokeUp:
 	; woke up.
 	text_jump UnknownText_0x1bc115
 	db "@"
-; 0x505ad
 
-.Text_HealthReturned: ; 0x505ad
+.Text_HealthReturned:
 	; 's health returned.
 	text_jump UnknownText_0x1bc123
 	db "@"
-; 0x505b2
 
-.Text_Revitalized: ; 0x505b2
+.Text_Revitalized:
 	; is revitalized.
 	text_jump UnknownText_0x1bc13a
 	db "@"
-; 0x505b7
 
-.Text_GrewToLevel: ; 0x505b7
+.Text_GrewToLevel:
 	; grew to level @ !@ @
 	text_jump UnknownText_0x1bc14f
 	db "@"
-; 0x505bc
 
-.Text_CameToItsSenses: ; 0x505bc
+.Text_CameToItsSenses:
 	; came to its senses.
 	text_jump UnknownText_0x1bc16e
 	db "@"
-; 0x505c1
-
 
-.PrintText: ; 505c1
+.PrintText:
 	ld e, a
 	ld d, 0
 	add hl, de
@@ -928,4 +869,3 @@ PrintPartyMenuActionText: ; 50566
 	pop af
 	ld [wOptions], a
 	ret
-; 505da
diff --git a/engine/search.asm b/engine/pokemon/search.asm
index 6c18f3e3d..c8d4439df 100755..100644
--- a/engine/search.asm
+++ b/engine/pokemon/search.asm
@@ -1,4 +1,4 @@
-Special_BeastsCheck: ; 0x4a6e8
+BeastsCheck:
 ; Check if the player owns all three legendary beasts.
 ; They must exist in either party or PC, and have the player's OT and ID.
 ; Return the result in wScriptVar.
@@ -28,9 +28,8 @@ Special_BeastsCheck: ; 0x4a6e8
 	ld [wScriptVar], a
 	ret
 
-
-Special_MonCheck: ; 0x4a711
-; Check if the player owns any monsters of the species in wScriptVar.
+MonCheck:
+; Check if the player owns any Pokémon of the species in wScriptVar.
 ; Return the result in wScriptVar.
 
 	call CheckOwnMonAnywhere
@@ -46,8 +45,7 @@ Special_MonCheck: ; 0x4a711
 	ld [wScriptVar], a
 	ret
 
-
-CheckOwnMonAnywhere: ; 0x4a721
+CheckOwnMonAnywhere:
 ; Check if the player owns any monsters of the species in wScriptVar.
 ; It must exist in either party or PC, and have the player's OT and ID.
 
@@ -178,8 +176,7 @@ CheckOwnMonAnywhere: ; 0x4a721
 	and a
 	ret
 
-
-CheckOwnMon: ; 0x4a7ba
+CheckOwnMon:
 ; Check if a Pokémon belongs to the player and is of a specific species.
 
 ; inputs:
@@ -219,7 +216,7 @@ CheckOwnMon: ; 0x4a7ba
 
 	ld hl, wPlayerName
 
-rept NAME_LENGTH_JAPANESE +- 2 ; should be PLAYER_NAME_LENGTH +- 2
+rept NAME_LENGTH_JAPANESE + -2 ; should be PLAYER_NAME_LENGTH + -2
 	ld a, [de]
 	cp [hl]
 	jr nz, .notfound
@@ -246,9 +243,8 @@ endr
 	pop bc
 	scf
 	ret
-; 0x4a810
 
-BoxAddressTable1: ; 4a810
+BoxAddressTable1:
 	dba sBox1
 	dba sBox2
 	dba sBox3
@@ -263,9 +259,8 @@ BoxAddressTable1: ; 4a810
 	dba sBox12
 	dba sBox13
 	dba sBox14
-; 4a83a
 
-UpdateOTPointer: ; 0x4a83a
+UpdateOTPointer:
 	push hl
 	ld hl, NAME_LENGTH
 	add hl, bc
@@ -273,4 +268,3 @@ UpdateOTPointer: ; 0x4a83a
 	ld c, l
 	pop hl
 	ret
-; 0x4a843
diff --git a/engine/search2.asm b/engine/pokemon/search2.asm
index 15b8ae138..7af93282e 100755..100644
--- a/engine/search2.asm
+++ b/engine/pokemon/search2.asm
@@ -1,18 +1,18 @@
-_FindGreaterThanThatLevel: ; 4dbd2
+_FindPartyMonAboveLevel:
 	ld hl, wPartyMon1Level
-	call FindGreaterThanThatLevel
+	call FindAboveLevel
 	ret
 
-_FindAtLeastThatHappy: ; 4dbd9
+_FindPartyMonAtLeastThatHappy:
 	ld hl, wPartyMon1Happiness
 	call FindAtLeastThatHappy
 	ret
 
-_FindThatSpecies: ; 4dbe0
+_FindPartyMonThatSpecies:
 	ld hl, wPartyMon1Species
 	jp FindThatSpecies
 
-_FindThatSpeciesYourTrainerID: ; 4dbe6
+_FindPartyMonThatSpeciesYourTrainerID:
 	ld hl, wPartyMon1Species
 	call FindThatSpecies
 	ret z
@@ -35,7 +35,7 @@ _FindThatSpeciesYourTrainerID: ; 4dbe6
 	xor a
 	ret
 
-FindAtLeastThatHappy: ; 4dc0a
+FindAtLeastThatHappy:
 ; Sets the bits for the Pokemon that have a happiness greater than or equal to b.
 ; The lowest bits are used.  Sets z if no Pokemon in your party is at least that happy.
 	ld c, $0
@@ -69,7 +69,7 @@ FindAtLeastThatHappy: ; 4dc0a
 	and a
 	ret
 
-FindGreaterThanThatLevel: ; 4dc31
+FindAboveLevel:
 	ld c, $0
 	ld a, [wPartyCount]
 	ld d, a
@@ -98,7 +98,7 @@ FindGreaterThanThatLevel: ; 4dc31
 	and a
 	ret
 
-FindThatSpecies: ; 4dc56
+FindThatSpecies:
 ; Find species b in your party.
 ; If you have no Pokemon, returns c = -1 and z.
 ; If that species is in your party, returns its location in c, and nz.
@@ -116,7 +116,7 @@ FindThatSpecies: ; 4dc56
 	and a
 	ret
 
-RetroactivelyIgnoreEggs: ; 4dc67
+RetroactivelyIgnoreEggs:
 	ld e, -2
 	ld hl, wPartySpecies
 .loop
diff --git a/engine/stats_screen.asm b/engine/pokemon/stats_screen.asm
index e55c85c86..dfc704f1a 100755..100644
--- a/engine/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -1,10 +1,10 @@
-const_value set 1
+	const_def 1
 	const PINK_PAGE  ; 1
 	const GREEN_PAGE ; 2
 	const BLUE_PAGE  ; 3
-NUM_STAT_PAGES EQU const_value +- 1
+NUM_STAT_PAGES EQU const_value + -1
 
-BattleStatsScreenInit: ; 4dc7b (13:5c7b)
+BattleStatsScreenInit:
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
 	jr nz, StatsScreenInit
@@ -14,15 +14,15 @@ BattleStatsScreenInit: ; 4dc7b (13:5c7b)
 	jr z, StatsScreenInit
 	jr _MobileStatsScreenInit
 
-StatsScreenInit: ; 4dc8a
+StatsScreenInit:
 	ld hl, StatsScreenMain
 	jr StatsScreenInit_gotaddress
 
-_MobileStatsScreenInit: ; 4dc8f
+_MobileStatsScreenInit:
 	ld hl, StatsScreenMobile
 	jr StatsScreenInit_gotaddress
 
-StatsScreenInit_gotaddress: ; 4dc94
+StatsScreenInit_gotaddress:
 	ld a, [hMapAnims]
 	push af
 	xor a
@@ -56,9 +56,8 @@ StatsScreenInit_gotaddress: ; 4dc94
 	pop af
 	ld [hMapAnims], a
 	ret
-; 0x4dcd2
 
-StatsScreenMain: ; 0x4dcd2
+StatsScreenMain:
 	xor a
 	ld [wJumptableIndex], a
 	; stupid interns
@@ -67,7 +66,7 @@ StatsScreenMain: ; 0x4dcd2
 	and %11111100
 	or 1
 	ld [wcf64], a
-.loop ; 4dce3
+.loop
 	ld a, [wJumptableIndex]
 	and $ff ^ (1 << 7)
 	ld hl, StatsScreenPointerTable
@@ -77,9 +76,8 @@ StatsScreenMain: ; 0x4dcd2
 	bit 7, a
 	jr z, .loop
 	ret
-; 0x4dcf7
 
-StatsScreenMobile: ; 4dcf7
+StatsScreenMobile:
 	xor a
 	ld [wJumptableIndex], a
 	; stupid interns
@@ -103,9 +101,8 @@ StatsScreenMobile: ; 4dcf7
 
 .exit
 	ret
-; 4dd2a
 
-StatsScreenPointerTable: ; 4dd2a
+StatsScreenPointerTable:
 	dw MonStatsInit       ; regular pokémon
 	dw EggStatsInit       ; egg
 	dw StatsScreenWaitCry
@@ -114,10 +111,8 @@ StatsScreenPointerTable: ; 4dd2a
 	dw StatsScreenWaitCry
 	dw MonStatsJoypad
 	dw StatsScreen_Exit
-; 4dd3a
-
 
-StatsScreen_WaitAnim: ; 4dd3a (13:5d3a)
+StatsScreen_WaitAnim:
 	ld hl, wcf64
 	bit 6, [hl]
 	jr nz, .try_anim
@@ -137,19 +132,19 @@ StatsScreen_WaitAnim: ; 4dd3a (13:5d3a)
 	farcall HDMATransferTileMapToWRAMBank3
 	ret
 
-StatsScreen_SetJumptableIndex: ; 4dd62 (13:5d62)
+StatsScreen_SetJumptableIndex:
 	ld a, [wJumptableIndex]
 	and $80
 	or h
 	ld [wJumptableIndex], a
 	ret
 
-StatsScreen_Exit: ; 4dd6c (13:5d6c)
+StatsScreen_Exit:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
 
-MonStatsInit: ; 4dd72 (13:5d72)
+MonStatsInit:
 	ld hl, wcf64
 	res 6, [hl]
 	call ClearBGPalettes
@@ -171,16 +166,14 @@ MonStatsInit: ; 4dd72 (13:5d72)
 	call StatsScreen_SetJumptableIndex
 	ret
 
-EggStatsInit: ; 4dda1
+EggStatsInit:
 	call EggStatsScreen
 	ld a, [wJumptableIndex]
 	inc a
 	ld [wJumptableIndex], a
 	ret
-; 0x4ddac
-
 
-EggStatsJoypad: ; 4ddac (13:5dac)
+EggStatsJoypad:
 	call StatsScreen_GetJoypad
 	jr nc, .check
 	ld h, 0
@@ -198,7 +191,7 @@ EggStatsJoypad: ; 4ddac (13:5dac)
 	call StatsScreen_SetJumptableIndex
 	ret
 
-StatsScreen_LoadPage: ; 4ddc6 (13:5dc6)
+StatsScreen_LoadPage:
 	call StatsScreen_LoadGFX
 	ld hl, wcf64
 	res 4, [hl]
@@ -207,7 +200,7 @@ StatsScreen_LoadPage: ; 4ddc6 (13:5dc6)
 	ld [wJumptableIndex], a
 	ret
 
-MonStatsJoypad: ; 4ddd6 (13:5dd6)
+MonStatsJoypad:
 	call StatsScreen_GetJoypad
 	jr nc, .next
 	ld h, 0
@@ -218,7 +211,7 @@ MonStatsJoypad: ; 4ddd6 (13:5dd6)
 	and D_DOWN | D_UP | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON
 	jp StatsScreen_JoypadAction
 
-StatsScreenWaitCry: ; 4dde6 (13:5de6)
+StatsScreenWaitCry:
 	call IsSFXPlaying
 	ret nc
 	ld a, [wJumptableIndex]
@@ -226,11 +219,11 @@ StatsScreenWaitCry: ; 4dde6 (13:5de6)
 	ld [wJumptableIndex], a
 	ret
 
-StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2)
+StatsScreen_CopyToTempMon:
 	ld a, [wMonType]
 	cp TEMPMON
 	jr nz, .breedmon
-	ld a, [wBufferMon]
+	ld a, [wBufferMonSpecies]
 	ld [wCurSpecies], a
 	call GetBaseData
 	ld hl, wBufferMon
@@ -240,7 +233,7 @@ StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2)
 	jr .done
 
 .breedmon
-	farcall CopyPkmnToTempMon
+	farcall CopyMonToTempMon
 	ld a, [wCurPartySpecies]
 	cp EGG
 	jr z, .done
@@ -252,7 +245,7 @@ StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2)
 	and a
 	ret
 
-StatsScreen_GetJoypad: ; 4de2c (13:5e2c)
+StatsScreen_GetJoypad:
 	call GetJoypad
 	ld a, [wMonType]
 	cp TEMPMON
@@ -280,7 +273,7 @@ StatsScreen_GetJoypad: ; 4de2c (13:5e2c)
 	scf
 	ret
 
-StatsScreen_JoypadAction: ; 4de54 (13:5e54)
+StatsScreen_JoypadAction:
 	push af
 	ld a, [wcf64]
 	maskbits NUM_STAT_PAGES
@@ -374,12 +367,12 @@ StatsScreen_JoypadAction: ; 4de54 (13:5e54)
 	call StatsScreen_SetJumptableIndex
 	ret
 
-.b_button ; 4dee4 (13:5ee4)
+.b_button
 	ld h, 7
 	call StatsScreen_SetJumptableIndex
 	ret
 
-StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
+StatsScreen_InitUpperHalf:
 	call .PlaceHPBar
 	xor a
 	ld [hBGMapMode], a
@@ -416,7 +409,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
 	call StatsScreen_PlaceShinyIcon
 	ret
 
-.PlaceHPBar: ; 4df45 (13:5f45)
+.PlaceHPBar:
 	ld hl, wTempMonHP
 	ld a, [hli]
 	ld b, a
@@ -433,7 +426,7 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
 	call DelayFrame
 	ret
 
-.PlaceGenderChar: ; 4df66 (13:5f66)
+.PlaceGenderChar:
 	push hl
 	farcall GetGender
 	pop hl
@@ -444,16 +437,14 @@ StatsScreen_InitUpperHalf: ; 4deea (13:5eea)
 .got_gender
 	ld [hl], a
 	ret
-; 4df77 (13:5f77)
 
-.NicknamePointers: ; 4df77
+.NicknamePointers:
 	dw wPartyMonNicknames
 	dw wOTPartyMonNicknames
 	dw sBoxMonNicknames
 	dw wBufferMonNick
-; 4df7f
 
-Unreferenced_Function4df7f: ; 4df7f
+Unreferenced_Function4df7f:
 	hlcoord 7, 0
 	ld bc, SCREEN_WIDTH
 	ld d, SCREEN_HEIGHT
@@ -464,9 +455,8 @@ Unreferenced_Function4df7f: ; 4df7f
 	dec d
 	jr nz, .loop
 	ret
-; 4df8f
 
-StatsScreen_PlaceHorizontalDivider: ; 4df8f (13:5f8f)
+StatsScreen_PlaceHorizontalDivider:
 	hlcoord 0, 7
 	ld b, SCREEN_WIDTH
 	ld a, $62 ; horizontal divider (empty HP/exp bar)
@@ -476,14 +466,14 @@ StatsScreen_PlaceHorizontalDivider: ; 4df8f (13:5f8f)
 	jr nz, .loop
 	ret
 
-StatsScreen_PlacePageSwitchArrows: ; 4df9b (13:5f9b)
+StatsScreen_PlacePageSwitchArrows:
 	hlcoord 12, 6
 	ld [hl], "◀"
 	hlcoord 19, 6
 	ld [hl], "▶"
 	ret
 
-StatsScreen_PlaceShinyIcon: ; 4dfa6 (13:5fa6)
+StatsScreen_PlaceShinyIcon:
 	ld bc, wTempMonDVs
 	farcall CheckShininess
 	ret nc
@@ -491,7 +481,7 @@ StatsScreen_PlaceShinyIcon: ; 4dfa6 (13:5fa6)
 	ld [hl], "⁂"
 	ret
 
-StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
+StatsScreen_LoadGFX:
 	ld a, [wBaseDexNo]
 	ld [wd265], a
 	ld [wCurSpecies], a
@@ -510,7 +500,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	call StatsScreen_PlaceFrontpic
 	ret
 
-.ClearBox: ; 4dfda (13:5fda)
+.ClearBox:
 	ld a, [wcf64]
 	maskbits NUM_STAT_PAGES
 	ld c, a
@@ -520,7 +510,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	call ClearBox
 	ret
 
-.LoadPals: ; 4dfed (13:5fed)
+.LoadPals:
 	ld a, [wcf64]
 	maskbits NUM_STAT_PAGES
 	ld c, a
@@ -530,7 +520,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	set 5, [hl]
 	ret
 
-.PageTilemap: ; 4e002 (13:6002)
+.PageTilemap:
 	ld a, [wcf64]
 	maskbits NUM_STAT_PAGES
 	dec a
@@ -538,13 +528,13 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	rst JumpTable
 	ret
 
-.Jumptable: ; 4e00d (13:600d)
+.Jumptable:
 ; entries correspond to *_PAGE constants
 	dw .PinkPage
 	dw .GreenPage
 	dw .BluePage
 
-.PinkPage: ; 4e013 (13:6013)
+.PinkPage:
 	hlcoord 0, 9
 	ld b, $0
 	predef DrawPlayerHP
@@ -624,7 +614,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	ld [hl], $41 ; right exp bar end cap
 	ret
 
-.PrintNextLevel: ; 4e0d3 (13:60d3)
+.PrintNextLevel:
 	ld a, [wTempMonLevel]
 	push af
 	cp MAX_LEVEL
@@ -637,7 +627,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	ld [wTempMonLevel], a
 	ret
 
-.CalcExpToNextLevel: ; 4e0e7 (13:60e7)
+.CalcExpToNextLevel:
 	ld a, [wTempMonLevel]
 	cp MAX_LEVEL
 	jr z, .AlreadyAtMaxLevel
@@ -666,34 +656,27 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	ld [hli], a
 	ld [hl], a
 	ret
-; 4e119 (13:6119)
 
-.Status_Type: ; 4e119
+.Status_Type:
 	db   "STATUS/"
 	next "TYPE/@"
-; 4e127
 
-.OK_str: ; 4e127
+.OK_str:
 	db "OK @"
-; 4e12b
 
-.ExpPointStr: ; 4e12b
+.ExpPointStr:
 	db "EXP POINTS@"
-; 4e136
 
-.LevelUpStr: ; 4e136
+.LevelUpStr:
 	db "LEVEL UP@"
-; 4e13f
 
-.ToStr: ; 4e13f
+.ToStr:
 	db "TO@"
-; 4e142
 
-.PkrsStr: ; 4e142
+.PkrsStr:
 	db "#RUS@"
-; 4e147
 
-.GreenPage: ; 4e147 (13:6147)
+.GreenPage:
 	ld de, .Item
 	hlcoord 0, 8
 	call PlaceString
@@ -717,7 +700,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	predef ListMovePP
 	ret
 
-.GetItemName: ; 4e189 (13:6189)
+.GetItemName:
 	ld de, .ThreeDashes
 	ld a, [wTempMonItem]
 	and a
@@ -728,21 +711,17 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	ld [wd265], a
 	call GetItemName
 	ret
-; 4e1a0 (13:61a0)
 
-.Item: ; 4e1a0
+.Item:
 	db "ITEM@"
-; 4e1a5
 
-.ThreeDashes: ; 4e1a5
+.ThreeDashes:
 	db "---@"
-; 4e1a9
 
-.Move: ; 4e1a9
+.Move:
 	db "MOVE@"
-; 4e1ae
 
-.BluePage: ; 4e1ae (13:61ae)
+.BluePage:
 	call .PlaceOTInfo
 	hlcoord 10, 8
 	ld de, SCREEN_WIDTH
@@ -758,7 +737,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	predef PrintTempMonStats
 	ret
 
-.PlaceOTInfo: ; 4e1cc (13:61cc)
+.PlaceOTInfo:
 	ld de, IDNoString
 	hlcoord 0, 9
 	call PlaceString
@@ -772,7 +751,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	ld hl, .OTNamePointers
 	call GetNicknamePointer
 	call CopyNickname
-	farcall CheckNickErrors
+	farcall CorrectNickErrors
 	hlcoord 2, 13
 	call PlaceString
 	ld a, [wTempMonCaughtGender]
@@ -789,24 +768,20 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
 	ld [hl], a
 .done
 	ret
-; 4e216 (13:6216)
 
-.OTNamePointers: ; 4e216
+.OTNamePointers:
 	dw wPartyMonOT
 	dw wOTPartyMonOT
 	dw sBoxMonOT
 	dw wBufferMonOT
-; 4e21e
 
-IDNoString: ; 4e21e
+IDNoString:
 	db "<ID>№.@"
 
-OTString: ; 4e222
+OTString:
 	db "OT/@"
-; 4e226
 
-
-StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
+StatsScreen_PlaceFrontpic:
 	ld hl, wTempMonDVs
 	predef GetUnownLetter
 	call StatsScreen_GetAnimationParam
@@ -832,7 +807,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
 	call PlayMonCry2
 	ret
 
-.AnimateMon: ; 4e253 (13:6253)
+.AnimateMon:
 	ld hl, wcf64
 	set 5, [hl]
 	ld a, [wCurPartySpecies]
@@ -849,7 +824,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
 	call _PrepMonFrontpic
 	ret
 
-.AnimateEgg: ; 4e271 (13:6271)
+.AnimateEgg:
 	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr z, .unownegg
@@ -864,7 +839,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
 	call .get_animation
 	ret
 
-.get_animation ; 4e289 (13:6289)
+.get_animation
 	ld a, [wCurPartySpecies]
 	call IsAPokemon
 	ret c
@@ -879,20 +854,20 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
 	set 6, [hl]
 	ret
 
-StatsScreen_GetAnimationParam: ; 4e2ad (13:62ad)
+StatsScreen_GetAnimationParam:
 	ld a, [wMonType]
 	ld hl, .Jumptable
 	rst JumpTable
 	ret
 
-.Jumptable: ; 4e2b5 (13:62b5)
+.Jumptable:
 	dw .PartyMon
 	dw .OTPartyMon
 	dw .BoxMon
 	dw .Tempmon
 	dw .Wildmon
 
-.PartyMon: ; 4e2bf (13:62bf)
+.PartyMon:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMon1
 	ld bc, PARTYMON_STRUCT_LENGTH
@@ -901,11 +876,11 @@ StatsScreen_GetAnimationParam: ; 4e2ad (13:62ad)
 	ld c, l
 	jr .CheckEggFaintedFrzSlp
 
-.OTPartyMon: ; 4e2cf (13:62cf)
+.OTPartyMon:
 	xor a
 	ret
 
-.BoxMon: ; 4e2d1 (13:62d1)
+.BoxMon:
 	ld hl, sBoxMons
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wCurPartyMon]
@@ -920,11 +895,11 @@ StatsScreen_GetAnimationParam: ; 4e2ad (13:62ad)
 	pop af
 	ret
 
-.Tempmon: ; 4e2ed (13:62ed)
+.Tempmon:
 	ld bc, wTempMonSpecies
 	jr .CheckEggFaintedFrzSlp ; utterly pointless
 
-.CheckEggFaintedFrzSlp: ; 4e2f2 (13:62f2)
+.CheckEggFaintedFrzSlp:
 	ld a, [wCurPartySpecies]
 	cp EGG
 	jr z, .egg
@@ -935,16 +910,16 @@ StatsScreen_GetAnimationParam: ; 4e2ad (13:62ad)
 	scf
 	ret
 
-.Wildmon: ; 4e301 (13:6301)
+.Wildmon:
 	ld a, $1
 	and a
 	ret
 
-.FaintedFrzSlp: ; 4e305 (13:6305)
+.FaintedFrzSlp:
 	xor a
 	ret
 
-StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307)
+StatsScreen_LoadTextBoxSpaceGFX:
 	nop
 	push hl
 	push de
@@ -966,14 +941,12 @@ StatsScreen_LoadTextBoxSpaceGFX: ; 4e307 (13:6307)
 	pop de
 	pop hl
 	ret
-; 4e32a (13:632a)
 
-Unreferenced_4e32a: ; 4e32a
+Unreferenced_4e32a:
 ; A blank space tile?
 	ds 16
-; 4e33a
 
-EggStatsScreen: ; 4e33a
+EggStatsScreen:
 	xor a
 	ld [hBGMapMode], a
 	ld hl, wCurHPPal
@@ -1025,38 +998,35 @@ EggStatsScreen: ; 4e33a
 	ld de, SFX_2_BOOPS
 	call PlaySFX
 	ret
-; 0x4e3c0
 
-EggString: ; 4e3c0
+EggString:
 	db "EGG@"
 
-FiveQMarkString: ; 4e3c4
+FiveQMarkString:
 	db "?????@"
 
-EggSoonString: ; 0x4e3ca
+EggSoonString:
 	db   "It's making sounds"
 	next "inside. It's going"
 	next "to hatch soon!@"
 
-EggCloseString: ; 0x4e3fd
+EggCloseString:
 	db   "It moves around"
 	next "inside sometimes."
 	next "It must be close"
 	next "to hatching.@"
 
-EggMoreTimeString: ; 0x4e43d
+EggMoreTimeString:
 	db   "Wonder what's"
 	next "inside? It needs"
 	next "more time, though.@"
 
-EggALotMoreTimeString: ; 0x4e46e
+EggALotMoreTimeString:
 	db   "This EGG needs a"
 	next "lot more time to"
 	next "hatch.@"
-; 0x4e497
-
 
-StatsScreen_AnimateEgg: ; 4e497 (13:6497)
+StatsScreen_AnimateEgg:
 	call StatsScreen_GetAnimationParam
 	ret nc
 	ld a, [wTempMonHappiness]
@@ -1083,7 +1053,7 @@ StatsScreen_AnimateEgg: ; 4e497 (13:6497)
 	set 6, [hl]
 	ret
 
-StatsScreen_LoadPageIndicators: ; 4e4cd (13:64cd)
+StatsScreen_LoadPageIndicators:
 	hlcoord 13, 5
 	ld a, $36 ; first of 4 small square tiles
 	call .load_square
@@ -1101,7 +1071,7 @@ StatsScreen_LoadPageIndicators: ; 4e4cd (13:64cd)
 	hlcoord 15, 5 ; GREEN_PAGE (= GREEN_PAGE)
 	jr z, .load_square
 	hlcoord 17, 5 ; BLUE_PAGE (> GREEN_PAGE)
-.load_square ; 4e4f7 (13:64f7)
+.load_square
 	push bc
 	ld [hli], a
 	inc a
@@ -1115,7 +1085,7 @@ StatsScreen_LoadPageIndicators: ; 4e4cd (13:64cd)
 	pop bc
 	ret
 
-CopyNickname: ; 4e505 (13:6505)
+CopyNickname:
 	ld de, wStringBuffer1
 	ld bc, MON_NAME_LENGTH
 	jr .okay ; utterly pointless
@@ -1137,7 +1107,7 @@ CopyNickname: ; 4e505 (13:6505)
 	pop de
 	ret
 
-GetNicknamePointer: ; 4e528 (13:6528)
+GetNicknamePointer:
 	ld a, [wMonType]
 	add a
 	ld c, a
@@ -1152,8 +1122,7 @@ GetNicknamePointer: ; 4e528 (13:6528)
 	ld a, [wCurPartyMon]
 	jp SkipNames
 
-
-CheckFaintedFrzSlp: ; 4e53f
+CheckFaintedFrzSlp:
 	ld hl, MON_HP
 	add hl, bc
 	ld a, [hli]
@@ -1170,4 +1139,3 @@ CheckFaintedFrzSlp: ; 4e53f
 .fainted_frz_slp
 	scf
 	ret
-; 4e554
diff --git a/engine/routines/switchpartymons.asm b/engine/pokemon/switchpartymons.asm
index b01178417..d612a3472 100644
--- a/engine/routines/switchpartymons.asm
+++ b/engine/pokemon/switchpartymons.asm
@@ -16,7 +16,7 @@ _SwitchPartyMons:
 .skip
 	ret
 
-.ClearSprite: ; 50f34 (14:4f34)
+.ClearSprite:
 	push af
 	hlcoord 0, 1
 	ld bc, 2 * SCREEN_WIDTH
@@ -39,7 +39,7 @@ _SwitchPartyMons:
 	call WaitPlaySFX
 	ret
 
-.SwapMonAndMail: ; 50f62 (14:4f62)
+.SwapMonAndMail:
 	push hl
 	push de
 	push bc
@@ -136,10 +136,10 @@ _SwitchPartyMons:
 	pop hl
 	ret
 
-.CopyNameTowd002: ; 51036 (14:5036)
+.CopyNameTowd002:
 	ld de, wd002
 
-.CopyName: ; 51039 (14:5039)
+.CopyName:
 	ld bc, NAME_LENGTH
 	call CopyBytes
 	ret
diff --git a/engine/tempmon.asm b/engine/pokemon/tempmon.asm
index 03bec3755..4547a02b9 100644
--- a/engine/tempmon.asm
+++ b/engine/pokemon/tempmon.asm
@@ -1,10 +1,10 @@
-CopyPkmnToTempMon: ; 5084a
-; gets the BaseData of a Pkmn
-; and copys the PkmnStructure to wTempMon
+CopyMonToTempMon:
+; gets the BaseData of a mon
+; and copies the party_struct to wTempMon
 
 	ld a, [wCurPartyMon]
 	ld e, a
-	call GetPkmnSpecies
+	call GetMonSpecies
 	ld a, [wCurPartySpecies]
 	ld [wCurSpecies], a
 	call GetBaseData
@@ -32,13 +32,13 @@ CopyPkmnToTempMon: ; 5084a
 .done
 	ret
 
-CalcwBufferMonStats: ; 5088b
+CalcBufferMonStats:
 	ld bc, wBufferMon
 	jr _TempMonStatsCalculation
 
-CalcTempmonStats: ; 50890
+CalcTempmonStats:
 	ld bc, wTempMon
-_TempMonStatsCalculation: ; 50893
+_TempMonStatsCalculation:
 	ld hl, MON_LEVEL
 	add hl, bc
 	ld a, [hl]
@@ -50,8 +50,8 @@ _TempMonStatsCalculation: ; 50893
 	ld hl, MON_STAT_EXP - 1
 	add hl, bc
 	push bc
-	ld b, $1
-	predef CalcPkmnStats
+	ld b, TRUE
+	predef CalcMonStats
 	pop bc
 	ld hl, MON_HP
 	add hl, bc
@@ -82,9 +82,9 @@ _TempMonStatsCalculation: ; 50893
 	ld [hl], a
 	ret
 
-GetPkmnSpecies: ; 508d5
-; [wMonType] has the type of the Pkmn
-; e = Nr. of Pkmn (i.e. [wCurPartyMon])
+GetMonSpecies:
+; [wMonType] has the type of the mon
+; e = Nr. of mon (i.e. [wCurPartyMon])
 
 	ld a, [wMonType]
 	and a ; PARTYMON
diff --git a/engine/types.asm b/engine/pokemon/types.asm
index dc0df61ae..4e2ca3e45 100644
--- a/engine/types.asm
+++ b/engine/pokemon/types.asm
@@ -1,4 +1,4 @@
-PrintMonTypes: ; 5090d
+PrintMonTypes:
 ; Print one or both types of [wCurSpecies]
 ; on the stats screen at hl.
 
@@ -37,10 +37,8 @@ PrintMonTypes: ; 5090d
 	add hl, bc
 	ld bc, NAME_LENGTH_JAPANESE - 1
 	jp ByteFill
-; 5093a
 
-
-PrintMoveType: ; 5093a
+PrintMoveType:
 ; Print the type of move b at hl.
 
 	push hl
@@ -57,8 +55,7 @@ PrintMoveType: ; 5093a
 
 	ld b, a
 
-
-PrintType: ; 50953
+PrintType:
 ; Print type b at hl.
 
 	ld a, b
@@ -75,10 +72,8 @@ PrintType: ; 50953
 	pop hl
 
 	jp PlaceString
-; 50964
 
-
-GetTypeName: ; 50964
+GetTypeName:
 ; Copy the name of type [wd265] to wStringBuffer1.
 
 	ld a, [wd265]
@@ -93,7 +88,5 @@ GetTypeName: ; 50964
 	ld de, wStringBuffer1
 	ld bc, MOVE_NAME_LENGTH
 	jp CopyBytes
-; 5097b
-
 
 INCLUDE "data/types/names.asm"
diff --git a/engine/predef.asm b/engine/predef.asm
index 13c593c90..e18765b0a 100644
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -1,4 +1,4 @@
-GetPredefPointer:: ; 854b
+GetPredefPointer::
 ; Return the bank and address of wPredefID in a and wPredefAddress.
 
 ; Save hl for later (back in Predef)
@@ -24,6 +24,5 @@ GetPredefPointer:: ; 854b
 	ld a, [hl]
 
 	ret
-; 856b
 
 INCLUDE "data/predef_pointers.asm"
diff --git a/engine/print_party.asm b/engine/printer/print_party.asm
index 5fe0e28c0..eeb694d62 100755..100644
--- a/engine/print_party.asm
+++ b/engine/printer/print_party.asm
@@ -1,6 +1,6 @@
 PRINTPARTY_HP EQUS "\"◀\"" ; $71
 
-PrintPage1: ; 1dc1b0
+PrintPage1:
 	hlcoord 0, 0
 	decoord 0, 0, wPrinterTileMapBuffer
 	ld bc, 17 * SCREEN_WIDTH
@@ -50,9 +50,8 @@ PrintPage1: ; 1dc1b0
 	jr nz, .column_loop
 	ld [hl], $3a
 	ret
-; 1dc213
 
-PrintPage2: ; 1dc213
+PrintPage2:
 	hlcoord 0, 0, wPrinterTileMapBuffer
 	ld bc, 8 * SCREEN_WIDTH
 	ld a, " "
@@ -89,9 +88,8 @@ PrintPage2: ; 1dc213
 	ld a, b
 	call nz, FarString
 	ret
-; 1dc26a
 
-.FillColumn: ; 1dc26a
+.FillColumn:
 	push de
 	ld de, SCREEN_WIDTH
 .column_loop
@@ -101,9 +99,8 @@ PrintPage2: ; 1dc213
 	jr nz, .column_loop
 	pop de
 	ret
-; 1dc275
 
-GBPrinterStrings:
+GBPrinterStrings: ; used only for BANK(GBPrinterStrings)
 GBPrinterString_Null: db "@"
 GBPrinterString_CheckingLink: next " CHECKING LINK...@"
 GBPrinterString_Transmitting: next "  TRANSMITTING...@"
@@ -132,9 +129,8 @@ GBPrinterString_PrinterError4:
 	next "Check the Game Boy"
 	next "Printer Manual."
 	db   "@"
-; 1dc381
 
-PrintPartyMonPage1: ; 1dc381
+PrintPartyMonPage1:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -159,7 +155,7 @@ PrintPartyMonPage1: ; 1dc381
 
 	xor a
 	ld [wMonType], a
-	farcall CopyPkmnToTempMon
+	farcall CopyMonToTempMon
 	hlcoord 0, 7
 	ld b, 9
 	ld c, 18
@@ -232,9 +228,8 @@ PrintPartyMonPage1: ; 1dc381
 	call GetSGBLayout
 	call SetPalettes
 	ret
-; 1dc47b
 
-PrintPartyMonPage2: ; 1dc47b
+PrintPartyMonPage2:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -243,7 +238,7 @@ PrintPartyMonPage2: ; 1dc47b
 	call LoadFontsBattleExtra
 	xor a
 	ld [wMonType], a
-	farcall CopyPkmnToTempMon
+	farcall CopyMonToTempMon
 	hlcoord 0, 0
 	ld b, 15
 	ld c, 18
@@ -284,24 +279,21 @@ PrintPartyMonPage2: ; 1dc47b
 	call GetSGBLayout
 	call SetPalettes
 	ret
-; 1dc507
 
-.PrintTempMonStats: ; 1dc507
+.PrintTempMonStats:
 	lb bc, 2, 3
 	call PrintNum
 	ret
-; 1dc50e
 
-Function1dc50e: ; 1dc50e
+Function1dc50e:
 	ld bc, NAME_LENGTH
 	ld a, [wCurPartyMon]
 	call AddNTimes
 	ld e, l
 	ld d, h
 	ret
-; 1dc51a
 
-Function1dc51a: ; 1dc51a
+Function1dc51a:
 	and a
 	jr z, .no_move
 
@@ -315,9 +307,8 @@ Function1dc51a: ; 1dc51a
 .got_string
 	call PlaceString
 	ret
-; 1dc52c
 
-Function1dc52c: ; 1dc52c
+Function1dc52c:
 	farcall GetGender
 	ld a, " "
 	jr c, .got_gender
@@ -334,18 +325,17 @@ Function1dc52c: ; 1dc52c
 	hlcoord 18, 2
 	ld [hl], "⁂"
 	ret
-; 1dc550
 
-String1dc550: ; 1dc550
+String1dc550:
 	db "OT/@"
 
-String1dc554: ; 1dc554
+String1dc554:
 	db "MOVE@"
 
-String1dc559: ; 1dc559
+String1dc559:
 	db "<ID>№.@"
 
-String1dc55d: ; 1dc55d
+String1dc55d:
 	db   "ATTACK"
 	next "DEFENSE"
 	next "SPCL.ATK"
@@ -353,12 +343,11 @@ String1dc55d: ; 1dc55d
 	next "SPEED"
 	db   "@"
 
-String1dc584: ; 1dc584
+String1dc584:
 	db "------------@"
-; 1dc591
 
-GBPrinterHPIcon: ; 1dc591
+GBPrinterHPIcon:
 INCBIN "gfx/printer/hp.1bpp"
 
-GBPrinterLvIcon: ; 1dc599
+GBPrinterLvIcon:
 INCBIN "gfx/printer/lv.1bpp"
diff --git a/engine/printer.asm b/engine/printer/printer.asm
index b9e55ef2a..4dc74c6d2 100755..100644
--- a/engine/printer.asm
+++ b/engine/printer/printer.asm
@@ -1,6 +1,4 @@
-INCLUDE "engine/printer_serial.asm"
-
-SendScreenToPrinter: ; 843f0
+SendScreenToPrinter:
 .loop
 	call JoyTextDelay
 	call CheckCancelPrint
@@ -21,31 +19,27 @@ SendScreenToPrinter: ; 843f0
 .cancel
 	scf
 	ret
-; 84411
 
-Printer_CleanUpAfterSend: ; 84411
+Printer_CleanUpAfterSend:
 	xor a
 	ld [wPrinterConnectionOpen], a
 	ld [wPrinterOpcode], a
 	ret
-; 84419
 
-Printer_PrepareTileMapForPrint: ; 84419
+Printer_PrepareTileMapForPrint:
 	push af
 	call Printer_StartTransmission
 	pop af
 	ld [wcbfa], a
 	call Printer_CopyTileMapToBuffer
 	ret
-; 84425
 
-Printer_ExitPrinter: ; 84425
+Printer_ExitPrinter:
 	call ReturnToMapFromSubmenu
 	call Printer_RestartMapMusic
 	ret
-; 8442c
 
-PrintDexEntry: ; 8442c
+PrintDexEntry:
 	ld a, [wPrinterQueueLength]
 	push af
 
@@ -121,9 +115,8 @@ PrintDexEntry: ; 8442c
 	pop af
 	ld [wPrinterQueueLength], a
 	ret
-; 844bc
 
-PrintPCBox: ; 844bc (21:44bc)
+PrintPCBox:
 	ld a, [wPrinterQueueLength]
 	push af
 	ld a, 18 / 2
@@ -211,12 +204,12 @@ PrintPCBox: ; 844bc (21:44bc)
 	ld [wPrinterQueueLength], a
 	ret
 
-Printer_ResetRegistersAndStartDataSend: ; 84559 (21:4559)
+Printer_ResetRegistersAndStartDataSend:
 	call Printer_ResetJoypadRegisters
 	call SendScreenToPrinter
 	ret
 
-PrintUnownStamp: ; 84560
+PrintUnownStamp:
 	ld a, [wPrinterQueueLength]
 	push af
 	xor a
@@ -274,15 +267,13 @@ PrintUnownStamp: ; 84560
 	pop af
 	ld [wPrinterQueueLength], a
 	ret
-; 845d4
 
-PrintMail: ; 845d4
+PrintMail:
 	call PrintMail_
 	call Printer_ExitPrinter
 	ret
-; 845db
 
-PrintMail_: ; 845db
+PrintMail_:
 	ld a, [wPrinterQueueLength]
 	push af
 	xor a
@@ -323,9 +314,8 @@ PrintMail_: ; 845db
 	pop af
 	ld [wPrinterQueueLength], a
 	ret
-; 8461a
 
-PrintPartymon: ; 8461a
+PrintPartymon:
 	ld a, [wPrinterQueueLength]
 	push af
 	xor a
@@ -385,9 +375,8 @@ PrintPartymon: ; 8461a
 	pop af
 	ld [wPrinterQueueLength], a
 	ret
-; 84688
 
-_PrintDiploma: ; 84688
+_PrintDiploma:
 	ld a, [wPrinterQueueLength]
 	push af
 
@@ -449,9 +438,8 @@ _PrintDiploma: ; 84688
 	pop af
 	ld [wPrinterQueueLength], a
 	ret
-; 846f6
 
-CheckCancelPrint: ; 846f6
+CheckCancelPrint:
 	ld a, [hJoyDown]
 	and B_BUTTON
 	jr nz, .pressed_b
@@ -484,45 +472,39 @@ CheckCancelPrint: ; 846f6
 	ld [hPrinter], a
 	scf
 	ret
-; 84728
 
-Printer_CopyTileMapToBuffer: ; 84728
+Printer_CopyTileMapToBuffer:
 	hlcoord 0, 0
 	ld de, wPrinterTileMapBuffer
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call CopyBytes
 	ret
-; 84735
 
-Printer_CopyBufferToTileMap: ; 84735
+Printer_CopyBufferToTileMap:
 	ld hl, wPrinterTileMapBuffer
 	decoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call CopyBytes
 	ret
-; 84742
 
-Printer_ResetJoypadRegisters: ; 84742
+Printer_ResetJoypadRegisters:
 	xor a
 	ld [hJoyReleased], a
 	ld [hJoyPressed], a
 	ld [hJoyDown], a
 	ld [hJoyLast], a
 	ret
-; 8474c
 
-Printer_PlayMusic: ; 8474c
+Printer_PlayMusic:
 	ld de, MUSIC_PRINTER
 	call PlayMusic2
 	ret
-; 84753
 
-Printer_RestartMapMusic: ; 84753
+Printer_RestartMapMusic:
 	call RestartMapMusic
 	ret
-; 84757
 
-CheckPrinterStatus: ; 84757
+CheckPrinterStatus:
 ; Check for printer errors
 ; If [ca88] == -1, we're disconnected
 	ld a, [wPrinterHandshake]
@@ -561,9 +543,8 @@ CheckPrinterStatus: ; 84757
 .load_text_index
 	ld [wPrinterStatus], a
 	ret
-; 84785
 
-PlacePrinterStatusString: ; 84785
+PlacePrinterStatusString:
 ; Print nonzero printer status
 	ld a, [wPrinterStatus]
 	and a
@@ -594,9 +575,8 @@ PlacePrinterStatusString: ; 84785
 	xor a
 	ld [wPrinterStatus], a
 	ret
-; 847bd
 
-Unreferenced_Function847bd: ; 847bd
+Unreferenced_Function847bd:
 	ld a, [wPrinterStatus]
 	and a
 	ret z
@@ -626,13 +606,11 @@ Unreferenced_Function847bd: ; 847bd
 	xor a
 	ld [wPrinterStatus], a
 	ret
-; 847f5
 
 String_PressBToCancel:
 	db "Press B to Cancel@"
-; 84807
 
-PrinterStatusStringPointers: ; 84807
+PrinterStatusStringPointers:
 	dw GBPrinterString_Null ; @
 	dw GBPrinterString_CheckingLink ; CHECKING LINK
 	dw GBPrinterString_Transmitting ; TRANSMITTING
@@ -641,9 +619,8 @@ PrinterStatusStringPointers: ; 84807
 	dw GBPrinterString_PrinterError2 ; error 2
 	dw GBPrinterString_PrinterError3 ; error 3
 	dw GBPrinterString_PrinterError4 ; error 4
-; 84817
 
-PrintPCBox_Page1: ; 84817 (21:4817)
+PrintPCBox_Page1:
 	xor a
 	ld [wWhichBoxMonToPrint], a
 	hlcoord 0, 0
@@ -678,13 +655,11 @@ PrintPCBox_Page1: ; 84817 (21:4817)
 	ld c, 3
 	call Printer_PrintBoxListSegment
 	ret
-; 84865 (21:4865)
 
 .String_PokemonList:
 	db "#MON LIST@"
-; 8486f
 
-PrintPCBox_Page2: ; 8486f (21:486f)
+PrintPCBox_Page2:
 	hlcoord 0, 0
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	ld a, " "
@@ -701,7 +676,7 @@ PrintPCBox_Page2: ; 8486f (21:486f)
 	call Printer_PrintBoxListSegment
 	ret
 
-PrintPCBox_Page3: ; 84893 (21:4893)
+PrintPCBox_Page3:
 	hlcoord 0, 0
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	ld a, " "
@@ -718,7 +693,7 @@ PrintPCBox_Page3: ; 84893 (21:4893)
 	call Printer_PrintBoxListSegment
 	ret
 
-PrintPCBox_Page4: ; 848b7 (21:48b7)
+PrintPCBox_Page4:
 	hlcoord 0, 0
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 	ld a, " "
@@ -739,7 +714,7 @@ PrintPCBox_Page4: ; 848b7 (21:48b7)
 	call Printer_PrintBoxListSegment
 	ret
 
-Printer_PrintBoxListSegment: ; 848e7 (21:48e7)
+Printer_PrintBoxListSegment:
 	ld a, [wBankOfBoxToPrint]
 	call GetSRAMBank
 .loop
@@ -839,7 +814,7 @@ Printer_PrintBoxListSegment: ; 848e7 (21:48e7)
 	call CloseSRAM
 	ret
 
-Printer_GetMonGender: ; 8498a (21:498a)
+Printer_GetMonGender:
 	push hl
 	ld a, [wAddrOfBoxToPrint]
 	ld l, a
@@ -871,7 +846,7 @@ Printer_GetMonGender: ; 8498a (21:498a)
 	ld [hli], a
 	ret
 
-Printer_GetBoxMonSpecies: ; 849c6 (21:49c6)
+Printer_GetBoxMonSpecies:
 	push hl
 	ld e, a
 	ld d, $0
@@ -885,7 +860,7 @@ Printer_GetBoxMonSpecies: ; 849c6 (21:49c6)
 	pop hl
 	ret
 
-Printer_PlaceTopBorder: ; 849d7 (21:49d7)
+Printer_PlaceTopBorder:
 	hlcoord 0, 0
 	ld a, "┌"
 	ld [hli], a
@@ -899,7 +874,7 @@ Printer_PlaceTopBorder: ; 849d7 (21:49d7)
 	ld [hl], a
 	ret
 
-Printer_PlaceSideBorders: ; 849e9 (21:49e9)
+Printer_PlaceSideBorders:
 	hlcoord 0, 0
 	ld de, SCREEN_WIDTH - 1
 	ld c, SCREEN_HEIGHT
@@ -913,7 +888,7 @@ Printer_PlaceSideBorders: ; 849e9 (21:49e9)
 	jr nz, .loop
 	ret
 
-Printer_PlaceBottomBorders: ; 849fc (21:49fc)
+Printer_PlaceBottomBorders:
 	hlcoord 0, 17
 	ld a, "└"
 	ld [hli], a
@@ -927,7 +902,7 @@ Printer_PlaceBottomBorders: ; 849fc (21:49fc)
 	ld [hl], a
 	ret
 
-Printer_PlaceEmptyBoxSlotString: ; 84a0e (21:4a0e)
+Printer_PlaceEmptyBoxSlotString:
 	hlcoord 2, 0
 	ld c, $6
 .loop
@@ -942,8 +917,6 @@ Printer_PlaceEmptyBoxSlotString: ; 84a0e (21:4a0e)
 	dec c
 	jr nz, .loop
 	ret
-; 84a25 (21:4a25)
 
-String84a25: ; 84a25
+String84a25:
 	db "  ------@"
-; 84a2e
diff --git a/engine/printer_serial.asm b/engine/printer/printer_serial.asm
index 4e0d10851..e8f106ac4 100755..100644
--- a/engine/printer_serial.asm
+++ b/engine/printer/printer_serial.asm
@@ -1,4 +1,4 @@
-Printer_StartTransmission: ; 84000
+Printer_StartTransmission:
 	ld hl, wGameboyPrinterRAM
 	ld bc, wGameboyPrinterRAMEnd - wGameboyPrinterRAM
 	xor a
@@ -14,9 +14,8 @@ Printer_StartTransmission: ; 84000
 	xor a
 	ld [wJumptableIndex], a
 	ret
-; 84022
 
-PrinterJumptableIteration: ; 84022
+PrinterJumptableIteration:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -27,9 +26,8 @@ PrinterJumptableIteration: ; 84022
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 84031
 
-.Jumptable: ; 84031 (21:4031)
+.Jumptable:
 	dw Print_InitPrinterHandshake ; 00
 	dw Printer_CheckConnectionStatus ; 01
 	dw Printer_WaitSerial ; 02
@@ -53,33 +51,33 @@ PrinterJumptableIteration: ; 84022
 	dw Printer_WaitLoopBack ; 12
 	dw Printer_WaitLoopBack_ ; 13
 
-Printer_NextSection: ; 84059 (21:4059)
+Printer_NextSection:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 
-Printer_PrevSection: ; 8405e (21:405e)
+Printer_PrevSection:
 	ld hl, wJumptableIndex
 	dec [hl]
 	ret
 
-Printer_Quit: ; 84063 (21:4063)
+Printer_Quit:
 	xor a
 	ld [wPrinterStatusFlags], a
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
 
-Printer_NextSection_: ; 8406d (21:406d)
+Printer_NextSection_:
 	call Printer_NextSection
 	ret
 
-Printer_SectionOne: ; 84071 (21:4071)
+Printer_SectionOne:
 	ld a, $1
 	ld [wJumptableIndex], a
 	ret
 
-Print_InitPrinterHandshake: ; 84077 (21:4077)
+Print_InitPrinterHandshake:
 	call Printer_ResetData
 	ld hl, PrinterDataPacket1
 	call Printer_CopyPacket
@@ -94,7 +92,7 @@ Print_InitPrinterHandshake: ; 84077 (21:4077)
 	ld [wPrinterStatus], a
 	ret
 
-Printer_StartTransmittingTilemap: ; 84099 (21:4099)
+Printer_StartTransmittingTilemap:
 	call Printer_ResetData
 	; check ???
 	ld hl, wPrinterRowIndex
@@ -118,7 +116,7 @@ Printer_StartTransmittingTilemap: ; 84099 (21:4099)
 	ld [wPrinterStatus], a
 	ret
 
-Printer_EndTilemapTransmission: ; 840c5 (21:40c5)
+Printer_EndTilemapTransmission:
 	; ensure that we go from here to routine 7
 	ld a, $6
 	ld [wJumptableIndex], a
@@ -133,7 +131,7 @@ Printer_EndTilemapTransmission: ; 840c5 (21:40c5)
 	call Printer_WaitHandshake
 	ret
 
-Printer_SignalSendHeader: ; 840de (21:40de)
+Printer_SignalSendHeader:
 	call Printer_ResetData
 	ld hl, PrinterDataPacket2 ; signal request print
 	call Printer_CopyPacket
@@ -151,7 +149,7 @@ Printer_SignalSendHeader: ; 840de (21:40de)
 	ld [wPrinterStatus], a
 	ret
 
-Printer_SignalLoopBack: ; 84103 (21:4103)
+Printer_SignalLoopBack:
 	call Printer_ResetData
 	; send packet 1
 	ld hl, PrinterDataPacket1 ; signal no transmission
@@ -166,7 +164,7 @@ Printer_SignalLoopBack: ; 84103 (21:4103)
 	call Printer_WaitHandshake
 	ret
 
-Printer_WaitSerial: ; 84120 (21:4120)
+Printer_WaitSerial:
 	ld hl, wPrinterSerialFrameDelay
 	inc [hl]
 	ld a, [hl]
@@ -177,7 +175,7 @@ Printer_WaitSerial: ; 84120 (21:4120)
 	call Printer_NextSection
 	ret
 
-Printer_WaitSerialAndLoopBack2: ; 8412e (21:412e)
+Printer_WaitSerialAndLoopBack2:
 	ld hl, wPrinterSerialFrameDelay
 	inc [hl]
 	ld a, [hl]
@@ -191,7 +189,7 @@ Printer_WaitSerialAndLoopBack2: ; 8412e (21:412e)
 	call Printer_PrevSection
 	ret
 
-Printer_CheckConnectionStatus: ; 84143 (21:4143)
+Printer_CheckConnectionStatus:
 	ld a, [wPrinterOpcode]
 	and a
 	ret nz
@@ -224,7 +222,7 @@ Printer_CheckConnectionStatus: ; 84143 (21:4143)
 	ld [wJumptableIndex], a
 	ret
 
-Printer_TransmissionLoop: ; 84180 (21:4180)
+Printer_TransmissionLoop:
 	ld a, [wPrinterOpcode]
 	and a
 	ret nz
@@ -246,7 +244,7 @@ Printer_TransmissionLoop: ; 84180 (21:4180)
 	ld [wJumptableIndex], a
 	ret
 
-Printer_WaitUntilFinished: ; 841a1 (21:41a1)
+Printer_WaitUntilFinished:
 	ld a, [wPrinterOpcode]
 	and a
 	ret nz
@@ -256,9 +254,9 @@ Printer_WaitUntilFinished: ; 841a1 (21:41a1)
 	call Printer_NextSection
 	ret
 
-Printer_WaitLoopBack: ; 841b0 (21:41b0)
+Printer_WaitLoopBack:
 	call Printer_NextSection
-Printer_WaitLoopBack_: ; 841b3 (21:41b3)
+Printer_WaitLoopBack_:
 	ld a, [wPrinterOpcode]
 	and a
 	ret nz
@@ -269,7 +267,7 @@ Printer_WaitLoopBack_: ; 841b3 (21:41b3)
 	ld [wJumptableIndex], a
 	ret
 
-Printer_WaitHandshake: ; 841c3 (21:41c3)
+Printer_WaitHandshake:
 .loop
 	ld a, [wPrinterOpcode]
 	and a
@@ -287,7 +285,7 @@ Printer_WaitHandshake: ; 841c3 (21:41c3)
 	ld [rSC], a
 	ret
 
-Printer_CopyPacket: ; 841e2 (21:41e2)
+Printer_CopyPacket:
 	ld a, [hli]
 	ld [wPrinterData], a
 	ld a, [hli]
@@ -302,7 +300,7 @@ Printer_CopyPacket: ; 841e2 (21:41e2)
 	ld [wPrinterChecksum + 1], a
 	ret
 
-Printer_ResetData: ; 841fb (21:41fb)
+Printer_ResetData:
 	xor a
 	ld hl, wPrinterData
 	ld [hli], a
@@ -320,7 +318,7 @@ Printer_ResetData: ; 841fb (21:41fb)
 	call Printer_ByteFill
 	ret
 
-Printer_ComputeChecksum: ; 84219 (21:4219)
+Printer_ComputeChecksum:
 	ld hl, 0
 	ld bc, 4
 	ld de, wPrinterData
@@ -337,7 +335,7 @@ Printer_ComputeChecksum: ; 84219 (21:4219)
 	ld [wPrinterChecksum + 1], a
 	ret
 
-.ComputeChecksum: ; 8423c (21:423c)
+.ComputeChecksum:
 .loop
 	ld a, [de]
 	inc de
@@ -352,7 +350,7 @@ Printer_ComputeChecksum: ; 84219 (21:4219)
 	jr nz, .loop
 	ret
 
-Printer_StageHeaderForSend: ; 84249 (21:4249)
+Printer_StageHeaderForSend:
 	ld a, $1
 	ld [wGameboyPrinter2bppSource + 0], a
 	ld a, [wcbfa]
@@ -363,7 +361,7 @@ Printer_StageHeaderForSend: ; 84249 (21:4249)
 	ld [wGameboyPrinter2bppSource + 3], a
 	ret
 
-Printer_Convert2RowsTo2bpp: ; 84260 (21:4260)
+Printer_Convert2RowsTo2bpp:
 	; de = wPrinterTileMapBuffer + 2 * SCREEN_WIDTH * ([wPrinterQueueLength] - [wPrinterRowIndex])
 	ld a, [wPrinterRowIndex]
 	xor $ff
@@ -420,7 +418,7 @@ Printer_Convert2RowsTo2bpp: ; 84260 (21:4260)
 	jr nz, .loop2
 	ret
 
-Printer_ByteFill: ; 842ab
+Printer_ByteFill:
 	push de
 	ld e, a
 .loop
@@ -433,7 +431,6 @@ Printer_ByteFill: ; 842ab
 	ld a, e
 	pop de
 	ret
-; 842b7
 
 PrinterDataPacket1:
 	db  1, 0, $00, 0
@@ -453,9 +450,8 @@ PrinterDataPacket5: ; unused
 PrinterDataPacket6: ; unused
 	db 15, 0, $00, 0
 	dw 15
-; 842db
 
-_PrinterReceive:: ; 842db
+_PrinterReceive::
 	ld a, [wPrinterOpcode]
 	add a
 	ld e, a
@@ -466,9 +462,8 @@ _PrinterReceive:: ; 842db
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 842ea
 
-.Jumptable: ; 842ea (21:42ea)
+.Jumptable:
 	dw Printer_DoNothing ; 00
 
 	dw Printer_Send0x33 ; 01
@@ -505,45 +500,45 @@ _PrinterReceive:: ; 842db
 	dw Printer_ReceiveTowPrinterHandshakeAndSend0x00 ; 1e
 	dw Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop ; 1f
 
-Printer_NextInstruction: ; 8432a (21:432a)
+Printer_NextInstruction:
 	ld hl, wPrinterOpcode
 	inc [hl]
 	ret
 
-Printer_DoNothing: ; 8432f (21:432f)
+Printer_DoNothing:
 	ret
 
-Printer_Send0x33: ; 84330 (21:4330)
+Printer_Send0x33:
 	ld a, $33
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_SendPrinterData1: ; 84339 (21:4339)
+Printer_SendPrinterData1:
 	ld a, [wPrinterData]
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_SendPrinterData2: ; 84343 (21:4343)
+Printer_SendPrinterData2:
 	ld a, [wPrinterData + 1]
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_SendPrinterData3: ; 8434d (21:434d)
+Printer_SendPrinterData3:
 	ld a, [wPrinterData + 2]
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_SendPrinterData4: ; 84357 (21:4357)
+Printer_SendPrinterData4:
 	ld a, [wPrinterData + 3]
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_SendNextByte: ; 84361 (21:4361)
+Printer_SendNextByte:
 	; decrement 16-bit counter
 	ld hl, wPrinterSendByteCounter
 	ld a, [hli]
@@ -573,25 +568,25 @@ Printer_SendNextByte: ; 84361 (21:4361)
 
 .done
 	call Printer_NextInstruction
-Printer_SendwPrinterChecksumLo: ; 8438b (21:438b)
+Printer_SendwPrinterChecksumLo:
 	ld a, [wPrinterChecksum]
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_SendwPrinterChecksumHi: ; 84395 (21:4395)
+Printer_SendwPrinterChecksumHi:
 	ld a, [wPrinterChecksum + 1]
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_Send0x00: ; 8439f (21:439f)
+Printer_Send0x00:
 	ld a, $0
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_ReceiveTowPrinterHandshakeAndSend0x00: ; 843a8 (21:43a8)
+Printer_ReceiveTowPrinterHandshakeAndSend0x00:
 	ld a, [rSB]
 	ld [wPrinterHandshake], a
 	ld a, $0
@@ -599,32 +594,32 @@ Printer_ReceiveTowPrinterHandshakeAndSend0x00: ; 843a8 (21:43a8)
 	call Printer_NextInstruction
 	ret
 
-Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop: ; 843b6 (21:43b6)
+Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop:
 	ld a, [rSB]
 	ld [wPrinterStatusFlags], a
 	xor a
 	ld [wPrinterOpcode], a
 	ret
 
-Printer_Send0x0f: ; 843c0 (21:43c0)
+Printer_Send0x0f:
 	ld a, $f
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_Send0x00_: ; 843c9 (21:43c9)
+Printer_Send0x00_:
 	ld a, $0
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_Send0x08: ; 843d2 (21:43d2)
+Printer_Send0x08:
 	ld a, $8
 	call Printer_SerialSend
 	call Printer_NextInstruction
 	ret
 
-Printer_SerialSend: ; 843db (21:43db)
+Printer_SerialSend:
 	ld [rSB], a
 	ld a, $1 ; switch to internal clock
 	ld [rSC], a
@@ -632,7 +627,7 @@ Printer_SerialSend: ; 843db (21:43db)
 	ld [rSC], a
 	ret
 
-Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop_: ; 843e6 (21:43e6)
+Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop_:
 	ld a, [rSB]
 	ld [wPrinterStatusFlags], a
 	xor a
diff --git a/engine/routines/sine.asm b/engine/routines/sine.asm
deleted file mode 100755
index 5f56a10a8..000000000
--- a/engine/routines/sine.asm
+++ /dev/null
@@ -1,48 +0,0 @@
-_Sine:: ; 84d9
-; A simple sine function.
-; Return d * sin(e) in hl.
-
-; e is a signed 6-bit value.
-	ld a, e
-	and %111111
-	cp  %100000
-	jr nc, .negative
-	call .ApplySineWave
-	ld a, h
-	ret
-
-.negative
-	and %011111
-	call .ApplySineWave
-	ld a, h
-	xor $ff
-	inc a
-	ret
-
-.ApplySineWave: ; 84ef
-	ld e, a
-	ld a, d
-	ld d, 0
-	ld hl, .sinewave
-	add hl, de
-	add hl, de
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	ld hl, 0
-; Factor amplitude
-.multiply
-	srl a
-	jr nc, .even
-	add hl, de
-.even
-	sla e
-	rl d
-	and a
-	jr nz, .multiply
-	ret
-
-.sinewave ; 850b
-; A $20-word table representing a sine wave.
-; 90 degrees is index $10 at a base amplitude of $100.
-	sine_wave $100
diff --git a/engine/routines/printhoursmins.asm b/engine/rtc/print_hours_mins.asm
index eb7dc1619..f4abc0c1b 100644
--- a/engine/routines/printhoursmins.asm
+++ b/engine/rtc/print_hours_mins.asm
@@ -1,4 +1,4 @@
-Unreferenced_Function1dd6a9: ; 1dd6a9
+Unreferenced_Function1dd6a9:
 	ld a, b
 	ld b, c
 	ld c, a
@@ -13,7 +13,7 @@ Unreferenced_Function1dd6a9: ; 1dd6a9
 	pop bc
 	ret
 
-PrintHoursMins: ; 1dd6bb (77:56bb)
+PrintHoursMins:
 ; Hours in b, minutes in c
 	ld a, b
 	cp 12
@@ -59,5 +59,5 @@ PrintHoursMins: ; 1dd6bb (77:56bb)
 	call PlaceString
 	ret
 
-String_AM: db "AM@" ; 1dd6fc
-String_PM: db "PM@" ; 1dd6ff
+String_AM: db "AM@"
+String_PM: db "PM@"
diff --git a/engine/delete_save_change_clock.asm b/engine/rtc/reset_password.asm
index fd6ffae2c..1a5461b15 100755..100644
--- a/engine/delete_save_change_clock.asm
+++ b/engine/rtc/reset_password.asm
@@ -1,4 +1,4 @@
-_ResetClock: ; 4d3b1
+_ResetClock:
 	farcall BlankScreen
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
@@ -8,8 +8,8 @@ _ResetClock: ; 4d3b1
 	call PlayMusic
 	ld hl, .text_askreset
 	call PrintText
-	ld hl, .NoYes_MenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, .NoYes_MenuHeader
+	call CopyMenuHeader
 	call VerticalMenu
 	ret c
 	ld a, [wMenuCursorY]
@@ -31,34 +31,34 @@ _ResetClock: ; 4d3b1
 	call PrintText
 	ret
 
-.text_okay ; 0x4d3fe
+.text_okay
 	; Password OK. Select CONTINUE & reset settings.
 	text_jump UnknownText_0x1c55db
 	db "@"
 
-.text_wrong ; 0x4d403
+.text_wrong
 	; Wrong password!
 	text_jump UnknownText_0x1c560b
 	db "@"
 
-.text_askreset ; 0x4d408
+.text_askreset
 	; Reset the clock?
 	text_jump UnknownText_0x1c561c
 	db "@"
 
-.NoYes_MenuDataHeader: ; 0x4d40d
+.NoYes_MenuHeader:
 	db 0 ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .NoYes_MenuData2
+	dw .NoYes_MenuData
 	db 1 ; default option
 
-.NoYes_MenuData2: ; 0x4d415
+.NoYes_MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "NO@"
 	db "YES@"
 
-ClockResetPassword: ; 4d41e
+ClockResetPassword:
 	call .CalculatePassword
 	push de
 	ld hl, wStringBuffer2
@@ -101,12 +101,12 @@ ClockResetPassword: ; 4d41e
 	scf
 	ret
 
-.pleaseenterpasswordtext ; 0x4d463
+.pleaseenterpasswordtext
 	; Please enter the password.
 	text_jump UnknownText_0x1c562e
 	db "@"
 
-.updateIDdisplay ; 4d468
+.updateIDdisplay
 	hlcoord 14, 15
 	ld de, wStringBuffer2
 	ld c, 5
@@ -129,7 +129,7 @@ ClockResetPassword: ; 4d41e
 	ld [hl], "▲"
 	ret
 
-.dpadinput ; 4d490
+.dpadinput
 	ld a, b
 	and D_LEFT
 	jr nz, .left
@@ -186,7 +186,7 @@ ClockResetPassword: ; 4d41e
 	ld [hl], 9
 	ret
 
-.getcurrentdigit ; 4d4d5
+.getcurrentdigit
 	ld a, [wStringBuffer2 + 5]
 	ld e, a
 	ld d, $0
@@ -194,7 +194,7 @@ ClockResetPassword: ; 4d41e
 	add hl, de
 	ret
 
-.ConvertDecIDToBytes: ; 4d4e0
+.ConvertDecIDToBytes:
 	ld hl, 0
 	ld de, wStringBuffer2 + 4
 	ld bc, 1
@@ -206,7 +206,7 @@ ClockResetPassword: ; 4d41e
 	ld bc, 1000
 	call .ConvertToBytes
 	ld bc, 10000
-.ConvertToBytes: ; 4d501
+.ConvertToBytes:
 	ld a, [de]
 	dec de
 	push hl
@@ -218,7 +218,7 @@ ClockResetPassword: ; 4d41e
 	add hl, bc
 	ret
 
-.CalculatePassword: ; 4d50f
+.CalculatePassword:
 	ld a, BANK(sPlayerData)
 	call GetSRAMBank
 	ld de, 0
@@ -234,7 +234,7 @@ ClockResetPassword: ; 4d41e
 	call CloseSRAM
 	ret
 
-.ComponentFromNumber: ; 4d533
+.ComponentFromNumber:
 	ld a, [hli]
 	add e
 	ld e, a
@@ -245,7 +245,7 @@ ClockResetPassword: ; 4d41e
 	jr nz, .ComponentFromNumber
 	ret
 
-.ComponentFromString: ; 4d53e
+.ComponentFromString:
 	ld a, [hli]
 	cp "@"
 	ret z
@@ -257,40 +257,3 @@ ClockResetPassword: ; 4d41e
 	dec c
 	jr nz, .ComponentFromString
 	ret
-
-_DeleteSaveData: ; 4d54c
-	farcall BlankScreen
-	ld b, SCGB_DIPLOMA
-	call GetSGBLayout
-	call LoadStandardFont
-	call LoadFontsExtra
-	ld de, MUSIC_MAIN_MENU
-	call PlayMusic
-	ld hl, .Text_ClearAllSaveData
-	call PrintText
-	ld hl, .NoYesMenuDataHeader
-	call CopyMenuDataHeader
-	call VerticalMenu
-	ret c
-	ld a, [wMenuCursorY]
-	cp $1
-	ret z
-	farcall EmptyAllSRAMBanks
-	ret
-
-.Text_ClearAllSaveData: ; 0x4d580
-	; Clear all save data?
-	text_jump UnknownText_0x1c564a
-	db "@"
-
-.NoYesMenuDataHeader: ; 0x4d585
-	db 0 ; flags
-	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
-	db 1 ; default option
-
-.MenuData2: ; 0x4d58d
-	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
-	db 2 ; items
-	db "NO@"
-	db "YES@"
diff --git a/engine/clock_reset.asm b/engine/rtc/restart_clock.asm
index 4c4a96b9c..5071fef48 100755..100644
--- a/engine/clock_reset.asm
+++ b/engine/rtc/restart_clock.asm
@@ -1,5 +1,4 @@
-
-ResetClock_GetWraparoundTime: ; 20000 (8:4000)
+RestartClock_GetWraparoundTime:
 	push hl
 	dec a
 	ld e, a
@@ -17,9 +16,8 @@ endr
 	ld c, [hl]
 	pop hl
 	ret
-; 20015 (8:4015)
 
-.WrapAroundTimes: ; 20015
+.WrapAroundTimes:
 	dw wBuffer4
 	db 7, 4
 
@@ -28,9 +26,8 @@ endr
 
 	dw wBuffer6
 	db 60, 15
-; 20021
 
-RestartClock: ; 20021 (8:4021)
+RestartClock:
 ; If we're here, we had an RTC overflow.
 	ld hl, .Text_ClockTimeMayBeWrong
 	call PrintText
@@ -38,7 +35,7 @@ RestartClock: ; 20021 (8:4021)
 	ld a, [hl]
 	push af
 	set NO_TEXT_SCROLL, [hl]
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call ClearTileMap
 	ld hl, .Text_SetWithControlPad
 	call PrintText
@@ -49,21 +46,18 @@ RestartClock: ; 20021 (8:4021)
 	ld [hl], b
 	ld c, a
 	ret
-; 20047 (8:4047)
 
-.Text_ClockTimeMayBeWrong: ; 0x20047
+.Text_ClockTimeMayBeWrong:
 	; The clock's time may be wrong. Please reset the time.
 	text_jump UnknownText_0x1c40e6
 	db "@"
-; 0x2004c
 
-.Text_SetWithControlPad: ; 0x2004c
+.Text_SetWithControlPad:
 	; Set with the Control Pad. Confirm: A Button Cancel:  B Button
 	text_jump UnknownText_0x1c411c
 	db "@"
-; 0x20051
 
-.SetClock: ; 20051 (8:4051)
+.SetClock:
 	ld a, 1
 	ld [wBuffer1], a ; which digit
 	ld [wBuffer2], a
@@ -106,19 +100,16 @@ RestartClock: ; 20021 (8:4021)
 .cancel
 	ld a, $1
 	ret
-; 200b0 (8:40b0)
 
-.Text_IsThisOK: ; 0x200b0
+.Text_IsThisOK:
 	; Is this OK?
 	text_jump UnknownText_0x1c415b
 	db "@"
-; 0x200b5
 
-.Text_ClockReset: ; 0x200b5
+.Text_ClockReset:
 	; The clock has been reset.
 	text_jump UnknownText_0x1c4168
 	db "@"
-; 0x200ba
 
 .joy_loop
 	call JoyTextDelay_ForcehJoyDown
@@ -152,7 +143,7 @@ RestartClock: ; 20021 (8:4021)
 
 .pressed_up
 	ld a, [wBuffer1]
-	call ResetClock_GetWraparoundTime
+	call RestartClock_GetWraparoundTime
 	ld a, [de]
 	inc a
 	ld [de], a
@@ -164,7 +155,7 @@ RestartClock: ; 20021 (8:4021)
 
 .pressed_down
 	ld a, [wBuffer1]
-	call ResetClock_GetWraparoundTime
+	call RestartClock_GetWraparoundTime
 	ld a, [de]
 	dec a
 	ld [de], a
@@ -194,7 +185,7 @@ RestartClock: ; 20021 (8:4021)
 	xor a
 	ret
 
-.PrintTime: ; 2011f (8:411f)
+.PrintTime:
 	hlcoord 0, 5
 	ld b, 5
 	ld c, 18
@@ -218,19 +209,17 @@ RestartClock: ; 20021 (8:4021)
 	ld a, [wBuffer1]
 	ld [wBuffer2], a
 	ret
-; 20160 (8:4160)
 
+.unreferenced
 ; unused
-.unreferenced ; 20160
 	ld a, [wBuffer3]
 	ld b, a
 	call Coord2Tile
 	ret
-; 20168
 
-.PlaceChars: ; 20168 (8:4168)
+.PlaceChars:
 	push de
-	call ResetClock_GetWraparoundTime
+	call RestartClock_GetWraparoundTime
 	ld a, [wBuffer3]
 	dec a
 	ld b, a
@@ -241,12 +230,11 @@ RestartClock: ; 20021 (8:4021)
 	add hl, bc
 	ld [hl], e
 	ret
-; 2017c (8:417c)
 
-String_2017c: ; 2017c
+UnreferencedString_HourJP:
+; unused
 	db "じ@" ; HR
-; 2017e
 
-String_2017e: ; 2017e
+UnreferencedString_MinuteJP:
+; unused
 	db "ふん@" ; MIN
-; 20181
diff --git a/engine/rtc.asm b/engine/rtc/rtc.asm
index 37e24c1ed..4a8aab50a 100755..100644
--- a/engine/rtc.asm
+++ b/engine/rtc/rtc.asm
@@ -9,9 +9,8 @@ Unreferenced_StopRTC:
 	ld [MBC3RTC], a
 	call CloseSRAM
 	ret
-; 14019
 
-StartRTC: ; 14019
+StartRTC:
 	ld a, SRAM_ENABLE
 	ld [MBC3SRamEnable], a
 	call LatchClock
@@ -22,9 +21,8 @@ StartRTC: ; 14019
 	ld [MBC3RTC], a
 	call CloseSRAM
 	ret
-; 14032
 
-GetTimeOfDay:: ; 14032
+GetTimeOfDay::
 ; get time of day based on the current hour
 	ld a, [hHours] ; hour
 	ld hl, TimesOfDay
@@ -46,9 +44,8 @@ GetTimeOfDay:: ; 14032
 	ld a, [hl]
 	ld [wTimeOfDay], a
 	ret
-; 14044
 
-TimesOfDay: ; 14044
+TimesOfDay:
 ; hours for the time of day
 ; 0400-0959 morn | 1000-1759 day | 1800-0359 nite
 	db MORN_HOUR, NITE_F
@@ -56,16 +53,14 @@ TimesOfDay: ; 14044
 	db NITE_HOUR, DAY_F
 	db MAX_HOUR,  NITE_F
 	db -1, MORN_F
-; 1404e
 
 Unreferenced_1404e:
 	db 20, NITE_F
 	db 40, MORN_F
 	db 60, DAY_F
 	db -1, MORN_F
-; 14056
 
-StageRTCTimeForSave: ; 14056
+StageRTCTimeForSave:
 	call UpdateTime
 	ld hl, wRTC
 	ld a, [wCurDay]
@@ -77,9 +72,8 @@ StageRTCTimeForSave: ; 14056
 	ld a, [hSeconds]
 	ld [hli], a
 	ret
-; 1406a
 
-SaveRTC: ; 1406a
+SaveRTC:
 	ld a, $a
 	ld [MBC3SRamEnable], a
 	call LatchClock
@@ -93,9 +87,8 @@ SaveRTC: ; 1406a
 	ld [sRTCStatusFlags], a
 	call CloseSRAM
 	ret
-; 14089
 
-StartClock:: ; 14089
+StartClock::
 	call GetClock
 	call Function1409b
 	call FixDays
@@ -107,9 +100,8 @@ StartClock:: ; 14089
 .skip_set
 	call StartRTC
 	ret
-; 1409b
 
-Function1409b: ; 1409b
+Function1409b:
 	ld hl, hRTCDayHi
 	bit 7, [hl]
 	jr nz, .set_bit_7
@@ -123,9 +115,8 @@ Function1409b: ; 1409b
 	ld a, %10000000
 	call RecordRTCStatus ; set bit 7 on sRTCStatusFlags
 	ret
-; 140ae
 
-Function140ae: ; 140ae
+Function140ae:
 	call CheckRTCStatus
 	ld c, a
 	and %11000000 ; Day count exceeded 255 or 16383
@@ -160,9 +151,8 @@ Function140ae: ; 140ae
 .dont_update
 	xor a
 	ret
-; 140ed
 
-_InitTime:: ; 140ed
+_InitTime::
 	call GetClock
 	call FixDays
 	ld hl, hRTCSeconds
@@ -206,4 +196,3 @@ _InitTime:: ; 140ed
 .okay_days
 	ld [de], a
 	ret
-; 1412a
diff --git a/engine/timeset.asm b/engine/rtc/timeset.asm
index 99e4e6843..06f800c45 100755..100644
--- a/engine/timeset.asm
+++ b/engine/rtc/timeset.asm
@@ -1,7 +1,7 @@
 TIMESET_UP_ARROW   EQUS "\"♂\"" ; $ef
 TIMESET_DOWN_ARROW EQUS "\"♀\"" ; $f5
 
-InitClock: ; 90672 (24:4672)
+InitClock:
 ; Ask the player to set the time.
 	ld a, [hInMenu]
 	push af
@@ -112,7 +112,7 @@ InitClock: ; 90672 (24:4672)
 	jr .HourIsSet
 
 .MinutesAreSet:
-	call SetTimeOfDay
+	call InitTimeOfDay
 	ld hl, OakText_ResponseToSetTime
 	call PrintText
 	call WaitPressAorB_BlinkCursor
@@ -120,7 +120,7 @@ InitClock: ; 90672 (24:4672)
 	ld [hInMenu], a
 	ret
 
-.ClearScreen: ; 90783 (24:4783)
+.ClearScreen:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -131,7 +131,7 @@ InitClock: ; 90672 (24:4672)
 	ld [hBGMapMode], a
 	ret
 
-SetHour: ; 90795 (24:4795)
+SetHour:
 	ld a, [hJoyPressed]
 	and A_BUTTON
 	jr nz, .Confirm
@@ -183,7 +183,7 @@ SetHour: ; 90795 (24:4795)
 	scf
 	ret
 
-DisplayHourOClock: ; 907de (24:47de)
+DisplayHourOClock:
 	push hl
 	ld a, [wInitHourBuffer]
 	ld c, a
@@ -195,9 +195,8 @@ DisplayHourOClock: ; 907de (24:47de)
 	call PlaceString
 	pop hl
 	ret
-; 907f1 (24:47f1)
 
-UnreferencedFunction907f1: ; 907f1
+UnreferencedFunction907f1:
 	ld h, d
 	ld l, e
 	push hl
@@ -222,9 +221,8 @@ UnreferencedFunction907f1: ; 907f1
 	inc hl
 	inc hl
 	ret
-; 90810
 
-SetMinutes: ; 90810 (24:4810)
+SetMinutes:
 	ld a, [hJoyPressed]
 	and A_BUTTON
 	jr nz, .a_button
@@ -273,7 +271,7 @@ SetMinutes: ; 90810 (24:4810)
 	scf
 	ret
 
-DisplayMinutesWithMinString: ; 90859 (24:4859)
+DisplayMinutesWithMinString:
 	ld de, wInitMinuteBuffer
 	call PrintTwoDigitNumberRightAlign
 	inc hl
@@ -281,7 +279,7 @@ DisplayMinutesWithMinString: ; 90859 (24:4859)
 	call PlaceString
 	ret
 
-PrintTwoDigitNumberRightAlign: ; 90867 (24:4867)
+PrintTwoDigitNumberRightAlign:
 	push hl
 	ld a, " "
 	ld [hli], a
@@ -290,25 +288,21 @@ PrintTwoDigitNumberRightAlign: ; 90867 (24:4867)
 	lb bc, PRINTNUM_RIGHTALIGN | 1, 2
 	call PrintNum
 	ret
-; 90874 (24:4874)
 
-Text_WokeUpOak: ; 0x90874
+Text_WokeUpOak:
 	; Zzz… Hm? Wha…? You woke me up! Will you check the clock for me?
 	text_jump UnknownText_0x1bc29c
 	db "@"
-; 0x90879
 
-Text_WhatTimeIsIt: ; 0x90879
+Text_WhatTimeIsIt:
 	; What time is it?
 	text_jump UnknownText_0x1bc2eb
 	db "@"
-; 0x9087e
 
 String_oclock:
 	db "o'clock@"
-; 90886
 
-Text_WhatHrs: ; 0x90886
+Text_WhatHrs:
 	; What?@ @
 	text_jump UnknownText_0x1bc2fd
 	start_asm
@@ -316,25 +310,21 @@ Text_WhatHrs: ; 0x90886
 	call DisplayHourOClock
 	ld hl, .QuestionMark
 	ret
-; 90895 (24:4895)
 
-.QuestionMark: ; 0x90895
+.QuestionMark:
 	; ?
 	text_jump UnknownText_0x1bc305
 	db "@"
-; 0x9089a
 
-Text_HowManyMinutes: ; 0x9089a
+Text_HowManyMinutes:
 	; How many minutes?
 	text_jump UnknownText_0x1bc308
 	db "@"
-; 0x9089f
 
 String_min:
 	db "min.@"
-; 908a4
 
-Text_WhoaMins: ; 0x908a4
+Text_WhoaMins:
 	; Whoa!@ @
 	text_jump UnknownText_0x1bc31b
 	start_asm
@@ -342,15 +332,13 @@ Text_WhoaMins: ; 0x908a4
 	call DisplayMinutesWithMinString
 	ld hl, .QuestionMark
 	ret
-; 908b3 (24:48b3)
 
-.QuestionMark: ; 0x908b3
+.QuestionMark:
 	; ?
 	text_jump UnknownText_0x1bc323
 	db "@"
-; 0x908b8
 
-OakText_ResponseToSetTime: ; 0x908b8
+OakText_ResponseToSetTime:
 	start_asm
 	decoord 1, 14
 	ld a, [wInitHourBuffer]
@@ -379,35 +367,30 @@ OakText_ResponseToSetTime: ; 0x908b8
 .day:
 	ld hl, .yikes
 	ret
-; 908ec (24:48ec)
 
-.overslept ; 0x908ec
+.overslept
 	; ! I overslept!
 	text_jump UnknownText_0x1bc326
 	db "@"
-; 0x908f1
 
-.yikes ; 0x908f1
+.yikes
 	; ! Yikes! I over- slept!
 	text_jump UnknownText_0x1bc336
 	db "@"
-; 0x908f6
 
-.sodark ; 0x908f6
+.sodark
 	; ! No wonder it's so dark!
 	text_jump UnknownText_0x1bc34f
 	db "@"
-; 0x908fb
 
-TimeSetBackgroundGFX: ; 908fb
+TimeSetBackgroundGFX:
 INCBIN "gfx/new_game/timeset_bg.1bpp"
-TimeSetUpArrowGFX: ; 90903
+TimeSetUpArrowGFX:
 INCBIN "gfx/new_game/up_arrow.1bpp"
-TimeSetDownArrowGFX: ; 9090b
+TimeSetDownArrowGFX:
 INCBIN "gfx/new_game/down_arrow.1bpp"
-; 90913
 
-Special_SetDayOfWeek: ; 90913
+SetDayOfWeek:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -426,7 +409,7 @@ Special_SetDayOfWeek: ; 90913
 	hlcoord 0, 12
 	lb bc, 4, 18
 	call TextBox
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	ld hl, .WhatDayIsItText
 	call PrintText
 	hlcoord 9, 3
@@ -454,14 +437,13 @@ Special_SetDayOfWeek: ; 90913
 	jr c, .loop
 	ld a, [wTempDayOfWeek]
 	ld [wStringBuffer2], a
-	call SetDayOfWeek
+	call InitDayOfWeek
 	call LoadStandardFont
 	pop af
 	ld [hInMenu], a
 	ret
-; 90993
 
-.GetJoypadAction: ; 90993
+.GetJoypadAction:
 	ld a, [hJoyPressed]
 	and A_BUTTON
 	jr z, .not_A
@@ -515,9 +497,8 @@ Special_SetDayOfWeek: ; 90913
 	call WaitBGMap
 	and a
 	ret
-; 909de
 
-.PlaceWeekdayString: ; 909de
+.PlaceWeekdayString:
 	push hl
 	ld a, [wTempDayOfWeek]
 	ld e, a
@@ -531,9 +512,8 @@ Special_SetDayOfWeek: ; 90913
 	pop hl
 	call PlaceString
 	ret
-; 909f2
 
-.WeekdayStrings: ; 909f2
+.WeekdayStrings:
 ; entries correspond to wCurDay constants (see constants/wram_constants.asm)
 	dw .Sunday
 	dw .Monday
@@ -552,28 +532,24 @@ Special_SetDayOfWeek: ; 90913
 .Friday:    db " FRIDAY@"
 .Saturday:  db "SATURDAY@"
 
-
-.WhatDayIsItText: ; 0x90a3f
+.WhatDayIsItText:
 	; What day is it?
 	text_jump UnknownText_0x1bc369
 	db "@"
-; 0x90a44
 
-.ConfirmWeekdayText: ; 0x90a44
+.ConfirmWeekdayText:
 	start_asm
 	hlcoord 1, 14
 	call .PlaceWeekdayString
 	ld hl, .IsIt
 	ret
-; 90a4f (24:4a4f)
 
-.IsIt: ; 0x90a4f
+.IsIt:
 	; , is it?
 	text_jump UnknownText_0x1bc37a
 	db "@"
-; 0x90a54
 
-Special_InitialSetDSTFlag: ; 90a54
+InitialSetDSTFlag:
 	ld a, [wDST]
 	set 7, a
 	ld [wDST], a
@@ -583,9 +559,8 @@ Special_InitialSetDSTFlag: ; 90a54
 	ld hl, .Text
 	call PlaceHLTextAtBC
 	ret
-; 90a6c
 
-.Text: ; 90a6c
+.Text:
 	start_asm
 	call UpdateTime
 	ld a, [hHours]
@@ -596,15 +571,13 @@ Special_InitialSetDSTFlag: ; 90a54
 	farcall PrintHoursMins
 	ld hl, .DSTIsThatOK
 	ret
-; 90a83 (24:4a83)
 
-.DSTIsThatOK: ; 0x90a83
+.DSTIsThatOK:
 	; DST, is that OK?
 	text_jump Text_DSTIsThatOK
 	db "@"
-; 0x90a88
 
-Special_InitialClearDSTFlag: ; 90a88
+InitialClearDSTFlag:
 	ld a, [wDST]
 	res 7, a
 	ld [wDST], a
@@ -614,9 +587,8 @@ Special_InitialClearDSTFlag: ; 90a88
 	ld hl, .Text
 	call PlaceHLTextAtBC
 	ret
-; 90aa0
 
-.Text: ; 90aa0
+.Text:
 	start_asm
 	call UpdateTime
 	ld a, [hHours]
@@ -627,24 +599,21 @@ Special_InitialClearDSTFlag: ; 90a88
 	farcall PrintHoursMins
 	ld hl, .IsThatOK
 	ret
-; 90ab7
 
-.IsThatOK: ; 0x90ab7
+.IsThatOK:
 	; , is that OK?
 	text_jump UnknownText_0x1c5ff1
 	db "@"
-; 0x90abc
 
-DebugDisplayTime: ; 90abc
+DebugDisplayTime:
 	hlcoord 1, 14
 	lb bc, 3, SCREEN_WIDTH - 2
 	call ClearBox
 	ld hl, .Text
 	call PlaceHLTextAtBC
 	ret
-; 90acc
 
-.Text: ; 0x90acc
+.Text:
 	start_asm
 	call UpdateTime
 
@@ -694,14 +663,12 @@ DebugDisplayTime: ; 90abc
 .done
 	ld hl, .NowOnDebug
 	ret
-; 90b13
 
-.NowOnDebug: ; 0x90b13
+.NowOnDebug:
 	text "<PARA>Now on DEBUG…"
 	prompt
-; 0x90b23
 
-.PrintTime: ; 90b23
+.PrintTime:
 	lb bc, 1, 3
 	call PrintNum
 	ld [hl], "."
@@ -715,9 +682,8 @@ DebugDisplayTime: ; 90abc
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2
 	call PrintNum
 	ret
-; 90b3e
 
-PrintHour: ; 90b3e (24:4b3e)
+PrintHour:
 	ld l, e
 	ld h, d
 	push bc
@@ -733,7 +699,7 @@ PrintHour: ; 90b3e (24:4b3e)
 	call PrintTwoDigitNumberRightAlign
 	ret
 
-GetTimeOfDayString: ; 90b58 (24:4b58)
+GetTimeOfDayString:
 	ld a, c
 	cp MORN_HOUR
 	jr c, .nite
@@ -750,12 +716,10 @@ GetTimeOfDayString: ; 90b58 (24:4b58)
 .day
 	ld de, .day_string
 	ret
-; 90b71 (24:4b71)
 
 .nite_string: db "NITE@"
 .morn_string: db "MORN@"
 .day_string:  db "DAY@"
-; 90b7f
 
 AdjustHourForAMorPM:
 ; Convert the hour stored in c (0-23) to a 1-12 value
diff --git a/engine/routines/flagpredef.asm b/engine/smallflag.asm
index 2a6d91ee1..22819e5d5 100644
--- a/engine/routines/flagpredef.asm
+++ b/engine/smallflag.asm
@@ -1,4 +1,4 @@
-SmallFarFlagAction: ; 4d7c1
+SmallFarFlagAction:
 ; Perform action b on bit c in flag array hl.
 ; If checking a flag, check flag array d:hl unless d is 0.
 
diff --git a/engine/map_palettes.asm b/engine/tilesets/map_palettes.asm
index f8e23e058..5f943795a 100644
--- a/engine/map_palettes.asm
+++ b/engine/tilesets/map_palettes.asm
@@ -1,4 +1,4 @@
-SwapTextboxPalettes:: ; 4c000
+SwapTextboxPalettes::
 	hlcoord 0, 0
 	decoord 0, 0, wAttrMap
 	ld b, SCREEN_HEIGHT
@@ -14,7 +14,7 @@ SwapTextboxPalettes:: ; 4c000
 	add [hl]
 	ld l, a
 	ld a, [wTilesetPalettes + 1]
-	adc $0
+	adc 0
 	ld h, a
 	ld a, [hl]
 	and $f
@@ -25,7 +25,7 @@ SwapTextboxPalettes:: ; 4c000
 	add [hl]
 	ld l, a
 	ld a, [wTilesetPalettes + 1]
-	adc $0
+	adc 0
 	ld h, a
 	ld a, [hl]
 	swap a
@@ -44,7 +44,7 @@ SwapTextboxPalettes:: ; 4c000
 	jr nz, .loop
 	ret
 
-ScrollBGMapPalettes:: ; 4c03f
+ScrollBGMapPalettes::
 	ld hl, wBGMapBuffer
 	ld de, wBGMapPalBuffer
 .loop
@@ -58,7 +58,7 @@ ScrollBGMapPalettes:: ; 4c03f
 	add [hl]
 	ld l, a
 	ld a, [wTilesetPalettes + 1]
-	adc $0
+	adc 0
 	ld h, a
 	ld a, [hl]
 	and $f
@@ -69,7 +69,7 @@ ScrollBGMapPalettes:: ; 4c03f
 	add [hl]
 	ld l, a
 	ld a, [wTilesetPalettes + 1]
-	adc $0
+	adc 0
 	ld h, a
 	ld a, [hl]
 	swap a
diff --git a/engine/mapgroup_roofs.asm b/engine/tilesets/mapgroup_roofs.asm
index 58e5e7cfe..b269e5277 100644
--- a/engine/mapgroup_roofs.asm
+++ b/engine/tilesets/mapgroup_roofs.asm
@@ -1,4 +1,4 @@
-LoadMapGroupRoof:: ; 1c000
+LoadMapGroupRoof::
 	ld a, [wMapGroup]
 	ld e, a
 	ld d, 0
@@ -14,7 +14,5 @@ LoadMapGroupRoof:: ; 1c000
 	ld bc, 9 tiles
 	call CopyBytes
 	ret
-; 1c021
-
 
 INCLUDE "data/maps/roofs.asm"
diff --git a/engine/tileset_anims.asm b/engine/tilesets/tileset_anims.asm
index 9c32d7821..2827b3a92 100644
--- a/engine/tileset_anims.asm
+++ b/engine/tilesets/tileset_anims.asm
@@ -1,4 +1,4 @@
-_AnimateTileset:: ; fc000
+_AnimateTileset::
 ; Iterate over a given pointer array of
 ; animation functions (one per frame).
 
@@ -32,39 +32,36 @@ _AnimateTileset:: ; fc000
 	ld l, a
 
 	jp hl
-; fc01b
 
-Tileset0Anim: ; 0xfc01b
-TilesetJohtoModernAnim: ; 0xfc01b
-TilesetKantoAnim: ; 0xfc01b
+Tileset0Anim:
+TilesetJohtoModernAnim:
+TilesetKantoAnim:
 	dw vTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
-	dw NULL,  TileAnimationPalette
+	dw NULL,  AnimateWaterPalette
 	dw NULL,  WaitTileAnimation
 	dw NULL,  AnimateFlowerTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  StandingTileFrame8
 	dw NULL,  DoneTileAnimation
-; 0xfc047
 
-TilesetParkAnim: ; 0xfc047
+TilesetParkAnim:
 	dw vTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw vTiles2 tile $5f, AnimateFountain
 	dw NULL,  WaitTileAnimation
-	dw NULL,  TileAnimationPalette
+	dw NULL,  AnimateWaterPalette
 	dw NULL,  WaitTileAnimation
 	dw NULL,  AnimateFlowerTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  StandingTileFrame8
 	dw NULL,  DoneTileAnimation
-; 0xfc073
 
-TilesetForestAnim: ; 0xfc073
+TilesetForestAnim:
 	dw NULL,  ForestTreeLeftAnimation
 	dw NULL,  ForestTreeRightAnimation
 	dw NULL,  WaitTileAnimation
@@ -74,16 +71,15 @@ TilesetForestAnim: ; 0xfc073
 	dw NULL,  ForestTreeRightAnimation2
 	dw NULL,  AnimateFlowerTile
 	dw vTiles2 tile $14, AnimateWaterTile
-	dw NULL,  TileAnimationPalette
+	dw NULL,  AnimateWaterPalette
 	dw NULL,  StandingTileFrame8
 	dw NULL,  DoneTileAnimation
-; 0xfc0a3
 
-TilesetJohtoAnim: ; 0xfc0a3
+TilesetJohtoAnim:
 	dw vTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
-	dw NULL,  TileAnimationPalette
+	dw NULL,  AnimateWaterPalette
 	dw NULL,  WaitTileAnimation
 	dw NULL,  AnimateFlowerTile
 	dw WhirlpoolFrames1, AnimateWhirlpoolTile
@@ -93,9 +89,8 @@ TilesetJohtoAnim: ; 0xfc0a3
 	dw NULL,  WaitTileAnimation
 	dw NULL,  StandingTileFrame8
 	dw NULL,  DoneTileAnimation
-; 0xfc0d7
 
-UnusedTilesetAnim_fc0d7: ; 0xfc0d7
+UnusedTilesetAnim_fc0d7:
 	dw vTiles2 tile $03, WriteTileToBuffer
 	dw wTileAnimBuffer, ScrollTileRightLeft
 	dw vTiles2 tile $03, WriteTileFromBuffer
@@ -107,9 +102,8 @@ UnusedTilesetAnim_fc0d7: ; 0xfc0d7
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  DoneTileAnimation
-; 0xfc103
 
-UnusedTilesetAnim_fc103: ; 0xfc103
+UnusedTilesetAnim_fc103:
 	dw vTiles2 tile $14, WriteTileToBuffer
 	dw wTileAnimBuffer, ScrollTileRightLeft
 	dw vTiles2 tile $14, WriteTileFromBuffer
@@ -121,24 +115,22 @@ UnusedTilesetAnim_fc103: ; 0xfc103
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  DoneTileAnimation
-; 0xfc12f
 
-TilesetPortAnim: ; 0xfc12f
+TilesetPortAnim:
 	dw vTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
-	dw NULL,  TileAnimationPalette
+	dw NULL,  AnimateWaterPalette
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  StandingTileFrame8
 	dw NULL,  DoneTileAnimation
-; 0xfc15f
 
-TilesetEliteFourRoomAnim: ; 0xfc15f
+TilesetEliteFourRoomAnim:
 	dw NULL,  LavaBubbleAnim2
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -147,9 +139,8 @@ TilesetEliteFourRoomAnim: ; 0xfc15f
 	dw NULL,  WaitTileAnimation
 	dw NULL,  StandingTileFrame8
 	dw NULL,  DoneTileAnimation
-; 0xfc17f
 
-UnusedTilesetAnim_fc17f: ; 0xfc17f
+UnusedTilesetAnim_fc17f:
 	dw vTiles2 tile $53, WriteTileToBuffer
 	dw wTileAnimBuffer, ScrollTileDown
 	dw wTileAnimBuffer, ScrollTileDown
@@ -162,9 +153,8 @@ UnusedTilesetAnim_fc17f: ; 0xfc17f
 	dw wTileAnimBuffer, ScrollTileDown
 	dw vTiles2 tile $53, WriteTileFromBuffer
 	dw NULL,  DoneTileAnimation
-; 0xfc1af
 
-UnusedTilesetAnim_fc1af: ; 0xfc1af
+UnusedTilesetAnim_fc1af:
 	dw vTiles2 tile $54, WriteTileToBuffer
 	dw wTileAnimBuffer, ScrollTileDown
 	dw wTileAnimBuffer, ScrollTileDown
@@ -179,17 +169,16 @@ UnusedTilesetAnim_fc1af: ; 0xfc1af
 	dw wTileAnimBuffer, ScrollTileDown
 	dw vTiles2 tile $54, WriteTileFromBuffer
 	dw NULL,  DoneTileAnimation
-; 0xfc1e7
 
-TilesetCaveAnim: ; 0xfc1e7
-TilesetDarkCaveAnim: ; 0xfc1e7
+TilesetCaveAnim:
+TilesetDarkCaveAnim:
 	dw vTiles2 tile $14, WriteTileToBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw wTileAnimBuffer, ScrollTileRightLeft
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw vTiles2 tile $14, WriteTileFromBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
-	dw NULL,  TileAnimationPalette
+	dw NULL,  AnimateWaterPalette
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw vTiles2 tile $40, WriteTileToBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
@@ -202,16 +191,15 @@ TilesetDarkCaveAnim: ; 0xfc1e7
 	dw vTiles2 tile $40, WriteTileFromBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw NULL,  DoneTileAnimation
-; 0xfc233
 
-TilesetIcePathAnim: ; 0xfc233
+TilesetIcePathAnim:
 	dw vTiles2 tile $35, WriteTileToBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw wTileAnimBuffer, ScrollTileRightLeft
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw vTiles2 tile $35, WriteTileFromBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
-	dw NULL,  TileAnimationPalette
+	dw NULL,  AnimateWaterPalette
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw vTiles2 tile $31, WriteTileToBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
@@ -224,9 +212,8 @@ TilesetIcePathAnim: ; 0xfc233
 	dw vTiles2 tile $31, WriteTileFromBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw NULL,  DoneTileAnimation
-; 0xfc27f
 
-TilesetTowerAnim: ; 0xfc27f
+TilesetTowerAnim:
 	dw TowerPillarTilePointer9,  AnimateTowerPillarTile
 	dw TowerPillarTilePointer10, AnimateTowerPillarTile
 	dw TowerPillarTilePointer7,  AnimateTowerPillarTile
@@ -243,9 +230,8 @@ TilesetTowerAnim: ; 0xfc27f
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  DoneTileAnimation
-; 0xfc2bf
 
-UnusedTilesetAnim_fc2bf: ; 0xfc2bf
+UnusedTilesetAnim_fc2bf:
 	dw vTiles2 tile $4f, WriteTileToBuffer
 	dw wTileAnimBuffer, ScrollTileRightLeft
 	dw vTiles2 tile $4f, WriteTileFromBuffer
@@ -256,60 +242,55 @@ UnusedTilesetAnim_fc2bf: ; 0xfc2bf
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  DoneTileAnimation
-; 0xfc2e7
-
-TilesetBattleTowerOutsideAnim: ; 0xfc2e7
-TilesetHouseAnim: ; 0xfc2e7
-TilesetPlayersHouseAnim: ; 0xfc2e7
-TilesetPokecenterAnim: ; 0xfc2e7
-TilesetGateAnim: ; 0xfc2e7
-TilesetLabAnim: ; 0xfc2e7
-TilesetFacilityAnim: ; 0xfc2e7
-TilesetMartAnim: ; 0xfc2e7
-TilesetMansionAnim: ; 0xfc2e7
-TilesetGameCornerAnim: ; 0xfc2e7
-TilesetTraditionalHouseAnim: ; 0xfc2e7
-TilesetTrainStationAnim: ; 0xfc2e7
-TilesetChampionsRoomAnim: ; 0xfc2e7
-TilesetLighthouseAnim: ; 0xfc2e7
-TilesetPlayersRoomAnim: ; 0xfc2e7
-TilesetPokeComCenterAnim: ; 0xfc2e7
-TilesetBattleTowerAnim: ; 0xfc2e7
-TilesetRuinsOfAlphAnim: ; 0xfc2e7
-TilesetRadioTowerAnim: ; 0xfc2e7
-TilesetUndergroundAnim: ; 0xfc2e7
-TilesetBetaWordRoomAnim: ; 0xfc2e7
-TilesetHoOhWordRoomAnim: ; 0xfc2e7
-TilesetKabutoWordRoomAnim: ; 0xfc2e7
-TilesetOmanyteWordRoomAnim: ; 0xfc2e7
-TilesetAerodactylWordRoomAnim: ; 0xfc2e7
+
+TilesetBattleTowerOutsideAnim:
+TilesetHouseAnim:
+TilesetPlayersHouseAnim:
+TilesetPokecenterAnim:
+TilesetGateAnim:
+TilesetLabAnim:
+TilesetFacilityAnim:
+TilesetMartAnim:
+TilesetMansionAnim:
+TilesetGameCornerAnim:
+TilesetTraditionalHouseAnim:
+TilesetTrainStationAnim:
+TilesetChampionsRoomAnim:
+TilesetLighthouseAnim:
+TilesetPlayersRoomAnim:
+TilesetPokeComCenterAnim:
+TilesetBattleTowerAnim:
+TilesetRuinsOfAlphAnim:
+TilesetRadioTowerAnim:
+TilesetUndergroundAnim:
+TilesetBetaWordRoomAnim:
+TilesetHoOhWordRoomAnim:
+TilesetKabutoWordRoomAnim:
+TilesetOmanyteWordRoomAnim:
+TilesetAerodactylWordRoomAnim:
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  DoneTileAnimation
-; 0xfc2fb
 
-DoneTileAnimation: ; fc2fb
+DoneTileAnimation:
 ; Reset the animation command loop.
 	xor a
 	ld [hTileAnimFrame], a
 
-WaitTileAnimation: ; fc2fe
+WaitTileAnimation:
 ; Do nothing this frame.
 	ret
-; fc2ff
 
-StandingTileFrame8: ; fc2ff
+StandingTileFrame8:
 	ld a, [wTileAnimationTimer]
 	inc a
 	and %111
 	ld [wTileAnimationTimer], a
 	ret
-; fc309
-
 
-ScrollTileRightLeft: ; fc309
+ScrollTileRightLeft:
 ; Scroll right for 4 ticks, then left for 4 ticks.
 	ld a, [wTileAnimationTimer]
 	inc a
@@ -318,9 +299,8 @@ ScrollTileRightLeft: ; fc309
 	and %100
 	jr nz, ScrollTileLeft
 	jr ScrollTileRight
-; fc318
 
-ScrollTileUpDown: ; fc318
+ScrollTileUpDown:
 ; Scroll up for 4 ticks, then down for 4 ticks.
 	ld a, [wTileAnimationTimer]
 	inc a
@@ -329,9 +309,8 @@ ScrollTileUpDown: ; fc318
 	and %100
 	jr nz, ScrollTileDown
 	jr ScrollTileUp
-; fc327
 
-ScrollTileLeft: ; fc327
+ScrollTileLeft:
 	ld h, d
 	ld l, e
 	ld c, 4
@@ -344,9 +323,8 @@ endr
 	dec c
 	jr nz, .loop
 	ret
-; fc33b
 
-ScrollTileRight: ; fc33b
+ScrollTileRight:
 	ld h, d
 	ld l, e
 	ld c, 4
@@ -359,9 +337,8 @@ endr
 	dec c
 	jr nz, .loop
 	ret
-; fc34f
 
-ScrollTileUp: ; fc34f
+ScrollTileUp:
 	ld h, d
 	ld l, e
 	ld d, [hl]
@@ -386,9 +363,8 @@ ScrollTileUp: ; fc34f
 	dec a
 	jr nz, .loop
 	ret
-; fc36a
 
-ScrollTileDown: ; fc36a
+ScrollTileDown:
 	ld h, d
 	ld l, e
 	ld de, TILE_WIDTH * 2 - 2
@@ -415,10 +391,8 @@ ScrollTileDown: ; fc36a
 	dec a
 	jr nz, .loop
 	ret
-; fc387
-
 
-AnimateFountain: ; fc387
+AnimateFountain:
 	ld hl, sp+0
 	ld b, h
 	ld c, l
@@ -454,10 +428,8 @@ AnimateFountain: ; fc387
 .frame3 INCBIN "gfx/tilesets/fountain/3.2bpp"
 .frame4 INCBIN "gfx/tilesets/fountain/4.2bpp"
 .frame5 INCBIN "gfx/tilesets/fountain/5.2bpp"
-; fc402
 
-
-AnimateWaterTile: ; fc402
+AnimateWaterTile:
 ; Draw a water tile for the current frame in VRAM tile at de.
 
 ; Save sp in bc (see WriteTile).
@@ -488,21 +460,18 @@ AnimateWaterTile: ; fc402
 	ld h, d
 
 	jp WriteTile
-; fc41c
 
-WaterTileFrames: ; fc41c
+WaterTileFrames:
 	INCBIN "gfx/tilesets/water/water.2bpp"
-; fc45c
-
 
-ForestTreeLeftAnimation: ; fc45c
+ForestTreeLeftAnimation:
 	ld hl, sp+0
 	ld b, h
 	ld c, l
 
 ; Only during the Celebi event.
 	ld a, [wCelebiEvent]
-	bit 2, a
+	bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
 	jr nz, .asm_fc46c
 	ld hl, ForestTreeLeftFrames
 	jr .asm_fc47d
@@ -523,28 +492,23 @@ ForestTreeLeftAnimation: ; fc45c
 	ld sp, hl
 	ld hl, vTiles2 tile $0c
 	jp WriteTile
-; fc484
-
 
-ForestTreeLeftFrames: ; fc484
+ForestTreeLeftFrames:
 	INCBIN "gfx/tilesets/forest-tree/1.2bpp"
 	INCBIN "gfx/tilesets/forest-tree/2.2bpp"
-; fc4a4
 
-ForestTreeRightFrames: ; fc4a4
+ForestTreeRightFrames:
 	INCBIN "gfx/tilesets/forest-tree/3.2bpp"
 	INCBIN "gfx/tilesets/forest-tree/4.2bpp"
-; fc4c4
 
-
-ForestTreeRightAnimation: ; fc4c4
+ForestTreeRightAnimation:
 	ld hl, sp+0
 	ld b, h
 	ld c, l
 
 ; Only during the Celebi event.
 	ld a, [wCelebiEvent]
-	bit 2, a
+	bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
 	jr nz, .asm_fc4d4
 	ld hl, ForestTreeRightFrames
 	jr .asm_fc4eb
@@ -569,17 +533,15 @@ ForestTreeRightAnimation: ; fc4c4
 	ld sp, hl
 	ld hl, vTiles2 tile $0f
 	jp WriteTile
-; fc4f2
-
 
-ForestTreeLeftAnimation2: ; fc4f2
+ForestTreeLeftAnimation2:
 	ld hl, sp+0
 	ld b, h
 	ld c, l
 
 ; Only during the Celebi event.
 	ld a, [wCelebiEvent]
-	bit 2, a
+	bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
 	jr nz, .asm_fc502
 	ld hl, ForestTreeLeftFrames
 	jr .asm_fc515
@@ -601,17 +563,15 @@ ForestTreeLeftAnimation2: ; fc4f2
 	ld sp, hl
 	ld hl, vTiles2 tile $0c
 	jp WriteTile
-; fc51c
-
 
-ForestTreeRightAnimation2: ; fc51c
+ForestTreeRightAnimation2:
 	ld hl, sp+0
 	ld b, h
 	ld c, l
 
 ; Only during the Celebi event.
 	ld a, [wCelebiEvent]
-	bit 2, a
+	bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
 	jr nz, .asm_fc52c
 	ld hl, ForestTreeRightFrames
 	jr .asm_fc545
@@ -637,10 +597,8 @@ ForestTreeRightAnimation2: ; fc51c
 	ld sp, hl
 	ld hl, vTiles2 tile $0f
 	jp WriteTile
-; fc54c
 
-
-GetForestTreeFrame: ; fc54c
+GetForestTreeFrame:
 ; Return 0 if a is even, or 2 if odd.
 	and a
 	jr z, .even
@@ -663,10 +621,8 @@ GetForestTreeFrame: ; fc54c
 .even
 	xor a
 	ret
-; fc56d
-
 
-AnimateFlowerTile: ; fc56d
+AnimateFlowerTile:
 ; No parameters.
 
 ; Save sp in bc (see WriteTile).
@@ -694,17 +650,14 @@ AnimateFlowerTile: ; fc56d
 	ld hl, vTiles2 tile $03
 
 	jp WriteTile
-; fc58c
 
-FlowerTileFrames: ; fc58c
+FlowerTileFrames:
 	INCBIN "gfx/tilesets/flower/dmg_1.2bpp"
 	INCBIN "gfx/tilesets/flower/cgb_1.2bpp"
 	INCBIN "gfx/tilesets/flower/dmg_2.2bpp"
 	INCBIN "gfx/tilesets/flower/cgb_2.2bpp"
-; fc5cc
-
 
-LavaBubbleAnim1: ; fc5cc
+LavaBubbleAnim1:
 ; Splash in the bottom-right corner of the fountain.
 	ld hl, sp+0
 	ld b, h
@@ -723,10 +676,8 @@ LavaBubbleAnim1: ; fc5cc
 	ld sp, hl
 	ld hl, vTiles2 tile $5b
 	jp WriteTile
-; fc5eb
 
-
-LavaBubbleAnim2: ; fc5eb
+LavaBubbleAnim2:
 ; Splash in the top-left corner of the fountain.
 	ld hl, sp+0
 	ld b, h
@@ -743,18 +694,14 @@ LavaBubbleAnim2: ; fc5eb
 	ld sp, hl
 	ld hl, vTiles2 tile $38
 	jp WriteTile
-; fc605
-
 
-LavaBubbleFrames: ; fc605
+LavaBubbleFrames:
 	INCBIN "gfx/tilesets/lava/1.2bpp"
 	INCBIN "gfx/tilesets/lava/2.2bpp"
 	INCBIN "gfx/tilesets/lava/3.2bpp"
 	INCBIN "gfx/tilesets/lava/4.2bpp"
-; fc645
-
 
-AnimateTowerPillarTile: ; fc645
+AnimateTowerPillarTile:
 ; Read from struct at de:
 ; 	Destination (VRAM)
 ;	Address of the first tile in the frame array
@@ -799,17 +746,13 @@ AnimateTowerPillarTile: ; fc645
 
 .frames
 	db $00, $10, $20, $30, $40, $30, $20, $10
-; fc673
 
-
-StandingTileFrame: ; fc673
+StandingTileFrame:
 	ld hl, wTileAnimationTimer
 	inc [hl]
 	ret
-; fc678
-
 
-AnimateWhirlpoolTile: ; fc678
+AnimateWhirlpoolTile:
 ; Update whirlpool tile using struct at de.
 
 ; Struct:
@@ -852,10 +795,8 @@ AnimateWhirlpoolTile: ; fc678
 	ld h, d
 
 	jr WriteTile
-; fc696
-
 
-WriteTileFromBuffer: ; fc696
+WriteTileFromBuffer:
 ; Write tiledata at wTileAnimBuffer to de.
 ; wTileAnimBuffer is loaded to sp for WriteTile.
 
@@ -869,10 +810,8 @@ WriteTileFromBuffer: ; fc696
 	ld h, d
 	ld l, e
 	jr WriteTile
-; fc6a2
 
-
-WriteTileToBuffer: ; fc6a2
+WriteTileToBuffer:
 ; Write tiledata de to wTileAnimBuffer.
 ; de is loaded to sp for WriteTile.
 
@@ -888,7 +827,7 @@ WriteTileToBuffer: ; fc6a2
 
 	; fallthrough
 
-WriteTile: ; fc6ac
+WriteTile:
 ; Write one 8x8 tile ($10 bytes) from sp to hl.
 
 ; Warning: sp is saved in bc so we can abuse pop.
@@ -912,10 +851,8 @@ endr
 	ld l, c
 	ld sp, hl
 	ret
-; fc6d7
-
 
-TileAnimationPalette: ; fc6d7
+AnimateWaterPalette:
 ; Transition between color values 0-2 for color 0 in palette 3.
 
 ; No palette changes on DMG.
@@ -952,7 +889,7 @@ TileAnimationPalette: ; fc6d7
 	jr z, .color2
 
 .color1
-	ld hl, wBGPals1 palette PAL_BG_WATER + 2
+	ld hl, wBGPals1 palette PAL_BG_WATER color 1
 	ld a, [hli]
 	ld [rBGPD], a
 	ld a, [hli]
@@ -960,7 +897,7 @@ TileAnimationPalette: ; fc6d7
 	jr .end
 
 .color0
-	ld hl, wBGPals1 palette PAL_BG_WATER
+	ld hl, wBGPals1 palette PAL_BG_WATER color 0
 	ld a, [hli]
 	ld [rBGPD], a
 	ld a, [hli]
@@ -968,7 +905,7 @@ TileAnimationPalette: ; fc6d7
 	jr .end
 
 .color2
-	ld hl, wBGPals1 palette PAL_BG_WATER + 4
+	ld hl, wBGPals1 palette PAL_BG_WATER color 2
 	ld a, [hli]
 	ld [rBGPD], a
 	ld a, [hli]
@@ -978,10 +915,8 @@ TileAnimationPalette: ; fc6d7
 	pop af
 	ld [rSVBK], a
 	ret
-; fc71e
-
 
-FlickeringCaveEntrancePalette: ; fc71e
+FlickeringCaveEntrancePalette:
 ; No palette changes on DMG.
 	ld a, [hCGB]
 	and a
@@ -1009,7 +944,7 @@ FlickeringCaveEntrancePalette: ; fc71e
 	jr .okay
 
 .bit1set
-	ld hl, wBGPals1 palette PAL_BG_YELLOW + 2
+	ld hl, wBGPals1 palette PAL_BG_YELLOW color 1
 
 .okay
 	ld a, [hli]
@@ -1020,8 +955,6 @@ FlickeringCaveEntrancePalette: ; fc71e
 	pop af
 	ld [rSVBK], a
 	ret
-; fc750
-
 
 TowerPillarTilePointer1:  dw vTiles2 tile $2d, TowerPillarTile1
 TowerPillarTilePointer2:  dw vTiles2 tile $2f, TowerPillarTile2
@@ -1044,17 +977,13 @@ TowerPillarTile7:  INCBIN "gfx/tilesets/tower-pillar/7.2bpp"
 TowerPillarTile8:  INCBIN "gfx/tilesets/tower-pillar/8.2bpp"
 TowerPillarTile9:  INCBIN "gfx/tilesets/tower-pillar/9.2bpp"
 TowerPillarTile10: INCBIN "gfx/tilesets/tower-pillar/10.2bpp"
-; fca98
-
 
 WhirlpoolFrames1: dw vTiles2 tile $32, WhirlpoolTiles1
 WhirlpoolFrames2: dw vTiles2 tile $33, WhirlpoolTiles2
 WhirlpoolFrames3: dw vTiles2 tile $42, WhirlpoolTiles3
 WhirlpoolFrames4: dw vTiles2 tile $43, WhirlpoolTiles4
-; fcaa8
 
 WhirlpoolTiles1: INCBIN "gfx/tilesets/whirlpool/1.2bpp"
 WhirlpoolTiles2: INCBIN "gfx/tilesets/whirlpool/2.2bpp"
 WhirlpoolTiles3: INCBIN "gfx/tilesets/whirlpool/3.2bpp"
 WhirlpoolTiles4: INCBIN "gfx/tilesets/whirlpool/4.2bpp"
-; fcba8
diff --git a/engine/tileset_palettes.asm b/engine/tilesets/tileset_palettes.asm
index e2c39c0ab..1e433b158 100644
--- a/engine/tileset_palettes.asm
+++ b/engine/tilesets/tileset_palettes.asm
@@ -1,4 +1,4 @@
-LoadSpecialMapPalette: ; 494ac
+LoadSpecialMapPalette:
 	ld a, [wMapTileset]
 	cp TILESET_POKECOM_CENTER
 	jr z, .pokecom_2f
@@ -51,78 +51,66 @@ LoadSpecialMapPalette: ; 494ac
 .do_nothing
 	and a
 	ret
-; 494f2
 
-LoadPokeComPalette: ; 494f2
+LoadPokeComPalette:
 	ld a, BANK(wBGPals1)
 	ld de, wBGPals1
 	ld hl, PokeComPalette
 	ld bc, 8 palettes
 	call FarCopyWRAM
 	ret
-; 49501
 
-PokeComPalette: ; 49501
+PokeComPalette:
 INCLUDE "gfx/tilesets/pokecom_center.pal"
-; 49541
 
-LoadBattleTowerPalette: ; 49541
+LoadBattleTowerPalette:
 	ld a, BANK(wBGPals1)
 	ld de, wBGPals1
 	ld hl, BattleTowerPalette
 	ld bc, 8 palettes
 	call FarCopyWRAM
 	ret
-; 49550
 
-BattleTowerPalette: ; 49550
+BattleTowerPalette:
 INCLUDE "gfx/tilesets/battle_tower.pal"
-; 49590
 
-LoadIcePathPalette: ; 49590
+LoadIcePathPalette:
 	ld a, BANK(wBGPals1)
 	ld de, wBGPals1
 	ld hl, IcePathPalette
 	ld bc, 8 palettes
 	call FarCopyWRAM
 	ret
-; 4959f
 
-IcePathPalette: ; 4959f
+IcePathPalette:
 INCLUDE "gfx/tilesets/ice_path.pal"
-; 495df
 
-LoadHousePalette: ; 495df
+LoadHousePalette:
 	ld a, BANK(wBGPals1)
 	ld de, wBGPals1
 	ld hl, HousePalette
 	ld bc, 8 palettes
 	call FarCopyWRAM
 	ret
-; 495ee
 
-HousePalette: ; 495ee
+HousePalette:
 INCLUDE "gfx/tilesets/house.pal"
-; 4962e
 
-LoadRadioTowerPalette: ; 4962e
+LoadRadioTowerPalette:
 	ld a, BANK(wBGPals1)
 	ld de, wBGPals1
 	ld hl, RadioTowerPalette
 	ld bc, 8 palettes
 	call FarCopyWRAM
 	ret
-; 4963d
 
-RadioTowerPalette: ; 4963d
+RadioTowerPalette:
 INCLUDE "gfx/tilesets/radio_tower.pal"
-; 4967d
 
-MansionPalette1: ; 4967d
+MansionPalette1:
 INCLUDE "gfx/tilesets/mansion_1.pal"
-; 496c5
 
-LoadMansionPalette: ; 496c5
+LoadMansionPalette:
 	ld a, BANK(wBGPals1)
 	ld de, wBGPals1
 	ld hl, MansionPalette1
@@ -144,8 +132,6 @@ LoadMansionPalette: ; 496c5
 	ld bc, 1 palettes
 	call FarCopyWRAM
 	ret
-; 496fe
 
-MansionPalette2: ; 496fe
+MansionPalette2:
 INCLUDE "gfx/tilesets/mansion_2.pal"
-; 49706
diff --git a/engine/timeofdaypals.asm b/engine/tilesets/timeofday_pals.asm
index 781c2e91a..58bbe9183 100644
--- a/engine/timeofdaypals.asm
+++ b/engine/tilesets/timeofday_pals.asm
@@ -1,18 +1,16 @@
-DummyPredef35: ; 8c000
+DummyPredef35:
 DummyPredef36:
 	ret
 
-UpdateTimeOfDayPal:: ; 8c001
+UpdateTimeOfDayPal::
 	call UpdateTime
 	ld a, [wTimeOfDay]
 	ld [wCurTimeOfDay], a
 	call GetTimePalette
 	ld [wTimeOfDayPal], a
 	ret
-; 8c011
 
-
-_TimeOfDayPals:: ; 8c011
+_TimeOfDayPals::
 ; return carry if pals are changed
 
 ; forced pals?
@@ -66,12 +64,10 @@ _TimeOfDayPals:: ; 8c011
 	ld a, b
 	ld [rSVBK], a
 
-
 ; update sgb pals
 	ld b, SCGB_MAPPALS
 	call GetSGBLayout
 
-
 ; restore bg palette 7
 	ld hl, wOBPals1 - 1 ; last byte in wBGPals1
 
@@ -109,34 +105,29 @@ _TimeOfDayPals:: ; 8c011
 ; no change occurred
 	and a
 	ret
-; 8c070
-
 
-_UpdateTimePals:: ; 8c070
+_UpdateTimePals::
 	ld c, $9 ; normal
 	call GetTimePalFade
 	call DmgToCgbTimePals
 	ret
-; 8c079
 
-Special_FadeInPalettes:: ; 8c079
+FadeInPalettes::
 	ld c, $12
 	call GetTimePalFade
 	ld b, $4
 	call ConvertTimePalsDecHL
 	ret
-; 8c084
 
-Special_FadeOutPalettes:: ; 8c084
+FadeOutPalettes::
 	call FillWhiteBGColor
 	ld c, $9
 	call GetTimePalFade
 	ld b, $4
 	call ConvertTimePalsIncHL
 	ret
-; 8c092
 
-Special_BattleTowerFade: ; 8c092
+BattleTowerFade:
 	call FillWhiteBGColor
 	ld c, $9
 	call GetTimePalFade
@@ -151,26 +142,22 @@ Special_BattleTowerFade: ; 8c092
 	dec b
 	jr nz, .asm_8c09c
 	ret
-; 8c0ab
 
-Special_FadeInQuickly: ; 8c0ab
+FadeInQuickly:
 	ld c, $0
 	call GetTimePalFade
 	ld b, $4
 	call ConvertTimePalsIncHL
 	ret
-; 8c0b6
 
-Special_FadeBlackQuickly: ; 8c0b6
+FadeBlackQuickly:
 	ld c, $9
 	call GetTimePalFade
 	ld b, $4
 	call ConvertTimePalsDecHL
 	ret
-; 8c0c1
 
-
-FillWhiteBGColor: ; 8c0c1
+FillWhiteBGColor:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
@@ -197,9 +184,8 @@ endr
 	pop af
 	ld [rSVBK], a
 	ret
-; 8c0e5
 
-ReplaceTimeOfDayPals: ; 8c0e5
+ReplaceTimeOfDayPals:
 	ld hl, .BrightnessLevels
 	ld a, [wMapTimeOfDay]
 	cp $4 ; Dark cave, needs Flash
@@ -216,7 +202,7 @@ ReplaceTimeOfDayPals: ; 8c0e5
 
 .DarkCave:
 	ld a, [wStatusFlags]
-	bit 2, a ; Flash
+	bit STATUSFLAGS_FLASH_F, a
 	jr nz, .UsedFlash
 	ld a, %11111111 ; 3, 3, 3, 3
 	ld [wTimeOfDayPalset], a
@@ -226,9 +212,8 @@ ReplaceTimeOfDayPals: ; 8c0e5
 	ld a, %10101010 ; 2, 2, 2, 2
 	ld [wTimeOfDayPalset], a
 	ret
-; 8c10f (23:410f)
 
-.BrightnessLevels: ; 8c10f
+.BrightnessLevels:
 	dc 3, 2, 1, 0
 	dc 1, 1, 1, 1
 	dc 2, 2, 2, 2
@@ -237,9 +222,8 @@ ReplaceTimeOfDayPals: ; 8c0e5
 	dc 3, 2, 1, 0
 	dc 3, 2, 1, 0
 	dc 3, 2, 1, 0
-; 8c117
 
-GetTimePalette: ; 8c117
+GetTimePalette:
 	ld a, [wTimeOfDay]
 	ld e, a
 	ld d, 0
@@ -250,7 +234,6 @@ GetTimePalette: ; 8c117
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 8c126
 
 .TimePalettes:
 	dw .MorningPalette
@@ -282,10 +265,8 @@ GetTimePalette: ; 8c117
 	rlca
 	rlca
 	ret
-; 8c14e
-
 
-DmgToCgbTimePals: ; 8c14e
+DmgToCgbTimePals:
 	push hl
 	push de
 	ld a, [hli]
@@ -298,9 +279,8 @@ DmgToCgbTimePals: ; 8c14e
 	pop de
 	pop hl
 	ret
-; 8c15e
 
-ConvertTimePalsIncHL: ; 8c15e
+ConvertTimePalsIncHL:
 .loop
 	call DmgToCgbTimePals
 	inc hl
@@ -311,9 +291,8 @@ ConvertTimePalsIncHL: ; 8c15e
 	dec b
 	jr nz, .loop
 	ret
-; 8c16d
 
-ConvertTimePalsDecHL: ; 8c16d
+ConvertTimePalsDecHL:
 .loop
 	call DmgToCgbTimePals
 	dec hl
@@ -324,10 +303,8 @@ ConvertTimePalsDecHL: ; 8c16d
 	dec b
 	jr nz, .loop
 	ret
-; 8c17c
-
 
-GetTimePalFade: ; 8c17c
+GetTimePalFade:
 ; check cgb
 	ld a, [hCGB]
 	and a
@@ -412,4 +389,3 @@ GetTimePalFade: ; 8c17c
 	db %10010000, %10010000, %10010000
 	db %01000000, %01000000, %01000000
 	db %00000000, %00000000, %00000000
-; 8c20f
diff --git a/gfx/battle_anims.asm b/gfx/battle_anims.asm
index 52ac4e6b5..7f8f59189 100644
--- a/gfx/battle_anims.asm
+++ b/gfx/battle_anims.asm
@@ -1,4 +1,4 @@
-AnimObj00GFX: ; 84a2e
+AnimObj00GFX:
 AnimObjHitGFX:       INCBIN "gfx/battle_anims/hit.2bpp.lz"
 AnimObjCutGFX:       INCBIN "gfx/battle_anims/cut.2bpp.lz"
 AnimObjFireGFX:      INCBIN "gfx/battle_anims/fire.2bpp.lz"
@@ -38,4 +38,3 @@ AnimObjShineGFX:     INCBIN "gfx/battle_anims/shine.2bpp.lz"
 AnimObjAngelsGFX:    INCBIN "gfx/battle_anims/angels.2bpp.lz"
 AnimObjWaveGFX:      INCBIN "gfx/battle_anims/wave.2bpp.lz"
 AnimObjAeroblastGFX: INCBIN "gfx/battle_anims/aeroblast.2bpp.lz"
-; 8640e
diff --git a/gfx/battle_anims/beam.png b/gfx/battle_anims/beam.png
index 32a3b1967..e8bc6cde4 100755..100644
--- a/gfx/battle_anims/beam.png
+++ b/gfx/battle_anims/beam.png
diff --git a/gfx/battle_anims/lightning.png b/gfx/battle_anims/lightning.png
index 6606fad12..fcc9376f9 100755..100644
--- a/gfx/battle_anims/lightning.png
+++ b/gfx/battle_anims/lightning.png
diff --git a/gfx/battle_anims/misc.png b/gfx/battle_anims/misc.png
index d7e67508e..7540508a4 100755..100644
--- a/gfx/battle_anims/misc.png
+++ b/gfx/battle_anims/misc.png
diff --git a/gfx/battle_anims/noise.png b/gfx/battle_anims/noise.png
index 17540a5e8..328d94c99 100755..100644
--- a/gfx/battle_anims/noise.png
+++ b/gfx/battle_anims/noise.png
diff --git a/gfx/battle_anims/objects.png b/gfx/battle_anims/objects.png
index 91ea435b8..80117f18f 100755..100644
--- a/gfx/battle_anims/objects.png
+++ b/gfx/battle_anims/objects.png
diff --git a/gfx/battle_anims/poison.png b/gfx/battle_anims/poison.png
index ebbbc52be..ebbbc52be 100755..100644
--- a/gfx/battle_anims/poison.png
+++ b/gfx/battle_anims/poison.png
diff --git a/gfx/battle_anims/pokeball.png b/gfx/battle_anims/pokeball.png
index 47edf2190..ff76a3f74 100755..100644
--- a/gfx/battle_anims/pokeball.png
+++ b/gfx/battle_anims/pokeball.png
diff --git a/gfx/battle_anims/rocks.png b/gfx/battle_anims/rocks.png
index d7fe76b2f..78814028c 100755..100644
--- a/gfx/battle_anims/rocks.png
+++ b/gfx/battle_anims/rocks.png
diff --git a/gfx/battle_anims/sand.png b/gfx/battle_anims/sand.png
index a54db235d..7ecdeaee3 100755..100644
--- a/gfx/battle_anims/sand.png
+++ b/gfx/battle_anims/sand.png
diff --git a/gfx/unknown/b789.pal b/gfx/beta_poker/beta_poker.pal
index cce760662..cce760662 100644
--- a/gfx/unknown/b789.pal
+++ b/gfx/beta_poker/beta_poker.pal
diff --git a/gfx/card_flip/card_flip_2.png b/gfx/card_flip/card_flip_2.png
index 531417385..d7123061c 100644
--- a/gfx/card_flip/card_flip_2.png
+++ b/gfx/card_flip/card_flip_2.png
diff --git a/gfx/credits/pichu.png b/gfx/credits/pichu.png
index 1d46ea807..73fd4b593 100644
--- a/gfx/credits/pichu.png
+++ b/gfx/credits/pichu.png
diff --git a/gfx/credits/theend.png b/gfx/credits/theend.png
index eaaf393b7..aada755f2 100644
--- a/gfx/credits/theend.png
+++ b/gfx/credits/theend.png
diff --git a/gfx/font.asm b/gfx/font.asm
index bf5741074..2361c2ae6 100755..100644
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -7,7 +7,7 @@ INCBIN "gfx/font/font.1bpp"
 FontBattleExtra:
 INCBIN "gfx/font/font_battle_extra.2bpp"
 
-Frames: ; f8800
+Frames:
 INCBIN "gfx/frames/1.1bpp"
 INCBIN "gfx/frames/2.1bpp"
 INCBIN "gfx/frames/3.1bpp"
@@ -17,66 +17,50 @@ INCBIN "gfx/frames/6.1bpp"
 INCBIN "gfx/frames/7.1bpp"
 INCBIN "gfx/frames/8.1bpp"
 INCBIN "gfx/frames/9.1bpp"
-; f89b0
 
 ; Various misc graphics here.
 
-StatsScreenPageTilesGFX: ; f89b0
+StatsScreenPageTilesGFX:
 INCBIN "gfx/stats/stats_tiles.2bpp"
-; f8ac0
 
-EnemyHPBarBorderGFX: ; f8ac0
+EnemyHPBarBorderGFX:
 INCBIN "gfx/battle/enemy_hp_bar_border.1bpp"
-; f8ae0
 
-HPExpBarBorderGFX: ; f8ae0
+HPExpBarBorderGFX:
 INCBIN "gfx/battle/hp_exp_bar_border.1bpp"
-; f8b10
 
-ExpBarGFX: ; f8b10
+ExpBarGFX:
 INCBIN "gfx/battle/expbar.2bpp"
-; f8ba0
 
-TownMapGFX: ; f8ba0
+TownMapGFX:
 INCBIN "gfx/pokegear/town_map.2bpp.lz"
-; f8ea4
 
 UnusedWeekdayKanjiGFX: ; unused kanji
 INCBIN "gfx/font/unused_weekday_kanji.2bpp"
-; f8f24
 
-PokegearPhoneIconGFX: ; f8f24
+PokegearPhoneIconGFX:
 INCBIN "gfx/font/phone_icon.2bpp"
-; f8f34
 
 UnusedBoldFontGFX: ; unused bold letters + unown chars
 INCBIN "gfx/font/unused_bold_font.1bpp"
-; f9204
 
-TextBoxSpaceGFX: ; f9204
+TextBoxSpaceGFX:
 INCBIN "gfx/frames/space.1bpp"
-; f9214
 
-FontsExtra_SolidBlackGFX: ; f9214
+FontsExtra_SolidBlackGFX:
 INCBIN "gfx/font/black.1bpp"
-; f921c
 
 UnusedUpArrowGFX: ; unused up arrow + whitespace
 INCBIN "gfx/font/unused_up_arrow.1bpp"
-; f9234
 
-MobilePhoneTilesGFX: ; f9234
+MobilePhoneTilesGFX:
 INCBIN "gfx/mobile/phone_tiles.2bpp"
-; f9344
 
-MapEntryFrameGFX: ; f9344
+MapEntryFrameGFX:
 INCBIN "gfx/frames/map_entry_sign.2bpp"
-; f9424
 
-FontsExtra2_UpArrowGFX: ; f9424
+FontsExtra2_UpArrowGFX:
 INCBIN "gfx/font/up_arrow.2bpp"
-; f9434
 
-Footprints: ; f9434
+Footprints:
 INCLUDE "gfx/footprints.asm"
-; fb434
diff --git a/gfx/frames/space.png b/gfx/frames/space.png
index 7590b85dd..577318724 100755..100644
--- a/gfx/frames/space.png
+++ b/gfx/frames/space.png
diff --git a/gfx/icons.asm b/gfx/icons.asm
index 0733c26f6..c664516fa 100644
--- a/gfx/icons.asm
+++ b/gfx/icons.asm
@@ -1,40 +1,41 @@
-Icons:
+Icons: ; used only for BANK(Icons)
+
 NullIcon:
-PoliwagIcon:      INCBIN "gfx/icons/poliwag.2bpp" ; 0x8ec0d
-JigglypuffIcon:   INCBIN "gfx/icons/jigglypuff.2bpp" ; 0x8ec8d
-DiglettIcon:      INCBIN "gfx/icons/diglett.2bpp" ; 0x8ed0d
-PikachuIcon:      INCBIN "gfx/icons/pikachu.2bpp" ; 0x8ed8d
-StaryuIcon:       INCBIN "gfx/icons/staryu.2bpp" ; 0x8ee0d
-FishIcon:         INCBIN "gfx/icons/fish.2bpp" ; 0x8ee8d
-BirdIcon:         INCBIN "gfx/icons/bird.2bpp" ; 0x8ef0d
-MonsterIcon:      INCBIN "gfx/icons/monster.2bpp" ; 0x8ef8d
-ClefairyIcon:     INCBIN "gfx/icons/clefairy.2bpp" ; 0x8f00d
-OddishIcon:       INCBIN "gfx/icons/oddish.2bpp" ; 0x8f08d
-BugIcon:          INCBIN "gfx/icons/bug.2bpp" ; 0x8f10d
-GhostIcon:        INCBIN "gfx/icons/ghost.2bpp" ; 0x8f18d
-LaprasIcon:       INCBIN "gfx/icons/lapras.2bpp" ; 0x8f20d
-HumanshapeIcon:   INCBIN "gfx/icons/humanshape.2bpp" ; 0x8f28d
-FoxIcon:          INCBIN "gfx/icons/fox.2bpp" ; 0x8f30d
-EquineIcon:       INCBIN "gfx/icons/equine.2bpp" ; 0x8f38d
-ShellIcon:        INCBIN "gfx/icons/shell.2bpp" ; 0x8f40d
-BlobIcon:         INCBIN "gfx/icons/blob.2bpp" ; 0x8f48d
-SerpentIcon:      INCBIN "gfx/icons/serpent.2bpp" ; 0x8f50d
-VoltorbIcon:      INCBIN "gfx/icons/voltorb.2bpp" ; 0x8f58d
-SquirtleIcon:     INCBIN "gfx/icons/squirtle.2bpp" ; 0x8f60d
-BulbasaurIcon:    INCBIN "gfx/icons/bulbasaur.2bpp" ; 0x8f68d
-CharmanderIcon:   INCBIN "gfx/icons/charmander.2bpp" ; 0x8f70d
-CaterpillarIcon:  INCBIN "gfx/icons/caterpillar.2bpp" ; 0x8f78d
-UnownIcon:        INCBIN "gfx/icons/unown.2bpp" ; 0x8f80d
-GeodudeIcon:      INCBIN "gfx/icons/geodude.2bpp" ; 0x8f88d
-FighterIcon:      INCBIN "gfx/icons/fighter.2bpp" ; 0x8f90d
-EggIcon:          INCBIN "gfx/icons/egg.2bpp" ; 0x8f98d
-JellyfishIcon:    INCBIN "gfx/icons/jellyfish.2bpp" ; 0x8fa0d
-MothIcon:         INCBIN "gfx/icons/moth.2bpp" ; 0x8fa8d
-BatIcon:          INCBIN "gfx/icons/bat.2bpp" ; 0x8fb0d
-SnorlaxIcon:      INCBIN "gfx/icons/snorlax.2bpp" ; 0x8fb8d
-HoOhIcon:         INCBIN "gfx/icons/ho_oh.2bpp" ; 0x8fc0d
-LugiaIcon:        INCBIN "gfx/icons/lugia.2bpp" ; 0x8fc8d
-GyaradosIcon:     INCBIN "gfx/icons/gyarados.2bpp" ; 0x8fd0d
-SlowpokeIcon:     INCBIN "gfx/icons/slowpoke.2bpp" ; 0x8fd8d
-SudowoodoIcon:    INCBIN "gfx/icons/sudowoodo.2bpp" ; 0x8fe0d
-BigmonIcon:       INCBIN "gfx/icons/bigmon.2bpp" ; 0x8fe8d
+PoliwagIcon:      INCBIN "gfx/icons/poliwag.2bpp"
+JigglypuffIcon:   INCBIN "gfx/icons/jigglypuff.2bpp"
+DiglettIcon:      INCBIN "gfx/icons/diglett.2bpp"
+PikachuIcon:      INCBIN "gfx/icons/pikachu.2bpp"
+StaryuIcon:       INCBIN "gfx/icons/staryu.2bpp"
+FishIcon:         INCBIN "gfx/icons/fish.2bpp"
+BirdIcon:         INCBIN "gfx/icons/bird.2bpp"
+MonsterIcon:      INCBIN "gfx/icons/monster.2bpp"
+ClefairyIcon:     INCBIN "gfx/icons/clefairy.2bpp"
+OddishIcon:       INCBIN "gfx/icons/oddish.2bpp"
+BugIcon:          INCBIN "gfx/icons/bug.2bpp"
+GhostIcon:        INCBIN "gfx/icons/ghost.2bpp"
+LaprasIcon:       INCBIN "gfx/icons/lapras.2bpp"
+HumanshapeIcon:   INCBIN "gfx/icons/humanshape.2bpp"
+FoxIcon:          INCBIN "gfx/icons/fox.2bpp"
+EquineIcon:       INCBIN "gfx/icons/equine.2bpp"
+ShellIcon:        INCBIN "gfx/icons/shell.2bpp"
+BlobIcon:         INCBIN "gfx/icons/blob.2bpp"
+SerpentIcon:      INCBIN "gfx/icons/serpent.2bpp"
+VoltorbIcon:      INCBIN "gfx/icons/voltorb.2bpp"
+SquirtleIcon:     INCBIN "gfx/icons/squirtle.2bpp"
+BulbasaurIcon:    INCBIN "gfx/icons/bulbasaur.2bpp"
+CharmanderIcon:   INCBIN "gfx/icons/charmander.2bpp"
+CaterpillarIcon:  INCBIN "gfx/icons/caterpillar.2bpp"
+UnownIcon:        INCBIN "gfx/icons/unown.2bpp"
+GeodudeIcon:      INCBIN "gfx/icons/geodude.2bpp"
+FighterIcon:      INCBIN "gfx/icons/fighter.2bpp"
+EggIcon:          INCBIN "gfx/icons/egg.2bpp"
+JellyfishIcon:    INCBIN "gfx/icons/jellyfish.2bpp"
+MothIcon:         INCBIN "gfx/icons/moth.2bpp"
+BatIcon:          INCBIN "gfx/icons/bat.2bpp"
+SnorlaxIcon:      INCBIN "gfx/icons/snorlax.2bpp"
+HoOhIcon:         INCBIN "gfx/icons/ho_oh.2bpp"
+LugiaIcon:        INCBIN "gfx/icons/lugia.2bpp"
+GyaradosIcon:     INCBIN "gfx/icons/gyarados.2bpp"
+SlowpokeIcon:     INCBIN "gfx/icons/slowpoke.2bpp"
+SudowoodoIcon:    INCBIN "gfx/icons/sudowoodo.2bpp"
+BigmonIcon:       INCBIN "gfx/icons/bigmon.2bpp"
diff --git a/gfx/mail.asm b/gfx/mail.asm
index 83ca99f60..f8b3f2891 100644
--- a/gfx/mail.asm
+++ b/gfx/mail.asm
@@ -1,111 +1,111 @@
-MorphMailDividerGFX: ; b9926
+MorphMailDividerGFX:
 INCBIN "gfx/mail/morph_mail_divider.1bpp"
 
-BlueSkyMailGrassGFX: ; b992e
+BlueSkyMailGrassGFX:
 INCBIN "gfx/mail/grass.1bpp"
 
-PortraitMailSmallPokeballGFX: ; b9936
+PortraitMailSmallPokeballGFX:
 INCBIN "gfx/mail/small_pokeball.1bpp"
 
-MorphMailBorderGFX: ; b993e
+MorphMailBorderGFX:
 INCBIN "gfx/mail/morph_mail_border.1bpp"
 
-MusicMailSmallNoteGFX: ; b9946
+MusicMailSmallNoteGFX:
 INCBIN "gfx/mail/small_note.1bpp"
 
-SurfMailWaveGFX: ; b994e
+SurfMailWaveGFX:
 INCBIN "gfx/mail/wave.1bpp"
 
-PortraitMailUnderlineGFX: ; b995e
+PortraitMailUnderlineGFX:
 INCBIN "gfx/mail/portraitmail_underline.1bpp"
 
-LovelyMailUnderlineGFX: ; b9966
+LovelyMailUnderlineGFX:
 INCBIN "gfx/mail/lovely_mail_underline.1bpp"
 
-LovelyMailSmallHeartGFX: ; b996e
+LovelyMailSmallHeartGFX:
 INCBIN "gfx/mail/small_heart.1bpp"
 
-SurfLiteBlueMailSmallShapesGFX: ; b9976
+SurfLiteBlueMailSmallShapesGFX:
 INCBIN "gfx/mail/small_triangle.1bpp"
 
-EonMailBorder1GFX: ; b997e
+EonMailBorder1GFX:
 INCBIN "gfx/mail/eon_mail_border_1.1bpp"
 
-EonMailBorder2GFX: ; b998e
+EonMailBorder2GFX:
 INCBIN "gfx/mail/eon_mail_border_2.1bpp"
 
-MailNatuGFX: ; b9996
+MailNatuGFX:
 INCBIN "gfx/mail/natu.1bpp"
 
-MailDratiniGFX: ; b99c6
+MailDratiniGFX:
 INCBIN "gfx/mail/dratini.1bpp"
 
-MailPoliwagGFX: ; b99f6
+MailPoliwagGFX:
 INCBIN "gfx/mail/poliwag.1bpp"
 
-MailLaprasGFX: ; b9a26
+MailLaprasGFX:
 INCBIN "gfx/mail/lapras.1bpp"
 
-MailEeveeGFX: ; b9a56
+MailEeveeGFX:
 INCBIN "gfx/mail/eevee.1bpp"
 
-MailDittoGFX: ; b9a86
+MailDittoGFX:
 INCBIN "gfx/mail/ditto.1bpp"
 
-MailMewGFX: ; b9ab6
+MailMewGFX:
 INCBIN "gfx/mail/mew.1bpp"
 
-MailDragoniteGFX: ; b9b46
+MailDragoniteGFX:
 INCBIN "gfx/mail/dragonite.1bpp"
 
-MailSentretGFX: ; b9bce
+MailSentretGFX:
 INCBIN "gfx/mail/sentret.1bpp"
 
-MailUnusedGrassGFX: ; b9bee
+MailUnusedGrassGFX:
 INCBIN "gfx/mail/unused_grass.1bpp"
 
-PortraitMailLargePokeballGFX: ; b9bfe
+PortraitMailLargePokeballGFX:
 INCBIN "gfx/mail/large_pokeball.1bpp"
 
-MailOddishGFX: ; b9c1e
+MailOddishGFX:
 INCBIN "gfx/mail/oddish.1bpp"
 
-SurfLiteBlueMailLargeShapesGFX: ; b9c3e
+SurfLiteBlueMailLargeShapesGFX:
 INCBIN "gfx/mail/large_triangle.1bpp"
 
-LovelyMailLargeHeartGFX: ; b9c5e
+LovelyMailLargeHeartGFX:
 INCBIN "gfx/mail/large_heart.1bpp"
 
-MorphMailBorderCornerGFX: ; b9c7e
+MorphMailBorderCornerGFX:
 INCBIN "gfx/mail/morph_mail_corner.1bpp"
 
-MailLargeCircleGFX: ; b9c9e
+MailLargeCircleGFX:
 INCBIN "gfx/mail/large_circle.1bpp"
 
-FlowerMailFlowerGFX: ; b9cbe
+FlowerMailFlowerGFX:
 INCBIN "gfx/mail/flower_1.1bpp"
 INCBIN "gfx/mail/flower_2.1bpp"
 
-MusicMailLargeNoteGFX: ; b9cfe
+MusicMailLargeNoteGFX:
 INCBIN "gfx/mail/large_note.1bpp"
 
-MailCloudGFX: ; b9d16
+MailCloudGFX:
 INCBIN "gfx/mail/cloud.1bpp"
 
-SurfMailBorderGFX: ; b9d46
+SurfMailBorderGFX:
 INCBIN "gfx/mail/surf_mail_border.1bpp"
 
-FlowerMailBorderGFX: ; b9d86
+FlowerMailBorderGFX:
 INCBIN "gfx/mail/flower_mail_border.1bpp"
 
-LiteBlueMailBorderGFX: ; b9dc6
+LiteBlueMailBorderGFX:
 INCBIN "gfx/mail/litebluemail_border.1bpp"
 
-MusicMailBorderGFX: ; b9e06
+MusicMailBorderGFX:
 INCBIN "gfx/mail/music_mail_border.1bpp"
 
-LovelyMailBorderGFX: ; b9e26
+LovelyMailBorderGFX:
 INCBIN "gfx/mail/lovely_mail_border.1bpp"
 
-PortraitMailBorderGFX: ; b9e4e
+PortraitMailBorderGFX:
 INCBIN "gfx/mail/portraitmail_border.1bpp"
diff --git a/gfx/mail/cloud.png b/gfx/mail/cloud.png
index bc0786238..d152f008e 100755..100644
--- a/gfx/mail/cloud.png
+++ b/gfx/mail/cloud.png
diff --git a/gfx/mail/dragonite.png b/gfx/mail/dragonite.png
index 9f792d31c..560f8f125 100755..100644
--- a/gfx/mail/dragonite.png
+++ b/gfx/mail/dragonite.png
diff --git a/gfx/mail/flower_mail_border.png b/gfx/mail/flower_mail_border.png
index d0ac239f3..a84dd8ac6 100755..100644
--- a/gfx/mail/flower_mail_border.png
+++ b/gfx/mail/flower_mail_border.png
diff --git a/gfx/mail/large_note.png b/gfx/mail/large_note.png
index 4b7a26faa..8b16f4103 100755..100644
--- a/gfx/mail/large_note.png
+++ b/gfx/mail/large_note.png
diff --git a/gfx/mail/litebluemail_border.png b/gfx/mail/litebluemail_border.png
index 878021bf8..4547e194d 100755..100644
--- a/gfx/mail/litebluemail_border.png
+++ b/gfx/mail/litebluemail_border.png
diff --git a/gfx/mail/morph_mail_corner.png b/gfx/mail/morph_mail_corner.png
index f9e7a3cae..491e64294 100755..100644
--- a/gfx/mail/morph_mail_corner.png
+++ b/gfx/mail/morph_mail_corner.png
diff --git a/gfx/mail/surf_mail_border.png b/gfx/mail/surf_mail_border.png
index 466d26c39..722fab83f 100755..100644
--- a/gfx/mail/surf_mail_border.png
+++ b/gfx/mail/surf_mail_border.png
diff --git a/gfx/mobile/electro_ball_nonmatching.png b/gfx/mobile/electro_ball_nonmatching.png
index 44ea166ef..52441bd83 100755..100644
--- a/gfx/mobile/electro_ball_nonmatching.png
+++ b/gfx/mobile/electro_ball_nonmatching.png
diff --git a/gfx/mobile/mobile_splash.png b/gfx/mobile/mobile_splash.png
index d54b68cdf..6eb92c5b2 100755..100644
--- a/gfx/mobile/mobile_splash.png
+++ b/gfx/mobile/mobile_splash.png
diff --git a/gfx/overworld/chris_fish.png b/gfx/overworld/chris_fish.png
index 81e05279a..0c968475a 100644
--- a/gfx/overworld/chris_fish.png
+++ b/gfx/overworld/chris_fish.png
diff --git a/gfx/overworld/kris_fish.png b/gfx/overworld/kris_fish.png
index c0fe37544..ff1372646 100644
--- a/gfx/overworld/kris_fish.png
+++ b/gfx/overworld/kris_fish.png
diff --git a/gfx/pack/pack_menu.png b/gfx/pack/pack_menu.png
index 52e2bcdd5..aa693cc40 100644
--- a/gfx/pack/pack_menu.png
+++ b/gfx/pack/pack_menu.png
diff --git a/gfx/pics.asm b/gfx/pics.asm
index 198569a76..d771b63d2 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -4,6 +4,7 @@ INCLUDE "constants.asm"
 ; PokemonPicPointers and UnownPicPointers are assumed to start at the same
 ; address, but in different banks. This is enforced in pokecrystal.link.
 
+
 SECTION "Pic Pointers", ROMX
 
 INCLUDE "data/pokemon/pic_pointers.asm"
@@ -20,7 +21,6 @@ INCLUDE "data/trainers/pic_pointers.asm"
 
 
 SECTION "Pics 1", ROMX
-Pics_1::
 
 HoOhFrontpic:        INCBIN "gfx/pokemon/ho_oh/front.animated.2bpp.lz"
 MachampFrontpic:     INCBIN "gfx/pokemon/machamp/front.animated.2bpp.lz"
@@ -35,7 +35,6 @@ VenusaurFrontpic:    INCBIN "gfx/pokemon/venusaur/front.animated.2bpp.lz"
 EnteiFrontpic:       INCBIN "gfx/pokemon/entei/front.animated.2bpp.lz"
 SuicuneFrontpic:     INCBIN "gfx/pokemon/suicune/front.animated.2bpp.lz"
 TyphlosionFrontpic:  INCBIN "gfx/pokemon/typhlosion/front.animated.2bpp.lz"
-; 123ffa
 
 
 SECTION "Pics 2", ROMX
@@ -56,7 +55,6 @@ MewtwoFrontpic:      INCBIN "gfx/pokemon/mewtwo/front.animated.2bpp.lz"
 FearowFrontpic:      INCBIN "gfx/pokemon/fearow/front.animated.2bpp.lz"
 CharizardFrontpic:   INCBIN "gfx/pokemon/charizard/front.animated.2bpp.lz"
 QuilavaFrontpic:     INCBIN "gfx/pokemon/quilava/front.animated.2bpp.lz"
-; 127ffe
 
 
 SECTION "Pics 3", ROMX
@@ -79,7 +77,6 @@ VictreebelFrontpic:  INCBIN "gfx/pokemon/victreebel/front.animated.2bpp.lz"
 RaichuFrontpic:      INCBIN "gfx/pokemon/raichu/front.animated.2bpp.lz"
 PrimeapeFrontpic:    INCBIN "gfx/pokemon/primeape/front.animated.2bpp.lz"
 OmastarBackpic:      INCBIN "gfx/pokemon/omastar/back.2bpp.lz"
-; 12bffe
 
 
 SECTION "Pics 4", ROMX
@@ -104,7 +101,6 @@ JolteonFrontpic:     INCBIN "gfx/pokemon/jolteon/front.animated.2bpp.lz"
 DonphanFrontpic:     INCBIN "gfx/pokemon/donphan/front.animated.2bpp.lz"
 PinsirFrontpic:      INCBIN "gfx/pokemon/pinsir/front.animated.2bpp.lz"
 UnownEFrontpic:      INCBIN "gfx/pokemon/unown_e/front.animated.2bpp.lz"
-; 130000
 
 
 SECTION "Pics 5", ROMX
@@ -130,7 +126,6 @@ AzumarillFrontpic:   INCBIN "gfx/pokemon/azumarill/front.animated.2bpp.lz"
 ParasectFrontpic:    INCBIN "gfx/pokemon/parasect/front.animated.2bpp.lz"
 MrMimeFrontpic:      INCBIN "gfx/pokemon/mr__mime/front.animated.2bpp.lz"
 HeracrossFrontpic:   INCBIN "gfx/pokemon/heracross/front.animated.2bpp.lz"
-; 133fff
 
 
 SECTION "Pics 6", ROMX
@@ -158,7 +153,6 @@ MarowakFrontpic:     INCBIN "gfx/pokemon/marowak/front.animated.2bpp.lz"
 VulpixFrontpic:      INCBIN "gfx/pokemon/vulpix/front.animated.2bpp.lz"
 GligarFrontpic:      INCBIN "gfx/pokemon/gligar/front.animated.2bpp.lz"
 DunsparceFrontpic:   INCBIN "gfx/pokemon/dunsparce/front.animated.2bpp.lz"
-; 137fff
 
 
 SECTION "Pics 7", ROMX
@@ -188,7 +182,6 @@ DragonairFrontpic:   INCBIN "gfx/pokemon/dragonair/front.animated.2bpp.lz"
 ForretressFrontpic:  INCBIN "gfx/pokemon/forretress/front.animated.2bpp.lz"
 TogeticFrontpic:     INCBIN "gfx/pokemon/togetic/front.animated.2bpp.lz"
 KangaskhanBackpic:   INCBIN "gfx/pokemon/kangaskhan/back.2bpp.lz"
-; 13c000
 
 
 SECTION "Pics 8", ROMX
@@ -220,7 +213,6 @@ FurretFrontpic:      INCBIN "gfx/pokemon/furret/front.animated.2bpp.lz"
 CyndaquilFrontpic:   INCBIN "gfx/pokemon/cyndaquil/front.animated.2bpp.lz"
 HitmonchanFrontpic:  INCBIN "gfx/pokemon/hitmonchan/front.animated.2bpp.lz"
 QuagsireFrontpic:    INCBIN "gfx/pokemon/quagsire/front.animated.2bpp.lz"
-; 13fff7
 
 
 SECTION "Pics 9", ROMX
@@ -256,7 +248,6 @@ SandshrewFrontpic:   INCBIN "gfx/pokemon/sandshrew/front.animated.2bpp.lz"
 NidoranFFrontpic:    INCBIN "gfx/pokemon/nidoran_f/front.animated.2bpp.lz"
 PidgeyFrontpic:      INCBIN "gfx/pokemon/pidgey/front.animated.2bpp.lz"
 ParasectBackpic:     INCBIN "gfx/pokemon/parasect/back.2bpp.lz"
-; 144000
 
 
 SECTION "Pics 10", ROMX
@@ -296,7 +287,6 @@ HitmontopBackpic:    INCBIN "gfx/pokemon/hitmontop/back.2bpp.lz"
 CloysterBackpic:     INCBIN "gfx/pokemon/cloyster/back.2bpp.lz"
 HoothootFrontpic:    INCBIN "gfx/pokemon/hoothoot/front.animated.2bpp.lz"
 UnownFBackpic:       INCBIN "gfx/pokemon/unown_f/back.2bpp.lz"
-; 148000
 
 
 SECTION "Pics 11", ROMX
@@ -339,7 +329,6 @@ CelebiBackpic:       INCBIN "gfx/pokemon/celebi/back.2bpp.lz"
 KrabbyBackpic:       INCBIN "gfx/pokemon/krabby/back.2bpp.lz"
 BugCatcherPic:       INCBIN "gfx/trainers/bug_catcher.2bpp.lz"
 SnorlaxBackpic:      INCBIN "gfx/pokemon/snorlax/back.2bpp.lz"
-; 14bffb
 
 
 SECTION "Pics 12", ROMX
@@ -385,7 +374,6 @@ FlareonBackpic:      INCBIN "gfx/pokemon/flareon/back.2bpp.lz"
 GoldeenBackpic:      INCBIN "gfx/pokemon/goldeen/back.2bpp.lz"
 BulbasaurFrontpic:   INCBIN "gfx/pokemon/bulbasaur/front.animated.2bpp.lz"
 StarmieBackpic:      INCBIN "gfx/pokemon/starmie/back.2bpp.lz"
-; 150000
 
 
 SECTION "Pics 13", ROMX
@@ -433,7 +421,6 @@ NidorinoBackpic:     INCBIN "gfx/pokemon/nidorino/back.2bpp.lz"
 MysticalmanPic:      INCBIN "gfx/trainers/mysticalman.2bpp.lz"
 CooltrainerfPic:     INCBIN "gfx/trainers/cooltrainer_f.2bpp.lz"
 ElectrodeFrontpic:   INCBIN "gfx/pokemon/electrode/front.animated.2bpp.lz"
-; 153fe3
 
 
 SECTION "Pics 14", ROMX
@@ -484,7 +471,6 @@ VenonatBackpic:      INCBIN "gfx/pokemon/venonat/back.2bpp.lz"
 BellossomBackpic:    INCBIN "gfx/pokemon/bellossom/back.2bpp.lz"
 Rival1Pic:           INCBIN "gfx/trainers/rival1.2bpp.lz"
 SwinubBackpic:       INCBIN "gfx/pokemon/swinub/back.2bpp.lz"
-; 158000
 
 
 SECTION "Pics 15", ROMX
@@ -538,7 +524,6 @@ MagnemiteFrontpic:   INCBIN "gfx/pokemon/magnemite/front.animated.2bpp.lz"
 ErikaPic:            INCBIN "gfx/trainers/erika.2bpp.lz"
 JaninePic:           INCBIN "gfx/trainers/janine.2bpp.lz"
 MagnemiteBackpic:    INCBIN "gfx/pokemon/magnemite/back.2bpp.lz"
-; 15bffa
 
 
 SECTION "Pics 16", ROMX
@@ -596,7 +581,6 @@ SwinubFrontpic:      INCBIN "gfx/pokemon/swinub/front.animated.2bpp.lz"
 LarvitarBackpic:     INCBIN "gfx/pokemon/larvitar/back.2bpp.lz"
 PorygonBackpic:      INCBIN "gfx/pokemon/porygon/back.2bpp.lz"
 UnownHBackpic:       INCBIN "gfx/pokemon/unown_h/back.2bpp.lz"
-; 15ffff
 
 
 SECTION "Pics 17", ROMX
@@ -662,7 +646,6 @@ MetapodBackpic:      INCBIN "gfx/pokemon/metapod/back.2bpp.lz"
 JigglypuffBackpic:   INCBIN "gfx/pokemon/jigglypuff/back.2bpp.lz"
 OddishBackpic:       INCBIN "gfx/pokemon/oddish/back.2bpp.lz"
 UnownDBackpic:       INCBIN "gfx/pokemon/unown_d/back.2bpp.lz"
-; 163ffc
 
 
 SECTION "Pics 18", ROMX
@@ -727,7 +710,6 @@ UnownYBackpic:       INCBIN "gfx/pokemon/unown_y/back.2bpp.lz"
 UnownPBackpic:       INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
 UnownIBackpic:       INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
 UnownRBackpic:       INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
-; 1669d3
 
 
 SECTION "Pics 19", ROMX
@@ -794,3 +776,17 @@ INCBIN "gfx/pokemon/unown_y/back.2bpp.lz"
 INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
 INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
 INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
+
+
+; Sections "Pics 20" to "Pics 24" are not used for any graphics,
+; but entries for their banks exist in FixPicBank (see engine/gfx/load_pics.asm).
+
+SECTION "Pics 20", ROMX
+
+SECTION "Pics 21", ROMX
+
+SECTION "Pics 22", ROMX
+
+SECTION "Pics 23", ROMX
+
+SECTION "Pics 24", ROMX
diff --git a/gfx/pokemon/questionmark/front.2bpp.lz.14c284f5 b/gfx/pokedex/question_mark.2bpp.lz.14c284f5
index cd2f7f22e..cd2f7f22e 100644
--- a/gfx/pokemon/questionmark/front.2bpp.lz.14c284f5
+++ b/gfx/pokedex/question_mark.2bpp.lz.14c284f5
diff --git a/gfx/pokemon/questionmark/front.png b/gfx/pokedex/question_mark.png
index e2b681c73..e2b681c73 100644
--- a/gfx/pokemon/questionmark/front.png
+++ b/gfx/pokedex/question_mark.png
diff --git a/gfx/pokegear/town_map.png b/gfx/pokegear/town_map.png
index 899379826..e711c5f1d 100644
--- a/gfx/pokegear/town_map.png
+++ b/gfx/pokegear/town_map.png
diff --git a/gfx/pokemon/abra/anim.asm b/gfx/pokemon/abra/anim.asm
index 9d37567ac..3eecf0cf0 100644
--- a/gfx/pokemon/abra/anim.asm
+++ b/gfx/pokemon/abra/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 09
 	dorepeat 1
 	endanim
-; 0xd0c5a
diff --git a/gfx/pokemon/abra/anim_idle.asm b/gfx/pokemon/abra/anim_idle.asm
index 796e57f88..c30d12eed 100644
--- a/gfx/pokemon/abra/anim_idle.asm
+++ b/gfx/pokemon/abra/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 07
 	dorepeat 1
 	endanim
-; 0xd1b38
diff --git a/gfx/pokemon/aerodactyl/anim.asm b/gfx/pokemon/aerodactyl/anim.asm
index 515cba043..5e6a67c7f 100644
--- a/gfx/pokemon/aerodactyl/anim.asm
+++ b/gfx/pokemon/aerodactyl/anim.asm
@@ -6,4 +6,3 @@
 	frame 1, 08
 	dorepeat 4
 	endanim
-; 0xd10a1
diff --git a/gfx/pokemon/aerodactyl/anim_idle.asm b/gfx/pokemon/aerodactyl/anim_idle.asm
index 4394a8e0c..ad4667aff 100644
--- a/gfx/pokemon/aerodactyl/anim_idle.asm
+++ b/gfx/pokemon/aerodactyl/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1e2b
diff --git a/gfx/pokemon/aipom/anim.asm b/gfx/pokemon/aipom/anim.asm
index 99556d958..74b03e07d 100644
--- a/gfx/pokemon/aipom/anim.asm
+++ b/gfx/pokemon/aipom/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 12
 	dorepeat 2
 	endanim
-; 0xd1369
diff --git a/gfx/pokemon/aipom/anim_idle.asm b/gfx/pokemon/aipom/anim_idle.asm
index 9685b665d..c4a056b01 100644
--- a/gfx/pokemon/aipom/anim_idle.asm
+++ b/gfx/pokemon/aipom/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd200b
diff --git a/gfx/pokemon/alakazam/anim.asm b/gfx/pokemon/alakazam/anim.asm
index fb87afbfe..f858dc298 100644
--- a/gfx/pokemon/alakazam/anim.asm
+++ b/gfx/pokemon/alakazam/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 2
 	frame 3, 07
 	endanim
-; 0xd0c76
diff --git a/gfx/pokemon/alakazam/anim_idle.asm b/gfx/pokemon/alakazam/anim_idle.asm
index 52cf585fb..9818e74f1 100644
--- a/gfx/pokemon/alakazam/anim_idle.asm
+++ b/gfx/pokemon/alakazam/anim_idle.asm
@@ -2,4 +2,3 @@
 	frame 5, 45
 	frame 3, 10
 	endanim
-; 0xd1b48
diff --git a/gfx/pokemon/ampharos/anim.asm b/gfx/pokemon/ampharos/anim.asm
index 5e3d6538e..3e09e9b95 100644
--- a/gfx/pokemon/ampharos/anim.asm
+++ b/gfx/pokemon/ampharos/anim.asm
@@ -7,4 +7,3 @@
 	frame 1, 06
 	frame 4, 06
 	endanim
-; 0xd12fa
diff --git a/gfx/pokemon/ampharos/anim_idle.asm b/gfx/pokemon/ampharos/anim_idle.asm
index 6dcb40d61..087f27bd8 100644
--- a/gfx/pokemon/ampharos/anim_idle.asm
+++ b/gfx/pokemon/ampharos/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 6, 06
 	dorepeat 2
 	endanim
-; 0xd1fb6
diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm
index 8efba2c30..761e7125c 100644
--- a/gfx/pokemon/anims.asm
+++ b/gfx/pokemon/anims.asm
@@ -1,4 +1,5 @@
-PicAnimations:
+PicAnimations: ; used only for BANK(PicAnimations)
+
 BulbasaurAnimation:  INCLUDE "gfx/pokemon/bulbasaur/anim.asm"
 IvysaurAnimation:    INCLUDE "gfx/pokemon/ivysaur/anim.asm"
 VenusaurAnimation:   INCLUDE "gfx/pokemon/venusaur/anim.asm"
diff --git a/gfx/pokemon/arbok/anim.asm b/gfx/pokemon/arbok/anim.asm
index 0ceceacac..b77e93305 100644
--- a/gfx/pokemon/arbok/anim.asm
+++ b/gfx/pokemon/arbok/anim.asm
@@ -12,4 +12,3 @@
 	frame 3, 05
 	dorepeat 8
 	endanim
-; 0xd09ed
diff --git a/gfx/pokemon/arbok/anim_idle.asm b/gfx/pokemon/arbok/anim_idle.asm
index c9f85e238..c5e42ab95 100644
--- a/gfx/pokemon/arbok/anim_idle.asm
+++ b/gfx/pokemon/arbok/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 5, 04
 	frame 4, 06
 	endanim
-; 0xd19a9
diff --git a/gfx/pokemon/arcanine/anim.asm b/gfx/pokemon/arcanine/anim.asm
index 0dc0dcacc..d70f01a1c 100644
--- a/gfx/pokemon/arcanine/anim.asm
+++ b/gfx/pokemon/arcanine/anim.asm
@@ -4,4 +4,3 @@
 	frame 4, 10
 	frame 7, 25
 	endanim
-; 0xd0c26
diff --git a/gfx/pokemon/arcanine/anim_idle.asm b/gfx/pokemon/arcanine/anim_idle.asm
index e178a2d24..3eb0790ba 100644
--- a/gfx/pokemon/arcanine/anim_idle.asm
+++ b/gfx/pokemon/arcanine/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 6, 09
 	dorepeat 1
 	endanim
-; 0xd1b0c
diff --git a/gfx/pokemon/ariados/anim.asm b/gfx/pokemon/ariados/anim.asm
index 9a4d30385..00a7a5dcd 100644
--- a/gfx/pokemon/ariados/anim.asm
+++ b/gfx/pokemon/ariados/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 1, 24
 	endanim
-; 0xd124d
diff --git a/gfx/pokemon/ariados/anim_idle.asm b/gfx/pokemon/ariados/anim_idle.asm
index 6b9f416be..bce41a887 100644
--- a/gfx/pokemon/ariados/anim_idle.asm
+++ b/gfx/pokemon/ariados/anim_idle.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 1, 08
 	endanim
-; 0xd1f3b
diff --git a/gfx/pokemon/articuno/anim.asm b/gfx/pokemon/articuno/anim.asm
index ccb583766..6d99becfa 100644
--- a/gfx/pokemon/articuno/anim.asm
+++ b/gfx/pokemon/articuno/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 2
 	frame 5, 12
 	endanim
-; 0xd10c1
diff --git a/gfx/pokemon/articuno/anim_idle.asm b/gfx/pokemon/articuno/anim_idle.asm
index 634d8daff..f9322d352 100644
--- a/gfx/pokemon/articuno/anim_idle.asm
+++ b/gfx/pokemon/articuno/anim_idle.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 5, 12
 	endanim
-; 0xd1e41
diff --git a/gfx/pokemon/azumarill/anim.asm b/gfx/pokemon/azumarill/anim.asm
index bbe46d4b7..b248a7144 100644
--- a/gfx/pokemon/azumarill/anim.asm
+++ b/gfx/pokemon/azumarill/anim.asm
@@ -6,4 +6,3 @@
 	frame 1, 08
 	frame 4, 08
 	endanim
-; 0xd1329
diff --git a/gfx/pokemon/azumarill/anim_idle.asm b/gfx/pokemon/azumarill/anim_idle.asm
index 070e6145f..b7c3a8f8b 100644
--- a/gfx/pokemon/azumarill/anim_idle.asm
+++ b/gfx/pokemon/azumarill/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1fd3
diff --git a/gfx/pokemon/bayleef/anim.asm b/gfx/pokemon/bayleef/anim.asm
index de54fe495..c6aa43fe1 100644
--- a/gfx/pokemon/bayleef/anim.asm
+++ b/gfx/pokemon/bayleef/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 11
 	frame 3, 15
 	endanim
-; 0xd116c
diff --git a/gfx/pokemon/bayleef/anim_idle.asm b/gfx/pokemon/bayleef/anim_idle.asm
index 59d3f1762..b7c3a8f8b 100644
--- a/gfx/pokemon/bayleef/anim_idle.asm
+++ b/gfx/pokemon/bayleef/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1ea8
diff --git a/gfx/pokemon/beedrill/anim.asm b/gfx/pokemon/beedrill/anim.asm
index 036fbb738..d322e52be 100644
--- a/gfx/pokemon/beedrill/anim.asm
+++ b/gfx/pokemon/beedrill/anim.asm
@@ -9,4 +9,3 @@
 	frame 3, 10
 	dorepeat 7
 	endanim
-; 0xd0954
diff --git a/gfx/pokemon/beedrill/anim_idle.asm b/gfx/pokemon/beedrill/anim_idle.asm
index 8205f9a8c..cfe49ab55 100644
--- a/gfx/pokemon/beedrill/anim_idle.asm
+++ b/gfx/pokemon/beedrill/anim_idle.asm
@@ -7,4 +7,3 @@
 	frame 0, 25
 	frame 3, 10
 	endanim
-; 0xd193c
diff --git a/gfx/pokemon/bellossom/anim.asm b/gfx/pokemon/bellossom/anim.asm
index 7aa2e3568..bec149b23 100644
--- a/gfx/pokemon/bellossom/anim.asm
+++ b/gfx/pokemon/bellossom/anim.asm
@@ -7,4 +7,3 @@
 	frame 5, 12
 	frame 4, 10
 	endanim
-; 0xd130b
diff --git a/gfx/pokemon/bellossom/anim_idle.asm b/gfx/pokemon/bellossom/anim_idle.asm
index 322fa3758..29e08faf1 100644
--- a/gfx/pokemon/bellossom/anim_idle.asm
+++ b/gfx/pokemon/bellossom/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 6, 06
 	dorepeat 1
 	endanim
-; 0xd1fbf
diff --git a/gfx/pokemon/bellsprout/anim.asm b/gfx/pokemon/bellsprout/anim.asm
index 9a71b29ac..0ebfba574 100644
--- a/gfx/pokemon/bellsprout/anim.asm
+++ b/gfx/pokemon/bellsprout/anim.asm
@@ -9,4 +9,3 @@
 	frame 1, 08
 	dorepeat 5
 	endanim
-; 0xd0cb2
diff --git a/gfx/pokemon/bellsprout/anim_idle.asm b/gfx/pokemon/bellsprout/anim_idle.asm
index 31ad26997..bde3b4173 100644
--- a/gfx/pokemon/bellsprout/anim_idle.asm
+++ b/gfx/pokemon/bellsprout/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 6, 05
 	dorepeat 3
 	endanim
-; 0xd1b78
diff --git a/gfx/pokemon/blastoise/anim.asm b/gfx/pokemon/blastoise/anim.asm
index 2d8b464d0..b5d755035 100644
--- a/gfx/pokemon/blastoise/anim.asm
+++ b/gfx/pokemon/blastoise/anim.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	frame 1, 04
 	endanim
-; 0xd0908
diff --git a/gfx/pokemon/blastoise/anim_idle.asm b/gfx/pokemon/blastoise/anim_idle.asm
index b25c75e5a..e3c7b1d0d 100644
--- a/gfx/pokemon/blastoise/anim_idle.asm
+++ b/gfx/pokemon/blastoise/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 12
 	dorepeat 1
 	endanim
-; 0xd18f0
diff --git a/gfx/pokemon/blissey/anim.asm b/gfx/pokemon/blissey/anim.asm
index 097ecc094..dcdb0a655 100644
--- a/gfx/pokemon/blissey/anim.asm
+++ b/gfx/pokemon/blissey/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 06
 	frame 3, 08
 	endanim
-; 0xd1607
diff --git a/gfx/pokemon/blissey/anim_idle.asm b/gfx/pokemon/blissey/anim_idle.asm
index 846d85003..1ebdbfccd 100644
--- a/gfx/pokemon/blissey/anim_idle.asm
+++ b/gfx/pokemon/blissey/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 07
 	dorepeat 1
 	endanim
-; 0xd21c1
diff --git a/gfx/pokemon/bulbasaur/anim.asm b/gfx/pokemon/bulbasaur/anim.asm
index e5c1cbe1e..fce9af135 100644
--- a/gfx/pokemon/bulbasaur/anim.asm
+++ b/gfx/pokemon/bulbasaur/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 05
 	frame 5, 05
 	endanim
-; 0xd089c
diff --git a/gfx/pokemon/bulbasaur/anim_idle.asm b/gfx/pokemon/bulbasaur/anim_idle.asm
index cfc0f54e9..ab75b5164 100644
--- a/gfx/pokemon/bulbasaur/anim_idle.asm
+++ b/gfx/pokemon/bulbasaur/anim_idle.asm
@@ -2,4 +2,3 @@
 	frame 0, 05
 	frame 5, 05
 	endanim
-; 0xd18a0
diff --git a/gfx/pokemon/butterfree/anim.asm b/gfx/pokemon/butterfree/anim.asm
index d31161a28..b1d1e79fe 100644
--- a/gfx/pokemon/butterfree/anim.asm
+++ b/gfx/pokemon/butterfree/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 06
 	dorepeat 3
 	endanim
-; 0xd0929
diff --git a/gfx/pokemon/butterfree/anim_idle.asm b/gfx/pokemon/butterfree/anim_idle.asm
index 1eb152f28..910725fa2 100644
--- a/gfx/pokemon/butterfree/anim_idle.asm
+++ b/gfx/pokemon/butterfree/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 10
 	dorepeat 1
 	endanim
-; 0xd190d
diff --git a/gfx/pokemon/caterpie/anim.asm b/gfx/pokemon/caterpie/anim.asm
index a5cf5f238..de380adc0 100644
--- a/gfx/pokemon/caterpie/anim.asm
+++ b/gfx/pokemon/caterpie/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 08
 	frame 1, 08
 	endanim
-; 0xd0915
diff --git a/gfx/pokemon/caterpie/anim_idle.asm b/gfx/pokemon/caterpie/anim_idle.asm
index e75b83f5c..faaeffe39 100644
--- a/gfx/pokemon/caterpie/anim_idle.asm
+++ b/gfx/pokemon/caterpie/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd18f9
diff --git a/gfx/pokemon/celebi/anim.asm b/gfx/pokemon/celebi/anim.asm
index 9f218a43e..ac16a0db2 100644
--- a/gfx/pokemon/celebi/anim.asm
+++ b/gfx/pokemon/celebi/anim.asm
@@ -13,4 +13,3 @@
 	frame 13, 05
 	dorepeat 11
 	endanim
-; 0xd1696
diff --git a/gfx/pokemon/celebi/anim_idle.asm b/gfx/pokemon/celebi/anim_idle.asm
index 6162488db..f2e4767d5 100644
--- a/gfx/pokemon/celebi/anim_idle.asm
+++ b/gfx/pokemon/celebi/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 11, 05
 	dorepeat 3
 	endanim
-; 0xd2222
diff --git a/gfx/pokemon/chansey/anim.asm b/gfx/pokemon/chansey/anim.asm
index 75de3b32b..3d07cc3bf 100644
--- a/gfx/pokemon/chansey/anim.asm
+++ b/gfx/pokemon/chansey/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 05
 	dorepeat 5
 	endanim
-; 0xd0f26
diff --git a/gfx/pokemon/chansey/anim_idle.asm b/gfx/pokemon/chansey/anim_idle.asm
index a78f8cf88..8318520e3 100644
--- a/gfx/pokemon/chansey/anim_idle.asm
+++ b/gfx/pokemon/chansey/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd1d16
diff --git a/gfx/pokemon/charizard/anim.asm b/gfx/pokemon/charizard/anim.asm
index b258e35c7..db965a3b7 100644
--- a/gfx/pokemon/charizard/anim.asm
+++ b/gfx/pokemon/charizard/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 09
 	dorepeat 3
 	endanim
-; 0xd08e1
diff --git a/gfx/pokemon/charizard/anim_idle.asm b/gfx/pokemon/charizard/anim_idle.asm
index daffccb9d..c4a056b01 100644
--- a/gfx/pokemon/charizard/anim_idle.asm
+++ b/gfx/pokemon/charizard/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd18d5
diff --git a/gfx/pokemon/charmander/anim.asm b/gfx/pokemon/charmander/anim.asm
index 72a0fe83d..ca3d1699d 100644
--- a/gfx/pokemon/charmander/anim.asm
+++ b/gfx/pokemon/charmander/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 10
 	frame 4, 10
 	endanim
-; 0xd08c5
diff --git a/gfx/pokemon/charmander/anim_idle.asm b/gfx/pokemon/charmander/anim_idle.asm
index 219b5407f..c4a056b01 100644
--- a/gfx/pokemon/charmander/anim_idle.asm
+++ b/gfx/pokemon/charmander/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd18bf
diff --git a/gfx/pokemon/charmeleon/anim.asm b/gfx/pokemon/charmeleon/anim.asm
index 30eeae979..3acce4a2b 100644
--- a/gfx/pokemon/charmeleon/anim.asm
+++ b/gfx/pokemon/charmeleon/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 08
 	frame 4, 30
 	endanim
-; 0xd08d4
diff --git a/gfx/pokemon/charmeleon/anim_idle.asm b/gfx/pokemon/charmeleon/anim_idle.asm
index d3320e33c..00a77d123 100644
--- a/gfx/pokemon/charmeleon/anim_idle.asm
+++ b/gfx/pokemon/charmeleon/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 1, 10
 	dorepeat 3
 	endanim
-; 0xd18cc
diff --git a/gfx/pokemon/chikorita/anim.asm b/gfx/pokemon/chikorita/anim.asm
index 2b8fa7d35..19f9097ae 100644
--- a/gfx/pokemon/chikorita/anim.asm
+++ b/gfx/pokemon/chikorita/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 05
 	dorepeat 4
 	endanim
-; 0xd1165
diff --git a/gfx/pokemon/chikorita/anim_idle.asm b/gfx/pokemon/chikorita/anim_idle.asm
index 9003c3ff2..cf685d8b0 100644
--- a/gfx/pokemon/chikorita/anim_idle.asm
+++ b/gfx/pokemon/chikorita/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 06
 	dorepeat 1
 	endanim
-; 0xd1e9f
diff --git a/gfx/pokemon/chinchou/anim.asm b/gfx/pokemon/chinchou/anim.asm
index f765c151a..f386311ac 100644
--- a/gfx/pokemon/chinchou/anim.asm
+++ b/gfx/pokemon/chinchou/anim.asm
@@ -8,4 +8,3 @@
 	dorepeat 5
 	frame 3, 10
 	endanim
-; 0xd1271
diff --git a/gfx/pokemon/chinchou/anim_idle.asm b/gfx/pokemon/chinchou/anim_idle.asm
index bf38f8d87..b7c3a8f8b 100644
--- a/gfx/pokemon/chinchou/anim_idle.asm
+++ b/gfx/pokemon/chinchou/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1f4d
diff --git a/gfx/pokemon/clefable/anim.asm b/gfx/pokemon/clefable/anim.asm
index d442807e8..31c49b895 100644
--- a/gfx/pokemon/clefable/anim.asm
+++ b/gfx/pokemon/clefable/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 10
 	frame 1, 10
 	endanim
-; 0xd0aa7
diff --git a/gfx/pokemon/clefable/anim_idle.asm b/gfx/pokemon/clefable/anim_idle.asm
index 2b024ffd8..c30d12eed 100644
--- a/gfx/pokemon/clefable/anim_idle.asm
+++ b/gfx/pokemon/clefable/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 07
 	dorepeat 1
 	endanim
-; 0xd1a29
diff --git a/gfx/pokemon/clefairy/anim.asm b/gfx/pokemon/clefairy/anim.asm
index 9905c4fcc..6f95adc4d 100644
--- a/gfx/pokemon/clefairy/anim.asm
+++ b/gfx/pokemon/clefairy/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 05
 	dorepeat 4
 	endanim
-; 0xd0a9e
diff --git a/gfx/pokemon/clefairy/anim_idle.asm b/gfx/pokemon/clefairy/anim_idle.asm
index c93613467..b931c713b 100644
--- a/gfx/pokemon/clefairy/anim_idle.asm
+++ b/gfx/pokemon/clefairy/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 0, 05
 	frame 3, 05
 	endanim
-; 0xd1a20
diff --git a/gfx/pokemon/cleffa/anim.asm b/gfx/pokemon/cleffa/anim.asm
index 37f3da590..50666a065 100644
--- a/gfx/pokemon/cleffa/anim.asm
+++ b/gfx/pokemon/cleffa/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 10
 	frame 3, 10
 	endanim
-; 0xd1290
diff --git a/gfx/pokemon/cleffa/anim_idle.asm b/gfx/pokemon/cleffa/anim_idle.asm
index 129f123c2..ada5030b3 100644
--- a/gfx/pokemon/cleffa/anim_idle.asm
+++ b/gfx/pokemon/cleffa/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 08
 	dorepeat 1
 	endanim
-; 0xd1f68
diff --git a/gfx/pokemon/cloyster/anim.asm b/gfx/pokemon/cloyster/anim.asm
index cc338f014..12dc71d73 100644
--- a/gfx/pokemon/cloyster/anim.asm
+++ b/gfx/pokemon/cloyster/anim.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 3, 09
 	endanim
-; 0xd0dd0
diff --git a/gfx/pokemon/cloyster/anim_idle.asm b/gfx/pokemon/cloyster/anim_idle.asm
index e872bbc59..885fb6822 100644
--- a/gfx/pokemon/cloyster/anim_idle.asm
+++ b/gfx/pokemon/cloyster/anim_idle.asm
@@ -1,4 +1,3 @@
 	frame 4, 52
 	dorepeat 1
 	endanim
-; 0xd1c4e
diff --git a/gfx/pokemon/corsola/anim.asm b/gfx/pokemon/corsola/anim.asm
index 68182e18e..35ce1e63d 100644
--- a/gfx/pokemon/corsola/anim.asm
+++ b/gfx/pokemon/corsola/anim.asm
@@ -4,4 +4,3 @@
 	frame 0, 12
 	frame 3, 18
 	endanim
-; 0xd1501
diff --git a/gfx/pokemon/corsola/anim_idle.asm b/gfx/pokemon/corsola/anim_idle.asm
index 6360176ca..1ebdbfccd 100644
--- a/gfx/pokemon/corsola/anim_idle.asm
+++ b/gfx/pokemon/corsola/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 07
 	dorepeat 1
 	endanim
-; 0xd210b
diff --git a/gfx/pokemon/crobat/anim.asm b/gfx/pokemon/crobat/anim.asm
index 99888ab81..b37885af7 100644
--- a/gfx/pokemon/crobat/anim.asm
+++ b/gfx/pokemon/crobat/anim.asm
@@ -7,4 +7,3 @@
 	frame 5, 05
 	dorepeat 1
 	endanim
-; 0xd125e
diff --git a/gfx/pokemon/crobat/anim_idle.asm b/gfx/pokemon/crobat/anim_idle.asm
index ec1dae2ac..f513910e0 100644
--- a/gfx/pokemon/crobat/anim_idle.asm
+++ b/gfx/pokemon/crobat/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 07
 	dorepeat 1
 	endanim
-; 0xd1f44
diff --git a/gfx/pokemon/croconaw/anim.asm b/gfx/pokemon/croconaw/anim.asm
index c487abfd9..819a6b0de 100644
--- a/gfx/pokemon/croconaw/anim.asm
+++ b/gfx/pokemon/croconaw/anim.asm
@@ -4,4 +4,3 @@
 	frame 1, 05
 	dorepeat 1
 	endanim
-; 0xd11d2
diff --git a/gfx/pokemon/croconaw/anim_idle.asm b/gfx/pokemon/croconaw/anim_idle.asm
index 78bd8518e..952fbb7c9 100644
--- a/gfx/pokemon/croconaw/anim_idle.asm
+++ b/gfx/pokemon/croconaw/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 10
 	dorepeat 1
 	endanim
-; 0xd1ee0
diff --git a/gfx/pokemon/cubone/anim.asm b/gfx/pokemon/cubone/anim.asm
index 2af8c522c..2f497e76e 100644
--- a/gfx/pokemon/cubone/anim.asm
+++ b/gfx/pokemon/cubone/anim.asm
@@ -9,4 +9,3 @@
 	frame 6, 02
 	frame 1, 08
 	endanim
-; 0xd0e9f
diff --git a/gfx/pokemon/cubone/anim_idle.asm b/gfx/pokemon/cubone/anim_idle.asm
index fb3b0b3ba..5721310cf 100644
--- a/gfx/pokemon/cubone/anim_idle.asm
+++ b/gfx/pokemon/cubone/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 08
 	dorepeat 1
 	endanim
-; 0xd1cc3
diff --git a/gfx/pokemon/cyndaquil/anim.asm b/gfx/pokemon/cyndaquil/anim.asm
index b069cc300..c8b8281cd 100644
--- a/gfx/pokemon/cyndaquil/anim.asm
+++ b/gfx/pokemon/cyndaquil/anim.asm
@@ -9,4 +9,3 @@
 	frame 3, 09
 	frame 1, 03
 	endanim
-; 0xd1194
diff --git a/gfx/pokemon/cyndaquil/anim_idle.asm b/gfx/pokemon/cyndaquil/anim_idle.asm
index 43c4d495a..952fbb7c9 100644
--- a/gfx/pokemon/cyndaquil/anim_idle.asm
+++ b/gfx/pokemon/cyndaquil/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 10
 	dorepeat 1
 	endanim
-; 0xd1eba
diff --git a/gfx/pokemon/delibird/anim.asm b/gfx/pokemon/delibird/anim.asm
index 3431ad1ae..1c48b7989 100644
--- a/gfx/pokemon/delibird/anim.asm
+++ b/gfx/pokemon/delibird/anim.asm
@@ -9,4 +9,3 @@
 	frame 0, 05
 	frame 6, 05
 	endanim
-; 0xd152a
diff --git a/gfx/pokemon/delibird/anim_idle.asm b/gfx/pokemon/delibird/anim_idle.asm
index 8a416cc61..60587ef17 100644
--- a/gfx/pokemon/delibird/anim_idle.asm
+++ b/gfx/pokemon/delibird/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 06
 	dorepeat 1
 	endanim
-; 0xd2126
diff --git a/gfx/pokemon/dewgong/anim.asm b/gfx/pokemon/dewgong/anim.asm
index b7c3efecf..a9d1b16a8 100644
--- a/gfx/pokemon/dewgong/anim.asm
+++ b/gfx/pokemon/dewgong/anim.asm
@@ -4,4 +4,3 @@
 	frame 4, 09
 	frame 5, 14
 	endanim
-; 0xd0daa
diff --git a/gfx/pokemon/dewgong/anim_idle.asm b/gfx/pokemon/dewgong/anim_idle.asm
index 0357ce660..6f173f10e 100644
--- a/gfx/pokemon/dewgong/anim_idle.asm
+++ b/gfx/pokemon/dewgong/anim_idle.asm
@@ -6,4 +6,3 @@
 	frame 9, 06
 	dorepeat 1
 	endanim
-; 0xd1c2a
diff --git a/gfx/pokemon/diglett/anim.asm b/gfx/pokemon/diglett/anim.asm
index a4d79bd56..c49b26e55 100644
--- a/gfx/pokemon/diglett/anim.asm
+++ b/gfx/pokemon/diglett/anim.asm
@@ -4,4 +4,3 @@
 	frame 1, 09
 	dorepeat 2
 	endanim
-; 0xd0b97
diff --git a/gfx/pokemon/diglett/anim_idle.asm b/gfx/pokemon/diglett/anim_idle.asm
index bd2a27e03..39492188f 100644
--- a/gfx/pokemon/diglett/anim_idle.asm
+++ b/gfx/pokemon/diglett/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd1aad
diff --git a/gfx/pokemon/ditto/anim.asm b/gfx/pokemon/ditto/anim.asm
index 53f3f9afa..4e14a015c 100644
--- a/gfx/pokemon/ditto/anim.asm
+++ b/gfx/pokemon/ditto/anim.asm
@@ -8,4 +8,3 @@
 	frame 7, 12
 	frame 8, 12
 	endanim
-; 0xd1029
diff --git a/gfx/pokemon/ditto/anim_idle.asm b/gfx/pokemon/ditto/anim_idle.asm
index 195808be1..1ebdbfccd 100644
--- a/gfx/pokemon/ditto/anim_idle.asm
+++ b/gfx/pokemon/ditto/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 07
 	dorepeat 1
 	endanim
-; 0xd1dc9
diff --git a/gfx/pokemon/dodrio/anim.asm b/gfx/pokemon/dodrio/anim.asm
index 539f896d7..5776036d5 100644
--- a/gfx/pokemon/dodrio/anim.asm
+++ b/gfx/pokemon/dodrio/anim.asm
@@ -3,4 +3,3 @@
 	frame 4, 10
 	frame 1, 09
 	endanim
-; 0xd0d92
diff --git a/gfx/pokemon/dodrio/anim_idle.asm b/gfx/pokemon/dodrio/anim_idle.asm
index a921058f3..96cc9d291 100644
--- a/gfx/pokemon/dodrio/anim_idle.asm
+++ b/gfx/pokemon/dodrio/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 0, 08
 	dorepeat 1
 	endanim
-; 0xd1c10
diff --git a/gfx/pokemon/doduo/anim.asm b/gfx/pokemon/doduo/anim.asm
index cd38ca192..d9de3ff1b 100644
--- a/gfx/pokemon/doduo/anim.asm
+++ b/gfx/pokemon/doduo/anim.asm
@@ -6,4 +6,3 @@
 	frame 1, 08
 	dorepeat 4
 	endanim
-; 0xd0d89
diff --git a/gfx/pokemon/doduo/anim_idle.asm b/gfx/pokemon/doduo/anim_idle.asm
index 89715cae8..1734fe736 100644
--- a/gfx/pokemon/doduo/anim_idle.asm
+++ b/gfx/pokemon/doduo/anim_idle.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 1, 30
 	endanim
-; 0xd1c07
diff --git a/gfx/pokemon/donphan/anim.asm b/gfx/pokemon/donphan/anim.asm
index fbfbd8d17..2efd255e9 100644
--- a/gfx/pokemon/donphan/anim.asm
+++ b/gfx/pokemon/donphan/anim.asm
@@ -3,4 +3,3 @@
 	frame 3, 10
 	frame 4, 06
 	endanim
-; 0xd1587
diff --git a/gfx/pokemon/donphan/anim_idle.asm b/gfx/pokemon/donphan/anim_idle.asm
index 341013ce9..5721310cf 100644
--- a/gfx/pokemon/donphan/anim_idle.asm
+++ b/gfx/pokemon/donphan/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 08
 	dorepeat 1
 	endanim
-; 0xd2169
diff --git a/gfx/pokemon/dragonair/anim.asm b/gfx/pokemon/dragonair/anim.asm
index b7a2be64d..739174f7d 100644
--- a/gfx/pokemon/dragonair/anim.asm
+++ b/gfx/pokemon/dragonair/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 08
 	dorepeat 1
 	endanim
-; 0xd10fd
diff --git a/gfx/pokemon/dragonair/anim_idle.asm b/gfx/pokemon/dragonair/anim_idle.asm
index afea7ab43..e7e9af08b 100644
--- a/gfx/pokemon/dragonair/anim_idle.asm
+++ b/gfx/pokemon/dragonair/anim_idle.asm
@@ -7,4 +7,3 @@
 	frame 6, 06
 	frame 5, 06
 	endanim
-; 0xd1e71
diff --git a/gfx/pokemon/dragonite/anim.asm b/gfx/pokemon/dragonite/anim.asm
index 9dd6bf84a..2b2de658c 100644
--- a/gfx/pokemon/dragonite/anim.asm
+++ b/gfx/pokemon/dragonite/anim.asm
@@ -10,4 +10,3 @@
 	frame 1, 12
 	dorepeat 8
 	endanim
-; 0xd1114
diff --git a/gfx/pokemon/dragonite/anim_idle.asm b/gfx/pokemon/dragonite/anim_idle.asm
index fe0d7edbb..5f760e82c 100644
--- a/gfx/pokemon/dragonite/anim_idle.asm
+++ b/gfx/pokemon/dragonite/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 5, 05
 	dorepeat 3
 	endanim
-; 0xd1e7e
diff --git a/gfx/pokemon/dratini/anim.asm b/gfx/pokemon/dratini/anim.asm
index f844a2eec..4a5d5566b 100644
--- a/gfx/pokemon/dratini/anim.asm
+++ b/gfx/pokemon/dratini/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 09
 	frame 3, 09
 	endanim
-; 0xd10f0
diff --git a/gfx/pokemon/dratini/anim_idle.asm b/gfx/pokemon/dratini/anim_idle.asm
index 441340446..936e90ea1 100644
--- a/gfx/pokemon/dratini/anim_idle.asm
+++ b/gfx/pokemon/dratini/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd1e60
diff --git a/gfx/pokemon/drowzee/anim.asm b/gfx/pokemon/drowzee/anim.asm
index badc99074..49c2acca7 100644
--- a/gfx/pokemon/drowzee/anim.asm
+++ b/gfx/pokemon/drowzee/anim.asm
@@ -8,4 +8,3 @@
 	frame 3, 05
 	frame 4, 05
 	endanim
-; 0xd0e1b
diff --git a/gfx/pokemon/drowzee/anim_idle.asm b/gfx/pokemon/drowzee/anim_idle.asm
index 247ecb8fe..d9d0a81f8 100644
--- a/gfx/pokemon/drowzee/anim_idle.asm
+++ b/gfx/pokemon/drowzee/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 0, 08
 	frame 5, 08
 	endanim
-; 0xd1c81
diff --git a/gfx/pokemon/dugtrio/anim.asm b/gfx/pokemon/dugtrio/anim.asm
index 7b5038620..180519d9c 100644
--- a/gfx/pokemon/dugtrio/anim.asm
+++ b/gfx/pokemon/dugtrio/anim.asm
@@ -13,4 +13,3 @@
 	frame 2, 06
 	frame 1, 06
 	endanim
-; 0xd0bb4
diff --git a/gfx/pokemon/dugtrio/anim_idle.asm b/gfx/pokemon/dugtrio/anim_idle.asm
index 1b32b854c..883fde447 100644
--- a/gfx/pokemon/dugtrio/anim_idle.asm
+++ b/gfx/pokemon/dugtrio/anim_idle.asm
@@ -7,4 +7,3 @@
 	dorepeat 4
 	frame 6, 20
 	endanim
-; 0xd1abe
diff --git a/gfx/pokemon/dunsparce/anim.asm b/gfx/pokemon/dunsparce/anim.asm
index b4217afbd..542719316 100644
--- a/gfx/pokemon/dunsparce/anim.asm
+++ b/gfx/pokemon/dunsparce/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 4, 12
 	endanim
-; 0xd1441
diff --git a/gfx/pokemon/dunsparce/anim_idle.asm b/gfx/pokemon/dunsparce/anim_idle.asm
index f5d6d9b05..5721310cf 100644
--- a/gfx/pokemon/dunsparce/anim_idle.asm
+++ b/gfx/pokemon/dunsparce/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 08
 	dorepeat 1
 	endanim
-; 0xd2089
diff --git a/gfx/pokemon/eevee/anim.asm b/gfx/pokemon/eevee/anim.asm
index 537cefb83..b03f0e570 100644
--- a/gfx/pokemon/eevee/anim.asm
+++ b/gfx/pokemon/eevee/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 2, 10
 	endanim
-; 0xd1038
diff --git a/gfx/pokemon/eevee/anim_idle.asm b/gfx/pokemon/eevee/anim_idle.asm
index 0f50b3cb8..44516875b 100644
--- a/gfx/pokemon/eevee/anim_idle.asm
+++ b/gfx/pokemon/eevee/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 0, 09
 	frame 5, 13
 	endanim
-; 0xd1dd6
diff --git a/gfx/pokemon/egg/anim.asm b/gfx/pokemon/egg/anim.asm
index 1ded66327..e8b56bae7 100644
--- a/gfx/pokemon/egg/anim.asm
+++ b/gfx/pokemon/egg/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 04
 	dorepeat 1
 	endanim
-; 0xd16a3
diff --git a/gfx/pokemon/egg/anim_idle.asm b/gfx/pokemon/egg/anim_idle.asm
index 634736c6b..319d54f71 100644
--- a/gfx/pokemon/egg/anim_idle.asm
+++ b/gfx/pokemon/egg/anim_idle.asm
@@ -2,4 +2,3 @@
 	frame 0, 03
 	frame 2, 03
 	endanim
-; 0xd2229
diff --git a/gfx/pokemon/ekans/anim.asm b/gfx/pokemon/ekans/anim.asm
index 9728434c0..cfd686e35 100644
--- a/gfx/pokemon/ekans/anim.asm
+++ b/gfx/pokemon/ekans/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 2, 20
 	endanim
-; 0xd09d2
diff --git a/gfx/pokemon/ekans/anim_idle.asm b/gfx/pokemon/ekans/anim_idle.asm
index 660a4f971..98c3ebe0c 100644
--- a/gfx/pokemon/ekans/anim_idle.asm
+++ b/gfx/pokemon/ekans/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 0, 02
 	dorepeat 1
 	endanim
-; 0xd199c
diff --git a/gfx/pokemon/electabuzz/anim.asm b/gfx/pokemon/electabuzz/anim.asm
index 4e2a550ed..8c93e2858 100644
--- a/gfx/pokemon/electabuzz/anim.asm
+++ b/gfx/pokemon/electabuzz/anim.asm
@@ -10,4 +10,3 @@
 	dorepeat 7
 	dorepeat 7
 	endanim
-; 0xd0fcc
diff --git a/gfx/pokemon/electabuzz/anim_idle.asm b/gfx/pokemon/electabuzz/anim_idle.asm
index efff4b3db..4a3da9a45 100644
--- a/gfx/pokemon/electabuzz/anim_idle.asm
+++ b/gfx/pokemon/electabuzz/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 04
 	dorepeat 1
 	endanim
-; 0xd1d8a
diff --git a/gfx/pokemon/electrode/anim.asm b/gfx/pokemon/electrode/anim.asm
index 18b31e305..c143a5fd6 100644
--- a/gfx/pokemon/electrode/anim.asm
+++ b/gfx/pokemon/electrode/anim.asm
@@ -1,4 +1,3 @@
 	frame 1, 05
 	frame 2, 40
 	endanim
-; 0xd0e5c
diff --git a/gfx/pokemon/electrode/anim_idle.asm b/gfx/pokemon/electrode/anim_idle.asm
index 30d1b1788..7f30d940a 100644
--- a/gfx/pokemon/electrode/anim_idle.asm
+++ b/gfx/pokemon/electrode/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 3, 45
 	endanim
-; 0xd1ca8
diff --git a/gfx/pokemon/elekid/anim.asm b/gfx/pokemon/elekid/anim.asm
index 590dccf14..8c6a08e67 100644
--- a/gfx/pokemon/elekid/anim.asm
+++ b/gfx/pokemon/elekid/anim.asm
@@ -8,4 +8,3 @@
 	frame 3, 03
 	dorepeat 6
 	endanim
-; 0xd15e0
diff --git a/gfx/pokemon/elekid/anim_idle.asm b/gfx/pokemon/elekid/anim_idle.asm
index cd10626f6..9f0c32711 100644
--- a/gfx/pokemon/elekid/anim_idle.asm
+++ b/gfx/pokemon/elekid/anim_idle.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 3, 20
 	endanim
-; 0xd21a6
diff --git a/gfx/pokemon/entei/anim.asm b/gfx/pokemon/entei/anim.asm
index 66c2c128d..b819654c2 100644
--- a/gfx/pokemon/entei/anim.asm
+++ b/gfx/pokemon/entei/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 12
 	frame 3, 30
 	endanim
-; 0xd161d
diff --git a/gfx/pokemon/entei/anim_idle.asm b/gfx/pokemon/entei/anim_idle.asm
index f20e5d072..cf66cab97 100644
--- a/gfx/pokemon/entei/anim_idle.asm
+++ b/gfx/pokemon/entei/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd21d7
diff --git a/gfx/pokemon/espeon/anim.asm b/gfx/pokemon/espeon/anim.asm
index 8a54a9b97..c228c07a2 100644
--- a/gfx/pokemon/espeon/anim.asm
+++ b/gfx/pokemon/espeon/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 07
 	dorepeat 3
 	endanim
-; 0xd13af
diff --git a/gfx/pokemon/espeon/anim_idle.asm b/gfx/pokemon/espeon/anim_idle.asm
index 33c88d1b4..1ebdbfccd 100644
--- a/gfx/pokemon/espeon/anim_idle.asm
+++ b/gfx/pokemon/espeon/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 07
 	dorepeat 1
 	endanim
-; 0xd203d
diff --git a/gfx/pokemon/exeggcute/anim.asm b/gfx/pokemon/exeggcute/anim.asm
index 0f0c10729..d5ab5822d 100644
--- a/gfx/pokemon/exeggcute/anim.asm
+++ b/gfx/pokemon/exeggcute/anim.asm
@@ -14,4 +14,3 @@
 	frame 0, 08
 	frame 3, 08
 	endanim
-; 0xd0e7b
diff --git a/gfx/pokemon/exeggcute/anim_idle.asm b/gfx/pokemon/exeggcute/anim_idle.asm
index ef839f5d1..c4a056b01 100644
--- a/gfx/pokemon/exeggcute/anim_idle.asm
+++ b/gfx/pokemon/exeggcute/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1cb1
diff --git a/gfx/pokemon/exeggutor/anim.asm b/gfx/pokemon/exeggutor/anim.asm
index 92f11a117..7eab9a463 100644
--- a/gfx/pokemon/exeggutor/anim.asm
+++ b/gfx/pokemon/exeggutor/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 06
 	dorepeat 4
 	endanim
-; 0xd0e8a
diff --git a/gfx/pokemon/exeggutor/anim_idle.asm b/gfx/pokemon/exeggutor/anim_idle.asm
index 3e5542c97..cadaf5e76 100644
--- a/gfx/pokemon/exeggutor/anim_idle.asm
+++ b/gfx/pokemon/exeggutor/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 06
 	dorepeat 1
 	endanim
-; 0xd1cba
diff --git a/gfx/pokemon/farfetch_d/anim.asm b/gfx/pokemon/farfetch_d/anim.asm
index 4dac6c1a4..922a2bbc1 100644
--- a/gfx/pokemon/farfetch_d/anim.asm
+++ b/gfx/pokemon/farfetch_d/anim.asm
@@ -3,4 +3,3 @@
 	frame 3, 14
 	frame 2, 06
 	endanim
-; 0xd0d7a
diff --git a/gfx/pokemon/farfetch_d/anim_idle.asm b/gfx/pokemon/farfetch_d/anim_idle.asm
index 5dcfaa89d..205f993a5 100644
--- a/gfx/pokemon/farfetch_d/anim_idle.asm
+++ b/gfx/pokemon/farfetch_d/anim_idle.asm
@@ -2,4 +2,3 @@
 	frame 5, 07
 	frame 4, 07
 	endanim
-; 0xd1bfa
diff --git a/gfx/pokemon/fearow/anim.asm b/gfx/pokemon/fearow/anim.asm
index 3a689af18..6464fbcbb 100644
--- a/gfx/pokemon/fearow/anim.asm
+++ b/gfx/pokemon/fearow/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 06
 	dorepeat 2
 	endanim
-; 0xd09c3
diff --git a/gfx/pokemon/fearow/anim_idle.asm b/gfx/pokemon/fearow/anim_idle.asm
index 0233782c9..f073ebaf5 100644
--- a/gfx/pokemon/fearow/anim_idle.asm
+++ b/gfx/pokemon/fearow/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 0, 05
 	dorepeat 1
 	endanim
-; 0xd198f
diff --git a/gfx/pokemon/feraligatr/anim.asm b/gfx/pokemon/feraligatr/anim.asm
index 1a0cebd2e..815689609 100644
--- a/gfx/pokemon/feraligatr/anim.asm
+++ b/gfx/pokemon/feraligatr/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 36
 	frame 2, 12
 	endanim
-; 0xd11dd
diff --git a/gfx/pokemon/feraligatr/anim_idle.asm b/gfx/pokemon/feraligatr/anim_idle.asm
index c1c39258d..b7c3a8f8b 100644
--- a/gfx/pokemon/feraligatr/anim_idle.asm
+++ b/gfx/pokemon/feraligatr/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1ee9
diff --git a/gfx/pokemon/flaaffy/anim.asm b/gfx/pokemon/flaaffy/anim.asm
index c9f1f4e7e..7af3dc9c9 100644
--- a/gfx/pokemon/flaaffy/anim.asm
+++ b/gfx/pokemon/flaaffy/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 3, 18
 	endanim
-; 0xd12e9
diff --git a/gfx/pokemon/flaaffy/anim_idle.asm b/gfx/pokemon/flaaffy/anim_idle.asm
index b9ec0d483..1ebdbfccd 100644
--- a/gfx/pokemon/flaaffy/anim_idle.asm
+++ b/gfx/pokemon/flaaffy/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 07
 	dorepeat 1
 	endanim
-; 0xd1fab
diff --git a/gfx/pokemon/flareon/anim.asm b/gfx/pokemon/flareon/anim.asm
index dbefae362..fe089c7a5 100644
--- a/gfx/pokemon/flareon/anim.asm
+++ b/gfx/pokemon/flareon/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 08
 	dorepeat 2
 	endanim
-; 0xd105f
diff --git a/gfx/pokemon/flareon/anim_idle.asm b/gfx/pokemon/flareon/anim_idle.asm
index 431573106..b7c3a8f8b 100644
--- a/gfx/pokemon/flareon/anim_idle.asm
+++ b/gfx/pokemon/flareon/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1df1
diff --git a/gfx/pokemon/forretress/anim.asm b/gfx/pokemon/forretress/anim.asm
index 74c8e2e12..1ee6264b3 100644
--- a/gfx/pokemon/forretress/anim.asm
+++ b/gfx/pokemon/forretress/anim.asm
@@ -8,4 +8,3 @@
 	frame 2, 25
 	frame 1, 08
 	endanim
-; 0xd1434
diff --git a/gfx/pokemon/forretress/anim_idle.asm b/gfx/pokemon/forretress/anim_idle.asm
index 4fafa1a3e..cf685d8b0 100644
--- a/gfx/pokemon/forretress/anim_idle.asm
+++ b/gfx/pokemon/forretress/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 06
 	dorepeat 1
 	endanim
-; 0xd2080
diff --git a/gfx/pokemon/furret/anim.asm b/gfx/pokemon/furret/anim.asm
index 8503d74ec..a49ef2847 100644
--- a/gfx/pokemon/furret/anim.asm
+++ b/gfx/pokemon/furret/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 08
 	dorepeat 2
 	endanim
-; 0xd11f3
diff --git a/gfx/pokemon/furret/anim_idle.asm b/gfx/pokemon/furret/anim_idle.asm
index e175bf7cc..b7c3a8f8b 100644
--- a/gfx/pokemon/furret/anim_idle.asm
+++ b/gfx/pokemon/furret/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1efb
diff --git a/gfx/pokemon/gastly/anim.asm b/gfx/pokemon/gastly/anim.asm
index d9414d188..5ecd42a35 100644
--- a/gfx/pokemon/gastly/anim.asm
+++ b/gfx/pokemon/gastly/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 12
 	frame 1, 12
 	endanim
-; 0xd0ddd
diff --git a/gfx/pokemon/gastly/anim_idle.asm b/gfx/pokemon/gastly/anim_idle.asm
index 65dc17abf..c4a056b01 100644
--- a/gfx/pokemon/gastly/anim_idle.asm
+++ b/gfx/pokemon/gastly/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1c57
diff --git a/gfx/pokemon/gengar/anim.asm b/gfx/pokemon/gengar/anim.asm
index 842c47c76..334e0af0a 100644
--- a/gfx/pokemon/gengar/anim.asm
+++ b/gfx/pokemon/gengar/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 09
 	dorepeat 4
 	endanim
-; 0xd0df7
diff --git a/gfx/pokemon/gengar/anim_idle.asm b/gfx/pokemon/gengar/anim_idle.asm
index 09df5dca3..7ef28705b 100644
--- a/gfx/pokemon/gengar/anim_idle.asm
+++ b/gfx/pokemon/gengar/anim_idle.asm
@@ -6,4 +6,3 @@
 	frame 6, 09
 	frame 5, 09
 	endanim
-; 0xd1c69
diff --git a/gfx/pokemon/geodude/anim.asm b/gfx/pokemon/geodude/anim.asm
index 3c54bc94e..9949b1ec8 100644
--- a/gfx/pokemon/geodude/anim.asm
+++ b/gfx/pokemon/geodude/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 07
 	dorepeat 3
 	endanim
-; 0xd0ceb
diff --git a/gfx/pokemon/geodude/anim_idle.asm b/gfx/pokemon/geodude/anim_idle.asm
index 4ec72d9b1..e991ac49f 100644
--- a/gfx/pokemon/geodude/anim_idle.asm
+++ b/gfx/pokemon/geodude/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	dorepeat 1
 	endanim
-; 0xd1ba9
diff --git a/gfx/pokemon/girafarig/anim.asm b/gfx/pokemon/girafarig/anim.asm
index 3a7ebd9fe..d6d99b624 100644
--- a/gfx/pokemon/girafarig/anim.asm
+++ b/gfx/pokemon/girafarig/anim.asm
@@ -11,4 +11,3 @@
 	frame 5, 05
 	frame 3, 05
 	endanim
-; 0xd141c
diff --git a/gfx/pokemon/girafarig/anim_idle.asm b/gfx/pokemon/girafarig/anim_idle.asm
index 95b1131ca..cf528ab8a 100644
--- a/gfx/pokemon/girafarig/anim_idle.asm
+++ b/gfx/pokemon/girafarig/anim_idle.asm
@@ -1,4 +1,3 @@
 	frame 5, 16
 	frame 3, 16
 	endanim
-; 0xd206e
diff --git a/gfx/pokemon/gligar/anim.asm b/gfx/pokemon/gligar/anim.asm
index 1dabf6cbd..caae53ed4 100644
--- a/gfx/pokemon/gligar/anim.asm
+++ b/gfx/pokemon/gligar/anim.asm
@@ -1,3 +1,2 @@
 	frame 1, 35
 	endanim
-; 0xd1444
diff --git a/gfx/pokemon/gligar/anim_idle.asm b/gfx/pokemon/gligar/anim_idle.asm
index 0cc7c0916..caae53ed4 100644
--- a/gfx/pokemon/gligar/anim_idle.asm
+++ b/gfx/pokemon/gligar/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 1, 35
 	endanim
-; 0xd208c
diff --git a/gfx/pokemon/gloom/anim.asm b/gfx/pokemon/gloom/anim.asm
index 89c6805b9..2e535efc3 100644
--- a/gfx/pokemon/gloom/anim.asm
+++ b/gfx/pokemon/gloom/anim.asm
@@ -9,4 +9,3 @@
 	frame 0, 06
 	frame 5, 06
 	endanim
-; 0xd0b35
diff --git a/gfx/pokemon/gloom/anim_idle.asm b/gfx/pokemon/gloom/anim_idle.asm
index cdb6c5191..7f7e5332a 100644
--- a/gfx/pokemon/gloom/anim_idle.asm
+++ b/gfx/pokemon/gloom/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 10
 	dorepeat 1
 	endanim
-; 0xd1a75
diff --git a/gfx/pokemon/golbat/anim.asm b/gfx/pokemon/golbat/anim.asm
index cb04c1a3b..27b36f18f 100644
--- a/gfx/pokemon/golbat/anim.asm
+++ b/gfx/pokemon/golbat/anim.asm
@@ -8,4 +8,3 @@
 	frame 1, 08
 	dorepeat 6
 	endanim
-; 0xd0b0d
diff --git a/gfx/pokemon/golbat/anim_idle.asm b/gfx/pokemon/golbat/anim_idle.asm
index 689aed3fd..ac0d93c61 100644
--- a/gfx/pokemon/golbat/anim_idle.asm
+++ b/gfx/pokemon/golbat/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1a63
diff --git a/gfx/pokemon/goldeen/anim.asm b/gfx/pokemon/goldeen/anim.asm
index c93141feb..eb66e4dfb 100644
--- a/gfx/pokemon/goldeen/anim.asm
+++ b/gfx/pokemon/goldeen/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 12
 	dorepeat 3
 	endanim
-; 0xd0f61
diff --git a/gfx/pokemon/goldeen/anim_idle.asm b/gfx/pokemon/goldeen/anim_idle.asm
index f31dfd1b2..81583f510 100644
--- a/gfx/pokemon/goldeen/anim_idle.asm
+++ b/gfx/pokemon/goldeen/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 07
 	dorepeat 1
 	endanim
-; 0xd1d49
diff --git a/gfx/pokemon/golduck/anim.asm b/gfx/pokemon/golduck/anim.asm
index 41ce17c55..035a26426 100644
--- a/gfx/pokemon/golduck/anim.asm
+++ b/gfx/pokemon/golduck/anim.asm
@@ -10,4 +10,3 @@
 	frame 6, 10
 	dorepeat 8
 	endanim
-; 0xd0bf4
diff --git a/gfx/pokemon/golduck/anim_idle.asm b/gfx/pokemon/golduck/anim_idle.asm
index a73476ca9..5d2a006f2 100644
--- a/gfx/pokemon/golduck/anim_idle.asm
+++ b/gfx/pokemon/golduck/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 7, 15
 	dorepeat 1
 	endanim
-; 0xd1ae2
diff --git a/gfx/pokemon/golem/anim.asm b/gfx/pokemon/golem/anim.asm
index ef21ec211..3860dd0c4 100644
--- a/gfx/pokemon/golem/anim.asm
+++ b/gfx/pokemon/golem/anim.asm
@@ -4,4 +4,3 @@
 	frame 1, 12
 	frame 3, 12
 	endanim
-; 0xd0d07
diff --git a/gfx/pokemon/golem/anim_idle.asm b/gfx/pokemon/golem/anim_idle.asm
index 9d3c23ba3..cf66cab97 100644
--- a/gfx/pokemon/golem/anim_idle.asm
+++ b/gfx/pokemon/golem/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd1bbd
diff --git a/gfx/pokemon/granbull/anim.asm b/gfx/pokemon/granbull/anim.asm
index 2f412479f..507b0a1b4 100644
--- a/gfx/pokemon/granbull/anim.asm
+++ b/gfx/pokemon/granbull/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 07
 	dorepeat 3
 	endanim
-; 0xd146f
diff --git a/gfx/pokemon/granbull/anim_idle.asm b/gfx/pokemon/granbull/anim_idle.asm
index 22e166977..93bb36fb2 100644
--- a/gfx/pokemon/granbull/anim_idle.asm
+++ b/gfx/pokemon/granbull/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 2, 06
 	dorepeat 1
 	endanim
-; 0xd20a7
diff --git a/gfx/pokemon/graveler/anim.asm b/gfx/pokemon/graveler/anim.asm
index 8c0fba1ac..e83aeaebf 100644
--- a/gfx/pokemon/graveler/anim.asm
+++ b/gfx/pokemon/graveler/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 09
 	dorepeat 5
 	endanim
-; 0xd0cfc
diff --git a/gfx/pokemon/graveler/anim_idle.asm b/gfx/pokemon/graveler/anim_idle.asm
index e4ebc15e0..f6059c101 100644
--- a/gfx/pokemon/graveler/anim_idle.asm
+++ b/gfx/pokemon/graveler/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 5, 20
 	dorepeat 2
 	endanim
-; 0xd1bb4
diff --git a/gfx/pokemon/grimer/anim.asm b/gfx/pokemon/grimer/anim.asm
index c8edda489..781355ffe 100644
--- a/gfx/pokemon/grimer/anim.asm
+++ b/gfx/pokemon/grimer/anim.asm
@@ -3,4 +3,3 @@
 	frame 1, 08
 	frame 2, 28
 	endanim
-; 0xd0db3
diff --git a/gfx/pokemon/grimer/anim_idle.asm b/gfx/pokemon/grimer/anim_idle.asm
index 50829935e..37761165e 100644
--- a/gfx/pokemon/grimer/anim_idle.asm
+++ b/gfx/pokemon/grimer/anim_idle.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 2, 16
 	endanim
-; 0xd1c37
diff --git a/gfx/pokemon/growlithe/anim.asm b/gfx/pokemon/growlithe/anim.asm
index 333c08e67..7a2d8b752 100644
--- a/gfx/pokemon/growlithe/anim.asm
+++ b/gfx/pokemon/growlithe/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 08
 	dorepeat 4
 	endanim
-; 0xd0c1b
diff --git a/gfx/pokemon/growlithe/anim_idle.asm b/gfx/pokemon/growlithe/anim_idle.asm
index bce18fa44..2fdd8e761 100644
--- a/gfx/pokemon/growlithe/anim_idle.asm
+++ b/gfx/pokemon/growlithe/anim_idle.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 2, 16
 	endanim
-; 0xd1b03
diff --git a/gfx/pokemon/gyarados/anim.asm b/gfx/pokemon/gyarados/anim.asm
index 89195fa31..9c162058e 100644
--- a/gfx/pokemon/gyarados/anim.asm
+++ b/gfx/pokemon/gyarados/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 11
 	dorepeat 1
 	endanim
-; 0xd100b
diff --git a/gfx/pokemon/gyarados/anim_idle.asm b/gfx/pokemon/gyarados/anim_idle.asm
index b33c52080..792fead16 100644
--- a/gfx/pokemon/gyarados/anim_idle.asm
+++ b/gfx/pokemon/gyarados/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	dorepeat 1
 	endanim
-; 0xd1db7
diff --git a/gfx/pokemon/haunter/anim.asm b/gfx/pokemon/haunter/anim.asm
index a46d0f0bc..9170e785c 100644
--- a/gfx/pokemon/haunter/anim.asm
+++ b/gfx/pokemon/haunter/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 10
 	frame 1, 10
 	endanim
-; 0xd0de8
diff --git a/gfx/pokemon/haunter/anim_idle.asm b/gfx/pokemon/haunter/anim_idle.asm
index bf439b1e1..24e1eb64b 100644
--- a/gfx/pokemon/haunter/anim_idle.asm
+++ b/gfx/pokemon/haunter/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 4, 58
 	endanim
-; 0xd1c5a
diff --git a/gfx/pokemon/heracross/anim.asm b/gfx/pokemon/heracross/anim.asm
index 5bba06fad..6c671d848 100644
--- a/gfx/pokemon/heracross/anim.asm
+++ b/gfx/pokemon/heracross/anim.asm
@@ -2,4 +2,3 @@
 	frame 1, 20
 	frame 2, 18
 	endanim
-; 0xd14a5
diff --git a/gfx/pokemon/heracross/anim_idle.asm b/gfx/pokemon/heracross/anim_idle.asm
index 6c402379c..792fead16 100644
--- a/gfx/pokemon/heracross/anim_idle.asm
+++ b/gfx/pokemon/heracross/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	dorepeat 1
 	endanim
-; 0xd20cb
diff --git a/gfx/pokemon/hitmonchan/anim.asm b/gfx/pokemon/hitmonchan/anim.asm
index b6ddd647e..2899be92e 100644
--- a/gfx/pokemon/hitmonchan/anim.asm
+++ b/gfx/pokemon/hitmonchan/anim.asm
@@ -8,4 +8,3 @@
 	frame 1, 40
 	frame 2, 10
 	endanim
-; 0xd0eda
diff --git a/gfx/pokemon/hitmonchan/anim_idle.asm b/gfx/pokemon/hitmonchan/anim_idle.asm
index 6f67577a0..2e53779f6 100644
--- a/gfx/pokemon/hitmonchan/anim_idle.asm
+++ b/gfx/pokemon/hitmonchan/anim_idle.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 4, 20
 	endanim
-; 0xd1ce2
diff --git a/gfx/pokemon/hitmonlee/anim.asm b/gfx/pokemon/hitmonlee/anim.asm
index 4260d7753..97110fe68 100644
--- a/gfx/pokemon/hitmonlee/anim.asm
+++ b/gfx/pokemon/hitmonlee/anim.asm
@@ -10,4 +10,3 @@
 	frame 4, 05
 	frame 1, 08
 	endanim
-; 0xd0ec7
diff --git a/gfx/pokemon/hitmonlee/anim_idle.asm b/gfx/pokemon/hitmonlee/anim_idle.asm
index 4d7d191bf..5721310cf 100644
--- a/gfx/pokemon/hitmonlee/anim_idle.asm
+++ b/gfx/pokemon/hitmonlee/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 08
 	dorepeat 1
 	endanim
-; 0xd1cd5
diff --git a/gfx/pokemon/hitmontop/anim.asm b/gfx/pokemon/hitmontop/anim.asm
index 195f1554b..1c4710796 100644
--- a/gfx/pokemon/hitmontop/anim.asm
+++ b/gfx/pokemon/hitmontop/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 4, 25
 	endanim
-; 0xd15c6
diff --git a/gfx/pokemon/hitmontop/anim_idle.asm b/gfx/pokemon/hitmontop/anim_idle.asm
index 3b4f17403..89ed2beb6 100644
--- a/gfx/pokemon/hitmontop/anim_idle.asm
+++ b/gfx/pokemon/hitmontop/anim_idle.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 4, 30
 	endanim
-; 0xd2192
diff --git a/gfx/pokemon/ho_oh/anim.asm b/gfx/pokemon/ho_oh/anim.asm
index 5ae27b487..68fbd386b 100644
--- a/gfx/pokemon/ho_oh/anim.asm
+++ b/gfx/pokemon/ho_oh/anim.asm
@@ -8,4 +8,3 @@
 	frame 0, 06
 	frame 4, 12
 	endanim
-; 0xd1679
diff --git a/gfx/pokemon/ho_oh/anim_idle.asm b/gfx/pokemon/ho_oh/anim_idle.asm
index d7808f281..ac0d93c61 100644
--- a/gfx/pokemon/ho_oh/anim_idle.asm
+++ b/gfx/pokemon/ho_oh/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd2215
diff --git a/gfx/pokemon/hoothoot/anim.asm b/gfx/pokemon/hoothoot/anim.asm
index 813faf909..a3c4197a3 100644
--- a/gfx/pokemon/hoothoot/anim.asm
+++ b/gfx/pokemon/hoothoot/anim.asm
@@ -9,4 +9,3 @@
 	frame 5, 05
 	dorepeat 7
 	endanim
-; 0xd1208
diff --git a/gfx/pokemon/hoothoot/anim_idle.asm b/gfx/pokemon/hoothoot/anim_idle.asm
index 4aaf1a124..182b30674 100644
--- a/gfx/pokemon/hoothoot/anim_idle.asm
+++ b/gfx/pokemon/hoothoot/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 0, 13
 	frame 5, 05
 	endanim
-; 0xd1f08
diff --git a/gfx/pokemon/hoppip/anim.asm b/gfx/pokemon/hoppip/anim.asm
index 6af60ab0b..d4e15f1ba 100644
--- a/gfx/pokemon/hoppip/anim.asm
+++ b/gfx/pokemon/hoppip/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 10
 	dorepeat 1
 	endanim
-; 0xd134e
diff --git a/gfx/pokemon/hoppip/anim_idle.asm b/gfx/pokemon/hoppip/anim_idle.asm
index d0281ca1c..afbcfb43a 100644
--- a/gfx/pokemon/hoppip/anim_idle.asm
+++ b/gfx/pokemon/hoppip/anim_idle.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 2, 20
 	endanim
-; 0xd1ff0
diff --git a/gfx/pokemon/horsea/anim.asm b/gfx/pokemon/horsea/anim.asm
index 18d51863c..edc827dbd 100644
--- a/gfx/pokemon/horsea/anim.asm
+++ b/gfx/pokemon/horsea/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 03
 	dorepeat 3
 	endanim
-; 0xd0f49
diff --git a/gfx/pokemon/horsea/anim_idle.asm b/gfx/pokemon/horsea/anim_idle.asm
index 2475abfdb..ac0d93c61 100644
--- a/gfx/pokemon/horsea/anim_idle.asm
+++ b/gfx/pokemon/horsea/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1d35
diff --git a/gfx/pokemon/houndoom/anim.asm b/gfx/pokemon/houndoom/anim.asm
index 60ad08726..6c364ec3e 100644
--- a/gfx/pokemon/houndoom/anim.asm
+++ b/gfx/pokemon/houndoom/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 04
 	frame 4, 08
 	endanim
-; 0xd1560
diff --git a/gfx/pokemon/houndoom/anim_idle.asm b/gfx/pokemon/houndoom/anim_idle.asm
index 78fa8610c..a5fedc7d6 100644
--- a/gfx/pokemon/houndoom/anim_idle.asm
+++ b/gfx/pokemon/houndoom/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 12
 	dorepeat 1
 	endanim
-; 0xd214e
diff --git a/gfx/pokemon/houndour/anim.asm b/gfx/pokemon/houndour/anim.asm
index 2235850c0..c9913e6bb 100644
--- a/gfx/pokemon/houndour/anim.asm
+++ b/gfx/pokemon/houndour/anim.asm
@@ -4,4 +4,3 @@
 	frame 0, 07
 	frame 3, 07
 	endanim
-; 0xd154f
diff --git a/gfx/pokemon/houndour/anim_idle.asm b/gfx/pokemon/houndour/anim_idle.asm
index dd8318689..9606f8713 100644
--- a/gfx/pokemon/houndour/anim_idle.asm
+++ b/gfx/pokemon/houndour/anim_idle.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 3, 16
 	endanim
-; 0xd2145
diff --git a/gfx/pokemon/hypno/anim.asm b/gfx/pokemon/hypno/anim.asm
index b6c3e6463..ad6ba93a8 100644
--- a/gfx/pokemon/hypno/anim.asm
+++ b/gfx/pokemon/hypno/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 15
 	dorepeat 1
 	endanim
-; 0xd0e26
diff --git a/gfx/pokemon/hypno/anim_idle.asm b/gfx/pokemon/hypno/anim_idle.asm
index 4d981c442..4f991f0ca 100644
--- a/gfx/pokemon/hypno/anim_idle.asm
+++ b/gfx/pokemon/hypno/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd1c8a
diff --git a/gfx/pokemon/igglybuff/anim.asm b/gfx/pokemon/igglybuff/anim.asm
index 0b2430e44..b0e26078b 100644
--- a/gfx/pokemon/igglybuff/anim.asm
+++ b/gfx/pokemon/igglybuff/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 14
 	frame 1, 06
 	endanim
-; 0xd1299
diff --git a/gfx/pokemon/igglybuff/anim_idle.asm b/gfx/pokemon/igglybuff/anim_idle.asm
index 338a0ab2d..c4a056b01 100644
--- a/gfx/pokemon/igglybuff/anim_idle.asm
+++ b/gfx/pokemon/igglybuff/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1f71
diff --git a/gfx/pokemon/ivysaur/anim.asm b/gfx/pokemon/ivysaur/anim.asm
index 65e89f5ab..1b5796df3 100644
--- a/gfx/pokemon/ivysaur/anim.asm
+++ b/gfx/pokemon/ivysaur/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 20
 	frame 1, 06
 	endanim
-; 0xd08a5
diff --git a/gfx/pokemon/ivysaur/anim_idle.asm b/gfx/pokemon/ivysaur/anim_idle.asm
index 3df18b2cd..c778f1c55 100644
--- a/gfx/pokemon/ivysaur/anim_idle.asm
+++ b/gfx/pokemon/ivysaur/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 0, 08
 	frame 1, 06
 	endanim
-; 0xd18ad
diff --git a/gfx/pokemon/jigglypuff/anim.asm b/gfx/pokemon/jigglypuff/anim.asm
index ada7e0d99..d28f3d07f 100644
--- a/gfx/pokemon/jigglypuff/anim.asm
+++ b/gfx/pokemon/jigglypuff/anim.asm
@@ -8,4 +8,3 @@
 	frame 4, 05
 	dorepeat 6
 	endanim
-; 0xd0ade
diff --git a/gfx/pokemon/jigglypuff/anim_idle.asm b/gfx/pokemon/jigglypuff/anim_idle.asm
index 40584de87..6968ec667 100644
--- a/gfx/pokemon/jigglypuff/anim_idle.asm
+++ b/gfx/pokemon/jigglypuff/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 07
 	dorepeat 1
 	endanim
-; 0xd1a46
diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm
index 56ea6eb00..f8e3b3ff5 100644
--- a/gfx/pokemon/johto_frames.asm
+++ b/gfx/pokemon/johto_frames.asm
@@ -1,4 +1,5 @@
-JohtoFrames:
+JohtoFrames: ; used only for BANK(JohtoFrames)
+
 ChikoritaFrames:  INCLUDE "gfx/pokemon/chikorita/frames.asm"
 BayleefFrames:    INCLUDE "gfx/pokemon/bayleef/frames.asm"
 MeganiumFrames:   INCLUDE "gfx/pokemon/meganium/frames.asm"
diff --git a/gfx/pokemon/jolteon/anim.asm b/gfx/pokemon/jolteon/anim.asm
index c4c01e60a..7b5b54213 100644
--- a/gfx/pokemon/jolteon/anim.asm
+++ b/gfx/pokemon/jolteon/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 06
 	dorepeat 5
 	endanim
-; 0xd1054
diff --git a/gfx/pokemon/jolteon/anim_idle.asm b/gfx/pokemon/jolteon/anim_idle.asm
index 0b5481afd..e991ac49f 100644
--- a/gfx/pokemon/jolteon/anim_idle.asm
+++ b/gfx/pokemon/jolteon/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	dorepeat 1
 	endanim
-; 0xd1de8
diff --git a/gfx/pokemon/jumpluff/anim.asm b/gfx/pokemon/jumpluff/anim.asm
index c4161560e..70bea7b60 100644
--- a/gfx/pokemon/jumpluff/anim.asm
+++ b/gfx/pokemon/jumpluff/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 09
 	frame 3, 09
 	endanim
-; 0xd135e
diff --git a/gfx/pokemon/jumpluff/anim_idle.asm b/gfx/pokemon/jumpluff/anim_idle.asm
index 5013b953f..4f991f0ca 100644
--- a/gfx/pokemon/jumpluff/anim_idle.asm
+++ b/gfx/pokemon/jumpluff/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd2002
diff --git a/gfx/pokemon/jynx/anim.asm b/gfx/pokemon/jynx/anim.asm
index 78f0e63ed..1d640aeff 100644
--- a/gfx/pokemon/jynx/anim.asm
+++ b/gfx/pokemon/jynx/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 16
 	dorepeat 1
 	endanim
-; 0xd0fb5
diff --git a/gfx/pokemon/jynx/anim_idle.asm b/gfx/pokemon/jynx/anim_idle.asm
index 42f42859c..faaeffe39 100644
--- a/gfx/pokemon/jynx/anim_idle.asm
+++ b/gfx/pokemon/jynx/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1d81
diff --git a/gfx/pokemon/kabuto/anim.asm b/gfx/pokemon/kabuto/anim.asm
index de308c900..af55cca53 100644
--- a/gfx/pokemon/kabuto/anim.asm
+++ b/gfx/pokemon/kabuto/anim.asm
@@ -3,4 +3,3 @@
 	frame 1, 16
 	frame 2, 12
 	endanim
-; 0xd1085
diff --git a/gfx/pokemon/kabuto/anim_idle.asm b/gfx/pokemon/kabuto/anim_idle.asm
index 0e347c87d..f9799ccf7 100644
--- a/gfx/pokemon/kabuto/anim_idle.asm
+++ b/gfx/pokemon/kabuto/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 0, 18
 	frame 3, 04
 	endanim
-; 0xd1e19
diff --git a/gfx/pokemon/kabutops/anim.asm b/gfx/pokemon/kabutops/anim.asm
index f5812126a..387559bb9 100644
--- a/gfx/pokemon/kabutops/anim.asm
+++ b/gfx/pokemon/kabutops/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 1, 25
 	endanim
-; 0xd1092
diff --git a/gfx/pokemon/kabutops/anim_idle.asm b/gfx/pokemon/kabutops/anim_idle.asm
index 32a70f827..792fead16 100644
--- a/gfx/pokemon/kabutops/anim_idle.asm
+++ b/gfx/pokemon/kabutops/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	dorepeat 1
 	endanim
-; 0xd1e22
diff --git a/gfx/pokemon/kadabra/anim.asm b/gfx/pokemon/kadabra/anim.asm
index 9b132e26b..feff6b587 100644
--- a/gfx/pokemon/kadabra/anim.asm
+++ b/gfx/pokemon/kadabra/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 1, 12
 	endanim
-; 0xd0c67
diff --git a/gfx/pokemon/kadabra/anim_idle.asm b/gfx/pokemon/kadabra/anim_idle.asm
index eabcdb07d..35cae5ee9 100644
--- a/gfx/pokemon/kadabra/anim_idle.asm
+++ b/gfx/pokemon/kadabra/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 07
 	dorepeat 1
 	endanim
-; 0xd1b41
diff --git a/gfx/pokemon/kakuna/anim.asm b/gfx/pokemon/kakuna/anim.asm
index b67e66e26..fed9aabfb 100644
--- a/gfx/pokemon/kakuna/anim.asm
+++ b/gfx/pokemon/kakuna/anim.asm
@@ -1,4 +1,3 @@
 	frame 0, 12
 	frame 1, 24
 	endanim
-; 0xd093f
diff --git a/gfx/pokemon/kakuna/anim_idle.asm b/gfx/pokemon/kakuna/anim_idle.asm
index a7ca98540..4cf1be2b0 100644
--- a/gfx/pokemon/kakuna/anim_idle.asm
+++ b/gfx/pokemon/kakuna/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 07
 	dorepeat 1
 	endanim
-; 0xd192b
diff --git a/gfx/pokemon/kangaskhan/anim.asm b/gfx/pokemon/kangaskhan/anim.asm
index 34363f893..04a5dc384 100644
--- a/gfx/pokemon/kangaskhan/anim.asm
+++ b/gfx/pokemon/kangaskhan/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 09
 	frame 4, 15
 	endanim
-; 0xd0f3c
diff --git a/gfx/pokemon/kangaskhan/anim_idle.asm b/gfx/pokemon/kangaskhan/anim_idle.asm
index 0da29ec4a..aa1ebd59f 100644
--- a/gfx/pokemon/kangaskhan/anim_idle.asm
+++ b/gfx/pokemon/kangaskhan/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 0, 15
 	frame 4, 25
 	endanim
-; 0xd1d2c
diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm
index 9a7aa7c85..67a066156 100644
--- a/gfx/pokemon/kanto_frames.asm
+++ b/gfx/pokemon/kanto_frames.asm
@@ -1,4 +1,5 @@
-KantoFrames:
+KantoFrames: ; used only for BANK(KantoFrames)
+
 BulbasaurFrames:  INCLUDE "gfx/pokemon/bulbasaur/frames.asm"
 IvysaurFrames:    INCLUDE "gfx/pokemon/ivysaur/frames.asm"
 VenusaurFrames:   INCLUDE "gfx/pokemon/venusaur/frames.asm"
diff --git a/gfx/pokemon/kingdra/anim.asm b/gfx/pokemon/kingdra/anim.asm
index c7bc2991f..14e0e9806 100644
--- a/gfx/pokemon/kingdra/anim.asm
+++ b/gfx/pokemon/kingdra/anim.asm
@@ -7,4 +7,3 @@
 	frame 5, 06
 	dorepeat 5
 	endanim
-; 0xd1571
diff --git a/gfx/pokemon/kingdra/anim_idle.asm b/gfx/pokemon/kingdra/anim_idle.asm
index 2ec7e99ae..29e08faf1 100644
--- a/gfx/pokemon/kingdra/anim_idle.asm
+++ b/gfx/pokemon/kingdra/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 6, 06
 	dorepeat 1
 	endanim
-; 0xd2157
diff --git a/gfx/pokemon/kingler/anim.asm b/gfx/pokemon/kingler/anim.asm
index 2be7b62be..b100d0b74 100644
--- a/gfx/pokemon/kingler/anim.asm
+++ b/gfx/pokemon/kingler/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 15
 	frame 2, 15
 	endanim
-; 0xd0e4a
diff --git a/gfx/pokemon/kingler/anim_idle.asm b/gfx/pokemon/kingler/anim_idle.asm
index 25af73bc9..5cd0200a8 100644
--- a/gfx/pokemon/kingler/anim_idle.asm
+++ b/gfx/pokemon/kingler/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 10
 	dorepeat 1
 	endanim
-; 0xd1c9a
diff --git a/gfx/pokemon/koffing/anim.asm b/gfx/pokemon/koffing/anim.asm
index fc574f528..5a426a113 100644
--- a/gfx/pokemon/koffing/anim.asm
+++ b/gfx/pokemon/koffing/anim.asm
@@ -4,4 +4,3 @@
 	frame 4, 10
 	frame 5, 15
 	endanim
-; 0xd0ef0
diff --git a/gfx/pokemon/koffing/anim_idle.asm b/gfx/pokemon/koffing/anim_idle.asm
index e0e81b4d3..c3ffc2567 100644
--- a/gfx/pokemon/koffing/anim_idle.asm
+++ b/gfx/pokemon/koffing/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 5, 48
 	endanim
-; 0xd1cee
diff --git a/gfx/pokemon/krabby/anim.asm b/gfx/pokemon/krabby/anim.asm
index 22f5657e5..220098180 100644
--- a/gfx/pokemon/krabby/anim.asm
+++ b/gfx/pokemon/krabby/anim.asm
@@ -8,4 +8,3 @@
 	frame 4, 03
 	dorepeat 3
 	endanim
-; 0xd0e39
diff --git a/gfx/pokemon/krabby/anim_idle.asm b/gfx/pokemon/krabby/anim_idle.asm
index 0b89ffc33..d86b856d2 100644
--- a/gfx/pokemon/krabby/anim_idle.asm
+++ b/gfx/pokemon/krabby/anim_idle.asm
@@ -2,4 +2,3 @@
 	frame 7, 06
 	dorepeat 3
 	endanim
-; 0xd1c91
diff --git a/gfx/pokemon/lanturn/anim.asm b/gfx/pokemon/lanturn/anim.asm
index 18882deb5..37be49644 100644
--- a/gfx/pokemon/lanturn/anim.asm
+++ b/gfx/pokemon/lanturn/anim.asm
@@ -6,4 +6,3 @@
 	frame 4, 05
 	dorepeat 4
 	endanim
-; 0xd1280
diff --git a/gfx/pokemon/lanturn/anim_idle.asm b/gfx/pokemon/lanturn/anim_idle.asm
index d57dd04b1..b7c3a8f8b 100644
--- a/gfx/pokemon/lanturn/anim_idle.asm
+++ b/gfx/pokemon/lanturn/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1f56
diff --git a/gfx/pokemon/lapras/anim.asm b/gfx/pokemon/lapras/anim.asm
index 9ae8f4e5c..7a3c74f37 100644
--- a/gfx/pokemon/lapras/anim.asm
+++ b/gfx/pokemon/lapras/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 09
 	frame 1, 10
 	endanim
-; 0xd1016
diff --git a/gfx/pokemon/lapras/anim_idle.asm b/gfx/pokemon/lapras/anim_idle.asm
index 790cccf05..936499ff0 100644
--- a/gfx/pokemon/lapras/anim_idle.asm
+++ b/gfx/pokemon/lapras/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 0, 12
 	frame 5, 12
 	endanim
-; 0xd1dc0
diff --git a/gfx/pokemon/larvitar/anim.asm b/gfx/pokemon/larvitar/anim.asm
index bb861f733..5e3c68db8 100644
--- a/gfx/pokemon/larvitar/anim.asm
+++ b/gfx/pokemon/larvitar/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 28
 	frame 3, 08
 	endanim
-; 0xd163d
diff --git a/gfx/pokemon/larvitar/anim_idle.asm b/gfx/pokemon/larvitar/anim_idle.asm
index 2b87de7be..c4a056b01 100644
--- a/gfx/pokemon/larvitar/anim_idle.asm
+++ b/gfx/pokemon/larvitar/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd21eb
diff --git a/gfx/pokemon/ledian/anim.asm b/gfx/pokemon/ledian/anim.asm
index ece77ff44..5cf6ededa 100644
--- a/gfx/pokemon/ledian/anim.asm
+++ b/gfx/pokemon/ledian/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 1, 08
 	endanim
-; 0xd1233
diff --git a/gfx/pokemon/ledian/anim_idle.asm b/gfx/pokemon/ledian/anim_idle.asm
index cf5a0e011..936e90ea1 100644
--- a/gfx/pokemon/ledian/anim_idle.asm
+++ b/gfx/pokemon/ledian/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd1f25
diff --git a/gfx/pokemon/ledyba/anim.asm b/gfx/pokemon/ledyba/anim.asm
index ac4c8e154..28f2becbe 100644
--- a/gfx/pokemon/ledyba/anim.asm
+++ b/gfx/pokemon/ledyba/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 12
 	dorepeat 2
 	endanim
-; 0xd1224
diff --git a/gfx/pokemon/ledyba/anim_idle.asm b/gfx/pokemon/ledyba/anim_idle.asm
index d493c5fbc..21cfa00dd 100644
--- a/gfx/pokemon/ledyba/anim_idle.asm
+++ b/gfx/pokemon/ledyba/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 3, 05
 	dorepeat 2
 	endanim
-; 0xd1f1c
diff --git a/gfx/pokemon/lickitung/anim.asm b/gfx/pokemon/lickitung/anim.asm
index 2fb31e50b..2157c3ca2 100644
--- a/gfx/pokemon/lickitung/anim.asm
+++ b/gfx/pokemon/lickitung/anim.asm
@@ -4,4 +4,3 @@
 	frame 0, 06
 	frame 3, 06
 	endanim
-; 0xd0ee5
diff --git a/gfx/pokemon/lickitung/anim_idle.asm b/gfx/pokemon/lickitung/anim_idle.asm
index cf0355a03..b7c3a8f8b 100644
--- a/gfx/pokemon/lickitung/anim_idle.asm
+++ b/gfx/pokemon/lickitung/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1ceb
diff --git a/gfx/pokemon/lugia/anim.asm b/gfx/pokemon/lugia/anim.asm
index 3c3c021a5..0eaac48c2 100644
--- a/gfx/pokemon/lugia/anim.asm
+++ b/gfx/pokemon/lugia/anim.asm
@@ -5,4 +5,3 @@
 	frame 5, 14
 	frame 6, 11
 	endanim
-; 0xd1666
diff --git a/gfx/pokemon/lugia/anim_idle.asm b/gfx/pokemon/lugia/anim_idle.asm
index 31f2ea09c..411c74883 100644
--- a/gfx/pokemon/lugia/anim_idle.asm
+++ b/gfx/pokemon/lugia/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 8, 10
 	frame 3, 10
 	endanim
-; 0xd220c
diff --git a/gfx/pokemon/machamp/anim.asm b/gfx/pokemon/machamp/anim.asm
index 6202aefe5..8e015b3b0 100644
--- a/gfx/pokemon/machamp/anim.asm
+++ b/gfx/pokemon/machamp/anim.asm
@@ -8,4 +8,3 @@
 	dorepeat 3
 	frame 7, 08
 	endanim
-; 0xd0c9d
diff --git a/gfx/pokemon/machamp/anim_idle.asm b/gfx/pokemon/machamp/anim_idle.asm
index 5171d3966..b3dcecd84 100644
--- a/gfx/pokemon/machamp/anim_idle.asm
+++ b/gfx/pokemon/machamp/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 07
 	dorepeat 1
 	endanim
-; 0xd1b6b
diff --git a/gfx/pokemon/machoke/anim.asm b/gfx/pokemon/machoke/anim.asm
index 6d89ab174..56fd79181 100644
--- a/gfx/pokemon/machoke/anim.asm
+++ b/gfx/pokemon/machoke/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 40
 	frame 1, 10
 	endanim
-; 0xd0c8a
diff --git a/gfx/pokemon/machoke/anim_idle.asm b/gfx/pokemon/machoke/anim_idle.asm
index c79f108d7..2116d5ded 100644
--- a/gfx/pokemon/machoke/anim_idle.asm
+++ b/gfx/pokemon/machoke/anim_idle.asm
@@ -7,4 +7,3 @@
 	frame 6, 08
 	dorepeat 5
 	endanim
-; 0xd1b62
diff --git a/gfx/pokemon/machop/anim.asm b/gfx/pokemon/machop/anim.asm
index 8fee766ce..3ba58434e 100644
--- a/gfx/pokemon/machop/anim.asm
+++ b/gfx/pokemon/machop/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 12
 	dorepeat 3
 	endanim
-; 0xd0c83
diff --git a/gfx/pokemon/machop/anim_idle.asm b/gfx/pokemon/machop/anim_idle.asm
index 20658284d..c4a056b01 100644
--- a/gfx/pokemon/machop/anim_idle.asm
+++ b/gfx/pokemon/machop/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1b51
diff --git a/gfx/pokemon/magby/anim.asm b/gfx/pokemon/magby/anim.asm
index b0f8c7a10..17cd1ae9f 100644
--- a/gfx/pokemon/magby/anim.asm
+++ b/gfx/pokemon/magby/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 4, 16
 	endanim
-; 0xd15ed
diff --git a/gfx/pokemon/magby/anim_idle.asm b/gfx/pokemon/magby/anim_idle.asm
index 20b2b7997..1cd973ead 100644
--- a/gfx/pokemon/magby/anim_idle.asm
+++ b/gfx/pokemon/magby/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 09
 	dorepeat 1
 	endanim
-; 0xd21af
diff --git a/gfx/pokemon/magcargo/anim.asm b/gfx/pokemon/magcargo/anim.asm
index d6bf7543a..a36d96c50 100644
--- a/gfx/pokemon/magcargo/anim.asm
+++ b/gfx/pokemon/magcargo/anim.asm
@@ -4,4 +4,3 @@
 	frame 4, 10
 	frame 1, 25
 	endanim
-; 0xd14e4
diff --git a/gfx/pokemon/magcargo/anim_idle.asm b/gfx/pokemon/magcargo/anim_idle.asm
index 3c76a44df..7054543f0 100644
--- a/gfx/pokemon/magcargo/anim_idle.asm
+++ b/gfx/pokemon/magcargo/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 1, 60
 	endanim
-; 0xd20f0
diff --git a/gfx/pokemon/magikarp/anim.asm b/gfx/pokemon/magikarp/anim.asm
index f06f21a40..b34075902 100644
--- a/gfx/pokemon/magikarp/anim.asm
+++ b/gfx/pokemon/magikarp/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 07
 	dorepeat 2
 	endanim
-; 0xd1002
diff --git a/gfx/pokemon/magikarp/anim_idle.asm b/gfx/pokemon/magikarp/anim_idle.asm
index 7c3f5cb76..1c84b06d5 100644
--- a/gfx/pokemon/magikarp/anim_idle.asm
+++ b/gfx/pokemon/magikarp/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 10
 	dorepeat 1
 	endanim
-; 0xd1dae
diff --git a/gfx/pokemon/magmar/anim.asm b/gfx/pokemon/magmar/anim.asm
index 8fde5d3b5..9308cea5c 100644
--- a/gfx/pokemon/magmar/anim.asm
+++ b/gfx/pokemon/magmar/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 07
 	dorepeat 2
 	endanim
-; 0xd0fd7
diff --git a/gfx/pokemon/magmar/anim_idle.asm b/gfx/pokemon/magmar/anim_idle.asm
index 784bdcd3d..35cae5ee9 100644
--- a/gfx/pokemon/magmar/anim_idle.asm
+++ b/gfx/pokemon/magmar/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 07
 	dorepeat 1
 	endanim
-; 0xd1d93
diff --git a/gfx/pokemon/magnemite/anim.asm b/gfx/pokemon/magnemite/anim.asm
index 4f038b0ed..1c624b40f 100644
--- a/gfx/pokemon/magnemite/anim.asm
+++ b/gfx/pokemon/magnemite/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 08
 	dorepeat 1
 	endanim
-; 0xd0d5c
diff --git a/gfx/pokemon/magnemite/anim_idle.asm b/gfx/pokemon/magnemite/anim_idle.asm
index a41239563..81719e6b3 100644
--- a/gfx/pokemon/magnemite/anim_idle.asm
+++ b/gfx/pokemon/magnemite/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 6, 08
 	dorepeat 1
 	endanim
-; 0xd1be4
diff --git a/gfx/pokemon/magneton/anim.asm b/gfx/pokemon/magneton/anim.asm
index 26b34d4ec..06d27a72d 100644
--- a/gfx/pokemon/magneton/anim.asm
+++ b/gfx/pokemon/magneton/anim.asm
@@ -9,4 +9,3 @@
 	frame 2, 04
 	frame 3, 04
 	endanim
-; 0xd0d71
diff --git a/gfx/pokemon/magneton/anim_idle.asm b/gfx/pokemon/magneton/anim_idle.asm
index 6045d8fae..d0cba2e01 100644
--- a/gfx/pokemon/magneton/anim_idle.asm
+++ b/gfx/pokemon/magneton/anim_idle.asm
@@ -6,4 +6,3 @@
 	frame 2, 24
 	frame 3, 24
 	endanim
-; 0xd1bf3
diff --git a/gfx/pokemon/mankey/anim.asm b/gfx/pokemon/mankey/anim.asm
index 7d6ef1fa5..01b8e3e64 100644
--- a/gfx/pokemon/mankey/anim.asm
+++ b/gfx/pokemon/mankey/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 08
 	dorepeat 2
 	endanim
-; 0xd0bff
diff --git a/gfx/pokemon/mankey/anim_idle.asm b/gfx/pokemon/mankey/anim_idle.asm
index c5874fc6d..faaeffe39 100644
--- a/gfx/pokemon/mankey/anim_idle.asm
+++ b/gfx/pokemon/mankey/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1aeb
diff --git a/gfx/pokemon/mantine/anim.asm b/gfx/pokemon/mantine/anim.asm
index d0a51de3e..165d1cfdf 100644
--- a/gfx/pokemon/mantine/anim.asm
+++ b/gfx/pokemon/mantine/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 15
 	frame 5, 15
 	endanim
-; 0xd1539
diff --git a/gfx/pokemon/mantine/anim_idle.asm b/gfx/pokemon/mantine/anim_idle.asm
index f552b1f09..17859c9d5 100644
--- a/gfx/pokemon/mantine/anim_idle.asm
+++ b/gfx/pokemon/mantine/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 6, 08
 	dorepeat 1
 	endanim
-; 0xd212f
diff --git a/gfx/pokemon/mareep/anim.asm b/gfx/pokemon/mareep/anim.asm
index e74a78cad..0bade86f0 100644
--- a/gfx/pokemon/mareep/anim.asm
+++ b/gfx/pokemon/mareep/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 06
 	dorepeat 4
 	endanim
-; 0xd12dc
diff --git a/gfx/pokemon/mareep/anim_idle.asm b/gfx/pokemon/mareep/anim_idle.asm
index 21d7a79f8..51fc59d03 100644
--- a/gfx/pokemon/mareep/anim_idle.asm
+++ b/gfx/pokemon/mareep/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 2, 07
 	dorepeat 1
 	endanim
-; 0xd1fa2
diff --git a/gfx/pokemon/marill/anim.asm b/gfx/pokemon/marill/anim.asm
index 5b8c7fc2a..d157bca9a 100644
--- a/gfx/pokemon/marill/anim.asm
+++ b/gfx/pokemon/marill/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 10
 	dorepeat 4
 	endanim
-; 0xd131a
diff --git a/gfx/pokemon/marill/anim_idle.asm b/gfx/pokemon/marill/anim_idle.asm
index 3be2dd1dc..690eefa2a 100644
--- a/gfx/pokemon/marill/anim_idle.asm
+++ b/gfx/pokemon/marill/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 5, 08
 	dorepeat 2
 	endanim
-; 0xd1fca
diff --git a/gfx/pokemon/marowak/anim.asm b/gfx/pokemon/marowak/anim.asm
index 23c9d2f92..28bf103c1 100644
--- a/gfx/pokemon/marowak/anim.asm
+++ b/gfx/pokemon/marowak/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 07
 	dorepeat 5
 	endanim
-; 0xd0eb0
diff --git a/gfx/pokemon/marowak/anim_idle.asm b/gfx/pokemon/marowak/anim_idle.asm
index 5cdcd7594..512259ece 100644
--- a/gfx/pokemon/marowak/anim_idle.asm
+++ b/gfx/pokemon/marowak/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 15
 	dorepeat 1
 	endanim
-; 0xd1ccc
diff --git a/gfx/pokemon/meganium/anim.asm b/gfx/pokemon/meganium/anim.asm
index adf80db8f..e5db2c673 100644
--- a/gfx/pokemon/meganium/anim.asm
+++ b/gfx/pokemon/meganium/anim.asm
@@ -8,4 +8,3 @@
 	frame 3, 07
 	dorepeat 6
 	endanim
-; 0xd117f
diff --git a/gfx/pokemon/meganium/anim_idle.asm b/gfx/pokemon/meganium/anim_idle.asm
index f28c9d97a..b7c3a8f8b 100644
--- a/gfx/pokemon/meganium/anim_idle.asm
+++ b/gfx/pokemon/meganium/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1eb1
diff --git a/gfx/pokemon/meowth/anim.asm b/gfx/pokemon/meowth/anim.asm
index ff95e9c6d..ed53bad2f 100644
--- a/gfx/pokemon/meowth/anim.asm
+++ b/gfx/pokemon/meowth/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 14
 	dorepeat 2
 	endanim
-; 0xd0bbf
diff --git a/gfx/pokemon/meowth/anim_idle.asm b/gfx/pokemon/meowth/anim_idle.asm
index 7f1e9eba8..cf66cab97 100644
--- a/gfx/pokemon/meowth/anim_idle.asm
+++ b/gfx/pokemon/meowth/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd1ac7
diff --git a/gfx/pokemon/metapod/anim.asm b/gfx/pokemon/metapod/anim.asm
index da76c7094..eee484dce 100644
--- a/gfx/pokemon/metapod/anim.asm
+++ b/gfx/pokemon/metapod/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 24
 	frame 1, 12
 	endanim
-; 0xd091c
diff --git a/gfx/pokemon/metapod/anim_idle.asm b/gfx/pokemon/metapod/anim_idle.asm
index e22d46cb7..b361670db 100644
--- a/gfx/pokemon/metapod/anim_idle.asm
+++ b/gfx/pokemon/metapod/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1904
diff --git a/gfx/pokemon/mew/anim.asm b/gfx/pokemon/mew/anim.asm
index b01e307de..3f8ce9842 100644
--- a/gfx/pokemon/mew/anim.asm
+++ b/gfx/pokemon/mew/anim.asm
@@ -15,4 +15,3 @@
 	frame 0, 15
 	frame 4, 15
 	endanim
-; 0xd1154
diff --git a/gfx/pokemon/mew/anim_idle.asm b/gfx/pokemon/mew/anim_idle.asm
index c22e552cb..9e264ee71 100644
--- a/gfx/pokemon/mew/anim_idle.asm
+++ b/gfx/pokemon/mew/anim_idle.asm
@@ -6,4 +6,3 @@
 	frame 4, 20
 	dorepeat 1
 	endanim
-; 0xd1e96
diff --git a/gfx/pokemon/mewtwo/anim.asm b/gfx/pokemon/mewtwo/anim.asm
index 78682c111..a84682339 100644
--- a/gfx/pokemon/mewtwo/anim.asm
+++ b/gfx/pokemon/mewtwo/anim.asm
@@ -14,4 +14,3 @@
 	frame 5, 14
 	frame 3, 04
 	endanim
-; 0xd1133
diff --git a/gfx/pokemon/mewtwo/anim_idle.asm b/gfx/pokemon/mewtwo/anim_idle.asm
index a80a56899..6b935e77a 100644
--- a/gfx/pokemon/mewtwo/anim_idle.asm
+++ b/gfx/pokemon/mewtwo/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 06
 	dorepeat 1
 	endanim
-; 0xd1e87
diff --git a/gfx/pokemon/miltank/anim.asm b/gfx/pokemon/miltank/anim.asm
index 6d12f2d5d..384ef3f61 100644
--- a/gfx/pokemon/miltank/anim.asm
+++ b/gfx/pokemon/miltank/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 3, 05
 	endanim
-; 0xd15fa
diff --git a/gfx/pokemon/miltank/anim_idle.asm b/gfx/pokemon/miltank/anim_idle.asm
index a6a76db7b..8318520e3 100644
--- a/gfx/pokemon/miltank/anim_idle.asm
+++ b/gfx/pokemon/miltank/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd21b8
diff --git a/gfx/pokemon/misdreavus/anim.asm b/gfx/pokemon/misdreavus/anim.asm
index d833c96fb..fe29627b3 100644
--- a/gfx/pokemon/misdreavus/anim.asm
+++ b/gfx/pokemon/misdreavus/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 13
 	frame 3, 13
 	endanim
-; 0xd13e9
diff --git a/gfx/pokemon/misdreavus/anim_idle.asm b/gfx/pokemon/misdreavus/anim_idle.asm
index 3f0ee9517..270d8a92e 100644
--- a/gfx/pokemon/misdreavus/anim_idle.asm
+++ b/gfx/pokemon/misdreavus/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 0, 08
 	dorepeat 1
 	endanim
-; 0xd205d
diff --git a/gfx/pokemon/moltres/anim.asm b/gfx/pokemon/moltres/anim.asm
index 220626749..f353d3078 100644
--- a/gfx/pokemon/moltres/anim.asm
+++ b/gfx/pokemon/moltres/anim.asm
@@ -10,4 +10,3 @@
 	frame 0, 12
 	frame 1, 12
 	endanim
-; 0xd10e3
diff --git a/gfx/pokemon/moltres/anim_idle.asm b/gfx/pokemon/moltres/anim_idle.asm
index 258191b6e..78dc7190f 100644
--- a/gfx/pokemon/moltres/anim_idle.asm
+++ b/gfx/pokemon/moltres/anim_idle.asm
@@ -6,4 +6,3 @@
 	frame 1, 12
 	frame 5, 12
 	endanim
-; 0xd1e57
diff --git a/gfx/pokemon/mr__mime/anim.asm b/gfx/pokemon/mr__mime/anim.asm
index fcb597a5a..d1144520f 100644
--- a/gfx/pokemon/mr__mime/anim.asm
+++ b/gfx/pokemon/mr__mime/anim.asm
@@ -8,4 +8,3 @@
 	frame 0, 32
 	frame 6, 06
 	endanim
-; 0xd0f99
diff --git a/gfx/pokemon/mr__mime/anim_idle.asm b/gfx/pokemon/mr__mime/anim_idle.asm
index c3747ac1e..29e08faf1 100644
--- a/gfx/pokemon/mr__mime/anim_idle.asm
+++ b/gfx/pokemon/mr__mime/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 6, 06
 	dorepeat 1
 	endanim
-; 0xd1d6f
diff --git a/gfx/pokemon/muk/anim.asm b/gfx/pokemon/muk/anim.asm
index 1bacba421..e6b2ecf27 100644
--- a/gfx/pokemon/muk/anim.asm
+++ b/gfx/pokemon/muk/anim.asm
@@ -3,4 +3,3 @@
 	frame 3, 12
 	frame 1, 12
 	endanim
-; 0xd0dbc
diff --git a/gfx/pokemon/muk/anim_idle.asm b/gfx/pokemon/muk/anim_idle.asm
index db37bf515..58ad3b689 100644
--- a/gfx/pokemon/muk/anim_idle.asm
+++ b/gfx/pokemon/muk/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 12
 	dorepeat 1
 	endanim
-; 0xd1c40
diff --git a/gfx/pokemon/murkrow/anim.asm b/gfx/pokemon/murkrow/anim.asm
index 8f0ca6a72..5c286efbf 100644
--- a/gfx/pokemon/murkrow/anim.asm
+++ b/gfx/pokemon/murkrow/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 07
 	frame 1, 07
 	endanim
-; 0xd13cf
diff --git a/gfx/pokemon/murkrow/anim_idle.asm b/gfx/pokemon/murkrow/anim_idle.asm
index 85e2f9c56..81583f510 100644
--- a/gfx/pokemon/murkrow/anim_idle.asm
+++ b/gfx/pokemon/murkrow/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 07
 	dorepeat 1
 	endanim
-; 0xd204f
diff --git a/gfx/pokemon/natu/anim.asm b/gfx/pokemon/natu/anim.asm
index 22c2659db..bb60fc477 100644
--- a/gfx/pokemon/natu/anim.asm
+++ b/gfx/pokemon/natu/anim.asm
@@ -3,4 +3,3 @@
 	frame 3, 25
 	frame 2, 10
 	endanim
-; 0xd12bc
diff --git a/gfx/pokemon/natu/anim_idle.asm b/gfx/pokemon/natu/anim_idle.asm
index a4a974877..7dd5afcf1 100644
--- a/gfx/pokemon/natu/anim_idle.asm
+++ b/gfx/pokemon/natu/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 4, 35
 	endanim
-; 0xd1f86
diff --git a/gfx/pokemon/nidoking/anim.asm b/gfx/pokemon/nidoking/anim.asm
index a32945d49..f2441e4e6 100644
--- a/gfx/pokemon/nidoking/anim.asm
+++ b/gfx/pokemon/nidoking/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 36
 	frame 1, 12
 	endanim
-; 0xd0a8f
diff --git a/gfx/pokemon/nidoking/anim_idle.asm b/gfx/pokemon/nidoking/anim_idle.asm
index 4e56028e1..faaeffe39 100644
--- a/gfx/pokemon/nidoking/anim_idle.asm
+++ b/gfx/pokemon/nidoking/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1a13
diff --git a/gfx/pokemon/nidoqueen/anim.asm b/gfx/pokemon/nidoqueen/anim.asm
index bd9d8eee8..37d7d6474 100644
--- a/gfx/pokemon/nidoqueen/anim.asm
+++ b/gfx/pokemon/nidoqueen/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 10
 	frame 5, 10
 	endanim
-; 0xd0a64
diff --git a/gfx/pokemon/nidoqueen/anim_idle.asm b/gfx/pokemon/nidoqueen/anim_idle.asm
index 1cc934c42..fdb7000ca 100644
--- a/gfx/pokemon/nidoqueen/anim_idle.asm
+++ b/gfx/pokemon/nidoqueen/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 6, 07
 	dorepeat 2
 	endanim
-; 0xd19f4
diff --git a/gfx/pokemon/nidoran_f/anim.asm b/gfx/pokemon/nidoran_f/anim.asm
index 623db13d1..28a222147 100644
--- a/gfx/pokemon/nidoran_f/anim.asm
+++ b/gfx/pokemon/nidoran_f/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 05
 	dorepeat 3
 	endanim
-; 0xd0a44
diff --git a/gfx/pokemon/nidoran_f/anim_idle.asm b/gfx/pokemon/nidoran_f/anim_idle.asm
index 348179aac..e31ce4774 100644
--- a/gfx/pokemon/nidoran_f/anim_idle.asm
+++ b/gfx/pokemon/nidoran_f/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd19e0
diff --git a/gfx/pokemon/nidoran_m/anim.asm b/gfx/pokemon/nidoran_m/anim.asm
index 9b8a38133..2919f0a42 100644
--- a/gfx/pokemon/nidoran_m/anim.asm
+++ b/gfx/pokemon/nidoran_m/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 06
 	dorepeat 3
 	endanim
-; 0xd0a71
diff --git a/gfx/pokemon/nidoran_m/anim_idle.asm b/gfx/pokemon/nidoran_m/anim_idle.asm
index 20b437f6a..faaeffe39 100644
--- a/gfx/pokemon/nidoran_m/anim_idle.asm
+++ b/gfx/pokemon/nidoran_m/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd19fd
diff --git a/gfx/pokemon/nidorina/anim.asm b/gfx/pokemon/nidorina/anim.asm
index 6ab079db4..8d4e323a6 100644
--- a/gfx/pokemon/nidorina/anim.asm
+++ b/gfx/pokemon/nidorina/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 06
 	dorepeat 2
 	endanim
-; 0xd0a53
diff --git a/gfx/pokemon/nidorina/anim_idle.asm b/gfx/pokemon/nidorina/anim_idle.asm
index 6afb1cbc8..2a4625144 100644
--- a/gfx/pokemon/nidorina/anim_idle.asm
+++ b/gfx/pokemon/nidorina/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 04
 	dorepeat 1
 	endanim
-; 0xd19e9
diff --git a/gfx/pokemon/nidorino/anim.asm b/gfx/pokemon/nidorino/anim.asm
index 16a6cb1dc..4e9fef35b 100644
--- a/gfx/pokemon/nidorino/anim.asm
+++ b/gfx/pokemon/nidorino/anim.asm
@@ -9,4 +9,3 @@
 	frame 3, 06
 	dorepeat 6
 	endanim
-; 0xd0a86
diff --git a/gfx/pokemon/nidorino/anim_idle.asm b/gfx/pokemon/nidorino/anim_idle.asm
index 40e17f454..b9c951a7b 100644
--- a/gfx/pokemon/nidorino/anim_idle.asm
+++ b/gfx/pokemon/nidorino/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 0, 06
 	frame 4, 06
 	endanim
-; 0xd1a0a
diff --git a/gfx/pokemon/ninetales/anim.asm b/gfx/pokemon/ninetales/anim.asm
index 0d691ee9d..54104dbdd 100644
--- a/gfx/pokemon/ninetales/anim.asm
+++ b/gfx/pokemon/ninetales/anim.asm
@@ -7,4 +7,3 @@
 	frame 2, 10
 	frame 1, 08
 	endanim
-; 0xd0acb
diff --git a/gfx/pokemon/ninetales/anim_idle.asm b/gfx/pokemon/ninetales/anim_idle.asm
index 68d1e8051..cf685d8b0 100644
--- a/gfx/pokemon/ninetales/anim_idle.asm
+++ b/gfx/pokemon/ninetales/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 06
 	dorepeat 1
 	endanim
-; 0xd1a3d
diff --git a/gfx/pokemon/noctowl/anim.asm b/gfx/pokemon/noctowl/anim.asm
index ce19c30a5..8e13e19bc 100644
--- a/gfx/pokemon/noctowl/anim.asm
+++ b/gfx/pokemon/noctowl/anim.asm
@@ -7,4 +7,3 @@
 	frame 2, 06
 	dorepeat 5
 	endanim
-; 0xd1219
diff --git a/gfx/pokemon/noctowl/anim_idle.asm b/gfx/pokemon/noctowl/anim_idle.asm
index 4fe81f336..5721310cf 100644
--- a/gfx/pokemon/noctowl/anim_idle.asm
+++ b/gfx/pokemon/noctowl/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 08
 	dorepeat 1
 	endanim
-; 0xd1f11
diff --git a/gfx/pokemon/octillery/anim.asm b/gfx/pokemon/octillery/anim.asm
index 2405d46a1..71dc2031a 100644
--- a/gfx/pokemon/octillery/anim.asm
+++ b/gfx/pokemon/octillery/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 05
 	dorepeat 3
 	endanim
-; 0xd1515
diff --git a/gfx/pokemon/octillery/anim_idle.asm b/gfx/pokemon/octillery/anim_idle.asm
index 0903a867a..c4a056b01 100644
--- a/gfx/pokemon/octillery/anim_idle.asm
+++ b/gfx/pokemon/octillery/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd211d
diff --git a/gfx/pokemon/oddish/anim.asm b/gfx/pokemon/oddish/anim.asm
index 338771fce..c8e0f9d5d 100644
--- a/gfx/pokemon/oddish/anim.asm
+++ b/gfx/pokemon/oddish/anim.asm
@@ -8,4 +8,3 @@
 	frame 3, 07
 	dorepeat 6
 	endanim
-; 0xd0b20
diff --git a/gfx/pokemon/oddish/anim_idle.asm b/gfx/pokemon/oddish/anim_idle.asm
index 92d041ff5..936e90ea1 100644
--- a/gfx/pokemon/oddish/anim_idle.asm
+++ b/gfx/pokemon/oddish/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd1a6c
diff --git a/gfx/pokemon/omanyte/anim.asm b/gfx/pokemon/omanyte/anim.asm
index 5863efecc..7581608b7 100644
--- a/gfx/pokemon/omanyte/anim.asm
+++ b/gfx/pokemon/omanyte/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 22
 	frame 1, 08
 	endanim
-; 0xd1075
diff --git a/gfx/pokemon/omanyte/anim_idle.asm b/gfx/pokemon/omanyte/anim_idle.asm
index ffdce5abd..792fead16 100644
--- a/gfx/pokemon/omanyte/anim_idle.asm
+++ b/gfx/pokemon/omanyte/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	dorepeat 1
 	endanim
-; 0xd1e03
diff --git a/gfx/pokemon/omastar/anim.asm b/gfx/pokemon/omastar/anim.asm
index 76d8c3aa8..a98ae41c8 100644
--- a/gfx/pokemon/omastar/anim.asm
+++ b/gfx/pokemon/omastar/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 40
 	frame 1, 06
 	endanim
-; 0xd107c
diff --git a/gfx/pokemon/omastar/anim_idle.asm b/gfx/pokemon/omastar/anim_idle.asm
index 60bcf04d2..abd553e82 100644
--- a/gfx/pokemon/omastar/anim_idle.asm
+++ b/gfx/pokemon/omastar/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 11
 	dorepeat 1
 	endanim
-; 0xd1e0c
diff --git a/gfx/pokemon/onix/anim.asm b/gfx/pokemon/onix/anim.asm
index a5b18f5b6..31dc30c82 100644
--- a/gfx/pokemon/onix/anim.asm
+++ b/gfx/pokemon/onix/anim.asm
@@ -7,4 +7,3 @@
 	frame 5, 12
 	frame 6, 12
 	endanim
-; 0xd0e08
diff --git a/gfx/pokemon/onix/anim_idle.asm b/gfx/pokemon/onix/anim_idle.asm
index e4ae7acac..77aaa10cf 100644
--- a/gfx/pokemon/onix/anim_idle.asm
+++ b/gfx/pokemon/onix/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 8, 10
 	dorepeat 1
 	endanim
-; 0xd1c74
diff --git a/gfx/pokemon/paras/anim.asm b/gfx/pokemon/paras/anim.asm
index 6fcc935e9..d313f1145 100644
--- a/gfx/pokemon/paras/anim.asm
+++ b/gfx/pokemon/paras/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 32
 	frame 1, 08
 	endanim
-; 0xd0b4f
diff --git a/gfx/pokemon/paras/anim_idle.asm b/gfx/pokemon/paras/anim_idle.asm
index 3ce495f04..faaeffe39 100644
--- a/gfx/pokemon/paras/anim_idle.asm
+++ b/gfx/pokemon/paras/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1a8b
diff --git a/gfx/pokemon/parasect/anim.asm b/gfx/pokemon/parasect/anim.asm
index e9e253cee..a62c97492 100644
--- a/gfx/pokemon/parasect/anim.asm
+++ b/gfx/pokemon/parasect/anim.asm
@@ -10,4 +10,3 @@
 	frame 4, 04
 	dorepeat 8
 	endanim
-; 0xd0b66
diff --git a/gfx/pokemon/parasect/anim_idle.asm b/gfx/pokemon/parasect/anim_idle.asm
index 8275690a6..28575f514 100644
--- a/gfx/pokemon/parasect/anim_idle.asm
+++ b/gfx/pokemon/parasect/anim_idle.asm
@@ -2,4 +2,3 @@
 	frame 0, 05
 	frame 4, 20
 	endanim
-; 0xd1a92
diff --git a/gfx/pokemon/persian/anim.asm b/gfx/pokemon/persian/anim.asm
index ae771c09c..a5e86a283 100644
--- a/gfx/pokemon/persian/anim.asm
+++ b/gfx/pokemon/persian/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 08
 	frame 2, 06
 	endanim
-; 0xd0bd0
diff --git a/gfx/pokemon/persian/anim_idle.asm b/gfx/pokemon/persian/anim_idle.asm
index ca9129bfa..936e90ea1 100644
--- a/gfx/pokemon/persian/anim_idle.asm
+++ b/gfx/pokemon/persian/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd1ad0
diff --git a/gfx/pokemon/phanpy/anim.asm b/gfx/pokemon/phanpy/anim.asm
index 7ec513762..5504c8881 100644
--- a/gfx/pokemon/phanpy/anim.asm
+++ b/gfx/pokemon/phanpy/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 05
 	dorepeat 3
 	endanim
-; 0xd157e
diff --git a/gfx/pokemon/phanpy/anim_idle.asm b/gfx/pokemon/phanpy/anim_idle.asm
index 43148da49..8318520e3 100644
--- a/gfx/pokemon/phanpy/anim_idle.asm
+++ b/gfx/pokemon/phanpy/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd2160
diff --git a/gfx/pokemon/pichu/anim.asm b/gfx/pokemon/pichu/anim.asm
index 50a1ae73c..32a1cd806 100644
--- a/gfx/pokemon/pichu/anim.asm
+++ b/gfx/pokemon/pichu/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 12
 	frame 4, 08
 	endanim
-; 0xd1289
diff --git a/gfx/pokemon/pichu/anim_idle.asm b/gfx/pokemon/pichu/anim_idle.asm
index dd39adcab..bd13c427d 100644
--- a/gfx/pokemon/pichu/anim_idle.asm
+++ b/gfx/pokemon/pichu/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1f5f
diff --git a/gfx/pokemon/pidgeot/anim.asm b/gfx/pokemon/pidgeot/anim.asm
index 34d5d3a98..ebb3981b8 100644
--- a/gfx/pokemon/pidgeot/anim.asm
+++ b/gfx/pokemon/pidgeot/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 06
 	dorepeat 3
 	endanim
-; 0xd0987
diff --git a/gfx/pokemon/pidgeot/anim_idle.asm b/gfx/pokemon/pidgeot/anim_idle.asm
index 6ba60e83e..a35d5c00a 100644
--- a/gfx/pokemon/pidgeot/anim_idle.asm
+++ b/gfx/pokemon/pidgeot/anim_idle.asm
@@ -6,4 +6,3 @@
 	frame 0, 06
 	frame 2, 06
 	endanim
-; 0xd1961
diff --git a/gfx/pokemon/pidgeotto/anim.asm b/gfx/pokemon/pidgeotto/anim.asm
index 53008855f..5c927ba03 100644
--- a/gfx/pokemon/pidgeotto/anim.asm
+++ b/gfx/pokemon/pidgeotto/anim.asm
@@ -8,4 +8,3 @@
 	dorepeat 5
 	frame 2, 20
 	endanim
-; 0xd097a
diff --git a/gfx/pokemon/pidgeotto/anim_idle.asm b/gfx/pokemon/pidgeotto/anim_idle.asm
index 95a27bb15..936e90ea1 100644
--- a/gfx/pokemon/pidgeotto/anim_idle.asm
+++ b/gfx/pokemon/pidgeotto/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd1952
diff --git a/gfx/pokemon/pidgey/anim.asm b/gfx/pokemon/pidgey/anim.asm
index 4ca6553d2..15080a58c 100644
--- a/gfx/pokemon/pidgey/anim.asm
+++ b/gfx/pokemon/pidgey/anim.asm
@@ -8,4 +8,3 @@
 	frame 1, 03
 	dorepeat 4
 	endanim
-; 0xd0967
diff --git a/gfx/pokemon/pidgey/anim_idle.asm b/gfx/pokemon/pidgey/anim_idle.asm
index 25a55fb45..cb58c18b8 100644
--- a/gfx/pokemon/pidgey/anim_idle.asm
+++ b/gfx/pokemon/pidgey/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 1, 04
 	dorepeat 1
 	endanim
-; 0xd1949
diff --git a/gfx/pokemon/pikachu/anim.asm b/gfx/pokemon/pikachu/anim.asm
index 6a1ac0954..95e22360c 100644
--- a/gfx/pokemon/pikachu/anim.asm
+++ b/gfx/pokemon/pikachu/anim.asm
@@ -9,4 +9,3 @@
 	frame 4, 05
 	dorepeat 7
 	endanim
-; 0xd0a02
diff --git a/gfx/pokemon/pikachu/anim_idle.asm b/gfx/pokemon/pikachu/anim_idle.asm
index 0454a2855..c6473af81 100644
--- a/gfx/pokemon/pikachu/anim_idle.asm
+++ b/gfx/pokemon/pikachu/anim_idle.asm
@@ -7,4 +7,3 @@
 	frame 4, 05
 	dorepeat 5
 	endanim
-; 0xd19ba
diff --git a/gfx/pokemon/piloswine/anim.asm b/gfx/pokemon/piloswine/anim.asm
index 5b57b3ef9..63cef3eeb 100644
--- a/gfx/pokemon/piloswine/anim.asm
+++ b/gfx/pokemon/piloswine/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 10
 	frame 3, 10
 	endanim
-; 0xd14f6
diff --git a/gfx/pokemon/piloswine/anim_idle.asm b/gfx/pokemon/piloswine/anim_idle.asm
index c1cba5ee2..a0b6ceb80 100644
--- a/gfx/pokemon/piloswine/anim_idle.asm
+++ b/gfx/pokemon/piloswine/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 12
 	dorepeat 1
 	endanim
-; 0xd2102
diff --git a/gfx/pokemon/pineco/anim.asm b/gfx/pokemon/pineco/anim.asm
index 4579032ec..7b8a6ed8e 100644
--- a/gfx/pokemon/pineco/anim.asm
+++ b/gfx/pokemon/pineco/anim.asm
@@ -1,4 +1,3 @@
 	frame 1, 06
 	frame 2, 18
 	endanim
-; 0xd1421
diff --git a/gfx/pokemon/pineco/anim_idle.asm b/gfx/pokemon/pineco/anim_idle.asm
index f1b4e949e..c4a056b01 100644
--- a/gfx/pokemon/pineco/anim_idle.asm
+++ b/gfx/pokemon/pineco/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd2077
diff --git a/gfx/pokemon/pinsir/anim.asm b/gfx/pokemon/pinsir/anim.asm
index f45752006..c13e2e27a 100644
--- a/gfx/pokemon/pinsir/anim.asm
+++ b/gfx/pokemon/pinsir/anim.asm
@@ -5,4 +5,3 @@
 	frame 4, 12
 	dorepeat 3
 	endanim
-; 0xd0fe4
diff --git a/gfx/pokemon/pinsir/anim_idle.asm b/gfx/pokemon/pinsir/anim_idle.asm
index 73895c2e0..d849824dd 100644
--- a/gfx/pokemon/pinsir/anim_idle.asm
+++ b/gfx/pokemon/pinsir/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 08
 	dorepeat 1
 	endanim
-; 0xd1d9c
diff --git a/gfx/pokemon/politoed/anim.asm b/gfx/pokemon/politoed/anim.asm
index 72347714f..d1943c1cd 100644
--- a/gfx/pokemon/politoed/anim.asm
+++ b/gfx/pokemon/politoed/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 1, 08
 	endanim
-; 0xd1345
diff --git a/gfx/pokemon/politoed/anim_idle.asm b/gfx/pokemon/politoed/anim_idle.asm
index 8ec01df37..1ebdbfccd 100644
--- a/gfx/pokemon/politoed/anim_idle.asm
+++ b/gfx/pokemon/politoed/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 07
 	dorepeat 1
 	endanim
-; 0xd1fe5
diff --git a/gfx/pokemon/poliwag/anim.asm b/gfx/pokemon/poliwag/anim.asm
index 8446897c0..42c6ea774 100644
--- a/gfx/pokemon/poliwag/anim.asm
+++ b/gfx/pokemon/poliwag/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 08
 	dorepeat 3
 	endanim
-; 0xd0c33
diff --git a/gfx/pokemon/poliwag/anim_idle.asm b/gfx/pokemon/poliwag/anim_idle.asm
index 839e57e87..db42dcc3b 100644
--- a/gfx/pokemon/poliwag/anim_idle.asm
+++ b/gfx/pokemon/poliwag/anim_idle.asm
@@ -7,4 +7,3 @@
 	frame 2, 10
 	dorepeat 5
 	endanim
-; 0xd1b1d
diff --git a/gfx/pokemon/poliwhirl/anim.asm b/gfx/pokemon/poliwhirl/anim.asm
index 14cb89029..f36b75d87 100644
--- a/gfx/pokemon/poliwhirl/anim.asm
+++ b/gfx/pokemon/poliwhirl/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 2, 16
 	endanim
-; 0xd0c42
diff --git a/gfx/pokemon/poliwhirl/anim_idle.asm b/gfx/pokemon/poliwhirl/anim_idle.asm
index 72ba07245..7561e0be7 100644
--- a/gfx/pokemon/poliwhirl/anim_idle.asm
+++ b/gfx/pokemon/poliwhirl/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 05
 	dorepeat 1
 	endanim
-; 0xd1b26
diff --git a/gfx/pokemon/poliwrath/anim.asm b/gfx/pokemon/poliwrath/anim.asm
index 2b5fb0eef..8a864158f 100644
--- a/gfx/pokemon/poliwrath/anim.asm
+++ b/gfx/pokemon/poliwrath/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 08
 	dorepeat 3
 	endanim
-; 0xd0c4f
diff --git a/gfx/pokemon/poliwrath/anim_idle.asm b/gfx/pokemon/poliwrath/anim_idle.asm
index f709ea35c..c4a056b01 100644
--- a/gfx/pokemon/poliwrath/anim_idle.asm
+++ b/gfx/pokemon/poliwrath/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1b2f
diff --git a/gfx/pokemon/ponyta/anim.asm b/gfx/pokemon/ponyta/anim.asm
index 34c3a82b6..68db9d272 100644
--- a/gfx/pokemon/ponyta/anim.asm
+++ b/gfx/pokemon/ponyta/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 06
 	frame 3, 06
 	endanim
-; 0xd0d18
diff --git a/gfx/pokemon/ponyta/anim_idle.asm b/gfx/pokemon/ponyta/anim_idle.asm
index 10c9f42dd..37e81cb0f 100644
--- a/gfx/pokemon/ponyta/anim_idle.asm
+++ b/gfx/pokemon/ponyta/anim_idle.asm
@@ -2,4 +2,3 @@
 	frame 0, 06
 	frame 5, 06
 	endanim
-; 0xd1bc4
diff --git a/gfx/pokemon/porygon/anim.asm b/gfx/pokemon/porygon/anim.asm
index 0246a5621..1130a90c5 100644
--- a/gfx/pokemon/porygon/anim.asm
+++ b/gfx/pokemon/porygon/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 06
 	frame 1, 06
 	endanim
-; 0xd106e
diff --git a/gfx/pokemon/porygon/anim_idle.asm b/gfx/pokemon/porygon/anim_idle.asm
index 89af5d13f..81583f510 100644
--- a/gfx/pokemon/porygon/anim_idle.asm
+++ b/gfx/pokemon/porygon/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 07
 	dorepeat 1
 	endanim
-; 0xd1dfa
diff --git a/gfx/pokemon/porygon2/anim.asm b/gfx/pokemon/porygon2/anim.asm
index b94920e29..4c9454b8e 100644
--- a/gfx/pokemon/porygon2/anim.asm
+++ b/gfx/pokemon/porygon2/anim.asm
@@ -4,4 +4,3 @@
 	frame 0, 06
 	dorepeat 1
 	endanim
-; 0xd1592
diff --git a/gfx/pokemon/porygon2/anim_idle.asm b/gfx/pokemon/porygon2/anim_idle.asm
index b3a029047..68a1d1a79 100644
--- a/gfx/pokemon/porygon2/anim_idle.asm
+++ b/gfx/pokemon/porygon2/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 3, 30
 	endanim
-; 0xd216c
diff --git a/gfx/pokemon/primeape/anim.asm b/gfx/pokemon/primeape/anim.asm
index a2a427059..af8513e25 100644
--- a/gfx/pokemon/primeape/anim.asm
+++ b/gfx/pokemon/primeape/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 05
 	frame 3, 25
 	endanim
-; 0xd0c0c
diff --git a/gfx/pokemon/primeape/anim_idle.asm b/gfx/pokemon/primeape/anim_idle.asm
index 7d1c8a2d7..51fbcca1c 100644
--- a/gfx/pokemon/primeape/anim_idle.asm
+++ b/gfx/pokemon/primeape/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 3, 06
 	dorepeat 3
 	endanim
-; 0xd1af8
diff --git a/gfx/pokemon/psyduck/anim.asm b/gfx/pokemon/psyduck/anim.asm
index da6f3aec6..2d7677a95 100644
--- a/gfx/pokemon/psyduck/anim.asm
+++ b/gfx/pokemon/psyduck/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 14
 	dorepeat 3
 	endanim
-; 0xd0bdd
diff --git a/gfx/pokemon/psyduck/anim_idle.asm b/gfx/pokemon/psyduck/anim_idle.asm
index 2fabc5b19..910725fa2 100644
--- a/gfx/pokemon/psyduck/anim_idle.asm
+++ b/gfx/pokemon/psyduck/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 10
 	dorepeat 1
 	endanim
-; 0xd1ad9
diff --git a/gfx/pokemon/pupitar/anim.asm b/gfx/pokemon/pupitar/anim.asm
index c3ea44bc9..9b945e438 100644
--- a/gfx/pokemon/pupitar/anim.asm
+++ b/gfx/pokemon/pupitar/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 04
 	dorepeat 2
 	endanim
-; 0xd164a
diff --git a/gfx/pokemon/pupitar/anim_idle.asm b/gfx/pokemon/pupitar/anim_idle.asm
index efc0f3bb4..794117de2 100644
--- a/gfx/pokemon/pupitar/anim_idle.asm
+++ b/gfx/pokemon/pupitar/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 2, 04
 	dorepeat 1
 	endanim
-; 0xd21f6
diff --git a/gfx/pokemon/quagsire/anim.asm b/gfx/pokemon/quagsire/anim.asm
index 852780069..b762e54ee 100644
--- a/gfx/pokemon/quagsire/anim.asm
+++ b/gfx/pokemon/quagsire/anim.asm
@@ -3,4 +3,3 @@
 	frame 3, 09
 	frame 4, 09
 	endanim
-; 0xd13a0
diff --git a/gfx/pokemon/quagsire/anim_idle.asm b/gfx/pokemon/quagsire/anim_idle.asm
index f5c2ed31b..258c338de 100644
--- a/gfx/pokemon/quagsire/anim_idle.asm
+++ b/gfx/pokemon/quagsire/anim_idle.asm
@@ -1,4 +1,3 @@
 	frame 2, 35
 	frame 1, 08
 	endanim
-; 0xd2034
diff --git a/gfx/pokemon/quilava/anim.asm b/gfx/pokemon/quilava/anim.asm
index b5df67978..542b846ac 100644
--- a/gfx/pokemon/quilava/anim.asm
+++ b/gfx/pokemon/quilava/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 10
 	frame 4, 08
 	endanim
-; 0xd11a3
diff --git a/gfx/pokemon/quilava/anim_idle.asm b/gfx/pokemon/quilava/anim_idle.asm
index 09f187796..c4a056b01 100644
--- a/gfx/pokemon/quilava/anim_idle.asm
+++ b/gfx/pokemon/quilava/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1ec3
diff --git a/gfx/pokemon/qwilfish/anim.asm b/gfx/pokemon/qwilfish/anim.asm
index 6e5d62d04..ca04aad5f 100644
--- a/gfx/pokemon/qwilfish/anim.asm
+++ b/gfx/pokemon/qwilfish/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 11
 	dorepeat 3
 	endanim
-; 0xd147c
diff --git a/gfx/pokemon/qwilfish/anim_idle.asm b/gfx/pokemon/qwilfish/anim_idle.asm
index 4330e80cc..2ff20cc7c 100644
--- a/gfx/pokemon/qwilfish/anim_idle.asm
+++ b/gfx/pokemon/qwilfish/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 13
 	dorepeat 1
 	endanim
-; 0xd20b0
diff --git a/gfx/pokemon/raichu/anim.asm b/gfx/pokemon/raichu/anim.asm
index a7312c7ae..781c4a86f 100644
--- a/gfx/pokemon/raichu/anim.asm
+++ b/gfx/pokemon/raichu/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 10
 	frame 1, 08
 	endanim
-; 0xd0a0f
diff --git a/gfx/pokemon/raichu/anim_idle.asm b/gfx/pokemon/raichu/anim_idle.asm
index 87f07ce9c..95bdae55e 100644
--- a/gfx/pokemon/raichu/anim_idle.asm
+++ b/gfx/pokemon/raichu/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 0, 04
 	frame 4, 04
 	endanim
-; 0xd19c3
diff --git a/gfx/pokemon/raikou/anim.asm b/gfx/pokemon/raikou/anim.asm
index 91931b3ef..d178a1897 100644
--- a/gfx/pokemon/raikou/anim.asm
+++ b/gfx/pokemon/raikou/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 2, 35
 	endanim
-; 0xd1614
diff --git a/gfx/pokemon/raikou/anim_idle.asm b/gfx/pokemon/raikou/anim_idle.asm
index ec54577cd..e3944e87e 100644
--- a/gfx/pokemon/raikou/anim_idle.asm
+++ b/gfx/pokemon/raikou/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 6, 05
 	frame 4, 30
 	endanim
-; 0xd21ce
diff --git a/gfx/pokemon/rapidash/anim.asm b/gfx/pokemon/rapidash/anim.asm
index 6fe29db8f..4bebac366 100644
--- a/gfx/pokemon/rapidash/anim.asm
+++ b/gfx/pokemon/rapidash/anim.asm
@@ -11,4 +11,3 @@
 	frame 3, 12
 	dorepeat 9
 	endanim
-; 0xd0d31
diff --git a/gfx/pokemon/rapidash/anim_idle.asm b/gfx/pokemon/rapidash/anim_idle.asm
index 0105673c9..ae6a4e5e5 100644
--- a/gfx/pokemon/rapidash/anim_idle.asm
+++ b/gfx/pokemon/rapidash/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 0, 06
 	frame 4, 06
 	endanim
-; 0xd1bcd
diff --git a/gfx/pokemon/raticate/anim.asm b/gfx/pokemon/raticate/anim.asm
index ad6450f27..6707340d0 100644
--- a/gfx/pokemon/raticate/anim.asm
+++ b/gfx/pokemon/raticate/anim.asm
@@ -4,4 +4,3 @@
 	frame 1, 04
 	dorepeat 2
 	endanim
-; 0xd09a3
diff --git a/gfx/pokemon/raticate/anim_idle.asm b/gfx/pokemon/raticate/anim_idle.asm
index 3ff83aa1c..bd7502133 100644
--- a/gfx/pokemon/raticate/anim_idle.asm
+++ b/gfx/pokemon/raticate/anim_idle.asm
@@ -7,4 +7,3 @@
 	frame 1, 04
 	dorepeat 5
 	endanim
-; 0xd197b
diff --git a/gfx/pokemon/rattata/anim.asm b/gfx/pokemon/rattata/anim.asm
index 0c72f16f9..c046396df 100644
--- a/gfx/pokemon/rattata/anim.asm
+++ b/gfx/pokemon/rattata/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 05
 	dorepeat 5
 	endanim
-; 0xd0998
diff --git a/gfx/pokemon/rattata/anim_idle.asm b/gfx/pokemon/rattata/anim_idle.asm
index a760b136e..e31ce4774 100644
--- a/gfx/pokemon/rattata/anim_idle.asm
+++ b/gfx/pokemon/rattata/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd196a
diff --git a/gfx/pokemon/remoraid/anim.asm b/gfx/pokemon/remoraid/anim.asm
index 5fca75d12..1d8608d41 100644
--- a/gfx/pokemon/remoraid/anim.asm
+++ b/gfx/pokemon/remoraid/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 10
 	frame 3, 10
 	endanim
-; 0xd1508
diff --git a/gfx/pokemon/remoraid/anim_idle.asm b/gfx/pokemon/remoraid/anim_idle.asm
index cb14bb7a7..3e2b121c1 100644
--- a/gfx/pokemon/remoraid/anim_idle.asm
+++ b/gfx/pokemon/remoraid/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 07
 	dorepeat 1
 	endanim
-; 0xd2114
diff --git a/gfx/pokemon/rhydon/anim.asm b/gfx/pokemon/rhydon/anim.asm
index 77d736a55..1ae10cbb3 100644
--- a/gfx/pokemon/rhydon/anim.asm
+++ b/gfx/pokemon/rhydon/anim.asm
@@ -7,4 +7,3 @@
 	frame 2, 02
 	dorepeat 5
 	endanim
-; 0xd0f15
diff --git a/gfx/pokemon/rhydon/anim_idle.asm b/gfx/pokemon/rhydon/anim_idle.asm
index b572a54ed..b7c3a8f8b 100644
--- a/gfx/pokemon/rhydon/anim_idle.asm
+++ b/gfx/pokemon/rhydon/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1d0d
diff --git a/gfx/pokemon/rhyhorn/anim.asm b/gfx/pokemon/rhyhorn/anim.asm
index b966557c4..cd944b3d0 100644
--- a/gfx/pokemon/rhyhorn/anim.asm
+++ b/gfx/pokemon/rhyhorn/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 13
 	frame 1, 40
 	endanim
-; 0xd0f04
diff --git a/gfx/pokemon/rhyhorn/anim_idle.asm b/gfx/pokemon/rhyhorn/anim_idle.asm
index 66e53642e..ad96a4b54 100644
--- a/gfx/pokemon/rhyhorn/anim_idle.asm
+++ b/gfx/pokemon/rhyhorn/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 13
 	dorepeat 1
 	endanim
-; 0xd1d04
diff --git a/gfx/pokemon/sandshrew/anim.asm b/gfx/pokemon/sandshrew/anim.asm
index 01827dda4..baf231c60 100644
--- a/gfx/pokemon/sandshrew/anim.asm
+++ b/gfx/pokemon/sandshrew/anim.asm
@@ -10,4 +10,3 @@
 	frame 4, 05
 	dorepeat 8
 	endanim
-; 0xd0a26
diff --git a/gfx/pokemon/sandshrew/anim_idle.asm b/gfx/pokemon/sandshrew/anim_idle.asm
index 545b445bd..544397943 100644
--- a/gfx/pokemon/sandshrew/anim_idle.asm
+++ b/gfx/pokemon/sandshrew/anim_idle.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 4, 13
 	endanim
-; 0xd19ce
diff --git a/gfx/pokemon/sandslash/anim.asm b/gfx/pokemon/sandslash/anim.asm
index 040c0c429..0e20b7720 100644
--- a/gfx/pokemon/sandslash/anim.asm
+++ b/gfx/pokemon/sandslash/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 07
 	frame 2, 08
 	endanim
-; 0xd0a37
diff --git a/gfx/pokemon/sandslash/anim_idle.asm b/gfx/pokemon/sandslash/anim_idle.asm
index b3480762d..730144654 100644
--- a/gfx/pokemon/sandslash/anim_idle.asm
+++ b/gfx/pokemon/sandslash/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 0, 04
 	frame 3, 04
 	endanim
-; 0xd19d7
diff --git a/gfx/pokemon/scizor/anim.asm b/gfx/pokemon/scizor/anim.asm
index d269c91d1..9edfaa902 100644
--- a/gfx/pokemon/scizor/anim.asm
+++ b/gfx/pokemon/scizor/anim.asm
@@ -7,4 +7,3 @@
 	dorepeat 3
 	frame 6, 18
 	endanim
-; 0xd148d
diff --git a/gfx/pokemon/scizor/anim_idle.asm b/gfx/pokemon/scizor/anim_idle.asm
index 744d6cafc..cf66cab97 100644
--- a/gfx/pokemon/scizor/anim_idle.asm
+++ b/gfx/pokemon/scizor/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd20b9
diff --git a/gfx/pokemon/scyther/anim.asm b/gfx/pokemon/scyther/anim.asm
index 572161065..26822a244 100644
--- a/gfx/pokemon/scyther/anim.asm
+++ b/gfx/pokemon/scyther/anim.asm
@@ -6,4 +6,3 @@
 	frame 5, 04
 	dorepeat 4
 	endanim
-; 0xd0fa8
diff --git a/gfx/pokemon/scyther/anim_idle.asm b/gfx/pokemon/scyther/anim_idle.asm
index e251a964d..2c7f8593a 100644
--- a/gfx/pokemon/scyther/anim_idle.asm
+++ b/gfx/pokemon/scyther/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 6, 04
 	dorepeat 1
 	endanim
-; 0xd1d78
diff --git a/gfx/pokemon/seadra/anim.asm b/gfx/pokemon/seadra/anim.asm
index d06adbdb0..b5e4aa4bd 100644
--- a/gfx/pokemon/seadra/anim.asm
+++ b/gfx/pokemon/seadra/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 10
 	dorepeat 1
 	endanim
-; 0xd0f54
diff --git a/gfx/pokemon/seadra/anim_idle.asm b/gfx/pokemon/seadra/anim_idle.asm
index d4c171276..34165feec 100644
--- a/gfx/pokemon/seadra/anim_idle.asm
+++ b/gfx/pokemon/seadra/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 3, 10
 	dorepeat 1
 	endanim
-; 0xd1d40
diff --git a/gfx/pokemon/seaking/anim.asm b/gfx/pokemon/seaking/anim.asm
index a147346e2..76dec6e5d 100644
--- a/gfx/pokemon/seaking/anim.asm
+++ b/gfx/pokemon/seaking/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 12
 	dorepeat 1
 	endanim
-; 0xd0f6c
diff --git a/gfx/pokemon/seaking/anim_idle.asm b/gfx/pokemon/seaking/anim_idle.asm
index 3d949a4bb..ec0b06003 100644
--- a/gfx/pokemon/seaking/anim_idle.asm
+++ b/gfx/pokemon/seaking/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 4, 15
 	dorepeat 1
 	endanim
-; 0xd1d54
diff --git a/gfx/pokemon/seel/anim.asm b/gfx/pokemon/seel/anim.asm
index ea92a35be..bb98ac085 100644
--- a/gfx/pokemon/seel/anim.asm
+++ b/gfx/pokemon/seel/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 10
 	dorepeat 3
 	endanim
-; 0xd0d9f
diff --git a/gfx/pokemon/seel/anim_idle.asm b/gfx/pokemon/seel/anim_idle.asm
index c601e55e5..ef4561990 100644
--- a/gfx/pokemon/seel/anim_idle.asm
+++ b/gfx/pokemon/seel/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 3, 06
 	dorepeat 2
 	endanim
-; 0xd1c1b
diff --git a/gfx/pokemon/sentret/anim.asm b/gfx/pokemon/sentret/anim.asm
index 8080c7303..3a5d02370 100644
--- a/gfx/pokemon/sentret/anim.asm
+++ b/gfx/pokemon/sentret/anim.asm
@@ -3,4 +3,3 @@
 	frame 1, 15
 	dorepeat 1
 	endanim
-; 0xd11e6
diff --git a/gfx/pokemon/sentret/anim_idle.asm b/gfx/pokemon/sentret/anim_idle.asm
index 9fcaecad0..56d5ae829 100644
--- a/gfx/pokemon/sentret/anim_idle.asm
+++ b/gfx/pokemon/sentret/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 2, 07
 	dorepeat 1
 	endanim
-; 0xd1ef2
diff --git a/gfx/pokemon/shellder/anim.asm b/gfx/pokemon/shellder/anim.asm
index 71aa3d358..6968ec667 100644
--- a/gfx/pokemon/shellder/anim.asm
+++ b/gfx/pokemon/shellder/anim.asm
@@ -3,4 +3,3 @@
 	frame 1, 07
 	dorepeat 1
 	endanim
-; 0xd0dc5
diff --git a/gfx/pokemon/shellder/anim_idle.asm b/gfx/pokemon/shellder/anim_idle.asm
index c32e9d19c..e01b67089 100644
--- a/gfx/pokemon/shellder/anim_idle.asm
+++ b/gfx/pokemon/shellder/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	dorepeat 1
 	endanim
-; 0xd1c49
diff --git a/gfx/pokemon/shuckle/anim.asm b/gfx/pokemon/shuckle/anim.asm
index 148d2bf7d..56b962447 100644
--- a/gfx/pokemon/shuckle/anim.asm
+++ b/gfx/pokemon/shuckle/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 05
 	dorepeat 5
 	endanim
-; 0xd149e
diff --git a/gfx/pokemon/shuckle/anim_idle.asm b/gfx/pokemon/shuckle/anim_idle.asm
index 4dd072951..936e90ea1 100644
--- a/gfx/pokemon/shuckle/anim_idle.asm
+++ b/gfx/pokemon/shuckle/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd20c2
diff --git a/gfx/pokemon/skarmory/anim.asm b/gfx/pokemon/skarmory/anim.asm
index 64c2bfaf0..315ad5e5e 100644
--- a/gfx/pokemon/skarmory/anim.asm
+++ b/gfx/pokemon/skarmory/anim.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 1, 08
 	endanim
-; 0xd1544
diff --git a/gfx/pokemon/skarmory/anim_idle.asm b/gfx/pokemon/skarmory/anim_idle.asm
index 1853c881f..4cf1be2b0 100644
--- a/gfx/pokemon/skarmory/anim_idle.asm
+++ b/gfx/pokemon/skarmory/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 07
 	dorepeat 1
 	endanim
-; 0xd2138
diff --git a/gfx/pokemon/skiploom/anim.asm b/gfx/pokemon/skiploom/anim.asm
index 2ab6422e5..6b4f9f79e 100644
--- a/gfx/pokemon/skiploom/anim.asm
+++ b/gfx/pokemon/skiploom/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 14
 	frame 3, 14
 	endanim
-; 0xd1357
diff --git a/gfx/pokemon/skiploom/anim_idle.asm b/gfx/pokemon/skiploom/anim_idle.asm
index d26d1717e..b7c3a8f8b 100644
--- a/gfx/pokemon/skiploom/anim_idle.asm
+++ b/gfx/pokemon/skiploom/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1ff9
diff --git a/gfx/pokemon/slowbro/anim.asm b/gfx/pokemon/slowbro/anim.asm
index cc288a464..f2c809ec7 100644
--- a/gfx/pokemon/slowbro/anim.asm
+++ b/gfx/pokemon/slowbro/anim.asm
@@ -10,4 +10,3 @@
 	frame 0, 10
 	frame 4, 10
 	endanim
-; 0xd0d4f
diff --git a/gfx/pokemon/slowbro/anim_idle.asm b/gfx/pokemon/slowbro/anim_idle.asm
index 9e793ee00..cf66cab97 100644
--- a/gfx/pokemon/slowbro/anim_idle.asm
+++ b/gfx/pokemon/slowbro/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd1bd9
diff --git a/gfx/pokemon/slowking/anim.asm b/gfx/pokemon/slowking/anim.asm
index d7ab700bd..3ecdf5932 100644
--- a/gfx/pokemon/slowking/anim.asm
+++ b/gfx/pokemon/slowking/anim.asm
@@ -8,4 +8,3 @@
 	frame 1, 06
 	dorepeat 6
 	endanim
-; 0xd13e2
diff --git a/gfx/pokemon/slowking/anim_idle.asm b/gfx/pokemon/slowking/anim_idle.asm
index 36fd7cd7a..63de841b2 100644
--- a/gfx/pokemon/slowking/anim_idle.asm
+++ b/gfx/pokemon/slowking/anim_idle.asm
@@ -1,4 +1,3 @@
 	frame 1, 07
 	frame 2, 50
 	endanim
-; 0xd2054
diff --git a/gfx/pokemon/slowpoke/anim.asm b/gfx/pokemon/slowpoke/anim.asm
index fa391743c..eff22bbc2 100644
--- a/gfx/pokemon/slowpoke/anim.asm
+++ b/gfx/pokemon/slowpoke/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 28
 	frame 1, 10
 	endanim
-; 0xd0d38
diff --git a/gfx/pokemon/slowpoke/anim_idle.asm b/gfx/pokemon/slowpoke/anim_idle.asm
index 805a281c5..63ef32f7c 100644
--- a/gfx/pokemon/slowpoke/anim_idle.asm
+++ b/gfx/pokemon/slowpoke/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 3, 20
 	endanim
-; 0xd1bd0
diff --git a/gfx/pokemon/slugma/anim.asm b/gfx/pokemon/slugma/anim.asm
index 1c867ec37..da3f2f4ff 100644
--- a/gfx/pokemon/slugma/anim.asm
+++ b/gfx/pokemon/slugma/anim.asm
@@ -7,4 +7,3 @@
 	frame 8, 06
 	frame 0, 14
 	endanim
-; 0xd14d9
diff --git a/gfx/pokemon/slugma/anim_idle.asm b/gfx/pokemon/slugma/anim_idle.asm
index 5bfe4e799..5721310cf 100644
--- a/gfx/pokemon/slugma/anim_idle.asm
+++ b/gfx/pokemon/slugma/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 08
 	dorepeat 1
 	endanim
-; 0xd20ed
diff --git a/gfx/pokemon/smeargle/anim.asm b/gfx/pokemon/smeargle/anim.asm
index 2144197fc..c91168b7a 100644
--- a/gfx/pokemon/smeargle/anim.asm
+++ b/gfx/pokemon/smeargle/anim.asm
@@ -4,4 +4,3 @@
 	frame 1, 07
 	dorepeat 1
 	endanim
-; 0xd15ac
diff --git a/gfx/pokemon/smeargle/anim_idle.asm b/gfx/pokemon/smeargle/anim_idle.asm
index 178b14959..e991ac49f 100644
--- a/gfx/pokemon/smeargle/anim_idle.asm
+++ b/gfx/pokemon/smeargle/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	dorepeat 1
 	endanim
-; 0xd217e
diff --git a/gfx/pokemon/smoochum/anim.asm b/gfx/pokemon/smoochum/anim.asm
index 39f5e7ebe..ce9aec6ac 100644
--- a/gfx/pokemon/smoochum/anim.asm
+++ b/gfx/pokemon/smoochum/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 08
 	frame 3, 24
 	endanim
-; 0xd15cd
diff --git a/gfx/pokemon/smoochum/anim_idle.asm b/gfx/pokemon/smoochum/anim_idle.asm
index 5ba02f113..269e3fad3 100644
--- a/gfx/pokemon/smoochum/anim_idle.asm
+++ b/gfx/pokemon/smoochum/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 1, 06
 	dorepeat 1
 	endanim
-; 0xd219b
diff --git a/gfx/pokemon/sneasel/anim.asm b/gfx/pokemon/sneasel/anim.asm
index 5b7f3fb79..7e50e4d73 100644
--- a/gfx/pokemon/sneasel/anim.asm
+++ b/gfx/pokemon/sneasel/anim.asm
@@ -1,4 +1,3 @@
 	frame 1, 04
 	frame 2, 30
 	endanim
-; 0xd14aa
diff --git a/gfx/pokemon/sneasel/anim_idle.asm b/gfx/pokemon/sneasel/anim_idle.asm
index 1d3e3a41d..5c0fc9f55 100644
--- a/gfx/pokemon/sneasel/anim_idle.asm
+++ b/gfx/pokemon/sneasel/anim_idle.asm
@@ -2,4 +2,3 @@
 	frame 0, 09
 	frame 4, 08
 	endanim
-; 0xd20d2
diff --git a/gfx/pokemon/snorlax/anim.asm b/gfx/pokemon/snorlax/anim.asm
index 3825f3bca..76c76173f 100644
--- a/gfx/pokemon/snorlax/anim.asm
+++ b/gfx/pokemon/snorlax/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 09
 	dorepeat 5
 	endanim
-; 0xd10b2
diff --git a/gfx/pokemon/snorlax/anim_idle.asm b/gfx/pokemon/snorlax/anim_idle.asm
index 4969f8f1f..448408fe7 100644
--- a/gfx/pokemon/snorlax/anim_idle.asm
+++ b/gfx/pokemon/snorlax/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 10
 	dorepeat 1
 	endanim
-; 0xd1e34
diff --git a/gfx/pokemon/snubbull/anim.asm b/gfx/pokemon/snubbull/anim.asm
index d97f9b354..de1e22ed2 100644
--- a/gfx/pokemon/snubbull/anim.asm
+++ b/gfx/pokemon/snubbull/anim.asm
@@ -8,4 +8,3 @@
 	frame 0, 08
 	dorepeat 6
 	endanim
-; 0xd1462
diff --git a/gfx/pokemon/snubbull/anim_idle.asm b/gfx/pokemon/snubbull/anim_idle.asm
index 08cae5b71..4b4e09954 100644
--- a/gfx/pokemon/snubbull/anim_idle.asm
+++ b/gfx/pokemon/snubbull/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 12
 	dorepeat 1
 	endanim
-; 0xd209e
diff --git a/gfx/pokemon/spearow/anim.asm b/gfx/pokemon/spearow/anim.asm
index 35780c784..ac9318690 100644
--- a/gfx/pokemon/spearow/anim.asm
+++ b/gfx/pokemon/spearow/anim.asm
@@ -8,4 +8,3 @@
 	frame 4, 04
 	dorepeat 6
 	endanim
-; 0xd09b6
diff --git a/gfx/pokemon/spearow/anim_idle.asm b/gfx/pokemon/spearow/anim_idle.asm
index ed487ecc3..060340de6 100644
--- a/gfx/pokemon/spearow/anim_idle.asm
+++ b/gfx/pokemon/spearow/anim_idle.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 6, 07
 	endanim
-; 0xd1986
diff --git a/gfx/pokemon/spinarak/anim.asm b/gfx/pokemon/spinarak/anim.asm
index be299fc49..ecc0e85e8 100644
--- a/gfx/pokemon/spinarak/anim.asm
+++ b/gfx/pokemon/spinarak/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 05
 	dorepeat 3
 	endanim
-; 0xd1240
diff --git a/gfx/pokemon/spinarak/anim_idle.asm b/gfx/pokemon/spinarak/anim_idle.asm
index c605578ef..cf66cab97 100644
--- a/gfx/pokemon/spinarak/anim_idle.asm
+++ b/gfx/pokemon/spinarak/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd1f2e
diff --git a/gfx/pokemon/squirtle/anim.asm b/gfx/pokemon/squirtle/anim.asm
index 9969d4263..2b2072d21 100644
--- a/gfx/pokemon/squirtle/anim.asm
+++ b/gfx/pokemon/squirtle/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 15
 	frame 4, 05
 	endanim
-; 0xd08f2
diff --git a/gfx/pokemon/squirtle/anim_idle.asm b/gfx/pokemon/squirtle/anim_idle.asm
index de24c37a6..7561e0be7 100644
--- a/gfx/pokemon/squirtle/anim_idle.asm
+++ b/gfx/pokemon/squirtle/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 05
 	dorepeat 1
 	endanim
-; 0xd18de
diff --git a/gfx/pokemon/stantler/anim.asm b/gfx/pokemon/stantler/anim.asm
index 8f4c133d8..c4a17df01 100644
--- a/gfx/pokemon/stantler/anim.asm
+++ b/gfx/pokemon/stantler/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 08
 	frame 2, 08
 	endanim
-; 0xd15a1
diff --git a/gfx/pokemon/stantler/anim_idle.asm b/gfx/pokemon/stantler/anim_idle.asm
index 7444d761a..792fead16 100644
--- a/gfx/pokemon/stantler/anim_idle.asm
+++ b/gfx/pokemon/stantler/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	dorepeat 1
 	endanim
-; 0xd2175
diff --git a/gfx/pokemon/starmie/anim.asm b/gfx/pokemon/starmie/anim.asm
index c81477807..6fc894b78 100644
--- a/gfx/pokemon/starmie/anim.asm
+++ b/gfx/pokemon/starmie/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 07
 	frame 3, 07
 	endanim
-; 0xd0f86
diff --git a/gfx/pokemon/starmie/anim_idle.asm b/gfx/pokemon/starmie/anim_idle.asm
index 7508e6e10..0560a4280 100644
--- a/gfx/pokemon/starmie/anim_idle.asm
+++ b/gfx/pokemon/starmie/anim_idle.asm
@@ -2,4 +2,3 @@
 	frame 3, 08
 	dorepeat 1
 	endanim
-; 0xd1d66
diff --git a/gfx/pokemon/staryu/anim.asm b/gfx/pokemon/staryu/anim.asm
index d257949e7..02c65458d 100644
--- a/gfx/pokemon/staryu/anim.asm
+++ b/gfx/pokemon/staryu/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 04
 	frame 2, 04
 	endanim
-; 0xd0f79
diff --git a/gfx/pokemon/staryu/anim_idle.asm b/gfx/pokemon/staryu/anim_idle.asm
index 184806574..d61a8b356 100644
--- a/gfx/pokemon/staryu/anim_idle.asm
+++ b/gfx/pokemon/staryu/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 3, 04
 	dorepeat 1
 	endanim
-; 0xd1d5f
diff --git a/gfx/pokemon/steelix/anim.asm b/gfx/pokemon/steelix/anim.asm
index 9acb2af0a..5b6a63c64 100644
--- a/gfx/pokemon/steelix/anim.asm
+++ b/gfx/pokemon/steelix/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 08
 	frame 1, 06
 	endanim
-; 0xd144f
diff --git a/gfx/pokemon/steelix/anim_idle.asm b/gfx/pokemon/steelix/anim_idle.asm
index 3c1de78fb..cf66cab97 100644
--- a/gfx/pokemon/steelix/anim_idle.asm
+++ b/gfx/pokemon/steelix/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd2095
diff --git a/gfx/pokemon/sudowoodo/anim.asm b/gfx/pokemon/sudowoodo/anim.asm
index 8e974a074..0e78f3017 100644
--- a/gfx/pokemon/sudowoodo/anim.asm
+++ b/gfx/pokemon/sudowoodo/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 10
 	dorepeat 1
 	endanim
-; 0xd1336
diff --git a/gfx/pokemon/sudowoodo/anim_idle.asm b/gfx/pokemon/sudowoodo/anim_idle.asm
index e42e960f9..ebed78bc3 100644
--- a/gfx/pokemon/sudowoodo/anim_idle.asm
+++ b/gfx/pokemon/sudowoodo/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 09
 	dorepeat 1
 	endanim
-; 0xd1fdc
diff --git a/gfx/pokemon/suicune/anim.asm b/gfx/pokemon/suicune/anim.asm
index 0f2528116..b44b77ff3 100644
--- a/gfx/pokemon/suicune/anim.asm
+++ b/gfx/pokemon/suicune/anim.asm
@@ -10,4 +10,3 @@
 	frame 0, 03
 	dorepeat 6
 	endanim
-; 0xd1634
diff --git a/gfx/pokemon/suicune/anim_idle.asm b/gfx/pokemon/suicune/anim_idle.asm
index 9e018683a..82df78d5e 100644
--- a/gfx/pokemon/suicune/anim_idle.asm
+++ b/gfx/pokemon/suicune/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 9, 06
 	dorepeat 2
 	endanim
-; 0xd21e2
diff --git a/gfx/pokemon/sunflora/anim.asm b/gfx/pokemon/sunflora/anim.asm
index aad8ddadd..32eade1b7 100644
--- a/gfx/pokemon/sunflora/anim.asm
+++ b/gfx/pokemon/sunflora/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 06
 	frame 3, 16
 	endanim
-; 0xd137b
diff --git a/gfx/pokemon/sunflora/anim_idle.asm b/gfx/pokemon/sunflora/anim_idle.asm
index e78d5449e..cf66cab97 100644
--- a/gfx/pokemon/sunflora/anim_idle.asm
+++ b/gfx/pokemon/sunflora/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd201d
diff --git a/gfx/pokemon/sunkern/anim.asm b/gfx/pokemon/sunkern/anim.asm
index c282b1fb2..b5d20276b 100644
--- a/gfx/pokemon/sunkern/anim.asm
+++ b/gfx/pokemon/sunkern/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 04
 	dorepeat 2
 	endanim
-; 0xd1374
diff --git a/gfx/pokemon/sunkern/anim_idle.asm b/gfx/pokemon/sunkern/anim_idle.asm
index f92d267a1..c4a056b01 100644
--- a/gfx/pokemon/sunkern/anim_idle.asm
+++ b/gfx/pokemon/sunkern/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd2014
diff --git a/gfx/pokemon/swinub/anim.asm b/gfx/pokemon/swinub/anim.asm
index f1d93138a..6fedf291a 100644
--- a/gfx/pokemon/swinub/anim.asm
+++ b/gfx/pokemon/swinub/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 09
 	dorepeat 2
 	endanim
-; 0xd14ef
diff --git a/gfx/pokemon/swinub/anim_idle.asm b/gfx/pokemon/swinub/anim_idle.asm
index 5fe97a2ba..81583f510 100644
--- a/gfx/pokemon/swinub/anim_idle.asm
+++ b/gfx/pokemon/swinub/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 07
 	dorepeat 1
 	endanim
-; 0xd20f9
diff --git a/gfx/pokemon/tangela/anim.asm b/gfx/pokemon/tangela/anim.asm
index 57a237afe..83ef5b724 100644
--- a/gfx/pokemon/tangela/anim.asm
+++ b/gfx/pokemon/tangela/anim.asm
@@ -2,4 +2,3 @@
 	frame 0, 24
 	frame 2, 10
 	endanim
-; 0xd0f2d
diff --git a/gfx/pokemon/tangela/anim_idle.asm b/gfx/pokemon/tangela/anim_idle.asm
index 7d8b2550f..93bb36fb2 100644
--- a/gfx/pokemon/tangela/anim_idle.asm
+++ b/gfx/pokemon/tangela/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 2, 06
 	dorepeat 1
 	endanim
-; 0xd1d1f
diff --git a/gfx/pokemon/tauros/anim.asm b/gfx/pokemon/tauros/anim.asm
index 52c9264c3..2fc758437 100644
--- a/gfx/pokemon/tauros/anim.asm
+++ b/gfx/pokemon/tauros/anim.asm
@@ -8,4 +8,3 @@
 	dorepeat 5
 	frame 1, 07
 	endanim
-; 0xd0ff7
diff --git a/gfx/pokemon/tauros/anim_idle.asm b/gfx/pokemon/tauros/anim_idle.asm
index ab6608d0d..ac0d93c61 100644
--- a/gfx/pokemon/tauros/anim_idle.asm
+++ b/gfx/pokemon/tauros/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd1da5
diff --git a/gfx/pokemon/teddiursa/anim.asm b/gfx/pokemon/teddiursa/anim.asm
index 78bbeae60..3491331fa 100644
--- a/gfx/pokemon/teddiursa/anim.asm
+++ b/gfx/pokemon/teddiursa/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 10
 	dorepeat 4
 	endanim
-; 0xd14b9
diff --git a/gfx/pokemon/teddiursa/anim_idle.asm b/gfx/pokemon/teddiursa/anim_idle.asm
index 85cae5284..ac0d93c61 100644
--- a/gfx/pokemon/teddiursa/anim_idle.asm
+++ b/gfx/pokemon/teddiursa/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 06
 	dorepeat 1
 	endanim
-; 0xd20db
diff --git a/gfx/pokemon/tentacool/anim.asm b/gfx/pokemon/tentacool/anim.asm
index 19b7d3a14..72da38556 100644
--- a/gfx/pokemon/tentacool/anim.asm
+++ b/gfx/pokemon/tentacool/anim.asm
@@ -3,4 +3,3 @@
 	frame 4, 10
 	frame 5, 16
 	endanim
-; 0xd0cd3
diff --git a/gfx/pokemon/tentacool/anim_idle.asm b/gfx/pokemon/tentacool/anim_idle.asm
index 4e9ba0b11..792fead16 100644
--- a/gfx/pokemon/tentacool/anim_idle.asm
+++ b/gfx/pokemon/tentacool/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	dorepeat 1
 	endanim
-; 0xd1b95
diff --git a/gfx/pokemon/tentacruel/anim.asm b/gfx/pokemon/tentacruel/anim.asm
index 4fed8e9d4..0aeaa2969 100644
--- a/gfx/pokemon/tentacruel/anim.asm
+++ b/gfx/pokemon/tentacruel/anim.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 2, 08
 	endanim
-; 0xd0cde
diff --git a/gfx/pokemon/tentacruel/anim_idle.asm b/gfx/pokemon/tentacruel/anim_idle.asm
index fd8d510b4..f0f2ae343 100644
--- a/gfx/pokemon/tentacruel/anim_idle.asm
+++ b/gfx/pokemon/tentacruel/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 3, 03
 	dorepeat 2
 	endanim
-; 0xd1ba0
diff --git a/gfx/pokemon/togepi/anim.asm b/gfx/pokemon/togepi/anim.asm
index a09192323..56c5c2123 100644
--- a/gfx/pokemon/togepi/anim.asm
+++ b/gfx/pokemon/togepi/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 06
 	frame 2, 06
 	endanim
-; 0xd12a6
diff --git a/gfx/pokemon/togepi/anim_idle.asm b/gfx/pokemon/togepi/anim_idle.asm
index e3bd76591..93bb36fb2 100644
--- a/gfx/pokemon/togepi/anim_idle.asm
+++ b/gfx/pokemon/togepi/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 2, 06
 	dorepeat 1
 	endanim
-; 0xd1f7a
diff --git a/gfx/pokemon/togetic/anim.asm b/gfx/pokemon/togetic/anim.asm
index cd1ac8f9b..1ed0353ff 100644
--- a/gfx/pokemon/togetic/anim.asm
+++ b/gfx/pokemon/togetic/anim.asm
@@ -5,4 +5,3 @@
 	frame 4, 09
 	dorepeat 3
 	endanim
-; 0xd12b3
diff --git a/gfx/pokemon/togetic/anim_idle.asm b/gfx/pokemon/togetic/anim_idle.asm
index 543befa82..c4a056b01 100644
--- a/gfx/pokemon/togetic/anim_idle.asm
+++ b/gfx/pokemon/togetic/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1f83
diff --git a/gfx/pokemon/totodile/anim.asm b/gfx/pokemon/totodile/anim.asm
index c320f4646..cf77dd699 100644
--- a/gfx/pokemon/totodile/anim.asm
+++ b/gfx/pokemon/totodile/anim.asm
@@ -7,4 +7,3 @@
 	frame 2, 10
 	dorepeat 5
 	endanim
-; 0xd11c7
diff --git a/gfx/pokemon/totodile/anim_idle.asm b/gfx/pokemon/totodile/anim_idle.asm
index 35379db93..52df376f0 100644
--- a/gfx/pokemon/totodile/anim_idle.asm
+++ b/gfx/pokemon/totodile/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 3, 06
 	dorepeat 2
 	endanim
-; 0xd1ed7
diff --git a/gfx/pokemon/typhlosion/anim.asm b/gfx/pokemon/typhlosion/anim.asm
index bb4b30d6c..576e73373 100644
--- a/gfx/pokemon/typhlosion/anim.asm
+++ b/gfx/pokemon/typhlosion/anim.asm
@@ -8,4 +8,3 @@
 	frame 1, 03
 	dorepeat 6
 	endanim
-; 0xd11b6
diff --git a/gfx/pokemon/typhlosion/anim_idle.asm b/gfx/pokemon/typhlosion/anim_idle.asm
index 2f7ed3abc..4da4517c5 100644
--- a/gfx/pokemon/typhlosion/anim_idle.asm
+++ b/gfx/pokemon/typhlosion/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 08
 	dorepeat 1
 	endanim
-; 0xd1ecc
diff --git a/gfx/pokemon/tyranitar/anim.asm b/gfx/pokemon/tyranitar/anim.asm
index f345bdd8e..c665e088f 100644
--- a/gfx/pokemon/tyranitar/anim.asm
+++ b/gfx/pokemon/tyranitar/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 16
 	frame 4, 16
 	endanim
-; 0xd1659
diff --git a/gfx/pokemon/tyranitar/anim_idle.asm b/gfx/pokemon/tyranitar/anim_idle.asm
index 29788fd1d..5721310cf 100644
--- a/gfx/pokemon/tyranitar/anim_idle.asm
+++ b/gfx/pokemon/tyranitar/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 08
 	dorepeat 1
 	endanim
-; 0xd21ff
diff --git a/gfx/pokemon/tyrogue/anim.asm b/gfx/pokemon/tyrogue/anim.asm
index e1470d816..3c8a3ee8b 100644
--- a/gfx/pokemon/tyrogue/anim.asm
+++ b/gfx/pokemon/tyrogue/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 06
 	dorepeat 2
 	endanim
-; 0xd15b7
diff --git a/gfx/pokemon/tyrogue/anim_idle.asm b/gfx/pokemon/tyrogue/anim_idle.asm
index da73f62e3..a0c4f2fb1 100644
--- a/gfx/pokemon/tyrogue/anim_idle.asm
+++ b/gfx/pokemon/tyrogue/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd2187
diff --git a/gfx/pokemon/umbreon/anim.asm b/gfx/pokemon/umbreon/anim.asm
index 541539979..3f0ec81bf 100644
--- a/gfx/pokemon/umbreon/anim.asm
+++ b/gfx/pokemon/umbreon/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 2, 30
 	endanim
-; 0xd13be
diff --git a/gfx/pokemon/umbreon/anim_idle.asm b/gfx/pokemon/umbreon/anim_idle.asm
index adb0158e2..91a8ce13d 100644
--- a/gfx/pokemon/umbreon/anim_idle.asm
+++ b/gfx/pokemon/umbreon/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 04
 	dorepeat 1
 	endanim
-; 0xd2046
diff --git a/gfx/pokemon/unown/anim.asm b/gfx/pokemon/unown/anim.asm
index 510d2751c..3756c413d 100644
--- a/gfx/pokemon/unown/anim.asm
+++ b/gfx/pokemon/unown/anim.asm
@@ -9,4 +9,3 @@
 	frame 9, 05
 	frame 10, 05
 	endanim
-; 0xd13fe
diff --git a/gfx/pokemon/unown/anim_idle.asm b/gfx/pokemon/unown/anim_idle.asm
index 3d0f65488..73db06df1 100644
--- a/gfx/pokemon/unown/anim_idle.asm
+++ b/gfx/pokemon/unown/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 11, 05
 	dorepeat 1
 	endanim
-; 0xd2066
diff --git a/gfx/pokemon/unown/bitmask.asm b/gfx/pokemon/unown/bitmask.asm
index f0ae4e5b2..91a562a1a 100644
--- a/gfx/pokemon/unown/bitmask.asm
+++ b/gfx/pokemon/unown/bitmask.asm
@@ -28,4 +28,3 @@
 	db %00010000
 	db %00000000
 	db %00000000
-; 0xd36ab
diff --git a/gfx/pokemon/unown/frames.asm b/gfx/pokemon/unown/frames.asm
index ca996e90a..b176918df 100644
--- a/gfx/pokemon/unown/frames.asm
+++ b/gfx/pokemon/unown/frames.asm
@@ -42,4 +42,3 @@
 .frame11
 	db $05 ; bitmask
 	db $27
-; 0xd8e5e
diff --git a/gfx/pokemon/unown_a/anim.asm b/gfx/pokemon/unown_a/anim.asm
index 7243ed0fb..add08b24d 100644
--- a/gfx/pokemon/unown_a/anim.asm
+++ b/gfx/pokemon/unown_a/anim.asm
@@ -10,4 +10,3 @@
 	frame 0, 07
 	dorepeat 6
 	endanim
-; 0xd2274
diff --git a/gfx/pokemon/unown_a/anim_idle.asm b/gfx/pokemon/unown_a/anim_idle.asm
index d995ba44d..ec5f6fbcd 100644
--- a/gfx/pokemon/unown_a/anim_idle.asm
+++ b/gfx/pokemon/unown_a/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 06
 	dorepeat 1
 	endanim
-; 0xd240e
diff --git a/gfx/pokemon/unown_anims.asm b/gfx/pokemon/unown_anims.asm
index ea4d46410..6e8d251d5 100644
--- a/gfx/pokemon/unown_anims.asm
+++ b/gfx/pokemon/unown_anims.asm
@@ -1,4 +1,5 @@
-UnownAnimations:
+UnownAnimations: ; used only for BANK(UnownAnimations)
+
 UnownAAnimation: INCLUDE "gfx/pokemon/unown_a/anim.asm"
 UnownBAnimation: INCLUDE "gfx/pokemon/unown_b/anim.asm"
 UnownCAnimation: INCLUDE "gfx/pokemon/unown_c/anim.asm"
diff --git a/gfx/pokemon/unown_b/anim.asm b/gfx/pokemon/unown_b/anim.asm
index 7683b9e84..abb3bdbfa 100644
--- a/gfx/pokemon/unown_b/anim.asm
+++ b/gfx/pokemon/unown_b/anim.asm
@@ -6,4 +6,3 @@
 	frame 5, 04
 	dorepeat 4
 	endanim
-; 0xd2283
diff --git a/gfx/pokemon/unown_b/anim_idle.asm b/gfx/pokemon/unown_b/anim_idle.asm
index b8e03b299..4719fd887 100644
--- a/gfx/pokemon/unown_b/anim_idle.asm
+++ b/gfx/pokemon/unown_b/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 6, 04
 	dorepeat 1
 	endanim
-; 0xd2417
diff --git a/gfx/pokemon/unown_c/anim.asm b/gfx/pokemon/unown_c/anim.asm
index 1e8b894ab..8916229c1 100644
--- a/gfx/pokemon/unown_c/anim.asm
+++ b/gfx/pokemon/unown_c/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 04
 	dorepeat 4
 	endanim
-; 0xd2292
diff --git a/gfx/pokemon/unown_c/anim_idle.asm b/gfx/pokemon/unown_c/anim_idle.asm
index fcf07ced3..936e90ea1 100644
--- a/gfx/pokemon/unown_c/anim_idle.asm
+++ b/gfx/pokemon/unown_c/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd2420
diff --git a/gfx/pokemon/unown_d/anim.asm b/gfx/pokemon/unown_d/anim.asm
index 51c3b2de1..a9a77fef8 100644
--- a/gfx/pokemon/unown_d/anim.asm
+++ b/gfx/pokemon/unown_d/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 08
 	dorepeat 1
 	endanim
-; 0xd229f
diff --git a/gfx/pokemon/unown_d/anim_idle.asm b/gfx/pokemon/unown_d/anim_idle.asm
index 17604ce36..8318520e3 100644
--- a/gfx/pokemon/unown_d/anim_idle.asm
+++ b/gfx/pokemon/unown_d/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd2429
diff --git a/gfx/pokemon/unown_e/anim.asm b/gfx/pokemon/unown_e/anim.asm
index 0a58feb4d..3f67806c5 100644
--- a/gfx/pokemon/unown_e/anim.asm
+++ b/gfx/pokemon/unown_e/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 02
 	dorepeat 4
 	endanim
-; 0xd22ae
diff --git a/gfx/pokemon/unown_e/anim_idle.asm b/gfx/pokemon/unown_e/anim_idle.asm
index 53db93c1f..8318520e3 100644
--- a/gfx/pokemon/unown_e/anim_idle.asm
+++ b/gfx/pokemon/unown_e/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd2432
diff --git a/gfx/pokemon/unown_f/anim.asm b/gfx/pokemon/unown_f/anim.asm
index f81c298a6..2423675a1 100644
--- a/gfx/pokemon/unown_f/anim.asm
+++ b/gfx/pokemon/unown_f/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 08
 	dorepeat 5
 	endanim
-; 0xd22bf
diff --git a/gfx/pokemon/unown_f/anim_idle.asm b/gfx/pokemon/unown_f/anim_idle.asm
index a75176981..936e90ea1 100644
--- a/gfx/pokemon/unown_f/anim_idle.asm
+++ b/gfx/pokemon/unown_f/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd243b
diff --git a/gfx/pokemon/unown_frames.asm b/gfx/pokemon/unown_frames.asm
index 7b7c5bc7e..d5ed3d621 100644
--- a/gfx/pokemon/unown_frames.asm
+++ b/gfx/pokemon/unown_frames.asm
@@ -1,4 +1,5 @@
-UnownsFrames:
+UnownsFrames: ; used only for BANK(UnownsFrames)
+
 UnownAFrames: INCLUDE "gfx/pokemon/unown_a/frames.asm"
 UnownBFrames: INCLUDE "gfx/pokemon/unown_b/frames.asm"
 UnownCFrames: INCLUDE "gfx/pokemon/unown_c/frames.asm"
diff --git a/gfx/pokemon/unown_g/anim.asm b/gfx/pokemon/unown_g/anim.asm
index 48100274f..39310ee33 100644
--- a/gfx/pokemon/unown_g/anim.asm
+++ b/gfx/pokemon/unown_g/anim.asm
@@ -4,4 +4,3 @@
 	frame 0, 06
 	dorepeat 1
 	endanim
-; 0xd22ca
diff --git a/gfx/pokemon/unown_g/anim_idle.asm b/gfx/pokemon/unown_g/anim_idle.asm
index 45906aed4..8318520e3 100644
--- a/gfx/pokemon/unown_g/anim_idle.asm
+++ b/gfx/pokemon/unown_g/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd2444
diff --git a/gfx/pokemon/unown_h/anim.asm b/gfx/pokemon/unown_h/anim.asm
index fdee3822b..f094dcadb 100644
--- a/gfx/pokemon/unown_h/anim.asm
+++ b/gfx/pokemon/unown_h/anim.asm
@@ -8,4 +8,3 @@
 	frame 3, 02
 	frame 4, 02
 	endanim
-; 0xd22dd
diff --git a/gfx/pokemon/unown_h/anim_idle.asm b/gfx/pokemon/unown_h/anim_idle.asm
index e6fb90d5e..7561e0be7 100644
--- a/gfx/pokemon/unown_h/anim_idle.asm
+++ b/gfx/pokemon/unown_h/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 05
 	dorepeat 1
 	endanim
-; 0xd244d
diff --git a/gfx/pokemon/unown_i/anim.asm b/gfx/pokemon/unown_i/anim.asm
index 38e19a0c9..8bd24ff25 100644
--- a/gfx/pokemon/unown_i/anim.asm
+++ b/gfx/pokemon/unown_i/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 05
 	dorepeat 1
 	endanim
-; 0xd22ea
diff --git a/gfx/pokemon/unown_i/anim_idle.asm b/gfx/pokemon/unown_i/anim_idle.asm
index 1d5ce67ad..8318520e3 100644
--- a/gfx/pokemon/unown_i/anim_idle.asm
+++ b/gfx/pokemon/unown_i/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd2456
diff --git a/gfx/pokemon/unown_j/anim.asm b/gfx/pokemon/unown_j/anim.asm
index 3a7467d45..e93864c00 100644
--- a/gfx/pokemon/unown_j/anim.asm
+++ b/gfx/pokemon/unown_j/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 05
 	dorepeat 1
 	endanim
-; 0xd22f7
diff --git a/gfx/pokemon/unown_j/anim_idle.asm b/gfx/pokemon/unown_j/anim_idle.asm
index d46b36028..8318520e3 100644
--- a/gfx/pokemon/unown_j/anim_idle.asm
+++ b/gfx/pokemon/unown_j/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd245f
diff --git a/gfx/pokemon/unown_k/anim.asm b/gfx/pokemon/unown_k/anim.asm
index 0948f212d..1f707a071 100644
--- a/gfx/pokemon/unown_k/anim.asm
+++ b/gfx/pokemon/unown_k/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 07
 	dorepeat 1
 	endanim
-; 0xd2304
diff --git a/gfx/pokemon/unown_k/anim_idle.asm b/gfx/pokemon/unown_k/anim_idle.asm
index 8f8a4acb1..8318520e3 100644
--- a/gfx/pokemon/unown_k/anim_idle.asm
+++ b/gfx/pokemon/unown_k/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd2468
diff --git a/gfx/pokemon/unown_l/anim.asm b/gfx/pokemon/unown_l/anim.asm
index 7b4e5e21c..d724203ca 100644
--- a/gfx/pokemon/unown_l/anim.asm
+++ b/gfx/pokemon/unown_l/anim.asm
@@ -9,4 +9,3 @@
 	frame 4, 12
 	frame 3, 11
 	endanim
-; 0xd2319
diff --git a/gfx/pokemon/unown_l/anim_idle.asm b/gfx/pokemon/unown_l/anim_idle.asm
index 859dec2ec..7561e0be7 100644
--- a/gfx/pokemon/unown_l/anim_idle.asm
+++ b/gfx/pokemon/unown_l/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 05
 	dorepeat 1
 	endanim
-; 0xd2471
diff --git a/gfx/pokemon/unown_m/anim.asm b/gfx/pokemon/unown_m/anim.asm
index bb5292446..150048150 100644
--- a/gfx/pokemon/unown_m/anim.asm
+++ b/gfx/pokemon/unown_m/anim.asm
@@ -9,4 +9,3 @@
 	frame 1, 02
 	dorepeat 5
 	endanim
-; 0xd232e
diff --git a/gfx/pokemon/unown_m/anim_idle.asm b/gfx/pokemon/unown_m/anim_idle.asm
index 710300f20..8318520e3 100644
--- a/gfx/pokemon/unown_m/anim_idle.asm
+++ b/gfx/pokemon/unown_m/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd247a
diff --git a/gfx/pokemon/unown_n/anim.asm b/gfx/pokemon/unown_n/anim.asm
index 1f6924926..2e8377dff 100644
--- a/gfx/pokemon/unown_n/anim.asm
+++ b/gfx/pokemon/unown_n/anim.asm
@@ -7,4 +7,3 @@
 	frame 2, 04
 	frame 1, 03
 	endanim
-; 0xd233f
diff --git a/gfx/pokemon/unown_n/anim_idle.asm b/gfx/pokemon/unown_n/anim_idle.asm
index 5275e3463..8318520e3 100644
--- a/gfx/pokemon/unown_n/anim_idle.asm
+++ b/gfx/pokemon/unown_n/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd2483
diff --git a/gfx/pokemon/unown_o/anim.asm b/gfx/pokemon/unown_o/anim.asm
index 581d47b9d..16bc02e0e 100644
--- a/gfx/pokemon/unown_o/anim.asm
+++ b/gfx/pokemon/unown_o/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 10
 	frame 3, 04
 	endanim
-; 0xd234c
diff --git a/gfx/pokemon/unown_o/anim_idle.asm b/gfx/pokemon/unown_o/anim_idle.asm
index fec231c84..8318520e3 100644
--- a/gfx/pokemon/unown_o/anim_idle.asm
+++ b/gfx/pokemon/unown_o/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd248c
diff --git a/gfx/pokemon/unown_p/anim.asm b/gfx/pokemon/unown_p/anim.asm
index 0cbaf30ed..84c929db6 100644
--- a/gfx/pokemon/unown_p/anim.asm
+++ b/gfx/pokemon/unown_p/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 36
 	frame 1, 06
 	endanim
-; 0xd2353
diff --git a/gfx/pokemon/unown_p/anim_idle.asm b/gfx/pokemon/unown_p/anim_idle.asm
index 51e0e0941..8318520e3 100644
--- a/gfx/pokemon/unown_p/anim_idle.asm
+++ b/gfx/pokemon/unown_p/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd2495
diff --git a/gfx/pokemon/unown_q/anim.asm b/gfx/pokemon/unown_q/anim.asm
index 555f61cf3..09b5462f7 100644
--- a/gfx/pokemon/unown_q/anim.asm
+++ b/gfx/pokemon/unown_q/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 05
 	dorepeat 1
 	endanim
-; 0xd2360
diff --git a/gfx/pokemon/unown_q/anim_idle.asm b/gfx/pokemon/unown_q/anim_idle.asm
index a17caa474..8318520e3 100644
--- a/gfx/pokemon/unown_q/anim_idle.asm
+++ b/gfx/pokemon/unown_q/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd249e
diff --git a/gfx/pokemon/unown_r/anim.asm b/gfx/pokemon/unown_r/anim.asm
index fde5a58ab..1f707a071 100644
--- a/gfx/pokemon/unown_r/anim.asm
+++ b/gfx/pokemon/unown_r/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 07
 	dorepeat 1
 	endanim
-; 0xd236d
diff --git a/gfx/pokemon/unown_r/anim_idle.asm b/gfx/pokemon/unown_r/anim_idle.asm
index b1db8166a..8318520e3 100644
--- a/gfx/pokemon/unown_r/anim_idle.asm
+++ b/gfx/pokemon/unown_r/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd24a7
diff --git a/gfx/pokemon/unown_s/anim.asm b/gfx/pokemon/unown_s/anim.asm
index 9cac3910d..d662b7dfe 100644
--- a/gfx/pokemon/unown_s/anim.asm
+++ b/gfx/pokemon/unown_s/anim.asm
@@ -7,4 +7,3 @@
 	frame 2, 03
 	dorepeat 5
 	endanim
-; 0xd237e
diff --git a/gfx/pokemon/unown_s/anim_idle.asm b/gfx/pokemon/unown_s/anim_idle.asm
index 49483f8f5..8318520e3 100644
--- a/gfx/pokemon/unown_s/anim_idle.asm
+++ b/gfx/pokemon/unown_s/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd24b0
diff --git a/gfx/pokemon/unown_t/anim.asm b/gfx/pokemon/unown_t/anim.asm
index feba7be07..8e1d948a2 100644
--- a/gfx/pokemon/unown_t/anim.asm
+++ b/gfx/pokemon/unown_t/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 05
 	dorepeat 1
 	endanim
-; 0xd238b
diff --git a/gfx/pokemon/unown_t/anim_idle.asm b/gfx/pokemon/unown_t/anim_idle.asm
index d295d6830..8318520e3 100644
--- a/gfx/pokemon/unown_t/anim_idle.asm
+++ b/gfx/pokemon/unown_t/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd24b9
diff --git a/gfx/pokemon/unown_u/anim.asm b/gfx/pokemon/unown_u/anim.asm
index 12c53636d..8475cb979 100644
--- a/gfx/pokemon/unown_u/anim.asm
+++ b/gfx/pokemon/unown_u/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 14
 	frame 1, 12
 	endanim
-; 0xd2394
diff --git a/gfx/pokemon/unown_u/anim_idle.asm b/gfx/pokemon/unown_u/anim_idle.asm
index 834e75999..8318520e3 100644
--- a/gfx/pokemon/unown_u/anim_idle.asm
+++ b/gfx/pokemon/unown_u/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd24c2
diff --git a/gfx/pokemon/unown_v/anim.asm b/gfx/pokemon/unown_v/anim.asm
index acc500009..75dec7486 100644
--- a/gfx/pokemon/unown_v/anim.asm
+++ b/gfx/pokemon/unown_v/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 10
 	frame 1, 10
 	endanim
-; 0xd239d
diff --git a/gfx/pokemon/unown_v/anim_idle.asm b/gfx/pokemon/unown_v/anim_idle.asm
index 818f727ea..8318520e3 100644
--- a/gfx/pokemon/unown_v/anim_idle.asm
+++ b/gfx/pokemon/unown_v/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd24cb
diff --git a/gfx/pokemon/unown_w/anim.asm b/gfx/pokemon/unown_w/anim.asm
index 620ff03e5..e46f6d4f8 100644
--- a/gfx/pokemon/unown_w/anim.asm
+++ b/gfx/pokemon/unown_w/anim.asm
@@ -3,4 +3,3 @@
 	frame 0, 06
 	frame 2, 12
 	endanim
-; 0xd23a6
diff --git a/gfx/pokemon/unown_w/anim_idle.asm b/gfx/pokemon/unown_w/anim_idle.asm
index b43d44bbc..8318520e3 100644
--- a/gfx/pokemon/unown_w/anim_idle.asm
+++ b/gfx/pokemon/unown_w/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd24d4
diff --git a/gfx/pokemon/unown_x/anim.asm b/gfx/pokemon/unown_x/anim.asm
index 0bb204da6..803892a28 100644
--- a/gfx/pokemon/unown_x/anim.asm
+++ b/gfx/pokemon/unown_x/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 06
 	dorepeat 1
 	endanim
-; 0xd23b3
diff --git a/gfx/pokemon/unown_x/anim_idle.asm b/gfx/pokemon/unown_x/anim_idle.asm
index 22b15a504..8318520e3 100644
--- a/gfx/pokemon/unown_x/anim_idle.asm
+++ b/gfx/pokemon/unown_x/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 05
 	dorepeat 1
 	endanim
-; 0xd24dd
diff --git a/gfx/pokemon/unown_y/anim.asm b/gfx/pokemon/unown_y/anim.asm
index e65aa4134..21fcd64ab 100644
--- a/gfx/pokemon/unown_y/anim.asm
+++ b/gfx/pokemon/unown_y/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 05
 	dorepeat 4
 	endanim
-; 0xd23c2
diff --git a/gfx/pokemon/unown_y/anim_idle.asm b/gfx/pokemon/unown_y/anim_idle.asm
index e1a9a2acb..936e90ea1 100644
--- a/gfx/pokemon/unown_y/anim_idle.asm
+++ b/gfx/pokemon/unown_y/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd24e6
diff --git a/gfx/pokemon/unown_z/anim.asm b/gfx/pokemon/unown_z/anim.asm
index 197978f9b..a907ac849 100644
--- a/gfx/pokemon/unown_z/anim.asm
+++ b/gfx/pokemon/unown_z/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 03
 	frame 3, 03
 	endanim
-; 0xd23d1
diff --git a/gfx/pokemon/unown_z/anim_idle.asm b/gfx/pokemon/unown_z/anim_idle.asm
index 4eb7513f6..936e90ea1 100644
--- a/gfx/pokemon/unown_z/anim_idle.asm
+++ b/gfx/pokemon/unown_z/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 4, 05
 	dorepeat 1
 	endanim
-; 0xd24ef
diff --git a/gfx/pokemon/ursaring/anim.asm b/gfx/pokemon/ursaring/anim.asm
index f571913ea..06ff8fd7e 100644
--- a/gfx/pokemon/ursaring/anim.asm
+++ b/gfx/pokemon/ursaring/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 1, 10
 	endanim
-; 0xd14c8
diff --git a/gfx/pokemon/ursaring/anim_idle.asm b/gfx/pokemon/ursaring/anim_idle.asm
index 01ebc0f1a..8989074ca 100644
--- a/gfx/pokemon/ursaring/anim_idle.asm
+++ b/gfx/pokemon/ursaring/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 5, 09
 	dorepeat 1
 	endanim
-; 0xd20e4
diff --git a/gfx/pokemon/vaporeon/anim.asm b/gfx/pokemon/vaporeon/anim.asm
index d13f1dd94..b92a229aa 100644
--- a/gfx/pokemon/vaporeon/anim.asm
+++ b/gfx/pokemon/vaporeon/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 10
 	dorepeat 2
 	endanim
-; 0xd1043
diff --git a/gfx/pokemon/vaporeon/anim_idle.asm b/gfx/pokemon/vaporeon/anim_idle.asm
index 79c386650..faaeffe39 100644
--- a/gfx/pokemon/vaporeon/anim_idle.asm
+++ b/gfx/pokemon/vaporeon/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1ddf
diff --git a/gfx/pokemon/venomoth/anim.asm b/gfx/pokemon/venomoth/anim.asm
index ba6014d59..ec7e2f5fa 100644
--- a/gfx/pokemon/venomoth/anim.asm
+++ b/gfx/pokemon/venomoth/anim.asm
@@ -3,4 +3,3 @@
 	frame 1, 06
 	dorepeat 1
 	endanim
-; 0xd0b8c
diff --git a/gfx/pokemon/venomoth/anim_idle.asm b/gfx/pokemon/venomoth/anim_idle.asm
index 619c19b73..33fbd44f5 100644
--- a/gfx/pokemon/venomoth/anim_idle.asm
+++ b/gfx/pokemon/venomoth/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 2, 04
 	dorepeat 1
 	endanim
-; 0xd1aa4
diff --git a/gfx/pokemon/venonat/anim.asm b/gfx/pokemon/venonat/anim.asm
index 508cbd84a..f742d4e15 100644
--- a/gfx/pokemon/venonat/anim.asm
+++ b/gfx/pokemon/venonat/anim.asm
@@ -13,4 +13,3 @@
 	frame 0, 02
 	dorepeat 11
 	endanim
-; 0xd0b83
diff --git a/gfx/pokemon/venonat/anim_idle.asm b/gfx/pokemon/venonat/anim_idle.asm
index ecd7a45f1..2c14af5c3 100644
--- a/gfx/pokemon/venonat/anim_idle.asm
+++ b/gfx/pokemon/venonat/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 2, 16
 	dorepeat 1
 	endanim
-; 0xd1a9b
diff --git a/gfx/pokemon/venusaur/anim.asm b/gfx/pokemon/venusaur/anim.asm
index 9ee74b6c0..aed7cc2ee 100644
--- a/gfx/pokemon/venusaur/anim.asm
+++ b/gfx/pokemon/venusaur/anim.asm
@@ -7,4 +7,3 @@
 	frame 5, 10
 	dorepeat 5
 	endanim
-; 0xd08b6
diff --git a/gfx/pokemon/venusaur/anim_idle.asm b/gfx/pokemon/venusaur/anim_idle.asm
index 6eebd7cd3..0d86cd77f 100644
--- a/gfx/pokemon/venusaur/anim_idle.asm
+++ b/gfx/pokemon/venusaur/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 6, 13
 	frame 7, 13
 	endanim
-; 0xd18b6
diff --git a/gfx/pokemon/victreebel/anim.asm b/gfx/pokemon/victreebel/anim.asm
index ec490f7fb..6e62911cb 100644
--- a/gfx/pokemon/victreebel/anim.asm
+++ b/gfx/pokemon/victreebel/anim.asm
@@ -4,4 +4,3 @@
 	frame 4, 10
 	frame 5, 10
 	endanim
-; 0xd0cca
diff --git a/gfx/pokemon/victreebel/anim_idle.asm b/gfx/pokemon/victreebel/anim_idle.asm
index 121550865..bc7504d4a 100644
--- a/gfx/pokemon/victreebel/anim_idle.asm
+++ b/gfx/pokemon/victreebel/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 5, 05
 	dorepeat 1
 	endanim
-; 0xd1b8c
diff --git a/gfx/pokemon/vileplume/anim.asm b/gfx/pokemon/vileplume/anim.asm
index 98c2a86de..9d44e17d8 100644
--- a/gfx/pokemon/vileplume/anim.asm
+++ b/gfx/pokemon/vileplume/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 07
 	frame 1, 07
 	endanim
-; 0xd0b46
diff --git a/gfx/pokemon/vileplume/anim_idle.asm b/gfx/pokemon/vileplume/anim_idle.asm
index e57622363..3b93ca3e7 100644
--- a/gfx/pokemon/vileplume/anim_idle.asm
+++ b/gfx/pokemon/vileplume/anim_idle.asm
@@ -5,4 +5,3 @@
 	frame 0, 12
 	frame 3, 07
 	endanim
-; 0xd1a82
diff --git a/gfx/pokemon/voltorb/anim.asm b/gfx/pokemon/voltorb/anim.asm
index fdb49b9af..424e6846e 100644
--- a/gfx/pokemon/voltorb/anim.asm
+++ b/gfx/pokemon/voltorb/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 04
 	dorepeat 3
 	endanim
-; 0xd0e57
diff --git a/gfx/pokemon/voltorb/anim_idle.asm b/gfx/pokemon/voltorb/anim_idle.asm
index be799fe4a..d98c6c698 100644
--- a/gfx/pokemon/voltorb/anim_idle.asm
+++ b/gfx/pokemon/voltorb/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 0, 08
 	dorepeat 2
 	endanim
-; 0xd1ca5
diff --git a/gfx/pokemon/vulpix/anim.asm b/gfx/pokemon/vulpix/anim.asm
index 878054202..357413304 100644
--- a/gfx/pokemon/vulpix/anim.asm
+++ b/gfx/pokemon/vulpix/anim.asm
@@ -8,4 +8,3 @@
 	frame 3, 05
 	dorepeat 6
 	endanim
-; 0xd0aba
diff --git a/gfx/pokemon/vulpix/anim_idle.asm b/gfx/pokemon/vulpix/anim_idle.asm
index f7c9e3671..3cc6ee572 100644
--- a/gfx/pokemon/vulpix/anim_idle.asm
+++ b/gfx/pokemon/vulpix/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 0, 05
 	frame 3, 05
 	endanim
-; 0xd1a34
diff --git a/gfx/pokemon/wartortle/anim.asm b/gfx/pokemon/wartortle/anim.asm
index 832b87b88..4e7e41f92 100644
--- a/gfx/pokemon/wartortle/anim.asm
+++ b/gfx/pokemon/wartortle/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 09
 	dorepeat 3
 	endanim
-; 0xd08ff
diff --git a/gfx/pokemon/wartortle/anim_idle.asm b/gfx/pokemon/wartortle/anim_idle.asm
index 40c4fcd14..c4a056b01 100644
--- a/gfx/pokemon/wartortle/anim_idle.asm
+++ b/gfx/pokemon/wartortle/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd18e7
diff --git a/gfx/pokemon/weedle/anim.asm b/gfx/pokemon/weedle/anim.asm
index 5d959a772..59a5d5daf 100644
--- a/gfx/pokemon/weedle/anim.asm
+++ b/gfx/pokemon/weedle/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 06
 	dorepeat 3
 	endanim
-; 0xd093a
diff --git a/gfx/pokemon/weedle/anim_idle.asm b/gfx/pokemon/weedle/anim_idle.asm
index 30dcb9185..d2e8d6349 100644
--- a/gfx/pokemon/weedle/anim_idle.asm
+++ b/gfx/pokemon/weedle/anim_idle.asm
@@ -9,4 +9,3 @@
 	frame 3, 05
 	dorepeat 5
 	endanim
-; 0xd1922
diff --git a/gfx/pokemon/weepinbell/anim.asm b/gfx/pokemon/weepinbell/anim.asm
index 6f710d29a..becc11604 100644
--- a/gfx/pokemon/weepinbell/anim.asm
+++ b/gfx/pokemon/weepinbell/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 1
 	frame 3, 12
 	endanim
-; 0xd0cbf
diff --git a/gfx/pokemon/weepinbell/anim_idle.asm b/gfx/pokemon/weepinbell/anim_idle.asm
index 0e56c9cc1..81583f510 100644
--- a/gfx/pokemon/weepinbell/anim_idle.asm
+++ b/gfx/pokemon/weepinbell/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 07
 	dorepeat 1
 	endanim
-; 0xd1b81
diff --git a/gfx/pokemon/weezing/anim.asm b/gfx/pokemon/weezing/anim.asm
index e64ca5d37..1328f5535 100644
--- a/gfx/pokemon/weezing/anim.asm
+++ b/gfx/pokemon/weezing/anim.asm
@@ -5,4 +5,3 @@
 	frame 4, 10
 	dorepeat 2
 	endanim
-; 0xd0efd
diff --git a/gfx/pokemon/weezing/anim_idle.asm b/gfx/pokemon/weezing/anim_idle.asm
index 1ba31dd74..ad7c9d3c7 100644
--- a/gfx/pokemon/weezing/anim_idle.asm
+++ b/gfx/pokemon/weezing/anim_idle.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 1, 12
 	endanim
-; 0xd1cfb
diff --git a/gfx/pokemon/wigglytuff/anim.asm b/gfx/pokemon/wigglytuff/anim.asm
index 53b468fdd..9ff3829af 100644
--- a/gfx/pokemon/wigglytuff/anim.asm
+++ b/gfx/pokemon/wigglytuff/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 06
 	frame 2, 04
 	endanim
-; 0xd0aed
diff --git a/gfx/pokemon/wigglytuff/anim_idle.asm b/gfx/pokemon/wigglytuff/anim_idle.asm
index b99bf002c..faaeffe39 100644
--- a/gfx/pokemon/wigglytuff/anim_idle.asm
+++ b/gfx/pokemon/wigglytuff/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd1a4f
diff --git a/gfx/pokemon/wobbuffet/anim.asm b/gfx/pokemon/wobbuffet/anim.asm
index 340f3df46..57abe207b 100644
--- a/gfx/pokemon/wobbuffet/anim.asm
+++ b/gfx/pokemon/wobbuffet/anim.asm
@@ -1,4 +1,3 @@
 	frame 1, 07
 	frame 2, 30
 	endanim
-; 0xd1403
diff --git a/gfx/pokemon/wobbuffet/anim_idle.asm b/gfx/pokemon/wobbuffet/anim_idle.asm
index 8a3564daa..576f48298 100644
--- a/gfx/pokemon/wobbuffet/anim_idle.asm
+++ b/gfx/pokemon/wobbuffet/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 0, 30
 	endanim
-; 0xd2069
diff --git a/gfx/pokemon/wooper/anim.asm b/gfx/pokemon/wooper/anim.asm
index 2c9becf9e..f491cbe78 100644
--- a/gfx/pokemon/wooper/anim.asm
+++ b/gfx/pokemon/wooper/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 08
 	frame 4, 08
 	endanim
-; 0xd1397
diff --git a/gfx/pokemon/wooper/anim_idle.asm b/gfx/pokemon/wooper/anim_idle.asm
index 3f152d035..c4a056b01 100644
--- a/gfx/pokemon/wooper/anim_idle.asm
+++ b/gfx/pokemon/wooper/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 06
 	dorepeat 1
 	endanim
-; 0xd202f
diff --git a/gfx/pokemon/xatu/anim.asm b/gfx/pokemon/xatu/anim.asm
index 002f905b8..13cbbe6be 100644
--- a/gfx/pokemon/xatu/anim.asm
+++ b/gfx/pokemon/xatu/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 12
 	dorepeat 5
 	endanim
-; 0xd12cd
diff --git a/gfx/pokemon/xatu/anim_idle.asm b/gfx/pokemon/xatu/anim_idle.asm
index 3fa8d7875..fe2221a6a 100644
--- a/gfx/pokemon/xatu/anim_idle.asm
+++ b/gfx/pokemon/xatu/anim_idle.asm
@@ -8,4 +8,3 @@
 	frame 2, 08
 	dorepeat 6
 	endanim
-; 0xd1f99
diff --git a/gfx/pokemon/yanma/anim.asm b/gfx/pokemon/yanma/anim.asm
index 4f1aaa929..6da78ff64 100644
--- a/gfx/pokemon/yanma/anim.asm
+++ b/gfx/pokemon/yanma/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 03
 	dorepeat 4
 	endanim
-; 0xd138a
diff --git a/gfx/pokemon/yanma/anim_idle.asm b/gfx/pokemon/yanma/anim_idle.asm
index 75464b3f1..66c12fb01 100644
--- a/gfx/pokemon/yanma/anim_idle.asm
+++ b/gfx/pokemon/yanma/anim_idle.asm
@@ -3,4 +3,3 @@
 	frame 3, 04
 	dorepeat 1
 	endanim
-; 0xd2026
diff --git a/gfx/pokemon/zapdos/anim.asm b/gfx/pokemon/zapdos/anim.asm
index a22540c2a..67d6f0e7c 100644
--- a/gfx/pokemon/zapdos/anim.asm
+++ b/gfx/pokemon/zapdos/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 10
 	dorepeat 2
 	endanim
-; 0xd10cc
diff --git a/gfx/pokemon/zapdos/anim_idle.asm b/gfx/pokemon/zapdos/anim_idle.asm
index 3d8c8fd57..0f59e637c 100644
--- a/gfx/pokemon/zapdos/anim_idle.asm
+++ b/gfx/pokemon/zapdos/anim_idle.asm
@@ -2,4 +2,3 @@
 	frame 2, 50
 	frame 1, 06
 	endanim
-; 0xd1e48
diff --git a/gfx/pokemon/zubat/anim.asm b/gfx/pokemon/zubat/anim.asm
index a34a66671..9c4d6712a 100644
--- a/gfx/pokemon/zubat/anim.asm
+++ b/gfx/pokemon/zubat/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 07
 	frame 0, 07
 	endanim
-; 0xd0afa
diff --git a/gfx/pokemon/zubat/anim_idle.asm b/gfx/pokemon/zubat/anim_idle.asm
index cfba587f9..838feac3f 100644
--- a/gfx/pokemon/zubat/anim_idle.asm
+++ b/gfx/pokemon/zubat/anim_idle.asm
@@ -4,4 +4,3 @@
 	frame 3, 12
 	dorepeat 2
 	endanim
-; 0xd1a5a
diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm
index a50decd34..92c6cb437 100644
--- a/gfx/sgb/blk_packets.asm
+++ b/gfx/sgb/blk_packets.asm
@@ -13,7 +13,6 @@ attr_blk_data: MACRO
 	db \5, \6, \7, \8 ; x1, y1, x2, y2
 ENDM
 
-
 BlkPacket_9a86:
 	attr_blk 1
 	attr_blk_data %011, 0,0,0, 00,00, 19,17
diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm
index fa3b386da..1d5ae7e5e 100644
--- a/gfx/sgb/pal_packets.asm
+++ b/gfx/sgb/pal_packets.asm
@@ -16,15 +16,14 @@ sgb_pal23: MACRO
 	db (SGB_PAL23 << 3) + 1
 ENDM
 
-
 PalPacket_GSTitleScreen:
 	sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3
 
 PalPacket_SCGB_13:
-	sgb_pal_set GREENMON_NITE, CGB_BADGE, RB_BROWNMON, 00
+	sgb_pal_set BETA_SHINY_GREENMON, CGB_BADGE, RB_BROWNMON, 00
 
-PalPacket_SCGB_11:
-	sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3
+PalPacket_BetaPoker:
+	sgb_pal_set BETA_POKER_0, BETA_POKER_1, BETA_POKER_2, BETA_POKER_3
 
 PalPacket_UnownPuzzle:
 	sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE
@@ -35,8 +34,8 @@ PalPacket_9bd6:
 PalPacket_GSIntroShellderLapras:
 	sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, 00, 00, 00
 
-UnreferencedPalPacket_9bf6:
-	sgb_pal_set 37, 00, 00, 00
+UnreferencedPalPacket_BetaIntroLapras:
+	sgb_pal_set BETA_INTRO_LAPRAS, 00, 00, 00
 
 PalPacket_GSIntroJigglypuffPikachu:
 	sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00
@@ -44,13 +43,13 @@ PalPacket_GSIntroJigglypuffPikachu:
 PalPacket_GSIntroStartersTransition:
 	sgb_pal_set GS_INTRO_STARTERS_TRANSITION, 00, 00, 00
 
-PalPacket_Function8b4d:
-	sgb_pal_set 3B, 00, 00, 00
+PalPacket_BetaIntroVenusaur:
+	sgb_pal_set BETA_INTRO_VENUSAUR, 00, 00, 00
 
 PalPacket_Pack:
 	sgb_pal_set PACK, 00, 00, 00
 
-PalPacket_SCGB_0F:
+PalPacket_BetaPikachuMinigame:
 	sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00
 
 PalPacket_PartyMenu:
@@ -69,7 +68,7 @@ PalPacket_SlotMachine:
 	sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3
 
 PalPacket_SCGB_06:
-	sgb_pal_set 33, 34, DIPLOMA, RB_PURPLEMON
+	sgb_pal_set BETA_LOGO_1, BETA_LOGO_2, DIPLOMA, RB_PURPLEMON
 
 PalPacket_Diploma:
 	sgb_pal_set DIPLOMA, 00, 00, 00
@@ -80,7 +79,6 @@ PalPacket_TradeTube:
 PalPacket_GamefreakLogo:
 	sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, 00, 00, 00
 
-
 PalPacket_9ce6:
 	sgb_pal01
 	RGB 31, 31, 31
diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal
index 67d19baec..9c86e2459 100644
--- a/gfx/sgb/predef.pal
+++ b/gfx/sgb/predef.pal
@@ -35,40 +35,40 @@
 	RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_RB_PINKMON
 	RGB 31,31,31, 31,28,14, 26,20,00, 00,00,00 ; PREDEFPAL_RB_YELLOWMON
 	RGB 31,31,31, 26,21,22, 15,15,18, 00,00,00 ; PREDEFPAL_CGB_BADGE
-	RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_MEWMON_NITE
-	RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_BLUEMON_NITE
-	RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_REDMON_NITE
-	RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_CYANMON_NITE
-	RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_PURPLEMON_NITE
-	RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_BROWNMON_NITE
-	RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_GREENMON_NITE
-	RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_PINKMON_NITE
-	RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_YELLOWMON_NITE
+	RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_SHINY_MEWMON
+	RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_SHINY_BLUEMON
+	RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_SHINY_REDMON
+	RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_SHINY_CYANMON
+	RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_SHINY_PURPLEMON
+	RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_SHINY_BROWNMON
+	RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_SHINY_GREENMON
+	RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_SHINY_PINKMON
+	RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_SHINY_YELLOWMON
 	RGB 31,31,31, 18,18,18, 10,10,10, 00,00,00 ; PREDEFPAL_PARTY_ICON
 	RGB 31,31,31, 30,26,15, 00,23,00, 00,00,00 ; PREDEFPAL_HP_GREEN
 	RGB 31,31,31, 30,26,15, 31,23,00, 00,00,00 ; PREDEFPAL_HP_YELLOW
 	RGB 31,31,31, 30,26,15, 31,00,00, 00,00,00 ; PREDEFPAL_HP_RED
 	RGB 31,31,31, 29,26,19, 27,20,14, 00,00,00 ; PREDEFPAL_POKEGEAR
-	RGB 31,31,31, 24,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_33
-	RGB 31,31,31, 31,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_34
+	RGB 31,31,31, 24,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_BETA_LOGO_1
+	RGB 31,31,31, 31,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_BETA_LOGO_2
 	RGB 31,31,31, 30,26,16, 16,12,09, 00,00,00 ; PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO
 	RGB 31,31,31, 15,28,26, 12,22,26, 03,16,14 ; PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS
-	RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_37
+	RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_BETA_INTRO_LAPRAS
 	RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
 	RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
 	RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
-	RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B
+	RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_BETA_INTRO_VENUSAUR
 	RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_PACK
 	RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0
 	RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1
 	RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2
 	RGB 31,31,31, 16,19,29, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_3
-	RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_0
-	RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_1
-	RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_2
-	RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_3
-	RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_45
-	RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_46
+	RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_0
+	RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_1
+	RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_2
+	RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_3
+	RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_BETA_RADIO
+	RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_BETA_POKEGEAR
 	RGB 31,31,31, 26,20,00, 16,19,29, 00,00,00 ; PREDEFPAL_47
 	RGB 31,31,31, 16,02,30, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_0
 	RGB 31,31,31, 16,13,04, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_1
diff --git a/gfx/slots/slots_3.png b/gfx/slots/slots_3.png
index 456e9b6bf..e166e3fc7 100644
--- a/gfx/slots/slots_3.png
+++ b/gfx/slots/slots_3.png
diff --git a/gfx/splash/logo1.png b/gfx/splash/logo1.png
index 1d2d6f479..a02eb08f6 100755..100644
--- a/gfx/splash/logo1.png
+++ b/gfx/splash/logo1.png
diff --git a/gfx/splash/logo2.png b/gfx/splash/logo2.png
index 7038efb54..7038efb54 100755..100644
--- a/gfx/splash/logo2.png
+++ b/gfx/splash/logo2.png
diff --git a/gfx/sprites.asm b/gfx/sprites.asm
index 318f7506e..f84ae77d6 100644
--- a/gfx/sprites.asm
+++ b/gfx/sprites.asm
@@ -1,108 +1,108 @@
 SECTION "Sprites 1", ROMX
 
-ChrisSpriteGFX::               INCBIN "gfx/sprites/chris.2bpp" ; c0000
-ChrisBikeSpriteGFX::           INCBIN "gfx/sprites/chris_bike.2bpp" ; c0180
-GameboyKidSpriteGFX::          INCBIN "gfx/sprites/gameboy_kid.2bpp" ; c0300
-SilverSpriteGFX::              INCBIN "gfx/sprites/silver.2bpp" ; c03c0
-OakSpriteGFX::                 INCBIN "gfx/sprites/oak.2bpp" ; c0540
-RedSpriteGFX::                 INCBIN "gfx/sprites/red.2bpp" ; c06c0
-BlueSpriteGFX::                INCBIN "gfx/sprites/blue.2bpp" ; c0840
-BillSpriteGFX::                INCBIN "gfx/sprites/bill.2bpp" ; c09c0
-ElderSpriteGFX::               INCBIN "gfx/sprites/elder.2bpp" ; c0b40
-JanineSpriteGFX::              INCBIN "gfx/sprites/janine.2bpp" ; c0cc0
-KurtSpriteGFX::                INCBIN "gfx/sprites/kurt.2bpp" ; c0e40
-MomSpriteGFX::                 INCBIN "gfx/sprites/mom.2bpp" ; c0fc0
-BlaineSpriteGFX::              INCBIN "gfx/sprites/blaine.2bpp" ; c1140
-RedsMomSpriteGFX::             INCBIN "gfx/sprites/reds_mom.2bpp" ; c12c0
-DaisySpriteGFX::               INCBIN "gfx/sprites/daisy.2bpp" ; c1440
-ElmSpriteGFX::                 INCBIN "gfx/sprites/elm.2bpp" ; c15c0
-WillSpriteGFX::                INCBIN "gfx/sprites/will.2bpp" ; c1740
-FalknerSpriteGFX::             INCBIN "gfx/sprites/falkner.2bpp" ; c1800
-WhitneySpriteGFX::             INCBIN "gfx/sprites/whitney.2bpp" ; c1980
-BugsySpriteGFX::               INCBIN "gfx/sprites/bugsy.2bpp" ; c1b00
-MortySpriteGFX::               INCBIN "gfx/sprites/morty.2bpp" ; c1c80
-ChuckSpriteGFX::               INCBIN "gfx/sprites/chuck.2bpp" ; c1e00
-JasmineSpriteGFX::             INCBIN "gfx/sprites/jasmine.2bpp" ; c1f80
-PryceSpriteGFX::               INCBIN "gfx/sprites/pryce.2bpp" ; c2100
-ClairSpriteGFX::               INCBIN "gfx/sprites/clair.2bpp" ; c2280
-BrockSpriteGFX::               INCBIN "gfx/sprites/brock.2bpp" ; c2400
-KarenSpriteGFX::               INCBIN "gfx/sprites/karen.2bpp" ; c2580
-BrunoSpriteGFX::               INCBIN "gfx/sprites/bruno.2bpp" ; c2640
-MistySpriteGFX::               INCBIN "gfx/sprites/misty.2bpp" ; c27c0
-LanceSpriteGFX::               INCBIN "gfx/sprites/lance.2bpp" ; c2940
-SurgeSpriteGFX::               INCBIN "gfx/sprites/surge.2bpp" ; c2ac0
-ErikaSpriteGFX::               INCBIN "gfx/sprites/erika.2bpp" ; c2c40
-KogaSpriteGFX::                INCBIN "gfx/sprites/koga.2bpp" ; c2dc0
-SabrinaSpriteGFX::             INCBIN "gfx/sprites/sabrina.2bpp" ; c2f40
-CooltrainerMSpriteGFX::        INCBIN "gfx/sprites/cooltrainer_m.2bpp" ; c30c0
-CooltrainerFSpriteGFX::        INCBIN "gfx/sprites/cooltrainer_f.2bpp" ; c3240
-BugCatcherSpriteGFX::          INCBIN "gfx/sprites/bug_catcher.2bpp" ; c33c0
-TwinSpriteGFX::                INCBIN "gfx/sprites/twin.2bpp" ; c3540
-YoungsterSpriteGFX::           INCBIN "gfx/sprites/youngster.2bpp" ; c36c0
-LassSpriteGFX::                INCBIN "gfx/sprites/lass.2bpp" ; c3840
-TeacherSpriteGFX::             INCBIN "gfx/sprites/teacher.2bpp" ; c39c0
-BuenaSpriteGFX::               INCBIN "gfx/sprites/buena.2bpp" ; c3b40
-SuperNerdSpriteGFX::           INCBIN "gfx/sprites/super_nerd.2bpp" ; c3cc0
-RockerSpriteGFX::              INCBIN "gfx/sprites/rocker.2bpp" ; c3e40
+ChrisSpriteGFX::               INCBIN "gfx/sprites/chris.2bpp"
+ChrisBikeSpriteGFX::           INCBIN "gfx/sprites/chris_bike.2bpp"
+GameboyKidSpriteGFX::          INCBIN "gfx/sprites/gameboy_kid.2bpp"
+SilverSpriteGFX::              INCBIN "gfx/sprites/silver.2bpp"
+OakSpriteGFX::                 INCBIN "gfx/sprites/oak.2bpp"
+RedSpriteGFX::                 INCBIN "gfx/sprites/red.2bpp"
+BlueSpriteGFX::                INCBIN "gfx/sprites/blue.2bpp"
+BillSpriteGFX::                INCBIN "gfx/sprites/bill.2bpp"
+ElderSpriteGFX::               INCBIN "gfx/sprites/elder.2bpp"
+JanineSpriteGFX::              INCBIN "gfx/sprites/janine.2bpp"
+KurtSpriteGFX::                INCBIN "gfx/sprites/kurt.2bpp"
+MomSpriteGFX::                 INCBIN "gfx/sprites/mom.2bpp"
+BlaineSpriteGFX::              INCBIN "gfx/sprites/blaine.2bpp"
+RedsMomSpriteGFX::             INCBIN "gfx/sprites/reds_mom.2bpp"
+DaisySpriteGFX::               INCBIN "gfx/sprites/daisy.2bpp"
+ElmSpriteGFX::                 INCBIN "gfx/sprites/elm.2bpp"
+WillSpriteGFX::                INCBIN "gfx/sprites/will.2bpp"
+FalknerSpriteGFX::             INCBIN "gfx/sprites/falkner.2bpp"
+WhitneySpriteGFX::             INCBIN "gfx/sprites/whitney.2bpp"
+BugsySpriteGFX::               INCBIN "gfx/sprites/bugsy.2bpp"
+MortySpriteGFX::               INCBIN "gfx/sprites/morty.2bpp"
+ChuckSpriteGFX::               INCBIN "gfx/sprites/chuck.2bpp"
+JasmineSpriteGFX::             INCBIN "gfx/sprites/jasmine.2bpp"
+PryceSpriteGFX::               INCBIN "gfx/sprites/pryce.2bpp"
+ClairSpriteGFX::               INCBIN "gfx/sprites/clair.2bpp"
+BrockSpriteGFX::               INCBIN "gfx/sprites/brock.2bpp"
+KarenSpriteGFX::               INCBIN "gfx/sprites/karen.2bpp"
+BrunoSpriteGFX::               INCBIN "gfx/sprites/bruno.2bpp"
+MistySpriteGFX::               INCBIN "gfx/sprites/misty.2bpp"
+LanceSpriteGFX::               INCBIN "gfx/sprites/lance.2bpp"
+SurgeSpriteGFX::               INCBIN "gfx/sprites/surge.2bpp"
+ErikaSpriteGFX::               INCBIN "gfx/sprites/erika.2bpp"
+KogaSpriteGFX::                INCBIN "gfx/sprites/koga.2bpp"
+SabrinaSpriteGFX::             INCBIN "gfx/sprites/sabrina.2bpp"
+CooltrainerMSpriteGFX::        INCBIN "gfx/sprites/cooltrainer_m.2bpp"
+CooltrainerFSpriteGFX::        INCBIN "gfx/sprites/cooltrainer_f.2bpp"
+BugCatcherSpriteGFX::          INCBIN "gfx/sprites/bug_catcher.2bpp"
+TwinSpriteGFX::                INCBIN "gfx/sprites/twin.2bpp"
+YoungsterSpriteGFX::           INCBIN "gfx/sprites/youngster.2bpp"
+LassSpriteGFX::                INCBIN "gfx/sprites/lass.2bpp"
+TeacherSpriteGFX::             INCBIN "gfx/sprites/teacher.2bpp"
+BuenaSpriteGFX::               INCBIN "gfx/sprites/buena.2bpp"
+SuperNerdSpriteGFX::           INCBIN "gfx/sprites/super_nerd.2bpp"
+RockerSpriteGFX::              INCBIN "gfx/sprites/rocker.2bpp"
 
 
 SECTION "Sprites 2", ROMX
 
-PokefanMSpriteGFX::            INCBIN "gfx/sprites/pokefan_m.2bpp" ; c4000
-PokefanFSpriteGFX::            INCBIN "gfx/sprites/pokefan_f.2bpp" ; c4180
-GrampsSpriteGFX::              INCBIN "gfx/sprites/gramps.2bpp" ; c4300
-GrannySpriteGFX::              INCBIN "gfx/sprites/granny.2bpp" ; c4480
-SwimmerGuySpriteGFX::          INCBIN "gfx/sprites/swimmer_guy.2bpp" ; c4600
-SwimmerGirlSpriteGFX::         INCBIN "gfx/sprites/swimmer_girl.2bpp" ; c4780
-BigSnorlaxSpriteGFX::          INCBIN "gfx/sprites/big_snorlax.2bpp" ; c4900
-SurfingPikachuSpriteGFX::      INCBIN "gfx/sprites/surfing_pikachu.2bpp" ; c4980
-RocketSpriteGFX::              INCBIN "gfx/sprites/rocket.2bpp" ; c4b00
-RocketGirlSpriteGFX::          INCBIN "gfx/sprites/rocket_girl.2bpp" ; c4c80
-NurseSpriteGFX::               INCBIN "gfx/sprites/nurse.2bpp" ; c4e00
-LinkReceptionistSpriteGFX::    INCBIN "gfx/sprites/link_receptionist.2bpp" ; c4ec0
-ClerkSpriteGFX::               INCBIN "gfx/sprites/clerk.2bpp" ; c5040
-FisherSpriteGFX::              INCBIN "gfx/sprites/fisher.2bpp" ; c51c0
-FishingGuruSpriteGFX::         INCBIN "gfx/sprites/fishing_guru.2bpp" ; c5340
-ScientistSpriteGFX::           INCBIN "gfx/sprites/scientist.2bpp" ; c54c0
-KimonoGirlSpriteGFX::          INCBIN "gfx/sprites/kimono_girl.2bpp" ; c5640
-SageSpriteGFX::                INCBIN "gfx/sprites/sage.2bpp" ; c57c0
-UnusedGuySpriteGFX::           INCBIN "gfx/sprites/unused_guy.2bpp" ; c5940
-GentlemanSpriteGFX::           INCBIN "gfx/sprites/gentleman.2bpp" ; c5ac0
-BlackBeltSpriteGFX::           INCBIN "gfx/sprites/black_belt.2bpp" ; c5c40
-ReceptionistSpriteGFX::        INCBIN "gfx/sprites/receptionist.2bpp" ; c5dc0
-OfficerSpriteGFX::             INCBIN "gfx/sprites/officer.2bpp" ; c5f40
-CalSpriteGFX::                 INCBIN "gfx/sprites/cal.2bpp" ; c60c0
-SlowpokeSpriteGFX::            INCBIN "gfx/sprites/slowpoke.2bpp" ; c6240
-CaptainSpriteGFX::             INCBIN "gfx/sprites/captain.2bpp" ; c6280
-BigLaprasSpriteGFX::           INCBIN "gfx/sprites/big_lapras.2bpp" ; c6400
-GymGuySpriteGFX::              INCBIN "gfx/sprites/gym_guy.2bpp" ; c6480
-SailorSpriteGFX::              INCBIN "gfx/sprites/sailor.2bpp" ; c6600
-BikerSpriteGFX::               INCBIN "gfx/sprites/biker.2bpp" ; c6780
-PharmacistSpriteGFX::          INCBIN "gfx/sprites/pharmacist.2bpp" ; c6900
-MonsterSpriteGFX::             INCBIN "gfx/sprites/monster.2bpp" ; c6a80
-FairySpriteGFX::               INCBIN "gfx/sprites/fairy.2bpp" ; c6c00
-BirdSpriteGFX::                INCBIN "gfx/sprites/bird.2bpp" ; c6d80
-DragonSpriteGFX::              INCBIN "gfx/sprites/dragon.2bpp" ; c6f00
-BigOnixSpriteGFX::             INCBIN "gfx/sprites/big_onix.2bpp" ; c7080
-N64SpriteGFX::                 INCBIN "gfx/sprites/n64.2bpp" ; c7140
-SudowoodoSpriteGFX::           INCBIN "gfx/sprites/sudowoodo.2bpp" ; c7180
-SurfSpriteGFX::                INCBIN "gfx/sprites/surf.2bpp" ; c7200
-PokeBallSpriteGFX::            INCBIN "gfx/sprites/poke_ball.2bpp" ; c7380
-PokedexSpriteGFX::             INCBIN "gfx/sprites/pokedex.2bpp" ; c7500
-PaperSpriteGFX::               INCBIN "gfx/sprites/paper.2bpp" ; c7680
-VirtualBoySpriteGFX::          INCBIN "gfx/sprites/virtual_boy.2bpp" ; c7800
-OldLinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; c7840
-RockSpriteGFX::                INCBIN "gfx/sprites/rock.2bpp" ; c7880
-BoulderSpriteGFX::             INCBIN "gfx/sprites/boulder.2bpp" ; c78c0
-SnesSpriteGFX::                INCBIN "gfx/sprites/snes.2bpp" ; c7900
-FamicomSpriteGFX::             INCBIN "gfx/sprites/famicom.2bpp" ; c7940
-FruitTreeSpriteGFX::           INCBIN "gfx/sprites/fruit_tree.2bpp" ; c7980
-GoldTrophySpriteGFX::          INCBIN "gfx/sprites/gold_trophy.2bpp" ; c79c0
-SilverTrophySpriteGFX::        INCBIN "gfx/sprites/silver_trophy.2bpp" ; c7a00
-KrisSpriteGFX::                INCBIN "gfx/sprites/kris.2bpp" ; c7a40
-KrisBikeSpriteGFX::            INCBIN "gfx/sprites/kris_bike.2bpp" ; c7bc0
-KurtOutsideSpriteGFX::         INCBIN "gfx/sprites/kurt_outside.2bpp" ; c7d40
-SuicuneSpriteGFX::             INCBIN "gfx/sprites/suicune.2bpp" ; c7e00
-EnteiSpriteGFX::               INCBIN "gfx/sprites/entei.2bpp" ; c7e40
-RaikouSpriteGFX::              INCBIN "gfx/sprites/raikou.2bpp" ; c7e80
-StandingYoungsterSpriteGFX::   INCBIN "gfx/sprites/standing_youngster.2bpp" ; c7ec0
+PokefanMSpriteGFX::            INCBIN "gfx/sprites/pokefan_m.2bpp"
+PokefanFSpriteGFX::            INCBIN "gfx/sprites/pokefan_f.2bpp"
+GrampsSpriteGFX::              INCBIN "gfx/sprites/gramps.2bpp"
+GrannySpriteGFX::              INCBIN "gfx/sprites/granny.2bpp"
+SwimmerGuySpriteGFX::          INCBIN "gfx/sprites/swimmer_guy.2bpp"
+SwimmerGirlSpriteGFX::         INCBIN "gfx/sprites/swimmer_girl.2bpp"
+BigSnorlaxSpriteGFX::          INCBIN "gfx/sprites/big_snorlax.2bpp"
+SurfingPikachuSpriteGFX::      INCBIN "gfx/sprites/surfing_pikachu.2bpp"
+RocketSpriteGFX::              INCBIN "gfx/sprites/rocket.2bpp"
+RocketGirlSpriteGFX::          INCBIN "gfx/sprites/rocket_girl.2bpp"
+NurseSpriteGFX::               INCBIN "gfx/sprites/nurse.2bpp"
+LinkReceptionistSpriteGFX::    INCBIN "gfx/sprites/link_receptionist.2bpp"
+ClerkSpriteGFX::               INCBIN "gfx/sprites/clerk.2bpp"
+FisherSpriteGFX::              INCBIN "gfx/sprites/fisher.2bpp"
+FishingGuruSpriteGFX::         INCBIN "gfx/sprites/fishing_guru.2bpp"
+ScientistSpriteGFX::           INCBIN "gfx/sprites/scientist.2bpp"
+KimonoGirlSpriteGFX::          INCBIN "gfx/sprites/kimono_girl.2bpp"
+SageSpriteGFX::                INCBIN "gfx/sprites/sage.2bpp"
+UnusedGuySpriteGFX::           INCBIN "gfx/sprites/unused_guy.2bpp"
+GentlemanSpriteGFX::           INCBIN "gfx/sprites/gentleman.2bpp"
+BlackBeltSpriteGFX::           INCBIN "gfx/sprites/black_belt.2bpp"
+ReceptionistSpriteGFX::        INCBIN "gfx/sprites/receptionist.2bpp"
+OfficerSpriteGFX::             INCBIN "gfx/sprites/officer.2bpp"
+CalSpriteGFX::                 INCBIN "gfx/sprites/cal.2bpp"
+SlowpokeSpriteGFX::            INCBIN "gfx/sprites/slowpoke.2bpp"
+CaptainSpriteGFX::             INCBIN "gfx/sprites/captain.2bpp"
+BigLaprasSpriteGFX::           INCBIN "gfx/sprites/big_lapras.2bpp"
+GymGuySpriteGFX::              INCBIN "gfx/sprites/gym_guy.2bpp"
+SailorSpriteGFX::              INCBIN "gfx/sprites/sailor.2bpp"
+BikerSpriteGFX::               INCBIN "gfx/sprites/biker.2bpp"
+PharmacistSpriteGFX::          INCBIN "gfx/sprites/pharmacist.2bpp"
+MonsterSpriteGFX::             INCBIN "gfx/sprites/monster.2bpp"
+FairySpriteGFX::               INCBIN "gfx/sprites/fairy.2bpp"
+BirdSpriteGFX::                INCBIN "gfx/sprites/bird.2bpp"
+DragonSpriteGFX::              INCBIN "gfx/sprites/dragon.2bpp"
+BigOnixSpriteGFX::             INCBIN "gfx/sprites/big_onix.2bpp"
+N64SpriteGFX::                 INCBIN "gfx/sprites/n64.2bpp"
+SudowoodoSpriteGFX::           INCBIN "gfx/sprites/sudowoodo.2bpp"
+SurfSpriteGFX::                INCBIN "gfx/sprites/surf.2bpp"
+PokeBallSpriteGFX::            INCBIN "gfx/sprites/poke_ball.2bpp"
+PokedexSpriteGFX::             INCBIN "gfx/sprites/pokedex.2bpp"
+PaperSpriteGFX::               INCBIN "gfx/sprites/paper.2bpp"
+VirtualBoySpriteGFX::          INCBIN "gfx/sprites/virtual_boy.2bpp"
+OldLinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/old_link_receptionist.2bpp"
+RockSpriteGFX::                INCBIN "gfx/sprites/rock.2bpp"
+BoulderSpriteGFX::             INCBIN "gfx/sprites/boulder.2bpp"
+SnesSpriteGFX::                INCBIN "gfx/sprites/snes.2bpp"
+FamicomSpriteGFX::             INCBIN "gfx/sprites/famicom.2bpp"
+FruitTreeSpriteGFX::           INCBIN "gfx/sprites/fruit_tree.2bpp"
+GoldTrophySpriteGFX::          INCBIN "gfx/sprites/gold_trophy.2bpp"
+SilverTrophySpriteGFX::        INCBIN "gfx/sprites/silver_trophy.2bpp"
+KrisSpriteGFX::                INCBIN "gfx/sprites/kris.2bpp"
+KrisBikeSpriteGFX::            INCBIN "gfx/sprites/kris_bike.2bpp"
+KurtOutsideSpriteGFX::         INCBIN "gfx/sprites/kurt_outside.2bpp"
+SuicuneSpriteGFX::             INCBIN "gfx/sprites/suicune.2bpp"
+EnteiSpriteGFX::               INCBIN "gfx/sprites/entei.2bpp"
+RaikouSpriteGFX::              INCBIN "gfx/sprites/raikou.2bpp"
+StandingYoungsterSpriteGFX::   INCBIN "gfx/sprites/standing_youngster.2bpp"
diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tileset_palette_maps.asm
index 5e8f9f4eb..41f71ff0b 100644
--- a/gfx/tilesets/palette_maps.asm
+++ b/gfx/tileset_palette_maps.asm
@@ -2,148 +2,114 @@ tilepal: MACRO
 ; used in gfx/tilesets/*_palette_map.asm
 ; vram bank, pals
 x = \1 << OAM_TILE_BANK
-rept (_NARG +- 1) / 2
+rept (_NARG + -1) / 2
 	dn (x | PAL_BG_\3), (x | PAL_BG_\2)
 	shift
 	shift
 endr
 ENDM
 
-
-TilesetKantoPalMap: ; 0x4c075
+TilesetKantoPalMap:
 INCLUDE "gfx/tilesets/kanto_palette_map.asm"
-; 0x4c0e5
 
-Tileset0PalMap: ; 0x4c0e5
-TilesetJohtoPalMap: ; 0x4c0e5
+Tileset0PalMap:
+TilesetJohtoPalMap:
 INCLUDE "gfx/tilesets/johto_palette_map.asm"
-; 0x4c155
 
-TilesetJohtoModernPalMap: ; 0x4c155
+TilesetJohtoModernPalMap:
 INCLUDE "gfx/tilesets/johto_modern_palette_map.asm"
-; 0x4c1c5
 
-TilesetHousePalMap: ; 0x4c1c5
+TilesetHousePalMap:
 INCLUDE "gfx/tilesets/house_palette_map.asm"
-; 0x4c235
 
-TilesetPlayersHousePalMap: ; 0x4c235
+TilesetPlayersHousePalMap:
 INCLUDE "gfx/tilesets/players_house_palette_map.asm"
-; 0x4c2a5
 
-TilesetPokecenterPalMap: ; 0x4c2a5
+TilesetPokecenterPalMap:
 INCLUDE "gfx/tilesets/pokecenter_palette_map.asm"
-; 0x4c315
 
-TilesetGatePalMap: ; 0x4c315
+TilesetGatePalMap:
 INCLUDE "gfx/tilesets/gate_palette_map.asm"
-; 0x4c385
 
-TilesetPortPalMap: ; 0x4c385
+TilesetPortPalMap:
 INCLUDE "gfx/tilesets/port_palette_map.asm"
-; 0x4c3f5
 
-TilesetLabPalMap: ; 0x4c3f5
+TilesetLabPalMap:
 INCLUDE "gfx/tilesets/lab_palette_map.asm"
-; 0x4c465
 
-TilesetFacilityPalMap: ; 0x4c465
+TilesetFacilityPalMap:
 INCLUDE "gfx/tilesets/facility_palette_map.asm"
-; 0x4c4d5
 
-TilesetMartPalMap: ; 0x4c4d5
+TilesetMartPalMap:
 INCLUDE "gfx/tilesets/mart_palette_map.asm"
-; 0x4c545
 
-TilesetMansionPalMap: ; 0x4c545
+TilesetMansionPalMap:
 INCLUDE "gfx/tilesets/mansion_palette_map.asm"
-; 0x4c5b5
 
-TilesetGameCornerPalMap: ; 0x4c5b5
+TilesetGameCornerPalMap:
 INCLUDE "gfx/tilesets/game_corner_palette_map.asm"
-; 0x4c625
 
-TilesetEliteFourRoomPalMap: ; 0x4c625
+TilesetEliteFourRoomPalMap:
 INCLUDE "gfx/tilesets/elite_four_room_palette_map.asm"
-; 0x4c695
 
-TilesetTraditionalHousePalMap: ; 0x4c695
+TilesetTraditionalHousePalMap:
 INCLUDE "gfx/tilesets/traditional_house_palette_map.asm"
-; 0x4c705
 
-TilesetTowerPalMap: ; 0x4c705
+TilesetTowerPalMap:
 INCLUDE "gfx/tilesets/tower_palette_map.asm"
-; 0x4c775
 
-TilesetCavePalMap: ; 0x4c775
-TilesetDarkCavePalMap: ; 0x4c775
+TilesetCavePalMap:
+TilesetDarkCavePalMap:
 INCLUDE "gfx/tilesets/cave_palette_map.asm"
-; 0x4c7e5
 
-TilesetParkPalMap: ; 0x4c7e5
+TilesetParkPalMap:
 INCLUDE "gfx/tilesets/park_palette_map.asm"
-; 0x4c855
-
-TilesetRuinsOfAlphPalMap: ; 0x4c855
-TilesetBetaWordRoomPalMap: ; 0x4c855
-TilesetHoOhWordRoomPalMap: ; 0x4c855
-TilesetKabutoWordRoomPalMap: ; 0x4c855
-TilesetOmanyteWordRoomPalMap: ; 0x4c855
-TilesetAerodactylWordRoomPalMap: ; 0x4c855
+
+TilesetRuinsOfAlphPalMap:
+TilesetBetaWordRoomPalMap:
+TilesetHoOhWordRoomPalMap:
+TilesetKabutoWordRoomPalMap:
+TilesetOmanyteWordRoomPalMap:
+TilesetAerodactylWordRoomPalMap:
 INCLUDE "gfx/tilesets/ruins_of_alph_palette_map.asm"
-; 0x4c8c5
 
-TilesetRadioTowerPalMap: ; 0x4c8c5
+TilesetRadioTowerPalMap:
 INCLUDE "gfx/tilesets/radio_tower_palette_map.asm"
-; 0x4c935
 
-TilesetTrainStationPalMap: ; 0x4c935
+TilesetTrainStationPalMap:
 INCLUDE "gfx/tilesets/train_station_palette_map.asm"
-; 0x4c9a5
 
-TilesetUndergroundPalMap: ; 0x4c9a5
+TilesetUndergroundPalMap:
 INCLUDE "gfx/tilesets/underground_palette_map.asm"
-; 0x4ca15
 
-TilesetChampionsRoomPalMap: ; 0x4ca15
+TilesetChampionsRoomPalMap:
 INCLUDE "gfx/tilesets/champions_room_palette_map.asm"
-; 0x4ca85
 
-TilesetLighthousePalMap: ; 0x4ca85
+TilesetLighthousePalMap:
 INCLUDE "gfx/tilesets/lighthouse_palette_map.asm"
-; 0x4caf5
 
-TilesetPlayersRoomPalMap: ; 0x4caf5
+TilesetPlayersRoomPalMap:
 INCLUDE "gfx/tilesets/players_room_palette_map.asm"
-; 0x4cb65
 
-UnusedMuseumPalMap: ; 0x4cb65
+UnusedMuseumPalMap:
 INCLUDE "gfx/tilesets/unused_museum_palette_map.asm"
-; 4cbd5
 
-TilesetIcePathPalMap: ; 0x4cbd5
+TilesetIcePathPalMap:
 INCLUDE "gfx/tilesets/ice_path_palette_map.asm"
-; 0x4cc45
 
-TilesetForestPalMap: ; 0x4cc45
+TilesetForestPalMap:
 INCLUDE "gfx/tilesets/forest_palette_map.asm"
-; 0x4ccb5
 
-TilesetPokeComCenterPalMap: ; 0x4ccb5
+TilesetPokeComCenterPalMap:
 INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm"
-; 0x4cd25
 
-TilesetBattleTowerPalMap: ; 0x4cd25
+TilesetBattleTowerPalMap:
 INCLUDE "gfx/tilesets/battle_tower_palette_map.asm"
-; 0x4cd95
 
-TilesetBattleTowerOutsidePalMap: ; 0x4cd95
+TilesetBattleTowerOutsidePalMap:
 INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
-; 0x4ce05
 
 ; unused
-; 0x4ce05
 rept 26
 	db $06
 endr
-; 0x4ce1f
diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm
index f6d6b465f..c4071349c 100644
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@@ -6,430 +6,332 @@ ENDM
 
 SECTION "Tileset Data 1", ROMX
 
-TilesetKantoGFX: ; 0x18000
+TilesetKantoGFX:
 INCBIN "gfx/tilesets/kanto.2bpp.lz"
-; 0x18606
 
-TilesetKantoMeta: ; 0x18606
+TilesetKantoMeta:
 INCBIN "data/tilesets/kanto_metatiles.bin"
-; 0x18e06
 
-TilesetKantoColl: ; 0x18e06
+TilesetKantoColl:
 INCLUDE "data/tilesets/kanto_collision.asm"
-; 0x19006
 
-Tileset0GFX: ; 0x19006
-TilesetJohtoGFX: ; 0x19006
+Tileset0GFX:
+TilesetJohtoGFX:
 INCBIN "gfx/tilesets/johto.2bpp.lz"
-; 0x19c0e
 
-Tileset0Meta: ; 0x19c0e
-TilesetJohtoMeta: ; 0x19c0e
+Tileset0Meta:
+TilesetJohtoMeta:
 INCBIN "data/tilesets/johto_metatiles.bin"
-; 0x1a40e
 
-Tileset0Coll: ; 0x1a40e
-TilesetJohtoColl: ; 0x1a40e
+Tileset0Coll:
+TilesetJohtoColl:
 INCLUDE "data/tilesets/johto_collision.asm"
-; 0x1a60e
 
-TilesetIcePathGFX: ; 0x1a60e
+TilesetIcePathGFX:
 INCBIN "gfx/tilesets/ice_path.2bpp.lz"
-; 0x1af3e
 
-TilesetIcePathMeta: ; 0x1af3e
+TilesetIcePathMeta:
 INCBIN "data/tilesets/ice_path_metatiles.bin"
-; 0x1b33e
 
-TilesetIcePathColl: ; 0x1b33e
+TilesetIcePathColl:
 INCLUDE "data/tilesets/ice_path_collision.asm"
-; 0x1b43e
 
-TilesetPlayersRoomGFX: ; 0x1b43e
+TilesetPlayersRoomGFX:
 INCBIN "gfx/tilesets/players_room.2bpp.lz"
-; 0x1b8fe
 
-TilesetPlayersRoomMeta: ; 0x1b8fe
+TilesetPlayersRoomMeta:
 INCBIN "data/tilesets/players_room_metatiles.bin"
-; 0x1bcfe
 
-TilesetPlayersRoomColl: ; 0x1bcfe
+TilesetPlayersRoomColl:
 INCLUDE "data/tilesets/players_room_collision.asm"
-; 0x1bdfe
 
 
 SECTION "Tileset Data 2", ROMX
 
-TilesetPokecenterGFX: ; 0x1c30c
+TilesetPokecenterGFX:
 INCBIN "gfx/tilesets/pokecenter.2bpp.lz"
-; 0x1c73c
 
-TilesetPokecenterMeta: ; 0x1c73c
+TilesetPokecenterMeta:
 INCBIN "data/tilesets/pokecenter_metatiles.bin"
-; 0x1cb3c
 
-TilesetPokecenterColl: ; 0x1cb3c
+TilesetPokecenterColl:
 INCLUDE "data/tilesets/pokecenter_collision.asm"
-; 0x1cc3c
 
-TilesetPortGFX: ; 0x1cc3c
+TilesetPortGFX:
 INCBIN "gfx/tilesets/port.2bpp.lz"
-; 0x1d04c
 
-TilesetPortMeta: ; 0x1d04c
+TilesetPortMeta:
 INCBIN "data/tilesets/port_metatiles.bin"
-; 0x1d44c
 
-TilesetPortColl: ; 0x1d44c
+TilesetPortColl:
 INCLUDE "data/tilesets/port_collision.asm"
-; 0x1d54c
 
-TilesetPlayersHouseGFX: ; 0x1d54c
+TilesetPlayersHouseGFX:
 INCBIN "gfx/tilesets/players_house.2bpp.lz"
-; 0x1d92c
 
-TilesetPlayersHouseMeta: ; 0x1d92c
+TilesetPlayersHouseMeta:
 INCBIN "data/tilesets/players_house_metatiles.bin"
-; 0x1dd2c
 
-TilesetPlayersHouseColl: ; 0x1dd2c
+TilesetPlayersHouseColl:
 INCLUDE "data/tilesets/players_house_collision.asm"
-; 0x1de2c
 
-TilesetMansionGFX: ; 0x1de2c
+TilesetMansionGFX:
 INCBIN "gfx/tilesets/mansion.2bpp.lz"
-; 0x1e58c
 
-TilesetMansionMeta: ; 0x1e58c
+TilesetMansionMeta:
 INCBIN "data/tilesets/mansion_metatiles.bin"
-; 0x1e98c
 
-TilesetMansionColl: ; 0x1e98c
+TilesetMansionColl:
 INCLUDE "data/tilesets/mansion_collision.asm"
-; 0x1ea8c
 
-TilesetCaveGFX: ; 0x1ea8c
+TilesetCaveGFX:
 INCBIN "gfx/tilesets/cave.2bpp.lz"
-; 0x1ee1c
 
-TilesetCaveMeta: ; 0x1ee1c
-TilesetDarkCaveMeta: ; 0x1ee1c
+TilesetCaveMeta:
+TilesetDarkCaveMeta:
 INCBIN "data/tilesets/cave_metatiles.bin"
-; 0x1f21c
 
-TilesetCaveColl: ; 0x1f21c
-TilesetDarkCaveColl: ; 0x1f21c
+TilesetCaveColl:
+TilesetDarkCaveColl:
 INCLUDE "data/tilesets/cave_collision.asm"
-; 0x1f31c
 
 
 SECTION "Tileset Data 3", ROMX
 
-TilesetTowerGFX: ; 0x20181
+TilesetTowerGFX:
 INCBIN "gfx/tilesets/tower.2bpp.lz"
-; 0x206e1
 
-TilesetTowerMeta: ; 0x206e1
+TilesetTowerMeta:
 INCBIN "data/tilesets/tower_metatiles.bin"
-; 0x20ae1
 
-TilesetTowerColl: ; 0x20ae1
+TilesetTowerColl:
 INCLUDE "data/tilesets/tower_collision.asm"
-; 0x20be1
 
-TilesetLabGFX: ; 0x20be1
+TilesetLabGFX:
 INCBIN "gfx/tilesets/lab.2bpp.lz"
-; 0x213e1
 
-TilesetLabMeta: ; 0x213e1
+TilesetLabMeta:
 INCBIN "data/tilesets/lab_metatiles.bin"
-; 0x217e1
 
-TilesetLabColl: ; 0x217e1
+TilesetLabColl:
 INCLUDE "data/tilesets/lab_collision.asm"
-; 0x218e1
 
-TilesetMartGFX: ; 0x218e1
+TilesetMartGFX:
 INCBIN "gfx/tilesets/mart.2bpp.lz"
-; 0x22031
 
-TilesetMartMeta: ; 0x22031
+TilesetMartMeta:
 INCBIN "data/tilesets/mart_metatiles.bin"
-; 0x22431
 
-TilesetMartColl: ; 0x22431
+TilesetMartColl:
 INCLUDE "data/tilesets/mart_collision.asm"
-; 0x22531
 
-TilesetGameCornerGFX: ; 0x22531
+TilesetGameCornerGFX:
 INCBIN "gfx/tilesets/game_corner.2bpp.lz"
-; 0x22af1
 
-TilesetGameCornerMeta: ; 0x22af1
+TilesetGameCornerMeta:
 INCBIN "data/tilesets/game_corner_metatiles.bin"
-; 0x22ef1
 
-TilesetGameCornerColl: ; 0x22ef1
+TilesetGameCornerColl:
 INCLUDE "data/tilesets/game_corner_collision.asm"
-; 0x22ff1
 
-TilesetTrainStationGFX: ; 0x22ff1
+TilesetTrainStationGFX:
 INCBIN "gfx/tilesets/train_station.2bpp.lz"
-; 0x23391
 
-TilesetTrainStationMeta: ; 0x23391
+TilesetTrainStationMeta:
 INCBIN "data/tilesets/train_station_metatiles.bin"
-; 0x23791
 
-TilesetTrainStationColl: ; 0x23791
+TilesetTrainStationColl:
 INCLUDE "data/tilesets/train_station_collision.asm"
-; 0x23891
 
-TilesetForestMeta: ; 0x23891
+TilesetForestMeta:
 INCBIN "data/tilesets/forest_metatiles.bin"
-; 0x23b11
 
 
 SECTION "Tileset Data 4", ROMX
 
-TilesetEliteFourRoomGFX: ; 0x30000
+TilesetEliteFourRoomGFX:
 INCBIN "gfx/tilesets/elite_four_room.2bpp.lz"
-; 0x304e0
 
-TilesetEliteFourRoomMeta: ; 0x304e0
+TilesetEliteFourRoomMeta:
 INCBIN "data/tilesets/elite_four_room_metatiles.bin"
-; 0x308e0
 
-TilesetEliteFourRoomColl: ; 0x308e0
+TilesetEliteFourRoomColl:
 INCLUDE "data/tilesets/elite_four_room_collision.asm"
-; 0x309e0
 
-TilesetParkGFX: ; 0x309e0
+TilesetParkGFX:
 INCBIN "gfx/tilesets/park.2bpp.lz"
-; 0x30e80
 
-TilesetParkMeta: ; 0x30e80
+TilesetParkMeta:
 INCBIN "data/tilesets/park_metatiles.bin"
-; 0x31280
 
-TilesetParkColl: ; 0x31280
+TilesetParkColl:
 INCLUDE "data/tilesets/park_collision.asm"
-; 0x31380
 
-TilesetRadioTowerGFX: ; 0x31380
+TilesetRadioTowerGFX:
 INCBIN "gfx/tilesets/radio_tower.2bpp.lz"
-; 0x318e0
 
-TilesetRadioTowerMeta: ; 0x318e0
+TilesetRadioTowerMeta:
 INCBIN "data/tilesets/radio_tower_metatiles.bin"
-; 0x31ce0
 
-TilesetRadioTowerColl: ; 0x31ce0
+TilesetRadioTowerColl:
 INCLUDE "data/tilesets/radio_tower_collision.asm"
-; 0x31de0
 
-TilesetUndergroundGFX: ; 0x31de0
+TilesetUndergroundGFX:
 INCBIN "gfx/tilesets/underground.2bpp.lz"
-; 0x321b0
 
-TilesetUndergroundMeta: ; 0x321b0
+TilesetUndergroundMeta:
 INCBIN "data/tilesets/underground_metatiles.bin"
-; 0x325b0
 
-TilesetUndergroundColl: ; 0x325b0
+TilesetUndergroundColl:
 INCLUDE "data/tilesets/underground_collision.asm"
-; 0x326b0
 
-TilesetDarkCaveGFX: ; 0x326b0
+TilesetDarkCaveGFX:
 INCBIN "gfx/tilesets/dark_cave.2bpp.lz"
-; 0x329f0
 
-UnusedTilesetDarkCaveMeta: ; 0x329f0
+UnusedTilesetDarkCaveMeta:
 INCBIN "data/tilesets/unused_dark_cave_metatiles.bin"
-; 0x331f0
 
-UnusedTilesetDarkCaveColl: ; 0x331f0
+UnusedTilesetDarkCaveColl:
 INCLUDE "data/tilesets/unused_dark_cave_collision.asm"
-; 0x333f0
 
 
 SECTION "Tileset Data 5", ROMX
 
-TilesetPokeComCenterGFX: ; 0xb4000
+TilesetPokeComCenterGFX:
 INCBIN "gfx/tilesets/pokecom_center.2bpp.lz"
-; 0xb48a0
 
-TilesetPokeComCenterMeta: ; 0xb48a0
+TilesetPokeComCenterMeta:
 INCBIN "data/tilesets/pokecom_center_metatiles.bin"
-; 0xb4ca0
 
-TilesetPokeComCenterColl: ; 0xb4ca0
+TilesetPokeComCenterColl:
 INCLUDE "data/tilesets/pokecom_center_collision.asm"
-; 0xb4da0
 
-TilesetBattleTowerGFX: ; 0xb4da0
+TilesetBattleTowerGFX:
 INCBIN "gfx/tilesets/battle_tower.2bpp.lz"
-; 0xb50e0
 
-TilesetBattleTowerMeta: ; 0xb50e0
+TilesetBattleTowerMeta:
 INCBIN "data/tilesets/battle_tower_metatiles.bin"
-; 0xb54e0
 
-TilesetBattleTowerColl: ; 0xb54e0
+TilesetBattleTowerColl:
 INCLUDE "data/tilesets/battle_tower_collision.asm"
-; 0xb55e0
 
-TilesetGateGFX: ; 0xb55e0
+TilesetGateGFX:
 INCBIN "gfx/tilesets/gate.2bpp.lz"
-; 0xb59e0
 
-TilesetGateMeta: ; 0xb59e0
+TilesetGateMeta:
 INCBIN "data/tilesets/gate_metatiles.bin"
-; 0xb5de0
 
-TilesetGateColl: ; 0xb5de0
+TilesetGateColl:
 INCLUDE "data/tilesets/gate_collision.asm"
-; 0xb5ee0
 
-TilesetJohtoModernGFX: ; 0xb5ee0
-TilesetBattleTowerOutsideGFX: ; 0xb5ee0
+TilesetJohtoModernGFX:
+TilesetBattleTowerOutsideGFX:
 INCBIN "gfx/tilesets/johto_modern.2bpp.lz"
-; 0xb6ae8
 
-TilesetJohtoModernMeta: ; 0xb6ae8
+TilesetJohtoModernMeta:
 INCBIN "data/tilesets/johto_modern_metatiles.bin"
-; 0xb72e8
 
-TilesetJohtoModernColl: ; 0xb72e8
+TilesetJohtoModernColl:
 INCLUDE "data/tilesets/johto_modern_collision.asm"
-; 0xb74e8
 
-TilesetTraditionalHouseGFX: ; 0xb74e8
+TilesetTraditionalHouseGFX:
 INCBIN "gfx/tilesets/traditional_house.2bpp.lz"
-; 0xb79a8
 
-TilesetTraditionalHouseMeta: ; 0xb79a8
+TilesetTraditionalHouseMeta:
 INCBIN "data/tilesets/traditional_house_metatiles.bin"
-; 0xb7da8
 
-TilesetTraditionalHouseColl: ; 0xb7da8
+TilesetTraditionalHouseColl:
 INCLUDE "data/tilesets/traditional_house_collision.asm"
-; 0xb7ea8
 
 
 SECTION "Tileset Data 6", ROMX
 
-TilesetForestGFX: ; 0xdc000
+TilesetForestGFX:
 INCBIN "gfx/tilesets/forest.2bpp.lz"
-; 0xdc3d0
 
-TilesetChampionsRoomGFX: ; 0xdc3d0
+TilesetChampionsRoomGFX:
 INCBIN "gfx/tilesets/champions_room.2bpp.lz"
-; 0xdcc50
 
-TilesetChampionsRoomMeta: ; 0xdcc50
+TilesetChampionsRoomMeta:
 INCBIN "data/tilesets/champions_room_metatiles.bin"
-; 0xdd050
 
-TilesetChampionsRoomColl: ; 0xdd050
+TilesetChampionsRoomColl:
 INCLUDE "data/tilesets/champions_room_collision.asm"
-; 0xdd150
 
-TilesetHouseGFX: ; 0xdd150
+TilesetHouseGFX:
 INCBIN "gfx/tilesets/house.2bpp.lz"
-; 0xdd600
 
-TilesetHouseMeta: ; 0xdd600
+TilesetHouseMeta:
 INCBIN "data/tilesets/house_metatiles.bin"
-; 0xdda00
 
-TilesetHouseColl: ; 0xdda00
+TilesetHouseColl:
 INCLUDE "data/tilesets/house_collision.asm"
-; 0xddb00
 
-TilesetLighthouseGFX: ; 0xddb00
+TilesetLighthouseGFX:
 INCBIN "gfx/tilesets/lighthouse.2bpp.lz"
-; 0xddf70
 
-TilesetLighthouseMeta: ; 0xddf70
+TilesetLighthouseMeta:
 INCBIN "data/tilesets/lighthouse_metatiles.bin"
-; 0xde370
 
-TilesetLighthouseColl: ; 0xde370
+TilesetLighthouseColl:
 INCLUDE "data/tilesets/lighthouse_collision.asm"
-; 0xde470
 
-TilesetForestColl: ; 0xde470
+TilesetForestColl:
 INCLUDE "data/tilesets/forest_collision.asm"
-; 0xde570
 
-TilesetFacilityGFX: ; 0xde570
+TilesetFacilityGFX:
 INCBIN "gfx/tilesets/facility.2bpp.lz"
-; 0xde990
 
-TilesetFacilityMeta: ; 0xde990
+TilesetFacilityMeta:
 INCBIN "data/tilesets/facility_metatiles.bin"
-; 0xded90
 
-TilesetFacilityColl: ; 0xded90
+TilesetFacilityColl:
 INCLUDE "data/tilesets/facility_collision.asm"
-; 0xdee90
 
-TilesetBattleTowerOutsideMeta: ; 0xdee90
+TilesetBattleTowerOutsideMeta:
 INCBIN "data/tilesets/battle_tower_outside_metatiles.bin"
-; 0xdf690
 
-TilesetBattleTowerOutsideColl: ; 0xdf690
+TilesetBattleTowerOutsideColl:
 INCLUDE "data/tilesets/battle_tower_outside_collision.asm"
-; 0xdf890
 
-TilesetBetaWordRoomMeta: ; 0xdf890
+TilesetBetaWordRoomMeta:
 INCBIN "data/tilesets/beta_word_room_metatiles.bin"
-; 0xdfc90
 
-TilesetBetaWordRoomColl: ; 0xdfc90
-TilesetHoOhWordRoomColl: ; 0xdfc90
-TilesetKabutoWordRoomColl: ; 0xdfc90
-TilesetOmanyteWordRoomColl: ; 0xdfc90
-TilesetAerodactylWordRoomColl: ; 0xdfc90
+TilesetBetaWordRoomColl:
+TilesetHoOhWordRoomColl:
+TilesetKabutoWordRoomColl:
+TilesetOmanyteWordRoomColl:
+TilesetAerodactylWordRoomColl:
 INCLUDE "data/tilesets/beta_word_room_collision.asm"
-; 0xdfd90
 
 
 SECTION "Tileset Data 7", ROMX
 
-TilesetRuinsOfAlphGFX: ; 0x1dc5a1
-TilesetBetaWordRoomGFX: ; 0x1dc5a1
-TilesetHoOhWordRoomGFX: ; 0x1dc5a1
-TilesetKabutoWordRoomGFX: ; 0x1dc5a1
-TilesetOmanyteWordRoomGFX: ; 0x1dc5a1
-TilesetAerodactylWordRoomGFX: ; 0x1dc5a1
+TilesetRuinsOfAlphGFX:
+TilesetBetaWordRoomGFX:
+TilesetHoOhWordRoomGFX:
+TilesetKabutoWordRoomGFX:
+TilesetOmanyteWordRoomGFX:
+TilesetAerodactylWordRoomGFX:
 INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz"
-; 0x1dd1a9
 
-TilesetRuinsOfAlphMeta: ; 0x1dd1a9
+TilesetRuinsOfAlphMeta:
 INCBIN "data/tilesets/ruins_of_alph_metatiles.bin"
-; 0x1dd5a9
 
-TilesetRuinsOfAlphColl: ; 0x1dd5a9
+TilesetRuinsOfAlphColl:
 INCLUDE "data/tilesets/ruins_of_alph_collision.asm"
-; 0x1dd6a9
 
 
 SECTION "Tileset Data 8", ROMX
 
-TilesetHoOhWordRoomMeta: ; 0x1e0000
+TilesetHoOhWordRoomMeta:
 INCBIN "data/tilesets/ho_oh_word_room_metatiles.bin"
-; 0x1e0400
 
-TilesetKabutoWordRoomMeta: ; 0x1e0400
+TilesetKabutoWordRoomMeta:
 INCBIN "data/tilesets/kabuto_word_room_metatiles.bin"
-; 0x1e0800
 
-TilesetOmanyteWordRoomMeta: ; 0x1e0800
+TilesetOmanyteWordRoomMeta:
 INCBIN "data/tilesets/omanyte_word_room_metatiles.bin"
-; 0x1e0c00
 
-TilesetAerodactylWordRoomMeta: ; 0x1e0c00
+TilesetAerodactylWordRoomMeta:
 INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin"
-; 0x1e1000
diff --git a/gfx/tilesets/bg_tiles.pal b/gfx/tilesets/bg_tiles.pal
index e21561c74..3605e2184 100644
--- a/gfx/tilesets/bg_tiles.pal
+++ b/gfx/tilesets/bg_tiles.pal
@@ -49,13 +49,5 @@
 	RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
 
 ; overworld water
-; morn/day
-	RGB 23, 23, 31
-	RGB 18, 19, 31
-	RGB 13, 12, 31
-	RGB 07, 07, 07
-; nite
-	RGB 15, 13, 27
-	RGB 10, 09, 20
-	RGB 04, 03, 18
-	RGB 00, 00, 00
+	RGB 23,23,31, 18,19,31, 13,12,31, 07,07,07 ; morn/day
+	RGB 15,13,27, 10,09,20, 04,03,18, 00,00,00 ; nite
diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal
index 6daf87cb6..652b152c1 100644
--- a/gfx/tilesets/roofs.pal
+++ b/gfx/tilesets/roofs.pal
@@ -1,107 +1,107 @@
 ; group 0 (unused)
 	RGB 21,21,21, 11,11,11 ; morn/day
-	RGB 21,21,21, 11,11,11; nite
+	RGB 21,21,21, 11,11,11 ; nite
 
 ; group 1 (Olivine)
 	RGB 14,17,31, 07,11,15 ; morn/day
-	RGB 09,09,17, 05,07,13; nite
+	RGB 09,09,17, 05,07,13 ; nite
 
 ; group 2 (Mahogany)
 	RGB 12,19,00, 06,10,00 ; morn/day
-	RGB 06,09,07, 04,05,06; nite
+	RGB 06,09,07, 04,05,06 ; nite
 
 ; group 3 (dungeons)
 	RGB 21,21,21, 11,11,11 ; morn/day
-	RGB 21,21,21, 17,08,07; nite
+	RGB 21,21,21, 17,08,07 ; nite
 
 ; group 4 (Ecruteak)
 	RGB 31,19,00, 27,10,05 ; morn/day
-	RGB 15,07,02, 11,04,02; nite
+	RGB 15,07,02, 11,04,02 ; nite
 
 ; group 5 (Blackthorn)
 	RGB 11,10,16, 05,06,07 ; morn/day
-	RGB 03,04,08, 00,00,00; nite
+	RGB 03,04,08, 00,00,00 ; nite
 
 ; group 6 (Cinnabar)
 	RGB 31,10,00, 18,06,00 ; morn/day
-	RGB 18,05,09, 17,08,07; nite
+	RGB 18,05,09, 17,08,07 ; nite
 
 ; group 7 (Cerulean)
 	RGB 17,27,31, 05,15,31 ; morn/day
-	RGB 07,08,22, 07,07,16; nite
+	RGB 07,08,22, 07,07,16 ; nite
 
 ; group 8 (Azalea)
 	RGB 22,20,10, 17,14,03 ; morn/day
-	RGB 11,11,05, 10,09,07; nite
+	RGB 11,11,05, 10,09,07 ; nite
 
 ; group 9 (Lake of Rage)
 	RGB 31,08,04, 09,09,08 ; morn/day
-	RGB 18,05,09, 09,09,08; nite
+	RGB 18,05,09, 09,09,08 ; nite
 
 ; group 10 (Violet)
 	RGB 24,14,31, 13,07,21 ; morn/day
-	RGB 12,03,18, 09,03,15; nite
+	RGB 12,03,18, 09,03,15 ; nite
 
 ; group 11 (Goldenrod)
 	RGB 25,25,00, 20,17,08 ; morn/day
-	RGB 12,12,00, 10,09,05; nite
+	RGB 12,12,00, 10,09,05 ; nite
 
 ; group 12 (Vermilion)
 	RGB 27,23,01, 23,11,00 ; morn/day
-	RGB 15,11,01, 11,10,01; nite
+	RGB 15,11,01, 11,10,01 ; nite
 
 ; group 13 (Pallet)
 	RGB 27,28,31, 17,19,22 ; morn/day
-	RGB 14,14,18, 10,09,13; nite
+	RGB 14,14,18, 10,09,13 ; nite
 
 ; group 14 (Pewter)
 	RGB 19,19,16, 10,12,15 ; morn/day
-	RGB 09,09,11, 04,05,07; nite
+	RGB 09,09,11, 04,05,07 ; nite
 
 ; group 15 (Mount Moon Square)
 	RGB 14,17,31, 07,11,15 ; morn/day
-	RGB 09,13,19, 07,07,16; nite
+	RGB 09,13,19, 07,07,16 ; nite
 
 ; group 16 (Indigo)
 	RGB 21,21,21, 13,13,13 ; morn/day
-	RGB 11,11,19, 07,07,12; nite
+	RGB 11,11,19, 07,07,12 ; nite
 
 ; group 17 (Fuchsia)
 	RGB 31,18,29, 17,13,20 ; morn/day
-	RGB 14,06,12, 11,03,10; nite
+	RGB 14,06,12, 11,03,10 ; nite
 
 ; group 18 (Lavender)
 	RGB 23,15,31, 16,05,31 ; morn/day
-	RGB 12,07,17, 08,06,10; nite
+	RGB 12,07,17, 08,06,10 ; nite
 
 ; group 19 (Silver Cave)
 	RGB 21,21,25, 16,16,16 ; morn/day
-	RGB 13,13,13, 07,07,07; nite
+	RGB 13,13,13, 07,07,07 ; nite
 
 ; group 20 (Cable Club)
 	RGB 21,21,21, 11,11,11 ; morn/day
-	RGB 21,21,21, 11,11,11; nite
+	RGB 21,21,21, 11,11,11 ; nite
 
 ; group 21 (Celadon)
 	RGB 19,31,15, 31,22,02 ; morn/day
-	RGB 12,13,09, 09,12,03; nite
+	RGB 12,13,09, 09,12,03 ; nite
 
 ; group 22 (Cianwood)
 	RGB 15,10,31, 07,05,15 ; morn/day
-	RGB 06,05,17, 02,02,08; nite
+	RGB 06,05,17, 02,02,08 ; nite
 
 ; group 23 (Viridian)
 	RGB 21,31,07, 13,25,04 ; morn/day
-	RGB 09,14,08, 06,10,04; nite
+	RGB 09,14,08, 06,10,04 ; nite
 
 ; group 24 (New Bark)
 	RGB 20,31,14, 11,23,05 ; morn/day
-	RGB 09,13,08, 06,09,04; nite
+	RGB 09,13,08, 06,09,04 ; nite
 
 ; group 25 (Saffron)
 	RGB 31,26,00, 31,15,00 ; morn/day
-	RGB 13,13,01, 08,08,01; nite
+	RGB 13,13,01, 08,08,01 ; nite
 
 ; group 26 (Cherrygrove)
 	RGB 31,14,28, 31,05,21 ; morn/day
-	RGB 14,07,17, 13,00,08; nite
+	RGB 14,07,17, 13,00,08 ; nite
diff --git a/gfx/trade/ball.png b/gfx/trade/ball.png
index 4d3477bb6..9b56ae758 100755..100644
--- a/gfx/trade/ball.png
+++ b/gfx/trade/ball.png
diff --git a/gfx/unknown/16c903.pal b/gfx/unknown/16c903.pal
index a72635167..a72635167 100755..100644
--- a/gfx/unknown/16c903.pal
+++ b/gfx/unknown/16c903.pal
diff --git a/home.asm b/home.asm
index 2f628a735..8f68511b4 100644
--- a/home.asm
+++ b/home.asm
@@ -2,12 +2,11 @@ INCLUDE "constants.asm"
 
 
 SECTION "NULL", ROM0
-NULL::
 
+NULL::
 
 INCLUDE "home/rst.asm"
 
-
 INCLUDE "home/interrupts.asm"
 
 
@@ -37,13 +36,13 @@ INCLUDE "home/video.asm"
 INCLUDE "home/map_objects.asm"
 INCLUDE "home/sine.asm"
 INCLUDE "home/movement.asm"
-INCLUDE "home/tilemap.asm"
+INCLUDE "home/menu_window.asm"
 INCLUDE "home/menu.asm"
 INCLUDE "home/handshake.asm"
 INCLUDE "home/game_time.asm"
 INCLUDE "home/map.asm"
 
-InexplicablyEmptyFunction:: ; 2d43
+InexplicablyEmptyFunction::
 ; unused
 ; Inexplicably empty.
 ; Seen in PredefPointers.
@@ -51,14 +50,13 @@ rept 16
 	nop
 endr
 	ret
-; 2d54
 
 INCLUDE "home/farcall.asm"
 INCLUDE "home/predef.asm"
 INCLUDE "home/window.asm"
 INCLUDE "home/flag.asm"
 
-Unreferenced_Function2ebb:: ; 2ebb
+Unreferenced_Function2ebb::
 	ld a, [wMonStatusFlags]
 	bit 1, a
 	ret z
@@ -66,190 +64,50 @@ Unreferenced_Function2ebb:: ; 2ebb
 	ld a, [hJoyDown]
 	bit B_BUTTON_F, a
 	ret
-; 2ec6
 
-xor_a:: ; 2ec6
+xor_a::
 	xor a
 	ret
-; 2ec8
 
-xor_a_dec_a:: ; 2ec8
+xor_a_dec_a::
 	xor a
 	dec a
 	ret
-; 2ecb
 
-Unreferenced_Function2ecb:: ; 2ecb
+Unreferenced_Function2ecb::
 	push hl
 	ld hl, wMonStatusFlags
 	bit 1, [hl]
 	pop hl
 	ret
-; 2ed3
-
-DisableSpriteUpdates:: ; 0x2ed3
-; disables overworld sprite updating?
-	xor a
-	ld [hMapAnims], a
-	ld a, [wVramState]
-	res 0, a
-	ld [wVramState], a
-	ld a, $0
-	ld [wSpriteUpdatesEnabled], a
-	ret
-; 0x2ee4
-
-EnableSpriteUpdates:: ; 2ee4
-	ld a, $1
-	ld [wSpriteUpdatesEnabled], a
-	ld a, [wVramState]
-	set 0, a
-	ld [wVramState], a
-	ld a, $1
-	ld [hMapAnims], a
-	ret
-; 2ef6
 
+INCLUDE "home/sprite_updates.asm"
 INCLUDE "home/string.asm"
+INCLUDE "home/region.asm"
 
-IsInJohto:: ; 2f17
-; Return 0 if the player is in Johto, and 1 in Kanto.
-
-	ld a, [wMapGroup]
-	ld b, a
-	ld a, [wMapNumber]
-	ld c, a
-	call GetWorldMapLocation
-
-	cp FAST_SHIP
-	jr z, .Johto
-
-	cp SPECIAL_MAP
-	jr nz, .CheckRegion
-
-	ld a, [wBackupMapGroup]
-	ld b, a
-	ld a, [wBackupMapNumber]
-	ld c, a
-	call GetWorldMapLocation
-
-.CheckRegion:
-	cp KANTO_LANDMARK
-	jr nc, .Kanto
-
-.Johto:
-	xor a
+ret_2f3e::
 	ret
 
-.Kanto:
-	ld a, 1
-	ret
-; 2f3e
-
-ret_2f3e:: ; 2f3e
-	ret
-; 2f3f
-
 INCLUDE "home/item.asm"
 INCLUDE "home/random.asm"
 INCLUDE "home/sram.asm"
 
 ; Register aliases
 
-_hl_:: ; 2fec
+_hl_::
 	jp hl
-; 2fed
 
-_de_:: ; 2fed
+_de_::
 	push de
 	ret
-; 2fef
 
 INCLUDE "home/double_speed.asm"
-
-ClearSprites:: ; 300b
-; Erase OAM data
-	ld hl, wVirtualOAM
-	ld b, wVirtualOAMEnd - wVirtualOAM
-	xor a
-.loop
-	ld [hli], a
-	dec b
-	jr nz, .loop
-	ret
-; 3016
-
-HideSprites:: ; 3016
-; Set all OAM y-positions to 160 to hide them offscreen
-	ld hl, wVirtualOAMSprite00YCoord
-	ld de, SPRITEOAMSTRUCT_LENGTH
-	ld b, NUM_SPRITE_OAM_STRUCTS
-	ld a, SCREEN_WIDTH_PX
-.loop
-	ld [hl], a ; y
-	add hl, de
-	dec b
-	jr nz, .loop
-	ret
-; 3026
-
+INCLUDE "home/clear_sprites.asm"
 INCLUDE "home/copy2.asm"
+INCLUDE "home/copy_tilemap.asm"
+INCLUDE "home/copy_name.asm"
 
-LoadTileMapToTempTileMap:: ; 309d
-; Load wTileMap into wTempTileMap
-	ld a, [rSVBK]
-	push af
-	ld a, BANK(wTempTileMap)
-	ld [rSVBK], a
-	hlcoord 0, 0
-	decoord 0, 0, wTempTileMap
-	ld bc, wTileMapEnd - wTileMap
-	call CopyBytes
-	pop af
-	ld [rSVBK], a
-	ret
-; 30b4
-
-Call_LoadTempTileMapToTileMap:: ; 30b4
-	xor a
-	ld [hBGMapMode], a
-	call LoadTempTileMapToTileMap
-	ld a, 1
-	ld [hBGMapMode], a
-	ret
-; 30bf
-
-LoadTempTileMapToTileMap:: ; 30bf
-; Load wTempTileMap into wTileMap
-	ld a, [rSVBK]
-	push af
-	ld a, BANK(wTempTileMap)
-	ld [rSVBK], a
-	hlcoord 0, 0, wTempTileMap
-	decoord 0, 0
-	ld bc, wTileMapEnd - wTileMap
-	call CopyBytes
-	pop af
-	ld [rSVBK], a
-	ret
-; 30d6
-
-CopyName1:: ; 30d6
-; Copies the name from de to wStringBuffer2
-	ld hl, wStringBuffer2
-
-CopyName2:: ; 30d9
-; Copies the name from de to hl
-.loop
-	ld a, [de]
-	inc de
-	ld [hli], a
-	cp "@"
-	jr nz, .loop
-	ret
-; 30e1
-
-IsInArray:: ; 30e1
+IsInArray::
 ; Find value a for every de bytes in array hl.
 ; Return index in b and carry if found.
 
@@ -272,9 +130,8 @@ IsInArray:: ; 30e1
 .InArray:
 	scf
 	ret
-; 30f4
 
-SkipNames:: ; 0x30f4
+SkipNames::
 ; Skip a names.
 	ld bc, NAME_LENGTH
 	and a
@@ -284,137 +141,11 @@ SkipNames:: ; 0x30f4
 	dec a
 	jr nz, .loop
 	ret
-; 0x30fe
 
 INCLUDE "home/math.asm"
+INCLUDE "home/print_text.asm"
 
-PrintLetterDelay:: ; 313d
-; Wait before printing the next letter.
-
-; The text speed setting in wOptions is actually a frame count:
-; 	fast: 1 frame
-; 	mid:  3 frames
-; 	slow: 5 frames
-
-; wTextBoxFlags[!0] and A or B override text speed with a one-frame delay.
-; wOptions[4] and wTextBoxFlags[!1] disable the delay.
-
-	ld a, [wOptions]
-	bit NO_TEXT_SCROLL, a
-	ret nz
-
-; non-scrolling text?
-	ld a, [wTextBoxFlags]
-	bit NO_TEXT_DELAY_F, a
-	ret z
-
-	push hl
-	push de
-	push bc
-
-	ld hl, hOAMUpdate
-	ld a, [hl]
-	push af
-
-; orginally turned oam update off...
-;	ld a, 1
-	ld [hl], a
-
-; force fast scroll?
-	ld a, [wTextBoxFlags]
-	bit FAST_TEXT_DELAY_F, a
-	jr z, .fast
-
-; text speed
-	ld a, [wOptions]
-	and %111
-	jr .updatedelay
-
-.fast
-	ld a, TEXT_DELAY_FAST
-
-.updatedelay
-	ld [wTextDelayFrames], a
-
-.checkjoypad
-	call GetJoypad
-
-; input override
-	ld a, [wDisableTextAcceleration]
-	and a
-	jr nz, .wait
-
-; Wait one frame if holding A or B.
-	ld a, [hJoyDown]
-	bit A_BUTTON_F, a
-	jr z, .checkb
-	jr .delay
-.checkb
-	bit B_BUTTON_F, a
-	jr z, .wait
-
-.delay
-	call DelayFrame
-	jr .end
-
-.wait
-	ld a, [wTextDelayFrames]
-	and a
-	jr nz, .checkjoypad
-
-.end
-	pop af
-	ld [hOAMUpdate], a
-	pop bc
-	pop de
-	pop hl
-	ret
-; 318c
-
-CopyDataUntil:: ; 318c
-; Copy [hl .. bc) to de.
-
-; In other words, the source data is
-; from hl up to but not including bc,
-; and the destination is de.
-
-	ld a, [hli]
-	ld [de], a
-	inc de
-	ld a, h
-	cp b
-	jr nz, CopyDataUntil
-	ld a, l
-	cp c
-	jr nz, CopyDataUntil
-	ret
-; 0x3198
-
-PrintNum:: ; 3198
-	homecall _PrintNum
-	ret
-; 31a4
-
-MobilePrintNum:: ; 31a4
-	homecall _MobilePrintNum
-	ret
-; 31b0
-
-FarPrintText:: ; 31b0
-	ld [hBuffer], a
-	ld a, [hROMBank]
-	push af
-	ld a, [hBuffer]
-	rst Bankswitch
-
-	call PrintText
-
-	pop af
-	rst Bankswitch
-	ret
-; 31be
-
-CallPointerAt:: ; 31be
+CallPointerAt::
 	ld a, [hROMBank]
 	push af
 	ld a, [hli]
@@ -430,13 +161,12 @@ CallPointerAt:: ; 31be
 	ld a, h
 	rst Bankswitch
 	ret
-; 31cd
 
-QueueScript:: ; 31cd
+QueueScript::
 ; Push pointer hl in the current bank to wQueuedScriptBank.
 	ld a, [hROMBank]
 
-FarQueueScript:: ; 31cf
+FarQueueScript::
 ; Push pointer a:hl to wQueuedScriptBank.
 	ld [wQueuedScriptBank], a
 	ld a, l
@@ -444,9 +174,8 @@ FarQueueScript:: ; 31cf
 	ld a, h
 	ld [wQueuedScriptAddr + 1], a
 	ret
-; 31db
 
-StringCmp:: ; 31db
+StringCmp::
 ; Compare c bytes at de and hl.
 ; Return z if they all match.
 .loop
@@ -458,9 +187,8 @@ StringCmp:: ; 31db
 	dec c
 	jr nz, .loop
 	ret
-; 0x31e4
 
-CompareLong:: ; 31e4
+CompareLong::
 ; Compare bc bytes at de and hl.
 ; Return carry if they all match.
 
@@ -482,259 +210,11 @@ CompareLong:: ; 31e4
 .Diff:
 	and a
 	ret
-; 31f3
-
-ClearBGPalettes:: ; 31f3
-	call ClearPalettes
-WaitBGMap:: ; 31f6
-; Tell VBlank to update BG Map
-	ld a, 1 ; BG Map 0 tiles
-	ld [hBGMapMode], a
-; Wait for it to do its magic
-	ld c, 4
-	call DelayFrames
-	ret
-; 3200
-
-WaitBGMap2:: ; 0x3200
-	ld a, [hCGB]
-	and a
-	jr z, .bg0
-
-	ld a, 2
-	ld [hBGMapMode], a
-	ld c, 4
-	call DelayFrames
 
-.bg0
-	ld a, 1
-	ld [hBGMapMode], a
-	ld c, 4
-	call DelayFrames
-	ret
-; 0x3218
-
-IsCGB:: ; 3218
-	ld a, [hCGB]
-	and a
-	ret
-; 321c
-
-ApplyTilemap:: ; 321c
-	ld a, [hCGB]
-	and a
-	jr z, .dmg
-
-	ld a, [wSpriteUpdatesEnabled]
-	cp 0
-	jr z, .dmg
-
-	ld a, 1
-	ld [hBGMapMode], a
-	jr CopyTilemapAtOnce
-
-.dmg
-; WaitBGMap
-	ld a, 1
-	ld [hBGMapMode], a
-	ld c, 4
-	call DelayFrames
-	ret
-; 3238
-
-CGBOnly_CopyTilemapAtOnce:: ; 3238
-	ld a, [hCGB]
-	and a
-	jr z, WaitBGMap
-
-CopyTilemapAtOnce:: ; 323d
-	jr .CopyTilemapAtOnce
-; 323f
-
-; unused
-	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
-	ret
-; 3246
-
-.CopyTilemapAtOnce: ; 3246
-	ld a, [hBGMapMode]
-	push af
-	xor a
-	ld [hBGMapMode], a
-
-	ld a, [hMapAnims]
-	push af
-	xor a
-	ld [hMapAnims], a
-
-.wait
-	ld a, [rLY]
-	cp $7f
-	jr c, .wait
-
-	di
-	ld a, BANK(vTiles3)
-	ld [rVBK], a
-	hlcoord 0, 0, wAttrMap
-	call .StackPointerMagic
-	ld a, BANK(vTiles0)
-	ld [rVBK], a
-	hlcoord 0, 0
-	call .StackPointerMagic
-
-.wait2
-	ld a, [rLY]
-	cp $7f
-	jr c, .wait2
-	ei
-
-	pop af
-	ld [hMapAnims], a
-	pop af
-	ld [hBGMapMode], a
-	ret
-; 327b
-
-.StackPointerMagic: ; 327b
-; Copy all tiles to vBGMap
-	ld [hSPBuffer], sp
-	ld sp, hl
-	ld a, [hBGMapAddress + 1]
-	ld h, a
-	ld l, 0
-	ld a, SCREEN_HEIGHT
-	ld [hTilesPerCycle], a
-	ld b, 1 << 1 ; not in v/hblank
-	ld c, LOW(rSTAT)
-
-.loop
-rept SCREEN_WIDTH / 2
-	pop de
-; if in v/hblank, wait until not in v/hblank
-.loop\@
-	ld a, [$ff00+c]
-	and b
-	jr nz, .loop\@
-; load BGMap0
-	ld [hl], e
-	inc l
-	ld [hl], d
-	inc l
-endr
-
-	ld de, BG_MAP_WIDTH - SCREEN_WIDTH
-	add hl, de
-	ld a, [hTilesPerCycle]
-	dec a
-	ld [hTilesPerCycle], a
-	jr nz, .loop
-
-	ld a, [hSPBuffer]
-	ld l, a
-	ld a, [hSPBuffer + 1]
-	ld h, a
-	ld sp, hl
-	ret
-; 32f9
-
-SetPalettes:: ; 32f9
-; Inits the Palettes
-; depending on the system the monochromes palettes or color palettes
-	ld a, [hCGB]
-	and a
-	jr nz, .SetPalettesForGameBoyColor
-	ld a, %11100100
-	ld [rBGP], a
-	ld a, %11010000
-	ld [rOBP0], a
-	ld [rOBP1], a
-	ret
-
-.SetPalettesForGameBoyColor:
-	push de
-	ld a, %11100100
-	call DmgToCgbBGPals
-	lb de, %11100100, %11100100
-	call DmgToCgbObjPals
-	pop de
-	ret
-; 3317
-
-ClearPalettes:: ; 3317
-; Make all palettes white
-
-; CGB: make all the palette colors white
-	ld a, [hCGB]
-	and a
-	jr nz, .cgb
-
-; DMG: just change palettes to 0 (white)
-	xor a
-	ld [rBGP], a
-	ld [rOBP0], a
-	ld [rOBP1], a
-	ret
-
-.cgb
-	ld a, [rSVBK]
-	push af
-
-	ld a, BANK(wBGPals2)
-	ld [rSVBK], a
-
-; Fill wBGPals2 and wOBPals2 with $ffff (white)
-	ld hl, wBGPals2
-	ld bc, 16 palettes
-	ld a, $ff
-	call ByteFill
-
-	pop af
-	ld [rSVBK], a
-
-; Request palette update
-	ld a, 1
-	ld [hCGBPalUpdate], a
-	ret
-; 333e
-
-GetMemSGBLayout:: ; 333e
-	ld b, SCGB_RAM
-GetSGBLayout:: ; 3340
-; load sgb packets unless dmg
-
-	ld a, [hCGB]
-	and a
-	jr nz, .sgb
-
-	ld a, [hSGB]
-	and a
-	ret z
-
-.sgb
-	predef_jump LoadSGBLayout
-; 334e
-
-SetHPPal:: ; 334e
-; Set palette for hp bar pixel length e at hl.
-	call GetHPPal
-	ld [hl], d
-	ret
-; 3353
-
-GetHPPal:: ; 3353
-; Get palette for hp bar pixel length e in d.
-	ld d, HP_GREEN
-	ld a, e
-	cp (50 * 48 / 100)
-	ret nc
-	inc d ; HP_YELLOW
-	cp (21 * 48 / 100)
-	ret nc
-	inc d ; HP_RED
-	ret
-; 335f
+INCLUDE "home/tilemap.asm"
+INCLUDE "home/hp_pals.asm"
 
-CountSetBits:: ; 0x335f
+CountSetBits::
 ; Count the number of set bits in b bytes starting from hl.
 ; Return in a, c and [wd265].
 	ld c, 0
@@ -757,646 +237,27 @@ CountSetBits:: ; 0x335f
 	ld a, c
 	ld [wd265], a
 	ret
-; 0x3376
 
-GetWeekday:: ; 3376
+GetWeekday::
 	ld a, [wCurDay]
 .mod
 	sub 7
 	jr nc, .mod
 	add 7
 	ret
-; 3380
 
 INCLUDE "home/pokedex_flags.asm"
-
 INCLUDE "home/names.asm"
-
-ScrollingMenu:: ; 350c
-	call CopyMenuData2
-	ld a, [hROMBank]
-	push af
-
-	ld a, BANK(_ScrollingMenu)
-	rst Bankswitch
-
-	call _InitScrollingMenu
-	call .UpdatePalettes
-	call _ScrollingMenu
-
-	pop af
-	rst Bankswitch
-
-	ld a, [wMenuJoypad]
-	ret
-; 3524
-
-.UpdatePalettes: ; 3524
-	ld hl, wVramState
-	bit 0, [hl]
-	jp nz, UpdateTimePals
-	jp SetPalettes
-; 352f
-
-InitScrollingMenu:: ; 352f
-	ld a, [wMenuBorderTopCoord]
-	dec a
-	ld b, a
-	ld a, [wMenuBorderBottomCoord]
-	sub b
-	ld d, a
-	ld a, [wMenuBorderLeftCoord]
-	dec a
-	ld c, a
-	ld a, [wMenuBorderRightCoord]
-	sub c
-	ld e, a
-	push de
-	call Coord2Tile
-	pop bc
-	jp TextBox
-; 354b
-
-JoyTextDelay_ForcehJoyDown:: ; 354b joypad
-	call DelayFrame
-
-	ld a, [hInMenu]
-	push af
-	ld a, $1
-	ld [hInMenu], a
-	call JoyTextDelay
-	pop af
-	ld [hInMenu], a
-
-	ld a, [hJoyLast]
-	and D_RIGHT + D_LEFT + D_UP + D_DOWN
-	ld c, a
-	ld a, [hJoyPressed]
-	and A_BUTTON + B_BUTTON + SELECT + START
-	or c
-	ld c, a
-	ret
-; 3567
-
-HandleStoneQueue:: ; 3567
-	ld a, [hROMBank]
-	push af
-
-	call SwitchToMapScriptsBank
-	call .WarpAction
-
-	pop bc
-	ld a, b
-	rst Bankswitch
-	ret
-; 3574
-
-.WarpAction: ; 3574
-	ld hl, OBJECT_MAP_OBJECT_INDEX
-	add hl, de
-	ld a, [hl]
-	cp $ff
-	jr z, .nope
-
-	ld l, a
-	push hl
-	call .IsObjectOnWarp
-	pop hl
-	jr nc, .nope
-	ld d, a
-	ld e, l
-	call .IsObjectInStoneTable
-	jr nc, .nope
-	call CallMapScript
-	farcall EnableScriptMode
-	scf
-	ret
-
-.nope
-	and a
-	ret
-; 3599
-
-.IsObjectOnWarp: ; 3599
-	push de
-
-	ld hl, OBJECT_NEXT_MAP_X
-	add hl, de
-	ld a, [hl]
-	ld hl, OBJECT_NEXT_MAP_Y
-	add hl, de
-	ld e, [hl]
-
-	sub 4
-	ld d, a
-	ld a, e
-	sub 4
-	ld e, a
-	call .check_on_warp
-
-	pop de
-	ret
-; 35b0
-
-.check_on_warp ; 35b0
-	ld hl, wCurrMapWarpsPointer
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	ld a, [wCurrMapWarpCount]
-	and a
-	jr z, .nope2
-
-.loop
-	push af
-	ld a, [hl]
-	cp e
-	jr nz, .not_on_warp
-	inc hl
-	ld a, [hld]
-	cp d
-	jr nz, .not_on_warp
-	jr .found_warp
-
-.not_on_warp
-	ld a, 5
-	add l
-	ld l, a
-	jr nc, .no_carry
-	inc h
-.no_carry
-
-	pop af
-	dec a
-	jr nz, .loop
-
-.nope2
-	and a
-	ret
-
-.found_warp
-	pop af
-	ld d, a
-	ld a, [wCurrMapWarpCount]
-	sub d
-	inc a
-	scf
-	ret
-; 35de
-
-.IsObjectInStoneTable: ; 35de
-	inc e
-	ld hl, CMDQUEUE_ADDR
-	add hl, bc
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-.loop2
-	ld a, [hli]
-	cp $ff
-	jr z, .nope3
-	cp d
-	jr nz, .next_inc3
-	ld a, [hli]
-	cp e
-	jr nz, .next_inc2
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	jr .yes
-
-.next_inc3
-	inc hl
-
-.next_inc2
-	inc hl
-	inc hl
-	jr .loop2
-
-.nope3
-	and a
-	ret
-
-.yes
-	scf
-	ret
-; 3600
-
+INCLUDE "home/scrolling_menu.asm"
+INCLUDE "home/stone_queue.asm"
 INCLUDE "home/trainers.asm"
-
-IsAPokemon:: ; 3741
-; Return carry if species a is not a Pokemon.
-	and a
-	jr z, .NotAPokemon
-	cp EGG
-	jr z, .Pokemon
-	cp NUM_POKEMON + 1
-	jr c, .Pokemon
-
-.NotAPokemon:
-	scf
-	ret
-
-.Pokemon:
-	and a
-	ret
-; 3750
-
-DrawBattleHPBar:: ; 3750
-; Draw an HP bar d tiles long at hl
-; Fill it up to e pixels
-
-	push hl
-	push de
-	push bc
-
-; Place 'HP:'
-	ld a, $60
-	ld [hli], a
-	ld a, $61
-	ld [hli], a
-
-; Draw a template
-	push hl
-	ld a, $62 ; empty bar
-.template
-	ld [hli], a
-	dec d
-	jr nz, .template
-	ld a, $6b ; bar end
-	add b
-	ld [hl], a
-	pop hl
-
-; Safety check # pixels
-	ld a, e
-	and a
-	jr nz, .fill
-	ld a, c
-	and a
-	jr z, .done
-	ld e, 1
-
-.fill
-; Keep drawing tiles until pixel length is reached
-	ld a, e
-	sub TILE_WIDTH
-	jr c, .lastbar
-
-	ld e, a
-	ld a, $6a ; full bar
-	ld [hli], a
-	ld a, e
-	and a
-	jr z, .done
-	jr .fill
-
-.lastbar
-	ld a, $62  ; empty bar
-	add e      ; + e
-	ld [hl], a
-
-.done
-	pop bc
-	pop de
-	pop hl
-	ret
-; 3786
-
-PrepMonFrontpic:: ; 3786
-	ld a, $1
-	ld [wBoxAlignment], a
-
-_PrepMonFrontpic:: ; 378b
-	ld a, [wCurPartySpecies]
-	call IsAPokemon
-	jr c, .not_pokemon
-
-	push hl
-	ld de, vTiles2
-	predef GetMonFrontpic
-	pop hl
-	xor a
-	ld [hGraphicStartTile], a
-	lb bc, 7, 7
-	predef PlaceGraphic
-	xor a
-	ld [wBoxAlignment], a
-	ret
-
-.not_pokemon
-	xor a
-	ld [wBoxAlignment], a
-	inc a
-	ld [wCurPartySpecies], a
-	ret
-; 37b6
-
+INCLUDE "home/mon_stats.asm"
 INCLUDE "home/cry.asm"
-
-PrintLevel:: ; 382d
-; Print wTempMonLevel at hl
-
-	ld a, [wTempMonLevel]
-	ld [hl], "<LV>"
-	inc hl
-
-; How many digits?
-	ld c, 2
-	cp 100 ; This is distinct from MAX_LEVEL.
-	jr c, Print8BitNumRightAlign
-
-; 3-digit numbers overwrite the :L.
-	dec hl
-	inc c
-	jr Print8BitNumRightAlign
-; 383d
-
-PrintLevel_Force3Digits:: ; 383d
-; Print :L and all 3 digits
-	ld [hl], "<LV>"
-	inc hl
-	ld c, 3
-; 3842
-
-Print8BitNumRightAlign:: ; 3842
-	ld [wd265], a
-	ld de, wd265
-	ld b, PRINTNUM_RIGHTALIGN | 1
-	jp PrintNum
-; 384d
-
-Unreferenced_Function384d:: ; 384d
-; GetNthMove
-	ld hl, wListMoves_MoveIndicesBuffer
-	ld c, a
-	ld b, 0
-	add hl, bc
-	ld a, [hl]
-	ret
-; 3856
-
-GetBaseData:: ; 3856
-	push bc
-	push de
-	push hl
-	ld a, [hROMBank]
-	push af
-	ld a, BANK(BaseData)
-	rst Bankswitch
-
-; Egg doesn't have BaseData
-	ld a, [wCurSpecies]
-	cp EGG
-	jr z, .egg
-
-; Get BaseData
-	dec a
-	ld bc, BASE_DATA_SIZE
-	ld hl, BaseData
-	call AddNTimes
-	ld de, wCurBaseData
-	ld bc, BASE_DATA_SIZE
-	call CopyBytes
-	jr .end
-
-.egg
-; ????
-	ld de, UnknownEggPic
-
-; Sprite dimensions
-	ld b, $55 ; 5x5
-	ld hl, wBasePicSize
-	ld [hl], b
-
-; ????
-	ld hl, wBasePadding
-	ld [hl], e
-	inc hl
-	ld [hl], d
-	inc hl
-	ld [hl], e
-	inc hl
-	ld [hl], d
-	jr .end
-
-.end
-; Replace Pokedex # with species
-	ld a, [wCurSpecies]
-	ld [wBaseDexNo], a
-
-	pop af
-	rst Bankswitch
-	pop hl
-	pop de
-	pop bc
-	ret
-; 389c
-
-GetCurNick:: ; 389c
-	ld a, [wCurPartyMon]
-	ld hl, wPartyMonNicknames
-
-GetNick:: ; 38a2
-; Get nickname a from list hl.
-
-	push hl
-	push bc
-
-	call SkipNames
-	ld de, wStringBuffer1
-
-	push de
-	ld bc, MON_NAME_LENGTH
-	call CopyBytes
-	pop de
-
-	callfar CheckNickErrors
-
-	pop bc
-	pop hl
-	ret
-; 38bb
-
-PrintBCDNumber:: ; 38bb
-; function to print a BCD (Binary-coded decimal) number
-; de = address of BCD number
-; hl = destination address
-; c = flags and length
-; bit 7: if set, do not print leading zeroes
-;        if unset, print leading zeroes
-; bit 6: if set, left-align the string (do not pad empty digits with spaces)
-;        if unset, right-align the string
-; bit 5: if set, print currency symbol at the beginning of the string
-;        if unset, do not print the currency symbol
-; bits 0-4: length of BCD number in bytes
-; Note that bits 5 and 7 are modified during execution. The above reflects
-; their meaning at the beginning of the functions's execution.
-	ld b, c ; save flags in b
-	res 7, c
-	res 6, c
-	res 5, c ; c now holds the length
-	bit 5, b
-	jr z, .loop
-	bit 7, b
-	jr nz, .loop ; skip currency symbol
-	ld [hl], "¥"
-	inc hl
-.loop
-	ld a, [de]
-	swap a
-	call PrintBCDDigit ; print upper digit
-	ld a, [de]
-	call PrintBCDDigit ; print lower digit
-	inc de
-	dec c
-	jr nz, .loop
-	bit 7, b ; were any non-zero digits printed?
-	jr z, .done ; if so, we are done
-.numberEqualsZero ; if every digit of the BCD number is zero
-	bit 6, b ; left or right alignment?
-	jr nz, .skipRightAlignmentAdjustment
-	dec hl ; if the string is right-aligned, it needs to be moved back one space
-.skipRightAlignmentAdjustment
-	bit 5, b
-	jr z, .skipCurrencySymbol
-	ld [hl], "¥" ; currency symbol
-	inc hl
-.skipCurrencySymbol
-	ld [hl], "0"
-	call PrintLetterDelay
-	inc hl
-.done
-	ret
-; 0x38f2
-
-PrintBCDDigit:: ; 38f2
-	and %00001111
-	and a
-	jr z, .zeroDigit
-.nonzeroDigit
-	bit 7, b ; have any non-space characters been printed?
-	jr z, .outputDigit
-; if bit 7 is set, then no numbers have been printed yet
-	bit 5, b ; print the currency symbol?
-	jr z, .skipCurrencySymbol
-	ld [hl], "¥"
-	inc hl
-	res 5, b
-.skipCurrencySymbol
-	res 7, b ; unset 7 to indicate that a nonzero digit has been reached
-.outputDigit
-	add "0"
-	ld [hli], a
-	jp PrintLetterDelay
-
-.zeroDigit
-	bit 7, b ; either printing leading zeroes or already reached a nonzero digit?
-	jr z, .outputDigit ; if so, print a zero digit
-	bit 6, b ; left or right alignment?
-	ret nz
-	ld a, " "
-	ld [hli], a ; if right-aligned, "print" a space by advancing the pointer
-	ret
-; 0x3917
-
-GetPartyParamLocation:: ; 3917
-; Get the location of parameter a from wCurPartyMon in hl
-	push bc
-	ld hl, wPartyMons
-	ld c, a
-	ld b, 0
-	add hl, bc
-	ld a, [wCurPartyMon]
-	call GetPartyLocation
-	pop bc
-	ret
-; 3927
-
-GetPartyLocation:: ; 3927
-; Add the length of a PartyMon struct to hl a times.
-	ld bc, PARTYMON_STRUCT_LENGTH
-	jp AddNTimes
-; 392d
-
-Unreferenced_Function392d:: ; 392d
-; GetDexNumber
-; Probably used in gen 1 to convert index number to dex number
-; Not required in gen 2 because index number == dex number
-	push hl
-	ld a, b
-	dec a
-	ld b, 0
-	add hl, bc
-	ld hl, BaseData + BASE_DEX_NO
-	ld bc, BASE_DATA_SIZE
-	call AddNTimes
-	ld a, BANK(BaseData)
-	call GetFarHalfword
-	ld b, l
-	ld c, h
-	pop hl
-	ret
-; 3945
-
+INCLUDE "home/print_level.asm"
+INCLUDE "home/mon_data.asm"
+INCLUDE "home/print_bcd.asm"
+INCLUDE "home/mon_data_2.asm"
 INCLUDE "home/battle.asm"
-
-PushLYOverrides:: ; 3b0c
-
-	ld a, [hLCDCPointer]
-	and a
-	ret z
-
-	ld a, LOW(wLYOverridesBackup)
-	ld [wRequested2bppSource], a
-	ld a, HIGH(wLYOverridesBackup)
-	ld [wRequested2bppSource + 1], a
-
-	ld a, LOW(wLYOverrides)
-	ld [wRequested2bppDest], a
-	ld a, HIGH(wLYOverrides)
-	ld [wRequested2bppDest + 1], a
-
-	ld a, (wLYOverridesEnd - wLYOverrides) / 16
-	ld [wRequested2bpp], a
-	ret
-; 3b2a
-
-_InitSpriteAnimStruct:: ; 3b2a
-
-	ld [wSpriteAnimIDBuffer], a
-	ld a, [hROMBank]
-	push af
-
-	ld a, BANK(InitSpriteAnimStruct)
-	rst Bankswitch
-	ld a, [wSpriteAnimIDBuffer]
-
-	call InitSpriteAnimStruct
-
-	pop af
-	rst Bankswitch
-
-	ret
-; 3b3c
-
-ReinitSpriteAnimFrame:: ; 3b3c
-
-	ld [wSpriteAnimIDBuffer], a
-	ld a, [hROMBank]
-	push af
-
-	ld a, BANK(_ReinitSpriteAnimFrame)
-	rst Bankswitch
-	ld a, [wSpriteAnimIDBuffer]
-
-	call _ReinitSpriteAnimFrame
-
-	pop af
-	rst Bankswitch
-
-	ret
-; 3b4e
-
+INCLUDE "home/sprite_anims.asm"
 INCLUDE "home/audio.asm"
 INCLUDE "home/mobile.asm"
diff --git a/home/audio.asm b/home/audio.asm
index 2d6f27cda..dd115449d 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -1,7 +1,6 @@
 ; Audio interfaces.
 
-MapSetup_Sound_Off:: ; 3b4e
-
+MapSetup_Sound_Off::
 	push hl
 	push de
 	push bc
@@ -24,11 +23,8 @@ MapSetup_Sound_Off:: ; 3b4e
 	pop de
 	pop hl
 	ret
-; 3b6a
-
-
-UpdateSound:: ; 3b6a
 
+UpdateSound::
 	push hl
 	push de
 	push bc
@@ -51,13 +47,9 @@ UpdateSound:: ; 3b6a
 	pop de
 	pop hl
 	ret
-; 3b86
-
 
-_LoadMusicByte:: ; 3b86
+_LoadMusicByte::
 ; wCurMusicByte = [a:de]
-GLOBAL LoadMusicByte
-
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 
@@ -68,10 +60,8 @@ GLOBAL LoadMusicByte
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 	ret
-; 3b97
-
 
-PlayMusic:: ; 3b97
+PlayMusic::
 ; Play music de.
 
 	push hl
@@ -104,10 +94,8 @@ PlayMusic:: ; 3b97
 	pop de
 	pop hl
 	ret
-; 3bbc
-
 
-PlayMusic2:: ; 3bbc
+PlayMusic2::
 ; Stop playing music, then play music de.
 
 	push hl
@@ -138,11 +126,8 @@ PlayMusic2:: ; 3bbc
 	pop hl
 	ret
 
-; 3be3
-
-
-PlayCry:: ; 3be3
-; Play cry header de.
+PlayCry::
+; Play cry de.
 
 	push hl
 	push de
@@ -191,10 +176,8 @@ endr
 	pop de
 	pop hl
 	ret
-; 3c23
-
 
-PlaySFX:: ; 3c23
+PlaySFX::
 ; Play sound effect de.
 ; Sound effects are ordered by priority (highest to lowest)
 
@@ -233,54 +216,49 @@ PlaySFX:: ; 3c23
 	pop de
 	pop hl
 	ret
-; 3c4e
 
-
-WaitPlaySFX:: ; 3c4e
+WaitPlaySFX::
 	call WaitSFX
 	call PlaySFX
 	ret
-; 3c55
-
 
-WaitSFX:: ; 3c55
+WaitSFX::
 ; infinite loop until sfx is done playing
 
 	push hl
 
 .wait
-	ld hl, wChannel5Flags
+	ld hl, wChannel5Flags1
 	bit 0, [hl]
 	jr nz, .wait
-	ld hl, wChannel6Flags
+	ld hl, wChannel6Flags1
 	bit 0, [hl]
 	jr nz, .wait
-	ld hl, wChannel7Flags
+	ld hl, wChannel7Flags1
 	bit 0, [hl]
 	jr nz, .wait
-	ld hl, wChannel8Flags
+	ld hl, wChannel8Flags1
 	bit 0, [hl]
 	jr nz, .wait
 
 	pop hl
 	ret
-; 3c74
 
-IsSFXPlaying:: ; 3c74
+IsSFXPlaying::
 ; Return carry if no sound effect is playing.
 ; The inverse of CheckSFX.
 	push hl
 
-	ld hl, wChannel5Flags
+	ld hl, wChannel5Flags1
 	bit 0, [hl]
 	jr nz, .playing
-	ld hl, wChannel6Flags
+	ld hl, wChannel6Flags1
 	bit 0, [hl]
 	jr nz, .playing
-	ld hl, wChannel7Flags
+	ld hl, wChannel7Flags1
 	bit 0, [hl]
 	jr nz, .playing
-	ld hl, wChannel8Flags
+	ld hl, wChannel8Flags1
 	bit 0, [hl]
 	jr nz, .playing
 
@@ -292,39 +270,33 @@ IsSFXPlaying:: ; 3c74
 	pop hl
 	and a
 	ret
-; 3c97
 
-MaxVolume:: ; 3c97
+MaxVolume::
 	ld a, MAX_VOLUME
 	ld [wVolume], a
 	ret
-; 3c9d
 
-LowVolume:: ; 3c9d
+LowVolume::
 	ld a, $33 ; 40%
 	ld [wVolume], a
 	ret
-; 3ca3
 
-VolumeOff:: ; 3ca3
+VolumeOff::
 	xor a
 	ld [wVolume], a
 	ret
-; 3ca8
 
-Unused_FadeOutMusic:: ; 3ca8
+Unused_FadeOutMusic::
 	ld a, 4
 	ld [wMusicFade], a
 	ret
-; 3cae
 
-FadeInMusic:: ; 3cae
+FadeInMusic::
 	ld a, 4 | (1 << MUSIC_FADE_IN_F)
 	ld [wMusicFade], a
 	ret
-; 3cb4
 
-SkipMusic:: ; 3cb4
+SkipMusic::
 ; Skip a frames of music.
 .loop
 	and a
@@ -332,9 +304,8 @@ SkipMusic:: ; 3cb4
 	dec a
 	call UpdateSound
 	jr .loop
-; 3cbc
 
-FadeToMapMusic:: ; 3cbc
+FadeToMapMusic::
 	push hl
 	push de
 	push bc
@@ -360,9 +331,8 @@ FadeToMapMusic:: ; 3cbc
 	pop de
 	pop hl
 	ret
-; 3cdf
 
-PlayMapMusic:: ; 3cdf
+PlayMapMusic::
 	push hl
 	push de
 	push bc
@@ -388,9 +358,8 @@ PlayMapMusic:: ; 3cdf
 	pop de
 	pop hl
 	ret
-; 3d03
 
-EnterMapMusic:: ; 3d03
+EnterMapMusic::
 	push hl
 	push de
 	push bc
@@ -419,9 +388,8 @@ EnterMapMusic:: ; 3d03
 	pop de
 	pop hl
 	ret
-; 3d2f
 
-TryRestartMapMusic:: ; 3d2f
+TryRestartMapMusic::
 	ld a, [wDontPlayMapMusicOnReload]
 	and a
 	jr z, RestartMapMusic
@@ -433,9 +401,8 @@ TryRestartMapMusic:: ; 3d2f
 	xor a
 	ld [wDontPlayMapMusicOnReload], a
 	ret
-; 3d47
 
-RestartMapMusic:: ; 3d47
+RestartMapMusic::
 	push hl
 	push de
 	push bc
@@ -452,9 +419,8 @@ RestartMapMusic:: ; 3d47
 	pop de
 	pop hl
 	ret
-; 3d62
 
-SpecialMapMusic:: ; 3d62
+SpecialMapMusic::
 	ld a, [wPlayerState]
 	cp PLAYER_SURF
 	jr z, .surf
@@ -462,7 +428,7 @@ SpecialMapMusic:: ; 3d62
 	jr z, .surf
 
 	ld a, [wStatusFlags2]
-	bit 2, a
+	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, a
 	jr nz, .contest
 
 .no
@@ -493,16 +459,14 @@ SpecialMapMusic:: ; 3d62
 	ld de, MUSIC_BUG_CATCHING_CONTEST_RANKING
 	scf
 	ret
-; 3d97
 
-GetMapMusic_MaybeSpecial:: ; 3d97
+GetMapMusic_MaybeSpecial::
 	call SpecialMapMusic
 	ret c
 	call GetMapMusic
 	ret
-; 3d9f
 
-Unreferenced_Function3d9f:: ; 3d9f
+Unreferenced_Function3d9f::
 ; Places a BCD number at the
 ; upper center of the screen.
 	ld a, 4 * TILE_WIDTH
@@ -536,20 +500,19 @@ Unreferenced_Function3d9f:: ; 3d9f
 	ld [wVirtualOAMSprite38TileID], a
 	ld [wVirtualOAMSprite39TileID], a
 	ret
-; 3dde
 
-CheckSFX:: ; 3dde
+CheckSFX::
 ; Return carry if any SFX channels are active.
-	ld a, [wChannel5Flags]
+	ld a, [wChannel5Flags1]
 	bit 0, a
 	jr nz, .playing
-	ld a, [wChannel6Flags]
+	ld a, [wChannel6Flags1]
 	bit 0, a
 	jr nz, .playing
-	ld a, [wChannel7Flags]
+	ld a, [wChannel7Flags1]
 	bit 0, a
 	jr nz, .playing
-	ld a, [wChannel8Flags]
+	ld a, [wChannel8Flags1]
 	bit 0, a
 	jr nz, .playing
 	and a
@@ -557,11 +520,10 @@ CheckSFX:: ; 3dde
 .playing
 	scf
 	ret
-; 3dfe
 
-TerminateExpBarSound:: ; 3dfe
+TerminateExpBarSound::
 	xor a
-	ld [wChannel5Flags], a
+	ld [wChannel5Flags1], a
 	ld [wSoundInput], a
 	ld [rNR10], a
 	ld [rNR11], a
@@ -569,27 +531,23 @@ TerminateExpBarSound:: ; 3dfe
 	ld [rNR13], a
 	ld [rNR14], a
 	ret
-; 3e10
-
 
-ChannelsOff:: ; 3e10
+ChannelsOff::
 ; Quickly turn off music channels
 	xor a
-	ld [wChannel1Flags], a
-	ld [wChannel2Flags], a
-	ld [wChannel3Flags], a
-	ld [wChannel4Flags], a
+	ld [wChannel1Flags1], a
+	ld [wChannel2Flags1], a
+	ld [wChannel3Flags1], a
+	ld [wChannel4Flags1], a
 	ld [wSoundInput], a
 	ret
-; 3e21
 
-SFXChannelsOff:: ; 3e21
+SFXChannelsOff::
 ; Quickly turn off sound effect channels
 	xor a
-	ld [wChannel5Flags], a
-	ld [wChannel6Flags], a
-	ld [wChannel7Flags], a
-	ld [wChannel8Flags], a
+	ld [wChannel5Flags1], a
+	ld [wChannel6Flags1], a
+	ld [wChannel7Flags1], a
+	ld [wChannel8Flags1], a
 	ld [wSoundInput], a
 	ret
-; 3e32
diff --git a/home/battle.asm b/home/battle.asm
index e59b1e3b4..e88adef02 100644
--- a/home/battle.asm
+++ b/home/battle.asm
@@ -1,4 +1,4 @@
-UserPartyAttr:: ; 3945
+UserPartyAttr::
 	push af
 	ld a, [hBattleTurn]
 	and a
@@ -8,10 +8,8 @@ UserPartyAttr:: ; 3945
 .ot
 	pop af
 	jr OTPartyAttr
-; 3951
 
-
-OpponentPartyAttr:: ; 3951
+OpponentPartyAttr::
 	push af
 	ld a, [hBattleTurn]
 	and a
@@ -21,10 +19,8 @@ OpponentPartyAttr:: ; 3951
 .ot
 	pop af
 	jr OTPartyAttr
-; 395d
-
 
-BattlePartyAttr:: ; 395d
+BattlePartyAttr::
 ; Get attribute a from the party struct of the active battle mon. 
 	push bc
 	ld c, a
@@ -35,10 +31,8 @@ BattlePartyAttr:: ; 395d
 	call GetPartyLocation
 	pop bc
 	ret
-; 396d
 
-
-OTPartyAttr:: ; 396d
+OTPartyAttr::
 ; Get attribute a from the party struct of the active enemy mon.
 	push bc
 	ld c, a
@@ -49,49 +43,41 @@ OTPartyAttr:: ; 396d
 	call GetPartyLocation
 	pop bc
 	ret
-; 397d
-
 
-ResetDamage:: ; 397d
+ResetDamage::
 	xor a
 	ld [wCurDamage], a
 	ld [wCurDamage + 1], a
 	ret
-; 3985
 
-SetPlayerTurn:: ; 3985
+SetPlayerTurn::
 	xor a
 	ld [hBattleTurn], a
 	ret
-; 3989
 
-SetEnemyTurn:: ; 3989
+SetEnemyTurn::
 	ld a, 1
 	ld [hBattleTurn], a
 	ret
-; 398e
 
-
-UpdateOpponentInParty:: ; 398e
+UpdateOpponentInParty::
 	ld a, [hBattleTurn]
 	and a
 	jr z, UpdateEnemyMonInParty
 	jr UpdateBattleMonInParty
-; 3995
 
-UpdateUserInParty:: ; 3995
+UpdateUserInParty::
 	ld a, [hBattleTurn]
 	and a
 	jr z, UpdateBattleMonInParty
 	jr UpdateEnemyMonInParty
-; 399c
 
-UpdateBattleMonInParty:: ; 399c
+UpdateBattleMonInParty::
 ; Update level, status, current HP
 
 	ld a, [wCurBattleMon]
 
-UpdateBattleMon:: ; 399f
+UpdateBattleMon::
 	ld hl, wPartyMon1Level
 	call GetPartyLocation
 
@@ -100,9 +86,8 @@ UpdateBattleMon:: ; 399f
 	ld hl, wBattleMonLevel
 	ld bc, wBattleMonMaxHP - wBattleMonLevel
 	jp CopyBytes
-; 39b0
 
-UpdateEnemyMonInParty:: ; 39b0
+UpdateEnemyMonInParty::
 ; Update level, status, current HP
 
 ; No wildmons.
@@ -119,27 +104,21 @@ UpdateEnemyMonInParty:: ; 39b0
 	ld hl, wEnemyMonLevel
 	ld bc, wEnemyMonMaxHP - wEnemyMonLevel
 	jp CopyBytes
-; 39c9
-
 
-RefreshBattleHuds:: ; 39c9
+RefreshBattleHuds::
 	call UpdateBattleHuds
 	ld c, 3
 	call DelayFrames
 	jp WaitBGMap
-; 39d4
 
-UpdateBattleHuds:: ; 39d4
+UpdateBattleHuds::
 	farcall UpdatePlayerHUD
 	farcall UpdateEnemyHUD
 	ret
-; 39e1
-
 
 INCLUDE "home/battle_vars.asm"
 
-
-FarCopyRadioText:: ; 3a90
+FarCopyRadioText::
 	inc hl
 	ld a, [hROMBank]
 	push af
@@ -161,14 +140,8 @@ FarCopyRadioText:: ; 3a90
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 	ret
-; 3ab2
-
-
-MobileTextBorder:: ; 3ab2
-
-CELL_PHONE_TOP    EQU $5e
-CELL_PHONE_BOTTOM EQU $5f
 
+MobileTextBorder::
 	; For mobile link battles only.
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
@@ -177,14 +150,12 @@ CELL_PHONE_BOTTOM EQU $5f
 	; Draw a cell phone icon at the
 	; top right corner of the border.
 	hlcoord 19, 12
-	ld [hl], CELL_PHONE_TOP
+	ld [hl], $5e ; top
 	hlcoord 19, 13
-	ld [hl], CELL_PHONE_BOTTOM
+	ld [hl], $5f ; bottom
 	ret
-; 3ac3
-
 
-BattleTextBox:: ; 3ac3
+BattleTextBox::
 ; Open a textbox and print text at hl.
 	push hl
 	call SpeechTextBox
@@ -194,10 +165,8 @@ BattleTextBox:: ; 3ac3
 	pop hl
 	call PrintTextBoxText
 	ret
-; 3ad5
 
-
-StdBattleTextBox:: ; 3ad5
+StdBattleTextBox::
 ; Open a textbox and print battle text at 20:hl.
 
 	ld a, [hROMBank]
@@ -211,10 +180,8 @@ StdBattleTextBox:: ; 3ad5
 	pop af
 	rst Bankswitch
 	ret
-; 3ae1
-
-GetBattleAnimPointer:: ; 3ae1
 
+GetBattleAnimPointer::
 	ld a, BANK(BattleAnimations)
 	rst Bankswitch
 
@@ -227,10 +194,8 @@ GetBattleAnimPointer:: ; 3ae1
 	rst Bankswitch
 
 	ret
-; 3af0
-
-GetBattleAnimByte:: ; 3af0
 
+GetBattleAnimByte::
 	push hl
 	push de
 
@@ -258,4 +223,3 @@ GetBattleAnimByte:: ; 3af0
 
 	ld a, [wBattleAnimByte]
 	ret
-; 3b0c
diff --git a/home/battle_vars.asm b/home/battle_vars.asm
index 44fc21d6d..a455fce20 100644
--- a/home/battle_vars.asm
+++ b/home/battle_vars.asm
@@ -1,111 +1,111 @@
-GetBattleVar:: ; 39e1

-; Preserves hl.

-	push hl

-	call GetBattleVarAddr

-	pop hl

-	ret

-; 39e7

-

-GetBattleVarAddr:: ; 39e7

-; Get variable from pair a, depending on whose turn it is.

-; There are 21 variable pairs.

-

-	push bc

-

-	ld hl, .BattleVarPairs

-	ld c, a

-	ld b, 0

-	add hl, bc

-	add hl, bc

-

-	ld a, [hli]

-	ld h, [hl]

-	ld l, a

-

-; Enemy turn uses the second byte instead.

-; This lets battle variable calls be side-neutral.

-	ld a, [hBattleTurn]

-	and a

-	jr z, .get_var

-	inc hl

-

-.get_var

-; var id

-	ld a, [hl]

-	ld c, a

-	ld b, 0

-

-	ld hl, .BattleVarPointers

-	add hl, bc

-	add hl, bc

-

-	ld a, [hli]

-	ld h, [hl]

-	ld l, a

-

-	ld a, [hl]

-

-	pop bc

-	ret

-

-.BattleVarPairs:

-	dw .Substatus1

-	dw .Substatus2

-	dw .Substatus3

-	dw .Substatus4

-	dw .Substatus5

-	dw .Substatus1Opp

-	dw .Substatus2Opp

-	dw .Substatus3Opp

-	dw .Substatus4Opp

-	dw .Substatus5Opp

-	dw .Status

-	dw .StatusOpp

-	dw .MoveAnim

-	dw .MoveEffect

-	dw .MovePower

-	dw .MoveType

-	dw .CurMove

-	dw .LastCounter

-	dw .LastCounterOpp

-	dw .LastMove

-	dw .LastMoveOpp

-

-;                       player                     enemy

-.Substatus1:      db PLAYER_SUBSTATUS_1,     ENEMY_SUBSTATUS_1

-.Substatus1Opp:   db ENEMY_SUBSTATUS_1,      PLAYER_SUBSTATUS_1

-.Substatus2:      db PLAYER_SUBSTATUS_2,     ENEMY_SUBSTATUS_2

-.Substatus2Opp:   db ENEMY_SUBSTATUS_2,      PLAYER_SUBSTATUS_2

-.Substatus3:      db PLAYER_SUBSTATUS_3,     ENEMY_SUBSTATUS_3

-.Substatus3Opp:   db ENEMY_SUBSTATUS_3,      PLAYER_SUBSTATUS_3

-.Substatus4:      db PLAYER_SUBSTATUS_4,     ENEMY_SUBSTATUS_4

-.Substatus4Opp:   db ENEMY_SUBSTATUS_4,      PLAYER_SUBSTATUS_4

-.Substatus5:      db PLAYER_SUBSTATUS_5,     ENEMY_SUBSTATUS_5

-.Substatus5Opp:   db ENEMY_SUBSTATUS_5,      PLAYER_SUBSTATUS_5

-.Status:          db PLAYER_STATUS,          ENEMY_STATUS

-.StatusOpp:       db ENEMY_STATUS,           PLAYER_STATUS

-.MoveAnim:        db PLAYER_MOVE_ANIMATION,  ENEMY_MOVE_ANIMATION

-.MoveEffect:      db PLAYER_MOVE_EFFECT,     ENEMY_MOVE_EFFECT

-.MovePower:       db PLAYER_MOVE_POWER,      ENEMY_MOVE_POWER

-.MoveType:        db PLAYER_MOVE_TYPE,       ENEMY_MOVE_TYPE

-.CurMove:         db PLAYER_CUR_MOVE,        ENEMY_CUR_MOVE

-.LastCounter:     db PLAYER_COUNTER_MOVE,    ENEMY_COUNTER_MOVE

-.LastCounterOpp:  db ENEMY_COUNTER_MOVE,     PLAYER_COUNTER_MOVE

-.LastMove:        db PLAYER_LAST_MOVE,       ENEMY_LAST_MOVE

-.LastMoveOpp:     db ENEMY_LAST_MOVE,        PLAYER_LAST_MOVE

-

-.BattleVarPointers:

-	dw wPlayerSubStatus1,           wEnemySubStatus1

-	dw wPlayerSubStatus2,           wEnemySubStatus2

-	dw wPlayerSubStatus3,           wEnemySubStatus3

-	dw wPlayerSubStatus4,           wEnemySubStatus4

-	dw wPlayerSubStatus5,           wEnemySubStatus5

-	dw wBattleMonStatus,            wEnemyMonStatus

-	dw wPlayerMoveStructAnimation,  wEnemyMoveStructAnimation

-	dw wPlayerMoveStructEffect,     wEnemyMoveStructEffect

-	dw wPlayerMoveStructPower,      wEnemyMoveStructPower

-	dw wPlayerMoveStructType,       wEnemyMoveStructType

-	dw wCurPlayerMove,              wCurEnemyMove

-	dw wLastPlayerCounterMove,      wLastEnemyCounterMove

-	dw wLastPlayerMove,             wLastEnemyMove

-; 3a90

+GetBattleVar::
+; Preserves hl.
+	push hl
+	call GetBattleVarAddr
+	pop hl
+	ret
+
+GetBattleVarAddr::
+; Get variable from pair a, depending on whose turn it is.
+; There are 21 variable pairs.
+
+	push bc
+
+	ld hl, BattleVarPairs
+	ld c, a
+	ld b, 0
+	add hl, bc
+	add hl, bc
+
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+
+; Enemy turn uses the second byte instead.
+; This lets battle variable calls be side-neutral.
+	ld a, [hBattleTurn]
+	and a
+	jr z, .getvar
+	inc hl
+
+.getvar
+; var id
+	ld a, [hl]
+	ld c, a
+	ld b, 0
+
+	ld hl, BattleVarLocations
+	add hl, bc
+	add hl, bc
+
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+
+	ld a, [hl]
+
+	pop bc
+	ret
+
+BattleVarPairs:
+; entries correspond to BATTLE_VARS_* constants
+	dw .Substatus1
+	dw .Substatus2
+	dw .Substatus3
+	dw .Substatus4
+	dw .Substatus5
+	dw .Substatus1Opp
+	dw .Substatus2Opp
+	dw .Substatus3Opp
+	dw .Substatus4Opp
+	dw .Substatus5Opp
+	dw .Status
+	dw .StatusOpp
+	dw .MoveAnim
+	dw .MoveEffect
+	dw .MovePower
+	dw .MoveType
+	dw .CurMove
+	dw .LastCounter
+	dw .LastCounterOpp
+	dw .LastMove
+	dw .LastMoveOpp
+
+;                   player                 enemy
+.Substatus1:     db PLAYER_SUBSTATUS_1,    ENEMY_SUBSTATUS_1
+.Substatus1Opp:  db ENEMY_SUBSTATUS_1,     PLAYER_SUBSTATUS_1
+.Substatus2:     db PLAYER_SUBSTATUS_2,    ENEMY_SUBSTATUS_2
+.Substatus2Opp:  db ENEMY_SUBSTATUS_2,     PLAYER_SUBSTATUS_2
+.Substatus3:     db PLAYER_SUBSTATUS_3,    ENEMY_SUBSTATUS_3
+.Substatus3Opp:  db ENEMY_SUBSTATUS_3,     PLAYER_SUBSTATUS_3
+.Substatus4:     db PLAYER_SUBSTATUS_4,    ENEMY_SUBSTATUS_4
+.Substatus4Opp:  db ENEMY_SUBSTATUS_4,     PLAYER_SUBSTATUS_4
+.Substatus5:     db PLAYER_SUBSTATUS_5,    ENEMY_SUBSTATUS_5
+.Substatus5Opp:  db ENEMY_SUBSTATUS_5,     PLAYER_SUBSTATUS_5
+.Status:         db PLAYER_STATUS,         ENEMY_STATUS
+.StatusOpp:      db ENEMY_STATUS,          PLAYER_STATUS
+.MoveAnim:       db PLAYER_MOVE_ANIMATION, ENEMY_MOVE_ANIMATION
+.MoveEffect:     db PLAYER_MOVE_EFFECT,    ENEMY_MOVE_EFFECT
+.MovePower:      db PLAYER_MOVE_POWER,     ENEMY_MOVE_POWER
+.MoveType:       db PLAYER_MOVE_TYPE,      ENEMY_MOVE_TYPE
+.CurMove:        db PLAYER_CUR_MOVE,       ENEMY_CUR_MOVE
+.LastCounter:    db PLAYER_COUNTER_MOVE,   ENEMY_COUNTER_MOVE
+.LastCounterOpp: db ENEMY_COUNTER_MOVE,    PLAYER_COUNTER_MOVE
+.LastMove:       db PLAYER_LAST_MOVE,      ENEMY_LAST_MOVE
+.LastMoveOpp:    db ENEMY_LAST_MOVE,       PLAYER_LAST_MOVE
+
+BattleVarLocations:
+; entries correspond to PLAYER_* and ENEMY_* constants
+	dw wPlayerSubStatus1,          wEnemySubStatus1
+	dw wPlayerSubStatus2,          wEnemySubStatus2
+	dw wPlayerSubStatus3,          wEnemySubStatus3
+	dw wPlayerSubStatus4,          wEnemySubStatus4
+	dw wPlayerSubStatus5,          wEnemySubStatus5
+	dw wBattleMonStatus,           wEnemyMonStatus
+	dw wPlayerMoveStructAnimation, wEnemyMoveStructAnimation
+	dw wPlayerMoveStructEffect,    wEnemyMoveStructEffect
+	dw wPlayerMoveStructPower,     wEnemyMoveStructPower
+	dw wPlayerMoveStructType,      wEnemyMoveStructType
+	dw wCurPlayerMove,             wCurEnemyMove
+	dw wLastPlayerCounterMove,     wLastEnemyCounterMove
+	dw wLastPlayerMove,            wLastEnemyMove
diff --git a/home/clear_sprites.asm b/home/clear_sprites.asm
new file mode 100644
index 000000000..699774612
--- /dev/null
+++ b/home/clear_sprites.asm
@@ -0,0 +1,23 @@
+ClearSprites::
+; Erase OAM data
+	ld hl, wVirtualOAM
+	ld b, wVirtualOAMEnd - wVirtualOAM
+	xor a
+.loop
+	ld [hli], a
+	dec b
+	jr nz, .loop
+	ret
+
+HideSprites::
+; Set all OAM y-positions to 160 to hide them offscreen
+	ld hl, wVirtualOAMSprite00YCoord
+	ld de, SPRITEOAMSTRUCT_LENGTH
+	ld b, NUM_SPRITE_OAM_STRUCTS
+	ld a, SCREEN_WIDTH_PX
+.loop
+	ld [hl], a ; y
+	add hl, de
+	dec b
+	jr nz, .loop
+	ret
diff --git a/home/copy.asm b/home/copy.asm
index 9bd79ce37..68ed240e3 100644
--- a/home/copy.asm
+++ b/home/copy.asm
@@ -1,7 +1,6 @@
 ; Functions to copy data from ROM.
 
-
-Get2bpp_2:: ; dc9
+Get2bpp_2::
 	ld a, [rLCDC]
 	bit rLCDC_ENABLE, a
 	jp z, Copy2bpp
@@ -9,9 +8,8 @@ Get2bpp_2:: ; dc9
 	homecall _Get2bpp
 
 	ret
-; ddc
 
-Get1bpp_2:: ; ddc
+Get1bpp_2::
 	ld a, [rLCDC]
 	bit rLCDC_ENABLE, a
 	jp z, Copy1bpp
@@ -19,9 +17,8 @@ Get1bpp_2:: ; ddc
 	homecall _Get1bpp
 
 	ret
-; def
 
-FarCopyBytesDouble_DoubleBankSwitch:: ; def
+FarCopyBytesDouble_DoubleBankSwitch::
 	ld [hBuffer], a
 	ld a, [hROMBank]
 	push af
@@ -33,9 +30,8 @@ FarCopyBytesDouble_DoubleBankSwitch:: ; def
 	pop af
 	rst Bankswitch
 	ret
-; dfd
 
-OldDMATransfer:: ; dfd
+OldDMATransfer::
 	dec c
 	ld a, [hBGMapMode]
 	push af
@@ -96,41 +92,29 @@ OldDMATransfer:: ; dfd
 	pop af
 	ld [hBGMapMode], a
 	ret
-; e4a
-
 
-
-ReplaceKrisSprite:: ; e4a
+ReplaceKrisSprite::
 	farcall _ReplaceKrisSprite
 	ret
-; e51
-
 
-
-LoadStandardFont:: ; e51
+LoadStandardFont::
 	farcall _LoadStandardFont
 	ret
-; e58
 
-LoadFontsBattleExtra:: ; e58
+LoadFontsBattleExtra::
 	farcall _LoadFontsBattleExtra
 	ret
-; e5f
-
-
 
-LoadFontsExtra:: ; e5f
+LoadFontsExtra::
 	farcall _LoadFontsExtra1
 	farcall _LoadFontsExtra2
 	ret
-; e6c
 
-LoadFontsExtra2:: ; e6c
+LoadFontsExtra2::
 	farcall _LoadFontsExtra2
 	ret
-; e73
 
-DecompressRequest2bpp:: ; e73
+DecompressRequest2bpp::
 	push de
 	ld a, BANK(sScratch)
 	call GetSRAMBank
@@ -147,11 +131,8 @@ DecompressRequest2bpp:: ; e73
 	call Request2bpp
 	call CloseSRAM
 	ret
-; e8d
 
-
-
-FarCopyBytes:: ; e8d
+FarCopyBytes::
 ; copy bc bytes from a:hl to de
 
 	ld [hBuffer], a
@@ -165,10 +146,8 @@ FarCopyBytes:: ; e8d
 	pop af
 	rst Bankswitch
 	ret
-; 0xe9b
 
-
-FarCopyBytesDouble:: ; e9b
+FarCopyBytesDouble::
 ; Copy bc bytes from a:hl to bc*2 bytes at de,
 ; doubling each byte in the process.
 
@@ -204,10 +183,8 @@ FarCopyBytesDouble:: ; e9b
 	pop af
 	rst Bankswitch
 	ret
-; 0xeba
-
 
-Request2bpp:: ; eba
+Request2bpp::
 ; Load 2bpp at b:de to occupy c tiles of hl.
 	ld a, [hBGMapMode]
 	push af
@@ -280,10 +257,8 @@ Request2bpp:: ; eba
 	sub [hl]
 	ld c, a
 	jr .loop
-; f1e
 
-
-Request1bpp:: ; f1e
+Request1bpp::
 ; Load 1bpp at b:de to occupy c tiles of hl.
 	ld a, [hBGMapMode]
 	push af
@@ -356,15 +331,13 @@ Request1bpp:: ; f1e
 	sub [hl]
 	ld c, a
 	jr .loop
-; f82
-
 
-Get2bpp:: ; f82
+Get2bpp::
 	ld a, [rLCDC]
 	bit rLCDC_ENABLE, a
 	jp nz, Request2bpp
 
-Copy2bpp:: ; f89
+Copy2bpp::
 ; copy c 2bpp tiles from b:de to hl
 
 	push hl
@@ -387,15 +360,13 @@ Copy2bpp:: ; f89
 	pop af
 
 	jp FarCopyBytes
-; f9d
-
 
-Get1bpp:: ; f9d
+Get1bpp::
 	ld a, [rLCDC]
 	bit rLCDC_ENABLE, a
 	jp nz, Request1bpp
 
-Copy1bpp:: ; fa4
+Copy1bpp::
 ; copy c 1bpp tiles from b:de to hl
 
 	push de
@@ -418,4 +389,3 @@ Copy1bpp:: ; fa4
 
 	pop hl
 	jp FarCopyBytesDouble
-; fb6
diff --git a/home/copy2.asm b/home/copy2.asm
index 23e1eca7f..fdf55b2e3 100644
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -1,7 +1,7 @@
-CopyBytes:: ; 0x3026
+CopyBytes::
 ; copy bc bytes from hl to de
-	inc b  ; we bail the moment b hits 0, so include the last run
-	inc c  ; same thing; include last byte
+	inc b ; we bail the moment b hits 0, so include the last run
+	inc c ; same thing; include last byte
 	jr .HandleLoop
 .CopyByte:
 	ld a, [hli]
@@ -14,7 +14,7 @@ CopyBytes:: ; 0x3026
 	jr nz, .CopyByte
 	ret
 
-SwapBytes:: ; 0x3034
+SwapBytes::
 ; swap bc bytes between hl and de
 .Loop:
 	; stash [hl] away on the stack
@@ -37,10 +37,10 @@ SwapBytes:: ; 0x3034
 	jr nz, .Loop
 	ret
 
-ByteFill:: ; 0x3041
+ByteFill::
 ; fill bc bytes with the value of a, starting at hl
-	inc b  ; we bail the moment b hits 0, so include the last run
-	inc c  ; same thing; include last byte
+	inc b ; we bail the moment b hits 0, so include the last run
+	inc c ; same thing; include last byte
 	jr .HandleLoop
 .PutByte:
 	ld [hli], a
@@ -51,7 +51,7 @@ ByteFill:: ; 0x3041
 	jr nz, .PutByte
 	ret
 
-GetFarByte:: ; 0x304d
+GetFarByte::
 ; retrieve a single byte from a:hl, and return it in a.
 	; bankswitch to new bank
 	ld [hBuffer], a
@@ -72,7 +72,7 @@ GetFarByte:: ; 0x304d
 	ld a, [hBuffer]
 	ret
 
-GetFarHalfword:: ; 0x305d
+GetFarHalfword::
 ; retrieve a halfword from a:hl, and return it in hl.
 	; bankswitch to new bank
 	ld [hBuffer], a
@@ -90,9 +90,8 @@ GetFarHalfword:: ; 0x305d
 	pop af
 	rst Bankswitch
 	ret
-; 0x306b
 
-FarCopyWRAM:: ; 306b
+FarCopyWRAM::
 	ld [hBuffer], a
 	ld a, [rSVBK]
 	push af
@@ -104,9 +103,8 @@ FarCopyWRAM:: ; 306b
 	pop af
 	ld [rSVBK], a
 	ret
-; 307b
 
-GetFarWRAMByte:: ; 307b
+GetFarWRAMByte::
 	ld [hBuffer], a
 	ld a, [rSVBK]
 	push af
@@ -118,9 +116,8 @@ GetFarWRAMByte:: ; 307b
 	ld [rSVBK], a
 	ld a, [hBuffer]
 	ret
-; 308d
 
-GetFarWRAMWord:: ; 308d
+GetFarWRAMWord::
 	ld [hBuffer], a
 	ld a, [rSVBK]
 	push af
@@ -132,4 +129,3 @@ GetFarWRAMWord:: ; 308d
 	pop af
 	ld [rSVBK], a
 	ret
-; 309d
diff --git a/home/copy_name.asm b/home/copy_name.asm
new file mode 100644
index 000000000..59c8cf6c8
--- /dev/null
+++ b/home/copy_name.asm
@@ -0,0 +1,13 @@
+CopyName1::
+; Copies the name from de to wStringBuffer2
+	ld hl, wStringBuffer2
+
+CopyName2::
+; Copies the name from de to hl
+.loop
+	ld a, [de]
+	inc de
+	ld [hli], a
+	cp "@"
+	jr nz, .loop
+	ret
diff --git a/home/copy_tilemap.asm b/home/copy_tilemap.asm
new file mode 100644
index 000000000..2c6c47244
--- /dev/null
+++ b/home/copy_tilemap.asm
@@ -0,0 +1,35 @@
+LoadTileMapToTempTileMap::
+; Load wTileMap into wTempTileMap
+	ld a, [rSVBK]
+	push af
+	ld a, BANK(wTempTileMap)
+	ld [rSVBK], a
+	hlcoord 0, 0
+	decoord 0, 0, wTempTileMap
+	ld bc, wTileMapEnd - wTileMap
+	call CopyBytes
+	pop af
+	ld [rSVBK], a
+	ret
+
+Call_LoadTempTileMapToTileMap::
+	xor a
+	ld [hBGMapMode], a
+	call LoadTempTileMapToTileMap
+	ld a, 1
+	ld [hBGMapMode], a
+	ret
+
+LoadTempTileMapToTileMap::
+; Load wTempTileMap into wTileMap
+	ld a, [rSVBK]
+	push af
+	ld a, BANK(wTempTileMap)
+	ld [rSVBK], a
+	hlcoord 0, 0, wTempTileMap
+	decoord 0, 0
+	ld bc, wTileMapEnd - wTileMap
+	call CopyBytes
+	pop af
+	ld [rSVBK], a
+	ret
diff --git a/home/cry.asm b/home/cry.asm
index 93983a6ae..43f20b1af 100644
--- a/home/cry.asm
+++ b/home/cry.asm
@@ -1,4 +1,4 @@
-PlayStereoCry:: ; 37b6
+PlayStereoCry::
 	push af
 	ld a, 1
 	ld [wStereoPanningMask], a
@@ -6,9 +6,8 @@ PlayStereoCry:: ; 37b6
 	call _PlayMonCry
 	call WaitSFX
 	ret
-; 37c4
 
-PlayStereoCry2:: ; 37c4
+PlayStereoCry2::
 ; Don't wait for the cry to end.
 ; Used during pic animations.
 	push af
@@ -16,15 +15,13 @@ PlayStereoCry2:: ; 37c4
 	ld [wStereoPanningMask], a
 	pop af
 	jp _PlayMonCry
-; 37ce
 
-PlayMonCry:: ; 37ce
+PlayMonCry::
 	call PlayMonCry2
 	call WaitSFX
 	ret
-; 37d5
 
-PlayMonCry2:: ; 37d5
+PlayMonCry2::
 ; Don't wait for the cry to end.
 	push af
 	xor a
@@ -33,9 +30,8 @@ PlayMonCry2:: ; 37d5
 	pop af
 	call _PlayMonCry
 	ret
-; 37e2
 
-_PlayMonCry:: ; 37e2
+_PlayMonCry::
 	push hl
 	push de
 	push bc
@@ -52,10 +48,9 @@ _PlayMonCry:: ; 37e2
 	pop de
 	pop hl
 	ret
-; 37f3
 
-LoadCry:: ; 37f3
-; Load cry header bc.
+LoadCry::
+; Load cry bc.
 
 	call GetCryIndex
 	ret c
@@ -88,9 +83,8 @@ endr
 	rst Bankswitch
 	and a
 	ret
-; 381e
 
-GetCryIndex:: ; 381e
+GetCryIndex::
 	and a
 	jr z, .no
 	cp NUM_POKEMON + 1
@@ -105,4 +99,3 @@ GetCryIndex:: ; 381e
 .no
 	scf
 	ret
-; 382d
diff --git a/home/decompress.asm b/home/decompress.asm
index 216b861f6..d4bab7a6a 100644
--- a/home/decompress.asm
+++ b/home/decompress.asm
@@ -1,4 +1,4 @@
-FarDecompress:: ; b40
+FarDecompress::
 ; Decompress graphics data from a:hl to de.
 
 	ld [wLZBank], a
@@ -12,19 +12,15 @@ FarDecompress:: ; b40
 	pop af
 	rst Bankswitch
 	ret
-; b50
 
-
-Decompress:: ; b50
+Decompress::
 ; Pokemon Crystal uses an lz variant for compression.
 ; This is mainly (but not necessarily) used for graphics.
 
 ; This function decompresses lz-compressed data from hl to de.
 
-
 LZ_END EQU $ff ; Compressed data is terminated with $ff.
 
-
 ; A typical control command consists of:
 
 LZ_CMD EQU %11100000 ; command id (bits 5-7)
@@ -32,7 +28,6 @@ LZ_LEN EQU %00011111 ; length n   (bits 0-4)
 
 ; Additional parameters are read during command execution.
 
-
 ; Commands:
 
 LZ_LITERAL   EQU 0 << 5 ; Read literal data for n bytes.
@@ -40,7 +35,6 @@ LZ_ITERATE   EQU 1 << 5 ; Write the same byte for n bytes.
 LZ_ALTERNATE EQU 2 << 5 ; Alternate two bytes for n bytes.
 LZ_ZERO      EQU 3 << 5 ; Write 0 for n bytes.
 
-
 ; Another class of commands reuses data from the decompressed output.
 LZ_RW        EQU 2 + 5 ; bit
 
@@ -53,7 +47,6 @@ LZ_REPEAT    EQU 4 << 5 ; Repeat n bytes from the offset.
 LZ_FLIP      EQU 5 << 5 ; Repeat n bitflipped bytes.
 LZ_REVERSE   EQU 6 << 5 ; Repeat n bytes in reverse.
 
-
 ; If the value in the count needs to be larger than 5 bits,
 ; LZ_LONG can be used to expand the count to 10 bits.
 LZ_LONG      EQU 7 << 5
@@ -68,10 +61,8 @@ LZ_LONG_HI   EQU %00000011
 ; x: the new control command
 ; y: the length
 
-
 ; For more information, refer to the code below and in extras/gfx.py.
 
-
 	; Save the output address
 	; for rewrite commands.
 	ld a, e
@@ -113,7 +104,6 @@ LZ_LONG_HI   EQU %00000011
 	inc bc
 	jr .command
 
-
 .short
 	push af
 
@@ -125,7 +115,6 @@ LZ_LONG_HI   EQU %00000011
 	; read at least 1 byte
 	inc c
 
-
 .command
 	; Increment loop counts.
 	; We bail the moment they hit 0.
@@ -144,7 +133,6 @@ LZ_LONG_HI   EQU %00000011
 	cp LZ_ZERO
 	jr z, .Zero
 
-
 .Literal:
 ; Read literal data for bc bytes.
 .lloop
@@ -159,7 +147,6 @@ LZ_LONG_HI   EQU %00000011
 	inc de
 	jr .lloop
 
-
 .Iter:
 ; Write the same byte for bc bytes.
 	ld a, [hli]
@@ -175,7 +162,6 @@ LZ_LONG_HI   EQU %00000011
 	inc de
 	jr .iloop
 
-
 .Alt:
 ; Alternate two bytes for bc bytes.
 	dec c
@@ -205,7 +191,6 @@ LZ_LONG_HI   EQU %00000011
 	inc hl
 	jr .Main
 
-
 .Zero:
 ; Write 0 for bc bytes.
 	xor a
@@ -221,7 +206,6 @@ LZ_LONG_HI   EQU %00000011
 	inc de
 	jr .zloop
 
-
 .rewrite
 ; Repeat decompressed data from output.
 	push hl
@@ -275,7 +259,6 @@ LZ_LONG_HI   EQU %00000011
 ; More practically, LZ_LONG is not recursive.
 ; For now, it defaults to LZ_REPEAT.
 
-
 .Repeat:
 ; Copy decompressed data for bc bytes.
 	dec c
@@ -289,7 +272,6 @@ LZ_LONG_HI   EQU %00000011
 	inc de
 	jr .Repeat
 
-
 .Flip:
 ; Copy bitflipped decompressed data for bc bytes.
 	dec c
@@ -315,7 +297,6 @@ LZ_LONG_HI   EQU %00000011
 	inc de
 	jr .Flip
 
-
 .Reverse:
 ; Copy reversed decompressed data for bc bytes.
 	dec c
@@ -330,7 +311,6 @@ LZ_LONG_HI   EQU %00000011
 	inc de
 	jr .Reverse
 
-
 .donerw
 	pop hl
 
@@ -340,4 +320,3 @@ LZ_LONG_HI   EQU %00000011
 .next
 	inc hl
 	jp .Main
-; c2f
diff --git a/home/delay.asm b/home/delay.asm
index 300f65c88..4ad25ef21 100644
--- a/home/delay.asm
+++ b/home/delay.asm
@@ -1,4 +1,4 @@
-DelayFrame:: ; 45a
+DelayFrame::
 ; Wait for one frame
 	ld a, 1
 	ld [wVBlankOccurred], a
@@ -10,13 +10,10 @@ DelayFrame:: ; 45a
 	and a
 	jr nz, .halt
 	ret
-; 468
 
-
-DelayFrames:: ; 468
+DelayFrames::
 ; Wait c frames
 	call DelayFrame
 	dec c
 	jr nz, DelayFrames
 	ret
-; 46f
diff --git a/home/double_speed.asm b/home/double_speed.asm
index c07dc9cee..de075e65e 100644
--- a/home/double_speed.asm
+++ b/home/double_speed.asm
@@ -5,20 +5,18 @@
 ; and double speed at any time, but LCD output
 ; collapses during the switch.
 
-DoubleSpeed:: ; 2fef
+DoubleSpeed::
 	ld hl, rKEY1
 	bit 7, [hl]
 	jr z, SwitchSpeed
 	ret
-; 2ff7
 
-NormalSpeed:: ; 2ff7
+NormalSpeed::
 	ld hl, rKEY1
 	bit 7, [hl]
 	ret z
-; 2ffd
 
-SwitchSpeed:: ; 2ffd
+SwitchSpeed::
 	set 0, [hl]
 	xor a
 	ld [rIF], a
@@ -27,4 +25,3 @@ SwitchSpeed:: ; 2ffd
 	ld [rJOYP], a
 	stop ; rgbasm adds a nop after this instruction by default
 	ret
-; 300b
diff --git a/home/fade.asm b/home/fade.asm
index 1a6f87c63..56f0197e6 100644
--- a/home/fade.asm
+++ b/home/fade.asm
@@ -1,7 +1,6 @@
 ; Functions to fade the screen in and out.
 
-
-Unreferenced_Function48c:: ; 48c
+Unreferenced_Function48c::
 ; TimeOfDayFade
 	ld a, [wTimeOfDayPal]
 	ld b, a
@@ -20,10 +19,8 @@ Unreferenced_Function48c:: ; 48c
 	ld a, [hli]
 	ld [rOBP1], a
 	ret
-; 4a3
-
 
-RotateFourPalettesRight:: ; 4a3
+RotateFourPalettesRight::
 	ld a, [hCGB]
 	and a
 	jr z, .dmg
@@ -35,9 +32,8 @@ RotateFourPalettesRight:: ; 4a3
 	ld hl, IncGradGBPalTable_08
 	ld b, 4
 	jr RotatePalettesRight
-; 4b6
 
-RotateThreePalettesRight:: ; 4b6
+RotateThreePalettesRight::
 	ld a, [hCGB]
 	and a
 	jr z, .dmg
@@ -48,7 +44,7 @@ RotateThreePalettesRight:: ; 4b6
 .dmg
 	ld hl, IncGradGBPalTable_13
 	ld b, 3
-RotatePalettesRight:: ; 4c7
+RotatePalettesRight::
 ; Rotate palettes to the right and fill with loaded colors from the left
 ; If we're already at the leftmost color, fill with the leftmost color
 	push de
@@ -65,9 +61,8 @@ RotatePalettesRight:: ; 4c7
 	dec b
 	jr nz, RotatePalettesRight
 	ret
-; 4dd
 
-RotateFourPalettesLeft:: ; 4dd
+RotateFourPalettesLeft::
 	ld a, [hCGB]
 	and a
 	jr z, .dmg
@@ -79,9 +74,8 @@ RotateFourPalettesLeft:: ; 4dd
 	ld hl, IncGradGBPalTable_12 - 1
 	ld b, 4
 	jr RotatePalettesLeft
-; 4f0
 
-RotateThreePalettesLeft:: ; 4f0
+RotateThreePalettesLeft::
 	ld a, [hCGB]
 	and a
 	jr z, .dmg
@@ -92,7 +86,7 @@ RotateThreePalettesLeft:: ; 4f0
 .dmg
 	ld hl, IncGradGBPalTable_15 - 1
 	ld b, 3
-RotatePalettesLeft:: ; 501
+RotatePalettesLeft::
 ; Rotate palettes to the left and fill with loaded colors from the right
 ; If we're already at the rightmost color, fill with the rightmost color
 	push de
@@ -109,10 +103,7 @@ RotatePalettesLeft:: ; 501
 	dec b
 	jr nz, RotatePalettesLeft
 	ret
-; 517
-
 
-; 517
 IncGradGBPalTable_00:: db %11111111, %11111111, %11111111
 IncGradGBPalTable_01:: db %11111110, %11111110, %11111110
 IncGradGBPalTable_02:: db %11111001, %11111001, %11111001
@@ -134,4 +125,3 @@ IncGradGBPalTable_13:: db %10010000, %10000000, %10010000
 IncGradGBPalTable_14:: db %01000000, %01000000, %01000000
 
 IncGradGBPalTable_15:: db %00000000, %00000000, %00000000
-; 547
diff --git a/home/farcall.asm b/home/farcall.asm
index 27649f30e..cb87b1774 100644
--- a/home/farcall.asm
+++ b/home/farcall.asm
@@ -1,4 +1,4 @@
-FarCall_de:: ; 2d54
+FarCall_de::
 ; Call a:de.
 ; Preserves other registers.
 
@@ -13,10 +13,8 @@ FarCall_de:: ; 2d54
 .de
 	push de
 	ret
-; 2d63
 
-
-FarCall_hl:: ; 2d63
+FarCall_hl::
 ; Call a:hl.
 ; Preserves other registers.
 
@@ -26,9 +24,8 @@ FarCall_hl:: ; 2d63
 	ld a, [hBuffer]
 	rst Bankswitch
 	call FarJump_hl
-; 2d6e
 
-ReturnFarCall:: ; 2d6e
+ReturnFarCall::
 ; We want to retain the contents of f.
 ; To do this, we can pop to bc instead of af.
 
@@ -47,8 +44,6 @@ ReturnFarCall:: ; 2d6e
 	ld a, [wFarCallBCBuffer + 1]
 	ld c, a
 	ret
-; 2d82
 
-FarJump_hl:: ; 2d82
+FarJump_hl::
 	jp hl
-; 2d83
diff --git a/home/flag.asm b/home/flag.asm
index 0b1390c99..411f04184 100644
--- a/home/flag.asm
+++ b/home/flag.asm
@@ -1,39 +1,35 @@
-ResetMapBufferEventFlags:: ; 2e50
+ResetMapBufferEventFlags::
 	xor a
 	ld hl, wEventFlags
 	ld [hli], a
 	ret
-; 2e56
 
-ResetBikeFlags:: ; 2e56
+ResetBikeFlags::
 	xor a
 	ld hl, wBikeFlags
 	ld [hli], a
 	ld [hl], a
 	ret
-; 2e5d
 
-ResetFlashIfOutOfCave:: ; 2e5d
+ResetFlashIfOutOfCave::
 	ld a, [wEnvironment]
-	cp $2
-	jr z, .asm_2e69
-	cp $1
-	jr z, .asm_2e69
+	cp ROUTE
+	jr z, .outdoors
+	cp TOWN
+	jr z, .outdoors
 	ret
 
-.asm_2e69
+.outdoors
 	ld hl, wStatusFlags
-	res 2, [hl]
+	res STATUSFLAGS_FLASH_F, [hl]
 	ret
-; 2e6f
 
-
-EventFlagAction:: ; 0x2e6f
+EventFlagAction::
 	ld hl, wEventFlags
 	call FlagAction
 	ret
 
-FlagAction:: ; 0x2e76
+FlagAction::
 ; Perform action b on bit de in flag array hl.
 
 ; inputs:
@@ -99,14 +95,11 @@ FlagAction:: ; 0x2e76
 	and [hl]
 	ld [hl], a
 	ret
-; 0x2ead
-
 
-CheckReceivedDex:: ; 2ead
+CheckReceivedDex::
 	ld de, ENGINE_POKEDEX
 	ld b, CHECK_FLAG
 	farcall EngineFlagAction
 	ld a, c
 	and a
 	ret
-; 2ebb
diff --git a/home/game_time.asm b/home/game_time.asm
index feaa09608..0300db73d 100644
--- a/home/game_time.asm
+++ b/home/game_time.asm
@@ -1,4 +1,4 @@
-ResetGameTime:: ; 208a
+ResetGameTime::
 	xor a
 	ld [wGameTimeCap], a
 	ld [wGameTimeHours], a
@@ -7,11 +7,8 @@ ResetGameTime:: ; 208a
 	ld [wGameTimeSeconds], a
 	ld [wGameTimeFrames], a
 	ret
-; 209e
-
-
-GameTimer:: ; 209e
 
+GameTimer::
 	nop
 
 	ld a, [rSVBK]
@@ -24,14 +21,11 @@ GameTimer:: ; 209e
 	pop af
 	ld [rSVBK], a
 	ret
-; 20ad
-
 
-UpdateGameTimer:: ; 20ad
+UpdateGameTimer::
 ; Increment the game timer by one frame.
 ; The game timer is capped at 999:59:59.00.
 
-
 ; Don't update if game logic is paused.
 	ld a, [wGameLogicPaused]
 	and a
@@ -39,7 +33,7 @@ UpdateGameTimer:: ; 20ad
 
 ; Is the timer paused?
 	ld hl, wGameTimerPause
-	bit 0, [hl]
+	bit GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
 	ret z
 
 ; Is the timer already capped?
@@ -47,7 +41,6 @@ UpdateGameTimer:: ; 20ad
 	bit 0, [hl]
 	ret nz
 
-
 ; +1 frame
 	ld hl, wGameTimeFrames
 	ld a, [hl]
@@ -59,7 +52,6 @@ UpdateGameTimer:: ; 20ad
 	ld [hl], a
 	ret
 
-
 .second
 	xor a
 	ld [hl], a
@@ -75,7 +67,6 @@ UpdateGameTimer:: ; 20ad
 	ld [hl], a
 	ret
 
-
 .minute
 	xor a
 	ld [hl], a
@@ -91,7 +82,6 @@ UpdateGameTimer:: ; 20ad
 	ld [hl], a
 	ret
 
-
 .hour
 	xor a
 	ld [hl], a
@@ -103,7 +93,6 @@ UpdateGameTimer:: ; 20ad
 	ld l, a
 	inc hl
 
-
 ; Cap the timer after 1000 hours.
 	ld a, h
 	cp HIGH(1000)
@@ -121,11 +110,9 @@ UpdateGameTimer:: ; 20ad
 	ld [wGameTimeSeconds], a
 	ret
 
-
 .ok
 	ld a, h
 	ld [wGameTimeHours], a
 	ld a, l
 	ld [wGameTimeHours + 1], a
 	ret
-; 210f
diff --git a/home/handshake.asm b/home/handshake.asm
index 14daf08a7..1d3f43d6a 100644
--- a/home/handshake.asm
+++ b/home/handshake.asm
@@ -1,10 +1,9 @@
-PrinterReceive:: ; 2057
+PrinterReceive::
 	homecall _PrinterReceive
 
 	ret
-; 2063
 
-AskSerial:: ; 2063
+AskSerial::
 ; send out a handshake while serial int is off
 	ld a, [wPrinterConnectionOpen]
 	bit 0, a
@@ -41,4 +40,3 @@ AskSerial:: ; 2063
 	ld [rSC], a
 
 	ret
-; 208a
diff --git a/home/hm_moves.asm b/home/hm_moves.asm
index c4233d094..30a9786a9 100644
--- a/home/hm_moves.asm
+++ b/home/hm_moves.asm
@@ -1,6 +1,6 @@
 ; HM moves can't be forgotten
 
-IsHM:: ; 34df
+IsHM::
 	cp HM01
 	jr c, .NotHM
 	scf
@@ -8,14 +8,13 @@ IsHM:: ; 34df
 .NotHM:
 	and a
 	ret
-; 34e7
 
-IsHMMove:: ; 34e7
+IsHMMove::
 	ld hl, .HMMoves
 	ld de, 1
 	jp IsInArray
 
-.HMMoves: ; 34f0
+.HMMoves:
 	db CUT
 	db FLY
 	db SURF
@@ -24,4 +23,3 @@ IsHMMove:: ; 34e7
 	db WATERFALL
 	db WHIRLPOOL
 	db -1 ; end
-; 34f8
diff --git a/home/hp_pals.asm b/home/hp_pals.asm
new file mode 100644
index 000000000..9400d341f
--- /dev/null
+++ b/home/hp_pals.asm
@@ -0,0 +1,17 @@
+SetHPPal::
+; Set palette for hp bar pixel length e at hl.
+	call GetHPPal
+	ld [hl], d
+	ret
+
+GetHPPal::
+; Get palette for hp bar pixel length e in d.
+	ld d, HP_GREEN
+	ld a, e
+	cp (HP_BAR_LENGTH_PX * 50 / 100) ; 24
+	ret nc
+	inc d ; HP_YELLOW
+	cp (HP_BAR_LENGTH_PX * 21 / 100) ; 10
+	ret nc
+	inc d ; HP_RED
+	ret
diff --git a/home/init.asm b/home/init.asm
index ec541ad16..dc1f538be 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -1,4 +1,4 @@
-Reset:: ; 150
+Reset::
 	di
 	call MapSetup_Sound_Off
 	xor a
@@ -17,10 +17,8 @@ Reset:: ; 150
 	call DelayFrames
 
 	jr Init
-; 16e
 
-
-_Start:: ; 16e
+_Start::
 	cp $11
 	jr z, .cgb
 	xor a
@@ -33,11 +31,8 @@ _Start:: ; 16e
 	ld [hCGB], a
 	ld a, $1
 	ld [hSystemBooted], a
-; 17d
-
-
-Init:: ; 17d
 
+Init::
 	di
 
 	xor a
@@ -102,7 +97,6 @@ Init:: ; 17d
 	call ClearSprites
 	call ClearsScratch
 
-
 	ld a, BANK(WriteOAMDMACodeToHRAM)
 	rst Bankswitch
 
@@ -172,10 +166,8 @@ Init:: ; 17d
 	xor a
 	ld [wMapMusic], a
 	jp GameInit
-; 245
-
 
-ClearVRAM:: ; 245
+ClearVRAM::
 ; Wipe VRAM banks 0 and 1
 
 	ld a, 1
@@ -190,9 +182,8 @@ ClearVRAM:: ; 245
 	xor a
 	call ByteFill
 	ret
-; 25a
 
-ClearWRAM:: ; 25a
+ClearWRAM::
 ; Wipe swappable WRAM banks (1-7)
 ; Assumes CGB or AGB
 
@@ -209,9 +200,8 @@ ClearWRAM:: ; 25a
 	cp 8
 	jr nc, .bank_loop ; Should be jr c
 	ret
-; 270
 
-ClearsScratch:: ; 270
+ClearsScratch::
 ; Wipe the first 32 bytes of sScratch
 
 	ld a, BANK(sScratch)
@@ -222,4 +212,3 @@ ClearsScratch:: ; 270
 	call ByteFill
 	call CloseSRAM
 	ret
-; 283
diff --git a/home/item.asm b/home/item.asm
index 2f550a200..282157e55 100644
--- a/home/item.asm
+++ b/home/item.asm
@@ -1,9 +1,8 @@
-DoItemEffect:: ; 2f3f
+DoItemEffect::
 	farcall _DoItemEffect
 	ret
-; 2f46
 
-CheckTossableItem:: ; 2f46
+CheckTossableItem::
 	push hl
 	push de
 	push bc
@@ -12,9 +11,8 @@ CheckTossableItem:: ; 2f46
 	pop de
 	pop hl
 	ret
-; 2f53
 
-TossItem:: ; 2f53
+TossItem::
 	push hl
 	push de
 	push bc
@@ -32,9 +30,8 @@ TossItem:: ; 2f53
 	pop de
 	pop hl
 	ret
-; 2f66
 
-ReceiveItem:: ; 2f66
+ReceiveItem::
 	push bc
 	ld a, [hROMBank]
 	push af
@@ -52,9 +49,8 @@ ReceiveItem:: ; 2f66
 	rst Bankswitch
 	pop bc
 	ret
-; 2f79
 
-CheckItem:: ; 2f79
+CheckItem::
 	push hl
 	push de
 	push bc
@@ -72,4 +68,3 @@ CheckItem:: ; 2f79
 	pop de
 	pop hl
 	ret
-; 2f8c
diff --git a/home/joypad.asm b/home/joypad.asm
index f46ab5c98..87fc60d7e 100644
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -1,21 +1,19 @@
-JoypadInt:: ; 92e
+JoypadInt::
 ; Replaced by Joypad, called from VBlank instead of the useless
 ; joypad interrupt.
 
 ; This is a placeholder in case the interrupt is somehow enabled.
 	reti
-; 92f
 
-ClearJoypad:: ; 92f
+ClearJoypad::
 	xor a
 ; Pressed this frame (delta)
 	ld [hJoyPressed], a
 ; Currently pressed
 	ld [hJoyDown], a
 	ret
-; 935
 
-Joypad:: ; 935
+Joypad::
 ; Read the joypad register and translate it to something more
 ; workable for use in-game. There are 8 buttons, so we can use
 ; one byte to contain all player input.
@@ -103,10 +101,8 @@ endr
 	jp z, Reset
 
 	ret
-; 984
 
-
-GetJoypad:: ; 984
+GetJoypad::
 ; Update mirror joypad input from hJoypadDown (real input)
 
 ; hJoyReleased: released this frame (delta)
@@ -193,7 +189,6 @@ GetJoypad:: ; 984
 	rst Bankswitch
 	jr .quit
 
-
 .updateauto
 ; An input of $ff will end the stream.
 	ld a, [hli]
@@ -232,10 +227,8 @@ GetJoypad:: ; 984
 	ld [hJoyPressed], a ; pressed
 	ld [hJoyDown], a ; input
 	jr .quit
-; 9ee
-
 
-StartAutoInput:: ; 9ee
+StartAutoInput::
 ; Start reading automated input stream at a:hl.
 
 	ld [wAutoInputBank], a
@@ -255,10 +248,8 @@ StartAutoInput:: ; 9ee
 	ld a, AUTO_INPUT
 	ld [wInputType], a
 	ret
-; a0a
 
-
-StopAutoInput:: ; a0a
+StopAutoInput::
 ; Clear variables related to automated input.
 	xor a
 	ld [wAutoInputBank], a
@@ -268,10 +259,8 @@ StopAutoInput:: ; a0a
 ; Back to normal input.
 	ld [wInputType], a
 	ret
-; a1b
-
 
-JoyTitleScreenInput:: ; a1b
+JoyTitleScreenInput::
 .loop
 
 	call DelayFrame
@@ -297,10 +286,8 @@ JoyTitleScreenInput:: ; a1b
 .keycombo
 	scf
 	ret
-; a36
-
 
-JoyWaitAorB:: ; a36
+JoyWaitAorB::
 .loop
 	call DelayFrame
 	call GetJoypad
@@ -309,9 +296,8 @@ JoyWaitAorB:: ; a36
 	ret nz
 	call RTC
 	jr .loop
-; a46
 
-WaitButton:: ; a46
+WaitButton::
 	ld a, [hOAMUpdate]
 	push af
 	ld a, 1
@@ -321,9 +307,8 @@ WaitButton:: ; a46
 	pop af
 	ld [hOAMUpdate], a
 	ret
-; a57
 
-JoyTextDelay:: ; a57
+JoyTextDelay::
 	call GetJoypad
 	ld a, [hInMenu]
 	and a
@@ -351,9 +336,8 @@ JoyTextDelay:: ; a57
 	ld a, 5
 	ld [wTextDelayFrames], a
 	ret
-; a80
 
-WaitPressAorB_BlinkCursor:: ; a80
+WaitPressAorB_BlinkCursor::
 	ld a, [hMapObjectIndexBuffer]
 	push af
 	ld a, [hObjectStructIndexBuffer]
@@ -379,18 +363,16 @@ WaitPressAorB_BlinkCursor:: ; a80
 	pop af
 	ld [hMapObjectIndexBuffer], a
 	ret
-; aa5
 
-SimpleWaitPressAorB:: ; aa5
+SimpleWaitPressAorB::
 .loop
 	call JoyTextDelay
 	ld a, [hJoyLast]
 	and A_BUTTON | B_BUTTON
 	jr z, .loop
 	ret
-; aaf
 
-ButtonSound:: ; aaf
+ButtonSound::
 	ld a, [wLinkMode]
 	and a
 	jr nz, .link
@@ -404,9 +386,8 @@ ButtonSound:: ; aaf
 .link
 	ld c, 65
 	jp DelayFrames
-; ac6
 
-.wait_input ; ac6
+.wait_input
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -432,9 +413,8 @@ ButtonSound:: ; aaf
 	pop af
 	ld [hOAMUpdate], a
 	ret
-; af5
 
-.blink_cursor ; af5
+.blink_cursor
 	ld a, [hVBlankCounter]
 	and %00010000 ; bit 4, a
 	jr z, .cursor_off
@@ -447,9 +427,8 @@ ButtonSound:: ; aaf
 .load_cursor_state
 	ldcoord_a 18, 17
 	ret
-; b06
 
-BlinkCursor:: ; b06
+BlinkCursor::
 	push bc
 	ld a, [hl]
 	ld b, a
@@ -491,4 +470,3 @@ BlinkCursor:: ; b06
 	ld a, "▼"
 	ld [hl], a
 	ret
-; b40
diff --git a/home/lcd.asm b/home/lcd.asm
index 3899f0816..7ea53d453 100644
--- a/home/lcd.asm
+++ b/home/lcd.asm
@@ -1,7 +1,6 @@
 ; LCD handling
 
-
-Unreferenced_Function547:: ; 547
+Unreferenced_Function547::
 	ld a, [hLCDCPointer]
 	cp rSCX - $ff00
 	ret nz
@@ -9,10 +8,8 @@ Unreferenced_Function547:: ; 547
 	ld a, [wLYOverrides]
 	ld [$ff00+c], a
 	ret
-; 552
-
 
-LCD:: ; 552
+LCD::
 	push af
 	ld a, [hLCDCPointer]
 	and a
@@ -34,10 +31,8 @@ LCD:: ; 552
 .done
 	pop af
 	reti
-; 568
 
-
-DisableLCD:: ; 568
+DisableLCD::
 ; Turn the LCD off
 
 ; Don't need to do anything if the LCD is already off
@@ -69,12 +64,9 @@ DisableLCD:: ; 568
 	ld a, b
 	ld [rIE], a
 	ret
-; 58a
-
 
-EnableLCD:: ; 58a
+EnableLCD::
 	ld a, [rLCDC]
 	set rLCDC_ENABLE, a
 	ld [rLCDC], a
 	ret
-; 591
diff --git a/home/map.asm b/home/map.asm
index 252b68cbe..a38b791fb 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -1,14 +1,13 @@
 ; Functions dealing with rendering and interacting with maps.
 
-Clearwc7e8:: ; 210f
+Clearwc7e8::
 	ld hl, wc7e8
 	ld bc, wc7e8_End - wc7e8
 	ld a, 0
 	call ByteFill
 	ret
-; 211b
 
-CheckScenes:: ; 211b
+CheckScenes::
 ; Checks wCurrMapSceneScriptPointer.  If it's empty, returns -1 in a.  Otherwise, returns the active scene ID in a.
 	push hl
 	ld hl, wCurrMapSceneScriptPointer
@@ -23,9 +22,8 @@ CheckScenes:: ; 211b
 .scene_exists
 	pop hl
 	ret
-; 212a
 
-GetCurrentMapSceneID:: ; 212a
+GetCurrentMapSceneID::
 ; Grabs the wram map scene script pointer for the current map and loads it into wCurrMapSceneScriptPointer.
 ; If there is no scene, both bytes of wCurrMapSceneScriptPointer are wiped clean.
 ; Copy the current map group and number into bc.  This is needed for GetMapSceneID.
@@ -46,9 +44,8 @@ GetCurrentMapSceneID:: ; 212a
 	ld [wCurrMapSceneScriptPointer + 1], a
 	xor a
 	ret
-; 2147
 
-GetMapSceneID:: ; 2147
+GetMapSceneID::
 ; Searches the scene script table for the map group and number loaded in bc, and returns the wram pointer in de.
 ; If the map is not in the scene script table, returns carry.
 	push bc
@@ -93,15 +90,13 @@ GetMapSceneID:: ; 2147
 
 	pop bc
 	ret
-; 2173
 
-OverworldTextModeSwitch:: ; 2173
+OverworldTextModeSwitch::
 	call LoadMapPart
 	call FarCallSwapTextboxPalettes
 	ret
-; 217a
 
-LoadMapPart:: ; 217a
+LoadMapPart::
 	ld a, [hROMBank]
 	push af
 
@@ -109,7 +104,7 @@ LoadMapPart:: ; 217a
 	rst Bankswitch
 
 	call LoadMetatiles
-	ld a, $60
+	ld a, "■"
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
@@ -121,21 +116,20 @@ LoadMapPart:: ; 217a
 	pop af
 	rst Bankswitch
 	ret
-; 2198
 
-LoadMetatiles:: ; 2198
+LoadMetatiles::
 	; de <- wOverworldMapAnchor
 	ld a, [wOverworldMapAnchor]
 	ld e, a
 	ld a, [wOverworldMapAnchor + 1]
 	ld d, a
-	ld hl, wMisc
-	ld b, WMISC_HEIGHT / 4 ; 5
+	ld hl, wSurroundingTiles
+	ld b, SURROUNDING_HEIGHT / METATILE_WIDTH ; 5
 
 .row
 	push de
 	push hl
-	ld c, WMISC_WIDTH / 4 ; 6
+	ld c, SURROUNDING_WIDTH / METATILE_WIDTH ; 6
 
 .col
 	push de
@@ -148,7 +142,7 @@ LoadMetatiles:: ; 2198
 	ld a, [wMapBorderBlock]
 
 .ok
-	; Load the current wMisc address into de.
+	; Load the current wSurroundingTiles address into de.
 	ld e, l
 	ld d, h
 	; Set hl to the address of the current metatile data ([wTilesetBlocksAddress] + (a) tiles).
@@ -169,27 +163,27 @@ LoadMetatiles:: ; 2198
 	ld h, a
 
 	; copy the 4x4 metatile
-rept 3
-rept 4
+rept METATILE_WIDTH + -1
+rept METATILE_WIDTH
 	ld a, [hli]
 	ld [de], a
 	inc de
 endr
 	ld a, e
-	add WMISC_WIDTH - 4
+	add SURROUNDING_WIDTH - METATILE_WIDTH
 	ld e, a
 	jr nc, .next\@
 	inc d
 .next\@
 endr
-rept 4
+rept METATILE_WIDTH
 	ld a, [hli]
 	ld [de], a
 	inc de
 endr
 	; Next metatile
 	pop hl
-	ld de, 4
+	ld de, METATILE_WIDTH
 	add hl, de
 	pop de
 	inc de
@@ -197,7 +191,7 @@ endr
 	jp nz, .col
 	; Next metarow
 	pop hl
-	ld de, WMISC_WIDTH * 4
+	ld de, SURROUNDING_WIDTH * METATILE_WIDTH
 	add hl, de
 	pop de
 	ld a, [wMapWidth]
@@ -210,18 +204,16 @@ endr
 	dec b
 	jp nz, .row
 	ret
-; 222a
 
-ReturnToMapFromSubmenu:: ; 222a
+ReturnToMapFromSubmenu::
 	ld a, MAPSETUP_SUBMENU
 	ld [hMapEntryMethod], a
 	farcall RunMapSetupScript
 	xor a
 	ld [hMapEntryMethod], a
 	ret
-; 2238
 
-CheckWarpTile:: ; 2238
+CheckWarpTile::
 	call GetDestinationWarpNumber
 	ret nc
 
@@ -233,16 +225,14 @@ CheckWarpTile:: ; 2238
 	call CopyWarpData
 	scf
 	ret
-; 224a
 
-WarpCheck:: ; 224a
+WarpCheck::
 	call GetDestinationWarpNumber
 	ret nc
 	call CopyWarpData
 	ret
-; 2252
 
-GetDestinationWarpNumber:: ; 2252
+GetDestinationWarpNumber::
 	farcall CheckWarpCollision
 	ret nc
 
@@ -256,14 +246,13 @@ GetDestinationWarpNumber:: ; 2252
 	ld a, d
 	rst Bankswitch
 	ret
-; 2266
 
-.GetDestinationWarpNumber: ; 2266
+.GetDestinationWarpNumber:
 	ld a, [wPlayerStandingMapY]
-	sub $4
+	sub 4
 	ld e, a
 	ld a, [wPlayerStandingMapX]
-	sub $4
+	sub 4
 	ld d, a
 	ld a, [wCurrMapWarpCount]
 	and a
@@ -315,9 +304,8 @@ GetDestinationWarpNumber:: ; 2252
 	inc hl
 	scf
 	ret
-; 22a7
 
-CopyWarpData:: ; 22a7
+CopyWarpData::
 	ld a, [hROMBank]
 	push af
 
@@ -328,9 +316,8 @@ CopyWarpData:: ; 22a7
 	rst Bankswitch
 	scf
 	ret
-; 22b4
 
-.CopyWarpData: ; 22b4
+.CopyWarpData:
 	push bc
 	ld hl, wCurrMapWarpsPointer
 	ld a, [hli]
@@ -364,16 +351,14 @@ CopyWarpData:: ; 22a7
 	ld [wPrevMapNumber], a
 	scf
 	ret
-; 22ee
 
-CheckOutdoorMap:: ; 22ee
+CheckOutdoorMap::
 	cp ROUTE
 	ret z
 	cp TOWN
 	ret
-; 22f4
 
-CheckIndoorMap:: ; 22f4
+CheckIndoorMap::
 	cp INDOOR
 	ret z
 	cp CAVE
@@ -382,7 +367,6 @@ CheckIndoorMap:: ; 22f4
 	ret z
 	cp GATE
 	ret
-; 2300
 
 ; unused
 	cp INDOOR
@@ -391,36 +375,32 @@ CheckIndoorMap:: ; 22f4
 	ret z
 	cp ENVIRONMENT_5
 	ret
-; 2309
 
-LoadMapAttributes:: ; 2309
-	call CopyMapDefAndData
+LoadMapAttributes::
+	call CopyMapPartialAndAttributes
 	call SwitchToMapScriptsBank
 	call ReadMapScripts
 	xor a ; do not skip object_events
 	call ReadMapEvents
 	ret
-; 2317
 
-LoadMapAttributes_SkipPeople:: ; 2317
-	call CopyMapDefAndData
+LoadMapAttributes_SkipPeople::
+	call CopyMapPartialAndAttributes
 	call SwitchToMapScriptsBank
 	call ReadMapScripts
 	ld a, TRUE ; skip object events
 	call ReadMapEvents
 	ret
-; 2326
 
-CopyMapDefAndData:: ; 2326
-	call PartialCopyMapDef
-	call SwitchToMapDataBank
-	call GetMapDataPointer
-	call CopyMapData
+CopyMapPartialAndAttributes::
+	call CopyMapPartial
+	call SwitchToMapAttributesBank
+	call GetMapAttributesPointer
+	call CopyMapAttributes
 	call GetMapConnections
 	ret
-; 2336
 
-ReadMapEvents:: ; 2336
+ReadMapEvents::
 	push af
 	ld hl, wMapEventsPointer
 	ld a, [hli]
@@ -438,9 +418,8 @@ ReadMapEvents:: ; 2336
 
 	call ReadObjectEvents
 	ret
-; 234f
 
-ReadMapScripts:: ; 234f
+ReadMapScripts::
 	ld hl, wMapScriptsPointer
 	ld a, [hli]
 	ld h, [hl]
@@ -448,11 +427,10 @@ ReadMapScripts:: ; 234f
 	call ReadMapSceneScripts
 	call ReadMapCallbacks
 	ret
-; 235c
 
-CopyMapData:: ; 235c
-	ld de, wMapData
-	ld c, wMapDataEnd - wMapData
+CopyMapAttributes::
+	ld de, wMapAttributes
+	ld c, wMapAttributesEnd - wMapAttributes
 .loop
 	ld a, [hli]
 	ld [de], a
@@ -460,9 +438,8 @@ CopyMapData:: ; 235c
 	dec c
 	jr nz, .loop
 	ret
-; 2368
 
-GetMapConnections:: ; 2368
+GetMapConnections::
 	ld a, $ff
 	ld [wNorthConnectedMapGroup], a
 	ld [wSouthConnectedMapGroup], a
@@ -497,9 +474,8 @@ GetMapConnections:: ; 2368
 .no_east
 
 	ret
-; 23a3
 
-GetMapConnection:: ; 23a3
+GetMapConnection::
 ; Load map connection struct at hl into de.
 	ld c, wSouthMapConnection - wNorthMapConnection
 .loop
@@ -509,9 +485,8 @@ GetMapConnection:: ; 23a3
 	dec c
 	jr nz, .loop
 	ret
-; 23ac
 
-ReadMapSceneScripts:: ; 23ac
+ReadMapSceneScripts::
 	ld a, [hli] ; scene script count
 	ld c, a
 	ld [wCurrMapSceneScriptCount], a ; current map scene script count
@@ -526,9 +501,8 @@ ReadMapSceneScripts:: ; 23ac
 	ld bc, 4 ; scene_script size
 	call AddNTimes
 	ret
-; 23c3
 
-ReadMapCallbacks:: ; 23c3
+ReadMapCallbacks::
 	ld a, [hli]
 	ld c, a
 	ld [wCurrMapCallbackCount], a
@@ -543,9 +517,8 @@ ReadMapCallbacks:: ; 23c3
 	ld bc, 3
 	call AddNTimes
 	ret
-; 23da
 
-ReadWarps:: ; 23da
+ReadWarps::
 	ld a, [hli]
 	ld c, a
 	ld [wCurrMapWarpCount], a
@@ -559,9 +532,8 @@ ReadWarps:: ; 23da
 	ld bc, 5
 	call AddNTimes
 	ret
-; 23f1
 
-ReadCoordEvents:: ; 23f1
+ReadCoordEvents::
 	ld a, [hli]
 	ld c, a
 	ld [wCurrMapCoordEventCount], a
@@ -577,9 +549,8 @@ ReadCoordEvents:: ; 23f1
 	ld bc, 8
 	call AddNTimes
 	ret
-; 2408
 
-ReadBGEvents:: ; 2408
+ReadBGEvents::
 	ld a, [hli]
 	ld c, a
 	ld [wCurrMapBGEventCount], a
@@ -595,9 +566,8 @@ ReadBGEvents:: ; 2408
 	ld bc, 5
 	call AddNTimes
 	ret
-; 241f
 
-ReadObjectEvents:: ; 241f
+ReadObjectEvents::
 	push hl
 	call ClearObjectStructs
 	pop de
@@ -641,9 +611,8 @@ ReadObjectEvents:: ; 241f
 	ld h, d
 	ld l, e
 	ret
-; 2457
 
-CopyMapObjectEvents:: ; 2457
+CopyMapObjectEvents::
 	and a
 	ret z
 
@@ -668,9 +637,8 @@ CopyMapObjectEvents:: ; 2457
 	dec c
 	jr nz, .loop
 	ret
-; 2471
 
-ClearObjectStructs:: ; 2471
+ClearObjectStructs::
 	ld hl, wObject1Struct
 	ld bc, OBJECT_STRUCT_LENGTH * (NUM_OBJECT_STRUCTS - 1)
 	xor a
@@ -687,9 +655,8 @@ ClearObjectStructs:: ; 2471
 	dec c
 	jr nz, .loop
 	ret
-; 248a
 
-RestoreFacingAfterWarp:: ; 248a
+RestoreFacingAfterWarp::
 	call GetMapScriptsBank
 	rst Bankswitch
 
@@ -719,7 +686,6 @@ RestoreFacingAfterWarp:: ; 248a
 .skip
 	farcall GetCoordOfUpperLeftCorner
 	ret
-; 24ba
 
 .backup
 	ld a, [wPrevWarp]
@@ -729,11 +695,10 @@ RestoreFacingAfterWarp:: ; 248a
 	ld a, [wPrevMapNumber]
 	ld [wBackupMapNumber], a
 	ret
-; 24cd
 
-LoadBlockData:: ; 24cd
-	ld hl, wOverworldMap
-	ld bc, wOverworldMapEnd - wOverworldMap
+LoadBlockData::
+	ld hl, wOverworldMapBlocks
+	ld bc, wOverworldMapBlocksEnd - wOverworldMapBlocks
 	ld a, 0
 	call ByteFill
 	call ChangeMap
@@ -741,13 +706,12 @@ LoadBlockData:: ; 24cd
 	ld a, MAPCALLBACK_TILES
 	call RunMapCallback
 	ret
-; 24e4
 
-ChangeMap:: ; 24e4
+ChangeMap::
 	ld a, [hROMBank]
 	push af
 
-	ld hl, wOverworldMap
+	ld hl, wOverworldMapBlocks
 	ld a, [wMapWidth]
 	ld [hConnectedMapWidth], a
 	add $6
@@ -791,10 +755,8 @@ ChangeMap:: ; 24e4
 	pop af
 	rst Bankswitch
 	ret
-; 2524
-
-FillMapConnections:: ; 2524
 
+FillMapConnections::
 ; North
 	ld a, [wNorthConnectedMapGroup]
 	cp $ff
@@ -889,11 +851,9 @@ FillMapConnections:: ; 2524
 
 .Done:
 	ret
-; 25d3
 
 FillNorthConnectionStrip::
-FillSouthConnectionStrip:: ; 25d3
-
+FillSouthConnectionStrip::
 	ld c, 3
 .y
 	push de
@@ -925,11 +885,9 @@ FillSouthConnectionStrip:: ; 25d3
 	dec c
 	jr nz, .y
 	ret
-; 25f6
 
 FillWestConnectionStrip::
-FillEastConnectionStrip:: ; 25f6
-
+FillEastConnectionStrip::
 .loop
 	ld a, [wMapWidth]
 	add 6
@@ -964,14 +922,12 @@ FillEastConnectionStrip:: ; 25f6
 	dec b
 	jr nz, .loop
 	ret
-; 261b
 
-LoadMapStatus:: ; 261b
+LoadMapStatus::
 	ld [wMapStatus], a
 	ret
-; 261f
 
-CallScript:: ; 261f
+CallScript::
 ; Call a script at a:hl.
 
 	ld [wScriptBank], a
@@ -985,18 +941,16 @@ CallScript:: ; 261f
 
 	scf
 	ret
-; 2631
 
-CallMapScript:: ; 2631
+CallMapScript::
 ; Call a script at hl in the current bank if there isn't already a script running
 	ld a, [wScriptRunning]
 	and a
 	ret nz
 	call GetMapScriptsBank
 	jr CallScript
-; 263b
 
-RunMapCallback:: ; 263b
+RunMapCallback::
 ; Will run the first callback found with execution index equal to a.
 	ld b, a
 	ld a, [hROMBank]
@@ -1015,9 +969,8 @@ RunMapCallback:: ; 263b
 	pop af
 	rst Bankswitch
 	ret
-; 2653
 
-.FindCallback: ; 2653
+.FindCallback:
 	ld a, [wCurrMapCallbackCount]
 	ld c, a
 	and a
@@ -1046,9 +999,8 @@ RunMapCallback:: ; 263b
 	ld l, a
 	scf
 	ret
-; 2674
 
-ExecuteCallbackScript:: ; 2674
+ExecuteCallbackScript::
 ; Do map callback de and return to script bank b.
 	farcall CallCallback
 	ld a, [wScriptMode]
@@ -1064,9 +1016,8 @@ ExecuteCallbackScript:: ; 2674
 	pop af
 	ld [wScriptMode], a
 	ret
-; 269a
 
-MapTextbox:: ; 269a
+MapTextbox::
 	ld a, [hROMBank]
 	push af
 
@@ -1087,9 +1038,8 @@ MapTextbox:: ; 269a
 	pop af
 	rst Bankswitch
 	ret
-; 26b7
 
-Call_a_de:: ; 26b7
+Call_a_de::
 ; Call a:de.
 
 	ld [hBuffer], a
@@ -1107,9 +1057,8 @@ Call_a_de:: ; 26b7
 .de
 	push de
 	ret
-; 26c7
 
-GetMovementData:: ; 26c7
+GetMovementData::
 ; Initialize the movement data for object c at b:hl
 	ld a, [hROMBank]
 	push af
@@ -1123,9 +1072,8 @@ GetMovementData:: ; 26c7
 	ld a, h
 	rst Bankswitch
 	ret
-; 26d4
 
-GetScriptByte:: ; 0x26d4
+GetScriptByte::
 ; Return byte at wScriptBank:wScriptPos in a.
 
 	push hl
@@ -1154,36 +1102,29 @@ GetScriptByte:: ; 0x26d4
 	pop bc
 	pop hl
 	ret
-; 0x26ef
 
-ObjectEvent:: ; 0x26ef
+ObjectEvent::
 	jumptextfaceplayer ObjectEventText
-; 0x26f2
 
 ObjectEventText::
 	text_jump _ObjectEventText
 	db "@"
-; 0x26f7
 
-BGEvent:: ; 26f7
+BGEvent::
 	jumptext BGEventText
-; 26fa
 
-BGEventText:: ; 26fa
+BGEventText::
 	text_jump UnknownText_0x1c46fc
 	db "@"
-; 26ff
 
-CoordinatesEvent:: ; 26ff
+CoordinatesEvent::
 	jumptext CoordinatesEventText
-; 2702
 
-CoordinatesEventText:: ; 2702
+CoordinatesEventText::
 	text_jump UnknownText_0x1c4706
 	db "@"
-; 2707
 
-CheckObjectMask:: ; 2707
+CheckObjectMask::
 	ld a, [hMapObjectIndexBuffer]
 	ld e, a
 	ld d, $0
@@ -1191,9 +1132,8 @@ CheckObjectMask:: ; 2707
 	add hl, de
 	ld a, [hl]
 	ret
-; 2712
 
-MaskObject:: ; 2712
+MaskObject::
 	ld a, [hMapObjectIndexBuffer]
 	ld e, a
 	ld d, $0
@@ -1201,9 +1141,8 @@ MaskObject:: ; 2712
 	add hl, de
 	ld [hl], -1 ; , masked
 	ret
-; 271e
 
-UnmaskObject:: ; 271e
+UnmaskObject::
 	ld a, [hMapObjectIndexBuffer]
 	ld e, a
 	ld d, $0
@@ -1211,9 +1150,8 @@ UnmaskObject:: ; 271e
 	add hl, de
 	ld [hl], 0 ; unmasked
 	ret
-; 272a
 
-ScrollMapDown:: ; 272a
+ScrollMapDown::
 	hlcoord 0, 0
 	ld de, wBGMapBuffer
 	call BackupBGMapRow
@@ -1227,9 +1165,8 @@ ScrollMapDown:: ; 272a
 	ld a, $1
 	ld [hBGMapUpdate], a
 	ret
-; 2748
 
-ScrollMapUp:: ; 2748
+ScrollMapUp::
 	hlcoord 0, SCREEN_HEIGHT - 2
 	ld de, wBGMapBuffer
 	call BackupBGMapRow
@@ -1239,7 +1176,7 @@ ScrollMapUp:: ; 2748
 	ld l, a
 	ld a, [wBGMapAnchor + 1]
 	ld h, a
-	ld bc, $0200
+	ld bc, BG_MAP_WIDTH tiles
 	add hl, bc
 ; cap d at HIGH(vBGMap0)
 	ld a, h
@@ -1251,9 +1188,8 @@ ScrollMapUp:: ; 2748
 	ld a, $1
 	ld [hBGMapUpdate], a
 	ret
-; 2771
 
-ScrollMapRight:: ; 2771
+ScrollMapRight::
 	hlcoord 0, 0
 	ld de, wBGMapBuffer
 	call BackupBGMapColumn
@@ -1267,9 +1203,8 @@ ScrollMapRight:: ; 2771
 	ld a, $1
 	ld [hBGMapUpdate], a
 	ret
-; 278f
 
-ScrollMapLeft:: ; 278f
+ScrollMapLeft::
 	hlcoord SCREEN_WIDTH - 2, 0
 	ld de, wBGMapBuffer
 	call BackupBGMapColumn
@@ -1290,9 +1225,8 @@ ScrollMapLeft:: ; 278f
 	ld a, $1
 	ld [hBGMapUpdate], a
 	ret
-; 27b7
 
-BackupBGMapRow:: ; 27b7
+BackupBGMapRow::
 	ld c, 2 * SCREEN_WIDTH
 .loop
 	ld a, [hli]
@@ -1301,9 +1235,8 @@ BackupBGMapRow:: ; 27b7
 	dec c
 	jr nz, .loop
 	ret
-; 27c0
 
-BackupBGMapColumn:: ; 27c0
+BackupBGMapColumn::
 	ld c, SCREEN_HEIGHT
 .loop
 	ld a, [hli]
@@ -1322,9 +1255,8 @@ BackupBGMapColumn:: ; 27c0
 	dec c
 	jr nz, .loop
 	ret
-; 27d3
 
-UpdateBGMapRow:: ; 27d3
+UpdateBGMapRow::
 	ld hl, wBGMapBufferPtrs
 	push de
 	call .iteration
@@ -1354,9 +1286,8 @@ UpdateBGMapRow:: ; 27d3
 	ld a, SCREEN_WIDTH
 	ld [hBGMapTileCount], a
 	ret
-; 27f8
 
-UpdateBGMapColumn:: ; 27f8
+UpdateBGMapColumn::
 	ld hl, wBGMapBufferPtrs
 	ld c, SCREEN_HEIGHT
 .loop
@@ -1381,7 +1312,6 @@ UpdateBGMapColumn:: ; 27f8
 	ld a, SCREEN_HEIGHT
 	ld [hBGMapTileCount], a
 	ret
-; 2816
 
 Unreferenced_Function2816::
 	ld hl, wBGMapBuffer
@@ -1389,9 +1319,8 @@ Unreferenced_Function2816::
 	xor a
 	call ByteFill
 	ret
-; 2821
 
-LoadTilesetGFX:: ; 2821
+LoadTilesetGFX::
 	ld hl, wTilesetAddress
 	ld a, [hli]
 	ld h, [hl]
@@ -1446,16 +1375,15 @@ LoadTilesetGFX:: ; 2821
 	xor a
 	ld [hTileAnimFrame], a
 	ret
-; 2879
 
-BufferScreen:: ; 2879
+BufferScreen::
 	ld hl, wOverworldMapAnchor
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	ld de, wScreenSave
-	ld c, $5
-	ld b, $6
+	ld c, SCREEN_META_HEIGHT
+	ld b, SCREEN_META_WIDTH
 .row
 	push bc
 	push hl
@@ -1467,17 +1395,16 @@ BufferScreen:: ; 2879
 	jr nz, .col
 	pop hl
 	ld a, [wMapWidth]
-	add $6
+	add 6
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	pop bc
 	dec c
 	jr nz, .row
 	ret
-; 289d
 
-SaveScreen:: ; 289d
+SaveScreen::
 	ld hl, wOverworldMapAnchor
 	ld a, [hli]
 	ld h, [hl]
@@ -1498,18 +1425,18 @@ SaveScreen:: ; 289d
 	ret
 
 .up
-	ld de, wScreenSave + 6
+	ld de, wScreenSave + SCREEN_META_WIDTH
 	ld a, [hMapObjectIndexBuffer]
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	jr .vertical
 
 .down
 	ld de, wScreenSave
 .vertical
-	ld b, 6
-	ld c, 4
+	ld b, SCREEN_META_WIDTH
+	ld c, SCREEN_META_HEIGHT - 1
 	jr SaveScreen_LoadNeighbor
 
 .left
@@ -1520,11 +1447,11 @@ SaveScreen:: ; 289d
 .right
 	ld de, wScreenSave
 .horizontal
-	ld b, 5
-	ld c, 5
+	ld b, SCREEN_META_WIDTH - 1
+	ld c, SCREEN_META_HEIGHT
 	jr SaveScreen_LoadNeighbor
 
-LoadNeighboringBlockData:: ; 28e3
+LoadNeighboringBlockData::
 	ld hl, wOverworldMapAnchor
 	ld a, [hli]
 	ld h, [hl]
@@ -1533,10 +1460,10 @@ LoadNeighboringBlockData:: ; 28e3
 	add 6
 	ld [hConnectionStripLength], a
 	ld de, wScreenSave
-	ld b, 6
-	ld c, 5
+	ld b, SCREEN_META_WIDTH
+	ld c, SCREEN_META_HEIGHT
 
-SaveScreen_LoadNeighbor:: ; 28f7
+SaveScreen_LoadNeighbor::
 .row
 	push bc
 	push hl
@@ -1564,9 +1491,8 @@ SaveScreen_LoadNeighbor:: ; 28f7
 	dec c
 	jr nz, .row
 	ret
-; 2914
 
-GetMovementPermissions:: ; 2914
+GetMovementPermissions::
 	xor a
 	ld [wTilePermissions], a
 	call .LeftRight
@@ -1594,9 +1520,8 @@ GetMovementPermissions:: ; 2914
 	or [hl]
 	ld [hl], a
 	ret
-; 2945
 
-.MovementPermissionsData: ; 2945
+.MovementPermissionsData:
 	db DOWN_MASK
 	db UP_MASK
 	db LEFT_MASK
@@ -1605,7 +1530,6 @@ GetMovementPermissions:: ; 2914
 	db UP_MASK | RIGHT_MASK
 	db DOWN_MASK | LEFT_MASK
 	db UP_MASK | LEFT_MASK
-; 294d
 
 .UpDown:
 	ld a, [wPlayerStandingMapX]
@@ -1625,7 +1549,6 @@ GetMovementPermissions:: ; 2914
 	ld [wTileUp], a
 	call .Up
 	ret
-; 296c
 
 .LeftRight:
 	ld a, [wPlayerStandingMapX]
@@ -1645,7 +1568,6 @@ GetMovementPermissions:: ; 2914
 	ld [wTileRight], a
 	call .Right
 	ret
-; 298b
 
 .Down:
 	call .CheckHiNybble
@@ -1664,7 +1586,6 @@ GetMovementPermissions:: ; 2914
 	or FACE_DOWN
 	ld [wTilePermissions], a
 	ret
-; 29a8
 
 .Up:
 	call .CheckHiNybble
@@ -1683,7 +1604,6 @@ GetMovementPermissions:: ; 2914
 	or FACE_UP
 	ld [wTilePermissions], a
 	ret
-; 29c5
 
 .Right:
 	call .CheckHiNybble
@@ -1702,7 +1622,6 @@ GetMovementPermissions:: ; 2914
 	or FACE_RIGHT
 	ld [wTilePermissions], a
 	ret
-; 29e2
 
 .Left:
 	call .CheckHiNybble
@@ -1721,17 +1640,15 @@ GetMovementPermissions:: ; 2914
 	or FACE_LEFT
 	ld [wTilePermissions], a
 	ret
-; 29ff
 
 .CheckHiNybble:
 	and $f0
-	cp $b0
+	cp HI_NYBBLE_SIDE_WALLS
 	ret z
-	cp $c0
+	cp HI_NYBBLE_UNUSED_C0
 	ret
-; 2a07
 
-GetFacingTileCoord:: ; 2a07
+GetFacingTileCoord::
 ; Return map coordinates in (d, e) and tile id in a
 ; of the tile the player is facing.
 
@@ -1774,9 +1691,8 @@ GetFacingTileCoord:: ; 2a07
 	dw wTileLeft
 	db  1,  0
 	dw wTileRight
-; 2a3c
 
-GetCoordTile:: ; 2a3c
+GetCoordTile::
 ; Get the collision byte for tile d, e
 	call GetBlockLocation
 	ld a, [hl]
@@ -1809,14 +1725,13 @@ GetCoordTile:: ; 2a3c
 .nope
 	ld a, -1
 	ret
-; 2a66
 
-GetBlockLocation:: ; 2a66
+GetBlockLocation::
 	ld a, [wMapWidth]
 	add 6
 	ld c, a
 	ld b, 0
-	ld hl, wOverworldMap + 1
+	ld hl, wOverworldMapBlocks + 1
 	add hl, bc
 	ld a, e
 	srl a
@@ -1839,9 +1754,8 @@ GetBlockLocation:: ; 2a66
 	ld b, 0
 	add hl, bc
 	ret
-; 2a8b
 
-CheckFacingBGEvent:: ; 2a8b
+CheckFacingBGEvent::
 	call GetFacingTileCoord
 ; Load facing into b.
 	ld b, a
@@ -1866,9 +1780,8 @@ CheckFacingBGEvent:: ; 2a8b
 	ld a, h
 	rst Bankswitch
 	ret
-; 2aaa
 
-CheckIfFacingTileCoordIsBGEvent:: ; 2aaa
+CheckIfFacingTileCoordIsBGEvent::
 ; Checks to see if you are facing a BG event.  If so, copies it into wEngineBuffer1 and sets carry.
 	ld hl, wCurrMapBGEventsPointer
 	ld a, [hli]
@@ -1905,9 +1818,8 @@ CheckIfFacingTileCoordIsBGEvent:: ; 2aaa
 	call CopyBytes
 	scf
 	ret
-; 2ad4
 
-CheckCurrentMapCoordEvents:: ; 2ad4
+CheckCurrentMapCoordEvents::
 ; If there are no coord events, we don't need to be here.
 	ld a, [wCurrMapCoordEventCount]
 	and a
@@ -1978,44 +1890,40 @@ CheckCurrentMapCoordEvents:: ; 2ad4
 	call CopyBytes
 	scf
 	ret
-; 2b29
 
-FadeToMenu:: ; 2b29
+FadeToMenu::
 	xor a
 	ld [hBGMapMode], a
-	call LoadStandardMenuDataHeader
-	farcall Special_FadeOutPalettes
+	call LoadStandardMenuHeader
+	farcall FadeOutPalettes
 	call ClearSprites
 	call DisableSpriteUpdates
 	ret
-; 2b3c
 
-CloseSubmenu:: ; 2b3c
+CloseSubmenu::
 	call ClearBGPalettes
 	call ReloadTilesetAndPalettes
 	call UpdateSprites
 	call Call_ExitMenu
 	call ret_d90
 	jr FinishExitMenu
-; 2b4d
 
-ExitAllMenus:: ; 2b4d
+ExitAllMenus::
 	call ClearBGPalettes
 	call Call_ExitMenu
 	call ReloadTilesetAndPalettes
 	call UpdateSprites
 	call ret_d90
-FinishExitMenu:: ; 2b5c
+FinishExitMenu::
 	ld b, SCGB_MAPPALS
 	call GetSGBLayout
 	farcall LoadOW_BGPal7
 	call WaitBGMap2
-	farcall Special_FadeInPalettes
+	farcall FadeInPalettes
 	call EnableSpriteUpdates
 	ret
-; 2b74
 
-ReturnToMapWithSpeechTextbox:: ; 0x2b74
+ReturnToMapWithSpeechTextbox::
 	push af
 	ld a, $1
 	ld [wSpriteUpdatesEnabled], a
@@ -2038,12 +1946,11 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74
 	ld [hMapAnims], a
 	pop af
 	ret
-; 0x2bae
 
-ReloadTilesetAndPalettes:: ; 2bae
+ReloadTilesetAndPalettes::
 	call DisableLCD
 	call ClearSprites
-	farcall Special_RefreshSprites
+	farcall RefreshSprites
 	call LoadStandardFont
 	call LoadFontsExtra
 	ld a, [hROMBank]
@@ -2052,7 +1959,7 @@ ReloadTilesetAndPalettes:: ; 2bae
 	ld b, a
 	ld a, [wMapNumber]
 	ld c, a
-	call SwitchToAnyMapDataBank
+	call SwitchToAnyMapAttributesBank
 	farcall UpdateTimeOfDayPal
 	call OverworldTextModeSwitch
 	call LoadTilesetGFX
@@ -2063,14 +1970,13 @@ ReloadTilesetAndPalettes:: ; 2bae
 
 	call EnableLCD
 	ret
-; 2be5
 
-GetMapDefPointer:: ; 2be5
+GetMapPointer::
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
 	ld c, a
-GetAnyMapDefPointer:: ; 0x2bed
+GetAnyMapPointer::
 ; Prior to calling this function, you must have switched banks so that
 ; MapGroupPointers is visible.
 
@@ -2078,7 +1984,7 @@ GetAnyMapDefPointer:: ; 0x2bed
 ; b = map group, c = map number
 
 ; outputs:
-; hl points to the map_def
+; hl points to the map within its group
 	push bc ; save map number for later
 
 	; get pointer to map group
@@ -2094,36 +2000,35 @@ GetAnyMapDefPointer:: ; 0x2bed
 	ld l, a
 	pop bc ; restore map number
 
-	; find the cth map_def
+	; find the cth map within the group
 	dec c
 	ld b, 0
 	ld a, 9
 	call AddNTimes
 	ret
-; 0x2c04
 
-GetMapDefField:: ; 0x2c04
-; Extract data from the current map's map_def.
+GetMapField::
+; Extract data from the current map's group entry.
 
 ; inputs:
-; de = offset of desired data within the map_def (a MAPDEF_* constant)
+; de = offset of desired data within the map (a MAP_* constant)
 
 ; outputs:
-; bc = data from the current map's map_def
-; (e.g., de = MAPDEF_TILESET would return a pointer to the tileset id)
+; bc = data from the current map's field
+; (e.g., de = MAP_TILESET would return a pointer to the tileset id)
 
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
 	ld c, a
-GetAnyMapDefField:: ; 0x2c0c
+GetAnyMapField::
 	; bankswitch
 	ld a, [hROMBank]
 	push af
 	ld a, BANK(MapGroupPointers)
 	rst Bankswitch
 
-	call GetAnyMapDefPointer
+	call GetAnyMapPointer
 	add hl, de
 	ld c, [hl]
 	inc hl
@@ -2133,83 +2038,77 @@ GetAnyMapDefField:: ; 0x2c0c
 	pop af
 	rst Bankswitch
 	ret
-; 0x2c1c
 
-SwitchToMapDataBank:: ; 2c1c
+SwitchToMapAttributesBank::
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
 	ld c, a
-SwitchToAnyMapDataBank:: ; 2c24
-	call GetAnyMapDataBank
+SwitchToAnyMapAttributesBank::
+	call GetAnyMapAttributesBank
 	rst Bankswitch
 	ret
-; 2c29
 
-GetMapDataBank:: ; 2c29
+GetMapAttributesBank::
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
 	ld c, a
-GetAnyMapDataBank:: ; 2c31
+GetAnyMapAttributesBank::
 	push hl
 	push de
-	ld de, MAPDEF_MAPDATA_BANK
-	call GetAnyMapDefField
+	ld de, MAP_MAPATTRIBUTES_BANK
+	call GetAnyMapField
 	ld a, c
 	pop de
 	pop hl
 	ret
-; 2c3d
 
-PartialCopyMapDef:: ; 2c3d
+CopyMapPartial::
 ; Copy map data bank, tileset, environment, and map data address
-; from the current map's map_def.
+; from the current map's entry within its group.
 	ld a, [hROMBank]
 	push af
 	ld a, BANK(MapGroupPointers)
 	rst Bankswitch
 
-	call GetMapDefPointer
-	ld de, wPartialMapDef
-	ld bc, wPartialMapDefEnd - wPartialMapDef
+	call GetMapPointer
+	ld de, wMapPartial
+	ld bc, wMapPartialEnd - wMapPartial
 	call CopyBytes
 
 	pop af
 	rst Bankswitch
 	ret
-; 2c52
 
-SwitchToMapScriptsBank:: ; 2c52
+SwitchToMapScriptsBank::
 	ld a, [wMapScriptsBank]
 	rst Bankswitch
 	ret
-; 2c57
 
-GetMapScriptsBank:: ; 2c57
+GetMapScriptsBank::
 	ld a, [wMapScriptsBank]
 	ret
-; 2c5b
 
-GetAnyMapBlocksBank:: ; 2c5b
+GetAnyMapBlocksBank::
 ; Return the blockdata bank for group b map c.
 	push hl
 	push de
 	push bc
 
 	push bc
-	ld de, MAPDEF_MAPDATA
-	call GetAnyMapDefField
+	ld de, MAP_MAPATTRIBUTES
+	call GetAnyMapField
 	ld l, c
 	ld h, b
 	pop bc
 
 	push hl
-	ld de, MAPDEF_MAPDATA_BANK
-	call GetAnyMapDefField
+	ld de, MAP_MAPATTRIBUTES_BANK
+	call GetAnyMapField
 	pop hl
 
-	ld de, MAPDEF_MAPDATA ; blockdata bank
+	ld de, MAP_MAPATTRIBUTES ; blockdata bank
 	add hl, de
 	ld a, c
 	call GetFarByte
@@ -2219,78 +2118,71 @@ GetAnyMapBlocksBank:: ; 2c5b
 	pop de
 	pop hl
 	ret
-; 2c7d
 
-GetMapDataPointer:: ; 0x2c7d
+GetMapAttributesPointer::
 ; returns the current map's data pointer in hl.
 	push bc
 	push de
-	ld de, MAPDEF_MAPDATA
-	call GetMapDefField
+	ld de, MAP_MAPATTRIBUTES
+	call GetMapField
 	ld l, c
 	ld h, b
 	pop de
 	pop bc
 	ret
-; 2c8a
 
-GetMapEnvironment:: ; 2c8a
+GetMapEnvironment::
 	push hl
 	push de
 	push bc
-	ld de, MAPDEF_ENVIRONMENT
-	call GetMapDefField
+	ld de, MAP_ENVIRONMENT
+	call GetMapField
 	ld a, c
 	pop bc
 	pop de
 	pop hl
 	ret
-; 2c98
 
 	ret ; unused
-; 2c99
 
-GetAnyMapEnvironment:: ; 2c99
+GetAnyMapEnvironment::
 	push hl
 	push de
 	push bc
-	ld de, MAPDEF_ENVIRONMENT
-	call GetAnyMapDefField
+	ld de, MAP_ENVIRONMENT
+	call GetAnyMapField
 	ld a, c
 	pop bc
 	pop de
 	pop hl
 	ret
-; 2ca7
 
-GetAnyMapTileset:: ; 2ca7
-	ld de, MAPDEF_TILESET
-	call GetAnyMapDefField
+GetAnyMapTileset::
+	ld de, MAP_TILESET
+	call GetAnyMapField
 	ld a, c
 	ret
-; 2caf
 
-GetWorldMapLocation:: ; 0x2caf
+GetWorldMapLocation::
 ; given a map group/id in bc, return its location on the Pokégear map.
 	push hl
 	push de
 	push bc
 
-	ld de, MAPDEF_LOCATION
-	call GetAnyMapDefField
+	ld de, MAP_LOCATION
+	call GetAnyMapField
 	ld a, c
 
 	pop bc
 	pop de
 	pop hl
 	ret
-; 0x2cbd
 
-GetMapMusic:: ; 2cbd
+GetMapMusic::
 	push hl
 	push bc
-	ld de, MAPDEF_MUSIC
-	call GetMapDefField
+	ld de, MAP_MUSIC
+	call GetMapField
 	ld a, c
 	cp MUSIC_MAHOGANY_MART
 	jr z, .mahoganymart
@@ -2306,7 +2198,7 @@ GetMapMusic:: ; 2cbd
 
 .radiotower
 	ld a, [wStatusFlags2]
-	bit 0, a
+	bit STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F, a
 	jr z, .clearedradiotower
 	ld de, MUSIC_ROCKET_OVERTURE
 	jr .done
@@ -2321,7 +2213,7 @@ GetMapMusic:: ; 2cbd
 
 .mahoganymart
 	ld a, [wStatusFlags2]
-	bit 7, a
+	bit STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F, a
 	jr z, .clearedmahogany
 	ld de, MUSIC_ROCKET_HIDEOUT
 	jr .done
@@ -2329,50 +2221,45 @@ GetMapMusic:: ; 2cbd
 .clearedmahogany
 	ld de, MUSIC_CHERRYGROVE_CITY
 	jr .done
-; 2cff
 
-GetMapTimeOfDay:: ; 2cff
+GetMapTimeOfDay::
 	call GetPhoneServiceTimeOfDayByte
 	and $f
 	ret
-; 2d05
 
-GetMapPhoneService:: ; 2d05
+GetMapPhoneService::
 	call GetPhoneServiceTimeOfDayByte
 	and $f0
 	swap a
 	ret
-; 2d0d
 
-GetPhoneServiceTimeOfDayByte:: ; 2d0d
+GetPhoneServiceTimeOfDayByte::
 	push hl
 	push bc
 
-	ld de, MAPDEF_PALETTE
-	call GetMapDefField
+	ld de, MAP_PALETTE
+	call GetMapField
 	ld a, c
 
 	pop bc
 	pop hl
 	ret
-; 2d19
 
-GetFishingGroup:: ; 2d19
+GetFishingGroup::
 	push de
 	push hl
 	push bc
 
-	ld de, MAPDEF_FISHGROUP
-	call GetMapDefField
+	ld de, MAP_FISHGROUP
+	call GetMapField
 	ld a, c
 
 	pop bc
 	pop hl
 	pop de
 	ret
-; 2d27
 
-LoadTileset:: ; 2d27
+LoadTileset::
 	push hl
 	push bc
 
@@ -2390,4 +2277,3 @@ LoadTileset:: ; 2d27
 	pop bc
 	pop hl
 	ret
-; 2d43
diff --git a/home/map_objects.asm b/home/map_objects.asm
index 97e4bae37..6bc30d571 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -1,6 +1,6 @@
 ; Functions handling map objects.
 
-GetSpritePalette:: ; 17ff
+GetSpritePalette::
 	push hl
 	push de
 	push bc
@@ -13,9 +13,8 @@ GetSpritePalette:: ; 17ff
 	pop de
 	pop hl
 	ret
-; 180e
 
-GetSpriteVTile:: ; 180e
+GetSpriteVTile::
 	push hl
 	push bc
 	ld hl, wUsedSprites + 2
@@ -49,9 +48,8 @@ GetSpriteVTile:: ; 180e
 	pop bc
 	pop hl
 	ret
-; 1836
 
-DoesSpriteHaveFacings:: ; 1836
+DoesSpriteHaveFacings::
 	push de
 	push hl
 
@@ -72,25 +70,22 @@ DoesSpriteHaveFacings:: ; 1836
 	pop hl
 	pop de
 	ret
-; 184a
 
-GetPlayerStandingTile:: ; 184a
+GetPlayerStandingTile::
 	ld a, [wPlayerStandingTile]
 	call GetTileCollision
 	ld b, a
 	ret
-; 1852
 
-CheckOnWater:: ; 1852
+CheckOnWater::
 	ld a, [wPlayerStandingTile]
 	call GetTileCollision
 	sub WATERTILE
 	ret z
 	and a
 	ret
-; 185d
 
-GetTileCollision:: ; 185d
+GetTileCollision::
 ; Get the collision type of tile a.
 
 	push de
@@ -115,9 +110,8 @@ GetTileCollision:: ; 185d
 	pop hl
 	pop de
 	ret
-; 1875
 
-CheckGrassTile:: ; 1875
+CheckGrassTile::
 	ld d, a
 	and $f0
 	cp HI_NYBBLE_TALL_GRASS
@@ -140,53 +134,46 @@ CheckGrassTile:: ; 1875
 	ret z
 	scf
 	ret
-; 188e
 
-CheckSuperTallGrassTile:: ; 188e
+CheckSuperTallGrassTile::
 	cp COLL_LONG_GRASS
 	ret z
 	cp COLL_LONG_GRASS_1C
 	ret
-; 1894
 
-CheckCutTreeTile:: ; 1894
+CheckCutTreeTile::
 	cp COLL_CUT_TREE
 	ret z
 	cp COLL_CUT_TREE_1A
 	ret
-; 189a
 
-CheckHeadbuttTreeTile:: ; 189a
+CheckHeadbuttTreeTile::
 	cp COLL_HEADBUTT_TREE
 	ret z
 	cp COLL_HEADBUTT_TREE_1D
 	ret
-; 18a0
 
-CheckCounterTile:: ; 18a0
+CheckCounterTile::
 	cp COLL_COUNTER
 	ret z
 	cp COLL_COUNTER_98
 	ret
-; 18a6
 
-CheckPitTile:: ; 18a6
+CheckPitTile::
 	cp COLL_PIT
 	ret z
 	cp COLL_PIT_68
 	ret
-; 18ac
 
-CheckIceTile:: ; 18ac
+CheckIceTile::
 	cp COLL_ICE
 	ret z
 	cp COLL_ICE_2B
 	ret z
 	scf
 	ret
-; 18b4
 
-CheckWhirlpoolTile:: ; 18b4
+CheckWhirlpoolTile::
 	nop
 	cp COLL_WHIRLPOOL
 	ret z
@@ -194,16 +181,14 @@ CheckWhirlpoolTile:: ; 18b4
 	ret z
 	scf
 	ret
-; 18bd
 
-CheckWaterfallTile:: ; 18bd
+CheckWaterfallTile::
 	cp COLL_WATERFALL
 	ret z
 	cp COLL_CURRENT_DOWN
 	ret
-; 18c3
 
-CheckStandingOnEntrance:: ; 18c3
+CheckStandingOnEntrance::
 	ld a, [wPlayerStandingTile]
 	cp COLL_DOOR
 	ret z
@@ -213,9 +198,8 @@ CheckStandingOnEntrance:: ; 18c3
 	ret z
 	cp COLL_CAVE
 	ret
-; 18d2
 
-GetMapObject:: ; 18d2
+GetMapObject::
 ; Return the location of map object a in bc.
 	ld hl, wMapObjects
 	ld bc, OBJECT_LENGTH
@@ -223,9 +207,8 @@ GetMapObject:: ; 18d2
 	ld b, h
 	ld c, l
 	ret
-; 18de
 
-CheckObjectVisibility:: ; 18de
+CheckObjectVisibility::
 ; Sets carry if the object is not visible on the screen.
 	ld [hMapObjectIndexBuffer], a
 	call GetMapObject
@@ -242,9 +225,8 @@ CheckObjectVisibility:: ; 18de
 .not_visible
 	scf
 	ret
-; 18f5
 
-CheckObjectTime:: ; 18f5
+CheckObjectTime::
 	ld hl, MAPOBJECT_HOUR
 	add hl, bc
 	ld a, [hl]
@@ -276,7 +258,10 @@ CheckObjectTime:: ; 18f5
 	ret
 
 .TimeOfDayValues_191e:
-	db MORN, DAY, NITE
+; entries correspond to TimeOfDay values
+	db MORN
+	db DAY
+	db NITE
 
 .check_hour
 	ld hl, MAPOBJECT_HOUR
@@ -314,25 +299,22 @@ CheckObjectTime:: ; 18f5
 .no
 	scf
 	ret
-; 194d
 
 ; unused
 	ld [hMapObjectIndexBuffer], a
 	call GetMapObject
 	call CopyObjectStruct
 	ret
-; 1956
 
-_CopyObjectStruct:: ; 1956
+_CopyObjectStruct::
 	ld [hMapObjectIndexBuffer], a
 	call UnmaskObject
 	ld a, [hMapObjectIndexBuffer]
 	call GetMapObject
 	farcall CopyObjectStruct
 	ret
-; 1967
 
-ApplyDeletionToMapObject:: ; 1967
+ApplyDeletionToMapObject::
 	ld [hMapObjectIndexBuffer], a
 	call GetMapObject
 	ld hl, MAPOBJECT_OBJECT_STRUCT_ID
@@ -361,15 +343,13 @@ ApplyDeletionToMapObject:: ; 1967
 	ld [wObjectFollow_Leader], a
 	ld [wObjectFollow_Follower], a
 	ret
-; 199f
 
-DeleteObjectStruct:: ; 199f
+DeleteObjectStruct::
 	call ApplyDeletionToMapObject
 	call MaskObject
 	ret
-; 19a6
 
-CopyPlayerObjectTemplate:: ; 19a6
+CopyPlayerObjectTemplate::
 	push hl
 	call GetMapObject
 	ld d, b
@@ -381,7 +361,6 @@ CopyPlayerObjectTemplate:: ; 19a6
 	ld bc, OBJECT_LENGTH - 1
 	call CopyBytes
 	ret
-; 19b8
 
 Unreferenced_Function19b8:
 	call GetMapObject
@@ -411,9 +390,8 @@ Unreferenced_Function19b8:
 	call GetObjectStruct
 	farcall DeleteMapObject
 	ret
-; 19e9
 
-LoadMovementDataPointer:: ; 19e9
+LoadMovementDataPointer::
 ; Load the movement data pointer for object a.
 	ld [wMovementObject], a
 	ld a, [hROMBank]
@@ -438,9 +416,8 @@ LoadMovementDataPointer:: ; 19e9
 	set 7, [hl]
 	and a
 	ret
-; 1a13
 
-FindFirstEmptyObjectStruct:: ; 1a13
+FindFirstEmptyObjectStruct::
 ; Returns the index of the first empty object struct in A and its address in HL, then sets carry.
 ; If all object structs are occupied, A = 0 and Z is set.
 ; Preserves BC and DE.
@@ -468,9 +445,8 @@ FindFirstEmptyObjectStruct:: ; 1a13
 	pop de
 	pop bc
 	ret
-; 1a2f
 
-GetSpriteMovementFunction:: ; 1a2f
+GetSpriteMovementFunction::
 	ld hl, OBJECT_MOVEMENTTYPE
 	add hl, bc
 	ld a, [hl]
@@ -479,36 +455,34 @@ GetSpriteMovementFunction:: ; 1a2f
 	xor a
 
 .ok
-	ld hl, SpriteMovementData
+	ld hl, SpriteMovementData + SPRITEMOVEATTR_MOVEMENT
 	ld e, a
 	ld d, 0
-rept SPRITEMOVEDATA_FIELDS
+rept NUM_SPRITEMOVEDATA_FIELDS
 	add hl, de
 endr
 	ld a, [hl]
 	ret
-; 1a47
 
-GetInitialFacing:: ; 1a47
+GetInitialFacing::
 	push bc
 	push de
 	ld e, a
 	ld d, 0
-	ld hl, SpriteMovementData + 1 ; init facing
-rept SPRITEMOVEDATA_FIELDS
+	ld hl, SpriteMovementData + SPRITEMOVEATTR_FACING
+rept NUM_SPRITEMOVEDATA_FIELDS
 	add hl, de
 endr
 	ld a, BANK(SpriteMovementData)
 	call GetFarByte
 	add a
 	add a
-	and $c
+	maskbits NUM_DIRECTIONS, 2
 	pop de
 	pop bc
 	ret
-; 1a61
 
-CopySpriteMovementData:: ; 1a61
+CopySpriteMovementData::
 	ld l, a
 	ld a, [hROMBank]
 	push af
@@ -524,9 +498,8 @@ CopySpriteMovementData:: ; 1a61
 	rst Bankswitch
 
 	ret
-; 1a71
 
-.CopyData: ; 1a71
+.CopyData:
 	ld hl, OBJECT_MOVEMENTTYPE
 	add hl, de
 	ld [hl], a
@@ -534,8 +507,8 @@ CopySpriteMovementData:: ; 1a61
 	push de
 	ld e, a
 	ld d, 0
-	ld hl, SpriteMovementData + 1 ; init facing
-rept SPRITEMOVEDATA_FIELDS
+	ld hl, SpriteMovementData + SPRITEMOVEATTR_FACING
+rept NUM_SPRITEMOVEDATA_FIELDS
 	add hl, de
 endr
 	ld b, h
@@ -546,7 +519,7 @@ endr
 	inc bc
 	rlca
 	rlca
-	and %00001100
+	maskbits NUM_DIRECTIONS, 2
 	ld hl, OBJECT_FACING
 	add hl, de
 	ld [hl], a
@@ -575,9 +548,8 @@ endr
 	add hl, de
 	ld [hl], a
 	ret
-; 1aae
 
-_GetMovementByte:: ; 1aae
+_GetMovementByte::
 ; Switch to the movement data bank
 	ld a, [hROMBank]
 	push af
@@ -601,21 +573,18 @@ _GetMovementByte:: ; 1aae
 
 	ld a, h
 	ret
-; 1ac6
 
-SetVramState_Bit0:: ; 1ac6
+SetVramState_Bit0::
 	ld hl, wVramState
 	set 0, [hl]
 	ret
-; 1acc
 
-ResetVramState_Bit0:: ; 1acc
+ResetVramState_Bit0::
 	ld hl, wVramState
 	res 0, [hl]
 	ret
-; 1ad2
 
-UpdateSprites:: ; 1ad2
+UpdateSprites::
 	ld a, [wVramState]
 	bit 0, a
 	ret z
@@ -623,26 +592,23 @@ UpdateSprites:: ; 1ad2
 	farcall Function55e0
 	farcall _UpdateSprites
 	ret
-; 1ae5
 
-GetObjectStruct:: ; 1ae5
+GetObjectStruct::
 	ld bc, OBJECT_STRUCT_LENGTH
 	ld hl, wObjectStructs
 	call AddNTimes
 	ld b, h
 	ld c, l
 	ret
-; 1af1
 
-DoesObjectHaveASprite:: ; 1af1
+DoesObjectHaveASprite::
 	ld hl, OBJECT_SPRITE
 	add hl, bc
 	ld a, [hl]
 	and a
 	ret
-; 1af8
 
-SetSpriteDirection:: ; 1af8
+SetSpriteDirection::
 	; preserves other flags
 	push af
 	ld hl, OBJECT_FACING
@@ -651,16 +617,14 @@ SetSpriteDirection:: ; 1af8
 	and %11110011
 	ld e, a
 	pop af
-	and %00001100
+	maskbits NUM_DIRECTIONS, 2
 	or e
 	ld [hl], a
 	ret
-; 1b07
 
-GetSpriteDirection:: ; 1b07
+GetSpriteDirection::
 	ld hl, OBJECT_FACING
 	add hl, bc
 	ld a, [hl]
-	and %00001100
+	maskbits NUM_DIRECTIONS, 2
 	ret
-; 1b0f
diff --git a/home/math.asm b/home/math.asm
index 6a779e378..f385ccbf8 100644
--- a/home/math.asm
+++ b/home/math.asm
@@ -1,4 +1,4 @@
-AddNTimes:: ; 0x30fe
+AddNTimes::
 ; Add bc * a to hl.
 	and a
 	ret z
@@ -7,9 +7,8 @@ AddNTimes:: ; 0x30fe
 	dec a
 	jr nz, .loop
 	ret
-; 0x3105
 
-SimpleMultiply:: ; 3105
+SimpleMultiply::
 ; Return a * c.
 	and a
 	ret z
@@ -23,10 +22,8 @@ SimpleMultiply:: ; 3105
 	jr nz, .loop
 	pop bc
 	ret
-; 3110
 
-
-SimpleDivide:: ; 3110
+SimpleDivide::
 ; Divide a by c. Return quotient b and remainder a.
 	ld b, 0
 .loop
@@ -36,10 +33,8 @@ SimpleDivide:: ; 3110
 	dec b
 	add c
 	ret
-; 3119
-
 
-Multiply:: ; 3119
+Multiply::
 ; Multiply hMultiplicand (3 bytes) by hMultiplier. Result in hProduct.
 ; All values are big endian.
 	push hl
@@ -50,10 +45,8 @@ Multiply:: ; 3119
 	pop bc
 	pop hl
 	ret
-; 3124
 
-
-Divide:: ; 3124
+Divide::
 ; Divide hDividend length b (max 4 bytes) by hDivisor. Result in hQuotient.
 ; All values are big endian.
 	push hl
@@ -64,10 +57,8 @@ Divide:: ; 3124
 	pop de
 	pop hl
 	ret
-; 3136
-
 
-SubtractSigned:: ; 3136
+SubtractSigned::
 ; Return a - b, sign in carry.
 	sub b
 	ret nc
@@ -75,4 +66,3 @@ SubtractSigned:: ; 3136
 	add 1
 	scf
 	ret
-; 313d
diff --git a/home/menu.asm b/home/menu.asm
index ae3252e96..d10b6e936 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -1,73 +1,61 @@
 ; Functions used in displaying and handling menus.
 
-
-LoadMenuDataHeader::
-	call CopyMenuDataHeader
+LoadMenuHeader::
+	call CopyMenuHeader
 	call PushWindow
 	ret
 
-CopyMenuDataHeader::
-	ld de, wMenuDataHeader
-	ld bc, wMenuDataHeaderEnd - wMenuDataHeader
+CopyMenuHeader::
+	ld de, wMenuHeader
+	ld bc, wMenuHeaderEnd - wMenuHeader
 	call CopyBytes
 	ld a, [hROMBank]
 	ld [wMenuDataBank], a
 	ret
-; 0x1d4b
 
-StoreTo_wMenuCursorBuffer:: ; 1d4b
+StoreTo_wMenuCursorBuffer::
 	ld [wMenuCursorBuffer], a
 	ret
-; 1d4f
-
 
-MenuTextBox:: ; 1d4f
+MenuTextBox::
 	push hl
 	call LoadMenuTextBox
 	pop hl
 	jp PrintText
-; 1d57
 
 ; unused
 	ret
-; 1d58
 
-LoadMenuTextBox:: ; 1d58
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+LoadMenuTextBox::
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	ret
-; 1d5f
 
-.MenuDataHeader: ; 1d5f
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw vTiles0
 	db 0 ; default option
-; 1d67
 
-MenuTextBoxBackup:: ; 1d67
+MenuTextBoxBackup::
 	call MenuTextBox
 	call CloseWindow
 	ret
-; 1d6e
 
-LoadStandardMenuDataHeader:: ; 1d6e
-	ld hl, .MenuDataHeader
-	call LoadMenuDataHeader
+LoadStandardMenuHeader::
+	ld hl, .MenuHeader
+	call LoadMenuHeader
 	ret
-; 1d75
 
-.MenuDataHeader: ; 1d75
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw 0
 	db 1 ; default option
-; 1d7d
 
-Call_ExitMenu:: ; 1d7d
+Call_ExitMenu::
 	call ExitMenu
 	ret
-; 1d81
 
 VerticalMenu::
 	xor a
@@ -76,8 +64,8 @@ VerticalMenu::
 	call UpdateSprites
 	call PlaceVerticalMenuItems
 	call ApplyTilemap
-	call CopyMenuData2
-	ld a, [wMenuData2Flags]
+	call CopyMenuData
+	ld a, [wMenuDataFlags]
 	bit 7, a
 	jr z, .cancel
 	call InitVerticalMenuCursor
@@ -92,21 +80,19 @@ VerticalMenu::
 .okay
 	and a
 	ret
-; 0x1dab
 
-GetMenu2:: ; 1dab
-	call LoadMenuDataHeader
+GetMenu2::
+	call LoadMenuHeader
 	call VerticalMenu
 	call CloseWindow
 	ld a, [wMenuCursorY]
 	ret
-; 1db8
 
 CopyNameFromMenu::
 	push hl
 	push bc
 	push af
-	ld hl, wMenuData2Pointer
+	ld hl, wMenuDataPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -120,24 +106,22 @@ CopyNameFromMenu::
 	pop bc
 	pop hl
 	ret
-; 0x1dcf
-
 
-YesNoBox:: ; 1dcf
+YesNoBox::
 	lb bc, SCREEN_WIDTH - 6, 7
 
-PlaceYesNoBox:: ; 1dd2
+PlaceYesNoBox::
 	jr _YesNoBox
 
-PlaceGenericTwoOptionBox:: ; 1dd4
-	call LoadMenuDataHeader
+PlaceGenericTwoOptionBox::
+	call LoadMenuHeader
 	jr InterpretTwoOptionMenu
 
-_YesNoBox:: ; 1dd9
+_YesNoBox::
 ; Return nc (yes) or c (no).
 	push bc
-	ld hl, YesNoMenuDataHeader
-	call CopyMenuDataHeader
+	ld hl, YesNoMenuHeader
+	call CopyMenuHeader
 	pop bc
 ; This seems to be an overflow prevention, but
 ; it was coded wrong.
@@ -158,7 +142,7 @@ _YesNoBox:: ; 1dd9
 	ld [wMenuBorderBottomCoord], a
 	call PushWindow
 
-InterpretTwoOptionMenu:: ; 1dfe
+InterpretTwoOptionMenu::
 	call VerticalMenu
 	push af
 	ld c, $f
@@ -177,31 +161,27 @@ InterpretTwoOptionMenu:: ; 1dfe
 	ld [wMenuCursorY], a
 	scf
 	ret
-; 1e1d
 
-YesNoMenuDataHeader:: ; 1e1d
+YesNoMenuHeader::
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 5, 15, 9
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
-; 1e25
 
-.MenuData2: ; 1e25
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2
 	db "YES@"
 	db "NO@"
-; 1e2e
 
-OffsetMenuDataHeader:: ; 1e2e
-	call _OffsetMenuDataHeader
+OffsetMenuHeader::
+	call _OffsetMenuHeader
 	call PushWindow
 	ret
-; 1e35
 
-_OffsetMenuDataHeader:: ; 1e35
+_OffsetMenuHeader::
 	push de
-	call CopyMenuDataHeader
+	call CopyMenuHeader
 	pop de
 	ld a, [wMenuBorderLeftCoord]
 	ld h, a
@@ -222,9 +202,8 @@ _OffsetMenuDataHeader:: ; 1e35
 	add l
 	ld [wMenuBorderBottomCoord], a
 	ret
-; 1e5d
 
-DoNthMenu:: ; 1e5d
+DoNthMenu::
 	call DrawVariableLengthMenuBox
 	call MenuWriteText
 	call InitMenuCursorAndButtonPermissions
@@ -232,9 +211,8 @@ DoNthMenu:: ; 1e5d
 	call GetMenuJoypad
 	call MenuClickSound
 	ret
-; 1e70
 
-SetUpMenu:: ; 1e70
+SetUpMenu::
 	call DrawVariableLengthMenuBox ; ???
 	call MenuWriteText
 	call InitMenuCursorAndButtonPermissions ; set up selection pointer
@@ -243,7 +221,7 @@ SetUpMenu:: ; 1e70
 	ret
 
 DrawVariableLengthMenuBox::
-	call CopyMenuData2
+	call CopyMenuData
 	call GetMenuIndexSet
 	call AutomaticGetMenuBottomCoord
 	call MenuBox
@@ -263,15 +241,14 @@ MenuWriteText::
 	pop af
 	ld [hOAMUpdate], a
 	ret
-; 0x1ea6
 
-AutomaticGetMenuBottomCoord:: ; 1ea6
+AutomaticGetMenuBottomCoord::
 	ld a, [wMenuBorderLeftCoord]
 	ld c, a
 	ld a, [wMenuBorderRightCoord]
 	sub c
 	ld c, a
-	ld a, [wMenuData2Items]
+	ld a, [wMenuDataItems]
 	add a
 	inc a
 	ld b, a
@@ -279,10 +256,9 @@ AutomaticGetMenuBottomCoord:: ; 1ea6
 	add b
 	ld [wMenuBorderBottomCoord], a
 	ret
-; 1ebd
 
-GetMenuIndexSet:: ; 1ebd
-	ld hl, wMenuData2IndicesPointer
+GetMenuIndexSet::
+	ld hl, wMenuDataIndicesPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -302,11 +278,10 @@ GetMenuIndexSet:: ; 1ebd
 	ld d, h
 	ld e, l
 	ld a, [hl]
-	ld [wMenuData2Items], a
+	ld [wMenuDataItems], a
 	ret
-; 1eda
 
-RunMenuItemPrintingFunction:: ; 1eda
+RunMenuItemPrintingFunction::
 	call MenuBoxCoord2Tile
 	ld bc, 2 * SCREEN_WIDTH + 2
 	add hl, bc
@@ -320,32 +295,30 @@ RunMenuItemPrintingFunction:: ; 1eda
 	push hl
 	ld d, h
 	ld e, l
-	ld hl, wMenuData2DisplayFunctionPointer
+	ld hl, wMenuDataDisplayFunctionPointer
 	call ._hl_
 	pop hl
 	ld de, 2 * SCREEN_WIDTH
 	add hl, de
 	pop de
 	jr .loop
-; 1efb
 
-._hl_ ; 1efb
+._hl_
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 1eff
 
-InitMenuCursorAndButtonPermissions:: ; 1eff
+InitMenuCursorAndButtonPermissions::
 	call InitVerticalMenuCursor
 	ld hl, wMenuJoypadFilter
-	ld a, [wMenuData2Flags]
+	ld a, [wMenuDataFlags]
 	bit 3, a
 	jr z, .disallow_select
 	set START_F, [hl]
 
 .disallow_select
-	ld a, [wMenuData2Flags]
+	ld a, [wMenuDataFlags]
 	bit 2, a
 	jr z, .disallow_left_right
 	set D_LEFT_F, [hl]
@@ -353,21 +326,17 @@ InitMenuCursorAndButtonPermissions:: ; 1eff
 
 .disallow_left_right
 	ret
-; 1f1a
 
-
-GetScrollingMenuJoypad:: ; 1f1a
+GetScrollingMenuJoypad::
 	call ScrollingMenuJoypad
 	ld hl, wMenuJoypadFilter
 	and [hl]
 	jr ContinueGettingMenuJoypad
-; 1f23
 
-GetStaticMenuJoypad:: ; 1f23
+GetStaticMenuJoypad::
 	xor a
 	ld [wMenuJoypad], a
 	call StaticMenuJoypad
-; 1f2a
 
 ContinueGettingMenuJoypad:
 	bit A_BUTTON_F, a
@@ -418,11 +387,10 @@ ContinueGettingMenuJoypad:
 	ld [wMenuSelection], a
 	scf
 	ret
-; 1f79
 
-PlaceMenuStrings:: ; 1f79
+PlaceMenuStrings::
 	push de
-	ld hl, wMenuData2PointerTableAddr
+	ld hl, wMenuDataPointerTableAddr
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -433,9 +401,8 @@ PlaceMenuStrings:: ; 1f79
 	pop hl
 	call PlaceString
 	ret
-; 1f8d
 
-PlaceNthMenuStrings:: ; 1f8d
+PlaceNthMenuStrings::
 	push de
 	ld a, [wMenuSelection]
 	call GetMenuDataPointerTableEntry
@@ -447,9 +414,8 @@ PlaceNthMenuStrings:: ; 1f8d
 	pop hl
 	call PlaceString
 	ret
-; 1f9e
 
-Unreferenced_Function1f9e:: ; 1f9e
+Unreferenced_Function1f9e::
 	call GetMenuDataPointerTableEntry
 	inc hl
 	inc hl
@@ -457,21 +423,19 @@ Unreferenced_Function1f9e:: ; 1f9e
 	ld d, [hl]
 	ld e, a
 	ret
-; 1fa7
 
-MenuJumptable:: ; 1fa7
+MenuJumptable::
 	ld a, [wMenuSelection]
 	call GetMenuDataPointerTableEntry
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 1fb1
 
-GetMenuDataPointerTableEntry:: ; 1fb1
+GetMenuDataPointerTableEntry::
 	ld e, a
 	ld d, $0
-	ld hl, wMenuData2PointerTableAddr
+	ld hl, wMenuDataPointerTableAddr
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -480,14 +444,13 @@ GetMenuDataPointerTableEntry:: ; 1fb1
 	add hl, de
 	add hl, de
 	ret
-; 1fbf
 
-ClearWindowData:: ; 1fbf
+ClearWindowData::
 	ld hl, wWindowStackPointer
 	call .bytefill
-	ld hl, wMenuDataHeader
+	ld hl, wMenuHeader
 	call .bytefill
-	ld hl, wMenuData2Flags
+	ld hl, wMenuDataFlags
 	call .bytefill
 	ld hl, w2DMenuCursorInitY
 	call .bytefill
@@ -509,16 +472,14 @@ ClearWindowData:: ; 1fbf
 	pop af
 	ld [rSVBK], a
 	ret
-; 1ff0
 
-.bytefill ; 1ff0
+.bytefill
 	ld bc, $10
 	xor a
 	call ByteFill
 	ret
-; 1ff8
 
-MenuClickSound:: ; 1ff8
+MenuClickSound::
 	push af
 	and A_BUTTON | B_BUTTON
 	jr z, .nosound
@@ -529,25 +490,21 @@ MenuClickSound:: ; 1ff8
 .nosound
 	pop af
 	ret
-; 2009
-
 
-PlayClickSFX:: ; 2009
+PlayClickSFX::
 	push de
 	ld de, SFX_READ_TEXT_2
 	call PlaySFX
 	pop de
 	ret
-; 0x2012
 
-MenuTextBoxWaitButton:: ; 2012
+MenuTextBoxWaitButton::
 	call MenuTextBox
 	call WaitButton
 	call ExitMenu
 	ret
-; 201c
 
-Place2DMenuItemName:: ; 201c
+Place2DMenuItemName::
 	ld [hBuffer], a
 	ld a, [hROMBank]
 	push af
@@ -559,28 +516,24 @@ Place2DMenuItemName:: ; 201c
 	rst Bankswitch
 
 	ret
-; 202a
 
-_2DMenu:: ; 202a
+_2DMenu::
 	ld a, [hROMBank]
-	ld [wMenuData2_2DMenuItemStringsBank], a
+	ld [wMenuData_2DMenuItemStringsBank], a
 	farcall _2DMenu_
 	ld a, [wMenuCursorBuffer]
 	ret
-; 2039
 
-InterpretBattleMenu:: ; 2039
+InterpretBattleMenu::
 	ld a, [hROMBank]
-	ld [wMenuData2_2DMenuItemStringsBank], a
+	ld [wMenuData_2DMenuItemStringsBank], a
 	farcall _InterpretBattleMenu
 	ld a, [wMenuCursorBuffer]
 	ret
-; 2048
 
-InterpretMobileMenu:: ; 2048
+InterpretMobileMenu::
 	ld a, [hROMBank]
-	ld [wMenuData2_2DMenuItemStringsBank], a
+	ld [wMenuData_2DMenuItemStringsBank], a
 	farcall _InterpretMobileMenu
 	ld a, [wMenuCursorBuffer]
 	ret
-; 2057
diff --git a/home/menu_window.asm b/home/menu_window.asm
new file mode 100644
index 000000000..7c511097d
--- /dev/null
+++ b/home/menu_window.asm
@@ -0,0 +1,242 @@
+PushWindow::
+	callfar _PushWindow
+	ret
+
+ExitMenu::
+	push af
+	callfar _ExitMenu
+	pop af
+	ret
+
+InitVerticalMenuCursor::
+	callfar _InitVerticalMenuCursor
+	ret
+
+CloseWindow::
+	push af
+	call ExitMenu
+	call ApplyTilemap
+	call UpdateSprites
+	pop af
+	ret
+
+RestoreTileBackup::
+	call MenuBoxCoord2Tile
+	call .copy
+	call MenuBoxCoord2Attr
+	call .copy
+	ret
+
+.copy
+	call GetMenuBoxDims
+	inc b
+	inc c
+
+.row
+	push bc
+	push hl
+
+.col
+	ld a, [de]
+	ld [hli], a
+	dec de
+	dec c
+	jr nz, .col
+
+	pop hl
+	ld bc, SCREEN_WIDTH
+	add hl, bc
+	pop bc
+	dec b
+	jr nz, .row
+
+	ret
+
+PopWindow::
+	ld b, $10
+	ld de, wMenuFlags
+.loop
+	ld a, [hld]
+	ld [de], a
+	inc de
+	dec b
+	jr nz, .loop
+	ret
+
+GetMenuBoxDims::
+	ld a, [wMenuBorderTopCoord] ; top
+	ld b, a
+	ld a, [wMenuBorderBottomCoord] ; bottom
+	sub b
+	ld b, a
+	ld a, [wMenuBorderLeftCoord] ; left
+	ld c, a
+	ld a, [wMenuBorderRightCoord] ; right
+	sub c
+	ld c, a
+	ret
+
+CopyMenuData::
+	push hl
+	push de
+	push bc
+	push af
+	ld hl, wMenuDataPointer
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ld de, wMenuDataFlags
+	ld bc, wMenuDataEnd - wMenuDataFlags
+	call CopyBytes
+	pop af
+	pop bc
+	pop de
+	pop hl
+	ret
+
+GetWindowStackTop::
+	ld hl, wWindowStackPointer
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	inc hl
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ret
+
+PlaceVerticalMenuItems::
+	call CopyMenuData
+	ld hl, wMenuDataPointer
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	call GetMenuTextStartCoord
+	call Coord2Tile ; hl now contains the tilemap address where we will start printing text.
+	inc de
+	ld a, [de] ; Number of items
+	inc de
+	ld b, a
+.loop
+	push bc
+	call PlaceString
+	inc de
+	ld bc, 2 * SCREEN_WIDTH
+	add hl, bc
+	pop bc
+	dec b
+	jr nz, .loop
+
+	ld a, [wMenuDataFlags]
+	bit 4, a
+	ret z
+
+	call MenuBoxCoord2Tile
+	ld a, [de]
+	ld c, a
+	inc de
+	ld b, $0
+	add hl, bc
+	jp PlaceString
+
+MenuBox::
+	call MenuBoxCoord2Tile
+	call GetMenuBoxDims
+	dec b
+	dec c
+	jp TextBox
+
+GetMenuTextStartCoord::
+	ld a, [wMenuBorderTopCoord]
+	ld b, a
+	inc b
+	ld a, [wMenuBorderLeftCoord]
+	ld c, a
+	inc c
+; bit 6: if not set, leave extra room on top
+	ld a, [wMenuDataFlags]
+	bit 6, a
+	jr nz, .bit_6_set
+	inc b
+
+.bit_6_set
+; bit 7: if set, leave extra room on the left
+	ld a, [wMenuDataFlags]
+	bit 7, a
+	jr z, .bit_7_clear
+	inc c
+
+.bit_7_clear
+	ret
+
+ClearMenuBoxInterior::
+	call MenuBoxCoord2Tile
+	ld bc, SCREEN_WIDTH + 1
+	add hl, bc
+	call GetMenuBoxDims
+	dec b
+	dec c
+	call ClearBox
+	ret
+
+ClearWholeMenuBox::
+	call MenuBoxCoord2Tile
+	call GetMenuBoxDims
+	inc c
+	inc b
+	call ClearBox
+	ret
+
+MenuBoxCoord2Tile::
+	ld a, [wMenuBorderLeftCoord]
+	ld c, a
+	ld a, [wMenuBorderTopCoord]
+	ld b, a
+
+Coord2Tile::
+; Return the address of wTileMap(c, b) in hl.
+	xor a
+	ld h, a
+	ld l, b
+	ld a, c
+	ld b, h
+	ld c, l
+	add hl, hl
+	add hl, hl
+	add hl, bc
+	add hl, hl
+	add hl, hl
+	ld c, a
+	xor a
+	ld b, a
+	add hl, bc
+	bccoord 0, 0
+	add hl, bc
+	ret
+
+MenuBoxCoord2Attr::
+	ld a, [wMenuBorderLeftCoord]
+	ld c, a
+	ld a, [wMenuBorderTopCoord]
+	ld b, a
+
+Coord2Attr::
+; Return the address of wAttrMap(c, b) in hl.
+	xor a
+	ld h, a
+	ld l, b
+	ld a, c
+	ld b, h
+	ld c, l
+	add hl, hl
+	add hl, hl
+	add hl, bc
+	add hl, hl
+	add hl, hl
+	ld c, a
+	xor a
+	ld b, a
+	add hl, bc
+	bccoord 0, 0, wAttrMap
+	add hl, bc
+	ret
diff --git a/home/mobile.asm b/home/mobile.asm
index 4be526bbc..21af7a73b 100644
--- a/home/mobile.asm
+++ b/home/mobile.asm
@@ -1,4 +1,4 @@
-Function3e32:: ; 3e32
+Function3e32::
 ; Mobile
 	cp $2
 	ld [$c988], a
@@ -27,9 +27,8 @@ Function3e32:: ; 3e32
 	rst Bankswitch
 
 	jp Function110030
-; 3e60
 
-Function3e60:: ; 3e60
+Function3e60::
 ; Return from Function110030
 	ld [$c986], a
 	ld a, l
@@ -50,9 +49,8 @@ Function3e60:: ; 3e60
 	ld l, a
 	ld a, [$c986]
 	ret
-; 3e80
 
-MobileReceive:: ; 3e80
+MobileReceive::
 	ld a, [hROMBank]
 	push af
 	ld a, BANK(_MobileReceive)
@@ -66,10 +64,8 @@ MobileReceive:: ; 3e80
 	rst Bankswitch
 
 	ret
-; 3e93
 
-
-Timer:: ; 3e93
+Timer::
 	push af
 	push bc
 	push de
@@ -125,9 +121,8 @@ Timer:: ; 3e93
 	pop bc
 	pop af
 	reti
-; 3ed7
 
-Unreferenced_Function3ed7:: ; 3ed7
+Unreferenced_Function3ed7::
 	ld [$dc02], a
 	ld a, [hROMBank]
 	push af
@@ -141,9 +136,8 @@ Unreferenced_Function3ed7:: ; 3ed7
 
 	ld a, [$dc02]
 	ret
-; 3eea
 
-Function3eea:: ; 3eea
+Function3eea::
 	push hl
 	push bc
 	ld de, wAttrMap - wTileMap
@@ -157,9 +151,8 @@ Function3eea:: ; 3eea
 	pop hl
 	call MobileHome_PlaceBox
 	ret
-; 3efd
 
-Unreferenced_Function3efd:: ; 3efd
+Unreferenced_Function3efd::
 	push hl
 	hlcoord 0, 12
 	ld b, 4
@@ -168,7 +161,6 @@ Unreferenced_Function3efd:: ; 3efd
 	pop hl
 	call PrintTextBoxText
 	ret
-; 3f0d
 
 .fill_attr
 	push hl
@@ -184,9 +176,8 @@ Unreferenced_Function3efd:: ; 3efd
 	pop hl
 	call TextBoxBorder
 	ret
-; 3f20
 
-Function3f20:: ; 3f20
+Function3f20::
 	hlcoord 0, 0, wAttrMap
 	ld b,  6
 	ld c, 20
@@ -196,9 +187,8 @@ Function3f20:: ; 3f20
 	ld c, 18
 	call MobileHome_PlaceBox
 	ret
-; 3f35
 
-Function3f35:: ; 3f35
+Function3f35::
 	ld a, 6
 	ld de, SCREEN_WIDTH
 .row
@@ -214,9 +204,8 @@ Function3f35:: ; 3f35
 	dec b
 	jr nz, .row
 	ret
-; 3f47
 
-MobileHome_PlaceBox: ; 3f47
+MobileHome_PlaceBox:
 	push bc
 	call .FillTop
 	pop bc
@@ -228,7 +217,6 @@ MobileHome_PlaceBox: ; 3f47
 	jr nz, .RowLoop
 	call .FillBottom
 	ret
-; 3f58
 
 .FillTop:
 	ld a, $63
@@ -260,18 +248,16 @@ MobileHome_PlaceBox: ; 3f47
 	ld de, SCREEN_WIDTH
 	add hl, de
 	ret
-; 3f7c
 
-Function3f7c:: ; 3f7c
+Function3f7c::
 	call MenuBoxCoord2Tile
 	call GetMenuBoxDims
 	dec b
 	dec c
 	call Function3eea
 	ret
-; 3f88
 
-Function3f88:: ; 3f88
+Function3f88::
 	ld hl, wDecompressScratch
 	ld b, 0
 .row
@@ -290,9 +276,8 @@ Function3f88:: ; 3f88
 	dec c
 	jr nz, .row
 	ret
-; 3f9f
 
-Function3f9f:: ; 3f9f
+Function3f9f::
 	ld hl, wDecompressScratch
 .row
 	push bc
@@ -311,4 +296,3 @@ Function3f9f:: ; 3f9f
 	dec c
 	jr nz, .row
 	ret
-; 3fb5
diff --git a/home/mon_data.asm b/home/mon_data.asm
new file mode 100644
index 000000000..bcfe49ddb
--- /dev/null
+++ b/home/mon_data.asm
@@ -0,0 +1,87 @@
+Unreferenced_GetNthMove::
+	ld hl, wListMoves_MoveIndicesBuffer
+	ld c, a
+	ld b, 0
+	add hl, bc
+	ld a, [hl]
+	ret
+
+GetBaseData::
+	push bc
+	push de
+	push hl
+	ld a, [hROMBank]
+	push af
+	ld a, BANK(BaseData)
+	rst Bankswitch
+
+; Egg doesn't have BaseData
+	ld a, [wCurSpecies]
+	cp EGG
+	jr z, .egg
+
+; Get BaseData
+	dec a
+	ld bc, BASE_DATA_SIZE
+	ld hl, BaseData
+	call AddNTimes
+	ld de, wCurBaseData
+	ld bc, BASE_DATA_SIZE
+	call CopyBytes
+	jr .end
+
+.egg
+; ????
+	ld de, UnknownEggPic
+
+; Sprite dimensions
+	ld b, $55 ; 5x5
+	ld hl, wBasePicSize
+	ld [hl], b
+
+; ????
+	ld hl, wBasePadding
+	ld [hl], e
+	inc hl
+	ld [hl], d
+	inc hl
+	ld [hl], e
+	inc hl
+	ld [hl], d
+	jr .end
+
+.end
+; Replace Pokedex # with species
+	ld a, [wCurSpecies]
+	ld [wBaseDexNo], a
+
+	pop af
+	rst Bankswitch
+	pop hl
+	pop de
+	pop bc
+	ret
+
+GetCurNick::
+	ld a, [wCurPartyMon]
+	ld hl, wPartyMonNicknames
+
+GetNick::
+; Get nickname a from list hl.
+
+	push hl
+	push bc
+
+	call SkipNames
+	ld de, wStringBuffer1
+
+	push de
+	ld bc, MON_NAME_LENGTH
+	call CopyBytes
+	pop de
+
+	callfar CorrectNickErrors
+
+	pop bc
+	pop hl
+	ret
diff --git a/home/mon_data_2.asm b/home/mon_data_2.asm
new file mode 100644
index 000000000..99169eaa8
--- /dev/null
+++ b/home/mon_data_2.asm
@@ -0,0 +1,34 @@
+GetPartyParamLocation::
+; Get the location of parameter a from wCurPartyMon in hl
+	push bc
+	ld hl, wPartyMons
+	ld c, a
+	ld b, 0
+	add hl, bc
+	ld a, [wCurPartyMon]
+	call GetPartyLocation
+	pop bc
+	ret
+
+GetPartyLocation::
+; Add the length of a PartyMon struct to hl a times.
+	ld bc, PARTYMON_STRUCT_LENGTH
+	jp AddNTimes
+
+Unreferenced_GetDexNumber::
+; Probably used in gen 1 to convert index number to dex number
+; Not required in gen 2 because index number == dex number
+	push hl
+	ld a, b
+	dec a
+	ld b, 0
+	add hl, bc
+	ld hl, BaseData + BASE_DEX_NO
+	ld bc, BASE_DATA_SIZE
+	call AddNTimes
+	ld a, BANK(BaseData)
+	call GetFarHalfword
+	ld b, l
+	ld c, h
+	pop hl
+	ret
diff --git a/home/mon_stats.asm b/home/mon_stats.asm
new file mode 100644
index 000000000..318d32c9c
--- /dev/null
+++ b/home/mon_stats.asm
@@ -0,0 +1,104 @@
+IsAPokemon::
+; Return carry if species a is not a Pokemon.
+	and a
+	jr z, .NotAPokemon
+	cp EGG
+	jr z, .Pokemon
+	cp NUM_POKEMON + 1
+	jr c, .Pokemon
+
+.NotAPokemon:
+	scf
+	ret
+
+.Pokemon:
+	and a
+	ret
+
+DrawBattleHPBar::
+; Draw an HP bar d tiles long at hl
+; Fill it up to e pixels
+
+	push hl
+	push de
+	push bc
+
+; Place 'HP:'
+	ld a, $60
+	ld [hli], a
+	ld a, $61
+	ld [hli], a
+
+; Draw a template
+	push hl
+	ld a, $62 ; empty bar
+.template
+	ld [hli], a
+	dec d
+	jr nz, .template
+	ld a, $6b ; bar end
+	add b
+	ld [hl], a
+	pop hl
+
+; Safety check # pixels
+	ld a, e
+	and a
+	jr nz, .fill
+	ld a, c
+	and a
+	jr z, .done
+	ld e, 1
+
+.fill
+; Keep drawing tiles until pixel length is reached
+	ld a, e
+	sub TILE_WIDTH
+	jr c, .lastbar
+
+	ld e, a
+	ld a, $6a ; full bar
+	ld [hli], a
+	ld a, e
+	and a
+	jr z, .done
+	jr .fill
+
+.lastbar
+	ld a, $62  ; empty bar
+	add e      ; + e
+	ld [hl], a
+
+.done
+	pop bc
+	pop de
+	pop hl
+	ret
+
+PrepMonFrontpic::
+	ld a, $1
+	ld [wBoxAlignment], a
+
+_PrepMonFrontpic::
+	ld a, [wCurPartySpecies]
+	call IsAPokemon
+	jr c, .not_pokemon
+
+	push hl
+	ld de, vTiles2
+	predef GetMonFrontpic
+	pop hl
+	xor a
+	ld [hGraphicStartTile], a
+	lb bc, 7, 7
+	predef PlaceGraphic
+	xor a
+	ld [wBoxAlignment], a
+	ret
+
+.not_pokemon
+	xor a
+	ld [wBoxAlignment], a
+	inc a
+	ld [wCurPartySpecies], a
+	ret
diff --git a/home/movement.asm b/home/movement.asm
index c2c45d12b..2c19b6355 100644
--- a/home/movement.asm
+++ b/home/movement.asm
@@ -1,4 +1,4 @@
-InitMovementBuffer:: ; 1b1e
+InitMovementBuffer::
 	ld [wMovementBufferObject], a
 	xor a
 	ld [wMovementBufferCount], a
@@ -9,18 +9,16 @@ InitMovementBuffer:: ; 1b1e
 	ld a, HIGH(wMovementBuffer)
 	ld [wUnusedMovementBufferPointer + 1], a
 	ret
-; 1b35
 
-DecrementMovementBufferCount:: ; 1b35
+DecrementMovementBufferCount::
 	ld a, [wMovementBufferCount]
 	and a
 	ret z
 	dec a
 	ld [wMovementBufferCount], a
 	ret
-; 1b3f
 
-AppendToMovementBuffer:: ; 1b3f
+AppendToMovementBuffer::
 	push hl
 	push de
 	ld hl, wMovementBufferCount
@@ -33,9 +31,8 @@ AppendToMovementBuffer:: ; 1b3f
 	pop de
 	pop hl
 	ret
-; 1b50
 
-AppendToMovementBufferNTimes:: ; 1b50
+AppendToMovementBufferNTimes::
 	push af
 	ld a, c
 	and a
@@ -50,9 +47,8 @@ AppendToMovementBufferNTimes:: ; 1b50
 	dec c
 	jr nz, .loop
 	ret
-; 1b5f
 
-ComputePathToWalkToPlayer:: ; 1b5f
+ComputePathToWalkToPlayer::
 	push af
 ; compare x coords, load left/right into h, and x distance into d
 	ld a, b
@@ -100,9 +96,8 @@ ComputePathToWalkToPlayer:: ; 1b5f
 	ld c, e
 	call AppendToMovementBufferNTimes
 	ret
-; 1b92
 
-.GetMovementData: ; 1b92
+.GetMovementData:
 	push de
 	push hl
 	ld l, b
@@ -118,7 +113,6 @@ ComputePathToWalkToPlayer:: ; 1b5f
 	pop hl
 	pop de
 	ret
-; 1ba5
 
 .MovementData:
 	slow_step DOWN
@@ -133,9 +127,8 @@ ComputePathToWalkToPlayer:: ; 1b5f
 	big_step UP
 	big_step LEFT
 	big_step RIGHT
-; 1bb1
 
-SetMenuAttributes:: ; 1bb1
+SetMenuAttributes::
 	push hl
 	push bc
 	ld hl, w2DMenuCursorInitY
@@ -156,21 +149,18 @@ SetMenuAttributes:: ; 1bb1
 	pop bc
 	pop hl
 	ret
-; 1bc9
 
-StaticMenuJoypad:: ; 1bc9
+StaticMenuJoypad::
 	callfar _StaticMenuJoypad
 	call GetMenuJoypad
 	ret
-; 1bd3
 
-ScrollingMenuJoypad:: ; 1bd3
+ScrollingMenuJoypad::
 	callfar _ScrollingMenuJoypad
 	call GetMenuJoypad
 	ret
-; 1bdd
 
-GetMenuJoypad:: ; 1bdd
+GetMenuJoypad::
 	push bc
 	push af
 	ld a, [hJoyLast]
@@ -184,23 +174,19 @@ GetMenuJoypad:: ; 1bdd
 	ld a, b
 	pop bc
 	ret
-; 1bee
 
-PlaceHollowCursor:: ; 1bee
+PlaceHollowCursor::
 	ld hl, wCursorCurrentTile
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	ld [hl], "▷"
 	ret
-; 1bf7
 
-HideCursor:: ; 1bf7
+HideCursor::
 	ld hl, wCursorCurrentTile
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	ld [hl], " "
 	ret
-; 1c00
-
diff --git a/home/names.asm b/home/names.asm
index 90a15c093..e9c36fc1d 100644
--- a/home/names.asm
+++ b/home/names.asm
@@ -1,4 +1,4 @@
-NamesPointers:: ; 33ab
+NamesPointers::
 ; entries correspond to GetName constants (see constants/text_constants.asm)
 	dba PokemonNames        ; MON_NAME (not used; jumps to GetPokemonName)
 	dba MoveNames           ; MOVE_NAME
@@ -8,9 +8,8 @@ NamesPointers:: ; 33ab
 	dbw 0, wOTPartyMonOT     ; ENEMY_OT_NAME
 	dba TrainerClassNames   ; TRAINER_NAME
 	dbw 4, MoveDescriptions ; MOVE_DESC_NAME_BROKEN (wrong bank)
-; 33c3
 
-GetName:: ; 33c3
+GetName::
 ; Return name wCurSpecies from name list wNamedObjectTypeBuffer in wStringBuffer1.
 
 	ld a, [hROMBank]
@@ -67,9 +66,8 @@ GetName:: ; 33c3
 	pop af
 	rst Bankswitch
 	ret
-; 3411
 
-GetNthString:: ; 3411
+GetNthString::
 ; Return the address of the
 ; ath string starting from hl.
 
@@ -87,9 +85,8 @@ GetNthString:: ; 3411
 	jr nz, .readChar
 	pop bc
 	ret
-; 3420
 
-GetBasePokemonName:: ; 3420
+GetBasePokemonName::
 ; Discards gender (Nidoran).
 
 	push hl
@@ -112,9 +109,7 @@ GetBasePokemonName:: ; 3420
 	pop hl
 	ret
 
-; 343b
-
-GetPokemonName:: ; 343b
+GetPokemonName::
 ; Get Pokemon name wd265.
 
 	ld a, [hROMBank]
@@ -150,9 +145,8 @@ GetPokemonName:: ; 343b
 	pop af
 	rst Bankswitch
 	ret
-; 3468
 
-GetItemName:: ; 3468
+GetItemName::
 ; Get item name wd265.
 
 	push hl
@@ -174,9 +168,8 @@ GetItemName:: ; 3468
 	pop bc
 	pop hl
 	ret
-; 3487
 
-GetTMHMName:: ; 3487
+GetTMHMName::
 ; Get TM/HM name by item id wd265.
 
 	push hl
@@ -257,11 +250,10 @@ GetTMHMName:: ; 3487
 	db "HM"
 .HMTextEnd:
 	db "@"
-; 34df
 
 INCLUDE "home/hm_moves.asm"
 
-GetMoveName:: ; 34f8
+GetMoveName::
 	push hl
 
 	ld a, MOVE_NAME
@@ -275,4 +267,3 @@ GetMoveName:: ; 34f8
 
 	pop hl
 	ret
-; 350c
diff --git a/home/palettes.asm b/home/palettes.asm
index 9f10da118..d5b6abff5 100644
--- a/home/palettes.asm
+++ b/home/palettes.asm
@@ -1,7 +1,6 @@
 ; Functions dealing with palettes.
 
-
-UpdatePalsIfCGB:: ; c2f
+UpdatePalsIfCGB::
 ; update bgp data from wBGPals2
 ; update obp data from wOBPals2
 ; return carry if successful
@@ -11,17 +10,14 @@ UpdatePalsIfCGB:: ; c2f
 	and a
 	ret z
 
-
-UpdateCGBPals:: ; c33
+UpdateCGBPals::
 ; return carry if successful
 ; any pals to update?
 	ld a, [hCGBPalUpdate]
 	and a
 	ret z
 
-
-ForceUpdateCGBPals:: ; c37
-
+ForceUpdateCGBPals::
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals2)
@@ -68,10 +64,8 @@ endr
 
 	scf
 	ret
-; c9f
 
-
-DmgToCgbBGPals:: ; c9f
+DmgToCgbBGPals::
 ; exists to forego reinserting cgb-converted image data
 
 ; input: a -> bgp
@@ -114,10 +108,8 @@ DmgToCgbBGPals:: ; c9f
 .end
 	pop af
 	ret
-; ccb
-
 
-DmgToCgbObjPals:: ; ccb
+DmgToCgbObjPals::
 ; exists to forego reinserting cgb-converted image data
 
 ; input: d -> obp1
@@ -160,10 +152,8 @@ DmgToCgbObjPals:: ; ccb
 	pop de
 	pop hl
 	ret
-; cf8
 
-
-DmgToCgbObjPal0:: ; cf8
+DmgToCgbObjPal0::
 	ld [rOBP0], a
 	push af
 
@@ -200,9 +190,8 @@ DmgToCgbObjPal0:: ; cf8
 .dmg
 	pop af
 	ret
-; d24
 
-DmgToCgbObjPal1:: ; d24
+DmgToCgbObjPal1::
 	ld [rOBP1], a
 	push af
 
@@ -238,11 +227,8 @@ DmgToCgbObjPal1:: ; d24
 .dmg
 	pop af
 	ret
-; d50
-
 
-
-CopyPals:: ; d50
+CopyPals::
 ; copy c palettes in order b from de to hl
 
 	push bc
@@ -253,7 +239,7 @@ CopyPals:: ; d50
 
 ; get pal color
 	ld a, b
-	and %11 ; color
+	maskbits 1 << PAL_COLOR_SIZE
 ; 2 bytes per color
 	add a
 	ld l, a
@@ -271,8 +257,9 @@ CopyPals:: ; d50
 	ld [hl], d
 	inc hl
 ; next pal color
+rept PAL_COLOR_SIZE
 	srl b
-	srl b
+endr
 ; source
 	pop de
 ; done pal?
@@ -280,7 +267,7 @@ CopyPals:: ; d50
 	jr nz, .loop
 
 ; de += 8 (next pal)
-	ld a, NUM_PAL_COLORS * 2
+	ld a, PALETTE_SIZE
 	add e
 	jr nc, .ok
 	inc d
@@ -292,10 +279,8 @@ CopyPals:: ; d50
 	dec c
 	jr nz, CopyPals
 	ret
-; d79
-
 
-ClearVBank1:: ; d79
+ClearVBank1::
 	ld a, [hCGB]
 	and a
 	ret z
@@ -311,15 +296,11 @@ ClearVBank1:: ; d79
 	ld a, 0
 	ld [rVBK], a
 	ret
-; d90
 
-
-ret_d90:: ; d90
+ret_d90::
 	ret
-; d91
-
 
-ReloadSpritesNoPalettes:: ; d91
+ReloadSpritesNoPalettes::
 	ld a, [hCGB]
 	and a
 	ret z
@@ -337,15 +318,11 @@ ReloadSpritesNoPalettes:: ; d91
 	ld [hCGBPalUpdate], a
 	call DelayFrame
 	ret
-; db1
-
 
-FarCallSwapTextboxPalettes:: ; db1
+FarCallSwapTextboxPalettes::
 	homecall SwapTextboxPalettes
 	ret
-; dbd
 
-FarCallScrollBGMapPalettes:: ; dbd
+FarCallScrollBGMapPalettes::
 	homecall ScrollBGMapPalettes
 	ret
-; dc9
diff --git a/home/pokedex_flags.asm b/home/pokedex_flags.asm
index e9ca2163e..809341509 100644
--- a/home/pokedex_flags.asm
+++ b/home/pokedex_flags.asm
@@ -1,4 +1,4 @@
-SetSeenAndCaughtMon:: ; 3380
+SetSeenAndCaughtMon::
 	push af
 	ld c, a
 	ld hl, wPokedexCaught
@@ -6,33 +6,28 @@ SetSeenAndCaughtMon:: ; 3380
 	call PokedexFlagAction
 	pop af
 	; fallthrough
-; 338b
 
-SetSeenMon:: ; 338b
+SetSeenMon::
 	ld c, a
 	ld hl, wPokedexSeen
 	ld b, SET_FLAG
 	jr PokedexFlagAction
-; 3393
 
-CheckCaughtMon:: ; 3393
+CheckCaughtMon::
 	ld c, a
 	ld hl, wPokedexCaught
 	ld b, CHECK_FLAG
 	jr PokedexFlagAction
-; 339b
 
-CheckSeenMon:: ; 339b
+CheckSeenMon::
 	ld c, a
 	ld hl, wPokedexSeen
 	ld b, CHECK_FLAG
 	; fallthrough
-; 33a1
 
-PokedexFlagAction:: ; 33a1
+PokedexFlagAction::
 	ld d, 0
 	predef SmallFarFlagAction
 	ld a, c
 	and a
 	ret
-; 33ab
diff --git a/home/predef.asm b/home/predef.asm
index f03bdaa94..e829bdc00 100644
--- a/home/predef.asm
+++ b/home/predef.asm
@@ -1,4 +1,4 @@
-Predef:: ; 2d83
+Predef::
 ; Call predefined function a.
 ; Preserves bc, de, hl and f.
 
@@ -50,4 +50,3 @@ Predef:: ; 2d83
 	ld a, [wPredefTemp + 1]
 	ld l, a
 	ret
-; 2dba
diff --git a/home/print_bcd.asm b/home/print_bcd.asm
new file mode 100644
index 000000000..4f93c866f
--- /dev/null
+++ b/home/print_bcd.asm
@@ -0,0 +1,79 @@
+PrintBCDNumber::
+; function to print a BCD (Binary-coded decimal) number
+; de = address of BCD number
+; hl = destination address
+; c = flags and length
+; bit 7: if set, do not print leading zeroes
+;        if unset, print leading zeroes
+; bit 6: if set, left-align the string (do not pad empty digits with spaces)
+;        if unset, right-align the string
+; bit 5: if set, print currency symbol at the beginning of the string
+;        if unset, do not print the currency symbol
+; bits 0-4: length of BCD number in bytes
+; Note that bits 5 and 7 are modified during execution. The above reflects
+; their meaning at the beginning of the functions's execution.
+	ld b, c ; save flags in b
+	res 7, c
+	res 6, c
+	res 5, c ; c now holds the length
+	bit 5, b
+	jr z, .loop
+	bit 7, b
+	jr nz, .loop ; skip currency symbol
+	ld [hl], "¥"
+	inc hl
+.loop
+	ld a, [de]
+	swap a
+	call PrintBCDDigit ; print upper digit
+	ld a, [de]
+	call PrintBCDDigit ; print lower digit
+	inc de
+	dec c
+	jr nz, .loop
+	bit 7, b ; were any non-zero digits printed?
+	jr z, .done ; if so, we are done
+.numberEqualsZero ; if every digit of the BCD number is zero
+	bit 6, b ; left or right alignment?
+	jr nz, .skipRightAlignmentAdjustment
+	dec hl ; if the string is right-aligned, it needs to be moved back one space
+.skipRightAlignmentAdjustment
+	bit 5, b
+	jr z, .skipCurrencySymbol
+	ld [hl], "¥" ; currency symbol
+	inc hl
+.skipCurrencySymbol
+	ld [hl], "0"
+	call PrintLetterDelay
+	inc hl
+.done
+	ret
+
+PrintBCDDigit::
+	and %00001111
+	and a
+	jr z, .zeroDigit
+.nonzeroDigit
+	bit 7, b ; have any non-space characters been printed?
+	jr z, .outputDigit
+; if bit 7 is set, then no numbers have been printed yet
+	bit 5, b ; print the currency symbol?
+	jr z, .skipCurrencySymbol
+	ld [hl], "¥"
+	inc hl
+	res 5, b
+.skipCurrencySymbol
+	res 7, b ; unset 7 to indicate that a nonzero digit has been reached
+.outputDigit
+	add "0"
+	ld [hli], a
+	jp PrintLetterDelay
+
+.zeroDigit
+	bit 7, b ; either printing leading zeroes or already reached a nonzero digit?
+	jr z, .outputDigit ; if so, print a zero digit
+	bit 6, b ; left or right alignment?
+	ret nz
+	ld a, " "
+	ld [hli], a ; if right-aligned, "print" a space by advancing the pointer
+	ret
diff --git a/home/print_level.asm b/home/print_level.asm
new file mode 100644
index 000000000..2ebbbf980
--- /dev/null
+++ b/home/print_level.asm
@@ -0,0 +1,28 @@
+PrintLevel::
+; Print wTempMonLevel at hl
+
+	ld a, [wTempMonLevel]
+	ld [hl], "<LV>"
+	inc hl
+
+; How many digits?
+	ld c, 2
+	cp 100 ; This is distinct from MAX_LEVEL.
+	jr c, Print8BitNumRightAlign
+
+; 3-digit numbers overwrite the :L.
+	dec hl
+	inc c
+	jr Print8BitNumRightAlign
+
+PrintLevel_Force3Digits::
+; Print :L and all 3 digits
+	ld [hl], "<LV>"
+	inc hl
+	ld c, 3
+
+Print8BitNumRightAlign::
+	ld [wd265], a
+	ld de, wd265
+	ld b, PRINTNUM_RIGHTALIGN | 1
+	jp PrintNum
diff --git a/home/print_text.asm b/home/print_text.asm
new file mode 100644
index 000000000..8a8a7dd9f
--- /dev/null
+++ b/home/print_text.asm
@@ -0,0 +1,120 @@
+PrintLetterDelay::
+; Wait before printing the next letter.
+
+; The text speed setting in wOptions is actually a frame count:
+; 	fast: 1 frame
+; 	mid:  3 frames
+; 	slow: 5 frames
+
+; wTextBoxFlags[!0] and A or B override text speed with a one-frame delay.
+; wOptions[4] and wTextBoxFlags[!1] disable the delay.
+
+	ld a, [wOptions]
+	bit NO_TEXT_SCROLL, a
+	ret nz
+
+; non-scrolling text?
+	ld a, [wTextBoxFlags]
+	bit NO_TEXT_DELAY_F, a
+	ret z
+
+	push hl
+	push de
+	push bc
+
+	ld hl, hOAMUpdate
+	ld a, [hl]
+	push af
+
+; orginally turned oam update off...
+;	ld a, 1
+	ld [hl], a
+
+; force fast scroll?
+	ld a, [wTextBoxFlags]
+	bit FAST_TEXT_DELAY_F, a
+	jr z, .fast
+
+; text speed
+	ld a, [wOptions]
+	and %111
+	jr .updatedelay
+
+.fast
+	ld a, TEXT_DELAY_FAST
+
+.updatedelay
+	ld [wTextDelayFrames], a
+
+.checkjoypad
+	call GetJoypad
+
+; input override
+	ld a, [wDisableTextAcceleration]
+	and a
+	jr nz, .wait
+
+; Wait one frame if holding A or B.
+	ld a, [hJoyDown]
+	bit A_BUTTON_F, a
+	jr z, .checkb
+	jr .delay
+.checkb
+	bit B_BUTTON_F, a
+	jr z, .wait
+
+.delay
+	call DelayFrame
+	jr .end
+
+.wait
+	ld a, [wTextDelayFrames]
+	and a
+	jr nz, .checkjoypad
+
+.end
+	pop af
+	ld [hOAMUpdate], a
+	pop bc
+	pop de
+	pop hl
+	ret
+
+CopyDataUntil::
+; Copy [hl .. bc) to de.
+
+; In other words, the source data is
+; from hl up to but not including bc,
+; and the destination is de.
+
+	ld a, [hli]
+	ld [de], a
+	inc de
+	ld a, h
+	cp b
+	jr nz, CopyDataUntil
+	ld a, l
+	cp c
+	jr nz, CopyDataUntil
+	ret
+
+PrintNum::
+	homecall _PrintNum
+	ret
+
+MobilePrintNum::
+	homecall _MobilePrintNum
+	ret
+
+FarPrintText::
+	ld [hBuffer], a
+	ld a, [hROMBank]
+	push af
+	ld a, [hBuffer]
+	rst Bankswitch
+
+	call PrintText
+
+	pop af
+	rst Bankswitch
+	ret
diff --git a/home/random.asm b/home/random.asm
index ceefdce6f..e436e4ff6 100644
--- a/home/random.asm
+++ b/home/random.asm
@@ -1,4 +1,4 @@
-Random:: ; 2f8c
+Random::
 ; A simple hardware-based random number generator (RNG).
 
 ; Two random numbers are generated by adding and subtracting
@@ -27,9 +27,8 @@ Random:: ; 2f8c
 
 	pop bc
 	ret
-; 2f9f
 
-BattleRandom:: ; 2f9f
+BattleRandom::
 ; _BattleRandom lives in another bank.
 
 ; It handles all RNG calls in the battle engine, allowing
@@ -47,10 +46,8 @@ BattleRandom:: ; 2f9f
 	rst Bankswitch
 	ld a, [wPredefTemp + 1]
 	ret
-; 2fb1
 
-
-RandomRange:: ; 2fb1
+RandomRange::
 ; Return a random number between 0 and a (non-inclusive).
 
 	push bc
@@ -81,4 +78,3 @@ RandomRange:: ; 2fb1
 
 	pop bc
 	ret
-; 2fcb
diff --git a/home/region.asm b/home/region.asm
new file mode 100644
index 000000000..4cb3d4768
--- /dev/null
+++ b/home/region.asm
@@ -0,0 +1,32 @@
+IsInJohto::
+; Return 0 if the player is in Johto, and 1 in Kanto.
+
+	ld a, [wMapGroup]
+	ld b, a
+	ld a, [wMapNumber]
+	ld c, a
+	call GetWorldMapLocation
+
+	cp FAST_SHIP
+	jr z, .Johto
+
+	cp SPECIAL_MAP
+	jr nz, .CheckRegion
+
+	ld a, [wBackupMapGroup]
+	ld b, a
+	ld a, [wBackupMapNumber]
+	ld c, a
+	call GetWorldMapLocation
+
+.CheckRegion:
+	cp KANTO_LANDMARK
+	jr nc, .Kanto
+
+.Johto:
+	xor a
+	ret
+
+.Kanto:
+	ld a, 1
+	ret
diff --git a/home/rst.asm b/home/rst.asm
index 1c9b5f6e4..c3abae80d 100644
--- a/home/rst.asm
+++ b/home/rst.asm
@@ -1,24 +1,24 @@
 ; rst vectors
 
-SECTION "rst0",ROM0
+SECTION "rst0", ROM0
 	di
 	jp Start
 
-SECTION "rst8",ROM0
+SECTION "rst8", ROM0 ; rst FarCall
 	jp FarCall_hl
 
-SECTION "rst10",ROM0
+SECTION "rst10", ROM0 ; rst Bankswitch
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 	ret
 
-SECTION "rst18",ROM0
+SECTION "rst18", ROM0
 	rst $38
 
-SECTION "rst20",ROM0
+SECTION "rst20", ROM0
 	rst $38
 
-SECTION "rst28",ROM0
+SECTION "rst28", ROM0 ; rst JumpTable
 	push de
 	ld e, a
 	ld d, 0
@@ -30,8 +30,8 @@ SECTION "rst28",ROM0
 	pop de
 	jp hl
 
-; SECTION "rst30",ROM0
+; SECTION "rst30", ROM0
 ; rst30 is midst rst28
 
-SECTION "rst38",ROM0
+SECTION "rst38", ROM0
 	rst $38
diff --git a/home/rtc.asm b/home/rtc.asm
index 9b8bc4ac3..0e5550485 100644
--- a/home/rtc.asm
+++ b/home/rtc.asm
@@ -1,4 +1,4 @@
-RTC:: ; 46f
+RTC::
 ; update time and time-sensitive palettes
 
 ; rtc enabled?
@@ -13,12 +13,10 @@ RTC:: ; 46f
 	bit 0, a ; obj update
 	ret z
 
-TimeOfDayPals:: ; 47e
+TimeOfDayPals::
 	callfar _TimeOfDayPals
 	ret
-; 485
 
-UpdateTimePals:: ; 485
+UpdateTimePals::
 	callfar _UpdateTimePals
 	ret
-; 48c
diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm
new file mode 100644
index 000000000..cf8e02fa8
--- /dev/null
+++ b/home/scrolling_menu.asm
@@ -0,0 +1,61 @@
+ScrollingMenu::
+	call CopyMenuData
+	ld a, [hROMBank]
+	push af
+
+	ld a, BANK(_ScrollingMenu)
+	rst Bankswitch
+
+	call _InitScrollingMenu
+	call .UpdatePalettes
+	call _ScrollingMenu
+
+	pop af
+	rst Bankswitch
+
+	ld a, [wMenuJoypad]
+	ret
+
+.UpdatePalettes:
+	ld hl, wVramState
+	bit 0, [hl]
+	jp nz, UpdateTimePals
+	jp SetPalettes
+
+InitScrollingMenu::
+	ld a, [wMenuBorderTopCoord]
+	dec a
+	ld b, a
+	ld a, [wMenuBorderBottomCoord]
+	sub b
+	ld d, a
+	ld a, [wMenuBorderLeftCoord]
+	dec a
+	ld c, a
+	ld a, [wMenuBorderRightCoord]
+	sub c
+	ld e, a
+	push de
+	call Coord2Tile
+	pop bc
+	jp TextBox
+
+JoyTextDelay_ForcehJoyDown::
+	call DelayFrame
+
+	ld a, [hInMenu]
+	push af
+	ld a, $1
+	ld [hInMenu], a
+	call JoyTextDelay
+	pop af
+	ld [hInMenu], a
+
+	ld a, [hJoyLast]
+	and D_RIGHT + D_LEFT + D_UP + D_DOWN
+	ld c, a
+	ld a, [hJoyPressed]
+	and A_BUTTON + B_BUTTON + SELECT + START
+	or c
+	ld c, a
+	ret
diff --git a/home/serial.asm b/home/serial.asm
index c32e559dd..663f74d3b 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -1,4 +1,4 @@
-Serial:: ; 6ef
+Serial::
 ; The serial interrupt.
 
 	push af
@@ -87,9 +87,8 @@ Serial:: ; 6ef
 	pop bc
 	pop af
 	reti
-; 75f
 
-Serial_ExchangeBytes:: ; 75f
+Serial_ExchangeBytes::
 	ld a, $1
 	ld [hSerialIgnoringInitialData], a
 .loop
@@ -123,9 +122,8 @@ Serial_ExchangeBytes:: ; 75f
 	or c
 	jr nz, .loop
 	ret
-; 78a
 
-Serial_ExchangeByte:: ; 78a
+Serial_ExchangeByte::
 .loop
 	xor a
 	ld [hSerialReceivedNewData], a
@@ -232,27 +230,24 @@ Serial_ExchangeByte:: ; 78a
 	dec a
 	jr nz, .delay_cycles
 	ret
-; 82b
 
-CheckwLinkTimeoutFramesNonzero:: ; 82b
+CheckwLinkTimeoutFramesNonzero::
 	push hl
 	ld hl, wLinkTimeoutFrames
 	ld a, [hli]
 	or [hl]
 	pop hl
 	ret
-; 833
 
-SerialDisconnected:: ; 833
+SerialDisconnected::
 	dec a ; a is always 0 when this is called
 	ld [wLinkTimeoutFrames], a
 	ld [wLinkTimeoutFrames + 1], a
 	ret
-; 83b
 
 ; This is used to exchange the button press and selected menu item on the link menu.
 ; The data is sent thrice and read twice to increase reliability.
-Serial_ExchangeLinkMenuSelection:: ; 83b
+Serial_ExchangeLinkMenuSelection::
 	ld hl, wPlayerLinkAction
 	ld de, wOtherPlayerLinkMode
 	ld c, 2
@@ -276,24 +271,21 @@ Serial_ExchangeLinkMenuSelection:: ; 83b
 	dec c
 	jr nz, .asm_847
 	ret
-; 862
 
-Serial_PrintWaitingTextAndSyncAndExchangeNybble:: ; 862
+Serial_PrintWaitingTextAndSyncAndExchangeNybble::
 	call LoadTileMapToTempTileMap
 	callfar PlaceWaitingText
 	call WaitLinkTransfer
 	jp Call_LoadTempTileMapToTileMap
-; 871
 
-Serial_SyncAndExchangeNybble:: ; 871
+Serial_SyncAndExchangeNybble::
 	call LoadTileMapToTempTileMap
 	callfar PlaceWaitingText
 	jp WaitLinkTransfer
-; 87d
 
 ; One "giant" leap for machinekind
 
-WaitLinkTransfer:: ; 87d
+WaitLinkTransfer::
 	ld a, $ff
 	ld [wOtherPlayerLinkAction], a
 .loop
@@ -338,9 +330,8 @@ WaitLinkTransfer:: ; 87d
 	ld a, [wOtherPlayerLinkAction]
 	ld [wOtherPlayerLinkMode], a
 	ret
-; 8c1
 
-LinkTransfer:: ; 8c1
+LinkTransfer::
 	push bc
 	ld b, SERIAL_TIMECAPSULE
 	ld a, [wLinkMode]
@@ -370,9 +361,8 @@ LinkTransfer:: ; 8c1
 	call .Receive
 	pop bc
 	ret
-; 8f3
 
-.Receive: ; 8f3
+.Receive:
 	ld a, [hSerialReceive]
 	ld [wOtherPlayerLinkMode], a
 	and $f0
@@ -384,9 +374,8 @@ LinkTransfer:: ; 8c1
 	and $f
 	ld [wOtherPlayerLinkAction], a
 	ret
-; 908
 
-LinkDataReceived:: ; 908
+LinkDataReceived::
 ; Let the other system know that the data has been received.
 	xor a
 	ld [hSerialSend], a
@@ -398,9 +387,8 @@ LinkDataReceived:: ; 908
 	ld a, (1 << rSC_ON) | 1
 	ld [rSC], a
 	ret
-; 919
 
-Unreferenced_Function919:: ; 919
+Unreferenced_Function919::
 	ld a, [wLinkMode]
 	and a
 	ret nz
@@ -413,4 +401,3 @@ Unreferenced_Function919:: ; 919
 	ld a, 1 << rSC_ON
 	ld [rSC], a
 	ret
-; 92e
diff --git a/home/sine.asm b/home/sine.asm
index eff5ed299..821f7c47d 100644
--- a/home/sine.asm
+++ b/home/sine.asm
@@ -1,13 +1,9 @@
-Cosine:: ; 1b0f
-; Return d * cos(a) in hl
-	add %010000 ; 90 degrees
-
-Sine:: ; 1b11
-; Return d * sin(a) in hl
-; a is a signed 6-bit value.
-
+Cosine::
+; a = d * cos(a * pi/32)
+	add %010000 ; cos(x) = sin(x + pi/2)
+	; fallthrough
+Sine::
+; a = d * sin(a * pi/32)
 	ld e, a
-
 	homecall _Sine
 	ret
-; 1b1e
diff --git a/home/sprite_anims.asm b/home/sprite_anims.asm
new file mode 100644
index 000000000..5f3ef82d2
--- /dev/null
+++ b/home/sprite_anims.asm
@@ -0,0 +1,50 @@
+PushLYOverrides::
+	ld a, [hLCDCPointer]
+	and a
+	ret z
+
+	ld a, LOW(wLYOverridesBackup)
+	ld [wRequested2bppSource], a
+	ld a, HIGH(wLYOverridesBackup)
+	ld [wRequested2bppSource + 1], a
+
+	ld a, LOW(wLYOverrides)
+	ld [wRequested2bppDest], a
+	ld a, HIGH(wLYOverrides)
+	ld [wRequested2bppDest + 1], a
+
+	ld a, (wLYOverridesEnd - wLYOverrides) / 16
+	ld [wRequested2bpp], a
+	ret
+
+_InitSpriteAnimStruct::
+	ld [wSpriteAnimIDBuffer], a
+	ld a, [hROMBank]
+	push af
+
+	ld a, BANK(InitSpriteAnimStruct)
+	rst Bankswitch
+	ld a, [wSpriteAnimIDBuffer]
+
+	call InitSpriteAnimStruct
+
+	pop af
+	rst Bankswitch
+
+	ret
+
+ReinitSpriteAnimFrame::
+	ld [wSpriteAnimIDBuffer], a
+	ld a, [hROMBank]
+	push af
+
+	ld a, BANK(_ReinitSpriteAnimFrame)
+	rst Bankswitch
+	ld a, [wSpriteAnimIDBuffer]
+
+	call _ReinitSpriteAnimFrame
+
+	pop af
+	rst Bankswitch
+
+	ret
diff --git a/home/sprite_updates.asm b/home/sprite_updates.asm
new file mode 100644
index 000000000..d263363a6
--- /dev/null
+++ b/home/sprite_updates.asm
@@ -0,0 +1,19 @@
+DisableSpriteUpdates::
+	xor a
+	ld [hMapAnims], a
+	ld a, [wVramState]
+	res 0, a
+	ld [wVramState], a
+	ld a, $0
+	ld [wSpriteUpdatesEnabled], a
+	ret
+
+EnableSpriteUpdates::
+	ld a, $1
+	ld [wSpriteUpdatesEnabled], a
+	ld a, [wVramState]
+	set 0, a
+	ld [wVramState], a
+	ld a, $1
+	ld [hMapAnims], a
+	ret
diff --git a/home/sram.asm b/home/sram.asm
index 4cfe14cf9..1b1a4f318 100644
--- a/home/sram.asm
+++ b/home/sram.asm
@@ -1,12 +1,11 @@
-GetSRAMBank:: ; 2fcb
+GetSRAMBank::
 ; load sram bank a
 ; if invalid bank, sram is disabled
 	cp NUM_SRAM_BANKS
 	jr c, OpenSRAM
 	jr CloseSRAM
-; 2fd1
 
-OpenSRAM:: ; 2fd1
+OpenSRAM::
 ; switch to sram bank a
 	push af
 ; latch clock data
@@ -19,9 +18,8 @@ OpenSRAM:: ; 2fd1
 	pop af
 	ld [MBC3SRamBank], a
 	ret
-; 2fe1
 
-CloseSRAM:: ; 2fe1
+CloseSRAM::
 	push af
 	ld a, SRAM_DISABLE
 ; reset clock latch for next time
@@ -30,4 +28,3 @@ CloseSRAM:: ; 2fe1
 	ld [MBC3SRamEnable], a
 	pop af
 	ret
-; 2fec
diff --git a/home/stone_queue.asm b/home/stone_queue.asm
new file mode 100644
index 000000000..b635cee16
--- /dev/null
+++ b/home/stone_queue.asm
@@ -0,0 +1,138 @@
+HandleStoneQueue::
+	ld a, [hROMBank]
+	push af
+
+	call SwitchToMapScriptsBank
+	call .WarpAction
+
+	pop bc
+	ld a, b
+	rst Bankswitch
+	ret
+
+.WarpAction:
+	ld hl, OBJECT_MAP_OBJECT_INDEX
+	add hl, de
+	ld a, [hl]
+	cp $ff
+	jr z, .nope
+
+	ld l, a
+	push hl
+	call .IsObjectOnWarp
+	pop hl
+	jr nc, .nope
+	ld d, a
+	ld e, l
+	call .IsObjectInStoneTable
+	jr nc, .nope
+	call CallMapScript
+	farcall EnableScriptMode
+	scf
+	ret
+
+.nope
+	and a
+	ret
+
+.IsObjectOnWarp:
+	push de
+
+	ld hl, OBJECT_NEXT_MAP_X
+	add hl, de
+	ld a, [hl]
+	ld hl, OBJECT_NEXT_MAP_Y
+	add hl, de
+	ld e, [hl]
+
+	sub 4
+	ld d, a
+	ld a, e
+	sub 4
+	ld e, a
+	call .check_on_warp
+
+	pop de
+	ret
+
+.check_on_warp
+	ld hl, wCurrMapWarpsPointer
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	ld a, [wCurrMapWarpCount]
+	and a
+	jr z, .nope2
+
+.loop
+	push af
+	ld a, [hl]
+	cp e
+	jr nz, .not_on_warp
+	inc hl
+	ld a, [hld]
+	cp d
+	jr nz, .not_on_warp
+	jr .found_warp
+
+.not_on_warp
+	ld a, 5
+	add l
+	ld l, a
+	jr nc, .no_carry
+	inc h
+.no_carry
+
+	pop af
+	dec a
+	jr nz, .loop
+
+.nope2
+	and a
+	ret
+
+.found_warp
+	pop af
+	ld d, a
+	ld a, [wCurrMapWarpCount]
+	sub d
+	inc a
+	scf
+	ret
+
+.IsObjectInStoneTable:
+	inc e
+	ld hl, CMDQUEUE_ADDR
+	add hl, bc
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+.loop2
+	ld a, [hli]
+	cp $ff
+	jr z, .nope3
+	cp d
+	jr nz, .next_inc3
+	ld a, [hli]
+	cp e
+	jr nz, .next_inc2
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	jr .yes
+
+.next_inc3
+	inc hl
+
+.next_inc2
+	inc hl
+	inc hl
+	jr .loop2
+
+.nope3
+	and a
+	ret
+
+.yes
+	scf
+	ret
diff --git a/home/string.asm b/home/string.asm
index 492246832..702ab50ff 100644
--- a/home/string.asm
+++ b/home/string.asm
@@ -1,14 +1,13 @@
-InitString:: ; 2ef6
+InitString::
 ; Init a string of length c.
 	push hl
 	jr _InitString
-; 2ef9
 
-InitName:: ; 2ef9
+InitName::
 ; Intended for names, so this function is limited to ten characters.
 	push hl
 	ld c, 10
-_InitString:: ; 2efc
+_InitString::
 ; if the string pointed to by hl is empty (defined as "zero or more spaces
 ; followed by a null"), then initialize it to the string pointed to by de.
 	push bc
@@ -34,4 +33,3 @@ _InitString:: ; 2efc
 	pop bc
 	pop hl
 	ret
-; 2f17
diff --git a/home/text.asm b/home/text.asm
index 5e7e66d43..ef952942d 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -1,4 +1,4 @@
-ClearBox:: ; fb6
+ClearBox::
 ; Fill a c*b box at hl with blank tiles.
 	ld a, " "
 	; fallthrough
@@ -18,10 +18,8 @@ FillBoxWithByte::
 	dec b
 	jr nz, .row
 	ret
-; fc8
 
-
-ClearTileMap:: ; fc8
+ClearTileMap::
 ; Fill wTileMap with blank tiles.
 
 	hlcoord 0, 0
@@ -34,19 +32,15 @@ ClearTileMap:: ; fc8
 	bit rLCDC_ENABLE, a
 	ret z
 	jp WaitBGMap
-; fdb
-
 
-ClearScreen:: ; fdb
+ClearScreen::
 	ld a, PAL_BG_TEXT
 	hlcoord 0, 0, wAttrMap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	jr ClearTileMap
-; fe8
 
-
-TextBox:: ; fe8
+TextBox::
 ; Draw a text box at hl with room for b lines of c characters each.
 ; Places a border around the textbox, then switches the palette to the
 ; text black-and-white scheme.
@@ -56,11 +50,8 @@ TextBox:: ; fe8
 	pop hl
 	pop bc
 	jr TextBoxPalette
-; ff1
-
-
-TextBoxBorder:: ; ff1
 
+TextBoxBorder::
 	; Top
 	push hl
 	ld a, "┌"
@@ -96,9 +87,8 @@ TextBoxBorder:: ; ff1
 	ld [hl], "┘"
 
 	ret
-; 101e
 
-.PlaceChars: ; 101e
+.PlaceChars:
 ; Place char a c times.
 	ld d, c
 .loop
@@ -106,10 +96,8 @@ TextBoxBorder:: ; ff1
 	dec d
 	jr nz, .loop
 	ret
-; 1024
-
 
-TextBoxPalette:: ; 1024
+TextBoxPalette::
 ; Fill text box width c height b at hl with pal 7
 	ld de, wAttrMap - wTileMap
 	add hl, de
@@ -132,58 +120,49 @@ TextBoxPalette:: ; 1024
 	dec b
 	jr nz, .col
 	ret
-; 103e
-
 
-SpeechTextBox:: ; 103e
+SpeechTextBox::
 ; Standard textbox.
 	hlcoord TEXTBOX_X, TEXTBOX_Y
 	ld b, TEXTBOX_INNERH
 	ld c, TEXTBOX_INNERW
 	jp TextBox
-; 1048
 
-TestText:: ; 1048
+TestText::
 	text "ゲームフりーク！"
 	done
-; 1052
 
-RadioTerminator:: ; 1052
+RadioTerminator::
 	ld hl, .stop
 	ret
 .stop	db "@"
-; 1057
 
-
-PrintText:: ; 1057
+PrintText::
 	call SetUpTextBox
-BuenaPrintText:: ; 105a
+BuenaPrintText::
 	push hl
 	hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY
 	lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW
 	call ClearBox
 	pop hl
 
-PrintTextBoxText:: ; 1065
+PrintTextBoxText::
 	bccoord TEXTBOX_INNERX, TEXTBOX_INNERY
 	call PlaceHLTextAtBC
 	ret
-; 106c
 
-SetUpTextBox:: ; 106c
+SetUpTextBox::
 	push hl
 	call SpeechTextBox
 	call UpdateSprites
 	call ApplyTilemap
 	pop hl
 	ret
-; 1078
-
 
-PlaceString:: ; 1078
+PlaceString::
 	push hl
 
-PlaceNextChar:: ; 1079
+PlaceNextChar::
 	ld a, [de]
 	cp "@"
 	jr nz, CheckDict
@@ -193,32 +172,36 @@ PlaceNextChar:: ; 1079
 	ret
 	pop de
 
-NextChar:: ; 1083
+NextChar::
 	inc de
 	jp PlaceNextChar
 
-CheckDict:: ; 1087
+CheckDict::
 dict: MACRO
-if \1 == 0
+if \1 == "<NULL>"
 	and a
 else
 	cp \1
 endc
-	jp z, \2
-ENDM
 
-dict2: MACRO
-	cp \1
+if STRSUB("\2", 1, 1) == "\""
+; Replace a character with another one
 	jr nz, ._\@
 	ld a, \2
 ._\@:
+elif STRSUB("\2", 1, 1) == "."
+; Locals can use a short jump
+	jr z, \2
+else
+	jp z, \2
+endc
 ENDM
 
-	dict TX_DAY,      DayOfWeekChar
+	dict "<MOBILE>",  MobileScriptChar
 	dict "<LINE>",    LineChar
 	dict "<NEXT>",    NextLineChar
-	dict TX_FAR,      TextFar
-	dict TX_START,    NullChar
+	dict "<CR>",      CarriageReturnChar
+	dict "<NULL>",    NullChar
 	dict "<SCROLL>",  _ContTextNoPause
 	dict "<_CONT>",   _ContText
 	dict "<PARA>",    Paragraph
@@ -236,7 +219,7 @@ ENDM
 	dict "<TM>",      TMChar
 	dict "<TRAINER>", TrainerChar
 	dict "<KOUGEKI>", PlaceKougeki
-	dict "<LNBRK>",   LineBreakChar
+	dict "<LF>",      LineFeedChar
 	dict "<CONT>",    ContText
 	dict "<……>",      SixDotsChar
 	dict "<DONE>",    DoneText
@@ -244,17 +227,14 @@ ENDM
 	dict "<PKMN>",    PlacePKMN
 	dict "<POKE>",    PlacePOKE
 	dict "%",         NextChar
-	dict2 "¯",        " "
+	dict "¯",         " "
 	dict "<DEXEND>",  PlaceDexEnd
 	dict "<TARGET>",  PlaceMoveTargetsName
 	dict "<USER>",    PlaceMoveUsersName
 	dict "<ENEMY>",   PlaceEnemysName
 	dict "<PLAY_G>",  PlaceGenderedPlayerName
-
-	cp "ﾟ"
-	jr z, .place ; should be .diacritic
-	cp "ﾞ"
-	jr z, .place ; should be .diacritic
+	dict "ﾟ",         .place ; should be .diacritic
+	dict "ﾞ",         .place ; should be .diacritic
 	jr .not_diacritic
 
 .diacritic
@@ -296,16 +276,12 @@ ENDM
 	ld [hli], a
 	call PrintLetterDelay
 	jp NextChar
-; 0x117b
-
 
-DayOfWeekChar:: ; 117b
+MobileScriptChar::
 	ld c, l
 	ld b, h
-	farcall Function17f036
+	farcall RunMobileScript
 	jp PlaceNextChar
-; 1186
-
 
 print_name: MACRO
 	push de
@@ -313,35 +289,34 @@ print_name: MACRO
 	jp PlaceCommandCharacter
 ENDM
 
-PrintMomsName:   print_name wMomsName   ; 1186
-PrintPlayerName: print_name wPlayerName ; 118d
-PrintRivalName:  print_name wRivalName  ; 1194
-PrintRedsName:   print_name wRedsName   ; 119b
-PrintGreensName: print_name wGreensName ; 11a2
-
-TrainerChar:  print_name TrainerCharText ; 11a9
-TMChar:       print_name TMCharText      ; 11b0
-PCChar:       print_name PCCharText      ; 11b7
-RocketChar:   print_name RocketCharText  ; 11be
-PlacePOKe:    print_name PlacePOKeText   ; 11c5
-PlaceKougeki: print_name KougekiText     ; 11cc
-SixDotsChar:  print_name SixDotsCharText ; 11d3
-PlacePKMN:    print_name PlacePKMNText   ; 11da
-PlacePOKE:    print_name PlacePOKEText   ; 11e1
-PlaceJPRoute: print_name PlaceJPRouteText ; 11e8
-PlaceWatashi: print_name PlaceWatashiText ; 11ef
-PlaceKokoWa:  print_name PlaceKokoWaText ; 11f6
-
-
-PlaceMoveTargetsName:: ; 11fd
+PrintMomsName:   print_name wMomsName
+PrintPlayerName: print_name wPlayerName
+PrintRivalName:  print_name wRivalName
+PrintRedsName:   print_name wRedsName
+PrintGreensName: print_name wGreensName
+
+TrainerChar:  print_name TrainerCharText
+TMChar:       print_name TMCharText
+PCChar:       print_name PCCharText
+RocketChar:   print_name RocketCharText
+PlacePOKe:    print_name PlacePOKeText
+PlaceKougeki: print_name KougekiText
+SixDotsChar:  print_name SixDotsCharText
+PlacePKMN:    print_name PlacePKMNText
+PlacePOKE:    print_name PlacePOKEText
+PlaceJPRoute: print_name PlaceJPRouteText
+PlaceWatashi: print_name PlaceWatashiText
+PlaceKokoWa:  print_name PlaceKokoWaText
+
+PlaceMoveTargetsName::
 	ld a, [hBattleTurn]
 	xor 1
 	jr PlaceMoveUsersName.place
 
-PlaceMoveUsersName:: ; 1203
+PlaceMoveUsersName::
 	ld a, [hBattleTurn]
 
-.place: ; 1205
+.place:
 	push de
 	and a
 	jr nz, .enemy
@@ -357,8 +332,7 @@ PlaceMoveUsersName:: ; 1203
 	ld de, wEnemyMonNick
 	jr PlaceCommandCharacter
 
-
-PlaceEnemysName:: ; 121b
+PlaceEnemysName::
 	push de
 
 	ld a, [wLinkMode]
@@ -391,28 +365,25 @@ PlaceEnemysName:: ; 121b
 	ld de, wOTClassName
 	jr PlaceCommandCharacter
 
-
-PlaceGenderedPlayerName:: ; 1252
+PlaceGenderedPlayerName::
 	push de
 	ld de, wPlayerName
 	call PlaceString
 	ld h, b
 	ld l, c
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	ld de, KunSuffixText
 	jr z, PlaceCommandCharacter
 	ld de, ChanSuffixText
 	jr PlaceCommandCharacter
 
-
-PlaceCommandCharacter:: ; 126a
+PlaceCommandCharacter::
 	call PlaceString
 	ld h, b
 	ld l, c
 	pop de
 	jp NextChar
-; 0x1273
 
 TMCharText::      db "TM@"
 TrainerCharText:: db "TRAINER@"
@@ -431,25 +402,22 @@ PlaceWatashiText::
 PlaceKokoWaText:: db "@"
 KunSuffixText::   db "@"
 ChanSuffixText::  db "@"
-; 12a7
 
-NextLineChar:: ; 12a7
+NextLineChar::
 	pop hl
 	ld bc, SCREEN_WIDTH * 2
 	add hl, bc
 	push hl
 	jp NextChar
-; 12b0
 
-LineBreakChar:: ; 12b0
+LineFeedChar::
 	pop hl
 	ld bc, SCREEN_WIDTH
 	add hl, bc
 	push hl
 	jp NextChar
-; 12b9
 
-TextFar:: ; 12b9
+CarriageReturnChar::
 	pop hl
 	push de
 	ld bc, -wTileMap + $10000
@@ -489,17 +457,14 @@ TextFar:: ; 12b9
 	add hl, bc
 	push hl
 	jp NextChar
-; 12ea
-
 
-LineChar:: ; 12ea
+LineChar::
 	pop hl
 	hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY + 2
 	push hl
 	jp NextChar
-; 0x12f2
 
-Paragraph:: ; 12f2
+Paragraph::
 	push de
 
 	ld a, [wLinkMode]
@@ -521,10 +486,8 @@ Paragraph:: ; 12f2
 	hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY
 	pop de
 	jp NextChar
-; 131f
-
 
-_ContText:: ; 131f
+_ContText::
 	ld a, [wLinkMode]
 	or a
 	jr nz, .communication
@@ -542,17 +505,15 @@ _ContText:: ; 131f
 	call z, UnloadBlinkingCursor
 	; fallthrough
 
-_ContTextNoPause:: ; 1337
+_ContTextNoPause::
 	push de
 	call TextScroll
 	call TextScroll
 	hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY + 2
 	pop de
 	jp NextChar
-; 1345
 
-
-ContText:: ; 1345
+ContText::
 	push de
 	ld de, .cont
 	ld b, h
@@ -564,18 +525,15 @@ ContText:: ; 1345
 	jp NextChar
 
 .cont: db "<_CONT>@"
-; 1356
-
 
-PlaceDexEnd:: ; 1356
-; Legacy: ends a Pokédex entry (Red).
+PlaceDexEnd::
+; Ends a Pokédex entry in Gen 1.
 ; Dex entries are now regular strings.
 	ld [hl], "."
 	pop hl
 	ret
-; 135a
 
-PromptText:: ; 135a
+PromptText::
 	ld a, [wLinkMode]
 	cp LINK_COLOSSEUM
 	jr z, .ok
@@ -593,23 +551,21 @@ PromptText:: ; 135a
 	jr z, DoneText
 	call UnloadBlinkingCursor
 
-DoneText:: ; 137c
+DoneText::
 	pop hl
 	ld de, .stop
 	dec de
 	ret
 
 .stop: db "@"
-; 1383
 
-NullChar:: ; 1383
+NullChar::
 	ld a, "?"
 	ld [hli], a
 	call PrintLetterDelay
 	jp NextChar
-; 138c
 
-TextScroll:: ; 138c
+TextScroll::
 	hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY
 	decoord TEXTBOX_INNERX, TEXTBOX_INNERY - 1
 	ld a, TEXTBOX_INNERH - 1
@@ -640,9 +596,8 @@ TextScroll:: ; 138c
 	ld c, 5
 	call DelayFrames
 	ret
-; 13b6
 
-Text_WaitBGMap:: ; 13b6
+Text_WaitBGMap::
 	push bc
 	ld a, [hOAMUpdate]
 	push af
@@ -655,25 +610,21 @@ Text_WaitBGMap:: ; 13b6
 	ld [hOAMUpdate], a
 	pop bc
 	ret
-; 13c6
 
-Diacritic:: ; 13c6
+Diacritic::
 	ret
-; 13c7
 
-LoadBlinkingCursor:: ; 13c7
+LoadBlinkingCursor::
 	ld a, "▼"
 	ldcoord_a 18, 17
 	ret
-; 13cd
 
-UnloadBlinkingCursor:: ; 13cd
+UnloadBlinkingCursor::
 	lda_coord 17, 17
 	ldcoord_a 18, 17
 	ret
-; 13d4
 
-FarString:: ; 13d4
+FarString::
 	ld b, a
 	ld a, [hROMBank]
 	push af
@@ -685,17 +636,14 @@ FarString:: ; 13d4
 	pop af
 	rst Bankswitch
 	ret
-; 13e0
 
-PokeFluteTerminatorCharacter:: ; 13e0
+PokeFluteTerminatorCharacter::
 	ld hl, .stop
 	ret
 
 .stop: db "@"
-; 13e5
-
 
-PlaceHLTextAtBC:: ; 13e5
+PlaceHLTextAtBC::
 	ld a, [wTextBoxFlags]
 	push af
 	set NO_TEXT_DELAY_F, a
@@ -706,9 +654,8 @@ PlaceHLTextAtBC:: ; 13e5
 	pop af
 	ld [wTextBoxFlags], a
 	ret
-; 13f6
 
-DoTextUntilTerminator:: ; 13f6
+DoTextUntilTerminator::
 	ld a, [hli]
 	cp "@"
 	ret z
@@ -732,37 +679,35 @@ DoTextUntilTerminator:: ; 13f6
 	; jp de
 	push de
 	ret
-; 1410
 
-TextCommands:: ; 1410
+TextCommands::
 ; entries correspond to TX_* constants (see macros/scripts/text.asm)
-	dw Text_TX               ; TX_START
-	dw Text_TX_RAM           ; TX_RAM
-	dw Text_TX_BCD           ; TX_BCD
-	dw Text_TX_MOVE          ; TX_MOVE
-	dw Text_TX_BOX           ; TX_BOX
-	dw Text_TX_LOW           ; TX_LOW
-	dw Text_WAIT_BUTTON      ; WAIT_BUTTON
-	dw Text_TX_SCROLL        ; TX_SCROLL
-	dw Text_START_ASM        ; START_ASM
-	dw Text_TX_NUM           ; TX_NUM
-	dw Text_TX_EXIT          ; TX_EXIT
-	dw Text_PlaySound        ; TX_SOUND_DEX_FANFARE_50_79
-	dw Text_TX_DOTS          ; TX_DOTS
-	dw Text_LINK_WAIT_BUTTON ; TX_LINK_WAIT_BUTTON
-	dw Text_PlaySound        ; TX_SOUND_DEX_FANFARE_20_49
-	dw Text_PlaySound        ; TX_SOUND_ITEM
-	dw Text_PlaySound        ; TX_SOUND_CAUGHT_MON
-	dw Text_PlaySound        ; TX_SOUND_DEX_FANFARE_80_109
-	dw Text_PlaySound        ; TX_SOUND_FANFARE
-	dw Text_PlaySound        ; TX_SOUND_SLOT_MACHINE_START
-	dw Text_TX_STRINGBUFFER  ; TX_STRINGBUFFER
-	dw Text_TX_DAY           ; TX_DAY
-	dw Text_TX_FAR           ; TX_FAR
-; 143e
-
-Text_TX:: ; 143e
-; TX
+	dw TextCommand_START            ; TX_START
+	dw TextCommand_RAM              ; TX_RAM
+	dw TextCommand_BCD              ; TX_BCD
+	dw TextCommand_MOVE             ; TX_MOVE
+	dw TextCommand_BOX              ; TX_BOX
+	dw TextCommand_LOW              ; TX_LOW
+	dw TextCommand_WAIT_BUTTON      ; TX_WAIT_BUTTON
+	dw TextCommand_SCROLL           ; TX_SCROLL
+	dw TextCommand_START_ASM        ; TX_START_ASM
+	dw TextCommand_NUM              ; TX_NUM
+	dw TextCommand_EXIT             ; TX_EXIT
+	dw TextCommand_SOUND            ; TX_SOUND_DEX_FANFARE_50_79
+	dw TextCommand_DOTS             ; TX_DOTS
+	dw TextCommand_LINK_WAIT_BUTTON ; TX_LINK_WAIT_BUTTON
+	dw TextCommand_SOUND            ; TX_SOUND_DEX_FANFARE_20_49
+	dw TextCommand_SOUND            ; TX_SOUND_ITEM
+	dw TextCommand_SOUND            ; TX_SOUND_CAUGHT_MON
+	dw TextCommand_SOUND            ; TX_SOUND_DEX_FANFARE_80_109
+	dw TextCommand_SOUND            ; TX_SOUND_FANFARE
+	dw TextCommand_SOUND            ; TX_SOUND_SLOT_MACHINE_START
+	dw TextCommand_STRINGBUFFER     ; TX_STRINGBUFFER
+	dw TextCommand_DAY              ; TX_DAY
+	dw TextCommand_FAR              ; TX_FAR
+
+TextCommand_START::
+; text_start
 ; write text until "@"
 ; [$00]["...@"]
 
@@ -775,9 +720,8 @@ Text_TX:: ; 143e
 	ld l, e
 	inc hl
 	ret
-; 1449
 
-Text_TX_RAM:: ; 1449
+TextCommand_RAM::
 ; text_from_ram
 ; write text from a ram address
 ; little endian
@@ -793,9 +737,8 @@ Text_TX_RAM:: ; 1449
 	call PlaceString
 	pop hl
 	ret
-; 1455
 
-Text_TX_FAR:: ; 1455
+TextCommand_FAR::
 ; text_jump
 ; write text from a different bank
 ; little endian
@@ -823,10 +766,9 @@ Text_TX_FAR:: ; 1455
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 	ret
-; 1470
 
-Text_TX_BCD:: ; 1470
-; TX_BCD
+TextCommand_BCD::
+; text_bcd
 ; write bcd from address, typically ram
 ; [$02][addr][flags]
 ; flags: see PrintBCDNumber
@@ -845,10 +787,9 @@ Text_TX_BCD:: ; 1470
 	ld c, l
 	pop hl
 	ret
-; 1480
 
-Text_TX_MOVE:: ; 1480
-; TX_MOVE
+TextCommand_MOVE::
+; text_move
 ; move to a new tile
 ; [$03][addr]
 
@@ -859,10 +800,9 @@ Text_TX_MOVE:: ; 1480
 	ld [wMenuScrollPosition + 2 + 1], a
 	ld b, a
 	ret
-; 148b
 
-Text_TX_BOX:: ; 148b
-; TX_BOX
+TextCommand_BOX::
+; text_box
 ; draw a box
 ; little endian
 ; [$04][addr][height][width]
@@ -881,28 +821,26 @@ Text_TX_BOX:: ; 148b
 	call TextBox
 	pop hl
 	ret
-; 149b
 
-Text_TX_LOW:: ; 149b
-; TX_LOW
+TextCommand_LOW::
+; text_low
 ; write text at (1,16)
 ; [$05]
 
 	bccoord TEXTBOX_INNERX, TEXTBOX_INNERY + 2
 	ret
-; 149f
 
-Text_WAIT_BUTTON:: ; 149f
-; TX_WAITBUTTON
+TextCommand_WAIT_BUTTON::
+; text_waitbutton
 ; wait for button press
 ; show arrow
 ; [06]
 
 	ld a, [wLinkMode]
 	cp LINK_COLOSSEUM
-	jp z, Text_LINK_WAIT_BUTTON
+	jp z, TextCommand_LINK_WAIT_BUTTON
 	cp LINK_MOBILE
-	jp z, Text_LINK_WAIT_BUTTON
+	jp z, TextCommand_LINK_WAIT_BUTTON
 
 	push hl
 	call LoadBlinkingCursor
@@ -912,9 +850,9 @@ Text_WAIT_BUTTON:: ; 149f
 	call UnloadBlinkingCursor
 	pop hl
 	ret
-; 14ba
 
-Text_TX_SCROLL:: ; 14ba
+TextCommand_SCROLL::
+; text_scroll
 ; pushes text up two lines and sets the BC cursor to the border tile
 ; below the first character column of the text box.
 	push hl
@@ -924,10 +862,9 @@ Text_TX_SCROLL:: ; 14ba
 	pop hl
 	bccoord TEXTBOX_INNERX, TEXTBOX_INNERY + 2
 	ret
-; 14c9
 
-Text_START_ASM:: ; 14c9
-; TX_ASM
+TextCommand_START_ASM::
+; start_asm
 
 	bit 7, h
 	jr nz, .not_rom
@@ -937,10 +874,9 @@ Text_START_ASM:: ; 14c9
 	ld a, "@"
 	ld [hl], a
 	ret
-; 14d2
 
-Text_TX_NUM:: ; 14d2
-; TX_NUM
+TextCommand_NUM::
+; deciram
 ; [$09][addr][hi:bytes lo:digits]
 	ld a, [hli]
 	ld e, a
@@ -963,9 +899,9 @@ Text_TX_NUM:: ; 14d2
 	ld c, l
 	pop hl
 	ret
-; 14ed
 
-Text_TX_EXIT:: ; 14ed
+TextCommand_EXIT::
+; interpret_data
 	push hl
 	push bc
 	call GetJoypad
@@ -978,9 +914,8 @@ Text_TX_EXIT:: ; 14ed
 	pop bc
 	pop hl
 	ret
-; 1500
 
-Text_PlaySound:: ; 1500
+TextCommand_SOUND::
 ; chars:
 ;   $0b, $0e, $0f, $10, $11, $12, $13
 ; see TextSFX
@@ -1014,10 +949,9 @@ Text_PlaySound:: ; 1500
 	pop hl
 	pop bc
 	ret
-; 1522
 
-Unreferenced_Function1522:: ; 1522
-; TX_CRY
+Unreferenced_Function1522::
+; play_cry
 	push de
 	ld e, [hl]
 	inc hl
@@ -1027,9 +961,8 @@ Unreferenced_Function1522:: ; 1522
 	pop hl
 	pop bc
 	ret
-; 152d
 
-TextSFX:: ; 152d
+TextSFX::
 	dbw TX_SOUND_DEX_FANFARE_50_79,  SFX_DEX_FANFARE_50_79
 	dbw TX_SOUND_FANFARE,            SFX_FANFARE
 	dbw TX_SOUND_DEX_FANFARE_20_49,  SFX_DEX_FANFARE_20_49
@@ -1038,9 +971,9 @@ TextSFX:: ; 152d
 	dbw TX_SOUND_DEX_FANFARE_80_109, SFX_DEX_FANFARE_80_109
 	dbw TX_SOUND_SLOT_MACHINE_START, SFX_SLOT_MACHINE_START
 	db -1
-; 1543
 
-Text_TX_DOTS:: ; 1543
+TextCommand_DOTS::
+; limited_interpret_data
 ; [$0C][num]
 	ld a, [hli]
 	ld d, a
@@ -1067,9 +1000,9 @@ Text_TX_DOTS:: ; 1543
 	ld c, l
 	pop hl
 	ret
-; 1562
 
-Text_LINK_WAIT_BUTTON:: ; 1562
+TextCommand_LINK_WAIT_BUTTON::
+; link_wait_button
 ; wait for key down
 ; display arrow
 	push hl
@@ -1078,9 +1011,9 @@ Text_LINK_WAIT_BUTTON:: ; 1562
 	pop bc
 	pop hl
 	ret
-; 156a
 
-Text_TX_STRINGBUFFER:: ; 156a
+TextCommand_STRINGBUFFER::
+; text_buffer
 ; Print a string from one of the following:
 ; 0: wStringBuffer3
 ; 1: wStringBuffer4
@@ -1107,10 +1040,9 @@ Text_TX_STRINGBUFFER:: ; 156a
 	call PlaceString
 	pop hl
 	ret
-; 1582
 
-Text_TX_DAY:: ; 1582
-; TX_DAY
+TextCommand_DAY::
+; current_day
 
 	call GetWeekday
 	push hl
@@ -1134,7 +1066,7 @@ Text_TX_DAY:: ; 1582
 	pop hl
 	ret
 
-.Days: ; 15a2
+.Days:
 	dw .Sun
 	dw .Mon
 	dw .Tues
@@ -1151,4 +1083,3 @@ Text_TX_DAY:: ; 1582
 .Fri:    db "FRI@"
 .Satur:  db "SATUR@"
 .Day:    db "DAY@"
-; 15d8
diff --git a/home/tilemap.asm b/home/tilemap.asm
index 4bbd16102..711118ae0 100644
--- a/home/tilemap.asm
+++ b/home/tilemap.asm
@@ -1,257 +1,218 @@
-PushWindow:: ; 1c00
-	callfar _PushWindow
+ClearBGPalettes::
+	call ClearPalettes
+WaitBGMap::
+; Tell VBlank to update BG Map
+	ld a, 1 ; BG Map 0 tiles
+	ld [hBGMapMode], a
+; Wait for it to do its magic
+	ld c, 4
+	call DelayFrames
 	ret
-; 1c07
 
-ExitMenu:: ; 0x1c07
-	push af
-	callfar _ExitMenu
-	pop af
+WaitBGMap2::
+	ld a, [hCGB]
+	and a
+	jr z, .bg0
+
+	ld a, 2
+	ld [hBGMapMode], a
+	ld c, 4
+	call DelayFrames
+
+.bg0
+	ld a, 1
+	ld [hBGMapMode], a
+	ld c, 4
+	call DelayFrames
 	ret
 
-InitVerticalMenuCursor:: ; 0x1c10
-	callfar _InitVerticalMenuCursor
+IsCGB::
+	ld a, [hCGB]
+	and a
 	ret
 
-CloseWindow:: ; 0x1c17
-	push af
-	call ExitMenu
-	call ApplyTilemap
-	call UpdateSprites
-	pop af
+ApplyTilemap::
+	ld a, [hCGB]
+	and a
+	jr z, .dmg
+
+	ld a, [wSpriteUpdatesEnabled]
+	cp 0
+	jr z, .dmg
+
+	ld a, 1
+	ld [hBGMapMode], a
+	jr CopyTilemapAtOnce
+
+.dmg
+; WaitBGMap
+	ld a, 1
+	ld [hBGMapMode], a
+	ld c, 4
+	call DelayFrames
 	ret
 
-RestoreTileBackup:: ; 0x1c23
-	call MenuBoxCoord2Tile
-	call .copy
-	call MenuBoxCoord2Attr
-	call .copy
-	ret
-; 0x1c30
-
-.copy ; 0x1c30
-	call GetMenuBoxDims
-	inc b
-	inc c
-
-.row
-	push bc
-	push hl
-
-.col
-	ld a, [de]
-	ld [hli], a
-	dec de
-	dec c
-	jr nz, .col ; 0x1c3b $fa
-
-	pop hl
-	ld bc, SCREEN_WIDTH
-	add hl, bc
-	pop bc
-	dec b
-	jr nz, .row ; 0x1c44 $ef
+CGBOnly_CopyTilemapAtOnce::
+	ld a, [hCGB]
+	and a
+	jr z, WaitBGMap
 
-	ret
+CopyTilemapAtOnce::
+	jr .CopyTilemapAtOnce
 
-PopWindow:: ; 0x1c47
-	ld b, $10
-	ld de, wMenuFlags
-.loop
-	ld a, [hld]
-	ld [de], a
-	inc de
-	dec b
-	jr nz, .loop ; 0x1c50 $fa
+; unused
+	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
 	ret
 
-GetMenuBoxDims:: ; 0x1c53
-	ld a, [wMenuBorderTopCoord] ; top
-	ld b, a
-	ld a, [wMenuBorderBottomCoord] ; bottom
-	sub b
-	ld b, a
-	ld a, [wMenuBorderLeftCoord] ; left
-	ld c, a
-	ld a, [wMenuBorderRightCoord] ; right
-	sub c
-	ld c, a
-	ret
-; 0x1c66
+.CopyTilemapAtOnce:
+	ld a, [hBGMapMode]
+	push af
+	xor a
+	ld [hBGMapMode], a
 
-CopyMenuData2:: ; 1c66
-	push hl
-	push de
-	push bc
+	ld a, [hMapAnims]
 	push af
-	ld hl, wMenuData2Pointer
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	ld de, wMenuData2Flags
-	ld bc, wMenuData2End - wMenuData2Flags
-	call CopyBytes
+	xor a
+	ld [hMapAnims], a
+
+.wait
+	ld a, [rLY]
+	cp $7f
+	jr c, .wait
+
+	di
+	ld a, BANK(vTiles3)
+	ld [rVBK], a
+	hlcoord 0, 0, wAttrMap
+	call .StackPointerMagic
+	ld a, BANK(vTiles0)
+	ld [rVBK], a
+	hlcoord 0, 0
+	call .StackPointerMagic
+
+.wait2
+	ld a, [rLY]
+	cp $7f
+	jr c, .wait2
+	ei
+
 	pop af
-	pop bc
-	pop de
-	pop hl
+	ld [hMapAnims], a
+	pop af
+	ld [hBGMapMode], a
 	ret
-; 1c7e
 
-GetWindowStackTop:: ; 1c7e
-	ld hl, wWindowStackPointer
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	inc hl
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-	ret
-; 1c89
-
-PlaceVerticalMenuItems:: ; 1c89
-	call CopyMenuData2
-	ld hl, wMenuData2Pointer
-	ld e, [hl]
-	inc hl
-	ld d, [hl]
-	call GetMenuTextStartCoord
-	call Coord2Tile ; hl now contains the tilemap address where we will start printing text.
-	inc de
-	ld a, [de] ; Number of items
-	inc de
-	ld b, a
+.StackPointerMagic:
+; Copy all tiles to vBGMap
+	ld [hSPBuffer], sp
+	ld sp, hl
+	ld a, [hBGMapAddress + 1]
+	ld h, a
+	ld l, 0
+	ld a, SCREEN_HEIGHT
+	ld [hTilesPerCycle], a
+	ld b, 1 << 1 ; not in v/hblank
+	ld c, LOW(rSTAT)
+
 .loop
-	push bc
-	call PlaceString
-	inc de
-	ld bc, 2 * SCREEN_WIDTH
-	add hl, bc
-	pop bc
-	dec b
+rept SCREEN_WIDTH / 2
+	pop de
+; if in v/hblank, wait until not in v/hblank
+.loop\@
+	ld a, [$ff00+c]
+	and b
+	jr nz, .loop\@
+; load BGMap0
+	ld [hl], e
+	inc l
+	ld [hl], d
+	inc l
+endr
+
+	ld de, BG_MAP_WIDTH - SCREEN_WIDTH
+	add hl, de
+	ld a, [hTilesPerCycle]
+	dec a
+	ld [hTilesPerCycle], a
 	jr nz, .loop
 
-	ld a, [wMenuData2Flags]
-	bit 4, a
-	ret z
-
-	call MenuBoxCoord2Tile
-	ld a, [de]
-	ld c, a
-	inc de
-	ld b, $0
-	add hl, bc
-	jp PlaceString
-; 1cbb
-
-MenuBox:: ; 1cbb
-	call MenuBoxCoord2Tile
-	call GetMenuBoxDims
-	dec b
-	dec c
-	jp TextBox
-; 1cc6
-
-GetMenuTextStartCoord:: ; 1cc6
-	ld a, [wMenuBorderTopCoord]
-	ld b, a
-	inc b
-	ld a, [wMenuBorderLeftCoord]
-	ld c, a
-	inc c
-; bit 6: if not set, leave extra room on top
-	ld a, [wMenuData2Flags]
-	bit 6, a
-	jr nz, .bit_6_set
-	inc b
-
-.bit_6_set
-; bit 7: if set, leave extra room on the left
-	ld a, [wMenuData2Flags]
-	bit 7, a
-	jr z, .bit_7_clear
-	inc c
-
-.bit_7_clear
-	ret
-; 1ce1
-
-ClearMenuBoxInterior:: ; 1ce1
-	call MenuBoxCoord2Tile
-	ld bc, SCREEN_WIDTH + 1
-	add hl, bc
-	call GetMenuBoxDims
-	dec b
-	dec c
-	call ClearBox
+	ld a, [hSPBuffer]
+	ld l, a
+	ld a, [hSPBuffer + 1]
+	ld h, a
+	ld sp, hl
 	ret
-; 1cf1
-
-ClearWholeMenuBox:: ; 1cf1
-	call MenuBoxCoord2Tile
-	call GetMenuBoxDims
-	inc c
-	inc b
-	call ClearBox
+
+SetPalettes::
+; Inits the Palettes
+; depending on the system the monochromes palettes or color palettes
+	ld a, [hCGB]
+	and a
+	jr nz, .SetPalettesForGameBoyColor
+	ld a, %11100100
+	ld [rBGP], a
+	ld a, %11010000
+	ld [rOBP0], a
+	ld [rOBP1], a
 	ret
-; 1cfd
 
+.SetPalettesForGameBoyColor:
+	push de
+	ld a, %11100100
+	call DmgToCgbBGPals
+	lb de, %11100100, %11100100
+	call DmgToCgbObjPals
+	pop de
+	ret
 
-MenuBoxCoord2Tile:: ; 1cfd
-	ld a, [wMenuBorderLeftCoord]
-	ld c, a
-	ld a, [wMenuBorderTopCoord]
-	ld b, a
-; 1d05
+ClearPalettes::
+; Make all palettes white
 
+; CGB: make all the palette colors white
+	ld a, [hCGB]
+	and a
+	jr nz, .cgb
 
-Coord2Tile:: ; 1d05
-; Return the address of wTileMap(c, b) in hl.
-	xor a
-	ld h, a
-	ld l, b
-	ld a, c
-	ld b, h
-	ld c, l
-	add hl, hl
-	add hl, hl
-	add hl, bc
-	add hl, hl
-	add hl, hl
-	ld c, a
+; DMG: just change palettes to 0 (white)
 	xor a
-	ld b, a
-	add hl, bc
-	bccoord 0, 0
-	add hl, bc
+	ld [rBGP], a
+	ld [rOBP0], a
+	ld [rOBP1], a
 	ret
-; 1d19
 
-MenuBoxCoord2Attr:: ; 1d19
-	ld a, [wMenuBorderLeftCoord]
-	ld c, a
-	ld a, [wMenuBorderTopCoord]
-	ld b, a
+.cgb
+	ld a, [rSVBK]
+	push af
 
-Coord2Attr:: ; 1d21
-; Return the address of wAttrMap(c, b) in hl.
-	xor a
-	ld h, a
-	ld l, b
-	ld a, c
-	ld b, h
-	ld c, l
-	add hl, hl
-	add hl, hl
-	add hl, bc
-	add hl, hl
-	add hl, hl
-	ld c, a
-	xor a
-	ld b, a
-	add hl, bc
-	bccoord 0, 0, wAttrMap
-	add hl, bc
+	ld a, BANK(wBGPals2)
+	ld [rSVBK], a
+
+; Fill wBGPals2 and wOBPals2 with $ffff (white)
+	ld hl, wBGPals2
+	ld bc, 16 palettes
+	ld a, $ff
+	call ByteFill
+
+	pop af
+	ld [rSVBK], a
+
+; Request palette update
+	ld a, 1
+	ld [hCGBPalUpdate], a
 	ret
-; 1d35
+
+GetMemSGBLayout::
+	ld b, SCGB_RAM
+GetSGBLayout::
+; load sgb packets unless dmg
+
+	ld a, [hCGB]
+	and a
+	jr nz, .sgb
+
+	ld a, [hSGB]
+	and a
+	ret z
+
+.sgb
+	predef_jump LoadSGBLayout
diff --git a/home/time.asm b/home/time.asm
index 5ede49173..caf857a68 100644
--- a/home/time.asm
+++ b/home/time.asm
@@ -1,7 +1,6 @@
 ; Functions relating to the timer interrupt and the real-time-clock.
 
-
-AskTimer:: ; 591
+AskTimer::
 	push af
 	ld a, [hMobile]
 	and a
@@ -11,29 +10,23 @@ AskTimer:: ; 591
 .not_mobile
 	pop af
 	reti
-; 59c
-
 
-LatchClock:: ; 59c
+LatchClock::
 ; latch clock counter data
 	ld a, 0
 	ld [MBC3LatchClock], a
 	ld a, 1
 	ld [MBC3LatchClock], a
 	ret
-; 5a7
-
 
-UpdateTime:: ; 5a7
+UpdateTime::
 	call GetClock
 	call FixDays
 	call FixTime
 	farcall GetTimeOfDay
 	ret
-; 5b7
 
-
-GetClock:: ; 5b7
+GetClock::
 ; store clock data in hRTCDayHi-hRTCSeconds
 
 ; enable clock r/w
@@ -72,10 +65,8 @@ GetClock:: ; 5b7
 ; unlatch clock / disable clock r/w
 	call CloseSRAM
 	ret
-; 5e8
-
 
-FixDays:: ; 5e8
+FixDays::
 ; fix day count
 ; mod by 140
 
@@ -134,10 +125,8 @@ FixDays:: ; 5e8
 .quit
 	xor a
 	ret
-; 61d
 
-
-FixTime:: ; 61d
+FixTime::
 ; add ingame time (set at newgame) to current time
 ;				  day     hr    min    sec
 ; store time in wCurDay, hHours, hMinutes, hSeconds
@@ -185,16 +174,15 @@ FixTime:: ; 61d
 	adc c
 	ld [wCurDay], a
 	ret
-; 658
 
-SetTimeOfDay:: ; 658
+InitTimeOfDay::
 	xor a
 	ld [wStringBuffer2], a
 	ld a, $0 ; useless
 	ld [wStringBuffer2 + 3], a
 	jr InitTime
 
-SetDayOfWeek:: ; 663
+InitDayOfWeek::
 	call UpdateTime
 	ld a, [hHours]
 	ld [wStringBuffer2 + 1], a
@@ -204,20 +192,16 @@ SetDayOfWeek:: ; 663
 	ld [wStringBuffer2 + 3], a
 	jr InitTime ; useless
 
-InitTime:: ; 677
+InitTime::
 	farcall _InitTime
 	ret
-; 67e
-
-
 
-PanicResetClock:: ; 67e
+PanicResetClock::
 	call .ClearhRTC
 	call SetClock
 	ret
-; 685
 
-.ClearhRTC: ; 685
+.ClearhRTC:
 	xor a
 	ld [hRTCSeconds], a
 	ld [hRTCMinutes], a
@@ -225,10 +209,8 @@ PanicResetClock:: ; 67e
 	ld [hRTCDayLo], a
 	ld [hRTCDayHi], a
 	ret
-; 691
 
-
-SetClock:: ; 691
+SetClock::
 ; set clock data from hram
 
 ; enable clock r/w
@@ -274,10 +256,8 @@ SetClock:: ; 691
 ; cleanup
 	call CloseSRAM ; unlatch clock, disable clock r/w
 	ret
-; 6c4
-
 
-ClearRTCStatus:: ; 6c4
+ClearRTCStatus::
 ; clear sRTCStatusFlags
 	xor a
 	push af
@@ -287,9 +267,8 @@ ClearRTCStatus:: ; 6c4
 	ld [sRTCStatusFlags], a
 	call CloseSRAM
 	ret
-; 6d3
 
-RecordRTCStatus:: ; 6d3
+RecordRTCStatus::
 ; append flags to sRTCStatusFlags
 	ld hl, sRTCStatusFlags
 	push af
@@ -300,13 +279,11 @@ RecordRTCStatus:: ; 6d3
 	ld [hl], a
 	call CloseSRAM
 	ret
-; 6e3
 
-CheckRTCStatus:: ; 6e3
+CheckRTCStatus::
 ; check sRTCStatusFlags
 	ld a, BANK(sRTCStatusFlags)
 	call GetSRAMBank
 	ld a, [sRTCStatusFlags]
 	call CloseSRAM
 	ret
-; 6ef
diff --git a/home/trainers.asm b/home/trainers.asm
index 575af65a7..5def6cf17 100644
--- a/home/trainers.asm
+++ b/home/trainers.asm
@@ -1,4 +1,4 @@
-CheckTrainerBattle2:: ; 3600
+CheckTrainerBattle2::
 	ld a, [hROMBank]
 	push af
 
@@ -9,9 +9,8 @@ CheckTrainerBattle2:: ; 3600
 	ld a, b
 	rst Bankswitch
 	ret
-; 360d
 
-CheckTrainerBattle:: ; 360d
+CheckTrainerBattle::
 ; Check if any trainer on the map sees the player and wants to battle.
 
 ; Skip the player object.
@@ -21,7 +20,6 @@ CheckTrainerBattle:: ; 360d
 .loop
 
 ; Start a battle if the object:
-
 	push af
 	push de
 
@@ -101,15 +99,14 @@ CheckTrainerBattle:: ; 360d
 	ld a, c
 	ld [wEngineBuffer3], a
 	jr LoadTrainer_continue
-; 3674
 
-TalkToTrainer:: ; 3674
+TalkToTrainer::
 	ld a, 1
 	ld [wEngineBuffer2], a
 	ld a, -1
 	ld [wEngineBuffer3], a
 
-LoadTrainer_continue:: ; 367e
+LoadTrainer_continue::
 	call GetMapScriptsBank
 	ld [wEngineBuffer1], a
 
@@ -128,19 +125,16 @@ LoadTrainer_continue:: ; 367e
 	ld [wRunningTrainerBattleScript], a
 	scf
 	ret
-; 36a5
-
-FacingPlayerDistance_bc:: ; 36a5
 
+FacingPlayerDistance_bc::
 	push de
 	call FacingPlayerDistance
 	ld b, d
 	ld c, e
 	pop de
 	ret
-; 36ad
 
-FacingPlayerDistance:: ; 36ad
+FacingPlayerDistance::
 ; Return carry if the sprite at bc is facing the player,
 ; and its distance in d.
 
@@ -208,9 +202,8 @@ FacingPlayerDistance:: ; 36ad
 .NotFacing:
 	and a
 	ret
-; 36f5
 
-CheckTrainerFlag:: ; 36f5
+CheckTrainerFlag::
 	push bc
 	ld hl, OBJECT_MAP_OBJECT_INDEX
 	add hl, bc
@@ -233,9 +226,8 @@ CheckTrainerFlag:: ; 36f5
 	and a
 	pop bc
 	ret
-; 3718
 
-PrintWinLossText:: ; 3718
+PrintWinLossText::
 	ld a, [wBattleType]
 	cp BATTLETYPE_CANLOSE
 	jr .canlose ; ??????????
@@ -247,7 +239,7 @@ PrintWinLossText:: ; 3718
 .canlose
 	ld a, [wBattleResult]
 	ld hl, wWinTextPointer
-	and $f
+	and $f ; WIN?
 	jr z, .ok
 	ld hl, wLossTextPointer
 
@@ -260,4 +252,3 @@ PrintWinLossText:: ; 3718
 	call WaitBGMap
 	call WaitPressAorB_BlinkCursor
 	ret
-; 3741
diff --git a/home/vblank.asm b/home/vblank.asm
index 3b33b1ec5..5e87dbcdf 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -6,8 +6,7 @@
 
 ; This prevents the display and audio output from lagging.
 
-
-VBlank:: ; 283
+VBlank::
 	push af
 	push bc
 	push de
@@ -34,9 +33,8 @@ VBlank:: ; 283
 	pop bc
 	pop af
 	reti
-; 2a1
 
-.VBlanks: ; 2a1
+.VBlanks:
 	dw VBlank0
 	dw VBlank1
 	dw VBlank2
@@ -45,10 +43,8 @@ VBlank:: ; 283
 	dw VBlank5
 	dw VBlank6
 	dw VBlank0 ; just in case
-; 2b1
-
 
-VBlank0:: ; 2b1
+VBlank0::
 ; normal operation
 
 ; rng
@@ -116,7 +112,6 @@ VBlank0:: ; 2b1
 	call hTransferVirtualOAM
 .done_oam
 
-
 	; vblank-sensitive operations are done
 
 	xor a
@@ -148,10 +143,8 @@ VBlank0:: ; 2b1
 	ld [hSecondsBackup], a
 
 	ret
-; 325
 
-
-VBlank2:: ; 325
+VBlank2::
 ; sound only
 
 	ld a, [hROMBank]
@@ -167,10 +160,8 @@ VBlank2:: ; 325
 	xor a
 	ld [wVBlankOccurred], a
 	ret
-; 337
-
 
-VBlank1:: ; 337
+VBlank1::
 ; scx, scy
 ; palettes
 ; bg map
@@ -235,10 +226,8 @@ VBlank1:: ; 337
 	ld a, b
 	ld [rIF], a
 	ret
-; 37f
 
-
-UpdatePals:: ; 37f
+UpdatePals::
 ; update pals for either dmg or cgb
 
 	ld a, [hCGB]
@@ -255,10 +244,8 @@ UpdatePals:: ; 37f
 
 	and a
 	ret
-; 396
-
 
-VBlank3:: ; 396
+VBlank3::
 ; scx, scy
 ; palettes
 ; bg map
@@ -321,10 +308,8 @@ VBlank3:: ; 396
 	ld a, b
 	ld [rIF], a
 	ret
-; 3df
-
 
-VBlank4:: ; 3df
+VBlank4::
 ; bg map
 ; tiles
 ; oam
@@ -354,10 +339,8 @@ VBlank4:: ; 3df
 	ld a, [hROMBankBackup]
 	rst Bankswitch
 	ret
-; 400
 
-
-VBlank5:: ; 400
+VBlank5::
 ; scx
 ; palettes
 ; bg map
@@ -404,10 +387,8 @@ VBlank5:: ; 400
 	ld a, %1111 ; serial timer lcdstat vblank
 	ld [rIE], a
 	ret
-; 436
-
 
-VBlank6:: ; 436
+VBlank6::
 ; palettes
 ; tiles
 ; dma transfer
@@ -438,4 +419,3 @@ VBlank6:: ; 436
 	ld a, [hROMBankBackup]
 	rst Bankswitch
 	ret
-; 45a
diff --git a/home/video.asm b/home/video.asm
index 1066197ff..4b519fca0 100644
--- a/home/video.asm
+++ b/home/video.asm
@@ -1,6 +1,6 @@
 ; Functions dealing with VRAM.
 
-DMATransfer:: ; 15d8
+DMATransfer::
 ; Return carry if the transfer is completed.
 
 	ld a, [hDMATransfer]
@@ -16,10 +16,8 @@ DMATransfer:: ; 15d8
 	ld [hDMATransfer], a
 	scf
 	ret
-; 15e3
 
-
-UpdateBGMapBuffer:: ; 15e3
+UpdateBGMapBuffer::
 ; Copy [hBGMapTileCount] 16x8 tiles from wBGMapBuffer
 ; to bg map addresses in wBGMapBufferPtrs.
 
@@ -43,7 +41,6 @@ UpdateBGMapBuffer:: ; 15e3
 	ld hl, wBGMapPalBuffer
 	ld de, wBGMapBuffer
 
-
 .next
 ; Copy a pair of 16x8 blocks (one 16x16 block)
 
@@ -83,7 +80,6 @@ endr
 
 	jr nz, .next
 
-
 	ld a, [hSPBuffer]
 	ld l, a
 	ld a, [hSPBuffer + 1]
@@ -97,10 +93,8 @@ endr
 	ld [hBGMapUpdate], a
 	scf
 	ret
-; 163a
 
-
-WaitTop:: ; 163a
+WaitTop::
 ; Wait until the top third of the BG Map is being updated.
 
 	ld a, [hBGMapMode]
@@ -118,10 +112,8 @@ WaitTop:: ; 163a
 	xor a
 	ld [hBGMapMode], a
 	ret
-; 164c
-
 
-UpdateBGMap:: ; 164c
+UpdateBGMap::
 ; Update the BG Map, in thirds, from wTileMap and wAttrMap.
 
 	ld a, [hBGMapMode]
@@ -163,7 +155,6 @@ UpdateBGMap:: ; 164c
 	ld [hBGMapAddress + 1], a
 	ret
 
-
 .Attr:
 	ld a, 1
 	ld [rVBK], a
@@ -175,11 +166,9 @@ UpdateBGMap:: ; 164c
 	ld [rVBK], a
 	ret
 
-
 .Tiles:
 	hlcoord 0, 0
 
-
 .update
 	ld [hSPBuffer], sp
 
@@ -191,10 +180,8 @@ UpdateBGMap:: ; 164c
 	jr z, .middle
 	; 2
 
-
 THIRD_HEIGHT EQU SCREEN_HEIGHT / 3
 
-
 .bottom
 	ld de, 2 * THIRD_HEIGHT * SCREEN_WIDTH
 	add hl, de
@@ -212,7 +199,6 @@ THIRD_HEIGHT EQU SCREEN_HEIGHT / 3
 	xor a
 	jr .start
 
-
 .middle
 	ld de, THIRD_HEIGHT * SCREEN_WIDTH
 	add hl, de
@@ -230,7 +216,6 @@ THIRD_HEIGHT EQU SCREEN_HEIGHT / 3
 	ld a, 2
 	jr .start
 
-
 .top
 	ld sp, hl
 
@@ -242,7 +227,6 @@ THIRD_HEIGHT EQU SCREEN_HEIGHT / 3
 ; Next time: middle third
 	ld a, 1
 
-
 .start
 ; Which third to update next time
 	ld [hBGMapThird], a
@@ -253,7 +237,6 @@ THIRD_HEIGHT EQU SCREEN_HEIGHT / 3
 ; Discrepancy between wTileMap and BGMap
 	ld bc, BG_MAP_WIDTH - (SCREEN_WIDTH - 1)
 
-
 .row
 ; Copy a row of 20 tiles
 rept SCREEN_WIDTH / 2 - 1
@@ -272,17 +255,14 @@ endr
 	dec a
 	jr nz, .row
 
-
 	ld a, [hSPBuffer]
 	ld l, a
 	ld a, [hSPBuffer + 1]
 	ld h, a
 	ld sp, hl
 	ret
-; 170a
-
 
-Serve1bppRequest:: ; 170a
+Serve1bppRequest::
 ; Only call during the first fifth of VBlank
 
 	ld a, [wRequested1bpp]
@@ -346,7 +326,6 @@ endr
 	dec b
 	jr nz, .next
 
-
 	ld a, l
 	ld [wRequested1bppDest], a
 	ld a, h
@@ -360,10 +339,8 @@ endr
 	ld h, a
 	ld sp, hl
 	ret
-; 1769
 
-
-Serve2bppRequest:: ; 1769
+Serve2bppRequest::
 ; Only call during the first fifth of VBlank
 
 	ld a, [wRequested2bpp]
@@ -378,14 +355,12 @@ Serve2bppRequest:: ; 1769
 	ret nc
 	jr _Serve2bppRequest
 
-
-Serve2bppRequest_VBlank:: ; 1778
-
+Serve2bppRequest_VBlank::
 	ld a, [wRequested2bpp]
 	and a
 	ret z
 
-_Serve2bppRequest:: ; 177d
+_Serve2bppRequest::
 ; Copy [wRequested2bpp] 2bpp tiles from [wRequested2bppSource] to [wRequested2bppDest]
 
 	ld [hSPBuffer], sp
@@ -428,7 +403,6 @@ endr
 	dec b
 	jr nz, .next
 
-
 	ld a, l
 	ld [wRequested2bppDest], a
 	ld a, h
@@ -442,10 +416,8 @@ endr
 	ld h, a
 	ld sp, hl
 	ret
-; 17d3
-
 
-AnimateTileset:: ; 17d3
+AnimateTileset::
 ; Only call during the first fifth of VBlank
 
 	ld a, [hMapAnims]
@@ -483,4 +455,3 @@ AnimateTileset:: ; 17d3
 	pop af
 	rst Bankswitch
 	ret
-; 17ff
diff --git a/home/window.asm b/home/window.asm
index 2d7c22569..6d9bd5311 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -1,5 +1,4 @@
-RefreshScreen:: ; 2dba
-
+RefreshScreen::
 	call ClearWindowData
 	ld a, [hROMBank]
 	push af
@@ -13,10 +12,8 @@ RefreshScreen:: ; 2dba
 	pop af
 	rst Bankswitch
 	ret
-; 2dcf
-
 
-CloseText:: ; 2dcf
+CloseText::
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -29,9 +26,8 @@ CloseText:: ; 2dcf
 	ld hl, wVramState
 	res 6, [hl]
 	ret
-; 2de2
 
-.CloseText: ; 2de2
+.CloseText:
 	call ClearWindowData
 	xor a
 	ld [hBGMapMode], a
@@ -46,9 +42,8 @@ CloseText:: ; 2dcf
 	farcall ReturnFromMapSetupScript
 	farcall LoadOverworldFont
 	ret
-; 2e08
 
-OpenText:: ; 2e08
+OpenText::
 	call ClearWindowData
 	ld a, [hROMBank]
 	push af
@@ -63,9 +58,8 @@ OpenText:: ; 2e08
 	rst Bankswitch
 
 	ret
-; 2e20
 
-_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 2e20
+_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap::
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -76,9 +70,8 @@ _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 2e20
 	pop af
 	ld [hOAMUpdate], a
 	ret
-; 2e31
 
-SafeUpdateSprites:: ; 2e31
+SafeUpdateSprites::
 	ld a, [hOAMUpdate]
 	push af
 	ld a, [hBGMapMode]
@@ -102,4 +95,3 @@ SafeUpdateSprites:: ; 2e31
 ; unused
 	scf
 	ret
-; 2e50
diff --git a/hram.asm b/hram.asm
index d86fb3957..47d6f954a 100644
--- a/hram.asm
+++ b/hram.asm
@@ -129,3 +129,4 @@ hDMATransfer       EQU $ffe8
 hMobile            EQU $ffe9
 hSystemBooted      EQU $ffea
 hClockResetTrigger EQU $ffeb
+hFFEC              EQU $ffec
diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm
index fc4ae2883..a0f58cfa4 100644
--- a/lib/mobile/main.asm
+++ b/lib/mobile/main.asm
@@ -7,7 +7,7 @@ INCLUDE "constants/hardware_constants.asm"
 
 SECTION "Mobile Adapter SDK", ROMX
 
-Function110000: ; 110000 (44:4000)
+Function110000:
 ; Copy b bytes from hl to de
 .loop
 	ld a, [hli]
@@ -16,9 +16,8 @@ Function110000: ; 110000 (44:4000)
 	dec b
 	jr nz, .loop
 	ret
-; 110007 (44:4007)
 
-Function110007: ; 110007
+Function110007:
 ; Copy bytes from hl to de until a 0 is encountered.
 ; Include the 0 in the copy, and count the number of
 ; nonzero bytes copied.  Keep the de pointer at the
@@ -31,9 +30,8 @@ Function110007: ; 110007
 	inc de
 	inc bc
 	jr .loop
-; 11000f
 
-Function11000f: ; 11000f
+Function11000f:
 ; Copy bytes from hl to de until a 0 is encountered,
 ; or a bytes have been copied, whichever comes first.
 ; Add the byte count to the count previously stored
@@ -60,12 +58,11 @@ Function11000f: ; 11000f
 	add c
 	ld c, a
 	ld a, b
-	adc $0
+	adc 0
 	ld b, a
 	ret
-; 110029
 
-Function110029: ; 110029 (44:4029)
+Function110029:
 ; Clear two bytes at $ca3a.
 	xor a
 	ld hl, $ca3a
@@ -73,7 +70,7 @@ Function110029: ; 110029 (44:4029)
 	ld [hl], a
 	ret
 
-Function110030:: ; 110030 (44:4030)
+Function110030::
 ; Use the byte at $c988 as a parameter
 ; for a dw.
 ; If [$c988] not in {12, 14, 16},
@@ -121,9 +118,8 @@ Function110030:: ; 110030 (44:4030)
 	ld h, [hl]
 	ld l, a
 	ret ; indirectly jump to the function loaded from the dw, which returns to Function3e60.
-; 110070 (44:4070)
 
-.dw ; 110070
+.dw
 	dw Function110115
 	dw Function110236
 	dw Function110291
@@ -158,9 +154,8 @@ Function110030:: ; 110030 (44:4030)
 	dw Function1103ac
 	dw Function110235
 	dw Function111540
-; 1100b4
 
-Function1100b4: ; 1100b4 (44:40b4)
+Function1100b4:
 	push bc
 .loop
 	di
@@ -187,9 +182,8 @@ Function1100b4: ; 1100b4 (44:40b4)
 .done
 	pop bc
 	ret
-; 1100dc (44:40dc)
 
-Function1100dc: ; 1100dc
+Function1100dc:
 	xor a
 	ld [rTAC], a
 	ld e, c
@@ -225,9 +219,8 @@ Function1100dc: ; 1100dc
 	ld a, $6
 	ld [$ff00+c], a
 	ret
-; 110115
 
-Function110115: ; 110115
+Function110115:
 	ld hl, $c821
 	bit 1, [hl]
 	jr nz, .asm_110120
@@ -384,27 +377,24 @@ Function110115: ; 110115
 	ld h, [hl]
 	ld l, a
 	jp .asm_11015b
-; 110226
 
-Function110226: ; 110226 (44:4226)
+Function110226:
 	ld a, $21
 
-Function110228: ; 110228
+Function110228:
 	ld [$c80f], a
 	ld hl, $c821
 	set 1, [hl]
 	ret
-; 110231 (44:4231)
 
-Function110231: ; 110231
+Function110231:
 	ld a, $20
 	jr Function110228
-; 110235
 
-Function110235: ; 110235
+Function110235:
 	nop
 
-Function110236: ; 110236
+Function110236:
 	ld a, [$c988]
 	push af
 	push bc
@@ -459,9 +449,8 @@ Function110236: ; 110236
 .asm_11028b
 	ld [$c86a], a
 	jp Function110432
-; 110291
 
-Function110291: ; 110291
+Function110291:
 	ld a, [$c821]
 	bit 1, a
 	jr z, .asm_1102a6
@@ -554,9 +543,8 @@ Function110291: ; 110291
 	res 1, [hl]
 	set 0, [hl]
 	ret
-; 11032c
 
-Function11032c: ; 11032c
+Function11032c:
 	ld a, [$c821]
 	bit 1, a
 	jp nz, Function110226
@@ -613,17 +601,15 @@ Function11032c: ; 11032c
 	ld a, $2d
 	ld [$c86a], a
 	jp Function110432
-; 110393
 
-Function110393: ; 110393
+Function110393:
 	ld c, LOW(rIE)
 	ld a, [$ff00+c]
 	or $c
 	ld [$ff00+c], a
 	ret
-; 11039a
 
-Function11039a: ; 11039a
+Function11039a:
 	ld b, $0
 .asm_11039c
 	inc b
@@ -642,9 +628,8 @@ Function11039a: ; 11039a
 .asm_1103aa
 	scf
 	ret
-; 1103ac
 
-Function1103ac: ; 1103ac
+Function1103ac:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -713,13 +698,12 @@ Function1103ac: ; 1103ac
 	ld a, $b
 	ld [$c86a], a
 
-Function110432: ; 110432
+Function110432:
 	ld hl, $c821
 	set 0, [hl]
 	ret
-; 110438
 
-Function110438: ; 110438
+Function110438:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -759,9 +743,8 @@ Function110438: ; 110438
 	ld a, $c
 	ld [$c86a], a
 	jr Function110432
-; 110485
 
-Function110485: ; 110485
+Function110485:
 	ld de, $cb47
 	ld hl, Unknown_11201d
 	ld b, $6
@@ -787,9 +770,8 @@ Function110485: ; 110485
 	ld a, c
 	ld [$cb4c], a
 	ret
-; 1104b0
 
-Function1104b0: ; 1104b0
+Function1104b0:
 	xor a
 	ld [$c81e], a
 	call Function110393
@@ -799,9 +781,8 @@ Function1104b0: ; 1104b0
 	ld hl, Unknown_112000
 	ld b, $1
 	jp Function111f07
-; 1104c6
 
-Function1104c6: ; 1104c6
+Function1104c6:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -886,33 +867,29 @@ Function1104c6: ; 1104c6
 	ld a, $e
 	ld [$c86a], a
 	jp Function110432
-; 110578
 
-Function110578: ; 110578
+Function110578:
 	ld b, $25
 	call Function110596
 	or a
 	jp nz, Function1135ba
 	ret
-; 110582
 
-Function110582: ; 110582
+Function110582:
 	ld b, $26
 	call Function110596
 	or a
 	jp nz, Function11359d
 	ret
-; 11058c
 
-Function11058c: ; 11058c
+Function11058c:
 	ld b, $27
 	call Function110596
 	or a
 	jp nz, Function1135ad
 	ret
-; 110596
 
-Function110596: ; 110596
+Function110596:
 	ld a, [$c821]
 	bit 0, a
 	jr nz, .asm_1105d9
@@ -949,9 +926,8 @@ Function110596: ; 110596
 .asm_1105d9
 	pop hl
 	jp Function110226
-; 1105dd
 
-Function1105dd: ; 1105dd
+Function1105dd:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -979,9 +955,8 @@ Function1105dd: ; 1105dd
 	ld a, $d
 	ld [$c86a], a
 	jp Function110432
-; 110615
 
-Function110615: ; 110615
+Function110615:
 	ld b, $15
 	ld [$c86e], a
 	or a
@@ -1102,9 +1077,8 @@ Function110615: ; 110615
 	ld a, $50
 	ld b, $40
 	jp .asm_110631
-; 1106ef
 
-Function1106ef: ; 1106ef
+Function1106ef:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -1158,9 +1132,8 @@ Function1106ef: ; 1106ef
 	call Function11295e
 	ld a, $0
 	jp Function110615
-; 110757
 
-Function110757: ; 110757
+Function110757:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -1243,9 +1216,8 @@ Function110757: ; 110757
 .asm_1107fb
 	pop hl
 	jp Function110231
-; 1107ff
 
-Function1107ff: ; 1107ff
+Function1107ff:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -1315,21 +1287,19 @@ Function1107ff: ; 1107ff
 	ld a, $16
 	ld [$c86a], a
 	jp Function110432
-; 110899
 
-Function110899: ; 110899
+Function110899:
 	ld a, [$c86a]
 	cp $3
 	jp nz, Function110226
 	jr Function1108ab
-; 1108a3
 
-Function1108a3: ; 1108a3
+Function1108a3:
 	ld a, [$c86a]
 	cp $4
 	jp nz, Function110226
 
-Function1108ab: ; 1108ab
+Function1108ab:
 	ld hl, $c821
 	bit 0, [hl]
 	jp nz, Function110226
@@ -1368,9 +1338,8 @@ Function1108ab: ; 1108ab
 	ld a, $17
 	ld [$c86a], a
 	jp Function110432
-; 110905
 
-Function110905: ; 110905
+Function110905:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -1450,9 +1419,8 @@ Function110905: ; 110905
 	call Function110000
 	ld a, $1
 	jp Function110615
-; 1109a4
 
-Function1109a4: ; 1109a4
+Function1109a4:
 	ld hl, $c821
 	bit 0, [hl]
 	jp nz, Function110226
@@ -1489,9 +1457,8 @@ Function1109a4: ; 1109a4
 	ld a, $18
 	ld [$c86a], a
 	jp Function110432
-; 1109f9
 
-Function1109f9: ; 1109f9
+Function1109f9:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -1535,9 +1502,8 @@ Function1109f9: ; 1109f9
 	ld a, $1d
 	ld [$c86a], a
 	jp Function110432
-; 110a5b
 
-Function110a5b: ; 110a5b
+Function110a5b:
 	ld a, [$c821]
 	bit 2, a
 	jr z, .asm_110a6d
@@ -1620,9 +1586,8 @@ Function110a5b: ; 110a5b
 	ld a, $1a
 	ld [$c86a], a
 	jp Function110432
-; 110af4
 
-Function110af4: ; 110af4
+Function110af4:
 	ld hl, $c827
 	ld a, e
 	ld [hli], a
@@ -1667,7 +1632,7 @@ Function110af4: ; 110af4
 	add c
 	ld [hli], a
 	ld a, b
-	adc $0
+	adc 0
 	ld [hl], a
 	xor a
 	ld [$c993], a
@@ -1708,8 +1673,8 @@ Function110af4: ; 110af4
 	ld a, [$c993]
 	add e
 	ld [hli], a
-	ld a, $0
-	adc $0
+	ld a, 0
+	adc 0
 	ld [hl], a
 	xor a
 	ld [$c993], a
@@ -1832,9 +1797,8 @@ Function110af4: ; 110af4
 	ld e, a
 	pop hl
 	jp .asm_110b1c
-; 110c3c
 
-Function110c3c: ; 110c3c
+Function110c3c:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -1878,9 +1842,8 @@ Function110c3c: ; 110c3c
 	ld a, $1b
 	ld [$c86a], a
 	jp Function110432
-; 110c9e
 
-Function110c9e: ; 110c9e
+Function110c9e:
 	ld a, [$c821]
 	bit 2, a
 	jr z, .asm_110cb0
@@ -1963,9 +1926,8 @@ Function110c9e: ; 110c9e
 	ld a, $1c
 	ld [$c86a], a
 	jp Function110432
-; 110d37
 
-Function110d37: ; 110d37
+Function110d37:
 	push bc
 	push de
 	ld b, 0
@@ -2100,9 +2062,8 @@ Function110d37: ; 110d37
 	cp $a
 	jr nz, .last_loop
 	ret
-; 110ddd
 
-Function110ddd: ; 110ddd
+Function110ddd:
 	ld a, [$c821]
 	bit 2, a
 	ld a, [$c86a]
@@ -2169,7 +2130,7 @@ Function110ddd: ; 110ddd
 	push de
 	push bc
 	push hl
-	ld b, URIPrefixEnd - URIPrefix
+	ld b, URIPrefix.End - URIPrefix
 	ld de, URIPrefix
 .asm_110e53
 	ld a, [de]
@@ -2180,7 +2141,7 @@ Function110ddd: ; 110ddd
 	dec b
 	jr nz, .asm_110e53
 	push hl
-	ld b, HTTPUploadURLEnd - HTTPUploadURL
+	ld b, HTTPUploadURL.End - HTTPUploadURL
 	ld c, $0
 	ld de, HTTPUploadURL
 .asm_110e64
@@ -2197,7 +2158,7 @@ Function110ddd: ; 110ddd
 .asm_110e70
 	pop hl
 	push hl
-	ld b, HTTPRankingURLEnd - HTTPRankingURL
+	ld b, HTTPRankingURL.End - HTTPRankingURL
 	ld c, $0
 	ld de, HTTPRankingURL
 .asm_110e79
@@ -2214,7 +2175,7 @@ Function110ddd: ; 110ddd
 .asm_110e86
 	pop hl
 	push hl
-	ld b, HTTPUtilityURLEnd - HTTPUtilityURL
+	ld b, HTTPUtilityURL.End - HTTPUtilityURL
 	ld c, $0
 	ld de, HTTPUtilityURL
 .asm_110e8f
@@ -2233,7 +2194,7 @@ Function110ddd: ; 110ddd
 
 .asm_110ea2
 	pop hl
-	ld b, HTTPDownloadURLEnd - HTTPDownloadURL
+	ld b, HTTPDownloadURL.End - HTTPDownloadURL
 	ld c, $0
 	ld de, HTTPDownloadURL
 .asm_110eaa
@@ -2300,7 +2261,7 @@ Function110ddd: ; 110ddd
 	xor a
 	ld [$c994], a
 
-Function110f07: ; 110f07
+Function110f07:
 	ld hl, $c833
 	ld a, [hli]
 	ld h, [hl]
@@ -2387,29 +2348,28 @@ Function110f07: ; 110f07
 	ld a, $f
 	ld [$c86a], a
 	jp Function110432
-; 110fad
 
-URIPrefix: ; 0x110fad
+URIPrefix:
 	db "http://"
-URIPrefixEnd
+.End
 
-HTTPDownloadURL: ; 0x110fb4
+HTTPDownloadURL:
 	db "gameboy.datacenter.ne.jp/cgb/download"
-HTTPDownloadURLEnd
+.End
 
-HTTPUploadURL: ; 0x110fd9
+HTTPUploadURL:
 	db "gameboy.datacenter.ne.jp/cgb/upload"
-HTTPUploadURLEnd
+.End
 
-HTTPUtilityURL: ; 0x110ffc
+HTTPUtilityURL:
 	db "gameboy.datacenter.ne.jp/cgb/utility"
-HTTPUtilityURLEnd
+.End
 
-HTTPRankingURL: ; 0x111020
+HTTPRankingURL:
 	db "gameboy.datacenter.ne.jp/cgb/ranking"
-HTTPRankingURLEnd
+.End
 
-Function111044: ; 111044
+Function111044:
 	ld hl, $c827
 	ld a, e
 	ld [hli], a
@@ -2495,8 +2455,8 @@ Function111044: ; 111044
 	ld a, [$c991]
 	add e
 	ld [hli], a
-	ld a, $0
-	adc $0
+	ld a, 0
+	adc 0
 	ld [hl], a
 	xor a
 	ld [$c991], a
@@ -2581,9 +2541,8 @@ Function111044: ; 111044
 	ld [$c86d], a
 	ei
 	ret
-; 11115f
 
-Function11115f: ; 11115f
+Function11115f:
 	ld e, a
 	xor a
 	cp b
@@ -2658,17 +2617,15 @@ Function11115f: ; 11115f
 	ld [hl], a
 	pop af
 	ret
-; 1111ca
 
-Function1111ca: ; 1111ca
+Function1111ca:
 	ld hl, $c821
 	res 2, [hl]
 	ld a, $6
 	ld [$c86b], a
 	jp Function112430
-; 1111d7
 
-Function1111d7: ; 1111d7
+Function1111d7:
 	push hl
 	ld hl, $c866
 	ld a, [hli]
@@ -2700,9 +2657,8 @@ Function1111d7: ; 1111d7
 	ld a, b
 	ld [hl], a
 	ret
-; 1111fe
 
-Function1111fe: ; 1111fe
+Function1111fe:
 	ld a, [$c821]
 	bit 2, a
 	ld a, [$c86a]
@@ -2749,7 +2705,7 @@ endr
 	jp z, Function1113f7
 
 .asm_111251
-	ld b, URIPrefixEnd - URIPrefix
+	ld b, URIPrefix.End - URIPrefix
 	ld de, URIPrefix
 .asm_111256
 	ld a, [de]
@@ -2760,7 +2716,7 @@ endr
 	dec b
 	jr nz, .asm_111256
 	push hl
-	ld b, HTTPDownloadURLEnd - HTTPDownloadURL
+	ld b, HTTPDownloadURL.End - HTTPDownloadURL
 	ld c, $0
 	ld de, HTTPDownloadURL
 .asm_111268
@@ -2777,7 +2733,7 @@ endr
 .asm_111275
 	pop hl
 	push hl
-	ld b, HTTPRankingURLEnd - HTTPRankingURL
+	ld b, HTTPRankingURL.End - HTTPRankingURL
 	ld c, $0
 	ld de, HTTPRankingURL
 .asm_11127e
@@ -2795,7 +2751,7 @@ endr
 
 .asm_11128f
 	pop hl
-	ld b, HTTPUploadURLEnd - HTTPUploadURL
+	ld b, HTTPUploadURL.End - HTTPUploadURL
 	ld c, $0
 	ld de, HTTPUploadURL
 .asm_111297
@@ -2899,9 +2855,8 @@ endr
 	xor $1
 	ld [$c994], a
 	jp Function110f07
-; 111335
 
-Function111335: ; 111335
+Function111335:
 	ld hl, $c876
 	ld a, [hli]
 	ld h, [hl]
@@ -3028,27 +2983,24 @@ Function111335: ; 111335
 	ld [de], a
 	inc de
 	ret
-; 1113ea
 
-Function1113ea: ; 1113ea
+Function1113ea:
 	cp $14
 	jp z, Function111044
 	cp $24
 	jp z, Function111044
 	jp Function110226
-; 1113f7
 
-Function1113f7: ; 1113f7
+Function1113f7:
 	pop hl
 
-Function1113f8: ; 1113f8
+Function1113f8:
 	pop hl
 	pop hl
 	pop hl
 	jp Function110231
-; 1113fe
 
-Function1113fe: ; 1113fe
+Function1113fe:
 	ld a, [$c822]
 	bit 4, a
 	jp z, .asm_11147f
@@ -3136,9 +3088,8 @@ Function1113fe: ; 1113fe
 	call Function110231
 	ld a, $ff
 	ret
-; 11148c
 
-Function11148c: ; 11148c
+Function11148c:
 	ld a, [$c822]
 	bit 4, a
 	jp z, Function110226
@@ -3258,12 +3209,11 @@ Function11148c: ; 11148c
 	ld [hl], a
 	pop hl
 	jr .asm_1114d2
-; 111540
 
-Function111540: ; 111540
+Function111540:
 	nop
 
-Function111541: ; 111541
+Function111541:
 	ld hl, $c821
 	bit 0, [hl]
 	jp nz, Function110226
@@ -3307,9 +3257,8 @@ Function111541: ; 111541
 	ld a, $1
 	ld [$c86b], a
 	jr .asm_11156f
-; 111596
 
-Function111596: ; 111596
+Function111596:
 	ld hl, $c86a
 	ld a, [hl]
 	cp $1
@@ -3352,9 +3301,8 @@ Function111596: ; 111596
 	ld a, $1
 	ld [hl], a
 	ret
-; 1115e4
 
-Function1115e4: ; 1115e4
+Function1115e4:
 	di
 	push af
 	ld hl, $c821
@@ -3383,9 +3331,8 @@ Function1115e4: ; 1115e4
 .asm_11160d
 	ei
 	jr .asm_111604
-; 111610
 
-Function111610: ; 111610
+Function111610:
 	ld hl, $c86a
 	ld a, [hl]
 	dec a
@@ -3404,9 +3351,8 @@ Function111610: ; 111610
 	ld [hli], a
 	ld [hl], b
 	ret
-; 11162d
 
-Function11162d: ; 11162d
+Function11162d:
 	ld a, [$c86a]
 	cp $1
 	jp nz, Function110226
@@ -3426,9 +3372,8 @@ Function11162d: ; 11162d
 	or b
 	jr nz, .asm_111647
 	ret
-; 11164f
 
-Function11164f: ; 11164f (44:564f)
+Function11164f:
 	ld hl, $c815
 	xor a
 	ld [hli], a
@@ -3443,7 +3388,7 @@ Function11164f: ; 11164f (44:564f)
 	ld [hl], a
 	ret
 
-Function111664: ; 111664 (44:5664)
+Function111664:
 	ld hl, $ca3a
 	ld a, [hli]
 	ld e, a
@@ -3467,7 +3412,7 @@ Function111664: ; 111664 (44:5664)
 	ld [hl], d
 	ret
 
-Function111686: ; 111686 (44:5686)
+Function111686:
 	xor a
 	ld [rTAC], a
 	ld c, $ff
@@ -3483,17 +3428,16 @@ Function111686: ; 111686 (44:5686)
 	or c
 	ld [hl], a
 	ret
-; 1116a0 (44:56a0)
 
-Function1116a0: ; 1116a0
+Function1116a0:
 	ld a, $1
 	jr Function1116a9
 
-Function1116a4: ; 1116a4
+Function1116a4:
 	set 1, [hl]
 	ld a, [$c86a]
 
-Function1116a9: ; 1116a9
+Function1116a9:
 	ld [$cb48], a
 	ld hl, $c815
 	xor a
@@ -3510,9 +3454,8 @@ Function1116a9: ; 1116a9
 	and b
 	ld [$cb47], a
 	ret
-; 1116c5
 
-_MobileReceive:: ; 1116c5 (44:56c5)
+_MobileReceive::
 	ld a, [$c800]
 	rrca
 	jp nc, Function1118bc
@@ -3618,7 +3561,7 @@ _MobileReceive:: ; 1116c5 (44:56c5)
 .asm_111778
 	xor a
 	ld [$c800], a
-Function11177c: ; 11177c (44:577c)
+Function11177c:
 	ld hl, $c820
 	ld a, [hld]
 	ld e, a
@@ -3638,18 +3581,18 @@ Function11177c: ; 11177c (44:577c)
 	ld [hl], e
 	jp Function1118bc
 
-Function111796: ; 111796 (44:5796)
+Function111796:
 	ld b, $a
 	jr asm_1117a2
-asm_11179a: ; 11179a (44:579a)
+asm_11179a:
 	xor a
 	ld [hli], a
 	ld [hl], a
 	jp Function1118bc
 
-Function1117a0: ; 1117a0 (44:57a0)
+Function1117a0:
 	ld b, $3
-asm_1117a2: ; 1117a2 (44:57a2)
+asm_1117a2:
 	ld hl, $c822
 	set 3, [hl]
 	ld hl, $c815
@@ -3686,7 +3629,7 @@ asm_1117a2: ; 1117a2 (44:57a2)
 	ld [hl], a
 	jp Function1118bc
 
-Function1117e7: ; 1117e7 (44:57e7)
+Function1117e7:
 	ld a, [$c80b]
 	or a
 	jr z, .asm_1117f8
@@ -3765,7 +3708,7 @@ Function1117e7: ; 1117e7 (44:57e7)
 	ld [hl], a
 	jr Function1118bc
 
-Function11186e: ; 11186e (44:586e)
+Function11186e:
 	call Function1118c2
 	ld a, $4
 	cp [hl]
@@ -3780,7 +3723,7 @@ Function11186e: ; 11186e (44:586e)
 	inc [hl]
 	jr Function1118bc
 
-Function111884: ; 111884 (44:5884)
+Function111884:
 	call Function1118c2
 	ld a, [$c80c]
 	cp [hl]
@@ -3790,7 +3733,7 @@ Function111884: ; 111884 (44:5884)
 	inc [hl]
 	jr Function1118bc
 
-Function111892: ; 111892 (44:5892)
+Function111892:
 	ld a, [rSB]
 	ld c, a
 	call Function111664
@@ -3816,12 +3759,12 @@ Function111892: ; 111892 (44:5892)
 	xor a
 	ld [hli], a
 	inc [hl]
-Function1118bc: ; 1118bc (44:58bc)
+Function1118bc:
 	ld hl, $c822
 	res 1, [hl]
 	ret
 
-Function1118c2: ; 1118c2 (44:58c2)
+Function1118c2:
 	ld a, [rSB]
 	ld c, a
 	ld b, $0
@@ -3839,7 +3782,7 @@ Function1118c2: ; 1118c2 (44:58c2)
 	inc [hl]
 	ret
 
-_Timer:: ; 1118de (44:58de)
+_Timer::
 	ld a, [$c80b]
 	cp $4
 	call z, Function111b3c
@@ -3975,7 +3918,7 @@ _Timer:: ; 1118de (44:58de)
 	ld [$c80f], a
 	jr .asm_1119a9
 
-Function1119f0: ; 1119f0 (44:59f0)
+Function1119f0:
 	ld a, $90
 	ld [$c81e], a
 	ld [$c808], a
@@ -3987,7 +3930,7 @@ Function1119f0: ; 1119f0 (44:59f0)
 	ld [$c806], a
 	jp Function111b3b
 
-Function111a0b: ; 111a0b (44:5a0b)
+Function111a0b:
 	ld a, [hl]
 	cp $6
 	jp z, Function111b3b
@@ -4006,7 +3949,7 @@ Function111a0b: ; 111a0b (44:5a0b)
 	call Function111f07
 	jp Function111b3b
 
-Function111a2a: ; 111a2a (44:5a2a)
+Function111a2a:
 	ld hl, $c80b
 	ld a, [hld]
 	or a
@@ -4018,13 +3961,13 @@ Function111a2a: ; 111a2a (44:5a2a)
 	jp z, Function111ab9
 	cp $3
 	jp z, Function111abd
-asm_111a40: ; 111a40 (44:5a40)
+asm_111a40:
 	ld a, $4b
 
-Function111a42: ; 111a42 (44:5a42)
+Function111a42:
 	ld [rSB], a
 	jp Function111b2e
-asm_111a47: ; 111a47 (44:5a47)
+asm_111a47:
 	ld hl, $c815
 	dec [hl]
 	jr nz, asm_111a40
@@ -4084,11 +4027,11 @@ asm_111a47: ; 111a47 (44:5a47)
 	ei
 	jp Function111b3b
 
-Function111ab9: ; 111ab9 (44:5ab9)
+Function111ab9:
 	ld a, $80
 	jr Function111a42
 
-Function111abd: ; 111abd (44:5abd)
+Function111abd:
 	ld a, [$c814]
 	or a
 	jr nz, .asm_111acb
@@ -4143,7 +4086,7 @@ Function111abd: ; 111abd (44:5abd)
 	ld a, $f1
 	jp Function111a42
 
-Function111b21: ; 111b21 (44:5b21)
+Function111b21:
 	ld hl, $c803
 	ld a, [hli]
 	ld e, a
@@ -4155,7 +4098,7 @@ Function111b21: ; 111b21 (44:5b21)
 	ld [hld], a
 	ld [hl], e
 
-Function111b2e: ; 111b2e (44:5b2e)
+Function111b2e:
 	ld hl, $c822
 	set 1, [hl]
 	ld a, $3
@@ -4163,10 +4106,10 @@ Function111b2e: ; 111b2e (44:5b2e)
 	ld a, $83
 	ld [rSC], a
 
-Function111b3b: ; 111b3b (44:5b3b)
+Function111b3b:
 	ret
 
-Function111b3c: ; 111b3c (44:5b3c)
+Function111b3c:
 	xor a
 	ld [$c819], a
 	ld [$c80b], a
@@ -4268,7 +4211,7 @@ Function111b3c: ; 111b3c (44:5b3c)
 	ld [$c807], a
 	ret
 
-Function111c06: ; 111c06 (44:5c06)
+Function111c06:
 	ld de, $c872
 	ld hl, $ca40
 	ld b, $2
@@ -4277,7 +4220,7 @@ Function111c06: ; 111c06 (44:5c06)
 	ld [$c807], a
 	ret
 
-Function111c17: ; 111c17 (44:5c17)
+Function111c17:
 	ld a, [$ca3c]
 	cp $9f
 	jp z, Function111d07
@@ -4376,7 +4319,7 @@ Function111c17: ; 111c17 (44:5c17)
 	call Function110000
 	jr Function111d07
 
-Function111cc2: ; 111cc2 (44:5cc2)
+Function111cc2:
 	xor a
 	cp d
 	jr nz, .asm_111cda
@@ -4425,7 +4368,7 @@ Function111cc2: ; 111cc2 (44:5cc2)
 	jr nc, Function111d07
 	inc [hl]
 
-Function111d07: ; 111d07 (44:5d07)
+Function111d07:
 	ld a, [$c822]
 	bit 4, a
 	jr z, .asm_111d1c
@@ -4440,7 +4383,7 @@ Function111d07: ; 111d07 (44:5d07)
 	ld [$c807], a
 	ret
 
-Function111d23: ; 111d23 (44:5d23)
+Function111d23:
 	ld a, [$c829]
 	ld e, a
 	ld a, [$c82a]
@@ -4452,7 +4395,7 @@ Function111d23: ; 111d23 (44:5d23)
 	ld [$c807], a
 	ret
 
-Function111d39: ; 111d39 (44:5d39)
+Function111d39:
 	ld de, $ca3f
 	ld hl, Unknown_112006
 	ld b, $9
@@ -4482,14 +4425,14 @@ Function111d39: ; 111d39 (44:5d39)
 	xor a
 	jr .asm_111d59
 
-Function111d65: ; 111d65 (44:5d65)
+Function111d65:
 	ld a, $3
 	ld [$c807], a
 	ld hl, $c821
 	set 4, [hl]
 	ret
 
-Function111d70: ; 111d70 (44:5d70)
+Function111d70:
 	ld hl, $c822
 	bit 0, [hl]
 	jr z, .asm_111dc0
@@ -4544,7 +4487,7 @@ Function111d70: ; 111d70 (44:5d70)
 	ld [$c807], a
 	ret
 
-Function111dd9: ; 111dd9 (44:5dd9)
+Function111dd9:
 	cp $ff
 	jr z, .asm_111de7
 	or a
@@ -4585,7 +4528,7 @@ Function111dd9: ; 111dd9 (44:5dd9)
 	ld b, $3
 	ret
 
-Function111e15: ; 111e15 (44:5e15)
+Function111e15:
 	ld a, b
 	and $7
 	rrca
@@ -4599,13 +4542,11 @@ Function111e15: ; 111e15 (44:5e15)
 	ld [$c821], a
 	pop hl
 	ret
-; 111e28 (44:5e28)
 
-Function111e28: ; 111e28
+Function111e28:
 	jp Function110029
-; 111e2b
 
-Function111e2b: ; 111e2b (44:5e2b)
+Function111e2b:
 	ld a, [$c81e]
 	cp $ff
 	jp z, Function111ef8
@@ -4720,20 +4661,19 @@ Function111e2b: ; 111e2b (44:5e2b)
 	ld [$c807], a
 	ret
 
-Function111ef8: ; 111ef8 (44:5ef8)
+Function111ef8:
 	ld a, [$c805]
 	ld [$c807], a
 	ret
-; 111eff (44:5eff)
 
-Function111eff: ; 111eff
+Function111eff:
 	ld de, $000a
 
-Function111f02: ; 111f02 (44:5f02)
+Function111f02:
 	ld [$c81e], a
 	ld b, $5
 
-Function111f07: ; 111f07 (44:5f07)
+Function111f07:
 	call Function1100b4
 	ret c
 	ld a, [$c800]
@@ -4783,9 +4723,8 @@ Function111f07: ; 111f07 (44:5f07)
 	set 5, [hl]
 	ei
 	ret
-; 111f63 (44:5f63)
 
-Function111f63: ; 111f63
+Function111f63:
 	push de
 	ld hl, 0
 	ld c, b
@@ -4819,9 +4758,8 @@ Function111f63: ; 111f63
 	ld e, c
 	ld d, b
 	ret
-; 111f8d
 
-Function111f8d: ; 111f8d
+Function111f8d:
 	dec de
 	ld a, [de]
 	add l
@@ -4831,9 +4769,8 @@ Function111f8d: ; 111f8d
 	ld h, a
 	dec b
 	ret
-; 111f97
 
-Function111f97: ; 111f97 (44:5f97)
+Function111f97:
 	ld hl, $c822
 	bit 0, [hl]
 	ret nz
@@ -4880,62 +4817,61 @@ Function111f97: ; 111f97 (44:5f97)
 	ld hl, Unknown_112001
 	ld de, $12
 	jp Function111f07
-; 111ff2 (44:5ff2)
 
 	ds 14
 
-Unknown_112000: ; 112000
+Unknown_112000:
 	db $4b
 
-Unknown_112001: ; 112001
+Unknown_112001:
 	db $99, $66, $10, $00, $00
 
-Unknown_112006: ; 112006
+Unknown_112006:
 	db $08, "NINTENDO", $02, $77, $80, $00
 
-Unknown_112013: ; 112013
+Unknown_112013:
 	db $99, $66, $11, $00, $00, $00, $00, $11, $80, $00
 
-Unknown_11201d: ; 11201d
+Unknown_11201d:
 	db $99, $66, $12, $00, $00, $00
 
-Unknown_112023: ; 112023
+Unknown_112023:
 	db $99, $66, $13, $00, $00, $00, $00, $13, $80, $00
 
-Unknown_11202d: ; 11202d
+Unknown_11202d:
 	db $99, $66, $17, $00, $00, $00, $00, $17, $80, $00
 
-Unknown_112037: ; 112037
+Unknown_112037:
 	db $99, $66, $21, $00, $00
 
-Unknown_11203c: ; 11203c
+Unknown_11203c:
 	db $99, $66, $22, $00, $00, $00, $00, $22, $80, $00
 
-Unknown_112046: ; 112046
+Unknown_112046:
 	db $99, $66, $19, $00, $00, $02, $00, $60, $00, $7b, $80, $00
 
-Unknown_112052: ; 112052
+Unknown_112052:
 	db $99, $66, $19, $00, $00, $02, $60, $60, $00, $db, $80, $00
 
-Unknown_11205e: ; 11205e
+Unknown_11205e:
 	db $99, $66, $1a, $00, $00
 
-Unknown_112063: ; 112063
+Unknown_112063:
 	db $99, $66, $28, $00, $00
 
-Unknown_112068: ; 112068
+Unknown_112068:
 	db $99, $66, $14, $00, $00, $00, $00, $14, $80, $00
 
-Unknown_112072: ; 112072
+Unknown_112072:
 	db $99, $66, $15, $00, $00, $01, $ff, $01, $15, $80, $00
 
-Unknown_11207d: ; 11207d
+Unknown_11207d:
 	db $99, $66, $23, $00, $00, $06
 
-Unknown_112083: ; 112083
+Unknown_112083:
 	db $99, $66, $24, $00, $00, $01
 
-Unknown_112089: ; 112089
+Unknown_112089:
 	db $ec, $14, $c9
 	db $e4, $0f, $0e
 	db $e0, $0c, $53
@@ -4943,7 +4879,6 @@ Unknown_112089: ; 112089
 	db $b0, $05, $ee
 	db $ec, $10, $b4
 	db $e4, $0c, $dd
-; 11209e
 
 Unknown_11209e:
 	db "HELO ", 0
@@ -4981,9 +4916,8 @@ Unknown_112137:
 	db "POST ", 0
 Unknown_11213d:
 	db "Content-Length: ", 0
-; 11214e
 
-Function11214e: ; 11214e (44:614e)
+Function11214e:
 	ld a, [$c822]
 	bit 5, a
 	ret nz
@@ -5037,9 +4971,8 @@ Function11214e: ; 11214e (44:614e)
 	ld hl, $c821
 	res 1, [hl]
 	jr .asm_112175
-; 1121ac (44:61ac)
 
-Jumptable_1121ac: ; 1121ac
+Jumptable_1121ac:
 	dw Function1121f6
 	dw Function112271
 	dw Function112373
@@ -5077,9 +5010,8 @@ Jumptable_1121ac: ; 1121ac
 	dw Function1134cb
 	dw Function113672
 	dw Function113626
-; 1121f6
 
-Function1121f6: ; 1121f6
+Function1121f6:
 	dec a
 	jr z, .asm_1121fe
 	dec a
@@ -5147,30 +5079,27 @@ Function1121f6: ; 1121f6
 	call Function11225d
 	jp Function1116a4
 
-Function112251: ; 112251
+Function112251:
 	xor a
 	ld [$c821], a
 	ld [$c807], a
 	inc a
 	ld [$c86a], a
 	ret
-; 11225d
 
-Function11225d: ; 11225d
+Function11225d:
 	ld [$c80f], a
 	ld a, $5
 	ld [$c86a], a
 	ld hl, $c821
 	ret
-; 112269
 
-Function112269: ; 112269
+Function112269:
 	ld a, $91
 	ld hl, Unknown_112013
 	jp Function111eff
-; 112271
 
-Function112271: ; 112271
+Function112271:
 	dec a
 	jr z, .asm_11228c
 	dec a
@@ -5304,7 +5233,7 @@ Function112271: ; 112271
 	call Function11225d
 	jp Function1116a4
 
-Function11234b: ; 11234b
+Function11234b:
 	ld a, [$cb4c]
 	add $a
 	ld e, a
@@ -5313,7 +5242,7 @@ Function11234b: ; 11234b
 	ld a, b
 	jp Function111f02
 
-Function11235a: ; 11235a
+Function11235a:
 	ld hl, $c86e
 	ld a, $80
 	ld [hli], a
@@ -5322,15 +5251,13 @@ Function11235a: ; 11235a
 	ld a, $97
 	ld hl, Unknown_11202d
 	jp Function111eff
-; 11236b
 
-Function11236b: ; 11236b
+Function11236b:
 	ld a, $99
 	ld de, $000c
 	jp Function111f02
-; 112373
 
-Function112373: ; 112373
+Function112373:
 	dec a
 	jr z, Function11235a
 	dec a
@@ -5374,9 +5301,8 @@ Function112373: ; 112373
 	ld a, [$c872]
 	call Function11225d
 	jp Function1116a4
-; 1123b6
 
-Function1123b6: ; 1123b6
+Function1123b6:
 	dec a
 	jr z, .asm_1123be
 	dec a
@@ -5404,9 +5330,8 @@ Function1123b6: ; 1123b6
 	set 6, [hl]
 	set 5, [hl]
 	ret
-; 1123e1
 
-Function1123e1: ; 1123e1
+Function1123e1:
 	dec a
 	jr z, .asm_1123f2
 	dec a
@@ -5458,7 +5383,7 @@ Function1123e1: ; 1123e1
 	ld [hl], a
 	jp Function1116a0
 
-Function112430: ; 112430
+Function112430:
 	ld a, $3
 	ld [$c807], a
 	ld de, $cb47
@@ -5473,9 +5398,8 @@ Function112430: ; 112430
 	ld a, $a4
 	ld hl, $cb47
 	jp Function111f02
-; 112451
 
-Function112451: ; 112451
+Function112451:
 	dec a
 	jr z, .asm_112458
 	dec a
@@ -5607,9 +5531,8 @@ Function112451: ; 112451
 
 .asm_112531
 	jp Function1125bf
-; 112534
 
-Function112534: ; 112534
+Function112534:
 	ld b, $fa
 	ld hl, $c880
 	xor a
@@ -5632,9 +5555,8 @@ Function112534: ; 112534
 	ld a, $95
 	ld hl, $cb53
 	jp Function111f02
-; 112566
 
-Function112566: ; 112566
+Function112566:
 	call Function1125c7
 	ld a, [$cb5a]
 	and $1
@@ -5661,7 +5583,7 @@ Function112566: ; 112566
 	ld [$c86a], a
 	jr Function1125bf
 
-Function112597: ; 112597
+Function112597:
 	call Function1125c7
 	call Function11269b
 	ld a, $5
@@ -5683,14 +5605,13 @@ Function112597: ; 112597
 .asm_1125bc
 	ld [$c86a], a
 
-Function1125bf: ; 1125bf
+Function1125bf:
 	ld hl, $c821
 	set 0, [hl]
 	res 2, [hl]
 	ret
-; 1125c7
 
-Function1125c7: ; 1125c7
+Function1125c7:
 	ld hl, $c872
 	ld a, [hli]
 	ld c, a
@@ -5741,9 +5662,8 @@ Function1125c7: ; 1125c7
 	ld [de], a
 	inc de
 	ret
-; 11261c
 
-Function11261c: ; 11261c
+Function11261c:
 	xor a
 	ld [$c86b], a
 	ld a, [$c86c]
@@ -5768,13 +5688,12 @@ Function11261c: ; 11261c
 	ld a, $11
 	ld [$c86a], a
 
-Function11264e: ; 11264e
+Function11264e:
 	ld hl, $c821
 	set 0, [hl]
 	ret
-; 112654
 
-Function112654: ; 112654
+Function112654:
 	xor a
 	ld [$c86b], a
 	ld a, [$c86c]
@@ -5809,9 +5728,8 @@ Function112654: ; 112654
 	ld a, $12
 	ld [$c86a], a
 	jr Function11264e
-; 11269b
 
-Function11269b: ; 11269b
+Function11269b:
 	ld bc, $0001
 	ld hl, Unknown_112110
 	ld a, [$c994]
@@ -5819,19 +5737,16 @@ Function11269b: ; 11269b
 	call nz, Function1126ac
 	call Function110007
 	ret
-; 1126ac
 
-Function1126ac: ; 1126ac
+Function1126ac:
 	ld hl, Unknown_112137
 	ret
-; 1126b0
 
-Function1126b0: ; 1126b0
+Function1126b0:
 	ld hl, Unknown_112115
 	jp Function110007
-; 1126b6
 
-Function1126b6: ; 1126b6
+Function1126b6:
 	ld hl, Unknown_112121
 	call Function110007
 	ld hl, $013f
@@ -5856,9 +5771,8 @@ Function1126b6: ; 1126b6
 	ld c, a
 	ld hl, Unknown_112132
 	jp Function110007
-; 1126e6
 
-Function1126e6: ; 1126e6
+Function1126e6:
 	xor a
 	ld [$c86b], a
 	ld hl, Unknown_11213d
@@ -5891,9 +5805,8 @@ Function1126e6: ; 1126e6
 	ld c, a
 	or c
 	ret
-; 112715
 
-Function112715: ; 112715
+Function112715:
 	xor a
 	ld [$c86c], a
 	ld a, $2
@@ -5901,13 +5814,12 @@ Function112715: ; 112715
 	ld hl, $c821
 	res 0, [hl]
 	ret
-; 112724
 
-Function112724: ; 112724
+Function112724:
 	ld a, $ff
 	ld [$c86e], a
 
-Function112729: ; 112729
+Function112729:
 	push hl
 	ld hl, $c82c
 	xor a
@@ -5920,9 +5832,8 @@ Function112729: ; 112729
 	ld [hl], a
 	pop hl
 	ret
-; 11273a
 
-Function11273a: ; 11273a
+Function11273a:
 	dec a
 	jr z, .asm_112752
 	dec a
@@ -6002,12 +5913,12 @@ Function11273a: ; 11273a
 	ld [$c86b], a
 	jp Function112430
 
-Function1127c5: ; 1127c5
+Function1127c5:
 	ld de, $000b
 	ld a, $95
 	jp Function111f02
 
-Function1127cd: ; 1127cd
+Function1127cd:
 	ld hl, $c810
 	xor a
 	ld [hli], a
@@ -6019,13 +5930,12 @@ Function1127cd: ; 1127cd
 	set 1, [hl]
 	res 0, [hl]
 	ret
-; 1127e1
 
-Function1127e1: ; 1127e1
+Function1127e1:
 	call Function112807
 	ld hl, $c832
 
-Function1127e7: ; 1127e7
+Function1127e7:
 	ld a, [hli]
 	cp $d
 	ret nz
@@ -6035,9 +5945,8 @@ Function1127e7: ; 1127e7
 	ld a, $20
 	ld [hl], a
 	ret
-; 1127f3
 
-Function1127f3: ; 1127f3
+Function1127f3:
 	call Function112807
 	ld hl, $c82f
 	ld a, [hli]
@@ -6050,9 +5959,8 @@ Function1127f3: ; 1127f3
 	cp $2e
 	ret nz
 	jr Function1127e7
-; 112807
 
-Function112807: ; 112807
+Function112807:
 	push bc
 	push de
 	ld hl, $ca3f
@@ -6090,9 +5998,8 @@ Function112807: ; 112807
 	ld b, $5
 	ld de, $c82f
 	jr .asm_11282a
-; 112840
 
-Function112840: ; 112840
+Function112840:
 	dec a
 	jr z, .asm_112844
 	ret
@@ -6161,7 +6068,7 @@ Function112840: ; 112840
 	ld hl, $cb47
 	jp Function1127c5
 
-Function1128bd: ; 1128bd
+Function1128bd:
 	ld hl, $c880
 	call Function112b11
 	ld hl, $c810
@@ -6173,16 +6080,14 @@ Function1128bd: ; 1128bd
 	set 1, [hl]
 	res 0, [hl]
 	ret
-; 1128d3
 
-Function1128d3: ; 1128d3
+Function1128d3:
 	ld hl, $c821
 	res 0, [hl]
 	res 2, [hl]
 	ret
-; 1128db
 
-Function1128db: ; 1128db
+Function1128db:
 	dec a
 	jr z, .asm_112947
 	dec a
@@ -6259,9 +6164,8 @@ Function1128db: ; 1128db
 
 .asm_11295b
 	jp Function1128bd
-; 11295e
 
-Function11295e: ; 11295e
+Function11295e:
 	ld a, $d
 	ld [de], a
 	inc de
@@ -6271,9 +6175,8 @@ Function11295e: ; 11295e
 	inc de
 	inc c
 	ret
-; 112969
 
-Function112969: ; 112969
+Function112969:
 	dec a
 	jr z, .asm_112970
 	dec a
@@ -6304,9 +6207,8 @@ Function112969: ; 112969
 	res 7, [hl]
 	set 5, [hl]
 	ret
-; 11299c
 
-Function11299c: ; 11299c
+Function11299c:
 	dec a
 	jr z, .asm_1129aa
 	dec a
@@ -6385,7 +6287,7 @@ Function11299c: ; 11299c
 	inc de
 .asm_112a2c
 
-Function112a2c: ; 112a2c
+Function112a2c:
 	ld hl, $c821
 	set 1, [hl]
 	res 0, [hl]
@@ -6399,7 +6301,7 @@ Function112a2c: ; 112a2c
 	ld [$c86a], a
 	ret
 
-Function112a42: ; 112a42
+Function112a42:
 	ld hl, $c810
 	xor a
 	ld [hli], a
@@ -6411,9 +6313,8 @@ Function112a42: ; 112a42
 	set 1, [hl]
 	res 0, [hl]
 	ret
-; 112a56
 
-Function112a56: ; 112a56
+Function112a56:
 	dec a
 	jr z, .asm_112a5a
 	ret
@@ -6468,9 +6369,8 @@ Function112a56: ; 112a56
 .asm_112aa6
 	ld de, $0005
 	jp Function112a2c
-; 112aac
 
-Function112aac: ; 112aac
+Function112aac:
 	ld a, [$c872]
 	push af
 	ld a, [$c873]
@@ -6530,9 +6430,8 @@ Function112aac: ; 112aac
 	pop af
 	ld [$c872], a
 	ret
-; 112b11
 
-Function112b11: ; 112b11
+Function112b11:
 	ld a, [$c872]
 	push af
 	ld a, [$c873]
@@ -6588,9 +6487,8 @@ Function112b11: ; 112b11
 	pop af
 	ld [$c872], a
 	ret
-; 112b60
 
-Function112b60: ; 112b60
+Function112b60:
 	ld a, [hli]
 	cp $30
 	jr c, .asm_112b6f
@@ -6605,9 +6503,8 @@ Function112b60: ; 112b60
 .asm_112b6f
 	scf
 	ret
-; 112b71
 
-Function112b71: ; 112b71
+Function112b71:
 	dec a
 	jr z, .asm_112b75
 	ret
@@ -6654,9 +6551,8 @@ Function112b71: ; 112b71
 .asm_112bb5
 	ld de, $0004
 	jp Function112a2c
-; 112bbb
 
-Function112bbb: ; 112bbb
+Function112bbb:
 	dec a
 	jr z, .asm_112bbf
 	ret
@@ -6684,9 +6580,8 @@ Function112bbb: ; 112bbb
 .asm_112be6
 	ld de, $0004
 	jp Function112a2c
-; 112bec
 
-Function112bec: ; 112bec
+Function112bec:
 	dec a
 	jr z, .asm_112bf7
 	dec a
@@ -6829,7 +6724,7 @@ Function112bec: ; 112bec
 	add c
 	ld [$c82d], a
 	ld a, [$c82e]
-	adc $0
+	adc 0
 	ld [$c82e], a
 	ld hl, $c829
 	ld a, e
@@ -6878,9 +6773,8 @@ Function112bec: ; 112bec
 	ld hl, $c82d
 	ld b, $2
 	jp Function110000
-; 112d20
 
-Function112d20: ; 112d20
+Function112d20:
 	ld a, [$c86a]
 	cp $1a
 	jr nz, .asm_112d2d
@@ -6890,9 +6784,8 @@ Function112d20: ; 112d20
 .asm_112d2d
 	ld de, $0004
 	jp Function112a2c
-; 112d33
 
-Function112d33: ; 112d33
+Function112d33:
 	dec a
 	jr z, .asm_112d87
 	dec a
@@ -7221,9 +7114,8 @@ Function112d33: ; 112d33
 	ld hl, $c821
 	res 0, [hl]
 	ret
-; 112f61
 
-Function112f61: ; 112f61
+Function112f61:
 	ld hl, $c989
 	ld a, [hl]
 	or a
@@ -7294,9 +7186,8 @@ Function112f61: ; 112f61
 	call Function11306b
 	ld a, [$c990]
 	ret
-; 112fd5
 
-Function112fd5: ; 112fd5
+Function112fd5:
 	ld de, Unknown_113001
 	push hl
 	call Function113281
@@ -7331,13 +7222,11 @@ Function112fd5: ; 112fd5
 	pop hl
 	pop bc
 	ret
-; 113001
 
-Unknown_113001: ; 113001
+Unknown_113001:
 	db "date: ", 0
-; 113008
 
-Function113008: ; 113008
+Function113008:
 	ld de, Unknown_1132a6
 	push hl
 	call Function113273
@@ -7358,9 +7247,8 @@ Function113008: ; 113008
 	ld a, $2
 	ld [$c990], a
 	ret
-; 113026
 
-Function113026: ; 113026
+Function113026:
 	ld de, Unknown_1132b2
 	push hl
 	call Function113273
@@ -7392,9 +7280,8 @@ Function113026: ; 113026
 	pop hl
 	pop bc
 	ret
-; 113054
 
-Function113054: ; 113054
+Function113054:
 	ld de, Unknown_1132bf
 	push hl
 	call Function113273
@@ -7410,14 +7297,13 @@ Function113054: ; 113054
 	pop bc
 	pop hl
 	ret
-; 11306b
 
-Function11306b: ; 11306b
+Function11306b:
 	ld hl, $c880
 	ld a, [$c82d]
 	ld b, a
 
-Function113072: ; 113072
+Function113072:
 	call Function113268
 	jp nc, Function113089
 	ld a, [$ca3c]
@@ -7429,7 +7315,7 @@ Function113072: ; 113072
 	pop hl
 	jr Function113095
 
-Function113089: ; 113089
+Function113089:
 	ld a, [hl]
 	cp $d
 	jr z, .asm_113094
@@ -7440,7 +7326,7 @@ Function113089: ; 113089
 .asm_113094
 	inc hl
 
-Function113095: ; 113095
+Function113095:
 	inc hl
 	push bc
 	ld a, [$c872]
@@ -7549,7 +7435,7 @@ Function113095: ; 113095
 	add b
 	ld [hli], a
 	ld a, [hl]
-	adc $0
+	adc 0
 	ld [hl], a
 	ld c, b
 	pop hl
@@ -7575,9 +7461,8 @@ Function113095: ; 113095
 	ld a, $2
 	ld [$c989], a
 	ret
-; 113167
 
-Function113167: ; 113167
+Function113167:
 	ld de, Unknown_1132ff
 	push hl
 	call Function113273
@@ -7598,7 +7483,7 @@ Function113167: ; 113167
 	jr nz, .asm_113178
 	jr Function113197
 
-Function113180: ; 113180
+Function113180:
 	ld de, Unknown_11330c
 	push hl
 	call Function113273
@@ -7618,7 +7503,7 @@ Function113180: ; 113180
 	cp $a
 	jr nz, .asm_113191
 
-Function113197: ; 113197
+Function113197:
 	pop hl
 	ld c, b
 	ld de, $cb57
@@ -7633,9 +7518,8 @@ Function113197: ; 113197
 	pop hl
 	pop bc
 	ret
-; 1131a9
 
-Function1131a9: ; 1131a9
+Function1131a9:
 	ld hl, $c979
 	ld de, $c880
 	ld b, $0
@@ -7697,9 +7581,8 @@ Function1131a9: ; 1131a9
 	dec [hl]
 	ld a, $4
 	ret
-; 113206
 
-Function113206: ; 113206
+Function113206:
 	ld a, b
 	sub e
 	ld [$c991], a
@@ -7735,9 +7618,8 @@ Function113206: ; 113206
 	ld a, $3
 	ld [$c86b], a
 	ret
-; 113245
 
-Function113245: ; 113245
+Function113245:
 	ld a, b
 	sub e
 	ld [$c992], a
@@ -7758,9 +7640,8 @@ Function113245: ; 113245
 	ld a, $3
 	ld [$c86b], a
 	ret
-; 113268
 
-Function113268: ; 113268
+Function113268:
 .asm_113268
 	dec b
 	ld a, [hli]
@@ -7771,9 +7652,8 @@ Function113268: ; 113268
 	jr nz, .asm_113268
 	scf
 	ret
-; 113273
 
-Function113273: ; 113273
+Function113273:
 	ld c, $0
 .asm_113275
 	ld a, [de]
@@ -7787,9 +7667,8 @@ Function113273: ; 113273
 	jr z, .asm_113275
 	scf
 	ret
-; 113281
 
-Function113281: ; 113281
+Function113281:
 	ld c, $0
 	push hl
 	ld l, e
@@ -7816,16 +7695,14 @@ Function113281: ; 113281
 	ld h, d
 	pop de
 	ret
-; 11329d
 
-Function11329d: ; 11329d
+Function11329d:
 	cp $41
 	ret c
 	cp $5b
 	ret nc
 	or $20
 	ret
-; 1132a6
 
 Unknown_1132a6:
 	db "Gb-Status: ", 0
@@ -7839,9 +7716,8 @@ Unknown_1132ff:
 	db "URI-header: ", 0
 Unknown_11330c:
 	db "Location: ", 0
-; 113317
 
-Function113317: ; 113317
+Function113317:
 	ld a, $1
 	ld [$c86b], a
 	ld de, $cb59
@@ -7888,13 +7764,11 @@ Function113317: ; 113317
 	ld hl, Unknown_113372
 	call Function110007
 	jr .asm_113351
-; 113372
 
-Unknown_113372: ; 113372
+Unknown_113372:
 	db "Content-Length: 0", $d, "\n", 0
-; 113386
 
-Function113386: ; 113386
+Function113386:
 	call Function113482
 	ld a, $1
 	ld [$c86b], a
@@ -7931,9 +7805,8 @@ Function113386: ; 113386
 	ld a, $95
 	ld hl, $cb53
 	jp Function111f02
-; 1133de
 
-Function1133de: ; 1133de
+Function1133de:
 	call Function1126e6
 	xor a
 	ld [$c86b], a
@@ -7946,9 +7819,8 @@ Function1133de: ; 1133de
 	ld a, [$c9ad]
 	ld [$c87f], a
 	ret
-; 1133fe
 
-Function1133fe: ; 1133fe
+Function1133fe:
 	ld hl, $cb58
 	ld a, [hli]
 	cp $68
@@ -8039,9 +7911,8 @@ Function1133fe: ; 1133fe
 	jr nz, .asm_113478
 	dec de
 	jr .asm_113455
-; 113482
 
-Function113482: ; 113482
+Function113482:
 	ld hl, $c87f
 	ld a, [hld]
 	ld b, a
@@ -8091,9 +7962,8 @@ Function113482: ; 113482
 	ld hl, $cb47
 	ld a, $95
 	jp Function111f02
-; 1134cb
 
-Function1134cb: ; 1134cb
+Function1134cb:
 	dec a
 	jr z, .asm_1134d9
 	dec a
@@ -8145,9 +8015,8 @@ Function1134cb: ; 1134cb
 	cp $1e
 	jp nz, Function112251
 	jp Function1116a0
-; 113519
 
-Function113519: ; 113519
+Function113519:
 	dec a
 	jr z, .asm_113527
 	dec a
@@ -8228,9 +8097,8 @@ Function113519: ; 113519
 .asm_11358c
 	call Function11225d
 	jp Function1116a4
-; 113592
 
-Function113592: ; 113592
+Function113592:
 	push de
 	ld l, e
 	ld h, d
@@ -8240,9 +8108,8 @@ Function113592: ; 113592
 	call Function110000
 	pop de
 	ret
-; 11359d
 
-Function11359d: ; 11359d
+Function11359d:
 	ld b, $20
 	call Function113592
 	ld a, $21
@@ -8251,17 +8118,15 @@ Function11359d: ; 11359d
 	xor a
 	ld [de], a
 	ret
-; 1135ad
 
-Function1135ad: ; 1135ad
+Function1135ad:
 	ld b, $1e
 	call Function113592
 	ld a, $1f
 	ld hl, $c8ac
 	jp Function11000f
-; 1135ba
 
-Function1135ba: ; 1135ba
+Function1135ba:
 	ld b, $65
 	call Function113592
 	ld hl, $c8f6
@@ -8281,9 +8146,8 @@ Function1135ba: ; 1135ba
 	ld a, $11
 	ld hl, $c92e
 	jp Function11000f
-; 1135eb
 
-Function1135eb: ; 1135eb
+Function1135eb:
 	ld b, $8
 .asm_1135ed
 	ld a, [hl]
@@ -8317,19 +8181,16 @@ Function1135eb: ; 1135eb
 	ld [de], a
 	inc de
 	ret
-; 113620
 
-Function113620: ; 113620
+Function113620:
 	ld a, $23
 	ret
-; 113623
 
-Function113623: ; 113623
+Function113623:
 	ld a, $2a
 	ret
-; 113626
 
-Function113626: ; 113626
+Function113626:
 	dec a
 	jr z, .asm_113634
 	dec a
@@ -8383,9 +8244,8 @@ Function113626: ; 113626
 
 .asm_11366f
 	jp Function1116a0
-; 113672
 
-Function113672: ; 113672
+Function113672:
 	dec a
 	jr z, .asm_113680
 	dec a
@@ -8438,9 +8298,8 @@ Function113672: ; 113672
 
 .asm_1136be
 	jp Function1116a0
-; 1136c1
 
-Function1136c1: ; 1136c1
+Function1136c1:
 	xor a
 	ld [$cc28], a
 	ld a, l
@@ -8812,9 +8671,8 @@ endr
 	xor a
 	ld [hl], a
 	ret
-; 113909
 
-Function113909: ; 113909
+Function113909:
 	call Function11391e
 	ld a, c
 	and $f0
@@ -8827,7 +8685,7 @@ Function113909: ; 113909
 	jp z, Function1139b7
 	jp Function1139de
 
-Function11391e: ; 11391e
+Function11391e:
 	and $f
 	ld e, a
 	ld d, $0
@@ -8837,7 +8695,7 @@ Function11391e: ; 11391e
 	ld b, $8
 	jp Function110000
 
-Function11392f: ; 11392f
+Function11392f:
 	ld hl, $cbf9
 	ld a, [hli]
 	ld h, [hl]
@@ -8871,7 +8729,7 @@ Function11392f: ; 11392f
 	call Function113a15
 	ret
 
-Function113973: ; 113973
+Function113973:
 	ld hl, $cbf9
 	ld a, [hli]
 	ld h, [hl]
@@ -8904,9 +8762,8 @@ Function113973: ; 113973
 	ld de, $cc03
 	call Function113a15
 	ret
-; 1139b7
 
-Function1139b7: ; 1139b7
+Function1139b7:
 	ld hl, $cbf9
 	ld a, [hli]
 	ld h, [hl]
@@ -8927,9 +8784,8 @@ Function1139b7: ; 1139b7
 	ld hl, $cbff
 	call Function113a28
 	ret
-; 1139de
 
-Function1139de: ; 1139de
+Function1139de:
 	ld hl, $cbfd
 	ld a, [hli]
 	ld h, [hl]
@@ -8952,9 +8808,8 @@ Function1139de: ; 1139de
 	ld hl, $cbff
 	call Function113a28
 	ret
-; 113a0b
 
-Function113a0b: ; 113a0b
+Function113a0b:
 	ld b, $4
 .asm_113a0d
 	ld a, [de]
@@ -8964,9 +8819,8 @@ Function113a0b: ; 113a0b
 	dec b
 	jr nz, .asm_113a0d
 	ret
-; 113a15
 
-Function113a15: ; 113a15
+Function113a15:
 	ld b, $4
 .asm_113a17
 	ld a, [de]
@@ -8976,9 +8830,8 @@ Function113a15: ; 113a15
 	dec b
 	jr nz, .asm_113a17
 	ret
-; 113a1f
 
-Function113a1f: ; 113a1f
+Function113a1f:
 	ld b, $4
 .asm_113a21
 	ld a, [hl]
@@ -8987,9 +8840,8 @@ Function113a1f: ; 113a1f
 	dec b
 	jr nz, .asm_113a21
 	ret
-; 113a28
 
-Function113a28: ; 113a28
+Function113a28:
 	ld b, $4
 .asm_113a2a
 	ld a, [de]
@@ -8999,9 +8851,8 @@ Function113a28: ; 113a28
 	dec b
 	jr nz, .asm_113a2a
 	ret
-; 113a32
 
-Function113a32: ; 113a32
+Function113a32:
 	ld a, [de]
 	inc de
 	add [hl]
@@ -9015,9 +8866,8 @@ Function113a32: ; 113a32
 	dec b
 	jr nz, .asm_113a38
 	ret
-; 113a40
 
-Function113a40: ; 113a40
+Function113a40:
 .asm_113a40
 	or a
 	push hl
@@ -9039,11 +8889,9 @@ Function113a40: ; 113a40
 	dec b
 	jr nz, .asm_113a40
 	ret
-; 113a55
 
-Unknown_113a55: ; 113a55
+Unknown_113a55:
 	db "Authorization: GB00 name=", $22, 0
-; 113a70
 
 Unknown_113a70:
 	db $00, $00, $00, $07, $06, $04, $00, $0c, $04, $08, $00, $11, $02, $0c, $00, $16
@@ -9062,9 +8910,8 @@ Unknown_113a70:
 	db $30, $30, $00, $06, $36, $0c, $00, $0a, $34, $28, $00, $0f, $32, $04, $00, $15
 	db $30, $20, $00, $06, $36, $3c, $00, $0a, $34, $18, $00, $0f, $32, $34, $00, $15
 	db $30, $10, $00, $06, $36, $2c, $00, $0a, $34, $08, $00, $0f, $32, $24, $00, $15
-; 113b70
 
-Unknown_113b70: ; 113b70
+Unknown_113b70:
 	dw $cbe7
 	dw $cbeb
 	dw $cbef
@@ -9073,7 +8920,7 @@ Unknown_113b70: ; 113b70
 	dw $cbeb
 	dw $cbef
 
-Unknown_113b7e: ; 113b7e
+Unknown_113b7e:
 	db $01, $23, $45, $67, $89, $ab, $cd, $ef
 	db $fe, $dc, $ba, $98, $76, $54, $32, $10
 
@@ -9095,7 +8942,7 @@ Unknown_113b8e:
 	db $4f, $7e, $a8, $6f, $e0, $e6, $2c, $fe, $14, $43, $01, $a3, $a1, $11, $08, $4e
 	db $82, $7e, $53, $f7, $35, $f2, $3a, $bd, $bb, $d2, $d7, $2a, $91, $d3, $86, $eb
 
-Function113c8e: ; 113c8e
+Function113c8e:
 	ld a, c
 	ld [$cc10], a
 	ld a, b
@@ -9229,9 +9076,8 @@ Function113c8e: ; 113c8e
 	ld a, $0
 	ld [hl], a
 	ret
-; 113d47
 
-Function113d47: ; 113d47
+Function113d47:
 	cp $1a
 	jr c, .asm_113d5a
 	cp $34
@@ -9258,9 +9104,8 @@ Function113d47: ; 113d47
 .asm_113d63
 	ld a, $2b
 	ret
-; 113d66
 
-Function113d66: ; 113d66
+Function113d66:
 	ld a, c
 	ld [$cc10], a
 	ld a, b
@@ -9427,9 +9272,8 @@ endr
 .asm_113e3f
 	sub $47
 	ret
-; 113e42
 
-Function113e42: ; 113e42
+Function113e42:
 	dec a
 	jr z, .asm_113e4f
 	dec a
@@ -9504,18 +9348,16 @@ Function113e42: ; 113e42
 	ld a, $1
 	ld [$c86b], a
 	jp .asm_113e6d
-; 113eb8
 
-Function113eb8: ; 113eb8
+Function113eb8:
 	ld a, $ff
 	ld [$c81e], a
 	ld hl, $c822
 	res 5, [hl]
 	res 0, [hl]
 	jp Function111f97
-; 113ec7
 
-Unreferenced_Function113ec7: ; 113ec7
+Unreferenced_Function113ec7:
 	ld hl, $c822
 	ld a, [hl]
 	push af
@@ -9543,9 +9385,8 @@ Unreferenced_Function113ec7: ; 113ec7
 	ld hl, $c822
 	set 0, [hl]
 	ret
-; 113ef2
 
-Function113ef2: ; 113ef2
+Function113ef2:
 	dec a
 	jr z, .asm_113efa
 	dec a
@@ -9588,9 +9429,8 @@ Function113ef2: ; 113ef2
 	dec a
 	ld [hl], a
 	ret
-; 113f2d
 
-Function113f2d: ; 113f2d
+Function113f2d:
 	dec a
 	jr z, .asm_113f35
 	dec a
@@ -9649,4 +9489,3 @@ Function113f2d: ; 113f2d
 	inc a
 	ld [hl], a
 	ret
-; 113f84
diff --git a/macros.asm b/macros.asm
index 7036b6419..1018eeb1f 100644
--- a/macros.asm
+++ b/macros.asm
@@ -3,8 +3,8 @@ INCLUDE "macros/predef.asm"
 INCLUDE "macros/rst.asm"
 INCLUDE "macros/data.asm"
 INCLUDE "macros/code.asm"
+INCLUDE "macros/gfx.asm"
 INCLUDE "macros/coords.asm"
-INCLUDE "macros/color.asm"
 
 INCLUDE "macros/scripts/audio.asm"
 INCLUDE "macros/scripts/maps.asm"
@@ -16,7 +16,4 @@ INCLUDE "macros/scripts/battle_anims.asm"
 INCLUDE "macros/scripts/trade_anims.asm"
 INCLUDE "macros/scripts/gfx_anims.asm"
 
-percent EQUS "* $ff / 100"
-
-tiles EQUS "* LEN_2BPP_TILE"
-tile  EQUS "+ LEN_2BPP_TILE *"
+INCLUDE "macros/legacy.asm"
diff --git a/macros/code.asm b/macros/code.asm
index 799c27d45..9429884ca 100644
--- a/macros/code.asm
+++ b/macros/code.asm
@@ -1,11 +1,11 @@
 ; Syntactic sugar macros
 
 lb: MACRO ; r, hi, lo
-	ld \1, (\2 & $ff) << 8 + (\3 & $ff)
+	ld \1, ((\2) & $ff) << 8 | ((\3) & $ff)
 ENDM
 
 ln: MACRO ; r, hi, lo
-	ld \1, (\2 & $f) << 4 + (\3 & $f)
+	ld \1, ((\2) & $f) << 4 | ((\3) & $f)
 ENDM
 
 ldpixel: MACRO
@@ -19,7 +19,6 @@ ENDM
 depixel EQUS "ldpixel de,"
 bcpixel EQUS "ldpixel bc,"
 
-
 ; Design patterns
 
 jumptable: MACRO
@@ -36,13 +35,15 @@ jumptable: MACRO
 ENDM
 
 maskbits: MACRO
-; masks just enough bits to cover the argument
+; masks just enough bits to cover the first argument
+; the second argument is an optional shift amount
 ; e.g. "maskbits 26" becomes "and %00011111" (since 26 - 1 = %00011001)
+; and "maskbits 3, 2" becomes "and %00001100" (since "maskbits 3" becomes %00000011)
 ; example usage in rejection sampling:
 ; .loop
 ; 	call Random
-; 	maskbits 30
-; 	cp 30
+; 	maskbits 26
+; 	cp 26
 ; 	jr nc, .loop
 x = 1
 rept 8
@@ -50,5 +51,56 @@ if x + 1 < (\1)
 x = x << 1 | 1
 endc
 endr
+if _NARG == 2
+	and x << (\2)
+else
 	and x
+endc
+ENDM
+
+calc_sine_wave: MACRO
+; input: a = a signed 6-bit value
+; output: a = d * sin(a * pi/32)
+	and %111111
+	cp  %100000
+	jr nc, .negative\@
+	call .apply\@
+	ld a, h
+	ret
+.negative\@
+	and %011111
+	call .apply\@
+	ld a, h
+	xor $ff
+	inc a
+	ret
+.apply\@
+	ld e, a
+	ld a, d
+	ld d, 0
+if _NARG == 1
+	ld hl, \1
+else
+	ld hl, .sinetable\@
+endc
+	add hl, de
+	add hl, de
+	ld e, [hl]
+	inc hl
+	ld d, [hl]
+	ld hl, 0
+.multiply\@ ; factor amplitude
+	srl a
+	jr nc, .even\@
+	add hl, de
+.even\@
+	sla e
+	rl d
+	and a
+	jr nz, .multiply\@
+	ret
+if _NARG == 0
+.sinetable\@
+	sine_table 32
+endc
 ENDM
diff --git a/macros/coords.asm b/macros/coords.asm
index 95c4cb041..0833c242c 100644
--- a/macros/coords.asm
+++ b/macros/coords.asm
@@ -26,11 +26,11 @@ ENDM
 
 dwcoord: MACRO
 ; x, y
-	rept _NARG / 2
+rept _NARG / 2
 	dw (\2) * SCREEN_WIDTH + (\1) + wTileMap
 	shift
 	shift
-	endr
+endr
 ENDM
 
 ldcoord_a: MACRO
diff --git a/macros/data.asm b/macros/data.asm
index 8345a2523..08a23ad29 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -1,3 +1,7 @@
+; Value macros
+
+percent EQUS "* $ff / 100"
+
 ; Constant data (db, dw, dl) macros
 
 dwb: MACRO
@@ -26,29 +30,29 @@ dbwww: MACRO
 ENDM
 
 dn: MACRO ; nybbles
-	rept _NARG / 2
+rept _NARG / 2
 	db ((\1) << 4) | (\2)
 	shift
 	shift
-	endr
+endr
 ENDM
 
 dc: MACRO ; "crumbs"
-	rept _NARG / 4
+rept _NARG / 4
 	db ((\1) << 6) | ((\2) << 4) | ((\3) << 2) | (\4)
 	shift
 	shift
 	shift
 	shift
-	endr
+endr
 ENDM
 
 dx: MACRO
 x = 8 * ((\1) - 1)
-	rept \1
+rept \1
 	db ((\2) >> x) & $ff
 x = x + -8
-	endr
+endr
 ENDM
 
 dt: MACRO ; three-byte (big-endian)
@@ -64,17 +68,17 @@ bigdw: MACRO ; big-endian word
 ENDM
 
 dba: MACRO ; dbw bank, address
-	rept _NARG
+rept _NARG
 	dbw BANK(\1), \1
 	shift
-	endr
+endr
 ENDM
 
 dab: MACRO ; dwb address, bank
-	rept _NARG
+rept _NARG
 	dwb \1, BANK(\1)
 	shift
-	endr
+endr
 ENDM
 
 dba_pic: MACRO ; dbw bank, address
@@ -82,7 +86,6 @@ dba_pic: MACRO ; dbw bank, address
 	dw \1
 ENDM
 
-
 dbpixel: MACRO
 if _NARG >= 4
 ; x tile, x pxl, y tile, y pxl
@@ -98,28 +101,24 @@ dsprite: MACRO
 	db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, \6
 ENDM
 
-
 menu_coords: MACRO
 ; x1, y1, x2, y2
 	db \2, \1 ; start coords
 	db \4, \3 ; end coords
 ENDM
 
-
-sine_wave: MACRO
-; \1: amplitude
-x = 0
-	rept $20
-	; Round up.
-	dw (sin(x) + (sin(x) & $ff)) >> 8
-x = x + (\1) * $40000
-	endr
-ENDM
-
-
 bcd: MACRO
-	rept _NARG
+rept _NARG
 	dn ((\1) % 100) / 10, (\1) % 10
 	shift
-	endr
+endr
+ENDM
+
+sine_table: MACRO
+; \1 samples of sin(x) from x=0 to x<32768 (pi radians)
+x = 0
+rept \1
+	dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
+x = x + DIV(32768, \1) ; a circle has 65536 "degrees"
+endr
 ENDM
diff --git a/macros/enum.asm b/macros/enum.asm
index c1321a636..009400743 100644
--- a/macros/enum.asm
+++ b/macros/enum.asm
@@ -22,11 +22,14 @@ enum_set: MACRO
 __enum__ = \1
 ENDM
 
-
 ; Enumerate constants
 
 const_def: MACRO
+if _NARG >= 1
+const_value = \1
+else
 const_value = 0
+endc
 ENDM
 
 const: MACRO
@@ -39,7 +42,6 @@ shift_const: MACRO
 const_value = const_value + 1
 ENDM
 
-
 ; Enumerate strings
 
 define: MACRO
diff --git a/macros/color.asm b/macros/gfx.asm
index 5ebaae218..ff07ba468 100644
--- a/macros/color.asm
+++ b/macros/gfx.asm
@@ -11,5 +11,9 @@ palred   EQUS "(1 << 0) *"
 palgreen EQUS "(1 << 5) *"
 palblue  EQUS "(1 << 10) *"
 
-palettes EQUS "* 8"
-palette  EQUS "+ 8 *"
+palettes EQUS "* PALETTE_SIZE"
+palette  EQUS "+ PALETTE_SIZE *"
+color    EQUS "+ PAL_COLOR_SIZE *"
+
+tiles EQUS "* LEN_2BPP_TILE"
+tile  EQUS "+ LEN_2BPP_TILE *"
diff --git a/macros/legacy.asm b/macros/legacy.asm
new file mode 100644
index 000000000..35e6e9ccb
--- /dev/null
+++ b/macros/legacy.asm
@@ -0,0 +1,165 @@
+; Legacy support for pre-2018 pokecrystal.
+; Allows porting scripts with as few edits as possible.
+
+; macros/rst.asm
+callba EQUS "farcall"
+callab EQUS "callfar"
+
+; macros/scripts/audio.asm
+unknownmusic0xde EQUS "sound_duty"
+
+; macros/scripts/events.asm
+
+checkmorn EQUS "checktime MORN"
+checkday  EQUS "checktime DAY"
+checknite EQUS "checktime NITE"
+
+if_equal        EQUS "ifequal"
+if_not_equal    EQUS "ifnotequal"
+if_greater_than EQUS "ifgreater"
+if_less_than    EQUS "ifless"
+end_all         EQUS "endall"
+
+checkmaptriggers EQUS "checkmapscene"
+domaptrigger     EQUS "setmapscene"
+checktriggers    EQUS "checkscene"
+dotrigger        EQUS "setscene"
+
+faceperson       EQUS "faceobject"
+moveperson       EQUS "moveobject"
+writepersonxy    EQUS "writeobjectxy"
+spriteface       EQUS "turnobject"
+objectface       EQUS "turnobject"
+
+RAM2MEM           EQUS "vartomem"
+loadfont          EQUS "opentext"
+loadmenudata      EQUS "loadmenu"
+loadmenuheader    EQUS "loadmenu"
+writebackup       EQUS "closewindow"
+interpretmenu     EQUS "_2dmenu"
+interpretmenu2    EQUS "verticalmenu"
+battlecheck       EQUS "randomwildmon"
+loadtrainerdata   EQUS "loadmemtrainer"
+loadpokedata      EQUS "loadwildmon"
+returnafterbattle EQUS "reloadmapafterbattle"
+trainerstatus     EQUS "trainerflagaction"
+talkaftercancel   EQUS "endifjustbattled"
+talkaftercheck    EQUS "checkjustbattled"
+playrammusic      EQUS "encountermusic"
+reloadmapmusic    EQUS "dontrestartmapmusic"
+resetfuncs        EQUS "endall"
+storetext         EQUS "battletowertext"
+displaylocation   EQUS "landmarktotext"
+givepokeitem      EQUS "givepokemail"
+checkpokeitem     EQUS "checkpokemail"
+
+; macros/scripts/maps.asm
+
+mapconst: MACRO
+	map_const \1, \3, \2
+ENDM
+
+maptrigger EQUS "scene_script"
+
+warp_def: MACRO
+	warp_event \2, \1, \4, \3
+ENDM
+
+xy_trigger: MACRO
+	coord_event \3, \2, \1, \5
+ENDM
+
+signpost: MACRO
+	bg_event \2, \1, \3, \4
+ENDM
+
+person_event: MACRO
+;	object_event \3, \2, \1, \4, \5, \6, \7, \8, \9, \10, \11, \12, \13
+	db \1, \2 + 4, \3 + 4, \4
+	dn \6, \5
+	db \7, \8
+	shift
+	dn \8, \9
+	shift
+	db \9
+	shift
+	dw \9
+	shift
+	dw \9
+ENDM
+
+PERSONTYPE_SCRIPT   EQUS "OBJECTTYPE_SCRIPT"
+PERSONTYPE_ITEMBALL EQUS "OBJECTTYPE_ITEMBALL"
+PERSONTYPE_TRAINER  EQUS "OBJECTTYPE_TRAINER"
+
+; macros/scripts/movement.asm
+
+show_person   EQUS "show_object"
+hide_person   EQUS "hide_object"
+remove_person EQUS "remove_object"
+
+turn_head_down        EQUS "turn_head DOWN"
+turn_head_up          EQUS "turn_head UP"
+turn_head_left        EQUS "turn_head LEFT"
+turn_head_right       EQUS "turn_head RIGHT"
+turn_step_down        EQUS "turn_step DOWN"
+turn_step_up          EQUS "turn_step UP"
+turn_step_left        EQUS "turn_step LEFT"
+turn_step_right       EQUS "turn_step RIGHT"
+slow_step_down        EQUS "slow_step DOWN"
+slow_step_up          EQUS "slow_step UP"
+slow_step_left        EQUS "slow_step LEFT"
+slow_step_right       EQUS "slow_step RIGHT"
+step_down             EQUS "step DOWN"
+step_up               EQUS "step UP"
+step_left             EQUS "step LEFT"
+step_right            EQUS "step RIGHT"
+big_step_down         EQUS "big_step DOWN"
+big_step_up           EQUS "big_step UP"
+big_step_left         EQUS "big_step LEFT"
+big_step_right        EQUS "big_step RIGHT"
+slow_slide_step_down  EQUS "slow_slide_step DOWN"
+slow_slide_step_up    EQUS "slow_slide_step UP"
+slow_slide_step_left  EQUS "slow_slide_step LEFT"
+slow_slide_step_right EQUS "slow_slide_step RIGHT"
+slide_step_down       EQUS "slide_step DOWN"
+slide_step_up         EQUS "slide_step UP"
+slide_step_left       EQUS "slide_step LEFT"
+slide_step_right      EQUS "slide_step RIGHT"
+fast_slide_step_down  EQUS "fast_slide_step DOWN"
+fast_slide_step_up    EQUS "fast_slide_step UP"
+fast_slide_step_left  EQUS "fast_slide_step LEFT"
+fast_slide_step_right EQUS "fast_slide_step RIGHT"
+turn_away_down        EQUS "turn_away DOWN"
+turn_away_up          EQUS "turn_away UP"
+turn_away_left        EQUS "turn_away LEFT"
+turn_away_right       EQUS "turn_away RIGHT"
+turn_in_down          EQUS "turn_in DOWN"
+turn_in_up            EQUS "turn_in UP"
+turn_in_left          EQUS "turn_in LEFT"
+turn_in_right         EQUS "turn_in RIGHT"
+turn_waterfall_down   EQUS "turn_waterfall DOWN"
+turn_waterfall_up     EQUS "turn_waterfall UP"
+turn_waterfall_left   EQUS "turn_waterfall LEFT"
+turn_waterfall_right  EQUS "turn_waterfall RIGHT"
+slow_jump_step_down   EQUS "slow_jump_step DOWN"
+slow_jump_step_up     EQUS "slow_jump_step UP"
+slow_jump_step_left   EQUS "slow_jump_step LEFT"
+slow_jump_step_right  EQUS "slow_jump_step RIGHT"
+jump_step_down        EQUS "jump_step DOWN"
+jump_step_up          EQUS "jump_step UP"
+jump_step_left        EQUS "jump_step LEFT"
+jump_step_right       EQUS "jump_step RIGHT"
+fast_jump_step_down   EQUS "fast_jump_step DOWN"
+fast_jump_step_up     EQUS "fast_jump_step UP"
+fast_jump_step_left   EQUS "fast_jump_step LEFT"
+fast_jump_step_right  EQUS "fast_jump_step RIGHT"
+
+step_sleep_1 EQUS "step_sleep 1"
+step_sleep_2 EQUS "step_sleep 2"
+step_sleep_3 EQUS "step_sleep 3"
+step_sleep_4 EQUS "step_sleep 4"
+step_sleep_5 EQUS "step_sleep 5"
+step_sleep_6 EQUS "step_sleep 6"
+step_sleep_7 EQUS "step_sleep 7"
+step_sleep_8 EQUS "step_sleep 8"
diff --git a/macros/rst.asm b/macros/rst.asm
index 58f54d5e8..00505e123 100644
--- a/macros/rst.asm
+++ b/macros/rst.asm
@@ -14,10 +14,6 @@ callfar: MACRO ; address, bank
 	rst FarCall
 ENDM
 
-; legacy support for pre-2018 pokecrystal
-callba EQUS "farcall"
-callab EQUS "callfar"
-
 homecall: MACRO
 	ld a, [hROMBank]
 	push af
diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm
index 5c7aabed3..f25b6da22 100644
--- a/macros/scripts/battle_anims.asm
+++ b/macros/scripts/battle_anims.asm
@@ -1,6 +1,6 @@
 anim_wait: MACRO
 if \1 >= $d0
-	flip out
+	fail "anim_wait argument must be less than $d0."
 endc
 	db \1
 ENDM
@@ -295,7 +295,7 @@ anim_call: MACRO
 	dw \1 ; address
 ENDM
 
-	enum anim_ret_command ; $ff
+anim_ret_command EQU -1 ; $ff
 anim_ret: MACRO
 	db anim_ret_command
 ENDM
diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm
index 4ae8dbaf4..48e034bdf 100644
--- a/macros/scripts/battle_commands.asm
+++ b/macros/scripts/battle_commands.asm
@@ -15,10 +15,10 @@ ENDM
 	command damagevariation         ; 08
 	command checkhit                ; 09
 	command lowersub                ; 0a
-	command hittargetnosub          ; 0b
+	command moveanimnosub           ; 0b
 	command raisesub                ; 0c
 	command failuretext             ; 0d
-	command checkfaint              ; 0e
+	command applydamage             ; 0e
 	command criticaltext            ; 0f
 	command supereffectivetext      ; 10
 	command checkdestinybond        ; 11
@@ -169,19 +169,18 @@ ENDM
 	command ragedamage              ; a2
 	command resettypematchup        ; a3
 	command allstatsup              ; a4
-	command effect0xa5              ; a5
+	command bidefailtext            ; a5
 	command raisesubnoanim          ; a6
 	command lowersubnoanim          ; a7
-	command effect0xa8              ; a8
+	command beatupfailtext          ; a8
 	command clearmissdamage         ; a9
 	command movedelay               ; aa
-	command hittarget               ; ab
+	command moveanim                ; ab
 	command tristatuschance         ; ac
 	command supereffectivelooptext  ; ad
 	command startloop               ; ae
 	command curl                    ; af
 
-__enum__ set $fe
-
+	enum_start $fe
 	command endturn                 ; fe
 	command endmove                 ; ff
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 9bca1c004..a8f6c2015 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -1,4 +1,4 @@
-; ScriptCommandTable indexes (see engine/scripting.asm)
+; ScriptCommandTable indexes (see engine/overworld/scripting.asm)
 	enum_start
 
 	enum scall_command ; $00
@@ -37,16 +37,16 @@ ptjump: MACRO
 	dw \1 ; pointer
 ENDM
 
-	enum if_equal_command ; $06
-if_equal: MACRO
-	db if_equal_command
+	enum ifequal_command ; $06
+ifequal: MACRO
+	db ifequal_command
 	db \1 ; byte
 	dw \2 ; pointer
 ENDM
 
-	enum if_not_equal_command ; $07
-if_not_equal: MACRO
-	db if_not_equal_command
+	enum ifnotequal_command ; $07
+ifnotequal: MACRO
+	db ifnotequal_command
 	db \1 ; byte
 	dw \2 ; pointer
 ENDM
@@ -63,16 +63,16 @@ iftrue: MACRO
 	dw \1 ; pointer
 ENDM
 
-	enum if_greater_than_command ; $0a
-if_greater_than: MACRO
-	db if_greater_than_command
+	enum ifgreater_command ; $0a
+ifgreater: MACRO
+	db ifgreater_command
 	db \1 ; byte
 	dw \2 ; pointer
 ENDM
 
-	enum if_less_than_command ; $0b
-if_less_than: MACRO
-	db if_less_than_command
+	enum ifless_command ; $0b
+ifless: MACRO
+	db ifless_command
 	db \1 ; byte
 	dw \2 ; pointer
 ENDM
@@ -110,13 +110,13 @@ ENDM
 	enum checkmapscene_command ; $11
 checkmapscene: MACRO
 	db checkmapscene_command
-	map \1 ; map
+	map_id \1 ; map
 ENDM
 
 	enum setmapscene_command ; $12
 setmapscene: MACRO
 	db setmapscene_command
-	map \1 ; map
+	map_id \1 ; map
 	db \2 ; scene_id
 ENDM
 
@@ -194,23 +194,23 @@ ENDM
 
 	enum giveitem_command ; $1f
 giveitem: MACRO
+if _NARG == 1
+	giveitem \1, 1
+else
 	db giveitem_command
 	db \1 ; item
-if _NARG == 2
 	db \2 ; quantity
-else
-	db 1
 endc
 ENDM
 
 	enum takeitem_command ; $20
 takeitem: MACRO
+if _NARG == 1
+	takeitem \1, 1
+else
 	db takeitem_command
 	db \1 ; item
-if _NARG == 2
 	db \2 ; quantity
-else
-	db 1
 endc
 ENDM
 
@@ -283,10 +283,6 @@ checktime: MACRO
 	db \1 ; time
 ENDM
 
-checkmorn EQUS "checktime MORN"
-checkday  EQUS "checktime DAY"
-checknite EQUS "checktime NITE"
-
 	enum checkpoke_command ; $2c
 checkpoke: MACRO
 	db checkpoke_command
@@ -295,23 +291,21 @@ ENDM
 
 	enum givepoke_command ; $2d
 givepoke: MACRO
+if _NARG == 2
+	givepoke \1, \2, NO_ITEM, FALSE
+elif _NARG == 3
+	givepoke \1, \2, \3, FALSE
+else
 	db givepoke_command
 	db \1 ; pokemon
 	db \2 ; level
-	if _NARG >= 3
 	db \3 ; item
-	if _NARG >= 4
 	db \4 ; trainer
-	if \4
+if \4
 	dw \5 ; trainer_name_pointer
 	dw \6 ; pkmn_nickname
-	endc
-	else
-	db 0
-	endc
-	else
-	db 0, 0
-	endc
+endc
+endc
 ENDM
 
 	enum giveegg_command ; $2e
@@ -321,15 +315,15 @@ giveegg: MACRO
 	db \2 ; level
 ENDM
 
-	enum givepokeitem_command ; $2f
-givepokeitem: MACRO
-	db givepokeitem_command
+	enum givepokemail_command ; $2f
+givepokemail: MACRO
+	db givepokemail_command
 	dw \1 ; pointer
 ENDM
 
-	enum checkpokeitem_command ; $30
-checkpokeitem: MACRO
-	db checkpokeitem_command
+	enum checkpokemail_command ; $30
+checkpokemail: MACRO
+	db checkpokemail_command
 	dw \1 ; pointer
 ENDM
 
@@ -389,19 +383,19 @@ ENDM
 warpmod: MACRO
 	db warpmod_command
 	db \1 ; warp_id
-	map \2 ; map
+	map_id \2 ; map
 ENDM
 
 	enum blackoutmod_command ; $3b
 blackoutmod: MACRO
 	db blackoutmod_command
-	map \1 ; map
+	map_id \1 ; map
 ENDM
 
 	enum warp_command ; $3c
 warp: MACRO
 	db warp_command
-	map \1 ; map
+	map_id \1 ; map
 	db \2 ; x
 	db \3 ; y
 ENDM
@@ -477,11 +471,11 @@ ENDM
 
 	enum refreshscreen_command ; $48
 refreshscreen: MACRO
+if _NARG == 0
+	refreshscreen 0
+else
 	db refreshscreen_command
-if _NARG == 1
 	db \1 ; dummy
-else
-	db 0
 endc
 ENDM
 
@@ -520,10 +514,10 @@ yesorno: MACRO
 	db yesorno_command
 ENDM
 
-	enum loadmenudata_command ; $4f
-loadmenudata: MACRO
-	db loadmenudata_command
-	dw \1 ; data
+	enum loadmenu_command ; $4f
+loadmenu: MACRO
+	db loadmenu_command
+	dw \1 ; menu_header
 ENDM
 
 	enum closewindow_command ; $50
@@ -651,14 +645,14 @@ scripttalkafter: MACRO
 	db scripttalkafter_command
 ENDM
 
-	enum end_if_just_battled_command ; $66
-end_if_just_battled: MACRO
-	db end_if_just_battled_command
+	enum endifjustbattled_command ; $66
+endifjustbattled: MACRO
+	db endifjustbattled_command
 ENDM
 
-	enum check_just_battled_command ; $67
-check_just_battled: MACRO
-	db check_just_battled_command
+	enum checkjustbattled_command ; $67
+checkjustbattled: MACRO
+	db checkjustbattled_command
 ENDM
 
 	enum setlasttalked_command ; $68
@@ -751,9 +745,9 @@ showemote: MACRO
 	db \3 ; time
 ENDM
 
-	enum spriteface_command ; $76
-spriteface: MACRO
-	db spriteface_command
+	enum turnobject_command ; $76
+turnobject: MACRO
+	db turnobject_command
 	db \1 ; object id
 	db \2 ; facing
 ENDM
@@ -920,9 +914,9 @@ reloadandreturn: MACRO
 	db \1 ; which_method
 ENDM
 
-	enum end_all_command ; $93
-end_all: MACRO
-	db end_all_command
+	enum endall_command ; $93
+endall: MACRO
+	db endall_command
 ENDM
 
 	enum pokemart_command ; $94
@@ -986,12 +980,12 @@ ENDM
 
 	enum verbosegiveitem_command ; $9e
 verbosegiveitem: MACRO
+if _NARG == 1
+	verbosegiveitem \1, 1
+else
 	db verbosegiveitem_command
 	db \1 ; item
-if _NARG == 2
 	db \2 ; quantity
-else
-	db 1
 endc
 ENDM
 
@@ -1006,7 +1000,7 @@ ENDM
 swarm: MACRO
 	db swarm_command
 	db \1 ; flag
-	map \2 ; map
+	map_id \2 ; map
 ENDM
 
 	enum halloffame_command ; $a1
@@ -1023,7 +1017,7 @@ ENDM
 warpfacing: MACRO
 	db warpfacing_command
 	db \1 ; facing
-	map \2 ; map
+	map_id \2 ; map
 	db \3 ; x
 	db \4 ; y
 ENDM
@@ -1062,7 +1056,7 @@ wait: MACRO
 	db \1 ; duration
 ENDM
 
-	enum check_save_command ; $a9
-check_save: MACRO
-	db check_save_command
+	enum checksave_command ; $a9
+checksave: MACRO
+	db checksave_command
 ENDM
diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm
index 943a000a9..8f33512ec 100644
--- a/macros/scripts/gfx_anims.asm
+++ b/macros/scripts/gfx_anims.asm
@@ -4,7 +4,7 @@ frame: MACRO
 	db \1
 x = \2
 if _NARG > 2
-rept _NARG +- 2
+rept _NARG + -2
 x = x | (1 << (\3 + 1))
 	shift
 endr
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm
index 31a1f16d9..7f5947a55 100644
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -1,12 +1,12 @@
-map: MACRO
+map_id: MACRO
 ;\1: map id
 	db GROUP_\1, MAP_\1
 ENDM
 
-
 scene_script: MACRO
 ;\1: script pointer
-	dw \1, 0
+	dw \1
+	dw 0 ; filler
 ENDM
 
 callback: MACRO
@@ -15,19 +15,19 @@ callback: MACRO
 	dbw \1, \2
 ENDM
 
-warp_def: MACRO
+warp_event: MACRO
 ;\1: x: left to right, starts at 0
 ;\2: y: top to bottom, starts at 0
-;\3: warp destination: starts at 1
-;\4: map id: from constants/map_constants.asm
-	db \2, \1, \3
-	map \4
+;\3: map id: from constants/map_constants.asm
+;\4: warp destination: starts at 1
+	db \2, \1, \4
+	map_id \3
 ENDM
 
 coord_event: MACRO
 ;\1: x: left to right, starts at 0
 ;\2: y: top to bottom, starts at 0
-;\3: scene id: controlled by setscene/setmapscene
+;\3: scene id: a SCENE_* constant; controlled by setscene/setmapscene
 ;\4: script pointer
 	db \3, \2, \1
 	db 0 ; filler
@@ -74,34 +74,33 @@ object_event: MACRO
 	dw \9
 ENDM
 
-
 trainer: MACRO
-;\1: flag: an EVENT_BEAT_* constant
-;\2: trainer group
-;\3: trainer id
+;\1: trainer group
+;\2: trainer id
+;\3: flag: an EVENT_BEAT_* constant
 ;\4: seen text
 ;\5: win text
 ;\6: loss text
 ;\7: after-battle text
-	dw \1
-	db \2, \3
+	dw \3
+	db \1, \2
 	dw \4, \5, \6, \7
 ENDM
 
 itemball: MACRO
 ;\1: item: from constants/item_constants.asm
 ;\2: quantity: default 1
-if _NARG == 2
-	db \1, \2
+if _NARG == 1
+	itemball \1, 1
 else
-	db \1, 1
+	db \1, \2
 endc
 ENDM
 
 hiddenitem: MACRO
-;\1: flag: an EVENT_* constant
-;\2: item: from constants/item_constants.asm
-	dwb \1, \2
+;\1: item: from constants/item_constants.asm
+;\2: flag: an EVENT_* constant
+	dwb \2, \1
 ENDM
 
 elevfloor: MACRO
@@ -109,7 +108,7 @@ elevfloor: MACRO
 ;\2: warp destination: starts at 1
 ;\3: map id
 	db \1, \2
-	map \3
+	map_id \3
 ENDM
 
 conditional_event: MACRO
diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm
index 451608723..83d1ad0e6 100644
--- a/macros/scripts/movement.asm
+++ b/macros/scripts/movement.asm
@@ -1,4 +1,4 @@
-; MovementPointers indexes (see engine/movement.asm)
+; MovementPointers indexes (see engine/overworld/movement.asm)
 	enum_start
 
 ; Directional movements
diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm
index bff18c7ea..d1fec35db 100644
--- a/macros/scripts/text.asm
+++ b/macros/scripts/text.asm
@@ -46,9 +46,9 @@ text_low: MACRO
 	db TX_LOW
 ENDM
 
-	enum WAIT_BUTTON ; $06
+	enum TX_WAIT_BUTTON ; $06
 text_waitbutton: MACRO
-	db WAIT_BUTTON
+	db TX_WAIT_BUTTON
 ENDM
 
 	enum TX_SCROLL ; $07
@@ -56,9 +56,9 @@ text_scroll: MACRO
 	db TX_SCROLL
 ENDM
 
-	enum START_ASM ; $08
+	enum TX_START_ASM ; $08
 start_asm: MACRO
-	db START_ASM
+	db TX_START_ASM
 ENDM
 
 	enum TX_NUM ; $09
diff --git a/macros/scripts/trade_anims.asm b/macros/scripts/trade_anims.asm
index 94c9070aa..6227f2022 100644
--- a/macros/scripts/trade_anims.asm
+++ b/macros/scripts/trade_anims.asm
@@ -21,7 +21,7 @@ tradeanim_enter_link_tube: MACRO
 	db tradeanim_enter_link_tube_command
 ENDM
 
-__enum__ set $5
+	enum_start $05
 
 	enum tradeanim_exit_link_tube_command ; $05
 tradeanim_exit_link_tube: MACRO
@@ -33,14 +33,14 @@ tradeanim_tube_to_ot: MACRO
 	db tradeanim_tube_to_ot_command
 ENDM
 
-__enum__ set $0e
+	enum_start $0e
 
 	enum tradeanim_tube_to_player_command ; $0e
 tradeanim_tube_to_player: MACRO
 	db tradeanim_tube_to_player_command
 ENDM
 
-__enum__ set $16
+	enum_start $16
 
 	enum tradeanim_sent_to_ot_text_command ; $16
 tradeanim_sent_to_ot_text: MACRO
@@ -92,7 +92,7 @@ tradeanim_scroll_out_right: MACRO
 	db tradeanim_scroll_out_right_command
 ENDM
 
-__enum__ set $21
+	enum_start $21
 
 	enum tradeanim_wait_80_command ; $21
 tradeanim_wait_80: MACRO
@@ -119,7 +119,7 @@ tradeanim_wait_anim: MACRO
 	db tradeanim_wait_anim_command
 ENDM
 
-__enum__ set $27
+	enum_start $27
 
 	enum tradeanim_poof_command ; $27
 tradeanim_poof: MACRO
@@ -166,7 +166,6 @@ tradeanim_wait_180_if_ot_egg: MACRO
 	db tradeanim_wait_180_if_ot_egg_command
 ENDM
 
-
 ; Mobile
 	enum_start $01
 
@@ -185,7 +184,7 @@ mobiletradeanim_sendmon: MACRO
 	db mobiletradeanim_sendmon_command
 ENDM
 
-__enum__ set $05
+	enum_start $05
 
 	enum mobiletradeanim_05_command ; $05
 mobiletradeanim_05: MACRO
@@ -207,7 +206,7 @@ mobiletradeanim_receivemon: MACRO
 	db mobiletradeanim_receivemon_command
 ENDM
 
-__enum__ set $0b
+	enum_start $0b
 
 	enum mobiletradeanim_showgetmon_command ; $0b
 mobiletradeanim_showgetmon: MACRO
diff --git a/macros/wram.asm b/macros/wram.asm
index 7c8ca44a1..eec839b7d 100755..100644
--- a/macros/wram.asm
+++ b/macros/wram.asm
@@ -76,7 +76,6 @@ red_party_struct: MACRO
 \1Special::    dw
 ENDM
 
-
 battle_struct: MACRO
 \1Species::   db
 \1Item::      db
@@ -103,19 +102,17 @@ battle_struct: MACRO
 ENDM
 
 box: MACRO
-\1::
 \1Count::           db
 \1Species::         ds MONS_PER_BOX + 1
 \1Mons::
 \1Mon1::            box_struct \1Mon1
-\1Mon2::            ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX +- 1)
+\1Mon2::            ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX + -1)
 \1MonOT::           ds NAME_LENGTH * MONS_PER_BOX
 \1MonNicknames::    ds MON_NAME_LENGTH * MONS_PER_BOX
 \1MonNicknamesEnd::
 \1End::             ds 2 ; padding
 ENDM
 
-
 map_connection_struct: MACRO
 \1ConnectedMapGroup::       db
 \1ConnectedMapNumber::      db
@@ -132,7 +129,7 @@ channel_struct: MACRO
 ; Addreses are wChannel1 (c101).
 \1MusicID::           dw
 \1MusicBank::         db
-\1Flags::             db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest
+\1Flags1::            db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest
 \1Flags2::            db ; 0:vibrato on/off 2:duty 4:cry pitch
 \1Flags3::            db ; 0:vibrato up/down
 \1MusicAddress::      dw
@@ -142,51 +139,49 @@ channel_struct: MACRO
 \1Condition::         db ; conditional jumps
 \1DutyCycle::         db ; bits 6-7 (0:12.5% 1:25% 2:50% 3:75%)
 \1Intensity::         db ; hi:pressure lo:velocity
-\1Frequency:: ; 11 bits
-\1FrequencyLo::       db
-\1FrequencyHi::       db
+\1Frequency::         dw ; 11 bits
 \1Pitch::             db ; 0:rest 1-c:note
 \1Octave::            db ; 7-0 (0 is highest)
 \1PitchOffset::       db ; raises existing octaves (to repeat phrases)
 \1NoteDuration::      db ; frames remaining for the current note
-\1Field16::           ds 1 ; c117
-                      ds 1 ; c118
+\1Field16::           ds 1
+                      ds 1
 \1LoopCount::         db
 \1Tempo::             dw
 \1Tracks::            db ; hi:left lo:right
-\1SFXDutyLoop::       db ; c11d
+\1SFXDutyLoop::       db
 \1VibratoDelayCount:: db ; initialized by \1VibratoDelay
 \1VibratoDelay::      db ; number of frames a note plays until vibrato starts
 \1VibratoExtent::     db
 \1VibratoRate::       db ; hi:frames for each alt lo:frames to the next alt
 \1PitchWheelTarget::  dw ; frequency endpoint for pitch wheel
-\1PitchWheelAmount::  db ; c124
-\1PitchWheelAmountFraction::   db ; c125
-\1Field25::           db ; c126
-                      ds 1 ; c127
+\1PitchWheelAmount::  db
+\1PitchWheelAmountFraction::   db
+\1Field25::           db
+                      ds 1
 \1CryPitch::          dw
 \1Field29::           ds 1
 \1Field2a::           ds 2
 \1Field2c::           ds 1
 \1NoteLength::        db ; frames per 16th note
-\1Field2e::           ds 1 ; c12f
-\1Field2f::           ds 1 ; c130
-\1Field30::           ds 1 ; c131
-                      ds 1 ; c132
+\1Field2e::           ds 1
+\1Field2f::           ds 1
+\1Field30::           ds 1
+                      ds 1
 ENDM
 
 battle_tower_struct: MACRO
-\1Name:: ds NAME_LENGTH +- 1
+\1Name:: ds NAME_LENGTH + -1
 \1TrainerClass:: ds 1
-\1Pkmn1:: party_struct \1Pkmn1
-\1Pkmn1Name:: ds MON_NAME_LENGTH
-\1Pkmn1NameEnd::
-\1Pkmn2:: party_struct \1Pkmn2
-\1Pkmn2Name:: ds MON_NAME_LENGTH
-\1Pkmn2NameEnd::
-\1Pkmn3:: party_struct \1Pkmn3
-\1Pkmn3Name:: ds MON_NAME_LENGTH
-\1Pkmn3NameEnd::
+\1Mon1:: party_struct \1Mon1
+\1Mon1Name:: ds MON_NAME_LENGTH
+\1Mon1NameEnd::
+\1Mon2:: party_struct \1Mon2
+\1Mon2Name:: ds MON_NAME_LENGTH
+\1Mon2NameEnd::
+\1Mon3:: party_struct \1Mon3
+\1Mon3Name:: ds MON_NAME_LENGTH
+\1Mon3NameEnd::
 \1TrainerData:: ds BATTLETOWER_TRAINERDATALENGTH
 \1TrainerEnd::
 ENDM
@@ -222,7 +217,7 @@ hof_mon: MACRO
 \1ID::       dw
 \1DVs::      dw
 \1Level::    db
-\1Nickname:: ds MON_NAME_LENGTH +- 1
+\1Nickname:: ds MON_NAME_LENGTH + -1
 \1End::
 ENDM
 
@@ -234,11 +229,11 @@ hall_of_fame: MACRO
 \1Mon4:: hof_mon \1Mon4
 \1Mon5:: hof_mon \1Mon5
 \1Mon6:: hof_mon \1Mon6
-\1End:: ds 1
+\1End:: db
 ENDM
 
 link_battle_record: MACRO
-\1Name::   ds NAME_LENGTH +- 1
+\1Name::   ds NAME_LENGTH + -1
 \1ID::     dw
 \1Wins::   dw
 \1Losses:: dw
@@ -285,7 +280,6 @@ slot_reel: MACRO
 ENDM
 
 object_struct: MACRO
-\1Struct::
 \1Sprite::            db
 \1MapObjectIndex::    db
 \1SpriteTile::        db
@@ -323,7 +317,6 @@ object_struct: MACRO
 ENDM
 
 map_object: MACRO
-\1Object::
 \1ObjectStructID::  db
 \1ObjectSprite::    db
 \1ObjectYCoord::    db
diff --git a/main.asm b/main.asm
index 11f4fd39e..5872ce6cb 100644
--- a/main.asm
+++ b/main.asm
@@ -3,60 +3,61 @@ INCLUDE "constants.asm"
 
 SECTION "bank1", ROMX
 
-INCLUDE "engine/routines/placewaitingtext.asm"
-INCLUDE "engine/routines/loadpushoam.asm"
-INCLUDE "engine/map_objects.asm"
-INCLUDE "engine/intro_menu.asm"
-INCLUDE "engine/init_map.asm"
-INCLUDE "engine/learn.asm"
-INCLUDE "engine/routines/checknickerrors.asm"
-INCLUDE "engine/math.asm"
+INCLUDE "engine/link/place_waiting_text.asm"
+INCLUDE "engine/gfx/load_push_oam.asm"
+INCLUDE "engine/overworld/map_objects.asm"
+INCLUDE "engine/menus/intro_menu.asm"
+INCLUDE "engine/overworld/init_map.asm"
+INCLUDE "engine/pokemon/learn.asm"
+INCLUDE "engine/pokemon/correct_nick_errors.asm"
+INCLUDE "engine/math/math.asm"
 INCLUDE "data/items/attributes.asm"
-INCLUDE "engine/npc_movement.asm"
+INCLUDE "engine/overworld/npc_movement.asm"
 INCLUDE "engine/events/happiness_egg.asm"
-INCLUDE "engine/events/special.asm"
+INCLUDE "engine/events/shuckle.asm"
+INCLUDE "engine/events/haircut.asm"
 
 
 SECTION "bank2", ROMX
 
-INCLUDE "engine/player_object.asm"
-INCLUDE "engine/routines/sine.asm"
+INCLUDE "engine/overworld/player_object.asm"
+INCLUDE "engine/math/sine.asm"
 INCLUDE "engine/predef.asm"
-INCLUDE "engine/color.asm"
+INCLUDE "engine/gfx/color.asm"
 
 
 SECTION "bank3", ROMX
 
-INCLUDE "engine/routines/checktime.asm"
-INCLUDE "engine/specials.asm"
-INCLUDE "engine/printnum.asm"
-INCLUDE "engine/health.asm"
+INCLUDE "engine/events/checktime.asm"
+INCLUDE "engine/events/specials.asm"
+INCLUDE "engine/math/print_num.asm"
+INCLUDE "engine/pokemon/health.asm"
 INCLUDE "engine/events/overworld.asm"
-INCLUDE "engine/items.asm"
-INCLUDE "engine/player_step.asm"
+INCLUDE "engine/items/items.asm"
+INCLUDE "engine/overworld/player_step.asm"
 INCLUDE "engine/battle/anim_hp_bar.asm"
-INCLUDE "engine/move_mon.asm"
-INCLUDE "engine/billspctop.asm"
-INCLUDE "engine/routines/getbreedmonlevelgrowth.asm"
+INCLUDE "engine/pokemon/move_mon.asm"
+INCLUDE "engine/pokemon/bills_pc_top.asm"
+INCLUDE "engine/pokemon/breedmon_level_growth.asm"
 INCLUDE "engine/events/bug_contest/caught_mon.asm"
-INCLUDE "engine/item_effects.asm"
-INCLUDE "engine/battle_anims/getpokeballwobble.asm"
-INCLUDE "engine/routines/knowsmove.asm"
+INCLUDE "engine/items/item_effects.asm"
+INCLUDE "engine/battle_anims/pokeball_wobble.asm"
+INCLUDE "engine/pokemon/knows_move.asm"
 
 
 SECTION "bank4", ROMX
 
-INCLUDE "engine/pack.asm"
-INCLUDE "engine/time.asm"
-INCLUDE "engine/tmhm.asm"
-INCLUDE "engine/naming_screen.asm"
+INCLUDE "engine/items/pack.asm"
+INCLUDE "engine/overworld/time.asm"
+INCLUDE "engine/items/tmhm2.asm"
+INCLUDE "engine/menus/naming_screen.asm"
 INCLUDE "engine/events/misc_scripts.asm"
 INCLUDE "engine/events/heal_machine_anim.asm"
 INCLUDE "engine/events/whiteout.asm"
 INCLUDE "engine/events/forced_movement.asm"
 INCLUDE "engine/events/itemfinder.asm"
-INCLUDE "engine/start_menu.asm"
-INCLUDE "engine/select_menu.asm"
+INCLUDE "engine/menus/start_menu.asm"
+INCLUDE "engine/overworld/select_menu.asm"
 INCLUDE "engine/events/elevator.asm"
 INCLUDE "engine/events/bug_contest/contest.asm"
 INCLUDE "engine/events/misc_scripts_2.asm"
@@ -64,76 +65,74 @@ INCLUDE "engine/events/std_collision.asm"
 INCLUDE "engine/events/bug_contest/judging.asm"
 INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm"
 INCLUDE "engine/events/bug_contest/contest_2.asm"
-INCLUDE "engine/routines/correcterrorsinplayerparty.asm"
-INCLUDE "engine/routines/getsquareroot.asm"
+INCLUDE "engine/pokemon/correct_party_errors.asm"
+INCLUDE "engine/math/get_square_root.asm"
 
 
 SECTION "bank5", ROMX
 
-INCLUDE "engine/rtc.asm"
-INCLUDE "engine/overworld.asm"
-INCLUDE "engine/tile_events.asm"
-INCLUDE "engine/save.asm"
-INCLUDE "engine/spawn_points.asm"
-INCLUDE "engine/map_setup.asm"
+INCLUDE "engine/rtc/rtc.asm"
+INCLUDE "engine/overworld/overworld.asm"
+INCLUDE "engine/overworld/tile_events.asm"
+INCLUDE "engine/menus/save.asm"
+INCLUDE "engine/overworld/spawn_points.asm"
+INCLUDE "engine/overworld/map_setup.asm"
 INCLUDE "engine/events/pokecenter_pc.asm"
-INCLUDE "engine/mart.asm"
-INCLUDE "engine/money.asm"
+INCLUDE "engine/items/mart.asm"
+INCLUDE "engine/events/money.asm"
 INCLUDE "data/items/marts.asm"
 INCLUDE "engine/events/mom.asm"
 INCLUDE "engine/events/daycare.asm"
 INCLUDE "engine/events/print_unown.asm"
 INCLUDE "engine/events/print_photo.asm"
-INCLUDE "engine/breeding.asm"
+INCLUDE "engine/pokemon/breeding.asm"
 INCLUDE "gfx/tilesets.asm"
 
 
 SECTION "Roofs", ROMX
 
-INCLUDE "engine/mapgroup_roofs.asm"
+INCLUDE "engine/tilesets/mapgroup_roofs.asm"
 
 
 SECTION "Clock Reset", ROMX
 
-INCLUDE "engine/clock_reset.asm"
+INCLUDE "engine/rtc/restart_clock.asm"
 
 
 SECTION "bank9", ROMX
 
 INCLUDE "data/text_buffers.asm"
-INCLUDE "engine/menu.asm"
-INCLUDE "engine/routines/updateitemdescription.asm"
+INCLUDE "engine/menus/menu.asm"
+INCLUDE "engine/items/update_item_description.asm"
 INCLUDE "engine/events/pokepic.asm"
-INCLUDE "engine/map_objects_2.asm"
-INCLUDE "engine/scrolling_menu.asm"
-INCLUDE "engine/switch_items.asm"
-INCLUDE "engine/menu_2.asm"
-INCLUDE "engine/mon_menu.asm"
+INCLUDE "engine/overworld/map_objects_2.asm"
+INCLUDE "engine/menus/scrolling_menu.asm"
+INCLUDE "engine/items/switch_items.asm"
+INCLUDE "engine/menus/menu_2.asm"
+INCLUDE "engine/pokemon/mon_menu.asm"
 INCLUDE "engine/battle/menu.asm"
-INCLUDE "engine/buy_sell_toss.asm"
-INCLUDE "engine/trainer_card.asm"
+INCLUDE "engine/items/buy_sell_toss.asm"
+INCLUDE "engine/menus/trainer_card.asm"
 INCLUDE "engine/events/prof_oaks_pc.asm"
-INCLUDE "engine/decorations.asm"
-INCLUDE "engine/routines/leveluphappinessmod.asm"
+INCLUDE "engine/overworld/decorations.asm"
+INCLUDE "engine/pokemon/level_up_happiness.asm"
 INCLUDE "engine/battle/read_trainer_dvs.asm"
-INCLUDE "data/trainers/dvs.asm"
 INCLUDE "engine/battle/returntobattle_useball.asm"
-INCLUDE "engine/battle/consumehelditem.asm"
-INCLUDE "data/moves/effects_pointers.asm"
+INCLUDE "engine/battle/consume_held_item.asm"
 INCLUDE "data/moves/effects.asm"
 INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm"
 
 
 SECTION "bankA", ROMX
 
-INCLUDE "engine/link.asm"
-INCLUDE "engine/wildmons.asm"
+INCLUDE "engine/link/link.asm"
+INCLUDE "engine/overworld/wildmons.asm"
 INCLUDE "engine/battle/link_result.asm"
 
-ChrisBackpic: ; 2ba1a
+ChrisBackpic:
 INCBIN "gfx/player/chris_back.2bpp.lz"
 
-DudeBackpic: ; 2bbaa
+DudeBackpic:
 INCBIN "gfx/battle/dude.2bpp.lz"
 
 
@@ -143,12 +142,12 @@ INCLUDE "engine/battle/trainer_huds.asm"
 INCLUDE "data/trainers/class_names.asm"
 INCLUDE "engine/battle/ai/redundant.asm"
 INCLUDE "engine/events/move_deleter.asm"
-INCLUDE "engine/mystery_gift_2.asm"
-INCLUDE "engine/tmhm2.asm"
+INCLUDE "engine/link/mystery_gift_2.asm"
+INCLUDE "engine/items/tmhm.asm"
 INCLUDE "data/moves/descriptions.asm"
 INCLUDE "engine/events/pokerus/pokerus.asm"
 INCLUDE "engine/battle/start_battle.asm"
-INCLUDE "engine/routines/placegraphic.asm"
+INCLUDE "engine/gfx/place_graphic.asm"
 
 
 SECTION "Effect Commands", ROMX
@@ -161,10 +160,7 @@ SECTION "Enemy Trainers", ROMX
 INCLUDE "engine/battle/ai/items.asm"
 INCLUDE "engine/battle/ai/scoring.asm"
 INCLUDE "engine/battle/read_trainer_attributes.asm"
-INCLUDE "data/trainers/attributes.asm"
 INCLUDE "engine/battle/read_trainer_party.asm"
-INCLUDE "data/trainers/party_pointers.asm"
-INCLUDE "data/trainers/parties.asm"
 
 
 SECTION "Battle Core", ROMX
@@ -177,7 +173,7 @@ SECTION "bank10", ROMX
 
 INCLUDE "engine/pokedex/pokedex.asm"
 INCLUDE "data/moves/moves.asm"
-INCLUDE "engine/evolve.asm"
+INCLUDE "engine/pokemon/evolve.asm"
 
 
 SECTION "bank11", ROMX
@@ -185,86 +181,86 @@ SECTION "bank11", ROMX
 INCLUDE "engine/events/fruit_trees.asm"
 INCLUDE "engine/battle/ai/move.asm"
 INCLUDE "engine/pokedex/pokedex_2.asm"
-INCLUDE "data/pokemon/dex_entry_pointers.asm"
-INCLUDE "engine/mail.asm"
+INCLUDE "engine/pokemon/mail.asm"
 
 
 SECTION "Crystal Features 1", ROMX
 
-INCLUDE "engine/init_gender.asm"
-INCLUDE "engine/routines/drawkrispackgfx.asm"
+INCLUDE "engine/menus/init_gender.asm"
+INCLUDE "engine/items/pack_kris.asm"
 INCLUDE "engine/events/move_tutor.asm"
-INCLUDE "engine/crystal_layouts.asm"
+INCLUDE "engine/gfx/crystal_layouts.asm"
 INCLUDE "engine/events/celebi.asm"
-INCLUDE "engine/main_menu.asm"
+INCLUDE "engine/menus/main_menu.asm"
 INCLUDE "mobile/mobile_menu.asm"
-INCLUDE "engine/search.asm"
+INCLUDE "engine/pokemon/search.asm"
 INCLUDE "mobile/mobile_12_2.asm"
 INCLUDE "engine/events/buena_menu.asm"
 
 
 SECTION "bank13", ROMX
 
-INCLUDE "engine/map_palettes.asm"
-INCLUDE "gfx/tilesets/palette_maps.asm"
+INCLUDE "engine/tilesets/map_palettes.asm"
+INCLUDE "gfx/tileset_palette_maps.asm"
 INCLUDE "data/collision_permissions.asm"
-INCLUDE "engine/routines/emptyallsrambanks.asm"
-INCLUDE "engine/routines/savemenu_copytilemapatonce.asm"
-INCLUDE "engine/routines/checksave.asm"
+INCLUDE "engine/menus/empty_sram.asm"
+INCLUDE "engine/menus/savemenu_copytilemapatonce.asm"
+INCLUDE "engine/events/checksave.asm"
 INCLUDE "data/maps/scenes.asm"
-INCLUDE "engine/routines/loadmappart.asm"
-INCLUDE "engine/routines/phonering_copytilemapatonce.asm"
+INCLUDE "engine/overworld/load_map_part.asm"
+INCLUDE "engine/phone/phonering_copytilemapatonce.asm"
 
-Shrink1Pic: ; 4d249
+Shrink1Pic:
 INCBIN "gfx/new_game/shrink1.2bpp.lz"
 
-Shrink2Pic: ; 4d2d9
+Shrink2Pic:
 INCBIN "gfx/new_game/shrink2.2bpp.lz"
 
-INCLUDE "engine/link_2.asm"
-INCLUDE "engine/delete_save_change_clock.asm"
+INCLUDE "engine/link/link_2.asm"
+INCLUDE "engine/rtc/reset_password.asm"
+INCLUDE "engine/menus/delete_save.asm"
 INCLUDE "data/tilesets.asm"
-INCLUDE "engine/routines/flagpredef.asm"
-INCLUDE "engine/routines/trademonfrontpic.asm"
+INCLUDE "engine/smallflag.asm"
+INCLUDE "engine/gfx/trademon_frontpic.asm"
 INCLUDE "engine/events/pokerus/check_pokerus.asm"
 INCLUDE "engine/events/lucky_number.asm"
-INCLUDE "engine/caught_data.asm"
-INCLUDE "engine/search2.asm"
-INCLUDE "engine/stats_screen.asm"
+INCLUDE "engine/pokemon/caught_data.asm"
+INCLUDE "engine/pokemon/search2.asm"
+INCLUDE "engine/pokemon/stats_screen.asm"
 INCLUDE "engine/events/catch_tutorial.asm"
-INCLUDE "engine/evolution_animation.asm"
-INCLUDE "engine/init_hof_credits.asm"
+INCLUDE "engine/movie/evolution_animation.asm"
+INCLUDE "engine/movie/init_hof_credits.asm"
 INCLUDE "engine/events/battle_tower/get_trainer_class.asm"
 INCLUDE "engine/battle/sliding_intro.asm"
 INCLUDE "mobile/print_opp_message.asm"
-INCLUDE "engine/battle/checkbattlescene.asm"
-INCLUDE "engine/gbc_only.asm"
+INCLUDE "engine/battle/check_battle_scene.asm"
+INCLUDE "engine/movie/gbc_only.asm"
 INCLUDE "engine/events/poke_seer.asm"
 
 
 SECTION "bank14", ROMX
 
-INCLUDE "engine/party_menu.asm"
+INCLUDE "engine/pokemon/party_menu.asm"
 INCLUDE "engine/events/poisonstep.asm"
 INCLUDE "engine/events/sweet_scent.asm"
 INCLUDE "engine/events/squirtbottle.asm"
 INCLUDE "engine/events/card_key.asm"
 INCLUDE "engine/events/basement_key.asm"
 INCLUDE "engine/events/sacred_ash.asm"
-INCLUDE "engine/tempmon.asm"
-INCLUDE "engine/types.asm"
-INCLUDE "engine/routines/unreferenced_getgen1trainerclassname.asm"
-INCLUDE "engine/mon_stats.asm"
-INCLUDE "engine/routines/initlist.asm"
-INCLUDE "engine/experience.asm"
-INCLUDE "engine/routines/switchpartymons.asm"
-INCLUDE "engine/load_pics.asm"
-INCLUDE "engine/move_mon_wo_mail.asm"
+INCLUDE "engine/pokemon/tempmon.asm"
+INCLUDE "engine/pokemon/types.asm"
+INCLUDE "engine/battle/unreferenced_getgen1trainerclassname.asm"
+INCLUDE "engine/pokemon/mon_stats.asm"
+INCLUDE "engine/link/init_list.asm"
+INCLUDE "engine/pokemon/experience.asm"
+INCLUDE "engine/pokemon/switchpartymons.asm"
+INCLUDE "engine/gfx/load_pics.asm"
+INCLUDE "engine/pokemon/move_mon_wo_mail.asm"
 INCLUDE "data/pokemon/base_stats.asm"
 INCLUDE "data/pokemon/names.asm"
-INCLUDE "data/unused/unknown_53d84.asm"
+INCLUDE "data/pokemon/unused_pic_banks.asm"
 
-UnknownEggPic:: ; 53d9c
+UnknownEggPic::
 ; Another egg pic. This is shifted up a few pixels.
 INCBIN "gfx/unknown/unknown_egg.2bpp.lz"
 
@@ -276,16 +272,17 @@ INCLUDE "data/phone/text/extra.asm"
 
 SECTION "bank20", ROMX
 
-INCLUDE "engine/player_movement.asm"
-INCLUDE "engine/engine_flags.asm"
-INCLUDE "engine/variables.asm"
-INCLUDE "data/battle/battle_text.asm"
-INCLUDE "engine/debug.asm"
+INCLUDE "engine/overworld/player_movement.asm"
+INCLUDE "engine/events/engine_flags.asm"
+INCLUDE "engine/overworld/variables.asm"
+INCLUDE "data/text/battle.asm"
+INCLUDE "engine/menus/debug.asm"
 
 
 SECTION "bank21", ROMX
 
-INCLUDE "engine/printer.asm"
+INCLUDE "engine/printer/printer_serial.asm"
+INCLUDE "engine/printer/printer.asm"
 INCLUDE "gfx/battle_anims.asm"
 INCLUDE "engine/events/halloffame.asm"
 
@@ -293,7 +290,7 @@ INCLUDE "engine/events/halloffame.asm"
 SECTION "Crystal Features 2", ROMX
 
 INCLUDE "engine/events/kurt.asm"
-INCLUDE "engine/player_gfx.asm"
+INCLUDE "engine/gfx/player_gfx.asm"
 INCLUDE "mobile/mobile_22.asm"
 INCLUDE "engine/events/unown_walls.asm"
 INCLUDE "engine/events/buena.asm"
@@ -304,22 +301,22 @@ INCLUDE "mobile/mobile_22_2.asm"
 
 SECTION "bank23", ROMX
 
-INCLUDE "engine/timeofdaypals.asm"
+INCLUDE "engine/tilesets/timeofday_pals.asm"
 INCLUDE "engine/battle/battle_transition.asm"
 INCLUDE "engine/events/field_moves.asm"
 INCLUDE "engine/events/magnet_train.asm"
 INCLUDE "engine/battle/battlestart_copytilemapatonce.asm"
-INCLUDE "engine/sprites.asm"
-INCLUDE "engine/mon_icons.asm"
+INCLUDE "engine/gfx/sprites.asm"
+INCLUDE "engine/gfx/mon_icons.asm"
 
 
 SECTION "bank24", ROMX
 
 INCLUDE "engine/phone/phone.asm"
-INCLUDE "engine/timeset.asm"
-INCLUDE "engine/pokegear.asm"
+INCLUDE "engine/rtc/timeset.asm"
+INCLUDE "engine/pokegear/pokegear.asm"
 INCLUDE "engine/events/fish.asm"
-INCLUDE "engine/slot_machine.asm"
+INCLUDE "engine/games/slot_machine.asm"
 
 
 SECTION "Phone Engine", ROMX
@@ -355,9 +352,9 @@ SECTION "bank2E", ROMX
 INCLUDE "engine/events/map_name_sign.asm"
 INCLUDE "engine/events/checkforhiddenitems.asm"
 INCLUDE "engine/events/treemons.asm"
-INCLUDE "engine/events/loadfishinggfx.asm"
-INCLUDE "engine/radio.asm"
-INCLUDE "engine/mail_2.asm"
+INCLUDE "engine/events/fishing_gfx.asm"
+INCLUDE "engine/pokegear/radio.asm"
+INCLUDE "engine/pokemon/mail_2.asm"
 
 
 SECTION "bank2F", ROMX
@@ -374,7 +371,7 @@ INCLUDE "engine/battle_anims/bg_effects.asm"
 INCLUDE "data/moves/animations.asm"
 INCLUDE "engine/events/poisonstep_pals.asm"
 
-TheEndGFX:: ; cbd2e
+TheEndGFX::
 INCBIN "gfx/credits/theend.2bpp"
 
 
@@ -393,7 +390,7 @@ INCLUDE "data/battle_anims/object_gfx.asm"
 
 SECTION "Pic Animations 1", ROMX
 
-INCLUDE "engine/pic_animation.asm"
+INCLUDE "engine/gfx/pic_animation.asm"
 INCLUDE "gfx/pokemon/anim_pointers.asm"
 INCLUDE "gfx/pokemon/anims.asm"
 INCLUDE "gfx/pokemon/idle_pointers.asm"
@@ -430,29 +427,29 @@ INCLUDE "gfx/pokemon/unown_frames.asm"
 SECTION "bank38", ROMX
 
 INCLUDE "engine/events/print_unown_2.asm"
-INCLUDE "engine/card_flip.asm"
-INCLUDE "engine/unown_puzzle.asm"
-INCLUDE "engine/dummy_game.asm"
-INCLUDE "engine/billspc.asm"
+INCLUDE "engine/games/card_flip.asm"
+INCLUDE "engine/games/unown_puzzle.asm"
+INCLUDE "engine/games/dummy_game.asm"
+INCLUDE "engine/pokemon/bills_pc.asm"
 
 
 SECTION "bank39", ROMX
 
-CopyrightGFX:: ; e4000
+CopyrightGFX::
 INCBIN "gfx/splash/copyright.2bpp"
 
-INCLUDE "engine/options_menu.asm"
-INCLUDE "engine/crystal_intro.asm"
+INCLUDE "engine/menus/options_menu.asm"
+INCLUDE "engine/movie/crystal_intro.asm"
 
 
 SECTION "bank3E", ROMX
 
-INCLUDE "engine/load_font.asm"
-INCLUDE "engine/time_capsule.asm"
+INCLUDE "engine/gfx/load_font.asm"
+INCLUDE "engine/link/time_capsule.asm"
 INCLUDE "engine/events/name_rater.asm"
-INCLUDE "engine/routines/playslowcry.asm"
-INCLUDE "engine/pokedex/newpokedexentry.asm"
-INCLUDE "engine/time_capsule_2.asm"
+INCLUDE "engine/events/play_slow_cry.asm"
+INCLUDE "engine/pokedex/new_pokedex_entry.asm"
+INCLUDE "engine/link/time_capsule_2.asm"
 INCLUDE "engine/pokedex/unown_dex.asm"
 INCLUDE "engine/events/magikarp.asm"
 INCLUDE "engine/battle/hidden_power.asm"
@@ -461,8 +458,8 @@ INCLUDE "engine/battle/misc.asm"
 
 SECTION "bank3F", ROMX
 
-INCLUDE "engine/tileset_anims.asm"
-INCLUDE "engine/npctrade.asm"
+INCLUDE "engine/tilesets/tileset_anims.asm"
+INCLUDE "engine/events/npc_trade.asm"
 INCLUDE "engine/events/mom_phone.asm"
 
 
@@ -471,13 +468,13 @@ INCLUDE "mobile/mobile_40.asm"
 
 SECTION "bank41", ROMX
 
-INCLUDE "engine/dma_transfer.asm"
+INCLUDE "engine/gfx/dma_transfer.asm"
 INCLUDE "gfx/emotes.asm"
-INCLUDE "engine/warp_connection.asm"
-INCLUDE "engine/mystery_gift.asm"
+INCLUDE "engine/overworld/warp_connection.asm"
+INCLUDE "engine/link/mystery_gift.asm"
 INCLUDE "engine/battle/used_move_text.asm"
 INCLUDE "mobile/mobile_41.asm"
-INCLUDE "engine/routines/loadoverworldfont.asm"
+INCLUDE "engine/gfx/load_overworld_font.asm"
 
 
 SECTION "Mobile 42", ROMX
@@ -487,14 +484,14 @@ INCLUDE "mobile/mobile_42.asm"
 
 SECTION "Intro Logo", ROMX
 
-IntroLogoGFX: ; 109407
+IntroLogoGFX:
 INCBIN "gfx/intro/logo.2bpp.lz"
 
 
 SECTION "Title", ROMX
 
-INCLUDE "engine/unused_title.asm"
-INCLUDE "engine/title.asm"
+INCLUDE "engine/movie/unused_title.asm"
+INCLUDE "engine/movie/title.asm"
 
 
 INCLUDE "mobile/mobile_45.asm"
@@ -511,7 +508,7 @@ INCLUDE "engine/events/battle_tower/trainer_text.asm"
 SECTION "bank5B", ROMX
 
 INCLUDE "mobile/mobile_5b.asm"
-INCLUDE "engine/link_trade.asm"
+INCLUDE "engine/link/link_trade.asm"
 
 
 SECTION "Mobile 5C", ROMX
@@ -526,7 +523,7 @@ INCLUDE "data/phone/text/extra2.asm"
 
 SECTION "UpdateBattleHUDs", ROMX
 
-INCLUDE "engine/battle/updatebattlehuds.asm"
+INCLUDE "engine/battle/update_battle_huds.asm"
 
 
 SECTION "Mobile 5E", ROMX
@@ -539,9 +536,9 @@ SECTION "Mobile 5F", ROMX
 INCLUDE "mobile/mobile_5f.asm"
 
 
-SECTION "Common Text 1", ROMX
+SECTION "Phone Text 2", ROMX
 
-INCLUDE "data/std_text.asm"
+INCLUDE "data/text/std_text.asm"
 INCLUDE "data/phone/text/jack_overworld.asm"
 INCLUDE "data/phone/text/beverly_overworld.asm"
 INCLUDE "data/phone/text/huey_overworld.asm"
@@ -560,38 +557,37 @@ SECTION "Special Phone Text", ROMX
 INCLUDE "data/phone/text/mom.asm"
 INCLUDE "data/phone/text/bill.asm"
 INCLUDE "data/phone/text/elm.asm"
-INCLUDE "data/phone/text/trainers1.asm"
+INCLUDE "data/phone/text/trainers.asm"
 
 
 SECTION "Miscellaneous Text", ROMX
 
 INCLUDE "data/items/names.asm"
-INCLUDE "engine/routines/printitemdescription.asm"
-INCLUDE "data/items/descriptions.asm"
+INCLUDE "engine/items/print_item_description.asm"
 INCLUDE "data/moves/names.asm"
-INCLUDE "engine/landmarks.asm"
+INCLUDE "engine/overworld/landmarks.asm"
 
 
 SECTION "bank77", ROMX
 
-UnownFont: ; 1dc000
+UnownFont:
 INCBIN "gfx/font/unown_font.2bpp"
 
-INCLUDE "engine/print_party.asm"
+INCLUDE "engine/printer/print_party.asm"
 
 
 SECTION "bank77_2", ROMX
 
-INCLUDE "engine/routines/printhoursmins.asm"
-INCLUDE "engine/diploma.asm"
+INCLUDE "engine/rtc/print_hours_mins.asm"
+INCLUDE "engine/events/diploma.asm"
 INCLUDE "engine/pokedex/pokedex_3.asm"
 INCLUDE "engine/events/catch_tutorial_input.asm"
-INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm"
+INCLUDE "engine/pokegear/townmap_convertlinebreakcharacters.asm"
 
-PokegearGFX: ; 1de2e4
+PokegearGFX:
 INCBIN "gfx/pokegear/pokegear.2bpp.lz"
 
-INCLUDE "engine/european_mail.asm"
+INCLUDE "engine/pokemon/european_mail.asm"
 
 
 SECTION "Battle Tower Text", ROMX
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 3675392fc..f8cd6d4b7 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const AZALEAGYM_BUGSY
 	const AZALEAGYM_BUG_CATCHER1
 	const AZALEAGYM_BUG_CATCHER2
@@ -8,11 +8,9 @@ const_value set 2
 	const AZALEAGYM_GYM_GUY
 
 AzaleaGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 AzaleaGymBugsyScript:
 	faceplayer
@@ -59,8 +57,8 @@ AzaleaGymBugsyScript:
 	end
 
 AzaleaGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -70,10 +68,10 @@ AzaleaGymActivateRockets:
 	jumpstd radiotowerrockets
 
 TrainerTwinsAmyandmay1:
-	trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript
+	trainer TWINS, AMYANDMAY1, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript
 
 .AfterScript:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsAmyandmay1AfterBattleText
 	waitbutton
@@ -81,10 +79,10 @@ TrainerTwinsAmyandmay1:
 	end
 
 TrainerTwinsAmyandmay2:
-	trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript
+	trainer TWINS, AMYANDMAY2, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript
 
 .AfterScript:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsAmyandmay2AfterBattleText
 	waitbutton
@@ -92,10 +90,10 @@ TrainerTwinsAmyandmay2:
 	end
 
 TrainerBugCatcherBenny:
-	trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript
+	trainer BUG_CATCHER, BUG_CATCHER_BENNY, EVENT_BEAT_BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript
 
 .AfterScript:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherBennyAfterBattleText
 	waitbutton
@@ -103,10 +101,10 @@ TrainerBugCatcherBenny:
 	end
 
 TrainerBugCatcherAl:
-	trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript
+	trainer BUG_CATCHER, AL, EVENT_BEAT_BUG_CATCHER_AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript
 
 .AfterScript:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherAlAfterBattleText
 	waitbutton
@@ -114,10 +112,10 @@ TrainerBugCatcherAl:
 	end
 
 TrainerBugCatcherJosh:
-	trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript
+	trainer BUG_CATCHER, JOSH, EVENT_BEAT_BUG_CATCHER_JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript
 
 .AfterScript:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherJoshAfterBattleText
 	waitbutton
@@ -362,28 +360,23 @@ AzaleaGymGuyWinText:
 	done
 
 AzaleaGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 15, 5, AZALEA_TOWN
-	warp_def 5, 15, 5, AZALEA_TOWN
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue
-	bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue
-
-.ObjectEvents:
-	db 7
-	object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
-	object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
-	object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1
-	object_event 0, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1
-	object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
-	object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
-	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 15, AZALEA_TOWN, 5
+	warp_event  5, 15, AZALEA_TOWN, 5
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3, 13, BGEVENT_READ, AzaleaGymStatue
+	bg_event  6, 13, BGEVENT_READ, AzaleaGymStatue
+
+	db 7 ; object events
+	object_event  5,  7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
+	object_event  5,  3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1
+	object_event  8,  8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1
+	object_event  0,  2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1
+	object_event  4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
+	object_event  5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
+	object_event  7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
index 8ecf94d92..c98ff31ac 100644
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const AZALEAMART_CLERK
 	const AZALEAMART_COOLTRAINER_M
 	const AZALEAMART_BUG_CATCHER
 
 AzaleaMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 AzaleaMartClerkScript:
 	opentext
@@ -46,22 +44,17 @@ AzaleaMartBugCatcherText:
 	done
 
 AzaleaMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 3, AZALEA_TOWN
-	warp_def 3, 7, 3, AZALEA_TOWN
+	db 2 ; warp events
+	warp_event  2,  7, AZALEA_TOWN, 3
+	warp_event  3,  7, AZALEA_TOWN, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
-	object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
-	object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
+	object_event  2,  5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
+	object_event  7,  2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1
diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm
index 6e65c2c01..dbae15320 100644
--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const AZALEAPOKECENTER1F_NURSE
 	const AZALEAPOKECENTER1F_GENTLEMAN
 	const AZALEAPOKECENTER1F_FISHING_GURU
 	const AZALEAPOKECENTER1F_POKEFAN_F
 
 AzaleaPokecenter1F_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -39,6 +37,7 @@ AzaleaPokecenter1FGentlemanText:
 	done
 
 AzaleaPokecenter1FUnusedText:
+; unreferenced
 	text "This BILL guy"
 	line "created the system"
 
@@ -77,24 +76,19 @@ AzaleaPokecenter1FPokefanFText:
 	done
 
 AzaleaPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 1, AZALEA_TOWN
-	warp_def 4, 7, 1, AZALEA_TOWN
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
-	object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
-	object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
-	object_event 1, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, AZALEA_TOWN, 1
+	warp_event  4,  7, AZALEA_TOWN, 1
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
+	object_event  9,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
+	object_event  6,  1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
+	object_event  1,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 16889aa51..c6bcbd67c 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const AZALEATOWN_AZALEA_ROCKET1
 	const AZALEATOWN_GRAMPS
 	const AZALEATOWN_TEACHER
@@ -13,14 +13,12 @@ const_value set 2
 	const AZALEATOWN_KURT_OUTSIDE
 
 AzaleaTown_MapScripts:
-.SceneScripts:
-	db 3
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .DummyScene2
-
-.MapCallbacks:
-	db 1
+	db 3 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING
+	scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE
+	scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
+
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .Flypoint
 
 .DummyScene0:
@@ -38,23 +36,23 @@ AzaleaTown_MapScripts:
 
 AzaleaTownRivalBattleScene1:
 	moveobject AZALEATOWN_SILVER, 11, 11
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	appear AZALEATOWN_SILVER
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	jump AzaleaTownRivalBattleScript
 
 AzaleaTownRivalBattleScene2:
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	appear AZALEATOWN_SILVER
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 AzaleaTownRivalBattleScript:
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
@@ -98,11 +96,11 @@ AzaleaTownRivalBattleScript:
 	writetext AzaleaTownRivalAfterText
 	waitbutton
 	closetext
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
 	playsound SFX_EXIT_BUILDING
 	disappear AZALEATOWN_SILVER
-	setscene 0
+	setscene SCENE_AZALEATOWN_NOTHING
 	waitsfx
 	playmapmusic
 	end
@@ -145,7 +143,7 @@ AzaleaTownSlowpokeScript:
 	closetext
 	end
 
-WoosterScript:
+UnusedWoosterScript:
 ; unused
 	faceplayer
 	opentext
@@ -160,17 +158,17 @@ AzaleaTownCelebiScene:
 	opentext
 	writetext AzaleaTownKurtText1
 	buttonsound
-	spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT
+	turnobject AZALEATOWN_KURT_OUTSIDE, RIGHT
 	writetext AzaleaTownKurtText2
 	buttonsound
 	writetext AzaleaTownKurtText3
 	waitbutton
 	verbosegiveitem GS_BALL
-	spriteface AZALEATOWN_KURT_OUTSIDE, LEFT
-	setflag ENGINE_HAVE_EXAMINED_GS_BALL
+	turnobject AZALEATOWN_KURT_OUTSIDE, LEFT
+	setflag ENGINE_FOREST_IS_RESTLESS
 	clearevent EVENT_ILEX_FOREST_LASS
 	setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
-	setscene 0
+	setscene SCENE_AZALEATOWN_NOTHING
 	closetext
 	end
 
@@ -179,7 +177,7 @@ AzaleaTownKurtScript:
 	opentext
 	writetext AzaleaTownKurtText3
 	waitbutton
-	spriteface AZALEATOWN_KURT_OUTSIDE, LEFT
+	turnobject AZALEATOWN_KURT_OUTSIDE, LEFT
 	closetext
 	end
 
@@ -211,7 +209,7 @@ WhiteApricornTree:
 	fruittree FRUITTREE_AZALEA_TOWN
 
 AzaleaTownHiddenFullHeal:
-	hiddenitem EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL
+	hiddenitem FULL_HEAL, EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL
 
 AzaleaTownRivalBattleApproachMovement1:
 	step LEFT
@@ -456,49 +454,44 @@ AzaleaTownIlexForestSignText:
 	done
 
 AzaleaTown_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 8
-	warp_def 15, 9, 1, AZALEA_POKECENTER_1F
-	warp_def 21, 13, 1, CHARCOAL_KILN
-	warp_def 21, 5, 2, AZALEA_MART
-	warp_def 9, 5, 1, KURTS_HOUSE
-	warp_def 10, 15, 1, AZALEA_GYM
-	warp_def 31, 7, 1, SLOWPOKE_WELL_B1F
-	warp_def 2, 10, 3, ILEX_FOREST_AZALEA_GATE
-	warp_def 2, 11, 4, ILEX_FOREST_AZALEA_GATE
-
-.CoordEvents:
-	db 3
-	coord_event 5, 10, 1, AzaleaTownRivalBattleScene1
-	coord_event 5, 11, 1, AzaleaTownRivalBattleScene2
-	coord_event 9, 6, 2, AzaleaTownCelebiScene
-
-.BGEvents:
-	db 9
-	bg_event 19, 9, BGEVENT_READ, AzaleaTownSign
-	bg_event 10, 9, BGEVENT_READ, KurtsHouseSign
+	db 0, 0 ; filler
+
+	db 8 ; warp events
+	warp_event 15,  9, AZALEA_POKECENTER_1F, 1
+	warp_event 21, 13, CHARCOAL_KILN, 1
+	warp_event 21,  5, AZALEA_MART, 2
+	warp_event  9,  5, KURTS_HOUSE, 1
+	warp_event 10, 15, AZALEA_GYM, 1
+	warp_event 31,  7, SLOWPOKE_WELL_B1F, 1
+	warp_event  2, 10, ILEX_FOREST_AZALEA_GATE, 3
+	warp_event  2, 11, ILEX_FOREST_AZALEA_GATE, 4
+
+	db 3 ; coord events
+	coord_event  5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1
+	coord_event  5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2
+	coord_event  9,  6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene
+
+	db 9 ; bg events
+	bg_event 19,  9, BGEVENT_READ, AzaleaTownSign
+	bg_event 10,  9, BGEVENT_READ, KurtsHouseSign
 	bg_event 14, 15, BGEVENT_READ, AzaleaGymSign
-	bg_event 29, 7, BGEVENT_READ, SlowpokeWellSign
+	bg_event 29,  7, BGEVENT_READ, SlowpokeWellSign
 	bg_event 19, 13, BGEVENT_READ, CharcoalKilnSign
-	bg_event 16, 9, BGEVENT_READ, AzaleaTownPokecenterSign
-	bg_event 22, 5, BGEVENT_READ, AzaleaTownMartSign
-	bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign
-	bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
-
-.ObjectEvents:
-	db 12
-	object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
-	object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
+	bg_event 16,  9, BGEVENT_READ, AzaleaTownPokecenterSign
+	bg_event 22,  5, BGEVENT_READ, AzaleaTownMartSign
+	bg_event  3,  9, BGEVENT_READ, AzaleaTownIlextForestSign
+	bg_event 31,  6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
+
+	db 12 ; object events
+	object_event 31,  9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
+	object_event 21,  9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
 	object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1
-	object_event 7, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1
-	object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event 15, 15, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
-	object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1
+	object_event  7,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1
+	object_event  8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 18,  9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 29,  9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event 15, 15, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
+	object_event  8,  2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1
 	object_event 11, 10, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
 	object_event 10, 16, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 6, 5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT
+	object_event  6,  5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 910d27a69..ee551c851 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BATTLETOWER1F_RECEPTIONIST
 	const BATTLETOWER1F_YOUNGSTER
 	const BATTLETOWER1F_COOLTRAINER_F
@@ -6,24 +6,22 @@ const_value set 2
 	const BATTLETOWER1F_GRANNY
 
 BattleTower1F_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .Scene0
-	scene_script .Scene1
+	db 2 ; scene scripts
+	scene_script .Scene0 ; SCENE_DEFAULT
+	scene_script .Scene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .Scene0:
 	writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	iffalse .SkipEverything
 	writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
-	special Special_BattleTowerAction
-	if_equal $0, .SkipEverything
-	if_equal $2, .priorityjump1
-	if_equal $3, .SkipEverything
-	if_equal $4, .SkipEverything
+	special BattleTowerAction
+	ifequal $0, .SkipEverything
+	ifequal $2, .priorityjump1
+	ifequal $3, .SkipEverything
+	ifequal $4, .SkipEverything
 	opentext
 	writetext Text_WeveBeenWaitingForYou
 	waitbutton
@@ -34,84 +32,84 @@ BattleTower1F_MapScripts:
 .priorityjump1
 	priorityjump BattleTower_LeftWithoutSaving
 	writebyte BATTLETOWERACTION_CHALLENGECANCELED
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	writebyte BATTLETOWERACTION_06
-	special Special_BattleTowerAction
+	special BattleTowerAction
 .SkipEverything:
-	setscene 1
+	setscene SCENE_FINISHED
 .Scene1:
 	end
 
-MapBattleTower1FSignpost0Script:
+BattleTower1FRulesSign:
 	opentext
 	writetext Text_ReadBattleTowerRules
 	yesorno
-	iffalse UnknownScript_0x9e3e0
+	iffalse .skip
 	writetext Text_BattleTowerRules
 	waitbutton
-UnknownScript_0x9e3e0:
+.skip:
 	closetext
 	end
 
-ReceptionistScript_0x9e3e2:
+BattleTower1FReceptionistScript:
 	writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
-	special Special_BattleTowerAction
-	if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
+	special BattleTowerAction
+	ifequal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
 	opentext
 	writetext Text_BattleTowerWelcomesYou
 	buttonsound
 	writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
-	special Special_BattleTowerAction
-	if_not_equal $0, Script_Menu_ChallengeExplanationCancel
+	special BattleTowerAction
+	ifnotequal $0, Script_Menu_ChallengeExplanationCancel
 	jump Script_BattleTowerIntroductionYesNo
 
-Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
+Script_Menu_ChallengeExplanationCancel:
 	writetext Text_WantToGoIntoABattleRoom
 	writebyte TRUE
-	special Special_Menu_ChallengeExplanationCancel
-	if_equal 1, Script_ChooseChallenge
-	if_equal 2, Script_BattleTowerExplanation
+	special Menu_ChallengeExplanationCancel
+	ifequal 1, Script_ChooseChallenge
+	ifequal 2, Script_BattleTowerExplanation
 	jump Script_BattleTowerHopeToServeYouAgain
 
-Script_ChooseChallenge: ; 0x9e40f
+Script_ChooseChallenge:
 	writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
-	special Special_BattleTowerAction
-	special Special_CheckForBattleTowerRules
-	if_not_equal FALSE, Script_WaitButton
+	special BattleTowerAction
+	special CheckForBattleTowerRules
+	ifnotequal FALSE, Script_WaitButton
 	writetext Text_SaveBeforeEnteringBattleRoom
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene 0
-	special Special_TryQuickSave
+	setscene SCENE_DEFAULT
+	special TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene 1
+	setscene SCENE_FINISHED
 	writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
-	special Special_BattleTowerAction
-	special Special_BattleTowerRoomMenu
-	if_equal $a, Script_Menu_ChallengeExplanationCancel
-	if_not_equal $0, Script_MobileError
+	special BattleTowerAction
+	special BattleTowerRoomMenu
+	ifequal $a, Script_Menu_ChallengeExplanationCancel
+	ifnotequal $0, Script_MobileError
 	writebyte BATTLETOWERACTION_11
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	writetext Text_RightThisWayToYourBattleRoom
 	waitbutton
 	closetext
 	writebyte BATTLETOWERACTION_CHOOSEREWARD
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	jump Script_WalkToBattleTowerElevator
 
 Script_ResumeBattleTowerChallenge:
 	closetext
 	writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group
-	special Special_BattleTowerAction
+	special BattleTowerAction
 Script_WalkToBattleTowerElevator:
 	musicfadeout MUSIC_NONE, 8
-	setmapscene BATTLE_TOWER_BATTLE_ROOM, 0
-	setmapscene BATTLE_TOWER_ELEVATOR, 0
-	setmapscene BATTLE_TOWER_HALLWAY, 0
+	setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_DEFAULT
+	setmapscene BATTLE_TOWER_ELEVATOR, SCENE_DEFAULT
+	setmapscene BATTLE_TOWER_HALLWAY, SCENE_DEFAULT
 	follow BATTLETOWER1F_RECEPTIONIST, PLAYER
 	applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
 	writebyte BATTLETOWERACTION_0A
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	warpsound
 	disappear BATTLETOWER1F_RECEPTIONIST
 	stopfollow
@@ -119,35 +117,35 @@ Script_WalkToBattleTowerElevator:
 	warpcheck
 	end
 
-Script_GivePlayerHisPrize: ; 0x9e47a
+Script_GivePlayerHisPrize:
 	writebyte BATTLETOWERACTION_1C
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	writebyte BATTLETOWERACTION_GIVEREWARD
-	special Special_BattleTowerAction
-	if_equal POTION, Script_YourPackIsStuffedFull
+	special BattleTowerAction
+	ifequal POTION, Script_YourPackIsStuffedFull
 	itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1
 	giveitem ITEM_FROM_MEM, 5
 	writetext Text_PlayerGotFive
 	writebyte BATTLETOWERACTION_1D
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	closetext
 	end
 
-Script_YourPackIsStuffedFull: ; 0x9e498
+Script_YourPackIsStuffedFull:
 	writetext Text_YourPackIsStuffedFull
 	waitbutton
 	closetext
 	end
 
-Script_BattleTowerIntroductionYesNo: ; 0x9e49e
+Script_BattleTowerIntroductionYesNo:
 	writetext Text_WouldYouLikeToHearAboutTheBattleTower
 	yesorno
 	iffalse Script_BattleTowerSkipExplanation
-Script_BattleTowerExplanation: ; 0x9e4a5
+Script_BattleTowerExplanation:
 	writetext Text_BattleTowerIntroduction_2
 Script_BattleTowerSkipExplanation:
 	writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	jump Script_Menu_ChallengeExplanationCancel
 
 Script_BattleTowerHopeToServeYouAgain:
@@ -157,11 +155,11 @@ Script_BattleTowerHopeToServeYouAgain:
 	end
 
 UnreferencedScript_0x9e4b6:
-	special Special_BattleTowerMobileError
+	special BattleTowerMobileError
 	closetext
 	end
 
-Script_WaitButton: ; 0x9e4bb
+Script_WaitButton:
 	waitbutton
 	closetext
 	end
@@ -170,33 +168,33 @@ UnreferencedScript_0x9e4be:
 	writetext Text_SaveBeforeEnteringBattleRoom
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
-	special Special_TryQuickSave
+	special TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
 	writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
-	special Special_BattleTowerAction
-	special Special_Function1700ba
-	if_equal $a, Script_Menu_ChallengeExplanationCancel
-	if_not_equal $0, Script_MobileError
+	special BattleTowerAction
+	special Function1700ba
+	ifequal $a, Script_Menu_ChallengeExplanationCancel
+	ifnotequal $0, Script_MobileError
 	writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
-	spriteface BATTLETOWER1F_RECEPTIONIST, LEFT
+	turnobject BATTLETOWER1F_RECEPTIONIST, LEFT
 	writetext Text_PleaseConfirmOnThisMonitor
 	waitbutton
-	spriteface BATTLETOWER1F_RECEPTIONIST, DOWN
+	turnobject BATTLETOWER1F_RECEPTIONIST, DOWN
 	closetext
 	end
 
 UnreferencedScript_0x9e4ea:
 	writebyte BATTLETOWERACTION_LEVEL_CHECK
-	special Special_BattleTowerAction
-	if_not_equal $0, Script_APkmnLevelExceeds
+	special BattleTowerAction
+	ifnotequal $0, Script_AMonLevelExceeds
 	writebyte BATTLETOWERACTION_UBERS_CHECK
-	special Special_BattleTowerAction
-	if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
-	special Special_CheckForBattleTowerRules
-	if_not_equal FALSE, Script_WaitButton
+	special BattleTowerAction
+	ifnotequal $0, Script_MayNotEnterABattleRoomUnderL70
+	special CheckForBattleTowerRules
+	ifnotequal FALSE, Script_WaitButton
 	writebyte BATTLETOWERACTION_05
-	special Special_BattleTowerAction
-	if_equal $0, .zero
+	special BattleTowerAction
+	ifequal $0, .zero
 	writetext Text_CantBeRegistered_PreviousRecordDeleted
 	jump continue
 
@@ -208,14 +206,14 @@ continue:
 	writetext Text_SaveBeforeReentry
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene 0
-	special Special_TryQuickSave
+	setscene SCENE_DEFAULT
+	special TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
-	setscene 1
+	setscene SCENE_FINISHED
 	writebyte BATTLETOWERACTION_06
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	writebyte BATTLETOWERACTION_12
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	writetext Text_RightThisWayToYourBattleRoom
 	waitbutton
 	jump Script_ResumeBattleTowerChallenge
@@ -225,18 +223,18 @@ UnreferencedScript_0x9e53b:
 	waitbutton
 	jump Script_BattleTowerHopeToServeYouAgain
 
-Script_APkmnLevelExceeds: ; 0x9e542
-	writetext Text_APkmnLevelExceeds
+Script_AMonLevelExceeds:
+	writetext Text_AMonLevelExceeds
 	waitbutton
 	jump Script_Menu_ChallengeExplanationCancel
 
-Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549
+Script_MayNotEnterABattleRoomUnderL70:
 	writetext Text_MayNotEnterABattleRoomUnderL70
 	waitbutton
 	jump Script_Menu_ChallengeExplanationCancel
 
 Script_MobileError:
-	special Special_BattleTowerMobileError
+	special BattleTowerMobileError
 	closetext
 	end
 
@@ -246,22 +244,22 @@ BattleTower_LeftWithoutSaving:
 	waitbutton
 	jump Script_BattleTowerHopeToServeYouAgain
 
-YoungsterScript_0x9e55d:
+BattleTower1FYoungsterScript:
 	faceplayer
 	opentext
 	writetext Text_BattleTowerYoungster
 	waitbutton
 	closetext
-	spriteface BATTLETOWER1F_YOUNGSTER, RIGHT
+	turnobject BATTLETOWER1F_YOUNGSTER, RIGHT
 	end
 
-CooltrainerFScript_0x9e568:
+BattleTower1FCooltrainerFScript:
 	jumptextfaceplayer Text_BattleTowerCooltrainerF
 
-BugCatcherScript_0x9e56b:
+BattleTower1FBugCatcherScript:
 	jumptextfaceplayer Text_BattleTowerBugCatcher
 
-GrannyScript_0x9e56e:
+BattleTower1FGrannyScript:
 	jumptextfaceplayer Text_BattleTowerGranny
 
 MovementData_BattleTower1FWalkToElevator:
@@ -348,7 +346,7 @@ MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent:
 	turn_head RIGHT
 	step_end
 
-Text_BattleTowerWelcomesYou: ; 0x9e5ab
+Text_BattleTowerWelcomesYou:
 	text "BATTLE TOWER"
 	line "welcomes you!"
 
@@ -356,17 +354,17 @@ Text_BattleTowerWelcomesYou: ; 0x9e5ab
 	line "to a BATTLE ROOM."
 	done
 
-Text_WantToGoIntoABattleRoom: ; 0x9e5ea
+Text_WantToGoIntoABattleRoom:
 	text "Want to go into a"
 	line "BATTLE ROOM?"
 	done
 
-Text_RightThisWayToYourBattleRoom: ; 0x9e60a
+Text_RightThisWayToYourBattleRoom:
 	text "Right this way to"
 	line "your BATTLE ROOM."
 	done
 
-Text_BattleTowerIntroduction_1: ; 0x9e62f
+Text_BattleTowerIntroduction_1:
 	text "BATTLE TOWER is a"
 	line "facility made for"
 	cont "#MON battles."
@@ -426,7 +424,7 @@ Text_BattleTowerIntroduction_1: ; 0x9e62f
 	para ""
 	done
 
-Text_BattleTowerIntroduction_2: ; 0x9e886
+Text_BattleTowerIntroduction_2:
 	text "BATTLE TOWER is a"
 	line "facility made for"
 	cont "#MON battles."
@@ -462,7 +460,7 @@ Text_BattleTowerIntroduction_2: ; 0x9e886
 	para ""
 	done
 
-Text_ReceivedAListOfLeadersOnTheHonorRoll: ; 0x9e9eb
+Text_ReceivedAListOfLeadersOnTheHonorRoll:
 	text "Received a list of"
 	line "LEADERS on the"
 	cont "HONOR ROLL."
@@ -470,18 +468,18 @@ Text_ReceivedAListOfLeadersOnTheHonorRoll: ; 0x9e9eb
 	para ""
 	done
 
-Text_PleaseConfirmOnThisMonitor: ; 0x9ea1b
+Text_PleaseConfirmOnThisMonitor:
 	text "Please confirm on"
 	line "this monitor."
 	done
 
-Text_ThankYou: ; 0x9ea3c
+Text_ThankYou:
 	text "Thank you!"
 
 	para ""
 	done
 
-Text_ThanksForVisiting: ; 0x9ea49
+Text_ThanksForVisiting:
 	text "Thanks for"
 	line "visiting!"
 	done
@@ -504,7 +502,7 @@ Text_BeatenAllTheTrainers_Mobile:
 	para ""
 	done
 
-Text_CongratulationsYouveBeatenAllTheTrainers: ; 0x9eaef
+Text_CongratulationsYouveBeatenAllTheTrainers:
 	text "Congratulations!"
 
 	para "You've beaten all"
@@ -524,7 +522,7 @@ Text_AskRegisterRecord_Mobile:
 	line "CENTER?"
 	done
 
-Text_PlayerGotFive: ; 0x9eb7e
+Text_PlayerGotFive:
 	text "<PLAYER> got five"
 	line "@"
 	text_from_ram wStringBuffer4
@@ -533,7 +531,7 @@ Text_PlayerGotFive: ; 0x9eb7e
 	text_waitbutton
 	db "@"
 
-Text_YourPackIsStuffedFull: ; 0x9eb94
+Text_YourPackIsStuffedFull:
 	text "Oops, your PACK is"
 	line "stuffed full."
 
@@ -541,24 +539,24 @@ Text_YourPackIsStuffedFull: ; 0x9eb94
 	line "and come back."
 	done
 
-Text_YourRegistrationIsComplete: ; 0x9ebd6
+Text_YourRegistrationIsComplete:
 	text "Your registration"
 	line "is complete."
 
 	para "Please come again!"
 	done
 
-Text_WeHopeToServeYouAgain: ; 0x9ec09
+Text_WeHopeToServeYouAgain:
 	text "We hope to serve"
 	line "you again."
 	done
 
-Text_PleaseStepThisWay: ; 0x9ec26
+Text_PleaseStepThisWay:
 	text "Please step this"
 	line "way."
 	done
 
-Text_WouldYouLikeToHearAboutTheBattleTower: ; 0x9ec3d
+Text_WouldYouLikeToHearAboutTheBattleTower:
 	text "Would you like to"
 	line "hear about the"
 	cont "BATTLE TOWER?"
@@ -584,19 +582,19 @@ Text_CantBeRegistered_PreviousRecordDeleted:
 	cont "deleted. OK?"
 	done
 
-Text_CheckTheLeaderHonorRoll: ; 0x9ed1e
+Text_CheckTheLeaderHonorRoll:
 	text "Check the LEADER"
 	line "HONOR ROLL?"
 	done
 
-Text_ReadBattleTowerRules: ; 0x9ed3c
+Text_ReadBattleTowerRules:
 	text "BATTLE TOWER rules"
 	line "are written here."
 
 	para "Read the rules?"
 	done
 
-Text_BattleTowerRules: ; 0x9ed72
+Text_BattleTowerRules:
 	text "Three #MON may"
 	line "enter battles."
 
@@ -628,13 +626,13 @@ Text_BattleTower_LeftWithoutSaving:
 	line "invalid."
 	done
 
-Text_YourPkmnWillBeHealedToFullHealth: ; 0x9ee92
+Text_YourMonWillBeHealedToFullHealth:
 	text "Your #MON will"
 	line "be healed to full"
 	cont "health."
 	done
 
-Text_NextUpOpponentNo: ; 0x9eebc
+Text_NextUpOpponentNo:
 	text "Next up, opponent"
 	line "no.@"
 	text_from_ram wStringBuffer3
@@ -649,7 +647,7 @@ Text_SaveBeforeConnecting_Mobile:
 	line "the CENTER."
 	done
 
-Text_SaveBeforeEnteringBattleRoom: ; 0x9ef1f
+Text_SaveBeforeEnteringBattleRoom:
 	text "Before entering"
 	line "the BATTLE ROOM,"
 
@@ -657,7 +655,7 @@ Text_SaveBeforeEnteringBattleRoom: ; 0x9ef1f
 	line "be saved."
 	done
 
-Text_SaveAndEndTheSession: ; 0x9ef5e
+Text_SaveAndEndTheSession:
 	text "SAVE and end the"
 	line "session?"
 	done
@@ -670,7 +668,7 @@ Text_SaveBeforeReentry:
 	line "the previous ROOM."
 	done
 
-Text_CancelYourBattleRoomChallenge: ; 0x9efbf
+Text_CancelYourBattleRoomChallenge:
 	text "Cancel your BATTLE"
 	line "ROOM challenge?"
 	done
@@ -701,7 +699,7 @@ Text_FiveDayBattleLimit_Mobile:
 	line "tomorrow."
 	done
 
-Text_TooMuchTimeElapsedNoRegister: ; 0x9f0c1
+Text_TooMuchTimeElapsedNoRegister:
 	text "Sorry, but it's"
 	line "not possible to"
 
@@ -732,7 +730,7 @@ Text_RegisterRecordTimedOut_Mobile:
 	cont "challenge."
 	done
 
-Text_APkmnLevelExceeds: ; 0x9f1e5
+Text_AMonLevelExceeds:
 	text "One or more of"
 	line "your #MON's"
 	cont "levels exceeds @"
@@ -740,7 +738,7 @@ Text_APkmnLevelExceeds: ; 0x9f1e5
 	text "."
 	done
 
-Text_MayNotEnterABattleRoomUnderL70: ; 0x9f217
+Text_MayNotEnterABattleRoomUnderL70:
 	text_from_ram wcd49
 	text " may not"
 	line "enter a BATTLE"
@@ -752,7 +750,7 @@ Text_MayNotEnterABattleRoomUnderL70: ; 0x9f217
 	text "."
 	done
 
-Text_BattleTowerYoungster: ; 0x9f264
+Text_BattleTowerYoungster:
 	text "Destroyed by the"
 	line "first opponent in"
 
@@ -760,7 +758,7 @@ Text_BattleTowerYoungster: ; 0x9f264
 	line "I'm no good…"
 	done
 
-Text_BattleTowerCooltrainerF: ; 0x9f2a4
+Text_BattleTowerCooltrainerF:
 	text "There are lots of"
 	line "BATTLE ROOMS, but"
 
@@ -768,7 +766,7 @@ Text_BattleTowerCooltrainerF: ; 0x9f2a4
 	line "them all!"
 	done
 
-Text_BattleTowerGranny: ; 0x9f2e3
+Text_BattleTowerGranny:
 	text "It's a grueling"
 	line "task, not being"
 
@@ -782,7 +780,7 @@ Text_BattleTowerGranny: ; 0x9f2e3
 	line "winning battles."
 	done
 
-Text_BattleTowerBugCatcher: ; 0x9f35b
+Text_BattleTowerBugCatcher:
 	text "I'm trying to see"
 	line "how far I can go"
 
@@ -794,26 +792,21 @@ Text_BattleTowerBugCatcher: ; 0x9f35b
 	done
 
 BattleTower1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 7, 9, 3, BATTLE_TOWER_OUTSIDE
-	warp_def 8, 9, 4, BATTLE_TOWER_OUTSIDE
-	warp_def 7, 0, 1, BATTLE_TOWER_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script
-
-.ObjectEvents:
-	db 5
-	object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
-	object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
-	object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
-	object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1
-	object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  7,  9, BATTLE_TOWER_OUTSIDE, 3
+	warp_event  8,  9, BATTLE_TOWER_OUTSIDE, 4
+	warp_event  7,  0, BATTLE_TOWER_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  6,  6, BGEVENT_READ, BattleTower1FRulesSign
+
+	db 5 ; object events
+	object_event  7,  6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTower1FReceptionistScript, -1
+	object_event 14,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BattleTower1FYoungsterScript, -1
+	object_event  4,  9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTower1FCooltrainerFScript, -1
+	object_event  1,  3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BattleTower1FBugCatcherScript, -1
+	object_event 14,  3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTower1FGrannyScript, -1
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index dd8e08e0f..0491c2845 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -1,29 +1,27 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BATTLETOWERBATTLEROOM_YOUNGSTER
 	const BATTLETOWERBATTLEROOM_RECEPTIONIST
 
 BattleTowerBattleRoom_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .EnterBattleRoom
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .EnterBattleRoom ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-.EnterBattleRoom: ; 0x9f419
+.EnterBattleRoom:
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
 	priorityjump Script_BattleRoom
-	setscene 1
+	setscene SCENE_FINISHED
 .DummyScene:
 	end
 
-Script_BattleRoom: ; 0x9f421
+Script_BattleRoom:
 	applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerWalksIn
 ; beat all 7 opponents in a row
-Script_BattleRoomLoop: ; 0x9f425
+Script_BattleRoomLoop:
 	writebyte BATTLETOWERBATTLEROOM_YOUNGSTER
-	special Special_LoadOpponentTrainerAndPokemonWithOTSprite
+	special LoadOpponentTrainerAndPokemonWithOTSprite
 	appear BATTLETOWERBATTLEROOM_YOUNGSTER
 	warpsound
 	waitsfx
@@ -32,80 +30,80 @@ Script_BattleRoomLoop: ; 0x9f425
 	battletowertext BATTLETOWERTEXT_INTRO
 	buttonsound
 	closetext
-	special Special_BattleTowerBattle ; calls predef startbattle
-	special Special_FadeOutPalettes
+	special BattleTowerBattle ; calls predef startbattle
+	special FadeOutPalettes
 	reloadmap
-	if_not_equal $0, Script_FailedBattleTowerChallenge
+	ifnotequal $0, Script_FailedBattleTowerChallenge
 	copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
-	if_equal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers
+	ifequal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers
 	applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut
 	warpsound
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
 	applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer
 	applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist
 	opentext
-	writetext Text_YourPkmnWillBeHealedToFullHealth
+	writetext Text_YourMonWillBeHealedToFullHealth
 	waitbutton
 	closetext
 	playmusic MUSIC_HEAL
-	special Special_FadeOutPalettes
-	special Special_LoadMapPalettes
+	special FadeOutPalettes
+	special LoadMapPalettes
 	pause 60
-	special Special_FadeInPalettes
+	special FadeInPalettes
 	special RestartMapMusic
 	opentext
 	writetext Text_NextUpOpponentNo
 	yesorno
 	iffalse Script_DontBattleNextOpponent
-Script_ContinueAndBattleNextOpponent: ; 0x9f477
+Script_ContinueAndBattleNextOpponent:
 	closetext
 	applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent
 	applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksAway
 	jump Script_BattleRoomLoop
 
-Script_DontBattleNextOpponent: ; 0x9f483
+Script_DontBattleNextOpponent:
 	writetext Text_SaveAndEndTheSession
 	yesorno
 	iffalse Script_DontSaveAndEndTheSession
 	writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	playsound SFX_SAVE
 	waitsfx
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	special Reset
-Script_DontSaveAndEndTheSession: ; 0x9f4a3
+Script_DontSaveAndEndTheSession:
 	writetext Text_CancelYourBattleRoomChallenge
 	yesorno
 	iffalse Script_ContinueAndBattleNextOpponent
 	writebyte BATTLETOWERACTION_CHALLENGECANCELED
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	writebyte BATTLETOWERACTION_06
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	closetext
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	warpfacing UP, BATTLE_TOWER_1F, 7, 7
 	opentext
 	jump Script_BattleTowerHopeToServeYouAgain
 
 Script_FailedBattleTowerChallenge:
 	pause 60
-	special Special_BattleTowerFade
+	special BattleTowerFade
 	warpfacing UP, BATTLE_TOWER_1F, 7, 7
 	writebyte BATTLETOWERACTION_CHALLENGECANCELED
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	opentext
 	writetext Text_ThanksForVisiting
 	waitbutton
 	closetext
 	end
 
-Script_BeatenAllTrainers: ; 0x9f4d9
+Script_BeatenAllTrainers:
 	pause 60
-	special Special_BattleTowerFade
+	special BattleTowerFade
 	warpfacing UP, BATTLE_TOWER_1F, 7, 7
 Script_BeatenAllTrainers2:
 	opentext
@@ -114,7 +112,7 @@ Script_BeatenAllTrainers2:
 
 UnreferencedScript_0x9f4eb:
 	writebyte BATTLETOWERACTION_CHALLENGECANCELED
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	opentext
 	writetext Text_TooMuchTimeElapsedNoRegister
 	waitbutton
@@ -123,9 +121,9 @@ UnreferencedScript_0x9f4eb:
 
 UnreferencedScript_0x9f4f7:
 	writebyte BATTLETOWERACTION_CHALLENGECANCELED
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	writebyte BATTLETOWERACTION_06
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	opentext
 	writetext Text_ThanksForVisiting
 	writetext Text_WeHopeToServeYouAgain
@@ -139,21 +137,16 @@ Text_ReturnedAfterSave_Mobile:
 	done
 
 BattleTowerBattleRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 3, 7, 4, BATTLE_TOWER_HALLWAY
-	warp_def 4, 7, 4, BATTLE_TOWER_HALLWAY
+	db 2 ; warp events
+	warp_event  3,  7, BATTLE_TOWER_HALLWAY, 4
+	warp_event  4,  7, BATTLE_TOWER_HALLWAY, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
-	object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	db 2 ; object events
+	object_event  4,  0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
+	object_event  1,  6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index f9f32dfae..f2b3621ba 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -1,19 +1,16 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BATTLETOWERELEVATOR_RECEPTIONIST
 
 BattleTowerElevator_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .Scene0
-	scene_script .Scene1
+	db 2 ; scene scripts
+	scene_script .Scene0 ; SCENE_DEFAULT
+	scene_script .Scene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .RideElevator
-	setscene 1
-
+	setscene SCENE_FINISHED
 .Scene1:
 	end
 
@@ -22,7 +19,7 @@ BattleTowerElevator_MapScripts:
 	applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
 	applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
 	writebyte BATTLETOWERACTION_0A
-	special Special_BattleTowerAction
+	special BattleTowerAction
 	playsound SFX_ELEVATOR
 	earthquake 60
 	waitsfx
@@ -45,20 +42,15 @@ MovementData_BattleTowerElevatorPlayerWalksIn:
 	step_end
 
 BattleTowerElevator_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 1, 3, 1, BATTLE_TOWER_HALLWAY
-	warp_def 2, 3, 1, BATTLE_TOWER_HALLWAY
+	db 2 ; warp events
+	warp_event  1,  3, BATTLE_TOWER_HALLWAY, 1
+	warp_event  2,  3, BATTLE_TOWER_HALLWAY, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1
+	db 1 ; object events
+	object_event  1,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index 80075fee2..230806c5a 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -1,18 +1,16 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BATTLETOWERHALLWAY_RECEPTIONIST
 
 BattleTowerHallway_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .Scene0
-	scene_script .Scene1
+	db 2 ; scene scripts
+	scene_script .Scene0 ; SCENE_DEFAULT
+	scene_script .Scene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .Scene0:
 	priorityjump .ChooseBattleRoom
-	setscene 1
+	setscene SCENE_FINISHED
 .Scene1:
 	end
 
@@ -37,35 +35,35 @@ BattleTowerHallway_MapScripts:
 ; enter different rooms for different levels to battle against
 ; at least it should look like that
 ; because all warps lead to the same room
-.WalkToChosenBattleRoom: ; 0x9f5dc
-	if_equal 3, .L30L40
-	if_equal 4, .L30L40
-	if_equal 5, .L50L60
-	if_equal 6, .L50L60
-	if_equal 7, .L70L80
-	if_equal 8, .L70L80
-	if_equal 9, .L90L100
-	if_equal 10, .L90L100
+.WalkToChosenBattleRoom:
+	ifequal 3, .L30L40
+	ifequal 4, .L30L40
+	ifequal 5, .L50L60
+	ifequal 6, .L50L60
+	ifequal 7, .L70L80
+	ifequal 8, .L70L80
+	ifequal 9, .L90L100
+	ifequal 10, .L90L100
 	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room
 	jump .EnterBattleRoom
 
-.L30L40: ; 0x9f603
+.L30L40:
 	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo3040Room
 	jump .EnterBattleRoom
 
-.L50L60: ; 0x9f60a
+.L50L60:
 	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo5060Room
 	jump .EnterBattleRoom
 
-.L70L80: ; 0x9f611
+.L70L80:
 	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo7080Room
 	jump .EnterBattleRoom
 
-.L90L100: ; 0x9f618
+.L90L100:
 	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo90100Room
 	jump .EnterBattleRoom
 
-.EnterBattleRoom: ; 0x9f61f
+.EnterBattleRoom:
 	faceobject PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST
 	opentext
 	writetext Text_PleaseStepThisWay
@@ -77,24 +75,19 @@ BattleTowerHallway_MapScripts:
 	end
 
 BattleTowerHallway_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 11, 1, 1, BATTLE_TOWER_ELEVATOR
-	warp_def 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_def 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_def 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_def 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM
-	warp_def 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event 11,  1, BATTLE_TOWER_ELEVATOR, 1
+	warp_event  5,  0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event  7,  0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event  9,  0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event 13,  0, BATTLE_TOWER_BATTLE_ROOM, 1
+	warp_event 15,  0, BATTLE_TOWER_BATTLE_ROOM, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event 11,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1
diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm
index a61717fd0..eb067af19 100644
--- a/maps/BattleTowerOutside.asm
+++ b/maps/BattleTowerOutside.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER
 	const BATTLETOWEROUTSIDE_BUENA
 	const BATTLETOWEROUTSIDE_SAILOR
 	const BATTLETOWEROUTSIDE_LASS
 
 BattleTowerOutside_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_TILES, .Callback1
 	callback MAPCALLBACK_OBJECTS, .Callback2
 
@@ -29,10 +27,11 @@ BattleTowerOutsideBuenaScript:
 BattleTowerOutsideSailorScript:
 	jumptextfaceplayer BattleTowerOutsideSailorText
 
-MapBattleTowerOutsideSignpost0Script:
-	jumptext BattleTowerOutsideText_UltimateChallenge
+BattleTowerOutsideSign:
+	jumptext BattleTowerOutsideSignText
 
-BattleTowerOutsideUnusedText1:
+BattleTowerOutsideYoungsterText_NotYetOpen:
+; unreferenced
 	text "Wow, the BATTLE"
 	line "TOWER is huge! My"
 
@@ -40,7 +39,8 @@ BattleTowerOutsideUnusedText1:
 	line "looking up at it."
 	done
 
-BattleTowerOutsideUnusedText2:
+BattleTowerOutsideYoungsterText_Mobile:
+; unreferenced
 	text "Wow, the BATTLE"
 	line "TOWER is huge!"
 
@@ -63,7 +63,8 @@ BattleTowerOutsideYoungsterText:
 	cont "in there!"
 	done
 
-BattleTowerOutsideUnusedText3:
+BattleTowerOutsideBuenaText_NotYetOpen:
+; unreferenced
 	text "What on earth do"
 	line "they do here?"
 
@@ -85,7 +86,8 @@ BattleTowerOutsideBuenaText:
 	line "battle…"
 	done
 
-BattleTowerOutsideUnusedText4:
+BattleTowerOutsideSailorText_Mobile:
+; unreferenced
 	text "Ehehehe…"
 	line "I sneaked out of"
 	cont "work to come here."
@@ -106,11 +108,12 @@ BattleTowerOutsideSailorText:
 	line "all. That I must!"
 	done
 
-BattleTowerOutsideText_BattleTower:
+BattleTowerOutsideSignText_NotYetOpen:
+; unused; originally shown when the Battle Tower was closed
 	text "BATTLE TOWER"
 	done
 
-BattleTowerOutsideText_UltimateChallenge:
+BattleTowerOutsideSignText:
 	text "BATTLE TOWER"
 
 	para "Take the Ultimate"
@@ -118,35 +121,32 @@ BattleTowerOutsideText_UltimateChallenge:
 	done
 
 BattleTowerOutsideText_DoorsClosed:
+; unused; originally shown when the Battle Tower was closed
 	text "The BATTLE TOWER's"
 	line "doors are closed…"
 	done
 
 BattleTowerOutsideText_DoorsOpen:
+; unused; originally shown after the Battle Tower opened
 	text "It's open!"
 	done
 
 BattleTowerOutside_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE
-	warp_def 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE
-	warp_def 8, 9, 1, BATTLE_TOWER_1F
-	warp_def 9, 9, 2, BATTLE_TOWER_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script
-
-.ObjectEvents:
-	db 4
-	object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3
+	warp_event  9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4
+	warp_event  8,  9, BATTLE_TOWER_1F, 1
+	warp_event  9,  9, BATTLE_TOWER_1F, 2
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event 10, 10, BGEVENT_READ, BattleTowerOutsideSign
+
+	db 4 ; object events
+	object_event  6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
 	object_event 13, 11, SPRITE_BUENA, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
 	object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
 	object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm
new file mode 100644
index 000000000..e669586e0
--- /dev/null
+++ b/maps/BillsBrothersHouse.asm
@@ -0,0 +1,41 @@
+	const_def 2 ; object constants
+	const BILLSBROTHERSHOUSE_POKEFAN_F
+	const BILLSBROTHERSHOUSE_YOUNGSTER
+
+BillsBrothersHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+BillsBrotherScript:
+	jumptextfaceplayer BillsBrotherText
+
+BillsBrothersHouseYoungsterScript:
+	jumptextfaceplayer BillsBrothersHouseYoungsterText
+
+BillsBrotherText:
+	text "My grandpa is at "
+	line "my brother BILL's"
+	cont "on CERULEAN CAPE."
+	done
+
+BillsBrothersHouseYoungsterText:
+	text "I saw these weird,"
+	line "slow #MON on"
+	cont "CYCLING ROAD."
+	done
+
+BillsBrothersHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, FUCHSIA_CITY, 4
+	warp_event  3,  7, FUCHSIA_CITY, 4
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  2,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1
+	object_event  6,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1
diff --git a/maps/GoldenrodBillsHouse.asm b/maps/BillsFamilysHouse.asm
index 33c8dbd17..1c95dc68d 100644
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -1,28 +1,26 @@
-const_value set 2
-	const GOLDENRODBILLSHOUSE_BILL
-	const GOLDENRODBILLSHOUSE_POKEFAN_F
-	const GOLDENRODBILLSHOUSE_TWIN
+	const_def 2 ; object constants
+	const BILLSFAMILYSHOUSE_BILL
+	const BILLSFAMILYSHOUSE_POKEFAN_F
+	const BILLSFAMILYSHOUSE_TWIN
 
-GoldenrodBillsHouse_MapScripts:
-.SceneScripts:
-	db 0
+BillsFamilysHouse_MapScripts:
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-BillsHouseBill:
+BillScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_EEVEE
-	iftrue UnknownScript_0x54c1f
+	iftrue .GotEevee
 	writetext UnknownText_0x54c74
 	yesorno
-	iffalse UnknownScript_0x54c19
+	iffalse .Refused
 	writetext UnknownText_0x54d3f
 	buttonsound
 	waitsfx
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, UnknownScript_0x54c13
+	ifequal PARTY_LENGTH, .NoRoom
 	writetext UnknownText_0x54dae
 	playsound SFX_CAUGHT_MON
 	waitsfx
@@ -33,71 +31,71 @@ BillsHouseBill:
 	closetext
 	end
 
-UnknownScript_0x54c13:
+.NoRoom:
 	writetext UnknownText_0x54e02
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x54c19:
+.Refused:
 	writetext UnknownText_0x54e2d
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x54c1f:
+.GotEevee:
 	writetext UnknownText_0x54e42
 	waitbutton
 	closetext
 	end
 
-BillsMom:
+BillsMomScript:
 	faceplayer
 	opentext
 	checkevent EVENT_MET_BILL
-	iffalse UnknownScript_0x54c33
+	iffalse .HaventMetBill
 	writetext UnknownText_0x54ea8
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x54c33:
+.HaventMetBill:
 	writetext UnknownText_0x54f4e
 	waitbutton
 	closetext
 	end
 
-BillsSister:
+BillsSisterScript:
 	faceplayer
 	opentext
 	checkcellnum PHONE_BILL
-	iftrue UnknownScript_0x54c58
+	iftrue .GotBillsNumber
 	writetext UnknownText_0x54f9e
 	askforphonenumber PHONE_BILL
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x54c64
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e
+	ifequal PHONE_CONTACTS_FULL, .NoRoom
+	ifequal PHONE_CONTACT_REFUSED, .Refused
 	waitsfx
 	addcellnum PHONE_BILL
 	writetext UnknownText_0x54fd9
 	playsound SFX_REGISTER_PHONE_NUMBER
 	waitsfx
 	buttonsound
-UnknownScript_0x54c58: ;0x54c58
+.GotBillsNumber:
 	writetext UnknownText_0x55069
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x54c5e:
+.Refused:
 	writetext UnknownText_0x54ff3
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x54c64:
+.NoRoom:
 	writetext UnknownText_0x55046
 	buttonsound
-	jump UnknownScript_0x54c5e
+	jump .Refused
 
 BillsHouseBookshelf1:
 	jumpstd picturebookshelf
@@ -242,26 +240,21 @@ UnknownText_0x55069:
 	line "system."
 	done
 
-GoldenrodBillsHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 4, GOLDENROD_CITY
-	warp_def 3, 7, 4, GOLDENROD_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2
-	bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1
-	bg_event 7, 1, BGEVENT_READ, BillsHouseRadio
-
-.ObjectEvents:
-	db 3
-	object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL
-	object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMom, -1
-	object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSister, -1
+BillsFamilysHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, GOLDENROD_CITY, 4
+	warp_event  3,  7, GOLDENROD_CITY, 4
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  0,  1, BGEVENT_READ, BillsHouseBookshelf2
+	bg_event  1,  1, BGEVENT_READ, BillsHouseBookshelf1
+	bg_event  7,  1, BGEVENT_READ, BillsHouseRadio
+
+	db 3 ; object events
+	object_event  2,  3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL
+	object_event  5,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1
+	object_event  5,  4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index e21facaab..ff83b7979 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BILLSHOUSE_GRAMPS
 
 BillsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BillsGrandpa:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue .JustShowedSomething
 	checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
 	iftrue .GotThunderstone
@@ -37,9 +35,9 @@ BillsGrandpa:
 	yesorno
 	iffalse .SaidNo
 	scall .ExcitedToSee
-	special Special_BillsGrandfather
+	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal LICKITUNG, .WrongPokemon
+	ifnotequal LICKITUNG, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
 	jump .ShowedLickitung
@@ -51,9 +49,9 @@ BillsGrandpa:
 	yesorno
 	iffalse .SaidNo
 	scall .ExcitedToSee
-	special Special_BillsGrandfather
+	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal ODDISH, .WrongPokemon
+	ifnotequal ODDISH, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
 	jump .ShowedOddish
@@ -65,9 +63,9 @@ BillsGrandpa:
 	yesorno
 	iffalse .SaidNo
 	scall .ExcitedToSee
-	special Special_BillsGrandfather
+	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal STARYU, .WrongPokemon
+	ifnotequal STARYU, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
 	jump .ShowedStaryu
@@ -81,9 +79,9 @@ BillsGrandpa:
 	yesorno
 	iffalse .SaidNo
 	scall .ExcitedToSee
-	special Special_BillsGrandfather
+	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal GROWLITHE, .WrongPokemon
+	ifnotequal GROWLITHE, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
 	jump .ShowedGrowlitheVulpix
@@ -95,9 +93,9 @@ BillsGrandpa:
 	yesorno
 	iffalse .SaidNo
 	scall .ExcitedToSee
-	special Special_BillsGrandfather
+	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal VULPIX, .WrongPokemon
+	ifnotequal VULPIX, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
 	jump .ShowedGrowlitheVulpix
@@ -109,9 +107,9 @@ BillsGrandpa:
 	yesorno
 	iffalse .SaidNo
 	scall .ExcitedToSee
-	special Special_BillsGrandfather
+	special BillsGrandfather
 	iffalse .SaidNo
-	if_not_equal PICHU, .WrongPokemon
+	ifnotequal PICHU, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
 	jump .ShowedPichu
@@ -123,7 +121,7 @@ BillsGrandpa:
 	verbosegiveitem EVERSTONE
 	iffalse .BagFull
 	setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
-	setevent EVENT_GAVE_KURT_APRICORNS
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	closetext
 	end
 
@@ -134,7 +132,7 @@ BillsGrandpa:
 	verbosegiveitem LEAF_STONE
 	iffalse .BagFull
 	setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
-	setevent EVENT_GAVE_KURT_APRICORNS
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	closetext
 	end
 
@@ -145,7 +143,7 @@ BillsGrandpa:
 	verbosegiveitem WATER_STONE
 	iffalse .BagFull
 	setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
-	setevent EVENT_GAVE_KURT_APRICORNS
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	closetext
 	end
 
@@ -156,7 +154,7 @@ BillsGrandpa:
 	verbosegiveitem FIRE_STONE
 	iffalse .BagFull
 	setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
-	setevent EVENT_GAVE_KURT_APRICORNS
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	closetext
 	end
 
@@ -354,20 +352,15 @@ BillsGrandpaPichuText:
 	done
 
 BillsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, ROUTE_25
-	warp_def 3, 7, 1, ROUTE_25
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_25, 1
+	warp_event  3,  7, ROUTE_25, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index 396599703..538f325c6 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BLACKTHORNCITY_SUPER_NERD1
 	const BLACKTHORNCITY_SUPER_NERD2
 	const BLACKTHORNCITY_GRAMPS1
@@ -10,11 +10,9 @@ const_value set 2
 	const BLACKTHORNCITY_COOLTRAINER_F2
 
 BlackthornCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 	callback MAPCALLBACK_OBJECTS, .Santos
 
@@ -24,7 +22,7 @@ BlackthornCity_MapScripts:
 
 .Santos:
 	checkcode VAR_WEEKDAY
-	if_equal SATURDAY, .SantosAppears
+	ifequal SATURDAY, .SantosAppears
 	disappear BLACKTHORNCITY_SANTOS
 	return
 
@@ -93,7 +91,7 @@ SantosScript:
 	checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
 	iftrue .Saturday
 	checkcode VAR_WEEKDAY
-	if_not_equal SATURDAY, .NotSaturday
+	ifnotequal SATURDAY, .NotSaturday
 	checkevent EVENT_MET_SANTOS_OF_SATURDAY
 	iftrue .MetSantos
 	writetext MeetSantosText
@@ -313,41 +311,36 @@ BlackthornCityTrainerTipsText:
 	done
 
 BlackthornCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 8
-	warp_def 18, 11, 1, BLACKTHORN_GYM_1F
-	warp_def 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE
-	warp_def 29, 23, 1, BLACKTHORN_EMYS_HOUSE
-	warp_def 15, 29, 2, BLACKTHORN_MART
-	warp_def 21, 29, 1, BLACKTHORN_POKECENTER_1F
-	warp_def 9, 31, 1, MOVE_DELETERS_HOUSE
-	warp_def 36, 9, 2, ICE_PATH_1F
-	warp_def 20, 1, 1, DRAGONS_DEN_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 7
+	db 0, 0 ; filler
+
+	db 8 ; warp events
+	warp_event 18, 11, BLACKTHORN_GYM_1F, 1
+	warp_event 13, 21, BLACKTHORN_DRAGON_SPEECH_HOUSE, 1
+	warp_event 29, 23, BLACKTHORN_EMYS_HOUSE, 1
+	warp_event 15, 29, BLACKTHORN_MART, 2
+	warp_event 21, 29, BLACKTHORN_POKECENTER_1F, 1
+	warp_event  9, 31, MOVE_DELETERS_HOUSE, 1
+	warp_event 36,  9, ICE_PATH_1F, 2
+	warp_event 20,  1, DRAGONS_DEN_1F, 1
+
+	db 0 ; coord events
+
+	db 7 ; bg events
 	bg_event 34, 24, BGEVENT_READ, BlackthornCitySign
 	bg_event 17, 13, BGEVENT_READ, BlackthornGymSign
-	bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign
-	bg_event 21, 3, BGEVENT_READ, DragonDensSign
-	bg_event 5, 25, BGEVENT_READ, BlackthornCityTrainerTips
+	bg_event  7, 31, BGEVENT_READ, MoveDeletersHouseSign
+	bg_event 21,  3, BGEVENT_READ, DragonDensSign
+	bg_event  5, 25, BGEVENT_READ, BlackthornCityTrainerTips
 	bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign
 	bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
 	object_event 19, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
-	object_event 20, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
-	object_event 21, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
+	object_event 20,  2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
+	object_event 21,  2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
 	object_event 24, 31, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1
-	object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1
+	object_event  9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1
 	object_event 13, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1
 	object_event 22, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
 	object_event 35, 19, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1
diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm
index 74621532f..8b4575611 100644
--- a/maps/BlackthornDragonSpeechHouse.asm
+++ b/maps/BlackthornDragonSpeechHouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY
 	const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
 
 BlackthornDragonSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BlackthornDragonSpeechHouseGrannyScript:
 	jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText
@@ -48,21 +46,16 @@ BlackthornDragonSpeechHouseDratiniText:
 	done
 
 BlackthornDragonSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 2, BLACKTHORN_CITY
-	warp_def 3, 7, 2, BLACKTHORN_CITY
+	db 2 ; warp events
+	warp_event  2,  7, BLACKTHORN_CITY, 2
+	warp_event  3,  7, BLACKTHORN_CITY, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
-	object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1
+	db 2 ; object events
+	object_event  2,  3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
+	object_event  5,  5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1
diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm
index d8277c74f..01fffb4de 100644
--- a/maps/BlackthornEmysHouse.asm
+++ b/maps/BlackthornEmysHouse.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BLACKTHORNEMYSHOUSE_EMY
 
 BlackthornEmysHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Emy:
 	faceplayer
 	opentext
-	trade NPCTRADE_EMY
+	trade NPC_TRADE_EMY
 	waitbutton
 	closetext
 	end
@@ -20,22 +18,17 @@ EmysHouseBookshelf:
 	jumpstd magazinebookshelf
 
 BlackthornEmysHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 3, BLACKTHORN_CITY
-	warp_def 3, 7, 3, BLACKTHORN_CITY
+	db 2 ; warp events
+	warp_event  2,  7, BLACKTHORN_CITY, 3
+	warp_event  3,  7, BLACKTHORN_CITY, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, EmysHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, EmysHouseBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 25de39246..4627e807b 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BLACKTHORNGYM1F_CLAIR
 	const BLACKTHORNGYM1F_COOLTRAINER_M1
 	const BLACKTHORNGYM1F_COOLTRAINER_M2
@@ -6,11 +6,9 @@ const_value set 2
 	const BLACKTHORNGYM1F_GYM_GUY
 
 BlackthornGym1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .Boulders
 
 .Boulders:
@@ -93,10 +91,10 @@ BlackthornGymClairScript:
 	end
 
 TrainerCooltrainermPaul:
-	trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script
+	trainer COOLTRAINERM, PAUL, EVENT_BEAT_COOLTRAINERM_PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermPaulAfterBattleText
 	waitbutton
@@ -104,10 +102,10 @@ TrainerCooltrainermPaul:
 	end
 
 TrainerCooltrainermMike:
-	trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script
+	trainer COOLTRAINERM, MIKE, EVENT_BEAT_COOLTRAINERM_MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermMikeAfterBattleText
 	waitbutton
@@ -115,10 +113,10 @@ TrainerCooltrainermMike:
 	end
 
 TrainerCooltrainerfLola:
-	trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script
+	trainer COOLTRAINERF, LOLA, EVENT_BEAT_COOLTRAINERF_LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfLolaAfterBattleText
 	waitbutton
@@ -387,31 +385,26 @@ BlackthornGymGuyWinText:
 	done
 
 BlackthornGym1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 7
-	warp_def 4, 17, 1, BLACKTHORN_CITY
-	warp_def 5, 17, 1, BLACKTHORN_CITY
-	warp_def 1, 7, 1, BLACKTHORN_GYM_2F
-	warp_def 7, 9, 2, BLACKTHORN_GYM_2F
-	warp_def 2, 6, 3, BLACKTHORN_GYM_2F
-	warp_def 7, 7, 4, BLACKTHORN_GYM_2F
-	warp_def 7, 6, 5, BLACKTHORN_GYM_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue
-	bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue
-
-.ObjectEvents:
-	db 5
-	object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
-	object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
-	object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
-	object_event 9, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1
-	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1
+	db 0, 0 ; filler
+
+	db 7 ; warp events
+	warp_event  4, 17, BLACKTHORN_CITY, 1
+	warp_event  5, 17, BLACKTHORN_CITY, 1
+	warp_event  1,  7, BLACKTHORN_GYM_2F, 1
+	warp_event  7,  9, BLACKTHORN_GYM_2F, 2
+	warp_event  2,  6, BLACKTHORN_GYM_2F, 3
+	warp_event  7,  7, BLACKTHORN_GYM_2F, 4
+	warp_event  7,  6, BLACKTHORN_GYM_2F, 5
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3, 15, BGEVENT_READ, BlackthornGymStatue
+	bg_event  6, 15, BGEVENT_READ, BlackthornGymStatue
+
+	db 5 ; object events
+	object_event  5,  3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
+	object_event  6,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
+	object_event  1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
+	object_event  9,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1
+	object_event  7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 7d08bcebb..195e937e3 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BLACKTHORNGYM2F_COOLTRAINER_M
 	const BLACKTHORNGYM2F_COOLTRAINER_F
 	const BLACKTHORNGYM2F_BOULDER1
@@ -9,11 +9,9 @@ const_value set 2
 	const BLACKTHORNGYM2F_BOULDER6
 
 BlackthornGym2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
 
 .SetUpStoneTable:
@@ -59,10 +57,10 @@ BlackthornGymBoulder:
 	jumpstd strengthboulder
 
 TrainerCooltrainermCody:
-	trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script
+	trainer COOLTRAINERM, CODY, EVENT_BEAT_COOLTRAINERM_CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermCodyAfterBattleText
 	waitbutton
@@ -70,10 +68,10 @@ TrainerCooltrainermCody:
 	end
 
 TrainerCooltrainerfFran:
-	trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script
+	trainer COOLTRAINERF, FRAN, EVENT_BEAT_COOLTRAINERF_FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfFranAfterBattleText
 	waitbutton
@@ -126,30 +124,25 @@ BlackthornGym2FBoulderFellText:
 	done
 
 BlackthornGym2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 1, 7, 3, BLACKTHORN_GYM_1F
-	warp_def 7, 9, 4, BLACKTHORN_GYM_1F
-	warp_def 2, 5, 5, BLACKTHORN_GYM_1F ; hole
-	warp_def 8, 7, 6, BLACKTHORN_GYM_1F ; hole
-	warp_def 8, 3, 7, BLACKTHORN_GYM_1F ; hole
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 8
-	object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
-	object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
-	object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
-	object_event 2, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
-	object_event 6, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
-	object_event 3, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
-	object_event 6, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
-	object_event 8, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  1,  7, BLACKTHORN_GYM_1F, 3
+	warp_event  7,  9, BLACKTHORN_GYM_1F, 4
+	warp_event  2,  5, BLACKTHORN_GYM_1F, 5 ; hole
+	warp_event  8,  7, BLACKTHORN_GYM_1F, 6 ; hole
+	warp_event  8,  3, BLACKTHORN_GYM_1F, 7 ; hole
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 8 ; object events
+	object_event  4,  1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
+	object_event  4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
+	object_event  8,  2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
+	object_event  2,  3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
+	object_event  6, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
+	object_event  3,  3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
+	object_event  6,  1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
+	object_event  8, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
index 4b4b74324..c7a61af05 100644
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BLACKTHORNMART_CLERK
 	const BLACKTHORNMART_COOLTRAINER_M
 	const BLACKTHORNMART_BLACK_BELT
 
 BlackthornMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BlackthornMartClerkScript:
 	opentext
@@ -47,22 +45,17 @@ BlackthornMartBlackBeltText:
 	done
 
 BlackthornMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 4, BLACKTHORN_CITY
-	warp_def 3, 7, 4, BLACKTHORN_CITY
+	db 2 ; warp events
+	warp_event  2,  7, BLACKTHORN_CITY, 4
+	warp_event  3,  7, BLACKTHORN_CITY, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
-	object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
+	object_event  5,  2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1
diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm
index 45c925561..a6e44a881 100644
--- a/maps/BlackthornPokecenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BLACKTHORNPOKECENTER1F_NURSE
 	const BLACKTHORNPOKECENTER1F_GENTLEMAN
 	const BLACKTHORNPOKECENTER1F_TWIN
 	const BLACKTHORNPOKECENTER1F_COOLTRAINER_M
 
 BlackthornPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 BlackthornPokecenter1FNurseScript:
 	jumpstd pokecenternurse
@@ -50,24 +48,19 @@ BlackthornPokecenter1FTwinText:
 	done
 
 BlackthornPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 5, BLACKTHORN_CITY
-	warp_def 4, 7, 5, BLACKTHORN_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1
-	object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1
-	object_event 1, 4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, BLACKTHORN_CITY, 5
+	warp_event  4,  7, BLACKTHORN_CITY, 5
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1
+	object_event  5,  3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1
+	object_event  1,  4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index bb8603fbf..e402d0c9a 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -1,46 +1,44 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BLUESHOUSE_DAISY
 
 BluesHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 DaisyScript:
 	faceplayer
 	opentext
 	checkcode VAR_HOUR
-	if_equal 15, .ThreePM
+	ifequal 15, .ThreePM
 	writetext DaisyHelloText
 	waitbutton
 	closetext
 	end
 
 .ThreePM:
-	checkflag ENGINE_TEA_IN_BLUES_HOUSE
+	checkflag ENGINE_DAISYS_GROOMING
 	iftrue .AlreadyGroomedMon
 	writetext DaisyOfferGroomingText
 	yesorno
 	iffalse .Refused
 	writetext DaisyWhichMonText
 	waitbutton
-	special Special_DaisyMassage
-	if_equal $0, .Refused
-	if_equal $1, .CantGroomEgg
-	setflag ENGINE_TEA_IN_BLUES_HOUSE
+	special DaisysGrooming
+	ifequal $0, .Refused
+	ifequal $1, .CantGroomEgg
+	setflag ENGINE_DAISYS_GROOMING
 	writetext DaisyAlrightText
 	waitbutton
 	closetext
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	playmusic MUSIC_HEAL
 	pause 60
-	special Special_FadeInPalettes
+	special FadeInPalettes
 	special RestartMapMusic
 	opentext
 	writetext GroomedMonLooksContentText
-	special Special_PlayCurMonCry
+	special PlayCurMonCry
 	buttonsound
 	writetext DaisyAllDoneText
 	waitbutton
@@ -145,20 +143,15 @@ DaisyCantGroomEggText:
 	done
 
 BluesHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 2, PALLET_TOWN
-	warp_def 3, 7, 2, PALLET_TOWN
+	db 2 ; warp events
+	warp_event  2,  7, PALLET_TOWN, 2
+	warp_event  3,  7, PALLET_TOWN, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 9ddbb5664..5e7c4e247 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BRUNOSROOM_BRUNO
 
 BrunosRoom_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .LockDoor
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .LockDoor ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .BrunosRoomDoors
 
 .LockDoor:
@@ -37,7 +35,7 @@ BrunosRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_FINISHED
 	setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
@@ -125,22 +123,17 @@ BrunoScript_BrunoDefeatText:
 	done
 
 BrunosRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 4, 17, 3, KOGAS_ROOM
-	warp_def 5, 17, 4, KOGAS_ROOM
-	warp_def 4, 2, 1, KARENS_ROOM
-	warp_def 5, 2, 2, KARENS_ROOM
+	db 4 ; warp events
+	warp_event  4, 17, KOGAS_ROOM, 3
+	warp_event  5, 17, KOGAS_ROOM, 4
+	warp_event  4,  2, KARENS_ROOM, 1
+	warp_event  5,  2, KARENS_ROOM, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1
+	db 1 ; object events
+	object_event  5,  7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index f8e5ef52f..074d3997a 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BURNEDTOWER1F_ROCK
 	const BURNEDTOWER1F_EUSINE
 	const BURNEDTOWER1F_SILVER
@@ -6,14 +6,12 @@ const_value set 2
 	const BURNEDTOWER1F_POKE_BALL
 
 BurnedTower1F_MapScripts:
-.SceneScripts:
-	db 3
-	scene_script .EusineScene
-	scene_script .DummyScene1
-	scene_script .DummyScene2
-
-.MapCallbacks:
-	db 1
+	db 3 ; scene scripts
+	scene_script .EusineScene ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_RIVAL_BATTLE
+	scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_NOTHING
+
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HoleAndLadder
 
 .EusineScene:
@@ -38,7 +36,7 @@ BurnedTower1F_MapScripts:
 	return
 
 .MeetEusine:
-	spriteface BURNEDTOWER1F_EUSINE, DOWN
+	turnobject BURNEDTOWER1F_EUSINE, DOWN
 	showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
 	applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement
 	opentext
@@ -46,14 +44,14 @@ BurnedTower1F_MapScripts:
 	waitbutton
 	closetext
 	moveobject BURNEDTOWER1F_EUSINE, 9, 14
-	setscene 1
+	setscene SCENE_BURNEDTOWER1F_RIVAL_BATTLE
 	end
 
 BurnedTowerRivalBattleScript:
 	showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
-	spriteface BURNEDTOWER1F_SILVER, RIGHT
+	turnobject BURNEDTOWER1F_SILVER, RIGHT
 	pause 15
 	applymovement PLAYER, BurnedTowerMovement_PlayerWalksToSilver
 	applymovement BURNEDTOWER1F_SILVER, BurnedTowerMovement_SilverWalksToPlayer
@@ -98,9 +96,9 @@ BurnedTowerRivalBattleScript:
 	writetext BurnedTowerSilver_AfterText1
 	waitbutton
 	closetext
-	setscene 2
+	setscene SCENE_BURNEDTOWER1F_NOTHING
 	setevent EVENT_RIVAL_BURNED_TOWER
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	earthquake 50
 	showemote EMOTE_SHOCK, PLAYER, 15
@@ -131,10 +129,10 @@ BurnedTower1FRock:
 	jumpstd smashrock
 
 BurnedTower1FHiddenEther:
-	hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
+	hiddenitem ETHER, EVENT_BURNED_TOWER_1F_HIDDEN_ETHER
 
 BurnedTower1FHiddenUltraBall:
-	hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
+	hiddenitem ULTRA_BALL, EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL
 
 BurnedTower1FHPUp:
 	itemball HP_UP
@@ -278,39 +276,34 @@ BurnedTower1FMortyText:
 	done
 
 BurnedTower1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 14
-	warp_def 9, 15, 13, ECRUTEAK_CITY
-	warp_def 10, 15, 13, ECRUTEAK_CITY
-	warp_def 10, 9,  1, BURNED_TOWER_B1F
-	warp_def 5, 5,  1, BURNED_TOWER_B1F
-	warp_def 5, 6,  1, BURNED_TOWER_B1F
-	warp_def 4, 6,  1, BURNED_TOWER_B1F
-	warp_def 15, 4,  2, BURNED_TOWER_B1F
-	warp_def 15, 5,  2, BURNED_TOWER_B1F
-	warp_def 10, 7,  3, BURNED_TOWER_B1F
-	warp_def 5, 14,  4, BURNED_TOWER_B1F
-	warp_def 4, 14,  4, BURNED_TOWER_B1F
-	warp_def 14, 14,  5, BURNED_TOWER_B1F
-	warp_def 15, 14,  5, BURNED_TOWER_B1F
-	warp_def 7, 15,  6, BURNED_TOWER_B1F
-
-.CoordEvents:
-	db 1
-	coord_event 11, 9, 1, BurnedTowerRivalBattleScript
-
-.BGEvents:
-	db 2
-	bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther
+	db 0, 0 ; filler
+
+	db 14 ; warp events
+	warp_event  9, 15, ECRUTEAK_CITY, 13
+	warp_event 10, 15, ECRUTEAK_CITY, 13
+	warp_event 10,  9, BURNED_TOWER_B1F, 1
+	warp_event  5,  5, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S
+	warp_event  5,  6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S
+	warp_event  4,  6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S
+	warp_event 15,  4, BURNED_TOWER_B1F, 2 ; inaccessible, left over from G/S
+	warp_event 15,  5, BURNED_TOWER_B1F, 2 ; inaccessible, left over from G/S
+	warp_event 10,  7, BURNED_TOWER_B1F, 3 ; inaccessible, left over from G/S
+	warp_event  5, 14, BURNED_TOWER_B1F, 4 ; inaccessible, left over from G/S
+	warp_event  4, 14, BURNED_TOWER_B1F, 4 ; inaccessible, left over from G/S
+	warp_event 14, 14, BURNED_TOWER_B1F, 5 ; inaccessible, left over from G/S
+	warp_event 15, 14, BURNED_TOWER_B1F, 5 ; inaccessible, left over from G/S
+	warp_event  7, 15, BURNED_TOWER_B1F, 6 ; inaccessible, left over from G/S
+
+	db 1 ; coord events
+	coord_event 11,  9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript
+
+	db 2 ; bg events
+	bg_event  8,  7, BGEVENT_ITEM, BurnedTower1FHiddenEther
 	bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall
 
-.ObjectEvents:
-	db 5
-	object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
+	db 5 ; object events
+	object_event 15,  4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
 	object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
-	object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
+	object_event  8,  9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
 	object_event 14, 14, SPRITE_MORTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY
-	object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP
+	object_event 14,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 3ad1d60f4..716c742f4 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const BURNEDTOWERB1F_BOULDER
 	const BURNEDTOWERB1F_RAIKOU1
 	const BURNEDTOWERB1F_ENTEI1
@@ -10,13 +10,11 @@ const_value set 2
 	const BURNEDTOWERB1F_EUSINE
 
 BurnedTowerB1F_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .LadderCallback
 
 .DummyScene0:
@@ -36,56 +34,56 @@ ReleaseTheBeasts:
 	playmusic MUSIC_NONE
 	pause 30
 	appear BURNEDTOWERB1F_RAIKOU1
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_RAIKOU2
 	pause 15
 	cry RAIKOU
 	appear BURNEDTOWERB1F_ENTEI1
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_ENTEI2
 	pause 15
 	cry ENTEI
 	appear BURNEDTOWERB1F_SUICUNE1
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_SUICUNE2
 	pause 15
 	cry SUICUNE
 	pause 15
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement BURNEDTOWERB1F_RAIKOU1, BurnedTowerRaikouMovement
 	disappear BURNEDTOWERB1F_RAIKOU1
 	waitsfx
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement BURNEDTOWERB1F_ENTEI1, BurnedTowerEnteiMovement
 	disappear BURNEDTOWERB1F_ENTEI1
 	waitsfx
 	pause 15
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement1
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement2
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 20
 	cry SUICUNE
 	pause 30
 	playsound SFX_WARP_FROM
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement3
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	disappear BURNEDTOWERB1F_SUICUNE1
 	waitsfx
 	special RestartMapMusic
-	setscene 1
+	setscene SCENE_FINISHED
 	setevent EVENT_RELEASED_THE_BEASTS
-	special Special_InitRoamMons
-	setmapscene ECRUTEAK_GYM, 1
-	setmapscene CIANWOOD_CITY, 1
+	special InitRoamMons
+	setmapscene ECRUTEAK_GYM, SCENE_FINISHED
+	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
 	setevent EVENT_ECRUTEAK_GYM_GRAMPS
 	clearevent EVENT_ECRUTEAK_CITY_GRAMPS
@@ -96,7 +94,7 @@ ReleaseTheBeasts:
 	changeblock 6, 14, $1b ; ladder
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_FINISHED
 	end
 
 BurnedTowerB1FEusine:
@@ -106,13 +104,13 @@ BurnedTowerB1FEusine:
 	waitbutton
 	closetext
 	checkcode VAR_FACING
-	if_equal UP, .Movement
+	ifequal UP, .Movement2
 	applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1
-	jump UnknownScript_0x18622a
+	jump .Finish
 
-.Movement:
+.Movement2:
 	applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement2
-UnknownScript_0x18622a:
+.Finish:
 	disappear BURNEDTOWERB1F_EUSINE
 	playsound SFX_EXIT_BUILDING
 	waitsfx
@@ -157,7 +155,8 @@ BurnedTowerSuicuneMovement2:
 	remove_sliding
 	step_end
 
-MovementData_0x18624f:
+BurnedTowerUnusedMovement:
+; unreferenced
 	set_sliding
 	big_step DOWN
 	remove_sliding
@@ -236,33 +235,28 @@ BurnedTowerB1FEusineText:
 	done
 
 BurnedTowerB1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 10, 9, 3, BURNED_TOWER_1F
-	warp_def 17, 7, 7, BURNED_TOWER_1F
-	warp_def 10, 8, 9, BURNED_TOWER_1F
-	warp_def 3, 13, 10, BURNED_TOWER_1F
-	warp_def 17, 14, 12, BURNED_TOWER_1F
-	warp_def 7, 15, 14, BURNED_TOWER_1F
-
-.CoordEvents:
-	db 1
-	coord_event 10, 6, 0, ReleaseTheBeasts
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 9
-	object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1
-	object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
-	object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
-	object_event 16, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event 10,  9, BURNED_TOWER_1F, 3
+	warp_event 17,  7, BURNED_TOWER_1F, 7
+	warp_event 10,  8, BURNED_TOWER_1F, 9
+	warp_event  3, 13, BURNED_TOWER_1F, 10
+	warp_event 17, 14, BURNED_TOWER_1F, 12
+	warp_event  7, 15, BURNED_TOWER_1F, 14
+
+	db 1 ; coord events
+	coord_event 10,  6, SCENE_DEFAULT, ReleaseTheBeasts
+
+	db 0 ; bg events
+
+	db 9 ; object events
+	object_event 17,  8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1
+	object_event  7,  3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	object_event 12,  3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	object_event 10,  4, SPRITE_SUICUNE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
+	object_event  7,  3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	object_event 12,  3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	object_event 10,  4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
+	object_event 16,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
 	object_event 10, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index 09a8db2f2..89588ddd3 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONCAFE_SUPER_NERD
 	const CELADONCAFE_FISHER1
 	const CELADONCAFE_FISHER2
@@ -6,11 +6,9 @@ const_value set 2
 	const CELADONCAFE_TEACHER
 
 CeladonCafe_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonCafeChef:
 	faceplayer
@@ -30,7 +28,7 @@ CeladonCafeFisher1:
 	writetext Fisher1Text_Concentration
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_FISHER1, LEFT
+	turnobject CELADONCAFE_FISHER1, LEFT
 	end
 
 CeladonCafeFisher2:
@@ -43,7 +41,7 @@ CeladonCafeFisher2:
 	writetext Fisher2Text_Quantity
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_FISHER2, RIGHT
+	turnobject CELADONCAFE_FISHER2, RIGHT
 	end
 
 CeladonCafeFisher3:
@@ -56,7 +54,7 @@ CeladonCafeFisher3:
 	writetext Fisher3Text_GoldenrodIsBest
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_FISHER3, RIGHT
+	turnobject CELADONCAFE_FISHER3, RIGHT
 	end
 
 CeladonCafeTeacher:
@@ -71,7 +69,7 @@ CeladonCafeTeacher:
 	writetext TeacherText_NoCoinCase
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_TEACHER, LEFT
+	turnobject CELADONCAFE_TEACHER, LEFT
 	end
 
 .HasCoinCase:
@@ -79,12 +77,12 @@ CeladonCafeTeacher:
 	writetext TeacherText_KeepEating
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_TEACHER, RIGHT
+	turnobject CELADONCAFE_TEACHER, RIGHT
 	opentext
 	writetext TeacherText_MoreChef
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_TEACHER, LEFT
+	turnobject CELADONCAFE_TEACHER, LEFT
 	end
 
 EatathonContestPoster:
@@ -208,26 +206,21 @@ NoRoomForLeftoversText:
 	done
 
 CeladonCafe_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 6, 7, 9, CELADON_CITY
-	warp_def 7, 7, 9, CELADON_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 5, 0, BGEVENT_READ, EatathonContestPoster
-	bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan
-
-.ObjectEvents:
-	db 5
-	object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1
-	object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1
-	object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1
-	object_event 1, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1
-	object_event 4, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  6,  7, CELADON_CITY, 9
+	warp_event  7,  7, CELADON_CITY, 9
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  5,  0, BGEVENT_READ, EatathonContestPoster
+	bg_event  7,  1, BGEVENT_READ, CeladonCafeTrashcan
+
+	db 5 ; object events
+	object_event  9,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1
+	object_event  4,  6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1
+	object_event  1,  7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1
+	object_event  1,  2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1
+	object_event  4,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index 8075a5343..36ff6b714 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONCITY_FISHER
 	const CELADONCITY_POLIWAG
 	const CELADONCITY_TEACHER1
@@ -10,11 +10,9 @@ const_value set 2
 	const CELADONCITY_LASS
 
 CeladonCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -75,7 +73,7 @@ CeladonCityPokecenterSign:
 	jumpstd pokecentersign
 
 CeladonCityHiddenPpUp:
-	hiddenitem EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP
+	hiddenitem PP_UP, EVENT_CELADON_CITY_HIDDEN_PP_UP
 
 CeladonCityFisherText:
 	text "This POLIWRATH is"
@@ -160,8 +158,8 @@ CeladonCityTeacher2Text:
 	line "a sales clerk."
 	done
 
+CeladonCityLassText_Mobile:
 ; unused
-CeladonCityUnusedPokeComCenterText:
 	text "I love being"
 	line "surrounded by tall"
 	cont "buildings!"
@@ -235,43 +233,38 @@ CeladonCityTrainerTipsText:
 	done
 
 CeladonCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 9
-	warp_def 4, 9, 1, CELADON_DEPT_STORE_1F
-	warp_def 16, 9, 1, CELADON_MANSION_1F
-	warp_def 16, 3, 3, CELADON_MANSION_1F
-	warp_def 17, 3, 3, CELADON_MANSION_1F
-	warp_def 29, 9, 1, CELADON_POKECENTER_1F
-	warp_def 18, 19, 1, CELADON_GAME_CORNER
-	warp_def 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM
-	warp_def 10, 29, 1, CELADON_GYM
-	warp_def 25, 29, 1, CELADON_CAFE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 8
+	db 0, 0 ; filler
+
+	db 9 ; warp events
+	warp_event  4,  9, CELADON_DEPT_STORE_1F, 1
+	warp_event 16,  9, CELADON_MANSION_1F, 1
+	warp_event 16,  3, CELADON_MANSION_1F, 3
+	warp_event 17,  3, CELADON_MANSION_1F, 3
+	warp_event 29,  9, CELADON_POKECENTER_1F, 1
+	warp_event 18, 19, CELADON_GAME_CORNER, 1
+	warp_event 23, 19, CELADON_GAME_CORNER_PRIZE_ROOM, 1
+	warp_event 10, 29, CELADON_GYM, 1
+	warp_event 25, 29, CELADON_CAFE, 1
+
+	db 0 ; coord events
+
+	db 8 ; bg events
 	bg_event 23, 21, BGEVENT_READ, CeladonCitySign
 	bg_event 11, 31, BGEVENT_READ, CeladonGymSign
-	bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign
-	bg_event 13, 9, BGEVENT_READ, CeladonCityMansionSign
+	bg_event  6,  9, BGEVENT_READ, CeladonCityDeptStoreSign
+	bg_event 13,  9, BGEVENT_READ, CeladonCityMansionSign
 	bg_event 19, 21, BGEVENT_READ, CeladonCityGameCornerSign
 	bg_event 29, 21, BGEVENT_READ, CeladonCityTrainerTips
-	bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign
+	bg_event 30,  9, BGEVENT_READ, CeladonCityPokecenterSign
 	bg_event 37, 21, BGEVENT_ITEM, CeladonCityHiddenPpUp
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 26, 11, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1
 	object_event 27, 11, SPRITE_POLIWAG, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1
 	object_event 20, 24, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1
 	object_event 14, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1
-	object_event 8, 31, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1
+	object_event  8, 31, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1
 	object_event 18, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1
 	object_event 24, 33, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1
-	object_event 6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1
-	object_event 7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1
+	object_event  6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1
+	object_event  7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1
diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm
index 7f838179d..ba347458a 100644
--- a/maps/CeladonDeptStore1F.asm
+++ b/maps/CeladonDeptStore1F.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE1F_RECEPTIONIST
 	const CELADONDEPTSTORE1F_GENTLEMAN
 	const CELADONDEPTSTORE1F_TEACHER
 
 CeladonDeptStore1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonDeptStore1FReceptionistScript:
 	jumptextfaceplayer CeladonDeptStore1FReceptionistText
@@ -74,26 +72,21 @@ CeladonDeptStore1FDirectoryText:
 	done
 
 CeladonDeptStore1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 7, 7, 1, CELADON_CITY
-	warp_def 8, 7, 1, CELADON_CITY
-	warp_def 15, 0, 2, CELADON_DEPT_STORE_2F
-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
-
-.ObjectEvents:
-	db 3
-	object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1
-	object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1
-	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  7,  7, CELADON_CITY, 1
+	warp_event  8,  7, CELADON_CITY, 1
+	warp_event 15,  0, CELADON_DEPT_STORE_2F, 2
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore1FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
+
+	db 3 ; object events
+	object_event 10,  1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1
+	object_event 11,  4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1
+	object_event  5,  3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1
diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm
index eb9bb8dbc..cdbadd700 100644
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -1,24 +1,22 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE2F_CLERK1
 	const CELADONDEPTSTORE2F_CLERK2
 	const CELADONDEPTSTORE2F_POKEFAN_M
 	const CELADONDEPTSTORE2F_YOUNGSTER
 
 CeladonDeptStore2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x70bad:
+CeladonDeptStore2FClerk1Script:
 	faceplayer
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_CELADON_2F_1
 	closetext
 	end
 
-ClerkScript_0x70bb5:
+CeladonDeptStore2FClerk2Script:
 	faceplayer
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_CELADON_2F_2
@@ -69,26 +67,21 @@ CeladonDeptStore2FDirectoryText:
 	done
 
 CeladonDeptStore2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 12, 0, 1, CELADON_DEPT_STORE_3F
-	warp_def 15, 0, 3, CELADON_DEPT_STORE_1F
-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton
-
-.ObjectEvents:
-	db 4
-	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1
-	object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1
-	object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1
-	object_event 6, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 12,  0, CELADON_DEPT_STORE_3F, 1
+	warp_event 15,  0, CELADON_DEPT_STORE_1F, 3
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore2FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore2FElevatorButton
+
+	db 4 ; object events
+	object_event 13,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FClerk1Script, -1
+	object_event 14,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FClerk2Script, -1
+	object_event  5,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1
+	object_event  6,  2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index 01cd14f57..638ff3c34 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE3F_CLERK
 	const CELADONDEPTSTORE3F_YOUNGSTER
 	const CELADONDEPTSTORE3F_GAMEBOY_KID1
@@ -6,13 +6,11 @@ const_value set 2
 	const CELADONDEPTSTORE3F_SUPER_NERD
 
 CeladonDeptStore3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x70d29:
+CeladonDeptStore3FClerkScript:
 	faceplayer
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_CELADON_3F
@@ -28,7 +26,7 @@ CeladonDeptStore3FGameboyKid1Script:
 	writetext CeladonDeptStore3FGameboyKid1Text
 	waitbutton
 	closetext
-	spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
+	turnobject CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
 	end
 
 CeladonDeptStore3FGameboyKid2Script:
@@ -37,7 +35,7 @@ CeladonDeptStore3FGameboyKid2Script:
 	writetext CeladonDeptStore3FGameboyKid2Text
 	waitbutton
 	closetext
-	spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
+	turnobject CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
 	end
 
 CeladonDeptStore3FSuperNerdScript:
@@ -95,27 +93,22 @@ CeladonDeptStore3FDirectoryText:
 	done
 
 CeladonDeptStore3F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 12, 0, 1, CELADON_DEPT_STORE_2F
-	warp_def 15, 0, 2, CELADON_DEPT_STORE_4F
-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton
-
-.ObjectEvents:
-	db 5
-	object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
-	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
-	object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
-	object_event 10, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
-	object_event 13, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 12,  0, CELADON_DEPT_STORE_2F, 1
+	warp_event 15,  0, CELADON_DEPT_STORE_4F, 2
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore3FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore3FElevatorButton
+
+	db 5 ; object events
+	object_event  7,  1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FClerkScript, -1
+	object_event  6,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
+	object_event  9,  1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
+	object_event 10,  1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
+	object_event 13,  4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1
diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
index e3869c990..9e7dddc29 100644
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE4F_CLERK
 	const CELADONDEPTSTORE4F_SUPER_NERD
 	const CELADONDEPTSTORE4F_YOUNGSTER
 
 CeladonDeptStore4F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x70f0d:
+CeladonDeptStore4FClerkScript:
 	faceplayer
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_CELADON_4F
@@ -51,25 +49,20 @@ CeladonDeptStore4FDirectoryText:
 	done
 
 CeladonDeptStore4F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 12, 0, 1, CELADON_DEPT_STORE_5F
-	warp_def 15, 0, 2, CELADON_DEPT_STORE_3F
-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton
-
-.ObjectEvents:
-	db 3
-	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
-	object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
-	object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 12,  0, CELADON_DEPT_STORE_5F, 1
+	warp_event 15,  0, CELADON_DEPT_STORE_3F, 2
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore4FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore4FElevatorButton
+
+	db 3 ; object events
+	object_event 13,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FClerkScript, -1
+	object_event  7,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
+	object_event  8,  2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
index a14e8c7be..2c5ae22f8 100644
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE5F_CLERK1
 	const CELADONDEPTSTORE5F_CLERK2
 	const CELADONDEPTSTORE5F_GENTLEMAN
@@ -6,20 +6,18 @@ const_value set 2
 	const CELADONDEPTSTORE5F_TEACHER
 
 CeladonDeptStore5F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x71004:
+CeladonDeptStore5FClerk1Script:
 	faceplayer
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_CELADON_5F_1
 	closetext
 	end
 
-ClerkScript_0x7100c:
+CeladonDeptStore5FClerk2Script:
 	faceplayer
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_CELADON_5F_2
@@ -72,27 +70,22 @@ CeladonDeptStore5FDirectoryText:
 	done
 
 CeladonDeptStore5F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 12, 0, 1, CELADON_DEPT_STORE_4F
-	warp_def 15, 0, 1, CELADON_DEPT_STORE_6F
-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton
-
-.ObjectEvents:
-	db 5
-	object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
-	object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
-	object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
-	object_event 3, 4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1
-	object_event 1, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 12,  0, CELADON_DEPT_STORE_4F, 1
+	warp_event 15,  0, CELADON_DEPT_STORE_6F, 1
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore5FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore5FElevatorButton
+
+	db 5 ; object events
+	object_event  7,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FClerk1Script, -1
+	object_event  8,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FClerk2Script, -1
+	object_event 13,  5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
+	object_event  3,  4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1
+	object_event  1,  7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 9a8c0bde8..bc67437e5 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONDEPTSTORE6F_SUPER_NERD
 	const CELADONDEPTSTORE6F_YOUNGSTER
 
 CeladonDeptStore6F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HideRooftopStairs
 
 .HideRooftopStairs:
@@ -24,19 +22,19 @@ CeladonDeptStore6FVendingMachine:
 	opentext
 	writetext CeladonVendingText
 .Start:
-	special Special_PlaceMoneyTopRight
-	loadmenudata .MenuData
+	special PlaceMoneyTopRight
+	loadmenu .MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .FreshWater
-	if_equal 2, .SodaPop
-	if_equal 3, .Lemonade
+	ifequal 1, .FreshWater
+	ifequal 2, .SodaPop
+	ifequal 3, .Lemonade
 	closetext
 	end
 
 .FreshWater:
 	checkmoney YOUR_MONEY, 200
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem FRESH_WATER
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 200
@@ -45,7 +43,7 @@ CeladonDeptStore6FVendingMachine:
 
 .SodaPop:
 	checkmoney YOUR_MONEY, 300
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem SODA_POP
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 300
@@ -54,7 +52,7 @@ CeladonDeptStore6FVendingMachine:
 
 .Lemonade:
 	checkmoney YOUR_MONEY, 350
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem LEMONADE
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 350
@@ -79,13 +77,13 @@ CeladonDeptStore6FVendingMachine:
 	waitbutton
 	jump .Start
 
-.MenuData:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "FRESH WATER  ¥200@"
@@ -146,27 +144,22 @@ CeladonDeptStore6FDirectoryText:
 	done
 
 CeladonDeptStore6F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 15, 0, 2, CELADON_DEPT_STORE_5F
-	warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 6
-	bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
-	bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
-	bg_event 9, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
-	bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
-	bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
-
-.ObjectEvents:
-	db 2
-	object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1
-	object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event 15,  0, CELADON_DEPT_STORE_5F, 2
+	warp_event  2,  0, CELADON_DEPT_STORE_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 6 ; bg events
+	bg_event 14,  0, BGEVENT_READ, CeladonDeptStore6FDirectory
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStore1FElevatorButton
+	bg_event  8,  1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+	bg_event  9,  1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+	bg_event 10,  1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+	bg_event 11,  1, BGEVENT_UP, CeladonDeptStore6FVendingMachine
+
+	db 2 ; object events
+	object_event  9,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1
+	object_event 12,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1
diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm
index b5045880b..d89efe8ee 100644
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -1,9 +1,7 @@
 CeladonDeptStoreElevator_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonDeptStoreElevatorScript:
 	opentext
@@ -28,20 +26,15 @@ CeladonDeptStoreElevatorData:
 	db -1 ; end
 
 CeladonDeptStoreElevator_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 1, 3, -1, CELADON_DEPT_STORE_1F
-	warp_def 2, 3, -1, CELADON_DEPT_STORE_1F
+	db 2 ; warp events
+	warp_event  1,  3, CELADON_DEPT_STORE_1F, -1
+	warp_event  2,  3, CELADON_DEPT_STORE_1F, -1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript
+	db 1 ; bg events
+	bg_event  3,  0, BGEVENT_READ, CeladonDeptStoreElevatorScript
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 5d3382f53..beab8cae4 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONGAMECORNER_CLERK
 	const CELADONGAMECORNER_RECEPTIONIST
 	const CELADONGAMECORNER_POKEFAN_M
@@ -10,11 +10,9 @@ const_value set 2
 	const CELADONGAMECORNER_GRAMPS
 
 CeladonGameCorner_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonGameCornerClerkScript:
 	jumpstd gamecornercoinvendor
@@ -28,7 +26,7 @@ CeladonGameCornerPokefanMScript:
 	writetext CeladonGameCornerPokefanMText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_POKEFAN_M, LEFT
+	turnobject CELADONGAMECORNER_POKEFAN_M, LEFT
 	end
 
 CeladonGameCornerTeacherScript:
@@ -37,7 +35,7 @@ CeladonGameCornerTeacherScript:
 	writetext CeladonGameCornerTeacherText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_TEACHER, RIGHT
+	turnobject CELADONGAMECORNER_TEACHER, RIGHT
 	end
 
 CeladonGameCornerFishingGuruScript:
@@ -46,7 +44,7 @@ CeladonGameCornerFishingGuruScript:
 	writetext CeladonGameCornerFishingGuruText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT
+	turnobject CELADONGAMECORNER_FISHING_GURU, RIGHT
 	end
 
 CeladonGameCornerFisherScript:
@@ -59,7 +57,7 @@ CeladonGameCornerFisherScript:
 	checkitem COIN_CASE
 	iffalse .NoCoinCase
 	checkcoins MAX_COINS - 1
-	if_equal HAVE_MORE, .FullCoinCase
+	ifequal HAVE_MORE, .FullCoinCase
 	stringtotext .coinname, MEM_BUFFER_1
 	scall .GiveCoins
 	givecoins 18
@@ -68,7 +66,7 @@ CeladonGameCornerFisherScript:
 	writetext CeladonGameCornerFisherText2
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	turnobject LAST_TALKED, LEFT
 	end
 
 .GiveCoins:
@@ -82,14 +80,14 @@ CeladonGameCornerFisherScript:
 	writetext CeladonGameCornerFisherNoCoinCaseText
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	turnobject LAST_TALKED, LEFT
 	end
 
 .FullCoinCase:
 	writetext CeladonGameCornerFisherFullCoinCaseText
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	turnobject LAST_TALKED, LEFT
 	end
 
 CeladonGymGuyScript:
@@ -101,7 +99,7 @@ CeladonGameCornerGrampsScript:
 	writetext CeladonGameCornerGrampsText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_GRAMPS, LEFT
+	turnobject CELADONGAMECORNER_GRAMPS, LEFT
 	end
 
 CeladonGameCornerPoster1Script:
@@ -112,39 +110,39 @@ CeladonGameCornerPoster2Script:
 
 CeladonGameCornerLuckySlotMachineScript:
 	random 6
-	if_equal 0, CeladonGameCornerSlotMachineScript
+	ifequal 0, CeladonGameCornerSlotMachineScript
 	refreshscreen
 	writebyte FALSE
-	special Special_SlotMachine
+	special SlotMachine
 	closetext
 	end
 
 CeladonGameCornerSlotMachineScript:
 	refreshscreen
 	writebyte TRUE
-	special Special_SlotMachine
+	special SlotMachine
 	closetext
 	end
 
 CeladonGameCornerCardFlipScript:
 	refreshscreen
-	special Special_CardFlip
+	special CardFlip
 	closetext
 	end
 
 CeladonGameCornerLighterScript:
 	jumptext CeladonGameCornerLighterText
 
-MapCeladonGameCornerSignpost9Script:
+CeladonGameCornerSodaCanScript:
 	opentext
-	writetext UnknownText_0x72567
+	writetext CeladonGameCornerSodaCanText
 	waitbutton
-	special Special_CardFlip
+	special CardFlip
 	closetext
 	end
 
-MovementData_0x721cd:
-; unused
+CeladonGameCornerUnusedMovementData:
+; unreferenced
 	step RIGHT
 	turn_head LEFT
 	step_end
@@ -272,7 +270,7 @@ CeladonGameCornerLighterText:
 	line "here."
 	done
 
-UnknownText_0x72567:
+CeladonGameCornerSodaCanText:
 	text "A can of soda…"
 
 	para "Someone must be"
@@ -282,66 +280,61 @@ UnknownText_0x72567:
 	done
 
 CeladonGameCorner_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 14, 13, 6, CELADON_CITY
-	warp_def 15, 13, 6, CELADON_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 38
-	bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 1, 9, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 1, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 1, 11, BGEVENT_LEFT, CeladonGameCornerCardFlipScript
-	bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 6, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 6, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 6, 9, BGEVENT_READ, MapCeladonGameCornerSignpost9Script
-	bg_event 6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript
-	bg_event 6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript
-	bg_event 7, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 7, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 7, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 7, 10, BGEVENT_READ, CeladonGameCornerSlotMachineScript
-	bg_event 7, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 12, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 12, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 12, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 12, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event 14, 13, CELADON_CITY, 6
+	warp_event 15, 13, CELADON_CITY, 6
+
+	db 0 ; coord events
+
+	db 38 ; bg events
+	bg_event  1,  6, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  1,  7, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  1,  8, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  1,  9, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  1, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  1, 11, BGEVENT_LEFT, CeladonGameCornerCardFlipScript
+	bg_event  6,  6, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  6,  7, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  6,  8, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  6,  9, BGEVENT_READ, CeladonGameCornerSodaCanScript
+	bg_event  6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript
+	bg_event  6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript
+	bg_event  7,  6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event  7,  7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event  7,  8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event  7,  9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event  7, 10, BGEVENT_READ, CeladonGameCornerSlotMachineScript
+	bg_event  7, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12,  6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12,  7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12,  8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 12,  9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 12, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 12, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 13, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 13, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 13, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 13, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13,  6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13,  7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13,  8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 13,  9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 13, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 13, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 18, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 18, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
-	bg_event 18, 8, BGEVENT_READ, CeladonGameCornerLighterScript
-	bg_event 18, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 18,  6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 18,  7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
+	bg_event 18,  8, BGEVENT_READ, CeladonGameCornerLighterScript
+	bg_event 18,  9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 18, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
 	bg_event 18, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript
-	bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script
-	bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script
+	bg_event 15,  0, BGEVENT_READ, CeladonGameCornerPoster1Script
+	bg_event  9,  0, BGEVENT_READ, CeladonGameCornerPoster2Script
 
-.ObjectEvents:
-	db 9
-	object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
-	object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
+	db 9 ; object events
+	object_event  5,  2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
+	object_event  3,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
 	object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1
-	object_event 17, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1
-	object_event 11, 7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1
-	object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
-	object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
-	object_event 11, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1
-	object_event 2, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1
+	object_event 17,  7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1
+	object_event 11,  7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1
+	object_event  8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
+	object_event  8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
+	object_event 11,  3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1
+	object_event  2,  8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 6d55f57d8..fdeeefc3c 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONGAMECORNERPRIZEROOM_GENTLEMAN
 	const CELADONGAMECORNERPRIZEROOM_PHARMACIST
 
 CeladonGameCornerPrizeRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonGameCornerPrizeRoomGentlemanScript:
 	jumptextfaceplayer CeladonGameCornerPrizeRoomGentlemanText
@@ -24,18 +22,18 @@ CeladonGameCornerPrizeRoomTMVendor:
 	iffalse CeladonPrizeRoom_NoCoinCase
 	writetext CeladonPrizeRoom_AskWhichPrizeText
 CeladonPrizeRoom_tmcounterloop:
-	special Special_DisplayCoinCaseBalance
-	loadmenudata CeladonPrizeRoom_TMMenuDataHeader
+	special DisplayCoinCaseBalance
+	loadmenu CeladonPrizeRoom_TMMenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .doubleteam
-	if_equal 2, .psychic
-	if_equal 3, .hyperbeam
+	ifequal 1, .doubleteam
+	ifequal 2, .psychic
+	ifequal 3, .hyperbeam
 	jump CeladonPrizeRoom_cancel
 
 .doubleteam
 	checkcoins 1500
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	itemtotext TM_DOUBLE_TEAM, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
@@ -46,7 +44,7 @@ CeladonPrizeRoom_tmcounterloop:
 
 .psychic
 	checkcoins 3500
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	itemtotext TM_PSYCHIC_M, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
@@ -57,7 +55,7 @@ CeladonPrizeRoom_tmcounterloop:
 
 .hyperbeam
 	checkcoins 7500
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	itemtotext TM_HYPER_BEAM, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
@@ -102,13 +100,13 @@ CeladonPrizeRoom_NoCoinCase:
 	closetext
 	end
 
-CeladonPrizeRoom_TMMenuDataHeader:
+CeladonPrizeRoom_TMMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 15, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "TM32    1500@"
@@ -125,20 +123,20 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	iffalse CeladonPrizeRoom_NoCoinCase
 .loop
 	writetext CeladonPrizeRoom_AskWhichPrizeText
-	special Special_DisplayCoinCaseBalance
-	loadmenudata .MenuDataHeader
+	special DisplayCoinCaseBalance
+	loadmenu .MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .pikachu
-	if_equal 2, .porygon
-	if_equal 3, .larvitar
+	ifequal 1, .pikachu
+	ifequal 2, .porygon
+	ifequal 3, .larvitar
 	jump CeladonPrizeRoom_cancel
 
 .pikachu
 	checkcoins 2222
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
+	ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
 	pokenamemem PIKACHU, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
@@ -147,16 +145,16 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	writetext CeladonPrizeRoom_HereYouGoText
 	waitbutton
 	writebyte PIKACHU
-	special Special_GameCornerPrizeMonCheckDex
+	special GameCornerPrizeMonCheckDex
 	givepoke PIKACHU, 25
 	takecoins 2222
 	jump .loop
 
 .porygon
 	checkcoins 5555
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
+	ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
 	pokenamemem PORYGON, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
@@ -165,16 +163,16 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	writetext CeladonPrizeRoom_HereYouGoText
 	waitbutton
 	writebyte PORYGON
-	special Special_GameCornerPrizeMonCheckDex
+	special GameCornerPrizeMonCheckDex
 	givepoke PORYGON, 15
 	takecoins 5555
 	jump .loop
 
 .larvitar
 	checkcoins 8888
-	if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+	ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
+	ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
 	pokenamemem LARVITAR, MEM_BUFFER_0
 	scall CeladonPrizeRoom_askbuy
 	iffalse CeladonPrizeRoom_cancel
@@ -183,18 +181,18 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	writetext CeladonPrizeRoom_HereYouGoText
 	waitbutton
 	writebyte LARVITAR
-	special Special_GameCornerPrizeMonCheckDex
+	special GameCornerPrizeMonCheckDex
 	givepoke LARVITAR, 40
 	takecoins 8888
 	jump .loop
 
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 17, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "PIKACHU    2222@"
@@ -264,23 +262,18 @@ CeladonPrizeRoom_NoCoinCaseText:
 	done
 
 CeladonGameCornerPrizeRoom_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 5, 7, CELADON_CITY
-	warp_def 3, 5, 7, CELADON_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor
-	bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor
-
-.ObjectEvents:
-	db 2
-	object_event 0, 2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1
-	object_event 4, 4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  5, CELADON_CITY, 7
+	warp_event  3,  5, CELADON_CITY, 7
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  2,  1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor
+	bg_event  4,  1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor
+
+	db 2 ; object events
+	object_event  0,  2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1
+	object_event  4,  4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm
index 53f09324a..e444aaa64 100644
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONGYM_ERIKA
 	const CELADONGYM_LASS1
 	const CELADONGYM_LASS2
@@ -7,21 +7,19 @@ const_value set 2
 	const CELADONGYM_TWIN2
 
 CeladonGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ErikaScript_0x72a6a:
+CeladonGymErikaScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_RAINBOWBADGE
 	iftrue .FightDone
-	writetext UnknownText_0x72b28
+	writetext ErikaBeforeBattleText
 	waitbutton
 	closetext
-	winlosstext UnknownText_0x72c3e, 0
+	winlosstext ErikaBeatenText, 0
 	loadtrainer ERIKA, ERIKA1
 	startbattle
 	reloadmapafterbattle
@@ -31,29 +29,29 @@ ErikaScript_0x72a6a:
 	setevent EVENT_BEAT_BEAUTY_JULIA
 	setevent EVENT_BEAT_TWINS_JO_AND_ZOE
 	opentext
-	writetext UnknownText_0x72c96
+	writetext PlayerReceivedRainbowBadgeText
 	playsound SFX_GET_BADGE
 	waitsfx
 	setflag ENGINE_RAINBOWBADGE
 .FightDone:
 	checkevent EVENT_GOT_TM19_GIGA_DRAIN
-	iftrue UnknownScript_0x72aae
-	writetext UnknownText_0x72cb0
+	iftrue .GotGigaDrain
+	writetext ErikaExplainTMText
 	buttonsound
 	verbosegiveitem TM_GIGA_DRAIN
-	iffalse UnknownScript_0x72aae
+	iffalse .GotGigaDrain
 	setevent EVENT_GOT_TM19_GIGA_DRAIN
-UnknownScript_0x72aae:
-	writetext UnknownText_0x72d8f
+.GotGigaDrain:
+	writetext ErikaAfterBattleText
 	waitbutton
 	closetext
 	end
 
 TrainerLassMichelle:
-	trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script
+	trainer LASS, MICHELLE, EVENT_BEAT_LASS_MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassMichelleAfterBattleText
 	waitbutton
@@ -61,10 +59,10 @@ TrainerLassMichelle:
 	end
 
 TrainerPicnickerTanya:
-	trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script
+	trainer PICNICKER, TANYA, EVENT_BEAT_PICNICKER_TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerTanyaAfterBattleText
 	waitbutton
@@ -72,34 +70,34 @@ TrainerPicnickerTanya:
 	end
 
 TrainerBeautyJulia:
-	trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script
+	trainer BEAUTY, JULIA, EVENT_BEAT_BEAUTY_JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautyJuliaAfterBattleText
 	waitbutton
 	closetext
 	end
 
-TrainerTwinsJoandzoe1:
-	trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script
+TrainerTwinsJoAndZoe1:
+	trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoAndZoe1SeenText, TwinsJoAndZoe1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
-	writetext TwinsJoandzoe1AfterBattleText
+	writetext TwinsJoAndZoe1AfterBattleText
 	waitbutton
 	closetext
 	end
 
-TrainerTwinsJoandzoe2:
-	trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script
+TrainerTwinsJoAndZoe2:
+	trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoAndZoe2SeenText, TwinsJoAndZoe2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
-	writetext TwinsJoandzoe2AfterBattleText
+	writetext TwinsJoAndZoe2AfterBattleText
 	waitbutton
 	closetext
 	end
@@ -112,7 +110,7 @@ CeladonGymStatue:
 	trainertotext ERIKA, ERIKA1, MEM_BUFFER_1
 	jumpstd gymstatue2
 
-UnknownText_0x72b28:
+ErikaBeforeBattleText:
 	text "ERIKA: Hello…"
 	line "Lovely weather,"
 
@@ -140,7 +138,7 @@ UnknownText_0x72b28:
 	line "shall not lose."
 	done
 
-UnknownText_0x72c3e:
+ErikaBeatenText:
 	text "ERIKA: Oh!"
 	line "I concede defeat…"
 
@@ -151,12 +149,12 @@ UnknownText_0x72c3e:
 	line "RAINBOWBADGE…"
 	done
 
-UnknownText_0x72c96:
+PlayerReceivedRainbowBadgeText:
 	text "<PLAYER> received"
 	line "RAINBOWBADGE."
 	done
 
-UnknownText_0x72cb0:
+ErikaExplainTMText:
 	text "ERIKA: That was a"
 	line "delightful match."
 
@@ -177,7 +175,7 @@ UnknownText_0x72cb0:
 	line "it pleases you…"
 	done
 
-UnknownText_0x72d8f:
+ErikaAfterBattleText:
 	text "ERIKA: Losing"
 	line "leaves a bitter"
 	cont "aftertaste…"
@@ -238,57 +236,52 @@ BeautyJuliaAfterBattleText:
 	cont "like ERIKA?"
 	done
 
-TwinsJoandzoe1SeenText:
+TwinsJoAndZoe1SeenText:
 	text "We'll show you"
 	line "#MON moves that"
 	cont "ERIKA taught us!"
 	done
 
-TwinsJoandzoe1BeatenText:
+TwinsJoAndZoe1BeatenText:
 	text "Oh… We lost…"
 	done
 
-TwinsJoandzoe1AfterBattleText:
+TwinsJoAndZoe1AfterBattleText:
 	text "ERIKA will get you"
 	line "back for us!"
 	done
 
-TwinsJoandzoe2SeenText:
+TwinsJoAndZoe2SeenText:
 	text "We're going to"
 	line "protect ERIKA!"
 	done
 
-TwinsJoandzoe2BeatenText:
+TwinsJoAndZoe2BeatenText:
 	text "We couldn't win…"
 	done
 
-TwinsJoandzoe2AfterBattleText:
+TwinsJoAndZoe2AfterBattleText:
 	text "ERIKA is much,"
 	line "much stronger!"
 	done
 
 CeladonGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 17, 8, CELADON_CITY
-	warp_def 5, 17, 8, CELADON_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 15, BGEVENT_READ, CeladonGymStatue
-	bg_event 6, 15, BGEVENT_READ, CeladonGymStatue
-
-.ObjectEvents:
-	db 6
-	object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1
-	object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
-	object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
-	object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1
-	object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1
-	object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 17, CELADON_CITY, 8
+	warp_event  5, 17, CELADON_CITY, 8
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3, 15, BGEVENT_READ, CeladonGymStatue
+	bg_event  6, 15, BGEVENT_READ, CeladonGymStatue
+
+	db 6 ; object events
+	object_event  5,  3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGymErikaScript, -1
+	object_event  7,  8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
+	object_event  2,  8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
+	object_event  3,  5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1
+	object_event  4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoAndZoe1, -1
+	object_event  5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoAndZoe2, -1
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm
index 4f6e0f94d..0494249ec 100644
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONMANSION1F_GRANNY
 	const CELADONMANSION1F_GROWLITHE1
 	const CELADONMANSION1F_CLEFAIRY
 	const CELADONMANSION1F_GROWLITHE2
 
 CeladonMansion1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonMansionManager:
 	jumptextfaceplayer CeladonMansionManagerText
@@ -41,7 +39,7 @@ CeladonMansion1FNidoranF:
 CeladonMansionManagersSuiteSign:
 	jumptext CeladonMansionManagersSuiteSignText
 
-CeladonMansion1fBookshelf:
+CeladonMansion1FBookshelf:
 	jumpstd picturebookshelf
 
 CeladonMansionManagerText:
@@ -75,29 +73,24 @@ CeladonMansionManagersSuiteSignText:
 	done
 
 CeladonMansion1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 6, 9, 2, CELADON_CITY
-	warp_def 7, 9, 2, CELADON_CITY
-	warp_def 3, 0, 3, CELADON_CITY
-	warp_def 0, 0, 1, CELADON_MANSION_2F
-	warp_def 7, 0, 4, CELADON_MANSION_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign
-	bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf
-	bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf
-
-.ObjectEvents:
-	db 4
-	object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
-	object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
-	object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1
-	object_event 4, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  6,  9, CELADON_CITY, 2
+	warp_event  7,  9, CELADON_CITY, 2
+	warp_event  3,  0, CELADON_CITY, 3
+	warp_event  0,  0, CELADON_MANSION_2F, 1
+	warp_event  7,  0, CELADON_MANSION_2F, 4
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  5,  8, BGEVENT_UP, CeladonMansionManagersSuiteSign
+	bg_event  0,  3, BGEVENT_READ, CeladonMansion1FBookshelf
+	bg_event  2,  3, BGEVENT_READ, CeladonMansion1FBookshelf
+
+	db 4 ; object events
+	object_event  1,  5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
+	object_event  2,  6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
+	object_event  3,  4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1
+	object_event  4,  4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1
diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm
index e463c5b07..316a16f25 100644
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -1,15 +1,13 @@
 CeladonMansion2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonMansion2FComputer:
 	jumptext CeladonMansion2FComputerText
 
-CeladonMansion2FSign:
-	jumptext CeladonMansion2FSignText
+CeladonMansion2FMeetingRoomSign:
+	jumptext CeladonMansion2FMeetingRoomSignText
 
 CeladonMansion2FBookshelf:
 	jumpstd difficultbookshelf
@@ -44,30 +42,25 @@ CeladonMansion2FComputerText:
 	para "…"
 	done
 
-CeladonMansion2FSignText:
+CeladonMansion2FMeetingRoomSignText:
 	text "GAME FREAK"
 	line "MEETING ROOM"
 	done
 
 CeladonMansion2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 0, 0, 4, CELADON_MANSION_1F
-	warp_def 1, 0, 2, CELADON_MANSION_3F
-	warp_def 6, 0, 3, CELADON_MANSION_3F
-	warp_def 7, 0, 5, CELADON_MANSION_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer
-	bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign
-	bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf
-
-.ObjectEvents:
-	db 0
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  0,  0, CELADON_MANSION_1F, 4
+	warp_event  1,  0, CELADON_MANSION_3F, 2
+	warp_event  6,  0, CELADON_MANSION_3F, 3
+	warp_event  7,  0, CELADON_MANSION_1F, 5
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  0,  3, BGEVENT_READ, CeladonMansion2FComputer
+	bg_event  5,  8, BGEVENT_UP, CeladonMansion2FMeetingRoomSign
+	bg_event  2,  3, BGEVENT_READ, CeladonMansion2FBookshelf
+
+	db 0 ; object events
diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm
index bb6bb2f3f..2bb4cf186 100644
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -1,65 +1,64 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONMANSION3F_COOLTRAINER_M
 	const CELADONMANSION3F_GYM_GUY
 	const CELADONMANSION3F_SUPER_NERD
 	const CELADONMANSION3F_FISHER
 
 CeladonMansion3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-CooltrainerMScript_0x71670:
+CeladonMansion3FCooltrainerMScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x716ce
 	checkcode VAR_DEXCAUGHT
-	if_greater_than NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi
+	ifgreater NUM_POKEMON - 2 - 1, .CompletedPokedex ; ignore Mew and Celebi
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7167e:
+.CompletedPokedex:
 	buttonsound
 	writetext UnknownText_0x71725
 	playsound SFX_DEX_FANFARE_230_PLUS
 	waitsfx
 	writetext UnknownText_0x71760
 	buttonsound
-	special Special_Diploma
+	special Diploma
 	writetext UnknownText_0x71763
 	waitbutton
 	closetext
 	setevent EVENT_ENABLE_DIPLOMA_PRINTING
 	end
 
-GymGuyScript_0x71696:
+CeladonMansion3FGymGuyScript:
 	faceplayer
 	opentext
 	checkevent EVENT_ENABLE_DIPLOMA_PRINTING
-	iftrue UnknownScript_0x716a4
+	iftrue .CanPrintDiploma
 	writetext UnknownText_0x717b4
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x716a4:
+.CanPrintDiploma:
 	writetext UnknownText_0x717d8
 	yesorno
-	iffalse UnknownScript_0x716b0
-	special Special_PrintDiploma
+	iffalse .Refused
+	special PrintDiploma
 	closetext
 	end
 
-UnknownScript_0x716b0:
+.Refused:
 	writetext UnknownText_0x71830
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x716b6:
+.CancelPrinting:
+; unused
 	writetext UnknownText_0x71863
 	waitbutton
 	closetext
@@ -71,17 +70,17 @@ CeladonMansion3FSuperNerdScript:
 CeladonMansion3FFisherScript:
 	jumptextfaceplayer CeladonMansion3FFisherText
 
-MapCeladonMansion3FSignpost0Script:
-	jumptext UnknownText_0x7190b
+CeladonMansion3FDevRoomSign:
+	jumptext CeladonMansion3FDevRoomSignText
 
-MapCeladonMansion3FSignpost1Script:
-	jumptext UnknownText_0x71928
+CeladonMansion3FDrawing:
+	jumptext CeladonMansion3FDrawingText
 
-MapCeladonMansion3FSignpost2Script:
-	jumptext UnknownText_0x71952
+CeladonMansion3FGameProgram:
+	jumptext CeladonMansion3FGameProgramText
 
-MapCeladonMansion3FSignpost3Script:
-	jumptext UnknownText_0x71996
+CeladonMansion3FReferenceMaterial:
+	jumptext CeladonMansion3FReferenceMaterialText
 
 UnknownText_0x716ce:
 	text "Is that right?"
@@ -163,18 +162,18 @@ CeladonMansion3FFisherText:
 	para "Oh, I love them!"
 	done
 
-UnknownText_0x7190b:
+CeladonMansion3FDevRoomSignText:
 	text "GAME FREAK"
 	line "DEVELOPMENT ROOM"
 	done
 
-UnknownText_0x71928:
+CeladonMansion3FDrawingText:
 	text "It's a detailed"
 	line "drawing of a"
 	cont "pretty girl."
 	done
 
-UnknownText_0x71952:
+CeladonMansion3FGameProgramText:
 	text "It's the game"
 	line "program. Messing"
 
@@ -182,7 +181,7 @@ UnknownText_0x71952:
 	line "a bug in the game!"
 	done
 
-UnknownText_0x71996:
+CeladonMansion3FReferenceMaterialText:
 	text "It's crammed with"
 	line "reference materi-"
 	cont "als. There's even"
@@ -190,29 +189,24 @@ UnknownText_0x71996:
 	done
 
 CeladonMansion3F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 0, 0, 1, CELADON_MANSION_ROOF
-	warp_def 1, 0, 2, CELADON_MANSION_2F
-	warp_def 6, 0, 3, CELADON_MANSION_2F
-	warp_def 7, 0, 2, CELADON_MANSION_ROOF
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 4
-	bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script
-	bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script
-	bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script
-	bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script
-
-.ObjectEvents:
-	db 4
-	object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
-	object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
-	object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
-	object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  0,  0, CELADON_MANSION_ROOF, 1
+	warp_event  1,  0, CELADON_MANSION_2F, 2
+	warp_event  6,  0, CELADON_MANSION_2F, 3
+	warp_event  7,  0, CELADON_MANSION_ROOF, 2
+
+	db 0 ; coord events
+
+	db 4 ; bg events
+	bg_event  5,  8, BGEVENT_UP, CeladonMansion3FDevRoomSign
+	bg_event  4,  3, BGEVENT_UP, CeladonMansion3FDrawing
+	bg_event  1,  6, BGEVENT_UP, CeladonMansion3FGameProgram
+	bg_event  1,  3, BGEVENT_UP, CeladonMansion3FReferenceMaterial
+
+	db 4 ; object events
+	object_event  3,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FCooltrainerMScript, -1
+	object_event  3,  4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FGymGuyScript, -1
+	object_event  0,  7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
+	object_event  0,  4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1
diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm
index d3a3c7623..be2514f36 100644
--- a/maps/CeladonMansionRoof.asm
+++ b/maps/CeladonMansionRoof.asm
@@ -1,18 +1,16 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONMANSIONROOF_FISHER
 
 CeladonMansionRoof_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonMansionRoofFisherScript:
 	jumptextfaceplayer CeladonMansionRoofFisherText
 
-MapCeladonMansionRoofSignpost0Script:
-	jumptext UnknownText_0x71aa1
+CeladonMansionRoofGraffiti:
+	jumptext CeladonMansionRoofGraffitiText
 
 CeladonMansionRoofFisherText:
 	text "High places--I do"
@@ -25,7 +23,7 @@ CeladonMansionRoofFisherText:
 	line "me is smoke!"
 	done
 
-UnknownText_0x71aa1:
+CeladonMansionRoofGraffitiText:
 	text "There's graffiti"
 	line "on the wall…"
 
@@ -34,22 +32,17 @@ UnknownText_0x71aa1:
 	done
 
 CeladonMansionRoof_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 1, 1, 1, CELADON_MANSION_3F
-	warp_def 6, 1, 4, CELADON_MANSION_3F
-	warp_def 2, 5, 1, CELADON_MANSION_ROOF_HOUSE
+	db 3 ; warp events
+	warp_event  1,  1, CELADON_MANSION_3F, 1
+	warp_event  6,  1, CELADON_MANSION_3F, 4
+	warp_event  2,  5, CELADON_MANSION_ROOF_HOUSE, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script
+	db 1 ; bg events
+	bg_event  6,  1, BGEVENT_LEFT, CeladonMansionRoofGraffiti
 
-.ObjectEvents:
-	db 1
-	object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1
+	db 1 ; object events
+	object_event  7,  5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index f49d12535..9ffceb59c 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -1,37 +1,35 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONMANSIONROOFHOUSE_PHARMACIST
 
 CeladonMansionRoofHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-PharmacistScript_0x71afd:
+CeladonMansionRoofHousePharmacistScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_TM03_CURSE
-	iftrue UnknownScript_0x71b21
+	iftrue .GotCurse
 	writetext UnknownText_0x71b27
 	buttonsound
-	checknite
-	iftrue UnknownScript_0x71b14
+	checktime NITE
+	iftrue .Night
 	writetext UnknownText_0x71b4a
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x71b14:
+.Night:
 	writetext UnknownText_0x71ba3
 	buttonsound
 	verbosegiveitem TM_CURSE
-	iffalse UnknownScript_0x71b25
+	iffalse .NoRoom
 	setevent EVENT_GOT_TM03_CURSE
-UnknownScript_0x71b21:
+.GotCurse:
 	writetext UnknownText_0x71db3
 	waitbutton
-UnknownScript_0x71b25:
+.NoRoom:
 	closetext
 	end
 
@@ -117,20 +115,15 @@ UnknownText_0x71db3:
 	done
 
 CeladonMansionRoofHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 3, CELADON_MANSION_ROOF
-	warp_def 3, 7, 3, CELADON_MANSION_ROOF
+	db 2 ; warp events
+	warp_event  2,  7, CELADON_MANSION_ROOF, 3
+	warp_event  3,  7, CELADON_MANSION_ROOF, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1
+	db 1 ; object events
+	object_event  3,  2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofHousePharmacistScript, -1
diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm
index cfe31f624..85097f378 100644
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CELADONPOKECENTER1F_NURSE
 	const CELADONPOKECENTER1F_GENTLEMAN
 	const CELADONPOKECENTER1F_PHARMACIST
@@ -6,16 +6,14 @@ const_value set 2
 	const CELADONPOKECENTER1F_EUSINE
 
 CeladonPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x71e22:
+CeladonPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
-GentlemanScript_0x71e25:
+CeladonPokecenter1FGentlemanScript:
 	jumpstd happinesschecknpc
 
 CeladonPokecenter1FCooltrainerFScript:
@@ -30,9 +28,9 @@ CeladonEusine:
 	writetext CeladonEusineText1
 	buttonsound
 	writebyte SUICUNE
-	special Special_MonCheck
+	special MonCheck
 	iffalse .NoSuicune
-	special Special_BeastsCheck
+	special BeastsCheck
 	iftrue .HoOh
 	writetext NoBeastsText
 	waitbutton
@@ -45,7 +43,7 @@ CeladonEusine:
 	waitbutton
 	closetext
 	checkcode VAR_FACING
-	if_equal UP, .Location1
+	ifequal UP, .Location1
 	applymovement CELADONPOKECENTER1F_EUSINE, .Movement1
 	jump .Continue
 
@@ -146,25 +144,20 @@ NoBeastsText:
 	done
 
 CeladonPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 5, CELADON_CITY
-	warp_def 4, 7, 5, CELADON_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 5
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1
-	object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1
-	object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1
-	object_event 8, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1
-	object_event 4, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, CELADON_CITY, 5
+	warp_event  4,  7, CELADON_CITY, 5
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 5 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FNurseScript, -1
+	object_event  1,  5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FGentlemanScript, -1
+	object_event  0,  3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1
+	object_event  8,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1
+	object_event  4,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH
diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm
index 06212496b..aec478102 100644
--- a/maps/CeladonPokecenter2FBeta.asm
+++ b/maps/CeladonPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 CeladonPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeladonPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 0, 7, 3, CELADON_POKECENTER_1F
+	db 1 ; warp events
+	warp_event  0,  7, CELADON_POKECENTER_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 9980a4487..38fdc9a41 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CERULEANCITY_COOLTRAINER_M
 	const CERULEANCITY_SUPER_NERD
 	const CERULEANCITY_SLOWPOKE
@@ -7,11 +7,9 @@ const_value set 2
 	const CERULEANCITY_YOUNGSTER
 
 CeruleanCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -51,7 +49,7 @@ CeruleanCityCooltrainerFScript:
 	writetext CeruleanCityCooltrainerFText1
 	waitbutton
 	closetext
-	spriteface CERULEANCITY_COOLTRAINER_F, LEFT
+	turnobject CERULEANCITY_COOLTRAINER_F, LEFT
 	opentext
 	writetext CeruleanCityCooltrainerFText2
 	waitbutton
@@ -115,7 +113,7 @@ CeruleanCityYoungsterScript:
 	playsound SFX_TRANSACTION
 	waitsfx
 	showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15
-	spriteface CERULEANCITY_YOUNGSTER, LEFT
+	turnobject CERULEANCITY_YOUNGSTER, LEFT
 	opentext
 	writetext CeruleanCityYoungsterText2
 	waitbutton
@@ -147,7 +145,7 @@ CeruleanCityMartSign:
 	jumpstd martsign
 
 CeruleanCityHiddenBerserkGene:
-	hiddenitem EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE
+	hiddenitem BERSERK_GENE, EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY
 
 CeruleanCityCooltrainerMText1:
 	text "KANTO's POWER"
@@ -276,38 +274,33 @@ CeruleanLockedDoorText:
 	done
 
 CeruleanCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE
-	warp_def 28, 17, 1, CERULEAN_POLICE_STATION
-	warp_def 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE
-	warp_def 19, 21, 1, CERULEAN_POKECENTER_1F
-	warp_def 30, 23, 1, CERULEAN_GYM
-	warp_def 25, 29, 2, CERULEAN_MART
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 9
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event  7, 15, CERULEAN_GYM_BADGE_SPEECH_HOUSE, 1
+	warp_event 28, 17, CERULEAN_POLICE_STATION, 1
+	warp_event 13, 19, CERULEAN_TRADE_SPEECH_HOUSE, 1
+	warp_event 19, 21, CERULEAN_POKECENTER_1F, 1
+	warp_event 30, 23, CERULEAN_GYM, 1
+	warp_event 25, 29, CERULEAN_MART, 2
+
+	db 0 ; coord events
+
+	db 9 ; bg events
 	bg_event 23, 23, BGEVENT_READ, CeruleanCitySign
 	bg_event 27, 25, BGEVENT_READ, CeruleanGymSign
 	bg_event 11, 29, BGEVENT_READ, CeruleanBikeShopSign
 	bg_event 25, 17, BGEVENT_READ, CeruleanPoliceSign
-	bg_event 23, 7, BGEVENT_READ, CeruleanCapeSign
+	bg_event 23,  7, BGEVENT_READ, CeruleanCapeSign
 	bg_event 14, 29, BGEVENT_READ, CeruleanLockedDoor
 	bg_event 20, 21, BGEVENT_READ, CeruleanCityPokecenterSign
 	bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign
-	bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
+	bg_event  2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1
 	object_event 23, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1
-	object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1
+	object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1
 	object_event 21, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1
 	object_event 30, 26, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1
-	object_event 6, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1
+	object_event  6, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index b1076ded5..4fff92cdf 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CERULEANGYM_ROCKET
 	const CERULEANGYM_MISTY
 	const CERULEANGYM_SWIMMER_GIRL1
@@ -7,13 +7,11 @@ const_value set 2
 	const CERULEANGYM_GYM_GUY
 
 CeruleanGym_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .GruntRunsOut
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_CERULEANGYM_NOTHING
+	scene_script .GruntRunsOut ; SCENE_CERULEANGYM_GRUNT_RUNS_OUT
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -23,42 +21,42 @@ CeruleanGym_MapScripts:
 	end
 
 .GruntRunsOutScript:
-	applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3
+	applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsDownMovement
 	playsound SFX_TACKLE
-	applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb
+	applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsIntoYouMovement
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	opentext
 	writetext UnknownText_0x1884fb
 	waitbutton
 	closetext
 	showemote EMOTE_SHOCK, CERULEANGYM_ROCKET, 15
-	applymovement CERULEANGYM_ROCKET, MovementData_0x1884f7
+	applymovement CERULEANGYM_ROCKET, CeruleanGymGruntBacksAwayMovement
 	opentext
 	writetext UnknownText_0x188574
 	waitbutton
 	closetext
-	applymovement CERULEANGYM_ROCKET, MovementData_0x1884f5
+	applymovement CERULEANGYM_ROCKET, CeruleanGymGruntMovesCloseMovement
 	opentext
 	writetext UnknownText_0x1885a5
 	waitbutton
 	closetext
-	applymovement CERULEANGYM_ROCKET, MovementData_0x1884e8
+	applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsOutMovement
 	playsound SFX_EXIT_BUILDING
 	disappear CERULEANGYM_ROCKET
 	setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
 	clearevent EVENT_ROUTE_24_ROCKET
 	clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
-	setscene 0
-	setmapscene ROUTE_25, 1
-	setmapscene POWER_PLANT, 0
+	setscene SCENE_CERULEANGYM_NOTHING
+	setmapscene ROUTE_25, SCENE_ROUTE25_MISTYS_DATE
+	setmapscene POWER_PLANT, SCENE_POWERPLANT_NOTHING
 	waitsfx
 	special RestartMapMusic
 	pause 15
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	pause 15
 	end
 
-MistyScript_0x188432:
+CeruleanGymMistyScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_CASCADEBADGE
@@ -86,10 +84,10 @@ MistyScript_0x188432:
 	end
 
 TrainerSwimmerfDiana:
-	trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script
+	trainer SWIMMERF, DIANA, EVENT_BEAT_SWIMMERF_DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfDianaAfterBattleText
 	waitbutton
@@ -97,10 +95,10 @@ TrainerSwimmerfDiana:
 	end
 
 TrainerSwimmerfBriana:
-	trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script
+	trainer SWIMMERF, BRIANA, EVENT_BEAT_SWIMMERF_BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfBrianaAfterBattleText
 	waitbutton
@@ -108,10 +106,10 @@ TrainerSwimmerfBriana:
 	end
 
 TrainerSwimmermParker:
-	trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script
+	trainer SWIMMERM, PARKER, EVENT_BEAT_SWIMMERM_PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermParkerAfterBattleText
 	waitbutton
@@ -135,7 +133,7 @@ CeruleanGymGuyScript:
 	end
 
 CeruleanGymHiddenMachinePart:
-	hiddenitem EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART
+	hiddenitem MACHINE_PART, EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
 
 CeruleanGymStatue1:
 	checkevent EVENT_TRAINERS_IN_CERULEAN_GYM
@@ -163,19 +161,19 @@ CeruleanGymStatue:
 	trainertotext MISTY, MISTY1, MEM_BUFFER_1
 	jumpstd gymstatue2
 
-MovementData_0x1884e3:
+CeruleanGymGruntRunsDownMovement:
 	big_step DOWN
 	big_step DOWN
 	big_step DOWN
 	big_step DOWN
 	step_end
 
-MovementData_0x1884e8:
+CeruleanGymGruntRunsOutMovement:
 	big_step RIGHT
 	big_step DOWN
 	step_end
 
-MovementData_0x1884eb:
+CeruleanGymGruntRunsIntoYouMovement:
 	fix_facing
 	set_sliding
 	jump_step UP
@@ -187,11 +185,11 @@ MovementData_0x1884eb:
 	step DOWN
 	step_end
 
-MovementData_0x1884f5:
+CeruleanGymGruntMovesCloseMovement:
 	big_step DOWN
 	step_end
 
-MovementData_0x1884f7:
+CeruleanGymGruntBacksAwayMovement:
 	fix_facing
 	slow_step UP
 	remove_fixed_facing
@@ -363,28 +361,23 @@ CeruleanGymGuyWinText:
 	done
 
 CeruleanGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 15, 5, CERULEAN_CITY
-	warp_def 5, 15, 5, CERULEAN_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart
-	bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1
-	bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2
-
-.ObjectEvents:
-	db 6
-	object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
-	object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
-	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 15, CERULEAN_CITY, 5
+	warp_event  5, 15, CERULEAN_CITY, 5
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  3,  8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart
+	bg_event  2, 13, BGEVENT_READ, CeruleanGymStatue1
+	bg_event  6, 13, BGEVENT_READ, CeruleanGymStatue2
+
+	db 6 ; object events
+	object_event  4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
+	object_event  5,  3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanGymMistyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event  4,  6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event  1,  9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event  8,  9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
+	object_event  7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm
index 82d9db826..6d94bae06 100644
--- a/maps/CeruleanGymBadgeSpeechHouse.asm
+++ b/maps/CeruleanGymBadgeSpeechHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M
 
 CeruleanGymBadgeSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeruleanGymBadgeSpeechHousePokefanMScript:
 	jumptextfaceplayer CeruleanGymBadgeSpeechHousePokefanMText
@@ -17,20 +15,15 @@ CeruleanGymBadgeSpeechHousePokefanMText:
 	done
 
 CeruleanGymBadgeSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, CERULEAN_CITY
-	warp_def 3, 7, 1, CERULEAN_CITY
+	db 2 ; warp events
+	warp_event  2,  7, CERULEAN_CITY, 1
+	warp_event  3,  7, CERULEAN_CITY, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
index c89621b6a..6fd5c9b87 100644
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CERULEANMART_CLERK
 	const CERULEANMART_COOLTRAINER_M
 	const CERULEANMART_COOLTRAINER_F
 
 CeruleanMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeruleanMart_Clerk:
 	opentext
@@ -46,22 +44,17 @@ CeruleanMart_CooltrainerFText:
 	done
 
 CeruleanMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 6, CERULEAN_CITY
-	warp_def 3, 7, 6, CERULEAN_CITY
+	db 2 ; warp events
+	warp_event  2,  7, CERULEAN_CITY, 6
+	warp_event  3,  7, CERULEAN_CITY, 6
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
-	object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
-	object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
+	object_event  1,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
+	object_event  7,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1
diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm
index 2efd5f743..c7bf9738e 100644
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -1,30 +1,28 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CERULEANPOKECENTER1F_NURSE
 	const CERULEANPOKECENTER1F_SUPER_NERD
 	const CERULEANPOKECENTER1F_GYM_GUY
 
 CeruleanPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x18820f:
+CeruleanPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
-SuperNerdScript_0x188212:
-	special Special_Mobile_DummyReturnFalse
+CeruleanPokecenter1FSuperNerdScript:
+	special Mobile_DummyReturnFalse
 	iftrue .mobile
-	jumptextfaceplayer UnknownText_0x188221
+	jumptextfaceplayer CeruleanPokecenter1FSuperNerdText
 
 .mobile
-	jumptextfaceplayer UnknownText_0x18828c
+	jumptextfaceplayer CeruleanPokecenter1FSuperNerdText_Mobile
 
 CeruleanPokecenter1FGymGuyScript:
 	jumptextfaceplayer CeruleanPokecenter1FGymGuyText
 
-UnknownText_0x188221:
+CeruleanPokecenter1FSuperNerdText:
 	text "For battles, I'd"
 	line "much rather use"
 
@@ -36,7 +34,7 @@ UnknownText_0x188221:
 	cont "caught #MON."
 	done
 
-UnknownText_0x18828c:
+CeruleanPokecenter1FSuperNerdText_Mobile:
 	text "Do you battle by"
 	line "mobile phone?"
 
@@ -63,23 +61,18 @@ CeruleanPokecenter1FGymGuyText:
 	done
 
 CeruleanPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 4, CERULEAN_CITY
-	warp_def 4, 7, 4, CERULEAN_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1
-	object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1
-	object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, CERULEAN_CITY, 4
+	warp_event  4,  7, CERULEAN_CITY, 4
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FNurseScript, -1
+	object_event  8,  4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FSuperNerdScript, -1
+	object_event  1,  5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1
diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm
index 467377caa..135d49d36 100644
--- a/maps/CeruleanPokecenter2FBeta.asm
+++ b/maps/CeruleanPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 CeruleanPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeruleanPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 0, 7, 1, CERULEAN_POKECENTER_1F
+	db 1 ; warp events
+	warp_event  0,  7, CERULEAN_POKECENTER_1F, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm
index ca77bf0cd..1c97dc0e5 100644
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CERULEANPOLICESTATION_FISHING_GURU
 	const CERULEANPOLICESTATION_POKEFAN_F
 	const CERULEANPOLICESTATION_DIGLETT
 
 CeruleanPoliceStation_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeruleanPoliceStationFishingGuruScript:
 	jumptextfaceplayer CeruleanPoliceStationFishingGuruText
@@ -44,22 +42,17 @@ CeruleanDiglettText:
 	done
 
 CeruleanPoliceStation_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 2, CERULEAN_CITY
-	warp_def 3, 7, 2, CERULEAN_CITY
+	db 2 ; warp events
+	warp_event  2,  7, CERULEAN_CITY, 2
+	warp_event  3,  7, CERULEAN_CITY, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1
-	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1
-	object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1
+	db 3 ; object events
+	object_event  5,  1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1
+	object_event  5,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1
+	object_event  3,  5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1
diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm
index 8fdd470ae..d1a3caea6 100644
--- a/maps/CeruleanTradeSpeechHouse.asm
+++ b/maps/CeruleanTradeSpeechHouse.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CERULEANTRADESPEECHHOUSE_GRANNY
 	const CERULEANTRADESPEECHHOUSE_GRAMPS
 	const CERULEANTRADESPEECHHOUSE_RHYDON
 	const CERULEANTRADESPEECHHOUSE_ZUBAT
 
 CeruleanTradeSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CeruleanTradeSpeechHouseGrannyScript:
 	jumptextfaceplayer CeruleanTradeSpeechHouseGrannyText
@@ -17,17 +15,17 @@ CeruleanTradeSpeechHouseGrannyScript:
 CeruleanTradeSpeechHouseGrampsScript:
 	jumptextfaceplayer CeruleanTradeSpeechHouseGrampsText
 
-RhydonScript_0x188139:
+CeruleanTradeSpeechHouseRhydonScript:
 	opentext
-	writetext UnknownText_0x18819c
+	writetext CeruleanTradeSpeechHouseRhydonText
 	cry KANGASKHAN
 	waitbutton
 	closetext
 	end
 
-ZubatScript_0x188143:
+CeruleanTradeSpeechHouseZubatScript:
 	opentext
-	writetext UnknownText_0x1881b5
+	writetext CeruleanTradeSpeechHouseZubatText
 	cry ZUBAT
 	waitbutton
 	closetext
@@ -44,33 +42,28 @@ CeruleanTradeSpeechHouseGrampsText:
 	text "Ah… I'm so happy…"
 	done
 
-UnknownText_0x18819c:
+CeruleanTradeSpeechHouseRhydonText:
 	text "KANGASKHAN: Garu"
 	line "garuu."
 	done
 
-UnknownText_0x1881b5:
+CeruleanTradeSpeechHouseZubatText:
 	text "ZUBAT: Zuba zubaa."
 	done
 
 CeruleanTradeSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 3, CERULEAN_CITY
-	warp_def 3, 7, 3, CERULEAN_CITY
+	db 2 ; warp events
+	warp_event  2,  7, CERULEAN_CITY, 3
+	warp_event  3,  7, CERULEAN_CITY, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
-	object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1
-	object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1
-	object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1
-	object_event 5, 6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1
+	db 4 ; object events
+	object_event  2,  4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1
+	object_event  1,  2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1
+	object_event  5,  2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseRhydonScript, -1
+	object_event  5,  6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseZubatScript, -1
diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
index 3eaa2464b..dda289377 100644
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CHARCOALKILN_BLACK_BELT
 	const CHARCOALKILN_YOUNGSTER
 	const CHARCOALKILN_MOLTRES
 
 CharcoalKiln_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CharcoalKilnBoss:
 	faceplayer
@@ -149,25 +147,20 @@ FarfetchdText:
 	done
 
 CharcoalKiln_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 2, AZALEA_TOWN
-	warp_def 3, 7, 2, AZALEA_TOWN
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf
-	bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf
-	bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio
-
-.ObjectEvents:
-	db 3
-	object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
-	object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
-	object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, AZALEA_TOWN, 2
+	warp_event  3,  7, AZALEA_TOWN, 2
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  0,  1, BGEVENT_READ, CharcoalKilnBookshelf
+	bg_event  1,  1, BGEVENT_READ, CharcoalKilnBookshelf
+	bg_event  7,  1, BGEVENT_READ, CharcoalKilnRadio
+
+	db 3 ; object events
+	object_event  2,  3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
+	object_event  5,  3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
+	object_event  5,  6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index ac3db17b6..579ee70ac 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CHERRYGROVECITY_GRAMPS
 	const CHERRYGROVECITY_SILVER
 	const CHERRYGROVECITY_TEACHER
@@ -6,13 +6,11 @@ const_value set 2
 	const CHERRYGROVECITY_FISHER
 
 CherrygroveCity_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_NOTHING
+	scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_MEET_RIVAL
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .DummyScene0:
@@ -44,28 +42,28 @@ CherrygroveCityGuideGent:
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext GuideGentMartText
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement3
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext GuideGentRoute30Text
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement4
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	opentext
 	writetext GuideGentSeaText
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement5
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 60
-	spriteface CHERRYGROVECITY_GRAMPS, LEFT
-	spriteface PLAYER, RIGHT
+	turnobject CHERRYGROVECITY_GRAMPS, LEFT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext GuideGentGiftText
 	buttonsound
@@ -79,7 +77,7 @@ CherrygroveCityGuideGent:
 	closetext
 	stopfollow
 	special RestartMapMusic
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement6
 	playsound SFX_ENTER_DOOR
 	disappear CHERRYGROVECITY_GRAMPS
@@ -103,16 +101,16 @@ CherrygroveCityGuideGent:
 CherrygroveSilverSceneSouth:
 	moveobject CHERRYGROVECITY_SILVER, 39, 7
 CherrygroveSilverSceneNorth:
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	appear CHERRYGROVECITY_SILVER
 	applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
-	writetext UnknownText_0x19c4e2
+	writetext CherrygroveRivalText_Seen
 	waitbutton
 	closetext
 	checkevent EVENT_GOT_TOTODILE_FROM_ELM
@@ -168,10 +166,10 @@ CherrygroveSilverSceneNorth:
 .FinishRival:
 	playsound SFX_TACKLE
 	applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
 	disappear CHERRYGROVECITY_SILVER
-	setscene 0
+	setscene SCENE_CHERRYGROVECITY_NOTHING
 	special HealParty
 	playmapmusic
 	end
@@ -432,7 +430,7 @@ GuideGentNoText:
 	line "when you like."
 	done
 
-UnknownText_0x19c4e2:
+CherrygroveRivalText_Seen:
 	text "<……> <……> <……>"
 
 	para "You got a #MON"
@@ -547,33 +545,28 @@ GuideGentsHouseSignText:
 	done
 
 CherrygroveCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 23, 3, 2, CHERRYGROVE_MART
-	warp_def 29, 3, 1, CHERRYGROVE_POKECENTER_1F
-	warp_def 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE
-	warp_def 25, 9, 1, GUIDE_GENTS_HOUSE
-	warp_def 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
-
-.CoordEvents:
-	db 2
-	coord_event 33, 6, 1, CherrygroveSilverSceneNorth
-	coord_event 33, 7, 1, CherrygroveSilverSceneSouth
-
-.BGEvents:
-	db 4
-	bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign
-	bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign
-	bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign
-	bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign
-
-.ObjectEvents:
-	db 5
-	object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
-	object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event 23,  3, CHERRYGROVE_MART, 2
+	warp_event 29,  3, CHERRYGROVE_POKECENTER_1F, 1
+	warp_event 17,  7, CHERRYGROVE_GYM_SPEECH_HOUSE, 1
+	warp_event 25,  9, GUIDE_GENTS_HOUSE, 1
+	warp_event 31, 11, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 1
+
+	db 2 ; coord events
+	coord_event 33,  6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth
+	coord_event 33,  7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth
+
+	db 4 ; bg events
+	bg_event 30,  8, BGEVENT_READ, CherrygroveCitySign
+	bg_event 23,  9, BGEVENT_READ, GuideGentsHouseSign
+	bg_event 24,  3, BGEVENT_READ, CherrygroveCityMartSign
+	bg_event 30,  3, BGEVENT_READ, CherrygroveCityPokecenterSign
+
+	db 5 ; object events
+	object_event 32,  6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
+	object_event 39,  6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
 	object_event 27, 12, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1
-	object_event 23, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1
-	object_event 7, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1
+	object_event 23,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1
+	object_event  7, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1
diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm
index c79941cb2..78ea3fc6c 100644
--- a/maps/CherrygroveEvolutionSpeechHouse.asm
+++ b/maps/CherrygroveEvolutionSpeechHouse.asm
@@ -1,24 +1,22 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS
 	const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER
 
 CherrygroveEvolutionSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-YoungsterScript_0x196cb2:
+CherrygroveEvolutionSpeechHouseYoungsterScript:
 	opentext
-	writetext UnknownText_0x196cc3
+	writetext CherrygroveEvolutionSpeechHouseYoungsterText
 	waitbutton
 	closetext
 	end
 
-LassScript_0x196cb9:
+CherrygroveEvolutionSpeechHouseLassScript:
 	opentext
-	writetext UnknownText_0x196cfc
+	writetext CherrygroveEvolutionSpeechHouseLassText
 	waitbutton
 	closetext
 	end
@@ -26,7 +24,7 @@ LassScript_0x196cb9:
 CherrygroveEvolutionSpeechHouseBookshelf:
 	jumpstd magazinebookshelf
 
-UnknownText_0x196cc3:
+CherrygroveEvolutionSpeechHouseYoungsterText:
 	text "#MON gain expe-"
 	line "rience in battle"
 
@@ -34,7 +32,7 @@ UnknownText_0x196cc3:
 	line "form."
 	done
 
-UnknownText_0x196cfc:
+CherrygroveEvolutionSpeechHouseLassText:
 	text "#MON change?"
 
 	para "I would be shocked"
@@ -42,23 +40,18 @@ UnknownText_0x196cfc:
 	done
 
 CherrygroveEvolutionSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 5, CHERRYGROVE_CITY
-	warp_def 3, 7, 5, CHERRYGROVE_CITY
+	db 2 ; warp events
+	warp_event  2,  7, CHERRYGROVE_CITY, 5
+	warp_event  3,  7, CHERRYGROVE_CITY, 5
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
 
-.ObjectEvents:
-	db 2
-	object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1
-	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1
+	db 2 ; object events
+	object_event  3,  5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CherrygroveEvolutionSpeechHouseLassScript, -1
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveEvolutionSpeechHouseYoungsterScript, -1
diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm
index 2709ed1c0..95aa6c91a 100644
--- a/maps/CherrygroveGymSpeechHouse.asm
+++ b/maps/CherrygroveGymSpeechHouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M
 	const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER
 
 CherrygroveGymSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CherrygroveGymSpeechHousePokefanMScript:
 	jumptextfaceplayer CherrygroveGymSpeechHousePokefanMText
@@ -45,23 +43,18 @@ CherrygroveGymSpeechHouseBugCatcherText:
 	done
 
 CherrygroveGymSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 3, CHERRYGROVE_CITY
-	warp_def 3, 7, 3, CHERRYGROVE_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
-
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1
-	object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, CHERRYGROVE_CITY, 3
+	warp_event  3,  7, CHERRYGROVE_CITY, 3
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
+
+	db 2 ; object events
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1
+	object_event  5,  5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1
diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
index 7a4b6dc0b..366df35e7 100644
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -1,40 +1,38 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CHERRYGROVEMART_CLERK
 	const CHERRYGROVEMART_COOLTRAINER_M
 	const CHERRYGROVEMART_YOUNGSTER
 
 CherrygroveMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x19680a:
+CherrygroveMartClerkScript:
 	opentext
 	checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
-	iftrue UnknownScript_0x196817
+	iftrue .PokeBallsInStock
 	pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE
 	closetext
 	end
 
-UnknownScript_0x196817:
+.PokeBallsInStock:
 	pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE_DEX
 	closetext
 	end
 
-CooltrainerMScript_0x19681d:
+CherrygroveMartCooltrainerMScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
-	iftrue UnknownScript_0x19682b
-	writetext UnknownText_0x196834
+	iftrue .PokeBallsInStock
+	writetext CherrygroveMartCooltrainerMText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x19682b:
-	writetext UnknownText_0x196873
+.PokeBallsInStock:
+	writetext CherrygroveMartCooltrainerMText_PokeBallsInStock
 	waitbutton
 	closetext
 	end
@@ -42,7 +40,7 @@ UnknownScript_0x19682b:
 CherrygroveMartYoungsterScript:
 	jumptextfaceplayer CherrygroveMartYoungsterText
 
-UnknownText_0x196834:
+CherrygroveMartCooltrainerMText:
 	text "They're fresh out"
 	line "of # BALLS!"
 
@@ -50,7 +48,7 @@ UnknownText_0x196834:
 	line "more of them?"
 	done
 
-UnknownText_0x196873:
+CherrygroveMartCooltrainerMText_PokeBallsInStock:
 	text "# BALLS are in"
 	line "stock! Now I can"
 	cont "catch #MON!"
@@ -72,22 +70,17 @@ CherrygroveMartYoungsterText:
 	done
 
 CherrygroveMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, CHERRYGROVE_CITY
-	warp_def 3, 7, 1, CHERRYGROVE_CITY
+	db 2 ; warp events
+	warp_event  2,  7, CHERRYGROVE_CITY, 1
+	warp_event  3,  7, CHERRYGROVE_CITY, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1
-	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveMartClerkScript, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveMartCooltrainerMScript, -1
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1
diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm
index 202d87e50..cfd02430b 100644
--- a/maps/CherrygrovePokecenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CHERRYGROVEPOKECENTER1F_NURSE
 	const CHERRYGROVEPOKECENTER1F_FISHER
 	const CHERRYGROVEPOKECENTER1F_GENTLEMAN
 	const CHERRYGROVEPOKECENTER1F_TEACHER
 
 CherrygrovePokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x19696d:
+CherrygrovePokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
 CherrygrovePokecenter1FFisherScript:
@@ -20,18 +18,18 @@ CherrygrovePokecenter1FFisherScript:
 CherrygrovePokecenter1FGentlemanScript:
 	jumptextfaceplayer CherrygrovePokecenter1FGentlemanText
 
-TeacherScript_0x196976:
+CherrygrovePokecenter1FTeacherScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
-	iftrue UnknownScript_0x196984
-	writetext UnknownText_0x1969f1
+	iftrue .CommCenterOpen
+	writetext CherrygrovePokecenter1FTeacherText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x196984:
-	writetext UnknownText_0x196a46
+.CommCenterOpen:
+	writetext CherrygrovePokecenter1FTeacherText_CommCenterOpen
 	waitbutton
 	closetext
 	end
@@ -50,7 +48,7 @@ CherrygrovePokecenter1FGentlemanText:
 	cont "to use."
 	done
 
-UnknownText_0x1969f1:
+CherrygrovePokecenter1FTeacherText:
 	text "The COMMUNICATION"
 	line "CENTER upstairs"
 	cont "was just built."
@@ -59,7 +57,7 @@ UnknownText_0x1969f1:
 	line "finishing it up."
 	done
 
-UnknownText_0x196a46:
+CherrygrovePokecenter1FTeacherText_CommCenterOpen:
 	text "The COMMUNICATION"
 	line "CENTER upstairs"
 	cont "was just built."
@@ -69,24 +67,19 @@ UnknownText_0x196a46:
 	done
 
 CherrygrovePokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 2, CHERRYGROVE_CITY
-	warp_def 4, 7, 2, CHERRYGROVE_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1
-	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1
-	object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1
-	object_event 1, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, CHERRYGROVE_CITY, 2
+	warp_event  4,  7, CHERRYGROVE_CITY, 2
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FNurseScript, -1
+	object_event  2,  3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1
+	object_event  8,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1
+	object_event  1,  6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FTeacherScript, -1
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index f05b7aeb3..dfb743e2a 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CIANWOODCITY_STANDING_YOUNGSTER
 	const CIANWOODCITY_POKEFAN_M
 	const CIANWOODCITY_LASS
@@ -13,13 +13,11 @@ const_value set 2
 	const CIANWOODCITY_SUICUNE
 
 CianwoodCity_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_CIANWOODCITY_NOTHING
+	scene_script .DummyScene1 ; SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
 
 .DummyScene0:
@@ -38,26 +36,26 @@ CianwoodCity_MapScripts:
 	return
 
 CianwoodCitySuicuneAndEusine:
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
-	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da
-	spriteface PLAYER, DOWN
+	applymovement CIANWOODCITY_SUICUNE, CianwoodCitySuicuneApproachMovement
+	turnobject PLAYER, DOWN
 	pause 15
 	playsound SFX_WARP_FROM
-	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
+	applymovement CIANWOODCITY_SUICUNE, CianwoodCitySuicuneDepartMovement
 	disappear CIANWOODCITY_SUICUNE
 	pause 10
-	setscene 0
+	setscene SCENE_CIANWOODCITY_NOTHING
 	clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
-	setmapscene ROUTE_42, 1
+	setmapscene ROUTE_42, SCENE_ROUTE42_SUICUNE
 	checkevent EVENT_FOUGHT_EUSINE
 	iftrue .Done
 	setevent EVENT_FOUGHT_EUSINE
 	playmusic MUSIC_MYSTICALMAN_ENCOUNTER
 	appear CIANWOODCITY_EUSINE
-	applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00e7
+	applymovement CIANWOODCITY_EUSINE, CianwoodCityEusineApproachMovement
 	opentext
 	writetext EusineSuicuneText
 	waitbutton
@@ -73,10 +71,10 @@ CianwoodCitySuicuneAndEusine:
 	writetext EusineAfterText
 	waitbutton
 	closetext
-	applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00ec
+	applymovement CIANWOODCITY_EUSINE, CianwoodCityEusineDepartMovement
 	disappear CIANWOODCITY_EUSINE
 	pause 20
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	playmapmusic
 	pause 10
 .Done:
@@ -120,8 +118,9 @@ CianwoodCityPokefanM:
 CianwoodCityLass:
 	jumptextfaceplayer CianwoodCityLassText
 
-CianwoodCityUnknownScript:
-	jumptextfaceplayer CianwoodCityUnknownText
+CianwoodCityUnusedScript:
+; unreferenced
+	jumptextfaceplayer CianwoodCityUnusedText
 
 CianwoodCitySign:
 	jumptext CianwoodCitySignText
@@ -145,12 +144,12 @@ CianwoodCityRock:
 	jumpstd smashrock
 
 CianwoodCityHiddenRevive:
-	hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE
+	hiddenitem REVIVE, EVENT_CIANWOOD_CITY_HIDDEN_REVIVE
 
 CianwoodCityHiddenMaxEther:
-	hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER
+	hiddenitem MAX_ETHER, EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER
 
-MovementData_0x1a00da:
+CianwoodCitySuicuneApproachMovement:
 	set_sliding
 	fast_jump_step DOWN
 	fast_jump_step DOWN
@@ -158,7 +157,7 @@ MovementData_0x1a00da:
 	remove_sliding
 	step_end
 
-MovementData_0x1a00e0:
+CianwoodCitySuicuneDepartMovement:
 	set_sliding
 	fast_jump_step RIGHT
 	fast_jump_step UP
@@ -167,14 +166,14 @@ MovementData_0x1a00e0:
 	remove_sliding
 	step_end
 
-MovementData_0x1a00e7:
+CianwoodCityEusineApproachMovement:
 	step UP
 	step UP
 	step UP
 	step UP
 	step_end
 
-MovementData_0x1a00ec:
+CianwoodCityEusineDepartMovement:
 	step DOWN
 	step DOWN
 	step DOWN
@@ -266,8 +265,8 @@ CianwoodCityLassText:
 	line "MON."
 	done
 
-; possibly unused
-CianwoodCityUnknownText:
+CianwoodCityUnusedText:
+; unused
 	text "There are several"
 	line "islands between"
 	cont "here and OLIVINE."
@@ -381,45 +380,40 @@ CianwoodPokeSeerSignText:
 	done
 
 CianwoodCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 7
-	warp_def 17, 41, 1, MANIAS_HOUSE
-	warp_def 8, 43, 1, CIANWOOD_GYM
-	warp_def 23, 43, 1, CIANWOOD_POKECENTER_1F
-	warp_def 15, 47, 1, CIANWOOD_PHARMACY
-	warp_def 9, 31, 1, CIANWOOD_PHOTO_STUDIO
-	warp_def 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
-	warp_def 5, 17, 1, POKE_SEERS_HOUSE
-
-.CoordEvents:
-	db 1
-	coord_event 11, 16, 1, CianwoodCitySuicuneAndEusine
-
-.BGEvents:
-	db 8
+	db 0, 0 ; filler
+
+	db 7 ; warp events
+	warp_event 17, 41, MANIAS_HOUSE, 1
+	warp_event  8, 43, CIANWOOD_GYM, 1
+	warp_event 23, 43, CIANWOOD_POKECENTER_1F, 1
+	warp_event 15, 47, CIANWOOD_PHARMACY, 1
+	warp_event  9, 31, CIANWOOD_PHOTO_STUDIO, 1
+	warp_event 15, 37, CIANWOOD_LUGIA_SPEECH_HOUSE, 1
+	warp_event  5, 17, POKE_SEERS_HOUSE, 1
+
+	db 1 ; coord events
+	coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine
+
+	db 8 ; bg events
 	bg_event 20, 34, BGEVENT_READ, CianwoodCitySign
-	bg_event 7, 45, BGEVENT_READ, CianwoodGymSign
+	bg_event  7, 45, BGEVENT_READ, CianwoodGymSign
 	bg_event 24, 43, BGEVENT_READ, CianwoodPokecenterSign
 	bg_event 19, 47, BGEVENT_READ, CianwoodPharmacySign
-	bg_event 8, 32, BGEVENT_READ, CianwoodPhotoStudioSign
-	bg_event 8, 24, BGEVENT_READ, CianwoodPokeSeerSign
-	bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive
-	bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther
+	bg_event  8, 32, BGEVENT_READ, CianwoodPhotoStudioSign
+	bg_event  8, 24, BGEVENT_READ, CianwoodPokeSeerSign
+	bg_event  4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive
+	bg_event  5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther
 
-.ObjectEvents:
-	db 12
+	db 12 ; object events
 	object_event 21, 37, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1
 	object_event 17, 33, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1
 	object_event 14, 42, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1
-	object_event 8, 16, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event 9, 17, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event 4, 25, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event 5, 29, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event  8, 16, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event  9, 17, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event  4, 25, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event  5, 29, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
 	object_event 10, 27, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
-	object_event 4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
+	object_event  4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
 	object_event 10, 46, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1
 	object_event 11, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
-	object_event 10, 14, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
+	object_event 10, 14, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 1ca8a0a5e..db2aa74ee 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CIANWOODGYM_CHUCK
 	const CIANWOODGYM_BLACK_BELT1
 	const CIANWOODGYM_BLACK_BELT2
@@ -10,13 +10,11 @@ const_value set 2
 	const CIANWOODGYM_BOULDER4
 
 CianwoodGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ChuckScript_0x9d60f:
+CianwoodGymChuckScript:
 	faceplayer
 	opentext
 	checkevent EVENT_BEAT_CHUCK
@@ -24,7 +22,7 @@ ChuckScript_0x9d60f:
 	writetext ChuckIntroText1
 	waitbutton
 	closetext
-	spriteface CIANWOODGYM_CHUCK, RIGHT
+	turnobject CIANWOODGYM_CHUCK, RIGHT
 	opentext
 	writetext ChuckIntroText2
 	waitbutton
@@ -76,8 +74,8 @@ ChuckScript_0x9d60f:
 	end
 
 CianwoodGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -87,10 +85,10 @@ CianwoodGymActivateRockets:
 	jumpstd radiotowerrockets
 
 TrainerBlackbeltYoshi:
-	trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script
+	trainer BLACKBELT_T, YOSHI, EVENT_BEAT_BLACKBELT_YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BlackbeltYoshiAfterText
 	waitbutton
@@ -98,10 +96,10 @@ TrainerBlackbeltYoshi:
 	end
 
 TrainerBlackbeltLao:
-	trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script
+	trainer BLACKBELT_T, LAO, EVENT_BEAT_BLACKBELT_LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BlackbeltLaoAfterText
 	waitbutton
@@ -109,10 +107,10 @@ TrainerBlackbeltLao:
 	end
 
 TrainerBlackbeltNob:
-	trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script
+	trainer BLACKBELT_T, NOB, EVENT_BEAT_BLACKBELT_NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BlackbeltNobAfterText
 	waitbutton
@@ -120,10 +118,10 @@ TrainerBlackbeltNob:
 	end
 
 TrainerBlackbeltLung:
-	trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script
+	trainer BLACKBELT_T, LUNG, EVENT_BEAT_BLACKBELT_LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BlackbeltLungAfterText
 	waitbutton
@@ -306,30 +304,25 @@ BlackbeltLungAfterText:
 	done
 
 CianwoodGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 17, 2, CIANWOOD_CITY
-	warp_def 5, 17, 2, CIANWOOD_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue
-	bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue
-
-.ObjectEvents:
-	db 9
-	object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1
-	object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1
-	object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1
-	object_event 3, 9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1
-	object_event 5, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1
-	object_event 5, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
-	object_event 3, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
-	object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
-	object_event 5, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 17, CIANWOOD_CITY, 2
+	warp_event  5, 17, CIANWOOD_CITY, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3, 15, BGEVENT_READ, CianwoodGymStatue
+	bg_event  6, 15, BGEVENT_READ, CianwoodGymStatue
+
+	db 9 ; object events
+	object_event  4,  1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CianwoodGymChuckScript, -1
+	object_event  2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1
+	object_event  7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1
+	object_event  3,  9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1
+	object_event  5,  5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1
+	object_event  5,  1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	object_event  3,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	object_event  4,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
+	object_event  5,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm
index 4b3099eec..8eb9bffaf 100644
--- a/maps/CianwoodLugiaSpeechHouse.asm
+++ b/maps/CianwoodLugiaSpeechHouse.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CIANWOODLUGIASPEECHHOUSE_TEACHER
 	const CIANWOODLUGIASPEECHHOUSE_LASS
 	const CIANWOODLUGIASPEECHHOUSE_TWIN
 
 CianwoodLugiaSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CianwoodLugiaSpeechHouseTeacherScript:
 	jumptextfaceplayer CianwoodLugiaSpeechHouseTeacherText
@@ -62,24 +60,19 @@ CianwoodLugiaSpeechHouseTwinText:
 	done
 
 CianwoodLugiaSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 6, CIANWOOD_CITY
-	warp_def 3, 7, 6, CIANWOOD_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
-
-.ObjectEvents:
-	db 3
-	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1
-	object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1
-	object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, CIANWOOD_CITY, 6
+	warp_event  3,  7, CIANWOOD_CITY, 6
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
+
+	db 3 ; object events
+	object_event  2,  4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1
+	object_event  6,  5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1
+	object_event  0,  2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index 696a16610..ef00ba49d 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CIANWOODPHARMACY_PHARMACIST
 
 CianwoodPharmacy_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -73,22 +71,17 @@ PharmacistDescribeSecretpotionText:
 	done
 
 CianwoodPharmacy_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 4, CIANWOOD_CITY
-	warp_def 3, 7, 4, CIANWOOD_CITY
+	db 2 ; warp events
+	warp_event  2,  7, CIANWOOD_CITY, 4
+	warp_event  3,  7, CIANWOOD_CITY, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
-	bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, CianwoodPharmacyBookshelf
+	bg_event  1,  1, BGEVENT_READ, CianwoodPharmacyBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1
diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm
index bbf2eb3d9..d59df9b9c 100644
--- a/maps/CianwoodPhotoStudio.asm
+++ b/maps/CianwoodPhotoStudio.asm
@@ -1,33 +1,31 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CIANWOODPHOTOSTUDIO_FISHING_GURU
 
 CianwoodPhotoStudio_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-FishingGuruScript_0x9e0e0:
+CianwoodPhotoStudioFishingGuruScript:
 	faceplayer
 	opentext
-	writetext UnknownText_0x9e0f9
+	writetext CianwoodPhotoStudioFishingGuruText_Question
 	yesorno
-	iffalse UnknownScript_0x9e0f3
-	writetext UnknownText_0x9e142
+	iffalse .Refused
+	writetext CianwoodPhotoStudioFishingGuruText_Yes
 	waitbutton
-	special Special_PhotoStudio
+	special PhotoStudio
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x9e0f3:
-	writetext UnknownText_0x9e156
+.Refused:
+	writetext CianwoodPhotoStudioFishingGuruText_No
 	waitbutton
 	closetext
 	end
 
-UnknownText_0x9e0f9:
+CianwoodPhotoStudioFishingGuruText_Question:
 	text "You have magnifi-"
 	line "cent #MON with"
 	cont "you."
@@ -36,11 +34,11 @@ UnknownText_0x9e0f9:
 	line "for a souvenir?"
 	done
 
-UnknownText_0x9e142:
+CianwoodPhotoStudioFishingGuruText_Yes:
 	text "OK! Big smile now!"
 	done
 
-UnknownText_0x9e156:
+CianwoodPhotoStudioFishingGuruText_No:
 	text "Oh, that's too"
 	line "bad. I thought it"
 
@@ -49,20 +47,15 @@ UnknownText_0x9e156:
 	done
 
 CianwoodPhotoStudio_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 5, CIANWOOD_CITY
-	warp_def 3, 7, 5, CIANWOOD_CITY
+	db 2 ; warp events
+	warp_event  2,  7, CIANWOOD_CITY, 5
+	warp_event  3,  7, CIANWOOD_CITY, 5
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPhotoStudioFishingGuruScript, -1
diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm
index 0f97e011b..e5bc22c37 100644
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CIANWOODPOKECENTER1F_NURSE
 	const CIANWOODPOKECENTER1F_LASS
 	const CIANWOODPOKECENTER1F_GYM_GUY
 	const CIANWOODPOKECENTER1F_SUPER_NERD
 
 CianwoodPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x9dbcf:
+CianwoodPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
 CianwoodPokecenter1FLassScript:
@@ -91,7 +89,8 @@ CianwoodGymGuyWinText:
 	cont "looking at you!"
 	done
 
-UnknownText_0x9ddf2:
+CianwoodPokecenter1FUnusedText1:
+; unreferenced
 	text "Don't you get the"
 	line "urge to show off"
 
@@ -105,7 +104,8 @@ UnknownText_0x9ddf2:
 	line "in VIOLET."
 	done
 
-UnknownText_0x9de66:
+CianwoodPokecenter1FUnusedText2:
+; unreferenced
 	text "I've been battling"
 	line "my pal in VIOLET"
 
@@ -132,24 +132,19 @@ CianwoodPokecenter1FSuperNerdText:
 	done
 
 CianwoodPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 3, CIANWOOD_CITY
-	warp_def 4, 7, 3, CIANWOOD_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
-	object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
-	object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
-	object_event 8, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, CIANWOOD_CITY, 3
+	warp_event  4,  7, CIANWOOD_CITY, 3
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FNurseScript, -1
+	object_event  1,  5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
+	object_event  5,  3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
+	object_event  8,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index ed4765d18..54656768b 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CINNABARISLAND_BLUE
 
 CinnabarIsland_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -35,7 +33,7 @@ CinnabarIslandPokecenterSign:
 	jumpstd pokecentersign
 
 CinnabarIslandHiddenRareCandy:
-	hiddenitem EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY
+	hiddenitem RARE_CANDY, EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY
 
 CinnabarIslandBlueTeleport:
 	teleport_from
@@ -128,23 +126,18 @@ CinnabarIslandSignText:
 	done
 
 CinnabarIsland_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 11, 11, 1, CINNABAR_POKECENTER_1F
+	db 1 ; warp events
+	warp_event 11, 11, CINNABAR_POKECENTER_1F, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 12, 11, BGEVENT_READ, CinnabarIslandPokecenterSign
-	bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign
-	bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign
-	bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy
+	bg_event  9, 11, BGEVENT_READ, CinnabarIslandGymSign
+	bg_event  7,  7, BGEVENT_READ, CinnabarIslandSign
+	bg_event  9,  1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy
 
-.ObjectEvents:
-	db 1
-	object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
+	db 1 ; object events
+	object_event  9,  6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm
index 17fe1b97c..9100f73b4 100644
--- a/maps/CinnabarPokecenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const CINNABARPOKECENTER1F_NURSE
 	const CINNABARPOKECENTER1F_COOLTRAINER_F
 	const CINNABARPOKECENTER1F_FISHER
 
 CinnabarPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x1ab32c:
+CinnabarPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
 CinnabarPokecenter1FCooltrainerFScript:
@@ -35,23 +33,18 @@ CinnabarPokecenter1FFisherText:
 	done
 
 CinnabarPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 1, CINNABAR_ISLAND
-	warp_def 4, 7, 1, CINNABAR_ISLAND
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
-	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, CINNABAR_ISLAND, 1
+	warp_event  4,  7, CINNABAR_ISLAND, 1
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FNurseScript, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
+	object_event  2,  4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1
diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm
index f2621c43c..cf100a4a8 100644
--- a/maps/CinnabarPokecenter2FBeta.asm
+++ b/maps/CinnabarPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 CinnabarPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CinnabarPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 0, 7, 3, CINNABAR_POKECENTER_1F
+	db 1 ; warp events
+	warp_event  0,  7, CINNABAR_POKECENTER_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 6f8538bac..f6ac38b4d 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const COLOSSEUM_CHRIS1
 	const COLOSSEUM_CHRIS2
 
 Colosseum_MapScripts:
-.SceneScripts:
-	db 3
-	scene_script .InitializeColosseum
-	scene_script .DummyScene1
-	scene_script .DummyScene2
-
-.MapCallbacks:
-	db 2
+	db 3 ; scene scripts
+	scene_script .InitializeColosseum ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
+	scene_script .DummyScene2 ; unused
+
+	db 2 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 	callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F
 
@@ -25,7 +23,7 @@ Colosseum_MapScripts:
 	end
 
 .SetWhichChris:
-	special Special_CableClubCheckWhichChris
+	special CableClubCheckWhichChris
 	iffalse .Chris2
 	disappear COLOSSEUM_CHRIS2
 	appear COLOSSEUM_CHRIS1
@@ -37,20 +35,20 @@ Colosseum_MapScripts:
 	return
 
 .PreparePokecenter2F:
-	setmapscene POKECENTER_2F, 2
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene 1
-	setmapscene POKECENTER_2F, 2
+	setscene SCENE_FINISHED
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
 	end
 
-MapColosseumSignpost1Script:
-	special Special_Colosseum
+ColosseumConsoleScript:
+	special Colosseum
 	newloadmap MAPSETUP_LINKRETURN
 	end
 
-ChrisScript_0x193499:
+CableClubFriendScript:
 	opentext
 	writetext .FriendReadyText
 	waitbutton
@@ -63,23 +61,18 @@ ChrisScript_0x193499:
 	done
 
 Colosseum_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 7, 3, POKECENTER_2F
-	warp_def 5, 7, 3, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script
-	bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script
-
-.ObjectEvents:
-	db 2
-	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
-	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4,  7, POKECENTER_2F, 3
+	warp_event  5,  7, POKECENTER_2F, 3
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  4,  4, BGEVENT_RIGHT, ColosseumConsoleScript
+	bg_event  5,  4, BGEVENT_LEFT, ColosseumConsoleScript
+
+	db 2 ; object events
+	object_event  3,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  6,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
index 695329ded..f35fa487d 100644
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -1,37 +1,35 @@
-const_value set 2
+	const_def 2 ; object constants
 	const COPYCATSHOUSE1F_POKEFAN_M
 	const COPYCATSHOUSE1F_POKEFAN_F
 	const COPYCATSHOUSE1F_CLEFAIRY
 
 CopycatsHouse1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 CopycatsHouse1FPokefanMScript:
 	jumptextfaceplayer CopycatsHouse1FPokefanMText
 
-PokefanFScript_0x18ad16:
+CopycatsHouse1FPokefanFScript:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x18ad24
-	writetext UnknownText_0x18ad95
+	iftrue .ReturnedMachinePart
+	writetext CopycatsHouse1FPokefanFText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x18ad24:
-	writetext UnknownText_0x18add3
+.ReturnedMachinePart:
+	writetext CopycatsHouse1FPokefanFText_ReturnedMachinePart
 	waitbutton
 	closetext
 	end
 
-ClefairyScript_0x18ad2a:
+CopycatsHouse1FBlisseyScript:
 	opentext
-	writetext UnknownText_0x18ae4b
+	writetext CopycatsHouse1FBlisseyText
 	cry BLISSEY
 	waitbutton
 	closetext
@@ -48,7 +46,7 @@ CopycatsHouse1FPokefanMText:
 	line "around here."
 	done
 
-UnknownText_0x18ad95:
+CopycatsHouse1FPokefanFText:
 	text "My daughter is so"
 	line "self-centered…"
 
@@ -56,7 +54,7 @@ UnknownText_0x18ad95:
 	line "friends."
 	done
 
-UnknownText_0x18add3:
+CopycatsHouse1FPokefanFText_ReturnedMachinePart:
 	text "She recently lost"
 	line "the # DOLL that"
 
@@ -68,28 +66,23 @@ UnknownText_0x18add3:
 	cont "better at mimicry…"
 	done
 
-UnknownText_0x18ae4b:
+CopycatsHouse1FBlisseyText:
 	text "BLISSEY: Bliisii!"
 	done
 
 CopycatsHouse1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 2, 7, 8, SAFFRON_CITY
-	warp_def 3, 7, 8, SAFFRON_CITY
-	warp_def 2, 0, 1, COPYCATS_HOUSE_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1
-	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1
-	object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  2,  7, SAFFRON_CITY, 8
+	warp_event  3,  7, SAFFRON_CITY, 8
+	warp_event  2,  0, COPYCATS_HOUSE_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1
+	object_event  5,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanFScript, -1
+	object_event  6,  6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FBlisseyScript, -1
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index 74f6af110..9d0bbfe65 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const COPYCATSHOUSE2F_COPYCAT1 ; if player is male
 	const COPYCATSHOUSE2F_DODRIO
 	const COPYCATSHOUSE2F_FAIRYDOLL ; lost item
@@ -7,11 +7,9 @@ const_value set 2
 	const COPYCATSHOUSE2F_COPYCAT2 ; if player is female
 
 CopycatsHouse2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Callback
 
 .Callback:
@@ -46,7 +44,7 @@ Copycat:
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_KRIS
 .Default_Merge_1:
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 	checkevent EVENT_RETURNED_MACHINE_PART
 	iftrue .TalkAboutLostItem
 	opentext
@@ -70,7 +68,7 @@ Copycat:
 .Default_Merge_3a:
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_LASS
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 	opentext
 	writetext CopycatText_QuickMimicking
 	waitbutton
@@ -99,7 +97,7 @@ Copycat:
 .Default_Merge_3b:
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_LASS
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 	opentext
 	writetext CopycatText_Worried
 	waitbutton
@@ -142,7 +140,7 @@ Copycat:
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_KRIS
 .GotPass_Merge_1:
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 	opentext
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .GotPass_Female_2
@@ -164,7 +162,7 @@ Copycat:
 .GotPass_Merge_3:
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_LASS
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 	opentext
 	writetext CopycatText_ItsAScream
 	waitbutton
@@ -361,26 +359,21 @@ CopycatsHouse2FDollText:
 	done
 
 CopycatsHouse2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 1
-	warp_def 3, 0, 3, COPYCATS_HOUSE_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
-	bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
-
-.ObjectEvents:
-	db 6
-	object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1
-	object_event 6, 4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1
-	object_event 6, 1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
-	object_event 2, 1, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
-	object_event 7, 1, SPRITE_BIRD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
-	object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2
+	db 0, 0 ; filler
+
+	db 1 ; warp events
+	warp_event  3,  0, COPYCATS_HOUSE_1F, 3
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, CopycatsHouse2FBookshelf
+	bg_event  1,  1, BGEVENT_READ, CopycatsHouse2FBookshelf
+
+	db 6 ; object events
+	object_event  4,  3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1
+	object_event  6,  4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1
+	object_event  6,  1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
+	object_event  2,  1, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
+	object_event  7,  1, SPRITE_BIRD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
+	object_event  4,  3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index bb698becd..cbbb06714 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const DANCETHEATRE_KIMONO_GIRL1
 	const DANCETHEATRE_KIMONO_GIRL2
 	const DANCETHEATRE_KIMONO_GIRL3
@@ -10,17 +10,15 @@ const_value set 2
 	const DANCETHEATRE_GRANNY
 
 DanceTheatre_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerKimonoGirlNaoko2:
-	trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script
+	trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext KimonoGirlNaoko2AfterBattleText
 	waitbutton
@@ -28,10 +26,10 @@ TrainerKimonoGirlNaoko2:
 	end
 
 TrainerKimonoGirlSayo:
-	trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script
+	trainer KIMONO_GIRL, SAYO, EVENT_BEAT_KIMONO_GIRL_SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext KimonoGirlSayoAfterBattleText
 	waitbutton
@@ -39,10 +37,10 @@ TrainerKimonoGirlSayo:
 	end
 
 TrainerKimonoGirlZuki:
-	trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script
+	trainer KIMONO_GIRL, ZUKI, EVENT_BEAT_KIMONO_GIRL_ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext KimonoGirlZukiAfterBattleText
 	waitbutton
@@ -50,10 +48,10 @@ TrainerKimonoGirlZuki:
 	end
 
 TrainerKimonoGirlKuni:
-	trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script
+	trainer KIMONO_GIRL, KUNI, EVENT_BEAT_KIMONO_GIRL_KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext KimonoGirlKuniAfterBattleText
 	waitbutton
@@ -61,10 +59,10 @@ TrainerKimonoGirlKuni:
 	end
 
 TrainerKimonoGirlMiki:
-	trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script
+	trainer KIMONO_GIRL, MIKI, EVENT_BEAT_KIMONO_GIRL_MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext KimonoGirlMikiAfterBattleText
 	waitbutton
@@ -134,8 +132,8 @@ DanceTheatreCooltrainerMScript:
 DanceTheatreGrannyScript:
 	jumptextfaceplayer DanceTheatreGrannyText
 
-MapDanceTheatreSignpost1Script:
-	jumptext FancyPanelText
+DanceTheatreFancyPanel:
+	jumptext DanceTheatreFancyPanelText
 
 KimonoGirlNaoko2SeenText:
 	text "You have lovely"
@@ -331,37 +329,32 @@ DanceTheatreGrannyText:
 	cont "thing is possible."
 	done
 
-FancyPanelText:
+DanceTheatreFancyPanelText:
 	text "It's a fancy panel"
 	line "that's decorated"
 	cont "with flowers."
 	done
 
 DanceTheatre_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 5, 13, 8, ECRUTEAK_CITY
-	warp_def 6, 13, 8, ECRUTEAK_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
-	bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script
-
-.ObjectEvents:
-	db 9
-	object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1
-	object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1
-	object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1
-	object_event 9, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1
-	object_event 11, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1
-	object_event 7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1
-	object_event 6, 8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  5, 13, ECRUTEAK_CITY, 8
+	warp_event  6, 13, ECRUTEAK_CITY, 8
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  5,  6, BGEVENT_UP, DanceTheatreFancyPanel
+	bg_event  6,  6, BGEVENT_UP, DanceTheatreFancyPanel
+
+	db 9 ; object events
+	object_event  0,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1
+	object_event  2,  1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1
+	object_event  6,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1
+	object_event  9,  1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1
+	object_event 11,  2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1
+	object_event  7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1
+	object_event  6,  8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1
 	object_event 10, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1
-	object_event 3, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1
+	object_event  3,  6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1
diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm
index 63ea46aa3..84daa17de 100644
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1
 	const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2
 
 DarkCaveBlackthornEntrance_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 DarkCaveBlackthornEntrancePharmacistScript:
 	faceplayer
@@ -62,22 +60,17 @@ DarkCaveBlackthornEntrancePharmacistText2:
 	done
 
 DarkCaveBlackthornEntrance_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 23, 3, 1, ROUTE_45
-	warp_def 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE
+	db 2 ; warp events
+	warp_event 23,  3, ROUTE_45, 1
+	warp_event  3, 25, DARK_CAVE_VIOLET_ENTRANCE, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1
-	object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
-	object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
+	db 3 ; object events
+	object_event  7,  3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1
+	object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
+	object_event  7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index 3eed4f41c..10bbfb607 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const DARKCAVEVIOLETENTRANCE_POKE_BALL1
 	const DARKCAVEVIOLETENTRANCE_ROCK1
 	const DARKCAVEVIOLETENTRANCE_ROCK2
@@ -9,11 +9,9 @@ const_value set 2
 	const DARKCAVEVIOLETENTRANCE_POKE_BALL4
 
 DarkCaveVioletEntrance_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 DarkCaveVioletEntrancePotion:
 	itemball POTION
@@ -31,32 +29,27 @@ DarkCaveVioletEntranceRock:
 	jumpstd smashrock
 
 DarkCaveVioletEntranceHiddenElixer:
-	hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER
+	hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER
 
 DarkCaveVioletEntrance_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 3, 15, 3, ROUTE_31
-	warp_def 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE
-	warp_def 35, 33, 3, ROUTE_46
+	db 3 ; warp events
+	warp_event  3, 15, ROUTE_31, 3
+	warp_event 17,  1, DARK_CAVE_BLACKTHORN_ENTRANCE, 2
+	warp_event 35, 33, ROUTE_46, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer
+	db 1 ; bg events
+	bg_event 26,  3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer
 
-.ObjectEvents:
-	db 8
-	object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
+	db 8 ; object events
+	object_event  6,  8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION
 	object_event 16, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
-	object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
-	object_event 7, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
+	object_event 27,  6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
+	object_event  7, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
 	object_event 36, 31, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1
-	object_event 36, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
-	object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
-	object_event 30, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
+	object_event 36, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL
+	object_event 35,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION
+	object_event 30, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index 93461c3a8..7d085ede3 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const DAYCARE_GRAMPS
 	const DAYCARE_GRANNY
 
 DayCare_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .EggCheckCallback
 
 .EggCheckCallback:
@@ -31,8 +29,8 @@ DayCareManScript_Inside:
 	buttonsound
 	closetext
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, .PartyFull
-	special Special_GiveOddEgg
+	ifequal PARTY_LENGTH, .PartyFull
+	special GiveOddEgg
 	opentext
 	writetext DayCareText_GotOddEgg
 	playsound SFX_KEY_ITEM
@@ -51,7 +49,7 @@ DayCareManScript_Inside:
 	end
 
 .AlreadyHaveOddEgg:
-	special Special_DayCareMan
+	special DayCareMan
 	waitbutton
 	closetext
 	end
@@ -61,7 +59,7 @@ DayCareLadyScript:
 	opentext
 	checkflag ENGINE_DAY_CARE_MAN_HAS_EGG
 	iftrue .HusbandWasLookingForYou
-	special Special_DayCareLady
+	special DayCareLady
 	waitbutton
 	closetext
 	end
@@ -156,25 +154,20 @@ DayCareText_PartyFull:
 	done
 
 DayCare_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 0, 5, 3, ROUTE_34
-	warp_def 0, 6, 4, ROUTE_34
-	warp_def 2, 7, 5, ROUTE_34
-	warp_def 3, 7, 5, ROUTE_34
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, DayCareBookshelf
-	bg_event 1, 1, BGEVENT_READ, DayCareBookshelf
-
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE
-	object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  0,  5, ROUTE_34, 3
+	warp_event  0,  6, ROUTE_34, 4
+	warp_event  2,  7, ROUTE_34, 5
+	warp_event  3,  7, ROUTE_34, 5
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, DayCareBookshelf
+	bg_event  1,  1, BGEVENT_READ, DayCareBookshelf
+
+	db 2 ; object events
+	object_event  2,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE
+	object_event  5,  3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1
diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm
new file mode 100644
index 000000000..73eca15d4
--- /dev/null
+++ b/maps/DayOfWeekSiblingsHouse.asm
@@ -0,0 +1,83 @@
+	const_def 2 ; object constants
+	const DAYOFWEEKSIBLINGSHOUSE_POKEDEX
+
+DayOfWeekSiblingsHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+DayOfWeekSiblingsHousePokedexScript:
+	opentext
+	writetext DayOfWeekSiblingsHousePokedexText1
+	yesorno
+	iffalse .End
+	writetext DayOfWeekSiblingsHousePokedexText2
+	yesorno
+	iffalse .End
+	writetext DayOfWeekSiblingsHousePokedexText3
+	waitbutton
+.End:
+	closetext
+	end
+
+DayOfWeekSiblingsHousePokedexText1:
+	text "There's something"
+	line "written here."
+
+	para "Read it?"
+	done
+
+DayOfWeekSiblingsHousePokedexText2:
+	text "To my brothers and"
+	line "sisters:"
+
+	para "We take pride in"
+	line "serving #MON"
+	cont "trainers."
+
+	para "When trainers talk"
+	line "to you, give them"
+	cont "something useful."
+
+	para "Love,"
+	line "MONICA"
+
+	para "Keep reading?"
+	done
+
+DayOfWeekSiblingsHousePokedexText3:
+	text "Monday, MONICA"
+	line "ROUTE 40"
+
+	para "Tuesday, TUSCANY"
+	line "ROUTE 29"
+
+	para "Wednesday, WESLEY"
+	line "LAKE OF RAGE"
+
+	para "Thursday, ARTHUR"
+	line "ROUTE 36"
+
+	para "Friday, FRIEDA"
+	line "ROUTE 32"
+
+	para "Saturday, SANTOS"
+	line "BLACKTHORN CITY"
+
+	para "Sunday, SUNNY"
+	line "ROUTE 37"
+	done
+
+DayOfWeekSiblingsHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_26, 3
+	warp_event  3,  7, ROUTE_26, 3
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event  3,  3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayOfWeekSiblingsHousePokedexScript, -1
diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm
index b7ff38465..8475c1411 100644
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -1,18 +1,16 @@
-const_value set 2
+	const_def 2 ; object constants
 	const DIGLETTSCAVE_POKEFAN_M
 
 DiglettsCave_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 DiglettsCavePokefanMScript:
 	jumptextfaceplayer DiglettsCavePokefanMText
 
 DiglettsCaveHiddenMaxRevive:
-	hiddenitem EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE
+	hiddenitem MAX_REVIVE, EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
 
 DiglettsCavePokefanMText:
 	text "A bunch of DIGLETT"
@@ -23,25 +21,20 @@ DiglettsCavePokefanMText:
 	done
 
 DiglettsCave_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 3, 33, 10, VERMILION_CITY
-	warp_def 5, 31, 5, DIGLETTS_CAVE
-	warp_def 15, 5, 5, ROUTE_2
-	warp_def 17, 3, 6, DIGLETTS_CAVE
-	warp_def 17, 33, 2, DIGLETTS_CAVE
-	warp_def 3, 3, 4, DIGLETTS_CAVE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive
-
-.ObjectEvents:
-	db 1
-	object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event  3, 33, VERMILION_CITY, 10
+	warp_event  5, 31, DIGLETTS_CAVE, 5
+	warp_event 15,  5, ROUTE_2, 5
+	warp_event 17,  3, DIGLETTS_CAVE, 6
+	warp_event 17, 33, DIGLETTS_CAVE, 2
+	warp_event  3,  3, DIGLETTS_CAVE, 4
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive
+
+	db 1 ; object events
+	object_event  3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 8be52840d..74a95d925 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const DRAGONSHRINE_ELDER1
 	const DRAGONSHRINE_ELDER2
 	const DRAGONSHRINE_ELDER3
 	const DRAGONSHRINE_CLAIR
 
 DragonShrine_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DragonShrineTest
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .DragonShrineTest ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DragonShrineTest:
 	priorityjump .DragonShrineTestScript
@@ -27,93 +25,93 @@ DragonShrine_MapScripts:
 	writetext DragonShrineElderGreetingText
 	buttonsound
 .Question1:
-	setevent EVENT_RECEIVED_BALLS_FROM_KURT
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	writetext DragonShrineQuestion1Text
 	buttonsound
-	loadmenudata DragonShrineQuestion1_MenuDataHeader
+	loadmenu DragonShrineQuestion1_MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .RightAnswer
-	if_equal 2, .WrongAnswer
-	if_equal 3, .RightAnswer
+	ifequal 1, .RightAnswer
+	ifequal 2, .WrongAnswer
+	ifequal 3, .RightAnswer
 	end
 
 .Question2:
-	setevent EVENT_DRAGON_SHRINE_QUESTION_2
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	writetext DragonShrineQuestion2Text
 	buttonsound
-	loadmenudata DragonShrineQuestion2_MenuDataHeader
+	loadmenu DragonShrineQuestion2_MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .RightAnswer
-	if_equal 2, .RightAnswer
-	if_equal 3, .WrongAnswer
+	ifequal 1, .RightAnswer
+	ifequal 2, .RightAnswer
+	ifequal 3, .WrongAnswer
 .Question3:
-	setevent EVENT_DRAGON_SHRINE_QUESTION_3
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
 	writetext DragonShrineQuestion3Text
 	buttonsound
-	loadmenudata DragonShrineQuestion3_MenuDataHeader
+	loadmenu DragonShrineQuestion3_MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .WrongAnswer
-	if_equal 2, .RightAnswer
-	if_equal 3, .RightAnswer
+	ifequal 1, .WrongAnswer
+	ifequal 2, .RightAnswer
+	ifequal 3, .RightAnswer
 .Question4:
-	setevent EVENT_DRAGON_SHRINE_QUESTION_4
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
 	writetext DragonShrineQuestion4Text
 	buttonsound
-	loadmenudata DragonShrineQuestion4_MenuDataHeader
+	loadmenu DragonShrineQuestion4_MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .RightAnswer
-	if_equal 2, .WrongAnswer
-	if_equal 3, .RightAnswer
+	ifequal 1, .RightAnswer
+	ifequal 2, .WrongAnswer
+	ifequal 3, .RightAnswer
 .Question5:
-	setevent EVENT_DRAGON_SHRINE_QUESTION_5
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
 	writetext DragonShrineQuestion5Text
 	buttonsound
-	loadmenudata DragonShrineQuestion5_MenuDataHeader
+	loadmenu DragonShrineQuestion5_MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .WrongAnswer
-	if_equal 2, .RightAnswer
-	if_equal 3, .WrongAnswer
+	ifequal 1, .WrongAnswer
+	ifequal 2, .RightAnswer
+	ifequal 3, .WrongAnswer
 .RightAnswer:
-	checkevent EVENT_DRAGON_SHRINE_QUESTION_5
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
 	iftrue .PassedTheTest
 	writetext DragonShrineRightAnswerText
 	buttonsound
-	checkevent EVENT_DRAGON_SHRINE_QUESTION_4
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
 	iftrue .Question5
-	checkevent EVENT_DRAGON_SHRINE_QUESTION_3
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
 	iftrue .Question4
-	checkevent EVENT_DRAGON_SHRINE_QUESTION_2
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	iftrue .Question3
-	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue .Question2
 .WrongAnswer:
 	closetext
-	spriteface DRAGONSHRINE_ELDER1, LEFT
+	turnobject DRAGONSHRINE_ELDER1, LEFT
 	opentext
 	writetext DragonShrineWrongAnswerText1
 	waitbutton
 	closetext
-	spriteface DRAGONSHRINE_ELDER1, DOWN
+	turnobject DRAGONSHRINE_ELDER1, DOWN
 	opentext
 	writetext DragonShrineWrongAnswerText2
 	waitbutton
 	closetext
 	setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
 	opentext
-	checkevent EVENT_DRAGON_SHRINE_QUESTION_5
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
 	iftrue .Question5
-	checkevent EVENT_DRAGON_SHRINE_QUESTION_4
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
 	iftrue .Question4
-	checkevent EVENT_DRAGON_SHRINE_QUESTION_3
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
 	iftrue .Question3
-	checkevent EVENT_DRAGON_SHRINE_QUESTION_2
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	iftrue .Question2
-	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue .Question1
 .PassedTheTest:
 	writetext DragonShrinePassedTestText
@@ -124,17 +122,17 @@ DragonShrine_MapScripts:
 	playmusic MUSIC_CLAIR
 	appear DRAGONSHRINE_CLAIR
 	waitsfx
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	pause 30
 	applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkInMovement
-	spriteface DRAGONSHRINE_CLAIR, RIGHT
-	spriteface PLAYER, LEFT
-	spriteface DRAGONSHRINE_ELDER1, LEFT
+	turnobject DRAGONSHRINE_CLAIR, RIGHT
+	turnobject PLAYER, LEFT
+	turnobject DRAGONSHRINE_ELDER1, LEFT
 	opentext
 	writetext DragonShrineClairYouPassedText
 	waitbutton
 	closetext
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	applymovement DRAGONSHRINE_CLAIR, DragonShrineClairBigStepLeftMovement
 	opentext
 	writetext DragonShrineClairThatCantBeText
@@ -146,7 +144,7 @@ DragonShrine_MapScripts:
 	waitbutton
 	closetext
 	applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkToClairMovement
-	spriteface DRAGONSHRINE_CLAIR, UP
+	turnobject DRAGONSHRINE_CLAIR, UP
 	opentext
 	writetext DragonShrineMustIInformLanceText
 	waitbutton
@@ -156,7 +154,7 @@ DragonShrine_MapScripts:
 	writetext DragonShrineIUnderstandText
 	waitbutton
 	closetext
-	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e0
+	applymovement DRAGONSHRINE_CLAIR, DragonShrineClairTwoSlowStepsRightMovement
 	opentext
 	writetext DragonShrineHereRisingBadgeText
 	waitbutton
@@ -165,17 +163,17 @@ DragonShrine_MapScripts:
 	waitsfx
 	special RestartMapMusic
 	specialphonecall SPECIALCALL_MASTERBALL
-	setscene 1
-	setmapscene DRAGONS_DEN_B1F, 1
+	setscene SCENE_FINISHED
+	setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
 	writetext DragonShrinePlayerReceivedRisingBadgeText
 	buttonsound
 	writetext DragonShrineRisingBadgeExplanationText
 	waitbutton
 	closetext
-	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce
-	spriteface DRAGONSHRINE_CLAIR, UP
-	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1
-	spriteface PLAYER, UP
+	applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkAway1Movement
+	turnobject DRAGONSHRINE_CLAIR, UP
+	applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkAway2Movement
+	turnobject PLAYER, UP
 	opentext
 	writetext DragonShrineElderScoldsClairText
 	waitbutton
@@ -184,19 +182,19 @@ DragonShrine_MapScripts:
 	writetext DragonShrineSpeechlessText
 	waitbutton
 	closetext
-	applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e3
+	applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkOutMovement
 	playsound SFX_ENTER_DOOR
 	disappear DRAGONSHRINE_CLAIR
 	waitsfx
-	setevent EVENT_GAVE_KURT_APRICORNS
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	end
 
 DragonShrineElder1Script:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue .DontGiveDratiniYet
-	checkevent EVENT_JUST_RECEIVED_DRATINI
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7
 	iftrue .ReceivedDratini
 	checkevent EVENT_GOT_DRATINI
 	iffalse .GiveDratini
@@ -211,15 +209,15 @@ DragonShrineElder1Script:
 	writetext DragonShrineTakeThisDratiniText
 	waitbutton
 	checkcode VAR_PARTYCOUNT
-	if_equal 6, .PartyFull
+	ifequal PARTY_LENGTH, .PartyFull
 	writetext DragonShrinePlayerReceivedDratiniText
 	playsound SFX_CAUGHT_MON
 	waitsfx
 	givepoke DRATINI, 15
 	checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
-	special Special_Dratini
+	special GiveDratini
 	setevent EVENT_GOT_DRATINI
-	setevent EVENT_JUST_RECEIVED_DRATINI
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7
 	writetext DragonShrineSymbolicDragonText
 	waitbutton
 	closetext
@@ -265,65 +263,65 @@ DragonShrineElder3Script:
 	closetext
 	end
 
-DragonShrineQuestion1_MenuDataHeader:
+DragonShrineQuestion1_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 3 ; items
 	db "Pal@"
 	db "Underling@"
 	db "Friend@"
 
-DragonShrineQuestion2_MenuDataHeader:
+DragonShrineQuestion2_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 3 ; items
 	db "Strategy@"
 	db "Raising@"
 	db "Cheating@"
 
-DragonShrineQuestion3_MenuDataHeader:
+DragonShrineQuestion3_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 3 ; items
 	db "Weak person@"
 	db "Tough person@"
 	db "Anybody@"
 
-DragonShrineQuestion4_MenuDataHeader:
+DragonShrineQuestion4_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 3 ; items
 	db "Love@"
 	db "Violence@"
 	db "Knowledge@"
 
-DragonShrineQuestion5_MenuDataHeader:
+DragonShrineQuestion5_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
 	db 3 ; items
 	db "Tough@"
@@ -351,12 +349,12 @@ DragonShrineElderWalkToClairMovement:
 	turn_head DOWN
 	step_end
 
-MovementData_0x18d2ce:
+DragonShrineElderWalkAway1Movement:
 	slow_step RIGHT
 	slow_step RIGHT
 	step_end
 
-MovementData_0x18d2d1:
+DragonShrineElderWalkAway2Movement:
 	slow_step RIGHT
 	turn_head DOWN
 	step_end
@@ -379,12 +377,12 @@ DragonShrineClairSlowStepLeftMovement:
 	remove_fixed_facing
 	step_end
 
-MovementData_0x18d2e0:
+DragonShrineClairTwoSlowStepsRightMovement:
 	slow_step RIGHT
 	slow_step RIGHT
 	step_end
 
-MovementData_0x18d2e3:
+DragonShrineClairWalkOutMovement:
 	step DOWN
 	step DOWN
 	step DOWN
@@ -658,23 +656,18 @@ DragonShrineSpeechlessText:
 	done
 
 DragonShrine_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 9, 2, DRAGONS_DEN_B1F
-	warp_def 5, 9, 2, DRAGONS_DEN_B1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_GAVE_KURT_APRICORNS
-	object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_GAVE_KURT_APRICORNS
-	object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_GAVE_KURT_APRICORNS
-	object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4,  9, DRAGONS_DEN_B1F, 2
+	warp_event  5,  9, DRAGONS_DEN_B1F, 2
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  5,  1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  2,  4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  7,  4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  4,  8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR
diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm
index 0ff616c59..2fbc62dfe 100644
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -1,26 +1,19 @@
 DragonsDen1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 DragonsDen1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 3, 5, 8, BLACKTHORN_CITY
-	warp_def 3, 3, 4, DRAGONS_DEN_1F
-	warp_def 5, 15, 1, DRAGONS_DEN_B1F
-	warp_def 5, 13, 2, DRAGONS_DEN_1F
+	db 4 ; warp events
+	warp_event  3,  5, BLACKTHORN_CITY, 8
+	warp_event  3,  3, DRAGONS_DEN_1F, 4
+	warp_event  5, 15, DRAGONS_DEN_B1F, 1
+	warp_event  5, 13, DRAGONS_DEN_1F, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 172619fb6..918e82904 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const DRAGONSDENB1F_POKE_BALL1
 	const DRAGONSDENB1F_CLAIR
 	const DRAGONSDENB1F_SILVER
@@ -10,13 +10,11 @@ const_value set 2
 	const DRAGONSDENB1F_POKE_BALL3
 
 DragonsDenB1F_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_NOTHING
+	scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckSilver
 
 .DummyScene0:
@@ -33,8 +31,8 @@ DragonsDenB1F_MapScripts:
 
 .CheckDay:
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .AppearSilver
-	if_equal THURSDAY, .AppearSilver
+	ifequal TUESDAY, .AppearSilver
+	ifequal THURSDAY, .AppearSilver
 	disappear DRAGONSDENB1F_SILVER
 	return
 
@@ -49,7 +47,7 @@ DragonsDenB1F_ClairScene:
 	pause 30
 	closetext
 	showemote EMOTE_SHOCK, PLAYER, 15
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	playmusic MUSIC_CLAIR
 	applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksToYou
 	opentext
@@ -76,18 +74,18 @@ DragonsDenB1F_ClairScene:
 	closetext
 .FinishClair:
 	applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksAway
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 30
 	special RestartMapMusic
 	disappear DRAGONSDENB1F_CLAIR
-	setscene 0
+	setscene SCENE_DRAGONSDENB1F_NOTHING
 	end
 
 TrainerCooltrainermDarin:
-	trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script
+	trainer COOLTRAINERM, DARIN, EVENT_BEAT_COOLTRAINERM_DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermDarinAfterBattleText
 	waitbutton
@@ -95,10 +93,10 @@ TrainerCooltrainermDarin:
 	end
 
 TrainerCooltrainerfCara:
-	trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script
+	trainer COOLTRAINERF, CARA, EVENT_BEAT_COOLTRAINERF_CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfCaraAfterBattleText
 	waitbutton
@@ -106,10 +104,10 @@ TrainerCooltrainerfCara:
 	end
 
 TrainerTwinsLeaandpia1:
-	trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script
+	trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsLeaandpia1AfterBattleText
 	waitbutton
@@ -117,20 +115,19 @@ TrainerTwinsLeaandpia1:
 	end
 
 TrainerTwinsLeaandpia2:
-	trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script
+	trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsLeaandpia2AfterBattleText
 	waitbutton
 	closetext
 	end
 
-PokeBallScript_0x18c95a:
-; This whole script is written out rather than as an
-; item fragment because it's left over from the GS
-; event.
+DragonsDenB1FDragonFangScript:
+; This whole script is written out rather than as an itemball
+; because it's left over from the GS event.
 	giveitem DRAGON_FANG
 	iffalse .BagFull
 	disappear DRAGONSDENB1F_POKE_BALL1
@@ -153,16 +150,16 @@ PokeBallScript_0x18c95a:
 	closetext
 	end
 
-SilverScript_0x18c97e:
+DragonsDenB1FSilverScript:
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue .SilverTalkAgain
 	writetext SilverText_Training1
 	waitbutton
 	closetext
-	setevent EVENT_GAVE_KURT_APRICORNS
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	special RestartMapMusic
 	end
 
@@ -173,7 +170,7 @@ SilverScript_0x18c97e:
 	special RestartMapMusic
 	end
 
-MapDragonsDenB1FSignpost0Script:
+DragonShrineSignpost:
 	jumptext DragonShrineSignpostText
 
 DragonsDenB1FCalcium:
@@ -183,13 +180,13 @@ DragonsDenB1FMaxElixer:
 	itemball MAX_ELIXER
 
 DragonsDenB1FHiddenRevive:
-	hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE
+	hiddenitem REVIVE, EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE
 
 DragonsDenB1FHiddenMaxPotion:
-	hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION
 
 DragonsDenB1FHiddenMaxElixer:
-	hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER
+	hiddenitem MAX_ELIXER, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER
 
 MovementDragonsDen_ClairWalksToYou:
 	slow_step RIGHT
@@ -407,33 +404,28 @@ Text_NoRoomForDragonFang:
 	done
 
 DragonsDenB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 20, 3, 3, DRAGONS_DEN_1F
-	warp_def 19, 29, 1, DRAGON_SHRINE
+	db 2 ; warp events
+	warp_event 20,  3, DRAGONS_DEN_1F, 3
+	warp_event 19, 29, DRAGON_SHRINE, 1
 
-.CoordEvents:
-	db 1
-	coord_event 19, 30, 1, DragonsDenB1F_ClairScene
+	db 1 ; coord events
+	coord_event 19, 30, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM, DragonsDenB1F_ClairScene
 
-.BGEvents:
-	db 4
-	bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script
+	db 4 ; bg events
+	bg_event 18, 24, BGEVENT_READ, DragonShrineSignpost
 	bg_event 33, 29, BGEVENT_ITEM, DragonsDenB1FHiddenRevive
 	bg_event 21, 17, BGEVENT_ITEM, DragonsDenB1FHiddenMaxPotion
 	bg_event 31, 15, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer
 
-.ObjectEvents:
-	db 9
-	object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
+	db 9 ; object events
+	object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FDragonFangScript, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
 	object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
-	object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN
-	object_event 20, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1
-	object_event 8, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1
-	object_event 4, 17, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1
-	object_event 4, 18, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1
-	object_event 30, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM
-	object_event 5, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
+	object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FSilverScript, EVENT_RIVAL_DRAGONS_DEN
+	object_event 20,  8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1
+	object_event  8,  8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1
+	object_event  4, 17, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1
+	object_event  4, 18, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1
+	object_event 30,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM
+	object_event  5, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 1936858dd..982369994 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const EARLSPOKEMONACADEMY_EARL
 	const EARLSPOKEMONACADEMY_YOUNGSTER1
 	const EARLSPOKEMONACADEMY_GAMEBOY_KID1
@@ -7,14 +7,12 @@ const_value set 2
 	const EARLSPOKEMONACADEMY_POKEDEX
 
 EarlsPokemonAcademy_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 AcademyEarl:
-	applymovement EARLSPOKEMONACADEMY_EARL, MovementData_0x68b2d
+	applymovement EARLSPOKEMONACADEMY_EARL, AcademyEarlSpinMovement
 	faceplayer
 	opentext
 	writetext UnknownText_0x68b3b
@@ -47,7 +45,7 @@ EarlsPokemonAcademyGameboyKid1Script:
 	writetext EarlsPokemonAcademyGameboyKid1Text
 	waitbutton
 	closetext
-	spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
+	turnobject EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
 	end
 
 EarlsPokemonAcademyGameboyKid2Script:
@@ -56,7 +54,7 @@ EarlsPokemonAcademyGameboyKid2Script:
 	writetext EarlsPokemonAcademyGameboyKid2Text
 	waitbutton
 	closetext
-	spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
+	turnobject EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
 	end
 
 EarlsPokemonAcademyYoungster2Script:
@@ -66,14 +64,14 @@ AcademyBlackboard:
 	opentext
 	writetext AcademyBlackboardText
 .Loop:
-	loadmenudata .BlackboardMenuData
+	loadmenu .BlackboardMenuHeader
 	_2dmenu
 	closewindow
-	if_equal 1, .Poison
-	if_equal 2, .Paralysis
-	if_equal 3, .Sleep
-	if_equal 4, .Burn
-	if_equal 5, .Freeze
+	ifequal 1, .Poison
+	ifequal 2, .Paralysis
+	ifequal 3, .Sleep
+	ifequal 4, .Burn
+	ifequal 5, .Freeze
 	closetext
 	end
 
@@ -102,13 +100,13 @@ AcademyBlackboard:
 	waitbutton
 	jump .Loop
 
-.BlackboardMenuData:
+.BlackboardMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 11, 8
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	dn 3, 2 ; rows, columns
 	db 5 ; spacing
@@ -147,7 +145,7 @@ AcademyStickerMachine:
 AcademyBookshelf:
 	jumpstd difficultbookshelf
 
-MovementData_0x68b2d:
+AcademyEarlSpinMovement:
 	turn_head DOWN
 	turn_head LEFT
 	turn_head UP
@@ -412,29 +410,24 @@ AcademyStickerMachineText:
 	done
 
 EarlsPokemonAcademy_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 3, 15, 3, VIOLET_CITY
-	warp_def 4, 15, 3, VIOLET_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 4
-	bg_event 0, 1, BGEVENT_READ, AcademyBookshelf
-	bg_event 1, 1, BGEVENT_READ, AcademyBookshelf
-	bg_event 3, 0, BGEVENT_READ, AcademyBlackboard
-	bg_event 4, 0, BGEVENT_READ, AcademyBlackboard
-
-.ObjectEvents:
-	db 6
-	object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
-	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1
-	object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1
-	object_event 4, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1
-	object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1
-	object_event 2, 4, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  3, 15, VIOLET_CITY, 3
+	warp_event  4, 15, VIOLET_CITY, 3
+
+	db 0 ; coord events
+
+	db 4 ; bg events
+	bg_event  0,  1, BGEVENT_READ, AcademyBookshelf
+	bg_event  1,  1, BGEVENT_READ, AcademyBookshelf
+	bg_event  3,  0, BGEVENT_READ, AcademyBlackboard
+	bg_event  4,  0, BGEVENT_READ, AcademyBlackboard
+
+	db 6 ; object events
+	object_event  4,  2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1
+	object_event  3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1
+	object_event  4, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1
+	object_event  4,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1
+	object_event  2,  4, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index 5e3dada98..fdc2bba86 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ECRUTEAKCITY_GRAMPS1
 	const ECRUTEAKCITY_GRAMPS2
 	const ECRUTEAKCITY_LASS1
@@ -8,11 +8,9 @@ const_value set 2
 	const ECRUTEAKCITY_GRAMPS3
 
 EcruteakCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -28,37 +26,37 @@ EcruteakCityGramps2Script:
 EcruteakCityGramps3Script:
 	jumptextfaceplayer EcruteakCityGramps3Text
 
-EcruteakCityLassScript:
-	jumptextfaceplayer EcruteakCityLassText
+EcruteakCityLass1Script:
+	jumptextfaceplayer EcruteakCityLass1Text
 
-LassScript_0x1a4015:
+EcruteakCityLass2Script:
 	faceplayer
 	opentext
 	checkevent EVENT_RELEASED_THE_BEASTS
-	iftrue UnknownScript_0x1a4023
-	writetext UnknownText_0x1a421a
+	iftrue .ReleasedBeasts
+	writetext EcruteakCityLass2Text
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x1a4023:
-	writetext UnknownText_0x1a4269
+.ReleasedBeasts:
+	writetext EcruteakCityLass2Text_ReleasedBeasts
 	waitbutton
 	closetext
 	end
 
-FisherScript_0x1a4029:
+EcruteakCityFisherScript:
 	faceplayer
 	opentext
 	checkevent EVENT_JASMINE_RETURNED_TO_GYM
-	iftrue UnknownScript_0x1a4037
-	writetext UnknownText_0x1a42ac
+	iftrue .JasmineReturned
+	writetext EcruteakCityFisherText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x1a4037:
-	writetext UnknownText_0x1a4325
+.JasmineReturned:
+	writetext EcruteakCityFisherText_JasmineReturned
 	waitbutton
 	closetext
 	end
@@ -88,10 +86,10 @@ EcruteakCityMartSign:
 	jumpstd martsign
 
 EcruteakCityHiddenHyperPotion:
-	hiddenitem EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION
+	hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION
 
 UnusedMissingDaughterText:
-; This text is neither used nor referenced in the final game.
+; unused
 	text "Oh, no. Oh, no…"
 
 	para "My daughter is"
@@ -134,7 +132,7 @@ EcruteakCityGramps2Text:
 	cont "nice, I hear."
 	done
 
-EcruteakCityLassText:
+EcruteakCityLass1Text:
 	text "I'm going to prac-"
 	line "tice at the DANCE"
 
@@ -142,7 +140,7 @@ EcruteakCityLassText:
 	line "join me?"
 	done
 
-UnknownText_0x1a421a:
+EcruteakCityLass2Text:
 	text "The tower that"
 	line "used to be here…"
 
@@ -151,14 +149,14 @@ UnknownText_0x1a421a:
 	cont "taller."
 	done
 
-UnknownText_0x1a4269:
+EcruteakCityLass2Text_ReleasedBeasts:
 	text "Three big #MON"
 	line "ran off in differ-"
 	cont "ent directions."
 	cont "What were they?"
 	done
 
-UnknownText_0x1a42ac:
+EcruteakCityFisherText:
 	text "I heard a rumor"
 	line "about OLIVINE"
 	cont "LIGHTHOUSE."
@@ -171,7 +169,7 @@ UnknownText_0x1a42ac:
 	cont "are in trouble."
 	done
 
-UnknownText_0x1a4325:
+EcruteakCityFisherText_JasmineReturned:
 	text "The #MON at"
 	line "OLIVINE LIGHTHOUSE"
 	cont "has been cured."
@@ -260,47 +258,42 @@ BurnedTowerSignText:
 	done
 
 EcruteakCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 15
-	warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE
-	warp_def 35, 27, 2, ROUTE_42_ECRUTEAK_GATE
-	warp_def 18, 11, 1, ECRUTEAK_HOUSE
-	warp_def 20, 2, 1, WISE_TRIOS_ROOM
-	warp_def 20, 3, 2, WISE_TRIOS_ROOM
-	warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F
-	warp_def 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE
-	warp_def 23, 21, 1, DANCE_THEATRE
-	warp_def 29, 21, 2, ECRUTEAK_MART
-	warp_def 6, 27, 1, ECRUTEAK_GYM
-	warp_def 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE
-	warp_def 37, 7, 1, TIN_TOWER_1F
-	warp_def 5, 5, 1, BURNED_TOWER_1F
-	warp_def 0, 18, 3, ROUTE_38_ECRUTEAK_GATE
-	warp_def 0, 19, 4, ROUTE_38_ECRUTEAK_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 8
+	db 0, 0 ; filler
+
+	db 15 ; warp events
+	warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1
+	warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2
+	warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1
+	warp_event 20,  2, WISE_TRIOS_ROOM, 1
+	warp_event 20,  3, WISE_TRIOS_ROOM, 2
+	warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1
+	warp_event  5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1
+	warp_event 23, 21, DANCE_THEATRE, 1
+	warp_event 29, 21, ECRUTEAK_MART, 2
+	warp_event  6, 27, ECRUTEAK_GYM, 1
+	warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1
+	warp_event 37,  7, TIN_TOWER_1F, 1
+	warp_event  5,  5, BURNED_TOWER_1F, 1
+	warp_event  0, 18, ROUTE_38_ECRUTEAK_GATE, 3
+	warp_event  0, 19, ROUTE_38_ECRUTEAK_GATE, 4
+
+	db 0 ; coord events
+
+	db 8 ; bg events
 	bg_event 15, 21, BGEVENT_READ, EcruteakCitySign
 	bg_event 38, 10, BGEVENT_READ, TinTowerSign
-	bg_event 8, 28, BGEVENT_READ, EcruteakGymSign
+	bg_event  8, 28, BGEVENT_READ, EcruteakGymSign
 	bg_event 21, 21, BGEVENT_READ, EcruteakDanceTheaterSign
-	bg_event 2, 10, BGEVENT_READ, BurnedTowerSign
+	bg_event  2, 10, BGEVENT_READ, BurnedTowerSign
 	bg_event 24, 27, BGEVENT_READ, EcruteakCityPokecenterSign
 	bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign
 	bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1
 	object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1
-	object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1
-	object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1
-	object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1
+	object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLass1Script, -1
+	object_event  3,  9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityLass2Script, -1
+	object_event  9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityFisherScript, -1
 	object_event 10, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1
-	object_event 3, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS
+	object_event  3,  7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 70776d1ee..4dd709ec5 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ECRUTEAKGYM_MORTY
 	const ECRUTEAKGYM_SAGE1
 	const ECRUTEAKGYM_SAGE2
@@ -8,13 +8,11 @@ const_value set 2
 	const ECRUTEAKGYM_GRAMPS
 
 EcruteakGym_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .ForcedToLeave
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .ForcedToLeave ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .ForcedToLeave:
 	priorityjump EcruteakGymClosed
@@ -23,7 +21,7 @@ EcruteakGym_MapScripts:
 .DummyScene:
 	end
 
-MortyScript_0x99d58:
+EcruteakGymMortyScript:
 	faceplayer
 	opentext
 	checkevent EVENT_BEAT_MORTY
@@ -43,7 +41,7 @@ MortyScript_0x99d58:
 	setflag ENGINE_FOGBADGE
 	checkcode VAR_BADGES
 	scall EcruteakGymActivateRockets
-	setmapscene ECRUTEAK_HOUSE, 1
+	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_FINISHED
 	setevent EVENT_RANG_CLEAR_BELL_1
 	setevent EVENT_RANG_CLEAR_BELL_2
 .FightDone:
@@ -71,8 +69,8 @@ MortyScript_0x99d58:
 	end
 
 EcruteakGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -82,26 +80,26 @@ EcruteakGymActivateRockets:
 	jumpstd radiotowerrockets
 
 EcruteakGymClosed:
-	applymovement PLAYER, MovementData_0x99e5d
-	applymovement ECRUTEAKGYM_GRAMPS, MovementData_0x99e63
+	applymovement PLAYER, EcruteakGymPlayerStepUpMovement
+	applymovement ECRUTEAKGYM_GRAMPS, EcruteakGymGrampsSlowStepDownMovement
 	opentext
 	writetext UnknownText_0x9a49c
 	waitbutton
 	closetext
 	follow PLAYER, ECRUTEAKGYM_GRAMPS
-	applymovement PLAYER, MovementData_0x99e5f
+	applymovement PLAYER, EcruteakGymPlayerSlowStepDownMovement
 	stopfollow
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	playsound SFX_ENTER_DOOR
 	waitsfx
 	warp ECRUTEAK_CITY, 6, 27
 	end
 
 TrainerSageJeffrey:
-	trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script
+	trainer SAGE, JEFFREY, EVENT_BEAT_SAGE_JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageJeffreyAfterBattleText
 	waitbutton
@@ -109,10 +107,10 @@ TrainerSageJeffrey:
 	end
 
 TrainerSagePing:
-	trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, .Script
+	trainer SAGE, PING, EVENT_BEAT_SAGE_PING, SagePingSeenText, SagePingBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SagePingAfterBattleText
 	waitbutton
@@ -120,10 +118,10 @@ TrainerSagePing:
 	end
 
 TrainerMediumMartha:
-	trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script
+	trainer MEDIUM, MARTHA, EVENT_BEAT_MEDIUM_MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext MediumMarthaAfterBattleText
 	waitbutton
@@ -131,10 +129,10 @@ TrainerMediumMartha:
 	end
 
 TrainerMediumGrace:
-	trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script
+	trainer MEDIUM, GRACE, EVENT_BEAT_MEDIUM_GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext MediumGraceAfterBattleText
 	waitbutton
@@ -165,17 +163,17 @@ EcruteakGymStatue:
 	trainertotext MORTY, MORTY1, MEM_BUFFER_1
 	jumpstd gymstatue2
 
-MovementData_0x99e5d:
+EcruteakGymPlayerStepUpMovement:
 	step UP
 	step_end
 
-MovementData_0x99e5f:
+EcruteakGymPlayerSlowStepDownMovement:
 	fix_facing
 	slow_step DOWN
 	remove_fixed_facing
 	step_end
 
-MovementData_0x99e63:
+EcruteakGymGrampsSlowStepDownMovement:
 	slow_step DOWN
 	step_end
 
@@ -387,59 +385,54 @@ UnknownText_0x9a49c:
 	done
 
 EcruteakGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 33
-	warp_def 4, 17, 10, ECRUTEAK_CITY
-	warp_def 5, 17, 10, ECRUTEAK_CITY
-	warp_def 4, 14, 4, ECRUTEAK_GYM
-	warp_def 2, 4, 3, ECRUTEAK_GYM
-	warp_def 3, 4, 3, ECRUTEAK_GYM
-	warp_def 4, 4, 3, ECRUTEAK_GYM
-	warp_def 4, 5, 3, ECRUTEAK_GYM
-	warp_def 6, 7, 3, ECRUTEAK_GYM
-	warp_def 7, 4, 3, ECRUTEAK_GYM
-	warp_def 2, 6, 3, ECRUTEAK_GYM
-	warp_def 3, 6, 3, ECRUTEAK_GYM
-	warp_def 4, 6, 3, ECRUTEAK_GYM
-	warp_def 5, 6, 3, ECRUTEAK_GYM
-	warp_def 7, 6, 3, ECRUTEAK_GYM
-	warp_def 7, 7, 3, ECRUTEAK_GYM
-	warp_def 4, 8, 3, ECRUTEAK_GYM
-	warp_def 5, 8, 3, ECRUTEAK_GYM
-	warp_def 6, 8, 3, ECRUTEAK_GYM
-	warp_def 7, 8, 3, ECRUTEAK_GYM
-	warp_def 2, 8, 3, ECRUTEAK_GYM
-	warp_def 2, 9, 3, ECRUTEAK_GYM
-	warp_def 2, 10, 3, ECRUTEAK_GYM
-	warp_def 2, 11, 3, ECRUTEAK_GYM
-	warp_def 4, 10, 3, ECRUTEAK_GYM
-	warp_def 5, 10, 3, ECRUTEAK_GYM
-	warp_def 2, 12, 3, ECRUTEAK_GYM
-	warp_def 3, 12, 3, ECRUTEAK_GYM
-	warp_def 4, 12, 3, ECRUTEAK_GYM
-	warp_def 5, 12, 3, ECRUTEAK_GYM
-	warp_def 7, 10, 3, ECRUTEAK_GYM
-	warp_def 7, 11, 3, ECRUTEAK_GYM
-	warp_def 7, 12, 3, ECRUTEAK_GYM
-	warp_def 7, 13, 3, ECRUTEAK_GYM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue
-	bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue
-
-.ObjectEvents:
-	db 7
-	object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1
-	object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
-	object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
-	object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
-	object_event 7, 9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1
-	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1
-	object_event 4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
+	db 0, 0 ; filler
+
+	db 33 ; warp events
+	warp_event  4, 17, ECRUTEAK_CITY, 10
+	warp_event  5, 17, ECRUTEAK_CITY, 10
+	warp_event  4, 14, ECRUTEAK_GYM, 4
+	warp_event  2,  4, ECRUTEAK_GYM, 3
+	warp_event  3,  4, ECRUTEAK_GYM, 3
+	warp_event  4,  4, ECRUTEAK_GYM, 3
+	warp_event  4,  5, ECRUTEAK_GYM, 3
+	warp_event  6,  7, ECRUTEAK_GYM, 3
+	warp_event  7,  4, ECRUTEAK_GYM, 3
+	warp_event  2,  6, ECRUTEAK_GYM, 3
+	warp_event  3,  6, ECRUTEAK_GYM, 3
+	warp_event  4,  6, ECRUTEAK_GYM, 3
+	warp_event  5,  6, ECRUTEAK_GYM, 3
+	warp_event  7,  6, ECRUTEAK_GYM, 3
+	warp_event  7,  7, ECRUTEAK_GYM, 3
+	warp_event  4,  8, ECRUTEAK_GYM, 3
+	warp_event  5,  8, ECRUTEAK_GYM, 3
+	warp_event  6,  8, ECRUTEAK_GYM, 3
+	warp_event  7,  8, ECRUTEAK_GYM, 3
+	warp_event  2,  8, ECRUTEAK_GYM, 3
+	warp_event  2,  9, ECRUTEAK_GYM, 3
+	warp_event  2, 10, ECRUTEAK_GYM, 3
+	warp_event  2, 11, ECRUTEAK_GYM, 3
+	warp_event  4, 10, ECRUTEAK_GYM, 3
+	warp_event  5, 10, ECRUTEAK_GYM, 3
+	warp_event  2, 12, ECRUTEAK_GYM, 3
+	warp_event  3, 12, ECRUTEAK_GYM, 3
+	warp_event  4, 12, ECRUTEAK_GYM, 3
+	warp_event  5, 12, ECRUTEAK_GYM, 3
+	warp_event  7, 10, ECRUTEAK_GYM, 3
+	warp_event  7, 11, ECRUTEAK_GYM, 3
+	warp_event  7, 12, ECRUTEAK_GYM, 3
+	warp_event  7, 13, ECRUTEAK_GYM, 3
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3, 15, BGEVENT_READ, EcruteakGymStatue
+	bg_event  6, 15, BGEVENT_READ, EcruteakGymStatue
+
+	db 7 ; object events
+	object_event  5,  1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, EcruteakGymMortyScript, -1
+	object_event  2,  7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1
+	object_event  3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
+	object_event  7,  5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
+	object_event  7,  9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1
+	object_event  7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1
+	object_event  4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS
diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm
deleted file mode 100644
index 436bdd0e3..000000000
--- a/maps/EcruteakHouse.asm
+++ /dev/null
@@ -1,305 +0,0 @@
-const_value set 2
-	const ECRUTEAKHOUSE_SAGE1
-	const ECRUTEAKHOUSE_SAGE2
-	const ECRUTEAKHOUSE_SAGE3
-	const ECRUTEAKHOUSE_GRAMPS
-
-EcruteakHouse_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-
-.MapCallbacks:
-	db 1
-	callback MAPCALLBACK_OBJECTS, .InitializeSages
-
-.DummyScene0:
-	end
-
-.DummyScene1:
-	end
-
-.InitializeSages:
-	checkevent EVENT_FOUGHT_SUICUNE
-	iftrue .DontBlockTower
-	checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
-	iftrue .DontBlockTower
-	checkevent EVENT_CLEARED_RADIO_TOWER
-	iftrue .BlockTower
-	return
-
-.BlockTower:
-	clearevent EVENT_RANG_CLEAR_BELL_1
-	setevent EVENT_RANG_CLEAR_BELL_2
-	setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
-	checkitem CLEAR_BELL
-	iftrue .NoClearBell
-	setscene 0
-.NoClearBell:
-	return
-
-.DontBlockTower:
-	clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
-	return
-
-EcruteakHouse_CoordEvent1:
-	checkevent EVENT_RANG_CLEAR_BELL_2
-	iftrue EcruteakHouse_CoordEvent_DontMove
-	applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7
-	moveobject ECRUTEAKHOUSE_SAGE1, 4, 6
-	appear ECRUTEAKHOUSE_SAGE1
-	pause 5
-	disappear ECRUTEAKHOUSE_SAGE2
-	end
-
-EcruteakHouse_CoordEvent2:
-	checkevent EVENT_RANG_CLEAR_BELL_1
-	iftrue EcruteakHouse_CoordEvent_DontMove
-	applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc
-	moveobject ECRUTEAKHOUSE_SAGE2, 5, 6
-	appear ECRUTEAKHOUSE_SAGE2
-	pause 5
-	disappear ECRUTEAKHOUSE_SAGE1
-	end
-
-EcruteakHouse_CoordEvent_DontMove:
-	end
-
-SageScript_0x98062:
-	faceplayer
-	opentext
-	checkevent EVENT_CLEARED_RADIO_TOWER
-	iftrue .CheckForClearBell
-	checkflag ENGINE_FOGBADGE
-	iftrue .BlockPassage_GotFogBadge
-	writetext UnknownText_0x980d1
-	waitbutton
-	closetext
-	end
-
-.BlockPassage_GotFogBadge:
-	writetext UnknownText_0x98131
-	waitbutton
-	closetext
-	end
-
-.CheckForClearBell:
-	checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
-	iftrue .AllowedThrough
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iftrue .Event000
-	checkitem CLEAR_BELL
-	iftrue .RingClearBell
-	writetext UnknownText_0x981a4
-	waitbutton
-	closetext
-	end
-
-.RingClearBell:
-	writetext UnknownText_0x98250
-	waitbutton
-	closetext
-	setscene 1
-	setevent EVENT_RANG_CLEAR_BELL_2
-	clearevent EVENT_RANG_CLEAR_BELL_1
-	setevent EVENT_GAVE_KURT_APRICORNS
-	end
-
-.AllowedThrough:
-	writetext UnknownText_0x9837e
-	waitbutton
-	closetext
-	end
-
-.Event000:
-	writetext UnknownText_0x98391
-	waitbutton
-	closetext
-	end
-
-SageScript_0x980b0:
-	faceplayer
-	opentext
-	checkevent EVENT_GOT_CLEAR_BELL
-	iftrue .GotClearBell
-	writetext UnknownText_0x9840b
-	waitbutton
-	closetext
-	end
-
-.GotClearBell:
-	writetext UnknownText_0x9846f
-	waitbutton
-	closetext
-	end
-
-EcruteakHouseGrampsScript:
-	jumptextfaceplayer EcruteakHouseGrampsText
-
-MovementData_0x980c7:
-	fix_facing
-	big_step LEFT
-	remove_fixed_facing
-	turn_head DOWN
-	step_end
-
-MovementData_0x980cc:
-	fix_facing
-	big_step RIGHT
-	remove_fixed_facing
-	turn_head DOWN
-	step_end
-
-UnknownText_0x980d1:
-	text "TIN TOWER is off"
-	line "limits to anyone"
-
-	para "without ECRUTEAK"
-	line "GYM's BADGE."
-
-	para "Sorry, but you'll"
-	line "have to leave."
-	done
-
-UnknownText_0x98131:
-	text "TIN TOWER is off"
-	line "limits to anyone"
-
-	para "without ECRUTEAK"
-	line "GYM's BADGE."
-
-	para "Ah!"
-
-	para "ECRUTEAK's GYM"
-	line "BADGE! Please, go"
-	cont "right through."
-	done
-
-UnknownText_0x981a4:
-	text "A momentous event"
-	line "has occurred."
-
-	para "I beg your pardon,"
-	line "but I must ask you"
-	cont "to leave."
-
-	para "…What soothes the"
-	line "soul…"
-
-	para "The WISE TRIO say"
-	line "things that are so"
-
-	para "very difficult to"
-	line "understand…"
-	done
-
-UnknownText_0x98250:
-	text "A momentous event"
-	line "has occurred."
-
-	para "I beg your pardon,"
-	line "but I must ask you"
-	cont "to leave."
-
-	para "<……><……><……>"
-
-	para "Ah!"
-
-	para "The sound of that"
-	line "CLEAR BELL!"
-
-	para "It… It's sublime!"
-
-	para "I've never heard"
-	line "so beautiful a"
-	cont "sound before!"
-
-	para "That bell's chime"
-	line "is indicative of"
-	cont "the bearer's soul."
-
-	para "You…"
-
-	para "You may be able to"
-	line "make it through"
-	cont "TIN TOWER."
-
-	para "Please, do go on."
-	done
-
-UnknownText_0x9837e:
-	text "Please, do go on."
-	done
-
-UnknownText_0x98391:
-	text "That bell's chime"
-	line "is indicative of"
-	cont "the bearer's soul."
-
-	para "You…"
-
-	para "You may be able to"
-	line "make it through"
-	cont "TIN TOWER."
-
-	para "Please, do go on."
-	done
-
-UnknownText_0x9840b:
-	text "The TIN TOWER"
-	line "ahead is a nine-"
-
-	para "tier tower of"
-	line "divine beauty."
-
-	para "It soothes the"
-	line "soul of all who"
-	cont "see it."
-	done
-
-UnknownText_0x9846f:
-	text "The TIN TOWER"
-	line "shook! A #MON"
-
-	para "must have returned"
-	line "to the top!"
-	done
-
-EcruteakHouseGrampsText:
-	text "Two towers…"
-	line "Two #MON…"
-
-	para "But when one"
-	line "burned down, both"
-
-	para "#MON flew away,"
-	line "never to return."
-	done
-
-EcruteakHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 4, 17, 3, ECRUTEAK_CITY
-	warp_def 5, 17, 3, ECRUTEAK_CITY
-	warp_def 5, 3, 4, ECRUTEAK_HOUSE
-	warp_def 17, 15, 3, ECRUTEAK_HOUSE
-	warp_def 17, 3, 3, WISE_TRIOS_ROOM
-
-.CoordEvents:
-	db 2
-	coord_event 4, 7, 0, EcruteakHouse_CoordEvent1
-	coord_event 5, 7, 0, EcruteakHouse_CoordEvent2
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1
-	object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2
-	object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
-	object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm
index 0d956a181..0ae99bd65 100644
--- a/maps/EcruteakItemfinderHouse.asm
+++ b/maps/EcruteakItemfinderHouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M
 	const ECRUTEAKITEMFINDERHOUSE_POKEDEX
 
 EcruteakItemfinderHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 EcruteakItemfinderGuy:
 	faceplayer
@@ -163,22 +161,17 @@ EcruteakThreeMonText:
 	done
 
 EcruteakItemfinderHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 3, 7, 11, ECRUTEAK_CITY
-	warp_def 4, 7, 11, ECRUTEAK_CITY
+	db 2 ; warp events
+	warp_event  3,  7, ECRUTEAK_CITY, 11
+	warp_event  4,  7, ECRUTEAK_CITY, 11
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio
+	db 1 ; bg events
+	bg_event  2,  1, BGEVENT_READ, ItemFinderHouseRadio
 
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1
-	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1
+	db 2 ; object events
+	object_event  2,  3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1
+	object_event  3,  3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1
diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm
index 4b39f93eb..8b02bd15c 100644
--- a/maps/EcruteakLugiaSpeechHouse.asm
+++ b/maps/EcruteakLugiaSpeechHouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS
 	const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER
 
 EcruteakLugiaSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 EcruteakLugiaSpeechHouseGrampsScript:
 	jumptextfaceplayer EcruteakLugiaSpeechHouseGrampsText
@@ -45,22 +43,17 @@ EcruteakLugiaSpeechHouseYoungsterText:
 	done
 
 EcruteakLugiaSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 3, 7, 7, ECRUTEAK_CITY
-	warp_def 4, 7, 7, ECRUTEAK_CITY
+	db 2 ; warp events
+	warp_event  3,  7, ECRUTEAK_CITY, 7
+	warp_event  4,  7, ECRUTEAK_CITY, 7
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio
+	db 1 ; bg events
+	bg_event  2,  1, BGEVENT_READ, LugiaSpeechHouseRadio
 
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1
-	object_event 5, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1
+	db 2 ; object events
+	object_event  2,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1
+	object_event  5,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1
diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm
index c69de9a7d..13259932a 100644
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ECRUTEAKMART_CLERK
 	const ECRUTEAKMART_SUPER_NERD
 	const ECRUTEAKMART_GRANNY
 
 EcruteakMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x99c3b:
+EcruteakMartClerkScript:
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_ECRUTEAK
 	closetext
@@ -46,22 +44,17 @@ EcruteakMartGrannyText:
 	done
 
 EcruteakMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 9, ECRUTEAK_CITY
-	warp_def 3, 7, 9, ECRUTEAK_CITY
+	db 2 ; warp events
+	warp_event  2,  7, ECRUTEAK_CITY, 9
+	warp_event  3,  7, ECRUTEAK_CITY, 9
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1
-	object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1
-	object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartClerkScript, -1
+	object_event  5,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1
+	object_event  6,  6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index 409181ddc..eceb7a5ef 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ECRUTEAKPOKECENTER1F_NURSE
 	const ECRUTEAKPOKECENTER1F_POKEFAN_M
 	const ECRUTEAKPOKECENTER1F_COOLTRAINER_F
@@ -6,13 +6,11 @@ const_value set 2
 	const ECRUTEAKPOKECENTER1F_BILL
 
 EcruteakPokecenter1F_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .MeetBill
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .MeetBill ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .MeetBill:
 	priorityjump .BillActivatesTimeCapsule
@@ -28,15 +26,15 @@ EcruteakPokecenter1F_MapScripts:
 	waitsfx
 	applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement1
 	applymovement PLAYER, EcruteakPokecenter1FPlayerMovement1
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, UP
+	turnobject ECRUTEAKPOKECENTER1F_NURSE, UP
 	pause 10
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN
+	turnobject ECRUTEAKPOKECENTER1F_NURSE, DOWN
 	pause 30
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, UP
+	turnobject ECRUTEAKPOKECENTER1F_NURSE, UP
 	pause 10
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN
+	turnobject ECRUTEAKPOKECENTER1F_NURSE, DOWN
 	pause 20
-	spriteface ECRUTEAKPOKECENTER1F_BILL, DOWN
+	turnobject ECRUTEAKPOKECENTER1F_BILL, DOWN
 	pause 10
 	opentext
 	writetext EcruteakPokecenter1F_BillText1
@@ -47,13 +45,13 @@ EcruteakPokecenter1F_MapScripts:
 	writetext EcruteakPokecenter1F_BillText2
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement2
 	playsound SFX_EXIT_BUILDING
 	disappear ECRUTEAKPOKECENTER1F_BILL
 	clearevent EVENT_MET_BILL
 	setflag ENGINE_TIME_CAPSULE
-	setscene 1
+	setscene SCENE_FINISHED
 	waitsfx
 	end
 
@@ -61,7 +59,7 @@ EcruteakPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
 EcruteakPokecenter1FPokefanMScript:
-	special Special_Mobile_DummyReturnFalse
+	special Mobile_DummyReturnFalse
 	iftrue .mobile
 	jumptextfaceplayer EcruteakPokecenter1FPokefanMText
 
@@ -207,25 +205,20 @@ EcruteakPokecenter1FGymGuyText:
 	done
 
 EcruteakPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 6, ECRUTEAK_CITY
-	warp_def 4, 7, 6, ECRUTEAK_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 5
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1
-	object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1
-	object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1
-	object_event 7, 1, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1
-	object_event 0, 7, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, ECRUTEAK_CITY, 6
+	warp_event  4,  7, ECRUTEAK_CITY, 6
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 5 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1
+	object_event  7,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1
+	object_event  1,  4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1
+	object_event  7,  1, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1
+	object_event  0,  7, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm
new file mode 100644
index 000000000..8b58d49ee
--- /dev/null
+++ b/maps/EcruteakTinTowerEntrance.asm
@@ -0,0 +1,298 @@
+	const_def 2 ; object constants
+	const ECRUTEAKTINTOWERENTRANCE_SAGE1
+	const ECRUTEAKTINTOWERENTRANCE_SAGE2
+	const ECRUTEAKTINTOWERENTRANCE_SAGE3
+	const ECRUTEAKTINTOWERENTRANCE_GRAMPS
+
+EcruteakTinTowerEntrance_MapScripts:
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
+
+	db 1 ; callbacks
+	callback MAPCALLBACK_OBJECTS, .InitializeSages
+
+.DummyScene0:
+	end
+
+.DummyScene1:
+	end
+
+.InitializeSages:
+	checkevent EVENT_FOUGHT_SUICUNE
+	iftrue .DontBlockTower
+	checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
+	iftrue .DontBlockTower
+	checkevent EVENT_CLEARED_RADIO_TOWER
+	iftrue .BlockTower
+	return
+
+.BlockTower:
+	clearevent EVENT_RANG_CLEAR_BELL_1
+	setevent EVENT_RANG_CLEAR_BELL_2
+	setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
+	checkitem CLEAR_BELL
+	iftrue .NoClearBell
+	setscene SCENE_DEFAULT
+.NoClearBell:
+	return
+
+.DontBlockTower:
+	clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
+	return
+
+EcruteakTinTowerEntrance_CoordEvent1:
+	checkevent EVENT_RANG_CLEAR_BELL_2
+	iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove
+	applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7
+	moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6
+	appear ECRUTEAKTINTOWERENTRANCE_SAGE1
+	pause 5
+	disappear ECRUTEAKTINTOWERENTRANCE_SAGE2
+	end
+
+EcruteakTinTowerEntrance_CoordEvent2:
+	checkevent EVENT_RANG_CLEAR_BELL_1
+	iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove
+	applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc
+	moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6
+	appear ECRUTEAKTINTOWERENTRANCE_SAGE2
+	pause 5
+	disappear ECRUTEAKTINTOWERENTRANCE_SAGE1
+	end
+
+EcruteakTinTowerEntrance_CoordEvent_DontMove:
+	end
+
+EcruteakTinTowerEntranceSageScript:
+	faceplayer
+	opentext
+	checkevent EVENT_CLEARED_RADIO_TOWER
+	iftrue .CheckForClearBell
+	checkflag ENGINE_FOGBADGE
+	iftrue .BlockPassage_GotFogBadge
+	writetext EcruteakTinTowerEntranceSageText
+	waitbutton
+	closetext
+	end
+
+.BlockPassage_GotFogBadge:
+	writetext EcruteakTinTowerEntranceSageText_GotFogBadge
+	waitbutton
+	closetext
+	end
+
+.CheckForClearBell:
+	checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
+	iftrue .AllowedThrough
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iftrue .RangClearBell
+	checkitem CLEAR_BELL
+	iftrue .GotClearBell
+	writetext EcruteakTinTowerEntranceSageText_NoClearBell
+	waitbutton
+	closetext
+	end
+
+.GotClearBell:
+	writetext EcruteakTinTowerEntranceSageText_HearsClearBell
+	waitbutton
+	closetext
+	setscene SCENE_FINISHED
+	setevent EVENT_RANG_CLEAR_BELL_2
+	clearevent EVENT_RANG_CLEAR_BELL_1
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	end
+
+.AllowedThrough:
+	writetext EcruteakTinTowerEntranceSageText_PleaseDoGoOn
+	waitbutton
+	closetext
+	end
+
+.RangClearBell:
+	writetext EcruteakTinTowerEntranceSageText_HeardClearBell
+	waitbutton
+	closetext
+	end
+
+EcruteakTinTowerEntranceWanderingSageScript:
+	faceplayer
+	opentext
+	checkevent EVENT_GOT_CLEAR_BELL
+	iftrue .GotClearBell
+	writetext EcruteakTinTowerEntranceWanderingSageText
+	waitbutton
+	closetext
+	end
+
+.GotClearBell:
+	writetext EcruteakTinTowerEntranceWanderingSageText_GotClearBell
+	waitbutton
+	closetext
+	end
+
+EcruteakTinTowerEntranceGrampsScript:
+	jumptextfaceplayer EcruteakTinTowerEntranceGrampsText
+
+MovementData_0x980c7:
+	fix_facing
+	big_step LEFT
+	remove_fixed_facing
+	turn_head DOWN
+	step_end
+
+MovementData_0x980cc:
+	fix_facing
+	big_step RIGHT
+	remove_fixed_facing
+	turn_head DOWN
+	step_end
+
+EcruteakTinTowerEntranceSageText:
+	text "TIN TOWER is off"
+	line "limits to anyone"
+
+	para "without ECRUTEAK"
+	line "GYM's BADGE."
+
+	para "Sorry, but you'll"
+	line "have to leave."
+	done
+
+EcruteakTinTowerEntranceSageText_GotFogBadge:
+	text "TIN TOWER is off"
+	line "limits to anyone"
+
+	para "without ECRUTEAK"
+	line "GYM's BADGE."
+
+	para "Ah!"
+
+	para "ECRUTEAK's GYM"
+	line "BADGE! Please, go"
+	cont "right through."
+	done
+
+EcruteakTinTowerEntranceSageText_NoClearBell:
+	text "A momentous event"
+	line "has occurred."
+
+	para "I beg your pardon,"
+	line "but I must ask you"
+	cont "to leave."
+
+	para "…What soothes the"
+	line "soul…"
+
+	para "The WISE TRIO say"
+	line "things that are so"
+
+	para "very difficult to"
+	line "understand…"
+	done
+
+EcruteakTinTowerEntranceSageText_HearsClearBell:
+	text "A momentous event"
+	line "has occurred."
+
+	para "I beg your pardon,"
+	line "but I must ask you"
+	cont "to leave."
+
+	para "<……><……><……>"
+
+	para "Ah!"
+
+	para "The sound of that"
+	line "CLEAR BELL!"
+
+	para "It… It's sublime!"
+
+	para "I've never heard"
+	line "so beautiful a"
+	cont "sound before!"
+
+	para "That bell's chime"
+	line "is indicative of"
+	cont "the bearer's soul."
+
+	para "You…"
+
+	para "You may be able to"
+	line "make it through"
+	cont "TIN TOWER."
+
+	para "Please, do go on."
+	done
+
+EcruteakTinTowerEntranceSageText_PleaseDoGoOn:
+	text "Please, do go on."
+	done
+
+EcruteakTinTowerEntranceSageText_HeardClearBell:
+	text "That bell's chime"
+	line "is indicative of"
+	cont "the bearer's soul."
+
+	para "You…"
+
+	para "You may be able to"
+	line "make it through"
+	cont "TIN TOWER."
+
+	para "Please, do go on."
+	done
+
+EcruteakTinTowerEntranceWanderingSageText:
+	text "The TIN TOWER"
+	line "ahead is a nine-"
+
+	para "tier tower of"
+	line "divine beauty."
+
+	para "It soothes the"
+	line "soul of all who"
+	cont "see it."
+	done
+
+EcruteakTinTowerEntranceWanderingSageText_GotClearBell:
+	text "The TIN TOWER"
+	line "shook! A #MON"
+
+	para "must have returned"
+	line "to the top!"
+	done
+
+EcruteakTinTowerEntranceGrampsText:
+	text "Two towers…"
+	line "Two #MON…"
+
+	para "But when one"
+	line "burned down, both"
+
+	para "#MON flew away,"
+	line "never to return."
+	done
+
+EcruteakTinTowerEntrance_MapEvents:
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  4, 17, ECRUTEAK_CITY, 3
+	warp_event  5, 17, ECRUTEAK_CITY, 3
+	warp_event  5,  3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4
+	warp_event 17, 15, ECRUTEAK_TIN_TOWER_ENTRANCE, 3
+	warp_event 17,  3, WISE_TRIOS_ROOM, 3
+
+	db 2 ; coord events
+	coord_event  4,  7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1
+	coord_event  5,  7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  4,  6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_RANG_CLEAR_BELL_1
+	object_event  5,  6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_RANG_CLEAR_BELL_2
+	object_event  6,  9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceWanderingSageScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
+	object_event  3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
diff --git a/maps/EcruteakHouse.blk b/maps/EcruteakTinTowerEntrance.blk
index 8f74a6559..8f74a6559 100644
--- a/maps/EcruteakHouse.blk
+++ b/maps/EcruteakTinTowerEntrance.blk
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm
index 292562f85..544de62fb 100644
--- a/maps/ElmsHouse.asm
+++ b/maps/ElmsHouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ELMSHOUSE_ELMS_WIFE
 	const ELMSHOUSE_ELMS_SON
 
 ElmsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ElmsWife:
 	jumptextfaceplayer ElmsWifeText
@@ -84,24 +82,19 @@ ElmsHousePCText:
 	done
 
 ElmsHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 4, NEW_BARK_TOWN
-	warp_def 3, 7, 4, NEW_BARK_TOWN
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 0, 1, BGEVENT_READ, ElmsHousePC
-	bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf
-	bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf
-
-.ObjectEvents:
-	db 2
-	object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1
-	object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, NEW_BARK_TOWN, 4
+	warp_event  3,  7, NEW_BARK_TOWN, 4
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  0,  1, BGEVENT_READ, ElmsHousePC
+	bg_event  6,  1, BGEVENT_READ, ElmsHouseBookshelf
+	bg_event  7,  1, BGEVENT_READ, ElmsHouseBookshelf
+
+	db 2 ; object events
+	object_event  1,  5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1
+	object_event  5,  4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index ff531500c..2deaf2016 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ELMSLAB_ELM
 	const ELMSLAB_ELMS_AIDE
 	const ELMSLAB_POKE_BALL1
@@ -7,17 +7,15 @@ const_value set 2
 	const ELMSLAB_OFFICER
 
 ElmsLab_MapScripts:
-.SceneScripts:
-	db 6
-	scene_script .MeetElm
-	scene_script .DummyScene1
-	scene_script .DummyScene2
-	scene_script .DummyScene3
-	scene_script .DummyScene4
-	scene_script .DummyScene5
-
-.MapCallbacks:
-	db 1
+	db 6 ; scene scripts
+	scene_script .MeetElm ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_ELMSLAB_CANT_LEAVE
+	scene_script .DummyScene2 ; SCENE_ELMSLAB_NOTHING
+	scene_script .DummyScene3 ; SCENE_ELMSLAB_MEET_OFFICER
+	scene_script .DummyScene4 ; SCENE_ELMSLAB_UNUSED
+	scene_script .DummyScene5 ; SCENE_ELMSLAB_AIDE_GIVES_POTION
+
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .MoveElmCallback
 
 .MeetElm:
@@ -41,7 +39,7 @@ ElmsLab_MapScripts:
 
 .MoveElmCallback:
 	checkscene
-	iftrue .Skip
+	iftrue .Skip ; not SCENE_DEFAULT
 	moveobject ELMSLAB_ELM, 3, 4
 .Skip:
 	return
@@ -49,7 +47,7 @@ ElmsLab_MapScripts:
 .WalkUpToElm:
 	applymovement PLAYER, ElmsLab_WalkUpToElmMovement
 	showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
-	spriteface ELMSLAB_ELM, RIGHT
+	turnobject ELMSLAB_ELM, RIGHT
 	opentext
 	writetext ElmText_Intro
 .MustSayYes:
@@ -67,24 +65,24 @@ ElmsLab_MapScripts:
 	playsound SFX_GLASS_TING
 	pause 30
 	showemote EMOTE_SHOCK, ELMSLAB_ELM, 10
-	spriteface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	opentext
 	writetext ElmText_GotAnEmail
 	waitbutton
 	closetext
 	opentext
-	spriteface ELMSLAB_ELM, RIGHT
+	turnobject ELMSLAB_ELM, RIGHT
 	writetext ElmText_MissionFromMrPokemon
 	waitbutton
 	closetext
 	applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement1
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement2
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext ElmText_ChooseAPokemon
 	waitbutton
-	setscene 1
+	setscene SCENE_ELMSLAB_CANT_LEAVE
 	closetext
 	end
 
@@ -108,10 +106,10 @@ ElmCheckEverstone:
 	checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
 	iffalse ElmCheckTogepiEgg
 	writebyte TOGEPI
-	special Special_FindThatSpeciesYourTrainerID
+	special FindPartyMonThatSpeciesYourTrainerID
 	iftrue ShowElmTogepiScript
 	writebyte TOGETIC
-	special Special_FindThatSpeciesYourTrainerID
+	special FindPartyMonThatSpeciesYourTrainerID
 	iftrue ShowElmTogepiScript
 	writetext UnknownText_0x79a40
 	waitbutton
@@ -120,10 +118,10 @@ ElmCheckEverstone:
 
 ElmEggHatchedScript:
 	writebyte TOGEPI
-	special Special_FindThatSpeciesYourTrainerID
+	special FindPartyMonThatSpeciesYourTrainerID
 	iftrue ShowElmTogepiScript
 	writebyte TOGETIC
-	special Special_FindThatSpeciesYourTrainerID
+	special FindPartyMonThatSpeciesYourTrainerID
 	iftrue ShowElmTogepiScript
 	jump ElmCheckGotEggAgain
 
@@ -149,18 +147,18 @@ ElmCheckGotEggAgain:
 	end
 
 LabTryToLeaveScript:
-	spriteface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	opentext
 	writetext LabWhereGoingText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x78f70
+	applymovement PLAYER, ElmsLab_CantLeaveMovement
 	end
 
 CyndaquilPokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic CYNDAQUIL
 	cry CYNDAQUIL
@@ -183,14 +181,14 @@ CyndaquilPokeBallScript:
 	givepoke CYNDAQUIL, 5, BERRY
 	closetext
 	checkcode VAR_FACING
-	if_equal RIGHT, ElmDirectionsScript
+	ifequal RIGHT, ElmDirectionsScript
 	applymovement PLAYER, AfterCyndaquilMovement
 	jump ElmDirectionsScript
 
 TotodilePokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic TOTODILE
 	cry TOTODILE
@@ -218,7 +216,7 @@ TotodilePokeBallScript:
 ChikoritaPokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic CHIKORITA
 	cry CHIKORITA
@@ -250,7 +248,7 @@ DidntChooseStarterScript:
 	end
 
 ElmDirectionsScript:
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext ElmDirectionsText1
 	waitbutton
@@ -262,20 +260,20 @@ ElmDirectionsScript:
 	waitsfx
 	waitbutton
 	closetext
-	spriteface ELMSLAB_ELM, LEFT
+	turnobject ELMSLAB_ELM, LEFT
 	opentext
 	writetext ElmDirectionsText2
 	waitbutton
 	closetext
-	spriteface ELMSLAB_ELM, DOWN
+	turnobject ELMSLAB_ELM, DOWN
 	opentext
 	writetext ElmDirectionsText3
 	waitbutton
 	closetext
 	setevent EVENT_GOT_A_POKEMON_FROM_ELM
 	setevent EVENT_RIVAL_CHERRYGROVE_CITY
-	setscene 5
-	setmapscene NEW_BARK_TOWN, 1
+	setscene SCENE_ELMSLAB_AIDE_GIVES_POTION
+	setmapscene NEW_BARK_TOWN, SCENE_FINISHED
 	end
 
 ElmDescribesMrPokemonScript:
@@ -308,11 +306,11 @@ ElmsLabHealingMachine:
 	end
 
 ElmsLabHealingMachine_HealParty:
-	special Special_StubbedTrainerRankings_Healings
+	special StubbedTrainerRankings_Healings
 	special HealParty
 	playmusic MUSIC_NONE
 	writebyte HEALMACHINE_ELMS_LAB
-	special Special_HealMachineAnim
+	special HealMachineAnim
 	pause 30
 	special RestartMapMusic
 	closetext
@@ -340,14 +338,14 @@ ElmAfterTheftScript:
 	writetext ElmAfterTheftText5
 	buttonsound
 	setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
-	setflag ENGINE_BUG_CONTEST_ON
-	setmapscene ROUTE_29, 1
+	setflag ENGINE_MAIN_MENU_MOBILE_CHOICES
+	setmapscene ROUTE_29, SCENE_ROUTE29_CATCH_TUTORIAL
 	clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY
 	setevent EVENT_ROUTE_30_BATTLE
 	writetext ElmAfterTheftText6
 	waitbutton
 	closetext
-	setscene 6
+	setscene SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS
 	end
 
 ElmStudyingEggScript:
@@ -422,19 +420,19 @@ ElmGiveTicketScript:
 ElmJumpBackScript1:
 	closetext
 	checkcode VAR_FACING
-	if_equal DOWN, ElmJumpDownScript
-	if_equal UP, ElmJumpUpScript
-	if_equal LEFT, ElmJumpLeftScript
-	if_equal RIGHT, ElmJumpRightScript
+	ifequal DOWN, ElmJumpDownScript
+	ifequal UP, ElmJumpUpScript
+	ifequal LEFT, ElmJumpLeftScript
+	ifequal RIGHT, ElmJumpRightScript
 	end
 
 ElmJumpBackScript2:
 	closetext
 	checkcode VAR_FACING
-	if_equal DOWN, ElmJumpUpScript
-	if_equal UP, ElmJumpDownScript
-	if_equal LEFT, ElmJumpRightScript
-	if_equal RIGHT, ElmJumpLeftScript
+	ifequal DOWN, ElmJumpUpScript
+	ifequal UP, ElmJumpDownScript
+	ifequal LEFT, ElmJumpRightScript
+	ifequal RIGHT, ElmJumpLeftScript
 	end
 
 ElmJumpUpScript:
@@ -457,41 +455,41 @@ ElmJumpRightScript:
 	opentext
 	end
 
-AideScript_WalkPotions1:
+AideScript_WalkPotion1:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
-	spriteface PLAYER, DOWN
-	scall AideScript_GivePotions
+	turnobject PLAYER, DOWN
+	scall AideScript_GivePotion
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
 	end
 
-AideScript_WalkPotions2:
+AideScript_WalkPotion2:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
-	spriteface PLAYER, DOWN
-	scall AideScript_GivePotions
+	turnobject PLAYER, DOWN
+	scall AideScript_GivePotion
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
 	end
 
-AideScript_GivePotions:
+AideScript_GivePotion:
 	opentext
-	writetext AideText_GiveYouPotions
+	writetext AideText_GiveYouPotion
 	buttonsound
 	verbosegiveitem POTION
 	writetext AideText_AlwaysBusy
 	waitbutton
 	closetext
-	setscene 2
+	setscene SCENE_ELMSLAB_NOTHING
 	end
 
 AideScript_WalkBalls1:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	scall AideScript_GiveYouBalls
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
 	end
 
 AideScript_WalkBalls2:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	scall AideScript_GiveYouBalls
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
 	end
@@ -507,7 +505,7 @@ AideScript_GiveYouBalls:
 	buttonsound
 	itemnotify
 	closetext
-	setscene 2
+	setscene SCENE_ELMSLAB_NOTHING
 	end
 
 AideScript_ReceiveTheBalls:
@@ -552,17 +550,17 @@ MeetCopScript2:
 MeetCopScript:
 	applymovement PLAYER, MeetCopScript_WalkUp
 CopScript:
-	spriteface ELMSLAB_OFFICER, LEFT
+	turnobject ELMSLAB_OFFICER, LEFT
 	opentext
 	writetext ElmsLabOfficerText1
 	buttonsound
-	special Special_NameRival
+	special NameRival
 	writetext ElmsLabOfficerText2
 	waitbutton
 	closetext
 	applymovement ELMSLAB_OFFICER, OfficerLeavesMovement
 	disappear ELMSLAB_OFFICER
-	setscene 2
+	setscene SCENE_ELMSLAB_NOTHING
 	end
 
 ElmsLabWindow:
@@ -621,7 +619,7 @@ ElmsLab_WalkUpToElmMovement:
 	turn_head LEFT
 	step_end
 
-MovementData_0x78f70:
+ElmsLab_CantLeaveMovement:
 	step UP
 	step_end
 
@@ -1217,7 +1215,7 @@ ElmsLabSignpostText_Egg:
 	cont "by PROF.ELM."
 	done
 
-AideText_GiveYouPotions:
+AideText_GiveYouPotion:
 	text "<PLAY_G>, I want"
 	line "you to have this"
 	cont "for your errand."
@@ -1371,49 +1369,44 @@ ElmsLabPCText:
 	done
 
 ElmsLab_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 11, 1, NEW_BARK_TOWN
-	warp_def 5, 11, 1, NEW_BARK_TOWN
-
-.CoordEvents:
-	db 8
-	coord_event 4, 6, 1, LabTryToLeaveScript
-	coord_event 5, 6, 1, LabTryToLeaveScript
-	coord_event 4, 5, 3, MeetCopScript
-	coord_event 5, 5, 3, MeetCopScript2
-	coord_event 4, 8, 5, AideScript_WalkPotions1
-	coord_event 5, 8, 5, AideScript_WalkPotions2
-	coord_event 4, 8, 6, AideScript_WalkBalls1
-	coord_event 5, 8, 6, AideScript_WalkBalls2
-
-.BGEvents:
-	db 16
-	bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine
-	bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 8, 1, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 9, 1, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 0, 7, BGEVENT_READ, ElmsLabTravelTip1
-	bg_event 1, 7, BGEVENT_READ, ElmsLabTravelTip2
-	bg_event 2, 7, BGEVENT_READ, ElmsLabTravelTip3
-	bg_event 3, 7, BGEVENT_READ, ElmsLabTravelTip4
-	bg_event 6, 7, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 7, 7, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 8, 7, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 9, 7, BGEVENT_READ, ElmsLabBookshelf
-	bg_event 9, 3, BGEVENT_READ, ElmsLabTrashcan
-	bg_event 5, 0, BGEVENT_READ, ElmsLabWindow
-	bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC
-
-.ObjectEvents:
-	db 6
-	object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1
-	object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
-	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
-	object_event 7, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
-	object_event 8, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
-	object_event 5, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 11, NEW_BARK_TOWN, 1
+	warp_event  5, 11, NEW_BARK_TOWN, 1
+
+	db 8 ; coord events
+	coord_event  4,  6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
+	coord_event  5,  6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
+	coord_event  4,  5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript
+	coord_event  5,  5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript2
+	coord_event  4,  8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion1
+	coord_event  5,  8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion2
+	coord_event  4,  8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls1
+	coord_event  5,  8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls2
+
+	db 16 ; bg events
+	bg_event  2,  1, BGEVENT_READ, ElmsLabHealingMachine
+	bg_event  6,  1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  7,  1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  8,  1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  9,  1, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  0,  7, BGEVENT_READ, ElmsLabTravelTip1
+	bg_event  1,  7, BGEVENT_READ, ElmsLabTravelTip2
+	bg_event  2,  7, BGEVENT_READ, ElmsLabTravelTip3
+	bg_event  3,  7, BGEVENT_READ, ElmsLabTravelTip4
+	bg_event  6,  7, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  7,  7, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  8,  7, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  9,  7, BGEVENT_READ, ElmsLabBookshelf
+	bg_event  9,  3, BGEVENT_READ, ElmsLabTrashcan
+	bg_event  5,  0, BGEVENT_READ, ElmsLabWindow
+	bg_event  3,  5, BGEVENT_DOWN, ElmsLabPC
+
+	db 6 ; object events
+	object_event  5,  2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1
+	object_event  2,  9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
+	object_event  6,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
+	object_event  7,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
+	object_event  8,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
+	object_event  5,  3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 6dfb2350d..8b6b50419 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -1,18 +1,16 @@
-const_value set 2
+	const_def 2 ; object constants
 	const FASTSHIP1F_SAILOR1
 	const FASTSHIP1F_SAILOR2
 	const FASTSHIP1F_SAILOR3
 	const FASTSHIP1F_GENTLEMAN
 
 FastShip1F_MapScripts:
-.SceneScripts:
-	db 3
-	scene_script .DummyScene0
-	scene_script .EnterFastShip
-	scene_script .DummyScene2
+	db 3 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .EnterFastShip ; SCENE_FASTSHIP1F_ENTER_SHIP
+	scene_script .DummyScene2 ; SCENE_FASTSHIP1F_MEET_GRANDPA
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -35,27 +33,27 @@ FastShip1F_MapScripts:
 	clearevent EVENT_FAST_SHIP_HAS_ARRIVED
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iftrue .SkipGrandpa
-	setscene 2
+	setscene SCENE_FASTSHIP1F_MEET_GRANDPA
 	end
 
 .SkipGrandpa:
-	setscene 0
+	setscene SCENE_DEFAULT
 	end
 
-SailorScript_0x75160:
+FastShip1FSailor1Script:
 	faceplayer
 	opentext
 	checkevent EVENT_FAST_SHIP_HAS_ARRIVED
 	iftrue .Arrived
 	checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
 	iftrue .Olivine
-	writetext UnknownText_0x7523b
+	writetext FastShip1FSailor1Text_ToVermilion
 	waitbutton
 	closetext
 	end
 
 .Olivine:
-	writetext UnknownText_0x7529b
+	writetext FastShip1FSailor1Text_ToOlivine
 	waitbutton
 	closetext
 	end
@@ -63,34 +61,34 @@ SailorScript_0x75160:
 .Arrived:
 	checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
 	iftrue ._Olivine
-	writetext UnknownText_0x754be
+	writetext FastShip1FSailor1Text_InVermilion
 	waitbutton
 	closetext
 	scall .LetThePlayerOut
 	playsound SFX_EXIT_BUILDING
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	waitsfx
 	setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
-	setmapscene VERMILION_PORT, 1
+	setmapscene VERMILION_PORT, SCENE_VERMILIONPORT_LEAVE_SHIP
 	warp VERMILION_PORT, 7, 17
 	end
 
 ._Olivine:
-	writetext UnknownText_0x7548d
+	writetext FastShip1FSailor1Text_InOlivine
 	waitbutton
 	closetext
 	scall .LetThePlayerOut
 	playsound SFX_EXIT_BUILDING
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	waitsfx
 	setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
-	setmapscene OLIVINE_PORT, 1
+	setmapscene OLIVINE_PORT, SCENE_OLIVINEPORT_LEAVE_SHIP
 	warp OLIVINE_PORT, 7, 23
 	end
 
 .LetThePlayerOut:
 	checkcode VAR_FACING
-	if_equal RIGHT, .YouAreFacingRight
+	ifequal RIGHT, .YouAreFacingRight
 	applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e
 	applymovement PLAYER, MovementData_0x75235
 	end
@@ -100,24 +98,24 @@ SailorScript_0x75160:
 	applymovement PLAYER, MovementData_0x75238
 	end
 
-SailorScript_0x751d0:
+FastShip1FSailor2Script:
 	faceplayer
 	opentext
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iftrue .Vermilion
-	writetext UnknownText_0x752f9
+	writetext FastShip1FSailor2Text_FirstTime
 	waitbutton
 	closetext
 	end
 
 .Vermilion:
-	writetext UnknownText_0x7534f
+	writetext FastShip1FSailor2Text
 	waitbutton
 	closetext
 	end
 
-FastShip1FSailorScript:
-	jumptextfaceplayer FastShip1FSailorText
+FastShip1FSailor3Script:
+	jumptextfaceplayer FastShip1FSailor3Text
 
 WorriedGrandpaSceneRight:
 	moveobject FASTSHIP1F_GENTLEMAN, 20, 6
@@ -132,10 +130,10 @@ WorriedGrandpaSceneLeft:
 	writetext UnknownText_0x75412
 	waitbutton
 	closetext
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
 	disappear FASTSHIP1F_GENTLEMAN
-	setscene 0
+	setscene SCENE_DEFAULT
 	end
 
 MovementData_0x7520e:
@@ -207,7 +205,7 @@ MovementData_0x75238:
 	step UP
 	step_end
 
-UnknownText_0x7523b:
+FastShip1FSailor1Text_ToVermilion:
 	text "FAST SHIP S.S.AQUA"
 	line "is en route to"
 	cont "VERMILION CITY."
@@ -217,7 +215,7 @@ UnknownText_0x7523b:
 	cont "we arrive."
 	done
 
-UnknownText_0x7529b:
+FastShip1FSailor1Text_ToOlivine:
 	text "FAST SHIP S.S.AQUA"
 	line "is en route to"
 	cont "OLIVINE CITY."
@@ -227,7 +225,7 @@ UnknownText_0x7529b:
 	cont "we arrive."
 	done
 
-UnknownText_0x752f9:
+FastShip1FSailor2Text_FirstTime:
 	text "Here's your cabin."
 
 	para "If your #MON"
@@ -238,7 +236,7 @@ UnknownText_0x752f9:
 	line "them."
 	done
 
-UnknownText_0x7534f:
+FastShip1FSailor2Text:
 	text "Here's your cabin."
 
 	para "You can heal your"
@@ -250,7 +248,7 @@ UnknownText_0x7534f:
 	cont "you're sleeping."
 	done
 
-FastShip1FSailorText:
+FastShip1FSailor3Text:
 	text "The passengers are"
 	line "all trainers."
 
@@ -273,48 +271,43 @@ UnknownText_0x75412:
 	line "know!"
 	done
 
-UnknownText_0x7548d:
+FastShip1FSailor1Text_InOlivine:
 	text "FAST SHIP S.S.AQUA"
 	line "has arrived in"
 	cont "OLIVINE CITY."
 	done
 
-UnknownText_0x754be:
+FastShip1FSailor1Text_InVermilion:
 	text "FAST SHIP S.S.AQUA"
 	line "has arrived in"
 	cont "VERMILION CITY."
 	done
 
 FastShip1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 12
-	warp_def 25, 1, -1, FAST_SHIP_1F
-	warp_def 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE
-	warp_def 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE
-	warp_def 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE
-	warp_def 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW
-	warp_def 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW
-	warp_def 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW
-	warp_def 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
-	warp_def 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
-	warp_def 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN
-	warp_def 6, 12, 1, FAST_SHIP_B1F
-	warp_def 30, 14, 2, FAST_SHIP_B1F
-
-.CoordEvents:
-	db 2
-	coord_event 24, 6, 2, WorriedGrandpaSceneLeft
-	coord_event 25, 6, 2, WorriedGrandpaSceneRight
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1
-	object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1
-	object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1
-	object_event 19, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
+	db 0, 0 ; filler
+
+	db 12 ; warp events
+	warp_event 25,  1, FAST_SHIP_1F, -1
+	warp_event 27,  8, FAST_SHIP_CABINS_NNW_NNE_NE, 1
+	warp_event 23,  8, FAST_SHIP_CABINS_NNW_NNE_NE, 2
+	warp_event 19,  8, FAST_SHIP_CABINS_NNW_NNE_NE, 3
+	warp_event 15,  8, FAST_SHIP_CABINS_SW_SSW_NW, 1
+	warp_event 15, 15, FAST_SHIP_CABINS_SW_SSW_NW, 2
+	warp_event 19, 15, FAST_SHIP_CABINS_SW_SSW_NW, 4
+	warp_event 23, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 1
+	warp_event 27, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 3
+	warp_event  3, 13, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5
+	warp_event  6, 12, FAST_SHIP_B1F, 1
+	warp_event 30, 14, FAST_SHIP_B1F, 2
+
+	db 2 ; coord events
+	coord_event 24,  6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft
+	coord_event 25,  6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneRight
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event 25,  2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor1Script, -1
+	object_event 14,  7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor2Script, -1
+	object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor3Script, -1
+	object_event 19,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm
index c179b490a..7eb6813c7 100644
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const FASTSHIPB1F_SAILOR1
 	const FASTSHIPB1F_SAILOR2
 	const FASTSHIPB1F_SAILOR3
@@ -13,13 +13,11 @@ const_value set 2
 	const FASTSHIPB1F_YOUNGSTER2
 
 FastShipB1F_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -27,38 +25,38 @@ FastShipB1F_MapScripts:
 .DummyScene1:
 	end
 
-UnknownScript_0x7673c:
+FastShipB1FSailorBlocksLeft:
 	checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
-	iftrue UnknownScript_0x76766
-	applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876
+	iftrue FastShipB1FAlreadyBlocked
+	applymovement FASTSHIPB1F_SAILOR2, FashShipB1FSailorBlocksLeftMovement
 	moveobject FASTSHIPB1F_SAILOR1, 30, 6
 	appear FASTSHIPB1F_SAILOR1
 	pause 5
 	disappear FASTSHIPB1F_SAILOR2
 	end
 
-UnknownScript_0x76751:
+FastShipB1FSailorBlocksRight:
 	checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT
-	iftrue UnknownScript_0x76766
-	applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871
+	iftrue FastShipB1FAlreadyBlocked
+	applymovement FASTSHIPB1F_SAILOR1, FashShipB1FSailorBlocksRightMovement
 	moveobject FASTSHIPB1F_SAILOR2, 31, 6
 	appear FASTSHIPB1F_SAILOR2
 	pause 5
 	disappear FASTSHIPB1F_SAILOR1
 	end
 
-UnknownScript_0x76766:
+FastShipB1FAlreadyBlocked:
 	end
 
-SailorScript_0x76767:
+FastShipB1FSailorScript:
 	faceplayer
 	opentext
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
-	iftrue UnknownScript_0x767a0
+	iftrue .FirstTime
 	checkevent EVENT_FAST_SHIP_LAZY_SAILOR
-	iftrue UnknownScript_0x7678d
+	iftrue .LazySailor
 	checkevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
-	iftrue UnknownScript_0x76787
+	iftrue .AlreadyInformed
 	writetext UnknownText_0x7687b
 	waitbutton
 	closetext
@@ -66,38 +64,38 @@ SailorScript_0x76767:
 	clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
 	end
 
-UnknownScript_0x76787:
+.AlreadyInformed:
 	writetext UnknownText_0x76907
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7678d:
+.LazySailor:
 	writetext UnknownText_0x7692e
 	checkevent EVENT_FAST_SHIP_FOUND_GIRL
-	iffalse UnknownScript_0x76799
+	iffalse .NotFoundGirl
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x76799:
+.NotFoundGirl:
 	buttonsound
 	writetext UnknownText_0x7696d
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x767a0:
+.FirstTime:
 	writetext UnknownText_0x7699d
 	waitbutton
 	closetext
 	end
 
 TrainerSailorJeff:
-	trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script
+	trainer SAILOR, JEFF, EVENT_BEAT_SAILOR_JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorJeffAfterBattleText
 	waitbutton
@@ -105,10 +103,10 @@ TrainerSailorJeff:
 	end
 
 TrainerPicnickerDebra:
-	trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script
+	trainer PICNICKER, DEBRA, EVENT_BEAT_PICNICKER_DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerDebraAfterBattleText
 	waitbutton
@@ -116,10 +114,10 @@ TrainerPicnickerDebra:
 	end
 
 TrainerJugglerFritz:
-	trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script
+	trainer JUGGLER, FRITZ, EVENT_BEAT_JUGGLER_FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext JugglerFritzAfterBattleText
 	waitbutton
@@ -127,10 +125,10 @@ TrainerJugglerFritz:
 	end
 
 TrainerSailorGarrett:
-	trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script
+	trainer SAILOR, GARRETT, EVENT_BEAT_SAILOR_GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorGarrettAfterBattleText
 	waitbutton
@@ -138,10 +136,10 @@ TrainerSailorGarrett:
 	end
 
 TrainerFisherJonah:
-	trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script
+	trainer FISHER, JONAH, EVENT_BEAT_FISHER_JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherJonahAfterBattleText
 	waitbutton
@@ -149,10 +147,10 @@ TrainerFisherJonah:
 	end
 
 TrainerBlackbeltWai:
-	trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script
+	trainer BLACKBELT_T, WAI, EVENT_BEAT_BLACKBELT_WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BlackbeltWaiAfterBattleText
 	waitbutton
@@ -160,10 +158,10 @@ TrainerBlackbeltWai:
 	end
 
 TrainerSailorKenneth:
-	trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script
+	trainer SAILOR, KENNETH, EVENT_BEAT_SAILOR_KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorKennethAfterBattleText
 	waitbutton
@@ -171,10 +169,10 @@ TrainerSailorKenneth:
 	end
 
 TrainerTeacherShirley:
-	trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script
+	trainer TEACHER, SHIRLEY, EVENT_BEAT_TEACHER_SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TeacherShirleyAfterBattleText
 	waitbutton
@@ -182,10 +180,10 @@ TrainerTeacherShirley:
 	end
 
 TrainerSchoolboyNate:
-	trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script
+	trainer SCHOOLBOY, NATE, EVENT_BEAT_SCHOOLBOY_NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyNateAfterBattleText
 	waitbutton
@@ -193,10 +191,10 @@ TrainerSchoolboyNate:
 	end
 
 TrainerSchoolboyRicky:
-	trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script
+	trainer SCHOOLBOY, RICKY, EVENT_BEAT_SCHOOLBOY_RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyRickyAfterBattleText
 	waitbutton
@@ -206,14 +204,14 @@ TrainerSchoolboyRicky:
 FashShipB1FTrashcan:
 	jumpstd trashcan
 
-MovementData_0x76871:
+FashShipB1FSailorBlocksRightMovement:
 	fix_facing
 	big_step RIGHT
 	remove_fixed_facing
 	turn_head DOWN
 	step_end
 
-MovementData_0x76876:
+FashShipB1FSailorBlocksLeftMovement:
 	fix_facing
 	big_step LEFT
 	remove_fixed_facing
@@ -449,34 +447,29 @@ SchoolboyRickyAfterBattleText:
 	done
 
 FastShipB1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 5, 11, 11, FAST_SHIP_1F
-	warp_def 31, 13, 12, FAST_SHIP_1F
-
-.CoordEvents:
-	db 2
-	coord_event 30, 7, 0, UnknownScript_0x7673c
-	coord_event 31, 7, 0, UnknownScript_0x76751
-
-.BGEvents:
-	db 1
-	bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan
-
-.ObjectEvents:
-	db 12
-	object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
-	object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
-	object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 26, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 17, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 25, 8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  5, 11, FAST_SHIP_1F, 11
+	warp_event 31, 13, FAST_SHIP_1F, 12
+
+	db 2 ; coord events
+	coord_event 30,  7, SCENE_DEFAULT, FastShipB1FSailorBlocksLeft
+	coord_event 31,  7, SCENE_DEFAULT, FastShipB1FSailorBlocksRight
+
+	db 1 ; bg events
+	bg_event 27,  9, BGEVENT_READ, FashShipB1FTrashcan
+
+	db 12 ; object events
+	object_event 30,  6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_LEFT
+	object_event 31,  6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
+	object_event  9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  6,  4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 26,  9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event 17,  4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event 25,  8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
 	object_event 15, 11, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 23, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 9, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 23,  4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  9, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event 14,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
 	object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm
index a6ff922dd..c2af9728b 100644
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M
 	const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F
 	const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD
@@ -8,17 +8,15 @@ const_value set 2
 	const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST
 
 FastShipCabins_NNW_NNE_NE_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerCooltrainermSean:
-	trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script
+	trainer COOLTRAINERM, SEAN, EVENT_BEAT_COOLTRAINERM_SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermSeanAfterBattleText
 	waitbutton
@@ -26,10 +24,10 @@ TrainerCooltrainermSean:
 	end
 
 TrainerCooltrainerfCarol:
-	trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script
+	trainer COOLTRAINERF, CAROL, EVENT_BEAT_COOLTRAINERF_CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfCarolAfterBattleText
 	waitbutton
@@ -37,10 +35,10 @@ TrainerCooltrainerfCarol:
 	end
 
 TrainerPokemaniacEthan:
-	trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script
+	trainer POKEMANIAC, ETHAN, EVENT_BEAT_POKEMANIAC_ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacEthanAfterBattleText
 	waitbutton
@@ -48,10 +46,10 @@ TrainerPokemaniacEthan:
 	end
 
 TrainerHikerNoland:
-	trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script
+	trainer HIKER, NOLAND, EVENT_BEAT_HIKER_NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerNolandAfterBattleText
 	waitbutton
@@ -59,10 +57,10 @@ TrainerHikerNoland:
 	end
 
 TrainerGentlemanEdward:
-	trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script
+	trainer GENTLEMAN, EDWARD, EVENT_BEAT_GENTLEMAN_EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GentlemanEdwardAfterBattleText
 	waitbutton
@@ -70,17 +68,17 @@ TrainerGentlemanEdward:
 	end
 
 TrainerBurglarCorey:
-	trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script
+	trainer BURGLAR, COREY, EVENT_BEAT_BURGLAR_COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BurglarCoreyAfterBattleText
 	waitbutton
 	closetext
 	end
 
-SailorScript_0x755f1:
+FastShipLazySailorScript:
 	playmusic MUSIC_HIKER_ENCOUNTER
 	faceplayer
 	opentext
@@ -98,17 +96,17 @@ SailorScript_0x755f1:
 	waitbutton
 	closetext
 	setevent EVENT_FAST_SHIP_LAZY_SAILOR
-	setmapscene FAST_SHIP_B1F, 1
+	setmapscene FAST_SHIP_B1F, SCENE_FINISHED
 	checkcode VAR_FACING
-	if_equal RIGHT, UnknownScript_0x75629
-	applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637
+	ifequal RIGHT, .Movement2
+	applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement1
 	playsound SFX_EXIT_BUILDING
 	disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR
 	waitsfx
 	end
 
-UnknownScript_0x75629:
-	applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x7563c
+.Movement2:
+	applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement2
 	playsound SFX_EXIT_BUILDING
 	disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR
 	waitsfx
@@ -117,14 +115,14 @@ UnknownScript_0x75629:
 FastShipCabins_NNW_NNE_NETrashcan:
 	jumpstd trashcan
 
-MovementData_0x75637:
+FastShipLazySailorLeavesMovement1:
 	step LEFT
 	step LEFT
 	step UP
 	step UP
 	step_end
 
-MovementData_0x7563c:
+FastShipLazySailorLeavesMovement2:
 	step DOWN
 	step LEFT
 	step LEFT
@@ -267,30 +265,25 @@ BurglarCoreyAfterBattleText:
 	done
 
 FastShipCabins_NNW_NNE_NE_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 2, 0, 2, FAST_SHIP_1F
-	warp_def 2, 12, 3, FAST_SHIP_1F
-	warp_def 2, 24, 4, FAST_SHIP_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
-	bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
-	bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
-
-.ObjectEvents:
-	db 7
-	object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
-	object_event 7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  2,  0, FAST_SHIP_1F, 2
+	warp_event  2, 12, FAST_SHIP_1F, 3
+	warp_event  2, 24, FAST_SHIP_1F, 4
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
+	bg_event  7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
+	bg_event  7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan
+
+	db 7 ; object events
+	object_event  4,  3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event  1,  5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event  1,  5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipLazySailorScript, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
+	object_event  7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event  2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 5c038275d..4a611a9b2 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
@@ -12,13 +12,11 @@ const_value set 2
 	const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2
 
 FastShipCabins_SE_SSE_CaptainsCabin_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-Unreferenced_0x75ea6:
+.UnreferencedDummyScene:
 	end
 
 SSAquaCaptain:
@@ -38,7 +36,7 @@ SSAquaCaptain:
 	end
 
 SSAquaGranddaughterBefore:
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
+	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
 	opentext
 	writetext SSAquaGranddaughterCaptainPlayWithMeText
 	waitbutton
@@ -48,19 +46,19 @@ SSAquaGranddaughterBefore:
 	writetext SSAquaGranddaughterHasToFindGrandpaText
 	waitbutton
 	closetext
-	special Special_FadeBlackQuickly
+	special FadeBlackQuickly
 	special ReloadSpritesNoPalettes
 	disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2
 	applymovement PLAYER, MovementData_0x76004
 	moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, 3, 19
 	appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
-	spriteface PLAYER, UP
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
-	special Special_FadeInQuickly
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
+	turnobject PLAYER, UP
+	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
+	special FadeInQuickly
+	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
 	showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15
 	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
+	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .PlayerIsFemale
 	opentext
@@ -75,13 +73,13 @@ SSAquaGranddaughterBefore:
 	waitbutton
 	closetext
 .cont:
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
+	turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
 	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010
 	opentext
 	writetext SSAquaEntertainedGranddaughterText
 	buttonsound
 	setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
-	setmapscene FAST_SHIP_1F, 0
+	setmapscene FAST_SHIP_1F, SCENE_DEFAULT
 	jump SSAquaMetalCoatAndDocking
 
 SSAquaGrandpa:
@@ -94,7 +92,7 @@ SSAquaGrandpa:
 	writetext SSAquaCantFindGranddaughterText
 	waitbutton
 	closetext
-	setmapscene FAST_SHIP_1F, 0
+	setmapscene FAST_SHIP_1F, SCENE_DEFAULT
 	end
 
 SSAquaMetalCoatAndDocking:
@@ -141,10 +139,10 @@ SSAquaGranddaughterAfter:
 	end
 
 TrainerPokefanmColin:
-	trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script
+	trainer POKEFANM, COLIN, EVENT_BEAT_POKEFANM_COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmColinAfterBattleText
 	waitbutton
@@ -152,10 +150,10 @@ TrainerPokefanmColin:
 	end
 
 TrainerTwinsMegandpeg1:
-	trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script
+	trainer TWINS, MEGANDPEG1, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsMegandpeg1AfterBattleText
 	waitbutton
@@ -163,10 +161,10 @@ TrainerTwinsMegandpeg1:
 	end
 
 TrainerTwinsMegandpeg2:
-	trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script
+	trainer TWINS, MEGANDPEG2, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsMegandpeg2AfterBattleText
 	waitbutton
@@ -174,10 +172,10 @@ TrainerTwinsMegandpeg2:
 	end
 
 TrainerPsychicRodney:
-	trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script
+	trainer PSYCHIC_T, RODNEY, EVENT_BEAT_PSYCHIC_RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicRodneyAfterBattleText
 	waitbutton
@@ -185,10 +183,10 @@ TrainerPsychicRodney:
 	end
 
 TrainerPokefanmJeremy:
-	trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script
+	trainer POKEFANM, JEREMY, EVENT_BEAT_POKEFANM_JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmJeremyAfterBattleText
 	waitbutton
@@ -196,10 +194,10 @@ TrainerPokefanmJeremy:
 	end
 
 TrainerPokefanfGeorgia:
-	trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script
+	trainer POKEFANF, GEORGIA, EVENT_BEAT_POKEFANF_GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanfGeorgiaAfterBattleText
 	waitbutton
@@ -207,10 +205,10 @@ TrainerPokefanfGeorgia:
 	end
 
 TrainerSupernerdShawn:
-	trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script
+	trainer SUPER_NERD, SHAWN, EVENT_BEAT_SUPER_NERD_SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdShawnAfterBattleText
 	waitbutton
@@ -463,35 +461,30 @@ SSAquaHasArrivedVermilionText:
 	done
 
 FastShipCabins_SE_SSE_CaptainsCabin_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 2, 7, 8, FAST_SHIP_1F
-	warp_def 3, 7, 8, FAST_SHIP_1F
-	warp_def 2, 19, 9, FAST_SHIP_1F
-	warp_def 3, 19, 9, FAST_SHIP_1F
-	warp_def 2, 33, 10, FAST_SHIP_1F
-	warp_def 3, 33, 10, FAST_SHIP_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan
-
-.ObjectEvents:
-	db 11
-	object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
-	object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
-	object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
-	object_event 2, 25, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
-	object_event 5, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 2, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 5, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 5, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 1, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event  2,  7, FAST_SHIP_1F, 8
+	warp_event  3,  7, FAST_SHIP_1F, 8
+	warp_event  2, 19, FAST_SHIP_1F, 9
+	warp_event  3, 19, FAST_SHIP_1F, 9
+	warp_event  2, 33, FAST_SHIP_1F, 10
+	warp_event  3, 33, FAST_SHIP_1F, 10
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan
+
+	db 11 ; object events
+	object_event  3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1
+	object_event  2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
+	object_event  3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
+	object_event  2, 25, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2
+	object_event  5,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  2,  4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  3,  4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  5,  5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  5,  5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  1, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index d4d35f584..ab1a27b13 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -1,21 +1,19 @@
-const_value set 2
+	const_def 2 ; object constants
 	const FASTSHIPCABINS_SW_SSW_NW_FISHER
 	const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER
 	const FASTSHIPCABINS_SW_SSW_NW_BUENA
 	const FASTSHIPCABINS_SW_SSW_NW_ROCKER
 
 FastShipCabins_SW_SSW_NW_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerFirebreatherLyle:
-	trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script
+	trainer FIREBREATHER, LYLE, EVENT_BEAT_FIREBREATHER_LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherLyleAfterBattleText
 	waitbutton
@@ -23,10 +21,10 @@ TrainerFirebreatherLyle:
 	end
 
 TrainerBugCatcherKen:
-	trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script
+	trainer BUG_CATCHER, KEN, EVENT_BEAT_BUG_CATCHER_KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherKenAfterBattleText
 	waitbutton
@@ -34,10 +32,10 @@ TrainerBugCatcherKen:
 	end
 
 TrainerBeautyCassie:
-	trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script
+	trainer BEAUTY, CASSIE, EVENT_BEAT_BEAUTY_CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautyCassieAfterBattleText
 	waitbutton
@@ -45,11 +43,11 @@ TrainerBeautyCassie:
 	end
 
 TrainerGuitaristClyde:
-	trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script
+	trainer GUITARIST, CLYDE, EVENT_BEAT_GUITARIST_CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
-	special Special_Mobile_DummyReturnFalse
+	endifjustbattled
+	special Mobile_DummyReturnFalse
 	iftrue .mobile
 	opentext
 	writetext UnknownText_0x75d65
@@ -69,32 +67,32 @@ FastShipBed:
 	writetext FastShipBedText1
 	waitbutton
 	closetext
-	special Special_FadeBlackQuickly
+	special FadeBlackQuickly
 	special ReloadSpritesNoPalettes
-	special Special_StubbedTrainerRankings_Healings
+	special StubbedTrainerRankings_Healings
 	special HealParty
 	playmusic MUSIC_HEAL
 	pause 60
 	special RestartMapMusic
-	special Special_FadeInQuickly
+	special FadeInQuickly
 	opentext
 	writetext FastShipBedText2
 	waitbutton
 	closetext
 	checkevent EVENT_FAST_SHIP_HAS_ARRIVED
-	iftrue UnknownScript_0x75ae1
+	iftrue .AlreadyArrived
 	checkevent EVENT_FAST_SHIP_FOUND_GIRL
-	iftrue UnknownScript_0x75ae2
+	iftrue .CanArrive
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
-	iftrue UnknownScript_0x75ae2
-UnknownScript_0x75ae1:
+	iftrue .CanArrive
+.AlreadyArrived:
 	end
 
-UnknownScript_0x75ae2:
+.CanArrive:
 	playsound SFX_ELEVATOR_END
 	pause 30
 	checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
-	iftrue UnknownScript_0x75af7
+	iftrue .ArrivedOlivine
 	opentext
 	writetext FastShipArrivedVermilionText
 	waitbutton
@@ -102,7 +100,7 @@ UnknownScript_0x75ae2:
 	setevent EVENT_FAST_SHIP_HAS_ARRIVED
 	end
 
-UnknownScript_0x75af7:
+.ArrivedOlivine:
 	opentext
 	writetext FastShipArrivedOlivineText
 	waitbutton
@@ -223,29 +221,24 @@ FastShipArrivedVermilionText:
 	done
 
 FastShipCabins_SW_SSW_NW_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 2, 0, 5, FAST_SHIP_1F
-	warp_def 2, 19, 6, FAST_SHIP_1F
-	warp_def 3, 19, 6, FAST_SHIP_1F
-	warp_def 2, 31, 7, FAST_SHIP_1F
-	warp_def 3, 31, 7, FAST_SHIP_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 7, 1, BGEVENT_READ, FastShipBed
-	bg_event 7, 2, BGEVENT_READ, FastShipBed
-	bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan
-
-.ObjectEvents:
-	db 4
-	object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
-	object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
-	object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
-	object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  2,  0, FAST_SHIP_1F, 5
+	warp_event  2, 19, FAST_SHIP_1F, 6
+	warp_event  3, 19, FAST_SHIP_1F, 6
+	warp_event  2, 31, FAST_SHIP_1F, 7
+	warp_event  3, 31, FAST_SHIP_1F, 7
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  7,  1, BGEVENT_READ, FastShipBed
+	bg_event  7,  2, BGEVENT_READ, FastShipBed
+	bg_event  7,  7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan
+
+	db 4 ; object events
+	object_event  1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
+	object_event  6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
+	object_event  1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
+	object_event  3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index 46cc7ddeb..e097febbe 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -1,23 +1,21 @@
-const_value set 2
+	const_def 2 ; object constants
 	const FIGHTINGDOJO_BLACK_BELT
 	const FIGHTINGDOJO_POKE_BALL
 
 FightingDojo_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FightingDojoBlackBelt:
 	jumptextfaceplayer FightingDojoBlackBeltText
 
-MapFightingDojoSignpost0Script:
-	jumptext FightingDojoSign0Text
-
-MapFightingDojoSignpost1Script:
+FightingDojoSign1:
 	jumptext FightingDojoSign1Text
 
+FightingDojoSign2:
+	jumptext FightingDojoSign2Text
+
 FightingDojoFocusBand:
 	itemball FOCUS_BAND
 
@@ -32,34 +30,29 @@ FightingDojoBlackBeltText:
 	cont "training."
 	done
 
-FightingDojoSign0Text:
+FightingDojoSign1Text:
 	text "What goes around"
 	line "comes around!"
 	done
 
-FightingDojoSign1Text:
+FightingDojoSign2Text:
 	text "Enemies on every"
 	line "side!"
 	done
 
 FightingDojo_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 11, 1, SAFFRON_CITY
-	warp_def 5, 11, 1, SAFFRON_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script
-	bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script
-
-.ObjectEvents:
-	db 2
-	object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
-	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 11, SAFFRON_CITY, 1
+	warp_event  5, 11, SAFFRON_CITY, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  4,  0, BGEVENT_READ, FightingDojoSign1
+	bg_event  5,  0, BGEVENT_READ, FightingDojoSign2
+
+	db 2 ; object events
+	object_event  4,  4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1
+	object_event  3,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND
diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm
deleted file mode 100644
index 8a72256b6..000000000
--- a/maps/FuchsiaBillSpeechHouse.asm
+++ /dev/null
@@ -1,48 +0,0 @@
-const_value set 2
-	const FUCHSIABILLSPEECHHOUSE_POKEFAN_F
-	const FUCHSIABILLSPEECHHOUSE_YOUNGSTER
-
-FuchsiaBillSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 0
-
-FuchsiaBillSpeechHousePokefanFScript:
-	jumptextfaceplayer FuchsiaBillSpeechHousePokefanFText
-
-FuchsiaBillSpeechHouseYoungsterScript:
-	jumptextfaceplayer FuchsiaBillSpeechHouseYoungsterText
-
-FuchsiaBillSpeechHousePokefanFText:
-	text "My grandpa is at "
-	line "my brother BILL's"
-	cont "on CERULEAN CAPE."
-	done
-
-FuchsiaBillSpeechHouseYoungsterText:
-	text "I saw these weird,"
-	line "slow #MON on"
-	cont "CYCLING ROAD."
-	done
-
-FuchsiaBillSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 4, FUCHSIA_CITY
-	warp_def 3, 7, 4, FUCHSIA_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1
-	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index 34a636aaf..0d44b0e8f 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const FUCHSIACITY_YOUNGSTER
 	const FUCHSIACITY_POKEFAN_M
 	const FUCHSIACITY_TEACHER
 	const FUCHSIACITY_FRUIT_TREE
 
 FuchsiaCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -125,40 +123,35 @@ NoLitteringSignText:
 	done
 
 FuchsiaCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 11
-	warp_def 5, 13, 2, FUCHSIA_MART
-	warp_def 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE
-	warp_def 8, 27, 1, FUCHSIA_GYM
-	warp_def 11, 27, 1, FUCHSIA_BILL_SPEECH_HOUSE
-	warp_def 19, 27, 1, FUCHSIA_POKECENTER_1F
-	warp_def 27, 27, 1, SAFARI_ZONE_WARDENS_HOME
-	warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA
-	warp_def 37, 22, 1, ROUTE_15_FUCHSIA_GATE
-	warp_def 37, 23, 2, ROUTE_15_FUCHSIA_GATE
-	warp_def 7, 35, 1, ROUTE_19_FUCHSIA_GATE
-	warp_def 8, 35, 2, ROUTE_19_FUCHSIA_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 8
+	db 0, 0 ; filler
+
+	db 11 ; warp events
+	warp_event  5, 13, FUCHSIA_MART, 2
+	warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1
+	warp_event  8, 27, FUCHSIA_GYM, 1
+	warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1
+	warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1
+	warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1
+	warp_event 18,  3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; inaccessible
+	warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1
+	warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2
+	warp_event  7, 35, ROUTE_19_FUCHSIA_GATE, 1
+	warp_event  8, 35, ROUTE_19_FUCHSIA_GATE, 2
+
+	db 0 ; coord events
+
+	db 8 ; bg events
 	bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign
-	bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign
+	bg_event  5, 29, BGEVENT_READ, FuchsiaGymSign
 	bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign
 	bg_event 27, 29, BGEVENT_READ, WardensHomeSign
-	bg_event 17, 5, BGEVENT_READ, SafariZoneClosedSign
+	bg_event 17,  5, BGEVENT_READ, SafariZoneClosedSign
 	bg_event 13, 15, BGEVENT_READ, NoLitteringSign
 	bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign
-	bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign
+	bg_event  6, 13, BGEVENT_READ, FuchsiaCityMartSign
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1
-	object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1
+	object_event 13,  8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1
 	object_event 16, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1
-	object_event 8, 1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1
+	object_event  8,  1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index a691d1d50..24fa2de71 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const FUCHSIAGYM_JANINE
 	const FUCHSIAGYM_FUCHSIA_GYM_1
 	const FUCHSIAGYM_FUCHSIA_GYM_2
@@ -7,11 +7,9 @@ const_value set 2
 	const FUCHSIAGYM_GYM_GUY
 
 FuchsiaGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FuchsiaGymJanineScript:
 	checkflag ENGINE_SOULBADGE
@@ -35,7 +33,7 @@ FuchsiaGymJanineScript:
 	variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
 	variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
 	variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 	opentext
 	writetext Text_ReceivedSoulBadge
 	playsound SFX_GET_BADGE
@@ -65,7 +63,7 @@ LassAliceScript:
 	applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 .AliceUnmasked:
 	faceplayer
 	opentext
@@ -99,7 +97,7 @@ LassLindaScript:
 	applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 .LindaUnmasked:
 	faceplayer
 	opentext
@@ -133,7 +131,7 @@ PicnickerCindyScript:
 	applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 .CindyUnmasked:
 	faceplayer
 	opentext
@@ -156,7 +154,7 @@ PicnickerCindyScript:
 	end
 
 .CindyAfterScript:
-	writetext UnknownText_0x19620c
+	writetext PicnickerCindyAfterText
 	waitbutton
 	closetext
 	end
@@ -167,7 +165,7 @@ CamperBarryScript:
 	applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 .BarryUnmasked:
 	faceplayer
 	opentext
@@ -190,7 +188,7 @@ CamperBarryScript:
 	end
 
 .BarryAfterScript:
-	writetext UnknownText_0x19626b
+	writetext CamperBarryAfterText
 	waitbutton
 	closetext
 	end
@@ -336,7 +334,7 @@ PicnickerCindyBeatenText:
 	line "I wanted to win!"
 	done
 
-UnknownText_0x19620c:
+PicnickerCindyAfterText:
 	text "You must be"
 	line "getting tired."
 	done
@@ -353,7 +351,7 @@ CamperBarryBeatenText:
 	line "right on! Dang!"
 	done
 
-UnknownText_0x19626b:
+CamperBarryAfterText:
 	text "Hey, you. Was my"
 	line "disguise cute or"
 	cont "what, huh?"
@@ -381,27 +379,22 @@ FuchsiaGymGuyWinText:
 	done
 
 FuchsiaGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 17, 3, FUCHSIA_CITY
-	warp_def 5, 17, 3, FUCHSIA_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue
-	bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue
-
-.ObjectEvents:
-	db 6
-	object_event 1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1
-	object_event 5, 7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1
-	object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1
-	object_event 9, 4, SPRITE_FUCHSIA_GYM_3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1
-	object_event 4, 2, SPRITE_FUCHSIA_GYM_4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1
-	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 17, FUCHSIA_CITY, 3
+	warp_event  5, 17, FUCHSIA_CITY, 3
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3, 15, BGEVENT_READ, FuchsiaGymStatue
+	bg_event  6, 15, BGEVENT_READ, FuchsiaGymStatue
+
+	db 6 ; object events
+	object_event  1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1
+	object_event  5,  7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1
+	object_event  5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1
+	object_event  9,  4, SPRITE_FUCHSIA_GYM_3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1
+	object_event  4,  2, SPRITE_FUCHSIA_GYM_4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1
+	object_event  7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm
index 4ab7932f3..b57e8259d 100644
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const FUCHSIAMART_CLERK
 	const FUCHSIAMART_FISHER
 	const FUCHSIAMART_COOLTRAINER_F
 
 FuchsiaMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x195ce8:
+FuchsiaMartClerkScript:
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_FUCHSIA
 	closetext
@@ -38,22 +36,17 @@ FuchsiaMartCooltrainerFText:
 	done
 
 FuchsiaMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, FUCHSIA_CITY
-	warp_def 3, 7, 1, FUCHSIA_CITY
+	db 2 ; warp events
+	warp_event  2,  7, FUCHSIA_CITY, 1
+	warp_event  3,  7, FUCHSIA_CITY, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1
-	object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaMartClerkScript, -1
+	object_event  3,  2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index 9bc8775a6..b05557046 100644
--- a/maps/FuchsiaPokecenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -1,21 +1,19 @@
-const_value set 2
+	const_def 2 ; object constants
 	const FUCHSIAPOKECENTER1F_NURSE
 	const FUCHSIAPOKECENTER1F_COOLTRAINER_M
 	const FUCHSIAPOKECENTER1F_COOLTRAINER_F
 	const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR
 
 FuchsiaPokecenter1F_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
 
-NurseScript_0x196459:
+FuchsiaPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
 FuchsiaPokecenter1FCooltrainerMScript:
@@ -24,27 +22,27 @@ FuchsiaPokecenter1FCooltrainerMScript:
 FuchsiaPokecenter1FCooltrainerFScript:
 	jumptextfaceplayer FuchsiaPokecenter1FCooltrainerFText
 
-JanineImpersonatorScript_0x196462:
+FuchsiaPokecenter1FJanineImpersonatorScript:
 	faceplayer
 	opentext
-	writetext UnknownText_0x19652e
+	writetext FuchsiaPokecenter1FJanineImpersonatorText1
 	waitbutton
 	closetext
-	applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
+	applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, FuchsiaPokecenter1FJanineImpersonatorSpinMovement
 	faceplayer
 	variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 	opentext
-	writetext UnknownText_0x19654e
+	writetext FuchsiaPokecenter1FJanineImpersonatorText2
 	waitbutton
 	closetext
-	applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
+	applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, FuchsiaPokecenter1FJanineImpersonatorSpinMovement
 	faceplayer
 	variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 	end
 
-MovementData_0x196486:
+FuchsiaPokecenter1FJanineImpersonatorSpinMovement:
 	turn_head DOWN
 	turn_head LEFT
 	turn_head UP
@@ -78,35 +76,30 @@ FuchsiaPokecenter1FCooltrainerFText:
 	cont "looked identical."
 	done
 
-UnknownText_0x19652e:
+FuchsiaPokecenter1FJanineImpersonatorText1:
 	text "I'm JANINE! Hocus-"
 	line "pocus… Poof!"
 	done
 
-UnknownText_0x19654e:
+FuchsiaPokecenter1FJanineImpersonatorText2:
 	text "See? I look just"
 	line "like her now!"
 	done
 
 FuchsiaPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 5, FUCHSIA_CITY
-	warp_def 4, 7, 5, FUCHSIA_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1
-	object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1
-	object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1
-	object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, FUCHSIA_CITY, 5
+	warp_event  4,  7, FUCHSIA_CITY, 5
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FNurseScript, -1
+	object_event  8,  4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1
+	object_event  1,  4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1
+	object_event  5,  3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FJanineImpersonatorScript, -1
diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm
index dc61c55ab..bfa6be81e 100644
--- a/maps/FuchsiaPokecenter2FBeta.asm
+++ b/maps/FuchsiaPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 FuchsiaPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FuchsiaPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 0, 7, 3, FUCHSIA_POKECENTER_1F
+	db 1 ; warp events
+	warp_event  0,  7, FUCHSIA_POKECENTER_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm
index 48cc677ab..62a1902e9 100644
--- a/maps/GoldenrodBikeShop.asm
+++ b/maps/GoldenrodBikeShop.asm
@@ -1,24 +1,22 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODBIKESHOP_CLERK
 
 GoldenrodBikeShop_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-UnknownScript_0x5474f:
+.UnreferencedDummyScene:
 	end
 
-ClerkScript_0x54750:
+GoldenrodBikeShopClerkScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_BICYCLE
-	iftrue UnknownScript_0x54775
+	iftrue .GotBicycle
 	writetext UnknownText_0x54787
 	yesorno
-	iffalse UnknownScript_0x5477b
+	iffalse .Refused
 	writetext UnknownText_0x547f8
 	buttonsound
 	waitsfx
@@ -29,24 +27,24 @@ ClerkScript_0x54750:
 	itemnotify
 	setflag ENGINE_BIKE_SHOP_CALL_ENABLED
 	setevent EVENT_GOT_BICYCLE
-UnknownScript_0x54775:
+.GotBicycle:
 	writetext UnknownText_0x5485f
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5477b:
+.Refused:
 	writetext UnknownText_0x54898
 	waitbutton
 	closetext
 	end
 
-; possibly unused
-UnknownScript_0x54781:
-	jumptext UnknownText_0x548c0
+GoldenrodBikeShopJustReleasedCompactBike:
+; unused
+	jumptext GoldenrodBikeShopJustReleasedCompactBikeText
 
-MapGoldenrodBikeShopSignpost8Script:
-	jumptext UnknownText_0x548ed
+GoldenrodBikeShopBicycle:
+	jumptext GoldenrodBikeShopBicycleText
 
 UnknownText_0x54787:
 	text "…sigh… I moved"
@@ -90,42 +88,37 @@ UnknownText_0x54898:
 	done
 
 ; possibly unused
-UnknownText_0x548c0:
+GoldenrodBikeShopJustReleasedCompactBikeText:
 	text "Just released!"
 
 	para "First-rate compact"
 	line "BICYCLES!"
 	done
 
-UnknownText_0x548ed:
+GoldenrodBikeShopBicycleText:
 	text "It's a shiny new"
 	line "BICYCLE!"
 	done
 
 GoldenrodBikeShop_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 2, GOLDENROD_CITY
-	warp_def 3, 7, 2, GOLDENROD_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 9
-	bg_event 1, 2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 0, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 1, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 0, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 1, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 0, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 1, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-	bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script
-
-.ObjectEvents:
-	db 1
-	object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, GOLDENROD_CITY, 2
+	warp_event  3,  7, GOLDENROD_CITY, 2
+
+	db 0 ; coord events
+
+	db 9 ; bg events
+	bg_event  1,  2, BGEVENT_READ, GoldenrodBikeShopBicycle
+	bg_event  0,  3, BGEVENT_READ, GoldenrodBikeShopBicycle
+	bg_event  1,  3, BGEVENT_READ, GoldenrodBikeShopBicycle
+	bg_event  0,  5, BGEVENT_READ, GoldenrodBikeShopBicycle
+	bg_event  1,  5, BGEVENT_READ, GoldenrodBikeShopBicycle
+	bg_event  0,  6, BGEVENT_READ, GoldenrodBikeShopBicycle
+	bg_event  1,  6, BGEVENT_READ, GoldenrodBikeShopBicycle
+	bg_event  6,  6, BGEVENT_READ, GoldenrodBikeShopBicycle
+	bg_event  7,  6, BGEVENT_READ, GoldenrodBikeShopBicycle
+
+	db 1 ; object events
+	object_event  7,  2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodBikeShopClerkScript, -1
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 89ca2bb0d..51041345f 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODCITY_POKEFAN_M1
 	const GOLDENRODCITY_YOUNGSTER1
 	const GOLDENRODCITY_COOLTRAINER_F1
@@ -16,17 +16,15 @@ const_value set 2
 	const GOLDENRODCITY_POKEFAN_M2
 
 GoldenrodCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria
 	callback MAPCALLBACK_OBJECTS, .MoveTutor
 
 .FlyPointAndFloria:
 	setflag ENGINE_FLYPOINT_GOLDENROD
-	setflag ENGINE_FLORIA
+	setflag ENGINE_REACHED_GOLDENROD
 	checkevent EVENT_MET_FLORIA
 	iftrue .FloriaDone
 	clearevent EVENT_FLORIA_AT_SUDOWOODO
@@ -39,8 +37,8 @@ GoldenrodCity_MapScripts:
 	checkitem COIN_CASE
 	iffalse .MoveTutorDisappear
 	checkcode VAR_WEEKDAY
-	if_equal WEDNESDAY, .MoveTutorAppear
-	if_equal SATURDAY, .MoveTutorAppear
+	ifequal WEDNESDAY, .MoveTutorAppear
+	ifequal SATURDAY, .MoveTutorAppear
 .MoveTutorDisappear:
 	disappear GOLDENRODCITY_POKEFAN_M2
 	return
@@ -52,55 +50,55 @@ GoldenrodCity_MapScripts:
 .MoveTutorDone:
 	return
 
-MoveTutor:
+MoveTutorScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x199042
 	yesorno
 	iffalse .Refused
-	special Special_DisplayCoinCaseBalance
+	special DisplayCoinCaseBalance
 	writetext UnknownText_0x199090
 	yesorno
 	iffalse .Refused2
 	checkcoins 4000
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	writetext UnknownText_0x1990ce
-	loadmenudata .MoveMenuDataHeader
+	loadmenu .MoveMenuHeader
 	verticalmenu
 	closewindow
-	if_equal MOVETUTOR_FLAMETHROWER, .Flamethrower
-	if_equal MOVETUTOR_THUNDERBOLT, .Thunderbolt
-	if_equal MOVETUTOR_ICE_BEAM, .IceBeam
+	ifequal MOVETUTOR_FLAMETHROWER, .Flamethrower
+	ifequal MOVETUTOR_THUNDERBOLT, .Thunderbolt
+	ifequal MOVETUTOR_ICE_BEAM, .IceBeam
 	jump .Incompatible
 
 .Flamethrower:
 	writebyte MOVETUTOR_FLAMETHROWER
 	writetext UnknownText_0x1991cf
-	special Special_MoveTutor
-	if_equal FALSE, .TeachMove
+	special MoveTutor
+	ifequal FALSE, .TeachMove
 	jump .Incompatible
 
 .Thunderbolt:
 	writebyte MOVETUTOR_THUNDERBOLT
 	writetext UnknownText_0x1991cf
-	special Special_MoveTutor
-	if_equal FALSE, .TeachMove
+	special MoveTutor
+	ifequal FALSE, .TeachMove
 	jump .Incompatible
 
 .IceBeam:
 	writebyte MOVETUTOR_ICE_BEAM
 	writetext UnknownText_0x1991cf
-	special Special_MoveTutor
-	if_equal FALSE, .TeachMove
+	special MoveTutor
+	ifequal FALSE, .TeachMove
 	jump .Incompatible
 
-.MoveMenuDataHeader:
+.MoveMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 15, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "FLAMETHROWER@"
@@ -126,12 +124,12 @@ MoveTutor:
 	takecoins 4000
 	waitsfx
 	playsound SFX_TRANSACTION
-	special Special_DisplayCoinCaseBalance
+	special DisplayCoinCaseBalance
 	writetext UnknownText_0x19918b
 	waitbutton
 	closetext
 	checkcode VAR_FACING
-	if_equal LEFT, .WalkAroundPlayer
+	ifequal LEFT, .WalkAroundPlayer
 	applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a5f
 	jump .GoInside
 
@@ -163,34 +161,34 @@ GoldenrodCityPokefanMScript:
 GoldenrodCityYoungster1Script:
 	jumptextfaceplayer GoldenrodCityYoungster1Text
 
-CooltrainerFScript_0x1989e9:
+GoldenrodCityCooltrainerF1Script:
 	faceplayer
 	opentext
 	checkevent EVENT_CLEARED_RADIO_TOWER
 	iftrue .ClearedRadioTower
-	writetext UnknownText_0x198ae6
+	writetext GoldenrodCityCooltrainerF1Text
 	waitbutton
 	closetext
 	end
 
 .ClearedRadioTower:
-	writetext UnknownText_0x198b2d
+	writetext GoldenrodCityCooltrainerF1Text_ClearedRadioTower
 	waitbutton
 	closetext
 	end
 
-CooltrainerFScript_0x1989fd:
+GoldenrodCityCooltrainerF2Script:
 	faceplayer
 	opentext
 	checkflag ENGINE_RADIO_CARD
 	iftrue .GotRadioCard
-	writetext UnknownText_0x198b73
+	writetext GoldenrodCityCooltrainerF2Text
 	waitbutton
 	closetext
 	end
 
 .GotRadioCard:
-	writetext UnknownText_0x198c14
+	writetext GoldenrodCityCooltrainerF2Text_GotRadioCard
 	waitbutton
 	closetext
 	end
@@ -212,7 +210,7 @@ GoldenrodCityRocketScoutScript:
 	writetext GoldenrodCityRocketScoutText2
 	waitbutton
 	closetext
-	spriteface GOLDENRODCITY_ROCKETSCOUT, UP
+	turnobject GOLDENRODCITY_ROCKETSCOUT, UP
 	end
 
 GoldenrodCityRocket1Script:
@@ -299,7 +297,7 @@ GoldenrodCityYoungster1Text:
 	line "anywhere."
 	done
 
-UnknownText_0x198ae6:
+GoldenrodCityCooltrainerF1Text:
 	text "Is that man in"
 	line "black dressed up"
 
@@ -307,7 +305,7 @@ UnknownText_0x198ae6:
 	line "member? How silly!"
 	done
 
-UnknownText_0x198b2d:
+GoldenrodCityCooltrainerF1Text_ClearedRadioTower:
 	text "Was that man in"
 	line "black really part"
 
@@ -315,7 +313,7 @@ UnknownText_0x198b2d:
 	line "can't believe it!"
 	done
 
-UnknownText_0x198b73:
+GoldenrodCityCooltrainerF2Text:
 	text "The RADIO TOWER in"
 	line "GOLDENROD CITY is"
 	cont "a landmark."
@@ -331,7 +329,7 @@ UnknownText_0x198b73:
 	line "serve as a radio."
 	done
 
-UnknownText_0x198c14:
+GoldenrodCityCooltrainerF2Text_GotRadioCard:
 	text "Oh, your #GEAR"
 	line "works as a radio!"
 	done
@@ -478,8 +476,8 @@ GoldenrodCityUndergroundSignSouthText:
 	line "ENTRANCE"
 	done
 
-PokeComCenterSignText:
-; unused in the english version
+GoldenrodCityPokeComCenterSignText:
+; unused
 	text "For Mobile Tips!"
 	line "#COM CENTER"
 	done
@@ -552,59 +550,54 @@ UnknownText_0x1991cf:
 	done
 
 GoldenrodCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 15
-	warp_def 24, 7, 1, GOLDENROD_GYM
-	warp_def 29, 29, 1, GOLDENROD_BIKE_SHOP
-	warp_def 31, 21, 1, GOLDENROD_HAPPINESS_RATER
-	warp_def 5, 25, 1, GOLDENROD_BILLS_HOUSE
-	warp_def 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION
-	warp_def 29, 5, 1, GOLDENROD_FLOWER_SHOP
-	warp_def 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE
-	warp_def 15, 7, 1, GOLDENROD_NAME_RATER
-	warp_def 24, 27, 1, GOLDENROD_DEPT_STORE_1F
-	warp_def 14, 21, 1, GOLDENROD_GAME_CORNER
-	warp_def 5, 15, 1, RADIO_TOWER_1F
-	warp_def 19, 1, 3, ROUTE_35_GOLDENROD_GATE
-	warp_def 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def 15, 27, 1, GOLDENROD_POKECENTER_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 12
+	db 0, 0 ; filler
+
+	db 15 ; warp events
+	warp_event 24,  7, GOLDENROD_GYM, 1
+	warp_event 29, 29, GOLDENROD_BIKE_SHOP, 1
+	warp_event 31, 21, GOLDENROD_HAPPINESS_RATER, 1
+	warp_event  5, 25, BILLS_FAMILYS_HOUSE, 1
+	warp_event  9, 13, GOLDENROD_MAGNET_TRAIN_STATION, 2
+	warp_event 29,  5, GOLDENROD_FLOWER_SHOP, 1
+	warp_event 33,  9, GOLDENROD_PP_SPEECH_HOUSE, 1
+	warp_event 15,  7, GOLDENROD_NAME_RATER, 1
+	warp_event 24, 27, GOLDENROD_DEPT_STORE_1F, 1
+	warp_event 14, 21, GOLDENROD_GAME_CORNER, 1
+	warp_event  5, 15, RADIO_TOWER_1F, 1
+	warp_event 19,  1, ROUTE_35_GOLDENROD_GATE, 3
+	warp_event  9,  5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 8
+	warp_event 11, 29, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 5
+	warp_event 15, 27, GOLDENROD_POKECENTER_1F, 1
+
+	db 0 ; coord events
+
+	db 12 ; bg events
 	bg_event 10, 14, BGEVENT_READ, GoldenrodCityStationSign
-	bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign
+	bg_event  4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign
 	bg_event 26, 27, BGEVENT_READ, GoldenrodDeptStoreSign
-	bg_event 26, 9, BGEVENT_READ, GoldenrodGymSign
+	bg_event 26,  9, BGEVENT_READ, GoldenrodGymSign
 	bg_event 22, 18, BGEVENT_READ, GoldenrodCitySign
 	bg_event 28, 30, BGEVENT_READ, GoldenrodCityBikeShopSign
 	bg_event 16, 22, BGEVENT_READ, GoldenrodCityGameCornerSign
-	bg_event 12, 7, BGEVENT_READ, GoldenrodCityNameRaterSign
-	bg_event 8, 6, BGEVENT_READ, GoldenrodCityUndergroundSignNorth
+	bg_event 12,  7, BGEVENT_READ, GoldenrodCityNameRaterSign
+	bg_event  8,  6, BGEVENT_READ, GoldenrodCityUndergroundSignNorth
 	bg_event 12, 30, BGEVENT_READ, GoldenrodCityUndergroundSignSouth
 	bg_event 16, 27, BGEVENT_UP, GoldenrodCityPokecenterSign
-	bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign
+	bg_event 30,  6, BGEVENT_READ, GoldenrodCityFlowerShopSign
 
-.ObjectEvents:
-	db 15
-	object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	db 15 ; object events
+	object_event  7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 20, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityCooltrainerF1Script, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 20, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityCooltrainerF2Script, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 19, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 17, 10, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
 	object_event 11, 27, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 4, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
+	object_event  4, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
 	object_event 28, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
-	object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
+	object_event  8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
 	object_event 16, 23, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 29, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 29,  7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 31, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR
+	object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutorScript, EVENT_GOLDENROD_CITY_MOVE_TUTOR
diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm
index 6f07b6ad4..5877484be 100644
--- a/maps/GoldenrodDeptStore1F.asm
+++ b/maps/GoldenrodDeptStore1F.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE1F_RECEPTIONIST
 	const GOLDENRODDEPTSTORE1F_POKEFAN_F
 	const GOLDENRODDEPTSTORE1F_BUG_CATCHER
 	const GOLDENRODDEPTSTORE1F_GENTLEMAN
 
 GoldenrodDeptStore1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GoldenrodDeptStore1FReceptionistScript:
 	jumptextfaceplayer GoldenrodDeptStore1FReceptionistText
@@ -79,27 +77,22 @@ GoldenrodDeptStore1FDirectoryText:
 	done
 
 GoldenrodDeptStore1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 7, 7, 9, GOLDENROD_CITY
-	warp_def 8, 7, 9, GOLDENROD_CITY
-	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_2F
-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton
-
-.ObjectEvents:
-	db 4
-	object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1
-	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1
-	object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1
-	object_event 11, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  7,  7, GOLDENROD_CITY, 9
+	warp_event  8,  7, GOLDENROD_CITY, 9
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_2F, 2
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore1FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton
+
+	db 4 ; object events
+	object_event 10,  1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1
+	object_event  5,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1
+	object_event  5,  5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1
+	object_event 11,  5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1
diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm
index bfe6a398f..268deb3a0 100644
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE2F_CLERK1
 	const GOLDENRODDEPTSTORE2F_CLERK2
 	const GOLDENRODDEPTSTORE2F_YOUNGSTER
@@ -6,20 +6,18 @@ const_value set 2
 	const GOLDENRODDEPTSTORE2F_GENTLEMAN
 
 GoldenrodDeptStore2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x55b5d:
+GoldenrodDeptStore2FClerk1Script:
 	faceplayer
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_1
 	closetext
 	end
 
-ClerkScript_0x55b65:
+GoldenrodDeptStore2FClerk2Script:
 	faceplayer
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_2
@@ -41,8 +39,8 @@ GoldenrodDeptStore2FDirectory:
 GoldenrodDeptStore2FElevatorButton:
 	jumpstd elevatorbutton
 
+GoldenrodDeptStore2FUnusedText1:
 ; unused
-UnusedText_0x55b7c:
 	text "We intend to sell"
 	line "items for #MON"
 	cont "to hold."
@@ -52,8 +50,8 @@ UnusedText_0x55b7c:
 	cont "MON hold it."
 	done
 
+GoldenrodDeptStore2FUnusedText2:
 ; unused
-UnusedText_0x55bd3:
 	text "By giving #MON"
 	line "items to hold, I"
 
@@ -101,27 +99,22 @@ GoldenrodDeptStore2FDirectoryText:
 	done
 
 GoldenrodDeptStore2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_3F
-	warp_def 15, 0, 3, GOLDENROD_DEPT_STORE_1F
-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton
-
-.ObjectEvents:
-	db 5
-	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1
-	object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1
-	object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1
-	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1
-	object_event 2, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 12,  0, GOLDENROD_DEPT_STORE_3F, 1
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_1F, 3
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore2FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton
+
+	db 5 ; object events
+	object_event 13,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FClerk1Script, -1
+	object_event 13,  6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FClerk2Script, -1
+	object_event  9,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1
+	object_event  6,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1
+	object_event  2,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1
diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
index c495cb440..b4441f3e4 100644
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE3F_CLERK
 	const GOLDENRODDEPTSTORE3F_SUPER_NERD
 	const GOLDENRODDEPTSTORE3F_ROCKER
 
 GoldenrodDeptStore3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x55db8:
+GoldenrodDeptStore3FClerkScript:
 	faceplayer
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_3F
@@ -57,25 +55,20 @@ GoldenrodDeptStore3FDirectoryText:
 	done
 
 GoldenrodDeptStore3F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_2F
-	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_4F
-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore3FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton
-
-.ObjectEvents:
-	db 3
-	object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1
-	object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1
-	object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 12,  0, GOLDENROD_DEPT_STORE_2F, 1
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_4F, 2
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore3FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton
+
+	db 3 ; object events
+	object_event  6,  1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FClerkScript, -1
+	object_event 12,  5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1
+	object_event  2,  5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index 03882b8f2..895c8a4fe 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE4F_CLERK
 	const GOLDENRODDEPTSTORE4F_COOLTRAINER_M
 	const GOLDENRODDEPTSTORE4F_BUG_CATCHER
 	const GOLDENRODDEPTSTORE4F_GAMEBOY_KID
 
 GoldenrodDeptStore4F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x55ee9:
+GoldenrodDeptStore4FClerkScript:
 	faceplayer
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_4F
@@ -24,13 +22,13 @@ GoldenrodDeptStore4FCooltrainerMScript:
 GoldenrodDeptStore4FBugCatcherScript:
 	jumptextfaceplayer GoldenrodDeptStore4FBugCatcherText
 
-GameboyKidScript_0x55ef7:
+GoldenrodDeptStore4FGameboyKidScript:
 	faceplayer
 	opentext
-	writetext UnknownText_0x55f74
+	writetext GoldenrodDeptStore4FGameboyKidText
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
+	turnobject GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
 	end
 
 GoldenrodDeptStore4FDirectory:
@@ -53,7 +51,7 @@ GoldenrodDeptStore4FBugCatcherText:
 	line "#MON's DEFENSE."
 	done
 
-UnknownText_0x55f74:
+GoldenrodDeptStore4FGameboyKidText:
 	text "Some #MON"
 	line "evolve only by"
 
@@ -78,26 +76,21 @@ GoldenrodDeptStore4FDirectoryText:
 	done
 
 GoldenrodDeptStore4F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_5F
-	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_3F
-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton
-
-.ObjectEvents:
-	db 4
-	object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1
-	object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
-	object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
-	object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 12,  0, GOLDENROD_DEPT_STORE_5F, 1
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_3F, 2
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore4FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton
+
+	db 4 ; object events
+	object_event 13,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FClerkScript, -1
+	object_event 11,  7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1
+	object_event  7,  2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1
+	object_event  5,  1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FGameboyKidScript, -1
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index 94da64d2f..4734656b3 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE5F_CLERK
 	const GOLDENRODDEPTSTORE5F_LASS
 	const GOLDENRODDEPTSTORE5F_MIKE
@@ -7,16 +7,14 @@ const_value set 2
 	const GOLDENRODDEPTSTORE5F_RECEPTIONIST
 
 GoldenrodDeptStore5F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .CheckIfSunday
 
 .CheckIfSunday:
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, .yes
+	ifequal SUNDAY, .yes
 	disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST
 	return
 
@@ -24,7 +22,7 @@ GoldenrodDeptStore5F_MapScripts:
 	appear GOLDENRODDEPTSTORE5F_RECEPTIONIST
 	return
 
-ClerkScript_0x5609c:
+GoldenrodDeptStore5FClerkScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_TM02_HEADBUTT
@@ -58,18 +56,18 @@ ClerkScript_0x5609c:
 	closetext
 	end
 
-ReceptionistScript_0x560ce:
+GoldenrodDeptStore5FReceptionistScript:
 	faceplayer
 	opentext
 	checkcode VAR_WEEKDAY
-	if_not_equal SUNDAY, .EventIsOver
-	checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
+	ifnotequal SUNDAY, .EventIsOver
+	checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
 	iftrue .EventIsOver
-	special Special_GetFirstPokemonHappiness
+	special GetFirstPokemonHappiness
 	writetext UnknownText_0x56143
 	buttonsound
-	if_greater_than 150 - 1, .VeryHappy
-	if_greater_than 50 - 1, .SomewhatHappy
+	ifgreater 150 - 1, .VeryHappy
+	ifgreater 50 - 1, .SomewhatHappy
 	jump .NotVeryHappy
 
 .VeryHappy:
@@ -77,7 +75,7 @@ ReceptionistScript_0x560ce:
 	buttonsound
 	verbosegiveitem TM_RETURN
 	iffalse .Done
-	setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
+	setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
 	closetext
 	end
 
@@ -92,7 +90,7 @@ ReceptionistScript_0x560ce:
 	buttonsound
 	verbosegiveitem TM_FRUSTRATION
 	iffalse .Done
-	setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
+	setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
 	closetext
 	end
 
@@ -106,12 +104,12 @@ ReceptionistScript_0x560ce:
 Carrie:
 	faceplayer
 	opentext
-	special Special_GameboyCheck
-	if_not_equal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver
+	special GameboyCheck
+	ifnotequal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver
 	writetext UnknownText_0x56241
 	waitbutton
 	closetext
-	special Special_UnlockMysteryGift
+	special UnlockMysteryGift
 	end
 
 .NotGBC:
@@ -126,7 +124,7 @@ GoldenrodDeptStore5FLassScript:
 Mike:
 	faceplayer
 	opentext
-	trade NPCTRADE_MIKE
+	trade NPC_TRADE_MIKE
 	waitbutton
 	closetext
 	end
@@ -218,28 +216,23 @@ GoldenrodDeptStore5FDirectoryText:
 	done
 
 GoldenrodDeptStore5F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_4F
-	warp_def 15, 0, 1, GOLDENROD_DEPT_STORE_6F
-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore5FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton
-
-.ObjectEvents:
-	db 6
-	object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1
-	object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1
-	object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1
-	object_event 13, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1
-	object_event 9, 1, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1
-	object_event 7, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 12,  0, GOLDENROD_DEPT_STORE_4F, 1
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_6F, 1
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore5FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton
+
+	db 6 ; object events
+	object_event  8,  5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FClerkScript, -1
+	object_event  3,  6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1
+	object_event  6,  3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1
+	object_event 13,  5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1
+	object_event  9,  1, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1
+	object_event  7,  5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FReceptionistScript, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 995afcada..fa21f5e92 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -1,31 +1,29 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTORE6F_LASS
 	const GOLDENRODDEPTSTORE6F_SUPER_NERD
 
 GoldenrodDeptStore6F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GoldenrodVendingMachine:
 	opentext
 	writetext GoldenrodVendingText
 .Start:
-	special Special_PlaceMoneyTopRight
-	loadmenudata .MenuData
+	special PlaceMoneyTopRight
+	loadmenu .MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .FreshWater
-	if_equal 2, .SodaPop
-	if_equal 3, .Lemonade
+	ifequal 1, .FreshWater
+	ifequal 2, .SodaPop
+	ifequal 3, .Lemonade
 	closetext
 	end
 
 .FreshWater:
 	checkmoney YOUR_MONEY, 200
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem FRESH_WATER
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 200
@@ -34,7 +32,7 @@ GoldenrodVendingMachine:
 
 .SodaPop:
 	checkmoney YOUR_MONEY, 300
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem SODA_POP
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 300
@@ -43,7 +41,7 @@ GoldenrodVendingMachine:
 
 .Lemonade:
 	checkmoney YOUR_MONEY, 350
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem LEMONADE
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, 350
@@ -68,13 +66,13 @@ GoldenrodVendingMachine:
 	waitbutton
 	jump .Start
 
-.MenuData:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "FRESH WATER  ¥200@"
@@ -148,28 +146,23 @@ GoldenrodDeptStore6FDirectoryText:
 	done
 
 GoldenrodDeptStore6F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_5F
-	warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-	warp_def 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 6
-	bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore6FDirectory
-	bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton
-	bg_event 8, 1, BGEVENT_UP, GoldenrodVendingMachine
-	bg_event 9, 1, BGEVENT_UP, GoldenrodVendingMachine
-	bg_event 10, 1, BGEVENT_UP, GoldenrodVendingMachine
-	bg_event 11, 1, BGEVENT_UP, GoldenrodVendingMachine
-
-.ObjectEvents:
-	db 2
-	object_event 10, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1
-	object_event 8, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 15,  0, GOLDENROD_DEPT_STORE_5F, 2
+	warp_event  2,  0, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+	warp_event 13,  0, GOLDENROD_DEPT_STORE_ROOF, 1
+
+	db 0 ; coord events
+
+	db 6 ; bg events
+	bg_event 14,  0, BGEVENT_READ, GoldenrodDeptStore6FDirectory
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton
+	bg_event  8,  1, BGEVENT_UP, GoldenrodVendingMachine
+	bg_event  9,  1, BGEVENT_UP, GoldenrodVendingMachine
+	bg_event 10,  1, BGEVENT_UP, GoldenrodVendingMachine
+	bg_event 11,  1, BGEVENT_UP, GoldenrodVendingMachine
+
+	db 2 ; object events
+	object_event 10,  2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1
+	object_event  8,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index 4d0603d0f..9c08c4198 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL1
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL2
 	const GOLDENRODDEPTSTOREB1F_POKE_BALL3
@@ -9,24 +9,22 @@ const_value set 2
 	const GOLDENRODDEPTSTOREB1F_MACHOP
 
 GoldenrodDeptStoreB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 2
-	callback MAPCALLBACK_TILES, UnknownScript_0x7d781
-	callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac
+	db 2 ; callbacks
+	callback MAPCALLBACK_TILES, .ClearBoxes
+	callback MAPCALLBACK_NEWMAP, .Unblock
 
-UnknownScript_0x7d781:
+.ClearBoxes:
 	checkevent EVENT_RECEIVED_CARD_KEY
-	iftrue UnknownScript_0x7d78a
-	jump UnknownScript_0x7d791
+	iftrue .GotCardKey
+	jump .Continue
 
-UnknownScript_0x7d78a:
+.GotCardKey:
 	changeblock 16, 4, $0d ; floor
-	jump UnknownScript_0x7d791
+	jump .Continue
 
-UnknownScript_0x7d791:
+.Continue:
 	checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
 	iftrue .Layout2
 	checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
@@ -42,7 +40,7 @@ UnknownScript_0x7d791:
 	changeblock 10, 12, $0d ; floor
 	return
 
-UnknownScript_0x7d7ac:
+.Unblock:
 	clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
 	return
 
@@ -55,7 +53,7 @@ GoldenrodDeptStoreB1FBlackBelt2Script:
 GoldenrodDeptStoreB1FBlackBelt3Script:
 	jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt3Text
 
-MachopScript_0x7d7b9:
+GoldenrodDeptStoreB1FMachopScript:
 	opentext
 	writetext UnknownText_0x7d8bb
 	cry MACHOKE
@@ -110,28 +108,23 @@ UnknownText_0x7d8bb:
 	done
 
 GoldenrodDeptStoreB1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE
-	warp_def 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR
-	warp_def 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 8
-	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
-	object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
-	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
-	object_event 15, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
-	object_event 9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1
-	object_event 4, 8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1
-	object_event 6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1
-	object_event 7, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 17,  2, GOLDENROD_UNDERGROUND_WAREHOUSE, 3
+	warp_event  9,  4, GOLDENROD_DEPT_STORE_ELEVATOR, 1
+	warp_event 10,  4, GOLDENROD_DEPT_STORE_ELEVATOR, 2
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 8 ; object events
+	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
+	object_event 14,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
+	object_event  6,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
+	object_event 15, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
+	object_event  9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1
+	object_event  4,  8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1
+	object_event  6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1
+	object_event  7,  7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FMachopScript, -1
diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm
index 6ff041e9f..e9d5e9d37 100644
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -1,13 +1,11 @@
 GoldenrodDeptStoreElevator_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-MapGoldenrodDeptStoreElevatorSignpost0Script:
+GoldenrodDeptStoreElevatorScript:
 	opentext
-	elevator Elevator_0x566e0
+	elevator GoldenrodDeptStoreElevatorData
 	closetext
 	iffalse .Done
 	pause 5
@@ -43,7 +41,7 @@ MapGoldenrodDeptStoreElevatorSignpost0Script:
 .Done:
 	end
 
-Elevator_0x566e0:
+GoldenrodDeptStoreElevatorData:
 	db 7 ; floors
 	elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F
 	elevfloor FLOOR_1F,  4, GOLDENROD_DEPT_STORE_1F
@@ -55,20 +53,15 @@ Elevator_0x566e0:
 	db -1 ; end
 
 GoldenrodDeptStoreElevator_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 1, 3, -1, GOLDENROD_DEPT_STORE_1F
-	warp_def 2, 3, -1, GOLDENROD_DEPT_STORE_1F
+	db 2 ; warp events
+	warp_event  1,  3, GOLDENROD_DEPT_STORE_1F, -1
+	warp_event  2,  3, GOLDENROD_DEPT_STORE_1F, -1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 3, 0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script
+	db 1 ; bg events
+	bg_event  3,  0, BGEVENT_READ, GoldenrodDeptStoreElevatorScript
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index 55f885e62..f385a3e8a 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODDEPTSTOREROOF_CLERK
 	const GOLDENRODDEPTSTOREROOF_POKEFAN_F
 	const GOLDENRODDEPTSTOREROOF_FISHER
@@ -9,11 +9,9 @@ const_value set 2
 	const GOLDENRODDEPTSTOREROOF_BUG_CATCHER
 
 GoldenrodDeptStoreRoof_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_TILES, .CheckSaleChangeBlock
 	callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk
 
@@ -39,7 +37,7 @@ GoldenrodDeptStoreRoof_MapScripts:
 	setevent EVENT_GOLDENROD_SALE_ON
 	return
 
-ClerkScript_0x5673f:
+GoldenrodDeptStoreRoofClerkScript:
 	opentext
 	pokemart MARTTYPE_ROOFTOP, 0
 	closetext
@@ -48,29 +46,29 @@ ClerkScript_0x5673f:
 GoldenrodDeptStoreRoofPokefanFScript:
 	jumptextfaceplayer GoldenrodDeptStoreRoofPokefanFText
 
-FisherScript_0x56749:
+GoldenrodDeptStoreRoofFisherScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x567d2
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTOREROOF_FISHER, UP
+	turnobject GOLDENRODDEPTSTOREROOF_FISHER, UP
 	end
 
 GoldenrodDeptStoreRoofTwinScript:
 	jumptextfaceplayer GoldenrodDeptStoreRoofTwinText
 
-SuperNerdScript_0x56757:
+GoldenrodDeptStoreRoofSuperNerdScript:
 	opentext
 	writetext UnknownText_0x56867
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP
+	turnobject GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP
 	opentext
 	writetext UnknownText_0x56871
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT
+	turnobject GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT
 	end
 
 GoldenrodDeptStoreRoofPokefanMScript:
@@ -212,30 +210,25 @@ PokeDollVendingMachineText:
 	done
 
 GoldenrodDeptStoreRoof_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 1
-	warp_def 13, 1, 3, GOLDENROD_DEPT_STORE_6F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 4
-	bg_event 15, 3, BGEVENT_RIGHT, Binoculars1
-	bg_event 15, 5, BGEVENT_RIGHT, Binoculars2
-	bg_event 15, 6, BGEVENT_RIGHT, Binoculars3
-	bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine
-
-.ObjectEvents:
-	db 8
-	object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF
-	object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1
-	object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1
-	object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON
-	object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON
-	object_event 7, 0, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF
-	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF
-	object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF
+	db 0, 0 ; filler
+
+	db 1 ; warp events
+	warp_event 13,  1, GOLDENROD_DEPT_STORE_6F, 3
+
+	db 0 ; coord events
+
+	db 4 ; bg events
+	bg_event 15,  3, BGEVENT_RIGHT, Binoculars1
+	bg_event 15,  5, BGEVENT_RIGHT, Binoculars2
+	bg_event 15,  6, BGEVENT_RIGHT, Binoculars3
+	bg_event  3,  0, BGEVENT_UP, PokeDollVendingMachine
+
+	db 8 ; object events
+	object_event  1,  4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofClerkScript, EVENT_GOLDENROD_SALE_OFF
+	object_event 10,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1
+	object_event  2,  1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofFisherScript, -1
+	object_event  3,  4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON
+	object_event 14,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofSuperNerdScript, EVENT_GOLDENROD_SALE_ON
+	object_event  7,  0, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF
+	object_event  5,  3, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF
+	object_event  1,  6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index 38a8edc3f..ea060d0d3 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODFLOWERSHOP_TEACHER
 	const GOLDENRODFLOWERSHOP_FLORIA
 
 GoldenrodFlowerShop_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FlowerShopTeacherScript:
 	checkevent EVENT_FOUGHT_SUDOWOODO
@@ -32,7 +30,7 @@ FlowerShopTeacherScript:
 	end
 
 .Lalala:
-	spriteface GOLDENRODFLOWERSHOP_TEACHER, LEFT
+	turnobject GOLDENRODFLOWERSHOP_TEACHER, LEFT
 	opentext
 	writetext UnknownText_0x5552e
 	waitbutton
@@ -160,21 +158,16 @@ UnknownText_0x55604:
 	done
 
 GoldenrodFlowerShop_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 6, GOLDENROD_CITY
-	warp_def 3, 7, 6, GOLDENROD_CITY
+	db 2 ; warp events
+	warp_event  2,  7, GOLDENROD_CITY, 6
+	warp_event  3,  7, GOLDENROD_CITY, 6
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1
-	object_event 5, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
+	db 2 ; object events
+	object_event  2,  4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1
+	object_event  5,  6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 58fc67192..288ec01d3 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODGAMECORNER_CLERK
 	const GOLDENRODGAMECORNER_RECEPTIONIST1
 	const GOLDENRODGAMECORNER_RECEPTIONIST2
@@ -13,11 +13,9 @@ const_value set 2
 	const GOLDENRODGAMECORNER_POKEFAN_M3
 
 GoldenrodGameCorner_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Callback
 
 .Callback:
@@ -26,8 +24,8 @@ GoldenrodGameCorner_MapScripts:
 	checkitem COIN_CASE
 	iffalse .move_tutor_inside
 	checkcode VAR_WEEKDAY
-	if_equal WEDNESDAY, .move_tutor_outside
-	if_equal SATURDAY, .move_tutor_outside
+	ifequal WEDNESDAY, .move_tutor_outside
+	ifequal SATURDAY, .move_tutor_outside
 .move_tutor_inside
 	appear GOLDENRODGAMECORNER_POKEFAN_M3
 	return
@@ -45,13 +43,13 @@ GoldenrodGameCornerPokefanM3Script:
 	writetext GoldenrodGameCornerPokefanM3Text
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
+	turnobject GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
 	end
 
-GoldenrodGmeCornerCoinVendorScript:
+GoldenrodGameCornerCoinVendorScript:
 	jumpstd gamecornercoinvendor
 
-GoldenrodGmeCornerTMVendorScript:
+GoldenrodGameCornerTMVendorScript:
 	faceplayer
 	opentext
 	writetext GoldenrodGameCornerPrizeVendorIntroText
@@ -59,60 +57,60 @@ GoldenrodGmeCornerTMVendorScript:
 	checkitem COIN_CASE
 	iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript
 	writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
-GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
-	special Special_DisplayCoinCaseBalance
-	loadmenudata GoldenrodGameCornerTMVendorMenuData
+GoldenrodGameCornerTMVendor_LoopScript:
+	special DisplayCoinCaseBalance
+	loadmenu GoldenrodGameCornerTMVendorMenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .Thunder
-	if_equal 2, .Blizzard
-	if_equal 3, .FireBlast
+	ifequal 1, .Thunder
+	ifequal 2, .Blizzard
+	ifequal 3, .FireBlast
 	jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
 
 .Thunder:
 	checkcoins 5500
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	itemtotext TM_THUNDER, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
 	giveitem TM_THUNDER
 	iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	takecoins 5500
-	jump GoldenrodGmeCornerTMVendor_FinishScript
+	jump GoldenrodGameCornerTMVendor_FinishScript
 
 .Blizzard:
 	checkcoins 5500
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	itemtotext TM_BLIZZARD, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
 	giveitem TM_BLIZZARD
 	iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	takecoins 5500
-	jump GoldenrodGmeCornerTMVendor_FinishScript
+	jump GoldenrodGameCornerTMVendor_FinishScript
 
 .FireBlast:
 	checkcoins 5500
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	itemtotext TM_FIRE_BLAST, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
 	giveitem TM_FIRE_BLAST
 	iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	takecoins 5500
-	jump GoldenrodGmeCornerTMVendor_FinishScript
+	jump GoldenrodGameCornerTMVendor_FinishScript
 
 GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript:
 	writetext GoldenrodGameCornerPrizeVendorConfirmPrizeText
 	yesorno
 	end
 
-GoldenrodGmeCornerTMVendor_FinishScript:
+GoldenrodGameCornerTMVendor_FinishScript:
 	waitsfx
 	playsound SFX_TRANSACTION
 	writetext GoldenrodGameCornerPrizeVendorHereYouGoText
 	waitbutton
-	jump GoldenrodGmeCornerTMVendor_LoopScript
+	jump GoldenrodGameCornerTMVendor_LoopScript
 
 GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript:
 	writetext GoldenrodGameCornerPrizeVendorNeedMoreCoinsText
@@ -138,13 +136,13 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript:
 	closetext
 	end
 
-GoldenrodGameCornerTMVendorMenuData:
+GoldenrodGameCornerTMVendorMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 15, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "TM25    5500@"
@@ -161,20 +159,20 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript
 .loop
 	writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
-	special Special_DisplayCoinCaseBalance
-	loadmenudata .MenuDataHeader
+	special DisplayCoinCaseBalance
+	loadmenu .MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, .abra
-	if_equal 2, .cubone
-	if_equal 3, .wobbuffet
+	ifequal 1, .abra
+	ifequal 2, .cubone
+	ifequal 3, .wobbuffet
 	jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
 
 .abra
 	checkcoins 100
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
+	ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	pokenamemem ABRA, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -183,16 +181,16 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	writetext GoldenrodGameCornerPrizeVendorHereYouGoText
 	waitbutton
 	writebyte ABRA
-	special Special_GameCornerPrizeMonCheckDex
+	special GameCornerPrizeMonCheckDex
 	givepoke ABRA, 5
 	takecoins 100
 	jump .loop
 
 .cubone
 	checkcoins 800
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
+	ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	pokenamemem CUBONE, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -201,16 +199,16 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	writetext GoldenrodGameCornerPrizeVendorHereYouGoText
 	waitbutton
 	writebyte CUBONE
-	special Special_GameCornerPrizeMonCheckDex
+	special GameCornerPrizeMonCheckDex
 	givepoke CUBONE, 15
 	takecoins 800
 	jump .loop
 
 .wobbuffet
 	checkcoins 1500
-	if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+	ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
+	ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	pokenamemem WOBBUFFET, MEM_BUFFER_0
 	scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
 	iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -219,18 +217,18 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	writetext GoldenrodGameCornerPrizeVendorHereYouGoText
 	waitbutton
 	writebyte WOBBUFFET
-	special Special_GameCornerPrizeMonCheckDex
+	special GameCornerPrizeMonCheckDex
 	givepoke WOBBUFFET, 15
 	takecoins 1500
 	jump .loop
 
-.MenuDataHeader:
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 17, TEXTBOX_Y - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "ABRA        100@"
@@ -244,7 +242,7 @@ GoldenrodGameCornerPharmacistScript:
 	writetext GoldenrodGameCornerPharmacistText
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	turnobject LAST_TALKED, LEFT
 	end
 
 GoldenrodGameCornerPokefanM1Script:
@@ -253,7 +251,7 @@ GoldenrodGameCornerPokefanM1Script:
 	writetext GoldenrodGameCornerPokefanM1Text
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT
+	turnobject GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT
 	end
 
 GoldenrodGameCornerCooltrainerMScript:
@@ -262,7 +260,7 @@ GoldenrodGameCornerCooltrainerMScript:
 	writetext GoldenrodGameCornerCooltrainerMText
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT
+	turnobject GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT
 	end
 
 GoldenrodGameCornerPokefanFScript:
@@ -271,7 +269,7 @@ GoldenrodGameCornerPokefanFScript:
 	writetext GoldenrodGameCornerPokefanFText
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT
+	turnobject GOLDENRODGAMECORNER_POKEFAN_F, RIGHT
 	end
 
 GoldenrodGameCornerCooltrainerFScript:
@@ -283,7 +281,7 @@ GoldenrodGameCornerGentlemanScript:
 	writetext GoldenrodGameCornerGentlemanText
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT
+	turnobject GOLDENRODGAMECORNER_GENTLEMAN, RIGHT
 	end
 
 GoldenrodGameCornerPokefanM2Script:
@@ -294,23 +292,23 @@ GoldenrodGameCornerLeftTheirDrinkScript:
 
 GoldenrodGameCornerSlotsMachineScript:
 	random 6
-	if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript
+	ifequal 0, GoldenrodGameCornerLuckySlotsMachineScript
 	refreshscreen
 	writebyte FALSE
-	special Special_SlotMachine
+	special SlotMachine
 	closetext
 	end
 
 GoldenrodGameCornerLuckySlotsMachineScript:
 	refreshscreen
 	writebyte TRUE
-	special Special_SlotMachine
+	special SlotMachine
 	closetext
 	end
 
 GoldenrodGameCornerCardFlipMachineScript:
 	refreshscreen
-	special Special_CardFlip
+	special CardFlip
 	closetext
 	end
 
@@ -437,62 +435,57 @@ GoldenrodGameCornerLeftTheirDrinkText:
 	done
 
 GoldenrodGameCorner_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 13, 10, GOLDENROD_CITY
-	warp_def 3, 13, 10, GOLDENROD_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 31
-	bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 6, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 7, BGEVENT_READ, GoldenrodGameCornerLuckySlotsMachineScript
-	bg_event 7, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 7, 11, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript
-	bg_event 12, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 12, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 12, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
-	bg_event 12, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2, 13, GOLDENROD_CITY, 10
+	warp_event  3, 13, GOLDENROD_CITY, 10
+
+	db 0 ; coord events
+
+	db 31 ; bg events
+	bg_event  6,  6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  6,  7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  6,  8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  6,  9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  6, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  6, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript
+	bg_event  7,  6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  7,  7, BGEVENT_READ, GoldenrodGameCornerLuckySlotsMachineScript
+	bg_event  7,  8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  7,  9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  7, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event  7, 11, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12,  6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12,  7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12,  8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
+	bg_event 12,  9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
 	bg_event 12, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript
 	bg_event 12, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript
-	bg_event 13, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 13, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 13, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 13, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13,  6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13,  7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13,  8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 13,  9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
 	bg_event 13, 10, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
 	bg_event 13, 11, BGEVENT_LEFT, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 18, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 18, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 18, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 18, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18,  6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18,  7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18,  8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
+	bg_event 18,  9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
 	bg_event 18, 10, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript
 	bg_event 18, 11, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript
-	bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript
-
-.ObjectEvents:
-	db 12
-	object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1
-	object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1
-	object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1
-	object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
-	object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
+	bg_event 12,  1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript
+
+	db 12 ; object events
+	object_event  3,  2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCoinVendorScript, -1
+	object_event 16,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerTMVendorScript, -1
+	object_event 18,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1
+	object_event  8,  7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
+	object_event  8,  7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
 	object_event 11, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1
-	object_event 14, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1
-	object_event 17, 6, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1
-	object_event 10, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1
-	object_event 5, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1
-	object_event 2, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1
+	object_event 14,  8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1
+	object_event 17,  6, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1
+	object_event 10,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1
+	object_event  5, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1
+	object_event  2,  9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1
 	object_event 17, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index f4eac1b6b..aa3a6e5ba 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODGYM_WHITNEY
 	const GOLDENRODGYM_LASS1
 	const GOLDENRODGYM_LASS2
@@ -7,13 +7,11 @@ const_value set 2
 	const GOLDENRODGYM_GYM_GUY
 
 GoldenrodGym_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_GOLDENRODGYM_NOTHING
+	scene_script .DummyScene1 ; SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -21,21 +19,21 @@ GoldenrodGym_MapScripts:
 .DummyScene1:
 	end
 
-WhitneyScript_0x5400c:
+GoldenrodGymWhitneyScript:
 	faceplayer
 	checkevent EVENT_BEAT_WHITNEY
 	iftrue .FightDone
 	opentext
-	writetext UnknownText_0x54122
+	writetext WhitneyBeforeText
 	waitbutton
 	closetext
-	winlosstext UnknownText_0x541a5, 0
+	winlosstext WhitneyShouldntBeSoSeriousText, 0
 	loadtrainer WHITNEY, WHITNEY1
 	startbattle
 	reloadmapafterbattle
 	setevent EVENT_BEAT_WHITNEY
 	setevent EVENT_MADE_WHITNEY_CRY
-	setscene 1
+	setscene SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING
 	setevent EVENT_BEAT_BEAUTY_VICTORIA
 	setevent EVENT_BEAT_BEAUTY_SAMANTHA
 	setevent EVENT_BEAT_LASS_CARRIE
@@ -44,46 +42,46 @@ WhitneyScript_0x5400c:
 	opentext
 	checkevent EVENT_MADE_WHITNEY_CRY
 	iffalse .StoppedCrying
-	writetext UnknownText_0x541f4
+	writetext WhitneyYouMeanieText
 	waitbutton
 	closetext
 	end
 
 .StoppedCrying:
 	checkevent EVENT_GOT_TM45_ATTRACT
-	iftrue UnknownScript_0x54077
+	iftrue .GotAttract
 	checkflag ENGINE_PLAINBADGE
-	iftrue UnknownScript_0x54064
-	writetext UnknownText_0x54222
+	iftrue .GotPlainBadge
+	writetext WhitneyWhatDoYouWantText
 	buttonsound
 	waitsfx
-	writetext UnknownText_0x54273
+	writetext PlayerReceivedPlainBadgeText
 	playsound SFX_GET_BADGE
 	waitsfx
 	setflag ENGINE_PLAINBADGE
 	checkcode VAR_BADGES
 	scall GoldenrodGymActivateRockets
-UnknownScript_0x54064:
-	writetext UnknownText_0x5428b
+.GotPlainBadge:
+	writetext WhitneyPlainBadgeText
 	buttonsound
 	verbosegiveitem TM_ATTRACT
-	iffalse UnknownScript_0x5407b
+	iffalse .NoRoomForAttract
 	setevent EVENT_GOT_TM45_ATTRACT
-	writetext UnknownText_0x54302
+	writetext WhitneyAttractText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x54077:
-	writetext UnknownText_0x54360
+.GotAttract:
+	writetext WhitneyGoodCryText
 	waitbutton
-UnknownScript_0x5407b:
+.NoRoomForAttract:
 	closetext
 	end
 
 GoldenrodGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -93,10 +91,10 @@ GoldenrodGymActivateRockets:
 	jumpstd radiotowerrockets
 
 TrainerLassCarrie:
-	trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script
+	trainer LASS, CARRIE, EVENT_BEAT_LASS_CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassCarrieAfterBattleText
 	waitbutton
@@ -106,21 +104,21 @@ TrainerLassCarrie:
 WhitneyCriesScript:
 	showemote EMOTE_SHOCK, GOLDENRODGYM_LASS2, 15
 	applymovement GOLDENRODGYM_LASS2, BridgetWalksUpMovement
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	opentext
 	writetext BridgetWhitneyCriesText
 	waitbutton
 	closetext
 	applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement
-	setscene 0
+	setscene SCENE_GOLDENRODGYM_NOTHING
 	clearevent EVENT_MADE_WHITNEY_CRY
 	end
 
 TrainerLassBridget:
-	trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script
+	trainer LASS, BRIDGET, EVENT_BEAT_LASS_BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassBridgetAfterBattleText
 	waitbutton
@@ -128,10 +126,10 @@ TrainerLassBridget:
 	end
 
 TrainerBeautyVictoria:
-	trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script
+	trainer BEAUTY, VICTORIA, EVENT_BEAT_BEAUTY_VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautyVictoriaAfterBattleText
 	waitbutton
@@ -139,10 +137,10 @@ TrainerBeautyVictoria:
 	end
 
 TrainerBeautySamantha:
-	trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script
+	trainer BEAUTY, SAMANTHA, EVENT_BEAT_BEAUTY_SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautySamanthaAfterBattleText
 	waitbutton
@@ -184,7 +182,7 @@ BridgetWalksAwayMovement:
 	turn_head LEFT
 	step_end
 
-UnknownText_0x54122:
+WhitneyBeforeText:
 	text "Hi! I'm WHITNEY!"
 
 	para "Everyone was into"
@@ -199,7 +197,7 @@ UnknownText_0x54122:
 	cont "you--I'm good!"
 	done
 
-UnknownText_0x541a5:
+WhitneyShouldntBeSoSeriousText:
 	text "Sob…"
 
 	para "…Waaaaaaah!"
@@ -210,7 +208,7 @@ UnknownText_0x541a5:
 	cont "you child, you!"
 	done
 
-UnknownText_0x541f4:
+WhitneyYouMeanieText:
 	text "Waaaaah!"
 
 	para "Waaaaah!"
@@ -219,7 +217,7 @@ UnknownText_0x541f4:
 	line "…You meanie!"
 	done
 
-UnknownText_0x54222:
+WhitneyWhatDoYouWantText:
 	text "…Sniff…"
 
 	para "What? What do you"
@@ -230,12 +228,12 @@ UnknownText_0x54222:
 	cont "PLAINBADGE."
 	done
 
-UnknownText_0x54273:
+PlayerReceivedPlainBadgeText:
 	text "<PLAYER> received"
 	line "PLAINBADGE."
 	done
 
-UnknownText_0x5428b:
+WhitneyPlainBadgeText:
 	text "PLAINBADGE lets"
 	line "your #MON use"
 
@@ -250,7 +248,7 @@ UnknownText_0x5428b:
 	line "this too!"
 	done
 
-UnknownText_0x54302:
+WhitneyAttractText:
 	text "It's ATTRACT!"
 	line "It makes full use"
 
@@ -262,7 +260,7 @@ UnknownText_0x54302:
 	cont "like me?"
 	done
 
-UnknownText_0x54360:
+WhitneyGoodCryText:
 	text "Ah, that was a"
 	line "good cry!"
 
@@ -380,28 +378,23 @@ GoldenrodGymGuyWinText:
 	done
 
 GoldenrodGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 17, 1, GOLDENROD_CITY
-	warp_def 3, 17, 1, GOLDENROD_CITY
-
-.CoordEvents:
-	db 1
-	coord_event 8, 5, 1, WhitneyCriesScript
-
-.BGEvents:
-	db 2
-	bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue
-	bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue
-
-.ObjectEvents:
-	db 6
-	object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1
-	object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
-	object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
-	object_event 0, 2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1
-	object_event 19, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1
-	object_event 5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2, 17, GOLDENROD_CITY, 1
+	warp_event  3, 17, GOLDENROD_CITY, 1
+
+	db 1 ; coord events
+	coord_event  8,  5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript
+
+	db 2 ; bg events
+	bg_event  1, 15, BGEVENT_READ, GoldenrodGymStatue
+	bg_event  4, 15, BGEVENT_READ, GoldenrodGymStatue
+
+	db 6 ; object events
+	object_event  8,  3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymWhitneyScript, -1
+	object_event  9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
+	object_event  9,  6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
+	object_event  0,  2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1
+	object_event 19,  5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1
+	object_event  5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index f31e8603f..2b2093a29 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -1,60 +1,58 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODHAPPINESSRATER_TEACHER
 	const GOLDENRODHAPPINESSRATER_POKEFAN_M
 	const GOLDENRODHAPPINESSRATER_TWIN
 
 GoldenrodHappinessRater_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-TeacherScript_0x54953:
+GoldenrodHappinessRaterTeacherScript:
 	faceplayer
 	opentext
-	special Special_GetFirstPokemonHappiness
-	writetext UnknownText_0x549a3
+	special GetFirstPokemonHappiness
+	writetext GoldenrodHappinessRaterTeacherText
 	buttonsound
-	if_greater_than 250 - 1, UnknownScript_0x54973
-	if_greater_than 200 - 1, UnknownScript_0x54979
-	if_greater_than 150 - 1, UnknownScript_0x5497f
-	if_greater_than 100 - 1, UnknownScript_0x54985
-	if_greater_than  50 - 1, UnknownScript_0x5498b
-	jump UnknownScript_0x54991
-
-UnknownScript_0x54973:
-	writetext UnknownText_0x549fc
+	ifgreater 250 - 1, .LovesYouALot
+	ifgreater 200 - 1, .ReallyTrustsYou
+	ifgreater 150 - 1, .SortOfHappy
+	ifgreater 100 - 1, .QuiteCute
+	ifgreater  50 - 1, .NotUsedToYou
+	jump .LooksMean
+
+.LovesYouALot:
+	writetext GoldenrodHappinessRatingText_LovesYouALot
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x54979:
-	writetext UnknownText_0x54a2c
+.ReallyTrustsYou:
+	writetext GoldenrodHappinessRatingText_ReallyTrustsYou
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5497f:
-	writetext UnknownText_0x54a5a
+.SortOfHappy:
+	writetext GoldenrodHappinessRatingText_SortOfHappy
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x54985:
-	writetext UnknownText_0x54a8e
+.QuiteCute:
+	writetext GoldenrodHappinessRatingText_QuiteCute
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5498b:
-	writetext UnknownText_0x54a9f
+.NotUsedToYou:
+	writetext GoldenrodHappinessRatingText_NotUsedToYou
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x54991:
-	writetext UnknownText_0x54ad1
+.LooksMean:
+	writetext GoldenrodHappinessRatingText_LooksMean
 	waitbutton
 	closetext
 	end
@@ -71,7 +69,7 @@ HappinessRatersHouseBookshelf:
 HappinessRatersHouseRadio:
 	jumpstd radio2
 
-UnknownText_0x549a3:
+GoldenrodHappinessRaterTeacherText:
 	text "If you treat your"
 	line "#MON nicely,"
 
@@ -84,35 +82,35 @@ UnknownText_0x549a3:
 	text "…"
 	done
 
-UnknownText_0x549fc:
+GoldenrodHappinessRatingText_LovesYouALot:
 	text "It looks really"
 	line "happy! It must"
 	cont "love you a lot."
 	done
 
-UnknownText_0x54a2c:
+GoldenrodHappinessRatingText_ReallyTrustsYou:
 	text "I get the feeling"
 	line "that it really"
 	cont "trusts you."
 	done
 
-UnknownText_0x54a5a:
+GoldenrodHappinessRatingText_SortOfHappy:
 	text "It's friendly to-"
 	line "ward you. It looks"
 	cont "sort of happy."
 	done
 
-UnknownText_0x54a8e:
+GoldenrodHappinessRatingText_QuiteCute:
 	text "It's quite cute."
 	done
 
-UnknownText_0x54a9f:
+GoldenrodHappinessRatingText_NotUsedToYou:
 	text "You should treat"
 	line "it better. It's"
 	cont "not used to you."
 	done
 
-UnknownText_0x54ad1:
+GoldenrodHappinessRatingText_LooksMean:
 	text "It doesn't seem to"
 	line "like you at all."
 	cont "It looks mean."
@@ -137,25 +135,20 @@ GoldenrodHappinessRaterTwinText:
 	done
 
 GoldenrodHappinessRater_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 3, GOLDENROD_CITY
-	warp_def 3, 7, 3, GOLDENROD_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 0, 1, BGEVENT_READ, HappinessRatersHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf
-	bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio
-
-.ObjectEvents:
-	db 3
-	object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1
-	object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1
-	object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, GOLDENROD_CITY, 3
+	warp_event  3,  7, GOLDENROD_CITY, 3
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  0,  1, BGEVENT_READ, HappinessRatersHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, HappinessRatersHouseBookshelf
+	bg_event  7,  1, BGEVENT_READ, HappinessRatersHouseRadio
+
+	db 3 ; object events
+	object_event  2,  4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTeacherScript, -1
+	object_event  5,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1
+	object_event  5,  6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index c0f749413..69836e012 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -1,19 +1,17 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODMAGNETTRAINSTATION_OFFICER
 	const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN
 
 GoldenrodMagnetTrainStation_MapScripts:
-.SceneScripts:
-	db 1
-	scene_script .DummyScene
+	db 1 ; scene scripts
+	scene_script .DummyScene ; SCENE_DEFAULT
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
 
-OfficerScript_0x550ec:
+GoldenrodMagnetTrainStationOfficerScript:
 	faceplayer
 	opentext
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
@@ -35,7 +33,7 @@ OfficerScript_0x550ec:
 	applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146
 	applymovement PLAYER, MovementData_0x5514f
 	writebyte FALSE
-	special Special_MagnetTrain
+	special MagnetTrain
 	warpcheck
 	newloadmap MAPSETUP_TRAIN
 	applymovement PLAYER, .MovementBoardTheTrain
@@ -165,24 +163,19 @@ GoldenrodMagnetTrainStationGentlemanText:
 	done
 
 GoldenrodMagnetTrainStation_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 8, 17, 5, GOLDENROD_CITY
-	warp_def 9, 17, 5, GOLDENROD_CITY
-	warp_def 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION
-	warp_def 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION
-
-.CoordEvents:
-	db 1
-	coord_event 11, 6, 0, Script_ArriveFromSaffron
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 2
-	object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  8, 17, GOLDENROD_CITY, 5
+	warp_event  9, 17, GOLDENROD_CITY, 5
+	warp_event  6,  5, SAFFRON_MAGNET_TRAIN_STATION, 4
+	warp_event 11,  5, SAFFRON_MAGNET_TRAIN_STATION, 3
+
+	db 1 ; coord events
+	coord_event 11,  6, SCENE_DEFAULT, Script_ArriveFromSaffron
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  9,  9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationOfficerScript, -1
 	object_event 11, 14, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index fc3369a21..16ffddb2c 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODNAMERATER_NAME_RATER
 
 GoldenrodNameRater_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GoldenrodNameRater:
 	faceplayer
 	opentext
-	special Special_NameRater
+	special NameRater
 	waitbutton
 	closetext
 	end
@@ -22,26 +20,21 @@ GoldenrodNameRaterBookshelf:
 GoldenrodNameRaterRadio:
 	jumpstd radio2
 
-INCLUDE "data/unused/sweet_honey_text.asm"
+INCLUDE "data/text/unused_sweet_honey.asm"
 
 GoldenrodNameRater_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 8, GOLDENROD_CITY
-	warp_def 3, 7, 8, GOLDENROD_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf
-	bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf
-	bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio
-
-.ObjectEvents:
-	db 1
-	object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, GOLDENROD_CITY, 8
+	warp_event  3,  7, GOLDENROD_CITY, 8
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  0,  1, BGEVENT_READ, GoldenrodNameRaterBookshelf
+	bg_event  1,  1, BGEVENT_READ, GoldenrodNameRaterBookshelf
+	bg_event  7,  1, BGEVENT_READ, GoldenrodNameRaterRadio
+
+	db 1 ; object events
+	object_event  2,  4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1
diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm
index 416ed37c7..2f43993d1 100644
--- a/maps/GoldenrodPPSpeechHouse.asm
+++ b/maps/GoldenrodPPSpeechHouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODPPSPEECHHOUSE_FISHER
 	const GOLDENRODPPSPEECHHOUSE_LASS
 
 GoldenrodPPSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GoldenrodPPSpeechHouseFisherScript:
 	jumptextfaceplayer GoldenrodPPSpeechHouseFisherText
@@ -52,24 +50,19 @@ GoldenrodPPSpeechHouseLassText:
 	done
 
 GoldenrodPPSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 7, GOLDENROD_CITY
-	warp_def 3, 7, 7, GOLDENROD_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1
-	bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2
-	bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio
-
-.ObjectEvents:
-	db 2
-	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1
-	object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, GOLDENROD_CITY, 7
+	warp_event  3,  7, GOLDENROD_CITY, 7
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  0,  1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1
+	bg_event  1,  1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2
+	bg_event  7,  1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio
+
+	db 2 ; object events
+	object_event  2,  4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1
+	object_event  5,  3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index e835ff320..20cf07506 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODPOKECENTER1F_NURSE
 	const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	const GOLDENRODPOKECENTER1F_GAMEBOY_KID
@@ -6,19 +6,17 @@ const_value set 2
 	const GOLDENRODPOKECENTER1F_POKEFAN_F
 
 GoldenrodPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x60f91:
+GoldenrodPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
 GoldenrodPokecenter1F_GSBallSceneLeft:
 	writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
-	special Special_BattleTowerAction
-	if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
+	special BattleTowerAction
+	ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
 	end
 
 .gsball
@@ -30,7 +28,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft:
 	appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	playmusic MUSIC_SHOW_ME_AROUND
 	applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6105a
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext UnknownText_0x622f0
 	waitbutton
@@ -49,8 +47,8 @@ GoldenrodPokecenter1F_GSBallSceneLeft:
 
 GoldenrodPokecenter1F_GSBallSceneRight:
 	writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
-	special Special_BattleTowerAction
-	if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
+	special BattleTowerAction
+	ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
 	end
 
 .gsball
@@ -62,7 +60,7 @@ GoldenrodPokecenter1F_GSBallSceneRight:
 	appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	playmusic MUSIC_SHOW_ME_AROUND
 	applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61065
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext UnknownText_0x622f0
 	waitbutton
@@ -85,34 +83,34 @@ GoldenrodPokecenter1FGameboyKidScript:
 GoldenrodPokecenter1FLassScript:
 	jumptextfaceplayer GoldenrodPokecenter1FLassText
 
-PokefanFScript_0x61024:
+GoldenrodPokecenter1FPokefanF:
 	faceplayer
 	opentext
 	writetext UnknownText_0x623fb
 	waitbutton
 	writetext UnknownText_0x6248c
 	yesorno
-	iffalse UnknownScript_0x6104b
+	iffalse .NoEonMail
 	takeitem EON_MAIL
-	iffalse UnknownScript_0x6104b
+	iffalse .NoEonMail
 	writetext UnknownText_0x62549
 	waitbutton
 	writetext UnknownText_0x624a4
 	waitbutton
 	verbosegiveitem REVIVE
-	iffalse UnknownScript_0x61051
+	iffalse .NoRoom
 	writetext UnknownText_0x624e9
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6104b:
+.NoEonMail:
 	writetext UnknownText_0x62509
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x61051:
+.NoRoom:
 	giveitem EON_MAIL
 	writetext UnknownText_0x6252a
 	waitbutton
@@ -805,28 +803,23 @@ UnknownText_0x62549:
 	done
 
 GoldenrodPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 3, 7, 15, GOLDENROD_CITY
-	warp_def 4, 7, 15, GOLDENROD_CITY
-	warp_def 0, 6, 1, GOLDENROD_POKECOM_CENTER_2F_MOBILE
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 2
-	coord_event 3, 7, 0, GoldenrodPokecenter1F_GSBallSceneLeft
-	coord_event 4, 7, 0, GoldenrodPokecenter1F_GSBallSceneRight
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 5
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1
-	object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
-	object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1
-	object_event 1, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1
-	object_event 7, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  3,  7, GOLDENROD_CITY, 15
+	warp_event  4,  7, GOLDENROD_CITY, 15
+	warp_event  0,  6, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 1
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 2 ; coord events
+	coord_event  3,  7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft
+	coord_event  4,  7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneRight
+
+	db 0 ; bg events
+
+	db 5 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FNurseScript, -1
+	object_event 16,  8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event  6,  1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1
+	object_event  1,  4, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1
+	object_event  7,  5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FPokefanF, -1
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 06e15d67a..c83709b03 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODUNDERGROUND_SUPER_NERD1
 	const GOLDENRODUNDERGROUND_SUPER_NERD2
 	const GOLDENRODUNDERGROUND_SUPER_NERD3
@@ -10,11 +10,9 @@ const_value set 2
 	const GOLDENRODUNDERGROUND_GRANNY
 
 GoldenrodUnderground_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 3
+	db 3 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .ResetSwitches
 	callback MAPCALLBACK_TILES, .CheckBasementKey
 	callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek
@@ -50,12 +48,12 @@ GoldenrodUnderground_MapScripts:
 
 .CheckDayOfWeek:
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, .Monday
-	if_equal TUESDAY, .Tuesday
-	if_equal WEDNESDAY, .Wednesday
-	if_equal THURSDAY, .Thursday
-	if_equal FRIDAY, .Friday
-	if_equal SATURDAY, .Saturday
+	ifequal MONDAY, .Monday
+	ifequal TUESDAY, .Tuesday
+	ifequal WEDNESDAY, .Wednesday
+	ifequal THURSDAY, .Thursday
+	ifequal FRIDAY, .Friday
+	ifequal SATURDAY, .Saturday
 
 .Sunday:
 	disappear GOLDENRODUNDERGROUND_GRAMPS
@@ -66,7 +64,7 @@ GoldenrodUnderground_MapScripts:
 
 .Monday:
 	disappear GOLDENRODUNDERGROUND_GRAMPS
-	checkmorn
+	checktime MORN
 	iffalse .NotMondayMorning
 	appear GOLDENRODUNDERGROUND_GRAMPS
 .NotMondayMorning:
@@ -111,10 +109,10 @@ GoldenrodUnderground_MapScripts:
 	return
 
 TrainerSupernerdEric:
-	trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script
+	trainer SUPER_NERD, ERIC, EVENT_BEAT_SUPER_NERD_ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdEricAfterBattleText
 	waitbutton
@@ -122,10 +120,10 @@ TrainerSupernerdEric:
 	end
 
 TrainerSupernerdTeru:
-	trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script
+	trainer SUPER_NERD, TERU, EVENT_BEAT_SUPER_NERD_TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdTeruAfterBattleText
 	waitbutton
@@ -133,10 +131,10 @@ TrainerSupernerdTeru:
 	end
 
 TrainerPokemaniacIssac:
-	trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script
+	trainer POKEMANIAC, ISSAC, EVENT_BEAT_POKEMANIAC_ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacIssacAfterBattleText
 	waitbutton
@@ -144,21 +142,21 @@ TrainerPokemaniacIssac:
 	end
 
 TrainerPokemaniacDonald:
-	trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script
+	trainer POKEMANIAC, DONALD, EVENT_BEAT_POKEMANIAC_DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacDonaldAfterBattleText
 	waitbutton
 	closetext
 	end
 
-GrannyScript_0x7c132:
+BitterMerchantScript:
 	opentext
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, .Open
-	if_equal SATURDAY, .Open
+	ifequal SUNDAY, .Open
+	ifequal SATURDAY, .Open
 	jump GoldenrodUndergroundScript_ShopClosed
 
 .Open:
@@ -166,16 +164,16 @@ GrannyScript_0x7c132:
 	closetext
 	end
 
-GrampsScript_0x7c146:
+BargainMerchantScript:
 	opentext
 	checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
 	iftrue GoldenrodUndergroundScript_ShopClosed
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, .CheckMorn
+	ifequal MONDAY, .CheckMorn
 	jump GoldenrodUndergroundScript_ShopClosed
 
 .CheckMorn:
-	checkmorn
+	checktime MORN
 	iffalse GoldenrodUndergroundScript_ShopClosed
 	pokemart MARTTYPE_BARGAIN, 0
 	closetext
@@ -184,67 +182,67 @@ GrampsScript_0x7c146:
 OlderHaircutBrotherScript:
 	opentext
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .DoHaircut
-	if_equal THURSDAY, .DoHaircut
-	if_equal SATURDAY, .DoHaircut
+	ifequal TUESDAY, .DoHaircut
+	ifequal THURSDAY, .DoHaircut
+	ifequal SATURDAY, .DoHaircut
 	jump GoldenrodUndergroundScript_ShopClosed
 
 .DoHaircut:
 	checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
 	iftrue .AlreadyGotHaircut
-	special Special_PlaceMoneyTopRight
+	special PlaceMoneyTopRight
 	writetext UnknownText_0x7c5f9
 	yesorno
 	iffalse .Refused
 	checkmoney YOUR_MONEY, 500
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	writetext UnknownText_0x7c69a
 	buttonsound
-	special Special_YoungerHaircutBrother
-	if_equal $0, .Refused
-	if_equal $1, .Refused
+	special YoungerHaircutBrother
+	ifequal $0, .Refused
+	ifequal $1, .Refused
 	setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
-	if_equal $2, .two
-	if_equal $3, .three
+	ifequal $2, .two
+	ifequal $3, .three
 	jump .else
 
 .two
-	setevent EVENT_GAVE_KURT_APRICORNS
-	clearevent EVENT_RECEIVED_BALLS_FROM_KURT
-	clearevent EVENT_DRAGON_SHRINE_QUESTION_2
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	jump .then
 
 .three
-	clearevent EVENT_GAVE_KURT_APRICORNS
-	setevent EVENT_RECEIVED_BALLS_FROM_KURT
-	clearevent EVENT_DRAGON_SHRINE_QUESTION_2
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	jump .then
 
 .else
-	clearevent EVENT_GAVE_KURT_APRICORNS
-	clearevent EVENT_RECEIVED_BALLS_FROM_KURT
-	setevent EVENT_DRAGON_SHRINE_QUESTION_2
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	jump .then
 
 .then
 	takemoney YOUR_MONEY, 500
-	special Special_PlaceMoneyTopRight
+	special PlaceMoneyTopRight
 	writetext UnknownText_0x7c6b8
 	waitbutton
 	closetext
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	playmusic MUSIC_HEAL
 	pause 60
-	special Special_FadeInPalettes
+	special FadeInPalettes
 	special RestartMapMusic
 	opentext
 	writetext UnknownText_0x7c6d8
 	waitbutton
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iftrue UnknownScript_0x7c2bb
-	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
-	iftrue UnknownScript_0x7c2c4
-	jump UnknownScript_0x7c2cd
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iftrue EitherHaircutBrotherScript_SlightlyHappier
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	iftrue EitherHaircutBrotherScript_Happier
+	jump EitherHaircutBrotherScript_MuchHappier
 
 .Refused:
 	writetext UnknownText_0x7c6ea
@@ -267,67 +265,67 @@ OlderHaircutBrotherScript:
 YoungerHaircutBrotherScript:
 	opentext
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, .DoHaircut
-	if_equal WEDNESDAY, .DoHaircut
-	if_equal FRIDAY, .DoHaircut
+	ifequal SUNDAY, .DoHaircut
+	ifequal WEDNESDAY, .DoHaircut
+	ifequal FRIDAY, .DoHaircut
 	jump GoldenrodUndergroundScript_ShopClosed
 
 .DoHaircut:
 	checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
 	iftrue .AlreadyGotHaircut
-	special Special_PlaceMoneyTopRight
+	special PlaceMoneyTopRight
 	writetext UnknownText_0x7c75c
 	yesorno
 	iffalse .Refused
 	checkmoney YOUR_MONEY, 300
-	if_equal HAVE_LESS, .NotEnoughMoney
+	ifequal HAVE_LESS, .NotEnoughMoney
 	writetext UnknownText_0x7c7f1
 	buttonsound
-	special Special_OlderHaircutBrother
-	if_equal $0, .Refused
-	if_equal $1, .Refused
+	special OlderHaircutBrother
+	ifequal $0, .Refused
+	ifequal $1, .Refused
 	setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
-	if_equal $2, .two
-	if_equal $3, .three
+	ifequal $2, .two
+	ifequal $3, .three
 	jump .else
 
 .two
-	setevent EVENT_GAVE_KURT_APRICORNS
-	clearevent EVENT_RECEIVED_BALLS_FROM_KURT
-	clearevent EVENT_DRAGON_SHRINE_QUESTION_2
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	jump .then
 
 .three
-	clearevent EVENT_GAVE_KURT_APRICORNS
-	setevent EVENT_RECEIVED_BALLS_FROM_KURT
-	clearevent EVENT_DRAGON_SHRINE_QUESTION_2
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	jump .then
 
 .else
-	clearevent EVENT_GAVE_KURT_APRICORNS
-	clearevent EVENT_RECEIVED_BALLS_FROM_KURT
-	setevent EVENT_DRAGON_SHRINE_QUESTION_2
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	jump .then
 
 .then
 	takemoney YOUR_MONEY, 300
-	special Special_PlaceMoneyTopRight
+	special PlaceMoneyTopRight
 	writetext UnknownText_0x7c80e
 	waitbutton
 	closetext
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	playmusic MUSIC_HEAL
 	pause 60
-	special Special_FadeInPalettes
+	special FadeInPalettes
 	special RestartMapMusic
 	opentext
 	writetext UnknownText_0x7c82a
 	waitbutton
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iftrue UnknownScript_0x7c2bb
-	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
-	iftrue UnknownScript_0x7c2c4
-	jump UnknownScript_0x7c2cd
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iftrue EitherHaircutBrotherScript_SlightlyHappier
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	iftrue EitherHaircutBrotherScript_Happier
+	jump EitherHaircutBrotherScript_MuchHappier
 
 .Refused:
 	writetext UnknownText_0x7c842
@@ -347,23 +345,23 @@ YoungerHaircutBrotherScript:
 	closetext
 	end
 
-UnknownScript_0x7c2bb:
+EitherHaircutBrotherScript_SlightlyHappier:
 	writetext HaircutBrosText_SlightlyHappier
-	special Special_PlayCurMonCry
+	special PlayCurMonCry
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7c2c4:
+EitherHaircutBrotherScript_Happier:
 	writetext HaircutBrosText_Happier
-	special Special_PlayCurMonCry
+	special PlayCurMonCry
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7c2cd:
+EitherHaircutBrotherScript_MuchHappier:
 	writetext HaircutBrosText_MuchHappier
-	special Special_PlayCurMonCry
+	special PlayCurMonCry
 	waitbutton
 	closetext
 	end
@@ -405,17 +403,17 @@ GoldenrodUndergroundScript_ShopClosed:
 GoldenrodUndergroundCoinCase:
 	itemball COIN_CASE
 
-MapGoldenrodUndergroundSignpost1Script:
-	jumptext UnknownText_0x7c91a
+GoldenrodUndergroundNoEntrySign:
+	jumptext GoldenrodUndergroundNoEntryText
 
 GoldenrodUndergroundHiddenParlyzHeal:
-	hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL
+	hiddenitem PARLYZ_HEAL, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL
 
 GoldenrodUndergroundHiddenSuperPotion:
-	hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION
+	hiddenitem SUPER_POTION, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION
 
 GoldenrodUndergroundHiddenAntidote:
-	hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE
+	hiddenitem ANTIDOTE, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE
 
 SupernerdEricSeenText:
 	text "I got booted out"
@@ -641,43 +639,38 @@ UnknownText_0x7c904:
 	line "today."
 	done
 
-UnknownText_0x7c91a:
+GoldenrodUndergroundNoEntryText:
 	text "NO ENTRY BEYOND"
 	line "THIS POINT"
 	done
 
 GoldenrodUnderground_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def 18, 6, 4, GOLDENROD_UNDERGROUND
-	warp_def 21, 31, 3, GOLDENROD_UNDERGROUND
-	warp_def 22, 31, 3, GOLDENROD_UNDERGROUND
-	warp_def 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 5
-	bg_event 18, 6, BGEVENT_READ, BasementDoorScript
-	bg_event 19, 6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script
-	bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
-	bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
-	bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
-
-.ObjectEvents:
-	db 9
-	object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1
-	object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
-	object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
-	object_event 2, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
-	object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
-	object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
-	object_event 7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
-	object_event 7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
-	object_event 7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event  3,  2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 7
+	warp_event  3, 34, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 4
+	warp_event 18,  6, GOLDENROD_UNDERGROUND, 4
+	warp_event 21, 31, GOLDENROD_UNDERGROUND, 3
+	warp_event 22, 31, GOLDENROD_UNDERGROUND, 3
+	warp_event 22, 27, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 1
+
+	db 0 ; coord events
+
+	db 5 ; bg events
+	bg_event 18,  6, BGEVENT_READ, BasementDoorScript
+	bg_event 19,  6, BGEVENT_READ, GoldenrodUndergroundNoEntrySign
+	bg_event  6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal
+	bg_event  4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion
+	bg_event 17,  8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote
+
+	db 9 ; object events
+	object_event  5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1
+	object_event  6,  9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1
+	object_event  3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1
+	object_event  2,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1
+	object_event  7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
+	object_event  7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BargainMerchantScript, EVENT_GOLDENROD_UNDERGROUND_GRAMPS
+	object_event  7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
+	object_event  7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
+	object_event  7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BitterMerchantScript, EVENT_GOLDENROD_UNDERGROUND_GRANNY
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index 8e84d7d36..1ffe461af 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -31,7 +31,7 @@ doorstate: MACRO
 	changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2
 ENDM
 
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1
@@ -45,13 +45,11 @@ const_value set 2
 	const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 
 GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .UpdateDoorPositions
 
 .DummyScene0:
@@ -112,46 +110,46 @@ GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
 .false14
 	return
 
-SuperNerdScript_0x7ca7a:
+GoldenrodUndergroundSwitchRoomEntrancesSuperNerdScript:
 	jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText
 
-TeacherScript_0x7ca7d:
+GoldenrodUndergroundSwitchRoomEntrancesTeacherScript:
 	jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText
 
 UndergroundSilverScene1:
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	playsound SFX_EXIT_BUILDING
 	appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	waitsfx
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	scall UndergroundSilverBattleScript
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
 	playsound SFX_EXIT_BUILDING
 	disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
-	setscene 1
+	setscene SCENE_FINISHED
 	waitsfx
 	playmapmusic
 	end
 
 UndergroundSilverScene2:
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	playsound SFX_EXIT_BUILDING
 	appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	waitsfx
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	scall UndergroundSilverBattleScript
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
 	playsound SFX_EXIT_BUILDING
 	disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
-	setscene 1
+	setscene SCENE_FINISHED
 	waitsfx
 	playmapmusic
 	end
@@ -160,7 +158,7 @@ UndergroundSilverBattleScript:
 	checkevent EVENT_RIVAL_BURNED_TOWER
 	iftrue .Continue
 	setevent EVENT_RIVAL_BURNED_TOWER
-	setmapscene BURNED_TOWER_1F, 1
+	setmapscene BURNED_TOWER_1F, SCENE_BURNEDTOWER1F_RIVAL_BATTLE
 .Continue:
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
@@ -207,10 +205,10 @@ UndergroundSilverBattleScript:
 	end
 
 TrainerGruntM11:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_11, EVENT_BEAT_ROCKET_GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM11AfterBattleText
 	waitbutton
@@ -218,10 +216,10 @@ TrainerGruntM11:
 	end
 
 TrainerGruntM25:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_25, EVENT_BEAT_ROCKET_GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM25AfterBattleText
 	waitbutton
@@ -229,10 +227,10 @@ TrainerGruntM25:
 	end
 
 TrainerBurglarDuncan:
-	trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script
+	trainer BURGLAR, DUNCAN, EVENT_BEAT_BURGLAR_DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BurglarDuncanAfterBattleText
 	waitbutton
@@ -240,10 +238,10 @@ TrainerBurglarDuncan:
 	end
 
 TrainerBurglarEddie:
-	trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script
+	trainer BURGLAR, EDDIE, EVENT_BEAT_BURGLAR_EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BurglarEddieAfterBattleText
 	waitbutton
@@ -251,10 +249,10 @@ TrainerBurglarEddie:
 	end
 
 TrainerGruntM13:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_13, EVENT_BEAT_ROCKET_GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM13AfterBattleText
 	waitbutton
@@ -262,10 +260,10 @@ TrainerGruntM13:
 	end
 
 TrainerGruntF3:
-	trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script
+	trainer GRUNTF, GRUNTF_3, EVENT_BEAT_ROCKET_GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntF3AfterBattleText
 	waitbutton
@@ -382,14 +380,14 @@ GoldenrodUndergroundSwitchRoomEntrances_DontToggle:
 
 GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
 	copybytetovar wUndergroundSwitchPositions
-	if_equal 0, .Position0
-	if_equal 1, .Position1
-	if_equal 2, .Position2
-	if_equal 3, .Position3
-	if_equal 4, .Position4
-	if_equal 5, .Position5
-	if_equal 6, .Position6
-	if_equal 7, .EmergencyPosition
+	ifequal 0, .Position0
+	ifequal 1, .Position1
+	ifequal 2, .Position2
+	ifequal 3, .Position3
+	ifequal 4, .Position4
+	ifequal 5, .Position5
+	ifequal 6, .Position6
+	ifequal 7, .EmergencyPosition
 .Position0:
 	playsound SFX_ENTER_DOOR
 	scall .Clear4
@@ -631,10 +629,10 @@ GoldenrodUndergroundSwitchRoomEntrancesFullHeal:
 	itemball FULL_HEAL
 
 GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion:
-	hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION
 
 GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive:
-	hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE
+	hiddenitem REVIVE, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE
 
 UndergroundSilverApproachMovement1:
 	step DOWN
@@ -931,45 +929,40 @@ SwitchRoomText_Emergency:
 	done
 
 GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 9
-	warp_def 23, 3, 6, GOLDENROD_UNDERGROUND
-	warp_def 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE
-	warp_def 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE
-	warp_def 5, 25, 2, GOLDENROD_UNDERGROUND
-	warp_def 4, 29, 14, GOLDENROD_CITY
-	warp_def 5, 29, 14, GOLDENROD_CITY
-	warp_def 21, 25, 1, GOLDENROD_UNDERGROUND
-	warp_def 20, 29, 13, GOLDENROD_CITY
-	warp_def 21, 29, 13, GOLDENROD_CITY
-
-.CoordEvents:
-	db 2
-	coord_event 19, 4, 0, UndergroundSilverScene1
-	coord_event 19, 5, 0, UndergroundSilverScene2
-
-.BGEvents:
-	db 6
-	bg_event 16, 1, BGEVENT_READ, Switch1Script
-	bg_event 10, 1, BGEVENT_READ, Switch2Script
-	bg_event 2, 1, BGEVENT_READ, Switch3Script
+	db 0, 0 ; filler
+
+	db 9 ; warp events
+	warp_event 23,  3, GOLDENROD_UNDERGROUND, 6
+	warp_event 22, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 1
+	warp_event 23, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 2
+	warp_event  5, 25, GOLDENROD_UNDERGROUND, 2
+	warp_event  4, 29, GOLDENROD_CITY, 14
+	warp_event  5, 29, GOLDENROD_CITY, 14
+	warp_event 21, 25, GOLDENROD_UNDERGROUND, 1
+	warp_event 20, 29, GOLDENROD_CITY, 13
+	warp_event 21, 29, GOLDENROD_CITY, 13
+
+	db 2 ; coord events
+	coord_event 19,  4, SCENE_DEFAULT, UndergroundSilverScene1
+	coord_event 19,  5, SCENE_DEFAULT, UndergroundSilverScene2
+
+	db 6 ; bg events
+	bg_event 16,  1, BGEVENT_READ, Switch1Script
+	bg_event 10,  1, BGEVENT_READ, Switch2Script
+	bg_event  2,  1, BGEVENT_READ, Switch3Script
 	bg_event 20, 11, BGEVENT_READ, EmergencySwitchScript
-	bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion
-	bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive
-
-.ObjectEvents:
-	db 11
-	object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 11, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 3, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	bg_event  8,  9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion
+	bg_event  1,  8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive
+
+	db 11 ; object events
+	object_event  9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  4,  8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 17,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 11,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  3,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	object_event 19, 12, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1
-	object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1
-	object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
-	object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
-	object_event 23, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND
+	object_event  3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodUndergroundSwitchRoomEntrancesTeacherScript, -1
+	object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodUndergroundSwitchRoomEntrancesSuperNerdScript, -1
+	object_event  1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
+	object_event 14,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
+	object_event 23,  3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index 65e8f648a..b650ac975 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2
 	const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3
@@ -8,11 +8,9 @@ const_value set 2
 	const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3
 
 GoldenrodUndergroundWarehouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .ResetSwitches
 
 .ResetSwitches:
@@ -36,10 +34,10 @@ GoldenrodUndergroundWarehouse_MapScripts:
 	return
 
 TrainerGruntM24:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_24, EVENT_BEAT_ROCKET_GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM24AfterBattleText
 	waitbutton
@@ -47,10 +45,10 @@ TrainerGruntM24:
 	end
 
 TrainerGruntM14:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_14, EVENT_BEAT_ROCKET_GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM14AfterBattleText
 	waitbutton
@@ -58,21 +56,21 @@ TrainerGruntM14:
 	end
 
 TrainerGruntM15:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_15, EVENT_BEAT_ROCKET_GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM15AfterBattleText
 	waitbutton
 	closetext
 	end
 
-GentlemanScript_0x7d9bf:
+GoldenrodUndergroundWarehouseDirectorScript:
 	faceplayer
 	opentext
 	checkevent EVENT_RECEIVED_CARD_KEY
-	iftrue UnknownScript_0x7d9de
+	iftrue .GotCardKey
 	writetext UnknownText_0x7dbc6
 	buttonsound
 	verbosegiveitem CARD_KEY
@@ -82,7 +80,7 @@ GentlemanScript_0x7d9bf:
 	clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
 	writetext UnknownText_0x7dc5b
 	buttonsound
-UnknownScript_0x7d9de:
+.GotCardKey:
 	writetext UnknownText_0x7dc8d
 	waitbutton
 	closetext
@@ -211,27 +209,22 @@ UnknownText_0x7dc8d:
 	done
 
 GoldenrodUndergroundWarehouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
-	warp_def 17, 2, 1, GOLDENROD_DEPT_STORE_B1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 7
-	object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
-	object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
-	object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  2, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 2
+	warp_event  3, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 3
+	warp_event 17,  2, GOLDENROD_DEPT_STORE_B1F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 7 ; object events
+	object_event  9,  8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 14,  3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 12,  8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodUndergroundWarehouseDirectorScript, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
+	object_event 13,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
+	object_event  2,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm
index 136d0da66..376aa0d0c 100644
--- a/maps/GuideGentsHouse.asm
+++ b/maps/GuideGentsHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const GUIDEGENTSHOUSE_GRAMPS
 
 GuideGentsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GuideGentsHouseGuideGent:
 	jumptextfaceplayer GuideGentsHouseGuideGentText
@@ -28,22 +26,17 @@ GuideGentsHouseGuideGentText:
 	done
 
 GuideGentsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 4, CHERRYGROVE_CITY
-	warp_def 3, 7, 4, CHERRYGROVE_CITY
+	db 2 ; warp events
+	warp_event  2,  7, CHERRYGROVE_CITY, 4
+	warp_event  3,  7, CHERRYGROVE_CITY, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, GuideGentsHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, GuideGentsHouseBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
+	db 1 ; object events
+	object_event  2,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 3f5f6ee10..3d9492f14 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const HALLOFFAME_LANCE
 
 HallOfFame_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .EnterHallOfFame
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .EnterHallOfFame ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .EnterHallOfFame:
 	priorityjump .EnterHallOfFameScript
@@ -21,24 +19,24 @@ HallOfFame_MapScripts:
 	follow HALLOFFAME_LANCE, PLAYER
 	applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance
 	stopfollow
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext HallOfFame_LanceText
 	waitbutton
 	closetext
-	spriteface HALLOFFAME_LANCE, UP
+	turnobject HALLOFFAME_LANCE, UP
 	applymovement PLAYER, HallOfFame_SlowlyApproachMachine
-	setscene 1
+	setscene SCENE_FINISHED
 	pause 15
 	writebyte HEALMACHINE_HALL_OF_FAME
-	special Special_HealMachineAnim
+	special HealMachineAnim
 	setevent EVENT_BEAT_ELITE_FOUR
 	setevent EVENT_TELEPORT_GUY
 	setevent EVENT_RIVAL_SPROUT_TOWER
 	clearevent EVENT_RED_IN_MT_SILVER
 	setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
 	clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
-	setmapscene SPROUT_TOWER_3F, 1
+	setmapscene SPROUT_TOWER_3F, SCENE_FINISHED
 	special HealParty
 	checkevent EVENT_GOT_SS_TICKET_FROM_ELM
 	iftrue .SkipPhoneCall
@@ -111,20 +109,15 @@ HallOfFame_LanceText:
 	done
 
 HallOfFame_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 4, 13, 3, LANCES_ROOM
-	warp_def 5, 13, 4, LANCES_ROOM
+	db 2 ; warp events
+	warp_event  4, 13, LANCES_ROOM, 3
+	warp_event  5, 13, LANCES_ROOM, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	db 1 ; object events
+	object_event  4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm
index 84abeb680..9650fd346 100644
--- a/maps/IcePath1F.asm
+++ b/maps/IcePath1F.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ICEPATH1F_POKE_BALL1
 	const ICEPATH1F_POKE_BALL2
 	const ICEPATH1F_POKE_BALL3
 
 IcePath1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 IcePath1FHMWaterfall:
 	itemball HM_WATERFALL
@@ -20,24 +18,19 @@ IcePath1FProtein:
 	itemball PROTEIN
 
 IcePath1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 4, 19, 1, ROUTE_44
-	warp_def 36, 27, 7, BLACKTHORN_CITY
-	warp_def 37, 5, 1, ICE_PATH_B1F
-	warp_def 37, 13, 7, ICE_PATH_B1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
-	object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP
-	object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  4, 19, ROUTE_44, 1
+	warp_event 36, 27, BLACKTHORN_CITY, 7
+	warp_event 37,  5, ICE_PATH_B1F, 1
+	warp_event 37, 13, ICE_PATH_B1F, 7
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event 31,  7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL
+	object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP
+	object_event 35,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 2df927ebd..149328000 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ICEPATHB1F_BOULDER1
 	const ICEPATHB1F_BOULDER2
 	const ICEPATHB1F_BOULDER3
@@ -6,11 +6,9 @@ const_value set 2
 	const ICEPATHB1F_POKE_BALL
 
 IcePathB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
 
 .SetUpStoneTable:
@@ -68,7 +66,7 @@ IcePathB1FIron:
 	itemball IRON
 
 IcePathB1FHiddenMaxPotion:
-	hiddenitem EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION
 
 IcePathBoulderFellThroughText:
 	text "The boulder fell"
@@ -76,31 +74,26 @@ IcePathBoulderFellThroughText:
 	done
 
 IcePathB1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 8
-	warp_def 3, 15, 3, ICE_PATH_1F
-	warp_def 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE
-	warp_def 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_def 4, 7, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_def 5, 12, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_def 12, 13, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole
-	warp_def 5, 25, 4, ICE_PATH_1F
-	warp_def 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
+	db 0, 0 ; filler
+
+	db 8 ; warp events
+	warp_event  3, 15, ICE_PATH_1F, 3
+	warp_event 17,  3, ICE_PATH_B2F_MAHOGANY_SIDE, 1
+	warp_event 11,  2, ICE_PATH_B2F_MAHOGANY_SIDE, 3 ; hole
+	warp_event  4,  7, ICE_PATH_B2F_MAHOGANY_SIDE, 4 ; hole
+	warp_event  5, 12, ICE_PATH_B2F_MAHOGANY_SIDE, 5 ; hole
+	warp_event 12, 13, ICE_PATH_B2F_MAHOGANY_SIDE, 6 ; hole
+	warp_event  5, 25, ICE_PATH_1F, 4
+	warp_event 11, 27, ICE_PATH_B2F_BLACKTHORN_SIDE, 1
+
+	db 0 ; coord events
+
+	db 1 ; bg events
 	bg_event 17, 30, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion
 
-.ObjectEvents:
-	db 5
-	object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
-	object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
-	object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
-	object_event 17, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
-	object_event 5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON
+	db 5 ; object events
+	object_event 11,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1
+	object_event  7,  8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2
+	object_event  8,  9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3
+	object_event 17,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4
+	object_event  5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON
diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
index 1fe814b66..23ba93773 100644
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -1,35 +1,28 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL
 
 IcePathB2FBlackthornSide_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 IcePathB2FBlackthornSideTMRest:
 	itemball TM_REST
 
 IcePathB2FBlackthornSideHiddenIceHeal:
-	hiddenitem EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL
+	hiddenitem ICE_HEAL, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL
 
 IcePathB2FBlackthornSide_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 3, 15, 8, ICE_PATH_B1F
-	warp_def 3, 3, 2, ICE_PATH_B3F
+	db 2 ; warp events
+	warp_event  3, 15, ICE_PATH_B1F, 8
+	warp_event  3,  3, ICE_PATH_B3F, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal
+	db 1 ; bg events
+	bg_event  2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal
 
-.ObjectEvents:
-	db 1
-	object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
+	db 1 ; object events
+	object_event  8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
index d70dc8492..86a706db8 100644
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER1
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER2
 	const ICEPATHB2FMAHOGANYSIDE_BOULDER3
@@ -7,11 +7,9 @@ const_value set 2
 	const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2
 
 IcePathB2FMahoganySide_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 IcePathB2FMahoganySideBoulder:
 	jumptext IcePathB2FMahoganySideBoulderText
@@ -23,7 +21,7 @@ IcePathB2FMahoganySideMaxPotion:
 	itemball MAX_POTION
 
 IcePathB2FMahoganySideHiddenCarbos:
-	hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS
+	hiddenitem CARBOS, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS
 
 IcePathB2FMahoganySideBoulderText:
 	text "It's immovably"
@@ -31,30 +29,25 @@ IcePathB2FMahoganySideBoulderText:
 	done
 
 IcePathB2FMahoganySide_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 17, 1, 2, ICE_PATH_B1F
-	warp_def 9, 11, 1, ICE_PATH_B3F
-	warp_def 11, 4, 3, ICE_PATH_B1F
-	warp_def 4, 6, 4, ICE_PATH_B1F
-	warp_def 4, 12, 5, ICE_PATH_B1F
-	warp_def 12, 12, 6, ICE_PATH_B1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos
-
-.ObjectEvents:
-	db 6
-	object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A
-	object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A
-	object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A
-	object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A
-	object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
-	object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event 17,  1, ICE_PATH_B1F, 2
+	warp_event  9, 11, ICE_PATH_B3F, 1
+	warp_event 11,  4, ICE_PATH_B1F, 3
+	warp_event  4,  6, ICE_PATH_B1F, 4
+	warp_event  4, 12, ICE_PATH_B1F, 5
+	warp_event 12, 12, ICE_PATH_B1F, 6
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos
+
+	db 6 ; object events
+	object_event 11,  3, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A
+	object_event  4,  7, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A
+	object_event  3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A
+	object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A
+	object_event  8,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
+	object_event  0,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION
diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm
index 40809dbe3..1130705af 100644
--- a/maps/IcePathB3F.asm
+++ b/maps/IcePathB3F.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ICEPATHB3F_POKE_BALL
 	const ICEPATHB3F_ROCK
 
 IcePathB3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 IcePathB3FNevermeltice:
 	itemball NEVERMELTICE
@@ -16,21 +14,16 @@ IcePathB3FRock:
 	jumpstd smashrock
 
 IcePathB3F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE
-	warp_def 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE
+	db 2 ; warp events
+	warp_event  3,  5, ICE_PATH_B2F_MAHOGANY_SIDE, 2
+	warp_event 15,  5, ICE_PATH_B2F_BLACKTHORN_SIDE, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE
-	object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1
+	db 2 ; object events
+	object_event  5,  7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE
+	object_event  6,  6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index de3d79152..806ce41d3 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ILEXFOREST_FARFETCHD
 	const ILEXFOREST_YOUNGSTER1
 	const ILEXFOREST_BLACK_BELT
@@ -12,27 +12,25 @@ const_value set 2
 	const ILEXFOREST_POKE_BALL4
 
 IlexForest_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .FarfetchdCallback
 
 .FarfetchdCallback:
 	checkevent EVENT_GOT_HM01_CUT
 	iftrue .Static
 	copybytetovar wFarfetchdPosition
-	if_equal  1, .PositionOne
-	if_equal  2, .PositionTwo
-	if_equal  3, .PositionThree
-	if_equal  4, .PositionFour
-	if_equal  5, .PositionFive
-	if_equal  6, .PositionSix
-	if_equal  7, .PositionSeven
-	if_equal  8, .PositionEight
-	if_equal  9, .PositionNine
-	if_equal 10, .PositionTen
+	ifequal  1, .PositionOne
+	ifequal  2, .PositionTwo
+	ifequal  3, .PositionThree
+	ifequal  4, .PositionFour
+	ifequal  5, .PositionFive
+	ifequal  6, .PositionSix
+	ifequal  7, .PositionSeven
+	ifequal  8, .PositionEight
+	ifequal  9, .PositionNine
+	ifequal 10, .PositionTen
 .Static:
 	return
 
@@ -104,16 +102,16 @@ IlexForestCharcoalApprenticeScript:
 
 IlexForestFarfetchdScript:
 	copybytetovar wFarfetchdPosition
-	if_equal  1, .Position1
-	if_equal  2, .Position2
-	if_equal  3, .Position3
-	if_equal  4, .Position4
-	if_equal  5, .Position5
-	if_equal  6, .Position6
-	if_equal  7, .Position7
-	if_equal  8, .Position8
-	if_equal  9, .Position9
-	if_equal 10, .Position10
+	ifequal  1, .Position1
+	ifequal  2, .Position2
+	ifequal  3, .Position3
+	ifequal  4, .Position4
+	ifequal  5, .Position5
+	ifequal  6, .Position6
+	ifequal  7, .Position7
+	ifequal  8, .Position8
+	ifequal  9, .Position9
+	ifequal 10, .Position10
 
 .Position1:
 	faceplayer
@@ -133,7 +131,7 @@ IlexForestFarfetchdScript:
 
 .Position2:
 	scall .CryAndCheckFacing
-	if_equal DOWN, .Position2_Down
+	ifequal DOWN, .Position2_Down
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos3
 	moveobject ILEXFOREST_FARFETCHD, 20, 24
 	disappear ILEXFOREST_FARFETCHD
@@ -151,7 +149,7 @@ IlexForestFarfetchdScript:
 
 .Position3:
 	scall .CryAndCheckFacing
-	if_equal LEFT, .Position3_Left
+	ifequal LEFT, .Position3_Left
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos4
 	moveobject ILEXFOREST_FARFETCHD, 29, 22
 	disappear ILEXFOREST_FARFETCHD
@@ -169,7 +167,7 @@ IlexForestFarfetchdScript:
 
 .Position4:
 	scall .CryAndCheckFacing
-	if_equal UP, .Position4_Up
+	ifequal UP, .Position4_Up
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos5
 	moveobject ILEXFOREST_FARFETCHD, 28, 31
 	disappear ILEXFOREST_FARFETCHD
@@ -187,9 +185,9 @@ IlexForestFarfetchdScript:
 
 .Position5:
 	scall .CryAndCheckFacing
-	if_equal UP, .Position5_Up
-	if_equal LEFT, .Position5_Left
-	if_equal RIGHT, .Position5_Right
+	ifequal UP, .Position5_Up
+	ifequal LEFT, .Position5_Left
+	ifequal RIGHT, .Position5_Right
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos6
 	moveobject ILEXFOREST_FARFETCHD, 24, 35
 	disappear ILEXFOREST_FARFETCHD
@@ -223,7 +221,7 @@ IlexForestFarfetchdScript:
 
 .Position6:
 	scall .CryAndCheckFacing
-	if_equal RIGHT, .Position6_Right
+	ifequal RIGHT, .Position6_Right
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos7
 	moveobject ILEXFOREST_FARFETCHD, 22, 31
 	disappear ILEXFOREST_FARFETCHD
@@ -241,8 +239,8 @@ IlexForestFarfetchdScript:
 
 .Position7:
 	scall .CryAndCheckFacing
-	if_equal DOWN, .Position7_Down
-	if_equal LEFT, .Position7_Left
+	ifequal DOWN, .Position7_Down
+	ifequal LEFT, .Position7_Left
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos8
 	moveobject ILEXFOREST_FARFETCHD, 15, 29
 	disappear ILEXFOREST_FARFETCHD
@@ -268,9 +266,9 @@ IlexForestFarfetchdScript:
 
 .Position8:
 	scall .CryAndCheckFacing
-	if_equal UP, .Position8_Up
-	if_equal LEFT, .Position8_Left
-	if_equal RIGHT, .Position8_Right
+	ifequal UP, .Position8_Up
+	ifequal LEFT, .Position8_Left
+	ifequal RIGHT, .Position8_Right
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos9
 	moveobject ILEXFOREST_FARFETCHD, 10, 35
 	disappear ILEXFOREST_FARFETCHD
@@ -297,8 +295,8 @@ IlexForestFarfetchdScript:
 
 .Position9:
 	scall .CryAndCheckFacing
-	if_equal DOWN, .Position9_Down
-	if_equal RIGHT, .Position9_Right
+	ifequal DOWN, .Position9_Down
+	ifequal RIGHT, .Position9_Right
 	applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos10
 	moveobject ILEXFOREST_FARFETCHD, 6, 28
 	disappear ILEXFOREST_FARFETCHD
@@ -388,10 +386,10 @@ IlexForestHeadbuttGuyScript:
 	end
 
 TrainerBugCatcherWayne:
-	trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script
+	trainer BUG_CATCHER, WAYNE, EVENT_BEAT_BUG_CATCHER_WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherWayneAfterBattleText
 	waitbutton
@@ -414,22 +412,22 @@ IlexForestEther:
 	itemball ETHER
 
 IlexForestHiddenEther:
-	hiddenitem EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER
+	hiddenitem ETHER, EVENT_ILEX_FOREST_HIDDEN_ETHER
 
 IlexForestHiddenSuperPotion:
-	hiddenitem EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION
+	hiddenitem SUPER_POTION, EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION
 
 IlexForestHiddenFullHeal:
-	hiddenitem EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL
+	hiddenitem FULL_HEAL, EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL
 
 IlexForestBoulder:
 ; unused
 	jumpstd strengthboulder
 
-MapIlexForestSignpost0Script:
-	jumptext Text_IlexForestSignpost0
+IlexForestSignpost:
+	jumptext IlexForestSignpostText
 
-MapIlexForestSignpost4Script:
+IlexForestShrineScript:
 	checkevent EVENT_FOREST_IS_RESTLESS
 	iftrue .ForestIsRestless
 	jump .DontDoCelebiEvent
@@ -459,18 +457,18 @@ MapIlexForestSignpost4Script:
 	closetext
 	pause 20
 	showemote EMOTE_SHOCK, PLAYER, 20
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	applymovement PLAYER, MovementData_0x6ef58
 	pause 30
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	pause 20
-	clearflag ENGINE_HAVE_EXAMINED_GS_BALL
-	special Special_CelebiShrineEvent
+	clearflag ENGINE_FOREST_IS_RESTLESS
+	special CelebiShrineEvent
 	loadwildmon CELEBI, 30
 	startbattle
 	reloadmapafterbattle
 	pause 20
-	special Special_CheckCaughtCelebi
+	special CheckCaughtCelebi
 	iffalse .DidntCatchCelebi
 	appear ILEXFOREST_KURT
 	applymovement ILEXFOREST_KURT, MovementData_0x6ef4e
@@ -845,7 +843,7 @@ Text_IlexForestLass:
 	cont "forest's guardian?"
 	done
 
-Text_IlexForestSignpost0:
+IlexForestSignpostText:
 	text "ILEX FOREST is"
 	line "so overgrown with"
 
@@ -938,36 +936,31 @@ BugCatcherWayneAfterBattleText:
 	done
 
 IlexForest_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE
-	warp_def 3, 42, 1, ILEX_FOREST_AZALEA_GATE
-	warp_def 3, 43, 2, ILEX_FOREST_AZALEA_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 5
-	bg_event 3, 17, BGEVENT_READ, MapIlexForestSignpost0Script
-	bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  1,  5, ROUTE_34_ILEX_FOREST_GATE, 3
+	warp_event  3, 42, ILEX_FOREST_AZALEA_GATE, 1
+	warp_event  3, 43, ILEX_FOREST_AZALEA_GATE, 2
+
+	db 0 ; coord events
+
+	db 5 ; bg events
+	bg_event  3, 17, BGEVENT_READ, IlexForestSignpost
+	bg_event 11,  7, BGEVENT_ITEM, IlexForestHiddenEther
 	bg_event 22, 14, BGEVENT_ITEM, IlexForestHiddenSuperPotion
-	bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal
-	bg_event 8, 22, BGEVENT_UP, MapIlexForestSignpost4Script
+	bg_event  1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal
+	bg_event  8, 22, BGEVENT_UP, IlexForestShrineScript
 
-.ObjectEvents:
-	db 11
+	db 11 ; object events
 	object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD
-	object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE
-	object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER
+	object_event  7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE
+	object_event  5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER
 	object_event 15, 14, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1
-	object_event 20, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE
-	object_event 8, 29, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
-	object_event 3, 24, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS
-	object_event 12, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1
-	object_event 9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK
-	object_event 17, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE
-	object_event 27, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER
+	object_event 20, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE
+	object_event  8, 29, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT
+	object_event  3, 24, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS
+	object_event 12,  1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1
+	object_event  9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK
+	object_event 17,  7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE
+	object_event 27,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER
diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
index c66483971..0e992960b 100644
--- a/maps/IlexForestAzaleaGate.asm
+++ b/maps/IlexForestAzaleaGate.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ILEXFORESTAZALEAGATE_OFFICER
 	const ILEXFORESTAZALEAGATE_GRANNY
 
 IlexForestAzaleaGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 IlexForestAzaleaGateOfficerScript:
 	jumptextfaceplayer IlexForestAzaleaGateOfficerText
@@ -31,23 +29,18 @@ IlexForestAzaleaGateGrannyText:
 	done
 
 IlexForestAzaleaGate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 0, 4, 2, ILEX_FOREST
-	warp_def 0, 5, 3, ILEX_FOREST
-	warp_def 9, 4, 7, AZALEA_TOWN
-	warp_def 9, 5, 8, AZALEA_TOWN
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 2
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
-	object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  0,  4, ILEX_FOREST, 2
+	warp_event  0,  5, ILEX_FOREST, 3
+	warp_event  9,  4, AZALEA_TOWN, 7
+	warp_event  9,  5, AZALEA_TOWN, 8
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
+	object_event  1,  3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 17a4d0663..bd3fb3516 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const INDIGOPLATEAUPOKECENTER1F_NURSE
 	const INDIGOPLATEAUPOKECENTER1F_CLERK
 	const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M
@@ -7,24 +7,22 @@ const_value set 2
 	const INDIGOPLATEAUPOKECENTER1F_ABRA
 
 IndigoPlateauPokecenter1F_MapScripts:
-.SceneScripts:
-	db 1
-	scene_script .DummyScene
+	db 1 ; scene scripts
+	scene_script .DummyScene ; SCENE_DEFAULT
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .PrepareElite4
 
 .DummyScene:
 	end
 
 .PrepareElite4:
-	setmapscene WILLS_ROOM, 0
-	setmapscene KOGAS_ROOM, 0
-	setmapscene BRUNOS_ROOM, 0
-	setmapscene KARENS_ROOM, 0
-	setmapscene LANCES_ROOM, 0
-	setmapscene HALL_OF_FAME, 0
+	setmapscene WILLS_ROOM, SCENE_DEFAULT
+	setmapscene KOGAS_ROOM, SCENE_DEFAULT
+	setmapscene BRUNOS_ROOM, SCENE_DEFAULT
+	setmapscene KARENS_ROOM, SCENE_DEFAULT
+	setmapscene LANCES_ROOM, SCENE_DEFAULT
+	setmapscene HALL_OF_FAME, SCENE_DEFAULT
 	clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
 	clearevent EVENT_WILLS_ROOM_EXIT_OPEN
 	clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
@@ -49,20 +47,20 @@ PlateauRivalBattle1:
 	checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
 	iftrue PlateauRivalScriptDone
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, PlateauRivalScriptDone
-	if_equal TUESDAY, PlateauRivalScriptDone
-	if_equal THURSDAY, PlateauRivalScriptDone
-	if_equal FRIDAY, PlateauRivalScriptDone
-	if_equal SATURDAY, PlateauRivalScriptDone
+	ifequal SUNDAY, PlateauRivalScriptDone
+	ifequal TUESDAY, PlateauRivalScriptDone
+	ifequal THURSDAY, PlateauRivalScriptDone
+	ifequal FRIDAY, PlateauRivalScriptDone
+	ifequal SATURDAY, PlateauRivalScriptDone
 	moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, 17, 9
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1
 	playmusic MUSIC_RIVAL_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	jump PlateauRivalBattleCommon
 
 PlateauRivalBattle2:
@@ -71,19 +69,19 @@ PlateauRivalBattle2:
 	checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
 	iftrue PlateauRivalScriptDone
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, PlateauRivalScriptDone
-	if_equal TUESDAY, PlateauRivalScriptDone
-	if_equal THURSDAY, PlateauRivalScriptDone
-	if_equal FRIDAY, PlateauRivalScriptDone
-	if_equal SATURDAY, PlateauRivalScriptDone
+	ifequal SUNDAY, PlateauRivalScriptDone
+	ifequal TUESDAY, PlateauRivalScriptDone
+	ifequal THURSDAY, PlateauRivalScriptDone
+	ifequal FRIDAY, PlateauRivalScriptDone
+	ifequal SATURDAY, PlateauRivalScriptDone
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2
 	playmusic MUSIC_RIVAL_ENCOUNTER
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 PlateauRivalBattleCommon:
 	opentext
 	writetext PlateauRivalText1
@@ -127,19 +125,19 @@ PlateauRivalPostBattle:
 	writetext PlateauRivalText2
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement
 	disappear INDIGOPLATEAUPOKECENTER1F_SILVER
-	setscene 0
+	setscene SCENE_DEFAULT
 	playmapmusic
 	setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
 PlateauRivalScriptDone:
 	end
 
-NurseScript_0x18012c:
+IndigoPlateauPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
-ClerkScript_0x18012f:
+IndigoPlateauPokecenter1FClerkScript:
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_INDIGO_PLATEAU
 	closetext
@@ -158,7 +156,7 @@ TeleportGuyScript:
 	waitbutton
 	closetext
 	playsound SFX_WARP_TO
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	waitsfx
 	warp NEW_BARK_TOWN, 13, 6
 	end
@@ -303,29 +301,24 @@ AbraText:
 	done
 
 IndigoPlateauPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 5, 13, 1, ROUTE_23
-	warp_def 6, 13, 2, ROUTE_23
-	warp_def 0, 13, 1, POKECENTER_2F
-	warp_def 14, 3, 1, WILLS_ROOM
-
-.CoordEvents:
-	db 2
-	coord_event 16, 4, 0, PlateauRivalBattle1
-	coord_event 17, 4, 0, PlateauRivalBattle2
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 6
-	object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1
-	object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  5, 13, ROUTE_23, 1
+	warp_event  6, 13, ROUTE_23, 2
+	warp_event  0, 13, POKECENTER_2F, 1
+	warp_event 14,  3, WILLS_ROOM, 1
+
+	db 2 ; coord events
+	coord_event 16,  4, SCENE_DEFAULT, PlateauRivalBattle1
+	coord_event 17,  4, SCENE_DEFAULT, PlateauRivalBattle2
+
+	db 0 ; bg events
+
+	db 6 ; object events
+	object_event  3,  7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FNurseScript, -1
+	object_event 11,  7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FClerkScript, -1
 	object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1
-	object_event 16, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
-	object_event 1, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
-	object_event 0, 9, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY
+	object_event 16,  9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
+	object_event  1,  9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
+	object_event  0,  9, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index eef62321d..ed85ed0ba 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const KARENSROOM_KAREN
 
 KarensRoom_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .LockDoor
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .LockDoor ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .KarensRoomDoors
 
 .LockDoor:
@@ -30,14 +28,14 @@ KarensRoom_MapScripts:
 	return
 
 .KarensDoorLocksBehindYou:
-	applymovement PLAYER, KarensMovementData_0x18078e
+	applymovement PLAYER, KarensRoom_EnterMovement
 	refreshscreen $86
 	playsound SFX_STRENGTH
 	earthquake 80
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_FINISHED
 	setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
@@ -73,7 +71,7 @@ KarenScript_AfterBattle:
 	closetext
 	end
 
-KarensMovementData_0x18078e:
+KarensRoom_EnterMovement:
 	step UP
 	step UP
 	step UP
@@ -133,22 +131,17 @@ KarenScript_KarenDefeatText:
 	done
 
 KarensRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 4, 17, 3, BRUNOS_ROOM
-	warp_def 5, 17, 4, BRUNOS_ROOM
-	warp_def 4, 2, 1, LANCES_ROOM
-	warp_def 5, 2, 2, LANCES_ROOM
+	db 4 ; warp events
+	warp_event  4, 17, BRUNOS_ROOM, 3
+	warp_event  5, 17, BRUNOS_ROOM, 4
+	warp_event  4,  2, LANCES_ROOM, 1
+	warp_event  5,  2, LANCES_ROOM, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 5, 7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1
+	db 1 ; object events
+	object_event  5,  7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index fe1badec4..4401e6197 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const KOGASROOM_KOGA
 
 KogasRoom_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .LockDoor
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .LockDoor ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .KogasRoomDoors
 
 .LockDoor:
@@ -30,14 +28,14 @@ KogasRoom_MapScripts:
 	return
 
 .KogasDoorLocksBehindYou:
-	applymovement PLAYER, KogasMovementData_0x18078e
+	applymovement PLAYER, KogasRoom_EnterMovement
 	refreshscreen $86
 	playsound SFX_STRENGTH
 	earthquake 80
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_FINISHED
 	setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
@@ -73,7 +71,7 @@ KogaScript_AfterBattle:
 	closetext
 	end
 
-KogasMovementData_0x18078e:
+KogasRoom_EnterMovement:
 	step UP
 	step UP
 	step UP
@@ -130,22 +128,17 @@ KogaScript_KogaDefeatText:
 	done
 
 KogasRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 4, 17, 2, WILLS_ROOM
-	warp_def 5, 17, 3, WILLS_ROOM
-	warp_def 4, 2, 1, BRUNOS_ROOM
-	warp_def 5, 2, 2, BRUNOS_ROOM
+	db 4 ; warp events
+	warp_event  4, 17, WILLS_ROOM, 2
+	warp_event  5, 17, WILLS_ROOM, 3
+	warp_event  4,  2, BRUNOS_ROOM, 1
+	warp_event  5,  2, BRUNOS_ROOM, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 5, 7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1
+	db 1 ; object events
+	object_event  5,  7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1
diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm
deleted file mode 100644
index f1dcc7e2f..000000000
--- a/maps/KrissHouse2F.asm
+++ /dev/null
@@ -1,141 +0,0 @@
-const_value set 2
-	const KRISSHOUSE2F_CONSOLE
-	const KRISSHOUSE2F_DOLL_1
-	const KRISSHOUSE2F_DOLL_2
-	const KRISSHOUSE2F_BIG_DOLL
-
-KrissHouse2F_MapScripts:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 2
-	callback MAPCALLBACK_NEWMAP, .InitializeRoom
-	callback MAPCALLBACK_TILES, .SetSpawn
-
-; unused
-.Null:
-	end
-
-.InitializeRoom:
-	special Special_ToggleDecorationsVisibility
-	setevent EVENT_IN_YOUR_ROOM
-	checkevent EVENT_INITIALIZED_EVENTS
-	iftrue .SkipInitialization
-	jumpstd initializeevents
-	return
-
-.SkipInitialization:
-	return
-
-.SetSpawn:
-	special Special_ToggleMaptileDecorations
-	return
-
-	db 0, 0, 0 ; filler
-
-DecoDoll1Script:
-	describedecoration DECODESC_LEFT_DOLL
-
-DecoDoll2Script:
-	describedecoration DECODESC_RIGHT_DOLL
-
-DecoBigDollScript:
-	describedecoration DECODESC_BIG_DOLL
-
-DecoGameConsoleScript:
-	describedecoration DECODESC_CONSOLE
-
-DecoPosterScript:
-	conditional_event EVENT_KRISS_ROOM_POSTER, .Script
-
-.Script:
-	describedecoration DECODESC_POSTER
-
-KrissHouseRadio:
-	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
-	iftrue .NormalRadio
-	checkevent EVENT_LISTENED_TO_INITIAL_RADIO
-	iftrue .AbbreviatedRadio
-	playmusic MUSIC_POKEMON_TALK
-	opentext
-	writetext KrisRadioText1
-	pause 45
-	writetext KrisRadioText2
-	pause 45
-	writetext KrisRadioText3
-	pause 45
-	musicfadeout MUSIC_NEW_BARK_TOWN, 16
-	writetext KrisRadioText4
-	pause 45
-	closetext
-	setevent EVENT_LISTENED_TO_INITIAL_RADIO
-	end
-
-.NormalRadio:
-	jumpstd radio1
-
-.AbbreviatedRadio:
-	opentext
-	writetext KrisRadioText4
-	pause 45
-	closetext
-	end
-
-KrissHouseBookshelf:
-	jumpstd picturebookshelf
-
-KrissHousePC:
-	opentext
-	special Special_KrissHousePC
-	iftrue .Warp
-	closetext
-	end
-.Warp:
-	warp NONE, 0, 0
-	end
-
-KrisRadioText1:
-	text "PROF.OAK'S #MON"
-	line "TALK! Please tune"
-	cont "in next time!"
-	done
-
-KrisRadioText2:
-	text "#MON CHANNEL!"
-	done
-
-KrisRadioText3:
-	text "This is DJ MARY,"
-	line "your co-host!"
-	done
-
-KrisRadioText4:
-	text "#MON!"
-	line "#MON CHANNEL…"
-	done
-
-KrissHouse2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 1
-	warp_def 7, 0, 3, KRISS_HOUSE_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 4
-	bg_event 2, 1, BGEVENT_UP, KrissHousePC
-	bg_event 3, 1, BGEVENT_READ, KrissHouseRadio
-	bg_event 5, 1, BGEVENT_READ, KrissHouseBookshelf
-	bg_event 6, 0, BGEVENT_IFSET, DecoPosterScript
-
-.ObjectEvents:
-	db 4
-	object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoGameConsoleScript, EVENT_KRISS_HOUSE_2F_CONSOLE
-	object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoDoll1Script, EVENT_KRISS_HOUSE_2F_DOLL_1
-	object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoDoll2Script, EVENT_KRISS_HOUSE_2F_DOLL_2
-	object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DecoBigDollScript, EVENT_KRISS_HOUSE_2F_BIG_DOLL
diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm
deleted file mode 100644
index 457660d97..000000000
--- a/maps/KrissNeighborsHouse.asm
+++ /dev/null
@@ -1,122 +0,0 @@
-const_value set 2
-	const KRISSNEIGHBORSHOUSE_COOLTRAINER_F
-	const KRISSNEIGHBORSHOUSE_POKEFAN_F
-
-KrissNeighborsHouse_MapScripts:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 0
-
-KrissNeighborsDaughter:
-	jumptextfaceplayer KrissNeighborsDaughterText
-
-KrissNeighbor:
-	jumptextfaceplayer KrissNeighborText
-
-KrissNeighborsHouseBookshelf:
-	jumpstd magazinebookshelf
-
-KrissNeighborsHouseRadio:
-	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
-	iftrue .NormalRadio
-	checkevent EVENT_LISTENED_TO_INITIAL_RADIO
-	iftrue .AbbreviatedRadio
-	playmusic MUSIC_POKEMON_TALK
-	opentext
-	writetext KrisNeighborRadioText1
-	pause 45
-	writetext KrisNeighborRadioText2
-	pause 45
-	writetext KrisNeighborRadioText3
-	pause 45
-	musicfadeout MUSIC_NEW_BARK_TOWN, 16
-	writetext KrisNeighborRadioText4
-	pause 45
-	closetext
-	setevent EVENT_LISTENED_TO_INITIAL_RADIO
-	end
-.NormalRadio:
-	jumpstd radio1
-.AbbreviatedRadio:
-	opentext
-	writetext KrisNeighborRadioText4
-	pause 45
-	closetext
-	end
-
-KrissNeighborsDaughterText:
-	text "PIKACHU is an"
-	line "evolved #MON."
-
-	para "I was amazed by"
-	line "PROF.ELM's find-"
-	cont "ings."
-
-	para "He's so famous for"
-	line "his research on"
-	cont "#MON evolution."
-
-	para "…sigh…"
-
-	para "I wish I could be"
-	line "a researcher like"
-	cont "him…"
-	done
-
-KrissNeighborText:
-	text "My daughter is"
-	line "adamant about"
-
-	para "becoming PROF."
-	line "ELM's assistant."
-
-	para "She really loves"
-	line "#MON!"
-
-	para "But then, so do I!"
-	done
-
-KrisNeighborRadioText1:
-	text "PROF.OAK'S #MON"
-	line "TALK! Please tune"
-	cont "in next time!"
-	done
-
-KrisNeighborRadioText2:
-	text "#MON CHANNEL!"
-	done
-
-KrisNeighborRadioText3:
-	text "This is DJ MARY,"
-	line "your co-host!"
-	done
-
-KrisNeighborRadioText4:
-	text "#MON!"
-	line "#MON CHANNEL…"
-	done
-
-KrissNeighborsHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 3, NEW_BARK_TOWN
-	warp_def 3, 7, 3, NEW_BARK_TOWN
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 0, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf
-	bg_event 7, 1, BGEVENT_READ, KrissNeighborsHouseRadio
-
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1
-	object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index eb2bbcb89..6ff71e297 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const KURTSHOUSE_KURT1
 	const KURTSHOUSE_TWIN1
 	const KURTSHOUSE_SLOWPOKE
@@ -6,11 +6,9 @@ const_value set 2
 	const KURTSHOUSE_TWIN2
 
 KurtsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .KurtCallback
 
 .KurtCallback:
@@ -34,7 +32,7 @@ KurtsHouse_MapScripts:
 .Done:
 	return
 
-KurtScript_0x18e178:
+Kurt1:
 	faceplayer
 	opentext
 	checkevent EVENT_KURT_GAVE_YOU_LURE_BALL
@@ -44,11 +42,11 @@ KurtScript_0x18e178:
 	writetext UnknownText_0x18e473
 	waitbutton
 	closetext
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
 	checkcode VAR_FACING
-	if_equal UP, .RunAround
-	spriteface PLAYER, DOWN
+	ifequal UP, .RunAround
+	turnobject PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
 	playsound SFX_EXIT_BUILDING
@@ -58,7 +56,7 @@ KurtScript_0x18e178:
 	end
 
 .RunAround:
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c
 	playsound SFX_EXIT_BUILDING
@@ -74,7 +72,7 @@ KurtScript_0x18e178:
 	iffalse .NoRoomForBall
 	setevent EVENT_KURT_GAVE_YOU_LURE_BALL
 .GotLureBall:
-	checkevent EVENT_GAVE_KURT_APRICORNS
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue .WaitForApricorns
 	checkevent EVENT_GAVE_KURT_RED_APRICORN
 	iftrue .GiveLevelBall
@@ -93,9 +91,9 @@ KurtScript_0x18e178:
 	checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
 	iftrue .CanGiveGSBallToKurt
 .NoGSBall:
-	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue .CheckApricorns
-	checkevent EVENT_DRAGON_SHRINE_QUESTION_2
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	iftrue .CheckApricorns
 	writetext UnknownText_0x18e6c9
 	waitbutton
@@ -114,9 +112,9 @@ KurtScript_0x18e178:
 	iftrue .AskApricorn
 	checkitem PNK_APRICORN
 	iftrue .AskApricorn
-	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue .ThatTurnedOutGreat
-	checkevent EVENT_DRAGON_SHRINE_QUESTION_2
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
 	iftrue .IMakeBallsFromApricorns
 	closetext
 	end
@@ -130,15 +128,15 @@ KurtScript_0x18e178:
 .AskApricorn:
 	writetext UnknownText_0x18e736
 	buttonsound
-	setevent EVENT_DRAGON_SHRINE_QUESTION_2
-	special Special_SelectApricornForKurt
-	if_equal FALSE, .Cancel
-	if_equal BLU_APRICORN, .Blu
-	if_equal YLW_APRICORN, .Ylw
-	if_equal GRN_APRICORN, .Grn
-	if_equal WHT_APRICORN, .Wht
-	if_equal BLK_APRICORN, .Blk
-	if_equal PNK_APRICORN, .Pnk
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
+	special SelectApricornForKurt
+	ifequal FALSE, .Cancel
+	ifequal BLU_APRICORN, .Blu
+	ifequal YLW_APRICORN, .Ylw
+	ifequal GRN_APRICORN, .Grn
+	ifequal WHT_APRICORN, .Wht
+	ifequal BLK_APRICORN, .Blk
+	ifequal PNK_APRICORN, .Pnk
 ; .Red
 	setevent EVENT_GAVE_KURT_RED_APRICORN
 	jump .GaveKurtApricorns
@@ -168,7 +166,7 @@ KurtScript_0x18e178:
 	jump .GaveKurtApricorns
 
 .GaveKurtApricorns:
-	setevent EVENT_GAVE_KURT_APRICORNS
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	setflag ENGINE_KURT_MAKING_BALLS
 .WaitForApricorns:
 	writetext UnknownText_0x18e779
@@ -183,7 +181,7 @@ KurtScript_0x18e178:
 	end
 
 ._ThatTurnedOutGreat:
-	setevent EVENT_RECEIVED_BALLS_FROM_KURT
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 .ThatTurnedOutGreat:
 	writetext UnknownText_0x18e82a
 	waitbutton
@@ -291,18 +289,18 @@ KurtScript_0x18e178:
 	setevent EVENT_FOREST_IS_RESTLESS
 	clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
 	clearevent EVENT_GAVE_GS_BALL_TO_KURT
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 20
 	showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30
 	checkcode VAR_FACING
-	if_equal UP, .GSBallRunAround
-	spriteface PLAYER, DOWN
+	ifequal UP, .GSBallRunAround
+	turnobject PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
 	jump .KurtHasLeftTheBuilding
 
 .GSBallRunAround:
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c
 .KurtHasLeftTheBuilding:
@@ -311,10 +309,10 @@ KurtScript_0x18e178:
 	clearevent EVENT_AZALEA_TOWN_KURT
 	waitsfx
 	special RestartMapMusic
-	setmapscene AZALEA_TOWN, 2
+	setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
 	end
 
-KurtScript_0x18e3bd:
+Kurt2:
 	faceplayer
 	opentext
 	checkevent EVENT_GAVE_GS_BALL_TO_KURT
@@ -325,21 +323,21 @@ KurtMakingBallsScript:
 	writetext UnknownText_0x18e7d8
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_KURT2, UP
+	turnobject KURTSHOUSE_KURT2, UP
 	end
 
 Script_FirstTimeBuggingKurt:
 	writetext UnknownText_0x18e863
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_KURT2, UP
+	turnobject KURTSHOUSE_KURT2, UP
 	setevent EVENT_BUGGING_KURT_TOO_MUCH
 	end
 
 KurtScript_ImCheckingItNow:
 	writetext UnknownText_0x18e934
 	waitbutton
-	spriteface KURTSHOUSE_KURT2, UP
+	turnobject KURTSHOUSE_KURT2, UP
 	writetext UnknownText_0x18e949
 	waitbutton
 	closetext
@@ -347,9 +345,9 @@ KurtScript_ImCheckingItNow:
 
 KurtsGranddaughter1:
 	faceplayer
-	checkevent EVENT_GAVE_KURT_APRICORNS
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue KurtsGranddaughter2Subscript
-	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue KurtsGranddaughterFunScript
 	checkevent EVENT_FOREST_IS_RESTLESS
 	iftrue .Lonely
@@ -395,14 +393,14 @@ KurtsGranddaughter2Subscript:
 	writetext KurtsGranddaughterHelpText
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_TWIN2, RIGHT
+	turnobject KURTSHOUSE_TWIN2, RIGHT
 	end
 
 .GSBall:
 	writetext KurtsGranddaughterGSBallText
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_TWIN2, RIGHT
+	turnobject KURTSHOUSE_TWIN2, RIGHT
 	end
 
 KurtsGranddaughterFunScript:
@@ -677,31 +675,26 @@ KurtsHouseCelebiStatueText:
 	done
 
 KurtsHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 3, 7, 4, AZALEA_TOWN
-	warp_def 4, 7, 4, AZALEA_TOWN
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 7
-	bg_event 6, 1, BGEVENT_READ, KurtsHouseRadio
-	bg_event 8, 0, BGEVENT_READ, KurtsHouseOakPhoto
-	bg_event 9, 0, BGEVENT_READ, KurtsHouseOakPhoto
-	bg_event 5, 1, BGEVENT_READ, KurtsHouseBookshelf
-	bg_event 2, 1, BGEVENT_READ, KurtsHouseBookshelf
-	bg_event 3, 1, BGEVENT_READ, KurtsHouseBookshelf
-	bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue
-
-.ObjectEvents:
-	db 5
-	object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1
-	object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
-	object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
-	object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2
-	object_event 11, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  3,  7, AZALEA_TOWN, 4
+	warp_event  4,  7, AZALEA_TOWN, 4
+
+	db 0 ; coord events
+
+	db 7 ; bg events
+	bg_event  6,  1, BGEVENT_READ, KurtsHouseRadio
+	bg_event  8,  0, BGEVENT_READ, KurtsHouseOakPhoto
+	bg_event  9,  0, BGEVENT_READ, KurtsHouseOakPhoto
+	bg_event  5,  1, BGEVENT_READ, KurtsHouseBookshelf
+	bg_event  2,  1, BGEVENT_READ, KurtsHouseBookshelf
+	bg_event  3,  1, BGEVENT_READ, KurtsHouseBookshelf
+	bg_event  4,  1, BGEVENT_READ, KurtsHouseCelebiStatue
+
+	db 5 ; object events
+	object_event  3,  2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Kurt1, EVENT_KURTS_HOUSE_KURT_1
+	object_event  5,  3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
+	object_event  6,  3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE
+	object_event 14,  3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Kurt2, EVENT_KURTS_HOUSE_KURT_2
+	object_event 11,  4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index fdbbeb438..a63fb147e 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const LAKEOFRAGE_LANCE
 	const LAKEOFRAGE_GRAMPS
 	const LAKEOFRAGE_SUPER_NERD1
@@ -13,13 +13,11 @@ const_value set 2
 	const LAKEOFRAGE_POKE_BALL2
 
 LakeOfRage_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; unusable
+	scene_script .DummyScene1 ; unusable
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 	callback MAPCALLBACK_OBJECTS, .Wesley
 
@@ -35,7 +33,7 @@ LakeOfRage_MapScripts:
 
 .Wesley:
 	checkcode VAR_WEEKDAY
-	if_equal WEDNESDAY, .WesleyAppears
+	ifequal WEDNESDAY, .WesleyAppears
 	disappear LAKEOFRAGE_WESLEY
 	return
 
@@ -43,17 +41,17 @@ LakeOfRage_MapScripts:
 	appear LAKEOFRAGE_WESLEY
 	return
 
-LanceScript_0x70022:
+LakeOfRageLanceScript:
 	checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE
-	iftrue UnknownScript_0x70057
+	iftrue .AskAgainForHelp
 	opentext
 	writetext UnknownText_0x70157
 	buttonsound
 	faceplayer
 	writetext UnknownText_0x701b4
 	yesorno
-	iffalse UnknownScript_0x7004e
-UnknownScript_0x70035:
+	iffalse .RefusedToHelp
+.AgreedToHelp:
 	writetext UnknownText_0x702c6
 	waitbutton
 	closetext
@@ -62,25 +60,25 @@ UnknownScript_0x70035:
 	disappear LAKEOFRAGE_LANCE
 	clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
 	setevent EVENT_DECIDED_TO_HELP_LANCE
-	setmapscene MAHOGANY_MART_1F, 1
+	setmapscene MAHOGANY_MART_1F, SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS
 	end
 
-UnknownScript_0x7004e:
+.RefusedToHelp:
 	writetext UnknownText_0x70371
 	waitbutton
 	closetext
 	setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE
 	end
 
-UnknownScript_0x70057:
+.AskAgainForHelp:
 	faceplayer
 	opentext
 	writetext UnknownText_0x703a5
 	yesorno
-	iffalse UnknownScript_0x7004e
-	jump UnknownScript_0x70035
+	iffalse .RefusedToHelp
+	jump .AgreedToHelp
 
-GyaradosScript_0x70063:
+RedGyarados:
 	opentext
 	writetext UnknownText_0x703cb
 	pause 15
@@ -89,9 +87,9 @@ GyaradosScript_0x70063:
 	loadwildmon GYARADOS, 30
 	writecode VAR_BATTLETYPE, BATTLETYPE_SHINY
 	startbattle
-	if_equal $1, UnknownScript_0x7007a
+	ifequal $1, .NotBeaten
 	disappear LAKEOFRAGE_GYARADOS
-UnknownScript_0x7007a:
+.NotBeaten:
 	reloadmapafterbattle
 	opentext
 	giveitem RED_SCALE
@@ -101,22 +99,22 @@ UnknownScript_0x7007a:
 	waitsfx
 	itemnotify
 	closetext
-	setscene 0
+	setscene 0 ; Lake of Rage does not have a scene variable
 	appear LAKEOFRAGE_LANCE
 	end
 
-GrampsScript_0x7008e:
+LakeOfRageGrampsScript:
 	faceplayer
 	opentext
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
-	iftrue UnknownScript_0x7009c
-	writetext UnknownText_0x703f8
+	iftrue .ClearedRocketHideout
+	writetext LakeOfRageGrampsText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7009c:
-	writetext UnknownText_0x70421
+.ClearedRocketHideout:
+	writetext LakeOfRageGrampsText_ClearedRocketHideout
 	waitbutton
 	closetext
 	end
@@ -127,29 +125,29 @@ LakeOfRageSuperNerdScript:
 LakeOfRageCooltrainerFScript:
 	jumptextfaceplayer LakeOfRageCooltrainerFText
 
-MapLakeOfRageSignpost0Script:
-	jumptext UnknownText_0x708d7
+LakeOfRageSign:
+	jumptext LakeOfRageSignText
 
-MapLakeOfRageSignpost1Script:
+MagikarpHouseSignScript:
 	opentext
-	writetext UnknownText_0x70903
+	writetext FishingGurusHouseSignText
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
-	iftrue UnknownScript_0x700b8
+	iftrue .MagikarpLengthRecord
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x700b8:
+.MagikarpLengthRecord:
 	buttonsound
-	special Special_MagikarpHouseSign
+	special MagikarpHouseSign
 	closetext
 	end
 
 TrainerFisherAndre:
-	trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script
+	trainer FISHER, ANDRE, EVENT_BEAT_FISHER_ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherAndreAfterBattleText
 	waitbutton
@@ -157,10 +155,10 @@ TrainerFisherAndre:
 	end
 
 TrainerFisherRaymond:
-	trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script
+	trainer FISHER, RAYMOND, EVENT_BEAT_FISHER_RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherRaymondAfterBattleText
 	waitbutton
@@ -168,10 +166,10 @@ TrainerFisherRaymond:
 	end
 
 TrainerCooltrainermAaron:
-	trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script
+	trainer COOLTRAINERM, AARON, EVENT_BEAT_COOLTRAINERM_AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermAaronAfterBattleText
 	waitbutton
@@ -179,10 +177,10 @@ TrainerCooltrainermAaron:
 	end
 
 TrainerCooltrainerfLois:
-	trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script
+	trainer COOLTRAINERF, LOIS, EVENT_BEAT_COOLTRAINERF_LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfLoisAfterBattleText
 	waitbutton
@@ -195,7 +193,7 @@ WesleyScript:
 	checkevent EVENT_GOT_BLACKBELT_FROM_WESLEY
 	iftrue WesleyWednesdayScript
 	checkcode VAR_WEEKDAY
-	if_not_equal WEDNESDAY, WesleyNotWednesdayScript
+	ifnotequal WEDNESDAY, WesleyNotWednesdayScript
 	checkevent EVENT_MET_WESLEY_OF_WEDNESDAY
 	iftrue .MetWesley
 	writetext MeetWesleyText
@@ -232,13 +230,13 @@ LakeOfRageTMDetect:
 	itemball TM_DETECT
 
 LakeOfRageHiddenFullRestore:
-	hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE
+	hiddenitem FULL_RESTORE, EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE
 
 LakeOfRageHiddenRareCandy:
-	hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY
+	hiddenitem RARE_CANDY, EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY
 
 LakeOfRageHiddenMaxPotion:
-	hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION
 
 MovementData_0x70155:
 	teleport_from
@@ -321,14 +319,14 @@ UnknownText_0x703df:
 	line "RED SCALE."
 	done
 
-UnknownText_0x703f8:
+LakeOfRageGrampsText:
 	text "The GYARADOS are"
 	line "angry!"
 
 	para "It's a bad omen!"
 	done
 
-UnknownText_0x70421:
+LakeOfRageGrampsText_ClearedRocketHideout:
 	text "Hahah! The MAGI-"
 	line "KARP are biting!"
 	done
@@ -482,48 +480,43 @@ WesleyNotWednesdayText:
 	cont "That's too bad."
 	done
 
-UnknownText_0x708d7:
+LakeOfRageSignText:
 	text "LAKE OF RAGE,"
 	line "also known as"
 	cont "GYARADOS LAKE."
 	done
 
-UnknownText_0x70903:
+FishingGurusHouseSignText:
 	text "FISHING GURU'S"
 	line "HOUSE"
 	done
 
 LakeOfRage_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE
-	warp_def 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE
+	db 2 ; warp events
+	warp_event  7,  3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1
+	warp_event 27, 31, LAKE_OF_RAGE_MAGIKARP_HOUSE, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 5
-	bg_event 21, 27, BGEVENT_READ, MapLakeOfRageSignpost0Script
-	bg_event 25, 31, BGEVENT_READ, MapLakeOfRageSignpost1Script
+	db 5 ; bg events
+	bg_event 21, 27, BGEVENT_READ, LakeOfRageSign
+	bg_event 25, 31, BGEVENT_READ, MagikarpHouseSignScript
 	bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore
-	bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
-	bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
+	bg_event  4,  4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
+	bg_event 35,  5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
 
-.ObjectEvents:
-	db 12
-	object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE
-	object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1
+	db 12 ; object events
+	object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageLanceScript, EVENT_LAKE_OF_RAGE_LANCE
+	object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageGrampsScript, -1
 	object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1
 	object_event 25, 29, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1
 	object_event 30, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS
 	object_event 24, 26, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event 4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event 36, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS
-	object_event 4, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
-	object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
-	object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
+	object_event  4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
+	object_event 36,  7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
+	object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RedGyarados, EVENT_LAKE_OF_RAGE_RED_GYARADOS
+	object_event  4,  4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
+	object_event  7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
+	object_event 35,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm
index 9d346ab0a..177d7ea27 100644
--- a/maps/LakeOfRageHiddenPowerHouse.asm
+++ b/maps/LakeOfRageHiddenPowerHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER
 
 LakeOfRageHiddenPowerHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 HiddenPowerGuy:
 	faceplayer
@@ -68,22 +66,17 @@ HiddenPowerGuyText3:
 	done
 
 LakeOfRageHiddenPowerHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, LAKE_OF_RAGE
-	warp_def 3, 7, 1, LAKE_OF_RAGE
+	db 2 ; warp events
+	warp_event  2,  7, LAKE_OF_RAGE, 1
+	warp_event  3,  7, LAKE_OF_RAGE, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, HiddenPowerHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, HiddenPowerHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, HiddenPowerHouseBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index 92900c486..6443ac299 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -1,97 +1,96 @@
-const_value set 2
+	const_def 2 ; object constants
 	const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU
 
 LakeOfRageMagikarpHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-FishingGuruScript_0x19a6ae:
+MagikarpLengthRaterScript:
 	faceplayer
 	opentext
 	checkevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
-	iftrue UnknownScript_0x19a6fe
+	iftrue .GetReward
 	checkevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
-	iftrue UnknownScript_0x19a6e0
+	iftrue .AskedForMagikarp
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
-	iftrue UnknownScript_0x19a6d7
+	iftrue .ClearedRocketHideout
 	checkevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
-	iftrue UnknownScript_0x19a6d1
-	writetext UnknownText_0x19a72e
+	iftrue .ExplainedHistory
+	writetext MagikarpLengthRaterText_LakeOfRageHistory
 	waitbutton
 	closetext
 	setevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
 	end
 
-UnknownScript_0x19a6d1:
-	writetext UnknownText_0x19a84d
+.ExplainedHistory:
+	writetext MagikarpLengthRaterText_MenInBlack
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x19a6d7:
-	writetext UnknownText_0x19a890
+.ClearedRocketHideout:
+	writetext MagikarpLengthRaterText_WorldsLargestMagikarp
 	waitbutton
 	closetext
 	setevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
 	end
 
-UnknownScript_0x19a6e0:
+.AskedForMagikarp:
 	writebyte MAGIKARP
-	special Special_FindThatSpecies
-	iffalse UnknownScript_0x19a6d7
-	writetext UnknownText_0x19a93e
+	special FindPartyMonThatSpecies
+	iffalse .ClearedRocketHideout
+	writetext MagikarpLengthRaterText_YouHaveAMagikarp
 	waitbutton
-	special Special_CheckMagikarpLength
-	if_equal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c
-	if_equal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722
-	if_equal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716
+	special CheckMagikarpLength
+	ifequal MAGIKARPLENGTH_NOT_MAGIKARP, .NotMagikarp
+	ifequal MAGIKARPLENGTH_REFUSED, .Refused
+	ifequal MAGIKARPLENGTH_TOO_SHORT, .TooShort
 	; MAGIKARPLENGTH_BEAT_RECORD
-	jump UnknownScript_0x19a6fe
+	jump .GetReward
 
-UnknownScript_0x19a6fe:
-	writetext UnknownText_0x19a977
+.GetReward:
+	writetext MagikarpLengthRaterText_Memento
 	buttonsound
 	verbosegiveitem ELIXER
-	iffalse UnknownScript_0x19a711
-	writetext UnknownText_0x19a9c3
+	iffalse .NoRoom
+	writetext MagikarpLengthRaterText_Bonus
 	waitbutton
 	closetext
 	clearevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
 	end
 
-UnknownScript_0x19a711:
+.NoRoom:
 	closetext
 	setevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
 	end
 
-UnknownScript_0x19a716:
-	writetext UnknownText_0x19aa01
+.TooShort:
+	writetext MagikarpLengthRaterText_TooShort
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x19a71c:
-	writetext UnknownText_0x19aa5c
+.NotMagikarp:
+	writetext MagikarpLengthRaterText_NotMagikarp
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x19a722:
-	writetext UnknownText_0x19aa79
+.Refused:
+	writetext MagikarpLengthRaterText_Refused
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x19a728:
-	jumptext UnknownText_0x19aabc
+LakeOfRageMagikarpHouseUnusedRecordSign:
+; unused
+	jumptext LakeOfRageMagikarpHouseUnusedRecordText
 
 MagikarpHouseBookshelf:
 	jumpstd difficultbookshelf
 
-UnknownText_0x19a72e:
+MagikarpLengthRaterText_LakeOfRageHistory:
 	text "LAKE OF RAGE is"
 	line "actually a crater"
 
@@ -120,7 +119,7 @@ UnknownText_0x19a72e:
 	line "what's happening."
 	done
 
-UnknownText_0x19a84d:
+MagikarpLengthRaterText_MenInBlack:
 	text "The LAKE hasn't"
 	line "been normal since"
 
@@ -128,7 +127,7 @@ UnknownText_0x19a84d:
 	line "black arrived."
 	done
 
-UnknownText_0x19a890:
+MagikarpLengthRaterText_WorldsLargestMagikarp:
 	text "LAKE OF RAGE is"
 	line "back to normal."
 
@@ -145,7 +144,7 @@ UnknownText_0x19a890:
 	cont "you do."
 	done
 
-UnknownText_0x19a93e:
+MagikarpLengthRaterText_YouHaveAMagikarp:
 	text "Ah, you have a"
 	line "MAGIKARP! Let's"
 
@@ -153,7 +152,7 @@ UnknownText_0x19a93e:
 	line "baby is."
 	done
 
-UnknownText_0x19a977:
+MagikarpLengthRaterText_Memento:
 	text "Wow! This one is"
 	line "outstanding!"
 
@@ -164,7 +163,7 @@ UnknownText_0x19a977:
 	line "memento!"
 	done
 
-UnknownText_0x19a9c3:
+MagikarpLengthRaterText_Bonus:
 	text "The record is the"
 	line "important thing."
 
@@ -172,7 +171,7 @@ UnknownText_0x19a9c3:
 	line "a bonus!"
 	done
 
-UnknownText_0x19aa01:
+MagikarpLengthRaterText_TooShort:
 	text "Wow! This one is"
 	line "outstanding!"
 
@@ -183,12 +182,12 @@ UnknownText_0x19aa01:
 	line "before."
 	done
 
-UnknownText_0x19aa5c:
+MagikarpLengthRaterText_NotMagikarp:
 	text "What? That's not a"
 	line "MAGIKARP!"
 	done
 
-UnknownText_0x19aa79:
+MagikarpLengthRaterText_Refused:
 	text "Oh… So you didn't"
 	line "get one good"
 
@@ -196,7 +195,7 @@ UnknownText_0x19aa79:
 	line "Maybe next time."
 	done
 
-UnknownText_0x19aabc:
+LakeOfRageMagikarpHouseUnusedRecordText:
 	text "CURRENT RECORD"
 
 	para "@"
@@ -207,22 +206,17 @@ UnknownText_0x19aabc:
 	db "@@"
 
 LakeOfRageMagikarpHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 2, LAKE_OF_RAGE
-	warp_def 3, 7, 2, LAKE_OF_RAGE
+	db 2 ; warp events
+	warp_event  2,  7, LAKE_OF_RAGE, 2
+	warp_event  3,  7, LAKE_OF_RAGE, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, MagikarpHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, MagikarpHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, MagikarpHouseBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MagikarpLengthRaterScript, -1
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index a3336251b..8636fc9b1 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const LANCESROOM_LANCE
 	const LANCESROOM_MARY
 	const LANCESROOM_OAK
 
 LancesRoom_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .LockDoor
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .LockDoor ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_LANCESROOM_APPROACH_LANCE
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .LancesRoomDoors
 
 .LockDoor:
@@ -32,27 +30,27 @@ LancesRoom_MapScripts:
 	return
 
 .LancesDoorLocksBehindYou:
-	applymovement PLAYER, LancesRoom_PlayerWalksInMovementData
+	applymovement PLAYER, LancesRoom_EnterMovement
 	refreshscreen $86
 	playsound SFX_STRENGTH
 	earthquake 80
 	changeblock 4, 22, $34 ; wall
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_LANCESROOM_APPROACH_LANCE
 	setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
 	end
 
 Script_ApproachLanceFromLeft:
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	applymovement PLAYER, MovementData_ApproachLanceFromLeft
-	jump LanceScript_0x180e7b
+	jump LancesRoomLanceScript
 
 Script_ApproachLanceFromRight:
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	applymovement PLAYER, MovementData_ApproachLanceFromRight
-LanceScript_0x180e7b:
-	spriteface LANCESROOM_LANCE, LEFT
+LancesRoomLanceScript:
+	turnobject LANCESROOM_LANCE, LEFT
 	opentext
 	writetext LanceBattleIntroText
 	waitbutton
@@ -76,9 +74,9 @@ LanceScript_0x180e7b:
 	musicfadeout MUSIC_BEAUTY_ENCOUNTER, 16
 	pause 30
 	showemote EMOTE_SHOCK, LANCESROOM_LANCE, 15
-	spriteface LANCESROOM_LANCE, DOWN
+	turnobject LANCESROOM_LANCE, DOWN
 	pause 10
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	appear LANCESROOM_MARY
 	applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRushesIn
 	opentext
@@ -90,27 +88,27 @@ LanceScript_0x180e7b:
 	follow LANCESROOM_MARY, LANCESROOM_OAK
 	applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryYieldsToOak
 	stopfollow
-	spriteface LANCESROOM_OAK, UP
-	spriteface LANCESROOM_LANCE, LEFT
+	turnobject LANCESROOM_OAK, UP
+	turnobject LANCESROOM_LANCE, LEFT
 	opentext
 	writetext UnknownText_0x18121b
 	waitbutton
 	closetext
 	applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	opentext
 	writetext UnknownText_0x18134b
 	waitbutton
 	closetext
 	applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext UnknownText_0x18137b
 	waitbutton
 	closetext
 	follow LANCESROOM_LANCE, PLAYER
-	spriteface LANCESROOM_MARY, UP
-	spriteface LANCESROOM_OAK, UP
+	turnobject LANCESROOM_MARY, UP
+	turnobject LANCESROOM_OAK, UP
 	applymovement LANCESROOM_LANCE, LancesRoomMovementData_LanceLeadsPlayerToHallOfFame
 	stopfollow
 	playsound SFX_EXIT_BUILDING
@@ -125,12 +123,12 @@ LanceScript_0x180e7b:
 	pause 30
 	closetext
 	applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	pause 15
 	warpfacing UP, HALL_OF_FAME, 4, 13
 	end
 
-LancesRoom_PlayerWalksInMovementData:
+LancesRoom_EnterMovement:
 	step UP
 	step UP
 	step UP
@@ -338,26 +336,21 @@ UnknownText_0x1813c5:
 	done
 
 LancesRoom_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 4, 23, 3, KARENS_ROOM
-	warp_def 5, 23, 4, KARENS_ROOM
-	warp_def 4, 1, 1, HALL_OF_FAME
-	warp_def 5, 1, 2, HALL_OF_FAME
-
-.CoordEvents:
-	db 2
-	coord_event 4, 5, 1, Script_ApproachLanceFromLeft
-	coord_event 5, 5, 1, Script_ApproachLanceFromRight
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1
-	object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
-	object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  4, 23, KARENS_ROOM, 3
+	warp_event  5, 23, KARENS_ROOM, 4
+	warp_event  4,  1, HALL_OF_FAME, 1
+	warp_event  5,  1, HALL_OF_FAME, 2
+
+	db 2 ; coord events
+	coord_event  4,  5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft
+	coord_event  5,  5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  5,  3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LancesRoomLanceScript, -1
+	object_event  4,  7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
+	object_event  4,  7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY
diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
index d16bce5f1..45bd0d208 100644
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const LAVRADIOTOWER1F_RECEPTIONIST
 	const LAVRADIOTOWER1F_OFFICER
 	const LAVRADIOTOWER1F_SUPER_NERD1
@@ -6,11 +6,9 @@ const_value set 2
 	const LAVRADIOTOWER1F_SUPER_NERD2
 
 LavRadioTower1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 LavRadioTower1FReceptionistScript:
 	jumptextfaceplayer LavRadioTower1FReceptionistText
@@ -18,64 +16,65 @@ LavRadioTower1FReceptionistScript:
 LavRadioTower1FOfficerScript:
 	jumptextfaceplayer LavRadioTower1FOfficerText
 
-LavRadioTower1FSuperNerdScript:
-	jumptextfaceplayer LavRadioTower1FSuperNerdText
+LavRadioTower1FSuperNerd1Script:
+	jumptextfaceplayer LavRadioTower1FSuperNerd1Text
 
-GentlemanScript_0x7ee6c:
+LavRadioTower1FGentlemanScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_EXPN_CARD
-	iftrue .UnknownScript_0x7ee8e
+	iftrue .GotExpnCard
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue .UnknownScript_0x7ee80
-	writetext UnknownText_0x7effb
+	iftrue .ReturnedMachinePart
+	writetext LavRadioTower1FGentlemanText
 	waitbutton
 	closetext
 	end
 
-.UnknownScript_0x7ee80:
-	writetext UnknownText_0x7f0a1
+.ReturnedMachinePart:
+	writetext LavRadioTower1FGentlemanText_ReturnedMachinePart
 	buttonsound
 	stringtotext .expncardname, MEM_BUFFER_1
-	scall .UnknownScript_0x7ee94
+	scall .receiveitem
 	setflag ENGINE_EXPN_CARD
-.UnknownScript_0x7ee8e:
-	writetext UnknownText_0x7f141
+.GotExpnCard:
+	writetext LavRadioTower1FGentlemanText_GotExpnCard
 	waitbutton
 	closetext
 	end
 
-.UnknownScript_0x7ee94:
+.receiveitem:
 	jumpstd receiveitem
 	end
 
 .expncardname
 	db "EXPN CARD@"
 
-SuperNerdScript_0x7eea2:
+LavRadioTower1FSuperNerd2Script:
 	faceplayer
 	opentext
 	checkflag ENGINE_EXPN_CARD
-	iftrue UnknownScript_0x7eeb0
-	writetext UnknownText_0x7f193
+	iftrue .GotExpnCard
+	writetext LavRadioTower1FSuperNerd2Text
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7eeb0:
-	writetext UnknownText_0x7f248
+.GotExpnCard:
+	writetext LavRadioTower1FSuperNerd2Text_GotExpnCard
 	waitbutton
 	closetext
 	end
 
-MapLavRadioTower1FSignpost0Script:
-	jumptext UnknownText_0x7f2e3
+LavRadioTower1FDirectory:
+	jumptext LavRadioTower1FDirectoryText
 
-MapLavRadioTower1FSignpost1Script:
-	jumptext UnknownText_0x7f32d
+LavRadioTower1FPokeFluteSign:
+	jumptext LavRadioTower1FPokeFluteSignText
 
-UnknownScript_0x7eebc:
-	jumptext UnknownText_0x7f36b
+LavRadioTower1FReferenceLibrary:
+; unreferenced
+	jumptext LavRadioTower1FReferenceLibraryText
 
 LavRadioTower1FReceptionistText:
 	text "Welcome!"
@@ -100,7 +99,7 @@ LavRadioTower1FOfficerText:
 	line "up our security."
 	done
 
-LavRadioTower1FSuperNerdText:
+LavRadioTower1FSuperNerd1Text:
 	text "Many people are"
 	line "hard at work here"
 
@@ -112,7 +111,7 @@ LavRadioTower1FSuperNerdText:
 	cont "on good shows."
 	done
 
-UnknownText_0x7effb:
+LavRadioTower1FGentlemanText:
 	text "Oh, no, no, no!"
 
 	para "We've been off the"
@@ -130,7 +129,7 @@ UnknownText_0x7effb:
 	para "I'll be ruined!"
 	done
 
-UnknownText_0x7f0a1:
+LavRadioTower1FGentlemanText_ReturnedMachinePart:
 	text "Ah! So you're the"
 	line "<PLAY_G> who solved"
 
@@ -147,7 +146,7 @@ UnknownText_0x7f0a1:
 	line "as my thanks."
 	done
 
-UnknownText_0x7f141:
+LavRadioTower1FGentlemanText_GotExpnCard:
 	text "With that thing,"
 	line "you can tune into"
 
@@ -157,7 +156,7 @@ UnknownText_0x7f141:
 	para "Gahahahaha!"
 	done
 
-UnknownText_0x7f193:
+LavRadioTower1FSuperNerd2Text:
 	text "Hey there!"
 
 	para "I am the super"
@@ -176,7 +175,7 @@ UnknownText_0x7f193:
 	line "better get one!"
 	done
 
-UnknownText_0x7f248:
+LavRadioTower1FSuperNerd2Text_GotExpnCard:
 	text "Hey there!"
 
 	para "I am the super"
@@ -193,7 +192,7 @@ UnknownText_0x7f248:
 	cont "off the air!"
 	done
 
-UnknownText_0x7f2e3:
+LavRadioTower1FDirectoryText:
 	text "1F RECEPTION"
 	line "2F SALES"
 
@@ -204,7 +203,7 @@ UnknownText_0x7f2e3:
 	line "   OFFICE"
 	done
 
-UnknownText_0x7f32d:
+LavRadioTower1FPokeFluteSignText:
 	text "Perk Up #MON"
 	line "with Mellow Sounds"
 
@@ -212,7 +211,7 @@ UnknownText_0x7f32d:
 	line "on CHANNEL 20"
 	done
 
-UnknownText_0x7f36b:
+LavRadioTower1FReferenceLibraryText:
 	text "Wow! A full rack"
 	line "of #MON CDs and"
 	cont "videos."
@@ -222,26 +221,21 @@ UnknownText_0x7f36b:
 	done
 
 LavRadioTower1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 7, LAVENDER_TOWN
-	warp_def 3, 7, 7, LAVENDER_TOWN
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
-	bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
-
-.ObjectEvents:
-	db 5
-	object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
-	object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
-	object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
-	object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1
-	object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, LAVENDER_TOWN, 7
+	warp_event  3,  7, LAVENDER_TOWN, 7
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 11,  0, BGEVENT_READ, LavRadioTower1FDirectory
+	bg_event  5,  0, BGEVENT_READ, LavRadioTower1FPokeFluteSign
+
+	db 5 ; object events
+	object_event  6,  6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
+	object_event 15,  1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
+	object_event  1,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerd1Script, -1
+	object_event  9,  1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FGentlemanScript, -1
+	object_event 14,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerd2Script, -1
diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
index f55db399b..b5c3de66c 100644
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const LAVENDERMART_CLERK
 	const LAVENDERMART_POKEFAN_M
 	const LAVENDERMART_ROCKER
 
 LavenderMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x7eb1c:
+LavenderMartClerkScript:
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_LAVENDER
 	closetext
@@ -48,22 +46,17 @@ LavenderMartRockerText:
 	done
 
 LavenderMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 5, LAVENDER_TOWN
-	warp_def 3, 7, 5, LAVENDER_TOWN
+	db 2 ; warp events
+	warp_event  2,  7, LAVENDER_TOWN, 5
+	warp_event  3,  7, LAVENDER_TOWN, 5
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1
-	object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1
-	object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartClerkScript, -1
+	object_event  6,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1
+	object_event  9,  2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1
diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm
index 544c51d5b..7d2b44c96 100644
--- a/maps/LavenderNameRater.asm
+++ b/maps/LavenderNameRater.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const LAVENDERNAMERATER_NAME_RATER
 
 LavenderNameRater_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -15,29 +13,25 @@ LavenderNameRater_MapScripts:
 LavenderNameRater:
 	faceplayer
 	opentext
-	special Special_NameRater
+	special NameRater
 	waitbutton
 	closetext
 	end
 
 LavenderNameRaterUnusedBookshelf:
+; unused
 	jumpstd difficultbookshelf
 
 LavenderNameRater_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 4, LAVENDER_TOWN
-	warp_def 3, 7, 4, LAVENDER_TOWN
+	db 2 ; warp events
+	warp_event  2,  7, LAVENDER_TOWN, 4
+	warp_event  3,  7, LAVENDER_TOWN, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1
diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm
index 7436697ea..6031e9e80 100644
--- a/maps/LavenderPokecenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const LAVENDERPOKECENTER1F_NURSE
 	const LAVENDERPOKECENTER1F_GENTLEMAN
 	const LAVENDERPOKECENTER1F_TEACHER
 	const LAVENDERPOKECENTER1F_YOUNGSTER
 
 LavenderPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x7e6a0:
+LavenderPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
 LavenderPokecenter1FGentlemanScript:
@@ -20,18 +18,18 @@ LavenderPokecenter1FGentlemanScript:
 LavenderPokecenter1FTeacherScript:
 	jumptextfaceplayer LavenderPokecenter1FTeacherText
 
-YoungsterScript_0x7e6a9:
+LavenderPokecenter1FYoungsterScript:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x7e6b7
-	writetext UnknownText_0x7e779
+	iftrue .ReturnedMachinePart
+	writetext LavenderPokecenter1FYoungsterText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7e6b7:
-	writetext UnknownText_0x7e7ed
+.ReturnedMachinePart:
+	writetext LavenderPokecenter1FYoungsterText_ReturnedMachinePart
 	waitbutton
 	closetext
 	end
@@ -55,7 +53,7 @@ LavenderPokecenter1FTeacherText:
 	cont "to tune into it."
 	done
 
-UnknownText_0x7e779:
+LavenderPokecenter1FYoungsterText:
 	text "If the POWER PLANT"
 	line "isn't running, the"
 
@@ -67,7 +65,7 @@ UnknownText_0x7e779:
 	cont "can't broadcast…"
 	done
 
-UnknownText_0x7e7ed:
+LavenderPokecenter1FYoungsterText_ReturnedMachinePart:
 	text "The DIRECTOR of"
 	line "the RADIO STATION"
 	cont "sure was happy."
@@ -81,24 +79,19 @@ UnknownText_0x7e7ed:
 	done
 
 LavenderPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 1, LAVENDER_TOWN
-	warp_def 4, 7, 1, LAVENDER_TOWN
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1
-	object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1
-	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1
-	object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, LAVENDER_TOWN, 1
+	warp_event  4,  7, LAVENDER_TOWN, 1
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FNurseScript, -1
+	object_event  7,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1
+	object_event  5,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1
+	object_event  1,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FYoungsterScript, -1
diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm
index 537f10ea1..7157b4735 100644
--- a/maps/LavenderPokecenter2FBeta.asm
+++ b/maps/LavenderPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 LavenderPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 LavenderPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 0, 7, 3, LAVENDER_POKECENTER_1F
+	db 1 ; warp events
+	warp_event  0,  7, LAVENDER_POKECENTER_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm
index eacb6b4d6..dd73aa81f 100644
--- a/maps/LavenderSpeechHouse.asm
+++ b/maps/LavenderSpeechHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const LAVENDERSPEECHHOUSE_POKEFAN_F
 
 LavenderSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 LavenderSpeechHousePokefanFScript:
 	jumptextfaceplayer LavenderSpeechHousePokefanFText
@@ -29,22 +27,17 @@ LavenderSpeechHousePokefanFText:
 	done
 
 LavenderSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 3, LAVENDER_TOWN
-	warp_def 3, 7, 3, LAVENDER_TOWN
+	db 2 ; warp events
+	warp_event  2,  7, LAVENDER_TOWN, 3
+	warp_event  3,  7, LAVENDER_TOWN, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, LavenderSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, LavenderSpeechHouseBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index 655acb3b3..9aeec7ab9 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const LAVENDERTOWN_POKEFAN_M
 	const LAVENDERTOWN_TEACHER
 	const LAVENDERTOWN_GRAMPS
 	const LAVENDERTOWN_YOUNGSTER
 
 LavenderTown_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -106,34 +104,29 @@ SoulHouseSignText:
 	done
 
 LavenderTown_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 7
-	warp_def 5, 5, 1, LAVENDER_POKECENTER_1F
-	warp_def 5, 9, 1, MR_FUJIS_HOUSE
-	warp_def 3, 13, 1, LAVENDER_SPEECH_HOUSE
-	warp_def 7, 13, 1, LAVENDER_NAME_RATER
-	warp_def 1, 5, 2, LAVENDER_MART
-	warp_def 13, 11, 1, SOUL_HOUSE
-	warp_def 14, 5, 1, LAV_RADIO_TOWER_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 6
-	bg_event 11, 3, BGEVENT_READ, LavenderTownSign
-	bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign
-	bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign
+	db 0, 0 ; filler
+
+	db 7 ; warp events
+	warp_event  5,  5, LAVENDER_POKECENTER_1F, 1
+	warp_event  5,  9, MR_FUJIS_HOUSE, 1
+	warp_event  3, 13, LAVENDER_SPEECH_HOUSE, 1
+	warp_event  7, 13, LAVENDER_NAME_RATER, 1
+	warp_event  1,  5, LAVENDER_MART, 2
+	warp_event 13, 11, SOUL_HOUSE, 1
+	warp_event 14,  5, LAV_RADIO_TOWER_1F, 1
+
+	db 0 ; coord events
+
+	db 6 ; bg events
+	bg_event 11,  3, BGEVENT_READ, LavenderTownSign
+	bg_event 15,  7, BGEVENT_READ, KantoRadioStationSign
+	bg_event  3,  9, BGEVENT_READ, VolunteerPokemonHouseSign
 	bg_event 15, 13, BGEVENT_READ, SoulHouseSign
-	bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText
-	bg_event 2, 5, BGEVENT_READ, LavenderMartSignText
+	bg_event  6,  5, BGEVENT_READ, LavenderPokecenterSignText
+	bg_event  2,  5, BGEVENT_READ, LavenderMartSignText
 
-.ObjectEvents:
-	db 4
-	object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1
-	object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1
+	db 4 ; object events
+	object_event 12,  7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1
+	object_event  2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1
 	object_event 14, 12, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1
-	object_event 6, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1
+	object_event  6, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index 20ab72ab1..f578597f0 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MAHOGANYGYM_PRYCE
 	const MAHOGANYGYM_BUENA1
 	const MAHOGANYGYM_ROCKER1
@@ -8,13 +8,11 @@ const_value set 2
 	const MAHOGANYGYM_GYM_GUY
 
 MahoganyGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-PryceScript_0x199a9e:
+MahoganyGymPryceScript:
 	faceplayer
 	opentext
 	checkevent EVENT_BEAT_PRYCE
@@ -60,8 +58,8 @@ MahoganyGym_NoRoomForIcyWind:
 	end
 
 MahoganyGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -71,10 +69,10 @@ MahoganyGymActivateRockets:
 	jumpstd radiotowerrockets
 
 TrainerSkierRoxanne:
-	trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script
+	trainer SKIER, ROXANNE, EVENT_BEAT_SKIER_ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SkierRoxanneAfterBattleText
 	waitbutton
@@ -82,10 +80,10 @@ TrainerSkierRoxanne:
 	end
 
 TrainerSkierClarissa:
-	trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script
+	trainer SKIER, CLARISSA, EVENT_BEAT_SKIER_CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SkierClarissaAfterBattleText
 	waitbutton
@@ -93,10 +91,10 @@ TrainerSkierClarissa:
 	end
 
 TrainerBoarderRonald:
-	trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script
+	trainer BOARDER, RONALD, EVENT_BEAT_BOARDER_RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BoarderRonaldAfterBattleText
 	waitbutton
@@ -104,10 +102,10 @@ TrainerBoarderRonald:
 	end
 
 TrainerBoarderBrad:
-	trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script
+	trainer BOARDER, BRAD, EVENT_BEAT_BOARDER_BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BoarderBradAfterBattleText
 	waitbutton
@@ -115,10 +113,10 @@ TrainerBoarderBrad:
 	end
 
 TrainerBoarderDouglas:
-	trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script
+	trainer BOARDER, DOUGLAS, EVENT_BEAT_BOARDER_DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BoarderDouglasAfterBattleText
 	waitbutton
@@ -373,28 +371,23 @@ MahoganyGymGuyWinText:
 	done
 
 MahoganyGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 17, 3, MAHOGANY_TOWN
-	warp_def 5, 17, 3, MAHOGANY_TOWN
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 15, BGEVENT_READ, MahoganyGymStatue
-	bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue
-
-.ObjectEvents:
-	db 7
-	object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1
-	object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1
-	object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1
-	object_event 9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1
-	object_event 5, 9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1
-	object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1
-	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 17, MAHOGANY_TOWN, 3
+	warp_event  5, 17, MAHOGANY_TOWN, 3
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3, 15, BGEVENT_READ, MahoganyGymStatue
+	bg_event  6, 15, BGEVENT_READ, MahoganyGymStatue
+
+	db 7 ; object events
+	object_event  5,  3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MahoganyGymPryceScript, -1
+	object_event  4,  6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1
+	object_event  0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1
+	object_event  9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1
+	object_event  5,  9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1
+	object_event  2,  4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1
+	object_event  7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 5b3cfd43c..1afdb0173 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MAHOGANYMART1F_PHARMACIST
 	const MAHOGANYMART1F_BLACK_BELT
 	const MAHOGANYMART1F_LANCE
@@ -6,20 +6,18 @@ const_value set 2
 	const MAHOGANYMART1F_GRANNY
 
 MahoganyMart1F_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .LanceUncoversStaircase
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_MAHOGANYMART1F_NOTHING
+	scene_script .LanceUncoversStaircase ; SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase
 
 .DummyScene0:
 	end
 
 .LanceUncoversStaircase:
-	priorityjump UnknownScript_0x6c38f
+	priorityjump MahoganyMart1FLanceUncoversStaircaseScript
 	end
 
 .MahoganyMart1FStaircase:
@@ -31,38 +29,38 @@ MahoganyMart1F_MapScripts:
 	changeblock 6, 2, $1e ; stairs
 	return
 
-PharmacistScript_0x6c367:
+MahogayMart1FPharmacistScript:
 	faceplayer
 	opentext
 	checkevent EVENT_DECIDED_TO_HELP_LANCE
-	iftrue UnknownScript_0x6c375
+	iftrue .LanceEntered
 	pokemart MARTTYPE_STANDARD, MART_MAHOGANY_1
 	closetext
 	end
 
-UnknownScript_0x6c375:
-	writetext UnknownText_0x6c46b
+.LanceEntered:
+	writetext MahogayMart1FPharmacistText_LanceEntered
 	waitbutton
 	closetext
 	end
 
-BlackBeltScript_0x6c37b:
+MahogayMart1FBlackBeltScript:
 	faceplayer
 	opentext
 	checkevent EVENT_DECIDED_TO_HELP_LANCE
-	iftrue UnknownScript_0x6c389
-	writetext UnknownText_0x6c494
+	iftrue .LanceEntered
+	writetext MahogayMart1FBlackBeltText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6c389:
-	writetext UnknownText_0x6c501
+.LanceEntered:
+	writetext MahogayMart1FBlackBeltText_LanceEntered
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6c38f:
+MahoganyMart1FLanceUncoversStaircaseScript:
 	pause 15
 	opentext
 	writetext UnknownText_0x6c52a
@@ -93,7 +91,7 @@ UnknownScript_0x6c38f:
 	reloadmappart
 	closetext
 	setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
-	spriteface MAHOGANYMART1F_LANCE, LEFT
+	turnobject MAHOGANYMART1F_LANCE, LEFT
 	opentext
 	writetext UnknownText_0x6c5ba
 	waitbutton
@@ -101,11 +99,11 @@ UnknownScript_0x6c38f:
 	applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412
 	playsound SFX_EXIT_BUILDING
 	disappear MAHOGANYMART1F_LANCE
-	setscene 0
+	setscene SCENE_MAHOGANYMART1F_NOTHING
 	waitsfx
 	end
 
-GrannyScript_0x6c3ee:
+MahogayMart1FGrannyScript:
 	faceplayer
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2
@@ -166,13 +164,13 @@ UnknownText_0x6c414:
 	line "eat in MAHOGANY!"
 	done
 
-UnknownText_0x6c46b:
+MahogayMart1FPharmacistText_LanceEntered:
 	text "Arrgh… You found"
 	line "the secret stair-"
 	cont "way…"
 	done
 
-UnknownText_0x6c494:
+MahogayMart1FBlackBeltText:
 	text "Heheh! The experi-"
 	line "ment worked like a"
 	cont "charm."
@@ -184,7 +182,7 @@ UnknownText_0x6c494:
 	line "moneymakers."
 	done
 
-UnknownText_0x6c501:
+MahogayMart1FBlackBeltText_LanceEntered:
 	text "Urrgh…"
 
 	para "That guy's dragon"
@@ -221,25 +219,20 @@ UnknownText_0x6c5ba:
 	done
 
 MahoganyMart1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 1, MAHOGANY_TOWN
-	warp_def 4, 7, 1, MAHOGANY_TOWN
-	warp_def 7, 3, 1, TEAM_ROCKET_BASE_B1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 5
-	object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
-	object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
-	object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, MAHOGANY_TOWN, 1
+	warp_event  4,  7, MAHOGANY_TOWN, 1
+	warp_event  7,  3, TEAM_ROCKET_BASE_B1F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 5 ; object events
+	object_event  4,  3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event  1,  6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event  4,  6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
+	object_event  3,  6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
+	object_event  1,  3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FGrannyScript, EVENT_MAHOGANY_MART_OWNERS
diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm
index 9a0cfdf24..caad5e049 100644
--- a/maps/MahoganyPokecenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MAHOGANYPOKECENTER1F_NURSE
 	const MAHOGANYPOKECENTER1F_POKEFAN_M
 	const MAHOGANYPOKECENTER1F_YOUNGSTER
 	const MAHOGANYPOKECENTER1F_COOLTRAINER_F
 
 MahoganyPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x19a356:
+MahoganyPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
 MahoganyPokecenter1FPokefanMScript:
@@ -54,24 +52,19 @@ MahoganyPokecenter1FCooltrainerFText:
 	done
 
 MahoganyPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 4, MAHOGANY_TOWN
-	warp_def 4, 7, 4, MAHOGANY_TOWN
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1
-	object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1
-	object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1
-	object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, MAHOGANY_TOWN, 4
+	warp_event  4,  7, MAHOGANY_TOWN, 4
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FNurseScript, -1
+	object_event  7,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1
+	object_event  1,  3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1
+	object_event  2,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1
diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm
index d6ed88a36..5984c89fb 100644
--- a/maps/MahoganyRedGyaradosSpeechHouse.asm
+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm
@@ -1,37 +1,37 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT
 	const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER
 
 MahoganyRedGyaradosSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MahoganyRedGyaradosSpeechHouseBlackBeltScript:
 	jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText
 
-TeacherScript_0x199982:
+MahoganyRedGyaradosSpeechHouseTeacherScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
-	iftrue UnknownScript_0x199990
-	writetext UnknownText_0x199a0e
+	iftrue .RocketsInRadioTower
+	writetext MahoganyRedGyaradosSpeechHouseTeacherText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x199990:
-	writetext UnknownText_0x199a3d
+.RocketsInRadioTower:
+	writetext MahoganyRedGyaradosSpeechHouseTeacherText_RocketsInRadioTower
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x195996:
+MahoganyRedGyaradosSpeechHouseUnusedBookshelf1:
+; unused
 	jumpstd picturebookshelf
 
-UnknownScript_0x195999:
+MahoganyRedGyaradosSpeechHouseUnusedBookshelf2:
+; unused
 	jumpstd magazinebookshelf
 
 MahoganyRedGyaradosSpeechHouseBlackBeltText:
@@ -46,13 +46,13 @@ MahoganyRedGyaradosSpeechHouseBlackBeltText:
 	line "in that lake…"
 	done
 
-UnknownText_0x199a0e:
+MahoganyRedGyaradosSpeechHouseTeacherText:
 	text "My favorite radio"
 	line "program? I'd say"
 	cont "#MON MUSIC."
 	done
 
-UnknownText_0x199a3d:
+MahoganyRedGyaradosSpeechHouseTeacherText_RocketsInRadioTower:
 	text "I've been hearing"
 	line "laughter on the"
 
@@ -61,21 +61,16 @@ UnknownText_0x199a3d:
 	done
 
 MahoganyRedGyaradosSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 2, MAHOGANY_TOWN
-	warp_def 3, 7, 2, MAHOGANY_TOWN
+	db 2 ; warp events
+	warp_event  2,  7, MAHOGANY_TOWN, 2
+	warp_event  3,  7, MAHOGANY_TOWN, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1
-	object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1
+	db 2 ; object events
+	object_event  2,  3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1
+	object_event  6,  5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseTeacherScript, -1
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index d53aabce0..0f7f702f1 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MAHOGANYTOWN_POKEFAN_M
 	const MAHOGANYTOWN_GRAMPS
 	const MAHOGANYTOWN_FISHER
 	const MAHOGANYTOWN_LASS
 
 MahoganyTown_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .DummyScene0:
@@ -24,81 +22,81 @@ MahoganyTown_MapScripts:
 	setflag ENGINE_FLYPOINT_MAHOGANY
 	return
 
-UnknownScript_0x190013:
+MahoganyTownTryARageCandyBarScript:
 	showemote EMOTE_SHOCK, MAHOGANYTOWN_POKEFAN_M, 15
 	applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900a9
 	follow PLAYER, MAHOGANYTOWN_POKEFAN_M
 	applymovement PLAYER, MovementData_0x1900a7
 	stopfollow
-	spriteface PLAYER, RIGHT
-	scall UnknownScript_0x19002f
+	turnobject PLAYER, RIGHT
+	scall RageCandyBarMerchantScript
 	applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad
 	end
 
-PokefanMScript_0x19002e:
+MahoganyTownPokefanMScript:
 	faceplayer
-UnknownScript_0x19002f:
+RageCandyBarMerchantScript:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
-	iftrue UnknownScript_0x190039
-	scall UnknownScript_0x190040
+	iftrue .ClearedRocketHideout
+	scall .SellRageCandyBars
 	end
 
-UnknownScript_0x190039:
+.ClearedRocketHideout:
 	opentext
-	writetext UnknownText_0x1901a6
+	writetext RageCandyBarMerchantText_SoldOut
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x190040:
+.SellRageCandyBars:
 	opentext
-	writetext UnknownText_0x1900b0
-	special Special_PlaceMoneyTopRight
+	writetext RageCandyBarMerchantText_TryOne
+	special PlaceMoneyTopRight
 	yesorno
-	iffalse UnknownScript_0x190072
+	iffalse .Refused
 	checkmoney YOUR_MONEY, 300
-	if_equal HAVE_LESS, UnknownScript_0x19006c
+	ifequal HAVE_LESS, .NotEnoughMoney
 	giveitem RAGECANDYBAR
-	iffalse UnknownScript_0x190078
+	iffalse .NoRoom
 	waitsfx
 	playsound SFX_TRANSACTION
 	takemoney YOUR_MONEY, 300
-	special Special_PlaceMoneyTopRight
-	writetext UnknownText_0x19014a
+	special PlaceMoneyTopRight
+	writetext RageCandyBarMerchantText_SavorIt
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x19006c:
-	writetext UnknownText_0x19015b
+.NotEnoughMoney:
+	writetext RageCandyBarMerchantText_NotEnoughMoney
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x190072:
-	writetext UnknownText_0x190178
+.Refused:
+	writetext RageCandyBarMerchantText_Refused
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x190078:
+.NoRoom:
 	writetext UnknownText_0x190188
 	waitbutton
 	closetext
 	end
 
-GrampsScript_0x19007e:
+MahoganyTownGrampsScript:
 	faceplayer
 	opentext
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
-	iftrue UnknownScript_0x19008c
-	writetext UnknownText_0x1901e5
+	iftrue .ClearedRocketHideout
+	writetext MahoganyTownGrampsText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x19008c:
-	writetext UnknownText_0x19021d
+.ClearedRocketHideout:
+	writetext MahoganyTownGrampsText_ClearedRocketHideout
 	waitbutton
 	closetext
 	end
@@ -140,7 +138,7 @@ MovementData_0x1900ad:
 	turn_head DOWN
 	step_end
 
-UnknownText_0x1900b0:
+RageCandyBarMerchantText_TryOne:
 	text "Hiya, kid!"
 
 	para "I see you're new"
@@ -157,16 +155,16 @@ UnknownText_0x1900b0:
 	cont "¥300! Want one?"
 	done
 
-UnknownText_0x19014a:
+RageCandyBarMerchantText_SavorIt:
 	text "Good! Savor it!"
 	done
 
-UnknownText_0x19015b:
+RageCandyBarMerchantText_NotEnoughMoney:
 	text "You don't have"
 	line "enough money."
 	done
 
-UnknownText_0x190178:
+RageCandyBarMerchantText_Refused:
 	text "Oh, fine then…"
 	done
 
@@ -175,7 +173,7 @@ UnknownText_0x190188:
 	line "room for this."
 	done
 
-UnknownText_0x1901a6:
+RageCandyBarMerchantText_SoldOut:
 	text "RAGECANDYBAR's"
 	line "sold out."
 
@@ -184,13 +182,13 @@ UnknownText_0x1901a6:
 	cont "kiddo."
 	done
 
-UnknownText_0x1901e5:
+MahoganyTownGrampsText:
 	text "Are you off to see"
 	line "the GYARADOS ram-"
 	cont "page at the LAKE?"
 	done
 
-UnknownText_0x19021d:
+MahoganyTownGrampsText_ClearedRocketHideout:
 	text "MAGIKARP have"
 	line "returned to LAKE"
 	cont "OF RAGE."
@@ -245,32 +243,27 @@ MahoganyGymSignText:
 	done
 
 MahoganyTown_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 11, 7, 1, MAHOGANY_MART_1F
-	warp_def 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE
-	warp_def 6, 13, 1, MAHOGANY_GYM
-	warp_def 15, 13, 1, MAHOGANY_POKECENTER_1F
-	warp_def 9, 1, 3, ROUTE_43_MAHOGANY_GATE
-
-.CoordEvents:
-	db 2
-	coord_event 19, 8, 0, UnknownScript_0x190013
-	coord_event 19, 9, 0, UnknownScript_0x190013
-
-.BGEvents:
-	db 4
-	bg_event 1, 5, BGEVENT_READ, MahoganyTownSign
-	bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign
-	bg_event 3, 13, BGEVENT_READ, MahoganyGymSign
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event 11,  7, MAHOGANY_MART_1F, 1
+	warp_event 17,  7, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 1
+	warp_event  6, 13, MAHOGANY_GYM, 1
+	warp_event 15, 13, MAHOGANY_POKECENTER_1F, 1
+	warp_event  9,  1, ROUTE_43_MAHOGANY_GATE, 3
+
+	db 2 ; coord events
+	coord_event 19,  8, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript
+	coord_event 19,  9, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript
+
+	db 4 ; bg events
+	bg_event  1,  5, BGEVENT_READ, MahoganyTownSign
+	bg_event  9,  7, BGEVENT_READ, MahoganyTownRagecandybarSign
+	bg_event  3, 13, BGEVENT_READ, MahoganyGymSign
 	bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign
 
-.ObjectEvents:
-	db 4
-	object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
-	object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1
-	object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
-	object_event 12, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS
+	db 4 ; object events
+	object_event 19,  8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownPokefanMScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
+	object_event  6,  9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownGrampsScript, -1
+	object_event  6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
+	object_event 12,  8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS
diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm
index d5d3febb6..1a70e9606 100644
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MANIASHOUSE_ROCKER
 
 ManiasHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ManiaScript:
 	faceplayer
@@ -18,7 +16,7 @@ ManiaScript:
 	writetext ManiaText_AskLookAfterShuckle
 	yesorno
 	iffalse .refusetotakeshuckie
-	special Special_GiveShuckle
+	special GiveShuckle
 	iffalse .partyfull
 	writetext ManiaText_TakeCareOfShuckle
 	buttonsound
@@ -31,7 +29,7 @@ ManiaScript:
 	end
 
 .alreadyhaveshuckie
-	checkflag ENGINE_SHUCKLE_GIVEN
+	checkflag ENGINE_GOT_SHUCKIE_TODAY
 	iffalse .returnshuckie
 	writetext ManiaText_TakeCareOfShuckle
 	waitbutton
@@ -54,11 +52,11 @@ ManiaScript:
 	writetext ManiaText_CanIHaveMyMonBack
 	yesorno
 	iffalse .refused
-	special Special_ReturnShuckle
-	if_equal SHUCKIE_WRONG_MON, .wrong
-	if_equal SHUCKIE_REFUSED, .refused
-	if_equal SHUCKIE_HAPPY, .superhappy
-	if_equal SHUCKIE_FAINTED, .default_postevent
+	special ReturnShuckle
+	ifequal SHUCKIE_WRONG_MON, .wrong
+	ifequal SHUCKIE_REFUSED, .refused
+	ifequal SHUCKIE_HAPPY, .superhappy
+	ifequal SHUCKIE_FAINTED, .default_postevent
 	; SHUCKIE_RETURNED
 	writetext ManiaText_ThankYou
 	waitbutton
@@ -97,7 +95,8 @@ ManiaScript:
 	closetext
 	end
 
-UnknownScript_0x9d300:
+ManiasHouseUnusedBookshelf:
+; unused
 	jumpstd picturebookshelf
 
 ManiaText_AskLookAfterShuckle:
@@ -200,20 +199,15 @@ ManiaText_ShuckleIsYourLastMon:
 	done
 
 ManiasHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, CIANWOOD_CITY
-	warp_def 3, 7, 1, CIANWOOD_CITY
+	db 2 ; warp events
+	warp_event  2,  7, CIANWOOD_CITY, 1
+	warp_event  3,  7, CIANWOOD_CITY, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1
+	db 1 ; object events
+	object_event  2,  4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index d65ae1006..0eff7e32b 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,11 +1,9 @@
 MobileBattleRoom_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .InitializeMobileBattleRoom
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .InitializeMobileBattleRoom ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .InitializeMobileBattleRoom:
 	priorityjump .InitializeAndPreparePokecenter2F
@@ -15,42 +13,42 @@ MobileBattleRoom_MapScripts:
 	end
 
 .InitializeAndPreparePokecenter2F:
-	setscene 1
-	setmapscene POKECENTER_2F, 5
+	setscene SCENE_FINISHED
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
 	end
 
-MapMobileBattleRoomSignpost0Script:
+MobileBattleRoomConsoleScript:
 	refreshscreen
-	special Special_Function1037c2
-	if_equal $1, .one
-	special Special_Function1037eb
+	special Function1037c2
+	ifequal $1, .one
+	special Function1037eb
 	iffalse .false
-	if_equal $1, .one_
-	if_equal $2, .two_
+	ifequal $1, .one_
+	ifequal $2, .two_
 	jump .false
 
 .one_
 	writetext MobileBattleRoom_HealText
 	pause 20
 	closetext
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	playmusic MUSIC_HEAL
-	special Special_LoadMapPalettes
+	special LoadMapPalettes
 	pause 60
-	special Special_FadeInPalettes
+	special FadeInPalettes
 	special RestartMapMusic
 	refreshscreen
 .two_
-	special Special_StubbedTrainerRankings_Healings
+	special StubbedTrainerRankings_Healings
 	special HealParty
-	special Special_Function10383c
+	special Function10383c
 	iftrue .false
 .one
-	special Special_Function10387b
+	special Function10387b
 	writetext MobileBattleRoom_EstablishingCommsText
 	waitbutton
 	reloadmappart
-	special Special_Function101225
+	special Function101225
 .false
 	closetext
 	end
@@ -67,20 +65,15 @@ MobileBattleRoom_HealText:
 	done
 
 MobileBattleRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 4, 7, 6, POKECENTER_2F
-	warp_def 5, 7, 6, POKECENTER_2F
+	db 2 ; warp events
+	warp_event  4,  7, POKECENTER_2F, 6
+	warp_event  5,  7, POKECENTER_2F, 6
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script
+	db 1 ; bg events
+	bg_event  4,  2, BGEVENT_UP, MobileBattleRoomConsoleScript
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm
new file mode 100644
index 000000000..b294b2355
--- /dev/null
+++ b/maps/MobileTradeRoom.asm
@@ -0,0 +1,47 @@
+MobileTradeRoom_MapScripts:
+	db 2 ; scene scripts
+	scene_script .InitializeMobileTradeRoom ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
+
+	db 0 ; callbacks
+
+.InitializeMobileTradeRoom:
+	priorityjump .InitializeAndPreparePokecenter2F
+	end
+
+.DummyScene:
+	end
+
+.InitializeAndPreparePokecenter2F:
+	setscene SCENE_FINISHED
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
+	end
+
+MobileTradeRoomConsoleScript:
+	refreshscreen
+	special Function1037c2
+	writetext MobileTradeRoom_EstablishingCommsText
+	waitbutton
+	reloadmappart
+	special Function101231
+	closetext
+	end
+
+MobileTradeRoom_EstablishingCommsText:
+	text "Establishing"
+	line "communications…"
+	done
+
+MobileTradeRoom_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4,  7, POKECENTER_2F, 5
+	warp_event  5,  7, POKECENTER_2F, 5
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  4,  2, BGEVENT_UP, MobileTradeRoomConsoleScript
+
+	db 0 ; object events
diff --git a/maps/MobileTradeRoomMobile.blk b/maps/MobileTradeRoom.blk
index fbe578781..fbe578781 100644
--- a/maps/MobileTradeRoomMobile.blk
+++ b/maps/MobileTradeRoom.blk
diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm
deleted file mode 100644
index 53713c9de..000000000
--- a/maps/MobileTradeRoomMobile.asm
+++ /dev/null
@@ -1,54 +0,0 @@
-MobileTradeRoomMobile_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .InitializeMobileTradeRoomMobile
-	scene_script .DummyScene
-
-.MapCallbacks:
-	db 0
-
-.InitializeMobileTradeRoomMobile:
-	priorityjump .InitializeAndPreparePokecenter2F
-	end
-
-.DummyScene:
-	end
-
-.InitializeAndPreparePokecenter2F:
-	setscene 1
-	setmapscene POKECENTER_2F, 4
-	end
-
-MapMobileTradeRoomMobileSignpost0Script:
-	refreshscreen
-	special Special_Function1037c2
-	writetext MobileTradeRoomMobile_EstablishingCommsText
-	waitbutton
-	reloadmappart
-	special Special_Function101231
-	closetext
-	end
-
-MobileTradeRoomMobile_EstablishingCommsText:
-	text "Establishing"
-	line "communications…"
-	done
-
-MobileTradeRoomMobile_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 7, 5, POKECENTER_2F
-	warp_def 5, 7, 5, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script
-
-.ObjectEvents:
-	db 0
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 38e5d436d..1385f8e5d 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MOUNTMOON_SILVER
 
 MountMoon_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .RivalEncounter
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .RivalEncounter ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .RivalEncounter:
 	priorityjump .RivalBattle
@@ -18,9 +16,9 @@ MountMoon_MapScripts:
 	end
 
 .RivalBattle:
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	applymovement MOUNTMOON_SILVER, MountMoonSilverMovementBefore
 	playmusic MUSIC_RIVAL_ENCOUNTER
@@ -66,7 +64,7 @@ MountMoon_MapScripts:
 	closetext
 	applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter
 	disappear MOUNTMOON_SILVER
-	setscene 1
+	setscene SCENE_FINISHED
 	setevent EVENT_BEAT_RIVAL_IN_MT_MOON
 	playmapmusic
 	end
@@ -161,26 +159,21 @@ MountMoonSilverTextLoss:
 	done
 
 MountMoon_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 8
-	warp_def 3, 3, 1, ROUTE_3
-	warp_def 15, 15, 1, ROUTE_4
-	warp_def 13, 3, 7, MOUNT_MOON
-	warp_def 15, 11, 8, MOUNT_MOON
-	warp_def 25, 5, 1, MOUNT_MOON_SQUARE
-	warp_def 25, 15, 2, MOUNT_MOON_SQUARE
-	warp_def 25, 3, 3, MOUNT_MOON
-	warp_def 25, 13, 4, MOUNT_MOON
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
+	db 0, 0 ; filler
+
+	db 8 ; warp events
+	warp_event  3,  3, ROUTE_3, 1
+	warp_event 15, 15, ROUTE_4, 1
+	warp_event 13,  3, MOUNT_MOON, 7
+	warp_event 15, 11, MOUNT_MOON, 8
+	warp_event 25,  5, MOUNT_MOON_SQUARE, 1
+	warp_event 25, 15, MOUNT_MOON_SQUARE, 2
+	warp_event 25,  3, MOUNT_MOON, 3
+	warp_event 25, 13, MOUNT_MOON, 4
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event  7,  3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
index b24a98e20..54616ea17 100644
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only
 	const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only
 	const MOUNTMOONGIFTSHOP_LASS1 ; morning only
 	const MOUNTMOONGIFTSHOP_LASS2 ; day only
 
 MountMoonGiftShop_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MountMoonGiftShopClerkScript:
 	faceplayer
@@ -28,23 +26,18 @@ MountMoonGiftShopLassText:
 	done
 
 MountMoonGiftShop_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 3, 7, 3, MOUNT_MOON_SQUARE
-	warp_def 4, 7, 3, MOUNT_MOON_SQUARE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
-	object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
-	object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
-	object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  3,  7, MOUNT_MOON_SQUARE, 3
+	warp_event  4,  7, MOUNT_MOON_SQUARE, 3
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  4,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
+	object_event  1,  2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
+	object_event  1,  6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
+	object_event  5,  4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 1d9848f3b..29784336e 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MOUNTMOONSQUARE_FAIRY1
 	const MOUNTMOONSQUARE_FAIRY2
 	const MOUNTMOONSQUARE_ROCK
 
 MountMoonSquare_MapScripts:
-.SceneScripts:
-	db 1
-	scene_script .DummyScene
+	db 1 ; scene scripts
+	scene_script .DummyScene ; SCENE_DEFAULT
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .DisappearMoonStone
 	callback MAPCALLBACK_OBJECTS, .DisappearRock
 
@@ -28,15 +26,15 @@ ClefairyDance:
 	checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY
 	iftrue .NoDancing
 	checkcode VAR_WEEKDAY
-	if_not_equal MONDAY, .NoDancing
-	checknite
+	ifnotequal MONDAY, .NoDancing
+	checktime NITE
 	iffalse .NoDancing
 	appear MOUNTMOONSQUARE_FAIRY1
 	appear MOUNTMOONSQUARE_FAIRY2
 	applymovement PLAYER, PlayerWalksUpToDancingClefairies
 	pause 15
 	appear MOUNTMOONSQUARE_ROCK
-	spriteface MOUNTMOONSQUARE_FAIRY1, RIGHT
+	turnobject MOUNTMOONSQUARE_FAIRY1, RIGHT
 	cry CLEFAIRY
 	waitsfx
 	pause 30
@@ -56,10 +54,10 @@ ClefairyDance:
 	follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
 	applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep7
 	stopfollow
-	spriteface MOUNTMOONSQUARE_FAIRY1, DOWN
+	turnobject MOUNTMOONSQUARE_FAIRY1, DOWN
 	pause 10
 	showemote EMOTE_SHOCK, MOUNTMOONSQUARE_FAIRY1, 15
-	spriteface MOUNTMOONSQUARE_FAIRY1, DOWN
+	turnobject MOUNTMOONSQUARE_FAIRY1, DOWN
 	cry CLEFAIRY
 	pause 15
 	follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
@@ -75,7 +73,7 @@ ClefairyDance:
 	end
 
 MountMoonSquareHiddenMoonStone:
-	hiddenitem EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE
+	hiddenitem MOON_STONE, EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE
 
 DontLitterSign:
 	jumptext DontLitterSignText
@@ -133,26 +131,21 @@ DontLitterSignText:
 	done
 
 MountMoonSquare_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 20, 5, 5, MOUNT_MOON
-	warp_def 22, 11, 6, MOUNT_MOON
-	warp_def 13, 7, 1, MOUNT_MOON_GIFT_SHOP
-
-.CoordEvents:
-	db 1
-	coord_event 7, 11, 0, ClefairyDance
-
-.BGEvents:
-	db 2
-	bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
-	bg_event 17, 7, BGEVENT_READ, DontLitterSign
-
-.ObjectEvents:
-	db 3
-	object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
-	object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
-	object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 20,  5, MOUNT_MOON, 5
+	warp_event 22, 11, MOUNT_MOON, 6
+	warp_event 13,  7, MOUNT_MOON_GIFT_SHOP, 1
+
+	db 1 ; coord events
+	coord_event  7, 11, SCENE_DEFAULT, ClefairyDance
+
+	db 2 ; bg events
+	bg_event  7,  7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone
+	bg_event 17,  7, BGEVENT_READ, DontLitterSign
+
+	db 3 ; object events
+	object_event  6,  6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
+	object_event  7,  6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY
+	object_event  7,  7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index a67ba1144..05b39101e 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MOUNTMORTAR1FINSIDE_BOULDER
 	const MOUNTMORTAR1FINSIDE_POKE_BALL1
 	const MOUNTMORTAR1FINSIDE_POKE_BALL2
@@ -11,17 +11,15 @@ const_value set 2
 	const MOUNTMORTAR1FINSIDE_POKE_BALL7
 
 MountMortar1FInside_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerPokemaniacMiller:
-	trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script
+	trainer POKEMANIAC, MILLER, EVENT_BEAT_POKEMANIAC_MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacMillerAfterBattleText
 	waitbutton
@@ -29,10 +27,10 @@ TrainerPokemaniacMiller:
 	end
 
 TrainerSupernerdMarkus:
-	trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script
+	trainer SUPER_NERD, MARKUS, EVENT_BEAT_SUPER_NERD_MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdMarkusAfterBattleText
 	waitbutton
@@ -64,7 +62,7 @@ MountMortar1FInsideUltraBall:
 	itemball ULTRA_BALL
 
 MountMortar1FInsideHiddenMaxRepel:
-	hiddenitem EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL
+	hiddenitem MAX_REPEL, EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL
 
 PokemaniacMillerSeenText:
 	text "I'm not losing"
@@ -117,34 +115,29 @@ SupernerdMarkusAfterBattleText:
 	done
 
 MountMortar1FInside_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def 33, 41, 9, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def 3, 19, 1, MOUNT_MORTAR_B1F
-	warp_def 9, 9, 2, MOUNT_MORTAR_2F_INSIDE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event 11, 47, MOUNT_MORTAR_1F_OUTSIDE, 5
+	warp_event 29, 47, MOUNT_MORTAR_1F_OUTSIDE, 6
+	warp_event  5, 39, MOUNT_MORTAR_1F_OUTSIDE, 8
+	warp_event 33, 41, MOUNT_MORTAR_1F_OUTSIDE, 9
+	warp_event  3, 19, MOUNT_MORTAR_B1F, 1
+	warp_event  9,  9, MOUNT_MORTAR_2F_INSIDE, 2
+
+	db 0 ; coord events
+
+	db 1 ; bg events
 	bg_event 30, 11, BGEVENT_ITEM, MountMortar1FInsideHiddenMaxRepel
 
-.ObjectEvents:
-	db 10
+	db 10 ; object events
 	object_event 21, 43, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortar1FBoulder, -1
-	object_event 35, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
-	object_event 16, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
-	object_event 10, 27, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION
-	object_event 22, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION
-	object_event 35, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
+	object_event 35, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
+	object_event 16, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE
+	object_event 10, 27, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION
+	object_event 22, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION
+	object_event 35, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
 	object_event 33, 43, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1
 	object_event 24, 28, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1
-	object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
-	object_event 17, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
+	object_event  8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
+	object_event 17, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
index d38f4f732..eded2353c 100644
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MOUNTMORTAR1FOUTSIDE_POKE_BALL1
 	const MOUNTMORTAR1FOUTSIDE_POKE_BALL2
 
 MountMortar1FOutside_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MountMortar1FOutsideEther:
 	itemball ETHER
@@ -16,32 +14,27 @@ MountMortar1FOutsideRevive:
 	itemball REVIVE
 
 MountMortar1FOutsideHiddenHyperPotion:
-	hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION
+	hiddenitem HYPER_POTION, EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION
 
 MountMortar1FOutside_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 9
-	warp_def 3, 33, 3, ROUTE_42
-	warp_def 17, 33, 4, ROUTE_42
-	warp_def 37, 33, 5, ROUTE_42
-	warp_def 17, 5, 1, MOUNT_MORTAR_2F_INSIDE
-	warp_def 11, 21, 1, MOUNT_MORTAR_1F_INSIDE
-	warp_def 29, 21, 2, MOUNT_MORTAR_1F_INSIDE
-	warp_def 17, 29, 2, MOUNT_MORTAR_B1F
-	warp_def 7, 13, 3, MOUNT_MORTAR_1F_INSIDE
-	warp_def 33, 13, 4, MOUNT_MORTAR_1F_INSIDE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
+	db 0, 0 ; filler
+
+	db 9 ; warp events
+	warp_event  3, 33, ROUTE_42, 3
+	warp_event 17, 33, ROUTE_42, 4
+	warp_event 37, 33, ROUTE_42, 5
+	warp_event 17,  5, MOUNT_MORTAR_2F_INSIDE, 1
+	warp_event 11, 21, MOUNT_MORTAR_1F_INSIDE, 1
+	warp_event 29, 21, MOUNT_MORTAR_1F_INSIDE, 2
+	warp_event 17, 29, MOUNT_MORTAR_B1F, 2
+	warp_event  7, 13, MOUNT_MORTAR_1F_INSIDE, 3
+	warp_event 33, 13, MOUNT_MORTAR_1F_INSIDE, 4
+
+	db 0 ; coord events
+
+	db 1 ; bg events
 	bg_event 25, 22, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion
 
-.ObjectEvents:
-	db 2
-	object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
-	object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
+	db 2 ; object events
+	object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
+	object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index 66120731f..a81f77697 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MOUNTMORTAR2FINSIDE_POKE_BALL1
 	const MOUNTMORTAR2FINSIDE_POKE_BALL2
 	const MOUNTMORTAR2FINSIDE_POKE_BALL3
@@ -8,17 +8,15 @@ const_value set 2
 	const MOUNTMORTAR2FINSIDE_SUPER_NERD
 
 MountMortar2FInside_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerSupernerdHugh:
-	trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script
+	trainer SUPER_NERD, HUGH, EVENT_BEAT_SUPER_NERD_HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdHughAfterBattleText
 	waitbutton
@@ -44,7 +42,7 @@ MountMortar2FInsideEscapeRope:
 	itemball ESCAPE_ROPE
 
 MountMortar2FInsideHiddenFullRestore:
-	hiddenitem EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
+	hiddenitem FULL_RESTORE, EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE
 
 SupernerdHughSeenText:
 	text "Yo! MARKUS!"
@@ -67,27 +65,22 @@ SupernerdHughAfterBattleText:
 	done
 
 MountMortar2FInside_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def 3, 5, 6, MOUNT_MORTAR_1F_INSIDE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore
-
-.ObjectEvents:
-	db 7
-	object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
-	object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
-	object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
-	object_event 16, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
-	object_event 9, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
-	object_event 28, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event 17, 33, MOUNT_MORTAR_1F_OUTSIDE, 4
+	warp_event  3,  5, MOUNT_MORTAR_1F_INSIDE, 6
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event 24,  8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore
+
+	db 7 ; object events
+	object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION
+	object_event  2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY
+	object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL
+	object_event 16,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE
+	object_event  9, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER
+	object_event 28,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
 	object_event 13, 26, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdHugh, -1
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index 7d798c22e..c78b60fbf 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MOUNTMORTARB1F_POKE_BALL1
 	const MOUNTMORTARB1F_POKE_BALL2
 	const MOUNTMORTARB1F_BOULDER
@@ -8,19 +8,17 @@ const_value set 2
 	const MOUNTMORTARB1F_POKE_BALL5
 
 MountMortarB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-BlackBeltScript_0x7e1f6:
+MountMortarB1FKiyoScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_TYROGUE_FROM_KIYO
-	iftrue UnknownScript_0x7e231
+	iftrue .GotTyrogue
 	checkevent EVENT_BEAT_BLACKBELT_KIYO
-	iftrue UnknownScript_0x7e217
+	iftrue .BeatKiyo
 	writetext UnknownText_0x7e24d
 	waitbutton
 	closetext
@@ -30,24 +28,24 @@ BlackBeltScript_0x7e1f6:
 	reloadmapafterbattle
 	setevent EVENT_BEAT_BLACKBELT_KIYO
 	opentext
-UnknownScript_0x7e217:
+.BeatKiyo:
 	writetext UnknownText_0x7e2c0
 	buttonsound
 	waitsfx
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, UnknownScript_0x7e237
+	ifequal PARTY_LENGTH, .NoRoom
 	writetext UnknownText_0x7e355
 	playsound SFX_CAUGHT_MON
 	waitsfx
 	givepoke TYROGUE, 10
 	setevent EVENT_GOT_TYROGUE_FROM_KIYO
-UnknownScript_0x7e231:
+.GotTyrogue:
 	writetext UnknownText_0x7e36a
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7e237:
+.NoRoom:
 	writetext UnknownText_0x7e3df
 	waitbutton
 	closetext
@@ -72,7 +70,7 @@ MountMortarB1FPPUp:
 	itemball PP_UP
 
 MountMortarB1FHiddenMaxRevive:
-	hiddenitem EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE
+	hiddenitem MAX_REVIVE, EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE
 
 UnknownText_0x7e24d:
 	text "Hey!"
@@ -135,27 +133,22 @@ UnknownText_0x7e3df:
 	done
 
 MountMortarB1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 3, 3, 5, MOUNT_MORTAR_1F_INSIDE
-	warp_def 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive
-
-.ObjectEvents:
-	db 7
-	object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
-	object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
-	object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
-	object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1
-	object_event 34, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
-	object_event 32, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
-	object_event 21, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  3,  3, MOUNT_MORTAR_1F_INSIDE, 5
+	warp_event 19, 29, MOUNT_MORTAR_1F_OUTSIDE, 7
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  4,  6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive
+
+	db 7 ; object events
+	object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
+	object_event  4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
+	object_event  9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
+	object_event 16,  4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MountMortarB1FKiyoScript, -1
+	object_event 34, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
+	object_event 32,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
+	object_event 21, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP
diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm
index 0635be308..e382cf226 100644
--- a/maps/MoveDeletersHouse.asm
+++ b/maps/MoveDeletersHouse.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MOVEDELETERSHOUSE_SUPER_NERD
 
 MoveDeletersHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MoveDeleter:
 	faceplayer
 	opentext
-	special Special_MoveDeletion
+	special MoveDeletion
 	waitbutton
 	closetext
 	end
@@ -20,22 +18,17 @@ MoveDeletersHouseBookshelf:
 	jumpstd difficultbookshelf
 
 MoveDeletersHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 6, BLACKTHORN_CITY
-	warp_def 3, 7, 6, BLACKTHORN_CITY
+	db 2 ; warp events
+	warp_event  2,  7, BLACKTHORN_CITY, 6
+	warp_event  3,  7, BLACKTHORN_CITY, 6
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, MoveDeletersHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, MoveDeletersHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, MoveDeletersHouseBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1
diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm
index 403134bae..4396e707d 100644
--- a/maps/MrFujisHouse.asm
+++ b/maps/MrFujisHouse.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MRFUJISHOUSE_SUPER_NERD
 	const MRFUJISHOUSE_LASS
 	const MRFUJISHOUSE_PSYDUCK
@@ -6,11 +6,9 @@ const_value set 2
 	const MRFUJISHOUSE_PIDGEY
 
 MrFujisHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MrFujisHouseSuperNerdScript:
 	jumptextfaceplayer MrFujisHouseSuperNerdText
@@ -80,26 +78,21 @@ MrFujisPidgeyText:
 	done
 
 MrFujisHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 2, LAVENDER_TOWN
-	warp_def 3, 7, 2, LAVENDER_TOWN
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf
-
-.ObjectEvents:
-	db 5
-	object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1
-	object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1
-	object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1
-	object_event 5, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1
-	object_event 1, 3, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, LAVENDER_TOWN, 2
+	warp_event  3,  7, LAVENDER_TOWN, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, MrFujisHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, MrFujisHouseBookshelf
+
+	db 5 ; object events
+	object_event  4,  1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1
+	object_event  3,  4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1
+	object_event  7,  4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1
+	object_event  5,  5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1
+	object_event  1,  3, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index 8ac7d0a09..5aee409b6 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MRPOKEMONSHOUSE_GENTLEMAN
 	const MRPOKEMONSHOUSE_OAK
 
 MrPokemonsHouse_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .MeetMrPokemon
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .MeetMrPokemon ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .MeetMrPokemon:
 	priorityjump .MrPokemonEvent
@@ -20,7 +18,7 @@ MrPokemonsHouse_MapScripts:
 
 .MrPokemonEvent:
 	showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15
-	spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
+	turnobject MRPOKEMONSHOUSE_GENTLEMAN, DOWN
 	opentext
 	writetext MrPokemonIntroText1
 	waitbutton
@@ -39,11 +37,11 @@ MrPokemonsHouse_MapScripts:
 	blackoutmod CHERRYGROVE_CITY
 	writetext MrPokemonIntroText3
 	buttonsound
-	spriteface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT
+	turnobject MRPOKEMONSHOUSE_GENTLEMAN, RIGHT
 	writetext MrPokemonIntroText4
 	buttonsound
-	spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
-	spriteface MRPOKEMONSHOUSE_OAK, LEFT
+	turnobject MRPOKEMONSHOUSE_GENTLEMAN, DOWN
+	turnobject MRPOKEMONSHOUSE_OAK, LEFT
 	writetext MrPokemonIntroText5
 	waitbutton
 	closetext
@@ -86,7 +84,7 @@ MrPokemonsHouse_MrPokemonScript:
 MrPokemonsHouse_OakScript:
 	playmusic MUSIC_PROF_OAK
 	applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakWalksToPlayer
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext MrPokemonsHouse_OakText1
 	buttonsound
@@ -98,36 +96,36 @@ MrPokemonsHouse_OakScript:
 	writetext MrPokemonsHouse_OakText2
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakExits
 	playsound SFX_EXIT_BUILDING
 	disappear MRPOKEMONSHOUSE_OAK
 	waitsfx
 	special RestartMapMusic
 	pause 15
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext MrPokemonsHouse_MrPokemonHealText
 	waitbutton
 	closetext
-	special Special_FadeBlackQuickly
+	special FadeBlackQuickly
 	special ReloadSpritesNoPalettes
 	playmusic MUSIC_HEAL
-	special Special_StubbedTrainerRankings_Healings
+	special StubbedTrainerRankings_Healings
 	special HealParty
 	pause 60
-	special Special_FadeInQuickly
+	special FadeInQuickly
 	special RestartMapMusic
 	opentext
 	writetext MrPokemonText_ImDependingOnYou
 	waitbutton
 	closetext
 	setevent EVENT_RIVAL_NEW_BARK_TOWN
-	setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR
-	clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
-	setscene 1
-	setmapscene CHERRYGROVE_CITY, 1
-	setmapscene ELMS_LAB, 3
+	setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
+	clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
+	setscene SCENE_FINISHED
+	setmapscene CHERRYGROVE_CITY, SCENE_CHERRYGROVECITY_MEET_RIVAL
+	setmapscene ELMS_LAB, SCENE_ELMSLAB_MEET_OFFICER
 	specialphonecall SPECIALCALL_ROBBED
 	clearevent EVENT_COP_IN_ELMS_LAB
 	checkevent EVENT_GOT_TOTODILE_FROM_ELM
@@ -145,13 +143,13 @@ MrPokemonsHouse_OakScript:
 	setevent EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
 	end
 
-MapMrPokemonsHouseSignpost1Script:
+MrPokemonsHouse_ForeignMagazines:
 	jumptext MrPokemonsHouse_ForeignMagazinesText
 
-MapMrPokemonsHouseSignpost3Script:
+MrPokemonsHouse_BrokenComputer:
 	jumptext MrPokemonsHouse_BrokenComputerText
 
-MapMrPokemonsHouseSignpost4Script:
+MrPokemonsHouse_StrangeCoins:
 	jumptext MrPokemonsHouse_StrangeCoinsText
 
 MrPokemonsHouse_PlayerWalksToMrPokemon:
@@ -373,26 +371,21 @@ MrPokemonsHouse_StrangeCoinsText:
 	done
 
 MrPokemonsHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 2, ROUTE_30
-	warp_def 3, 7, 2, ROUTE_30
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 5
-	bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
-	bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script
-	bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
-	bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script
-	bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script
-
-.ObjectEvents:
-	db 2
-	object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1
-	object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_30, 2
+	warp_event  3,  7, ROUTE_30, 2
+
+	db 0 ; coord events
+
+	db 5 ; bg events
+	bg_event  0,  1, BGEVENT_READ, MrPokemonsHouse_ForeignMagazines
+	bg_event  1,  1, BGEVENT_READ, MrPokemonsHouse_ForeignMagazines
+	bg_event  6,  1, BGEVENT_READ, MrPokemonsHouse_BrokenComputer
+	bg_event  7,  1, BGEVENT_READ, MrPokemonsHouse_BrokenComputer
+	bg_event  6,  4, BGEVENT_READ, MrPokemonsHouse_StrangeCoins
+
+	db 2 ; object events
+	object_event  3,  5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1
+	object_event  6,  5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK
diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm
index 042b922d0..c5121e247 100644
--- a/maps/MrPsychicsHouse.asm
+++ b/maps/MrPsychicsHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const MRPSYCHICSHOUSE_FISHING_GURU
 
 MrPsychicsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MrPsychic:
 	faceplayer
@@ -48,22 +46,17 @@ MrPsychicText2:
 	done
 
 MrPsychicsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 5, SAFFRON_CITY
-	warp_def 3, 7, 5, SAFFRON_CITY
+	db 2 ; warp events
+	warp_event  2,  7, SAFFRON_CITY, 5
+	warp_event  3,  7, SAFFRON_CITY, 5
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, MrPsychicsHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, MrPsychicsHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, MrPsychicsHouseBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1
+	db 1 ; object events
+	object_event  5,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 9429c5845..1b87393f5 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const NATIONALPARK_LASS1
 	const NATIONALPARK_POKEFAN_F1
 	const NATIONALPARK_TEACHER1
@@ -15,11 +15,9 @@ const_value set 2
 	const NATIONALPARK_POKE_BALL2
 
 NationalPark_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 NationalParkLassScript:
 	jumptextfaceplayer NationalParkLassText
@@ -27,20 +25,20 @@ NationalParkLassScript:
 NationalParkPokefanFScript:
 	jumptextfaceplayer NationalParkPokefanFText
 
-TeacherScript_0x5c008:
+NationalParkTeacher1Script:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_QUICK_CLAW
-	iftrue UnknownScript_0x5c01d
-	writetext UnknownText_0x5c265
+	iftrue .GotQuickClaw
+	writetext NationalParkTeacher1Text
 	buttonsound
 	verbosegiveitem QUICK_CLAW
-	iffalse UnknownScript_0x5c021
+	iffalse .NoRoom
 	setevent EVENT_GOT_QUICK_CLAW
-UnknownScript_0x5c01d:
-	writetext UnknownText_0x5c30d
+.GotQuickClaw:
+	writetext NationalParkTeacher1Text_GotQuickClaw
 	waitbutton
-UnknownScript_0x5c021:
+.NoRoom:
 	closetext
 	end
 
@@ -50,8 +48,8 @@ NationalParkYoungster1Script:
 NationalParkYoungster2Script:
 	jumptextfaceplayer NationalParkYoungster2Text
 
-NationalParkTeacherScript:
-	jumptextfaceplayer NationalParkTeacherText
+NationalParkTeacher2Script:
+	jumptextfaceplayer NationalParkTeacher2Text
 
 NationalParkPersian:
 	faceplayer
@@ -62,53 +60,53 @@ NationalParkPersian:
 	closetext
 	end
 
-GameboyKidScript_0x5c037:
+NationalParkGameboyKidScript:
 	faceplayer
 	opentext
-	writetext UnknownText_0x5c42a
+	writetext NationalParkGameboyKidText
 	waitbutton
 	closetext
-	spriteface NATIONALPARK_GAMEBOY_KID, DOWN
+	turnobject NATIONALPARK_GAMEBOY_KID, DOWN
 	end
 
 TrainerSchoolboyJack1:
-	trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script
+	trainer SCHOOLBOY, JACK1, EVENT_BEAT_SCHOOLBOY_JACK, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_JACK
-	iftrue UnknownScript_0x5c088
+	iftrue .Rematch
 	checkcellnum PHONE_SCHOOLBOY_JACK
-	iftrue UnknownScript_0x5c108
+	iftrue .NumberAccepted
 	checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
-	iftrue UnknownScript_0x5c071
+	iftrue .AskAgain
 	writetext UnknownText_0x5c4f3
 	buttonsound
 	setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
-	scall UnknownScript_0x5c0fc
-	jump UnknownScript_0x5c074
+	scall .AskNumber1
+	jump .RequestNumber
 
-UnknownScript_0x5c071:
-	scall UnknownScript_0x5c100
-UnknownScript_0x5c074:
+.AskAgain:
+	scall .AskNumber2
+.RequestNumber:
 	askforphonenumber PHONE_SCHOOLBOY_JACK
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c110
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
-	scall UnknownScript_0x5c104
-	jump UnknownScript_0x5c108
+	scall .RegisteredNumber
+	jump .NumberAccepted
 
-UnknownScript_0x5c088:
-	scall UnknownScript_0x5c114
+.Rematch:
+	scall .RematchStd
 	winlosstext SchoolboyJack1BeatenText, 0
 	copybytetovar wJackFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -160,39 +158,39 @@ UnknownScript_0x5c088:
 	clearflag ENGINE_JACK
 	end
 
-UnknownScript_0x5c0fc:
+.AskNumber1:
 	jumpstd asknumber1m
 	end
 
-UnknownScript_0x5c100:
+.AskNumber2:
 	jumpstd asknumber2m
 	end
 
-UnknownScript_0x5c104:
+.RegisteredNumber:
 	jumpstd registerednumberm
 	end
 
-UnknownScript_0x5c108:
+.NumberAccepted:
 	jumpstd numberacceptedm
 	end
 
-UnknownScript_0x5c10c:
+.NumberDeclined:
 	jumpstd numberdeclinedm
 	end
 
-UnknownScript_0x5c110:
+.PhoneFull:
 	jumpstd phonefullm
 	end
 
-UnknownScript_0x5c114:
+.RematchStd:
 	jumpstd rematchm
 	end
 
 TrainerPokefanmWilliam:
-	trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script
+	trainer POKEFANM, WILLIAM, EVENT_BEAT_POKEFANM_WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmWilliamAfterBattleText
 	waitbutton
@@ -200,103 +198,103 @@ TrainerPokefanmWilliam:
 	end
 
 TrainerPokefanfBeverly1:
-	trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script
+	trainer POKEFANF, BEVERLY1, EVENT_BEAT_POKEFANF_BEVERLY, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_BEVERLY_HAS_NUGGET
-	iftrue UnknownScript_0x5c177
+	iftrue .GiveNugget
 	checkcellnum PHONE_POKEFAN_BEVERLY
-	iftrue UnknownScript_0x5c19b
+	iftrue .NumberAccepted
 	checkpoke MARILL
-	iffalse UnknownScript_0x5c189
+	iffalse .NoMarill
 	checkevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
-	iftrue UnknownScript_0x5c160
+	iftrue .AskAgain
 	writetext UnknownText_0x5c5bd
 	buttonsound
 	setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
-	scall UnknownScript_0x5c18f
-	jump UnknownScript_0x5c163
+	scall .AskNumber1
+	jump .RequestNumber
 
-UnknownScript_0x5c160:
-	scall UnknownScript_0x5c193
-UnknownScript_0x5c163:
+.AskAgain:
+	scall .AskNumber2
+.RequestNumber:
 	askforphonenumber PHONE_POKEFAN_BEVERLY
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0
-	scall UnknownScript_0x5c197
-	jump UnknownScript_0x5c19b
+	scall .RegisteredNumber
+	jump .NumberAccepted
 
-UnknownScript_0x5c177:
-	scall UnknownScript_0x5c1a7
+.GiveNugget:
+	scall .Gift
 	verbosegiveitem NUGGET
-	iffalse UnknownScript_0x5c186
+	iffalse .NoRoom
 	clearflag ENGINE_BEVERLY_HAS_NUGGET
-	jump UnknownScript_0x5c19b
+	jump .NumberAccepted
 
-UnknownScript_0x5c186:
-	jump UnknownScript_0x5c1ab
+.NoRoom:
+	jump .PackFull
 
-UnknownScript_0x5c189:
+.NoMarill:
 	writetext UnknownText_0x5c68a
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5c18f:
+.AskNumber1:
 	jumpstd asknumber1f
 	end
 
-UnknownScript_0x5c193:
+.AskNumber2:
 	jumpstd asknumber2f
 	end
 
-UnknownScript_0x5c197:
+.RegisteredNumber:
 	jumpstd registerednumberf
 	end
 
-UnknownScript_0x5c19b:
+.NumberAccepted:
 	jumpstd numberacceptedf
 	end
 
-UnknownScript_0x5c19f:
+.NumberDeclined:
 	jumpstd numberdeclinedf
 	end
 
-UnknownScript_0x5c1a3:
+.PhoneFull:
 	jumpstd phonefullf
 	end
 
-UnknownScript_0x5c1a7:
+.Gift:
 	jumpstd giftf
 	end
 
-UnknownScript_0x5c1ab:
+.PackFull:
 	jumpstd packfullf
 	end
 
 TrainerLassKrise:
-	trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script
+	trainer LASS, KRISE, EVENT_BEAT_LASS_KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassKriseAfterBattleText
 	waitbutton
 	closetext
 	end
 
-MapNationalParkSignpost0Script:
-	jumptext UnknownText_0x5c750
+NationalParkRelaxationSquareSign:
+	jumptext NationalParkRelaxationSquareText
 
-MapNationalParkSignpost1Script:
-	jumptext UnknownText_0x5c771
+NationalParkBattleNoticeSign:
+	jumptext NationalParkBattleNoticeText
 
-MapNationalParkSignpost3Script:
-	jumptext UnknownText_0x5c7c6
+NationalParkTrainerTipsSign:
+	jumptext NationalParkTrainerTipsText
 
 NationalParkParlyzHeal:
 	itemball PARLYZ_HEAL
@@ -305,7 +303,7 @@ NationalParkTMDig:
 	itemball TM_DIG
 
 NationalParkHiddenFullHeal:
-	hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
+	hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL
 
 NationalParkLassText:
 	text "Look! Check out my"
@@ -324,7 +322,7 @@ NationalParkPokefanFText:
 	cont "It cheers me up."
 	done
 
-UnknownText_0x5c265:
+NationalParkTeacher1Text:
 	text "Pay attention,"
 	line "please!"
 
@@ -344,7 +342,7 @@ UnknownText_0x5c265:
 	line "this."
 	done
 
-UnknownText_0x5c30d:
+NationalParkTeacher1Text_GotQuickClaw:
 	text "Let a #MON hold"
 	line "that QUICK CLAW."
 
@@ -365,7 +363,7 @@ NationalParkYoungster2Text:
 	cont "sticker if I win."
 	done
 
-NationalParkTeacherText:
+NationalParkTeacher2Text:
 	text "I take walks in"
 	line "the PARK, but I"
 
@@ -380,7 +378,7 @@ NationalParkPersianText:
 	text "PERSIAN: Fufushaa!"
 	done
 
-UnknownText_0x5c42a:
+NationalParkGameboyKidText:
 	text "I'm printing out"
 	line "my #DEX."
 
@@ -489,12 +487,12 @@ LassKriseAfterBattleText:
 	cont "because I'm cute!"
 	done
 
-UnknownText_0x5c750:
+NationalParkRelaxationSquareText:
 	text "RELAXATION SQUARE"
 	line "NATIONAL PARK"
 	done
 
-UnknownText_0x5c771:
+NationalParkBattleNoticeText:
 	text "What is this"
 	line "notice?"
 
@@ -505,7 +503,7 @@ UnknownText_0x5c771:
 	line "WARDEN'S OFFICE"
 	done
 
-UnknownText_0x5c7c6:
+NationalParkTrainerTipsText:
 	text "TRAINER TIPS"
 
 	para "Print out MAIL by"
@@ -514,39 +512,34 @@ UnknownText_0x5c7c6:
 	done
 
 NationalPark_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
-	warp_def 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 4
-	bg_event 14, 44, BGEVENT_READ, MapNationalParkSignpost0Script
-	bg_event 27, 31, BGEVENT_READ, MapNationalParkSignpost1Script
-	bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal
-	bg_event 12, 4, BGEVENT_READ, MapNationalParkSignpost3Script
-
-.ObjectEvents:
-	db 14
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event 33, 18, ROUTE_36_NATIONAL_PARK_GATE, 1
+	warp_event 33, 19, ROUTE_36_NATIONAL_PARK_GATE, 2
+	warp_event 10, 47, ROUTE_35_NATIONAL_PARK_GATE, 1
+	warp_event 11, 47, ROUTE_35_NATIONAL_PARK_GATE, 2
+
+	db 0 ; coord events
+
+	db 4 ; bg events
+	bg_event 14, 44, BGEVENT_READ, NationalParkRelaxationSquareSign
+	bg_event 27, 31, BGEVENT_READ, NationalParkBattleNoticeSign
+	bg_event  6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal
+	bg_event 12,  4, BGEVENT_READ, NationalParkTrainerTipsSign
+
+	db 14 ; object events
 	object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1
-	object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1
-	object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1
+	object_event 14,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1
+	object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkTeacher1Script, -1
 	object_event 11, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1
 	object_event 10, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1
-	object_event 17, 41, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacherScript, -1
+	object_event 17, 41, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkTeacher2Script, -1
 	object_event 26, 40, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPersian, -1
 	object_event 27, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1
 	object_event 18, 29, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1
-	object_event 16, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
-	object_event 8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1
-	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
-	object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1
-	object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG
+	object_event 16,  9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1
+	object_event  8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1
+	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
+	object_event 26,  6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkGameboyKidScript, -1
+	object_event  1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
index c69e55854..bf2911e3a 100644
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const NATIONALPARKBUGCONTEST_YOUNGSTER1
 	const NATIONALPARKBUGCONTEST_YOUNGSTER2
 	const NATIONALPARKBUGCONTEST_ROCKER
@@ -13,13 +13,11 @@ const_value set 2
 	const NATIONALPARKBUGCONTEST_POKE_BALL2
 
 NationalParkBugContest_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-YoungsterScript_0x5c8ec:
+BugCatchingContestant1AScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x5c94c
@@ -27,7 +25,7 @@ YoungsterScript_0x5c8ec:
 	closetext
 	end
 
-YoungsterScript_0x5c8f4:
+BugCatchingContestant2AScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x5c973
@@ -35,7 +33,7 @@ YoungsterScript_0x5c8f4:
 	closetext
 	end
 
-RockerScript_0x5c8fc:
+BugCatchingContestant3AScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x5c9a3
@@ -43,7 +41,7 @@ RockerScript_0x5c8fc:
 	closetext
 	end
 
-PokefanMScript_0x5c904:
+BugCatchingContestant4AScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x5c9cc
@@ -51,7 +49,7 @@ PokefanMScript_0x5c904:
 	closetext
 	end
 
-YoungsterScript_0x5c90c:
+BugCatchingContestant5AScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x5ca15
@@ -59,7 +57,7 @@ YoungsterScript_0x5c90c:
 	closetext
 	end
 
-YoungsterScript_0x5c914:
+BugCatchingContestant6AScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x5ca52
@@ -67,7 +65,7 @@ YoungsterScript_0x5c914:
 	closetext
 	end
 
-LassScript_0x5c91c:
+BugCatchingContestant7AScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x5ca8f
@@ -75,7 +73,7 @@ LassScript_0x5c91c:
 	closetext
 	end
 
-YoungsterScript_0x5c924:
+BugCatchingContestant8AScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x5cac8
@@ -83,7 +81,7 @@ YoungsterScript_0x5c924:
 	closetext
 	end
 
-YoungsterScript_0x5c92c:
+BugCatchingContestant9AScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x5cb25
@@ -91,7 +89,7 @@ YoungsterScript_0x5c92c:
 	closetext
 	end
 
-YoungsterScript_0x5c934:
+BugCatchingContestant10AScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x5cb64
@@ -99,14 +97,14 @@ YoungsterScript_0x5c934:
 	closetext
 	end
 
-MapNationalParkBugContestSignpost0Script:
-	jumptext UnknownText_0x5cba7
+NationalParkBugContestRelaxationSquareSign:
+	jumptext NationalParkBugContestRelaxationSquareText
 
-MapNationalParkBugContestSignpost1Script:
-	jumptext UnknownText_0x5cbc8
+NationalParkBugContestBattleNoticeSign:
+	jumptext NationalParkBugContestBattleNoticeText
 
-MapNationalParkBugContestSignpost3Script:
-	jumptext UnknownText_0x5cc1d
+NationalParkBugContestTrainerTipsSign:
+	jumptext NationalParkBugContestTrainerTipsText
 
 NationalParkBugContestParlyzHeal:
 	itemball PARLYZ_HEAL
@@ -115,7 +113,7 @@ NationalParkBugContestTMDig:
 	itemball TM_DIG
 
 NationalParkBugContestHiddenFullHeal:
-	hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
+	hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL
 
 UnknownText_0x5c94c:
 	text "DON: I'm going to"
@@ -196,12 +194,12 @@ UnknownText_0x5cb64:
 	line "for sure."
 	done
 
-UnknownText_0x5cba7:
+NationalParkBugContestRelaxationSquareText:
 	text "RELAXATION SQUARE"
 	line "NATIONAL PARK"
 	done
 
-UnknownText_0x5cbc8:
+NationalParkBugContestBattleNoticeText:
 	text "What is this"
 	line "notice?"
 
@@ -212,7 +210,7 @@ UnknownText_0x5cbc8:
 	line "WARDEN'S OFFICE"
 	done
 
-UnknownText_0x5cc1d:
+NationalParkBugContestTrainerTipsText:
 	text "TRAINER TIPS"
 
 	para "Print out MAIL by"
@@ -221,37 +219,32 @@ UnknownText_0x5cc1d:
 	done
 
 NationalParkBugContest_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
-	warp_def 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 4
-	bg_event 14, 44, BGEVENT_READ, MapNationalParkBugContestSignpost0Script
-	bg_event 27, 31, BGEVENT_READ, MapNationalParkBugContestSignpost1Script
-	bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal
-	bg_event 12, 4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script
-
-.ObjectEvents:
-	db 12
-	object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A
-	object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A
-	object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A
-	object_event 7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A
-	object_event 23, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A
-	object_event 27, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A
-	object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A
-	object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A
-	object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A
-	object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A
-	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
-	object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event 33, 18, ROUTE_36_NATIONAL_PARK_GATE, 1
+	warp_event 33, 19, ROUTE_36_NATIONAL_PARK_GATE, 1
+	warp_event 10, 47, ROUTE_35_NATIONAL_PARK_GATE, 1
+	warp_event 11, 47, ROUTE_35_NATIONAL_PARK_GATE, 1
+
+	db 0 ; coord events
+
+	db 4 ; bg events
+	bg_event 14, 44, BGEVENT_READ, NationalParkBugContestRelaxationSquareSign
+	bg_event 27, 31, BGEVENT_READ, NationalParkBugContestBattleNoticeSign
+	bg_event  6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal
+	bg_event 12,  4, BGEVENT_READ, NationalParkBugContestTrainerTipsSign
+
+	db 12 ; object events
+	object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant1AScript, EVENT_BUG_CATCHING_CONTESTANT_1A
+	object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant2AScript, EVENT_BUG_CATCHING_CONTESTANT_2A
+	object_event  9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant3AScript, EVENT_BUG_CATCHING_CONTESTANT_3A
+	object_event  7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant4AScript, EVENT_BUG_CATCHING_CONTESTANT_4A
+	object_event 23,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant5AScript, EVENT_BUG_CATCHING_CONTESTANT_5A
+	object_event 27, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant6AScript, EVENT_BUG_CATCHING_CONTESTANT_6A
+	object_event  7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant7AScript, EVENT_BUG_CATCHING_CONTESTANT_7A
+	object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant8AScript, EVENT_BUG_CATCHING_CONTESTANT_8A
+	object_event 16,  8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant9AScript, EVENT_BUG_CATCHING_CONTESTANT_9A
+	object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant10AScript, EVENT_BUG_CATCHING_CONTESTANT_10A
+	object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL
+	object_event  1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index f4cad71eb..d5d337455 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const NEWBARKTOWN_TEACHER
 	const NEWBARKTOWN_FISHER
 	const NEWBARKTOWN_SILVER
 
 NewBarkTown_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .DummyScene0:
@@ -26,12 +24,12 @@ NewBarkTown_MapScripts:
 
 NewBarkTown_TeacherStopsYouScene1:
 	playmusic MUSIC_MOM
-	spriteface NEWBARKTOWN_TEACHER, LEFT
+	turnobject NEWBARKTOWN_TEACHER, LEFT
 	opentext
 	writetext Text_WaitPlayer
 	waitbutton
 	closetext
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou1_NBT
 	opentext
 	writetext Text_WhatDoYouThinkYoureDoing
@@ -49,14 +47,14 @@ NewBarkTown_TeacherStopsYouScene1:
 
 NewBarkTown_TeacherStopsYouScene2:
 	playmusic MUSIC_MOM
-	spriteface NEWBARKTOWN_TEACHER, LEFT
+	turnobject NEWBARKTOWN_TEACHER, LEFT
 	opentext
 	writetext Text_WaitPlayer
 	waitbutton
 	closetext
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou2_NBT
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext Text_WhatDoYouThinkYoureDoing
 	waitbutton
@@ -111,7 +109,7 @@ NewBarkTownSilverScript:
 	writetext NewBarkTownRivalText1
 	waitbutton
 	closetext
-	spriteface NEWBARKTOWN_SILVER, LEFT
+	turnobject NEWBARKTOWN_SILVER, LEFT
 	opentext
 	writetext NewBarkTownRivalText2
 	waitbutton
@@ -120,7 +118,7 @@ NewBarkTownSilverScript:
 	applymovement PLAYER, Movement_SilverPushesYouAway_NBT
 	stopfollow
 	pause 5
-	spriteface NEWBARKTOWN_SILVER, DOWN
+	turnobject NEWBARKTOWN_SILVER, DOWN
 	pause 5
 	playsound SFX_TACKLE
 	applymovement PLAYER, Movement_SilverShovesYouOut_NBT
@@ -130,14 +128,14 @@ NewBarkTownSilverScript:
 NewBarkTownSign:
 	jumptext NewBarkTownSignText
 
-MapNewBarkTownSignpost1Script:
-	jumptext PlayersHouseSignText
+NewBarkTownPlayersHouseSign:
+	jumptext NewBarkTownPlayersHouseSignText
 
-MapNewBarkTownSignpost2Script:
-	jumptext ElmsLabSignText
+NewBarkTownElmsLabSign:
+	jumptext NewBarkTownElmsLabSignText
 
-MapNewBarkTownSignpost3Script:
-	jumptext ElmsHouseSignText
+NewBarkTownElmsHouseSign:
+	jumptext NewBarkTownElmsHouseSignText
 
 Movement_TeacherRunsToYou1_NBT:
 	step LEFT
@@ -269,43 +267,38 @@ NewBarkTownSignText:
 	cont "Beginning Blow"
 	done
 
-PlayersHouseSignText:
+NewBarkTownPlayersHouseSignText:
 	text "<PLAYER>'s House"
 	done
 
-ElmsLabSignText:
+NewBarkTownElmsLabSignText:
 	text "ELM #MON LAB"
 	done
 
-ElmsHouseSignText:
+NewBarkTownElmsHouseSignText:
 	text "ELM'S HOUSE"
 	done
 
 NewBarkTown_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 6, 3, 1, ELMS_LAB
-	warp_def 13, 5, 1, KRISS_HOUSE_1F
-	warp_def 3, 11, 1, KRISS_NEIGHBORS_HOUSE
-	warp_def 11, 13, 1, ELMS_HOUSE
-
-.CoordEvents:
-	db 2
-	coord_event 1, 8, 0, NewBarkTown_TeacherStopsYouScene1
-	coord_event 1, 9, 0, NewBarkTown_TeacherStopsYouScene2
-
-.BGEvents:
-	db 4
-	bg_event 8, 8, BGEVENT_READ, NewBarkTownSign
-	bg_event 11, 5, BGEVENT_READ, MapNewBarkTownSignpost1Script
-	bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script
-	bg_event 9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script
-
-.ObjectEvents:
-	db 3
-	object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
-	object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
-	object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  6,  3, ELMS_LAB, 1
+	warp_event 13,  5, PLAYERS_HOUSE_1F, 1
+	warp_event  3, 11, PLAYERS_NEIGHBORS_HOUSE, 1
+	warp_event 11, 13, ELMS_HOUSE, 1
+
+	db 2 ; coord events
+	coord_event  1,  8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1
+	coord_event  1,  9, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene2
+
+	db 4 ; bg events
+	bg_event  8,  8, BGEVENT_READ, NewBarkTownSign
+	bg_event 11,  5, BGEVENT_READ, NewBarkTownPlayersHouseSign
+	bg_event  3,  3, BGEVENT_READ, NewBarkTownElmsLabSign
+	bg_event  9, 13, BGEVENT_READ, NewBarkTownElmsHouseSign
+
+	db 3 ; object events
+	object_event  6,  8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
+	object_event 12,  9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
+	object_event  3,  2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index d78641c28..86ac71ac0 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OAKSLAB_OAK
 	const OAKSLAB_SCIENTIST1
 	const OAKSLAB_SCIENTIST2
 	const OAKSLAB_SCIENTIST3
 
 OaksLab_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -26,14 +24,14 @@ Oak:
 	setevent EVENT_TALKED_TO_OAK_IN_KANTO
 .CheckBadges:
 	checkcode VAR_BADGES
-	if_equal NUM_BADGES, .OpenMtSilver
-	if_equal NUM_JOHTO_BADGES, .Complain
+	ifequal NUM_BADGES, .OpenMtSilver
+	ifequal NUM_JOHTO_BADGES, .Complain
 	jump .AhGood
 
 .CheckPokedex:
 	writetext OakLabDexCheckText
 	waitbutton
-	special Special_ProfOaksPCBoot
+	special ProfOaksPCBoot
 	writetext OakLabGoodbyeText
 	waitbutton
 	closetext
@@ -225,7 +223,7 @@ OaksLabPoster2Text:
 	line "manner."
 	done
 
-OaksLabTrashcanText
+OaksLabTrashcanText:
 	text "There's nothing in"
 	line "here…"
 	done
@@ -257,39 +255,34 @@ OaksLabPCText:
 	done
 
 OaksLab_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 11, 3, PALLET_TOWN
-	warp_def 5, 11, 3, PALLET_TOWN
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 16
-	bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf
-	bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf
-	bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf
-	bg_event 9, 1, BGEVENT_READ, OaksLabBookshelf
-	bg_event 0, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 2, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 3, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 6, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 8, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 9, 7, BGEVENT_READ, OaksLabBookshelf
-	bg_event 4, 0, BGEVENT_READ, OaksLabPoster1
-	bg_event 5, 0, BGEVENT_READ, OaksLabPoster2
-	bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan
-	bg_event 0, 1, BGEVENT_READ, OaksLabPC
-
-.ObjectEvents:
-	db 4
-	object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1
-	object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1
-	object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1
-	object_event 1, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 11, PALLET_TOWN, 3
+	warp_event  5, 11, PALLET_TOWN, 3
+
+	db 0 ; coord events
+
+	db 16 ; bg events
+	bg_event  6,  1, BGEVENT_READ, OaksLabBookshelf
+	bg_event  7,  1, BGEVENT_READ, OaksLabBookshelf
+	bg_event  8,  1, BGEVENT_READ, OaksLabBookshelf
+	bg_event  9,  1, BGEVENT_READ, OaksLabBookshelf
+	bg_event  0,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  1,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  2,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  3,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  6,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  7,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  8,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  9,  7, BGEVENT_READ, OaksLabBookshelf
+	bg_event  4,  0, BGEVENT_READ, OaksLabPoster1
+	bg_event  5,  0, BGEVENT_READ, OaksLabPoster2
+	bg_event  9,  3, BGEVENT_READ, OaksLabTrashcan
+	bg_event  0,  1, BGEVENT_READ, OaksLabPC
+
+	db 4 ; object events
+	object_event  4,  2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1
+	object_event  1,  8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1
+	object_event  8,  9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1
+	object_event  1,  4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1
diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm
index 269357d21..0a4d66c77 100644
--- a/maps/OlivineCafe.asm
+++ b/maps/OlivineCafe.asm
@@ -1,26 +1,24 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINECAFE_SAILOR1
 	const OLIVINECAFE_FISHING_GURU
 	const OLIVINECAFE_SAILOR2
 
 OlivineCafe_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-SailorScript_0x9c8c1:
+OlivineCafeStrengthSailorScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_HM04_STRENGTH
-	iftrue UnknownScript_0x9c8d3
-	writetext UnknownText_0x9c8df
+	iftrue .GotStrength
+	writetext OlivineCafeStrengthSailorText
 	buttonsound
 	verbosegiveitem HM_STRENGTH
 	setevent EVENT_GOT_HM04_STRENGTH
-UnknownScript_0x9c8d3:
-	writetext UnknownText_0x9c965
+.GotStrength:
+	writetext OlivineCafeStrengthSailorText_GotStrength
 	waitbutton
 	closetext
 	end
@@ -31,7 +29,7 @@ OlivineCafeFishingGuruScript:
 OlivineCafeSailorScript:
 	jumptextfaceplayer OlivineCafeSailorText
 
-UnknownText_0x9c8df:
+OlivineCafeStrengthSailorText:
 	text "Hah! Your #MON"
 	line "sure look like"
 	cont "lightweights!"
@@ -45,7 +43,7 @@ UnknownText_0x9c8df:
 	cont "STRENGTH!"
 	done
 
-UnknownText_0x9c965:
+OlivineCafeStrengthSailorText_GotStrength:
 	text "On the sea, the"
 	line "only thing you can"
 
@@ -79,22 +77,17 @@ OlivineCafeSailorText:
 	done
 
 OlivineCafe_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 7, OLIVINE_CITY
-	warp_def 3, 7, 7, OLIVINE_CITY
+	db 2 ; warp events
+	warp_event  2,  7, OLIVINE_CITY, 7
+	warp_event  3,  7, OLIVINE_CITY, 7
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1
-	object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
-	object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1
+	db 3 ; object events
+	object_event  4,  3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeStrengthSailorScript, -1
+	object_event  7,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1
+	object_event  6,  6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index e2fd0c4c7..f93c584dc 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINECITY_SAILOR1
 	const OLIVINECITY_STANDING_YOUNGSTER
 	const OLIVINECITY_SAILOR2
 	const OLIVINECITY_OLIVINE_RIVAL
 
 OlivineCity_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .DummyScene0:
@@ -24,10 +22,10 @@ OlivineCity_MapScripts:
 	setflag ENGINE_FLYPOINT_OLIVINE
 	return
 
-UnknownScript_0x1a8833:
-	spriteface PLAYER, LEFT
+OlivineCityRivalSceneTop:
+	turnobject PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	playsound SFX_ENTER_DOOR
 	appear OLIVINECITY_OLIVINE_RIVAL
@@ -39,19 +37,19 @@ UnknownScript_0x1a8833:
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x1a88f4
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
-	setscene 1
+	setscene SCENE_FINISHED
 	disappear OLIVINECITY_OLIVINE_RIVAL
 	special RestartMapMusic
 	variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 	end
 
-UnknownScript_0x1a886b:
-	spriteface PLAYER, LEFT
+OlivineCityRivalSceneBottom:
+	turnobject PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	playsound SFX_ENTER_DOOR
 	appear OLIVINECITY_OLIVINE_RIVAL
@@ -63,30 +61,30 @@ UnknownScript_0x1a886b:
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x1a88f7
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
 	disappear OLIVINECITY_OLIVINE_RIVAL
-	setscene 1
+	setscene SCENE_FINISHED
 	special RestartMapMusic
 	variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
-	special Special_LoadUsedSpritesGFX
+	special LoadUsedSpritesGFX
 	end
 
 OlivineCitySailor1Script:
 	jumptextfaceplayer OlivineCitySailor1Text
 
-StandingYoungsterScript_0x1a88a6:
+OlivineCityStandingYoungsterScript:
 	faceplayer
 	opentext
 	random 2
-	if_equal 0, UnknownScript_0x1a88b4
-	writetext UnknownText_0x1a8b04
+	ifequal 0, .FiftyFifty
+	writetext OlivineCityStandingYoungsterPokegearText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x1a88b4:
-	writetext UnknownText_0x1a8b41
+.FiftyFifty:
+	writetext OlivineCityStandingYoungsterPokedexText
 	waitbutton
 	closetext
 	end
@@ -225,14 +223,14 @@ OlivineCitySailor1Text:
 	line "ship can sail."
 	done
 
-UnknownText_0x1a8b04:
+OlivineCityStandingYoungsterPokegearText:
 	text "That thing you"
 	line "have--it's a #-"
 	cont "GEAR, right? Wow,"
 	cont "that's cool."
 	done
 
-UnknownText_0x1a8b41:
+OlivineCityStandingYoungsterPokedexText:
 	text "Wow, you have a"
 	line "#DEX!"
 
@@ -283,46 +281,42 @@ OlivineCityBattleTowerSignText:
 	line "Opening Now!"
 	done
 
-UnknownText_0x1a8cba:
+OlivineCityBattleTowerSignText_NotYetOpen:
+; unused; originally shown when the Battle Tower was closed
 	text "BATTLE TOWER AHEAD"
 	done
 
 OlivineCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 11
-	warp_def 13, 21, 1, OLIVINE_POKECENTER_1F
-	warp_def 10, 11, 1, OLIVINE_GYM
-	warp_def 25, 11, 1, OLIVINE_TIMS_HOUSE
-	warp_def 0, 0, 1, OLIVINE_HOUSE_BETA
-	warp_def 29, 11, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE
-	warp_def 13, 15, 1, OLIVINE_GOOD_ROD_HOUSE
-	warp_def 7, 21, 1, OLIVINE_CAFE
-	warp_def 19, 17, 2, OLIVINE_MART
-	warp_def 29, 27, 1, OLIVINE_LIGHTHOUSE_1F
-	warp_def 19, 27, 1, OLIVINE_PORT_PASSAGE
-	warp_def 20, 27, 2, OLIVINE_PORT_PASSAGE
-
-.CoordEvents:
-	db 2
-	coord_event 13, 12, 0, UnknownScript_0x1a8833
-	coord_event 13, 13, 0, UnknownScript_0x1a886b
-
-.BGEvents:
-	db 7
+	db 0, 0 ; filler
+
+	db 11 ; warp events
+	warp_event 13, 21, OLIVINE_POKECENTER_1F, 1
+	warp_event 10, 11, OLIVINE_GYM, 1
+	warp_event 25, 11, OLIVINE_TIMS_HOUSE, 1
+	warp_event  0,  0, OLIVINE_HOUSE_BETA, 1 ; inaccessible
+	warp_event 29, 11, OLIVINE_PUNISHMENT_SPEECH_HOUSE, 1
+	warp_event 13, 15, OLIVINE_GOOD_ROD_HOUSE, 1
+	warp_event  7, 21, OLIVINE_CAFE, 1
+	warp_event 19, 17, OLIVINE_MART, 2
+	warp_event 29, 27, OLIVINE_LIGHTHOUSE_1F, 1
+	warp_event 19, 27, OLIVINE_PORT_PASSAGE, 1
+	warp_event 20, 27, OLIVINE_PORT_PASSAGE, 2
+
+	db 2 ; coord events
+	coord_event 13, 12, SCENE_DEFAULT, OlivineCityRivalSceneTop
+	coord_event 13, 13, SCENE_DEFAULT, OlivineCityRivalSceneBottom
+
+	db 7 ; bg events
 	bg_event 17, 11, BGEVENT_READ, OlivineCitySign
 	bg_event 20, 24, BGEVENT_READ, OlivineCityPortSign
-	bg_event 7, 11, BGEVENT_READ, OlivineGymSign
+	bg_event  7, 11, BGEVENT_READ, OlivineGymSign
 	bg_event 30, 28, BGEVENT_READ, OlivineLighthouseSign
-	bg_event 3, 23, BGEVENT_READ, OlivineCityBattleTowerSign
+	bg_event  3, 23, BGEVENT_READ, OlivineCityBattleTowerSign
 	bg_event 14, 21, BGEVENT_READ, OlivineCityPokecenterSign
 	bg_event 20, 17, BGEVENT_READ, OlivineCityMartSign
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 26, 27, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1
-	object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1
+	object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineCityStandingYoungsterScript, -1
 	object_event 17, 21, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1
 	object_event 10, 11, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY
diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm
index 3f7c3eced..67acb021c 100644
--- a/maps/OlivineGoodRodHouse.asm
+++ b/maps/OlivineGoodRodHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINEGOODRODHOUSE_FISHING_GURU
 
 OlivineGoodRodHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 GoodRodGuru:
 	faceplayer
@@ -83,20 +81,15 @@ HaveGoodRodText:
 	done
 
 OlivineGoodRodHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 6, OLIVINE_CITY
-	warp_def 3, 7, 6, OLIVINE_CITY
+	db 2 ; warp events
+	warp_event  2,  7, OLIVINE_CITY, 6
+	warp_event  3,  7, OLIVINE_CITY, 6
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index 40e2bd711..536d3c6e8 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINEGYM_JASMINE
 	const OLIVINEGYM_GYM_GUY
 
 OlivineGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-JasmineScript_0x9c12f:
+OlivineGymJasmineScript:
 	faceplayer
 	opentext
 	checkevent EVENT_BEAT_JASMINE
@@ -50,8 +48,8 @@ JasmineScript_0x9c12f:
 	end
 
 OlivineGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -198,23 +196,18 @@ OlivineGymGuyPreText:
 	done
 
 OlivineGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 15, 2, OLIVINE_CITY
-	warp_def 5, 15, 2, OLIVINE_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 13, BGEVENT_READ, OlivineGymStatue
-	bg_event 6, 13, BGEVENT_READ, OlivineGymStatue
-
-.ObjectEvents:
-	db 2
-	object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE
-	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 15, OLIVINE_CITY, 2
+	warp_event  5, 15, OLIVINE_CITY, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3, 13, BGEVENT_READ, OlivineGymStatue
+	bg_event  6, 13, BGEVENT_READ, OlivineGymStatue
+
+	db 2 ; object events
+	object_event  5,  3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymJasmineScript, EVENT_OLIVINE_GYM_JASMINE
+	object_event  7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1
diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm
index 336469c21..2570de372 100644
--- a/maps/OlivineHouseBeta.asm
+++ b/maps/OlivineHouseBeta.asm
@@ -1,20 +1,18 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINEHOUSEBETA_TEACHER
 	const OLIVINEHOUSEBETA_RHYDON
 
 OlivineHouseBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OlivineHouseBetaTeacherScript:
 	jumptextfaceplayer OlivineHouseBetaTeacherText
 
-RhydonScript_0x9c592:
+OlivineHouseBetaRhydonScript:
 	opentext
-	writetext UnknownText_0x9c5f0
+	writetext OlivineHouseBetaRhydonText
 	cry RHYDON
 	waitbutton
 	closetext
@@ -35,28 +33,23 @@ OlivineHouseBetaTeacherText:
 	cont "medicine for me."
 	done
 
-UnknownText_0x9c5f0:
+OlivineHouseBetaRhydonText:
 	text "RHYDON: Gugooh!"
 	done
 
 OlivineHouseBeta_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 4, OLIVINE_CITY
-	warp_def 3, 7, 4, OLIVINE_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, OlivineHouseBetaBookshelf1
-	bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2
-
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1
-	object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, OLIVINE_CITY, 4
+	warp_event  3,  7, OLIVINE_CITY, 4
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, OlivineHouseBetaBookshelf1
+	bg_event  1,  1, BGEVENT_READ, OlivineHouseBetaBookshelf2
+
+	db 2 ; object events
+	object_event  2,  3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1
+	object_event  6,  4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaRhydonScript, -1
diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm
index 769bf13da..f411731e5 100644
--- a/maps/OlivineLighthouse1F.asm
+++ b/maps/OlivineLighthouse1F.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE1F_SAILOR
 	const OLIVINELIGHTHOUSE1F_POKEFAN_F
 
 OlivineLighthouse1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OlivineLighthouse1FSailorScript:
 	jumptextfaceplayer OlivineLighthouse1FSailorText
@@ -37,24 +35,19 @@ OlivineLighthouse1FPokefanFText:
 	done
 
 OlivineLighthouse1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 10, 17, 9, OLIVINE_CITY
-	warp_def 11, 17, 9, OLIVINE_CITY
-	warp_def 3, 11, 1, OLIVINE_LIGHTHOUSE_2F
-	warp_def 16, 13, 3, OLIVINE_LIGHTHOUSE_2F
-	warp_def 17, 13, 4, OLIVINE_LIGHTHOUSE_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 2
-	object_event 8, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1
-	object_event 16, 9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event 10, 17, OLIVINE_CITY, 9
+	warp_event 11, 17, OLIVINE_CITY, 9
+	warp_event  3, 11, OLIVINE_LIGHTHOUSE_2F, 1
+	warp_event 16, 13, OLIVINE_LIGHTHOUSE_2F, 3
+	warp_event 17, 13, OLIVINE_LIGHTHOUSE_2F, 4
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  8,  2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1
+	object_event 16,  9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index d2fd6427f..062a3e2b6 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -1,60 +1,58 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE2F_SAILOR
 	const OLIVINELIGHTHOUSE2F_GENTLEMAN
 
 OlivineLighthouse2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerGentlemanAlfred:
-	trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script
+	trainer GENTLEMAN, ALFRED, EVENT_BEAT_GENTLEMAN_ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GentlemanAlfredAfterBattleText
 	waitbutton
 	closetext
 	end
 
-TrainerSailorHuey1:
-	trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script
+TrainerSailorHuey:
+	trainer SAILOR, HUEY1, EVENT_BEAT_SAILOR_HUEY, SailorHueySeenText, SailorHueyBeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_SAILOR_HUEY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_HUEY
-	iftrue UnknownScript_0x5afc7
+	iftrue .WantsBattle
 	checkcellnum PHONE_SAILOR_HUEY
-	iftrue UnknownScript_0x5b05f
+	iftrue .NumberAccepted
 	checkevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER
-	iftrue UnknownScript_0x5afb0
+	iftrue .AskedBefore
 	setevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER
-	scall UnknownScript_0x5b053
-	jump UnknownScript_0x5afb3
+	scall .AskNumber1
+	jump .AskForNumber
 
-UnknownScript_0x5afb0:
-	scall UnknownScript_0x5b057
-UnknownScript_0x5afb3:
+.AskedBefore:
+	scall .AskNumber2
+.AskForNumber:
 	askforphonenumber PHONE_SAILOR_HUEY
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5b067
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext SAILOR, HUEY1, MEM_BUFFER_0
-	scall UnknownScript_0x5b05b
-	jump UnknownScript_0x5b05f
+	scall .RegisteredNumber
+	jump .NumberAccepted
 
-UnknownScript_0x5afc7:
-	scall UnknownScript_0x5b06b
-	winlosstext SailorHuey1BeatenText, 0
+.WantsBattle:
+	scall .Rematch
+	winlosstext SailorHueyBeatenText, 0
 	copybytetovar wHueyFightCount
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight3:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight3
@@ -94,78 +92,78 @@ UnknownScript_0x5afc7:
 	reloadmapafterbattle
 	clearflag ENGINE_HUEY
 	checkevent EVENT_HUEY_PROTEIN
-	iftrue UnknownScript_0x5b03f
+	iftrue .HasProtein
 	checkevent EVENT_GOT_PROTEIN_FROM_HUEY
-	iftrue UnknownScript_0x5b03e
-	scall UnknownScript_0x5b076
+	iftrue .SkipGift
+	scall .RematchGift
 	verbosegiveitem PROTEIN
-	iffalse UnknownScript_0x5b06f
+	iffalse .PackFull
 	setevent EVENT_GOT_PROTEIN_FROM_HUEY
-	jump UnknownScript_0x5b05f
+	jump .NumberAccepted
 
-UnknownScript_0x5b03e:
+.SkipGift:
 	end
 
-UnknownScript_0x5b03f:
+.HasProtein:
 	opentext
-	writetext UnknownText_0x5b1b6
+	writetext SailorHueyGiveProteinText
 	waitbutton
 	verbosegiveitem PROTEIN
-	iffalse UnknownScript_0x5b06f
+	iffalse .PackFull
 	clearevent EVENT_HUEY_PROTEIN
 	setevent EVENT_GOT_PROTEIN_FROM_HUEY
-	jump UnknownScript_0x5b05f
+	jump .NumberAccepted
 
-UnknownScript_0x5b053:
+.AskNumber1:
 	jumpstd asknumber1m
 	end
 
-UnknownScript_0x5b057:
+.AskNumber2:
 	jumpstd asknumber2m
 	end
 
-UnknownScript_0x5b05b:
+.RegisteredNumber:
 	jumpstd registerednumberm
 	end
 
-UnknownScript_0x5b05f:
+.NumberAccepted:
 	jumpstd numberacceptedm
 	end
 
-UnknownScript_0x5b063:
+.NumberDeclined:
 	jumpstd numberdeclinedm
 	end
 
-UnknownScript_0x5b067:
+.PhoneFull:
 	jumpstd phonefullm
 	end
 
-UnknownScript_0x5b06b:
+.Rematch:
 	jumpstd rematchm
 	end
 
-UnknownScript_0x5b06f:
+.PackFull:
 	setevent EVENT_HUEY_PROTEIN
 	jumpstd packfullm
 	end
 
-UnknownScript_0x5b076:
+.RematchGift:
 	jumpstd rematchgiftm
 	end
 
-SailorHuey1SeenText:
+SailorHueySeenText:
 	text "Men of the sea are"
 	line "always spoiling"
 	cont "for a good fight!"
 	done
 
-SailorHuey1BeatenText:
+SailorHueyBeatenText:
 	text "Urf!"
 	line "I lose!"
 	done
 
+SailorHueyUnusedText:
 ; unused
-UnusedText_0x5b0be:
 	text "What power!"
 	line "How would you like"
 
@@ -195,7 +193,7 @@ GentlemanAlfredAfterBattleText:
 	line "ordinary medicine."
 	done
 
-UnknownText_0x5b1b6:
+SailorHueyGiveProteinText:
 	text "Man! You're as"
 	line "tough as ever!"
 
@@ -205,25 +203,20 @@ UnknownText_0x5b1b6:
 	done
 
 OlivineLighthouse2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 3, 11, 3, OLIVINE_LIGHTHOUSE_1F
-	warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_3F
-	warp_def 16, 13, 4, OLIVINE_LIGHTHOUSE_1F
-	warp_def 17, 13, 5, OLIVINE_LIGHTHOUSE_1F
-	warp_def 16, 11, 4, OLIVINE_LIGHTHOUSE_3F
-	warp_def 17, 11, 5, OLIVINE_LIGHTHOUSE_3F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 2
-	object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1
-	object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event  3, 11, OLIVINE_LIGHTHOUSE_1F, 3
+	warp_event  5,  3, OLIVINE_LIGHTHOUSE_3F, 2
+	warp_event 16, 13, OLIVINE_LIGHTHOUSE_1F, 4
+	warp_event 17, 13, OLIVINE_LIGHTHOUSE_1F, 5
+	warp_event 16, 11, OLIVINE_LIGHTHOUSE_3F, 4
+	warp_event 17, 11, OLIVINE_LIGHTHOUSE_3F, 5
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  9,  3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey, -1
+	object_event 17,  8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index 2cd0dc64c..53b2c5914 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -1,21 +1,19 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE3F_SAILOR
 	const OLIVINELIGHTHOUSE3F_GENTLEMAN
 	const OLIVINELIGHTHOUSE3F_YOUNGSTER
 	const OLIVINELIGHTHOUSE3F_POKE_BALL
 
 OlivineLighthouse3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperTheo:
-	trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script
+	trainer BIRD_KEEPER, THEO, EVENT_BEAT_BIRD_KEEPER_THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperTheoAfterBattleText
 	waitbutton
@@ -23,10 +21,10 @@ TrainerBirdKeeperTheo:
 	end
 
 TrainerGentlemanPreston:
-	trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script
+	trainer GENTLEMAN, PRESTON, EVENT_BEAT_GENTLEMAN_PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GentlemanPrestonAfterBattleText
 	waitbutton
@@ -34,10 +32,10 @@ TrainerGentlemanPreston:
 	end
 
 TrainerSailorTerrell:
-	trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script
+	trainer SAILOR, TERRELL, EVENT_BEAT_SAILOR_TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorTerrellAfterBattleText
 	waitbutton
@@ -113,30 +111,25 @@ GentlemanPrestonAfterBattleText:
 	done
 
 OlivineLighthouse3F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 9
-	warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_4F
-	warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_2F
-	warp_def 9, 5, 4, OLIVINE_LIGHTHOUSE_4F
-	warp_def 16, 11, 5, OLIVINE_LIGHTHOUSE_2F
-	warp_def 17, 11, 6, OLIVINE_LIGHTHOUSE_2F
-	warp_def 16, 9, 5, OLIVINE_LIGHTHOUSE_4F
-	warp_def 17, 9, 6, OLIVINE_LIGHTHOUSE_4F
-	warp_def 8, 3, 7, OLIVINE_LIGHTHOUSE_4F
-	warp_def 9, 3, 8, OLIVINE_LIGHTHOUSE_4F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1
-	object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1
-	object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1
-	object_event 8, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
+	db 0, 0 ; filler
+
+	db 9 ; warp events
+	warp_event 13,  3, OLIVINE_LIGHTHOUSE_4F, 1
+	warp_event  5,  3, OLIVINE_LIGHTHOUSE_2F, 2
+	warp_event  9,  5, OLIVINE_LIGHTHOUSE_4F, 4
+	warp_event 16, 11, OLIVINE_LIGHTHOUSE_2F, 5
+	warp_event 17, 11, OLIVINE_LIGHTHOUSE_2F, 6
+	warp_event 16,  9, OLIVINE_LIGHTHOUSE_4F, 5
+	warp_event 17,  9, OLIVINE_LIGHTHOUSE_4F, 6
+	warp_event  8,  3, OLIVINE_LIGHTHOUSE_4F, 7
+	warp_event  9,  3, OLIVINE_LIGHTHOUSE_4F, 8
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  9,  2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1
+	object_event 13,  5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1
+	object_event  3,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1
+	object_event  8,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER
diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm
index 7580d3499..50a4d17fc 100644
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -1,19 +1,17 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE4F_SAILOR
 	const OLIVINELIGHTHOUSE4F_LASS
 
 OlivineLighthouse4F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerLassConnie:
-	trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script
+	trainer LASS, CONNIE1, EVENT_BEAT_LASS_CONNIE, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassConnie1AfterBattleText
 	waitbutton
@@ -21,10 +19,10 @@ TrainerLassConnie:
 	end
 
 TrainerSailorKent:
-	trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script
+	trainer SAILOR, KENT, EVENT_BEAT_SAILOR_KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorKentAfterBattleText
 	waitbutton
@@ -82,29 +80,24 @@ LassConnie1AfterBattleText:
 	done
 
 OlivineLighthouse4F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 10
-	warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_3F
-	warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_5F
-	warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_5F
-	warp_def 9, 5, 3, OLIVINE_LIGHTHOUSE_3F
-	warp_def 16, 9, 6, OLIVINE_LIGHTHOUSE_3F
-	warp_def 17, 9, 7, OLIVINE_LIGHTHOUSE_3F
-	warp_def 8, 3, 8, OLIVINE_LIGHTHOUSE_3F
-	warp_def 9, 3, 9, OLIVINE_LIGHTHOUSE_3F
-	warp_def 16, 7, 4, OLIVINE_LIGHTHOUSE_5F
-	warp_def 17, 7, 5, OLIVINE_LIGHTHOUSE_5F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 2
-	object_event 7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1
-	object_event 11, 2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1
+	db 0, 0 ; filler
+
+	db 10 ; warp events
+	warp_event 13,  3, OLIVINE_LIGHTHOUSE_3F, 1
+	warp_event  3,  5, OLIVINE_LIGHTHOUSE_5F, 2
+	warp_event  9,  7, OLIVINE_LIGHTHOUSE_5F, 3
+	warp_event  9,  5, OLIVINE_LIGHTHOUSE_3F, 3
+	warp_event 16,  9, OLIVINE_LIGHTHOUSE_3F, 6
+	warp_event 17,  9, OLIVINE_LIGHTHOUSE_3F, 7
+	warp_event  8,  3, OLIVINE_LIGHTHOUSE_3F, 8
+	warp_event  9,  3, OLIVINE_LIGHTHOUSE_3F, 9
+	warp_event 16,  7, OLIVINE_LIGHTHOUSE_5F, 4
+	warp_event 17,  7, OLIVINE_LIGHTHOUSE_5F, 5
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1
+	object_event 11,  2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index ccee7f0c7..84e5948b6 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE5F_SAILOR
 	const OLIVINELIGHTHOUSE5F_YOUNGSTER
 	const OLIVINELIGHTHOUSE5F_POKE_BALL1
@@ -6,17 +6,15 @@ const_value set 2
 	const OLIVINELIGHTHOUSE5F_POKE_BALL3
 
 OlivineLighthouse5F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperDenis:
-	trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script
+	trainer BIRD_KEEPER, DENIS, EVENT_BEAT_BIRD_KEEPER_DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperDenisAfterBattleText
 	waitbutton
@@ -24,10 +22,10 @@ TrainerBirdKeeperDenis:
 	end
 
 TrainerSailorErnest:
-	trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script
+	trainer SAILOR, ERNEST, EVENT_BEAT_SAILOR_ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorErnestAfterBattleText
 	waitbutton
@@ -44,7 +42,7 @@ OlivineLighthouse5FTMSwagger:
 	itemball TM_SWAGGER
 
 OlivineLighthouse5FHiddenHyperPotion:
-	hiddenitem EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION
+	hiddenitem HYPER_POTION, EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION
 
 SailorErnestSeenText:
 	text "I wanted to battle"
@@ -91,30 +89,25 @@ BirdKeeperDenisAfterBattleText:
 	done
 
 OlivineLighthouse5F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 7
-	warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_6F
-	warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_4F
-	warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_4F
-	warp_def 16, 7, 9, OLIVINE_LIGHTHOUSE_4F
-	warp_def 17, 7, 10, OLIVINE_LIGHTHOUSE_4F
-	warp_def 16, 5, 2, OLIVINE_LIGHTHOUSE_6F
-	warp_def 17, 5, 3, OLIVINE_LIGHTHOUSE_6F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion
-
-.ObjectEvents:
-	db 5
-	object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1
-	object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1
-	object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
-	object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
-	object_event 2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
+	db 0, 0 ; filler
+
+	db 7 ; warp events
+	warp_event  9, 15, OLIVINE_LIGHTHOUSE_6F, 1
+	warp_event  3,  5, OLIVINE_LIGHTHOUSE_4F, 2
+	warp_event  9,  7, OLIVINE_LIGHTHOUSE_4F, 3
+	warp_event 16,  7, OLIVINE_LIGHTHOUSE_4F, 9
+	warp_event 17,  7, OLIVINE_LIGHTHOUSE_4F, 10
+	warp_event 16,  5, OLIVINE_LIGHTHOUSE_6F, 2
+	warp_event 17,  5, OLIVINE_LIGHTHOUSE_6F, 3
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion
+
+	db 5 ; object events
+	object_event  8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1
+	object_event  8,  3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1
+	object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY
+	object_event  6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL
+	object_event  2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index d036dc56f..f0121b8ef 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -1,130 +1,129 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINELIGHTHOUSE6F_JASMINE
 	const OLIVINELIGHTHOUSE6F_MONSTER
 	const OLIVINELIGHTHOUSE6F_POKE_BALL
 
 OlivineLighthouse6F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-JasmineScript_0x60b91:
+OlivineLighthouseJasmine:
 	faceplayer
 	opentext
 	checkitem SECRETPOTION
-	iftrue UnknownScript_0x60bab
+	iftrue .BroughtSecretpotion
 	checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
-	iftrue UnknownScript_0x60ba5
-	writetext UnknownText_0x60c81
+	iftrue .ExplainedSickness
+	writetext JasmineCianwoodPharmacyText
 	buttonsound
 	setevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
-UnknownScript_0x60ba5:
-	writetext UnknownText_0x60d64
+.ExplainedSickness:
+	writetext JasmineGetSomeMedicineText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x60bab:
-	writetext UnknownText_0x60d99
+.BroughtSecretpotion:
+	writetext JasmineCureAmphyText
 	yesorno
-	iffalse UnknownScript_0x60c25
-	writetext UnknownText_0x60dc3
+	iffalse .no
+	writetext PlayerHandedSecretpotionText
 	buttonsound
 	takeitem SECRETPOTION
-	writetext UnknownText_0x60dea
+	writetext JasmineDontBeOffendedText
 	waitbutton
 	closetext
-	spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
+	turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
 	pause 15
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	opentext
 	playmusic MUSIC_HEAL
-	writetext UnknownText_0x60e44
+	writetext JasmineAmphyHowAreYouFeelingText
 	pause 60
 	buttonsound
 	closetext
 	special RestartMapMusic
 	cry AMPHAROS
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	pause 10
-	special Special_FadeInPalettes
+	special FadeInPalettes
 	opentext
-	writetext UnknownText_0x60f3d
+	writetext AmphyPaluPaluluText
 	waitbutton
 	closetext
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
 	pause 10
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	pause 10
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
 	pause 10
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	pause 10
 	faceplayer
 	opentext
-	writetext UnknownText_0x60e6c
+	writetext JasmineThankYouText
 	waitbutton
 	closetext
 	setevent EVENT_JASMINE_RETURNED_TO_GYM
 	clearevent EVENT_OLIVINE_GYM_JASMINE
 	checkcode VAR_FACING
-	if_equal DOWN, UnknownScript_0x60c17
-	if_equal RIGHT, UnknownScript_0x60c1e
+	ifequal DOWN, .FacingDown
+	ifequal RIGHT, .FacingRight
 	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68
 	disappear OLIVINELIGHTHOUSE6F_JASMINE
 	end
 
-UnknownScript_0x60c17:
+.FacingDown:
 	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c70
 	disappear OLIVINELIGHTHOUSE6F_JASMINE
 	end
 
-UnknownScript_0x60c1e:
+.FacingRight:
 	applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c79
 	disappear OLIVINELIGHTHOUSE6F_JASMINE
 	end
 
-UnknownScript_0x60c25:
-	writetext UnknownText_0x60edf
+.no:
+	writetext JasmineISeeText
 	waitbutton
 	closetext
-	spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
+	turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
 	pause 15
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	opentext
-	writetext UnknownText_0x60ef1
+	writetext JasmineAmphyHangOnText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x60c39:
+OlivineLighthouseUnusedDummyScript:
+; unused
 	end
 
-MonsterScript_0x60c3a:
+OlivineLighthouseAmphy:
 	faceplayer
 	opentext
 	checkevent EVENT_JASMINE_RETURNED_TO_GYM
-	iftrue UnknownScript_0x60c51
-	writetext UnknownText_0x60f03
+	iftrue .HealthyNow
+	writetext AmphyPalPalooText
 	writebyte AMPHAROS
-	special Special_PlaySlowCry
+	special PlaySlowCry
 	buttonsound
-	writetext UnknownText_0x60f19
+	writetext AmphyBreathingLaboredText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x60c51:
-	writetext UnknownText_0x60f3d
+.HealthyNow:
+	writetext AmphyPaluPaluluText
 	cry AMPHAROS
 	waitbutton
 	closetext
-	special Special_FadeOutPalettes
-	special Special_FadeInPalettes
-	special Special_FadeOutPalettes
-	special Special_FadeInPalettes
+	special FadeOutPalettes
+	special FadeInPalettes
+	special FadeOutPalettes
+	special FadeInPalettes
 	end
 
 OlivineLighthouse6FSuperPotion:
@@ -161,7 +160,7 @@ MovementData_0x60c79:
 	step_sleep 8
 	step_end
 
-UnknownText_0x60c81:
+JasmineCianwoodPharmacyText:
 	text "JASMINE: … This"
 	line "#MON always"
 
@@ -185,25 +184,25 @@ UnknownText_0x60c81:
 	line "AMPHY unattended…"
 	done
 
-UnknownText_0x60d64:
+JasmineGetSomeMedicineText:
 	text "…May I ask you to"
 	line "get some medicine"
 	cont "for me? Please?"
 	done
 
-UnknownText_0x60d99:
+JasmineCureAmphyText:
 	text "JASMINE: …Will"
 	line "that medicine cure"
 	cont "AMPHY?"
 	done
 
-UnknownText_0x60dc3:
+PlayerHandedSecretpotionText:
 	text "<PLAYER> handed the"
 	line "SECRETPOTION to"
 	cont "JASMINE."
 	done
 
-UnknownText_0x60dea:
+JasmineDontBeOffendedText:
 	text "JASMINE: …Um,"
 	line "please don't be"
 	cont "offended…"
@@ -213,14 +212,14 @@ UnknownText_0x60dea:
 	cont "anyone but me…"
 	done
 
-UnknownText_0x60e44:
+JasmineAmphyHowAreYouFeelingText:
 	text "JASMINE: …"
 
 	para "AMPHY, how are you"
 	line "feeling?"
 	done
 
-UnknownText_0x60e6c:
+JasmineThankYouText:
 	text "JASMINE: …Oh, I'm"
 	line "so relieved…"
 
@@ -234,47 +233,42 @@ UnknownText_0x60e6c:
 	line "the GYM…"
 	done
 
-UnknownText_0x60edf:
+JasmineISeeText:
 	text "JASMINE: …I see…"
 	done
 
-UnknownText_0x60ef1:
+JasmineAmphyHangOnText:
 	text "…AMPHY, hang on!"
 	done
 
-UnknownText_0x60f03:
+AmphyPalPalooText:
 	text "AMPHY: …"
 	line "…Pa… paloo…"
 	done
 
-UnknownText_0x60f19:
+AmphyBreathingLaboredText:
 	text "Its breathing is"
 	line "terribly labored…"
 	done
 
-UnknownText_0x60f3d:
+AmphyPaluPaluluText:
 	text "AMPHY: Palu!"
 	line "Palulu!"
 	done
 
 OlivineLighthouse6F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_5F
-	warp_def 16, 5, 6, OLIVINE_LIGHTHOUSE_5F
-	warp_def 17, 5, 7, OLIVINE_LIGHTHOUSE_5F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
-	object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1
-	object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  9, 15, OLIVINE_LIGHTHOUSE_5F, 1
+	warp_event 16,  5, OLIVINE_LIGHTHOUSE_5F, 6
+	warp_event 17,  5, OLIVINE_LIGHTHOUSE_5F, 7
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  8,  8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineLighthouseJasmine, EVENT_OLIVINE_LIGHTHOUSE_JASMINE
+	object_event  9,  8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, OlivineLighthouseAmphy, -1
+	object_event  3,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION
diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
index ea980fe3c..f06aeebd4 100644
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINEMART_CLERK
 	const OLIVINEMART_COOLTRAINER_F
 	const OLIVINEMART_LASS
 
 OlivineMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x9cac7:
+OlivineMartClerkScript:
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_OLIVINE
 	closetext
@@ -46,22 +44,17 @@ OlivineMartLassText:
 	done
 
 OlivineMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 8, OLIVINE_CITY
-	warp_def 3, 7, 8, OLIVINE_CITY
+	db 2 ; warp events
+	warp_event  2,  7, OLIVINE_CITY, 8
+	warp_event  3,  7, OLIVINE_CITY, 8
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1
-	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1
-	object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartClerkScript, -1
+	object_event  6,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1
+	object_event  1,  6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1
diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm
index 3345636ff..c1acd0fac 100644
--- a/maps/OlivinePokecenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -1,20 +1,18 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINEPOKECENTER1F_NURSE
 	const OLIVINEPOKECENTER1F_FISHING_GURU
 	const OLIVINEPOKECENTER1F_FISHER
 	const OLIVINEPOKECENTER1F_TEACHER
 
 OlivinePokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x9c002:
+OlivinePokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
-FishingGuruScript_0x9c005:
+OlivinePokecenter1FFishingGuruScript:
 	jumpstd happinesschecknpc
 
 OlivinePokecenter1FFisherScript:
@@ -48,24 +46,19 @@ OlivinePokecenter1FTeacherText:
 	done
 
 OlivinePokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 1, OLIVINE_CITY
-	warp_def 4, 7, 1, OLIVINE_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1
-	object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1
-	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1
-	object_event 7, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, OLIVINE_CITY, 1
+	warp_event  4,  7, OLIVINE_CITY, 1
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FNurseScript, -1
+	object_event  8,  4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFishingGuruScript, -1
+	object_event  2,  3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1
+	object_event  7,  1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 0b9b8882a..22d96d1df 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINEPORT_SAILOR1
 	const OLIVINEPORT_SAILOR2
 	const OLIVINEPORT_SAILOR3
@@ -8,13 +8,11 @@ const_value set 2
 	const OLIVINEPORT_COOLTRAINER_F
 
 OlivinePort_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .LeaveFastShip
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .LeaveFastShip ; SCENE_OLIVINEPORT_LEAVE_SHIP
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -26,30 +24,30 @@ OlivinePort_MapScripts:
 .LeaveFastShipScript:
 	applymovement PLAYER, MovementData_0x74a32
 	appear OLIVINEPORT_SAILOR1
-	setscene 0
-	setevent EVENT_GAVE_KURT_APRICORNS
+	setscene SCENE_DEFAULT
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	blackoutmod OLIVINE_CITY
 	end
 
-SailorScript_0x748c0:
+OlivinePortSailorAtGangwayScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iftrue UnknownScript_0x74919
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iftrue OlivinePortAlreadyRodeScript
 	writetext UnknownText_0x74a55
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_SAILOR1, DOWN
+	turnobject OLIVINEPORT_SAILOR1, DOWN
 	pause 10
 	playsound SFX_EXIT_BUILDING
 	disappear OLIVINEPORT_SAILOR1
 	waitsfx
 	applymovement PLAYER, MovementData_0x74a30
 	playsound SFX_EXIT_BUILDING
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	waitsfx
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
-	iffalse UnknownScript_0x7490a
+	iffalse .FirstTime
 	clearevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
 	setevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
 	clearevent EVENT_BEAT_COOLTRAINERM_SEAN
@@ -61,180 +59,180 @@ SailorScript_0x748c0:
 	clearevent EVENT_BEAT_SAILOR_GARRETT
 	clearevent EVENT_BEAT_FISHER_JONAH
 	clearevent EVENT_BEAT_BLACKBELT_WAI
-UnknownScript_0x7490a:
+.FirstTime:
 	clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
 	appear OLIVINEPORT_SAILOR1
-	setmapscene FAST_SHIP_1F, 1
+	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_ENTER_SHIP
 	warp FAST_SHIP_1F, 25, 1
 	end
 
-UnknownScript_0x74919:
+OlivinePortAlreadyRodeScript:
 	writetext UnknownText_0x74a80
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7491f:
-	spriteface OLIVINEPORT_SAILOR3, RIGHT
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iftrue UnknownScript_0x7498b
-	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
-	iftrue UnknownScript_0x7498b
-	spriteface PLAYER, LEFT
+OlivinePortWalkUpToShipScript:
+	turnobject OLIVINEPORT_SAILOR3, RIGHT
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iftrue .skip
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	iftrue .skip
+	turnobject PLAYER, LEFT
 	opentext
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
-	iffalse UnknownScript_0x7494e
+	iffalse .FirstTime
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, UnknownScript_0x74977
-	if_equal SATURDAY, UnknownScript_0x74977
-	if_equal TUESDAY, UnknownScript_0x74981
-	if_equal WEDNESDAY, UnknownScript_0x74981
-	if_equal THURSDAY, UnknownScript_0x74981
-UnknownScript_0x7494e:
+	ifequal SUNDAY, .NextShipMonday
+	ifequal SATURDAY, .NextShipMonday
+	ifequal TUESDAY, .NextShipFriday
+	ifequal WEDNESDAY, .NextShipFriday
+	ifequal THURSDAY, .NextShipFriday
+.FirstTime:
 	writetext UnknownText_0x74a9c
 	yesorno
-	iffalse UnknownScript_0x74992
+	iffalse OlivinePortNotRidingMoveAwayScript
 	writetext UnknownText_0x74ada
 	buttonsound
 	checkitem S_S_TICKET
-	iffalse UnknownScript_0x7496d
+	iffalse .NoTicket
 	writetext UnknownText_0x74b11
 	waitbutton
 	closetext
-	setevent EVENT_RECEIVED_BALLS_FROM_KURT
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	applymovement PLAYER, MovementData_0x74a37
-	jump SailorScript_0x748c0
+	jump OlivinePortSailorAtGangwayScript
 
-UnknownScript_0x7496d:
+.NoTicket:
 	writetext UnknownText_0x74b41
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x74a34
 	end
 
-UnknownScript_0x74977:
+.NextShipMonday:
 	writetext UnknownText_0x74ba8
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x74a34
 	end
 
-UnknownScript_0x74981:
+.NextShipFriday:
 	writetext UnknownText_0x74bce
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x74a34
 	end
 
-UnknownScript_0x7498b:
+.skip:
 	end
 
-UnknownScript_0x7498c:
+OlivinePortNotRidingScript:
 	writetext UnknownText_0x74af6
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x74992:
+OlivinePortNotRidingMoveAwayScript:
 	writetext UnknownText_0x74af6
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x74a34
 	end
 
-SailorScript_0x7499c:
+OlivinePortSailorAfterHOFScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iftrue UnknownScript_0x74919
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iftrue OlivinePortAlreadyRodeScript
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
-	iffalse UnknownScript_0x749c0
+	iffalse .FirstTime
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, UnknownScript_0x749f2
-	if_equal SATURDAY, UnknownScript_0x749f2
-	if_equal TUESDAY, UnknownScript_0x749f8
-	if_equal WEDNESDAY, UnknownScript_0x749f8
-	if_equal THURSDAY, UnknownScript_0x749f8
-UnknownScript_0x749c0:
+	ifequal SUNDAY, .NextShipMonday
+	ifequal SATURDAY, .NextShipMonday
+	ifequal TUESDAY, .NextShipFriday
+	ifequal WEDNESDAY, .NextShipFriday
+	ifequal THURSDAY, .NextShipFriday
+.FirstTime:
 	writetext UnknownText_0x74a9c
 	yesorno
-	iffalse UnknownScript_0x7498c
+	iffalse OlivinePortNotRidingScript
 	writetext UnknownText_0x74ada
 	buttonsound
 	checkitem S_S_TICKET
-	iffalse UnknownScript_0x749ec
+	iffalse .NoTicket
 	writetext UnknownText_0x74b11
 	waitbutton
 	closetext
-	setevent EVENT_RECEIVED_BALLS_FROM_KURT
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	checkcode VAR_FACING
-	if_equal RIGHT, UnknownScript_0x749e5
+	ifequal RIGHT, .Right
 	applymovement PLAYER, MovementData_0x74a3f
-	jump SailorScript_0x748c0
+	jump OlivinePortSailorAtGangwayScript
 
-UnknownScript_0x749e5:
+.Right:
 	applymovement PLAYER, MovementData_0x74a49
-	jump SailorScript_0x748c0
+	jump OlivinePortSailorAtGangwayScript
 
-UnknownScript_0x749ec:
+.NoTicket:
 	writetext UnknownText_0x74b41
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x749f2:
+.NextShipMonday:
 	writetext UnknownText_0x74ba8
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x749f8:
+.NextShipFriday:
 	writetext UnknownText_0x74bce
 	waitbutton
 	closetext
 	end
 
-OlivinePortSailorScript:
-	jumptextfaceplayer OlivinePortSailorText
+OlivinePortSailorBeforeHOFScript:
+	jumptextfaceplayer OlivinePortSailorBeforeHOFText
 
-FishingGuruScript_0x74a01:
+OlivinePortFishingGuru1Script:
 	faceplayer
 	opentext
-	writetext UnknownText_0x74bf4
+	writetext OlivinePortFishingGuru1Text
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_FISHING_GURU1, UP
+	turnobject OLIVINEPORT_FISHING_GURU1, UP
 	end
 
-FishingGuruScript_0x74a0c:
+OlivinePortFishingGuru2Script:
 	faceplayer
 	opentext
-	writetext UnknownText_0x74c35
+	writetext OlivinePortFishingGuru2Text
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_FISHING_GURU2, UP
+	turnobject OLIVINEPORT_FISHING_GURU2, UP
 	end
 
-YoungsterScript_0x74a17:
+OlivinePortYoungsterScript:
 	faceplayer
 	opentext
-	writetext UnknownText_0x74c76
+	writetext OlivinePortYoungsterText
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_YOUNGSTER, DOWN
+	turnobject OLIVINEPORT_YOUNGSTER, DOWN
 	end
 
-CooltrainerFScript_0x74a22:
+OlivinePortCooltrainerFScript:
 	faceplayer
 	opentext
-	writetext UnknownText_0x74ca2
+	writetext OlivinePortCooltrainerFText
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_COOLTRAINER_F, DOWN
+	turnobject OLIVINEPORT_COOLTRAINER_F, DOWN
 	end
 
 OlivinePortHiddenProtein:
-	hiddenitem EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN
+	hiddenitem PROTEIN, EVENT_OLIVINE_PORT_HIDDEN_PROTEIN
 
 MovementData_0x74a30:
 	step DOWN
@@ -346,7 +344,7 @@ UnknownText_0x74bce:
 	line "sail next Friday."
 	done
 
-UnknownText_0x74bf4:
+OlivinePortFishingGuru1Text:
 	text "SHELLDER are easy"
 	line "to catch here."
 
@@ -354,7 +352,7 @@ UnknownText_0x74bf4:
 	line "rare elsewhere."
 	done
 
-UnknownText_0x74c35:
+OlivinePortFishingGuru2Text:
 	text "How many RODS do"
 	line "you have?"
 
@@ -363,20 +361,20 @@ UnknownText_0x74c35:
 	cont "#MON."
 	done
 
-UnknownText_0x74c76:
+OlivinePortYoungsterText:
 	text "S.S.AQUA uses jets"
 	line "to skim over the"
 	cont "waves!"
 	done
 
-UnknownText_0x74ca2:
+OlivinePortCooltrainerFText:
 	text "There are lots of"
 	line "#MON in KANTO."
 
 	para "I wish I could go…"
 	done
 
-OlivinePortSailorText:
+OlivinePortSailorBeforeHOFText:
 	text "We don't want you"
 	line "to fall into the"
 
@@ -385,28 +383,23 @@ OlivinePortSailorText:
 	done
 
 OlivinePort_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 11, 7, 5, OLIVINE_PORT_PASSAGE
-	warp_def 7, 23, 1, FAST_SHIP_1F
-
-.CoordEvents:
-	db 1
-	coord_event 7, 15, 0, UnknownScript_0x7491f
-
-.BGEvents:
-	db 1
-	bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein
-
-.ObjectEvents:
-	db 7
-	object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
-	object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
-	object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
-	object_event 4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
-	object_event 13, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
-	object_event 4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
-	object_event 11, 15, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event 11,  7, OLIVINE_PORT_PASSAGE, 5
+	warp_event  7, 23, FAST_SHIP_1F, 1
+
+	db 1 ; coord events
+	coord_event  7, 15, SCENE_DEFAULT, OlivinePortWalkUpToShipScript
+
+	db 1 ; bg events
+	bg_event  1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein
+
+	db 7 ; object events
+	object_event  7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorAtGangwayScript, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
+	object_event  7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorBeforeHOFScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	object_event  6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorAfterHOFScript, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+	object_event  4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortFishingGuru1Script, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	object_event 13, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortFishingGuru2Script, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
+	object_event  4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortYoungsterScript, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
+	object_event 11, 15, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortCooltrainerFScript, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm
index 5b9615a73..98040307f 100644
--- a/maps/OlivinePortPassage.asm
+++ b/maps/OlivinePortPassage.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINEPORTPASSAGE_POKEFAN_M
 
 OlivinePortPassage_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OlivinePortPassagePokefanMScript:
 	jumptextfaceplayer OlivinePortPassagePokefanMText
@@ -20,23 +18,18 @@ OlivinePortPassagePokefanMText:
 	done
 
 OlivinePortPassage_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 15, 0, 10, OLIVINE_CITY
-	warp_def 16, 0, 11, OLIVINE_CITY
-	warp_def 15, 4, 4, OLIVINE_PORT_PASSAGE
-	warp_def 3, 2, 3, OLIVINE_PORT_PASSAGE
-	warp_def 3, 14, 1, OLIVINE_PORT
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 17, 1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event 15,  0, OLIVINE_CITY, 10
+	warp_event 16,  0, OLIVINE_CITY, 11
+	warp_event 15,  4, OLIVINE_PORT_PASSAGE, 4
+	warp_event  3,  2, OLIVINE_PORT_PASSAGE, 3
+	warp_event  3, 14, OLIVINE_PORT, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event 17,  1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm
index ed0e86e32..e590f158d 100644
--- a/maps/OlivinePunishmentSpeechHouse.asm
+++ b/maps/OlivinePunishmentSpeechHouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M
 	const OLIVINEPUNISHMENTSPEECHHOUSE_LASS
 
 OlivinePunishmentSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 OlivinePunishmentSpeechHouseDad:
 	jumptextfaceplayer OlivinePunishmentSpeechHouseDadText
@@ -40,23 +38,18 @@ OlivinePunishmentSpeechHouseDaughterText:
 	done
 
 OlivinePunishmentSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 5, OLIVINE_CITY
-	warp_def 3, 7, 5, OLIVINE_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1
-	bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2
-
-.ObjectEvents:
-	db 2
-	object_event 1, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1
-	object_event 5, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, OLIVINE_CITY, 5
+	warp_event  3,  7, OLIVINE_CITY, 5
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1
+	bg_event  1,  1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2
+
+	db 2 ; object events
+	object_event  1,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1
+	object_event  5,  5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1
diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm
index 5d1b19263..60263cf3c 100644
--- a/maps/OlivineTimsHouse.asm
+++ b/maps/OlivineTimsHouse.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const OLIVINETIMSHOUSE_TIM
 
 OlivineTimsHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Tim:
 	faceplayer
 	opentext
-	trade NPCTRADE_TIM
+	trade NPC_TRADE_TIM
 	waitbutton
 	closetext
 	end
@@ -20,22 +18,17 @@ TimsHouseBookshelf:
 	jumpstd magazinebookshelf
 
 OlivineTimsHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 3, OLIVINE_CITY
-	warp_def 3, 7, 3, OLIVINE_CITY
+	db 2 ; warp events
+	warp_event  2,  7, OLIVINE_CITY, 3
+	warp_event  3,  7, OLIVINE_CITY, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, TimsHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, TimsHouseBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
index 8e18b6d08..0bc820103 100644
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const PALLETTOWN_TEACHER
 	const PALLETTOWN_FISHER
 
 PalletTown_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -70,26 +68,21 @@ BluesHouseSignText:
 	done
 
 PalletTown_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 5, 5, 1, REDS_HOUSE_1F
-	warp_def 13, 5, 1, BLUES_HOUSE
-	warp_def 12, 11, 1, OAKS_LAB
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 4
-	bg_event 7, 9, BGEVENT_READ, PalletTownSign
-	bg_event 3, 5, BGEVENT_READ, RedsHouseSign
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  5,  5, REDS_HOUSE_1F, 1
+	warp_event 13,  5, BLUES_HOUSE, 1
+	warp_event 12, 11, OAKS_LAB, 1
+
+	db 0 ; coord events
+
+	db 4 ; bg events
+	bg_event  7,  9, BGEVENT_READ, PalletTownSign
+	bg_event  3,  5, BGEVENT_READ, RedsHouseSign
 	bg_event 13, 13, BGEVENT_READ, OaksLabSign
-	bg_event 11, 5, BGEVENT_READ, BluesHouseSign
+	bg_event 11,  5, BGEVENT_READ, BluesHouseSign
 
-.ObjectEvents:
-	db 2
-	object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1
+	db 2 ; object events
+	object_event  3,  8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1
 	object_event 12, 14, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index a4467ec4a..0a994ebbf 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const PEWTERCITY_COOLTRAINER_F
 	const PEWTERCITY_BUG_CATCHER
 	const PEWTERCITY_GRAMPS
@@ -6,11 +6,9 @@ const_value set 2
 	const PEWTERCITY_FRUIT_TREE2
 
 PewterCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -23,20 +21,20 @@ PewterCityCooltrainerFScript:
 PewterCityBugCatcherScript:
 	jumptextfaceplayer PewterCityBugCatcherText
 
-GrampsScript_0x18c00f:
+PewterCityGrampsScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_SILVER_WING
-	iftrue UnknownScript_0x18c023
-	writetext UnknownText_0x18c0c6
+	iftrue .GotSilverWing
+	writetext PewterCityGrampsText
 	buttonsound
 	verbosegiveitem SILVER_WING
 	setevent EVENT_GOT_SILVER_WING
 	closetext
 	end
 
-UnknownScript_0x18c023:
-	writetext UnknownText_0x18c1aa
+.GotSilverWing:
+	writetext PewterCityGrampsText_GotSilverWing
 	waitbutton
 	closetext
 	end
@@ -62,10 +60,10 @@ PewterCityPokecenterSign:
 PewterCityMartSign:
 	jumpstd martsign
 
-FruitTreeScript_0x18c03e:
+PewterCityFruitTree1:
 	fruittree FRUITTREE_PEWTER_CITY_1
 
-FruitTreeScript_0x18c040:
+PewterCityFruitTree2:
 	fruittree FRUITTREE_PEWTER_CITY_2
 
 PewterCityCooltrainerFText:
@@ -85,7 +83,7 @@ PewterCityBugCatcherText:
 	line "night."
 	done
 
-UnknownText_0x18c0c6:
+PewterCityGrampsText:
 	text "Ah, you came all"
 	line "the way out here"
 	cont "from JOHTO?"
@@ -107,7 +105,7 @@ UnknownText_0x18c0c6:
 	cont "I found in JOHTO."
 	done
 
-UnknownText_0x18c1aa:
+PewterCityGrampsText_GotSilverWing:
 	text "Going to new, un-"
 	line "known places and"
 	cont "seeing new people…"
@@ -153,34 +151,29 @@ PewterCityWelcomeSignText:
 	done
 
 PewterCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE
-	warp_def 16, 17, 1, PEWTER_GYM
-	warp_def 23, 17, 2, PEWTER_MART
-	warp_def 13, 25, 1, PEWTER_POKECENTER_1F
-	warp_def 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 7
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event 29, 13, PEWTER_NIDORAN_SPEECH_HOUSE, 1
+	warp_event 16, 17, PEWTER_GYM, 1
+	warp_event 23, 17, PEWTER_MART, 2
+	warp_event 13, 25, PEWTER_POKECENTER_1F, 1
+	warp_event  7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1
+
+	db 0 ; coord events
+
+	db 7 ; bg events
 	bg_event 25, 23, BGEVENT_READ, PewterCitySign
 	bg_event 11, 17, BGEVENT_READ, PewterGymSign
-	bg_event 15, 9, BGEVENT_READ, PewterMuseumSign
+	bg_event 15,  9, BGEVENT_READ, PewterMuseumSign
 	bg_event 33, 19, BGEVENT_READ, PewterCityMtMoonGiftShopSign
 	bg_event 19, 29, BGEVENT_READ, PewterCityWelcomeSign
 	bg_event 14, 25, BGEVENT_READ, PewterCityPokecenterSign
 	bg_event 24, 17, BGEVENT_READ, PewterCityMartSign
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1
 	object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1
-	object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1
-	object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1
-	object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1
+	object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterCityGrampsScript, -1
+	object_event 32,  3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterCityFruitTree1, -1
+	object_event 30,  3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterCityFruitTree2, -1
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
index 9e6395f13..e01352895 100644
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const PEWTERGYM_BROCK
 	const PEWTERGYM_YOUNGSTER
 	const PEWTERGYM_GYM_GUY
 
 PewterGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-BrockScript_0x1a2864:
+PewterGymBrockScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_BOULDERBADGE
@@ -41,10 +39,10 @@ BrockScript_0x1a2864:
 	end
 
 TrainerCamperJerry:
-	trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script
+	trainer CAMPER, JERRY, EVENT_BEAT_CAMPER_JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperJerryAfterBattleText
 	waitbutton
@@ -209,24 +207,19 @@ PewterGymGuyWinText:
 	done
 
 PewterGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 13, 2, PEWTER_CITY
-	warp_def 5, 13, 2, PEWTER_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 2, 11, BGEVENT_READ, PewterGymStatue
-	bg_event 7, 11, BGEVENT_READ, PewterGymStatue
-
-.ObjectEvents:
-	db 3
-	object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1
-	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1
-	object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 13, PEWTER_CITY, 2
+	warp_event  5, 13, PEWTER_CITY, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  2, 11, BGEVENT_READ, PewterGymStatue
+	bg_event  7, 11, BGEVENT_READ, PewterGymStatue
+
+	db 3 ; object events
+	object_event  5,  1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PewterGymBrockScript, -1
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1
+	object_event  6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index cc5047d7c..ad6df1593 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const PEWTERMART_CLERK
 	const PEWTERMART_YOUNGSTER
 	const PEWTERMART_SUPER_NERD
 
 PewterMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x1a2dcb:
+PewterMartClerkScript:
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_PEWTER
 	closetext
@@ -46,22 +44,17 @@ PewterMartSuperNerdText:
 	done
 
 PewterMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 3, PEWTER_CITY
-	warp_def 3, 7, 3, PEWTER_CITY
+	db 2 ; warp events
+	warp_event  2,  7, PEWTER_CITY, 3
+	warp_event  3,  7, PEWTER_CITY, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1
-	object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1
-	object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartClerkScript, -1
+	object_event  9,  2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1
+	object_event  6,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1
diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm
index b70294cef..cf90488be 100644
--- a/maps/PewterNidoranSpeechHouse.asm
+++ b/maps/PewterNidoranSpeechHouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD
 	const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M
 
 PewterNidoranSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PewterNidoranSpeechHouseSuperNerdScript:
 	jumptextfaceplayer PewterNidoranSpeechHouseSuperNerdText
@@ -29,21 +27,16 @@ PewterNidoranText:
 	done
 
 PewterNidoranSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, PEWTER_CITY
-	warp_def 3, 7, 1, PEWTER_CITY
+	db 2 ; warp events
+	warp_event  2,  7, PEWTER_CITY, 1
+	warp_event  3,  7, PEWTER_CITY, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 3, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1
-	object_event 4, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1
+	db 2 ; object events
+	object_event  3,  5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1
+	object_event  4,  5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1
diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm
index 25234385d..3ec7bf91f 100644
--- a/maps/PewterPokecenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const PEWTERPOKECENTER1F_NURSE
 	const PEWTERPOKECENTER1F_TEACHER
 	const PEWTERPOKECENTER1F_JIGGLYPUFF
@@ -6,13 +6,11 @@ const_value set 2
 	const PEWTERPOKECENTER1F_CHRIS
 
 PewterPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x1a2ee7:
+PewterPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
 PewterPokecenter1FTeacherScript:
@@ -32,7 +30,7 @@ PewterPokecenter1FBugCatcherScript:
 Chris:
 	faceplayer
 	opentext
-	trade NPCTRADE_CHRIS
+	trade NPC_TRADE_CHRIS
 	waitbutton
 	closetext
 	end
@@ -68,25 +66,20 @@ PewterPokecenter1FBugCatcherText:
 	done
 
 PewterPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 4, PEWTER_CITY
-	warp_def 4, 7, 4, PEWTER_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 5
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1
-	object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1
-	object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1
-	object_event 2, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1
-	object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, PEWTER_CITY, 4
+	warp_event  4,  7, PEWTER_CITY, 4
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 5 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FNurseScript, -1
+	object_event  8,  6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1
+	object_event  1,  3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1
+	object_event  2,  3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1
+	object_event  7,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1
diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm
index 0e6e7b916..6e5e6c14a 100644
--- a/maps/PewterPokecenter2FBeta.asm
+++ b/maps/PewterPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 PewterPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PewterPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 0, 7, 3, PEWTER_POKECENTER_1F
+	db 1 ; warp events
+	warp_event  0,  7, PEWTER_POKECENTER_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm
index 43e423cc4..61a96a50f 100644
--- a/maps/PewterSnoozeSpeechHouse.asm
+++ b/maps/PewterSnoozeSpeechHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const PEWTERSNOOZESPEECHHOUSE_GRAMPS
 
 PewterSnoozeSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PewterSnoozeSpeechHouseGrampsScript:
 	jumptextfaceplayer PewterSnoozeSpeechHouseGrampsText
@@ -21,22 +19,17 @@ PewterSnoozeSpeechHouseGrampsText:
 	done
 
 PewterSnoozeSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 5, PEWTER_CITY
-	warp_def 3, 7, 5, PEWTER_CITY
+	db 2 ; warp events
+	warp_event  2,  7, PEWTER_CITY, 5
+	warp_event  3,  7, PEWTER_CITY, 5
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 5, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1
+	db 1 ; object events
+	object_event  5,  3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1
diff --git a/maps/KrissHouse1F.asm b/maps/PlayersHouse1F.asm
index f94534332..d82ae9d86 100644
--- a/maps/KrissHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -1,18 +1,16 @@
-const_value set 2
-	const KRISSHOUSE1F_MOM1
-	const KRISSHOUSE1F_MOM2
-	const KRISSHOUSE1F_MOM3
-	const KRISSHOUSE1F_MOM4
-	const KRISSHOUSE1F_POKEFAN_F
-
-KrissHouse1F_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-
-.MapCallbacks:
-	db 0
+	const_def 2 ; object constants
+	const PLAYERSHOUSE1F_MOM1
+	const PLAYERSHOUSE1F_MOM2
+	const PLAYERSHOUSE1F_MOM3
+	const PLAYERSHOUSE1F_MOM4
+	const PLAYERSHOUSE1F_POKEFAN_F
+
+PlayersHouse1F_MapScripts:
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
+
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -20,134 +18,134 @@ KrissHouse1F_MapScripts:
 .DummyScene1:
 	end
 
-UnknownScript_0x7a4d8:
-	setevent EVENT_GAVE_KURT_APRICORNS
+MeetMomLeftScript:
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 
-UnknownScript_0x7a4db:
+MeetMomRightScript:
 	playmusic MUSIC_MOM
-	showemote EMOTE_SHOCK, KRISSHOUSE1F_MOM1, 15
-	spriteface PLAYER, LEFT
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iffalse UnknownScript_0x7a4f2
-	applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fc
-	jump UnknownScript_0x7a4f6
-
-UnknownScript_0x7a4f2:
-	applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fe
-UnknownScript_0x7a4f6:
+	showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15
+	turnobject PLAYER, LEFT
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iffalse .OnRight
+	applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc
+	jump MeetMomScript
+
+.OnRight:
+	applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fe
+MeetMomScript:
 	opentext
 	writetext UnknownText_0x7a604
 	buttonsound
 	stringtotext GearName, MEM_BUFFER_1
-	scall UnknownScript_0x7a57e
+	scall PlayersHouse1FReceiveItemStd
 	setflag ENGINE_POKEGEAR
 	setflag ENGINE_PHONE_CARD
 	addcellnum PHONE_MOM
-	setscene 1
-	setevent EVENT_KRISS_HOUSE_MOM_1
-	clearevent EVENT_KRISS_HOUSE_MOM_2
+	setscene SCENE_FINISHED
+	setevent EVENT_PLAYERS_HOUSE_MOM_1
+	clearevent EVENT_PLAYERS_HOUSE_MOM_2
 	writetext UnknownText_0x7a6bd
 	buttonsound
-	special Special_SetDayOfWeek
-UnknownScript_0x7a519:
+	special SetDayOfWeek
+.SetDayOfWeek:
 	writetext UnknownText_0x7a742
 	yesorno
-	iffalse UnknownScript_0x7a52a
-	special Special_InitialSetDSTFlag
+	iffalse .WrongDay
+	special InitialSetDSTFlag
 	yesorno
-	iffalse UnknownScript_0x7a519
-	jump UnknownScript_0x7a531
+	iffalse .SetDayOfWeek
+	jump .DayOfWeekDone
 
-UnknownScript_0x7a52a:
-	special Special_InitialClearDSTFlag
+.WrongDay:
+	special InitialClearDSTFlag
 	yesorno
-	iffalse UnknownScript_0x7a519
-UnknownScript_0x7a531:
+	iffalse .SetDayOfWeek
+.DayOfWeekDone:
 	writetext UnknownText_0x7a763
 	yesorno
-	iffalse UnknownScript_0x7a542
-	jump UnknownScript_0x7a53b
+	iffalse .ExplainPhone
+	jump .KnowPhone
 
-UnknownScript_0x7a53b:
+.KnowPhone:
 	writetext UnknownText_0x7a7cb
 	buttonsound
-	jump UnknownScript_0x7a549
+	jump .FinishPhone
 
-UnknownScript_0x7a542:
+.ExplainPhone:
 	writetext UnknownText_0x7a807
 	buttonsound
-	jump UnknownScript_0x7a549
+	jump .FinishPhone
 
-UnknownScript_0x7a549:
+.FinishPhone:
 	writetext UnknownText_0x7a850
 	waitbutton
 	closetext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iftrue UnknownScript_0x7a55d
-	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
-	iffalse UnknownScript_0x7a564
-	jump UnknownScript_0x7a56b
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iftrue .FromRight
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	iffalse .FromLeft
+	jump .Finish
 
-UnknownScript_0x7a55d:
-	applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a600
-	jump UnknownScript_0x7a56b
+.FromRight:
+	applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a600
+	jump .Finish
 
-UnknownScript_0x7a564:
-	applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a602
-	jump UnknownScript_0x7a56b
+.FromLeft:
+	applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a602
+	jump .Finish
 
-UnknownScript_0x7a56b:
+.Finish:
 	special RestartMapMusic
-	spriteface KRISSHOUSE1F_MOM1, LEFT
+	turnobject PLAYERSHOUSE1F_MOM1, LEFT
 	end
 
-UnknownScript_0x7a572:
+MeetMomTalkedScript:
 	playmusic MUSIC_MOM
-	jump UnknownScript_0x7a4f6
+	jump MeetMomScript
 
 GearName:
 	db "#GEAR@"
 
-UnknownScript_0x7a57e:
+PlayersHouse1FReceiveItemStd:
 	jumpstd receiveitem
 	end
 
-MomScript_0x7a582:
+MomScript:
 	faceplayer
-	setevent EVENT_RECEIVED_BALLS_FROM_KURT
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	checkscene
-	iffalse UnknownScript_0x7a572
+	iffalse MeetMomTalkedScript ; SCENE_DEFAULT
 	opentext
 	checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM
-	iftrue UnknownScript_0x7a5af
+	iftrue .FirstTimeBanking
 	checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
-	iftrue UnknownScript_0x7a5b8
+	iftrue .BankOfMom
 	checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
-	iftrue UnknownScript_0x7a5b5
+	iftrue .GaveMysteryEgg
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
-	iftrue UnknownScript_0x7a5a9
+	iftrue .GotAPokemon
 	writetext UnknownText_0x7a8b5
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7a5a9:
+.GotAPokemon:
 	writetext UnknownText_0x7a8e5
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7a5af:
+.FirstTimeBanking:
 	writetext UnknownText_0x7a957
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7a5b5:
+.GaveMysteryEgg:
 	setevent EVENT_FIRST_TIME_BANKING_WITH_MOM
-UnknownScript_0x7a5b8:
+.BankOfMom:
 	setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
-	special Special_BankOfMom
+	special BankOfMom
 	waitbutton
 	closetext
 	end
@@ -155,11 +153,11 @@ UnknownScript_0x7a5b8:
 NeighborScript:
 	faceplayer
 	opentext
-	checkmorn
+	checktime MORN
 	iftrue .MornScript
-	checkday
+	checktime DAY
 	iftrue .DayScript
-	checknite
+	checktime NITE
 	iftrue .NiteScript
 
 .MornScript:
@@ -181,7 +179,7 @@ NeighborScript:
 	writetext NeighborText
 	waitbutton
 	closetext
-	spriteface KRISSHOUSE1F_POKEFAN_F, RIGHT
+	turnobject PLAYERSHOUSE1F_POKEFAN_F, RIGHT
 	end
 
 TVScript:
@@ -385,32 +383,27 @@ TVText:
 	line "rolling too!"
 	done
 
-KrissHouse1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 6, 7, 2, NEW_BARK_TOWN
-	warp_def 7, 7, 2, NEW_BARK_TOWN
-	warp_def 9, 0, 1, KRISS_HOUSE_2F
-
-.CoordEvents:
-	db 2
-	coord_event 8, 4, 0, UnknownScript_0x7a4d8
-	coord_event 9, 4, 0, UnknownScript_0x7a4db
-
-.BGEvents:
-	db 4
-	bg_event 0, 1, BGEVENT_READ, StoveScript
-	bg_event 1, 1, BGEVENT_READ, SinkScript
-	bg_event 2, 1, BGEVENT_READ, FridgeScript
-	bg_event 4, 1, BGEVENT_READ, TVScript
-
-.ObjectEvents:
-	db 5
-	object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1
-	object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
-	object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
-	object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
-	object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR
+PlayersHouse1F_MapEvents:
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  6,  7, NEW_BARK_TOWN, 2
+	warp_event  7,  7, NEW_BARK_TOWN, 2
+	warp_event  9,  0, PLAYERS_HOUSE_2F, 1
+
+	db 2 ; coord events
+	coord_event  8,  4, SCENE_DEFAULT, MeetMomLeftScript
+	coord_event  9,  4, SCENE_DEFAULT, MeetMomRightScript
+
+	db 4 ; bg events
+	bg_event  0,  1, BGEVENT_READ, StoveScript
+	bg_event  1,  1, BGEVENT_READ, SinkScript
+	bg_event  2,  1, BGEVENT_READ, FridgeScript
+	bg_event  4,  1, BGEVENT_READ, TVScript
+
+	db 5 ; object events
+	object_event  7,  4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_1
+	object_event  2,  2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2
+	object_event  7,  4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2
+	object_event  0,  2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2
+	object_event  4,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
diff --git a/maps/KrissHouse1F.blk b/maps/PlayersHouse1F.blk
index 8b85e1535..8b85e1535 100644
--- a/maps/KrissHouse1F.blk
+++ b/maps/PlayersHouse1F.blk
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
new file mode 100644
index 000000000..a5c03a749
--- /dev/null
+++ b/maps/PlayersHouse2F.asm
@@ -0,0 +1,134 @@
+	const_def 2 ; object constants
+	const PLAYERSHOUSE2F_CONSOLE
+	const PLAYERSHOUSE2F_DOLL_1
+	const PLAYERSHOUSE2F_DOLL_2
+	const PLAYERSHOUSE2F_BIG_DOLL
+
+PlayersHouse2F_MapScripts:
+	db 0 ; scene scripts
+
+	db 2 ; callbacks
+	callback MAPCALLBACK_NEWMAP, .InitializeRoom
+	callback MAPCALLBACK_TILES, .SetSpawn
+
+; unused
+.Null:
+	end
+
+.InitializeRoom:
+	special ToggleDecorationsVisibility
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
+	checkevent EVENT_INITIALIZED_EVENTS
+	iftrue .SkipInitialization
+	jumpstd initializeevents
+	return
+
+.SkipInitialization:
+	return
+
+.SetSpawn:
+	special ToggleMaptileDecorations
+	return
+
+	db 0, 0, 0 ; filler
+
+Doll1Script:
+	describedecoration DECODESC_LEFT_DOLL
+
+Doll2Script:
+	describedecoration DECODESC_RIGHT_DOLL
+
+BigDollScript:
+	describedecoration DECODESC_BIG_DOLL
+
+GameConsoleScript:
+	describedecoration DECODESC_CONSOLE
+
+PlayersHousePosterScript:
+	conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script
+
+.Script:
+	describedecoration DECODESC_POSTER
+
+PlayersHouseRadioScript:
+	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+	iftrue .NormalRadio
+	checkevent EVENT_LISTENED_TO_INITIAL_RADIO
+	iftrue .AbbreviatedRadio
+	playmusic MUSIC_POKEMON_TALK
+	opentext
+	writetext PlayersRadioText1
+	pause 45
+	writetext PlayersRadioText2
+	pause 45
+	writetext PlayersRadioText3
+	pause 45
+	musicfadeout MUSIC_NEW_BARK_TOWN, 16
+	writetext PlayersRadioText4
+	pause 45
+	closetext
+	setevent EVENT_LISTENED_TO_INITIAL_RADIO
+	end
+
+.NormalRadio:
+	jumpstd radio1
+
+.AbbreviatedRadio:
+	opentext
+	writetext PlayersRadioText4
+	pause 45
+	closetext
+	end
+
+PlayersHouseBookshelfScript:
+	jumpstd picturebookshelf
+
+PlayersHousePCScript:
+	opentext
+	special PlayersHousePC
+	iftrue .Warp
+	closetext
+	end
+.Warp:
+	warp NONE, 0, 0
+	end
+
+PlayersRadioText1:
+	text "PROF.OAK'S #MON"
+	line "TALK! Please tune"
+	cont "in next time!"
+	done
+
+PlayersRadioText2:
+	text "#MON CHANNEL!"
+	done
+
+PlayersRadioText3:
+	text "This is DJ MARY,"
+	line "your co-host!"
+	done
+
+PlayersRadioText4:
+	text "#MON!"
+	line "#MON CHANNEL…"
+	done
+
+PlayersHouse2F_MapEvents:
+	db 0, 0 ; filler
+
+	db 1 ; warp events
+	warp_event  7,  0, PLAYERS_HOUSE_1F, 3
+
+	db 0 ; coord events
+
+	db 4 ; bg events
+	bg_event  2,  1, BGEVENT_UP, PlayersHousePCScript
+	bg_event  3,  1, BGEVENT_READ, PlayersHouseRadioScript
+	bg_event  5,  1, BGEVENT_READ, PlayersHouseBookshelfScript
+	bg_event  6,  0, BGEVENT_IFSET, PlayersHousePosterScript
+
+	db 4 ; object events
+	object_event  4,  2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE
+	object_event  4,  4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
+	object_event  5,  4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
+	object_event  0,  1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
diff --git a/maps/KrissHouse2F.blk b/maps/PlayersHouse2F.blk
index 63d33c2f8..63d33c2f8 100644
--- a/maps/KrissHouse2F.blk
+++ b/maps/PlayersHouse2F.blk
diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm
new file mode 100644
index 000000000..84400b09e
--- /dev/null
+++ b/maps/PlayersNeighborsHouse.asm
@@ -0,0 +1,115 @@
+	const_def 2 ; object constants
+	const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F
+	const PLAYERSNEIGHBORSHOUSE_POKEFAN_F
+
+PlayersNeighborsHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+PlayersNeighborsDaughterScript:
+	jumptextfaceplayer PlayersNeighborsDaughterText
+
+PlayersNeighborScript:
+	jumptextfaceplayer PlayersNeighborText
+
+PlayersNeighborsHouseBookshelfScript:
+	jumpstd magazinebookshelf
+
+PlayersNeighborsHouseRadioScript:
+	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+	iftrue .NormalRadio
+	checkevent EVENT_LISTENED_TO_INITIAL_RADIO
+	iftrue .AbbreviatedRadio
+	playmusic MUSIC_POKEMON_TALK
+	opentext
+	writetext PlayerNeighborRadioText1
+	pause 45
+	writetext PlayerNeighborRadioText2
+	pause 45
+	writetext PlayerNeighborRadioText3
+	pause 45
+	musicfadeout MUSIC_NEW_BARK_TOWN, 16
+	writetext PlayerNeighborRadioText4
+	pause 45
+	closetext
+	setevent EVENT_LISTENED_TO_INITIAL_RADIO
+	end
+.NormalRadio:
+	jumpstd radio1
+.AbbreviatedRadio:
+	opentext
+	writetext PlayerNeighborRadioText4
+	pause 45
+	closetext
+	end
+
+PlayersNeighborsDaughterText:
+	text "PIKACHU is an"
+	line "evolved #MON."
+
+	para "I was amazed by"
+	line "PROF.ELM's find-"
+	cont "ings."
+
+	para "He's so famous for"
+	line "his research on"
+	cont "#MON evolution."
+
+	para "…sigh…"
+
+	para "I wish I could be"
+	line "a researcher like"
+	cont "him…"
+	done
+
+PlayersNeighborText:
+	text "My daughter is"
+	line "adamant about"
+
+	para "becoming PROF."
+	line "ELM's assistant."
+
+	para "She really loves"
+	line "#MON!"
+
+	para "But then, so do I!"
+	done
+
+PlayerNeighborRadioText1:
+	text "PROF.OAK'S #MON"
+	line "TALK! Please tune"
+	cont "in next time!"
+	done
+
+PlayerNeighborRadioText2:
+	text "#MON CHANNEL!"
+	done
+
+PlayerNeighborRadioText3:
+	text "This is DJ MARY,"
+	line "your co-host!"
+	done
+
+PlayerNeighborRadioText4:
+	text "#MON!"
+	line "#MON CHANNEL…"
+	done
+
+PlayersNeighborsHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, NEW_BARK_TOWN, 3
+	warp_event  3,  7, NEW_BARK_TOWN, 3
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  0,  1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
+	bg_event  1,  1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
+	bg_event  7,  1, BGEVENT_READ, PlayersNeighborsHouseRadioScript
+
+	db 2 ; object events
+	object_event  2,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1
+	object_event  5,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm
index 89dfe05ba..05d2f9779 100644
--- a/maps/PokeSeersHouse.asm
+++ b/maps/PokeSeersHouse.asm
@@ -1,36 +1,29 @@
-const_value set 2
+	const_def 2 ; object constants
 	const POKESEERSHOUSE_GRANNY
 
 PokeSeersHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SeerScript:
 	faceplayer
 	opentext
-	special Special_PokeSeer
+	special PokeSeer
 	waitbutton
 	closetext
 	end
 
 PokeSeersHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 7, CIANWOOD_CITY
-	warp_def 3, 7, 7, CIANWOOD_CITY
+	db 2 ; warp events
+	warp_event  2,  7, CIANWOOD_CITY, 7
+	warp_event  3,  7, CIANWOOD_CITY, 7
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 40900519c..33b2f0fb0 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -1,27 +1,25 @@
-const_value set 2
+	const_def 2 ; object constants
 	const POKECENTER2F_TRADE_RECEPTIONIST
 	const POKECENTER2F_BATTLE_RECEPTIONIST
 	const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
 	const POKECENTER2F_OFFICER
 
 Pokecenter2F_MapScripts:
-.SceneScripts:
-	db 6
-	scene_script .Scene0
-	scene_script .Scene1
-	scene_script .Scene2
-	scene_script .Scene3
-	scene_script .Scene4
-	scene_script .Scene5
-
-.MapCallbacks:
-	db 0
+	db 6 ; scene scripts
+	scene_script .Scene0 ; SCENE_DEFAULT
+	scene_script .Scene1 ; SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
+	scene_script .Scene2 ; SCENE_POKECENTER2F_LEAVE_COLOSSEUM
+	scene_script .Scene3 ; SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
+	scene_script .Scene4 ; SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
+	scene_script .Scene5 ; SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
+
+	db 0 ; callbacks
 
 .Scene0:
-	special Special_CheckMysteryGift
-	if_equal $0, .Scene0Done
+	special CheckMysteryGift
+	ifequal $0, .Scene0Done
 	clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
-	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue .Scene0Done
 	priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy
 
@@ -50,7 +48,7 @@ Pokecenter2F_MapScripts:
 
 Pokecenter2F_AppearMysteryGiftDeliveryGuy:
 	appear POKECENTER2F_OFFICER
-	setevent EVENT_RECEIVED_BALLS_FROM_KURT
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	end
 
 Script_TradeCenterClosed:
@@ -76,28 +74,28 @@ LinkReceptionistScript_Trade:
 	writetext Text_TradeReceptionistIntro
 	yesorno
 	iffalse .Cancel
-	special Special_Mobile_DummyReturnFalse ; always returns false
+	special Mobile_DummyReturnFalse ; always returns false
 	iffalse .NoMobile
 	writetext Text_TradeReceptionistMobile
-	special Special_AskMobileOrCable
+	special AskMobileOrCable
 	iffalse .Cancel
-	if_equal $1, .Mobile
+	ifequal $1, .Mobile
 .NoMobile:
-	special Special_SetBitsForLinkTradeRequest
+	special SetBitsForLinkTradeRequest
 	writetext Text_PleaseWait
-	special Special_WaitForLinkedFriend
+	special WaitForLinkedFriend
 	iffalse .FriendNotReady
 	writetext Text_MustSaveGame
 	yesorno
 	iffalse .DidNotSave
-	special Special_TryQuickSave
+	special TryQuickSave
 	iffalse .DidNotSave
 	writetext Text_PleaseWait
-	special Special_CheckLinkTimeout
+	special CheckLinkTimeout
 	iffalse .LinkTimedOut
 	copybytetovar wOtherPlayerLinkMode
 	iffalse .LinkedToFirstGen
-	special Special_CheckBothSelectedSameRoom
+	special CheckBothSelectedSameRoom
 	iffalse .IncompatibleRooms
 	writetext Text_PleaseComeIn2
 	waitbutton
@@ -107,21 +105,21 @@ LinkReceptionistScript_Trade:
 	end
 
 .FriendNotReady:
-	special Special_WaitForOtherPlayerToExit
+	special WaitForOtherPlayerToExit
 	writetext Text_FriendNotReady
 	closetext
 	end
 
 .LinkedToFirstGen:
-	special Special_FailedLinkToPast
+	special FailedLinkToPast
 	writetext Text_CantLinkToThePast
-	special Special_CloseLink
+	special CloseLink
 	closetext
 	end
 
 .IncompatibleRooms:
 	writetext Text_IncompatibleRooms
-	special Special_CloseLink
+	special CloseLink
 	closetext
 	end
 
@@ -132,7 +130,7 @@ LinkReceptionistScript_Trade:
 .DidNotSave:
 	writetext Text_PleaseComeAgain
 .AbortLink:
-	special Special_WaitForOtherPlayerToExit
+	special WaitForOtherPlayerToExit
 .Cancel:
 	closetext
 	end
@@ -151,9 +149,9 @@ LinkReceptionistScript_Trade:
 	writetext Text_MustSaveGame
 	yesorno
 	iffalse .Mobile_DidNotSave
-	special Special_TryQuickSave
+	special TryQuickSave
 	iffalse .Mobile_DidNotSave
-	special Special_Function1011f1
+	special Function1011f1
 	writetext Text_PleaseComeIn2
 	waitbutton
 	closetext
@@ -178,28 +176,28 @@ LinkReceptionistScript_Battle:
 	writetext Text_BattleReceptionistIntro
 	yesorno
 	iffalse .Cancel
-	special Special_Mobile_DummyReturnFalse ; always returns false
+	special Mobile_DummyReturnFalse ; always returns false
 	iffalse .NoMobile
 	writetext Text_BattleReceptionistMobile
-	special Special_AskMobileOrCable
+	special AskMobileOrCable
 	iffalse .Cancel
-	if_equal $1, .Mobile
+	ifequal $1, .Mobile
 .NoMobile:
-	special Special_SetBitsForBattleRequest
+	special SetBitsForBattleRequest
 	writetext Text_PleaseWait
-	special Special_WaitForLinkedFriend
+	special WaitForLinkedFriend
 	iffalse .FriendNotReady
 	writetext Text_MustSaveGame
 	yesorno
 	iffalse .DidNotSave
-	special Special_TryQuickSave
+	special TryQuickSave
 	iffalse .DidNotSave
 	writetext Text_PleaseWait
-	special Special_CheckLinkTimeout
+	special CheckLinkTimeout
 	iffalse .LinkTimedOut
 	copybytetovar wOtherPlayerLinkMode
 	iffalse .LinkedToFirstGen
-	special Special_CheckBothSelectedSameRoom
+	special CheckBothSelectedSameRoom
 	iffalse .IncompatibleRooms
 	writetext Text_PleaseComeIn2
 	waitbutton
@@ -209,21 +207,21 @@ LinkReceptionistScript_Battle:
 	end
 
 .FriendNotReady:
-	special Special_WaitForOtherPlayerToExit
+	special WaitForOtherPlayerToExit
 	writetext Text_FriendNotReady
 	closetext
 	end
 
 .LinkedToFirstGen:
-	special Special_FailedLinkToPast
+	special FailedLinkToPast
 	writetext Text_CantLinkToThePast
-	special Special_CloseLink
+	special CloseLink
 	closetext
 	end
 
 .IncompatibleRooms:
 	writetext Text_IncompatibleRooms
-	special Special_CloseLink
+	special CloseLink
 	closetext
 	end
 
@@ -234,7 +232,7 @@ LinkReceptionistScript_Battle:
 .DidNotSave:
 	writetext Text_PleaseComeAgain
 .AbortLink:
-	special Special_WaitForOtherPlayerToExit
+	special WaitForOtherPlayerToExit
 .Cancel:
 	closetext
 	end
@@ -255,9 +253,9 @@ LinkReceptionistScript_Battle:
 	writetext Text_MustSaveGame
 	yesorno
 	iffalse .Mobile_DidNotSave
-	special Special_Function103780
+	special Function103780
 	iffalse .Mobile_DidNotSave
-	special Special_Function1011f1
+	special Function1011f1
 	writetext Text_PleaseComeIn2
 	waitbutton
 	closetext
@@ -271,11 +269,11 @@ LinkReceptionistScript_Battle:
 	end
 
 .SelectThreeMons:
-	special Special_Mobile_SelectThreeMons
+	special Mobile_SelectThreeMons
 	iffalse .Mobile_DidNotSelect
-	if_equal $1, .Mobile_OK
-	if_equal $2, .Mobile_OK
-	if_equal $3, .Mobile_InvalidParty
+	ifequal $1, .Mobile_OK
+	ifequal $2, .Mobile_OK
+	ifequal $3, .Mobile_InvalidParty
 	jump .Mobile_DidNotSelect
 
 .Mobile_InvalidParty:
@@ -303,37 +301,37 @@ LinkReceptionistScript_TimeCapsule:
 	iftrue Script_TimeCapsuleClosed
 	checkflag ENGINE_TIME_CAPSULE
 	iftrue Script_TimeCapsuleClosed
-	special Special_SetBitsForTimeCapsuleRequest
+	special SetBitsForTimeCapsuleRequest
 	faceplayer
 	opentext
 	writetext Text_TimeCapsuleReceptionistIntro
 	yesorno
 	iffalse .Cancel
-	special Special_CheckTimeCapsuleCompatibility
-	if_equal $1, .MonTooNew
-	if_equal $2, .MonMoveTooNew
-	if_equal $3, .MonHasMail
+	special CheckTimeCapsuleCompatibility
+	ifequal $1, .MonTooNew
+	ifequal $2, .MonMoveTooNew
+	ifequal $3, .MonHasMail
 	writetext Text_PleaseWait
-	special Special_WaitForLinkedFriend
+	special WaitForLinkedFriend
 	iffalse .FriendNotReady
 	writetext Text_MustSaveGame
 	yesorno
 	iffalse .DidNotSave
-	special Special_TryQuickSave
+	special TryQuickSave
 	iffalse .DidNotSave
 	writetext Text_PleaseWait
-	special Special_CheckLinkTimeout
+	special CheckLinkTimeout
 	iffalse .LinkTimedOut
 	copybytetovar wOtherPlayerLinkMode
 	iffalse .OK
-	special Special_CheckBothSelectedSameRoom
+	special CheckBothSelectedSameRoom
 	writetext Text_IncompatibleRooms
-	special Special_CloseLink
+	special CloseLink
 	closetext
 	end
 
 .OK:
-	special Special_EnterTimeCapsule
+	special EnterTimeCapsule
 	writetext Text_PleaseComeIn2
 	waitbutton
 	closetext
@@ -342,7 +340,7 @@ LinkReceptionistScript_TimeCapsule:
 	end
 
 .FriendNotReady:
-	special Special_WaitForOtherPlayerToExit
+	special WaitForOtherPlayerToExit
 	writetext Text_FriendNotReady
 	closetext
 	end
@@ -354,7 +352,7 @@ LinkReceptionistScript_TimeCapsule:
 .DidNotSave:
 	writetext Text_PleaseComeAgain
 .Cancel:
-	special Special_WaitForOtherPlayerToExit
+	special WaitForOtherPlayerToExit
 	closetext
 	end
 
@@ -374,17 +372,17 @@ LinkReceptionistScript_TimeCapsule:
 	end
 
 Script_LeftCableTradeCenter:
-	special Special_WaitForOtherPlayerToExit
+	special WaitForOtherPlayerToExit
 	scall Script_WalkOutOfLinkTradeRoom
-	setscene 0
-	setmapscene TRADE_CENTER, 0
+	setscene SCENE_DEFAULT
+	setmapscene TRADE_CENTER, SCENE_DEFAULT
 	end
 
 Script_LeftMobileTradeRoom:
-	special Special_Function101220
+	special Function101220
 	scall Script_WalkOutOfMobileTradeRoom
-	setscene 0
-	setmapscene MOBILE_TRADE_ROOM_MOBILE, 0
+	setscene SCENE_DEFAULT
+	setmapscene MOBILE_TRADE_ROOM, SCENE_DEFAULT
 	end
 
 Script_WalkOutOfMobileTradeRoom:
@@ -394,17 +392,17 @@ Script_WalkOutOfMobileTradeRoom:
 	end
 
 Script_LeftCableColosseum:
-	special Special_WaitForOtherPlayerToExit
+	special WaitForOtherPlayerToExit
 	scall Script_WalkOutOfLinkBattleRoom
-	setscene 0
-	setmapscene COLOSSEUM, 0
+	setscene SCENE_DEFAULT
+	setmapscene COLOSSEUM, SCENE_DEFAULT
 	end
 
 Script_LeftMobileBattleRoom:
-	special Special_Function101220
+	special Function101220
 	scall Script_WalkOutOfMobileBattleRoom
-	setscene 0
-	setmapscene MOBILE_BATTLE_ROOM, 0
+	setscene SCENE_DEFAULT
+	setmapscene MOBILE_BATTLE_ROOM, SCENE_DEFAULT
 	end
 
 Script_WalkOutOfMobileBattleRoom:
@@ -428,7 +426,7 @@ Pokecenter2F_CheckGender:
 	waitbutton
 	closetext
 	applymovement2 Pokecenter2FMovementData_ReceptionistLooksRight
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	opentext
 	writetext Text_ChangeTheLook
 	waitbutton
@@ -436,7 +434,7 @@ Pokecenter2F_CheckGender:
 	playsound SFX_TINGLE
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
 	writebyte (PAL_NPC_RED << 4)
-	special Special_SetPlayerPalette
+	special SetPlayerPalette
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
 	setflag ENGINE_KRIS_IN_CABLE_CLUB
 	special ReplaceKrisSprite
@@ -463,7 +461,7 @@ Script_WalkOutOfLinkTradeRoom:
 	playsound SFX_TINGLE
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
 	writebyte (PAL_NPC_BLUE << 4)
-	special Special_SetPlayerPalette
+	special SetPlayerPalette
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
 	special ReplaceKrisSprite
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
@@ -485,7 +483,7 @@ Script_WalkOutOfLinkBattleRoom:
 	playsound SFX_TINGLE
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
 	writebyte (PAL_NPC_BLUE << 4)
-	special Special_SetPlayerPalette
+	special SetPlayerPalette
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
 	special ReplaceKrisSprite
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
@@ -496,8 +494,8 @@ TimeCapsuleScript_CheckPlayerGender:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Female
 	checkcode VAR_FACING
-	if_equal LEFT, .MaleFacingLeft
-	if_equal RIGHT, .MaleFacingRight
+	ifequal LEFT, .MaleFacingLeft
+	ifequal RIGHT, .MaleFacingRight
 	applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp_2
 	end
@@ -514,8 +512,8 @@ TimeCapsuleScript_CheckPlayerGender:
 
 .Female:
 	checkcode VAR_FACING
-	if_equal RIGHT, .FemaleFacingRight
-	if_equal LEFT, .FemaleFacingLeft
+	ifequal RIGHT, .FemaleFacingRight
+	ifequal LEFT, .FemaleFacingLeft
 	applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp_2
 	jump .FemaleContinue
@@ -534,8 +532,8 @@ TimeCapsuleScript_CheckPlayerGender:
 	waitbutton
 	closetext
 	checkcode VAR_FACING
-	if_not_equal UP, .FemaleChangeApperance
-	spriteface PLAYER, LEFT
+	ifnotequal UP, .FemaleChangeApperance
+	turnobject PLAYER, LEFT
 .FemaleChangeApperance:
 	opentext
 	writetext Text_ChangeTheLook
@@ -544,7 +542,7 @@ TimeCapsuleScript_CheckPlayerGender:
 	playsound SFX_TINGLE
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
 	writebyte (PAL_NPC_RED << 4)
-	special Special_SetPlayerPalette
+	special SetPlayerPalette
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown
 	faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
 	setflag ENGINE_KRIS_IN_CABLE_CLUB
@@ -558,7 +556,7 @@ TimeCapsuleScript_CheckPlayerGender:
 	end
 
 Script_LeftTimeCapsule:
-	special Special_WaitForOtherPlayerToExit
+	special WaitForOtherPlayerToExit
 	checkflag ENGINE_KRIS_IN_CABLE_CLUB
 	iftrue .Female
 	applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight
@@ -573,23 +571,23 @@ Script_LeftTimeCapsule:
 	playsound SFX_TINGLE
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
 	writebyte (PAL_NPC_BLUE << 4)
-	special Special_SetPlayerPalette
+	special SetPlayerPalette
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
 	special ReplaceKrisSprite
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
 	applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
 .Done:
-	setscene 0
-	setmapscene TIME_CAPSULE, 0
+	setscene SCENE_DEFAULT
+	setmapscene TIME_CAPSULE, SCENE_DEFAULT
 	end
 
-MapPokecenter2FSignpost0Script:
+Pokecenter2FLinkRecordSign:
 	refreshscreen
-	special Special_DisplayLinkRecord
+	special DisplayLinkRecord
 	closetext
 	end
 
-OfficerScript_0x192c9a:
+Pokecenter2FOfficerScript:
 	faceplayer
 	opentext
 	checkevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
@@ -600,7 +598,7 @@ OfficerScript_0x192c9a:
 	writetext Text_MysteryGiftDeliveryGuy_HereYouGo
 	buttonsound
 	waitsfx
-	special Special_GetMysteryGiftItem
+	special GetMysteryGiftItem
 	iffalse .BagIsFull
 	itemnotify
 	setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
@@ -1023,28 +1021,23 @@ Text_BrokeStadiumRules:
 	done
 
 Pokecenter2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 0, 7, -1, POKECENTER_2F
-	warp_def 5, 0, 1, TRADE_CENTER
-	warp_def 9, 0, 1, COLOSSEUM
-	warp_def 13, 2, 1, TIME_CAPSULE
-	warp_def 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE
-	warp_def 10, 0, 1, MOBILE_BATTLE_ROOM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script
-
-.ObjectEvents:
-	db 4
-	object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
-	object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
-	object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1
-	object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event  0,  7, POKECENTER_2F, -1
+	warp_event  5,  0, TRADE_CENTER, 1
+	warp_event  9,  0, COLOSSEUM, 1
+	warp_event 13,  2, TIME_CAPSULE, 1
+	warp_event  6,  0, MOBILE_TRADE_ROOM, 1
+	warp_event 10,  0, MOBILE_BATTLE_ROOM, 1
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  7,  3, BGEVENT_READ, Pokecenter2FLinkRecordSign
+
+	db 4 ; object events
+	object_event  5,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
+	object_event  9,  2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
+	object_event 13,  3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1
+	object_event  1,  1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Pokecenter2FOfficerScript, EVENT_MYSTERY_GIFT_DELIVERY_GUY
diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm
index d45b3ac56..3c0b3c6c5 100644
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/PokecomCenterAdminOfficeMobile.asm
@@ -1,112 +1,110 @@
-const_value set 2
-	const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST1
-	const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST2
-	const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3
+	const_def 2 ; object constants
+	const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST1
+	const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST2
+	const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST3
 
-GoldenrodPokeComCenter2FMobile_MapScripts:
-.SceneScripts:
-	db 0
+PokecomCenterAdminOfficeMobile_MapScripts:
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-GoldenrodPokeComCenter2FMobileScientist1Script:
-	jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist1Text
+PokecomCenterAdminOfficeMobileScientist1Script:
+	jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist1Text
 
-GoldenrodPokeComCenter2FMobileScientist2Script:
-	jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist2Text
+PokecomCenterAdminOfficeMobileScientist2Script:
+	jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist2Text
 
-GoldenrodPokeComCenter2FMobileScientist3Script:
-	jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist3Text
+PokecomCenterAdminOfficeMobileScientist3Script:
+	jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist3Text
 
-MapGoldenrodPokeComCenter2FMobileSignpost0Script:
+PokecomCenterAdminOfficeMobileComputer1:
 	opentext
-	writetext UnknownText_0x627ee
+	writetext PokecomCenterAdminOfficeMobileComputer1Text
 	waitbutton
-UnknownScript_0x625df:
+.loop:
 	reloadmappart
-	loadmenudata MenuDataHeader_0x62602
+	loadmenu .Computer1MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, UnknownScript_0x625f0
-	if_equal 2, UnknownScript_0x625f8
-	jump UnknownScript_0x62600
+	ifequal 1, .PokeComClub
+	ifequal 2, .MobileCenter
+	jump .Quit
 
-UnknownScript_0x625f0:
+.PokeComClub:
 	opentext
-	writetext UnknownText_0x62828
+	writetext PokecomCenterAdminOfficeMobileComputer1Text_PokeComClub
 	waitbutton
-	jump UnknownScript_0x625df
+	jump .loop
 
-UnknownScript_0x625f8:
+.MobileCenter:
 	opentext
-	writetext UnknownText_0x628f4
+	writetext PokecomCenterAdminOfficeMobileComputer1Text_MobileCenter
 	waitbutton
-	jump UnknownScript_0x625df
+	jump .loop
 
-UnknownScript_0x62600:
+.Quit:
 	closetext
 	end
 
-MenuDataHeader_0x62602:
+.Computer1MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 15, 8
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "#　つうしん　クラブ@" ; # COM CLUB
 	db "モバイルセンター@" ; MOBILE CENTER
 	db "やめる@" ; QUIT
 
-MapGoldenrodPokeComCenter2FMobileSignpost1Script:
+PokecomCenterAdminOfficeMobileComputer2:
 	opentext
-	writetext UnknownText_0x62989
+	writetext PokecomCenterAdminOfficeMobileComputer2Text
 	waitbutton
-UnknownScript_0x62629:
+.loop:
 	reloadmappart
-	loadmenudata MenuDataHeader_0x6264c
+	loadmenu .Computer2MenuHeader
 	verticalmenu
 	closewindow
-	if_equal 1, UnknownScript_0x6263a
-	if_equal 2, UnknownScript_0x62642
-	jump UnknownScript_0x6264a
+	ifequal 1, .UsePhone
+	ifequal 2, .DontUsePhone
+	jump .Quit
 
-UnknownScript_0x6263a:
+.UsePhone:
 	opentext
-	writetext UnknownText_0x629ae
+	writetext PokecomCenterAdminOfficeMobileComputer2Text_UsePhone
 	waitbutton
-	jump UnknownScript_0x62629
+	jump .loop
 
-UnknownScript_0x62642:
+.DontUsePhone:
 	opentext
-	writetext UnknownText_0x62a5a
+	writetext PokecomCenterAdminOfficeMobileComputer2Text_DontUsePhone
 	waitbutton
-	jump UnknownScript_0x62629
+	jump .loop
 
-UnknownScript_0x6264a:
+.Quit:
 	closetext
 	end
 
-MenuDataHeader_0x6264c:
+.Computer2MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 15, 8
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "でんわ<WO>つかうとき@" ; Use phone
 	db "でんわ<GA>つながらないとき@" ; Don't use phone
 	db "やめる@" ; QUIT
 
-MapGoldenrodPokeComCenter2FMobileSignpost2Script:
-	jumptext UnknownText_0x62b26
+PokecomCenterAdminOfficeMobileComputer3:
+	jumptext PokecomCenterAdminOfficeMobileComputer3Text
 
-GoldenrodPokeComCenter2FMobileScientist1Text:
+PokecomCenterAdminOfficeMobileScientist1Text:
 	text "#COM CENTER and"
 	line "MOBILE CENTER were"
 
@@ -120,7 +118,7 @@ GoldenrodPokeComCenter2FMobileScientist1Text:
 	line "strangers."
 	done
 
-GoldenrodPokeComCenter2FMobileScientist2Text:
+PokecomCenterAdminOfficeMobileScientist2Text:
 	text "When you linked"
 	line "with someone by"
 
@@ -137,7 +135,7 @@ GoldenrodPokeComCenter2FMobileScientist2Text:
 	line "got the shakes!"
 	done
 
-GoldenrodPokeComCenter2FMobileScientist3Text:
+PokecomCenterAdminOfficeMobileScientist3Text:
 	text "They were able to"
 	line "build this huge"
 
@@ -146,7 +144,7 @@ GoldenrodPokeComCenter2FMobileScientist3Text:
 	cont "less technology."
 	done
 
-UnknownText_0x627ee:
+PokecomCenterAdminOfficeMobileComputer1Text:
 	text "It's a notice"
 	line "about where MOBILE"
 
@@ -154,7 +152,7 @@ UnknownText_0x627ee:
 	line "used…"
 	done
 
-UnknownText_0x62828:
+PokecomCenterAdminOfficeMobileComputer1Text_PokeComClub:
 	text "There's a #COM"
 	line "CLUB upstairs in"
 
@@ -176,7 +174,7 @@ UnknownText_0x62828:
 	cont "you."
 	done
 
-UnknownText_0x628f4:
+PokecomCenterAdminOfficeMobileComputer1Text_MobileCenter:
 	text "To use the TRADE"
 	line "CORNER or read the"
 
@@ -191,13 +189,13 @@ UnknownText_0x628f4:
 	line "connecting there."
 	done
 
-UnknownText_0x62989:
+PokecomCenterAdminOfficeMobileComputer2Text:
 	text "It's a notice"
 	line "about using the"
 	cont "phone…"
 	done
 
-UnknownText_0x629ae:
+PokecomCenterAdminOfficeMobileComputer2Text_UsePhone:
 	text "Please ensure that"
 	line "your phone and"
 
@@ -213,7 +211,7 @@ UnknownText_0x629ae:
 	cont "while linking."
 	done
 
-UnknownText_0x62a5a:
+PokecomCenterAdminOfficeMobileComputer2Text_DontUsePhone:
 	text "If the server is"
 	line "busy, it may not"
 
@@ -234,7 +232,7 @@ UnknownText_0x62a5a:
 	cont "instructions."
 	done
 
-UnknownText_0x62b26:
+PokecomCenterAdminOfficeMobileComputer3Text:
 	text "The ADMINISTRATION"
 	line "OFFICE received an"
 	cont "e-mail. It says…"
@@ -262,26 +260,21 @@ UnknownText_0x62b26:
 	para "<……> <……> <……>"
 	done
 
-GoldenrodPokeComCenter2FMobile_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 0, 31, 3, GOLDENROD_POKECENTER_1F
-	warp_def 1, 31, 3, GOLDENROD_POKECENTER_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 6, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script
-	bg_event 6, 28, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script
-	bg_event 3, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script
-
-.ObjectEvents:
-	db 3
-	object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1
-	object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1
-	object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1
+PokecomCenterAdminOfficeMobile_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  0, 31, GOLDENROD_POKECENTER_1F, 3
+	warp_event  1, 31, GOLDENROD_POKECENTER_1F, 3
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer1
+	bg_event  6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer2
+	bg_event  3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer3
+
+	db 3 ; object events
+	object_event  4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist1Script, -1
+	object_event  7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist2Script, -1
+	object_event  7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist3Script, -1
diff --git a/maps/GoldenrodPokeComCenter2FMobile.blk b/maps/PokecomCenterAdminOfficeMobile.blk
index d4fd92414..d4fd92414 100644
--- a/maps/GoldenrodPokeComCenter2FMobile.blk
+++ b/maps/PokecomCenterAdminOfficeMobile.blk
diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm
index 0c8bb70ec..004122b69 100644
--- a/maps/PokemonFanClub.asm
+++ b/maps/PokemonFanClub.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const POKEMONFANCLUB_GENTLEMAN
 	const POKEMONFANCLUB_RECEPTIONIST
 	const POKEMONFANCLUB_FISHER
@@ -7,78 +7,76 @@ const_value set 2
 	const POKEMONFANCLUB_ODDISH
 
 PokemonFanClub_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-GentlemanScript_0x1917e9:
+PokemonFanClubPresidentScript:
 	faceplayer
 	opentext
 	checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
-	iftrue UnknownScript_0x191815
+	iftrue .HeardSpeech
 	checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL
-	iftrue UnknownScript_0x191802
+	iftrue .HeardSpeechButBagFull
 	writetext UnknownText_0x191881
 	yesorno
-	iffalse UnknownScript_0x19181b
+	iffalse .NotListening
 	writetext UnknownText_0x191911
 	buttonsound
-UnknownScript_0x191802:
+.HeardSpeechButBagFull:
 	writetext UnknownText_0x191a3d
 	buttonsound
 	verbosegiveitem RARE_CANDY
-	iffalse UnknownScript_0x19181f
+	iffalse .BagFull
 	setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
 	writetext UnknownText_0x191a72
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x191815:
+.HeardSpeech:
 	writetext UnknownText_0x191ae0
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x19181b:
+.NotListening:
 	writetext UnknownText_0x191b38
 	waitbutton
-UnknownScript_0x19181f:
+.BagFull:
 	closetext
 	end
 
 PokemonFanClubReceptionistScript:
 	jumptextfaceplayer PokemonFanClubReceptionistText
 
-FisherScript_0x191824:
+PokemonFanClubClefairyGuyScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
-	iftrue UnknownScript_0x19185f
+	iftrue .GotLostItem
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x191838
+	iftrue .FoundClefairyDoll
 	writetext UnknownText_0x191ba0
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x191838:
+.FoundClefairyDoll:
 	writetext UnknownText_0x191bff
 	checkevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM
-	iftrue UnknownScript_0x191844
+	iftrue .MetCopycat
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x191844:
+.MetCopycat:
 	buttonsound
 	writetext UnknownText_0x191c5a
 	buttonsound
 	waitsfx
 	giveitem LOST_ITEM
-	iffalse UnknownScript_0x191865
+	iffalse .NoRoom
 	disappear POKEMONFANCLUB_FAIRY
 	writetext UnknownText_0x191d0a
 	playsound SFX_KEY_ITEM
@@ -88,13 +86,13 @@ UnknownScript_0x191844:
 	closetext
 	end
 
-UnknownScript_0x19185f:
+.GotLostItem:
 	writetext UnknownText_0x191d1e
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x191865:
+.NoRoom:
 	writetext UnknownText_0x191d58
 	waitbutton
 	closetext
@@ -103,10 +101,10 @@ UnknownScript_0x191865:
 PokemonFanClubTeacherScript:
 	jumptextfaceplayer PokemonFanClubTeacherText
 
-ClefairyDoll:
+PokemonFanClubClefairyDollScript:
 	jumptext ClefairyDollText
 
-FanClubBayleef:
+PokemonFanClubBayleefScript:
 	opentext
 	writetext FanClubBayleefText
 	cry BAYLEEF
@@ -114,11 +112,11 @@ FanClubBayleef:
 	closetext
 	end
 
-MapPokemonFanClubSignpost0Script:
-	jumptext UnknownText_0x191dfc
+PokemonFanClubListenSign:
+	jumptext PokemonFanClubListenSignText
 
-MapPokemonFanClubSignpost1Script:
-	jumptext UnknownText_0x191e29
+PokemonFanClubBraggingSign:
+	jumptext PokemonFanClubBraggingSignText
 
 UnknownText_0x191881:
 	text "I'm the CHAIRMAN"
@@ -285,39 +283,34 @@ FanClubBayleefText:
 	text "BAYLEEF: Li liif!"
 	done
 
-UnknownText_0x191dfc:
+PokemonFanClubListenSignText:
 	text "Let's all listen"
 	line "politely to other"
 	cont "trainers."
 	done
 
-UnknownText_0x191e29:
+PokemonFanClubBraggingSignText:
 	text "If someone brags,"
 	line "brag right back!"
 	done
 
 PokemonFanClub_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 3, VERMILION_CITY
-	warp_def 3, 7, 3, VERMILION_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 7, 0, BGEVENT_READ, MapPokemonFanClubSignpost0Script
-	bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script
-
-.ObjectEvents:
-	db 6
-	object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1
-	object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
-	object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1
-	object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1
-	object_event 2, 4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL
-	object_event 7, 3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, VERMILION_CITY, 3
+	warp_event  3,  7, VERMILION_CITY, 3
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  7,  0, BGEVENT_READ, PokemonFanClubListenSign
+	bg_event  9,  0, BGEVENT_READ, PokemonFanClubBraggingSign
+
+	db 6 ; object events
+	object_event  3,  1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubPresidentScript, -1
+	object_event  4,  1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
+	object_event  2,  3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyGuyScript, -1
+	object_event  7,  2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1
+	object_event  2,  4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyDollScript, EVENT_VERMILION_FAN_CLUB_DOLL
+	object_event  7,  3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubBayleefScript, -1
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index ef855e40e..3678d5dfa 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const POWERPLANT_OFFICER1
 	const POWERPLANT_GYM_GUY1
 	const POWERPLANT_GYM_GUY2
@@ -8,13 +8,11 @@ const_value set 2
 	const POWERPLANT_FOREST
 
 PowerPlant_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_POWERPLANT_NOTHING
+	scene_script .DummyScene1 ; SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -28,106 +26,106 @@ PowerPlantGuardPhoneScript:
 	waitsfx
 	pause 30
 	applymovement POWERPLANT_OFFICER1, MovementData_0x188ed5
-	spriteface POWERPLANT_GYM_GUY1, DOWN
-	spriteface POWERPLANT_GYM_GUY2, DOWN
+	turnobject POWERPLANT_GYM_GUY1, DOWN
+	turnobject POWERPLANT_GYM_GUY2, DOWN
 	opentext
 	writetext UnknownText_0x188f22
 	waitbutton
 	closetext
-	spriteface POWERPLANT_OFFICER1, LEFT
-	spriteface PLAYER, RIGHT
+	turnobject POWERPLANT_OFFICER1, LEFT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x188f7f
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement POWERPLANT_OFFICER1, MovementData_0x188eda
-	setscene 0
+	setscene SCENE_POWERPLANT_NOTHING
 	end
 
-OfficerScript_0x188df5:
+PowerPlantOfficerScript:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x188e0f
+	iftrue .ReturnedMachinePart
 	checkevent EVENT_MET_MANAGER_AT_POWER_PLANT
-	iftrue UnknownScript_0x188e09
+	iftrue .MetManager
 	writetext UnknownText_0x188ee0
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x188e09:
+.MetManager:
 	writetext UnknownText_0x188f7f
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x188e0f:
+.ReturnedMachinePart:
 	writetext UnknownText_0x188fa2
 	waitbutton
 	closetext
 	end
 
-GymGuyScript_0x188e15:
+PowerPlantGymGuy1Script:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x188e23
+	iftrue .ReturnedMachinePart
 	writetext UnknownText_0x188fcf
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x188e23:
+.ReturnedMachinePart:
 	writetext UnknownText_0x189038
 	waitbutton
 	closetext
 	end
 
-GymGuyScript_0x188e29:
+PowerPlantGymGuy2Script:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x188e37
+	iftrue .ReturnedMachinePart
 	writetext UnknownText_0x189079
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x188e37:
+.ReturnedMachinePart:
 	writetext UnknownText_0x1890ef
 	waitbutton
 	closetext
 	end
 
-OfficerScript_0x188e3d:
+PowerPlantGymGuy3Script:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x188e4b
+	iftrue .ReturnedMachinePart
 	writetext UnknownText_0x18910e
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x188e4b:
+.ReturnedMachinePart:
 	writetext UnknownText_0x18917f
 	waitbutton
 	closetext
 	end
 
-GymGuyScript_0x188e51:
+PowerPlantGymGuy4Script:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x188e5f
+	iftrue .ReturnedMachinePart
 	writetext UnknownText_0x1891c2
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x188e5f:
+.ReturnedMachinePart:
 	writetext UnknownText_0x189225
 	waitbutton
 	closetext
@@ -137,28 +135,28 @@ PowerPlantManager:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x188eac
+	iftrue .ReturnedMachinePart
 	checkitem MACHINE_PART
-	iftrue UnknownScript_0x188e93
+	iftrue .FoundMachinePart
 	checkevent EVENT_MET_MANAGER_AT_POWER_PLANT
-	iftrue UnknownScript_0x188e8d
+	iftrue .MetManager
 	writetext UnknownText_0x189264
 	waitbutton
 	closetext
 	setevent EVENT_MET_MANAGER_AT_POWER_PLANT
 	clearevent EVENT_CERULEAN_GYM_ROCKET
 	clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
-	setmapscene CERULEAN_GYM, 1
-	setscene 1
+	setmapscene CERULEAN_GYM, SCENE_CERULEANGYM_GRUNT_RUNS_OUT
+	setscene SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL
 	end
 
-UnknownScript_0x188e8d:
+.MetManager:
 	writetext UnknownText_0x189308
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x188e93:
+.FoundMachinePart:
 	writetext UnknownText_0x18936e
 	buttonsound
 	takeitem MACHINE_PART
@@ -168,21 +166,21 @@ UnknownScript_0x188e93:
 	setevent EVENT_ROUTE_24_ROCKET
 	setevent EVENT_RESTORED_POWER_TO_KANTO
 	clearevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
-UnknownScript_0x188eac:
+.ReturnedMachinePart:
 	checkevent EVENT_GOT_TM07_ZAP_CANNON
-	iftrue UnknownScript_0x188ec5
+	iftrue .GotZapCannon
 	writetext UnknownText_0x1893c4
 	buttonsound
 	verbosegiveitem TM_ZAP_CANNON
-	iffalse UnknownScript_0x188ec3
+	iffalse .NoRoom
 	setevent EVENT_GOT_TM07_ZAP_CANNON
 	writetext UnknownText_0x1893f4
 	waitbutton
-UnknownScript_0x188ec3:
+.NoRoom:
 	closetext
 	end
 
-UnknownScript_0x188ec5:
+.GotZapCannon:
 	writetext UnknownText_0x189475
 	waitbutton
 	closetext
@@ -191,7 +189,7 @@ UnknownScript_0x188ec5:
 Forest:
 	faceplayer
 	opentext
-	trade NPCTRADE_FOREST
+	trade NPC_TRADE_FOREST
 	waitbutton
 	closetext
 	end
@@ -389,29 +387,24 @@ UnknownText_0x189475:
 	done
 
 PowerPlant_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 17, 2, ROUTE_10_NORTH
-	warp_def 3, 17, 2, ROUTE_10_NORTH
-
-.CoordEvents:
-	db 1
-	coord_event 5, 12, 1, PowerPlantGuardPhoneScript
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf
-	bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf
-
-.ObjectEvents:
-	db 7
-	object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1
-	object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1
-	object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1
-	object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1
-	object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2, 17, ROUTE_10_NORTH, 2
+	warp_event  3, 17, ROUTE_10_NORTH, 2
+
+	db 1 ; coord events
+	coord_event  5, 12, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL, PowerPlantGuardPhoneScript
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, PowerPlantBookshelf
+	bg_event  1,  1, BGEVENT_READ, PowerPlantBookshelf
+
+	db 7 ; object events
+	object_event  4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficerScript, -1
+	object_event  2,  9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy1Script, -1
+	object_event  6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy2Script, -1
+	object_event  9,  3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy3Script, -1
+	object_event  7,  2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy4Script, -1
 	object_event 14, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1
-	object_event 5, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1
+	object_event  5,  5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index d17798f1f..8107ee022 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RADIOTOWER1F_RECEPTIONIST
 	const RADIOTOWER1F_LASS
 	const RADIOTOWER1F_YOUNGSTER
@@ -7,38 +7,36 @@ const_value set 2
 	const RADIOTOWER1F_COOLTRAINER_F
 
 RadioTower1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ReceptionistScript_0x5cd29:
+RadioTower1FReceptionistScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
-	iftrue UnknownScript_0x5cd37
+	iftrue .Rockets
 	writetext UnknownText_0x5ce77
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5cd37:
+.Rockets:
 	writetext UnknownText_0x5ce81
 	waitbutton
 	closetext
 	end
 
-GentlemanScript_0x5cd3d:
+RadioTower1FLuckyNumberManScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x5ceba
 	buttonsound
-	special Special_CheckLuckyNumberShowFlag
+	special CheckLuckyNumberShowFlag
 	iffalse .skip
-	special Special_ResetLuckyNumberShowFlag
+	special ResetLuckyNumberShowFlag
 .skip
-	special Special_PrintTodaysLuckyNumber
+	special PrintTodaysLuckyNumber
 	checkflag ENGINE_LUCKY_NUMBER_SHOW
 	iftrue .GameOver
 	writetext UnknownText_0x5cf3a
@@ -53,13 +51,13 @@ GentlemanScript_0x5cd3d:
 	playsound SFX_DEX_FANFARE_20_49
 	waitsfx
 	buttonsound
-	special Special_CheckForLuckyNumberWinners
+	special CheckForLuckyNumberWinners
 	closetext
 	applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74
 	opentext
-	if_equal 1, .FirstPlace
-	if_equal 2, .SecondPlace
-	if_equal 3, .ThirdPlace
+	ifequal 1, .FirstPlace
+	ifequal 2, .SecondPlace
+	ifequal 3, .ThirdPlace
 	jump .NoPrize
 
 .GameOver:
@@ -113,67 +111,67 @@ GentlemanScript_0x5cd3d:
 	closetext
 	end
 
-CooltrainerFScript_0x5cdd5:
+RadioTower1FRadioCardWomanScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_RADIO_CARD
-	iftrue UnknownScript_0x5ce2d
+	iftrue .GotCard
 	writetext UnknownText_0x5d12d
 	yesorno
-	iffalse UnknownScript_0x5ce4b
+	iffalse .NoQuiz
 	writetext UnknownText_0x5d1f2
 	yesorno
-	iffalse UnknownScript_0x5ce42
+	iffalse .WrongAnswer
 	playsound SFX_ELEVATOR_END
 	waitsfx
 	writetext UnknownText_0x5d231
 	yesorno
-	iffalse UnknownScript_0x5ce42
+	iffalse .WrongAnswer
 	playsound SFX_ELEVATOR_END
 	waitsfx
 	writetext UnknownText_0x5d282
 	yesorno
-	iftrue UnknownScript_0x5ce42
+	iftrue .WrongAnswer
 	playsound SFX_ELEVATOR_END
 	waitsfx
 	writetext UnknownText_0x5d2bc
 	yesorno
-	iffalse UnknownScript_0x5ce42
+	iffalse .WrongAnswer
 	playsound SFX_ELEVATOR_END
 	waitsfx
 	writetext UnknownText_0x5d30e
 	yesorno
-	iftrue UnknownScript_0x5ce42
+	iftrue .WrongAnswer
 	playsound SFX_ELEVATOR_END
 	waitsfx
 	writetext UnknownText_0x5d37b
 	buttonsound
-	stringtotext RadioCardText, MEM_BUFFER_1
-	scall UnknownScript_0x5ce3e
+	stringtotext .RadioCardText, MEM_BUFFER_1
+	scall .ReceiveItem
 	writetext UnknownText_0x5d3c0
 	buttonsound
 	setflag ENGINE_RADIO_CARD
-UnknownScript_0x5ce2d:
+.GotCard:
 	writetext UnknownText_0x5d3e5
 	waitbutton
 	closetext
 	end
 
-RadioCardText:
+.RadioCardText:
 	db "RADIO CARD@"
 
-UnknownScript_0x5ce3e:
+.ReceiveItem:
 	jumpstd receiveitem
 	end
 
-UnknownScript_0x5ce42:
+.WrongAnswer:
 	playsound SFX_WRONG
 	writetext UnknownText_0x5d409
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5ce4b:
+.NoQuiz:
 	writetext UnknownText_0x5d443
 	waitbutton
 	closetext
@@ -186,21 +184,21 @@ RadioTower1FYoungsterScript:
 	jumptextfaceplayer RadioTower1FYoungsterText
 
 TrainerGruntM3:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_3, EVENT_BEAT_ROCKET_GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM3AfterBattleText
 	waitbutton
 	closetext
 	end
 
-MapRadioTower1FSignpost0Script:
-	jumptext UnknownText_0x5d5e7
+RadioTower1FDirectory:
+	jumptext RadioTower1FDirectoryText
 
-MapRadioTower1FSignpost1Script:
-	jumptext UnknownText_0x5d631
+RadioTower1FLuckyChannelSign:
+	jumptext RadioTower1FLuckyChannelSignText
 
 MovementData_0x5ce71:
 	step RIGHT
@@ -450,7 +448,7 @@ GruntM3AfterBattleText:
 	cont "warn the others…"
 	done
 
-UnknownText_0x5d5e7:
+RadioTower1FDirectoryText:
 	text "1F RECEPTION"
 	line "2F SALES"
 
@@ -461,7 +459,7 @@ UnknownText_0x5d5e7:
 	line "   OFFICE"
 	done
 
-UnknownText_0x5d631:
+RadioTower1FLuckyChannelSignText:
 	text "LUCKY CHANNEL!"
 
 	para "Win with #MON"
@@ -473,28 +471,23 @@ UnknownText_0x5d631:
 	done
 
 RadioTower1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 2, 7, 11, GOLDENROD_CITY
-	warp_def 3, 7, 11, GOLDENROD_CITY
-	warp_def 15, 0, 2, RADIO_TOWER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 0, BGEVENT_READ, MapRadioTower1FSignpost0Script
-	bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script
-
-.ObjectEvents:
-	db 6
-	object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1
-	object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 12, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  2,  7, GOLDENROD_CITY, 11
+	warp_event  3,  7, GOLDENROD_CITY, 11
+	warp_event 15,  0, RADIO_TOWER_2F, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3,  0, BGEVENT_READ, RadioTower1FDirectory
+	bg_event 13,  0, BGEVENT_READ, RadioTower1FLuckyChannelSign
+
+	db 6 ; object events
+	object_event  5,  6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FReceptionistScript, -1
+	object_event 16,  4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 15,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 14,  1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  8,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FLuckyNumberManScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 12,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower1FRadioCardWomanScript, EVENT_GOLDENROD_CITY_CIVILIANS
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 99f4dbe4c..036a19dd5 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RADIOTOWER2F_SUPER_NERD
 	const RADIOTOWER2F_TEACHER
 	const RADIOTOWER2F_ROCKET1
@@ -12,30 +12,29 @@ const_value set 2
 	const RADIOTOWER2F_RECEPTIONIST
 
 RadioTower2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-UnknownScript_0x5d6fd:
+RadioTower2FUnusedDummyScene:
+; unused
 	end
 
 RadioTower2FSuperNerdScript:
 	jumptextfaceplayer RadioTower2FSuperNerdText
 
-TeacherScript_0x5d701:
+RadioTower2FTeacherScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
 	iftrue .Rockets
-	writetext UnknownText_0x5d956
+	writetext RadioTower2FTeacherText
 	waitbutton
 	closetext
 	end
 
 .Rockets:
-	writetext UnknownText_0x5d983
+	writetext RadioTower2FTeacherText_Rockets
 	waitbutton
 	closetext
 	end
@@ -55,10 +54,10 @@ RadioTower2FBlackBelt2Script:
 	jumptextfaceplayer RadioTower2FBlackBelt2Text
 
 TrainerGruntM4:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_4, EVENT_BEAT_ROCKET_GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM4AfterBattleText
 	waitbutton
@@ -66,10 +65,10 @@ TrainerGruntM4:
 	end
 
 TrainerGruntM5:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_5, EVENT_BEAT_ROCKET_GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM5AfterBattleText
 	waitbutton
@@ -77,10 +76,10 @@ TrainerGruntM5:
 	end
 
 TrainerGruntM6:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_6, EVENT_BEAT_ROCKET_GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM6AfterBattleText
 	waitbutton
@@ -88,10 +87,10 @@ TrainerGruntM6:
 	end
 
 TrainerGruntF2:
-	trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script
+	trainer GRUNTF, GRUNTF_2, EVENT_BEAT_ROCKET_GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntF2AfterBattleText
 	waitbutton
@@ -102,41 +101,41 @@ Buena:
 	faceplayer
 	opentext
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
-	iftrue UnknownScript_0x5d865
+	iftrue .MidRocketTakeover
 	checkevent EVENT_MET_BUENA
-	iffalse UnknownScript_0x5d800
+	iffalse .Introduction
 	checkflag ENGINE_BUENAS_PASSWORD_2
-	iftrue UnknownScript_0x5d82f
+	iftrue .PlayedAlready
 	checkcode VAR_HOUR
-	if_less_than 18, UnknownScript_0x5d893
+	ifless 18, .TooEarly
 	checkflag ENGINE_BUENAS_PASSWORD
-	iffalse UnknownScript_0x5d80a
+	iffalse .TuneIn
 	checkitem BLUE_CARD
-	iffalse UnknownScript_0x5d86b
+	iffalse .NoBlueCard
 	checkcode VAR_BLUECARDBALANCE
-	if_equal 30, UnknownScript_0x5d87f
+	ifequal 30, .BlueCardCapped0
 	playmusic MUSIC_BUENAS_PASSWORD
 	writetext UnknownText_0x5de35
-	special Special_AskRememberPassword
-	iffalse UnknownScript_0x5d81e
+	special AskRememberPassword
+	iffalse .ForgotPassword
 	writetext UnknownText_0x5de84
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	checkcode VAR_FACING
-	if_not_equal RIGHT, UnknownScript_0x5d7be
+	ifnotequal RIGHT, .DontNeedToMove
 	applymovement PLAYER, MovementData_0x5d921
-UnknownScript_0x5d7be:
-	spriteface PLAYER, RIGHT
+.DontNeedToMove:
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x5dedd
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, DOWN
+	turnobject RADIOTOWER2F_BUENA, DOWN
 	refreshscreen
-	special Special_BuenasPassword
+	special BuenasPassword
 	closetext
-	iffalse UnknownScript_0x5d845
+	iffalse .WrongAnswer
 	opentext
 	writetext UnknownText_0x5dfc1
 	waitbutton
@@ -148,141 +147,141 @@ UnknownScript_0x5d7be:
 	playsound SFX_TRANSACTION
 	setflag ENGINE_BUENAS_PASSWORD_2
 	pause 20
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	opentext
 	writetext UnknownText_0x5e054
 	waitbutton
 	closetext
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 20
 	special RestartMapMusic
 	checkcode VAR_BLUECARDBALANCE
-	if_equal 30, UnknownScript_0x5d8a4
+	ifequal 30, .BlueCardCapped1
 	end
 
-UnknownScript_0x5d800:
+.Introduction:
 	writetext UnknownText_0x5dcf4
 	buttonsound
 	setevent EVENT_MET_BUENA
 	verbosegiveitem BLUE_CARD
-UnknownScript_0x5d80a:
+.TuneIn:
 	writetext UnknownText_0x5de10
 	waitbutton
 	closetext
 	checkcellnum PHONE_BUENA
-	iftrue UnknownScript_0x5d81a
+	iftrue .Registered0
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
-	iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d81a:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	iftrue .OfferedNumberBefore
+.Registered0:
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	end
 
-UnknownScript_0x5d81e:
+.ForgotPassword:
 	writetext UnknownText_0x5df29
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
-	special Special_FadeOutMusic
+	turnobject RADIOTOWER2F_BUENA, RIGHT
+	special FadeOutMusic
 	pause 20
 	special RestartMapMusic
 	end
 
-UnknownScript_0x5d82f:
+.PlayedAlready:
 	writetext UnknownText_0x5df6c
 	waitbutton
 	closetext
 	checkcellnum PHONE_BUENA
-	iftrue UnknownScript_0x5d83f
+	iftrue .Registered1
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
-	iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d83f:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	iftrue .OfferedNumberBefore
+.Registered1:
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	pause 10
 	end
 
-UnknownScript_0x5d845:
+.WrongAnswer:
 	setflag ENGINE_BUENAS_PASSWORD_2
 	opentext
 	writetext UnknownText_0x5e01c
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	pause 20
 	opentext
 	writetext UnknownText_0x5e054
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
-	special Special_FadeOutMusic
+	turnobject RADIOTOWER2F_BUENA, RIGHT
+	special FadeOutMusic
 	pause 20
 	special RestartMapMusic
 	end
 
-UnknownScript_0x5d865:
+.MidRocketTakeover:
 	writetext UnknownText_0x5e0c2
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5d86b:
+.NoBlueCard:
 	writetext UnknownText_0x5e192
 	waitbutton
 	closetext
 	checkcellnum PHONE_BUENA
-	iftrue UnknownScript_0x5d87b
+	iftrue .Registered2
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
-	iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d87b:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	iftrue .OfferedNumberBefore
+.Registered2:
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	end
 
-UnknownScript_0x5d87f:
+.BlueCardCapped0:
 	writetext UnknownText_0x5e0f1
 	waitbutton
 	closetext
 	checkcellnum PHONE_BUENA
-	iftrue UnknownScript_0x5d88f
+	iftrue .Registered3
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
-	iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d88f:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	iftrue .OfferedNumberBefore
+.Registered3:
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	end
 
-UnknownScript_0x5d893:
+.TooEarly:
 	writetext UnknownText_0x5e131
 	waitbutton
 	closetext
 	checkcellnum PHONE_BUENA
-	iftrue UnknownScript_0x5d8a3
+	iftrue .Registered4
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
-	iftrue UnknownScript_0x5d8cc
-UnknownScript_0x5d8a3:
+	iftrue .OfferedNumberBefore
+.Registered4:
 	end
 
-UnknownScript_0x5d8a4:
+.BlueCardCapped1:
 	checkcellnum PHONE_BUENA
-	iftrue UnknownScript_0x5d8fe
+	iftrue .HasNumber
 	pause 20
-	spriteface RADIOTOWER2F_BUENA, DOWN
+	turnobject RADIOTOWER2F_BUENA, DOWN
 	pause 15
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 15
 	checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
-	iftrue UnknownScript_0x5d8cc
+	iftrue .OfferedNumberBefore
 	showemote EMOTE_SHOCK, RADIOTOWER2F_BUENA, 15
 	setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
 	opentext
 	writetext UnknownText_0x5e1ee
-	jump UnknownScript_0x5d8d0
+	jump .AskForNumber
 
-UnknownScript_0x5d8cc:
+.OfferedNumberBefore:
 	opentext
 	writetext UnknownText_0x5e2bf
-UnknownScript_0x5d8d0:
+.AskForNumber:
 	askforphonenumber PHONE_BUENA
-	if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6
-	if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	writetext UnknownText_0x5e2f3
 	playsound SFX_REGISTER_PHONE_NUMBER
 	waitsfx
@@ -290,50 +289,50 @@ UnknownScript_0x5d8d0:
 	writetext UnknownText_0x5e310
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	addcellnum PHONE_BUENA
 	end
 
-UnknownScript_0x5d8ed:
+.NumberDeclined:
 	writetext UnknownText_0x5e33c
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	turnobject RADIOTOWER2F_BUENA, RIGHT
 	end
 
-UnknownScript_0x5d8f6:
+.PhoneFull:
 	writetext UnknownText_0x5e35e
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
-UnknownScript_0x5d8fe:
+	turnobject RADIOTOWER2F_BUENA, RIGHT
+.HasNumber:
 	end
 
-ReceptionistScript_0x5d8ff:
+RadioTowerBuenaPrizeReceptionist:
 	faceplayer
 	opentext
 	checkitem BLUE_CARD
-	iffalse UnknownScript_0x5d90f
+	iffalse .NoCard
 	writetext UnknownText_0x5e392
 	buttonsound
-	special Special_BuenaPrize
+	special BuenaPrize
 	closetext
 	end
 
-UnknownScript_0x5d90f:
+.NoCard:
 	writetext UnknownText_0x5e3d8
 	buttonsound
 	closetext
 	end
 
-MapRadioTower2FSignpost0Script:
-	jumptext UnknownText_0x5e426
+RadioTower2FSalesSign:
+	jumptext RadioTower2FSalesSignText
 
-MapRadioTower2FSignpost1Script:
-	jumptext UnknownText_0x5e430
+RadioTower2FOaksPKMNTalkSign:
+	jumptext RadioTower2FOaksPKMNTalkSignText
 
-MapRadioTower2FSignpost5Script:
-	jumptext UnknownText_0x5e463
+RadioTower2FPokemonRadioSign:
+	jumptext RadioTower2FPokemonRadioSignText
 
 RadioTower2FBookshelf:
 	jumpstd magazinebookshelf
@@ -349,13 +348,13 @@ RadioTower2FSuperNerdText:
 	cont "where. Tune in!"
 	done
 
-UnknownText_0x5d956:
+RadioTower2FTeacherText:
 	text "Lullabies on the"
 	line "radio may make"
 	cont "#MON sleep."
 	done
 
-UnknownText_0x5d983:
+RadioTower2FTeacherText_Rockets:
 	text "Why would they"
 	line "want to take over"
 	cont "the RADIO TOWER?"
@@ -693,11 +692,11 @@ UnknownText_0x5e3d8:
 	line "BLUE CARD!"
 	done
 
-UnknownText_0x5e426:
+RadioTower2FSalesSignText:
 	text "2F SALES"
 	done
 
-UnknownText_0x5e430:
+RadioTower2FOaksPKMNTalkSignText:
 	text "PROF.OAK'S #MON"
 	line "TALK"
 
@@ -705,42 +704,37 @@ UnknownText_0x5e430:
 	line "on the Air!"
 	done
 
-UnknownText_0x5e463:
+RadioTower2FPokemonRadioSignText:
 	text "Anywhere, Anytime"
 	line "#MON Radio"
 	done
 
 RadioTower2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 0, 0, 1, RADIO_TOWER_3F
-	warp_def 15, 0, 3, RADIO_TOWER_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 6
-	bg_event 3, 0, BGEVENT_READ, MapRadioTower2FSignpost0Script
-	bg_event 5, 0, BGEVENT_READ, MapRadioTower2FSignpost1Script
-	bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf
-	bg_event 10, 1, BGEVENT_READ, RadioTower2FBookshelf
-	bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf
-	bg_event 13, 0, BGEVENT_READ, MapRadioTower2FSignpost5Script
-
-.ObjectEvents:
-	db 11
-	object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS
-	object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1
-	object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 8, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 10, 5, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 0, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
-	object_event 1, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event 12, 1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1
-	object_event 14, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1
-	object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  0,  0, RADIO_TOWER_3F, 1
+	warp_event 15,  0, RADIO_TOWER_1F, 3
+
+	db 0 ; coord events
+
+	db 6 ; bg events
+	bg_event  3,  0, BGEVENT_READ, RadioTower2FSalesSign
+	bg_event  5,  0, BGEVENT_READ, RadioTower2FOaksPKMNTalkSign
+	bg_event  9,  1, BGEVENT_READ, RadioTower2FBookshelf
+	bg_event 10,  1, BGEVENT_READ, RadioTower2FBookshelf
+	bg_event 11,  1, BGEVENT_READ, RadioTower2FBookshelf
+	bg_event 13,  0, BGEVENT_READ, RadioTower2FPokemonRadioSign
+
+	db 11 ; object events
+	object_event  6,  6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS
+	object_event 17,  2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower2FTeacherScript, -1
+	object_event  1,  4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  8,  4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  4,  1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 10,  5, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  0,  1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
+	object_event  1,  1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event 12,  1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1
+	object_event 14,  5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1
+	object_event 12,  7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTowerBuenaPrizeReceptionist, EVENT_GOLDENROD_CITY_CIVILIANS
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index 0efc9e2db..367223ce4 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RADIOTOWER3F_SUPER_NERD
 	const RADIOTOWER3F_GYM_GUY
 	const RADIOTOWER3F_COOLTRAINER_F
@@ -8,11 +8,9 @@ const_value set 2
 	const RADIOTOWER3F_SCIENTIST
 
 RadioTower3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .CardKeyShutterCallback
 
 .CardKeyShutterCallback:
@@ -28,65 +26,65 @@ RadioTower3F_MapScripts:
 RadioTower3FSuperNerdScript:
 	jumptextfaceplayer RadioTower3FSuperNerdText
 
-GymGuyScript_0x5e556:
+RadioTower3FGymGuyScript:
 	faceplayer
 	opentext
 	checkevent EVENT_CLEARED_RADIO_TOWER
-	iftrue UnknownScript_0x5e564
-	writetext UnknownText_0x5e682
+	iftrue .NoRockets
+	writetext RadioTower3FGymGuyText_Rockets
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5e564:
-	writetext UnknownText_0x5e6eb
+.NoRockets:
+	writetext RadioTower3FGymGuyText
 	waitbutton
 	closetext
 	end
 
-CooltrainerFScript_0x5e56a:
+RadioTower3FCooltrainerFScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
-	iftrue UnknownScript_0x5e59d
+	iftrue .GotSunnyDay
 	checkevent EVENT_CLEARED_RADIO_TOWER
-	iftrue UnknownScript_0x5e58a
+	iftrue .NoRockets
 	checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
-	iftrue UnknownScript_0x5e584
+	iftrue .UsedCardKey
 	writetext UnknownText_0x5e754
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5e584:
+.UsedCardKey:
 	writetext UnknownText_0x5e7cb
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5e58a:
+.NoRockets:
 	writetext UnknownText_0x5e7e2
 	buttonsound
 	verbosegiveitem TM_SUNNY_DAY
-	iffalse UnknownScript_0x5e5a1
+	iffalse .NoRoom
 	writetext UnknownText_0x5e821
 	waitbutton
 	closetext
 	setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
 	end
 
-UnknownScript_0x5e59d:
+.GotSunnyDay:
 	writetext UnknownText_0x5e85c
 	waitbutton
-UnknownScript_0x5e5a1:
+.NoRoom:
 	closetext
 	end
 
 TrainerGruntM7:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_7, EVENT_BEAT_ROCKET_GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM7AfterBattleText
 	waitbutton
@@ -94,10 +92,10 @@ TrainerGruntM7:
 	end
 
 TrainerGruntM8:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_8, EVENT_BEAT_ROCKET_GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM8AfterBattleText
 	waitbutton
@@ -105,10 +103,10 @@ TrainerGruntM8:
 	end
 
 TrainerGruntM9:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_9, EVENT_BEAT_ROCKET_GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM9AfterBattleText
 	waitbutton
@@ -116,30 +114,30 @@ TrainerGruntM9:
 	end
 
 TrainerScientistMarc:
-	trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script
+	trainer SCIENTIST, MARC, EVENT_BEAT_SCIENTIST_MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext ScientistMarcAfterBattleText
 	waitbutton
 	closetext
 	end
 
-MapRadioTower3FSignpost2Script::
+CardKeySlotScript::
 	opentext
-	writetext UnknownText_0x5eaa4
+	writetext RadioTower3FCardKeySlotText
 	waitbutton
 	checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
-	iftrue UnknownScript_0x5e603
+	iftrue .UsedCardKey
 	checkitem CARD_KEY
-	iftrue UnknownScript_0x5e605
-UnknownScript_0x5e603:
+	iftrue .HaveCardKey
+.UsedCardKey:
 	closetext
 	end
 
-UnknownScript_0x5e605:
-	writetext UnknownText_0x5eabc
+.HaveCardKey:
+	writetext InsertedTheCardKeyText
 	waitbutton
 	setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	playsound SFX_ENTER_DOOR
@@ -150,11 +148,11 @@ UnknownScript_0x5e605:
 	waitsfx
 	end
 
-MapRadioTower3FSignpost0Script:
-	jumptext UnknownText_0x5ead6
+RadioTower3FPersonnelSign:
+	jumptext RadioTower3FPersonnelSignText
 
-MapRadioTower3FSignpost1Script:
-	jumptext UnknownText_0x5eae4
+RadioTower3FPokemonMusicSign:
+	jumptext RadioTower3FPokemonMusicSignText
 
 RadioTower3FSuperNerdText:
 	text "We have recordings"
@@ -167,7 +165,7 @@ RadioTower3FSuperNerdText:
 	line "200 kinds."
 	done
 
-UnknownText_0x5e682:
+RadioTower3FGymGuyText_Rockets:
 	text "To trainers, #-"
 	line "MON are their"
 	cont "beloved partners."
@@ -179,7 +177,7 @@ UnknownText_0x5e682:
 	line "#MON."
 	done
 
-UnknownText_0x5e6eb:
+RadioTower3FGymGuyText:
 	text "We run 24 hours a"
 	line "day to broadcast"
 
@@ -309,50 +307,45 @@ ScientistMarcAfterBattleText:
 	cont "I need from here."
 	done
 
-UnknownText_0x5eaa4:
+RadioTower3FCardKeySlotText:
 	text "It's the CARD KEY"
 	line "slot."
 	done
 
-UnknownText_0x5eabc:
+InsertedTheCardKeyText:
 	text "<PLAYER> inserted"
 	line "the CARD KEY."
 	done
 
-UnknownText_0x5ead6:
+RadioTower3FPersonnelSignText:
 	text "3F PERSONNEL"
 	done
 
-UnknownText_0x5eae4:
+RadioTower3FPokemonMusicSignText:
 	text "#MON MUSIC with"
 	line "Host DJ BEN"
 	done
 
 RadioTower3F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 0, 0, 1, RADIO_TOWER_2F
-	warp_def 7, 0, 2, RADIO_TOWER_4F
-	warp_def 17, 0, 4, RADIO_TOWER_4F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 3, 0, BGEVENT_READ, MapRadioTower3FSignpost0Script
-	bg_event 9, 0, BGEVENT_READ, MapRadioTower3FSignpost1Script
-	bg_event 14, 2, BGEVENT_UP, MapRadioTower3FSignpost2Script
-
-.ObjectEvents:
-	db 7
-	object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1
-	object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1
-	object_event 5, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 6, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 16, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 9, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  0,  0, RADIO_TOWER_2F, 1
+	warp_event  7,  0, RADIO_TOWER_4F, 2
+	warp_event 17,  0, RADIO_TOWER_4F, 4
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  3,  0, BGEVENT_READ, RadioTower3FPersonnelSign
+	bg_event  9,  0, BGEVENT_READ, RadioTower3FPokemonMusicSign
+	bg_event 14,  2, BGEVENT_UP, CardKeySlotScript
+
+	db 7 ; object events
+	object_event  7,  4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event  3,  4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower3FGymGuyScript, -1
+	object_event 11,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower3FCooltrainerFScript, -1
+	object_event  5,  1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  6,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 16,  6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  9,  6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm
index 99815f819..87efe0b23 100644
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RADIOTOWER4F_FISHER
 	const RADIOTOWER4F_TEACHER
 	const RADIOTOWER4F_GROWLITHE
@@ -8,42 +8,40 @@ const_value set 2
 	const RADIOTOWER4F_SCIENTIST
 
 RadioTower4F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RadioTower4FFisherScript:
 	jumptextfaceplayer RadioTower4FFisherText
 
-TeacherScript_0x5eb85:
+RadioTower4FDJMaryScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_PINK_BOW_FROM_MARY
-	iftrue UnknownScript_0x5ebac
+	iftrue .GotPinkBow
 	checkevent EVENT_CLEARED_RADIO_TOWER
-	iftrue UnknownScript_0x5eb99
-	writetext UnknownText_0x5ec68
+	iftrue .ClearedRockets
+	writetext RadioTower4FDJMaryText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5eb99:
-	writetext UnknownText_0x5ecab
+.ClearedRockets:
+	writetext RadioTower4FDJMaryText_ClearedRockets
 	buttonsound
 	verbosegiveitem PINK_BOW
-	iffalse UnknownScript_0x5ebb0
-	writetext UnknownText_0x5ecef
+	iffalse .NoRoom
+	writetext RadioTower4FDJMaryText_GivePinkBow
 	waitbutton
 	closetext
 	setevent EVENT_GOT_PINK_BOW_FROM_MARY
 	end
 
-UnknownScript_0x5ebac:
-	writetext UnknownText_0x5ed2c
+.GotPinkBow:
+	writetext RadioTower4FDJMaryText_After
 	waitbutton
-UnknownScript_0x5ebb0:
+.NoRoom:
 	closetext
 	end
 
@@ -56,10 +54,10 @@ RadioTowerMeowth:
 	end
 
 TrainerGruntM10:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_10, EVENT_BEAT_ROCKET_GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM10AfterBattleText
 	waitbutton
@@ -67,10 +65,10 @@ TrainerGruntM10:
 	end
 
 TrainerExecutivem2:
-	trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script
+	trainer EXECUTIVEM, EXECUTIVEM_2, EVENT_BEAT_ROCKET_EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext Executivem2AfterBattleText
 	waitbutton
@@ -78,10 +76,10 @@ TrainerExecutivem2:
 	end
 
 TrainerGruntF4:
-	trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script
+	trainer GRUNTF, GRUNTF_4, EVENT_BEAT_ROCKET_GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntF4AfterBattleText
 	waitbutton
@@ -89,21 +87,21 @@ TrainerGruntF4:
 	end
 
 TrainerScientistRich:
-	trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script
+	trainer SCIENTIST, RICH, EVENT_BEAT_SCIENTIST_RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext ScientistRichAfterBattleText
 	waitbutton
 	closetext
 	end
 
-MapRadioTower4FSignpost0Script:
-	jumptext UnknownText_0x5effe
+RadioTower4FProductionSign:
+	jumptext RadioTower4FProductionSignText
 
-MapRadioTower4FSignpost1Script:
-	jumptext UnknownText_0x5f00d
+RadioTower4FStudio2Sign:
+	jumptext RadioTower4FStudio2SignText
 
 RadioTower4FFisherText:
 	text "I listened to the"
@@ -114,7 +112,7 @@ RadioTower4FFisherText:
 	line "broadcast there."
 	done
 
-UnknownText_0x5ec68:
+RadioTower4FDJMaryText:
 	text "MARY: Why? Why do"
 	line "I have to suffer"
 	cont "through this?"
@@ -122,7 +120,7 @@ UnknownText_0x5ec68:
 	para "MEOWTH, help me!"
 	done
 
-UnknownText_0x5ecab:
+RadioTower4FDJMaryText_ClearedRockets:
 	text "MARY: Oh! You're"
 	line "my little savior!"
 
@@ -130,7 +128,7 @@ UnknownText_0x5ecab:
 	line "as my thanks?"
 	done
 
-UnknownText_0x5ecef:
+RadioTower4FDJMaryText_GivePinkBow:
 	text "MARY: It's just"
 	line "right for #MON"
 
@@ -138,7 +136,7 @@ UnknownText_0x5ecef:
 	line "type moves."
 	done
 
-UnknownText_0x5ed2c:
+RadioTower4FDJMaryText_After:
 	text "MARY: Please tune"
 	line "into me on PROF."
 
@@ -237,39 +235,34 @@ ScientistRichAfterBattleText:
 	cont "stop TEAM ROCKET?"
 	done
 
-UnknownText_0x5effe:
+RadioTower4FProductionSignText:
 	text "4F PRODUCTION"
 	done
 
-UnknownText_0x5f00d:
+RadioTower4FStudio2SignText:
 	text "4F STUDIO 2"
 	done
 
 RadioTower4F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 0, 0, 1, RADIO_TOWER_5F
-	warp_def 9, 0, 2, RADIO_TOWER_3F
-	warp_def 12, 0, 2, RADIO_TOWER_5F
-	warp_def 17, 0, 3, RADIO_TOWER_3F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 7, 0, BGEVENT_READ, MapRadioTower4FSignpost0Script
-	bg_event 15, 0, BGEVENT_READ, MapRadioTower4FSignpost1Script
-
-.ObjectEvents:
-	db 7
-	object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1
-	object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1
-	object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 12, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 4, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  0,  0, RADIO_TOWER_5F, 1
+	warp_event  9,  0, RADIO_TOWER_3F, 2
+	warp_event 12,  0, RADIO_TOWER_5F, 2
+	warp_event 17,  0, RADIO_TOWER_3F, 3
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  7,  0, BGEVENT_READ, RadioTower4FProductionSign
+	bg_event 15,  0, BGEVENT_READ, RadioTower4FStudio2Sign
+
+	db 7 ; object events
+	object_event  6,  4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event 14,  6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower4FDJMaryScript, -1
+	object_event 12,  7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1
+	object_event  5,  6, SPRITE_ROCKET, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 14,  1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 12,  4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event  4,  2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 009c1e91d..b89ab315c 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RADIOTOWER5F_DIRECTOR
 	const RADIOTOWER5F_ROCKET
 	const RADIOTOWER5F_ROCKET_GIRL
@@ -6,14 +6,12 @@ const_value set 2
 	const RADIOTOWER5F_POKE_BALL
 
 RadioTower5F_MapScripts:
-.SceneScripts:
-	db 3
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .DummyScene2
+	db 3 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_RADIOTOWER5F_ROCKET_BOSS
+	scene_script .DummyScene2 ; SCENE_RADIOTOWER5F_NOTHING
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -25,7 +23,7 @@ RadioTower5F_MapScripts:
 	end
 
 FakeDirectorScript:
-	spriteface RADIOTOWER5F_DIRECTOR, UP
+	turnobject RADIOTOWER5F_DIRECTOR, UP
 	showemote EMOTE_SHOCK, RADIOTOWER5F_DIRECTOR, 15
 	opentext
 	writetext FakeDirectorTextBefore1
@@ -47,7 +45,7 @@ FakeDirectorScript:
 	buttonsound
 	verbosegiveitem BASEMENT_KEY
 	closetext
-	setscene 1
+	setscene SCENE_RADIOTOWER5F_ROCKET_BOSS
 	setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3
 	end
 
@@ -68,10 +66,10 @@ Director:
 	end
 
 TrainerExecutivef1:
-	trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script
+	trainer EXECUTIVEF, EXECUTIVEF_1, EVENT_BEAT_ROCKET_EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext Executivef1AfterBattleText
 	waitbutton
@@ -79,9 +77,9 @@ TrainerExecutivef1:
 	end
 
 RadioTower5FRocketBossScene:
-	applymovement PLAYER, MovementData_0x60125
+	applymovement PLAYER, RadioTower5FPlayerTwoStepsLeftMovement
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface RADIOTOWER5F_ROCKET, RIGHT
+	turnobject RADIOTOWER5F_ROCKET, RIGHT
 	opentext
 	writetext RadioTower5FRocketBossBeforeText
 	waitbutton
@@ -95,12 +93,12 @@ RadioTower5FRocketBossScene:
 	writetext RadioTower5FRocketBossAfterText
 	waitbutton
 	closetext
-	special Special_FadeBlackQuickly
+	special FadeBlackQuickly
 	special ReloadSpritesNoPalettes
 	disappear RADIOTOWER5F_ROCKET
 	disappear RADIOTOWER5F_ROCKET_GIRL
 	pause 15
-	special Special_FadeInQuickly
+	special FadeInQuickly
 	setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1
 	setevent EVENT_CLEARED_RADIO_TOWER
 	clearflag ENGINE_ROCKETS_IN_RADIO_TOWER
@@ -118,7 +116,7 @@ RadioTower5FRocketBossScene:
 	moveobject RADIOTOWER5F_DIRECTOR, 12, 0
 	appear RADIOTOWER5F_DIRECTOR
 	applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext RadioTower5FDirectorThankYouText
 	buttonsound
@@ -126,8 +124,8 @@ RadioTower5FRocketBossScene:
 	writetext RadioTower5FDirectorDescribeClearBellText
 	waitbutton
 	closetext
-	setscene 2
-	setmapscene ECRUTEAK_HOUSE, 0
+	setscene SCENE_RADIOTOWER5F_NOTHING
+	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_DEFAULT
 	setevent EVENT_GOT_CLEAR_BELL
 	setevent EVENT_TEAM_ROCKET_DISBANDED
 	jump .UselessJump
@@ -144,11 +142,11 @@ Ben:
 RadioTower5FUltraBall:
 	itemball ULTRA_BALL
 
-MapRadioTower5FSignpost0Script:
-	jumptext SignpostRadioTower5FOffice
+RadioTower5FDirectorsOfficeSign:
+	jumptext RadioTower5FDirectorsOfficeSignText
 
-MapRadioTower5FSignpost2Script:
-	jumptext SignpostRadioTower5FStudio
+RadioTower5FStudio1Sign:
+	jumptext RadioTower5FStudio1SignText
 
 RadioTower5FBookshelf:
 	jumpstd magazinebookshelf
@@ -187,7 +185,7 @@ RadioTower5FDirectorWalksOut:
 	step UP
 	step_end
 
-MovementData_0x60125:
+RadioTower5FPlayerTwoStepsLeftMovement:
 	step LEFT
 	step LEFT
 	step_end
@@ -411,41 +409,36 @@ BenText:
 	line "to our music?"
 	done
 
-SignpostRadioTower5FOffice:
+RadioTower5FDirectorsOfficeSignText:
 	text "5F DIRECTOR'S"
 	line "   OFFICE"
 	done
 
-SignpostRadioTower5FStudio:
+RadioTower5FStudio1SignText:
 	text "5F STUDIO 1"
 	done
 
 RadioTower5F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 0, 0, 1, RADIO_TOWER_4F
-	warp_def 12, 0, 3, RADIO_TOWER_4F
-
-.CoordEvents:
-	db 2
-	coord_event 0, 3, 0, FakeDirectorScript
-	coord_event 16, 5, 1, RadioTower5FRocketBossScene
-
-.BGEvents:
-	db 5
-	bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script
-	bg_event 11, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
-	bg_event 15, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script
-	bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf
-	bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf
-
-.ObjectEvents:
-	db 5
-	object_event 3, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1
-	object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	object_event 13, 5, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER
-	object_event 8, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  0,  0, RADIO_TOWER_4F, 1
+	warp_event 12,  0, RADIO_TOWER_4F, 3
+
+	db 2 ; coord events
+	coord_event  0,  3, SCENE_DEFAULT, FakeDirectorScript
+	coord_event 16,  5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene
+
+	db 5 ; bg events
+	bg_event  3,  0, BGEVENT_READ, RadioTower5FDirectorsOfficeSign
+	bg_event 11,  0, BGEVENT_READ, RadioTower5FStudio1Sign
+	bg_event 15,  0, BGEVENT_READ, RadioTower5FStudio1Sign
+	bg_event 16,  1, BGEVENT_READ, RadioTower5FBookshelf
+	bg_event 17,  1, BGEVENT_READ, RadioTower5FBookshelf
+
+	db 5 ; object events
+	object_event  3,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1
+	object_event 13,  5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 17,  2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+	object_event 13,  5, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER
+	object_event  8,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL
diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm
index 2f9d2828a..a07b231a4 100644
--- a/maps/RedsHouse1F.asm
+++ b/maps/RedsHouse1F.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const REDSHOUSE1F_REDS_MOM
 
 RedsHouse1F_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -75,24 +73,19 @@ RedsHouse1FTVText:
 	done
 
 RedsHouse1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 2, 7, 1, PALLET_TOWN
-	warp_def 3, 7, 1, PALLET_TOWN
-	warp_def 7, 0, 1, REDS_HOUSE_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 0, 1, BGEVENT_READ, RedsHouse1FBookshelf
-	bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf
-	bg_event 2, 1, BGEVENT_READ, RedsHouse1FTV
-
-.ObjectEvents:
-	db 1
-	object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  2,  7, PALLET_TOWN, 1
+	warp_event  3,  7, PALLET_TOWN, 1
+	warp_event  7,  0, REDS_HOUSE_2F, 1
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  0,  1, BGEVENT_READ, RedsHouse1FBookshelf
+	bg_event  1,  1, BGEVENT_READ, RedsHouse1FBookshelf
+	bg_event  2,  1, BGEVENT_READ, RedsHouse1FTV
+
+	db 1 ; object events
+	object_event  5,  3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1
diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm
index b69790cdd..6ff76ec80 100644
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -1,9 +1,7 @@
 RedsHouse2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RedsHouse2FN64Script:
 	jumptext RedsHouse2FN64Text
@@ -26,20 +24,15 @@ RedsHouse2FPCText:
 	done
 
 RedsHouse2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 7, 0, 3, REDS_HOUSE_1F
+	db 1 ; warp events
+	warp_event  7,  0, REDS_HOUSE_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 3, 5, BGEVENT_READ, RedsHouse2FN64Script
-	bg_event 0, 1, BGEVENT_READ, RedsHouse2FPCScript
+	db 2 ; bg events
+	bg_event  3,  5, BGEVENT_READ, RedsHouse2FN64Script
+	bg_event  0,  1, BGEVENT_READ, RedsHouse2FPCScript
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
index 570b4b2f5..008f7aec8 100644
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROCKTUNNEL1F_POKE_BALL1
 	const ROCKTUNNEL1F_POKE_BALL2
 
 RockTunnel1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RockTunnel1FElixer:
 	itemball ELIXER
@@ -16,33 +14,28 @@ RockTunnel1FTMSteelWing:
 	itemball TM_STEEL_WING
 
 RockTunnel1FHiddenXAccuracy:
-	hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY
+	hiddenitem X_ACCURACY, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY
 
 RockTunnel1FHiddenXDefend:
-	hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND
+	hiddenitem X_DEFEND, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND
 
 RockTunnel1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 15, 3, 1, ROUTE_9
-	warp_def 11, 25, 1, ROUTE_10_SOUTH
-	warp_def 5, 3, 3, ROCK_TUNNEL_B1F
-	warp_def 15, 9, 2, ROCK_TUNNEL_B1F
-	warp_def 27, 3, 4, ROCK_TUNNEL_B1F
-	warp_def 27, 13, 1, ROCK_TUNNEL_B1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event 15,  3, ROUTE_9, 1
+	warp_event 11, 25, ROUTE_10_SOUTH, 1
+	warp_event  5,  3, ROCK_TUNNEL_B1F, 3
+	warp_event 15,  9, ROCK_TUNNEL_B1F, 2
+	warp_event 27,  3, ROCK_TUNNEL_B1F, 4
+	warp_event 27, 13, ROCK_TUNNEL_B1F, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 24,  4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy
 	bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend
 
-.ObjectEvents:
-	db 2
-	object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER
-	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
+	db 2 ; object events
+	object_event  4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER
+	object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
index d94f1f412..82cea7924 100644
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROCKTUNNELB1F_POKE_BALL1
 	const ROCKTUNNELB1F_POKE_BALL2
 	const ROCKTUNNELB1F_POKE_BALL3
 
 RockTunnelB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RockTunnelB1FIron:
 	itemball IRON
@@ -20,28 +18,23 @@ RockTunnelB1FRevive:
 	itemball REVIVE
 
 RockTunnelB1FHiddenMaxPotion:
-	hiddenitem EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION
 
 RockTunnelB1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 3, 3, 6, ROCK_TUNNEL_1F
-	warp_def 17, 9, 4, ROCK_TUNNEL_1F
-	warp_def 23, 3, 3, ROCK_TUNNEL_1F
-	warp_def 25, 23, 5, ROCK_TUNNEL_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion
-
-.ObjectEvents:
-	db 3
-	object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
-	object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
-	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  3,  3, ROCK_TUNNEL_1F, 6
+	warp_event 17,  9, ROCK_TUNNEL_1F, 4
+	warp_event 23,  3, ROCK_TUNNEL_1F, 3
+	warp_event 25, 23, ROCK_TUNNEL_1F, 5
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion
+
+	db 3 ; object events
+	object_event  7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON
+	object_event  6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP
+	object_event 15,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE
diff --git a/maps/Route1.asm b/maps/Route1.asm
index 8be70d4d6..fdae35d58 100644
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -1,20 +1,18 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE1_YOUNGSTER
 	const ROUTE1_COOLTRAINER_F
 	const ROUTE1_FRUIT_TREE
 
 Route1_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerSchoolboyDanny:
-	trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script
+	trainer SCHOOLBOY, DANNY, EVENT_BEAT_SCHOOLBOY_DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyDannyAfterBattleText
 	waitbutton
@@ -22,10 +20,10 @@ TrainerSchoolboyDanny:
 	end
 
 TrainerCooltrainerfQuinn:
-	trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script
+	trainer COOLTRAINERF, QUINN, EVENT_BEAT_COOLTRAINERF_QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfQuinnAfterBattleText
 	waitbutton
@@ -35,7 +33,7 @@ TrainerCooltrainerfQuinn:
 Route1Sign:
 	jumptext Route1SignText
 
-FruitTreeScript_0x1ac581:
+Route1FruitTree:
 	fruittree FRUITTREE_ROUTE_1
 
 SchoolboyDannySeenText:
@@ -81,21 +79,16 @@ Route1SignText:
 	done
 
 Route1_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 7, 27, BGEVENT_READ, Route1Sign
+	db 1 ; bg events
+	bg_event  7, 27, BGEVENT_READ, Route1Sign
 
-.ObjectEvents:
-	db 3
-	object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
-	object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
-	object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1
+	db 3 ; object events
+	object_event  4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1
+	object_event  9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1
+	object_event  3,  7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route1FruitTree, -1
diff --git a/maps/Route10North.asm b/maps/Route10North.asm
index feb7dd033..e04d646b7 100644
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -1,9 +1,7 @@
 Route10North_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PowerPlantSign:
 	jumptext PowerPlantSignText
@@ -16,21 +14,16 @@ PowerPlantSignText:
 	done
 
 Route10North_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 11, 1, 1, ROUTE_10_POKECENTER_1F
-	warp_def 3, 9, 1, POWER_PLANT
+	db 2 ; warp events
+	warp_event 11,  1, ROUTE_10_POKECENTER_1F, 1
+	warp_event  3,  9, POWER_PLANT, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 5, 11, BGEVENT_READ, PowerPlantSign
-	bg_event 12, 1, BGEVENT_READ, Route10PokecenterSign
+	db 2 ; bg events
+	bg_event  5, 11, BGEVENT_READ, PowerPlantSign
+	bg_event 12,  1, BGEVENT_READ, Route10PokecenterSign
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm
index 4a75da2ec..82a6c73ad 100644
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -1,34 +1,32 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE10POKECENTER1F_NURSE
 	const ROUTE10POKECENTER1F_GENTLEMAN
 	const ROUTE10POKECENTER1F_GYM_GUY
 	const ROUTE10POKECENTER1F_COOLTRAINER_F
 
 Route10Pokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x188bd4:
+Route10Pokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
 Route10Pokecenter1FGentlemanScript:
 	jumptextfaceplayer Route10Pokecenter1FGentlemanText
 
-GymGuyScript_0x188bda:
+Route10Pokecenter1FGymGuyScript:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x188be8
-	writetext UnknownText_0x188c26
+	iftrue .ReturnedMachinePart
+	writetext Route10Pokecenter1FGymGuyText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x188be8:
-	writetext UnknownText_0x188c9e
+.ReturnedMachinePart:
+	writetext Route10Pokecenter1FGymGuyText_ReturnedMachinePart
 	waitbutton
 	closetext
 	end
@@ -44,7 +42,7 @@ Route10Pokecenter1FGentlemanText:
 	line "convenient."
 	done
 
-UnknownText_0x188c26:
+Route10Pokecenter1FGymGuyText:
 	text "The POWER PLANT's"
 	line "MANAGER is looking"
 
@@ -58,7 +56,7 @@ UnknownText_0x188c26:
 	line "was stolen."
 	done
 
-UnknownText_0x188c9e:
+Route10Pokecenter1FGymGuyText_ReturnedMachinePart:
 	text "I hear TEAM ROCKET"
 	line "got back together"
 
@@ -81,24 +79,19 @@ Route10Pokecenter1FCooltrainerFText:
 	done
 
 Route10Pokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 1, ROUTE_10_NORTH
-	warp_def 4, 7, 1, ROUTE_10_NORTH
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1
-	object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1
-	object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1
-	object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, ROUTE_10_NORTH, 1
+	warp_event  4,  7, ROUTE_10_NORTH, 1
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FNurseScript, -1
+	object_event  7,  6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1
+	object_event  7,  2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGymGuyScript, -1
+	object_event  1,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1
diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm
index c3b2d39cc..86927bb5a 100644
--- a/maps/Route10Pokecenter2FBeta.asm
+++ b/maps/Route10Pokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 Route10Pokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route10Pokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 0, 7, 3, ROUTE_10_POKECENTER_1F
+	db 1 ; warp events
+	warp_event  0,  7, ROUTE_10_POKECENTER_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route10South.asm b/maps/Route10South.asm
index a03a5d485..6161995df 100644
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -1,19 +1,17 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE10SOUTH_POKEFAN_M1
 	const ROUTE10SOUTH_POKEFAN_M2
 
 Route10South_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerHikerJim:
-	trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script
+	trainer HIKER, JIM, EVENT_BEAT_HIKER_JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerJimAfterBattleText
 	waitbutton
@@ -21,10 +19,10 @@ TrainerHikerJim:
 	end
 
 TrainerPokefanmRobert:
-	trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script
+	trainer POKEFANM, ROBERT, EVENT_BEAT_POKEFANM_ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmRobertAfterBattleText
 	waitbutton
@@ -76,21 +74,16 @@ Route10SignText:
 	done
 
 Route10South_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 6, 1, 2, ROCK_TUNNEL_1F
+	db 1 ; warp events
+	warp_event  6,  1, ROCK_TUNNEL_1F, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 5, 3, BGEVENT_READ, Route10Sign
+	db 1 ; bg events
+	bg_event  5,  3, BGEVENT_READ, Route10Sign
 
-.ObjectEvents:
-	db 2
-	object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1
-	object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1
+	db 2 ; object events
+	object_event 17,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1
+	object_event  8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1
diff --git a/maps/Route11.asm b/maps/Route11.asm
index 353877969..9620e8f0b 100644
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE11_YOUNGSTER1
 	const ROUTE11_YOUNGSTER2
 	const ROUTE11_YOUNGSTER3
@@ -6,17 +6,15 @@ const_value set 2
 	const ROUTE11_FRUIT_TREE
 
 Route11_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerYoungsterOwen:
-	trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script
+	trainer YOUNGSTER, OWEN, EVENT_BEAT_YOUNGSTER_OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterOwenAfterBattleText
 	waitbutton
@@ -24,10 +22,10 @@ TrainerYoungsterOwen:
 	end
 
 TrainerYoungsterJason:
-	trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script
+	trainer YOUNGSTER, JASON, EVENT_BEAT_YOUNGSTER_JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterJasonAfterBattleText
 	waitbutton
@@ -35,10 +33,10 @@ TrainerYoungsterJason:
 	end
 
 TrainerPsychicHerman:
-	trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script
+	trainer PSYCHIC_T, HERMAN, EVENT_BEAT_PSYCHIC_HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicHermanAfterBattleText
 	waitbutton
@@ -46,10 +44,10 @@ TrainerPsychicHerman:
 	end
 
 TrainerPsychicFidel:
-	trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script
+	trainer PSYCHIC_T, FIDEL, EVENT_BEAT_PSYCHIC_FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicFidelAfterBattleText
 	waitbutton
@@ -59,11 +57,11 @@ TrainerPsychicFidel:
 Route11Sign:
 	jumptext Route11SignText
 
-FruitTreeScript_0x68055:
+Route11FruitTree:
 	fruittree FRUITTREE_ROUTE_11
 
 Route11HiddenRevive:
-	hiddenitem EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE
+	hiddenitem REVIVE, EVENT_ROUTE_11_HIDDEN_REVIVE
 
 YoungsterOwenSeenText:
 	text "There's no cheat-"
@@ -146,24 +144,19 @@ Route11SignText:
 	done
 
 Route11_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 3, 7, BGEVENT_READ, Route11Sign
-	bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive
+	db 2 ; bg events
+	bg_event  3,  7, BGEVENT_READ, Route11Sign
+	bg_event 32,  5, BGEVENT_ITEM, Route11HiddenRevive
 
-.ObjectEvents:
-	db 5
+	db 5 ; object events
 	object_event 22, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1
-	object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1
-	object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1
-	object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1
-	object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1
+	object_event 20,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1
+	object_event 28,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1
+	object_event  8,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1
+	object_event 32,  2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route11FruitTree, -1
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 3aaf37991..607ed498b 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE12_FISHER1
 	const ROUTE12_FISHER2
 	const ROUTE12_FISHER3
@@ -7,17 +7,15 @@ const_value set 2
 	const ROUTE12_POKE_BALL2
 
 Route12_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerFisherKyle:
-	trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script
+	trainer FISHER, KYLE, EVENT_BEAT_FISHER_KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherKyleAfterBattleText
 	waitbutton
@@ -25,10 +23,10 @@ TrainerFisherKyle:
 	end
 
 TrainerFisherMartin:
-	trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script
+	trainer FISHER, MARTIN, EVENT_BEAT_FISHER_MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherMartinAfterBattleText
 	waitbutton
@@ -36,10 +34,10 @@ TrainerFisherMartin:
 	end
 
 TrainerFisherStephen:
-	trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script
+	trainer FISHER, STEPHEN, EVENT_BEAT_FISHER_STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherStephenAfterBattleText
 	waitbutton
@@ -47,10 +45,10 @@ TrainerFisherStephen:
 	end
 
 TrainerFisherBarney:
-	trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script
+	trainer FISHER, BARNEY, EVENT_BEAT_FISHER_BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherBarneyAfterBattleText
 	waitbutton
@@ -70,7 +68,7 @@ Route12Nugget:
 	itemball NUGGET
 
 Route12HiddenElixer:
-	hiddenitem EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER
+	hiddenitem ELIXER, EVENT_ROUTE_12_HIDDEN_ELIXER
 
 FisherMartinSeenText:
 	text "Patience is the"
@@ -167,27 +165,22 @@ FishingSpotSignText:
 	done
 
 Route12_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE
+	db 1 ; warp events
+	warp_event 11, 33, ROUTE_12_SUPER_ROD_HOUSE, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 11, 27, BGEVENT_READ, Route12Sign
-	bg_event 13, 9, BGEVENT_READ, FishingSpotSign
+	bg_event 13,  9, BGEVENT_READ, FishingSpotSign
 	bg_event 14, 13, BGEVENT_ITEM, Route12HiddenElixer
 
-.ObjectEvents:
-	db 6
-	object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1
+	db 6 ; object events
+	object_event  5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1
 	object_event 14, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1
 	object_event 10, 38, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1
-	object_event 6, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1
-	object_event 5, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM
-	object_event 5, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET
+	object_event  6,  7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1
+	object_event  5, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM
+	object_event  5, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET
diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm
index ca39effaf..cd2ebd6cb 100644
--- a/maps/Route12SuperRodHouse.asm
+++ b/maps/Route12SuperRodHouse.asm
@@ -1,36 +1,34 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE12SUPERRODHOUSE_FISHING_GURU
 
 Route12SuperRodHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-FishingGuruScript_0x7f484:
+Route12SuperRodHouseFishingGuruScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_SUPER_ROD
-	iftrue UnknownScript_0x7f4a0
+	iftrue .GotSuperRod
 	writetext UnknownText_0x7f4af
 	yesorno
-	iffalse UnknownScript_0x7f4a6
+	iffalse .Refused
 	writetext UnknownText_0x7f52f
 	buttonsound
 	verbosegiveitem SUPER_ROD
-	iffalse UnknownScript_0x7f4aa
+	iffalse .NoRoom
 	setevent EVENT_GOT_SUPER_ROD
-UnknownScript_0x7f4a0:
+.GotSuperRod:
 	writetext UnknownText_0x7f57c
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x7f4a6:
+.Refused:
 	writetext UnknownText_0x7f5ec
 	waitbutton
-UnknownScript_0x7f4aa:
+.NoRoom:
 	closetext
 	end
 
@@ -80,20 +78,15 @@ UnknownText_0x7f5ec:
 	done
 
 Route12SuperRodHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, ROUTE_12
-	warp_def 3, 7, 1, ROUTE_12
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_12, 1
+	warp_event  3,  7, ROUTE_12, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1
+	db 1 ; object events
+	object_event  5,  3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route12SuperRodHouseFishingGuruScript, -1
diff --git a/maps/Route13.asm b/maps/Route13.asm
index 88753afbb..295f8c5e7 100644
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE13_YOUNGSTER1
 	const ROUTE13_YOUNGSTER2
 	const ROUTE13_POKEFAN_M1
@@ -6,17 +6,15 @@ const_value set 2
 	const ROUTE13_POKEFAN_M3
 
 Route13_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerPokefanmAlex:
-	trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script
+	trainer POKEFANM, ALEX, EVENT_BEAT_POKEFANM_ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmAlexAfterBattleText
 	waitbutton
@@ -24,10 +22,10 @@ TrainerPokefanmAlex:
 	end
 
 TrainerPokefanmJoshua:
-	trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script
+	trainer POKEFANM, JOSHUA, EVENT_BEAT_POKEFANM_JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmJoshuaAfterBattleText
 	waitbutton
@@ -35,10 +33,10 @@ TrainerPokefanmJoshua:
 	end
 
 TrainerBirdKeeperPerry:
-	trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script
+	trainer BIRD_KEEPER, PERRY, EVENT_BEAT_BIRD_KEEPER_PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperPerryAfterBattleText
 	waitbutton
@@ -46,10 +44,10 @@ TrainerBirdKeeperPerry:
 	end
 
 TrainerBirdKeeperBret:
-	trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script
+	trainer BIRD_KEEPER, BRET, EVENT_BEAT_BIRD_KEEPER_BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperBretAfterBattleText
 	waitbutton
@@ -57,10 +55,10 @@ TrainerBirdKeeperBret:
 	end
 
 TrainerHikerKenny:
-	trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script
+	trainer HIKER, KENNY, EVENT_BEAT_HIKER_KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerKennyAfterBattleText
 	waitbutton
@@ -77,7 +75,7 @@ Route13DirectionsSign:
 	jumptext Route13DirectionsSignText
 
 Route13HiddenCalcium:
-	hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM
+	hiddenitem CALCIUM, EVENT_ROUTE_13_HIDDEN_CALCIUM
 
 PokefanmAlexSeenText:
 	text "Bow down before my"
@@ -192,26 +190,21 @@ Route13DirectionsSignText:
 	done
 
 Route13_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 4
+	db 4 ; bg events
 	bg_event 29, 13, BGEVENT_READ, Route13TrainerTips
 	bg_event 41, 11, BGEVENT_READ, Route13Sign
 	bg_event 17, 13, BGEVENT_READ, Route13DirectionsSign
 	bg_event 30, 13, BGEVENT_ITEM, Route13HiddenCalcium
 
-.ObjectEvents:
-	db 5
-	object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1
-	object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1
-	object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1
+	db 5 ; object events
+	object_event 42,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1
+	object_event 43,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1
+	object_event 32,  8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1
 	object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerHikerKenny, -1
-	object_event 25, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1
+	object_event 25,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1
diff --git a/maps/Route14.asm b/maps/Route14.asm
index 3f5a58357..939cbfd20 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -1,29 +1,27 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE14_POKEFAN_M1
 	const ROUTE14_YOUNGSTER
 	const ROUTE14_POKEFAN_M2
 	const ROUTE14_KIM
 
 Route14_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Kim:
 	faceplayer
 	opentext
-	trade NPCTRADE_KIM
+	trade NPC_TRADE_KIM
 	waitbutton
 	closetext
 	end
 
 TrainerPokefanmCarter:
-	trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script
+	trainer POKEFANM, CARTER, EVENT_BEAT_POKEFANM_CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmCarterAfterBattleText
 	waitbutton
@@ -31,10 +29,10 @@ TrainerPokefanmCarter:
 	end
 
 TrainerBirdKeeperRoy:
-	trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script
+	trainer BIRD_KEEPER, ROY, EVENT_BEAT_BIRD_KEEPER_ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperRoyAfterBattleText
 	waitbutton
@@ -42,10 +40,10 @@ TrainerBirdKeeperRoy:
 	end
 
 TrainerPokefanmTrevor:
-	trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script
+	trainer POKEFANM, TREVOR, EVENT_BEAT_POKEFANM_TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmTrevorAfterBattleText
 	waitbutton
@@ -116,21 +114,16 @@ PokefanmTrevorAfterBattleText:
 	done
 
 Route14_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 11, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1
 	object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1
-	object_event 6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1
-	object_event 7, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1
+	object_event  6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1
+	object_event  7,  5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1
diff --git a/maps/Route15.asm b/maps/Route15.asm
index 58fe79c9b..3364a224b 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE15_YOUNGSTER1
 	const ROUTE15_YOUNGSTER2
 	const ROUTE15_YOUNGSTER3
@@ -8,17 +8,15 @@ const_value set 2
 	const ROUTE15_POKE_BALL
 
 Route15_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerTeacherColette:
-	trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script
+	trainer TEACHER, COLETTE, EVENT_BEAT_TEACHER_COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TeacherColetteAfterBattleText
 	waitbutton
@@ -26,10 +24,10 @@ TrainerTeacherColette:
 	end
 
 TrainerTeacherHillary:
-	trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script
+	trainer TEACHER, HILLARY, EVENT_BEAT_TEACHER_HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TeacherHillaryAfterBattleText
 	waitbutton
@@ -37,10 +35,10 @@ TrainerTeacherHillary:
 	end
 
 TrainerSchoolboyKipp:
-	trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script
+	trainer SCHOOLBOY, KIPP, EVENT_BEAT_SCHOOLBOY_KIP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyKippAfterBattleText
 	waitbutton
@@ -48,10 +46,10 @@ TrainerSchoolboyKipp:
 	end
 
 TrainerSchoolboyTommy:
-	trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script
+	trainer SCHOOLBOY, TOMMY, EVENT_BEAT_SCHOOLBOY_TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyTommyAfterBattleText
 	waitbutton
@@ -59,10 +57,10 @@ TrainerSchoolboyTommy:
 	end
 
 TrainerSchoolboyJohnny:
-	trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script
+	trainer SCHOOLBOY, JOHNNY, EVENT_BEAT_SCHOOLBOY_JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyJohnnyAfterBattleText
 	waitbutton
@@ -70,10 +68,10 @@ TrainerSchoolboyJohnny:
 	end
 
 TrainerSchoolboyBilly:
-	trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script
+	trainer SCHOOLBOY, BILLY, EVENT_BEAT_SCHOOLBOY_BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyBillyAfterBattleText
 	waitbutton
@@ -202,27 +200,22 @@ Route15SignText:
 	done
 
 Route15_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 4, 3, ROUTE_15_FUCHSIA_GATE
-	warp_def 2, 5, 4, ROUTE_15_FUCHSIA_GATE
+	db 2 ; warp events
+	warp_event  2,  4, ROUTE_15_FUCHSIA_GATE, 3
+	warp_event  2,  5, ROUTE_15_FUCHSIA_GATE, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 19, 9, BGEVENT_READ, Route15Sign
+	db 1 ; bg events
+	bg_event 19,  9, BGEVENT_READ, Route15Sign
 
-.ObjectEvents:
-	db 7
+	db 7 ; object events
 	object_event 10, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1
 	object_event 15, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1
 	object_event 33, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1
 	object_event 27, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1
 	object_event 30, 12, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerTeacherColette, -1
 	object_event 20, 10, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherHillary, -1
-	object_event 12, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP
+	object_event 12,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP
diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm
index 80966bd2b..002b31348 100644
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE15FUCHSIAGATE_OFFICER
 
 Route15FuchsiaGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route15FuchsiaGateOfficerScript:
 	jumptextfaceplayer Route15FuchsiaGateOfficerText
@@ -20,22 +18,17 @@ Route15FuchsiaGateOfficerText:
 	done
 
 Route15FuchsiaGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 0, 4, 8, FUCHSIA_CITY
-	warp_def 0, 5, 9, FUCHSIA_CITY
-	warp_def 9, 4, 1, ROUTE_15
-	warp_def 9, 5, 2, ROUTE_15
+	db 4 ; warp events
+	warp_event  0,  4, FUCHSIA_CITY, 8
+	warp_event  0,  5, FUCHSIA_CITY, 9
+	warp_event  9,  4, ROUTE_15, 1
+	warp_event  9,  5, ROUTE_15, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1
+	db 1 ; object events
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1
diff --git a/maps/Route16.asm b/maps/Route16.asm
index 0e0fb2dc4..327b90a85 100644
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -1,16 +1,14 @@
 Route16_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
 
 .AlwaysOnBike:
 	checkcode VAR_YCOORD
-	if_less_than 5, .CanWalk
+	ifless 5, .CanWalk
 	checkcode VAR_XCOORD
-	if_greater_than 13, .CanWalk
+	ifgreater 13, .CanWalk
 	setflag ENGINE_ALWAYS_ON_BIKE
 	return
 
@@ -29,23 +27,18 @@ CyclingRoadSignText:
 	done
 
 Route16_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE
-	warp_def 14, 6, 3, ROUTE_16_GATE
-	warp_def 14, 7, 4, ROUTE_16_GATE
-	warp_def 9, 6, 1, ROUTE_16_GATE
-	warp_def 9, 7, 2, ROUTE_16_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 5, 5, BGEVENT_READ, CyclingRoadSign
-
-.ObjectEvents:
-	db 0
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  3,  1, ROUTE_16_FUCHSIA_SPEECH_HOUSE, 1
+	warp_event 14,  6, ROUTE_16_GATE, 3
+	warp_event 14,  7, ROUTE_16_GATE, 4
+	warp_event  9,  6, ROUTE_16_GATE, 1
+	warp_event  9,  7, ROUTE_16_GATE, 2
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  5,  5, BGEVENT_READ, CyclingRoadSign
+
+	db 0 ; object events
diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm
index 1d709e4ea..53af80d35 100644
--- a/maps/Route16FuchsiaSpeechHouse.asm
+++ b/maps/Route16FuchsiaSpeechHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD
 
 Route16FuchsiaSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route16FuchsiaSpeechHouseSuperNerdScript:
 	jumptextfaceplayer Route16FuchsiaSpeechHouseSuperNerdText
@@ -23,22 +21,17 @@ Route16FuchsiaSpeechHouseSuperNerdText:
 	done
 
 Route16FuchsiaSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, ROUTE_16
-	warp_def 3, 7, 1, ROUTE_16
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_16, 1
+	warp_event  3,  7, ROUTE_16, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1
+	db 1 ; object events
+	object_event  2,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index d59425640..fb135e1b7 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE16GATE_OFFICER
 
 Route16Gate_MapScripts:
-.SceneScripts:
-	db 1
-	scene_script .DummyScene
+	db 1 ; scene scripts
+	scene_script .DummyScene ; SCENE_DEFAULT
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -15,22 +13,22 @@ Route16Gate_MapScripts:
 Route16GateOfficerScript:
 	jumptextfaceplayer Route16GateOfficerText
 
-UnknownScript_0x733ed:
+Route16GateBicycleCheck:
 	checkitem BICYCLE
-	iffalse UnknownScript_0x733f3
+	iffalse .NoBicycle
 	end
 
-UnknownScript_0x733f3:
+.NoBicycle:
 	showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
-	writetext UnknownText_0x73496
+	writetext Route16GateCannotPassText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x73405
+	applymovement PLAYER, Route16GateCannotPassMovement
 	end
 
-MovementData_0x73405:
+Route16GateCannotPassMovement:
 	step RIGHT
 	turn_head LEFT
 	step_end
@@ -50,7 +48,7 @@ Route16GateOfficerText:
 	line "a ship or train."
 	done
 
-UnknownText_0x73496:
+Route16GateCannotPassText:
 	text "Hey! Whoa! Stop!"
 
 	para "You can't go out"
@@ -61,24 +59,19 @@ UnknownText_0x73496:
 	done
 
 Route16Gate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 0, 4, 4, ROUTE_16
-	warp_def 0, 5, 5, ROUTE_16
-	warp_def 9, 4, 2, ROUTE_16
-	warp_def 9, 5, 3, ROUTE_16
-
-.CoordEvents:
-	db 2
-	coord_event 5, 4, 0, UnknownScript_0x733ed
-	coord_event 5, 5, 0, UnknownScript_0x733ed
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  0,  4, ROUTE_16, 4
+	warp_event  0,  5, ROUTE_16, 5
+	warp_event  9,  4, ROUTE_16, 2
+	warp_event  9,  5, ROUTE_16, 3
+
+	db 2 ; coord events
+	coord_event  5,  4, SCENE_DEFAULT, Route16GateBicycleCheck
+	coord_event  5,  5, SCENE_DEFAULT, Route16GateBicycleCheck
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1
diff --git a/maps/Route17.asm b/maps/Route17.asm
index b2c1a820d..a913835e0 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE17_BIKER1
 	const ROUTE17_BIKER2
 	const ROUTE17_BIKER3
 	const ROUTE17_BIKER4
 
 Route17_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
 
 .AlwaysOnBike:
@@ -18,10 +16,10 @@ Route17_MapScripts:
 	return
 
 TrainerBikerCharles:
-	trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script
+	trainer BIKER, CHARLES, EVENT_BEAT_BIKER_CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerCharlesAfterBattleText
 	waitbutton
@@ -29,10 +27,10 @@ TrainerBikerCharles:
 	end
 
 TrainerBikerRiley:
-	trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script
+	trainer BIKER, RILEY, EVENT_BEAT_BIKER_RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerRileyAfterBattleText
 	waitbutton
@@ -40,10 +38,10 @@ TrainerBikerRiley:
 	end
 
 TrainerBikerJoel:
-	trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script
+	trainer BIKER, JOEL, EVENT_BEAT_BIKER_JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerJoelAfterBattleText
 	waitbutton
@@ -51,10 +49,10 @@ TrainerBikerJoel:
 	end
 
 TrainerBikerGlenn:
-	trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script
+	trainer BIKER, GLENN, EVENT_BEAT_BIKER_GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerGlennAfterBattleText
 	waitbutton
@@ -62,10 +60,10 @@ TrainerBikerGlenn:
 	end
 
 Route17HiddenMaxEther:
-	hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER
+	hiddenitem MAX_ETHER, EVENT_ROUTE_17_HIDDEN_MAX_ETHER
 
 Route17HiddenMaxElixer:
-	hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER
+	hiddenitem MAX_ELIXER, EVENT_ROUTE_17_HIDDEN_MAX_ELIXER
 
 BikerRileySeenText:
 	text "Hey, you! You're"
@@ -133,25 +131,20 @@ BikerCharlesAfterBattleText:
 	done
 
 Route17_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 17, 82, 1, ROUTE_17_ROUTE_18_GATE
-	warp_def 17, 83, 2, ROUTE_17_ROUTE_18_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther
-	bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer
-
-.ObjectEvents:
-	db 4
-	object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1
-	object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1
-	object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1
-	object_event 6, 80, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event 17, 82, ROUTE_17_ROUTE_18_GATE, 1
+	warp_event 17, 83, ROUTE_17_ROUTE_18_GATE, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  9, 54, BGEVENT_ITEM, Route17HiddenMaxEther
+	bg_event  8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer
+
+	db 4 ; object events
+	object_event  4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1
+	object_event  9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1
+	object_event  3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1
+	object_event  6, 80, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index 367a2634b..0e434a711 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE17ROUTE18GATE_OFFICER
 
 Route17Route18Gate_MapScripts:
-.SceneScripts:
-	db 1
-	scene_script .DummyScene
+	db 1 ; scene scripts
+	scene_script .DummyScene ; SCENE_DEFAULT
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -15,22 +13,22 @@ Route17Route18Gate_MapScripts:
 Route17Route18GateOfficerScript:
 	jumptextfaceplayer Route17Route18GateOfficerText
 
-UnknownScript_0x73611:
+Route17Route18GateBicycleCheck:
 	checkitem BICYCLE
-	iffalse UnknownScript_0x73617
+	iffalse .NoBicycle
 	end
 
-UnknownScript_0x73617:
+.NoBicycle:
 	showemote EMOTE_SHOCK, ROUTE17ROUTE18GATE_OFFICER, 15
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
-	writetext UnknownText_0x7364d
+	writetext Route17Route18GateCannotPassText
 	waitbutton
 	closetext
-	applymovement PLAYER, MovementData_0x73629
+	applymovement PLAYER, Route17Route18GateCannotPassMovement
 	end
 
-MovementData_0x73629:
+Route17Route18GateCannotPassMovement:
 	step RIGHT
 	turn_head LEFT
 	step_end
@@ -40,7 +38,7 @@ Route17Route18GateOfficerText:
 	line "Uphill Starts Here"
 	done
 
-UnknownText_0x7364d:
+Route17Route18GateCannotPassText:
 	text "Hang on! Don't you"
 	line "have a BICYCLE?"
 
@@ -52,24 +50,19 @@ UnknownText_0x7364d:
 	done
 
 Route17Route18Gate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 0, 4, 1, ROUTE_17
-	warp_def 0, 5, 2, ROUTE_17
-	warp_def 9, 4, 1, ROUTE_18
-	warp_def 9, 5, 2, ROUTE_18
-
-.CoordEvents:
-	db 2
-	coord_event 5, 4, 0, UnknownScript_0x73611
-	coord_event 5, 5, 0, UnknownScript_0x73611
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  0,  4, ROUTE_17, 1
+	warp_event  0,  5, ROUTE_17, 2
+	warp_event  9,  4, ROUTE_18, 1
+	warp_event  9,  5, ROUTE_18, 2
+
+	db 2 ; coord events
+	coord_event  5,  4, SCENE_DEFAULT, Route17Route18GateBicycleCheck
+	coord_event  5,  5, SCENE_DEFAULT, Route17Route18GateBicycleCheck
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1
diff --git a/maps/Route18.asm b/maps/Route18.asm
index 8cff37f09..23d6cb4ed 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -1,19 +1,17 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE18_YOUNGSTER1
 	const ROUTE18_YOUNGSTER2
 
 Route18_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperBoris:
-	trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script
+	trainer BIRD_KEEPER, BORIS, EVENT_BEAT_BIRD_KEEPER_BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperBorisAfterBattleText
 	waitbutton
@@ -21,10 +19,10 @@ TrainerBirdKeeperBoris:
 	end
 
 TrainerBirdKeeperBob:
-	trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script
+	trainer BIRD_KEEPER, BOB, EVENT_BEAT_BIRD_KEEPER_BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperBobAfterBattleText
 	waitbutton
@@ -78,22 +76,17 @@ Route18SignText:
 	done
 
 Route18_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 6, 3, ROUTE_17_ROUTE_18_GATE
-	warp_def 2, 7, 4, ROUTE_17_ROUTE_18_GATE
+	db 2 ; warp events
+	warp_event  2,  6, ROUTE_17_ROUTE_18_GATE, 3
+	warp_event  2,  7, ROUTE_17_ROUTE_18_GATE, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 9, 5, BGEVENT_READ, Route18Sign
+	db 1 ; bg events
+	bg_event  9,  5, BGEVENT_READ, Route18Sign
 
-.ObjectEvents:
-	db 2
-	object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1
-	object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1
+	db 2 ; object events
+	object_event  9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1
+	object_event 13,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1
diff --git a/maps/Route19.asm b/maps/Route19.asm
index 8767a8b3b..103370a5a 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE19_SWIMMER_GIRL
 	const ROUTE19_SWIMMER_GUY1
 	const ROUTE19_SWIMMER_GUY2
@@ -7,11 +7,9 @@ const_value set 2
 	const ROUTE19_FISHER2
 
 Route19_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .ClearRocks
 
 .ClearRocks:
@@ -27,10 +25,10 @@ Route19_MapScripts:
 	return
 
 TrainerSwimmerfDawn:
-	trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script
+	trainer SWIMMERF, DAWN, EVENT_BEAT_SWIMMERF_DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfDawnAfterBattleText
 	waitbutton
@@ -38,10 +36,10 @@ TrainerSwimmerfDawn:
 	end
 
 TrainerSwimmermHarold:
-	trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script
+	trainer SWIMMERM, HAROLD, EVENT_BEAT_SWIMMERM_HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermHaroldAfterBattleText
 	waitbutton
@@ -49,10 +47,10 @@ TrainerSwimmermHarold:
 	end
 
 TrainerSwimmermJerome:
-	trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script
+	trainer SWIMMERM, JEROME, EVENT_BEAT_SWIMMERM_JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermJeromeAfterBattleText
 	waitbutton
@@ -60,44 +58,44 @@ TrainerSwimmermJerome:
 	end
 
 TrainerSwimmermTucker:
-	trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script
+	trainer SWIMMERM, TUCKER, EVENT_BEAT_SWIMMERM_TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermTuckerAfterBattleText
 	waitbutton
 	closetext
 	end
 
-FisherScript_0x19ea4d:
+Route19Fisher1Script:
 	faceplayer
 	opentext
 	checkevent EVENT_CINNABAR_ROCKS_CLEARED
-	iftrue UnknownScript_0x19ea5b
-	writetext UnknownText_0x19ecaf
+	iftrue .RocksCleared
+	writetext Route19Fisher1Text
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x19ea5b:
-	writetext UnknownText_0x19ed24
+.RocksCleared:
+	writetext Route19Fisher1Text_RocksCleared
 	waitbutton
 	closetext
 	end
 
-FisherScript_0x19ea61:
+Route19Fisher2Script:
 	faceplayer
 	opentext
 	checkevent EVENT_CINNABAR_ROCKS_CLEARED
 	iftrue .RocksCleared
-	writetext Route19FisherText1
+	writetext Route19Fisher2Text
 	waitbutton
 	closetext
 	end
 
 .RocksCleared:
-	writetext Route19FisherText2
+	writetext Route19Fisher2Text_RocksCleared
 	waitbutton
 	closetext
 	end
@@ -187,7 +185,7 @@ SwimmermJeromeAfterBattleText:
 	cont "love the sea."
 	done
 
-UnknownText_0x19ecaf:
+Route19Fisher1Text:
 	text "Sorry. This road"
 	line "is closed for"
 	cont "construction."
@@ -199,18 +197,18 @@ UnknownText_0x19ecaf:
 	line "from PALLET TOWN."
 	done
 
-UnknownText_0x19ed24:
+Route19Fisher1Text_RocksCleared:
 	text "I'm all sweaty."
 	line "Time for a swim!"
 	done
 
-Route19FisherText1:
+Route19Fisher2Text:
 	text "Who knows how long"
 	line "it would take to"
 	cont "move this boulder…"
 	done
 
-Route19FisherText2:
+Route19Fisher2Text_RocksCleared:
 	text "The roadwork is"
 	line "finally finished."
 
@@ -235,26 +233,21 @@ CarefulSwimmingSignText:
 	done
 
 Route19_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 7, 3, 3, ROUTE_19_FUCHSIA_GATE
+	db 1 ; warp events
+	warp_event  7,  3, ROUTE_19_FUCHSIA_GATE, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 11, 13, BGEVENT_READ, Route19Sign
-	bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign
+	bg_event 11,  1, BGEVENT_READ, CarefulSwimmingSign
 
-.ObjectEvents:
-	db 6
-	object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1
+	db 6 ; object events
+	object_event  9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1
 	object_event 13, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1
 	object_event 11, 17, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1
-	object_event 8, 23, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1
-	object_event 9, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1
-	object_event 11, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1
+	object_event  8, 23, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1
+	object_event  9,  5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, Route19Fisher1Script, -1
+	object_event 11,  5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, Route19Fisher2Script, -1
diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm
index 4446de2e3..4c2d6abd0 100644
--- a/maps/Route19FuchsiaGate.asm
+++ b/maps/Route19FuchsiaGate.asm
@@ -1,30 +1,28 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE19FUCHSIAGATE_OFFICER
 
 Route19FuchsiaGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-OfficerScript_0x1ab3f6:
+Route19FuchsiaGateOfficerScript:
 	faceplayer
 	opentext
 	checkevent EVENT_CINNABAR_ROCKS_CLEARED
 	iftrue .RocksCleared
-	writetext UnknownText_0x1ab40a
+	writetext Route19FuchsiaGateOfficerText
 	waitbutton
 	closetext
 	end
 
 .RocksCleared:
-	writetext UnknownText_0x1ab48a
+	writetext Route19FuchsiaGateOfficerText_RocksCleared
 	waitbutton
 	closetext
 	end
 
-UnknownText_0x1ab40a:
+Route19FuchsiaGateOfficerText:
 	text "CINNABAR's volcano"
 	line "erupted."
 
@@ -37,7 +35,7 @@ UnknownText_0x1ab40a:
 	cont "are safe…"
 	done
 
-UnknownText_0x1ab48a:
+Route19FuchsiaGateOfficerText_RocksCleared:
 	text "No CINNABAR citi-"
 	line "zens were injured"
 
@@ -46,22 +44,17 @@ UnknownText_0x1ab48a:
 	done
 
 Route19FuchsiaGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 4, 0, 10, FUCHSIA_CITY
-	warp_def 5, 0, 11, FUCHSIA_CITY
-	warp_def 4, 7, 1, ROUTE_19
-	warp_def 5, 7, 1, ROUTE_19
+	db 4 ; warp events
+	warp_event  4,  0, FUCHSIA_CITY, 10
+	warp_event  5,  0, FUCHSIA_CITY, 11
+	warp_event  4,  7, ROUTE_19, 1
+	warp_event  5,  7, ROUTE_19, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1
+	db 1 ; object events
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route19FuchsiaGateOfficerScript, -1
diff --git a/maps/Route2.asm b/maps/Route2.asm
index 09b885df3..2760b16eb 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE2_BUG_CATCHER1
 	const ROUTE2_BUG_CATCHER2
 	const ROUTE2_BUG_CATCHER3
@@ -9,17 +9,15 @@ const_value set 2
 	const ROUTE2_FRUIT_TREE
 
 Route2_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBugCatcherRob:
-	trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script
+	trainer BUG_CATCHER, ROB, EVENT_BEAT_BUG_CATCHER_ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherRobAfterBattleText
 	waitbutton
@@ -27,10 +25,10 @@ TrainerBugCatcherRob:
 	end
 
 TrainerBugCatcherEd:
-	trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script
+	trainer BUG_CATCHER, ED, EVENT_BEAT_BUG_CATCHER_ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherEdAfterBattleText
 	waitbutton
@@ -38,10 +36,10 @@ TrainerBugCatcherEd:
 	end
 
 TrainerBugCatcherDoug:
-	trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script
+	trainer BUG_CATCHER, DOUG, EVENT_BEAT_BUG_CATCHER_DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherDougAfterBattleText
 	waitbutton
@@ -51,8 +49,8 @@ TrainerBugCatcherDoug:
 Route2Sign:
 	jumptext Route2SignText
 
-MapRoute2Signpost1Script:
-	jumptext UnknownText_0x1ac49f
+Route2DiglettsCaveSign:
+	jumptext Route2DiglettsCaveSignText
 
 Route2DireHit:
 	itemball DIRE_HIT
@@ -66,20 +64,20 @@ Route2Carbos:
 Route2Elixer:
 	itemball ELIXER
 
-FruitTreeScript_0x1ac306:
+Route2FruitTree:
 	fruittree FRUITTREE_ROUTE_2
 
 Route2HiddenMaxEther:
-	hiddenitem EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER
+	hiddenitem MAX_ETHER, EVENT_ROUTE_2_HIDDEN_MAX_ETHER
 
 Route2HiddenFullHeal:
-	hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL
+	hiddenitem FULL_HEAL, EVENT_ROUTE_2_HIDDEN_FULL_HEAL
 
 Route2HiddenFullRestore:
-	hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE
+	hiddenitem FULL_RESTORE, EVENT_ROUTE_2_HIDDEN_FULL_RESTORE
 
 Route2HiddenRevive:
-	hiddenitem EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE
+	hiddenitem REVIVE, EVENT_ROUTE_2_HIDDEN_REVIVE
 
 BugCatcherRobSeenText:
 	text "My bug #MON are"
@@ -142,41 +140,36 @@ Route2SignText:
 	line "PEWTER CITY"
 	done
 
-UnknownText_0x1ac49f:
+Route2DiglettsCaveSignText:
 	text "DIGLETT'S CAVE"
 	done
 
 Route2_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 15, 15, 1, ROUTE_2_NUGGET_SPEECH_HOUSE
-	warp_def 15, 31, 3, ROUTE_2_GATE
-	warp_def 16, 27, 1, ROUTE_2_GATE
-	warp_def 17, 27, 2, ROUTE_2_GATE
-	warp_def 12, 7, 3, DIGLETTS_CAVE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 6
-	bg_event 7, 51, BGEVENT_READ, Route2Sign
-	bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script
-	bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther
-	bg_event 4, 14, BGEVENT_ITEM, Route2HiddenFullHeal
-	bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event 15, 15, ROUTE_2_NUGGET_HOUSE, 1
+	warp_event 15, 31, ROUTE_2_GATE, 3
+	warp_event 16, 27, ROUTE_2_GATE, 1
+	warp_event 17, 27, ROUTE_2_GATE, 2
+	warp_event 12,  7, DIGLETTS_CAVE, 3
+
+	db 0 ; coord events
+
+	db 6 ; bg events
+	bg_event  7, 51, BGEVENT_READ, Route2Sign
+	bg_event 11,  9, BGEVENT_READ, Route2DiglettsCaveSign
+	bg_event  7, 23, BGEVENT_ITEM, Route2HiddenMaxEther
+	bg_event  4, 14, BGEVENT_ITEM, Route2HiddenFullHeal
+	bg_event  4, 27, BGEVENT_ITEM, Route2HiddenFullRestore
 	bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1
-	object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
-	object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
-	object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
-	object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
-	object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
-	object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
-	object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1
+	object_event  6,  4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
+	object_event  0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
+	object_event  0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
+	object_event  2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION
+	object_event 19,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
+	object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
+	object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route2FruitTree, -1
diff --git a/maps/Route20.asm b/maps/Route20.asm
index e7a776b2b..8339bb5d0 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE20_SWIMMER_GIRL1
 	const ROUTE20_SWIMMER_GIRL2
 	const ROUTE20_SWIMMER_GUY
 
 Route20_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .ClearRocks
 
 .ClearRocks:
@@ -16,10 +14,10 @@ Route20_MapScripts:
 	return
 
 TrainerSwimmerfNicole:
-	trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script
+	trainer SWIMMERF, NICOLE, EVENT_BEAT_SWIMMERF_NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfNicoleAfterBattleText
 	waitbutton
@@ -27,10 +25,10 @@ TrainerSwimmerfNicole:
 	end
 
 TrainerSwimmerfLori:
-	trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script
+	trainer SWIMMERF, LORI, EVENT_BEAT_SWIMMERF_LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfLoriAfterBattleText
 	waitbutton
@@ -38,10 +36,10 @@ TrainerSwimmerfLori:
 	end
 
 TrainerSwimmermCameron:
-	trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script
+	trainer SWIMMERM, CAMERON, EVENT_BEAT_SWIMMERM_CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermCameronAfterBattleText
 	waitbutton
@@ -113,22 +111,17 @@ CinnabarGymSignText:
 	done
 
 Route20_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 38, 7, 1, SEAFOAM_GYM
+	db 1 ; warp events
+	warp_event 38,  7, SEAFOAM_GYM, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 37, 11, BGEVENT_READ, CinnabarGymSign
 
-.ObjectEvents:
-	db 3
-	object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1
+	db 3 ; object events
+	object_event 52,  8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1
 	object_event 45, 13, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1
 	object_event 12, 13, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1
diff --git a/maps/Route21.asm b/maps/Route21.asm
index e6b4eb564..68c15c526 100644
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -1,20 +1,18 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE21_SWIMMER_GIRL
 	const ROUTE21_SWIMMER_GUY
 	const ROUTE21_FISHER
 
 Route21_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerSwimmermSeth:
-	trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script
+	trainer SWIMMERM, SETH, EVENT_BEAT_SWIMMERM_SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermSethAfterBattleText
 	waitbutton
@@ -22,10 +20,10 @@ TrainerSwimmermSeth:
 	end
 
 TrainerSwimmerfNikki:
-	trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script
+	trainer SWIMMERF, NIKKI, EVENT_BEAT_SWIMMERF_NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfNikkiAfterBattleText
 	waitbutton
@@ -33,10 +31,10 @@ TrainerSwimmerfNikki:
 	end
 
 TrainerFisherArnold:
-	trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script
+	trainer FISHER, ARNOLD, EVENT_BEAT_FISHER_ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherArnoldAfterBattleText
 	waitbutton
@@ -90,20 +88,15 @@ FisherArnoldAfterBattleText:
 	done
 
 Route21_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
+	db 3 ; object events
 	object_event 11, 16, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1
-	object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1
+	object_event  2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1
 	object_event 14, 22, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1
diff --git a/maps/Route22.asm b/maps/Route22.asm
index c9d520cb1..8402f5e4c 100644
--- a/maps/Route22.asm
+++ b/maps/Route22.asm
@@ -1,9 +1,7 @@
 Route22_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VictoryRoadEntranceSign:
 	jumptext VictoryRoadEntranceSignText
@@ -16,19 +14,14 @@ VictoryRoadEntranceSignText:
 	done
 
 Route22_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 13, 5, 1, VICTORY_ROAD_GATE
+	db 1 ; warp events
+	warp_event 13,  5, VICTORY_ROAD_GATE, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 15, 7, BGEVENT_READ, VictoryRoadEntranceSign
+	db 1 ; bg events
+	bg_event 15,  7, BGEVENT_READ, VictoryRoadEntranceSign
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route23.asm b/maps/Route23.asm
index 99c527303..86e5935f3 100644
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -1,9 +1,7 @@
 Route23_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -23,22 +21,17 @@ IndigoPlateauSignText:
 	done
 
 Route23_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F
-	warp_def 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F
-	warp_def 9, 13, 10, VICTORY_ROAD
-	warp_def 10, 13, 10, VICTORY_ROAD
+	db 4 ; warp events
+	warp_event  9,  5, INDIGO_PLATEAU_POKECENTER_1F, 1
+	warp_event 10,  5, INDIGO_PLATEAU_POKECENTER_1F, 2
+	warp_event  9, 13, VICTORY_ROAD, 10
+	warp_event 10, 13, VICTORY_ROAD, 10
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 11, 7, BGEVENT_READ, IndigoPlateauSign
+	db 1 ; bg events
+	bg_event 11,  7, BGEVENT_READ, IndigoPlateauSign
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route24.asm b/maps/Route24.asm
index afb4a514e..227503e73 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE24_ROCKET
 
 Route24_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-RocketScript_0x1adbfa:
+Route24RocketScript:
 	faceplayer
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	opentext
@@ -24,15 +22,15 @@ RocketScript_0x1adbfa:
 	opentext
 	writetext UnknownText_0x1addc0
 	buttonsound
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	writetext UnknownText_0x1adee1
 	waitbutton
 	closetext
-	special Special_FadeBlackQuickly
+	special FadeBlackQuickly
 	special ReloadSpritesNoPalettes
 	disappear ROUTE24_ROCKET
 	pause 25
-	special Special_FadeInQuickly
+	special FadeInQuickly
 	playmapmusic
 	end
 
@@ -119,18 +117,13 @@ UnknownText_0x1adee1:
 	done
 
 Route24_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 0
+	db 0 ; warp events
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET
+	db 1 ; object events
+	object_event  8,  7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route24RocketScript, EVENT_ROUTE_24_ROCKET
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 1183600c9..20179b4b4 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE25_MISTY
 	const ROUTE25_COOLTRAINER_M1
 	const ROUTE25_YOUNGSTER1
@@ -12,13 +12,11 @@ const_value set 2
 	const ROUTE25_POKE_BALL
 
 Route25_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_ROUTE25_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE25_MISTYS_DATE
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -30,25 +28,25 @@ Route25MistyDate1Script:
 	showemote EMOTE_HEART, ROUTE25_MISTY, 15
 	pause 30
 	showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
-	spriteface ROUTE25_MISTY, DOWN
+	turnobject ROUTE25_MISTY, DOWN
 	applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efe8
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
-	spriteface ROUTE25_MISTY, UP
+	turnobject ROUTE25_MISTY, UP
 	pause 10
 	applymovement ROUTE25_MISTY, MovementData_0x19efed
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement ROUTE25_MISTY, MovementData_0x19effa
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement ROUTE25_MISTY, MovementData_0x19f000
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
-	setscene 0
+	setscene SCENE_ROUTE25_NOTHING
 	special RestartMapMusic
 	end
 
@@ -56,33 +54,33 @@ Route25MistyDate2Script:
 	showemote EMOTE_HEART, ROUTE25_MISTY, 15
 	pause 30
 	showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
-	spriteface ROUTE25_MISTY, DOWN
+	turnobject ROUTE25_MISTY, DOWN
 	applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efea
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
-	spriteface ROUTE25_MISTY, UP
+	turnobject ROUTE25_MISTY, UP
 	pause 10
 	applymovement ROUTE25_MISTY, MovementData_0x19eff4
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement ROUTE25_MISTY, MovementData_0x19effd
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement ROUTE25_MISTY, MovementData_0x19f000
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
-	setscene 0
+	setscene SCENE_ROUTE25_NOTHING
 	special RestartMapMusic
 	end
 
 TrainerSchoolboyDudley:
-	trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script
+	trainer SCHOOLBOY, DUDLEY, EVENT_BEAT_SCHOOLBOY_DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyDudleyAfterBattleText
 	waitbutton
@@ -90,10 +88,10 @@ TrainerSchoolboyDudley:
 	end
 
 TrainerLassEllen:
-	trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script
+	trainer LASS, ELLEN, EVENT_BEAT_LASS_ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassEllenAfterBattleText
 	waitbutton
@@ -101,10 +99,10 @@ TrainerLassEllen:
 	end
 
 TrainerSchoolboyJoe:
-	trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script
+	trainer SCHOOLBOY, JOE, EVENT_BEAT_SCHOOLBOY_JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SchoolboyJoeAfterBattleText
 	waitbutton
@@ -112,10 +110,10 @@ TrainerSchoolboyJoe:
 	end
 
 TrainerLassLaura:
-	trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script
+	trainer LASS, LAURA, EVENT_BEAT_LASS_LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassLauraAfterBattleText
 	waitbutton
@@ -123,10 +121,10 @@ TrainerLassLaura:
 	end
 
 TrainerCamperLloyd:
-	trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script
+	trainer CAMPER, LLOYD, EVENT_BEAT_CAMPER_LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperLloydAfterBattleText
 	waitbutton
@@ -134,10 +132,10 @@ TrainerCamperLloyd:
 	end
 
 TrainerLassShannon:
-	trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script
+	trainer LASS, SHANNON, EVENT_BEAT_LASS_SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext LassShannonAfterBattleText
 	waitbutton
@@ -145,10 +143,10 @@ TrainerLassShannon:
 	end
 
 TrainerSupernerdPat:
-	trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script
+	trainer SUPER_NERD, PAT, EVENT_BEAT_SUPER_NERD_PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdPatAfterBattleText
 	waitbutton
@@ -191,7 +189,7 @@ Route25Protein:
 	itemball PROTEIN
 
 Route25HiddenPotion:
-	hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION
+	hiddenitem POTION, EVENT_ROUTE_25_HIDDEN_POTION
 
 MovementData_0x19efe8:
 	big_step DOWN
@@ -430,33 +428,28 @@ BillsHouseSignText:
 	done
 
 Route25_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 1
-	warp_def 47, 5, 1, BILLS_HOUSE
-
-.CoordEvents:
-	db 2
-	coord_event 42, 6, 1, Route25MistyDate1Script
-	coord_event 42, 7, 1, Route25MistyDate2Script
-
-.BGEvents:
-	db 2
-	bg_event 45, 5, BGEVENT_READ, BillsHouseSign
-	bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion
-
-.ObjectEvents:
-	db 11
-	object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
+	db 0, 0 ; filler
+
+	db 1 ; warp events
+	warp_event 47,  5, BILLS_HOUSE, 1
+
+	db 2 ; coord events
+	coord_event 42,  6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script
+	coord_event 42,  7, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate2Script
+
+	db 2 ; bg events
+	bg_event 45,  5, BGEVENT_READ, BillsHouseSign
+	bg_event  4,  5, BGEVENT_ITEM, Route25HiddenPotion
+
+	db 11 ; object events
+	object_event 46,  9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
 	object_event 46, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND
-	object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1
+	object_event 12,  8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1
 	object_event 16, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassEllen, -1
-	object_event 21, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1
-	object_event 22, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1
-	object_event 25, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1
+	object_event 21,  8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1
+	object_event 22,  6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1
+	object_event 25,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1
 	object_event 28, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1
-	object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1
-	object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1
-	object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN
+	object_event 31,  7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1
+	object_event 37,  8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1
+	object_event 32,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 25b04283b..1d1f81534 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE26_COOLTRAINER_M1
 	const ROUTE26_COOLTRAINER_M2
 	const ROUTE26_COOLTRAINER_F1
@@ -9,17 +9,15 @@ const_value set 2
 	const ROUTE26_POKE_BALL
 
 Route26_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerCooltrainermJake:
-	trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script
+	trainer COOLTRAINERM, JAKE, EVENT_BEAT_COOLTRAINERM_JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermJakeAfterBattleText
 	waitbutton
@@ -27,11 +25,11 @@ TrainerCooltrainermJake:
 	end
 
 TrainerCooltrainermGaven3:
-	trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script
+	trainer COOLTRAINERM, GAVEN3, EVENT_BEAT_COOLTRAINERM_GAVEN, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_GAVEN
 	iftrue .WantsBattle
@@ -49,8 +47,8 @@ TrainerCooltrainermGaven3:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_COOLTRAINERM_GAVEN
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -59,9 +57,9 @@ TrainerCooltrainermGaven3:
 	scall .Rematch
 	winlosstext CooltrainermGaven3BeatenText, 0
 	copybytetovar wGavenFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -120,10 +118,10 @@ TrainerCooltrainermGaven3:
 	end
 
 TrainerCooltrainerfJoyce:
-	trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script
+	trainer COOLTRAINERF, JOYCE, EVENT_BEAT_COOLTRAINERF_JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfJoyceAfterBattleText
 	waitbutton
@@ -131,11 +129,11 @@ TrainerCooltrainerfJoyce:
 	end
 
 TrainerCooltrainerfBeth1:
-	trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script
+	trainer COOLTRAINERF, BETH1, EVENT_BEAT_COOLTRAINERF_BETH, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_BETH
 	iftrue .WantsBattle
@@ -153,8 +151,8 @@ TrainerCooltrainerfBeth1:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_COOLTRAINERF_BETH
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -163,9 +161,9 @@ TrainerCooltrainerfBeth1:
 	scall .Rematch
 	winlosstext CooltrainerfBeth1BeatenText, 0
 	copybytetovar wBethFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -224,10 +222,10 @@ TrainerCooltrainerfBeth1:
 	end
 
 TrainerPsychicRichard:
-	trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script
+	trainer PSYCHIC_T, RICHARD, EVENT_BEAT_PSYCHIC_RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicRichardAfterBattleText
 	waitbutton
@@ -235,10 +233,10 @@ TrainerPsychicRichard:
 	end
 
 TrainerFisherScott:
-	trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script
+	trainer FISHER, SCOTT, EVENT_BEAT_FISHER_SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherScottAfterBattleText
 	waitbutton
@@ -248,7 +246,7 @@ TrainerFisherScott:
 Route26Sign:
 	jumptext Route26SignText
 
-FruitTreeScript_0x1a4ec2:
+Route26FruitTree:
 	fruittree FRUITTREE_ROUTE_26
 
 Route26MaxElixer:
@@ -413,29 +411,24 @@ Route26SignText:
 	done
 
 Route26_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 7, 5, 3, VICTORY_ROAD_GATE
-	warp_def 15, 57, 1, ROUTE_26_HEAL_SPEECH_HOUSE
-	warp_def 5, 71, 1, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE
+	db 3 ; warp events
+	warp_event  7,  5, VICTORY_ROAD_GATE, 3
+	warp_event 15, 57, ROUTE_26_HEAL_HOUSE, 1
+	warp_event  5, 71, DAY_OF_WEEK_SIBLINGS_HOUSE, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 8, 6, BGEVENT_READ, Route26Sign
+	db 1 ; bg events
+	bg_event  8,  6, BGEVENT_READ, Route26Sign
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 14, 24, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1
-	object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1
+	object_event  9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1
 	object_event 10, 56, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1
-	object_event 5, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1
+	object_event  5,  8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1
 	object_event 13, 79, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicRichard, -1
 	object_event 10, 92, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherScott, -1
-	object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1
-	object_event 9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER
+	object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route26FruitTree, -1
+	object_event  9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER
diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm
deleted file mode 100644
index e958d81f2..000000000
--- a/maps/Route26DayofWeekSiblingsHouse.asm
+++ /dev/null
@@ -1,90 +0,0 @@
-const_value set 2
-	const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX
-
-Route26DayofWeekSiblingsHouse_MapScripts:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 0
-
-PokedexScript_0x7b1e4:
-	opentext
-	writetext UnknownText_0x7b1f9
-	yesorno
-	iffalse UnknownText_0x7b1f7
-	writetext UnknownText_0x7b222
-	yesorno
-	iffalse UnknownText_0x7b1f7
-	writetext UnknownText_0x7b2b9
-	waitbutton
-UnknownText_0x7b1f7:
-	closetext
-	end
-
-UnknownText_0x7b1f9:
-	text "There's something"
-	line "written here."
-
-	para "Read it?"
-	done
-
-UnknownText_0x7b222:
-	text "To my brothers and"
-	line "sisters:"
-
-	para "We take pride in"
-	line "serving #MON"
-	cont "trainers."
-
-	para "When trainers talk"
-	line "to you, give them"
-	cont "something useful."
-
-	para "Love,"
-	line "MONICA"
-
-	para "Keep reading?"
-	done
-
-UnknownText_0x7b2b9:
-	text "Monday, MONICA"
-	line "ROUTE 40"
-
-	para "Tuesday, TUSCANY"
-	line "ROUTE 29"
-
-	para "Wednesday, WESLEY"
-	line "LAKE OF RAGE"
-
-	para "Thursday, ARTHUR"
-	line "ROUTE 36"
-
-	para "Friday, FRIEDA"
-	line "ROUTE 32"
-
-	para "Saturday, SANTOS"
-	line "BLACKTHORN CITY"
-
-	para "Sunday, SUNNY"
-	line "ROUTE 37"
-	done
-
-Route26DayofWeekSiblingsHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 3, ROUTE_26
-	warp_def 3, 7, 3, ROUTE_26
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1
diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm
new file mode 100644
index 000000000..c90025032
--- /dev/null
+++ b/maps/Route26HealHouse.asm
@@ -0,0 +1,63 @@
+	const_def 2 ; object constants
+	const ROUTE26HEALHOUSE_TEACHER
+
+Route26HealHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+Route26HealHouseTeacherScript:
+	faceplayer
+	opentext
+	writetext UnknownText_0x7b14d
+	waitbutton
+	closetext
+	special FadeBlackQuickly
+	special ReloadSpritesNoPalettes
+	special StubbedTrainerRankings_Healings
+	playmusic MUSIC_HEAL
+	special HealParty
+	pause 60
+	special FadeInQuickly
+	special RestartMapMusic
+	opentext
+	writetext UnknownText_0x7b18b
+	waitbutton
+	closetext
+	end
+
+Route26HealHouseBookshelf:
+	jumpstd picturebookshelf
+
+UnknownText_0x7b14d:
+	text "Your #MON look"
+	line "a little tired."
+
+	para "You should rest"
+	line "them a while."
+	done
+
+UnknownText_0x7b18b:
+	text "There!"
+
+	para "Your #MON are"
+	line "looking good!"
+
+	para "Keep at it!"
+	done
+
+Route26HealHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_26, 2
+	warp_event  3,  7, ROUTE_26, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, Route26HealHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, Route26HealHouseBookshelf
+
+	db 1 ; object events
+	object_event  2,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route26HealHouseTeacherScript, -1
diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm
deleted file mode 100644
index d1759dc9d..000000000
--- a/maps/Route26HealSpeechHouse.asm
+++ /dev/null
@@ -1,70 +0,0 @@
-const_value set 2
-	const ROUTE26HEALSPEECHHOUSE_TEACHER
-
-Route26HealSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 0
-
-TeacherScript_0x7b125:
-	faceplayer
-	opentext
-	writetext UnknownText_0x7b14d
-	waitbutton
-	closetext
-	special Special_FadeBlackQuickly
-	special ReloadSpritesNoPalettes
-	special Special_StubbedTrainerRankings_Healings
-	playmusic MUSIC_HEAL
-	special HealParty
-	pause 60
-	special Special_FadeInQuickly
-	special RestartMapMusic
-	opentext
-	writetext UnknownText_0x7b18b
-	waitbutton
-	closetext
-	end
-
-Route26HealHouseBookshelf:
-	jumpstd picturebookshelf
-
-UnknownText_0x7b14d:
-	text "Your #MON look"
-	line "a little tired."
-
-	para "You should rest"
-	line "them a while."
-	done
-
-UnknownText_0x7b18b:
-	text "There!"
-
-	para "Your #MON are"
-	line "looking good!"
-
-	para "Keep at it!"
-	done
-
-Route26HealSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 2, ROUTE_26
-	warp_def 3, 7, 2, ROUTE_26
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf
-
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1
diff --git a/maps/Route27.asm b/maps/Route27.asm
index 7df5d61a6..bd39db0b7 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE27_COOLTRAINER_M1
 	const ROUTE27_COOLTRAINER_M2
 	const ROUTE27_COOLTRAINER_F1
@@ -10,13 +10,11 @@ const_value set 2
 	const ROUTE27_FISHER
 
 Route27_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -24,35 +22,35 @@ Route27_MapScripts:
 .DummyScene1:
 	end
 
-UnknownScript_0x1a0873:
-	spriteface ROUTE27_FISHER, LEFT
+FirstStepIntoKantoLeftScene:
+	turnobject ROUTE27_FISHER, LEFT
 	showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
 	applymovement ROUTE27_FISHER, MovementData_0x1a0a66
-	jump UnknownScript_0x1a088c
+	jump FirstStepIntoKantoScene_Continue
 
-UnknownScript_0x1a0881:
-	spriteface ROUTE27_FISHER, LEFT
+FirstStepIntoKantoRightScene:
+	turnobject ROUTE27_FISHER, LEFT
 	showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
 	applymovement ROUTE27_FISHER, MovementData_0x1a0a69
-UnknownScript_0x1a088c:
-	spriteface PLAYER, RIGHT
+FirstStepIntoKantoScene_Continue:
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext Route27FisherHeyText
 	buttonsound
 	writetext Route27FisherText
 	waitbutton
 	closetext
-	setscene 1
+	setscene SCENE_FINISHED
 	end
 
 Route27FisherScript:
 	jumptextfaceplayer Route27FisherText
 
 TrainerPsychicGilbert:
-	trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script
+	trainer PSYCHIC_T, GILBERT, EVENT_BEAT_PSYCHIC_GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicGilbertAfterBattleText
 	waitbutton
@@ -60,11 +58,11 @@ TrainerPsychicGilbert:
 	end
 
 TrainerBirdKeeperJose2:
-	trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, BirdKeeperJose2SeenText, BirdKeeperJose2BeatenText, 0, .Script
+	trainer BIRD_KEEPER, JOSE2, EVENT_BEAT_BIRD_KEEPER_JOSE2, BirdKeeperJose2SeenText, BirdKeeperJose2BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_JOSE
 	iftrue .WantsBattle
@@ -84,8 +82,8 @@ TrainerBirdKeeperJose2:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_BIRDKEEPER_JOSE
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -94,9 +92,9 @@ TrainerBirdKeeperJose2:
 	scall .Rematch
 	winlosstext BirdKeeperJose2BeatenText, 0
 	copybytetovar wJoseFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -173,10 +171,10 @@ TrainerBirdKeeperJose2:
 	end
 
 TrainerCooltrainermBlake:
-	trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script
+	trainer COOLTRAINERM, BLAKE, EVENT_BEAT_COOLTRAINERM_BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermBlakeAfterBattleText
 	waitbutton
@@ -184,10 +182,10 @@ TrainerCooltrainermBlake:
 	end
 
 TrainerCooltrainermBrian:
-	trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script
+	trainer COOLTRAINERM, BRIAN, EVENT_BEAT_COOLTRAINERM_BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermBrianAfterBattleText
 	waitbutton
@@ -195,11 +193,11 @@ TrainerCooltrainermBrian:
 	end
 
 TrainerCooltrainerfReena:
-	trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReenaSeenText, CooltrainerfReenaBeatenText, 0, .Script
+	trainer COOLTRAINERF, REENA1, EVENT_BEAT_COOLTRAINERF_REENA, CooltrainerfReenaSeenText, CooltrainerfReenaBeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_REENA
 	iftrue .WantsBattle
@@ -217,8 +215,8 @@ TrainerCooltrainerfReena:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_COOLTRAINERF_REENA
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -227,9 +225,9 @@ TrainerCooltrainerfReena:
 	scall .Rematch
 	winlosstext CooltrainerfReenaBeatenText, 0
 	copybytetovar wReenaFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -288,10 +286,10 @@ TrainerCooltrainerfReena:
 	end
 
 TrainerCooltrainerfMegan:
-	trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script
+	trainer COOLTRAINERF, MEGAN, EVENT_BEAT_COOLTRAINERF_MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfMeganAfterBattleText
 	waitbutton
@@ -468,32 +466,27 @@ TohjoFallsSignText:
 	done
 
 Route27_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE
-	warp_def 26, 5, 1, TOHJO_FALLS
-	warp_def 36, 5, 2, TOHJO_FALLS
-
-.CoordEvents:
-	db 2
-	coord_event 18, 10, 0, UnknownScript_0x1a0873
-	coord_event 19, 10, 0, UnknownScript_0x1a0881
-
-.BGEvents:
-	db 1
-	bg_event 25, 7, BGEVENT_READ, TohjoFallsSign
-
-.ObjectEvents:
-	db 9
-	object_event 48, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1
-	object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event 33,  7, ROUTE_27_SANDSTORM_HOUSE, 1
+	warp_event 26,  5, TOHJO_FALLS, 1
+	warp_event 36,  5, TOHJO_FALLS, 2
+
+	db 2 ; coord events
+	coord_event 18, 10, SCENE_DEFAULT, FirstStepIntoKantoLeftScene
+	coord_event 19, 10, SCENE_DEFAULT, FirstStepIntoKantoRightScene
+
+	db 1 ; bg events
+	bg_event 25,  7, BGEVENT_READ, TohjoFallsSign
+
+	db 9 ; object events
+	object_event 48,  7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1
+	object_event 58,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1
 	object_event 72, 10, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1
-	object_event 37, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1
-	object_event 65, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1
+	object_event 37,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1
+	object_event 65,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1
 	object_event 58, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperJose2, -1
-	object_event 60, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM
-	object_event 53, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY
+	object_event 60, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM
+	object_event 53, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY
 	object_event 21, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 3, Route27FisherScript, -1
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 629af1536..886e7aa26 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -1,22 +1,20 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE27SANDSTORMHOUSE_GRANNY
 
 Route27SandstormHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SandstormHouseWoman:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_TM37_SANDSTORM
 	iftrue .AlreadyGotItem
-	special Special_GetFirstPokemonHappiness
+	special GetFirstPokemonHappiness
 	writetext SandstormHouseWomanText1
 	buttonsound
-	if_greater_than 150 - 1, .Loyal
+	ifgreater 150 - 1, .Loyal
 	jump .Disloyal
 
 .Loyal:
@@ -94,22 +92,17 @@ SandstormHouseWomanDisloyalText:
 	done
 
 Route27SandstormHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, ROUTE_27
-	warp_def 3, 7, 1, ROUTE_27
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_27, 1
+	warp_event  3,  7, ROUTE_27, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, SandstormHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, SandstormHouseBookshelf
 
-.ObjectEvents:
-	db 1
-	object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1
+	db 1 ; object events
+	object_event  2,  4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1
diff --git a/maps/Route28.asm b/maps/Route28.asm
index 0599fd9d9..af41de7c5 100644
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -1,36 +1,29 @@
 Route28_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route28Sign:
 	jumptext Route28SignText
 
 Route28HiddenRareCandy:
-	hiddenitem EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY
+	hiddenitem RARE_CANDY, EVENT_ROUTE_28_HIDDEN_RARE_CANDY
 
 Route28SignText:
 	text "ROUTE 28"
 	done
 
 Route28_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 7, 3, 1, ROUTE_28_FAMOUS_SPEECH_HOUSE
-	warp_def 33, 5, 7, VICTORY_ROAD_GATE
+	db 2 ; warp events
+	warp_event  7,  3, ROUTE_28_STEEL_WING_HOUSE, 1
+	warp_event 33,  5, VICTORY_ROAD_GATE, 7
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 31, 5, BGEVENT_READ, Route28Sign
-	bg_event 25, 2, BGEVENT_ITEM, Route28HiddenRareCandy
+	db 2 ; bg events
+	bg_event 31,  5, BGEVENT_READ, Route28Sign
+	bg_event 25,  2, BGEVENT_ITEM, Route28HiddenRareCandy
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28SteelWingHouse.asm
index 662e7279b..a62f94d52 100644
--- a/maps/Route28FamousSpeechHouse.asm
+++ b/maps/Route28SteelWingHouse.asm
@@ -1,14 +1,12 @@
-const_value set 2
-	const ROUTE28FAMOUSSPEECHHOUSE_CELEBRITY
-	const ROUTE28FAMOUSSPEECHHOUSE_FEAROW
+	const_def 2 ; object constants
+	const ROUTE28STEELWINGHOUSE_CELEBRITY
+	const ROUTE28STEELWINGHOUSE_FEAROW
 
-Route28FamousSpeechHouse_MapScripts:
-.SceneScripts:
-	db 1
+Route28SteelWingHouse_MapScripts:
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -70,24 +68,19 @@ CelebritysFearowText:
 	text "FEAROW: Feero!"
 	done
 
-Route28FamousSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+Route28SteelWingHouse_MapEvents:
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, ROUTE_28
-	warp_def 3, 7, 1, ROUTE_28
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_28, 1
+	warp_event  3,  7, ROUTE_28, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, CelebrityHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, CelebrityHouseBookshelf
 
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1
-	object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1
+	db 2 ; object events
+	object_event  2,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1
+	object_event  6,  5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 6c7239d92..1a1f83e94 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE29_COOLTRAINER_M1
 	const ROUTE29_YOUNGSTER
 	const ROUTE29_TEACHER1
@@ -9,13 +9,11 @@ const_value set 2
 	const ROUTE29_POKE_BALL
 
 Route29_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_ROUTE29_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE29_CATCH_TUTORIAL
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Tuscany
 
 .DummyScene0:
@@ -34,15 +32,15 @@ Route29_MapScripts:
 
 .DoesTuscanyAppear:
 	checkcode VAR_WEEKDAY
-	if_not_equal TUESDAY, .TuscanyDisappears
+	ifnotequal TUESDAY, .TuscanyDisappears
 	appear ROUTE29_TUSCANY
 	return
 
 Route29Tutorial1:
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	turnobject ROUTE29_COOLTRAINER_M1, UP
 	showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1a
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	setevent EVENT_DUDE_TALKED_TO_YOU
 	opentext
 	writetext CatchingTutorialIntroText
@@ -54,20 +52,20 @@ Route29Tutorial1:
 	stopfollow
 	loadwildmon RATTATA, 5
 	catchtutorial BATTLETYPE_TUTORIAL
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	turnobject ROUTE29_COOLTRAINER_M1, UP
 	opentext
 	writetext CatchingTutorialDebriefText
 	waitbutton
 	closetext
-	setscene 0
+	setscene SCENE_ROUTE29_NOTHING
 	setevent EVENT_LEARNED_TO_CATCH_POKEMON
 	end
 
 Route29Tutorial2:
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	turnobject ROUTE29_COOLTRAINER_M1, UP
 	showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2a
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	setevent EVENT_DUDE_TALKED_TO_YOU
 	opentext
 	writetext CatchingTutorialIntroText
@@ -79,12 +77,12 @@ Route29Tutorial2:
 	stopfollow
 	loadwildmon RATTATA, 5
 	catchtutorial BATTLETYPE_TUTORIAL
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	turnobject ROUTE29_COOLTRAINER_M1, UP
 	opentext
 	writetext CatchingTutorialDebriefText
 	waitbutton
 	closetext
-	setscene 0
+	setscene SCENE_ROUTE29_NOTHING
 	setevent EVENT_LEARNED_TO_CATCH_POKEMON
 	end
 
@@ -93,7 +91,7 @@ Script_RefusedTutorial1:
 	waitbutton
 	closetext
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b
-	setscene 0
+	setscene SCENE_ROUTE29_NOTHING
 	end
 
 Script_RefusedTutorial2:
@@ -101,14 +99,14 @@ Script_RefusedTutorial2:
 	waitbutton
 	closetext
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b
-	setscene 0
+	setscene SCENE_ROUTE29_NOTHING
 	end
 
 CatchingTutorialDudeScript:
 	faceplayer
 	opentext
 	checkcode VAR_BOXSPACE
-	if_equal 0, .BoxFull
+	ifequal 0, .BoxFull
 	checkevent EVENT_LEARNED_TO_CATCH_POKEMON
 	iftrue .BoxFull
 	checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
@@ -147,21 +145,21 @@ Route29TeacherScript:
 Route29FisherScript:
 	jumptextfaceplayer Route29FisherText
 
-CooltrainerMScript_0x1a1031:
+Route29CooltrainerMScript:
 	faceplayer
 	opentext
-	checkday
+	checktime DAY
 	iftrue .day_morn
-	checknite
+	checktime NITE
 	iftrue .nite
 .day_morn
-	writetext Text_WaitingForNight
+	writetext Route29CooltrainerMText_WaitingForNight
 	waitbutton
 	closetext
 	end
 
 .nite
-	writetext Text_WaitingForMorning
+	writetext Route29CooltrainerMText_WaitingForMorning
 	waitbutton
 	closetext
 	end
@@ -172,7 +170,7 @@ TuscanyScript:
 	checkevent EVENT_GOT_PINK_BOW_FROM_TUSCANY
 	iftrue TuscanyTuesdayScript
 	checkcode VAR_WEEKDAY
-	if_not_equal TUESDAY, TuscanyNotTuesdayScript
+	ifnotequal TUESDAY, TuscanyNotTuesdayScript
 	checkevent EVENT_MET_TUSCANY_OF_TUESDAY
 	iftrue .MetTuscany
 	writetext MeetTuscanyText
@@ -333,7 +331,7 @@ Text_WaitingForDay:
 	line "daytime."
 	done
 
-Text_WaitingForNight:
+Route29CooltrainerMText_WaitingForNight:
 	text "I'm waiting for"
 	line "#MON that"
 
@@ -341,7 +339,7 @@ Text_WaitingForNight:
 	line "night."
 	done
 
-Text_WaitingForMorning:
+Route29CooltrainerMText_WaitingForMorning:
 	text "I'm waiting for"
 	line "#MON that"
 
@@ -416,30 +414,25 @@ Route29Sign2Text:
 	done
 
 Route29_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 27, 1, 3, ROUTE_29_ROUTE_46_GATE
+	db 1 ; warp events
+	warp_event 27,  1, ROUTE_29_ROUTE_46_GATE, 3
 
-.CoordEvents:
-	db 2
-	coord_event 53, 8, 1, Route29Tutorial1
-	coord_event 53, 9, 1, Route29Tutorial2
+	db 2 ; coord events
+	coord_event 53,  8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1
+	coord_event 53,  9, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial2
 
-.BGEvents:
-	db 2
-	bg_event 51, 7, BGEVENT_READ, Route29Sign1
-	bg_event 3, 5, BGEVENT_READ, Route29Sign2
+	db 2 ; bg events
+	bg_event 51,  7, BGEVENT_READ, Route29Sign1
+	bg_event  3,  5, BGEVENT_READ, Route29Sign2
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 50, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1
 	object_event 27, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1
 	object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1
-	object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1
-	object_event 25, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1
-	object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1
+	object_event 12,  2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1
+	object_event 25,  3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1
+	object_event 13,  4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29CooltrainerMScript, -1
 	object_event 29, 12, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY
-	object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION
+	object_event 48,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION
diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm
index f0b69ab5d..f575df1ca 100644
--- a/maps/Route29Route46Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE29ROUTE46GATE_OFFICER
 	const ROUTE29ROUTE46GATE_YOUNGSTER
 
 Route29Route46Gate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route29Route46GateOfficerScript:
 	jumptextfaceplayer Route29Route46GateOfficerText
@@ -37,23 +35,18 @@ Route29Route46GateYoungsterText:
 	done
 
 Route29Route46Gate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 4, 0, 1, ROUTE_46
-	warp_def 5, 0, 2, ROUTE_46
-	warp_def 4, 7, 1, ROUTE_29
-	warp_def 5, 7, 1, ROUTE_29
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 2
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1
-	object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  4,  0, ROUTE_46, 1
+	warp_event  5,  0, ROUTE_46, 2
+	warp_event  4,  7, ROUTE_29, 1
+	warp_event  5,  7, ROUTE_29, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1
+	object_event  6,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1
diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm
index 60585b267..1b665799f 100644
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE2GATE_SCIENTIST
 
 Route2Gate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route2GateScientistScript:
 	jumptextfaceplayer Route2GateScientistText
@@ -26,22 +24,17 @@ Route2GateScientistText:
 	done
 
 Route2Gate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 4, 0, 3, ROUTE_2
-	warp_def 5, 0, 4, ROUTE_2
-	warp_def 4, 7, 2, ROUTE_2
-	warp_def 5, 7, 2, ROUTE_2
+	db 4 ; warp events
+	warp_event  4,  0, ROUTE_2, 3
+	warp_event  5,  0, ROUTE_2, 4
+	warp_event  4,  7, ROUTE_2, 2
+	warp_event  5,  7, ROUTE_2, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1
+	db 1 ; object events
+	object_event  6,  4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1
diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm
new file mode 100644
index 000000000..2fa4b8922
--- /dev/null
+++ b/maps/Route2NuggetHouse.asm
@@ -0,0 +1,65 @@
+	const_def 2 ; object constants
+	const ROUTE2NUGGETHOUSE_FISHER
+
+Route2NuggetHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+Route2NuggetHouseFisherScript:
+	faceplayer
+	opentext
+	checkevent EVENT_GOT_NUGGET_FROM_GUY
+	iftrue .GotNugget
+	writetext Route2NuggetHouseFisherText
+	buttonsound
+	verbosegiveitem NUGGET
+	iffalse .NoRoom
+	setevent EVENT_GOT_NUGGET_FROM_GUY
+.GotNugget:
+	writetext Route2NuggetHouseFisherText_GotNugget
+	waitbutton
+.NoRoom:
+	closetext
+	end
+
+Route2NuggetHouseBookshelf:
+; unused
+	jumpstd difficultbookshelf
+
+Route2NuggetHouseFisherText:
+	text "Hi! Wow, I'm glad"
+	line "to see you."
+
+	para "You're the first"
+	line "visitor I've had"
+	cont "in a long time."
+
+	para "I'm super-happy!"
+	line "Let me give you a"
+	cont "little present."
+	done
+
+Route2NuggetHouseFisherText_GotNugget:
+	text "That's a NUGGET."
+
+	para "I can't give you"
+	line "any nuggets of"
+
+	para "wisdom, so that'll"
+	line "have to do!"
+	done
+
+Route2NuggetHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_2, 1
+	warp_event  3,  7, ROUTE_2, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event  2,  4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2NuggetHouseFisherScript, -1
diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm
deleted file mode 100644
index 231b568ed..000000000
--- a/maps/Route2NuggetSpeechHouse.asm
+++ /dev/null
@@ -1,72 +0,0 @@
-const_value set 2
-	const ROUTE2NUGGETSPEECHHOUSE_FISHER
-
-Route2NuggetSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 0
-
-FisherScript_0x9b847:
-	faceplayer
-	opentext
-	checkevent EVENT_GOT_NUGGET_FROM_GUY
-	iftrue .GotItem
-	writetext UnknownText_0x9b865
-	buttonsound
-	verbosegiveitem NUGGET
-	iffalse .Done
-	setevent EVENT_GOT_NUGGET_FROM_GUY
-.GotItem:
-	writetext UnknownText_0x9b8e5
-	waitbutton
-.Done:
-	closetext
-	end
-
-Route2NuggetSpeechHouseBookshelf:
-; unused
-	jumpstd difficultbookshelf
-
-UnknownText_0x9b865:
-	text "Hi! Wow, I'm glad"
-	line "to see you."
-
-	para "You're the first"
-	line "visitor I've had"
-	cont "in a long time."
-
-	para "I'm super-happy!"
-	line "Let me give you a"
-	cont "little present."
-	done
-
-UnknownText_0x9b8e5:
-	text "That's a NUGGET."
-
-	para "I can't give you"
-	line "any nuggets of"
-
-	para "wisdom, so that'll"
-	line "have to do!"
-	done
-
-Route2NuggetSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 1, ROUTE_2
-	warp_def 3, 7, 1, ROUTE_2
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1
diff --git a/maps/Route3.asm b/maps/Route3.asm
index 6ce01aeb1..dbc9b19d1 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -1,21 +1,19 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE3_FISHER1
 	const ROUTE3_YOUNGSTER1
 	const ROUTE3_YOUNGSTER2
 	const ROUTE3_FISHER2
 
 Route3_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerFirebreatherOtis:
-	trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script
+	trainer FIREBREATHER, OTIS, EVENT_BEAT_FIREBREATHER_OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherOtisAfterBattleText
 	waitbutton
@@ -23,10 +21,10 @@ TrainerFirebreatherOtis:
 	end
 
 TrainerYoungsterWarren:
-	trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script
+	trainer YOUNGSTER, WARREN, EVENT_BEAT_YOUNGSTER_WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterWarrenAfterBattleText
 	waitbutton
@@ -34,10 +32,10 @@ TrainerYoungsterWarren:
 	end
 
 TrainerYoungsterJimmy:
-	trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script
+	trainer YOUNGSTER, JIMMY, EVENT_BEAT_YOUNGSTER_JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterJimmyAfterBattleText
 	waitbutton
@@ -45,18 +43,18 @@ TrainerYoungsterJimmy:
 	end
 
 TrainerFirebreatherBurt:
-	trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script
+	trainer FIREBREATHER, BURT, EVENT_BEAT_FIREBREATHER_BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherBurtAfterBattleText
 	waitbutton
 	closetext
 	end
 
-MapRoute3Signpost0Script:
-	jumptext UnknownText_0x1ae163
+Route3MtMoonSquareSign:
+	jumptext Route3MtMoonSquareSignText
 
 FirebreatherOtisSeenText:
 	text "Ah! The weather's"
@@ -125,7 +123,7 @@ FirebreatherBurtAfterBattleText:
 	line "trainer…"
 	done
 
-UnknownText_0x1ae163:
+Route3MtMoonSquareSignText:
 	text "MT.MOON SQUARE"
 
 	para "Just go up the"
@@ -133,23 +131,18 @@ UnknownText_0x1ae163:
 	done
 
 Route3_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 52, 1, 1, MOUNT_MOON
+	db 1 ; warp events
+	warp_event 52,  1, MOUNT_MOON, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 49, 13, BGEVENT_READ, MapRoute3Signpost0Script
+	db 1 ; bg events
+	bg_event 49, 13, BGEVENT_READ, Route3MtMoonSquareSign
 
-.ObjectEvents:
-	db 4
+	db 4 ; object events
 	object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1
-	object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1
-	object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1
-	object_event 49, 5, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1
+	object_event 10,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1
+	object_event 16,  3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1
+	object_event 49,  5, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1
diff --git a/maps/Route30.asm b/maps/Route30.asm
index df8b593d6..a7d066601 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE30_YOUNGSTER1
 	const ROUTE30_YOUNGSTER2
 	const ROUTE30_YOUNGSTER3
@@ -12,11 +12,9 @@ const_value set 2
 	const ROUTE30_POKE_BALL
 
 Route30_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 YoungsterJoey_ImportantBattleScript:
 	waitsfx
@@ -31,7 +29,7 @@ YoungsterJoey_ImportantBattleScript:
 	faceplayer
 	writetext Text_ThisIsABigBattle
 	waitbutton
-	spriteface ROUTE30_YOUNGSTER1, UP
+	turnobject ROUTE30_YOUNGSTER1, UP
 	closetext
 	playsound SFX_TACKLE
 	applymovement ROUTE30_MONSTER1, Route30_MikeysRattataAttacksMovement
@@ -39,11 +37,11 @@ YoungsterJoey_ImportantBattleScript:
 	end
 
 TrainerYoungsterJoey:
-	trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script
+	trainer YOUNGSTER, JOEY1, EVENT_BEAT_YOUNGSTER_JOEY, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_JOEY
 	iftrue .Rematch
@@ -61,8 +59,8 @@ TrainerYoungsterJoey:
 	scall .AskNumber2
 .RequestNumber:
 	askforphonenumber PHONE_YOUNGSTER_JOEY
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -71,11 +69,11 @@ TrainerYoungsterJoey:
 	scall .RematchStd
 	winlosstext YoungsterJoey1BeatenText, 0
 	copybytetovar wJoeyFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight4
@@ -186,10 +184,10 @@ TrainerYoungsterJoey:
 	end
 
 TrainerYoungsterMikey:
-	trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script
+	trainer YOUNGSTER, MIKEY, EVENT_BEAT_YOUNGSTER_MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterMikeyAfterText
 	waitbutton
@@ -197,10 +195,10 @@ TrainerYoungsterMikey:
 	end
 
 TrainerBugCatcherDon:
-	trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script
+	trainer BUG_CATCHER, DON, EVENT_BEAT_BUG_CATCHER_DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BugCatcherDonAfterText
 	waitbutton
@@ -248,7 +246,7 @@ Route30FruitTree2:
 	fruittree FRUITTREE_ROUTE_30_2
 
 Route30HiddenPotion:
-	hiddenitem EVENT_ROUTE_30_HIDDEN_POTION, POTION
+	hiddenitem POTION, EVENT_ROUTE_30_HIDDEN_POTION
 
 Route30_JoeysRattataAttacksMovement:
 	fix_facing
@@ -407,35 +405,30 @@ YoungsterJoeyText_GiveHPUpAfterBattle:
 	done
 
 Route30_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 7, 39, 1, ROUTE_30_BERRY_SPEECH_HOUSE
-	warp_def 17, 5, 1, MR_POKEMONS_HOUSE
+	db 2 ; warp events
+	warp_event  7, 39, ROUTE_30_BERRY_HOUSE, 1
+	warp_event 17,  5, MR_POKEMONS_HOUSE, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 5
-	bg_event 9, 43, BGEVENT_READ, Route30Sign
+	db 5 ; bg events
+	bg_event  9, 43, BGEVENT_READ, Route30Sign
 	bg_event 13, 29, BGEVENT_READ, MrPokemonsHouseDirectionsSign
-	bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign
-	bg_event 3, 21, BGEVENT_READ, Route30TrainerTips
-	bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion
-
-.ObjectEvents:
-	db 11
-	object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE
-	object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
-	object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1
-	object_event 1, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1
-	object_event 7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1
-	object_event 5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
-	object_event 5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
-	object_event 5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1
-	object_event 11, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1
-	object_event 2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1
-	object_event 8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE
+	bg_event 15,  5, BGEVENT_READ, MrPokemonsHouseSign
+	bg_event  3, 21, BGEVENT_READ, Route30TrainerTips
+	bg_event 14,  9, BGEVENT_ITEM, Route30HiddenPotion
+
+	db 11 ; object events
+	object_event  5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE
+	object_event  2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY
+	object_event  5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1
+	object_event  1,  7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1
+	object_event  7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1
+	object_event  5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
+	object_event  5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE
+	object_event  5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1
+	object_event 11,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1
+	object_event  2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1
+	object_event  8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE
diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm
new file mode 100644
index 000000000..f24c58084
--- /dev/null
+++ b/maps/Route30BerryHouse.asm
@@ -0,0 +1,61 @@
+	const_def 2 ; object constants
+	const ROUTE30BERRYHOUSE_POKEFAN_M
+
+Route30BerryHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+Route30BerryHousePokefanMScript:
+	faceplayer
+	opentext
+	checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
+	iftrue .GotBerry
+	writetext Route30BerrySpeechHouseMonEatBerriesText
+	buttonsound
+	verbosegiveitem BERRY
+	iffalse .NoRoom
+	setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
+.GotBerry:
+	writetext Route30BerrySpeechHouseCheckTreesText
+	waitbutton
+.NoRoom:
+	closetext
+	end
+
+Route30BerryHouseBookshelf:
+	jumpstd magazinebookshelf
+
+Route30BerrySpeechHouseMonEatBerriesText:
+	text "You know, #MON"
+	line "eat BERRIES."
+
+	para "Well, my #MON"
+	line "got healthier by"
+	cont "eating a BERRY."
+
+	para "Here. I'll share"
+	line "one with you!"
+	done
+
+Route30BerrySpeechHouseCheckTreesText:
+	text "Check trees for"
+	line "BERRIES. They just"
+	cont "drop right off."
+	done
+
+Route30BerryHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_30, 1
+	warp_event  3,  7, ROUTE_30, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, Route30BerryHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, Route30BerryHouseBookshelf
+
+	db 1 ; object events
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route30BerryHousePokefanMScript, -1
diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm
deleted file mode 100644
index 96605b3c8..000000000
--- a/maps/Route30BerrySpeechHouse.asm
+++ /dev/null
@@ -1,68 +0,0 @@
-const_value set 2
-	const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M
-
-Route30BerrySpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 0
-
-PokefanMScript_0x196d64:
-	faceplayer
-	opentext
-	checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
-	iftrue UnknownScript_0x196d79
-	writetext UnknownText_0x196d82
-	buttonsound
-	verbosegiveitem BERRY
-	iffalse UnknownScript_0x196d7d
-	setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE
-UnknownScript_0x196d79:
-	writetext UnknownText_0x196dec
-	waitbutton
-UnknownScript_0x196d7d:
-	closetext
-	end
-
-Route30BerrySpeechHouseBookshelf:
-	jumpstd magazinebookshelf
-
-UnknownText_0x196d82:
-	text "You know, #MON"
-	line "eat BERRIES."
-
-	para "Well, my #MON"
-	line "got healthier by"
-	cont "eating a BERRY."
-
-	para "Here. I'll share"
-	line "one with you!"
-	done
-
-UnknownText_0x196dec:
-	text "Check trees for"
-	line "BERRIES. They just"
-	cont "drop right off."
-	done
-
-Route30BerrySpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 1, ROUTE_30
-	warp_def 3, 7, 1, ROUTE_30
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf
-
-.ObjectEvents:
-	db 1
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1
diff --git a/maps/Route31.asm b/maps/Route31.asm
index f8ea93d2a..1a7ba7205 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE31_FISHER
 	const ROUTE31_YOUNGSTER
 	const ROUTE31_BUG_CATCHER
@@ -8,11 +8,9 @@ const_value set 2
 	const ROUTE31_POKE_BALL2
 
 Route31_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckMomCall
 
 .CheckMomCall:
@@ -25,11 +23,11 @@ Route31_MapScripts:
 	return
 
 TrainerBugCatcherWade1:
-	trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script
+	trainer BUG_CATCHER, WADE1, EVENT_BEAT_BUG_CATCHER_WADE, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_WADE
 	iftrue .WadeRematch
@@ -49,8 +47,8 @@ TrainerBugCatcherWade1:
 	scall .AskAgainSTD
 .Continue:
 	askforphonenumber PHONE_BUG_CATCHER_WADE
-	if_equal PHONE_CONTACTS_FULL, .PhoneFullSTD
-	if_equal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD
+	ifequal PHONE_CONTACTS_FULL, .PhoneFullSTD
+	ifequal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD
 	trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
 	scall .RegisterNumberSTD
 	jump .AcceptedNumberSTD
@@ -59,11 +57,11 @@ TrainerBugCatcherWade1:
 	scall .RematchSTD
 	winlosstext BugCatcherWade1BeatenText, 0
 	copybytetovar wWadeFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight4
@@ -197,11 +195,11 @@ Route31MailRecipientScript:
 .TryGiveKenya:
 	writetext Text_Route31SleepyManGotMail
 	buttonsound
-	checkpokeitem ReceivedSpearowMailText
-	if_equal POKEMAIL_WRONG_MAIL, .WrongMail
-	if_equal POKEMAIL_REFUSED, .Refused
-	if_equal POKEMAIL_NO_MAIL, .NoMail
-	if_equal POKEMAIL_LAST_MON, .LastMon
+	checkpokemail ReceivedSpearowMailText
+	ifequal POKEMAIL_WRONG_MAIL, .WrongMail
+	ifequal POKEMAIL_REFUSED, .Refused
+	ifequal POKEMAIL_NO_MAIL, .NoMail
+	ifequal POKEMAIL_LAST_MON, .LastMon
 	; POKEMAIL_CORRECT
 	writetext Text_Route31HandOverMailMon
 	buttonsound
@@ -418,29 +416,24 @@ DarkCaveSignText:
 	done
 
 Route31_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 4, 6, 3, ROUTE_31_VIOLET_GATE
-	warp_def 4, 7, 4, ROUTE_31_VIOLET_GATE
-	warp_def 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 7, 5, BGEVENT_READ, Route31Sign
-	bg_event 31, 5, BGEVENT_READ, DarkCaveSign
-
-.ObjectEvents:
-	db 7
-	object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1
-	object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  4,  6, ROUTE_31_VIOLET_GATE, 3
+	warp_event  4,  7, ROUTE_31_VIOLET_GATE, 4
+	warp_event 34,  5, DARK_CAVE_VIOLET_ENTRANCE, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  7,  5, BGEVENT_READ, Route31Sign
+	bg_event 31,  5, BGEVENT_READ, DarkCaveSign
+
+	db 7 ; object events
+	object_event 17,  7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1
+	object_event  9,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1
 	object_event 21, 13, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1
-	object_event 33, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1
-	object_event 16, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1
-	object_event 29, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION
-	object_event 19, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL
+	object_event 33,  8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1
+	object_event 16,  7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1
+	object_event 29,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION
+	object_event 19, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL
diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm
index 6d62f9398..7e08b226c 100644
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE31VIOLETGATE_OFFICER
 	const ROUTE31VIOLETGATE_COOLTRAINER_F
 
 Route31VioletGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route31VioletGateOfficerScript:
 	jumptextfaceplayer Route31VioletGateOfficerText
@@ -28,23 +26,18 @@ Route31VioletGateCooltrainerFText:
 	done
 
 Route31VioletGate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 0, 4, 8, VIOLET_CITY
-	warp_def 0, 5, 9, VIOLET_CITY
-	warp_def 9, 4, 1, ROUTE_31
-	warp_def 9, 5, 2, ROUTE_31
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 2
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1
-	object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  0,  4, VIOLET_CITY, 8
+	warp_event  0,  5, VIOLET_CITY, 9
+	warp_event  9,  4, ROUTE_31, 1
+	warp_event  9,  5, ROUTE_31, 2
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1
+	object_event  1,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1
diff --git a/maps/Route32.asm b/maps/Route32.asm
index afd946c2b..bab9ce66a 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE32_FISHER1
 	const ROUTE32_FISHER2
 	const ROUTE32_FISHER3
@@ -15,14 +15,12 @@ const_value set 2
 	const ROUTE32_POKE_BALL2
 
 Route32_MapScripts:
-.SceneScripts:
-	db 3
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .DummyScene2
-
-.MapCallbacks:
-	db 1
+	db 3 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_ROUTE32_OFFER_SLOWPOKETAIL
+	scene_script .DummyScene2 ; SCENE_ROUTE32_NOTHING
+
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Frieda
 
 .DummyScene0:
@@ -36,7 +34,7 @@ Route32_MapScripts:
 
 .Frieda:
 	checkcode VAR_WEEKDAY
-	if_equal FRIDAY, .FriedaAppears
+	ifequal FRIDAY, .FriedaAppears
 	disappear ROUTE32_FRIEDA
 	return
 
@@ -87,8 +85,8 @@ Route32CooltrainerMContinueScene:
 	end
 
 Route32CooltrainerMStopsYouScene:
-	spriteface ROUTE32_COOLTRAINER_M, LEFT
-	spriteface PLAYER, RIGHT
+	turnobject ROUTE32_COOLTRAINER_M, LEFT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext Route32CooltrainerMText_WhatsTheHurry
 	waitbutton
@@ -96,7 +94,7 @@ Route32CooltrainerMStopsYouScene:
 	follow PLAYER, ROUTE32_COOLTRAINER_M
 	applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet
 	stopfollow
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	scall Route32CooltrainerMContinueScene
 	applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1
 	applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2
@@ -120,14 +118,14 @@ Route32RoarTMGuyScript:
 	end
 
 Route32WannaBuyASlowpokeTailScript:
-	spriteface ROUTE32_FISHER4, DOWN
-	spriteface PLAYER, UP
+	turnobject ROUTE32_FISHER4, DOWN
+	turnobject PLAYER, UP
 	jump _OfferToSellSlowpokeTail
 
 SlowpokeTailSalesmanScript:
 	faceplayer
 _OfferToSellSlowpokeTail:
-	setscene 2
+	setscene SCENE_ROUTE32_NOTHING
 	opentext
 	writetext Text_MillionDollarSlowpokeTail
 	yesorno
@@ -144,10 +142,10 @@ _OfferToSellSlowpokeTail:
 	end
 
 TrainerCamperRoland:
-	trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script
+	trainer CAMPER, ROLAND, EVENT_BEAT_CAMPER_ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperRolandAfterText
 	waitbutton
@@ -155,10 +153,10 @@ TrainerCamperRoland:
 	end
 
 TrainerFisherJustin:
-	trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script
+	trainer FISHER, JUSTIN, EVENT_BEAT_FISHER_JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherJustinAfterText
 	waitbutton
@@ -166,15 +164,15 @@ TrainerFisherJustin:
 	end
 
 TrainerFisherRalph1:
-	trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, 0, .Script
+	trainer FISHER, RALPH1, EVENT_BEAT_FISHER_RALPH, FisherRalph1SeenText, FisherRalph1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_FISHER_RALPH
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_RALPH
 	iftrue .Rematch
-	checkflag ENGINE_SPECIAL_WILDDATA
+	checkflag ENGINE_FISH_SWARM
 	iftrue .Swarm
 	checkcellnum PHONE_FISHER_RALPH
 	iftrue .NumberAccepted
@@ -190,8 +188,8 @@ TrainerFisherRalph1:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_FISHER_RALPH
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext FISHER, RALPH1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -200,11 +198,11 @@ TrainerFisherRalph1:
 	scall .RematchStd
 	winlosstext FisherRalph1BeatenText, 0
 	copybytetovar wRalphFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -291,10 +289,10 @@ TrainerFisherRalph1:
 	end
 
 TrainerFisherHenry:
-	trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script
+	trainer FISHER, HENRY, EVENT_BEAT_FISHER_HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherHenryAfterText
 	waitbutton
@@ -302,11 +300,11 @@ TrainerFisherHenry:
 	end
 
 TrainerPicnickerLiz1:
-	trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, .Script
+	trainer PICNICKER, LIZ1, EVENT_BEAT_PICNICKER_LIZ, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_PICNICKER_LIZ
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_LIZ
 	iftrue .Rematch
@@ -324,8 +322,8 @@ TrainerPicnickerLiz1:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_PICNICKER_LIZ
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext PICNICKER, LIZ1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -334,11 +332,11 @@ TrainerPicnickerLiz1:
 	scall .RematchStd
 	winlosstext PicnickerLiz1BeatenText, 0
 	copybytetovar wLizFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .LoadFight4
@@ -419,10 +417,10 @@ TrainerPicnickerLiz1:
 	end
 
 TrainerYoungsterAlbert:
-	trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script
+	trainer YOUNGSTER, ALBERT, EVENT_BEAT_YOUNGSTER_ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterAlbertAfterText
 	waitbutton
@@ -430,10 +428,10 @@ TrainerYoungsterAlbert:
 	end
 
 TrainerYoungsterGordon:
-	trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script
+	trainer YOUNGSTER, GORDON, EVENT_BEAT_YOUNGSTER_GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterGordonAfterText
 	waitbutton
@@ -441,10 +439,10 @@ TrainerYoungsterGordon:
 	end
 
 TrainerBirdKeeperPeter:
-	trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script
+	trainer BIRD_KEEPER, PETER, EVENT_BEAT_BIRD_KEEPER_PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperPeterAfterText
 	waitbutton
@@ -457,7 +455,7 @@ FriedaScript:
 	checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA
 	iftrue .Friday
 	checkcode VAR_WEEKDAY
-	if_not_equal FRIDAY, .NotFriday
+	ifnotequal FRIDAY, .NotFriday
 	checkevent EVENT_MET_FRIEDA_OF_FRIDAY
 	iftrue .MetFrieda
 	writetext MeetFriedaText
@@ -506,10 +504,10 @@ Route32PokecenterSign:
 	jumpstd pokecentersign
 
 Route32HiddenGreatBall:
-	hiddenitem EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL
+	hiddenitem GREAT_BALL, EVENT_ROUTE_32_HIDDEN_GREAT_BALL
 
 Route32HiddenSuperPotion:
-	hiddenitem EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION
+	hiddenitem SUPER_POTION, EVENT_ROUTE_32_HIDDEN_SUPER_POTION
 
 Movement_Route32CooltrainerMPushesYouBackToViolet:
 	step UP
@@ -543,8 +541,8 @@ Route32CooltrainerMText_AideIsWaiting:
 	line "CENTER."
 	done
 
-; might not be referenced anywhere
 Route32CooltrainerMText_UnusedSproutTower:
+; unused
 	text "Have you gone to"
 	line "SPROUT TOWER?"
 
@@ -681,7 +679,7 @@ FisherRalphSwarmText:
 	line "as you can, kid!"
 	done
 
-; --- start a segment of possibly unused texts
+; --- start a segment of unused text
 
 Route32UnusedFisher1SeenText:
 	text "I keep catching"
@@ -722,7 +720,7 @@ Route32UnusedFisher2AfterText:
 	line "#MON."
 	done
 
-; --- end a segment of possibly unused texts
+; --- end a segment of unused texts
 
 FisherHenrySeenText:
 	text "My #MON?"
@@ -837,8 +835,8 @@ BirdKeeperPeterAfterText:
 	cont "in VIOLET CITY."
 	done
 
-; unused
 Route32UnusedText:
+; unused
 	text "The fishermen"
 	line "yelled at me for"
 	cont "bugging them…"
@@ -929,43 +927,38 @@ Route32UnionCaveSignText:
 	done
 
 Route32_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 11, 73, 1, ROUTE_32_POKECENTER_1F
-	warp_def 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE
-	warp_def 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE
-	warp_def 6, 79, 4, UNION_CAVE_1F
-
-.CoordEvents:
-	db 2
-	coord_event 18, 8, 0, Route32CooltrainerMStopsYouScene
-	coord_event 7, 71, 1, Route32WannaBuyASlowpokeTailScript
-
-.BGEvents:
-	db 6
-	bg_event 13, 5, BGEVENT_READ, Route32Sign
-	bg_event 9, 1, BGEVENT_READ, Route32RuinsSign
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event 11, 73, ROUTE_32_POKECENTER_1F, 1
+	warp_event  4,  2, ROUTE_32_RUINS_OF_ALPH_GATE, 3
+	warp_event  4,  3, ROUTE_32_RUINS_OF_ALPH_GATE, 4
+	warp_event  6, 79, UNION_CAVE_1F, 4
+
+	db 2 ; coord events
+	coord_event 18,  8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene
+	coord_event  7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript
+
+	db 6 ; bg events
+	bg_event 13,  5, BGEVENT_READ, Route32Sign
+	bg_event  9,  1, BGEVENT_READ, Route32RuinsSign
 	bg_event 10, 84, BGEVENT_READ, Route32UnionCaveSign
 	bg_event 12, 73, BGEVENT_READ, Route32PokecenterSign
 	bg_event 12, 67, BGEVENT_ITEM, Route32HiddenGreatBall
 	bg_event 11, 40, BGEVENT_ITEM, Route32HiddenSuperPotion
 
-.ObjectEvents:
-	db 14
-	object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1
+	db 14 ; object events
+	object_event  8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1
 	object_event 12, 56, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1
-	object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1
+	object_event  6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1
 	object_event 12, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1
-	object_event 4, 63, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1
-	object_event 3, 45, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1
+	object_event  4, 63, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1
+	object_event  3, 45, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1
 	object_event 10, 30, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1
-	object_event 19, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1
+	object_event 19,  8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1
 	object_event 11, 82, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPeter, -1
-	object_event 7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
+	object_event  7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event  6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL
 	object_event 15, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1
 	object_event 12, 67, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY
-	object_event 3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL
+	object_event  3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL
diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm
index 5bedc7853..0b37334e3 100644
--- a/maps/Route32Pokecenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -1,43 +1,41 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE32POKECENTER1F_NURSE
 	const ROUTE32POKECENTER1F_FISHING_GURU
 	const ROUTE32POKECENTER1F_COOLTRAINER_F
 
 Route32Pokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x69b52:
+Route32Pokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
-FishingGuruScript_0x69b55:
+Route32Pokecenter1FFishingGuruScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_OLD_ROD
-	iftrue UnknownScript_0x69b7a
-	writetext UnknownText_0x69b83
+	iftrue .GotOldRod
+	writetext Route32Pokecenter1FFishingGuruText_Question
 	yesorno
-	iffalse UnknownScript_0x69b74
-	writetext UnknownText_0x69be8
+	iffalse .Refused
+	writetext Route32Pokecenter1FFishingGuruText_Yes
 	buttonsound
 	verbosegiveitem OLD_ROD
-	writetext UnknownText_0x69c1b
+	writetext Route32Pokecenter1FFishingGuruText_GiveOldRod
 	waitbutton
 	closetext
 	setevent EVENT_GOT_OLD_ROD
 	end
 
-UnknownScript_0x69b74:
-	writetext UnknownText_0x69c6c
+.Refused:
+	writetext Route32Pokecenter1FFishingGuruText_No
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x69b7a:
-	writetext UnknownText_0x69c8d
+.GotOldRod:
+	writetext Route32Pokecenter1FFishingGuruText_After
 	waitbutton
 	closetext
 	end
@@ -45,7 +43,7 @@ UnknownScript_0x69b7a:
 Route32Pokecenter1FCooltrainerFScript:
 	jumptextfaceplayer Route32Pokecenter1FCooltrainerFText
 
-UnknownText_0x69b83:
+Route32Pokecenter1FFishingGuruText_Question:
 	text "This is a great"
 	line "fishing spot."
 
@@ -57,7 +55,7 @@ UnknownText_0x69b83:
 	line "of my RODS?"
 	done
 
-UnknownText_0x69be8:
+Route32Pokecenter1FFishingGuruText_Yes:
 	text "Heh, that's good"
 	line "to hear."
 
@@ -65,7 +63,7 @@ UnknownText_0x69be8:
 	line "angler too!"
 	done
 
-UnknownText_0x69c1b:
+Route32Pokecenter1FFishingGuruText_GiveOldRod:
 	text "Fishing is great!"
 
 	para "If there's water,"
@@ -75,12 +73,12 @@ UnknownText_0x69c1b:
 	line "your ROD."
 	done
 
-UnknownText_0x69c6c:
+Route32Pokecenter1FFishingGuruText_No:
 	text "Oh. That's rather"
 	line "disappointing…"
 	done
 
-UnknownText_0x69c8d:
+Route32Pokecenter1FFishingGuruText_After:
 	text "Yo, kid. How are"
 	line "they biting?"
 	done
@@ -95,23 +93,18 @@ Route32Pokecenter1FCooltrainerFText:
 	done
 
 Route32Pokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 1, ROUTE_32
-	warp_def 4, 7, 1, ROUTE_32
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1
-	object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1
-	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, ROUTE_32, 1
+	warp_event  4,  7, ROUTE_32, 1
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FNurseScript, -1
+	object_event  1,  4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FFishingGuruScript, -1
+	object_event  6,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1
diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm
index 345e46dd4..3329d54f5 100644
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE32RUINSOFALPHGATE_OFFICER
 	const ROUTE32RUINSOFALPHGATE_POKEFAN_M
 	const ROUTE32RUINSOFALPHGATE_YOUNGSTER
 
 Route32RuinsOfAlphGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route32RuinsOfAlphGateOfficerScript:
 	jumptextfaceplayer Route32RuinsOfAlphGateOfficerText
@@ -47,24 +45,19 @@ Route32RuinsOfAlphGateYoungsterText:
 	done
 
 Route32RuinsOfAlphGate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 0, 4, 10, RUINS_OF_ALPH_OUTSIDE
-	warp_def 0, 5, 11, RUINS_OF_ALPH_OUTSIDE
-	warp_def 9, 4, 2, ROUTE_32
-	warp_def 9, 5, 3, ROUTE_32
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1
-	object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1
-	object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  0,  4, RUINS_OF_ALPH_OUTSIDE, 10
+	warp_event  0,  5, RUINS_OF_ALPH_OUTSIDE, 11
+	warp_event  9,  4, ROUTE_32, 2
+	warp_event  9,  5, ROUTE_32, 3
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1
+	object_event  8,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1
+	object_event  1,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1
diff --git a/maps/Route33.asm b/maps/Route33.asm
index be2abbf4c..eb88baaa6 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -1,24 +1,22 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE33_POKEFAN_M
 	const ROUTE33_LASS
 	const ROUTE33_FRUIT_TREE
 
 Route33_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route33LassScript:
 	jumptextfaceplayer Route33LassText
 
 TrainerHikerAnthony:
-	trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, .Script
+	trainer HIKER, ANTHONY2, EVENT_BEAT_HIKER_ANTHONY, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_HIKER_ANTHONY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_ANTHONY
 	iftrue .Rematch
@@ -38,8 +36,8 @@ TrainerHikerAnthony:
 	scall .AskNumber2
 .AskForPhoneNumber:
 	askforphonenumber PHONE_HIKER_ANTHONY
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext HIKER, ANTHONY2, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -48,11 +46,11 @@ TrainerHikerAnthony:
 	scall .RematchStd
 	winlosstext HikerAnthony2BeatenText, 0
 	copybytetovar wAnthonyFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -141,7 +139,7 @@ TrainerHikerAnthony:
 Route33Sign:
 	jumptext Route33SignText
 
-Route33FruitTreeScript:
+Route33FruitTree:
 	fruittree FRUITTREE_ROUTE_33
 
 HikerAnthony2SeenText:
@@ -195,22 +193,17 @@ Route33SignText:
 	done
 
 Route33_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 11, 9, 3, UNION_CAVE_1F
+	db 1 ; warp events
+	warp_event 11,  9, UNION_CAVE_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 11, 11, BGEVENT_READ, Route33Sign
 
-.ObjectEvents:
-	db 3
-	object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
+	db 3 ; object events
+	object_event  6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1
 	object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1
-	object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1
+	object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTree, -1
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 786ffb022..8e52a151e 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE34_YOUNGSTER1
 	const ROUTE34_YOUNGSTER2
 	const ROUTE34_YOUNGSTER3
@@ -14,11 +14,9 @@ const_value set 2
 	const ROUTE34_POKE_BALL
 
 Route34_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .EggCheckCallback
 
 .EggCheckCallback:
@@ -56,13 +54,13 @@ Route34_MapScripts:
 DayCareManScript_Outside:
 	faceplayer
 	opentext
-	special Special_DayCareManOutside
+	special DayCareManOutside
 	waitbutton
 	closetext
-	if_equal TRUE, .end_fail
+	ifequal TRUE, .end_fail
 	clearflag ENGINE_DAY_CARE_MAN_HAS_EGG
 	checkcode VAR_FACING
-	if_equal RIGHT, .walk_around_player
+	ifequal RIGHT, .walk_around_player
 	applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside
 	playsound SFX_ENTER_DOOR
 	disappear ROUTE34_GRAMPS
@@ -77,22 +75,22 @@ DayCareManScript_Outside:
 
 DayCareMon1Script:
 	opentext
-	special Special_DayCareMon1
+	special DayCareMon1
 	closetext
 	end
 
 DayCareMon2Script:
 	opentext
-	special Special_DayCareMon2
+	special DayCareMon2
 	closetext
 	end
 
 TrainerCamperTodd1:
-	trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script
+	trainer CAMPER, TODD1, EVENT_BEAT_CAMPER_TODD, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_CAMPER_TODD
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_TODD
 	iftrue .Rematch
@@ -112,8 +110,8 @@ TrainerCamperTodd1:
 	scall .AskNumber2
 .FinishAsk:
 	askforphonenumber PHONE_CAMPER_TODD
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext CAMPER, TODD1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -122,11 +120,11 @@ TrainerCamperTodd1:
 	scall .RematchStd
 	winlosstext CamperTodd1BeatenText, 0
 	copybytetovar wToddFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -213,11 +211,11 @@ TrainerCamperTodd1:
 	end
 
 TrainerPicnickerGina1:
-	trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script
+	trainer PICNICKER, GINA1, EVENT_BEAT_PICNICKER_GINA, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_PICNICKER_GINA
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_GINA
 	iftrue .Rematch
@@ -237,8 +235,8 @@ TrainerPicnickerGina1:
 	scall .AskNumber2
 .FinishAsk:
 	askforphonenumber PHONE_PICNICKER_GINA
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext PICNICKER, GINA1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -247,11 +245,11 @@ TrainerPicnickerGina1:
 	scall .RematchStd
 	winlosstext PicnickerGina1BeatenText, 0
 	copybytetovar wGinaFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -353,7 +351,7 @@ TrainerPicnickerGina1:
 OfficerKeithScript:
 	faceplayer
 	opentext
-	checknite
+	checktime NITE
 	iffalse .NoFight
 	checkevent EVENT_BEAT_OFFICER_KEITH
 	iftrue .AfterScript
@@ -382,10 +380,10 @@ OfficerKeithScript:
 	end
 
 TrainerYoungsterSamuel:
-	trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script
+	trainer YOUNGSTER, SAMUEL, EVENT_BEAT_YOUNGSTER_SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterSamuelAfterText
 	waitbutton
@@ -393,10 +391,10 @@ TrainerYoungsterSamuel:
 	end
 
 TrainerYoungsterIan:
-	trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script
+	trainer YOUNGSTER, IAN, EVENT_BEAT_YOUNGSTER_IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext YoungsterIanAfterText
 	waitbutton
@@ -404,10 +402,10 @@ TrainerYoungsterIan:
 	end
 
 TrainerPokefanmBrandon:
-	trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script
+	trainer POKEFANM, BRANDON, EVENT_BEAT_POKEFANM_BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmBrandonAfterText
 	waitbutton
@@ -415,10 +413,10 @@ TrainerPokefanmBrandon:
 	end
 
 TrainerCooltrainerfIrene:
-	trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script
+	trainer COOLTRAINERF, IRENE, EVENT_BEAT_COOLTRAINERF_IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
 	iftrue .GotSoftSand
@@ -434,10 +432,10 @@ TrainerCooltrainerfIrene:
 	end
 
 TrainerCooltrainerfJenn:
-	trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script
+	trainer COOLTRAINERF, JENN, EVENT_BEAT_COOLTRAINERF_JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
 	iftrue .GotSoftSand
@@ -453,10 +451,10 @@ TrainerCooltrainerfJenn:
 	end
 
 TrainerCooltrainerfKate:
-	trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script
+	trainer COOLTRAINERF, KATE, EVENT_BEAT_COOLTRAINERF_KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
 	iftrue .GotSoftSand
@@ -472,8 +470,9 @@ TrainerCooltrainerfKate:
 	closetext
 	end
 
+Route34IlexForestSign:
 ; unused
-	jumptext MapRoute34UnusedSignpostText
+	jumptext Route34IlexForestSignText
 
 Route34Sign:
 	jumptext Route34SignText
@@ -488,10 +487,10 @@ Route34Nugget:
 	itemball NUGGET
 
 Route34HiddenRareCandy:
-	hiddenitem EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY
+	hiddenitem RARE_CANDY, EVENT_ROUTE_34_HIDDEN_RARE_CANDY
 
 Route34HiddenSuperPotion:
-	hiddenitem EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION
+	hiddenitem SUPER_POTION, EVENT_ROUTE_34_HIDDEN_SUPER_POTION
 
 Route34MovementData_DayCareManWalksBackInside:
 	slow_step LEFT
@@ -726,7 +725,8 @@ CooltrainerfKateAfterText:
 	line "startled us."
 	done
 
-MapRoute34UnusedSignpostText:
+Route34IlexForestSignText:
+; unused
 	text "ILEX FOREST"
 	line "THROUGH THE GATE"
 	done
@@ -761,40 +761,35 @@ DayCareSignText:
 	done
 
 Route34_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE
-	warp_def 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE
-	warp_def 11, 14, 1, DAY_CARE
-	warp_def 11, 15, 2, DAY_CARE
-	warp_def 13, 15, 3, DAY_CARE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 5
-	bg_event 12, 6, BGEVENT_READ, Route34Sign
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event 13, 37, ROUTE_34_ILEX_FOREST_GATE, 1
+	warp_event 14, 37, ROUTE_34_ILEX_FOREST_GATE, 2
+	warp_event 11, 14, DAY_CARE, 1
+	warp_event 11, 15, DAY_CARE, 2
+	warp_event 13, 15, DAY_CARE, 3
+
+	db 0 ; coord events
+
+	db 5 ; bg events
+	bg_event 12,  6, BGEVENT_READ, Route34Sign
 	bg_event 13, 33, BGEVENT_READ, Route34TrainerTips
 	bg_event 10, 13, BGEVENT_READ, DayCareSign
-	bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy
+	bg_event  8, 32, BGEVENT_ITEM, Route34HiddenRareCandy
 	bg_event 17, 19, BGEVENT_ITEM, Route34HiddenSuperPotion
 
-.ObjectEvents:
-	db 13
-	object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1
+	db 13 ; object events
+	object_event 13,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1
 	object_event 15, 32, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1
 	object_event 11, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1
 	object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerGina1, -1
-	object_event 9, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1
+	object_event  9, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1
 	object_event 18, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1
 	object_event 15, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34
 	object_event 14, 18, SPRITE_DAY_CARE_MON_1, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1
 	object_event 17, 19, SPRITE_DAY_CARE_MON_2, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2
 	object_event 11, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1
-	object_event 3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1
-	object_event 6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1
-	object_event 7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET
+	object_event  3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1
+	object_event  6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1
+	object_event  7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 38dc04729..7f2c5124d 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE34ILEXFORESTGATE_TEACHER1
 	const ROUTE34ILEXFORESTGATE_BUTTERFREE
 	const ROUTE34ILEXFORESTGATE_LASS
 	const ROUTE34ILEXFORESTGATE_TEACHER2
 
 Route34IlexForestGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .IsForestRestless
 
 .IsForestRestless:
@@ -24,52 +22,52 @@ Route34IlexForestGate_MapScripts:
 	appear ROUTE34ILEXFORESTGATE_TEACHER1
 	return
 
-UnknownScript_0x62d3d:
+Route34IlexForestGateCelebiEvent:
 	checkevent EVENT_FOREST_IS_RESTLESS
-	iffalse UnknownScript_0x62d62
+	iffalse .skip
 	showemote EMOTE_SHOCK, ROUTE34ILEXFORESTGATE_TEACHER2, 20
-	spriteface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
-	spriteface PLAYER, RIGHT
+	turnobject ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
+	turnobject PLAYER, RIGHT
 	follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2
 	applymovement PLAYER, MovementData_0x62d97
 	stopfollow
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	opentext
-	writetext UnknownText_0x62e41
+	writetext Route34IlexForestGateTeacher_ForestIsRestless
 	waitbutton
 	closetext
 	applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a
-UnknownScript_0x62d62:
+.skip:
 	end
 
-TeacherScript_0x62d63:
+Route34IlexForestGateTeacherScript:
 	faceplayer
 	opentext
 	checkevent EVENT_FOREST_IS_RESTLESS
-	iftrue UnknownScript_0x62d84
+	iftrue .ForestIsRestless
 	checkevent EVENT_GOT_TM12_SWEET_SCENT
-	iftrue UnknownScript_0x62d7e
-	writetext UnknownText_0x62d9d
+	iftrue .GotSweetScent
+	writetext Route34IlexForestGateTeacherText
 	buttonsound
 	verbosegiveitem TM_SWEET_SCENT
-	iffalse UnknownScript_0x62d82
+	iffalse .NoRoom
 	setevent EVENT_GOT_TM12_SWEET_SCENT
-UnknownScript_0x62d7e:
-	writetext UnknownText_0x62df6
+.GotSweetScent:
+	writetext Route34IlexForestGateTeacher_GotSweetScent
 	waitbutton
-UnknownScript_0x62d82:
+.NoRoom:
 	closetext
 	end
 
-UnknownScript_0x62d84:
-	writetext UnknownText_0x62e41
+.ForestIsRestless:
+	writetext Route34IlexForestGateTeacher_ForestIsRestless
 	buttonsound
 	closetext
 	end
 
-IlexGateButterfree:
+Route34IlexForestGateButterfreeScript:
 	opentext
-	writetext UnknownText_0x62e83
+	writetext Route34IlexForestGateButterfreeText
 	cry BUTTERFREE
 	waitbutton
 	closetext
@@ -88,7 +86,7 @@ MovementData_0x62d9a:
 	step RIGHT
 	step_end
 
-UnknownText_0x62d9d:
+Route34IlexForestGateTeacherText:
 	text "Oh, honey. You're"
 	line "making a #DEX?"
 
@@ -99,7 +97,7 @@ UnknownText_0x62d9d:
 	line "this TM."
 	done
 
-UnknownText_0x62df6:
+Route34IlexForestGateTeacher_GotSweetScent:
 	text "It's SWEET SCENT."
 
 	para "Use it wherever"
@@ -109,7 +107,7 @@ UnknownText_0x62df6:
 	line "enticed by it."
 	done
 
-UnknownText_0x62e41:
+Route34IlexForestGateTeacher_ForestIsRestless:
 	text "Something's wrong"
 	line "in ILEX FOREST…"
 
@@ -117,7 +115,7 @@ UnknownText_0x62e41:
 	line "away right now."
 	done
 
-UnknownText_0x62e83:
+Route34IlexForestGateButterfreeText:
 	text "BUTTERFREE: Freeh!"
 	done
 
@@ -136,26 +134,21 @@ Route34IlexForestGateLassText:
 	done
 
 Route34IlexForestGate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 4, 0, 1, ROUTE_34
-	warp_def 5, 0, 2, ROUTE_34
-	warp_def 4, 7, 1, ILEX_FOREST
-	warp_def 5, 7, 1, ILEX_FOREST
-
-.CoordEvents:
-	db 1
-	coord_event 4, 7, 0, UnknownScript_0x62d3d
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
-	object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1
-	object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
-	object_event 5, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  4,  0, ROUTE_34, 1
+	warp_event  5,  0, ROUTE_34, 2
+	warp_event  4,  7, ILEX_FOREST, 1
+	warp_event  5,  7, ILEX_FOREST, 1
+
+	db 1 ; coord events
+	coord_event  4,  7, SCENE_DEFAULT, Route34IlexForestGateCelebiEvent
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  9,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateTeacherScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER
+	object_event  9,  4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateButterfreeScript, -1
+	object_event  3,  4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
+	object_event  5,  7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateTeacherScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
diff --git a/maps/Route35.asm b/maps/Route35.asm
index 7d9aa9e53..48c05058d 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE35_YOUNGSTER1
 	const ROUTE35_YOUNGSTER2
 	const ROUTE35_LASS1
@@ -12,17 +12,15 @@ const_value set 2
 	const ROUTE35_POKE_BALL
 
 Route35_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperBryan:
-	trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script
+	trainer BIRD_KEEPER, BRYAN, EVENT_BEAT_BIRD_KEEPER_BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperBryanAfterBattleText
 	waitbutton
@@ -30,11 +28,11 @@ TrainerBirdKeeperBryan:
 	end
 
 TrainerJugglerIrwin:
-	trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script
+	trainer JUGGLER, IRWIN1, EVENT_BEAT_JUGGLER_IRWIN, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkcellnum PHONE_JUGGLER_IRWIN
 	iftrue Route35NumberAcceptedM
@@ -50,8 +48,8 @@ TrainerJugglerIrwin:
 	scall Route35AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_JUGGLER_IRWIN
-	if_equal PHONE_CONTACTS_FULL, Route35PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
 	trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0
 	scall Route35RegisteredNumberM
 	jump Route35NumberAcceptedM
@@ -85,10 +83,10 @@ Route35RematchM:
 	end
 
 TrainerCamperIvan:
-	trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script
+	trainer CAMPER, IVAN, EVENT_BEAT_CAMPER_IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperIvanAfterBattleText
 	waitbutton
@@ -96,10 +94,10 @@ TrainerCamperIvan:
 	end
 
 TrainerCamperElliot:
-	trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script
+	trainer CAMPER, ELLIOT, EVENT_BEAT_CAMPER_ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperElliotAfterBattleText
 	waitbutton
@@ -107,10 +105,10 @@ TrainerCamperElliot:
 	end
 
 TrainerPicnickerBrooke:
-	trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script
+	trainer PICNICKER, BROOKE, EVENT_BEAT_PICNICKER_BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerBrookeAfterBattleText
 	waitbutton
@@ -118,10 +116,10 @@ TrainerPicnickerBrooke:
 	end
 
 TrainerPicnickerKim:
-	trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script
+	trainer PICNICKER, KIM, EVENT_BEAT_PICNICKER_KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerKimAfterBattleText
 	waitbutton
@@ -129,11 +127,11 @@ TrainerPicnickerKim:
 	end
 
 TrainerBugCatcherArnie:
-	trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, BugCatcherArnieSeenText, BugCatcherArnieBeatenText, 0, .Script
+	trainer BUG_CATCHER, ARNIE1, EVENT_BEAT_BUG_CATCHER_ARNIE, BugCatcherArnieSeenText, BugCatcherArnieBeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_ARNIE
 	iftrue .WantsBattle
@@ -153,8 +151,8 @@ TrainerBugCatcherArnie:
 	scall Route35AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_BUG_CATCHER_ARNIE
-	if_equal PHONE_CONTACTS_FULL, Route35PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
 	trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0
 	scall Route35RegisteredNumberM
 	jump Route35NumberAcceptedM
@@ -163,11 +161,11 @@ TrainerBugCatcherArnie:
 	scall Route35RematchM
 	winlosstext BugCatcherArnieBeatenText, 0
 	copybytetovar wArnieFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -226,10 +224,10 @@ TrainerBugCatcherArnie:
 	end
 
 TrainerFirebreatherWalt:
-	trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script
+	trainer FIREBREATHER, WALT, EVENT_BEAT_FIREBREATHER_WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherWaltAfterBattleText
 	waitbutton
@@ -239,7 +237,7 @@ TrainerFirebreatherWalt:
 TrainerOfficerDirk:
 	faceplayer
 	opentext
-	checknite
+	checktime NITE
 	iffalse .NotNight
 	checkevent EVENT_BEAT_OFFICER_DIRK
 	iftrue .AfterBattle
@@ -273,7 +271,7 @@ Route35Sign:
 Route35TMRollout:
 	itemball TM_ROLLOUT
 
-FruitTreeScript_0x19ca7e:
+Route35FruitTree:
 	fruittree FRUITTREE_ROUTE_35
 
 CamperIvanSeenText:
@@ -463,33 +461,28 @@ Route35SignText:
 	done
 
 Route35_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 9, 33, 1, ROUTE_35_GOLDENROD_GATE
-	warp_def 10, 33, 2, ROUTE_35_GOLDENROD_GATE
-	warp_def 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE
+	db 3 ; warp events
+	warp_event  9, 33, ROUTE_35_GOLDENROD_GATE, 1
+	warp_event 10, 33, ROUTE_35_GOLDENROD_GATE, 2
+	warp_event  3,  5, ROUTE_35_NATIONAL_PARK_GATE, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 1, 7, BGEVENT_READ, Route35Sign
+	db 2 ; bg events
+	bg_event  1,  7, BGEVENT_READ, Route35Sign
 	bg_event 11, 31, BGEVENT_READ, Route35Sign
 
-.ObjectEvents:
-	db 11
-	object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1
-	object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1
-	object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1
+	db 11 ; object events
+	object_event  4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1
+	object_event  8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1
+	object_event  7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1
 	object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerKim, -1
 	object_event 14, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBirdKeeperBryan, -1
-	object_event 2, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1
-	object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1
-	object_event 5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
-	object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1
-	object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1
-	object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT
+	object_event  2, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1
+	object_event 16,  7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1
+	object_event  5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1
+	object_event  5,  6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1
+	object_event  2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route35FruitTree, -1
+	object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm
index a783781dd..71a1e510b 100644
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE35GOLDENRODGATE_OFFICER
 	const ROUTE35GOLDENRODGATE_POKEFAN_F
 	const ROUTE35GOLDENRODGATE_FISHER
 
 Route35GoldenrodGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-OfficerScript_0x69d37:
+RandyScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_HP_UP_FROM_RANDY
@@ -26,12 +24,12 @@ OfficerScript_0x69d37:
 	buttonsound
 	waitsfx
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, .partyfull
+	ifequal PARTY_LENGTH, .partyfull
 	writetext UnknownText_0x69eb8
 	playsound SFX_KEY_ITEM
 	waitsfx
-	givepoke SPEAROW, 10, NO_ITEM, 1, GiftSpearowName, GiftSpearowOTName
-	givepokeitem GiftSpearowMail
+	givepoke SPEAROW, 10, NO_ITEM, TRUE, GiftSpearowName, GiftSpearowOTName
+	givepokemail GiftSpearowMail
 	setevent EVENT_GOT_KENYA
 .alreadyhavekenya
 	writetext UnknownText_0x69ed6
@@ -65,28 +63,30 @@ OfficerScript_0x69d37:
 	end
 
 GiftSpearowMail:
-	db   FLOWER_MAIL
+	db FLOWER_MAIL
 	db   "DARK CAVE leads"
 	next "to another road@"
+
 GiftSpearowName:
 	db "KENYA@"
+
 GiftSpearowOTName:
 	db "RANDY@"
 
-	db 0
+	db 0 ; filler
 
-PokefanFScript_0x69dc6:
+Route35GoldenrodGatePokefanFScript:
 	faceplayer
 	opentext
 	checkevent EVENT_FOUGHT_SUDOWOODO
-	iftrue .aftersudowoodo
-	writetext UnknownText_0x6a00a
+	iftrue .FoughtSudowoodo
+	writetext Route35GoldenrodGatePokefanFText
 	waitbutton
 	closetext
 	end
 
-.aftersudowoodo
-	writetext UnknownText_0x6a09a
+.FoughtSudowoodo
+	writetext Route35GoldenrodGatePokefanFText_FoughtSudowoodo
 	waitbutton
 	closetext
 	end
@@ -161,7 +161,7 @@ UnknownText_0x69fd9:
 	cont "what'd I say?"
 	done
 
-UnknownText_0x6a00a:
+Route35GoldenrodGatePokefanFText:
 	text "A strange tree is"
 	line "blocking the road."
 
@@ -175,7 +175,7 @@ UnknownText_0x6a00a:
 	line "SQUIRTBOTTLE."
 	done
 
-UnknownText_0x6a09a:
+Route35GoldenrodGatePokefanFText_FoughtSudowoodo:
 	text "I like the #MON"
 	line "Lullaby they play"
 	cont "on the radio."
@@ -196,24 +196,19 @@ Route35GoldenrodGateFisherText:
 	done
 
 Route35GoldenrodGate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 4, 0, 1, ROUTE_35
-	warp_def 5, 0, 2, ROUTE_35
-	warp_def 4, 7, 12, GOLDENROD_CITY
-	warp_def 5, 7, 12, GOLDENROD_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1
-	object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1
-	object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  4,  0, ROUTE_35, 1
+	warp_event  5,  0, ROUTE_35, 2
+	warp_event  4,  7, GOLDENROD_CITY, 12
+	warp_event  5,  7, GOLDENROD_CITY, 12
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RandyScript, -1
+	object_event  6,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGatePokefanFScript, -1
+	object_event  3,  2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 6dbfe9671..610263844 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE35NATIONALPARKGATE_OFFICER1
 	const ROUTE35NATIONALPARKGATE_YOUNGSTER
 	const ROUTE35NATIONALPARKGATE_OFFICER2
 
 Route35NationalParkGate_MapScripts:
-.SceneScripts:
-	db 3
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .LeaveContestEarly
-
-.MapCallbacks:
-	db 2
+	db 3 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_ROUTE35NATIONALPARKGATE_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE35NATIONALPARKGATE_UNUSED
+	scene_script .LeaveContestEarly ; SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
+
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
 	callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
 
@@ -28,18 +26,18 @@ Route35NationalParkGate_MapScripts:
 .CheckIfContestRunning:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .BugContestIsRunning
-	setscene 0
+	setscene SCENE_ROUTE35NATIONALPARKGATE_NOTHING
 	return
 
 .BugContestIsRunning:
-	setscene 2
+	setscene SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
 	return
 
 .CheckIfContestAvailable:
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .SetContestOfficer
-	if_equal THURSDAY, .SetContestOfficer
-	if_equal SATURDAY, .SetContestOfficer
+	ifequal TUESDAY, .SetContestOfficer
+	ifequal THURSDAY, .SetContestOfficer
+	ifequal SATURDAY, .SetContestOfficer
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .BugContestIsRunning
 	disappear ROUTE35NATIONALPARKGATE_OFFICER1
@@ -55,7 +53,7 @@ Route35NationalParkGate_MapScripts:
 
 .LeavingContestEarly:
 	applymovement PLAYER, MovementData_0x6a2e2
-	spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
+	turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
 	opentext
 	checkcode VAR_CONTESTMINUTES
 	addvar 1
@@ -74,17 +72,17 @@ Route35NationalParkGate_MapScripts:
 	closetext
 	scall Route35NationalParkGate_EnterContest
 	playsound SFX_ENTER_DOOR
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	waitsfx
 	warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47
 	end
 
-OfficerScript_0x6a204:
+Route35OfficerScriptContest:
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, Route35NationalParkGate_NoContestToday
-	if_equal MONDAY, Route35NationalParkGate_NoContestToday
-	if_equal WEDNESDAY, Route35NationalParkGate_NoContestToday
-	if_equal FRIDAY, Route35NationalParkGate_NoContestToday
+	ifequal SUNDAY, Route35NationalParkGate_NoContestToday
+	ifequal MONDAY, Route35NationalParkGate_NoContestToday
+	ifequal WEDNESDAY, Route35NationalParkGate_NoContestToday
+	ifequal FRIDAY, Route35NationalParkGate_NoContestToday
 	faceplayer
 	opentext
 	checkflag ENGINE_DAILY_BUG_CONTEST
@@ -94,8 +92,8 @@ OfficerScript_0x6a204:
 	yesorno
 	iffalse Route35NationalParkGate_DeclinedToParticipate
 	checkcode VAR_PARTYCOUNT
-	if_greater_than 1, Route35NationalParkGate_LeaveTheRestBehind
-	special Special_ContestDropOffMons
+	ifgreater 1, Route35NationalParkGate_LeaveTheRestBehind
+	special ContestDropOffMons
 	clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 Route35NationalParkGate_OkayToProceed:
 	setflag ENGINE_BUG_CONTEST_TIMER
@@ -108,18 +106,18 @@ Route35NationalParkGate_OkayToProceed:
 	writetext UnknownText_0x6a3e2
 	waitbutton
 	closetext
-	special Special_GiveParkBalls
+	special GiveParkBalls
 	scall Route35NationalParkGate_EnterContest
 	playsound SFX_ENTER_DOOR
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	waitsfx
-	special Special_SelectRandomBugContestContestants
+	special SelectRandomBugContestContestants
 	warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47
 	end
 
 Route35NationalParkGate_EnterContest:
 	checkcode VAR_FACING
-	if_equal LEFT, Route35NationalParkGate_FacingLeft
+	ifequal LEFT, Route35NationalParkGate_FacingLeft
 	applymovement PLAYER, MovementData_0x6a2e5
 	end
 
@@ -129,17 +127,17 @@ Route35NationalParkGate_FacingLeft:
 
 Route35NationalParkGate_LeaveTheRestBehind:
 	checkcode VAR_PARTYCOUNT
-	if_less_than PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty
+	ifless PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty
 	checkcode VAR_BOXSPACE
-	if_equal 0, Route35NationalParkGate_NoRoomInBox
+	ifequal 0, Route35NationalParkGate_NoRoomInBox
 
-Route35NationalParkGate_LessThanFullParty: ; 6a27d
-	special Special_CheckFirstMonIsEgg
-	if_equal TRUE, Route35NationalParkGate_FirstMonIsEgg
+Route35NationalParkGate_LessThanFullParty:
+	special CheckFirstMonIsEgg
+	ifequal TRUE, Route35NationalParkGate_FirstMonIsEgg
 	writetext UnknownText_0x6a4c6
 	yesorno
 	iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind
-	special Special_ContestDropOffMons
+	special ContestDropOffMons
 	iftrue Route35NationalParkGate_FirstMonIsFainted
 	setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 	writetext UnknownText_0x6a537
@@ -189,7 +187,7 @@ Route35NationalParkGate_ContestIsOver:
 Route35NationalParkGate_NoContestToday:
 	jumptextfaceplayer UnknownText_0x6a894
 
-OfficerScript_0x6a2ca:
+Route35NationalParkGateOfficerScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_DAILY_BUG_CONTEST
@@ -202,8 +200,8 @@ OfficerScript_0x6a2ca:
 Route35NationalParkGateYoungsterScript:
 	jumptextfaceplayer Route35NationalParkGateYoungsterText
 
-MapRoute36NationalParkGateSignpost0Script:
-	jumptext UnknownText_0x6a90e
+BugCatchingContestExplanationSign:
+	jumptext BugCatchingContestExplanationText
 
 Route35NationalParkGate_GetDayOfWeek:
 	jumpstd daytotext
@@ -417,7 +415,7 @@ Route35NationalParkGateYoungsterText:
 	cont "test going to be?"
 	done
 
-UnknownText_0x6a90e:
+BugCatchingContestExplanationText:
 	text "The Bug-Catching"
 	line "Contest is held on"
 
@@ -438,25 +436,20 @@ UnknownText_0x6a90e:
 	done
 
 Route35NationalParkGate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 3, 0, 3, NATIONAL_PARK
-	warp_def 4, 0, 4, NATIONAL_PARK
-	warp_def 3, 7, 3, ROUTE_35
-	warp_def 4, 7, 3, ROUTE_35
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 5, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
-
-.ObjectEvents:
-	db 3
-	object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
-	object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
-	object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  3,  0, NATIONAL_PARK, 3
+	warp_event  4,  0, NATIONAL_PARK, 4
+	warp_event  3,  7, ROUTE_35, 3
+	warp_event  4,  7, ROUTE_35, 3
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  5,  0, BGEVENT_READ, BugCatchingContestExplanationSign
+
+	db 3 ; object events
+	object_event  2,  1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35OfficerScriptContest, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
+	object_event  6,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
+	object_event  0,  3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateOfficerScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
diff --git a/maps/Route36.asm b/maps/Route36.asm
index fceef3306..67458e6f5 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE36_YOUNGSTER1
 	const ROUTE36_YOUNGSTER2
 	const ROUTE36_WEIRD_TREE
@@ -10,13 +10,11 @@ const_value set 2
 	const ROUTE36_SUICUNE
 
 Route36_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_ROUTE36_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE36_SUICUNE
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ArthurCallback
 
 .DummyScene0:
@@ -27,7 +25,7 @@ Route36_MapScripts:
 
 .ArthurCallback:
 	checkcode VAR_WEEKDAY
-	if_equal THURSDAY, .ArthurAppears
+	ifequal THURSDAY, .ArthurAppears
 	disappear ROUTE36_ARTHUR
 	return
 
@@ -39,14 +37,14 @@ Route36SuicuneScript:
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement ROUTE36_SUICUNE, Route36SuicuneMovement
 	disappear ROUTE36_SUICUNE
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	pause 10
-	setscene 0
+	setscene SCENE_ROUTE36_NOTHING
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
-	setmapscene CIANWOOD_CITY, 1
+	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
 	end
 
 SudowoodoScript:
@@ -79,7 +77,7 @@ WateredWeirdTreeScript:: ; export (for when you use Squirtbottle from pack)
 	loadwildmon SUDOWOODO, 20
 	startbattle
 	setevent EVENT_FOUGHT_SUDOWOODO
-	if_equal $2, DidntCatchSudowoodo
+	ifequal $2, DidntCatchSudowoodo
 	disappear ROUTE36_WEIRD_TREE
 	variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
 	reloadmapafterbattle
@@ -94,8 +92,8 @@ DidntCatchSudowoodo:
 	applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee
 	disappear ROUTE36_WEIRD_TREE
 	variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
-	special Special_LoadUsedSpritesGFX
-	special Special_RefreshSprites
+	special LoadUsedSpritesGFX
+	special RefreshSprites
 	end
 
 Route36FloriaScript:
@@ -109,7 +107,7 @@ Route36FloriaScript:
 	closetext
 	clearevent EVENT_FLORIA_AT_FLOWER_SHOP
 	checkcode VAR_FACING
-	if_equal UP, .Up
+	ifequal UP, .Up
 	applymovement ROUTE36_FLORIA, FloriaMovement1
 	disappear ROUTE36_FLORIA
 	end
@@ -150,28 +148,28 @@ Route36RockSmashGuyScript:
 	closetext
 	end
 
-LassScript_0x1940e0:
+Route36LassScript:
 	faceplayer
 	opentext
 	checkevent EVENT_FOUGHT_SUDOWOODO
 	iftrue .ClearedSudowoodo
-	writetext UnknownText_0x194626
+	writetext Route36LassText
 	waitbutton
 	closetext
 	end
 
 .ClearedSudowoodo:
-	writetext UnknownText_0x19469e
+	writetext Route36LassText_ClearedSudowoodo
 	waitbutton
 	closetext
 	end
 
 TrainerSchoolboyAlan1:
-	trainer EVENT_BEAT_SCHOOLBOY_ALAN, SCHOOLBOY, ALAN1, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, 0, .Script
+	trainer SCHOOLBOY, ALAN1, EVENT_BEAT_SCHOOLBOY_ALAN, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_ALAN
 	iftrue .ChooseRematch
@@ -191,8 +189,8 @@ TrainerSchoolboyAlan1:
 	scall .AskNumber2
 .ContinueAskForPhoneNumber:
 	askforphonenumber PHONE_SCHOOLBOY_ALAN
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -201,11 +199,11 @@ TrainerSchoolboyAlan1:
 	scall .Rematch
 	winlosstext SchoolboyAlan1BeatenText, 0
 	copybytetovar wAlanFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -305,10 +303,10 @@ TrainerSchoolboyAlan1:
 	end
 
 TrainerPsychicMark:
-	trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, .Script
+	trainer PSYCHIC_T, MARK, EVENT_BEAT_PSYCHIC_MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicMarkAfterBattleText
 	waitbutton
@@ -321,7 +319,7 @@ ArthurScript:
 	checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR
 	iftrue .AlreadyGotStone
 	checkcode VAR_WEEKDAY
-	if_not_equal THURSDAY, ArthurNotThursdayScript
+	ifnotequal THURSDAY, ArthurNotThursdayScript
 	checkevent EVENT_MET_ARTHUR_OF_THURSDAY
 	iftrue .MetArthur
 	writetext MeetArthurText
@@ -523,7 +521,7 @@ UnknownText_0x1945b8:
 	line "opened…"
 	done
 
-UnknownText_0x194626:
+Route36LassText:
 	text "An odd tree is"
 	line "blocking the way"
 	cont "to GOLDENROD CITY."
@@ -535,7 +533,7 @@ UnknownText_0x194626:
 	line "be done about it."
 	done
 
-UnknownText_0x19469e:
+Route36LassText_ClearedSudowoodo:
 	text "That odd tree dis-"
 	line "appeared without a"
 	cont "trace."
@@ -660,36 +658,31 @@ Route36TrainerTips2Text:
 	done
 
 Route36_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE
-	warp_def 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE
-	warp_def 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE
-
-.CoordEvents:
-	db 2
-	coord_event 20, 7, 1, Route36SuicuneScript
-	coord_event 22, 7, 1, Route36SuicuneScript
-
-.BGEvents:
-	db 4
-	bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event 18,  8, ROUTE_36_NATIONAL_PARK_GATE, 3
+	warp_event 18,  9, ROUTE_36_NATIONAL_PARK_GATE, 4
+	warp_event 47, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 1
+	warp_event 48, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 2
+
+	db 2 ; coord events
+	coord_event 20,  7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript
+	coord_event 22,  7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript
+
+	db 4 ; bg events
+	bg_event 29,  1, BGEVENT_READ, Route36TrainerTips2
 	bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign
-	bg_event 55, 7, BGEVENT_READ, Route36Sign
-	bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1
+	bg_event 55,  7, BGEVENT_READ, Route36Sign
+	bg_event 21,  7, BGEVENT_READ, Route36TrainerTips1
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1
 	object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1
-	object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
-	object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1
-	object_event 44, 9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
-	object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1
-	object_event 46, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
+	object_event 35,  9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO
+	object_event 51,  8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36LassScript, -1
+	object_event 44,  9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1
+	object_event 21,  4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1
+	object_event 46,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY
 	object_event 33, 12, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO
-	object_event 21, 6, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
+	object_event 21,  6, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 5251fa470..7faddf989 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE36NATIONALPARKGATE_OFFICER1
 	const ROUTE36NATIONALPARKGATE_YOUNGSTER1
 	const ROUTE36NATIONALPARKGATE_YOUNGSTER2
@@ -13,14 +13,12 @@ const_value set 2
 	const ROUTE36NATIONALPARKGATE_OFFICER2
 
 Route36NationalParkGate_MapScripts:
-.SceneScripts:
-	db 3
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .LeaveContestEarly
-
-.MapCallbacks:
-	db 2
+	db 3 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_ROUTE36NATIONALPARKGATE_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE36NATIONALPARKGATE_UNUSED
+	scene_script .LeaveContestEarly ; SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
+
+	db 2 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
 	callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
 
@@ -37,20 +35,20 @@ Route36NationalParkGate_MapScripts:
 .CheckIfContestRunning:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .BugContestIsRunning
-	setscene 0
+	setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING
 	return
 
 .BugContestIsRunning:
-	setscene 2
+	setscene SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
 	return
 
 .CheckIfContestAvailable:
 	checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
 	iftrue .Return
 	checkcode VAR_WEEKDAY
-	if_equal TUESDAY, .SetContestOfficer
-	if_equal THURSDAY, .SetContestOfficer
-	if_equal SATURDAY, .SetContestOfficer
+	ifequal TUESDAY, .SetContestOfficer
+	ifequal THURSDAY, .SetContestOfficer
+	ifequal SATURDAY, .SetContestOfficer
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .SetContestOfficer
 	disappear ROUTE36NATIONALPARKGATE_OFFICER1
@@ -64,7 +62,7 @@ Route36NationalParkGate_MapScripts:
 	return
 
 .LeavingContestEarly:
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	checkcode VAR_CONTESTMINUTES
 	addvar 1
@@ -75,23 +73,23 @@ Route36NationalParkGate_MapScripts:
 	writetext UnknownText_0x6b2c5
 	waitbutton
 	closetext
-	special Special_FadeBlackQuickly
+	special FadeBlackQuickly
 	special ReloadSpritesNoPalettes
 	scall .CopyContestants
 	disappear ROUTE36NATIONALPARKGATE_OFFICER1
 	appear ROUTE36NATIONALPARKGATE_OFFICER2
 	applymovement PLAYER, MovementData_0x6add1
 	pause 15
-	special Special_FadeInQuickly
+	special FadeInQuickly
 	jumpstd bugcontestresults
 
 .GoBackToContest:
 	writetext UnknownText_0x6b300
 	waitbutton
 	closetext
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	playsound SFX_EXIT_BUILDING
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	waitsfx
 	warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18
 	end
@@ -142,10 +140,10 @@ Route36NationalParkGate_MapScripts:
 
 Route36OfficerScriptContest:
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, _ContestNotOn
-	if_equal MONDAY, _ContestNotOn
-	if_equal WEDNESDAY, _ContestNotOn
-	if_equal FRIDAY, _ContestNotOn
+	ifequal SUNDAY, _ContestNotOn
+	ifequal MONDAY, _ContestNotOn
+	ifequal WEDNESDAY, _ContestNotOn
+	ifequal FRIDAY, _ContestNotOn
 	faceplayer
 	opentext
 	checkflag ENGINE_DAILY_BUG_CONTEST
@@ -155,8 +153,8 @@ Route36OfficerScriptContest:
 	yesorno
 	iffalse .DecidedNotToJoinContest
 	checkcode VAR_PARTYCOUNT
-	if_greater_than 1, .LeaveMonsWithOfficer
-	special Special_ContestDropOffMons
+	ifgreater 1, .LeaveMonsWithOfficer
+	special ContestDropOffMons
 	clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 .ResumeStartingContest:
 	setflag ENGINE_BUG_CONTEST_TIMER
@@ -171,27 +169,27 @@ Route36OfficerScriptContest:
 	waitbutton
 	closetext
 	setflag ENGINE_BUG_CONTEST_TIMER
-	special Special_GiveParkBalls
-	spriteface PLAYER, LEFT
+	special GiveParkBalls
+	turnobject PLAYER, LEFT
 	playsound SFX_EXIT_BUILDING
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	waitsfx
-	special Special_SelectRandomBugContestContestants
+	special SelectRandomBugContestContestants
 	warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18
 	end
 
 .LeaveMonsWithOfficer:
 	checkcode VAR_PARTYCOUNT
-	if_less_than PARTY_LENGTH, .ContinueLeavingMons
+	ifless PARTY_LENGTH, .ContinueLeavingMons
 	checkcode VAR_BOXSPACE
-	if_equal 0, .BoxFull
+	ifequal 0, .BoxFull
 .ContinueLeavingMons:
-	special Special_CheckFirstMonIsEgg
-	if_equal TRUE, .FirstMonIsEgg
+	special CheckFirstMonIsEgg
+	ifequal TRUE, .FirstMonIsEgg
 	writetext UnknownText_0x6afb0
 	yesorno
 	iffalse .RefusedToLeaveMons
-	special Special_ContestDropOffMons
+	special ContestDropOffMons
 	iftrue .FirstMonIsFainted
 	setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 	writetext UnknownText_0x6b021
@@ -291,7 +289,7 @@ Route36Officer_ContestHasConcluded:
 _ContestNotOn:
 	jumptextfaceplayer UnknownText_0x6b370
 
-OfficerScript_0x6acf4:
+Route36NationalParkGateOfficerScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_DAILY_BUG_CONTEST
@@ -305,168 +303,169 @@ Route36ParkGate_DayToText:
 	jumpstd daytotext
 	end
 
-YoungsterScript_0x6ad06:
+BugCatchingContestant1BScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iffalse UnknownScript_0x6ad14
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b399
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad14:
+.StillCompeting:
 	writetext UnknownText_0x6b3c4
 	waitbutton
 	closetext
 	end
 
-YoungsterScript_0x6ad1a:
+BugCatchingContestant2BScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iffalse UnknownScript_0x6ad28
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b40f
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad28:
+.StillCompeting:
 	writetext UnknownText_0x6b440
 	waitbutton
 	closetext
 	end
 
-RockerScript_0x6ad2e:
+BugCatchingContestant3BScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iffalse UnknownScript_0x6ad3c
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b462
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad3c:
+.StillCompeting:
 	writetext UnknownText_0x6b496
 	waitbutton
 	closetext
 	end
 
-PokefanMScript_0x6ad42:
+BugCatchingContestant4BScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iffalse UnknownScript_0x6ad50
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b4da
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad50:
+.StillCompeting:
 	writetext UnknownText_0x6b50a
 	waitbutton
 	closetext
 	end
 
-YoungsterScript_0x6ad56:
+BugCatchingContestant5BScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iffalse UnknownScript_0x6ad64
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b54e
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad64:
+.StillCompeting:
 	writetext UnknownText_0x6b57c
 	waitbutton
 	closetext
 	end
 
-YoungsterScript_0x6ad6a:
+BugCatchingContestant6BScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iffalse UnknownScript_0x6ad78
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b5b0
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad78:
+.StillCompeting:
 	writetext UnknownText_0x6b5dd
 	waitbutton
 	closetext
 	end
 
-LassScript_0x6ad7e:
+BugCatchingContestant7BScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iffalse UnknownScript_0x6ad8c
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b64b
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ad8c:
+.StillCompeting:
 	writetext UnknownText_0x6b698
 	waitbutton
 	closetext
 	end
 
-YoungsterScript_0x6ad92:
+BugCatchingContestant8BScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iffalse UnknownScript_0x6ada0
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b6b8
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6ada0:
+.StillCompeting:
 	writetext UnknownText_0x6b6e9
 	waitbutton
 	closetext
 	end
 
-YoungsterScript_0x6ada6:
+BugCatchingContestant9BScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iffalse UnknownScript_0x6adb4
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b71b
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6adb4:
+.StillCompeting:
 	writetext UnknownText_0x6b740
 	waitbutton
 	closetext
 	end
 
-YoungsterScript_0x6adba:
+BugCatchingContestant10BScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iffalse UnknownScript_0x6adc8
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iffalse .StillCompeting
 	writetext UnknownText_0x6b76f
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6adc8:
+.StillCompeting:
 	writetext UnknownText_0x6b7af
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x6adce:
-	jumptext UnknownText_0x6b84c
+UnusedBugCatchingContestExplanationSign:
+; duplicate of BugCatchingContestExplanationSign in Route35NationalParkGate.asm
+	jumptext UnusedBugCatchingContestExplanationText
 
 MovementData_0x6add1:
 	big_step DOWN
@@ -796,10 +795,10 @@ UnknownText_0x6b7af:
 	line "win."
 	done
 
+UnusedSudowoodoText:
 ; This text is unused and unreferenced in the final game.
 ; The tree Pokémon is Sudowoodo.
 ; The Silph Scope 2 was later reworked into the Squirtbottle.
-UnusedSudowoodoText:
 	text "I hear there's a"
 	line "#MON that looks"
 	cont "just like a tree."
@@ -809,7 +808,8 @@ UnusedSudowoodoText:
 	cont "SILPHSCOPE 2."
 	done
 
-UnknownText_0x6b84c:
+UnusedBugCatchingContestExplanationText:
+; duplicate of BugCatchingContestExplanationText in Route35NationalParkGate.asm
 	text "The Bug-Catching"
 	line "Contest is held on"
 
@@ -850,34 +850,29 @@ UnknownText_0x6b97f:
 	done
 
 Route36NationalParkGate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 0, 4, 1, NATIONAL_PARK
-	warp_def 0, 5, 2, NATIONAL_PARK
-	warp_def 9, 4, 1, ROUTE_36
-	warp_def 9, 5, 2, ROUTE_36
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 6, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script
-
-.ObjectEvents:
-	db 12
-	object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
-	object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
-	object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
-	object_event 2, 6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B
-	object_event 6, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B
-	object_event 2, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B
-	object_event 5, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B
-	object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B
-	object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B
-	object_event 6, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B
-	object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B
-	object_event 3, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  0,  4, NATIONAL_PARK, 1
+	warp_event  0,  5, NATIONAL_PARK, 2
+	warp_event  9,  4, ROUTE_36, 1
+	warp_event  9,  5, ROUTE_36, 2
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  6,  0, BGEVENT_READ, BugCatchingContestExplanationSign
+
+	db 12 ; object events
+	object_event  0,  3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
+	object_event  2,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant1BScript, EVENT_BUG_CATCHING_CONTESTANT_1B
+	object_event  4,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant2BScript, EVENT_BUG_CATCHING_CONTESTANT_2B
+	object_event  2,  6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant3BScript, EVENT_BUG_CATCHING_CONTESTANT_3B
+	object_event  6,  5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant4BScript, EVENT_BUG_CATCHING_CONTESTANT_4B
+	object_event  2,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant5BScript, EVENT_BUG_CATCHING_CONTESTANT_5B
+	object_event  5,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant6BScript, EVENT_BUG_CATCHING_CONTESTANT_6B
+	object_event  3,  6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant7BScript, EVENT_BUG_CATCHING_CONTESTANT_7B
+	object_event  4,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant8BScript, EVENT_BUG_CATCHING_CONTESTANT_8B
+	object_event  6,  7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant9BScript, EVENT_BUG_CATCHING_CONTESTANT_9B
+	object_event  6,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant10BScript, EVENT_BUG_CATCHING_CONTESTANT_10B
+	object_event  3,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36NationalParkGateOfficerScript, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm
index c7355dd04..ed894445d 100644
--- a/maps/Route36RuinsOfAlphGate.asm
+++ b/maps/Route36RuinsOfAlphGate.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE36RUINSOFALPHGATE_OFFICER
 	const ROUTE36RUINSOFALPHGATE_GRAMPS
 
 Route36RuinsOfAlphGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route36RuinsOfAlphGateOfficerScript:
 	jumptextfaceplayer Route36RuinsOfAlphGateOfficerText
@@ -35,23 +33,18 @@ Route36RuinsOfAlphGateGrampsText:
 	done
 
 Route36RuinsOfAlphGate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 4, 0, 3, ROUTE_36
-	warp_def 5, 0, 4, ROUTE_36
-	warp_def 4, 7, 9, RUINS_OF_ALPH_OUTSIDE
-	warp_def 5, 7, 9, RUINS_OF_ALPH_OUTSIDE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 2
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1
-	object_event 7, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  4,  0, ROUTE_36, 3
+	warp_event  5,  0, ROUTE_36, 4
+	warp_event  4,  7, RUINS_OF_ALPH_OUTSIDE, 9
+	warp_event  5,  7, RUINS_OF_ALPH_OUTSIDE, 9
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1
+	object_event  7,  5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 27dd38893..98cf05d20 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE37_WEIRD_TREE1
 	const ROUTE37_WEIRD_TREE2
 	const ROUTE37_YOUNGSTER
@@ -8,16 +8,14 @@ const_value set 2
 	const ROUTE37_FRUIT_TREE3
 
 Route37_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Sunny
 
 .Sunny:
 	checkcode VAR_WEEKDAY
-	if_equal SUNDAY, .SunnyAppears
+	ifequal SUNDAY, .SunnyAppears
 	disappear ROUTE37_SUNNY
 	return
 
@@ -26,10 +24,10 @@ Route37_MapScripts:
 	return
 
 TrainerTwinsAnnandanne1:
-	trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script
+	trainer TWINS, ANNANDANNE1, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsAnnandanne1AfterBattleText
 	waitbutton
@@ -37,10 +35,10 @@ TrainerTwinsAnnandanne1:
 	end
 
 TrainerTwinsAnnandanne2:
-	trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script
+	trainer TWINS, ANNANDANNE2, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext TwinsAnnandanne2AfterBattleText
 	waitbutton
@@ -48,10 +46,10 @@ TrainerTwinsAnnandanne2:
 	end
 
 TrainerPsychicGreg:
-	trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script
+	trainer PSYCHIC_T, GREG, EVENT_BEAT_PSYCHIC_GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicGregAfterBattleText
 	waitbutton
@@ -64,7 +62,7 @@ SunnyScript:
 	checkevent EVENT_GOT_MAGNET_FROM_SUNNY
 	iftrue SunnySundayScript
 	checkcode VAR_WEEKDAY
-	if_not_equal SUNDAY, SunnyNotSundayScript
+	ifnotequal SUNDAY, SunnyNotSundayScript
 	checkevent EVENT_MET_SUNNY_OF_SUNDAY
 	iftrue .MetSunny
 	writetext MeetSunnyText
@@ -104,17 +102,17 @@ SunnyNotSundayScript:
 Route37Sign:
 	jumptext Route37SignText
 
-FruitTreeScript_0x1a8e09:
+Route37FruitTree1:
 	fruittree FRUITTREE_ROUTE_37_1
 
-FruitTreeScript_0x1a8e0b:
+Route37FruitTree2:
 	fruittree FRUITTREE_ROUTE_37_2
 
-FruitTreeScript_0x1a8e0d:
+Route37FruitTree3:
 	fruittree FRUITTREE_ROUTE_37_3
 
 Route37HiddenEther:
-	hiddenitem EVENT_ROUTE_37_HIDDEN_ETHER, ETHER
+	hiddenitem ETHER, EVENT_ROUTE_37_HIDDEN_ETHER
 
 TwinsAnnandanne1SeenText:
 	text "ANN: ANNE and I"
@@ -238,26 +236,21 @@ Route37SignText:
 	done
 
 Route37_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 0
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 5, 3, BGEVENT_READ, Route37Sign
-	bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther
-
-.ObjectEvents:
-	db 7
-	object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1
-	object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1
-	object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1
-	object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1
-	object_event 16, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
-	object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1
-	object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1
+	db 0, 0 ; filler
+
+	db 0 ; warp events
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  5,  3, BGEVENT_READ, Route37Sign
+	bg_event  4,  2, BGEVENT_ITEM, Route37HiddenEther
+
+	db 7 ; object events
+	object_event  6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1
+	object_event  7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1
+	object_event  6,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1
+	object_event 13,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route37FruitTree1, -1
+	object_event 16,  8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
+	object_event 16,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route37FruitTree2, -1
+	object_event 15,  7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route37FruitTree3, -1
diff --git a/maps/Route38.asm b/maps/Route38.asm
index c228429ba..d8cd9370b 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE38_STANDING_YOUNGSTER1
 	const ROUTE38_LASS
 	const ROUTE38_STANDING_YOUNGSTER2
@@ -8,17 +8,15 @@ const_value set 2
 	const ROUTE38_BUENA2
 
 Route38_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperToby:
-	trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script
+	trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script
 
 .Script
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperTobyAfterBattleText
 	waitbutton
@@ -26,10 +24,10 @@ TrainerBirdKeeperToby:
 	end
 
 TrainerSailorHarry:
-	trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script
+	trainer SAILOR, HARRY, EVENT_BEAT_SAILOR_HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script
 
 .Script
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorHarryAfterBattleText
 	waitbutton
@@ -37,11 +35,11 @@ TrainerSailorHarry:
 	end
 
 TrainerLassDana1:
-	trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .Script
+	trainer LASS, DANA1, EVENT_BEAT_LASS_DANA, LassDana1SeenText, LassDana1BeatenText, 0, .Script
 
 .Script
 	writecode VAR_CALLERID, PHONE_LASS_DANA
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_DANA
 	iftrue .DanaRematch
@@ -61,8 +59,8 @@ TrainerLassDana1:
 	scall .AskNumber2F
 .AskForPhoneNumber:
 	askforphonenumber PHONE_LASS_DANA
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber
 	trainertotext LASS, DANA1, MEM_BUFFER_0
 	scall .RegisteredPhoneNumber
 	jump .NumberAccepted
@@ -71,11 +69,11 @@ TrainerLassDana1:
 	scall .Rematch
 	winlosstext LassDana1BeatenText, 0
 	copybytetovar wDanaFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -175,11 +173,11 @@ TrainerLassDana1:
 	end
 
 TrainerSchoolboyChad1:
-	trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script
+	trainer SCHOOLBOY, CHAD1, EVENT_BEAT_SCHOOLBOY_CHAD, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script
 
 .Script
 	writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_CHAD
 	iftrue .ChadRematch
@@ -197,8 +195,8 @@ TrainerSchoolboyChad1:
 	scall .AskPhoneNumber2
 .AskToRegisterNumber:
 	askforphonenumber PHONE_SCHOOLBOY_CHAD
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .SaidNo
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .SaidNo
 	trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0
 	scall .RegisteredChad
 	jump .HaveChadsNumber
@@ -207,11 +205,11 @@ TrainerSchoolboyChad1:
 	scall .Rematch
 	winlosstext SchoolboyChad1BeatenText, 0
 	copybytetovar wChadFightCount
-	if_equal 4, .Fight4
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 4, .Fight4
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight4:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight4
@@ -292,10 +290,10 @@ TrainerSchoolboyChad1:
 	end
 
 TrainerBeautyValerie:
-	trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script
+	trainer BEAUTY, VALERIE, EVENT_BEAT_BEAUTY_VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script
 
 .Script
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautyValerieAfterBattleText
 	waitbutton
@@ -303,10 +301,10 @@ TrainerBeautyValerie:
 	end
 
 TrainerBeautyOlivia:
-	trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script
+	trainer BEAUTY, OLIVIA, EVENT_BEAT_BEAUTY_OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script
 
 .Script
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BeautyOliviaAfterBattleText
 	waitbutton
@@ -319,7 +317,7 @@ Route38Sign:
 Route38TrainerTips:
 	jumptext Route38TrainerTipsText
 
-FruitTreeScript_0x1a1f33:
+Route38FruitTree:
 	fruittree FRUITTREE_ROUTE_38
 
 BirdKeeperTobySeenText:
@@ -473,28 +471,23 @@ Route38TrainerTipsText:
 	done
 
 Route38_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 35, 8, 1, ROUTE_38_ECRUTEAK_GATE
-	warp_def 35, 9, 2, ROUTE_38_ECRUTEAK_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 33, 7, BGEVENT_READ, Route38Sign
-	bg_event 5, 13, BGEVENT_READ, Route38TrainerTips
-
-.ObjectEvents:
-	db 7
-	object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1
-	object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event 35,  8, ROUTE_38_ECRUTEAK_GATE, 1
+	warp_event 35,  9, ROUTE_38_ECRUTEAK_GATE, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 33,  7, BGEVENT_READ, Route38Sign
+	bg_event  5, 13, BGEVENT_READ, Route38TrainerTips
+
+	db 7 ; object events
+	object_event  4,  1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1
+	object_event 15,  3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
 	object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1
-	object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1
-	object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1
-	object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1
-	object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1
+	object_event 19,  9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1
+	object_event 24,  5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1
+	object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route38FruitTree, -1
+	object_event  5,  8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1
diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm
index fa7280b57..2277c3a1d 100644
--- a/maps/Route38EcruteakGate.asm
+++ b/maps/Route38EcruteakGate.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE38ECRUTEAKGATE_OFFICER
 
 Route38EcruteakGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route38EcruteakGateOfficerScript:
 	jumptextfaceplayer Route38EcruteakGateOfficerText
@@ -25,22 +23,17 @@ Route38EcruteakGateOfficerText:
 	done
 
 Route38EcruteakGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 0, 4, 1, ROUTE_38
-	warp_def 0, 5, 2, ROUTE_38
-	warp_def 9, 4, 14, ECRUTEAK_CITY
-	warp_def 9, 5, 15, ECRUTEAK_CITY
+	db 4 ; warp events
+	warp_event  0,  4, ROUTE_38, 1
+	warp_event  0,  5, ROUTE_38, 2
+	warp_event  9,  4, ECRUTEAK_CITY, 14
+	warp_event  9,  5, ECRUTEAK_CITY, 15
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1
+	db 1 ; object events
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 36ecda5fc..8a37655a2 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE39_SAILOR
 	const ROUTE39_POKEFAN_M
 	const ROUTE39_POKEFAN_F1
@@ -11,11 +11,9 @@ const_value set 2
 	const ROUTE39_POKEFAN_F2
 
 Route39_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route39Miltank:
 	opentext
@@ -26,11 +24,11 @@ Route39Miltank:
 	end
 
 TrainerPokefanmDerek:
-	trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerekSeenText, PokefanmDerekBeatenText, 0, .Script
+	trainer POKEFANM, DEREK1, EVENT_BEAT_POKEFANM_DEREK, PokefanmDerekSeenText, PokefanmDerekBeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_POKEFANM_DEREK
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_DEREK_HAS_NUGGET
 	iftrue .HasNugget
@@ -50,8 +48,8 @@ TrainerPokefanmDerek:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_POKEFANM_DEREK
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext POKEFANM, DEREK1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -105,10 +103,10 @@ TrainerPokefanmDerek:
 	end
 
 TrainerPokefanfRuth:
-	trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script
+	trainer POKEFANF, RUTH, EVENT_BEAT_POKEFANF_RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanfRuthAfterBattleText
 	waitbutton
@@ -116,10 +114,10 @@ TrainerPokefanfRuth:
 	end
 
 TrainerSailorEugene:
-	trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script
+	trainer SAILOR, EUGENE, EVENT_BEAT_SAILOR_EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SailorEugeneAfterBattleText
 	waitbutton
@@ -127,10 +125,10 @@ TrainerSailorEugene:
 	end
 
 TrainerPsychicNorman:
-	trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script
+	trainer PSYCHIC_T, NORMAN, EVENT_BEAT_PSYCHIC_NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicNormanAfterBattleText
 	waitbutton
@@ -140,7 +138,7 @@ TrainerPsychicNorman:
 TrainerPokefanfJaime:
 	faceplayer
 	opentext
-	checknite
+	checktime NITE
 	iffalse .NotNight
 	checkevent EVENT_BEAT_POKEFANF_JAIME
 	iftrue .Beaten
@@ -176,11 +174,11 @@ MoomooFarmSign:
 Route39TrainerTips:
 	jumptext Route39TrainerTipsText
 
-FruitTreeScript_0x1a5bf4:
+Route39FruitTree:
 	fruittree FRUITTREE_ROUTE_39
 
 Route39HiddenNugget:
-	hiddenitem EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET
+	hiddenitem NUGGET, EVENT_ROUTE_39_HIDDEN_NUGGET
 
 Route39MiltankText:
 	text "MILTANK: Mooo!"
@@ -344,33 +342,28 @@ Route39TrainerTipsText:
 	done
 
 Route39_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 1, 3, 1, ROUTE_39_BARN
-	warp_def 5, 3, 1, ROUTE_39_FARMHOUSE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 4
-	bg_event 5, 31, BGEVENT_READ, Route39TrainerTips
-	bg_event 9, 5, BGEVENT_READ, MoomooFarmSign
-	bg_event 15, 7, BGEVENT_READ, Route39Sign
-	bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget
-
-.ObjectEvents:
-	db 10
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  1,  3, ROUTE_39_BARN, 1
+	warp_event  5,  3, ROUTE_39_FARMHOUSE, 1
+
+	db 0 ; coord events
+
+	db 4 ; bg events
+	bg_event  5, 31, BGEVENT_READ, Route39TrainerTips
+	bg_event  9,  5, BGEVENT_READ, MoomooFarmSign
+	bg_event 15,  7, BGEVENT_READ, Route39Sign
+	bg_event  5, 13, BGEVENT_ITEM, Route39HiddenNugget
+
+	db 10 ; object events
 	object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1
 	object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek, -1
 	object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1
-	object_event 3, 12, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event 6, 11, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event 4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
-	object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1
-	object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
-	object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1
+	object_event  3, 12, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event  6, 11, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event  4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event  8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+	object_event 13,  7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1
+	object_event  9,  3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39FruitTree, -1
+	object_event  4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index 5cc21eab5..15f69e310 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE39BARN_TWIN1
 	const ROUTE39BARN_TWIN2
 	const ROUTE39BARN_MOOMOO
 
 Route39Barn_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-TwinScript_0x9cc76:
+Route39BarnTwin1Script:
 	faceplayer
 	opentext
 	checkevent EVENT_HEALED_MOOMOO
@@ -18,17 +16,17 @@ TwinScript_0x9cc76:
 	writetext Text_MoomooIsSick
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN1, RIGHT
+	turnobject ROUTE39BARN_TWIN1, RIGHT
 	end
 
 .FeedingMooMoo:
 	writetext Text_WereFeedingMoomoo
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN1, RIGHT
+	turnobject ROUTE39BARN_TWIN1, RIGHT
 	end
 
-TwinScript_0x9cc90:
+Route39BarnTwin2Script:
 	faceplayer
 	opentext
 	checkevent EVENT_HEALED_MOOMOO
@@ -36,14 +34,14 @@ TwinScript_0x9cc90:
 	writetext Text_MoomooIsSick
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN2, LEFT
+	turnobject ROUTE39BARN_TWIN2, LEFT
 	end
 
 .FeedingMooMoo:
 	writetext Text_WereFeedingMoomoo
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN2, LEFT
+	turnobject ROUTE39BARN_TWIN2, LEFT
 	end
 
 MooMoo:
@@ -52,7 +50,7 @@ MooMoo:
 	iftrue .HappyCow
 	writetext Text_WeakMoo
 	writebyte MILTANK
-	special Special_PlaySlowCry
+	special PlaySlowCry
 	buttonsound
 	writetext Text_ItsCryIsWeak
 	checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
@@ -72,9 +70,9 @@ MooMoo:
 	copybytetovar wMooMooBerries
 	addvar 1
 	copyvartobyte wMooMooBerries
-	if_equal 3, .ThreeBerries
-	if_equal 5, .FiveBerries
-	if_equal 7, .SevenBerries
+	ifequal 3, .ThreeBerries
+	ifequal 5, .FiveBerries
+	ifequal 7, .SevenBerries
 	writetext Text_GaveBerry
 	waitbutton
 	closetext
@@ -189,22 +187,17 @@ Text_RefusedToGiveBerry:
 	done
 
 Route39Barn_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 3, 7, 1, ROUTE_39
-	warp_def 4, 7, 1, ROUTE_39
+	db 2 ; warp events
+	warp_event  3,  7, ROUTE_39, 1
+	warp_event  4,  7, ROUTE_39, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1
-	object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1
-	object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1
+	db 3 ; object events
+	object_event  2,  3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39BarnTwin1Script, -1
+	object_event  4,  3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route39BarnTwin2Script, -1
+	object_event  3,  3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index 9f46263de..510d6e5d5 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE39FARMHOUSE_POKEFAN_M
 	const ROUTE39FARMHOUSE_POKEFAN_F
 
 Route39Farmhouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 PokefanM_DairyFarmer:
 	faceplayer
@@ -24,15 +22,15 @@ FarmerMScript_SellMilk:
 	checkitem MOOMOO_MILK
 	iftrue FarmerMScript_Milking
 	writetext FarmerMText_BuyMilk
-	special Special_PlaceMoneyTopRight
+	special PlaceMoneyTopRight
 	yesorno
 	iffalse FarmerMScript_NoSale
 	checkmoney YOUR_MONEY, 500
-	if_equal HAVE_LESS, FarmerMScript_NoMoney
+	ifequal HAVE_LESS, FarmerMScript_NoMoney
 	giveitem MOOMOO_MILK
 	iffalse FarmerMScript_NoRoom
 	takemoney YOUR_MONEY, 500
-	special Special_PlaceMoneyTopRight
+	special PlaceMoneyTopRight
 	waitsfx
 	playsound SFX_TRANSACTION
 	writetext FarmerMText_GotMilk
@@ -193,23 +191,18 @@ FarmerFText_SnoreSpeech:
 	done
 
 Route39Farmhouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 2, ROUTE_39
-	warp_def 3, 7, 2, ROUTE_39
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf
-
-.ObjectEvents:
-	db 2
-	object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1
-	object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_39, 2
+	warp_event  3,  7, ROUTE_39, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, FarmhouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, FarmhouseBookshelf
+
+	db 2 ; object events
+	object_event  3,  2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1
+	object_event  5,  4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1
diff --git a/maps/Route4.asm b/maps/Route4.asm
index a0bf7c4bc..c7722e3a9 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -1,21 +1,19 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE4_YOUNGSTER
 	const ROUTE4_LASS1
 	const ROUTE4_LASS2
 	const ROUTE4_POKE_BALL
 
 Route4_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperHank:
-	trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script
+	trainer BIRD_KEEPER, HANK, EVENT_BEAT_BIRD_KEEPER_HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperHankAfterBattleText
 	waitbutton
@@ -23,10 +21,10 @@ TrainerBirdKeeperHank:
 	end
 
 TrainerPicnickerHope:
-	trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script
+	trainer PICNICKER, HOPE, EVENT_BEAT_PICNICKER_HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerHopeAfterBattleText
 	waitbutton
@@ -34,10 +32,10 @@ TrainerPicnickerHope:
 	end
 
 TrainerPicnickerSharon:
-	trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script
+	trainer PICNICKER, SHARON, EVENT_BEAT_PICNICKER_SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerSharonAfterBattleText
 	waitbutton
@@ -51,7 +49,7 @@ Route4HPUp:
 	itemball HP_UP
 
 Route4HiddenUltraBall:
-	hiddenitem EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
+	hiddenitem ULTRA_BALL, EVENT_ROUTE_4_HIDDEN_ULTRA_BALL
 
 BirdKeeperHankSeenText:
 	text "I'm raising my"
@@ -121,24 +119,19 @@ MtMoonSquareSignText:
 	done
 
 Route4_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 1
-	warp_def 2, 5, 2, MOUNT_MOON
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign
-	bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall
-
-.ObjectEvents:
-	db 4
-	object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1
-	object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1
-	object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
-	object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP
+	db 0, 0 ; filler
+
+	db 1 ; warp events
+	warp_event  2,  5, MOUNT_MOON, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3,  7, BGEVENT_READ, MtMoonSquareSign
+	bg_event 10,  3, BGEVENT_ITEM, Route4HiddenUltraBall
+
+	db 4 ; object events
+	object_event 17,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1
+	object_event  9,  8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1
+	object_event 21,  6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1
+	object_event 26,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP
diff --git a/maps/Route40.asm b/maps/Route40.asm
index 77f433c81..4d58dfe98 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE40_OLIVINE_RIVAL1
 	const ROUTE40_OLIVINE_RIVAL2
 	const ROUTE40_SWIMMER_GIRL1
@@ -13,17 +13,15 @@ const_value set 2
 	const ROUTE40_STANDING_YOUNGSTER
 
 Route40_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .MonicaCallback
 
 .MonicaCallback:
 	clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, .MonicaAppears
+	ifequal MONDAY, .MonicaAppears
 	disappear ROUTE40_MONICA
 	return
 
@@ -32,10 +30,10 @@ Route40_MapScripts:
 	return
 
 TrainerSwimmerfElaine:
-	trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script
+	trainer SWIMMERF, ELAINE, EVENT_BEAT_SWIMMERF_ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfElaineAfterBattleText
 	waitbutton
@@ -43,10 +41,10 @@ TrainerSwimmerfElaine:
 	end
 
 TrainerSwimmerfPaula:
-	trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script
+	trainer SWIMMERF, PAULA, EVENT_BEAT_SWIMMERF_PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfPaulaAfterBattleText
 	waitbutton
@@ -54,10 +52,10 @@ TrainerSwimmerfPaula:
 	end
 
 TrainerSwimmermSimon:
-	trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script
+	trainer SWIMMERM, SIMON, EVENT_BEAT_SWIMMERM_SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermSimonAfterBattleText
 	waitbutton
@@ -65,10 +63,10 @@ TrainerSwimmermSimon:
 	end
 
 TrainerSwimmermRandall:
-	trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script
+	trainer SWIMMERM, RANDALL, EVENT_BEAT_SWIMMERM_RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermRandallAfterBattleText
 	waitbutton
@@ -78,13 +76,13 @@ TrainerSwimmermRandall:
 Route40Lass1Script:
 	jumptextfaceplayer Route40Lass1Text
 
-PokefanMScript_0x1a61c7:
-	special Special_Mobile_DummyReturnFalse
+Route40PokefanMScript:
+	special Mobile_DummyReturnFalse
 	iftrue .mobile
-	jumptextfaceplayer UnknownText_0x1a646a
+	jumptextfaceplayer Route40PokefanMText
 
 .mobile
-	jumptextfaceplayer UnknownText_0x1a649b
+	jumptextfaceplayer Route40PokefanMText_Mobile
 
 Route40Lass2Script:
 	jumptextfaceplayer Route40Lass2Text
@@ -98,7 +96,7 @@ MonicaScript:
 	checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
 	iftrue .Monday
 	checkcode VAR_WEEKDAY
-	if_not_equal MONDAY, .NotMonday
+	ifnotequal MONDAY, .NotMonday
 	checkevent EVENT_MET_MONICA_OF_MONDAY
 	iftrue .MetMonica
 	writetext MeetMonicaText
@@ -135,7 +133,7 @@ Route40Rock:
 	jumpstd smashrock
 
 Route40HiddenHyperPotion:
-	hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION
+	hiddenitem HYPER_POTION, EVENT_ROUTE_40_HIDDEN_HYPER_POTION
 
 MovementData_0x1a621c:
 	step RIGHT
@@ -243,14 +241,14 @@ Route40Lass1Text:
 	line "the sea."
 	done
 
-UnknownText_0x1a646a:
+Route40PokefanMText:
 	text "Hm! There's a big"
 	line "building up ahead!"
 
 	para "What is it?"
 	done
 
-UnknownText_0x1a649b:
+Route40PokefanMText_Mobile:
 	text "Hm! Look at all"
 	line "those serious-"
 	cont "looking trainers"
@@ -338,32 +336,27 @@ Route40SignText:
 	done
 
 Route40_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE
+	db 1 ; warp events
+	warp_event  9,  5, ROUTE_40_BATTLE_TOWER_GATE, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 14, 10, BGEVENT_READ, Route40Sign
-	bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion
+	bg_event  7,  8, BGEVENT_ITEM, Route40HiddenHyperPotion
 
-.ObjectEvents:
-	db 12
+	db 12 ; object events
 	object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1
 	object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1
-	object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1
+	object_event  3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1
 	object_event 10, 25, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1
-	object_event 7, 11, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
-	object_event 6, 9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
-	object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
+	object_event  7, 11, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
+	object_event  6,  9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
+	object_event  7,  8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
 	object_event 11, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1
-	object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
-	object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1
-	object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1
-	object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	object_event  8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
+	object_event  7,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40PokefanMScript, -1
+	object_event 13,  4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1
+	object_event 16,  9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
index edd8fb7ff..9678e9aa3 100644
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE40BATTLETOWERGATE_ROCKER
 	const ROUTE40BATTLETOWERGATE_TWIN
 
 Route40BattleTowerGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ShowSailor
 
 .ShowSailor:
@@ -71,23 +69,18 @@ Route40BattleTowerGateTwinText:
 	done
 
 Route40BattleTowerGate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 4, 7, 1, ROUTE_40
-	warp_def 5, 7, 1, ROUTE_40
-	warp_def 4, 0, 1, BATTLE_TOWER_OUTSIDE
-	warp_def 5, 0, 2, BATTLE_TOWER_OUTSIDE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 2
-	object_event 3, 3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
-	object_event 7, 5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  4,  7, ROUTE_40, 1
+	warp_event  5,  7, ROUTE_40, 1
+	warp_event  4,  0, BATTLE_TOWER_OUTSIDE, 1
+	warp_event  5,  0, BATTLE_TOWER_OUTSIDE, 2
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  3,  3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+	object_event  7,  5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1
diff --git a/maps/Route41.asm b/maps/Route41.asm
index 4b66164dd..d851a41e5 100644
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE41_OLIVINE_RIVAL1
 	const ROUTE41_OLIVINE_RIVAL2
 	const ROUTE41_OLIVINE_RIVAL3
@@ -11,17 +11,15 @@ const_value set 2
 	const ROUTE41_SWIMMER_GIRL5
 
 Route41_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerSwimmerfKaylee:
-	trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script
+	trainer SWIMMERF, KAYLEE, EVENT_BEAT_SWIMMERF_KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfKayleeAfterBattleText
 	waitbutton
@@ -29,10 +27,10 @@ TrainerSwimmerfKaylee:
 	end
 
 TrainerSwimmerfSusie:
-	trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script
+	trainer SWIMMERF, SUSIE, EVENT_BEAT_SWIMMERF_SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfSusieAfterBattleText
 	waitbutton
@@ -40,10 +38,10 @@ TrainerSwimmerfSusie:
 	end
 
 TrainerSwimmerfDenise:
-	trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script
+	trainer SWIMMERF, DENISE, EVENT_BEAT_SWIMMERF_DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfDeniseAfterBattleText
 	waitbutton
@@ -51,10 +49,10 @@ TrainerSwimmerfDenise:
 	end
 
 TrainerSwimmerfKara:
-	trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script
+	trainer SWIMMERF, KARA, EVENT_BEAT_SWIMMERF_KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfKaraAfterBattleText
 	waitbutton
@@ -62,10 +60,10 @@ TrainerSwimmerfKara:
 	end
 
 TrainerSwimmerfWendy:
-	trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script
+	trainer SWIMMERF, WENDY, EVENT_BEAT_SWIMMERF_WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmerfWendyAfterBattleText
 	waitbutton
@@ -73,10 +71,10 @@ TrainerSwimmerfWendy:
 	end
 
 TrainerSwimmermCharlie:
-	trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script
+	trainer SWIMMERM, CHARLIE, EVENT_BEAT_SWIMMERM_CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermCharlieAfterBattleText
 	waitbutton
@@ -84,10 +82,10 @@ TrainerSwimmermCharlie:
 	end
 
 TrainerSwimmermGeorge:
-	trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script
+	trainer SWIMMERM, GEORGE, EVENT_BEAT_SWIMMERM_GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermGeorgeAfterBattleText
 	waitbutton
@@ -95,10 +93,10 @@ TrainerSwimmermGeorge:
 	end
 
 TrainerSwimmermBerke:
-	trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script
+	trainer SWIMMERM, BERKE, EVENT_BEAT_SWIMMERM_BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermBerkeAfterBattleText
 	waitbutton
@@ -106,10 +104,10 @@ TrainerSwimmermBerke:
 	end
 
 TrainerSwimmermKirk:
-	trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script
+	trainer SWIMMERM, KIRK, EVENT_BEAT_SWIMMERM_KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermKirkAfterBattleText
 	waitbutton
@@ -117,10 +115,10 @@ TrainerSwimmermKirk:
 	end
 
 TrainerSwimmermMathew:
-	trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script
+	trainer SWIMMERM, MATHEW, EVENT_BEAT_SWIMMERM_MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SwimmermMathewAfterBattleText
 	waitbutton
@@ -132,7 +130,7 @@ Route41Rock:
 	jumpstd smashrock
 
 Route41HiddenMaxEther:
-	hiddenitem EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER
+	hiddenitem MAX_ETHER, EVENT_ROUTE_41_HIDDEN_MAX_ETHER
 
 SwimmermCharlieSeenText:
 	text "The water's warm"
@@ -342,32 +340,27 @@ SwimmerfWendyAfterBattleText:
 	done
 
 Route41_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 12, 17, 1, WHIRL_ISLAND_NW
-	warp_def 36, 19, 1, WHIRL_ISLAND_NE
-	warp_def 12, 37, 1, WHIRL_ISLAND_SW
-	warp_def 36, 45, 1, WHIRL_ISLAND_SE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther
-
-.ObjectEvents:
-	db 10
-	object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1
-	object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event 12, 17, WHIRL_ISLAND_NW, 1
+	warp_event 36, 19, WHIRL_ISLAND_NE, 1
+	warp_event 12, 37, WHIRL_ISLAND_SW, 1
+	warp_event 36, 45, WHIRL_ISLAND_SE, 1
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  9, 35, BGEVENT_ITEM, Route41HiddenMaxEther
+
+	db 10 ; object events
+	object_event 32,  6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1
+	object_event 46,  8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1
 	object_event 20, 26, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1
 	object_event 32, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermKirk, -1
 	object_event 19, 46, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermMathew, -1
-	object_event 17, 4, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1
+	object_event 17,  4, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1
 	object_event 23, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1
 	object_event 27, 34, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1
 	object_event 44, 28, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfKara, -1
-	object_event 9, 50, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1
+	object_event  9, 50, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 47d45c140..ff154b6c0 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE42_FISHER
 	const ROUTE42_POKEFAN_M
 	const ROUTE42_SUPER_NERD
@@ -10,13 +10,11 @@ const_value set 2
 	const ROUTE42_SUICUNE
 
 Route42_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_ROUTE42_NOTHING
+	scene_script .DummyScene1 ; SCENE_ROUTE42_SUICUNE
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -28,20 +26,20 @@ Route42SuicuneScript:
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
-	applymovement ROUTE42_SUICUNE, MovementData_0x1a9356
+	applymovement ROUTE42_SUICUNE, Route42SuicuneMovement
 	disappear ROUTE42_SUICUNE
 	pause 10
-	setscene 0
+	setscene SCENE_ROUTE42_NOTHING
 	clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36
-	setmapscene ROUTE_36, 1
+	setmapscene ROUTE_36, SCENE_ROUTE36_SUICUNE
 	end
 
 TrainerFisherTully:
-	trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTullySeenText, FisherTullyBeatenText, 0, .Script
+	trainer FISHER, TULLY1, EVENT_BEAT_FISHER_TULLY, FisherTullySeenText, FisherTullyBeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_FISHER_TULLY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_TULLY
 	iftrue .WantsBattle
@@ -61,8 +59,8 @@ TrainerFisherTully:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_FISHER_TULLY
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext FISHER, TULLY1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -71,10 +69,10 @@ TrainerFisherTully:
 	scall .Rematch
 	winlosstext FisherTullyBeatenText, 0
 	copybytetovar wTullyFightCount
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight3:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight3
@@ -163,10 +161,10 @@ TrainerFisherTully:
 	end
 
 TrainerPokemaniacShane:
-	trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script
+	trainer POKEMANIAC, SHANE, EVENT_BEAT_POKEMANIAC_SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacShaneAfterBattleText
 	waitbutton
@@ -174,10 +172,10 @@ TrainerPokemaniacShane:
 	end
 
 TrainerHikerBenjamin:
-	trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script
+	trainer HIKER, BENJAMIN, EVENT_BEAT_HIKER_BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerBenjaminAfterBattleText
 	waitbutton
@@ -202,19 +200,19 @@ Route42UltraBall:
 Route42SuperPotion:
 	itemball SUPER_POTION
 
-FruitTreeScript_0x1a934d:
+Route42FruitTree1:
 	fruittree FRUITTREE_ROUTE_42_1
 
-FruitTreeScript_0x1a934f:
+Route42FruitTree2:
 	fruittree FRUITTREE_ROUTE_42_2
 
-FruitTreeScript_0x1a9351:
+Route42FruitTree3:
 	fruittree FRUITTREE_ROUTE_42_3
 
 Route42HiddenMaxPotion:
-	hiddenitem EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_ROUTE_42_HIDDEN_MAX_POTION
 
-MovementData_0x1a9356:
+Route42SuicuneMovement:
 	set_sliding
 	fast_jump_step UP
 	fast_jump_step UP
@@ -319,37 +317,32 @@ Route42Sign2Text:
 	done
 
 Route42_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 0, 8, 3, ROUTE_42_ECRUTEAK_GATE
-	warp_def 0, 9, 4, ROUTE_42_ECRUTEAK_GATE
-	warp_def 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE
-	warp_def 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE
-
-.CoordEvents:
-	db 1
-	coord_event 24, 14, 1, Route42SuicuneScript
-
-.BGEvents:
-	db 5
-	bg_event 4, 10, BGEVENT_READ, Route42Sign1
-	bg_event 7, 5, BGEVENT_READ, MtMortarSign1
-	bg_event 45, 9, BGEVENT_READ, MtMortarSign2
-	bg_event 54, 8, BGEVENT_READ, Route42Sign2
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  0,  8, ROUTE_42_ECRUTEAK_GATE, 3
+	warp_event  0,  9, ROUTE_42_ECRUTEAK_GATE, 4
+	warp_event 10,  5, MOUNT_MORTAR_1F_OUTSIDE, 1
+	warp_event 28,  9, MOUNT_MORTAR_1F_OUTSIDE, 2
+	warp_event 46,  7, MOUNT_MORTAR_1F_OUTSIDE, 3
+
+	db 1 ; coord events
+	coord_event 24, 14, SCENE_ROUTE42_SUICUNE, Route42SuicuneScript
+
+	db 5 ; bg events
+	bg_event  4, 10, BGEVENT_READ, Route42Sign1
+	bg_event  7,  5, BGEVENT_READ, MtMortarSign1
+	bg_event 45,  9, BGEVENT_READ, MtMortarSign2
+	bg_event 54,  8, BGEVENT_READ, Route42Sign2
 	bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion
 
-.ObjectEvents:
-	db 9
+	db 9 ; object events
 	object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1
-	object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
-	object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1
-	object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1
-	object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1
-	object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1
-	object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL
-	object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION
-	object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42
+	object_event 51,  9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1
+	object_event 47,  8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1
+	object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route42FruitTree1, -1
+	object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route42FruitTree2, -1
+	object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route42FruitTree3, -1
+	object_event  6,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL
+	object_event 33,  8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION
+	object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42
diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm
index f873e7fed..c6f702452 100644
--- a/maps/Route42EcruteakGate.asm
+++ b/maps/Route42EcruteakGate.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE42ECRUTEAKGATE_OFFICER
 
 Route42EcruteakGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route42EcruteakGateOfficerScript:
 	jumptextfaceplayer Route42EcruteakGateOfficerText
@@ -20,22 +18,17 @@ Route42EcruteakGateOfficerText:
 	done
 
 Route42EcruteakGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 0, 4, 1, ECRUTEAK_CITY
-	warp_def 0, 5, 2, ECRUTEAK_CITY
-	warp_def 9, 4, 1, ROUTE_42
-	warp_def 9, 5, 2, ROUTE_42
+	db 4 ; warp events
+	warp_event  0,  4, ECRUTEAK_CITY, 1
+	warp_event  0,  5, ECRUTEAK_CITY, 2
+	warp_event  9,  4, ROUTE_42, 1
+	warp_event  9,  5, ROUTE_42, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1
+	db 1 ; object events
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1
diff --git a/maps/Route43.asm b/maps/Route43.asm
index c1caeeb4a..ebb0e2371 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE43_SUPER_NERD1
 	const ROUTE43_SUPER_NERD2
 	const ROUTE43_SUPER_NERD3
@@ -9,28 +9,26 @@ const_value set 2
 	const ROUTE43_POKE_BALL
 
 Route43_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfRockets
 
 .CheckIfRockets:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue .NoRockets
-	setmapscene ROUTE_43_GATE, 0
+	setmapscene ROUTE_43_GATE, SCENE_DEFAULT
 	return
 
 .NoRockets:
-	setmapscene ROUTE_43_GATE, 1
+	setmapscene ROUTE_43_GATE, SCENE_FINISHED
 	return
 
 TrainerCamperSpencer:
-	trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script
+	trainer CAMPER, SPENCER, EVENT_BEAT_CAMPER_SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperSpencerAfterBattleText
 	waitbutton
@@ -38,10 +36,10 @@ TrainerCamperSpencer:
 	end
 
 TrainerPokemaniacBen:
-	trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script
+	trainer POKEMANIAC, BEN, EVENT_BEAT_POKEMANIAC_BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacBenAfterBattleText
 	waitbutton
@@ -49,11 +47,11 @@ TrainerPokemaniacBen:
 	end
 
 TrainerPokemaniacBrent:
-	trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrentSeenText, PokemaniacBrentBeatenText, 0, .Script
+	trainer POKEMANIAC, BRENT1, EVENT_BEAT_POKEMANIAC_BRENT, PokemaniacBrentSeenText, PokemaniacBrentBeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_BRENT
 	iftrue .WantsBattle
@@ -71,8 +69,8 @@ TrainerPokemaniacBrent:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_POKEMANIAC_BRENT
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -81,10 +79,10 @@ TrainerPokemaniacBrent:
 	scall .Rematch
 	winlosstext PokemaniacBrentBeatenText, 0
 	copybytetovar wBrentFightCount
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight3:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight3
@@ -154,10 +152,10 @@ TrainerPokemaniacBrent:
 	end
 
 TrainerPokemaniacRon:
-	trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script
+	trainer POKEMANIAC, RON, EVENT_BEAT_POKEMANIAC_RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacRonAfterBattleText
 	waitbutton
@@ -165,10 +163,10 @@ TrainerPokemaniacRon:
 	end
 
 TrainerFisherMarvin:
-	trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script
+	trainer FISHER, MARVIN, EVENT_BEAT_FISHER_MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherMarvinAfterBattleText
 	waitbutton
@@ -176,11 +174,11 @@ TrainerFisherMarvin:
 	end
 
 TrainerPicnickerTiffany:
-	trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffanySeenText, PicnickerTiffanyBeatenText, 0, .Script
+	trainer PICNICKER, TIFFANY3, EVENT_BEAT_PICNICKER_TIFFANY, PicnickerTiffanySeenText, PicnickerTiffanyBeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_TIFFANY
 	iftrue .WantsBattle
@@ -202,8 +200,8 @@ TrainerPicnickerTiffany:
 	scall .AskNumber2
 .AskForNumber:
 	askforphonenumber PHONE_PICNICKER_TIFFANY
-	if_equal PHONE_CONTACTS_FULL, .PhoneFull
-	if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+	ifequal PHONE_CONTACTS_FULL, .PhoneFull
+	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0
 	scall .RegisteredNumber
 	jump .NumberAccepted
@@ -212,10 +210,10 @@ TrainerPicnickerTiffany:
 	scall .Rematch
 	winlosstext PicnickerTiffanyBeatenText, 0
 	copybytetovar wTiffanyFightCount
-	if_equal 3, .Fight3
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 3, .Fight3
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight3:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight3
@@ -318,7 +316,7 @@ Route43Sign2:
 Route43TrainerTips:
 	jumptext Route43TrainerTipsText
 
-FruitTreeScript_0x19d266:
+Route43FruitTree:
 	fruittree FRUITTREE_ROUTE_43
 
 Route43MaxEther:
@@ -501,33 +499,28 @@ Route43TrainerTipsText:
 	done
 
 Route43_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 9, 51, 1, ROUTE_43_MAHOGANY_GATE
-	warp_def 10, 51, 2, ROUTE_43_MAHOGANY_GATE
-	warp_def 17, 35, 3, ROUTE_43_GATE
-	warp_def 17, 31, 1, ROUTE_43_GATE
-	warp_def 18, 31, 2, ROUTE_43_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 13, 3, BGEVENT_READ, Route43Sign1
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  9, 51, ROUTE_43_MAHOGANY_GATE, 1
+	warp_event 10, 51, ROUTE_43_MAHOGANY_GATE, 2
+	warp_event 17, 35, ROUTE_43_GATE, 3
+	warp_event 17, 31, ROUTE_43_GATE, 1
+	warp_event 18, 31, ROUTE_43_GATE, 2
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event 13,  3, BGEVENT_READ, Route43Sign1
 	bg_event 11, 49, BGEVENT_READ, Route43Sign2
 	bg_event 16, 38, BGEVENT_READ, Route43TrainerTips
 
-.ObjectEvents:
-	db 8
-	object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1
+	db 8 ; object events
+	object_event 13,  5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1
 	object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent, -1
-	object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1
-	object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1
-	object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1
+	object_event 14,  7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1
+	object_event  4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1
+	object_event  9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1
 	object_event 13, 40, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1
-	object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1
-	object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER
+	object_event  1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route43FruitTree, -1
+	object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 51d095e3c..69869991d 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -1,18 +1,16 @@
 ROUTE43GATE_TOLL EQU 1000
 
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE43GATE_OFFICER
 	const ROUTE43GATE_ROCKET1
 	const ROUTE43GATE_ROCKET2
 
 Route43Gate_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .RocketShakedown
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .RocketShakedown ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .CheckIfRockets
 
 .RocketShakedown:
@@ -25,33 +23,33 @@ Route43Gate_MapScripts:
 .CheckIfRockets:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue .NoRockets
-	setmapscene ROUTE_43, 0
+	setmapscene ROUTE_43, 0 ; Route 43 does not have a scene variable
 	return
 
 .NoRockets:
-	setmapscene ROUTE_43, 1
+	setmapscene ROUTE_43, 1 ; Route 43 does not have a scene variable
 	return
 
 .RocketTakeover:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	checkcode VAR_FACING
-	if_equal DOWN, RocketScript_Southbound
-	if_equal UP, RocketScript_Northbound
-	setscene 1
+	ifequal DOWN, RocketScript_Southbound
+	ifequal UP, RocketScript_Northbound
+	setscene SCENE_FINISHED
 	end
 
 RocketScript_Southbound:
 	applymovement PLAYER, PlayerStepsIn
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouSouth
-	spriteface ROUTE43GATE_ROCKET1, UP
+	turnobject ROUTE43GATE_ROCKET1, UP
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouSouth
 	opentext
 	writetext RocketText_TollFee
 	buttonsound
 	checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
-	if_equal HAVE_MORE, RocketScript_TollSouth
+	ifequal HAVE_MORE, RocketScript_TollSouth
 	jump RocketScript_YoureBrokeSouth
 
 RocketScript_TollSouth:
@@ -69,21 +67,21 @@ RocketScript_ShakeDownSouth:
 	closetext
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth
-	setscene 1
+	setscene SCENE_FINISHED
 	special RestartMapMusic
 	end
 
 RocketScript_Northbound:
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouNorth
-	spriteface ROUTE43GATE_ROCKET2, DOWN
+	turnobject ROUTE43GATE_ROCKET2, DOWN
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouNorth
 	opentext
 	writetext RocketText_TollFee
 	buttonsound
 	checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
-	if_equal HAVE_MORE, RocketScript_TollNorth
+	ifequal HAVE_MORE, RocketScript_TollNorth
 	jump RocketScript_YoureBrokeNorth
 
 RocketScript_TollNorth:
@@ -101,7 +99,7 @@ RocketScript_ShakeDownNorth:
 	closetext
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth
 	applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth
-	setscene 1
+	setscene SCENE_FINISHED
 	special RestartMapMusic
 	end
 
@@ -248,24 +246,19 @@ OfficerText_AvoidGrass:
 	done
 
 Route43Gate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 4, 0, 4, ROUTE_43
-	warp_def 5, 0, 5, ROUTE_43
-	warp_def 4, 7, 3, ROUTE_43
-	warp_def 5, 7, 3, ROUTE_43
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS
-	object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
-	object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  4,  0, ROUTE_43, 4
+	warp_event  5,  0, ROUTE_43, 5
+	warp_event  4,  7, ROUTE_43, 3
+	warp_event  5,  7, ROUTE_43, 3
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS
+	object_event  2,  4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
+	object_event  7,  4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS
diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm
index d5c29c18a..6af688f1a 100644
--- a/maps/Route43MahoganyGate.asm
+++ b/maps/Route43MahoganyGate.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE43MAHOGANYGATE_OFFICER
 
 Route43MahoganyGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route43MahoganyGateOfficer:
 	faceplayer
@@ -39,22 +37,17 @@ UnknownText_0x19ab65:
 	done
 
 Route43MahoganyGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 4, 0, 1, ROUTE_43
-	warp_def 5, 0, 2, ROUTE_43
-	warp_def 4, 7, 5, MAHOGANY_TOWN
-	warp_def 5, 7, 5, MAHOGANY_TOWN
+	db 4 ; warp events
+	warp_event  4,  0, ROUTE_43, 1
+	warp_event  5,  0, ROUTE_43, 2
+	warp_event  4,  7, MAHOGANY_TOWN, 5
+	warp_event  5,  7, MAHOGANY_TOWN, 5
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1
+	db 1 ; object events
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1
diff --git a/maps/Route44.asm b/maps/Route44.asm
index df755ae0d..f5f9f24bf 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE44_FISHER1
 	const ROUTE44_FISHER2
 	const ROUTE44_YOUNGSTER1
@@ -12,18 +12,16 @@ const_value set 2
 	const ROUTE44_POKE_BALL3
 
 Route44_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBirdKeeperVance1:
-	trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script
+	trainer BIRD_KEEPER, VANCE1, EVENT_BEAT_BIRD_KEEPER_VANCE, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_VANCE
 	iftrue .WantsBattle
@@ -41,8 +39,8 @@ TrainerBirdKeeperVance1:
 	scall Route44AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_BIRDKEEPER_VANCE
-	if_equal PHONE_CONTACTS_FULL, Route44PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
 	trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0
 	scall Route44RegisteredNumberM
 	jump Route44NumberAcceptedM
@@ -51,9 +49,9 @@ TrainerBirdKeeperVance1:
 	scall Route44RematchM
 	winlosstext BirdKeeperVance1BeatenText, 0
 	copybytetovar wVanceFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -150,10 +148,10 @@ Route44RematchGiftM:
 	end
 
 TrainerPsychicPhil:
-	trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script
+	trainer PSYCHIC_T, PHIL, EVENT_BEAT_PSYCHIC_PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicPhilAfterBattleText
 	waitbutton
@@ -161,11 +159,11 @@ TrainerPsychicPhil:
 	end
 
 TrainerFisherWilton1:
-	trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script
+	trainer FISHER, WILTON1, EVENT_BEAT_FISHER_WILTON, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_FISHER_WILTON
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_WILTON
 	iftrue .WantsBattle
@@ -185,8 +183,8 @@ TrainerFisherWilton1:
 	scall Route44AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_FISHER_WILTON
-	if_equal PHONE_CONTACTS_FULL, Route44PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
 	trainertotext FISHER, WILTON1, MEM_BUFFER_0
 	scall Route44RegisteredNumberM
 	jump Route44NumberAcceptedM
@@ -195,9 +193,9 @@ TrainerFisherWilton1:
 	scall Route44RematchM
 	winlosstext FisherWilton1BeatenText, 0
 	copybytetovar wWiltonFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -256,10 +254,10 @@ TrainerFisherWilton1:
 	jump Route44PackFullM
 
 TrainerFisherEdgar:
-	trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script
+	trainer FISHER, EDGAR, EVENT_BEAT_FISHER_EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FisherEdgarAfterBattleText
 	waitbutton
@@ -267,10 +265,10 @@ TrainerFisherEdgar:
 	end
 
 TrainerCooltrainerfCybil:
-	trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script
+	trainer COOLTRAINERF, CYBIL, EVENT_BEAT_COOLTRAINERF_CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfCybilAfterBattleText
 	waitbutton
@@ -278,10 +276,10 @@ TrainerCooltrainerfCybil:
 	end
 
 TrainerPokemaniacZach:
-	trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script
+	trainer POKEMANIAC, ZACH, EVENT_BEAT_POKEMANIAC_ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacZachAfterBattleText
 	waitbutton
@@ -289,10 +287,10 @@ TrainerPokemaniacZach:
 	end
 
 TrainerCooltrainermAllen:
-	trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script
+	trainer COOLTRAINERM, ALLEN, EVENT_BEAT_COOLTRAINERM_ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermAllenAfterBattleText
 	waitbutton
@@ -305,7 +303,7 @@ Route44Sign1:
 Route44Sign2:
 	jumptext Route44Sign2Text
 
-FruitTreeScript_0x19da40:
+Route44FruitTree:
 	fruittree FRUITTREE_ROUTE_44
 
 Route44MaxRevive:
@@ -318,7 +316,7 @@ Route44MaxRepel:
 	itemball MAX_REPEL
 
 Route44HiddenElixer:
-	hiddenitem EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER
+	hiddenitem ELIXER, EVENT_ROUTE_44_HIDDEN_ELIXER
 
 FisherWilton1SeenText:
 	text "Aack! You made me"
@@ -507,32 +505,27 @@ Route44Sign2Text:
 	done
 
 Route44_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 56, 7, 1, ICE_PATH_1F
+	db 1 ; warp events
+	warp_event 56,  7, ICE_PATH_1F, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
-	bg_event 53, 7, BGEVENT_READ, Route44Sign1
-	bg_event 6, 10, BGEVENT_READ, Route44Sign2
-	bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer
+	db 3 ; bg events
+	bg_event 53,  7, BGEVENT_READ, Route44Sign1
+	bg_event  6, 10, BGEVENT_READ, Route44Sign2
+	bg_event 32,  9, BGEVENT_ITEM, Route44HiddenElixer
 
-.ObjectEvents:
-	db 11
-	object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1
+	db 11 ; object events
+	object_event 35,  3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1
 	object_event 19, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1
-	object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1
-	object_event 43, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1
-	object_event 51, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1
+	object_event 10,  9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1
+	object_event 43,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1
+	object_event 51,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1
 	object_event 41, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1
 	object_event 31, 14, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1
-	object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1
-	object_event 30, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE
-	object_event 45, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL
-	object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL
+	object_event  9,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route44FruitTree, -1
+	object_event 30,  8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE
+	object_event 45,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL
+	object_event 14,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 156d06957..e26525441 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE45_POKEFAN_M1
 	const ROUTE45_POKEFAN_M2
 	const ROUTE45_POKEFAN_M3
@@ -14,24 +14,22 @@ const_value set 2
 	const ROUTE45_YOUNGSTER
 
 Route45_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBlackbeltKenji:
-	trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script
+	trainer BLACKBELT_T, KENJI3, EVENT_BEAT_BLACKBELT_KENJI, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkcellnum PHONE_BLACKBELT_KENJI
 	iftrue .Registered
 	checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER
 	iftrue .AskedAlready
-	special Special_SampleKenjiBreakCountdown
+	special SampleKenjiBreakCountdown
 	writetext BlackbeltKenjiAfterBattleText
 	waitbutton
 	setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER
@@ -42,18 +40,18 @@ TrainerBlackbeltKenji:
 	scall Route45AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_BLACKBELT_KENJI
-	if_equal PHONE_CONTACTS_FULL, Route45PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
 	trainertotext BLACKBELT_T, KENJI3, MEM_BUFFER_0
 	scall Route45RegisteredNumberM
 	jump Route45NumberAcceptedM
 
 .Registered:
 	checkcode VAR_KENJI_BREAK
-	if_not_equal 1, Route45NumberAcceptedM
-	checkmorn
+	ifnotequal 1, Route45NumberAcceptedM
+	checktime MORN
 	iftrue .Morning
-	checknite
+	checktime NITE
 	iftrue .Night
 	checkevent EVENT_KENJI_ON_BREAK
 	iffalse Route45NumberAcceptedM
@@ -61,7 +59,7 @@ TrainerBlackbeltKenji:
 	verbosegiveitem PP_UP
 	iffalse .NoRoom
 	clearevent EVENT_KENJI_ON_BREAK
-	special Special_SampleKenjiBreakCountdown
+	special SampleKenjiBreakCountdown
 	jump Route45NumberAcceptedM
 
 .Morning:
@@ -125,10 +123,10 @@ Route45RematchGiftM:
 	end
 
 TrainerHikerErik:
-	trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script
+	trainer HIKER, ERIK, EVENT_BEAT_HIKER_ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerErikAfterBattleText
 	waitbutton
@@ -136,10 +134,10 @@ TrainerHikerErik:
 	end
 
 TrainerHikerMichael:
-	trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script
+	trainer HIKER, MICHAEL, EVENT_BEAT_HIKER_MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerMichaelAfterBattleText
 	waitbutton
@@ -147,11 +145,11 @@ TrainerHikerMichael:
 	end
 
 TrainerHikerParry:
-	trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script
+	trainer HIKER, PARRY3, EVENT_BEAT_HIKER_PARRY, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_HIKER_PARRY
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_PARRY
 	iftrue .WantsBattle
@@ -169,8 +167,8 @@ TrainerHikerParry:
 	scall Route45AskNumber2M
 .AskForNumber:
 	askforphonenumber PHONE_HIKER_PARRY
-	if_equal PHONE_CONTACTS_FULL, Route45PhoneFullM
-	if_equal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
+	ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM
+	ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
 	trainertotext HIKER, PARRY1, MEM_BUFFER_0
 	scall Route45RegisteredNumberM
 	jump Route45NumberAcceptedM
@@ -179,9 +177,9 @@ TrainerHikerParry:
 	scall Route45RematchM
 	winlosstext HikerParry3BeatenText, 0
 	copybytetovar wParryFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -233,10 +231,10 @@ TrainerHikerParry:
 	jump Route45NumberAcceptedM
 
 TrainerHikerTimothy:
-	trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script
+	trainer HIKER, TIMOTHY, EVENT_BEAT_HIKER_TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerTimothyAfterBattleText
 	waitbutton
@@ -244,10 +242,10 @@ TrainerHikerTimothy:
 	end
 
 TrainerCooltrainermRyan:
-	trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script
+	trainer COOLTRAINERM, RYAN, EVENT_BEAT_COOLTRAINERM_RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermRyanAfterBattleText
 	waitbutton
@@ -255,10 +253,10 @@ TrainerCooltrainermRyan:
 	end
 
 TrainerCooltrainerfKelly:
-	trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script
+	trainer COOLTRAINERF, KELLY, EVENT_BEAT_COOLTRAINERF_KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfKellyAfterBattleText
 	waitbutton
@@ -296,7 +294,7 @@ Route45DummyScript:
 Route45Sign:
 	jumptext Route45SignText
 
-FruitTreeScript_0x19e294:
+Route45FruitTree:
 	fruittree FRUITTREE_ROUTE_45
 
 Route45Nugget:
@@ -312,7 +310,7 @@ Route45MaxPotion:
 	itemball MAX_POTION
 
 Route45HiddenPpUp:
-	hiddenitem EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP
+	hiddenitem PP_UP, EVENT_ROUTE_45_HIDDEN_PP_UP
 
 HikerErikSeenText:
 	text "Be prepared for"
@@ -532,33 +530,28 @@ Route45SignText:
 	done
 
 Route45_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE
+	db 1 ; warp events
+	warp_event  2,  5, DARK_CAVE_BLACKTHORN_ENTRANCE, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 10, 4, BGEVENT_READ, Route45Sign
+	db 2 ; bg events
+	bg_event 10,  4, BGEVENT_READ, Route45Sign
 	bg_event 13, 80, BGEVENT_ITEM, Route45HiddenPpUp
 
-.ObjectEvents:
-	db 13
+	db 13 ; object events
 	object_event 10, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1
 	object_event 15, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1
-	object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1
-	object_event 9, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1
+	object_event  5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1
+	object_event  9, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1
 	object_event 11, 50, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1
 	object_event 17, 18, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1
-	object_event 5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1
-	object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1
-	object_event 6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET
-	object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE
-	object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER
-	object_event 7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION
-	object_event 4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerCamperQuentin, -1
+	object_event  5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1
+	object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route45FruitTree, -1
+	object_event  6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET
+	object_event  5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE
+	object_event  6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER
+	object_event  7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION
+	object_event  4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerCamperQuentin, -1
diff --git a/maps/Route46.asm b/maps/Route46.asm
index c9e1b94e6..4fc813c35 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE46_POKEFAN_M
 	const ROUTE46_YOUNGSTER
 	const ROUTE46_LASS
@@ -7,17 +7,15 @@ const_value set 2
 	const ROUTE46_POKE_BALL
 
 Route46_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerCamperTed:
-	trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script
+	trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperTedAfterBattleText
 	waitbutton
@@ -25,11 +23,11 @@ TrainerCamperTed:
 	end
 
 TrainerPicnickerErin1:
-	trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script
+	trainer PICNICKER, ERIN1, EVENT_BEAT_PICNICKER_ERIN, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script
 
 .Script:
 	writecode VAR_CALLERID, PHONE_PICNICKER_ERIN
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	checkflag ENGINE_ERIN
 	iftrue .WantsBattle
@@ -47,8 +45,8 @@ TrainerPicnickerErin1:
 	scall Route46AskNumber2F
 .AskForNumber:
 	askforphonenumber PHONE_PICNICKER_ERIN
-	if_equal PHONE_CONTACTS_FULL, Route46PhoneFullF
-	if_equal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF
+	ifequal PHONE_CONTACTS_FULL, Route46PhoneFullF
+	ifequal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF
 	trainertotext PICNICKER, ERIN1, MEM_BUFFER_0
 	scall Route46RegisteredNumberF
 	jump Route46NumberAcceptedF
@@ -57,9 +55,9 @@ TrainerPicnickerErin1:
 	scall Route46RematchF
 	winlosstext PicnickerErin1BeatenText, 0
 	copybytetovar wErinFightCount
-	if_equal 2, .Fight2
-	if_equal 1, .Fight1
-	if_equal 0, .LoadFight0
+	ifequal 2, .Fight2
+	ifequal 1, .Fight1
+	ifequal 0, .LoadFight0
 .Fight2:
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
 	iftrue .LoadFight2
@@ -148,10 +146,10 @@ Route46RematchGiftF:
 	end
 
 TrainerHikerBailey:
-	trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script
+	trainer HIKER, BAILEY, EVENT_BEAT_HIKER_BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerBaileyAfterBattleText
 	waitbutton
@@ -164,10 +162,10 @@ Route46Sign:
 Route46XSpeed:
 	itemball X_SPEED
 
-FruitTreeScript_0x1a978f:
+Route46FruitTree1:
 	fruittree FRUITTREE_ROUTE_46_1
 
-FruitTreeScript_0x1a9791:
+Route46FruitTree2:
 	fruittree FRUITTREE_ROUTE_46_2
 
 HikerBaileySeenText:
@@ -251,27 +249,22 @@ Route46SignText:
 	done
 
 Route46_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 7, 33, 1, ROUTE_29_ROUTE_46_GATE
-	warp_def 8, 33, 2, ROUTE_29_ROUTE_46_GATE
-	warp_def 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE
+	db 3 ; warp events
+	warp_event  7, 33, ROUTE_29_ROUTE_46_GATE, 1
+	warp_event  8, 33, ROUTE_29_ROUTE_46_GATE, 2
+	warp_event 14,  5, DARK_CAVE_VIOLET_ENTRANCE, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 9, 27, BGEVENT_READ, Route46Sign
+	db 1 ; bg events
+	bg_event  9, 27, BGEVENT_READ, Route46Sign
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1
-	object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1
-	object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1
-	object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1
-	object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1
-	object_event 1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED
+	object_event  4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1
+	object_event  2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1
+	object_event  7,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route46FruitTree1, -1
+	object_event  8,  6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route46FruitTree2, -1
+	object_event  1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED
diff --git a/maps/Route5.asm b/maps/Route5.asm
index 9bdf8a023..103c17d56 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE5_POKEFAN_M
 
 Route5_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route5PokefanMScript:
 	jumptextfaceplayer Route5PokefanMText
@@ -40,24 +38,19 @@ HouseForSaleSignText:
 	done
 
 Route5_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
-	warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE
-	warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE
-	warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE
+	db 4 ; warp events
+	warp_event 17, 15, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 1
+	warp_event  8, 17, ROUTE_5_SAFFRON_GATE, 1
+	warp_event  9, 17, ROUTE_5_SAFFRON_GATE, 2
+	warp_event 10, 11, ROUTE_5_CLEANSE_TAG_HOUSE, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 17, 17, BGEVENT_READ, Route5UndergroundPathSign
 	bg_event 10, 11, BGEVENT_READ, HouseForSaleSign
 
-.ObjectEvents:
-	db 1
+	db 1 ; object events
 	object_event 17, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm
new file mode 100644
index 000000000..4fc1d0446
--- /dev/null
+++ b/maps/Route5CleanseTagHouse.asm
@@ -0,0 +1,76 @@
+	const_def 2 ; object constants
+	const ROUTE5CLEANSETAGHOUSE_GRANNY
+	const ROUTE5CLEANSETAGHOUSE_TEACHER
+
+Route5CleanseTagHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+Route5CleanseTagHouseGrannyScript:
+	faceplayer
+	opentext
+	checkevent EVENT_GOT_CLEANSE_TAG
+	iftrue .GotCleanseTag
+	writetext Route5CleanseTagHouseGrannyText1
+	buttonsound
+	verbosegiveitem CLEANSE_TAG
+	iffalse .NoRoom
+	setevent EVENT_GOT_CLEANSE_TAG
+.GotCleanseTag:
+	writetext Route5CleanseTagHouseGrannyText2
+	waitbutton
+.NoRoom:
+	closetext
+	end
+
+Route5CleanseTagHouseTeacherScript:
+	jumptextfaceplayer Route5CleanseTagHouseTeacherText
+
+HouseForSaleBookshelf:
+	jumpstd difficultbookshelf
+
+Route5CleanseTagHouseGrannyText1:
+	text "Eeyaaaah!"
+
+	para "I sense a sinister"
+	line "shadow hovering"
+	cont "over you."
+
+	para "Take this to ward"
+	line "it off!"
+	done
+
+Route5CleanseTagHouseGrannyText2:
+	text "You were in mortal"
+	line "danger, but you"
+	cont "are protected now."
+	done
+
+Route5CleanseTagHouseTeacherText:
+	text "My grandma is into"
+	line "warding off what"
+
+	para "she believes to be"
+	line "evil spirits."
+
+	para "I'm sorry that she"
+	line "startled you."
+	done
+
+Route5CleanseTagHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, ROUTE_5, 4
+	warp_event  3,  7, ROUTE_5, 4
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, HouseForSaleBookshelf
+	bg_event  1,  1, BGEVENT_READ, HouseForSaleBookshelf
+
+	db 2 ; object events
+	object_event  2,  5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseGrannyScript, -1
+	object_event  5,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1
diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm
deleted file mode 100644
index d0223f2e1..000000000
--- a/maps/Route5CleanseTagSpeechHouse.asm
+++ /dev/null
@@ -1,83 +0,0 @@
-const_value set 2
-	const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY
-	const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER
-
-Route5CleanseTagSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 0
-
-Route5CleanseTagGrannyScript:
-	faceplayer
-	opentext
-	checkevent EVENT_GOT_CLEANSE_TAG
-	iftrue .GotCleanseTag
-	writetext Route5CleanseTagGrannySinisterShadowText
-	buttonsound
-	verbosegiveitem CLEANSE_TAG
-	iffalse .NoRoom
-	setevent EVENT_GOT_CLEANSE_TAG
-.GotCleanseTag:
-	writetext Route5CleanseTagGrannyProtectedText
-	waitbutton
-.NoRoom:
-	closetext
-	end
-
-Route5CleanseTagSpeechHouseTeacherScript:
-	jumptextfaceplayer Route5CleanseTagSpeechHouseTeacherText
-
-HouseForSaleBookshelf:
-	jumpstd difficultbookshelf
-
-Route5CleanseTagGrannySinisterShadowText:
-	text "Eeyaaaah!"
-
-	para "I sense a sinister"
-	line "shadow hovering"
-	cont "over you."
-
-	para "Take this to ward"
-	line "it off!"
-	done
-
-Route5CleanseTagGrannyProtectedText:
-	text "You were in mortal"
-	line "danger, but you"
-	cont "are protected now."
-	done
-
-Route5CleanseTagSpeechHouseTeacherText:
-	text "My grandma is into"
-	line "warding off what"
-
-	para "she believes to be"
-	line "evil spirits."
-
-	para "I'm sorry that she"
-	line "startled you."
-	done
-
-Route5CleanseTagSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 4, ROUTE_5
-	warp_def 3, 7, 4, ROUTE_5
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf
-	bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf
-
-.ObjectEvents:
-	db 2
-	object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagGrannyScript, -1
-	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1
diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm
index 1f8bb9b94..3a0161af3 100644
--- a/maps/Route5SaffronGate.asm
+++ b/maps/Route5SaffronGate.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE5SAFFRONGATE_OFFICER
 
 Route5SaffronGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route5SaffronGateOfficerScript:
 	jumptextfaceplayer Route5SaffronGateOfficerText
@@ -21,22 +19,17 @@ Route5SaffronGateOfficerText:
 	done
 
 Route5SaffronGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 4, 0, 2, ROUTE_5
-	warp_def 5, 0, 3, ROUTE_5
-	warp_def 4, 7, 9, SAFFRON_CITY
-	warp_def 5, 7, 9, SAFFRON_CITY
+	db 4 ; warp events
+	warp_event  4,  0, ROUTE_5, 2
+	warp_event  5,  0, ROUTE_5, 3
+	warp_event  4,  7, SAFFRON_CITY, 9
+	warp_event  5,  7, SAFFRON_CITY, 9
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1
+	db 1 ; object events
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1
diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm
index 2bdb75ca0..d62a042b9 100644
--- a/maps/Route5UndergroundPathEntrance.asm
+++ b/maps/Route5UndergroundPathEntrance.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER
 
 Route5UndergroundPathEntrance_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route5UndergroundPathEntranceTeacherScript:
 	jumptextfaceplayer Route5UndergroundPathEntranceTeacherText
@@ -20,21 +18,16 @@ Route5UndergroundPathEntranceTeacherText:
 	done
 
 Route5UndergroundPathEntrance_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 3, 7, 1, ROUTE_5
-	warp_def 4, 7, 1, ROUTE_5
-	warp_def 4, 3, 1, UNDERGROUND_PATH
+	db 3 ; warp events
+	warp_event  3,  7, ROUTE_5, 1
+	warp_event  4,  7, ROUTE_5, 1
+	warp_event  4,  3, UNDERGROUND_PATH, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 2, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1
+	db 1 ; object events
+	object_event  2,  2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1
diff --git a/maps/Route6.asm b/maps/Route6.asm
index 9a66c5844..8576e1b04 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -1,20 +1,18 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE6_POKEFAN_M1
 	const ROUTE6_POKEFAN_M2
 	const ROUTE6_POKEFAN_M3
 
 Route6_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerPokefanmRex:
-	trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script
+	trainer POKEFANM, REX, EVENT_BEAT_POKEFANM_REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmRexAfterBattleText
 	waitbutton
@@ -22,10 +20,10 @@ TrainerPokefanmRex:
 	end
 
 TrainerPokefanmAllan:
-	trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script
+	trainer POKEFANM, ALLAN, EVENT_BEAT_POKEFANM_ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokefanmAllanAfterBattleText
 	waitbutton
@@ -92,23 +90,18 @@ PokefanmAllanAfterBattleText:
 	done
 
 Route6_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
-	warp_def 6, 1, 3, ROUTE_6_SAFFRON_GATE
+	db 2 ; warp events
+	warp_event 17,  3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 1
+	warp_event  6,  1, ROUTE_6_SAFFRON_GATE, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign
+	db 1 ; bg events
+	bg_event 19,  5, BGEVENT_READ, Route6UndergroundPathSign
 
-.ObjectEvents:
-	db 3
-	object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
-	object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1
+	db 3 ; object events
+	object_event 17,  4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
+	object_event  9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1
 	object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
index 569180738..c0de7ff54 100644
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE6SAFFRONGATE_OFFICER
 
 Route6SaffronGate_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
@@ -58,22 +56,17 @@ Route6SaffronGuardMagnetTrainText:
 	done
 
 Route6SaffronGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 4, 0, 12, SAFFRON_CITY
-	warp_def 5, 0, 13, SAFFRON_CITY
-	warp_def 4, 7, 2, ROUTE_6
-	warp_def 5, 7, 2, ROUTE_6
+	db 4 ; warp events
+	warp_event  4,  0, SAFFRON_CITY, 12
+	warp_event  5,  0, SAFFRON_CITY, 13
+	warp_event  4,  7, ROUTE_6, 2
+	warp_event  5,  7, ROUTE_6, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1
+	db 1 ; object events
+	object_event  0,  4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1
diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm
index aad70ec88..7e04b3fb1 100644
--- a/maps/Route6UndergroundPathEntrance.asm
+++ b/maps/Route6UndergroundPathEntrance.asm
@@ -1,25 +1,18 @@
 Route6UndergroundPathEntrance_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route6UndergroundPathEntrance_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 3, 7, 1, ROUTE_6
-	warp_def 4, 7, 1, ROUTE_6
-	warp_def 4, 3, 2, UNDERGROUND_PATH
+	db 3 ; warp events
+	warp_event  3,  7, ROUTE_6, 1
+	warp_event  4,  7, ROUTE_6, 1
+	warp_event  4,  3, UNDERGROUND_PATH, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route7.asm b/maps/Route7.asm
index f10b33ccc..6f1c5251f 100644
--- a/maps/Route7.asm
+++ b/maps/Route7.asm
@@ -1,9 +1,7 @@
 Route7_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route7UndergroundPathSign:
 	jumptext Route7UndergroundPathSignText
@@ -35,21 +33,16 @@ Route7LockedDoorText:
 	done
 
 Route7_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 15, 6, 1, ROUTE_7_SAFFRON_GATE
-	warp_def 15, 7, 2, ROUTE_7_SAFFRON_GATE
+	db 2 ; warp events
+	warp_event 15,  6, ROUTE_7_SAFFRON_GATE, 1
+	warp_event 15,  7, ROUTE_7_SAFFRON_GATE, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 5, 11, BGEVENT_READ, Route7UndergroundPathSign
-	bg_event 6, 9, BGEVENT_READ, Route7LockedDoor
+	db 2 ; bg events
+	bg_event  5, 11, BGEVENT_READ, Route7UndergroundPathSign
+	bg_event  6,  9, BGEVENT_READ, Route7LockedDoor
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm
index 47e7e4042..67a8c6813 100644
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE7SAFFRONGATE_OFFICER
 
 Route7SaffronGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route7SaffronGuardScript:
 	faceplayer
@@ -46,22 +44,17 @@ Route7SaffronGuardSeriousText:
 	done
 
 Route7SaffronGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 0, 4, 1, ROUTE_7
-	warp_def 0, 5, 2, ROUTE_7
-	warp_def 9, 4, 10, SAFFRON_CITY
-	warp_def 9, 5, 11, SAFFRON_CITY
+	db 4 ; warp events
+	warp_event  0,  4, ROUTE_7, 1
+	warp_event  0,  5, ROUTE_7, 2
+	warp_event  9,  4, SAFFRON_CITY, 10
+	warp_event  9,  5, SAFFRON_CITY, 11
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1
+	db 1 ; object events
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1
diff --git a/maps/Route8.asm b/maps/Route8.asm
index 10df64842..e3ce0b371 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE8_BIKER1
 	const ROUTE8_BIKER2
 	const ROUTE8_BIKER3
@@ -7,17 +7,15 @@ const_value set 2
 	const ROUTE8_FRUIT_TREE
 
 Route8_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerBikerDwayne:
-	trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script
+	trainer BIKER, DWAYNE, EVENT_BEAT_BIKER_DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerDwayneAfterBattleText
 	waitbutton
@@ -25,10 +23,10 @@ TrainerBikerDwayne:
 	end
 
 TrainerBikerHarris:
-	trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script
+	trainer BIKER, HARRIS, EVENT_BEAT_BIKER_HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerHarrisAfterBattleText
 	waitbutton
@@ -36,10 +34,10 @@ TrainerBikerHarris:
 	end
 
 TrainerBikerZeke:
-	trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script
+	trainer BIKER, ZEKE, EVENT_BEAT_BIKER_ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BikerZekeAfterBattleText
 	waitbutton
@@ -47,10 +45,10 @@ TrainerBikerZeke:
 	end
 
 TrainerSupernerdSam:
-	trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script
+	trainer SUPER_NERD, SAM, EVENT_BEAT_SUPER_NERD_SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdSamAfterBattleText
 	waitbutton
@@ -58,10 +56,10 @@ TrainerSupernerdSam:
 	end
 
 TrainerSupernerdTom:
-	trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script
+	trainer SUPER_NERD, TOM, EVENT_BEAT_SUPER_NERD_TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SupernerdTomAfterBattleText
 	waitbutton
@@ -74,7 +72,7 @@ Route8LockedDoor:
 Route8UndergroundPathSign:
 	jumptext Route8UndergroundPathSignText
 
-FruitTreeScript_0x6c06c:
+Route8FruitTree:
 	fruittree FRUITTREE_ROUTE_8
 
 BikerDwayneSeenText:
@@ -173,27 +171,22 @@ Route8UndergroundPathSignText:
 	done
 
 Route8_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 4, 3, ROUTE_8_SAFFRON_GATE
-	warp_def 4, 5, 4, ROUTE_8_SAFFRON_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign
-	bg_event 10, 5, BGEVENT_READ, Route8LockedDoor
-
-.ObjectEvents:
-	db 6
-	object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1
-	object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4,  4, ROUTE_8_SAFFRON_GATE, 3
+	warp_event  4,  5, ROUTE_8_SAFFRON_GATE, 4
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event 11,  7, BGEVENT_READ, Route8UndergroundPathSign
+	bg_event 10,  5, BGEVENT_READ, Route8LockedDoor
+
+	db 6 ; object events
+	object_event 10,  8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1
+	object_event 10,  9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1
 	object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1
-	object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1
+	object_event 23,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1
 	object_event 31, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1
-	object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1
+	object_event 33,  5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route8FruitTree, -1
diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm
index dc9968b1d..bcaf7f02c 100644
--- a/maps/Route8SaffronGate.asm
+++ b/maps/Route8SaffronGate.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE8SAFFRONGATE_OFFICER
 
 Route8SaffronGate_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Route8SaffronGateOfficerScript:
 	jumptextfaceplayer Route8SaffronGateOfficerText
@@ -20,22 +18,17 @@ Route8SaffronGateOfficerText:
 	done
 
 Route8SaffronGate_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 0, 4, 14, SAFFRON_CITY
-	warp_def 0, 5, 15, SAFFRON_CITY
-	warp_def 9, 4, 1, ROUTE_8
-	warp_def 9, 5, 2, ROUTE_8
+	db 4 ; warp events
+	warp_event  0,  4, SAFFRON_CITY, 14
+	warp_event  0,  5, SAFFRON_CITY, 15
+	warp_event  9,  4, ROUTE_8, 1
+	warp_event  9,  5, ROUTE_8, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1
+	db 1 ; object events
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1
diff --git a/maps/Route9.asm b/maps/Route9.asm
index cd1831f98..fa3d07313 100644
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const ROUTE9_YOUNGSTER1
 	const ROUTE9_LASS1
 	const ROUTE9_YOUNGSTER2
@@ -7,17 +7,15 @@ const_value set 2
 	const ROUTE9_POKEFAN_M2
 
 Route9_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerCamperDean:
-	trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script
+	trainer CAMPER, DEAN, EVENT_BEAT_CAMPER_DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperDeanAfterBattleText
 	waitbutton
@@ -25,10 +23,10 @@ TrainerCamperDean:
 	end
 
 TrainerPicnickerHeidi:
-	trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script
+	trainer PICNICKER, HEIDI, EVENT_BEAT_PICNICKER_HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerHeidiAfterBattleText
 	waitbutton
@@ -36,10 +34,10 @@ TrainerPicnickerHeidi:
 	end
 
 TrainerCamperSid:
-	trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script
+	trainer CAMPER, SID, EVENT_BEAT_CAMPER_SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CamperSidAfterBattleText
 	waitbutton
@@ -47,10 +45,10 @@ TrainerCamperSid:
 	end
 
 TrainerPicnickerEdna:
-	trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script
+	trainer PICNICKER, EDNA, EVENT_BEAT_PICNICKER_EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PicnickerEdnaAfterBattleText
 	waitbutton
@@ -58,10 +56,10 @@ TrainerPicnickerEdna:
 	end
 
 TrainerHikerTim:
-	trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script
+	trainer HIKER, TIM, EVENT_BEAT_HIKER_TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerTimAfterBattleText
 	waitbutton
@@ -69,10 +67,10 @@ TrainerHikerTim:
 	end
 
 TrainerHikerSidney:
-	trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script
+	trainer HIKER, SIDNEY, EVENT_BEAT_HIKER_SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerSidneyAfterBattleText
 	waitbutton
@@ -83,7 +81,7 @@ Route9Sign:
 	jumptext Route9SignText
 
 Route9HiddenEther:
-	hiddenitem EVENT_ROUTE_9_HIDDEN_ETHER, ETHER
+	hiddenitem ETHER, EVENT_ROUTE_9_HIDDEN_ETHER
 
 CamperDeanSeenText:
 	text "I came to explore"
@@ -206,26 +204,21 @@ Route9SignText:
 	done
 
 Route9_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 48, 15, 1, ROCK_TUNNEL_1F
+	db 1 ; warp events
+	warp_event 48, 15, ROCK_TUNNEL_1F, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 15, 7, BGEVENT_READ, Route9Sign
+	db 2 ; bg events
+	bg_event 15,  7, BGEVENT_READ, Route9Sign
 	bg_event 41, 15, BGEVENT_ITEM, Route9HiddenEther
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 23, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1
-	object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1
-	object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1
+	object_event 39,  8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1
+	object_event 11,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1
 	object_event 12, 15, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerEdna, -1
-	object_event 28, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1
+	object_event 28,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1
 	object_event 36, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerSidney, -1
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index 91f2967a3..a42c2b20c 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -1,11 +1,9 @@
 RuinsOfAlphAerodactylChamber_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .CheckWall
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .CheckWall ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
 
 .CheckWall:
@@ -43,23 +41,23 @@ RuinsOfAlphAerodactylChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene 1
+	setscene SCENE_FINISHED
 	closetext
 	end
 
-MapRuinsOfAlphAerodactylChamberSignpost2Script:
+RuinsOfAlphAerodactylChamberPuzzle:
 	refreshscreen
 	writebyte UNOWNPUZZLE_AERODACTYL
-	special Special_UnownPuzzle
+	special UnownPuzzle
 	closetext
-	iftrue UnknownScript_0x58df7
+	iftrue .PuzzleComplete
 	end
 
-UnknownScript_0x58df7:
+.PuzzleComplete:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_AERODACTYL_PUZZLE
-	setflag ENGINE_UNLOCKED_UNOWNS_3
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+	setflag ENGINE_UNLOCKED_UNOWNS_S_TO_W
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
@@ -67,75 +65,75 @@ UnknownScript_0x58df7:
 	reloadmappart
 	playsound SFX_STRENGTH
 	earthquake 80
-	applymovement PLAYER, MovementData_0x58e4d
+	applymovement PLAYER, RuinsOfAlphAerodactylChamberSkyfallTopMovement
 	playsound SFX_KINESIS
 	waitsfx
 	pause 20
 	warpcheck
 	end
 
-MapRuinsOfAlphAerodactylChamberSignpost1Script:
-	jumptext UnknownText_0x58ec2
+RuinsOfAlphAerodactylChamberAncientReplica:
+	jumptext RuinsOfAlphAerodactylChamberAncientReplicaText
 
-MapRuinsOfAlphAerodactylChamberSignpost3Script:
-	jumptext UnknownText_0x58ee7
+RuinsOfAlphAerodactylChamberDescriptionSign:
+	jumptext RuinsOfAlphAerodactylChamberDescriptionText
 
-MapRuinsOfAlphAerodactylChamberSignpost4Script:
+RuinsOfAlphAerodactylChamberWallPatternLeft:
 	opentext
-	writetext UnknownText_0x58e4f
+	writetext RuinsOfAlphAerodactylChamberWallPatternLeftText
 	writebyte UNOWNWORDS_LIGHT
-	special Special_DisplayUnownWords
+	special DisplayUnownWords
 	closetext
 	end
 
-MapRuinsOfAlphAerodactylChamberSignpost5Script:
+RuinsOfAlphAerodactylChamberWallPatternRight:
 	checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
-	iftrue UnknownScript_0x58e46
+	iftrue .WallOpen
 	opentext
-	writetext UnknownText_0x58e81
+	writetext RuinsOfAlphAerodactylChamberWallPatternRightText
 	writebyte UNOWNWORDS_LIGHT
-	special Special_DisplayUnownWords
+	special DisplayUnownWords
 	closetext
 	end
 
-UnknownScript_0x58e46:
+.WallOpen:
 	opentext
-	writetext UnknownText_0x58ea2
+	writetext RuinsOfAlphAerodactylChamberWallHoleText
 	waitbutton
 	closetext
 	end
 
-MovementData_0x58e4d:
+RuinsOfAlphAerodactylChamberSkyfallTopMovement:
 	skyfall_top
 	step_end
 
-UnknownText_0x58e4f:
+RuinsOfAlphAerodactylChamberWallPatternLeftText:
 	text "Patterns appeared"
 	line "on the walls…"
 	done
 
+RuinsOfAlphAerodactylChamberUnownText:
 ; unused
-UnusedText_0x58e70:
 	text "It's UNOWN text!"
 	done
 
-UnknownText_0x58e81:
+RuinsOfAlphAerodactylChamberWallPatternRightText:
 	text "Patterns appeared"
 	line "on the walls…"
 	done
 
-UnknownText_0x58ea2:
+RuinsOfAlphAerodactylChamberWallHoleText:
 	text "There's a big hole"
 	line "in the wall!"
 	done
 
-UnknownText_0x58ec2:
+RuinsOfAlphAerodactylChamberAncientReplicaText:
 	text "It's a replica of"
 	line "an ancient #-"
 	cont "MON."
 	done
 
-UnknownText_0x58ee7:
+RuinsOfAlphAerodactylChamberDescriptionText:
 	text "This flying #-"
 	line "MON attacked its"
 
@@ -144,28 +142,23 @@ UnknownText_0x58ee7:
 	done
 
 RuinsOfAlphAerodactylChamber_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 3, 9, 4, RUINS_OF_ALPH_OUTSIDE
-	warp_def 4, 9, 4, RUINS_OF_ALPH_OUTSIDE
-	warp_def 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 6
-	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
-	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script
-	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script
-	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script
-	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script
-	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script
-
-.ObjectEvents:
-	db 0
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  3,  9, RUINS_OF_ALPH_OUTSIDE, 4
+	warp_event  4,  9, RUINS_OF_ALPH_OUTSIDE, 4
+	warp_event  3,  3, RUINS_OF_ALPH_INNER_CHAMBER, 8
+	warp_event  4,  3, RUINS_OF_ALPH_INNER_CHAMBER, 9
+	warp_event  4,  0, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 1
+
+	db 0 ; coord events
+
+	db 6 ; bg events
+	bg_event  2,  3, BGEVENT_READ, RuinsOfAlphAerodactylChamberAncientReplica
+	bg_event  5,  3, BGEVENT_READ, RuinsOfAlphAerodactylChamberAncientReplica
+	bg_event  3,  2, BGEVENT_UP, RuinsOfAlphAerodactylChamberPuzzle
+	bg_event  4,  2, BGEVENT_UP, RuinsOfAlphAerodactylChamberDescriptionSign
+	bg_event  3,  0, BGEVENT_UP, RuinsOfAlphAerodactylChamberWallPatternLeft
+	bg_event  4,  0, BGEVENT_UP, RuinsOfAlphAerodactylChamberWallPatternRight
+
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm
index 8be5e878b..396cdc42b 100644
--- a/maps/RuinsOfAlphAerodactylItemRoom.asm
+++ b/maps/RuinsOfAlphAerodactylItemRoom.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3
 	const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4
 
 RuinsOfAlphAerodactylItemRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphAerodactylItemRoomGoldBerry:
 	itemball GOLD_BERRY
@@ -23,37 +21,32 @@ RuinsOfAlphAerodactylItemRoomHealPowder:
 RuinsOfAlphAerodactylItemRoomEnergyRoot:
 	itemball ENERGY_ROOT
 
-MapRuinsOfAlphAerodactylItemRoomSignpost1Script:
-	jumptext UnknownText_0x59ac1
+RuinsOfAlphAerodactylItemRoomAncientReplica:
+	jumptext RuinsOfAlphAerodactylItemRoomAncientReplicaText
 
-UnknownText_0x59ac1:
+RuinsOfAlphAerodactylItemRoomAncientReplicaText:
 	text "It's a replica of"
 	line "an ancient #-"
 	cont "MON."
 	done
 
 RuinsOfAlphAerodactylItemRoom_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_def 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_def 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
-	warp_def 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
-	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script
-
-.ObjectEvents:
-	db 4
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  3,  9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5
+	warp_event  4,  9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5
+	warp_event  3,  1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 1
+	warp_event  4,  1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  2,  1, BGEVENT_READ, RuinsOfAlphAerodactylItemRoomAncientReplica
+	bg_event  5,  1, BGEVENT_READ, RuinsOfAlphAerodactylItemRoomAncientReplica
+
+	db 4 ; object events
+	object_event  2,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
+	object_event  5,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
+	object_event  2,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
+	object_event  5,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm
index d991d80bc..96dc3eaef 100644
--- a/maps/RuinsOfAlphAerodactylWordRoom.asm
+++ b/maps/RuinsOfAlphAerodactylWordRoom.asm
@@ -1,25 +1,18 @@
 RuinsOfAlphAerodactylWordRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphAerodactylWordRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
-	warp_def 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM
-	warp_def 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER
+	db 3 ; warp events
+	warp_event  9,  5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 3
+	warp_event 10,  5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 4
+	warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 8
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index 173f35e39..0a8aeefc5 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -1,15 +1,13 @@
 RuinsOfAlphHoOhChamber_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .CheckWall
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .CheckWall ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
 
 .CheckWall:
-	special Special_HoOhChamber
+	special HoOhChamber
 	checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
 	iftrue .OpenWall
 	end
@@ -44,23 +42,23 @@ RuinsOfAlphHoOhChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene 1
+	setscene SCENE_FINISHED
 	closetext
 	end
 
-MapRuinsOfAlphHoOhChamberSignpost2Script:
+RuinsOfAlphHoOhChamberPuzzle:
 	refreshscreen
 	writebyte UNOWNPUZZLE_HO_OH
-	special Special_UnownPuzzle
+	special UnownPuzzle
 	closetext
-	iftrue UnknownScript_0x585ba
+	iftrue .PuzzleComplete
 	end
 
-UnknownScript_0x585ba:
+.PuzzleComplete:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_HO_OH_PUZZLE
-	setflag ENGINE_UNLOCKED_UNOWNS_4
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+	setflag ENGINE_UNLOCKED_UNOWNS_X_TO_Z
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
@@ -68,75 +66,75 @@ UnknownScript_0x585ba:
 	reloadmappart
 	playsound SFX_STRENGTH
 	earthquake 80
-	applymovement PLAYER, MovementData_0x58610
+	applymovement PLAYER, RuinsOfAlphHoOhChamberSkyfallTopMovement
 	playsound SFX_KINESIS
 	waitsfx
 	pause 20
 	warpcheck
 	end
 
-MapRuinsOfAlphHoOhChamberSignpost1Script:
-	jumptext UnknownText_0x58685
+RuinsOfAlphHoOhChamberAncientReplica:
+	jumptext RuinsOfAlphHoOhChamberAncientReplicaText
 
-MapRuinsOfAlphHoOhChamberSignpost3Script:
-	jumptext UnknownText_0x586aa
+RuinsOfAlphHoOhChamberDescriptionSign:
+	jumptext RuinsOfAlphHoOhChamberDescriptionText
 
-MapRuinsOfAlphHoOhChamberSignpost4Script:
+RuinsOfAlphHoOhChamberWallPatternLeft:
 	opentext
-	writetext UnknownText_0x58612
+	writetext RuinsOfAlphHoOhChamberWallPatternLeftText
 	writebyte UNOWNWORDS_HO_OH
-	special Special_DisplayUnownWords
+	special DisplayUnownWords
 	closetext
 	end
 
-MapRuinsOfAlphHoOhChamberSignpost5Script:
+RuinsOfAlphHoOhChamberWallPatternRight:
 	checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
-	iftrue UnknownScript_0x58609
+	iftrue .WallOpen
 	opentext
-	writetext UnknownText_0x58644
+	writetext RuinsOfAlphHoOhChamberWallPatternRightText
 	writebyte UNOWNWORDS_HO_OH
-	special Special_DisplayUnownWords
+	special DisplayUnownWords
 	closetext
 	end
 
-UnknownScript_0x58609:
+.WallOpen:
 	opentext
-	writetext UnknownText_0x58665
+	writetext RuinsOfAlphHoOhChamberWallHoleText
 	waitbutton
 	closetext
 	end
 
-MovementData_0x58610:
+RuinsOfAlphHoOhChamberSkyfallTopMovement:
 	skyfall_top
 	step_end
 
-UnknownText_0x58612:
+RuinsOfAlphHoOhChamberWallPatternLeftText:
 	text "Patterns appeared"
 	line "on the walls…"
 	done
 
+RuinsOfAlphHoOhChamberUnownText:
 ; unused
-UnusedText_0x58633:
 	text "It's UNOWN text!"
 	done
 
-UnknownText_0x58644:
+RuinsOfAlphHoOhChamberWallPatternRightText:
 	text "Patterns appeared"
 	line "on the walls…"
 	done
 
-UnknownText_0x58665:
+RuinsOfAlphHoOhChamberWallHoleText:
 	text "There's a big hole"
 	line "in the wall!"
 	done
 
-UnknownText_0x58685:
+RuinsOfAlphHoOhChamberAncientReplicaText:
 	text "It's a replica of"
 	line "an ancient #-"
 	cont "MON."
 	done
 
-UnknownText_0x586aa:
+RuinsOfAlphHoOhChamberDescriptionText:
 	text "A #MON that"
 	line "flew gracefully on"
 
@@ -145,28 +143,23 @@ UnknownText_0x586aa:
 	done
 
 RuinsOfAlphHoOhChamber_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 3, 9, 1, RUINS_OF_ALPH_OUTSIDE
-	warp_def 4, 9, 1, RUINS_OF_ALPH_OUTSIDE
-	warp_def 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 6
-	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
-	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script
-	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script
-	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script
-	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script
-	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script
-
-.ObjectEvents:
-	db 0
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  3,  9, RUINS_OF_ALPH_OUTSIDE, 1
+	warp_event  4,  9, RUINS_OF_ALPH_OUTSIDE, 1
+	warp_event  3,  3, RUINS_OF_ALPH_INNER_CHAMBER, 2
+	warp_event  4,  3, RUINS_OF_ALPH_INNER_CHAMBER, 3
+	warp_event  4,  0, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 1
+
+	db 0 ; coord events
+
+	db 6 ; bg events
+	bg_event  2,  3, BGEVENT_READ, RuinsOfAlphHoOhChamberAncientReplica
+	bg_event  5,  3, BGEVENT_READ, RuinsOfAlphHoOhChamberAncientReplica
+	bg_event  3,  2, BGEVENT_UP, RuinsOfAlphHoOhChamberPuzzle
+	bg_event  4,  2, BGEVENT_UP, RuinsOfAlphHoOhChamberDescriptionSign
+	bg_event  3,  0, BGEVENT_UP, RuinsOfAlphHoOhChamberWallPatternLeft
+	bg_event  4,  0, BGEVENT_UP, RuinsOfAlphHoOhChamberWallPatternRight
+
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm
index e8ad02a27..1dde14e7b 100644
--- a/maps/RuinsOfAlphHoOhItemRoom.asm
+++ b/maps/RuinsOfAlphHoOhItemRoom.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL1
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL2
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL3
 	const RUINSOFALPHHOOHITEMROOM_POKE_BALL4
 
 RuinsOfAlphHoOhItemRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphHoOhItemRoomGoldBerry:
 	itemball GOLD_BERRY
@@ -23,37 +21,32 @@ RuinsOfAlphHoOhItemRoomRevivalHerb:
 RuinsOfAlphHoOhItemRoomCharcoal:
 	itemball CHARCOAL
 
-MapRuinsOfAlphHoOhItemRoomSignpost1Script:
-	jumptext UnknownText_0x59923
+RuinsOfAlphHoOhItemRoomAncientReplica:
+	jumptext RuinsOfAlphHoOhItemRoomAncientReplicaText
 
-UnknownText_0x59923:
+RuinsOfAlphHoOhItemRoomAncientReplicaText:
 	text "It's a replica of"
 	line "an ancient #-"
 	cont "MON."
 	done
 
 RuinsOfAlphHoOhItemRoom_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_def 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_def 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM
-	warp_def 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
-	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script
-
-.ObjectEvents:
-	db 4
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  3,  9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
+	warp_event  4,  9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5
+	warp_event  3,  1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 1
+	warp_event  4,  1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  2,  1, BGEVENT_READ, RuinsOfAlphHoOhItemRoomAncientReplica
+	bg_event  5,  1, BGEVENT_READ, RuinsOfAlphHoOhItemRoomAncientReplica
+
+	db 4 ; object events
+	object_event  2,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
+	object_event  5,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
+	object_event  2,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
+	object_event  5,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm
index a9b3be9cd..d5492dbf9 100644
--- a/maps/RuinsOfAlphHoOhWordRoom.asm
+++ b/maps/RuinsOfAlphHoOhWordRoom.asm
@@ -1,25 +1,18 @@
 RuinsOfAlphHoOhWordRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphHoOhWordRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
-	warp_def 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM
-	warp_def 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER
+	db 3 ; warp events
+	warp_event  9,  9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 3
+	warp_event 10,  9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 4
+	warp_event 17, 21, RUINS_OF_ALPH_INNER_CHAMBER, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index 27e696a85..7f5348633 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RUINSOFALPHINNERCHAMBER_FISHER
 	const RUINSOFALPHINNERCHAMBER_TEACHER
 	const RUINSOFALPHINNERCHAMBER_GRAMPS
 
 RuinsOfAlphInnerChamber_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .UnownAppear
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_RUINSOFALPHINNERCHAMBER_NOTHING
+	scene_script .UnownAppear ; SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -24,7 +22,7 @@ RuinsOfAlphInnerChamber_MapScripts:
 	writetext RuinsOfAlphStrangePresenceText
 	waitbutton
 	closetext
-	setscene 0
+	setscene SCENE_RUINSOFALPHINNERCHAMBER_NOTHING
 	setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
 	clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
 	end
@@ -77,55 +75,50 @@ RuinsOfAlphInnerChamberStatueText:
 	done
 
 RuinsOfAlphInnerChamber_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 9
-	warp_def 10, 13, 5, RUINS_OF_ALPH_OUTSIDE
-	warp_def 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_def 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_def 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_def 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_def 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_def 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_def 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_def 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 26
-	bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 11, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 14, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 17, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 2, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 5, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 11, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 14, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 17, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 2, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	db 0, 0 ; filler
+
+	db 9 ; warp events
+	warp_event 10, 13, RUINS_OF_ALPH_OUTSIDE, 5
+	warp_event  3, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 3
+	warp_event  4, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 4
+	warp_event 15,  3, RUINS_OF_ALPH_KABUTO_CHAMBER, 3
+	warp_event 16,  3, RUINS_OF_ALPH_KABUTO_CHAMBER, 4
+	warp_event  3, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 3
+	warp_event  4, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 4
+	warp_event 15, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 3
+	warp_event 16, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4
+
+	db 0 ; coord events
+
+	db 26 ; bg events
+	bg_event  2,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  5,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  8,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 11,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 14,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 17,  3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  2,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  5,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  8,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 11,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 14,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event 17,  8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  2, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 17, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 2, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 5, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  2, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  5, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  8, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 11, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 14, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 17, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 2, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 5, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
-	bg_event 8, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  2, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  5, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
+	bg_event  8, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 11, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 14, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 	bg_event 17, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue
 
-.ObjectEvents:
-	db 3
-	object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
+	db 3 ; object events
+	object_event  3,  7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	object_event 14, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	object_event 11, 19, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index df4bcb881..09453956b 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST
 	const RUINSOFALPHKABUTOCHAMBER_SCIENTIST
 
 RuinsOfAlphKabutoChamber_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .CheckWall
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .CheckWall ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
 
 .CheckWall:
@@ -47,27 +45,27 @@ RuinsOfAlphKabutoChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene 1
+	setscene SCENE_FINISHED
 	closetext
 	end
 
 RuinsOfAlphKabutoChamberReceptionistScript:
 	jumptextfaceplayer RuinsOfAlphKabutoChamberReceptionistText
 
-MapRuinsOfAlphKabutoChamberSignpost2Script:
+RuinsOfAlphKabutoChamberPuzzle:
 	refreshscreen
 	writebyte UNOWNPUZZLE_KABUTO
-	special Special_UnownPuzzle
+	special UnownPuzzle
 	closetext
-	iftrue UnknownScript_0x58778
+	iftrue .PuzzleComplete
 	end
 
-UnknownScript_0x58778:
+.PuzzleComplete:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_KABUTO_PUZZLE
-	setflag ENGINE_UNLOCKED_UNOWNS_1
+	setflag ENGINE_UNLOCKED_UNOWNS_A_TO_K
 	setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
@@ -75,75 +73,75 @@ UnknownScript_0x58778:
 	reloadmappart
 	playsound SFX_STRENGTH
 	earthquake 80
-	applymovement PLAYER, MovementData_0x587fe
+	applymovement PLAYER, RuinsOfAlphKabutoChamberSkyfallTopMovement
 	playsound SFX_KINESIS
 	waitsfx
 	pause 20
 	warpcheck
 	end
 
-ScientistScript_0x587a8:
+RuinsOfAlphKabutoChamberScientistScript:
 	faceplayer
 	opentext
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x587cf
+	ifequal NUM_UNOWN, .AllUnownCaught
 	checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
-	iftrue UnknownScript_0x587c9
+	iftrue .WallOpen
 	checkevent EVENT_SOLVED_KABUTO_PUZZLE
-	iffalse UnknownScript_0x587c0
+	iffalse .PuzzleIncomplete
 	writetext UnknownText_0x589b8
 	buttonsound
-UnknownScript_0x587c0:
+.PuzzleIncomplete:
 	writetext UnknownText_0x588f5
 	waitbutton
 	closetext
-	spriteface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
+	turnobject RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
 	end
 
-UnknownScript_0x587c9:
+.WallOpen:
 	writetext UnknownText_0x5897c
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x587cf:
-	writetext UnknownText_0x594cb
+.AllUnownCaught:
+	writetext RuinsOfAlphResearchCenterScientist1Text_GotAllUnown
 	waitbutton
 	closetext
 	end
 
-MapRuinsOfAlphKabutoChamberSignpost1Script:
-	jumptext UnknownText_0x58b1a
+RuinsOfAlphKabutoChamberAncientReplica:
+	jumptext RuinsOfAlphKabutoChamberAncientReplicaText
 
-MapRuinsOfAlphKabutoChamberSignpost3Script:
-	jumptext UnknownText_0x58b3f
+RuinsOfAlphKabutoChamberDescriptionSign:
+	jumptext RuinsOfAlphKabutoChamberDescriptionText
 
-MapRuinsOfAlphKabutoChamberSignpost4Script:
+RuinsOfAlphKabutoChamberWallPatternLeft:
 	opentext
-	writetext UnknownText_0x58aa7
+	writetext RuinsOfAlphKabutoChamberWallPatternLeftText
 	writebyte UNOWNWORDS_ESCAPE
-	special Special_DisplayUnownWords
+	special DisplayUnownWords
 	closetext
 	end
 
-MapRuinsOfAlphKabutoChamberSignpost5Script:
+RuinsOfAlphKabutoChamberWallPatternRight:
 	checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
-	iftrue UnknownScript_0x587f7
+	iftrue .WallOpen
 	opentext
-	writetext UnknownText_0x58ad9
+	writetext RuinsOfAlphKabutoChamberWallPatternRightText
 	writebyte UNOWNWORDS_ESCAPE
-	special Special_DisplayUnownWords
+	special DisplayUnownWords
 	closetext
 	end
 
-UnknownScript_0x587f7:
+.WallOpen:
 	opentext
-	writetext UnknownText_0x58afa
+	writetext RuinsOfAlphKabutoChamberWallHoleText
 	waitbutton
 	closetext
 	end
 
-MovementData_0x587fe:
+RuinsOfAlphKabutoChamberSkyfallTopMovement:
 	skyfall_top
 	step_end
 
@@ -202,8 +200,8 @@ UnknownText_0x589b8:
 	cont "this wall here…"
 	done
 
+RuinsOfAlphKabutoChamberUnusedText:
 ; unused
-UnusedText_0x58a03:
 	text "The patterns on"
 	line "the wall appear to"
 	cont "be words!"
@@ -221,33 +219,33 @@ UnusedText_0x58a03:
 	line "yet…"
 	done
 
-UnknownText_0x58aa7:
+RuinsOfAlphKabutoChamberWallPatternLeftText:
 	text "Patterns appeared"
 	line "on the walls…"
 	done
 
+RuinsOfAlphKabutoChamberUnownText:
 ; unused
-UnusedText_0x58ac8:
 	text "It's UNOWN text!"
 	done
 
-UnknownText_0x58ad9:
+RuinsOfAlphKabutoChamberWallPatternRightText:
 	text "Patterns appeared"
 	line "on the walls…"
 	done
 
-UnknownText_0x58afa:
+RuinsOfAlphKabutoChamberWallHoleText:
 	text "There's a big hole"
 	line "in the wall!"
 	done
 
-UnknownText_0x58b1a:
+RuinsOfAlphKabutoChamberAncientReplicaText:
 	text "It's a replica of"
 	line "an ancient #-"
 	cont "MON."
 	done
 
-UnknownText_0x58b3f:
+RuinsOfAlphKabutoChamberDescriptionText:
 	text "A #MON that hid"
 	line "on the sea floor."
 
@@ -256,30 +254,25 @@ UnknownText_0x58b3f:
 	done
 
 RuinsOfAlphKabutoChamber_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 3, 9, 2, RUINS_OF_ALPH_OUTSIDE
-	warp_def 4, 9, 2, RUINS_OF_ALPH_OUTSIDE
-	warp_def 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 6
-	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
-	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script
-	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script
-	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script
-	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script
-	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script
-
-.ObjectEvents:
-	db 2
-	object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
-	object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  3,  9, RUINS_OF_ALPH_OUTSIDE, 2
+	warp_event  4,  9, RUINS_OF_ALPH_OUTSIDE, 2
+	warp_event  3,  3, RUINS_OF_ALPH_INNER_CHAMBER, 4
+	warp_event  4,  3, RUINS_OF_ALPH_INNER_CHAMBER, 5
+	warp_event  4,  0, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 1
+
+	db 0 ; coord events
+
+	db 6 ; bg events
+	bg_event  2,  3, BGEVENT_READ, RuinsOfAlphKabutoChamberAncientReplica
+	bg_event  5,  3, BGEVENT_READ, RuinsOfAlphKabutoChamberAncientReplica
+	bg_event  3,  2, BGEVENT_UP, RuinsOfAlphKabutoChamberPuzzle
+	bg_event  4,  2, BGEVENT_UP, RuinsOfAlphKabutoChamberDescriptionSign
+	bg_event  3,  0, BGEVENT_UP, RuinsOfAlphKabutoChamberWallPatternLeft
+	bg_event  4,  0, BGEVENT_UP, RuinsOfAlphKabutoChamberWallPatternRight
+
+	db 2 ; object events
+	object_event  5,  5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
+	object_event  3,  1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberScientistScript, -1
diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm
index 3e5d41515..7b43c2841 100644
--- a/maps/RuinsOfAlphKabutoItemRoom.asm
+++ b/maps/RuinsOfAlphKabutoItemRoom.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3
 	const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4
 
 RuinsOfAlphKabutoItemRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphKabutoItemRoomBerry:
 	itemball BERRY
@@ -23,37 +21,32 @@ RuinsOfAlphKabutoItemRoomHealPowder:
 RuinsOfAlphKabutoItemRoomEnergypowder:
 	itemball ENERGYPOWDER
 
-MapRuinsOfAlphKabutoItemRoomSignpost1Script:
-	jumptext UnknownText_0x599ad
+RuinsOfAlphKabutoItemRoomAncientReplica:
+	jumptext RuinsOfAlphKabutoItemRoomAncientReplicaText
 
-UnknownText_0x599ad:
+RuinsOfAlphKabutoItemRoomAncientReplicaText:
 	text "It's a replica of"
 	line "an ancient #-"
 	cont "MON."
 	done
 
 RuinsOfAlphKabutoItemRoom_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_def 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_def 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM
-	warp_def 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
-	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script
-
-.ObjectEvents:
-	db 4
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  3,  9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5
+	warp_event  4,  9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5
+	warp_event  3,  1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 1
+	warp_event  4,  1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  2,  1, BGEVENT_READ, RuinsOfAlphKabutoItemRoomAncientReplica
+	bg_event  5,  1, BGEVENT_READ, RuinsOfAlphKabutoItemRoomAncientReplica
+
+	db 4 ; object events
+	object_event  2,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
+	object_event  5,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
+	object_event  2,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
+	object_event  5,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm
index ad29b5760..086ae4c2d 100644
--- a/maps/RuinsOfAlphKabutoWordRoom.asm
+++ b/maps/RuinsOfAlphKabutoWordRoom.asm
@@ -1,25 +1,18 @@
 RuinsOfAlphKabutoWordRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphKabutoWordRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
-	warp_def 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM
-	warp_def 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER
+	db 3 ; warp events
+	warp_event  9,  5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 3
+	warp_event 10,  5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 4
+	warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index e9c937526..1a8387405 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -1,15 +1,13 @@
 RuinsOfAlphOmanyteChamber_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .CheckWall
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .CheckWall ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .HiddenDoors
 
 .CheckWall:
-	special Special_OmanyteChamber
+	special OmanyteChamber
 	checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
 	iftrue .OpenWall
 	end
@@ -44,23 +42,23 @@ RuinsOfAlphOmanyteChamber_MapScripts:
 	changeblock 4, 0, $30 ; open wall
 	reloadmappart
 	earthquake 50
-	setscene 1
+	setscene SCENE_FINISHED
 	closetext
 	end
 
-MapRuinsOfAlphOmanyteChamberSignpost2Script:
+RuinsOfAlphOmanyteChamberPuzzle:
 	refreshscreen
 	writebyte UNOWNPUZZLE_OMANYTE
-	special Special_UnownPuzzle
+	special UnownPuzzle
 	closetext
-	iftrue UnknownScript_0x58c36
+	iftrue .PuzzleComplete
 	end
 
-UnknownScript_0x58c36:
+.PuzzleComplete:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
 	setevent EVENT_SOLVED_OMANYTE_PUZZLE
-	setflag ENGINE_UNLOCKED_UNOWNS_2
-	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1
+	setflag ENGINE_UNLOCKED_UNOWNS_L_TO_R
+	setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
 	earthquake 30
 	showemote EMOTE_SHOCK, PLAYER, 15
 	changeblock 2, 2, $18 ; left hole
@@ -68,75 +66,75 @@ UnknownScript_0x58c36:
 	reloadmappart
 	playsound SFX_STRENGTH
 	earthquake 80
-	applymovement PLAYER, MovementData_0x58c8c
+	applymovement PLAYER, RuinsOfAlphOmanyteChamberSkyfallTopMovement
 	playsound SFX_KINESIS
 	waitsfx
 	pause 20
 	warpcheck
 	end
 
-MapRuinsOfAlphOmanyteChamberSignpost1Script:
-	jumptext UnknownText_0x58d01
+RuinsOfAlphOmanyteChamberAncientReplica:
+	jumptext RuinsOfAlphOmanyteChamberAncientReplicaText
 
-MapRuinsOfAlphOmanyteChamberSignpost3Script:
-	jumptext UnknownText_0x58d26
+RuinsOfAlphOmanyteChamberDescriptionSign:
+	jumptext RuinsOfAlphOmanyteChamberDescriptionText
 
-MapRuinsOfAlphOmanyteChamberSignpost4Script:
+RuinsOfAlphOmanyteChamberWallPatternLeft:
 	opentext
-	writetext UnknownText_0x58c8e
+	writetext RuinsOfAlphOmanyteChamberWallPatternLeftText
 	writebyte UNOWNWORDS_WATER
-	special Special_DisplayUnownWords
+	special DisplayUnownWords
 	closetext
 	end
 
-MapRuinsOfAlphOmanyteChamberSignpost5Script:
+RuinsOfAlphOmanyteChamberWallPatternRight:
 	checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
-	iftrue UnknownScript_0x58c85
+	iftrue .WallOpen
 	opentext
-	writetext UnknownText_0x58cc0
+	writetext RuinsOfAlphOmanyteChamberWallPatternRightText
 	writebyte UNOWNWORDS_WATER
-	special Special_DisplayUnownWords
+	special DisplayUnownWords
 	closetext
 	end
 
-UnknownScript_0x58c85:
+.WallOpen:
 	opentext
-	writetext UnknownText_0x58ce1
+	writetext RuinsOfAlphOmanyteChamberWallHoleText
 	waitbutton
 	closetext
 	end
 
-MovementData_0x58c8c:
+RuinsOfAlphOmanyteChamberSkyfallTopMovement:
 	skyfall_top
 	step_end
 
-UnknownText_0x58c8e:
+RuinsOfAlphOmanyteChamberWallPatternLeftText:
 	text "Patterns appeared"
 	line "on the walls…"
 	done
 
+RuinsOfAlphOmanyteChamberUnownText:
 ; unused
-UnusedText_0x58caf:
 	text "It's UNOWN text!"
 	done
 
-UnknownText_0x58cc0:
+RuinsOfAlphOmanyteChamberWallPatternRightText:
 	text "Patterns appeared"
 	line "on the walls…"
 	done
 
-UnknownText_0x58ce1:
+RuinsOfAlphOmanyteChamberWallHoleText:
 	text "There's a big hole"
 	line "in the wall!"
 	done
 
-UnknownText_0x58d01:
+RuinsOfAlphOmanyteChamberAncientReplicaText:
 	text "It's a replica of"
 	line "an ancient #-"
 	cont "MON."
 	done
 
-UnknownText_0x58d26:
+RuinsOfAlphOmanyteChamberDescriptionText:
 	text "This #MON"
 	line "drifted in the"
 
@@ -145,28 +143,23 @@ UnknownText_0x58d26:
 	done
 
 RuinsOfAlphOmanyteChamber_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 3, 9, 3, RUINS_OF_ALPH_OUTSIDE
-	warp_def 4, 9, 3, RUINS_OF_ALPH_OUTSIDE
-	warp_def 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 6
-	bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
-	bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script
-	bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script
-	bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script
-	bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script
-	bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script
-
-.ObjectEvents:
-	db 0
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  3,  9, RUINS_OF_ALPH_OUTSIDE, 3
+	warp_event  4,  9, RUINS_OF_ALPH_OUTSIDE, 3
+	warp_event  3,  3, RUINS_OF_ALPH_INNER_CHAMBER, 6
+	warp_event  4,  3, RUINS_OF_ALPH_INNER_CHAMBER, 7
+	warp_event  4,  0, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 1
+
+	db 0 ; coord events
+
+	db 6 ; bg events
+	bg_event  2,  3, BGEVENT_READ, RuinsOfAlphOmanyteChamberAncientReplica
+	bg_event  5,  3, BGEVENT_READ, RuinsOfAlphOmanyteChamberAncientReplica
+	bg_event  3,  2, BGEVENT_UP, RuinsOfAlphOmanyteChamberPuzzle
+	bg_event  4,  2, BGEVENT_UP, RuinsOfAlphOmanyteChamberDescriptionSign
+	bg_event  3,  0, BGEVENT_UP, RuinsOfAlphOmanyteChamberWallPatternLeft
+	bg_event  4,  0, BGEVENT_UP, RuinsOfAlphOmanyteChamberWallPatternRight
+
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm
index 3f4570b2b..cd0339e58 100644
--- a/maps/RuinsOfAlphOmanyteItemRoom.asm
+++ b/maps/RuinsOfAlphOmanyteItemRoom.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3
 	const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4
 
 RuinsOfAlphOmanyteItemRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphOmanyteItemRoomMysteryberry:
 	itemball MYSTERYBERRY
@@ -23,37 +21,32 @@ RuinsOfAlphOmanyteItemRoomStardust:
 RuinsOfAlphOmanyteItemRoomStarPiece:
 	itemball STAR_PIECE
 
-MapRuinsOfAlphOmanyteItemRoomSignpost1Script:
-	jumptext UnknownText_0x59a37
+RuinsOfAlphOmanyteItemRoomAncientReplica:
+	jumptext RuinsOfAlphOmanyteItemRoomAncientReplicaText
 
-UnknownText_0x59a37:
+RuinsOfAlphOmanyteItemRoomAncientReplicaText:
 	text "It's a replica of"
 	line "an ancient #-"
 	cont "MON."
 	done
 
 RuinsOfAlphOmanyteItemRoom_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_def 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_def 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
-	warp_def 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
-	bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script
-
-.ObjectEvents:
-	db 4
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
-	object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
-	object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
-	object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  3,  9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
+	warp_event  4,  9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5
+	warp_event  3,  1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 1
+	warp_event  4,  1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  2,  1, BGEVENT_READ, RuinsOfAlphOmanyteItemRoomAncientReplica
+	bg_event  5,  1, BGEVENT_READ, RuinsOfAlphOmanyteItemRoomAncientReplica
+
+	db 4 ; object events
+	object_event  2,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
+	object_event  5,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
+	object_event  2,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
+	object_event  5,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm
index b2f68e0a3..b5e0f4d2e 100644
--- a/maps/RuinsOfAlphOmanyteWordRoom.asm
+++ b/maps/RuinsOfAlphOmanyteWordRoom.asm
@@ -1,25 +1,18 @@
 RuinsOfAlphOmanyteWordRoom_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 RuinsOfAlphOmanyteWordRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
-	warp_def 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM
-	warp_def 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER
+	db 3 ; warp events
+	warp_event  9,  7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 3
+	warp_event 10,  7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 4
+	warp_event 17, 13, RUINS_OF_ALPH_INNER_CHAMBER, 6
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 3c674d8c8..394ea368e 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RUINSOFALPHOUTSIDE_YOUNGSTER1
 	const RUINSOFALPHOUTSIDE_SCIENTIST
 	const RUINSOFALPHOUTSIDE_FISHER
@@ -6,13 +6,11 @@ const_value set 2
 	const RUINSOFALPHOUTSIDE_YOUNGSTER3
 
 RuinsOfAlphOutside_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_RUINSOFALPHOUTSIDE_NOTHING
+	scene_script .DummyScene1 ; SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ScientistCallback
 
 .DummyScene0:
@@ -30,34 +28,34 @@ RuinsOfAlphOutside_MapScripts:
 
 .MaybeScientist:
 	checkcode VAR_UNOWNCOUNT
-	if_greater_than 2, .YesScientist
+	ifgreater 2, .YesScientist
 	jump .NoScientist
 
 .YesScientist:
 	appear RUINSOFALPHOUTSIDE_SCIENTIST
-	setscene 1
+	setscene SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX
 	return
 
 .NoScientist:
 	disappear RUINSOFALPHOUTSIDE_SCIENTIST
-	setscene 0
+	setscene SCENE_RUINSOFALPHOUTSIDE_NOTHING
 	return
 
 RuinsOfAlphOutsideScientistScene1:
-	spriteface RUINSOFALPHOUTSIDE_SCIENTIST, UP
-	spriteface PLAYER, DOWN
-	jump UnknownScript_0x58044
+	turnobject RUINSOFALPHOUTSIDE_SCIENTIST, UP
+	turnobject PLAYER, DOWN
+	jump RuinsOfAlphOutsideScientistSceneContinue
 
 RuinsOfAlphOutsideScientistScene2:
-	spriteface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
-	spriteface PLAYER, RIGHT
-	jump UnknownScript_0x58044
+	turnobject RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
+	turnobject PLAYER, RIGHT
+	jump RuinsOfAlphOutsideScientistSceneContinue
 
-ScientistScript_0x58043:
+RuinsOfAlphOutsideScientistScript:
 	faceplayer
-UnknownScript_0x58044:
+RuinsOfAlphOutsideScientistSceneContinue:
 	opentext
-	writetext UnknownText_0x580c7
+	writetext RuinsOfAlphOutsideScientistText
 	waitbutton
 	closetext
 	playmusic MUSIC_SHOW_ME_AROUND
@@ -66,46 +64,46 @@ UnknownScript_0x58044:
 	disappear RUINSOFALPHOUTSIDE_SCIENTIST
 	stopfollow
 	applymovement PLAYER, MovementData_0x580c5
-	setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, 1
+	setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX
 	warpcheck
 	end
 
-FisherScript_0x58061:
+RuinsOfAlphOutsideFisherScript:
 	faceplayer
 	opentext
 	checkevent EVENT_TALKED_TO_RUINS_COWARD
 	iftrue .Next
 	setevent EVENT_TALKED_TO_RUINS_COWARD
-	writetext UnknownText_0x583a4
+	writetext RuinsOfAlphOutsideFisherText1
 	buttonsound
 .Next:
-	writetext UnknownText_0x58420
+	writetext RuinsOfAlphOutsideFisherText2
 	waitbutton
 	closetext
 	end
 
-YoungsterScript_0x58076:
+RuinsOfAlphOutsideYoungster1Script:
 	faceplayer
 	opentext
-	writetext UnknownText_0x58449
+	writetext RuinsOfAlphOutsideYoungster1Text
 	waitbutton
 	closetext
 	end
 
-YoungsterScript_0x5807e:
+RuinsOfAlphOutsideYoungster2Script:
 	faceplayer
 	opentext
-	writetext UnknownText_0x5848e
+	writetext RuinsOfAlphOutsideYoungster2Text
 	waitbutton
 	closetext
-	spriteface RUINSOFALPHOUTSIDE_YOUNGSTER3, UP
+	turnobject RUINSOFALPHOUTSIDE_YOUNGSTER3, UP
 	end
 
 TrainerPsychicNathan:
-	trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script
+	trainer PSYCHIC_T, NATHAN, EVENT_BEAT_PSYCHIC_NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicNathanAfterBattleText
 	waitbutton
@@ -113,24 +111,24 @@ TrainerPsychicNathan:
 	end
 
 TrainerSuperNerdStan:
-	trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script
+	trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, SuperNerdStanSeenText, SuperNerdStanBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SuperNerdStanAfterBattleText
 	waitbutton
 	closetext
 	end
 
-RuinsOfAlphOutsideSignpost0Script:
-	jumptext UnknownText_0x58325
+RuinsOfAlphOutsideMysteryChamberSign:
+	jumptext RuinsOfAlphOutsideMysteryChamberSignText
 
-RuinsOfAlphOutsideSignpost1Script:
-	jumptext UnknownText_0x58342
+RuinsOfAlphSign:
+	jumptext RuinsOfAlphSignText
 
-RuinsOfAlphOutsideSignpost2Script:
-	jumptext UnknownText_0x58362
+RuinsOfAlphResearchCenterSign:
+	jumptext RuinsOfAlphResearchCenterSignText
 
 MovementData_0x580ba:
 	step RIGHT
@@ -149,7 +147,7 @@ MovementData_0x580c5:
 	step UP
 	step_end
 
-UnknownText_0x580c7:
+RuinsOfAlphOutsideScientistText:
 	text "Hm? That's a #-"
 	line "DEX, isn't it?"
 	cont "May I see it?"
@@ -178,13 +176,13 @@ UnknownText_0x580c7:
 	cont "DEX. Follow me."
 	done
 
-UnknownText_0x581e5:
+SuperNerdStanSeenText:
 	text "What do you want?"
 	line "I'm studying--"
 	cont "don't disturb me!"
 	done
 
-UnknownText_0x58217:
+SuperNerdStanBeatenText:
 	text "Sorry…"
 	line "I'm frustrated by"
 
@@ -223,17 +221,17 @@ PsychicNathanAfterBattleText:
 	line "here."
 	done
 
-UnknownText_0x58325:
+RuinsOfAlphOutsideMysteryChamberSignText:
 	text "MYSTERY STONE"
 	line "PANEL CHAMBER"
 	done
 
-UnknownText_0x58342:
+RuinsOfAlphSignText:
 	text "RUINS OF ALPH"
 	line "VISITORS WELCOME"
 	done
 
-UnknownText_0x58362:
+RuinsOfAlphResearchCenterSignText:
 	text "RUINS OF ALPH"
 	line "RESEARCH CENTER"
 
@@ -241,7 +239,7 @@ UnknownText_0x58362:
 	line "THE RUINS OF ALPH"
 	done
 
-UnknownText_0x583a4:
+RuinsOfAlphOutsideFisherText1:
 	text "While exploring"
 	line "the RUINS, we"
 
@@ -255,14 +253,14 @@ UnknownText_0x583a4:
 	line "careful too."
 	done
 
-UnknownText_0x58420:
+RuinsOfAlphOutsideFisherText2:
 	text "The RUINS hide a"
 	line "huge secret!"
 
 	para "…I think…"
 	done
 
-UnknownText_0x58449:
+RuinsOfAlphOutsideYoungster1Text:
 	text "There are many"
 	line "kinds of UNOWN, so"
 
@@ -270,7 +268,7 @@ UnknownText_0x58449:
 	line "our secret codes."
 	done
 
-UnknownText_0x5848e:
+RuinsOfAlphOutsideYoungster2Text:
 	text "A… H… E… A… D…"
 	line "Hmm…"
 
@@ -281,38 +279,33 @@ UnknownText_0x5848e:
 	done
 
 RuinsOfAlphOutside_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 11
-	warp_def 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER
-	warp_def 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER
-	warp_def 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER
-	warp_def 16, 33, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER
-	warp_def 10, 13, 1, RUINS_OF_ALPH_INNER_CHAMBER
-	warp_def 17, 11, 1, RUINS_OF_ALPH_RESEARCH_CENTER
-	warp_def 6, 19, 1, UNION_CAVE_B1F
-	warp_def 6, 27, 2, UNION_CAVE_B1F
-	warp_def 7, 5, 3, ROUTE_36_RUINS_OF_ALPH_GATE
-	warp_def 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE
-	warp_def 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE
-
-.CoordEvents:
-	db 2
-	coord_event 11, 14, 1, RuinsOfAlphOutsideScientistScene1
-	coord_event 10, 15, 1, RuinsOfAlphOutsideScientistScene2
-
-.BGEvents:
-	db 3
-	bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script
-	bg_event 12, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script
-	bg_event 18, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script
-
-.ObjectEvents:
-	db 5
-	object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1
-	object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
-	object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
-	object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
-	object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
+	db 0, 0 ; filler
+
+	db 11 ; warp events
+	warp_event  2, 17, RUINS_OF_ALPH_HO_OH_CHAMBER, 1
+	warp_event 14,  7, RUINS_OF_ALPH_KABUTO_CHAMBER, 1
+	warp_event  2, 29, RUINS_OF_ALPH_OMANYTE_CHAMBER, 1
+	warp_event 16, 33, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 1
+	warp_event 10, 13, RUINS_OF_ALPH_INNER_CHAMBER, 1
+	warp_event 17, 11, RUINS_OF_ALPH_RESEARCH_CENTER, 1
+	warp_event  6, 19, UNION_CAVE_B1F, 1
+	warp_event  6, 27, UNION_CAVE_B1F, 2
+	warp_event  7,  5, ROUTE_36_RUINS_OF_ALPH_GATE, 3
+	warp_event 13, 20, ROUTE_32_RUINS_OF_ALPH_GATE, 1
+	warp_event 13, 21, ROUTE_32_RUINS_OF_ALPH_GATE, 2
+
+	db 2 ; coord events
+	coord_event 11, 14, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene1
+	coord_event 10, 15, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene2
+
+	db 3 ; bg events
+	bg_event 16,  8, BGEVENT_READ, RuinsOfAlphOutsideMysteryChamberSign
+	bg_event 12, 16, BGEVENT_READ, RuinsOfAlphSign
+	bg_event 18, 12, BGEVENT_READ, RuinsOfAlphResearchCenterSign
+
+	db 5 ; object events
+	object_event  4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1
+	object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideScientistScript, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
+	object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideFisherScript, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
+	object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideYoungster1Script, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
+	object_event 12,  8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideYoungster2Script, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 1595ce59a..d455ebf64 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST1
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST2
 	const RUINSOFALPHRESEARCHCENTER_SCIENTIST3
 
 RuinsOfAlphResearchCenter_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .GetUnownDex
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING
+	scene_script .GetUnownDex ; SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .ScientistCallback
 
 .DummyScene0:
@@ -22,7 +20,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 
 .ScientistCallback:
 	checkscene
-	if_equal 1, .ShowScientist
+	ifequal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist
 	return
 
 .ShowScientist:
@@ -40,140 +38,141 @@ RuinsOfAlphResearchCenter_MapScripts:
 	pause 30
 	playsound SFX_TRANSACTION
 	pause 30
-	spriteface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN
+	turnobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN
 	opentext
-	writetext UnknownText_0x59278
+	writetext RuinsOfAlphResearchCenterModifiedDexText
 	waitbutton
 	closetext
 	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59274
 	opentext
-	writetext UnknownText_0x592fa
+	writetext RuinsOfAlphResearchCenterDexUpgradedText
 	playsound SFX_ITEM
 	waitsfx
 	setflag ENGINE_UNOWN_DEX
-	writetext UnknownText_0x59311
+	writetext RuinsOfAlphResearchCenterScientist3Text
 	waitbutton
 	closetext
 	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276
-	setscene 0
+	setscene SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING
 	special RestartMapMusic
 	end
 
-ScientistScript_0x591d1:
+RuinsOfAlphResearchCenterScientist3Script:
 	faceplayer
 	opentext
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x591df
-	writetext UnknownText_0x59311
+	ifequal NUM_UNOWN, .PrinterAvailable
+	writetext RuinsOfAlphResearchCenterScientist3Text
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x591df:
-	writetext UnknownText_0x5935f
+.PrinterAvailable:
+	writetext RuinsOfAlphResearchCenterScientist3_PrinterAvailable
 	waitbutton
 	closetext
 	end
 
-ScientistScript_0x591e5:
+RuinsOfAlphResearchCenterScientist1Script:
 	faceplayer
 	opentext
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x5920b
+	ifequal NUM_UNOWN, .GotAllUnown
 	checkflag ENGINE_UNOWN_DEX
-	iftrue UnknownScript_0x59205
+	iftrue .GotUnownDex
 	checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
-	iftrue UnknownScript_0x591ff
-	writetext UnknownText_0x593ed
+	iftrue .UnownAppeared
+	writetext RuinsOfAlphResearchCenterScientist1Text
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x591ff:
-	writetext UnknownText_0x59478
+.UnownAppeared:
+	writetext RuinsOfAlphResearchCenterScientist1Text_UnownAppeared
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x59205:
-	writetext UnknownText_0x59445
+.GotUnownDex:
+	writetext RuinsOfAlphResearchCenterScientist1Text_GotUnownDex
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5920b:
-	writetext UnknownText_0x594cb
+.GotAllUnown:
+	writetext RuinsOfAlphResearchCenterScientist1Text_GotAllUnown
 	waitbutton
 	closetext
 	clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
 	end
 
-ScientistScript_0x59214:
+RuinsOfAlphResearchCenterScientist2Script:
 	faceplayer
 	opentext
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x5922e
+	ifequal NUM_UNOWN, .GotAllUnown
 	checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
-	iftrue UnknownScript_0x59228
-	writetext UnknownText_0x5954f
+	iftrue .UnownAppeared
+	writetext RuinsOfAlphResearchCenterScientist2Text
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x59228:
-	writetext UnknownText_0x595cb
+.UnownAppeared:
+	writetext RuinsOfAlphResearchCenterScientist2Text_UnownAppeared
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x5922e:
-	writetext UnknownText_0x59769
+.GotAllUnown:
+	writetext RuinsOfAlphResearchCenterScientist2Text_GotAllUnown
 	waitbutton
 	closetext
 	end
 
-MapRuinsOfAlphResearchCenterSignpost1Script:
+RuinsOfAlphResearchCenterComputer:
 	opentext
 	checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
-	iftrue UnknownScript_0x59241
+	iftrue .SkipChecking
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x59247
-UnknownScript_0x59241:
-	writetext UnknownText_0x597b6
+	ifequal NUM_UNOWN, .GotAllUnown
+.SkipChecking:
+	writetext RuinsOfAlphResearchCenterComputerText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x59247:
-	writetext UnknownText_0x597d9
+.GotAllUnown:
+	writetext RuinsOfAlphResearchCenterComputerText_GotAllUnown
 	waitbutton
 	closetext
 	end
 
-MapRuinsOfAlphResearchCenterSignpost2Script:
+RuinsOfAlphResearchCenterPrinter:
 	opentext
 	checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
-	iftrue UnknownScript_0x5925a
+	iftrue .SkipChecking
 	checkcode VAR_UNOWNCOUNT
-	if_equal NUM_UNOWN, UnknownScript_0x59260
-UnknownScript_0x5925a:
-	writetext UnknownText_0x5980e
+	ifequal NUM_UNOWN, .PrinterAvailable
+.SkipChecking:
+	writetext RuinsOfAlphResearchCenterPrinterText_DoesntWork
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x59260:
-	writetext UnknownText_0x5982d
+.PrinterAvailable:
+	writetext RuinsOfAlphResearchCenterUnownPrinterText
 	waitbutton
-	special Special_UnownPrinter
+	special UnownPrinter
 	closetext
 	end
 
-UnreferencedScript_0x59269:
-	jumptext UnusedText_0x59848
+RuinsOfAlphResearchCenterPhoto:
+; unreferenced
+	jumptext RuinsOfAlphResearchCenterProfSilktreePhotoText
 
-MapRuinsOfAlphResearchCenterSignpost0Script:
-	jumptext UnknownText_0x59886
+RuinsOfAlphResearchCenterBookshelf:
+	jumptext RuinsOfAlphResearchCenterAcademicBooksText
 
 MovementData_0x5926f:
 	step UP
@@ -190,7 +189,7 @@ MovementData_0x59276:
 	step UP
 	step_end
 
-UnknownText_0x59278:
+RuinsOfAlphResearchCenterModifiedDexText:
 	text "Done!"
 
 	para "I modified your"
@@ -207,12 +206,12 @@ UnknownText_0x59278:
 	cont "they were caught."
 	done
 
-UnknownText_0x592fa:
+RuinsOfAlphResearchCenterDexUpgradedText:
 	text "<PLAYER>'s #DEX"
 	line "was upgraded."
 	done
 
-UnknownText_0x59311:
+RuinsOfAlphResearchCenterScientist3Text:
 	text "The UNOWN you"
 	line "catch will all be"
 	cont "recorded."
@@ -221,7 +220,7 @@ UnknownText_0x59311:
 	line "many kinds exist."
 	done
 
-UnknownText_0x5935f:
+RuinsOfAlphResearchCenterScientist3_PrinterAvailable:
 	text "You caught all the"
 	line "UNOWN variations?"
 
@@ -236,7 +235,7 @@ UnknownText_0x5935f:
 	line "it anytime."
 	done
 
-UnknownText_0x593ed:
+RuinsOfAlphResearchCenterScientist1Text:
 	text "The RUINS are"
 	line "about 1500 years"
 	cont "old."
@@ -246,13 +245,13 @@ UnknownText_0x593ed:
 	cont "built--or by whom."
 	done
 
-UnknownText_0x59445:
+RuinsOfAlphResearchCenterScientist1Text_GotUnownDex:
 	text "I wonder how many"
 	line "kinds of #MON"
 	cont "are in the RUINS?"
 	done
 
-UnknownText_0x59478:
+RuinsOfAlphResearchCenterScientist1Text_UnownAppeared:
 	text "#MON appeared"
 	line "in the RUINS?"
 
@@ -263,7 +262,7 @@ UnknownText_0x59478:
 	line "investigate this."
 	done
 
-UnknownText_0x594cb:
+RuinsOfAlphResearchCenterScientist1Text_GotAllUnown:
 	text "Our investigation,"
 	line "with your help, is"
 
@@ -277,7 +276,7 @@ UnknownText_0x594cb:
 	line "#MON."
 	done
 
-UnknownText_0x5954f:
+RuinsOfAlphResearchCenterScientist2Text:
 	text "There are odd pat-"
 	line "terns drawn on the"
 
@@ -290,7 +289,7 @@ UnknownText_0x5954f:
 	cont "of the RUINS."
 	done
 
-UnknownText_0x595cb:
+RuinsOfAlphResearchCenterScientist2Text_UnownAppeared:
 	text "The strange #-"
 	line "MON you saw in the"
 	cont "RUINS?"
@@ -308,8 +307,8 @@ UnknownText_0x595cb:
 	cont "kinds of them…"
 	done
 
+RuinsOfAlphResearchCenterUnusedText1:
 ; unused
-UnusedText_0x59669:
 	text "We think something"
 	line "caused the cryptic"
 
@@ -320,8 +319,8 @@ UnusedText_0x59669:
 	line "studies on that."
 	done
 
+RuinsOfAlphResearchCenterUnusedText2:
 ; unused
-UnusedText_0x596d3:
 	text "According to my"
 	line "research…"
 
@@ -338,7 +337,7 @@ UnusedText_0x596d3:
 	line "link…"
 	done
 
-UnknownText_0x59769:
+RuinsOfAlphResearchCenterScientist2Text_GotAllUnown:
 	text "Why did those"
 	line "ancient patterns"
 
@@ -349,14 +348,14 @@ UnknownText_0x59769:
 	line "deepens…"
 	done
 
-UnknownText_0x597b6:
+RuinsOfAlphResearchCenterComputerText:
 	text "RUINS OF ALPH"
 
 	para "Exploration"
 	line "Year 10"
 	done
 
-UnknownText_0x597d9:
+RuinsOfAlphResearchCenterComputerText_GotAllUnown:
 	text "Mystery #MON"
 	line "Name: UNOWN"
 
@@ -364,18 +363,18 @@ UnknownText_0x597d9:
 	line "kinds found."
 	done
 
-UnknownText_0x5980e:
+RuinsOfAlphResearchCenterPrinterText_DoesntWork:
 	text "This doesn't seem"
 	line "to work yet."
 	done
 
-UnknownText_0x5982d:
+RuinsOfAlphResearchCenterUnownPrinterText:
 	text "UNOWN may be"
 	line "printed out."
 	done
 
+RuinsOfAlphResearchCenterProfSilktreePhotoText:
 ; unused
-UnusedText_0x59848:
 	text "It's a photo of"
 	line "the RESEARCH"
 
@@ -383,7 +382,7 @@ UnusedText_0x59848:
 	line "PROF.SILKTREE."
 	done
 
-UnknownText_0x59886:
+RuinsOfAlphResearchCenterAcademicBooksText:
 	text "There are many"
 	line "academic books."
 
@@ -393,25 +392,20 @@ UnknownText_0x59886:
 	done
 
 RuinsOfAlphResearchCenter_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 6, RUINS_OF_ALPH_OUTSIDE
-	warp_def 3, 7, 6, RUINS_OF_ALPH_OUTSIDE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script
-	bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script
-	bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script
-
-.ObjectEvents:
-	db 3
-	object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1
-	object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1
-	object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, RUINS_OF_ALPH_OUTSIDE, 6
+	warp_event  3,  7, RUINS_OF_ALPH_OUTSIDE, 6
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  6,  5, BGEVENT_READ, RuinsOfAlphResearchCenterBookshelf
+	bg_event  3,  4, BGEVENT_READ, RuinsOfAlphResearchCenterComputer
+	bg_event  7,  1, BGEVENT_READ, RuinsOfAlphResearchCenterPrinter
+
+	db 3 ; object events
+	object_event  4,  5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist1Script, -1
+	object_event  5,  2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist2Script, -1
+	object_event  2,  5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist3Script, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm
index a96f55dea..32627af69 100644
--- a/maps/SafariZoneBeta.asm
+++ b/maps/SafariZoneBeta.asm
@@ -1,24 +1,17 @@
 SafariZoneBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SafariZoneBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA
-	warp_def 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA
+	db 2 ; warp events
+	warp_event  9, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 1
+	warp_event 10, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm
index 562775013..547ed5bd2 100644
--- a/maps/SafariZoneFuchsiaGateBeta.asm
+++ b/maps/SafariZoneFuchsiaGateBeta.asm
@@ -1,26 +1,19 @@
 SafariZoneFuchsiaGateBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SafariZoneFuchsiaGateBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 4, 0, 1, SAFARI_ZONE_BETA
-	warp_def 5, 0, 2, SAFARI_ZONE_BETA
-	warp_def 4, 7, 7, FUCHSIA_CITY
-	warp_def 5, 7, 7, FUCHSIA_CITY
+	db 4 ; warp events
+	warp_event  4,  0, SAFARI_ZONE_BETA, 1
+	warp_event  5,  0, SAFARI_ZONE_BETA, 2
+	warp_event  4,  7, FUCHSIA_CITY, 7
+	warp_event  5,  7, FUCHSIA_CITY, 7
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm
index 1ee13106f..270fc0267 100644
--- a/maps/SafariZoneMainOffice.asm
+++ b/maps/SafariZoneMainOffice.asm
@@ -1,24 +1,17 @@
 SafariZoneMainOffice_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SafariZoneMainOffice_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 2, FUCHSIA_CITY
-	warp_def 3, 7, 2, FUCHSIA_CITY
+	db 2 ; warp events
+	warp_event  2,  7, FUCHSIA_CITY, 2
+	warp_event  3,  7, FUCHSIA_CITY, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm
index e7295d594..41a2db11d 100644
--- a/maps/SafariZoneWardensHome.asm
+++ b/maps/SafariZoneWardensHome.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SAFARIZONEWARDENSHOME_LASS
 
 SafariZoneWardensHome_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WardensGranddaughter:
 	faceplayer
@@ -77,24 +75,19 @@ SafariZonePhotoText:
 	done
 
 SafariZoneWardensHome_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 6, FUCHSIA_CITY
-	warp_def 3, 7, 6, FUCHSIA_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 4
-	bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf
-	bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf
-	bg_event 7, 0, BGEVENT_READ, WardenPhoto
-	bg_event 9, 0, BGEVENT_READ, SafariZonePhoto
-
-.ObjectEvents:
-	db 1
-	object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, FUCHSIA_CITY, 6
+	warp_event  3,  7, FUCHSIA_CITY, 6
+
+	db 0 ; coord events
+
+	db 4 ; bg events
+	bg_event  0,  1, BGEVENT_READ, WardensHomeBookshelf
+	bg_event  1,  1, BGEVENT_READ, WardensHomeBookshelf
+	bg_event  7,  0, BGEVENT_READ, WardenPhoto
+	bg_event  9,  0, BGEVENT_READ, SafariZonePhoto
+
+	db 1 ; object events
+	object_event  2,  4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index d4c470571..5ea760c88 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SAFFRONCITY_LASS1
 	const SAFFRONCITY_POKEFAN_M
 	const SAFFRONCITY_COOLTRAINER_M
@@ -9,45 +9,43 @@ const_value set 2
 	const SAFFRONCITY_LASS2
 
 SaffronCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_SAFFRON
 	return
 
-LassScript_0x19932a:
+SaffronCityLass1Script:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x199338
-	writetext UnknownText_0x19938d
+	iftrue .ReturnedMachinePart
+	writetext SaffronCityLass1Text
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x199338:
-	writetext UnknownText_0x19940d
+.ReturnedMachinePart:
+	writetext SaffronCityLass1Text_ReturnedMachinePart
 	waitbutton
 	closetext
 	end
 
-PokefanMScript_0x19933e:
+SaffronCityPokefanMScript:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x19934c
-	writetext UnknownText_0x199460
+	iftrue .ReturnedMachinePart
+	writetext SaffronCityPokefanMText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x19934c:
-	writetext UnknownText_0x1994ae
+.ReturnedMachinePart:
+	writetext SaffronCityPokefanMText_ReturnedMachinePart
 	waitbutton
 	closetext
 	end
@@ -58,18 +56,18 @@ SaffronCityCooltrainerMScript:
 SaffronCityCooltrainerFScript:
 	jumptextfaceplayer SaffronCityCooltrainerFText
 
-FisherScript_0x199358:
+SaffronCityFisherScript:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x199366
-	writetext UnknownText_0x1995fc
+	iftrue .ReturnedMachinePart
+	writetext SaffronCityFisherText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x199366:
-	writetext UnknownText_0x19964b
+.ReturnedMachinePart:
+	writetext SaffronCityFisherText_ReturnedMachinePart
 	waitbutton
 	closetext
 	end
@@ -80,8 +78,8 @@ SaffronCityYoungster1Script:
 SaffronCityYoungster2Script:
 	jumptextfaceplayer SaffronCityYoungster2Text
 
-SaffronCityLassScript:
-	jumptextfaceplayer SaffronCityLassText
+SaffronCityLass2Script:
+	jumptextfaceplayer SaffronCityLass2Text
 
 SaffronCitySign:
 	jumptext SaffronCitySignText
@@ -107,7 +105,7 @@ SaffronCityPokecenterSign:
 SaffronCityMartSign:
 	jumpstd martsign
 
-UnknownText_0x19938d:
+SaffronCityLass1Text:
 	text "A little girl who"
 	line "is an expert at"
 
@@ -121,7 +119,7 @@ UnknownText_0x19938d:
 	line "It's confusing."
 	done
 
-UnknownText_0x19940d:
+SaffronCityLass1Text_ReturnedMachinePart:
 	text "The COPYCAT girl"
 	line "looked unhappy."
 
@@ -130,7 +128,7 @@ UnknownText_0x19940d:
 	cont "DOLL--CLEFAIRY."
 	done
 
-UnknownText_0x199460:
+SaffronCityPokefanMText:
 	text "You came out from"
 	line "JOHTO?"
 
@@ -139,7 +137,7 @@ UnknownText_0x199460:
 	cont "TRAIN's running."
 	done
 
-UnknownText_0x1994ae:
+SaffronCityPokefanMText_ReturnedMachinePart:
 	text "You came out from"
 	line "JOHTO?"
 
@@ -175,7 +173,7 @@ SaffronCityCooltrainerFText:
 	line "that."
 	done
 
-UnknownText_0x1995fc:
+SaffronCityFisherText:
 	text "Chew… Chew…"
 
 	para "I hear there's big"
@@ -185,7 +183,7 @@ UnknownText_0x1995fc:
 	para "Chew… Chew…"
 	done
 
-UnknownText_0x19964b:
+SaffronCityFisherText_ReturnedMachinePart:
 	text "Chew… Chew…"
 
 	para "I hear there was"
@@ -215,7 +213,7 @@ SaffronCityYoungster2Text:
 	line "over the place."
 	done
 
-SaffronCityLassText:
+SaffronCityLass2Text:
 	text "Our city was"
 	line "featured on a"
 	cont "radio program."
@@ -266,48 +264,43 @@ SaffronCityMagnetTrainStationSignText:
 	done
 
 SaffronCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 15
-	warp_def 26, 3, 1, FIGHTING_DOJO
-	warp_def 34, 3, 1, SAFFRON_GYM
-	warp_def 25, 11, 2, SAFFRON_MART
-	warp_def 9, 29, 1, SAFFRON_POKECENTER_1F
-	warp_def 27, 29, 1, MR_PSYCHICS_HOUSE
-	warp_def 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION
-	warp_def 18, 21, 1, SILPH_CO_1F
-	warp_def 9, 11, 1, COPYCATS_HOUSE_1F
-	warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE
-	warp_def 0, 24, 3, ROUTE_7_SAFFRON_GATE
-	warp_def 0, 25, 4, ROUTE_7_SAFFRON_GATE
-	warp_def 16, 33, 1, ROUTE_6_SAFFRON_GATE
-	warp_def 17, 33, 2, ROUTE_6_SAFFRON_GATE
-	warp_def 39, 22, 1, ROUTE_8_SAFFRON_GATE
-	warp_def 39, 23, 2, ROUTE_8_SAFFRON_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 8
-	bg_event 21, 5, BGEVENT_READ, SaffronCitySign
-	bg_event 33, 5, BGEVENT_READ, SaffronGymSign
-	bg_event 25, 5, BGEVENT_READ, FightingDojoSign
+	db 0, 0 ; filler
+
+	db 15 ; warp events
+	warp_event 26,  3, FIGHTING_DOJO, 1
+	warp_event 34,  3, SAFFRON_GYM, 1
+	warp_event 25, 11, SAFFRON_MART, 2
+	warp_event  9, 29, SAFFRON_POKECENTER_1F, 1
+	warp_event 27, 29, MR_PSYCHICS_HOUSE, 1
+	warp_event  8,  3, SAFFRON_MAGNET_TRAIN_STATION, 2
+	warp_event 18, 21, SILPH_CO_1F, 1
+	warp_event  9, 11, COPYCATS_HOUSE_1F, 1
+	warp_event 18,  3, ROUTE_5_SAFFRON_GATE, 3
+	warp_event  0, 24, ROUTE_7_SAFFRON_GATE, 3
+	warp_event  0, 25, ROUTE_7_SAFFRON_GATE, 4
+	warp_event 16, 33, ROUTE_6_SAFFRON_GATE, 1
+	warp_event 17, 33, ROUTE_6_SAFFRON_GATE, 2
+	warp_event 39, 22, ROUTE_8_SAFFRON_GATE, 1
+	warp_event 39, 23, ROUTE_8_SAFFRON_GATE, 2
+
+	db 0 ; coord events
+
+	db 8 ; bg events
+	bg_event 21,  5, BGEVENT_READ, SaffronCitySign
+	bg_event 33,  5, BGEVENT_READ, SaffronGymSign
+	bg_event 25,  5, BGEVENT_READ, FightingDojoSign
 	bg_event 15, 21, BGEVENT_READ, SilphCoSign
 	bg_event 25, 29, BGEVENT_READ, MrPsychicsHouseSign
-	bg_event 11, 5, BGEVENT_READ, SaffronCityMagnetTrainStationSign
+	bg_event 11,  5, BGEVENT_READ, SaffronCityMagnetTrainStationSign
 	bg_event 10, 29, BGEVENT_READ, SaffronCityPokecenterSign
 	bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign
 
-.ObjectEvents:
-	db 8
-	object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1
-	object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1
-	object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1
+	db 8 ; object events
+	object_event  7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityLass1Script, -1
+	object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronCityPokefanMScript, -1
+	object_event 32,  7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1
 	object_event 20, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1
-	object_event 27, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x199358, -1
+	object_event 27, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityFisherScript, -1
 	object_event 15, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1
 	object_event 35, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1
-	object_event 19, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1
+	object_event 19,  8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLass2Script, -1
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm
index a2ba7497d..c495d1104 100644
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SAFFRONGYM_SABRINA
 	const SAFFRONGYM_GRANNY1
 	const SAFFRONGYM_YOUNGSTER1
@@ -7,13 +7,11 @@ const_value set 2
 	const SAFFRONGYM_GYM_GUY
 
 SaffronGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-SabrinaScript_0x189c2e:
+SaffronGymSabrinaScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_MARSHBADGE
@@ -47,10 +45,10 @@ SabrinaScript_0x189c2e:
 	end
 
 TrainerMediumRebecca:
-	trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script
+	trainer MEDIUM, REBECCA, EVENT_BEAT_MEDIUM_REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext MediumRebeccaAfterBattleText
 	waitbutton
@@ -58,10 +56,10 @@ TrainerMediumRebecca:
 	end
 
 TrainerPsychicFranklin:
-	trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script
+	trainer PSYCHIC_T, FRANKLIN, EVENT_BEAT_PSYCHIC_FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicFranklinAfterBattleText
 	waitbutton
@@ -69,10 +67,10 @@ TrainerPsychicFranklin:
 	end
 
 TrainerMediumDoris:
-	trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script
+	trainer MEDIUM, DORIS, EVENT_BEAT_MEDIUM_DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext MediumDorisAfterBattleText
 	waitbutton
@@ -80,10 +78,10 @@ TrainerMediumDoris:
 	end
 
 TrainerPsychicJared:
-	trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script
+	trainer PSYCHIC_T, JARED, EVENT_BEAT_PSYCHIC_JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PsychicJaredAfterBattleText
 	waitbutton
@@ -291,56 +289,51 @@ SaffronGymGuyWinText:
 	done
 
 SaffronGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 32
-	warp_def 8, 17, 2, SAFFRON_CITY
-	warp_def 9, 17, 2, SAFFRON_CITY
-	warp_def 11, 15, 18, SAFFRON_GYM
-	warp_def 19, 15, 19, SAFFRON_GYM
-	warp_def 19, 11, 20, SAFFRON_GYM
-	warp_def 1, 11, 21, SAFFRON_GYM
-	warp_def 5, 3, 22, SAFFRON_GYM
-	warp_def 11, 5, 23, SAFFRON_GYM
-	warp_def 1, 15, 24, SAFFRON_GYM
-	warp_def 19, 3, 25, SAFFRON_GYM
-	warp_def 15, 17, 26, SAFFRON_GYM
-	warp_def 5, 17, 27, SAFFRON_GYM
-	warp_def 5, 9, 28, SAFFRON_GYM
-	warp_def 9, 3, 29, SAFFRON_GYM
-	warp_def 15, 9, 30, SAFFRON_GYM
-	warp_def 15, 5, 31, SAFFRON_GYM
-	warp_def 1, 5, 32, SAFFRON_GYM
-	warp_def 19, 17, 3, SAFFRON_GYM
-	warp_def 19, 9, 4, SAFFRON_GYM
-	warp_def 1, 9, 5, SAFFRON_GYM
-	warp_def 5, 5, 6, SAFFRON_GYM
-	warp_def 11, 3, 7, SAFFRON_GYM
-	warp_def 1, 17, 8, SAFFRON_GYM
-	warp_def 19, 5, 9, SAFFRON_GYM
-	warp_def 15, 15, 10, SAFFRON_GYM
-	warp_def 5, 15, 11, SAFFRON_GYM
-	warp_def 5, 11, 12, SAFFRON_GYM
-	warp_def 9, 5, 13, SAFFRON_GYM
-	warp_def 15, 11, 14, SAFFRON_GYM
-	warp_def 15, 3, 15, SAFFRON_GYM
-	warp_def 1, 3, 16, SAFFRON_GYM
-	warp_def 11, 9, 17, SAFFRON_GYM
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 8, 15, BGEVENT_READ, SaffronGymStatue
-
-.ObjectEvents:
-	db 6
-	object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1
+	db 0, 0 ; filler
+
+	db 32 ; warp events
+	warp_event  8, 17, SAFFRON_CITY, 2
+	warp_event  9, 17, SAFFRON_CITY, 2
+	warp_event 11, 15, SAFFRON_GYM, 18
+	warp_event 19, 15, SAFFRON_GYM, 19
+	warp_event 19, 11, SAFFRON_GYM, 20
+	warp_event  1, 11, SAFFRON_GYM, 21
+	warp_event  5,  3, SAFFRON_GYM, 22
+	warp_event 11,  5, SAFFRON_GYM, 23
+	warp_event  1, 15, SAFFRON_GYM, 24
+	warp_event 19,  3, SAFFRON_GYM, 25
+	warp_event 15, 17, SAFFRON_GYM, 26
+	warp_event  5, 17, SAFFRON_GYM, 27
+	warp_event  5,  9, SAFFRON_GYM, 28
+	warp_event  9,  3, SAFFRON_GYM, 29
+	warp_event 15,  9, SAFFRON_GYM, 30
+	warp_event 15,  5, SAFFRON_GYM, 31
+	warp_event  1,  5, SAFFRON_GYM, 32
+	warp_event 19, 17, SAFFRON_GYM, 3
+	warp_event 19,  9, SAFFRON_GYM, 4
+	warp_event  1,  9, SAFFRON_GYM, 5
+	warp_event  5,  5, SAFFRON_GYM, 6
+	warp_event 11,  3, SAFFRON_GYM, 7
+	warp_event  1, 17, SAFFRON_GYM, 8
+	warp_event 19,  5, SAFFRON_GYM, 9
+	warp_event 15, 15, SAFFRON_GYM, 10
+	warp_event  5, 15, SAFFRON_GYM, 11
+	warp_event  5, 11, SAFFRON_GYM, 12
+	warp_event  9,  5, SAFFRON_GYM, 13
+	warp_event 15, 11, SAFFRON_GYM, 14
+	warp_event 15,  3, SAFFRON_GYM, 15
+	warp_event  1,  3, SAFFRON_GYM, 16
+	warp_event 11,  9, SAFFRON_GYM, 17
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event  8, 15, BGEVENT_READ, SaffronGymStatue
+
+	db 6 ; object events
+	object_event  9,  8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronGymSabrinaScript, -1
 	object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1
-	object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
-	object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1
-	object_event 17, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1
-	object_event 9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1
+	object_event  3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
+	object_event  3,  4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1
+	object_event 17,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1
+	object_event  9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm
index 0d69d2017..fe8af17ed 100644
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -1,21 +1,19 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SAFFRONMAGNETTRAINSTATION_OFFICER
 	const SAFFRONMAGNETTRAINSTATION_GYM_GUY
 	const SAFFRONMAGNETTRAINSTATION_TEACHER
 	const SAFFRONMAGNETTRAINSTATION_LASS
 
 SaffronMagnetTrainStation_MapScripts:
-.SceneScripts:
-	db 1
-	scene_script .DummyScene
+	db 1 ; scene scripts
+	scene_script .DummyScene ; SCENE_DEFAULT
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
 
-OfficerScript_0x18a81e:
+SaffronMagnetTrainStationOfficerScript:
 	faceplayer
 	opentext
 	checkevent EVENT_RESTORED_POWER_TO_KANTO
@@ -37,7 +35,7 @@ OfficerScript_0x18a81e:
 	applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f
 	applymovement PLAYER, MovementData_0x18a898
 	writebyte TRUE
-	special Special_MagnetTrain
+	special MagnetTrain
 	warpcheck
 	newloadmap MAPSETUP_TRAIN
 	applymovement PLAYER, .MovementBoardTheTrain
@@ -70,18 +68,18 @@ Script_ArriveFromGoldenrod:
 	closetext
 	end
 
-GymGuyScript_0x18a875:
+SaffronMagnetTrainStationGymGuyScript:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
-	iftrue UnknownScript_0x18a883
-	writetext UnknownText_0x18a9ca
+	iftrue .ReturnedMachinePart
+	writetext SaffronMagnetTrainStationGymGuyText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x18a883:
-	writetext UnknownText_0x18aa61
+.ReturnedMachinePart:
+	writetext SaffronMagnetTrainStationGymGuyText_ReturnedMachinePart
 	waitbutton
 	closetext
 	end
@@ -166,7 +164,7 @@ UnknownText_0x18a993:
 	line "again."
 	done
 
-UnknownText_0x18a9ca:
+SaffronMagnetTrainStationGymGuyText:
 	text "The MAGNET TRAIN"
 	line "is a super-modern"
 
@@ -182,7 +180,7 @@ UnknownText_0x18a9ca:
 	cont "tricity…"
 	done
 
-UnknownText_0x18aa61:
+SaffronMagnetTrainStationGymGuyText_ReturnedMachinePart:
 	text "Whew…"
 
 	para "How many times"
@@ -216,26 +214,21 @@ SaffronMagnetTrainStationLassText:
 	done
 
 SaffronMagnetTrainStation_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 8, 17, 6, SAFFRON_CITY
-	warp_def 9, 17, 6, SAFFRON_CITY
-	warp_def 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION
-	warp_def 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION
-
-.CoordEvents:
-	db 1
-	coord_event 11, 6, 0, Script_ArriveFromGoldenrod
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
-	object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1
-	object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
-	object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  8, 17, SAFFRON_CITY, 6
+	warp_event  9, 17, SAFFRON_CITY, 6
+	warp_event  6,  5, GOLDENROD_MAGNET_TRAIN_STATION, 4
+	warp_event 11,  5, GOLDENROD_MAGNET_TRAIN_STATION, 3
+
+	db 1 ; coord events
+	coord_event 11,  6, SCENE_DEFAULT, Script_ArriveFromGoldenrod
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  9,  9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationOfficerScript, -1
+	object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationGymGuyScript, -1
+	object_event  6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
+	object_event  6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
index d7619320c..55e078d89 100644
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SAFFRONMART_CLERK
 	const SAFFRONMART_COOLTRAINER_M
 	const SAFFRONMART_COOLTRAINER_F
 
 SaffronMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x18a3bf:
+SaffronMartClerkScript:
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_SAFFRON
 	closetext
@@ -38,22 +36,17 @@ SaffronMartCooltrainerFText:
 	done
 
 SaffronMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 3, SAFFRON_CITY
-	warp_def 3, 7, 3, SAFFRON_CITY
+	db 2 ; warp events
+	warp_event  2,  7, SAFFRON_CITY, 3
+	warp_event  3,  7, SAFFRON_CITY, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1
-	object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1
-	object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMartClerkScript, -1
+	object_event  7,  2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1
+	object_event  7,  6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1
diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm
index d53fdb684..960f9f9be 100644
--- a/maps/SaffronPokecenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -1,28 +1,26 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SAFFRONPOKECENTER1F_NURSE
 	const SAFFRONPOKECENTER1F_TEACHER
 	const SAFFRONPOKECENTER1F_FISHER
 	const SAFFRONPOKECENTER1F_YOUNGSTER
 
 SaffronPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x18a47d:
+SaffronPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
-TeacherScript_0x18a480:
-	special Special_Mobile_DummyReturnFalse
+SaffronPokecenter1FTeacherScript:
+	special Mobile_DummyReturnFalse
 	iftrue .mobile
 	jumptextfaceplayer UnknownText_0x18a4a3
 
 .mobile
 	jumptextfaceplayer UnknownText_0x18a532
 
-FisherScript_0x18a48c:
+SaffronPokecenter1FFisherScript:
 	faceplayer
 	opentext
 	checkevent EVENT_RETURNED_MACHINE_PART
@@ -112,24 +110,19 @@ SaffronPokecenter1FYoungsterText:
 	done
 
 SaffronPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 4, SAFFRON_CITY
-	warp_def 4, 7, 4, SAFFRON_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1
-	object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1
-	object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1
-	object_event 1, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, SAFFRON_CITY, 4
+	warp_event  4,  7, SAFFRON_CITY, 4
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FNurseScript, -1
+	object_event  7,  2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FTeacherScript, -1
+	object_event  8,  6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FFisherScript, -1
+	object_event  1,  4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1
diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm
index ebc2bb6c8..912f1281a 100644
--- a/maps/SaffronPokecenter2FBeta.asm
+++ b/maps/SaffronPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 SaffronPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SaffronPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 0, 7, 3, SAFFRON_POKECENTER_1F
+	db 1 ; warp events
+	warp_event  0,  7, SAFFRON_POKECENTER_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm
index 885d04c60..fece1933d 100644
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -1,19 +1,17 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SEAFOAMGYM_BLAINE
 	const SEAFOAMGYM_GYM_GUY
 
 SeafoamGym_MapScripts:
-.SceneScripts:
-	db 1
+	db 1 ; scene scripts
 	scene_script .DummyScene
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
 
-BlaineScript_0x1ab4fb:
+SeafoamGymBlaineScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_VOLCANOBADGE
@@ -158,20 +156,15 @@ SeafoamGymGuyWinText2:
 	done
 
 SeafoamGym_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 5, 5, 1, ROUTE_20
+	db 1 ; warp events
+	warp_event  5,  5, ROUTE_20, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1
-	object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
+	db 2 ; object events
+	object_event  5,  2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SeafoamGymBlaineScript, -1
+	object_event  6,  5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm
index 83c75ef6c..d14f19b23 100644
--- a/maps/SilphCo1F.asm
+++ b/maps/SilphCo1F.asm
@@ -1,31 +1,29 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SILPHCO1F_RECEPTIONIST
 	const SILPHCO1F_OFFICER
 
 SilphCo1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-SilphCoReceptionist:
+SilphCoReceptionistScript:
 	jumptextfaceplayer SilphCoReceptionistText
 
-OfficerScript_0x18abe8:
+SilphCoOfficerScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_UP_GRADE
-	iftrue UnknownScript_0x18abfd
-	writetext UnknownText_0x18ac36
+	iftrue .GotUpGrade
+	writetext SilphCoOfficerText
 	buttonsound
 	verbosegiveitem UP_GRADE
-	iffalse UnknownScript_0x18ac01
+	iffalse .NoRoom
 	setevent EVENT_GOT_UP_GRADE
-UnknownScript_0x18abfd:
-	writetext UnknownText_0x18aca8
+.GotUpGrade:
+	writetext SilphCoOfficerText_GotUpGrade
 	waitbutton
-UnknownScript_0x18ac01:
+.NoRoom:
 	closetext
 	end
 
@@ -35,7 +33,7 @@ SilphCoReceptionistText:
 	cont "OFFICE BUILDING."
 	done
 
-UnknownText_0x18ac36:
+SilphCoOfficerText:
 	text "Only employees are"
 	line "permitted to go"
 	cont "upstairs."
@@ -47,7 +45,7 @@ UnknownText_0x18ac36:
 	line "little souvenir."
 	done
 
-UnknownText_0x18aca8:
+SilphCoOfficerText_GotUpGrade:
 	text "It's SILPH CO.'s"
 	line "latest product."
 
@@ -56,21 +54,16 @@ UnknownText_0x18aca8:
 	done
 
 SilphCo1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 7, SAFFRON_CITY
-	warp_def 3, 7, 7, SAFFRON_CITY
+	db 2 ; warp events
+	warp_event  2,  7, SAFFRON_CITY, 7
+	warp_event  3,  7, SAFFRON_CITY, 7
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1
-	object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1
+	db 2 ; object events
+	object_event  4,  2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionistScript, -1
+	object_event 13,  1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoOfficerScript, -1
diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm
index d218da44c..e2f48638d 100644
--- a/maps/SilverCaveItemRooms.asm
+++ b/maps/SilverCaveItemRooms.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SILVERCAVEITEMROOMS_POKE_BALL1
 	const SILVERCAVEITEMROOMS_POKE_BALL2
 
 SilverCaveItemRooms_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SilverCaveItemRoomsMaxRevive:
 	itemball MAX_REVIVE
@@ -16,21 +14,16 @@ SilverCaveItemRoomsFullRestore:
 	itemball FULL_RESTORE
 
 SilverCaveItemRooms_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 13, 3, 3, SILVER_CAVE_ROOM_2
-	warp_def 7, 15, 4, SILVER_CAVE_ROOM_2
+	db 2 ; warp events
+	warp_event 13,  3, SILVER_CAVE_ROOM_2, 3
+	warp_event  7, 15, SILVER_CAVE_ROOM_2, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
-	object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
+	db 2 ; object events
+	object_event  6,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE
+	object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE
diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm
index 3e51cf7b2..fea256208 100644
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -1,9 +1,7 @@
 SilverCaveOutside_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -17,29 +15,24 @@ MtSilverSign:
 	jumptext MtSilverSignText
 
 SilverCaveOutsideHiddenFullRestore:
-	hiddenitem EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
+	hiddenitem FULL_RESTORE, EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE
 
 MtSilverSignText:
 	text "MT.SILVER"
 	done
 
 SilverCaveOutside_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 23, 19, 1, SILVER_CAVE_POKECENTER_1F
-	warp_def 18, 11, 1, SILVER_CAVE_ROOM_1
+	db 2 ; warp events
+	warp_event 23, 19, SILVER_CAVE_POKECENTER_1F, 1
+	warp_event 18, 11, SILVER_CAVE_ROOM_1, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 3
+	db 3 ; bg events
 	bg_event 24, 19, BGEVENT_READ, MtSilverPokecenterSign
 	bg_event 17, 13, BGEVENT_READ, MtSilverSign
-	bg_event 9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore
+	bg_event  9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm
index 76b1e744f..7c293a36b 100644
--- a/maps/SilverCavePokecenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SILVERCAVEPOKECENTER1F_NURSE
 	const SILVERCAVEPOKECENTER1F_GRANNY
 
 SilverCavePokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x1ae59a:
+SilverCavePokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
 SilverCavePokecenter1FGrannyScript:
@@ -30,22 +28,17 @@ SilverCavePokecenter1FGrannyText:
 	done
 
 SilverCavePokecenter1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 3, 7, 1, SILVER_CAVE_OUTSIDE
-	warp_def 4, 7, 1, SILVER_CAVE_OUTSIDE
-	warp_def 0, 7, 1, POKECENTER_2F
+	db 3 ; warp events
+	warp_event  3,  7, SILVER_CAVE_OUTSIDE, 1
+	warp_event  4,  7, SILVER_CAVE_OUTSIDE, 1
+	warp_event  0,  7, POKECENTER_2F, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1
-	object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1
+	db 2 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FNurseScript, -1
+	object_event  1,  5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
index fd04a1a6d..1fe5df55d 100644
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SILVERCAVEROOM1_POKE_BALL1
 	const SILVERCAVEROOM1_POKE_BALL2
 	const SILVERCAVEROOM1_POKE_BALL3
 	const SILVERCAVEROOM1_POKE_BALL4
 
 SilverCaveRoom1_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SilverCaveRoom1MaxElixer:
 	itemball MAX_ELIXER
@@ -24,31 +22,26 @@ SilverCaveRoom1UltraBall:
 	itemball ULTRA_BALL
 
 SilverCaveRoom1HiddenDireHit:
-	hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT
+	hiddenitem DIRE_HIT, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT
 
 SilverCaveRoom1HiddenUltraBall:
-	hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL
+	hiddenitem ULTRA_BALL, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL
 
 SilverCaveRoom1_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 9, 33, 2, SILVER_CAVE_OUTSIDE
-	warp_def 15, 1, 1, SILVER_CAVE_ROOM_2
+	db 2 ; warp events
+	warp_event  9, 33, SILVER_CAVE_OUTSIDE, 2
+	warp_event 15,  1, SILVER_CAVE_ROOM_2, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 16, 23, BGEVENT_ITEM, SilverCaveRoom1HiddenDireHit
 	bg_event 17, 12, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall
 
-.ObjectEvents:
-	db 4
-	object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
-	object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
-	object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
-	object_event 7, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
+	db 4 ; object events
+	object_event  4,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER
+	object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN
+	object_event  5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE
+	object_event  7, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
index eb6b9fd69..7a7f9250d 100644
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SILVERCAVEROOM2_POKE_BALL1
 	const SILVERCAVEROOM2_POKE_BALL2
 	const SILVERCAVEROOM2_POKE_BALL3
 
 SilverCaveRoom2_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SilverCaveRoom2Calcium:
 	itemball CALCIUM
@@ -20,28 +18,23 @@ SilverCaveRoom2PPUp:
 	itemball PP_UP
 
 SilverCaveRoom2HiddenMaxPotion:
-	hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION
 
 SilverCaveRoom2_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 17, 31, 2, SILVER_CAVE_ROOM_1
-	warp_def 11, 5, 1, SILVER_CAVE_ROOM_3
-	warp_def 13, 21, 1, SILVER_CAVE_ITEM_ROOMS
-	warp_def 23, 3, 2, SILVER_CAVE_ITEM_ROOMS
+	db 4 ; warp events
+	warp_event 17, 31, SILVER_CAVE_ROOM_1, 2
+	warp_event 11,  5, SILVER_CAVE_ROOM_3, 1
+	warp_event 13, 21, SILVER_CAVE_ITEM_ROOMS, 1
+	warp_event 23,  3, SILVER_CAVE_ITEM_ROOMS, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion
 
-.ObjectEvents:
-	db 3
-	object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
-	object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
-	object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP
+	db 3 ; object events
+	object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM
+	object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
+	object_event  4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP
diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
index 705ca0cc1..3efd76434 100644
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SILVERCAVEROOM3_RED
 
 SilverCaveRoom3_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 Red:
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	faceplayer
 	opentext
 	writetext .Text1
@@ -20,16 +18,16 @@ Red:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	opentext
 	writetext .Text3
 	waitbutton
 	closetext
-	special Special_FadeBlackQuickly
+	special FadeBlackQuickly
 	special ReloadSpritesNoPalettes
 	disappear SILVERCAVEROOM3_RED
 	pause 15
-	special Special_FadeInQuickly
+	special FadeInQuickly
 	pause 30
 	special HealParty
 	refreshscreen
@@ -51,19 +49,14 @@ Red:
 	done
 
 SilverCaveRoom3_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 9, 33, 2, SILVER_CAVE_ROOM_2
+	db 1 ; warp events
+	warp_event  9, 33, SILVER_CAVE_ROOM_2, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER
+	db 1 ; object events
+	object_event  9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 4937a259f..e1af3bfcf 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SLOWPOKEWELLB1F_ROCKET1
 	const SLOWPOKEWELLB1F_ROCKET2
 	const SLOWPOKEWELLB1F_ROCKET3
@@ -10,20 +10,18 @@ const_value set 2
 	const SLOWPOKEWELLB1F_POKE_BALL
 
 SlowpokeWellB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SlowpokeWellB1FKurtScript:
 	jumptextfaceplayer SlowpokeWellB1FKurtText
 
 TrainerGruntM29:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_29, EVENT_BEAT_ROCKET_GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM29AfterBattleText
 	waitbutton
@@ -31,33 +29,33 @@ TrainerGruntM29:
 	end
 
 TrainerGruntM1:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_1, EVENT_BEAT_ROCKET_GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script
 
 .Script:
 	opentext
 	writetext TrainerGruntM1WhenTalkText
 	waitbutton
 	closetext
-	special Special_FadeBlackQuickly
+	special FadeBlackQuickly
 	special ReloadSpritesNoPalettes
 	disappear SLOWPOKEWELLB1F_ROCKET1
 	disappear SLOWPOKEWELLB1F_ROCKET2
 	disappear SLOWPOKEWELLB1F_ROCKET3
 	disappear SLOWPOKEWELLB1F_ROCKET_GIRL
 	pause 15
-	special Special_FadeInQuickly
+	special FadeInQuickly
 	disappear SLOWPOKEWELLB1F_KURT
 	moveobject SLOWPOKEWELLB1F_KURT, 11, 6
 	appear SLOWPOKEWELLB1F_KURT
 	applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext KurtLeaveSlowpokeWellText
 	waitbutton
 	closetext
 	setevent EVENT_CLEARED_SLOWPOKE_WELL
 	variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER
-	setmapscene AZALEA_TOWN, 1
+	setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_RIVAL_BATTLE
 	clearevent EVENT_ILEX_FOREST_APPRENTICE
 	clearevent EVENT_ILEX_FOREST_FARFETCHD
 	setevent EVENT_CHARCOAL_KILN_FARFETCH_D
@@ -67,17 +65,17 @@ TrainerGruntM1:
 	clearevent EVENT_AZALEA_TOWN_SLOWPOKES
 	clearevent EVENT_KURTS_HOUSE_SLOWPOKE
 	clearevent EVENT_KURTS_HOUSE_KURT_1
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	special HealParty
 	pause 15
 	warp KURTS_HOUSE, 3, 3
 	end
 
 TrainerGruntM2:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_2, EVENT_BEAT_ROCKET_GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM2AfterBattleText
 	waitbutton
@@ -85,10 +83,10 @@ TrainerGruntM2:
 	end
 
 TrainerGruntF1:
-	trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script
+	trainer GRUNTF, GRUNTF_1, EVENT_BEAT_ROCKET_GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntF1AfterBattleText
 	waitbutton
@@ -321,28 +319,23 @@ SlowpokeWellB1FTaillessSlowpokeText:
 	done
 
 SlowpokeWellB1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 17, 15, 6, AZALEA_TOWN
-	warp_def 7, 11, 1, SLOWPOKE_WELL_B2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 9
-	object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 10, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS
-	object_event 7, 4, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
-	object_event 6, 2, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event 17, 15, AZALEA_TOWN, 6
+	warp_event  7, 11, SLOWPOKE_WELL_B2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 9 ; object events
+	object_event 15,  7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event  5,  2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event  5,  6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event 10,  4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS
+	object_event  7,  4, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
+	object_event  6,  2, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES
 	object_event 16, 14, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT
-	object_event 3, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1
-	object_event 10, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
+	object_event  3,  2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1
+	object_event 10,  3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION
diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
index c8559cc9c..3098815e2 100644
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -1,20 +1,18 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SLOWPOKEWELLB2F_GYM_GUY
 	const SLOWPOKEWELLB2F_POKE_BALL
 
 SlowpokeWellB2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-GymGuyScript_0x5ad0b:
+SlowpokeWellB2FGymGuyScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
 	iftrue .GotKingsRock
-	writetext UnknownText_0x5ad2a
+	writetext SlowpokeWellB2FGymGuyText
 	buttonsound
 	verbosegiveitem KINGS_ROCK
 	iffalse .NoRoom
@@ -24,7 +22,7 @@ GymGuyScript_0x5ad0b:
 	end
 
 .GotKingsRock:
-	writetext UnknownText_0x5adf2
+	writetext SlowpokeWellB2FGymGuyText_GotKingsRock
 	waitbutton
 	closetext
 	end
@@ -32,7 +30,7 @@ GymGuyScript_0x5ad0b:
 SlowpokeWellB2FTMRainDance:
 	itemball TM_RAIN_DANCE
 
-UnknownText_0x5ad2a:
+SlowpokeWellB2FGymGuyText:
 	text "I'm waiting to see"
 	line "SLOWPOKE's moment"
 	cont "of evolution."
@@ -52,7 +50,7 @@ UnknownText_0x5ad2a:
 	cont "you."
 	done
 
-UnknownText_0x5adf2:
+SlowpokeWellB2FGymGuyText_GotKingsRock:
 	text "I'm going to be"
 	line "like SLOWPOKE."
 
@@ -62,20 +60,15 @@ UnknownText_0x5adf2:
 	done
 
 SlowpokeWellB2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 9, 11, 2, SLOWPOKE_WELL_B1F
+	db 1 ; warp events
+	warp_event  9, 11, SLOWPOKE_WELL_B1F, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
-	object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
+	db 2 ; object events
+	object_event  5,  4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, SlowpokeWellB2FGymGuyScript, -1
+	object_event 15,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm
index 15ac8e2b3..8c6a86128 100644
--- a/maps/SoulHouse.asm
+++ b/maps/SoulHouse.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SOULHOUSE_MRFUJI
 	const SOULHOUSE_TEACHER
 	const SOULHOUSE_LASS
 	const SOULHOUSE_GRANNY
 
 SoulHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 MrFuji:
 	jumptextfaceplayer MrFujiText
@@ -73,23 +71,18 @@ SoulHouseGrannyText:
 	done
 
 SoulHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 7, 6, LAVENDER_TOWN
-	warp_def 5, 7, 6, LAVENDER_TOWN
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1
-	object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1
-	object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1
-	object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4,  7, LAVENDER_TOWN, 6
+	warp_event  5,  7, LAVENDER_TOWN, 6
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  4,  2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1
+	object_event  7,  3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1
+	object_event  2,  5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1
+	object_event  1,  3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1
diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm
index 3f9887fe2..128eac3dc 100644
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SPROUTTOWER1F_SAGE1
 	const SPROUTTOWER1F_SAGE2
 	const SPROUTTOWER1F_GRANNY
@@ -7,11 +7,9 @@ const_value set 2
 	const SPROUTTOWER1F_POKE_BALL
 
 SproutTower1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 SproutTower1FSage1Script:
 	jumptextfaceplayer SproutTower1FSage1Text
@@ -26,10 +24,10 @@ SproutTower1FTeacherScript:
 	jumptextfaceplayer SproutTower1FTeacherText
 
 TrainerSageChow:
-	trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script
+	trainer SAGE, CHOW, EVENT_BEAT_SAGE_CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageChowAfterBattleText
 	waitbutton
@@ -39,8 +37,8 @@ TrainerSageChow:
 SproutTower1FParlyzHeal:
 	itemball PARLYZ_HEAL
 
-MapSproutTower1FSignpost1Script:
-	jumptext UnknownText_0x1846d6
+SproutTower1FStatue:
+	jumptext SproutTower1FStatueText
 
 SageChowSeenText:
 	text "We stand guard in"
@@ -95,7 +93,7 @@ SproutTower1FTeacherText:
 	line "ing upstairs."
 	done
 
-UnknownText_0x1846d6:
+SproutTower1FStatueText:
 	text "A #MON statue…"
 
 	para "It looks very"
@@ -103,30 +101,25 @@ UnknownText_0x1846d6:
 	done
 
 SproutTower1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 9, 15, 7, VIOLET_CITY
-	warp_def 10, 15, 7, VIOLET_CITY
-	warp_def 6, 4, 1, SPROUT_TOWER_2F
-	warp_def 2, 6, 2, SPROUT_TOWER_2F
-	warp_def 17, 3, 3, SPROUT_TOWER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
-	bg_event 12, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script
-
-.ObjectEvents:
-	db 6
-	object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1
-	object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  9, 15, VIOLET_CITY, 7
+	warp_event 10, 15, VIOLET_CITY, 7
+	warp_event  6,  4, SPROUT_TOWER_2F, 1
+	warp_event  2,  6, SPROUT_TOWER_2F, 2
+	warp_event 17,  3, SPROUT_TOWER_2F, 3
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  7, 15, BGEVENT_READ, SproutTower1FStatue
+	bg_event 12, 15, BGEVENT_READ, SproutTower1FStatue
+
+	db 6 ; object events
+	object_event  7,  4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1
+	object_event  6,  7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1
 	object_event 11, 12, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1
-	object_event 9, 9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1
-	object_event 3, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1
-	object_event 16, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
+	object_event  9,  9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1
+	object_event  3,  5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1
+	object_event 16,  7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index cd0c46fd7..686e8c1f1 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -1,20 +1,18 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SPROUTTOWER2F_SAGE1
 	const SPROUTTOWER2F_SAGE2
 	const SPROUTTOWER2F_POKE_BALL
 
 SproutTower2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerSageNico:
-	trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script
+	trainer SAGE, NICO, EVENT_BEAT_SAGE_NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageNicoAfterBattleText
 	waitbutton
@@ -22,18 +20,18 @@ TrainerSageNico:
 	end
 
 TrainerSageEdmond:
-	trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script
+	trainer SAGE, EDMOND, EVENT_BEAT_SAGE_EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageEdmondAfterBattleText
 	waitbutton
 	closetext
 	end
 
-MapSproutTower2FSignpost0Script:
-	jumptext UnknownText_0x1848c8
+SproutTower2FStatue:
+	jumptext SproutTower2FStatueText
 
 SproutTower2FXAccuracy:
 	itemball X_ACCURACY
@@ -77,7 +75,7 @@ SageEdmondAfterBattleText:
 	line "well enough."
 	done
 
-UnknownText_0x1848c8:
+SproutTower2FStatueText:
 	text "A #MON statue…"
 
 	para "It looks very"
@@ -85,25 +83,20 @@ UnknownText_0x1848c8:
 	done
 
 SproutTower2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 6, 4, 3, SPROUT_TOWER_1F
-	warp_def 2, 6, 4, SPROUT_TOWER_1F
-	warp_def 17, 3, 5, SPROUT_TOWER_1F
-	warp_def 10, 14, 1, SPROUT_TOWER_3F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 12, 15, BGEVENT_READ, MapSproutTower2FSignpost0Script
-
-.ObjectEvents:
-	db 3
-	object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
-	object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
-	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  6,  4, SPROUT_TOWER_1F, 3
+	warp_event  2,  6, SPROUT_TOWER_1F, 4
+	warp_event 17,  3, SPROUT_TOWER_1F, 5
+	warp_event 10, 14, SPROUT_TOWER_3F, 1
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event 12, 15, BGEVENT_READ, SproutTower2FStatue
+
+	db 3 ; object events
+	object_event 12,  3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1
+	object_event  9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1
+	object_event  3,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 2b459c55d..0462f279a 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const SPROUTTOWER3F_SAGE1
 	const SPROUTTOWER3F_SAGE2
 	const SPROUTTOWER3F_SAGE3
@@ -8,13 +8,11 @@ const_value set 2
 	const SPROUTTOWER3F_SILVER
 
 SproutTower3F_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -22,10 +20,10 @@ SproutTower3F_MapScripts:
 .DummyScene1:
 	end
 
-UnknownScript_0x184947:
-	spriteface PLAYER, UP
+SproutTower3FRivalScene:
+	turnobject PLAYER, UP
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	playsound SFX_TACKLE
 	playsound SFX_ELEVATOR
 	earthquake 79
@@ -40,26 +38,26 @@ UnknownScript_0x184947:
 	waitbutton
 	closetext
 	showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15
-	spriteface SPROUTTOWER3F_SILVER, DOWN
+	turnobject SPROUTTOWER3F_SILVER, DOWN
 	pause 15
 	applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
-	writetext UnknownText_0x184aec
+	writetext SproutTowerRivalOnlyCareAboutStrongText
 	waitbutton
 	closetext
-	spriteface SPROUTTOWER3F_SILVER, UP
+	turnobject SPROUTTOWER3F_SILVER, UP
 	opentext
-	writetext UnknownText_0x184bc8
+	writetext SproutTowerRivalUsedEscapeRopeText
 	pause 15
 	closetext
 	playsound SFX_WARP_TO
-	special Special_FadeBlackQuickly
+	special FadeBlackQuickly
 	special ReloadSpritesNoPalettes
 	disappear SPROUTTOWER3F_SILVER
 	waitsfx
-	special Special_FadeInQuickly
-	setscene 1
+	special FadeInQuickly
+	setscene SCENE_FINISHED
 	special RestartMapMusic
 	end
 
@@ -67,7 +65,7 @@ SageLiScript:
 	faceplayer
 	opentext
 	checkevent EVENT_GOT_HM05_FLASH
-	iftrue UnknownScript_0x1849d1
+	iftrue .GotFlash
 	writetext SageLiSeenText
 	waitbutton
 	closetext
@@ -76,27 +74,27 @@ SageLiScript:
 	startbattle
 	reloadmapafterbattle
 	opentext
-	writetext UnknownText_0x184cc2
+	writetext SageLiTakeThisFlashText
 	buttonsound
 	verbosegiveitem HM_FLASH
 	setevent EVENT_GOT_HM05_FLASH
 	setevent EVENT_BEAT_SAGE_LI
-	writetext UnknownText_0x184d13
+	writetext SageLiFlashExplanationText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x1849d1:
-	writetext UnknownText_0x184d88
+.GotFlash:
+	writetext SageLiAfterBattleText
 	waitbutton
 	closetext
 	end
 
 TrainerSageJin:
-	trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, .Script
+	trainer SAGE, JIN, EVENT_BEAT_SAGE_JIN, SageJinSeenText, SageJinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageJinAfterBattleText
 	waitbutton
@@ -104,10 +102,10 @@ TrainerSageJin:
 	end
 
 TrainerSageTroy:
-	trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script
+	trainer SAGE, TROY, EVENT_BEAT_SAGE_TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageTroyAfterBattleText
 	waitbutton
@@ -115,21 +113,21 @@ TrainerSageTroy:
 	end
 
 TrainerSageNeal:
-	trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script
+	trainer SAGE, NEAL, EVENT_BEAT_SAGE_NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext SageNealAfterBattleText
 	waitbutton
 	closetext
 	end
 
-MapSproutTower3FSignpost3Script:
-	jumptext UnknownText_0x184f37
+SproutTower3FPainting:
+	jumptext SproutTower3FPaintingText
 
-MapSproutTower3FSignpost5Script:
-	jumptext UnknownText_0x184f61
+SproutTower3FStatue:
+	jumptext SproutTower3FStatueText
 
 SproutTower3FPotion:
 	itemball POTION
@@ -174,7 +172,7 @@ UnknownText_0x184a27:
 	line "tools of war…"
 	done
 
-UnknownText_0x184aec:
+SproutTowerRivalOnlyCareAboutStrongText:
 	text "…"
 	line "…Humph!"
 
@@ -200,7 +198,7 @@ UnknownText_0x184aec:
 	cont "weak #MON."
 	done
 
-UnknownText_0x184bc8:
+SproutTowerRivalUsedEscapeRopeText:
 	text "<RIVAL> used an"
 	line "ESCAPE ROPE!"
 	done
@@ -232,7 +230,7 @@ SageLiBeatenText:
 	text "Ah, excellent!"
 	done
 
-UnknownText_0x184cc2:
+SageLiTakeThisFlashText:
 	text "You and your #-"
 	line "MON should have"
 
@@ -243,7 +241,7 @@ UnknownText_0x184cc2:
 	line "HM."
 	done
 
-UnknownText_0x184d13:
+SageLiFlashExplanationText:
 	text "FLASH illuminates"
 	line "even the darkest"
 	cont "of all places."
@@ -255,7 +253,7 @@ UnknownText_0x184d13:
 	line "from VIOLET's GYM."
 	done
 
-UnknownText_0x184d88:
+SageLiAfterBattleText:
 	text "I hope you learn"
 	line "and grow from your"
 	cont "journey."
@@ -316,13 +314,13 @@ SageNealAfterBattleText:
 	line "on your journey."
 	done
 
-UnknownText_0x184f37:
+SproutTower3FPaintingText:
 	text "It's a powerful"
 	line "painting of a"
 	cont "BELLSPROUT."
 	done
 
-UnknownText_0x184f61:
+SproutTower3FStatueText:
 	text "A #MON statue…"
 
 	para "It looks very"
@@ -330,32 +328,27 @@ UnknownText_0x184f61:
 	done
 
 SproutTower3F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 1
-	warp_def 10, 14, 4, SPROUT_TOWER_2F
-
-.CoordEvents:
-	db 1
-	coord_event 11, 9, 0, UnknownScript_0x184947
-
-.BGEvents:
-	db 6
-	bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
-	bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script
-	bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script
-	bg_event 10, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script
-	bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
-	bg_event 14, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script
-
-.ObjectEvents:
-	db 7
-	object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1
-	object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1
-	object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1
+	db 0, 0 ; filler
+
+	db 1 ; warp events
+	warp_event 10, 14, SPROUT_TOWER_2F, 4
+
+	db 1 ; coord events
+	coord_event 11,  9, SCENE_DEFAULT, SproutTower3FRivalScene
+
+	db 6 ; bg events
+	bg_event  8,  1, BGEVENT_READ, SproutTower3FStatue
+	bg_event 11,  1, BGEVENT_READ, SproutTower3FStatue
+	bg_event  9,  0, BGEVENT_READ, SproutTower3FPainting
+	bg_event 10,  0, BGEVENT_READ, SproutTower3FPainting
+	bg_event  5, 15, BGEVENT_READ, SproutTower3FStatue
+	bg_event 14, 15, BGEVENT_READ, SproutTower3FStatue
+
+	db 7 ; object events
+	object_event  8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1
+	object_event  8,  8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1
+	object_event 10,  2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1
 	object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1
-	object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION
-	object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
-	object_event 10, 4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
+	object_event  6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION
+	object_event 14,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
+	object_event 10,  4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 7ecb7b71a..28c22882f 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TEAMROCKETBASEB1F_ROCKET1
 	const TEAMROCKETBASEB1F_ROCKET2
 	const TEAMROCKETBASEB1F_SCIENTIST
@@ -7,12 +7,10 @@ const_value set 2
 	const TEAMROCKETBASEB1F_POKE_BALL3
 
 TeamRocketBaseB1F_MapScripts:
-.SceneScripts:
-	db 1
-	scene_script .DummyScene
+	db 1 ; scene scripts
+	scene_script .DummyScene ; SCENE_DEFAULT
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt
 
 .DummyScene:
@@ -32,10 +30,10 @@ SecurityCamera1a:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 2
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
@@ -43,7 +41,7 @@ SecurityCamera1a:
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_1
 	end
 
@@ -57,10 +55,10 @@ SecurityCamera1b:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 3
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
@@ -68,7 +66,7 @@ SecurityCamera1b:
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_1
 	end
 
@@ -82,19 +80,19 @@ SecurityCamera2a:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 7
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_2
 	end
 
@@ -108,19 +106,19 @@ SecurityCamera2b:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 8
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_2
 	end
 
@@ -134,19 +132,19 @@ SecurityCamera3a:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 6
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_3
 	end
 
@@ -160,19 +158,19 @@ SecurityCamera3b:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 7
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 12
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_3
 	end
 
@@ -186,19 +184,19 @@ SecurityCamera4:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 17, 16
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_4
 	end
 
@@ -212,19 +210,19 @@ SecurityCamera5:
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 3, 16
 	appear TEAMROCKETBASEB1F_ROCKET1
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 14, 16
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9
 	scall TrainerCameraGrunt2
-	if_equal TRUE, NoSecurityCamera
+	ifequal TRUE, NoSecurityCamera
 	setevent EVENT_SECURITY_CAMERA_5
 	end
 
@@ -448,9 +446,9 @@ ExplodingTrap22:
 	end
 
 VoltorbExplodingTrap:
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	cry VOLTORB
-	special Special_FadeInPalettes
+	special FadeInPalettes
 	setlasttalked -1
 	writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
 	loadwildmon VOLTORB, 23
@@ -458,9 +456,9 @@ VoltorbExplodingTrap:
 	end
 
 GeodudeExplodingTrap:
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	cry GEODUDE
-	special Special_FadeInPalettes
+	special FadeInPalettes
 	setlasttalked -1
 	writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
 	loadwildmon GEODUDE, 21
@@ -468,9 +466,9 @@ GeodudeExplodingTrap:
 	end
 
 KoffingExplodingTrap:
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	cry KOFFING
-	special Special_FadeInPalettes
+	special FadeInPalettes
 	setlasttalked -1
 	writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
 	loadwildmon KOFFING, 21
@@ -481,10 +479,10 @@ NoExplodingTrap:
 	end
 
 TrainerScientistJed:
-	trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script
+	trainer SCIENTIST, JED, EVENT_BEAT_SCIENTIST_JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext ScientistJedAfterBattleText
 	waitbutton
@@ -492,27 +490,27 @@ TrainerScientistJed:
 	end
 
 TrainerGruntM16:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_16, EVENT_BEAT_ROCKET_GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM16AfterBattleText
 	waitbutton
 	closetext
 	end
 
-MapTeamRocketBaseB1FSignpost5Script:
-	jumptext SecurityCameraText
+TeamRocketBaseB1FSecurityCamera:
+	jumptext TeamRocketBaseB1FSecurityCameraText
 
-MapTeamRocketBaseB1FSignpost7Script:
+TeamRocketBaseB1FBookshelf:
 	jumpstd teamrocketoath
 
-MapTeamRocketBaseB1FSignpost0Script:
+TeamRocketBaseB1FSecretSwitch:
 	opentext
 	checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS
-	iftrue UnknownScript_0x6cabe
-	writetext UnknownText_0x6cdad
+	iftrue .SecretSwitchOff
+	writetext TeamRocketBaseB1FSecretSwitchText
 	playsound SFX_TALLY
 	waitbutton
 	closetext
@@ -524,8 +522,8 @@ MapTeamRocketBaseB1FSignpost0Script:
 	setevent EVENT_SECURITY_CAMERA_5
 	end
 
-UnknownScript_0x6cabe:
-	writetext UnknownText_0x6cdd0
+.SecretSwitchOff:
+	writetext TeamRocketBaseB1FSwitchOffText
 	waitbutton
 	closetext
 	end
@@ -540,7 +538,7 @@ TeamRocketBaseB1FGuardSpec:
 	itemball GUARD_SPEC
 
 TeamRocketBaseB1FHiddenRevive:
-	hiddenitem EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE
+	hiddenitem REVIVE, EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE
 
 SecurityCameraMovement1:
 	big_step RIGHT
@@ -708,7 +706,7 @@ GruntM16AfterBattleText:
 	cont "courage and walk."
 	done
 
-SecurityCameraText:
+TeamRocketBaseB1FSecurityCameraText:
 	text "It's a PERSIAN"
 	line "statue…"
 
@@ -716,81 +714,76 @@ SecurityCameraText:
 	line "shiny."
 	done
 
-UnknownText_0x6cdad:
+TeamRocketBaseB1FSecretSwitchText:
 	text "A secret switch!"
 	line "Better press it."
 	done
 
-UnknownText_0x6cdd0:
+TeamRocketBaseB1FSwitchOffText:
 	text "The switch is"
 	line "turned off."
 	done
 
 TeamRocketBaseB1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 27, 2, 3, MAHOGANY_MART_1F
-	warp_def 3, 14, 1, TEAM_ROCKET_BASE_B2F
-	warp_def 5, 15, 4, TEAM_ROCKET_BASE_B1F
-	warp_def 25, 2, 3, TEAM_ROCKET_BASE_B1F
-
-.CoordEvents:
-	db 30
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event 27,  2, MAHOGANY_MART_1F, 3
+	warp_event  3, 14, TEAM_ROCKET_BASE_B2F, 1
+	warp_event  5, 15, TEAM_ROCKET_BASE_B1F, 4
+	warp_event 25,  2, TEAM_ROCKET_BASE_B1F, 3
+
+	db 30 ; coord events
 	; There are five security cameras in the base.
 	; Walking in front of one triggers two Rocket Grunts.
-	coord_event 24, 2, 0, SecurityCamera1a
-	coord_event 24, 3, 0, SecurityCamera1b
-	coord_event 6, 2, 0, SecurityCamera2a
-	coord_event 6, 3, 0, SecurityCamera2b
-	coord_event 24, 6, 0, SecurityCamera3a
-	coord_event 24, 7, 0, SecurityCamera3b
-	coord_event 22, 16, 0, SecurityCamera4
-	coord_event 8, 16, 0, SecurityCamera5
+	coord_event 24,  2, SCENE_DEFAULT, SecurityCamera1a
+	coord_event 24,  3, SCENE_DEFAULT, SecurityCamera1b
+	coord_event  6,  2, SCENE_DEFAULT, SecurityCamera2a
+	coord_event  6,  3, SCENE_DEFAULT, SecurityCamera2b
+	coord_event 24,  6, SCENE_DEFAULT, SecurityCamera3a
+	coord_event 24,  7, SCENE_DEFAULT, SecurityCamera3b
+	coord_event 22, 16, SCENE_DEFAULT, SecurityCamera4
+	coord_event  8, 16, SCENE_DEFAULT, SecurityCamera5
 	; There are spots on the floor that trigger a Pokémon battle.
 	; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct.
-	coord_event 2, 7, 0, ExplodingTrap1
-	coord_event 3, 7, 0, ExplodingTrap2
-	coord_event 4, 7, 0, ExplodingTrap3
-	coord_event 1, 8, 0, ExplodingTrap4
-	coord_event 3, 8, 0, ExplodingTrap5
-	coord_event 5, 8, 0, ExplodingTrap6
-	coord_event 3, 9, 0, ExplodingTrap7
-	coord_event 4, 9, 0, ExplodingTrap8
-	coord_event 1, 10, 0, ExplodingTrap9
-	coord_event 2, 10, 0, ExplodingTrap10
-	coord_event 3, 10, 0, ExplodingTrap11
-	coord_event 5, 10, 0, ExplodingTrap12
-	coord_event 2, 11, 0, ExplodingTrap13
-	coord_event 4, 11, 0, ExplodingTrap14
-	coord_event 1, 12, 0, ExplodingTrap15
-	coord_event 2, 12, 0, ExplodingTrap16
-	coord_event 4, 12, 0, ExplodingTrap17
-	coord_event 5, 12, 0, ExplodingTrap18
-	coord_event 1, 13, 0, ExplodingTrap19
-	coord_event 3, 13, 0, ExplodingTrap20
-	coord_event 4, 13, 0, ExplodingTrap21
-	coord_event 5, 13, 0, ExplodingTrap22
-
-.BGEvents:
-	db 9
-	bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script
-	bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 8, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 22, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 24, 5, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
-	bg_event 20, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
-	bg_event 21, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
-	bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive
-
-.ObjectEvents:
-	db 6
-	object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
-	object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
+	coord_event  2,  7, SCENE_DEFAULT, ExplodingTrap1
+	coord_event  3,  7, SCENE_DEFAULT, ExplodingTrap2
+	coord_event  4,  7, SCENE_DEFAULT, ExplodingTrap3
+	coord_event  1,  8, SCENE_DEFAULT, ExplodingTrap4
+	coord_event  3,  8, SCENE_DEFAULT, ExplodingTrap5
+	coord_event  5,  8, SCENE_DEFAULT, ExplodingTrap6
+	coord_event  3,  9, SCENE_DEFAULT, ExplodingTrap7
+	coord_event  4,  9, SCENE_DEFAULT, ExplodingTrap8
+	coord_event  1, 10, SCENE_DEFAULT, ExplodingTrap9
+	coord_event  2, 10, SCENE_DEFAULT, ExplodingTrap10
+	coord_event  3, 10, SCENE_DEFAULT, ExplodingTrap11
+	coord_event  5, 10, SCENE_DEFAULT, ExplodingTrap12
+	coord_event  2, 11, SCENE_DEFAULT, ExplodingTrap13
+	coord_event  4, 11, SCENE_DEFAULT, ExplodingTrap14
+	coord_event  1, 12, SCENE_DEFAULT, ExplodingTrap15
+	coord_event  2, 12, SCENE_DEFAULT, ExplodingTrap16
+	coord_event  4, 12, SCENE_DEFAULT, ExplodingTrap17
+	coord_event  5, 12, SCENE_DEFAULT, ExplodingTrap18
+	coord_event  1, 13, SCENE_DEFAULT, ExplodingTrap19
+	coord_event  3, 13, SCENE_DEFAULT, ExplodingTrap20
+	coord_event  4, 13, SCENE_DEFAULT, ExplodingTrap21
+	coord_event  5, 13, SCENE_DEFAULT, ExplodingTrap22
+
+	db 9 ; bg events
+	bg_event 19, 11, BGEVENT_READ, TeamRocketBaseB1FSecretSwitch
+	bg_event 24,  1, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
+	bg_event  6,  1, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
+	bg_event  8, 15, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
+	bg_event 22, 15, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
+	bg_event 24,  5, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera
+	bg_event 20, 11, BGEVENT_READ, TeamRocketBaseB1FBookshelf
+	bg_event 21, 11, BGEVENT_READ, TeamRocketBaseB1FBookshelf
+	bg_event  3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive
+
+	db 6 ; object events
+	object_event  0,  0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS
+	object_event  2,  4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 18, 12, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 27, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
-	object_event 14, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
-	object_event 21, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC
+	object_event 27,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION
+	object_event 14, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET
+	object_event 21, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index f31110476..9b05d82e0 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TEAMROCKETBASEB2F_ROCKET1
 	const TEAMROCKETBASEB2F_ROCKET_GIRL
 	const TEAMROCKETBASEB2F_LANCE
@@ -15,15 +15,13 @@ const_value set 2
 	const TEAMROCKETBASEB2F_POKE_BALL
 
 TeamRocketBaseB2F_MapScripts:
-.SceneScripts:
-	db 4
-	scene_script .DummyScene0
-	scene_script .DummyScene1
-	scene_script .DummyScene2
-	scene_script .DummyScene3
-
-.MapCallbacks:
-	db 1
+	db 4 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS
+	scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB2F_ELECTRODES
+	scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB2F_NOTHING
+
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .TransmitterDoorCallback
 
 .DummyScene0:
@@ -47,36 +45,36 @@ TeamRocketBaseB2F_MapScripts:
 	changeblock 14, 12, $07 ; floor
 	return
 
-UnknownScript_0x6cf95:
+RocketBaseBossFLeft:
 	moveobject TEAMROCKETBASEB2F_LANCE, 9, 13
-	jump UnknownScript_0x6cfac
+	jump RocketBaseBossFScript
 
-UnknownScript_0x6cf9c:
+RocketBaseBossFRight:
 	moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, 21, 16
 	moveobject TEAMROCKETBASEB2F_ROCKET1, 21, 16
 	moveobject TEAMROCKETBASEB2F_DRAGON, 10, 13
 	moveobject TEAMROCKETBASEB2F_LANCE, 10, 13
-UnknownScript_0x6cfac:
+RocketBaseBossFScript:
 	appear TEAMROCKETBASEB2F_ROCKET_GIRL
 	appear TEAMROCKETBASEB2F_ROCKET1
 	opentext
 	writetext UnknownText_0x6d2ad
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	applymovement PLAYER, MovementData_0x6d21f
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f
 	opentext
 	writetext UnknownText_0x6d2c3
 	waitbutton
 	closetext
 	cry DRAGONITE
-	spriteface TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT
-	spriteface PLAYER, LEFT
+	turnobject TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT
+	turnobject PLAYER, LEFT
 	appear TEAMROCKETBASEB2F_DRAGON
 	applymovement TEAMROCKETBASEB2F_DRAGON, MovementData_0x6d236
 	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d23b
@@ -87,7 +85,7 @@ UnknownScript_0x6cfac:
 	writetext UnknownText_0x6d38c
 	waitbutton
 	closetext
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241
 	opentext
 	writetext UnknownText_0x6d3bd
@@ -109,7 +107,7 @@ UnknownScript_0x6cfac:
 	writetext UnknownText_0x6d4c6
 	waitbutton
 	closetext
-	special Special_FadeBlackQuickly
+	special FadeBlackQuickly
 	special ReloadSpritesNoPalettes
 	disappear TEAMROCKETBASEB2F_ROCKET1
 	disappear TEAMROCKETBASEB2F_ROCKET_GIRL
@@ -117,16 +115,16 @@ UnknownScript_0x6cfac:
 	disappear TEAMROCKETBASEB2F_ROCKET3
 	disappear TEAMROCKETBASEB2F_ROCKET4
 	pause 15
-	special Special_FadeInQuickly
-	setscene 2
+	special FadeInQuickly
+	setscene SCENE_TEAMROCKETBASEB2F_ELECTRODES
 	clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
-	spriteface TEAMROCKETBASEB2F_LANCE, DOWN
+	turnobject TEAMROCKETBASEB2F_LANCE, DOWN
 	opentext
 	writetext UnknownText_0x6d5d8
 	waitbutton
 	closetext
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	writetext UnknownText_0x6d64e
 	waitbutton
@@ -142,11 +140,11 @@ UnknownScript_0x6cfac:
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267
 	disappear TEAMROCKETBASEB2F_LANCE
 
-UnknownScript_0x6d075:
+RocketBaseCantLeaveScript:
 	applymovement PLAYER, MovementData_0x6d271
 	end
 
-UnknownScript_0x6d07a:
+RocketBaseLancesSideScript:
 	opentext
 	writetext UnknownText_0x6d7ea
 	waitbutton
@@ -155,30 +153,30 @@ UnknownScript_0x6d07a:
 	end
 
 LanceHealsScript1:
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	jump LanceHealsCommon
 
 LanceHealsScript2:
-	spriteface PLAYER, RIGHT
-	spriteface TEAMROCKETBASEB2F_LANCE, LEFT
+	turnobject PLAYER, RIGHT
+	turnobject TEAMROCKETBASEB2F_LANCE, LEFT
 LanceHealsCommon:
 	opentext
 	writetext LanceHealsText1
 	waitbutton
 	closetext
-	special Special_FadeOutPalettes
-	special Special_StubbedTrainerRankings_Healings
+	special FadeOutPalettes
+	special StubbedTrainerRankings_Healings
 	playsound SFX_FULL_HEAL
 	special HealParty
-	special Special_FadeInPalettes
+	special FadeInPalettes
 	opentext
 	writetext LanceHealsText2
 	waitbutton
 	closetext
-	setscene 1
+	setscene SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS
 	setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
 	checkcode VAR_FACING
-	if_equal RIGHT, .FacingRight
+	ifequal RIGHT, .FacingRight
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212
 	disappear TEAMROCKETBASEB2F_LANCE
 	end
@@ -189,10 +187,10 @@ LanceHealsCommon:
 	end
 
 TrainerGruntM17:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_17, EVENT_BEAT_ROCKET_GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM17AfterBattleText
 	waitbutton
@@ -200,10 +198,10 @@ TrainerGruntM17:
 	end
 
 TrainerGruntM18:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_18, EVENT_BEAT_ROCKET_GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM18AfterBattleText
 	waitbutton
@@ -211,10 +209,10 @@ TrainerGruntM18:
 	end
 
 TrainerGruntM19:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script
+	trainer GRUNTM, GRUNTM_19, EVENT_BEAT_ROCKET_GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM19AfterBattleText
 	waitbutton
@@ -237,7 +235,7 @@ RocketElectrode1:
 	reloadmapafterbattle
 	special PlayMapMusic
 	applymovement PLAYER, MovementData_0x6d28c
-	jump UnknownScript_0x6d184
+	jump RocketBaseElectrodeScript
 
 RocketElectrode2:
 	cry ELECTRODE
@@ -255,7 +253,7 @@ RocketElectrode2:
 	reloadmapafterbattle
 	special PlayMapMusic
 	applymovement PLAYER, MovementData_0x6d299
-	jump UnknownScript_0x6d184
+	jump RocketBaseElectrodeScript
 
 RocketElectrode3:
 	cry ELECTRODE
@@ -273,17 +271,17 @@ RocketElectrode3:
 	reloadmapafterbattle
 	special PlayMapMusic
 	applymovement PLAYER, MovementData_0x6d2a4
-	jump UnknownScript_0x6d184
+	jump RocketBaseElectrodeScript
 
 TeamRocketBaseB2FReloadMap:
 	reloadmapafterbattle
 	end
 
-UnknownScript_0x6d184:
+RocketBaseElectrodeScript:
 	moveobject TEAMROCKETBASEB2F_LANCE, 18, 6
 	appear TEAMROCKETBASEB2F_LANCE
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x6d809
 	buttonsound
@@ -292,19 +290,19 @@ UnknownScript_0x6d184:
 	writetext UnknownText_0x6d8f8
 	waitbutton
 	closetext
-	spriteface TEAMROCKETBASEB2F_LANCE, DOWN
+	turnobject TEAMROCKETBASEB2F_LANCE, DOWN
 	opentext
 	writetext UnknownText_0x6d994
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d283
 	disappear TEAMROCKETBASEB2F_LANCE
 	setevent EVENT_CLEARED_ROCKET_HIDEOUT
 	clearflag ENGINE_ROCKET_SIGNAL_ON_CH20
 	setevent EVENT_ROUTE_43_GATE_ROCKETS
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
-	setscene 3
+	setscene SCENE_TEAMROCKETBASEB2F_NOTHING
 	clearevent EVENT_LAKE_OF_RAGE_CIVILIANS
 	setevent EVENT_TURNED_OFF_SECURITY_CAMERAS
 	setevent EVENT_SECURITY_CAMERA_1
@@ -356,7 +354,7 @@ TeamRocketBaseB2FTMThief:
 	itemball TM_THIEF
 
 TeamRocketBaseB2FHiddenFullHeal:
-	hiddenitem EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL
+	hiddenitem FULL_HEAL, EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL
 
 MovementData_0x6d212:
 	step RIGHT
@@ -909,68 +907,63 @@ UnknownText_0x6de03:
 	done
 
 TeamRocketBaseB2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 3, 14, 2, TEAM_ROCKET_BASE_B1F
-	warp_def 3, 2, 1, TEAM_ROCKET_BASE_B3F
-	warp_def 27, 2, 2, TEAM_ROCKET_BASE_B3F
-	warp_def 3, 6, 3, TEAM_ROCKET_BASE_B3F
-	warp_def 27, 14, 4, TEAM_ROCKET_BASE_B3F
-
-.CoordEvents:
-	db 9
-	coord_event 5, 14, 0, LanceHealsScript1
-	coord_event 4, 13, 0, LanceHealsScript2
-	coord_event 14, 11, 1, UnknownScript_0x6cf95
-	coord_event 15, 11, 1, UnknownScript_0x6cf9c
-	coord_event 14, 12, 2, UnknownScript_0x6d075
-	coord_event 15, 12, 2, UnknownScript_0x6d075
-	coord_event 12, 3, 2, UnknownScript_0x6d07a
-	coord_event 12, 10, 2, UnknownScript_0x6d07a
-	coord_event 12, 11, 2, UnknownScript_0x6d07a
-
-.BGEvents:
-	db 23
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  3, 14, TEAM_ROCKET_BASE_B1F, 2
+	warp_event  3,  2, TEAM_ROCKET_BASE_B3F, 1
+	warp_event 27,  2, TEAM_ROCKET_BASE_B3F, 2
+	warp_event  3,  6, TEAM_ROCKET_BASE_B3F, 3
+	warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4
+
+	db 9 ; coord events
+	coord_event  5, 14, SCENE_DEFAULT, LanceHealsScript1
+	coord_event  4, 13, SCENE_DEFAULT, LanceHealsScript2
+	coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFLeft
+	coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFRight
+	coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseCantLeaveScript
+	coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseCantLeaveScript
+	coord_event 12,  3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript
+	coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript
+	coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript
+
+	db 23 ; bg events
 	bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
 	bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
-	bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 16, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 15, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 14, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 13, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 12, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 14, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 15, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 16, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 17, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 17, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 17, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 17, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
-	bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal
-
-.ObjectEvents:
-	db 14
+	bg_event 17,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 16,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 15,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 14,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 13,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 12,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 13,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 14,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 15,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 16,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17,  4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17,  5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17,  6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17,  7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 17,  8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+	bg_event 26,  7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal
+
+	db 14 ; object events
 	object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
 	object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
-	object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
-	object_event 9, 13, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
-	object_event 7, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
-	object_event 7, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
-	object_event 7, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
-	object_event 22, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
-	object_event 22, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
-	object_event 22, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
+	object_event  5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
+	object_event  9, 13, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
+	object_event  7,  5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
+	object_event  7,  7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
+	object_event  7,  9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
+	object_event 22,  5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
+	object_event 22,  7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
+	object_event 22,  9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
 	object_event 25, 13, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event  4,  1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 21, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
+	object_event  3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 3f7fe5d39..f1092aca7 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TEAMROCKETBASEB3F_LANCE
 	const TEAMROCKETBASEB3F_ROCKET1
 	const TEAMROCKETBASEB3F_MOLTRES
@@ -15,15 +15,13 @@ const_value set 2
 	const TEAMROCKETBASEB3F_POKE_BALL5
 
 TeamRocketBaseB3F_MapScripts:
-.SceneScripts:
-	db 4
-	scene_script .LanceGetsPassword
-	scene_script .DummyScene1
-	scene_script .DummyScene2
-	scene_script .DummyScene3
-
-.MapCallbacks:
-	db 1
+	db 4 ; scene scripts
+	scene_script .LanceGetsPassword ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER
+	scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS
+	scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB3F_NOTHING
+
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .CheckGiovanniDoor
 
 .LanceGetsPassword:
@@ -49,9 +47,9 @@ TeamRocketBaseB3F_MapScripts:
 	return
 
 LanceGetPasswordScript:
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	pause 5
-	spriteface TEAMROCKETBASEB3F_MOLTRES, RIGHT
+	turnobject TEAMROCKETBASEB3F_MOLTRES, RIGHT
 	pause 20
 	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a
 	opentext
@@ -60,16 +58,16 @@ LanceGetPasswordScript:
 	closetext
 	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c
 	disappear TEAMROCKETBASEB3F_LANCE
-	setscene 1
+	setscene SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER
 	end
 
 RocketBaseRival:
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	appear TEAMROCKETBASEB3F_SILVER
 	applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext RocketBaseRivalText
@@ -79,44 +77,44 @@ RocketBaseRival:
 	applymovement PLAYER, RocketBaseRivalShovesPlayerMovement
 	applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement
 	disappear TEAMROCKETBASEB3F_SILVER
-	setscene 2
+	setscene SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS
 	special RestartMapMusic
 	end
 
 TeamRocketBaseB3FRocketScript:
 	jumptextfaceplayer TeamRocketBaseB3FRocketText
 
-UnknownScript_0x6e04b:
+RocketBaseBossLeft:
 	applymovement PLAYER, MovementData_0x6e133
-	jump UnknownScript_0x6e056
+	jump RocketBaseBoss
 
-UnknownScript_0x6e052:
+RocketBaseBossRight:
 	applymovement PLAYER, MovementData_0x6e13a
-UnknownScript_0x6e056:
+RocketBaseBoss:
 	pause 30
 	showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface TEAMROCKETBASEB3F_ROCKET1, DOWN
+	turnobject TEAMROCKETBASEB3F_ROCKET1, DOWN
 	opentext
-	writetext UnknownText_0x6e400
+	writetext ExecutiveM4BeforeText
 	waitbutton
 	closetext
 	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142
-	winlosstext UnknownText_0x6e511, 0
+	winlosstext ExecutiveM4BeatenText, 0
 	setlasttalked TEAMROCKETBASEB3F_ROCKET1
 	loadtrainer EXECUTIVEM, EXECUTIVEM_4
 	startbattle
 	reloadmapafterbattle
 	setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4
 	opentext
-	writetext UnknownText_0x6e548
+	writetext ExecutiveM4AfterText
 	waitbutton
 	closetext
 	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144
 	playsound SFX_TACKLE
 	applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147
 	disappear TEAMROCKETBASEB3F_ROCKET1
-	setscene 3
+	setscene SCENE_TEAMROCKETBASEB3F_NOTHING
 	end
 
 RocketBaseMurkrow:
@@ -128,10 +126,10 @@ RocketBaseMurkrow:
 	end
 
 SlowpokeTailGrunt:
-	trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, GRUNTF_5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script
+	trainer GRUNTF, GRUNTF_5, EVENT_BEAT_ROCKET_GRUNTF_5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script
 
 GruntF5Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntF5AfterBattleText
 	waitbutton
@@ -140,10 +138,10 @@ GruntF5Script:
 	end
 
 RaticateTailGrunt:
-	trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, GRUNTM_28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script
+	trainer GRUNTM, GRUNTM_28, EVENT_BEAT_ROCKET_GRUNTM_28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script
 
 GruntM28Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GruntM28AfterBattleText
 	waitbutton
@@ -152,10 +150,10 @@ GruntM28Script:
 	end
 
 TrainerScientistRoss:
-	trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script
+	trainer SCIENTIST, ROSS, EVENT_BEAT_SCIENTIST_ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext ScientistRossAfterBattleText
 	waitbutton
@@ -163,10 +161,10 @@ TrainerScientistRoss:
 	end
 
 TrainerScientistMitch:
-	trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script
+	trainer SCIENTIST, MITCH, EVENT_BEAT_SCIENTIST_MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext ScientistMitchAfterBattleText
 	waitbutton
@@ -385,7 +383,7 @@ RocketBaseRivalText:
 	cont "the likes of you!"
 	done
 
-UnknownText_0x6e400:
+ExecutiveM4BeforeText:
 	text "What? Who are you?"
 	line "This is the office"
 
@@ -412,7 +410,7 @@ UnknownText_0x6e400:
 	cont "place!"
 	done
 
-UnknownText_0x6e511:
+ExecutiveM4BeatenText:
 	text "I… I couldn't do a"
 	line "thing…"
 
@@ -420,7 +418,7 @@ UnknownText_0x6e511:
 	line "forgive me…"
 	done
 
-UnknownText_0x6e548:
+ExecutiveM4AfterText:
 	text "No, I can't let"
 	line "this affect me."
 
@@ -566,48 +564,43 @@ UnknownText_0x6e9a3:
 	done
 
 TeamRocketBaseB3F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 3, 2, 2, TEAM_ROCKET_BASE_B2F
-	warp_def 27, 2, 3, TEAM_ROCKET_BASE_B2F
-	warp_def 3, 6, 4, TEAM_ROCKET_BASE_B2F
-	warp_def 27, 14, 5, TEAM_ROCKET_BASE_B2F
-
-.CoordEvents:
-	db 3
-	coord_event 10, 8, 2, UnknownScript_0x6e04b
-	coord_event 11, 8, 2, UnknownScript_0x6e052
-	coord_event 8, 10, 1, RocketBaseRival
-
-.BGEvents:
-	db 10
-	bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
-	bg_event 11, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
-	bg_event 10, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 11, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 12, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 13, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 4, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 5, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
-	bg_event 7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
-
-.ObjectEvents:
-	db 14
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  3,  2, TEAM_ROCKET_BASE_B2F, 2
+	warp_event 27,  2, TEAM_ROCKET_BASE_B2F, 3
+	warp_event  3,  6, TEAM_ROCKET_BASE_B2F, 4
+	warp_event 27, 14, TEAM_ROCKET_BASE_B2F, 5
+
+	db 3 ; coord events
+	coord_event 10,  8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, RocketBaseBossLeft
+	coord_event 11,  8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, RocketBaseBossRight
+	coord_event  8, 10, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER, RocketBaseRival
+
+	db 10 ; bg events
+	bg_event 10,  9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
+	bg_event 11,  9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor
+	bg_event 10,  1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 11,  1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 12,  1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event 13,  1, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event  4, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event  5, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event  6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
+	bg_event  7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript
+
+	db 14 ; object events
 	object_event 25, 14, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
-	object_event 8, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
-	object_event 7, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 21, 7, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 5, 14, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event  8,  3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE
+	object_event  7,  2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event 21,  7, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
+	object_event  5, 14, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 23, 11, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION
 	object_event 24, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION
-	object_event 4, 5, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
-	object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
-	object_event 3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
-	object_event 28, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
-	object_event 17, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
-	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
+	object_event  4,  5, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
+	object_event  1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
+	object_event  3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
+	object_event 28,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
+	object_event 17,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
+	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index cb3d5f3a8..502312c96 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TIMECAPSULE_CHRIS1
 	const TIMECAPSULE_CHRIS2
 
 TimeCapsule_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .InitializeTimeCapsule
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .InitializeTimeCapsule ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 
 .InitializeTimeCapsule:
@@ -20,7 +18,7 @@ TimeCapsule_MapScripts:
 	end
 
 .SetWhichChris:
-	special Special_CableClubCheckWhichChris
+	special CableClubCheckWhichChris
 	iffalse .Chris2
 	disappear TIMECAPSULE_CHRIS2
 	appear TIMECAPSULE_CHRIS1
@@ -32,45 +30,40 @@ TimeCapsule_MapScripts:
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene 1
-	setmapscene POKECENTER_2F, 3
+	setscene SCENE_FINISHED
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
 	end
 
-MapTimeCapsuleSignpost1Script:
-	special Special_TimeCapsule
+TimeCapsuleConsoleScript:
+	special TimeCapsule
 	newloadmap MAPSETUP_LINKRETURN
 	end
 
-ChrisScript_0x19351a:
+TimeCapsuleFriendScript:
 	opentext
-	writetext UnknownText_0x193521
+	writetext .FriendReadyText
 	waitbutton
 	closetext
 	end
 
-UnknownText_0x193521:
+.FriendReadyText:
 	text "Your friend is"
 	line "ready."
 	done
 
 TimeCapsule_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 4, 7, 4, POKECENTER_2F
-	warp_def 5, 7, 4, POKECENTER_2F
+	db 2 ; warp events
+	warp_event  4,  7, POKECENTER_2F, 4
+	warp_event  5,  7, POKECENTER_2F, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script
-	bg_event 5, 4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script
+	db 2 ; bg events
+	bg_event  4,  4, BGEVENT_RIGHT, TimeCapsuleConsoleScript
+	bg_event  5,  4, BGEVENT_LEFT, TimeCapsuleConsoleScript
 
-.ObjectEvents:
-	db 2
-	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS
-	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT
+	db 2 ; object events
+	object_event  3,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TimeCapsuleFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  6,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TimeCapsuleFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index cd20d59b2..821658d0d 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TINTOWER1F_SUICUNE
 	const TINTOWER1F_RAIKOU
 	const TINTOWER1F_ENTEI
@@ -11,13 +11,11 @@ const_value set 2
 	const TINTOWER1F_SAGE6
 
 TinTower1F_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .FaceSuicune
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .FaceSuicune ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 2
+	db 2 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .NPCsCallback
 	callback MAPCALLBACK_TILES, .StairsCallback
 
@@ -33,7 +31,7 @@ TinTower1F_MapScripts:
 	iftrue .GotRainbowWing
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iffalse .FaceBeasts
-	special Special_BeastsCheck
+	special BeastsCheck
 	iffalse .FaceBeasts
 	clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
 	setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1
@@ -49,7 +47,7 @@ TinTower1F_MapScripts:
 	iftrue .FoughtSuicune
 	appear TINTOWER1F_SUICUNE
 	writebyte RAIKOU
-	special Special_MonCheck
+	special MonCheck
 	iftrue .NoRaikou
 	appear TINTOWER1F_RAIKOU
 	jump .CheckEntei
@@ -58,7 +56,7 @@ TinTower1F_MapScripts:
 	disappear TINTOWER1F_RAIKOU
 .CheckEntei:
 	writebyte ENTEI
-	special Special_MonCheck
+	special MonCheck
 	iftrue .NoEntei
 	appear TINTOWER1F_ENTEI
 	jump .BeastsDone
@@ -87,10 +85,10 @@ TinTower1F_MapScripts:
 	applymovement PLAYER, TinTowerPlayerMovement1
 	pause 15
 	writebyte RAIKOU
-	special Special_MonCheck
+	special MonCheck
 	iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower
 	applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	cry RAIKOU
 	pause 10
 	playsound SFX_WARP_FROM
@@ -100,10 +98,10 @@ TinTower1F_MapScripts:
 	waitsfx
 .Next1:
 	writebyte ENTEI
-	special Special_MonCheck
+	special MonCheck
 	iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower
 	applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	cry ENTEI
 	pause 10
 	playsound SFX_WARP_FROM
@@ -112,7 +110,7 @@ TinTower1F_MapScripts:
 	playsound SFX_EXIT_BUILDING
 	waitsfx
 .Next2:
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	pause 10
 	applymovement PLAYER, TinTowerPlayerMovement2
 	applymovement TINTOWER1F_SUICUNE, TinTowerSuicuneMovement
@@ -125,16 +123,16 @@ TinTower1F_MapScripts:
 	disappear TINTOWER1F_SUICUNE
 	setevent EVENT_FOUGHT_SUICUNE
 	setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
-	setmapscene ROUTE_42, 0
+	setmapscene ROUTE_42, SCENE_ROUTE42_NOTHING
 	setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
-	setmapscene ROUTE_36, 0
+	setmapscene ROUTE_36, SCENE_ROUTE36_NOTHING
 	setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
-	setmapscene CIANWOOD_CITY, 0
-	setscene 1
+	setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_NOTHING
+	setscene SCENE_FINISHED
 	clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
 	reloadmapafterbattle
 	pause 20
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	playmusic MUSIC_MYSTICALMAN_ENCOUNTER
 	playsound SFX_ENTER_DOOR
 	moveobject TINTOWER1F_EUSINE, 10, 15
@@ -155,7 +153,7 @@ TinTower1F_MapScripts:
 	moveobject TINTOWER1F_SAGE1, 7, 13
 	moveobject TINTOWER1F_SAGE2, 9, 13
 	moveobject TINTOWER1F_SAGE3, 11, 13
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext TinTowerEusineSuicuneText
 	waitbutton
@@ -164,7 +162,7 @@ TinTower1F_MapScripts:
 	playsound SFX_EXIT_BUILDING
 	disappear TINTOWER1F_EUSINE
 	waitsfx
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 20
 	playmapmusic
 	end
@@ -523,30 +521,25 @@ TinTower1FSage6Text2:
 	done
 
 TinTower1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 9, 15, 12, ECRUTEAK_CITY
-	warp_def 10, 15, 12, ECRUTEAK_CITY
-	warp_def 10, 2, 2, TIN_TOWER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 10
-	object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
-	object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
-	object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
-	object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE
-	object_event 5, 9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  9, 15, ECRUTEAK_CITY, 12
+	warp_event 10, 15, ECRUTEAK_CITY, 12
+	warp_event 10,  2, TIN_TOWER_2F, 2
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 10 ; object events
+	object_event  9,  9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
+	object_event  7,  9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
+	object_event 12,  9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
+	object_event  8,  3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE
+	object_event  5,  9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
 	object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
-	object_event 14, 6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
-	object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
-	object_event 9, 1, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
-	object_event 14, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
+	object_event 14,  6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
+	object_event  4,  2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
+	object_event  9,  1, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
+	object_event 14,  2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2
diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm
index 02012d6f8..280ab059c 100644
--- a/maps/TinTower2F.asm
+++ b/maps/TinTower2F.asm
@@ -1,24 +1,17 @@
 TinTower2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 10, 14, 1, TIN_TOWER_3F
-	warp_def 10, 2, 3, TIN_TOWER_1F
+	db 2 ; warp events
+	warp_event 10, 14, TIN_TOWER_3F, 1
+	warp_event 10,  2, TIN_TOWER_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm
index 505073594..c089d8124 100644
--- a/maps/TinTower3F.asm
+++ b/maps/TinTower3F.asm
@@ -1,31 +1,24 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TINTOWER3F_POKE_BALL
 
 TinTower3F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower3FFullHeal:
 	itemball FULL_HEAL
 
 TinTower3F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 10, 14, 1, TIN_TOWER_2F
-	warp_def 16, 2, 2, TIN_TOWER_4F
+	db 2 ; warp events
+	warp_event 10, 14, TIN_TOWER_2F, 1
+	warp_event 16,  2, TIN_TOWER_4F, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL
+	db 1 ; object events
+	object_event  3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index 67fd4fda6..c36365543 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TINTOWER4F_POKE_BALL1
 	const TINTOWER4F_POKE_BALL2
 	const TINTOWER4F_POKE_BALL3
 
 TinTower4F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower4FUltraBall:
 	itemball ULTRA_BALL
@@ -20,28 +18,23 @@ TinTower4FEscapeRope:
 	itemball ESCAPE_ROPE
 
 TinTower4FHiddenMaxPotion:
-	hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
 
 TinTower4F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 2, 4, 2, TIN_TOWER_5F
-	warp_def 16, 2, 2, TIN_TOWER_3F
-	warp_def 2, 14, 3, TIN_TOWER_5F
-	warp_def 17, 15, 4, TIN_TOWER_5F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 1
-	bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
-
-.ObjectEvents:
-	db 3
-	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
-	object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
-	object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  2,  4, TIN_TOWER_5F, 2
+	warp_event 16,  2, TIN_TOWER_3F, 2
+	warp_event  2, 14, TIN_TOWER_5F, 3
+	warp_event 17, 15, TIN_TOWER_5F, 4
+
+	db 0 ; coord events
+
+	db 1 ; bg events
+	bg_event 11,  6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion
+
+	db 3 ; object events
+	object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL
+	object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP
+	object_event  2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
index ee2980b33..cff375b3d 100644
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -1,41 +1,34 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TINTOWER5F_POKE_BALL
 
 TinTower5F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower5FRareCandy:
 	itemball RARE_CANDY
 
 TinTower5FHiddenFullRestore:
-	hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE
+	hiddenitem FULL_RESTORE, EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE
 
 TinTower5FHiddenCarbos:
-	hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS
+	hiddenitem CARBOS, EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
 
 TinTower5F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 11, 15, 2, TIN_TOWER_6F
-	warp_def 2, 4, 1, TIN_TOWER_4F
-	warp_def 2, 14, 3, TIN_TOWER_4F
-	warp_def 17, 15, 4, TIN_TOWER_4F
+	db 4 ; warp events
+	warp_event 11, 15, TIN_TOWER_6F, 2
+	warp_event  2,  4, TIN_TOWER_4F, 1
+	warp_event  2, 14, TIN_TOWER_4F, 3
+	warp_event 17, 15, TIN_TOWER_4F, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
+	db 2 ; bg events
 	bg_event 16, 14, BGEVENT_ITEM, TinTower5FHiddenFullRestore
-	bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos
+	bg_event  3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos
 
-.ObjectEvents:
-	db 1
-	object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY
+	db 1 ; object events
+	object_event  9,  9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY
diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm
index 5d587373d..9fa17a0a2 100644
--- a/maps/TinTower6F.asm
+++ b/maps/TinTower6F.asm
@@ -1,31 +1,24 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TINTOWER6F_POKE_BALL
 
 TinTower6F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower6FMaxPotion:
 	itemball MAX_POTION
 
 TinTower6F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 3, 9, 1, TIN_TOWER_7F
-	warp_def 11, 15, 1, TIN_TOWER_5F
+	db 2 ; warp events
+	warp_event  3,  9, TIN_TOWER_7F, 1
+	warp_event 11, 15, TIN_TOWER_5F, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION
+	db 1 ; object events
+	object_event  8,  8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION
diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
index ab10bf4c2..5025fbbe9 100644
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -1,34 +1,27 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TINTOWER7F_POKE_BALL
 
 TinTower7F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower7FMaxRevive:
 	itemball MAX_REVIVE
 
 TinTower7F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 3, 9, 1, TIN_TOWER_6F
-	warp_def 10, 15, 1, TIN_TOWER_8F
-	warp_def 12, 7, 4, TIN_TOWER_7F
-	warp_def 8, 3, 3, TIN_TOWER_7F
-	warp_def 6, 9, 5, TIN_TOWER_9F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  3,  9, TIN_TOWER_6F, 1
+	warp_event 10, 15, TIN_TOWER_8F, 1
+	warp_event 12,  7, TIN_TOWER_7F, 4
+	warp_event  8,  3, TIN_TOWER_7F, 3
+	warp_event  6,  9, TIN_TOWER_9F, 5
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event 16,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE
diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm
index 4e10ac13f..c39f118eb 100644
--- a/maps/TinTower8F.asm
+++ b/maps/TinTower8F.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TINTOWER8F_POKE_BALL1
 	const TINTOWER8F_POKE_BALL2
 	const TINTOWER8F_POKE_BALL3
 
 TinTower8F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower8FNugget:
 	itemball NUGGET
@@ -20,26 +18,21 @@ TinTower8FFullRestore:
 	itemball FULL_RESTORE
 
 TinTower8F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 6
-	warp_def 2, 5, 2, TIN_TOWER_7F
-	warp_def 2, 11, 1, TIN_TOWER_9F
-	warp_def 16, 7, 2, TIN_TOWER_9F
-	warp_def 10, 3, 3, TIN_TOWER_9F
-	warp_def 14, 15, 6, TIN_TOWER_9F
-	warp_def 6, 9, 7, TIN_TOWER_9F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET
-	object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER
-	object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE
+	db 0, 0 ; filler
+
+	db 6 ; warp events
+	warp_event  2,  5, TIN_TOWER_7F, 2
+	warp_event  2, 11, TIN_TOWER_9F, 1
+	warp_event 16,  7, TIN_TOWER_9F, 2
+	warp_event 10,  3, TIN_TOWER_9F, 3
+	warp_event 14, 15, TIN_TOWER_9F, 6
+	warp_event  6,  9, TIN_TOWER_9F, 7
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET
+	object_event 11,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER
+	object_event  3,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE
diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm
index a540b891f..77cd23fce 100644
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -1,46 +1,39 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TINTOWER9F_POKE_BALL
 
 TinTower9F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TinTower9FHPUp:
 	itemball HP_UP
 
-; unused
 TinTower9FUnusedHoOhText:
+; unused
 	text "HO-OH: Shaoooh!"
 	done
 
-; unused
 TinTower9FUnusedLugiaText:
+; unused
 	text "LUGIA: Gyaaan!"
 	done
 
 TinTower9F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 7
-	warp_def 12, 3, 2, TIN_TOWER_8F
-	warp_def 2, 5, 3, TIN_TOWER_8F
-	warp_def 12, 7, 4, TIN_TOWER_8F
-	warp_def 7, 9, 1, TIN_TOWER_ROOF
-	warp_def 16, 7, 5, TIN_TOWER_7F
-	warp_def 6, 13, 5, TIN_TOWER_8F
-	warp_def 8, 13, 6, TIN_TOWER_8F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP
+	db 0, 0 ; filler
+
+	db 7 ; warp events
+	warp_event 12,  3, TIN_TOWER_8F, 2
+	warp_event  2,  5, TIN_TOWER_8F, 3
+	warp_event 12,  7, TIN_TOWER_8F, 4
+	warp_event  7,  9, TIN_TOWER_ROOF, 1
+	warp_event 16,  7, TIN_TOWER_7F, 5
+	warp_event  6, 13, TIN_TOWER_8F, 5
+	warp_event  8, 13, TIN_TOWER_8F, 6
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event  9,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP
diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
index 3cfca7cf9..33971dd1d 100644
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TINTOWERROOF_HO_OH
 
 TinTowerRoof_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .HoOh
 
 .HoOh:
@@ -45,19 +43,14 @@ HoOhText:
 	done
 
 TinTowerRoof_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 9, 13, 4, TIN_TOWER_9F
+	db 1 ; warp events
+	warp_event  9, 13, TIN_TOWER_9F, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 9, 5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH
+	db 1 ; object events
+	object_event  9,  5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH
diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm
index c9982b094..4a57e3d2a 100644
--- a/maps/TohjoFalls.asm
+++ b/maps/TohjoFalls.asm
@@ -1,31 +1,24 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TOHJOFALLS_POKE_BALL
 
 TohjoFalls_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TohjoFallsMoonStone:
 	itemball MOON_STONE
 
 TohjoFalls_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 13, 15, 2, ROUTE_27
-	warp_def 25, 15, 3, ROUTE_27
+	db 2 ; warp events
+	warp_event 13, 15, ROUTE_27, 2
+	warp_event 25, 15, ROUTE_27, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE
+	db 1 ; object events
+	object_event  2,  6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 62232df4f..51501c5b1 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TRADECENTER_CHRIS1
 	const TRADECENTER_CHRIS2
 
 TradeCenter_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .InitializeTradeCenter
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .InitializeTradeCenter ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 
 .InitializeTradeCenter:
@@ -20,7 +18,7 @@ TradeCenter_MapScripts:
 	end
 
 .SetWhichChris:
-	special Special_CableClubCheckWhichChris
+	special CableClubCheckWhichChris
 	iffalse .Chris2
 	disappear TRADECENTER_CHRIS2
 	appear TRADECENTER_CHRIS1
@@ -32,16 +30,17 @@ TradeCenter_MapScripts:
 	return
 
 .InitializeAndPreparePokecenter2F:
-	setscene 1
-	setmapscene POKECENTER_2F, 1
+	setscene SCENE_FINISHED
+	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
 	end
 
-MapTradeCenterSignpost1Script:
-	special Special_TradeCenter
+TradeCenterConsoleScript:
+	special TradeCenter
 	newloadmap MAPSETUP_LINKRETURN
 	end
 
-ChrisScript_0x19340b:
+TradeCenterFriendScript:
+; unreferenced
 	opentext
 	writetext .FriendReadyText
 	waitbutton
@@ -54,23 +53,18 @@ ChrisScript_0x19340b:
 	done
 
 TradeCenter_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 4, 7, 2, POKECENTER_2F
-	warp_def 5, 7, 2, POKECENTER_2F
+	db 2 ; warp events
+	warp_event  4,  7, POKECENTER_2F, 2
+	warp_event  5,  7, POKECENTER_2F, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script
-	bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script
+	db 2 ; bg events
+	bg_event  4,  4, BGEVENT_RIGHT, TradeCenterConsoleScript
+	bg_event  5,  4, BGEVENT_LEFT, TradeCenterConsoleScript
 
-.ObjectEvents:
-	db 2
-	object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
-	object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
+	db 2 ; object events
+	object_event  3,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	object_event  6,  4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm
index d3fcfca04..ca6827230 100644
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TRAINERHOUSE1F_RECEPTIONIST
 	const TRAINERHOUSE1F_COOLTRAINER_M
 	const TRAINERHOUSE1F_COOLTRAINER_F
@@ -6,11 +6,9 @@ const_value set 2
 	const TRAINERHOUSE1F_GENTLEMAN
 
 TrainerHouse1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerHouse1FReceptionistScript:
 	jumptextfaceplayer TrainerHouse1FReceptionistText
@@ -27,14 +25,14 @@ TrainerHouse1FYoungsterScript:
 TrainerHouse1FGentlemanScript:
 	jumptextfaceplayer TrainerHouse1FGentlemanText
 
-MapTrainerHouse1FSignpost0Script:
-	jumptext UnknownText_0x9b1f4
+TrainerHouseSign1:
+	jumptext TrainerHouseSign1Text
 
-MapTrainerHouse1FSignpost1Script:
-	jumptext UnknownText_0x9b25d
+TrainerHouseSign2:
+	jumptext TrainerHouseSign2Text
 
-MapTrainerHouse1FSignpost2Script:
-	jumptext UnknownText_0x9b2c1
+TrainerHouseIllegibleBook:
+	jumptext TrainerHouseIllegibleText
 
 TrainerHouse1FReceptionistText:
 	text "Welcome to TRAINER"
@@ -103,7 +101,7 @@ TrainerHouse1FGentlemanText:
 	cont "battles."
 	done
 
-UnknownText_0x9b1f4:
+TrainerHouseSign1Text:
 	text "Practice battles"
 	line "are held in the"
 
@@ -115,7 +113,7 @@ UnknownText_0x9b1f4:
 	cont "participate."
 	done
 
-UnknownText_0x9b25d:
+TrainerHouseSign2Text:
 	text "There are no rules"
 	line "or regulations for"
 
@@ -126,7 +124,7 @@ UnknownText_0x9b25d:
 	line "goes!"
 	done
 
-UnknownText_0x9b2c1:
+TrainerHouseIllegibleText:
 	text "…What's this?"
 	line "A strategy memo?"
 
@@ -138,28 +136,23 @@ UnknownText_0x9b2c1:
 	done
 
 TrainerHouse1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 2, 13, 3, VIRIDIAN_CITY
-	warp_def 3, 13, 3, VIRIDIAN_CITY
-	warp_def 8, 2, 1, TRAINER_HOUSE_B1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 5, 0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script
-	bg_event 7, 0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script
-	bg_event 7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script
-
-.ObjectEvents:
-	db 5
-	object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1
-	object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1
-	object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1
-	object_event 4, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1
-	object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  2, 13, VIRIDIAN_CITY, 3
+	warp_event  3, 13, VIRIDIAN_CITY, 3
+	warp_event  8,  2, TRAINER_HOUSE_B1F, 1
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event  5,  0, BGEVENT_READ, TrainerHouseSign1
+	bg_event  7,  0, BGEVENT_READ, TrainerHouseSign2
+	bg_event  7, 10, BGEVENT_READ, TrainerHouseIllegibleBook
+
+	db 5 ; object events
+	object_event  0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1
+	object_event  7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1
+	object_event  6,  2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1
+	object_event  4,  8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1
+	object_event  2,  4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index bab0a5b66..b37be60a7 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -1,26 +1,24 @@
-const_value set 2
+	const_def 2 ; object constants
 	const TRAINERHOUSEB1F_RECEPTIONIST
 	const TRAINERHOUSEB1F_CHRIS
 
 TrainerHouseB1F_MapScripts:
-.SceneScripts:
-	db 1
-	scene_script .DummyScene
+	db 1 ; scene scripts
+	scene_script .DummyScene ; SCENE_DEFAULT
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene:
 	end
 
 TrainerHouseReceptionistScript:
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	opentext
 	checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
 	iftrue .FoughtTooManyTimes
 	writetext TrainerHouseB1FIntroText
 	buttonsound
-	special Special_TrainerHouse
+	special TrainerHouse
 	iffalse .GetCal3Name
 	trainertotext CAL, CAL2, MEM_BUFFER_0
 	jump .GotName
@@ -42,7 +40,7 @@ TrainerHouseReceptionistScript:
 	writetext TrainerHouseB1FCalBeforeText
 	waitbutton
 	closetext
-	special Special_TrainerHouse
+	special TrainerHouse
 	iffalse .NoSpecialBattle
 	winlosstext TrainerHouseB1FCalBeatenText, 0
 	setlasttalked TRAINERHOUSEB1F_CHRIS
@@ -170,21 +168,16 @@ TrainerHouseB1FCalBeforeText:
 	done
 
 TrainerHouseB1F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 9, 4, 3, TRAINER_HOUSE_1F
+	db 1 ; warp events
+	warp_event  9,  4, TRAINER_HOUSE_1F, 3
 
-.CoordEvents:
-	db 1
-	coord_event 7, 3, 0, TrainerHouseReceptionistScript
+	db 1 ; coord events
+	coord_event  7,  3, SCENE_DEFAULT, TrainerHouseReceptionistScript
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 7, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
-	object_event 6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	db 2 ; object events
+	object_event  7,  1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
+	object_event  6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm
index 6834c043e..72e8cd749 100644
--- a/maps/UndergroundPath.asm
+++ b/maps/UndergroundPath.asm
@@ -1,32 +1,25 @@
 UndergroundPath_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 UndergroundPathHiddenFullRestore:
-	hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE
+	hiddenitem FULL_RESTORE, EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE
 
 UndergroundPathHiddenXSpecial:
-	hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL
+	hiddenitem X_SPECIAL, EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL
 
 UndergroundPath_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
-	warp_def 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE
+	db 2 ; warp events
+	warp_event  3,  2, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 3
+	warp_event  3, 24, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 2
-	bg_event 3, 9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore
-	bg_event 1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial
+	db 2 ; bg events
+	bg_event  3,  9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore
+	bg_event  1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
index 77ed8bbb6..f978c8c66 100644
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const UNIONCAVE1F_POKEFAN_M1
 	const UNIONCAVE1F_SUPER_NERD
 	const UNIONCAVE1F_POKEFAN_M2
@@ -10,17 +10,15 @@ const_value set 2
 	const UNIONCAVE1F_POKE_BALL4
 
 UnionCave1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerPokemaniacLarry:
-	trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script
+	trainer POKEMANIAC, LARRY, EVENT_BEAT_POKEMANIAC_LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacLarryAfterBattleText
 	waitbutton
@@ -28,10 +26,10 @@ TrainerPokemaniacLarry:
 	end
 
 TrainerHikerRussell:
-	trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script
+	trainer HIKER, RUSSELL, EVENT_BEAT_HIKER_RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerRussellAfterBattleText
 	waitbutton
@@ -39,10 +37,10 @@ TrainerHikerRussell:
 	end
 
 TrainerHikerDaniel:
-	trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script
+	trainer HIKER, DANIEL, EVENT_BEAT_HIKER_DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerDanielAfterBattleText
 	waitbutton
@@ -50,10 +48,10 @@ TrainerHikerDaniel:
 	end
 
 TrainerFirebreatherBill:
-	trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script
+	trainer FIREBREATHER, BILL, EVENT_BEAT_FIREBREATHER_BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherBillAfterBattleText
 	waitbutton
@@ -61,10 +59,10 @@ TrainerFirebreatherBill:
 	end
 
 TrainerFirebreatherRay:
-	trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script
+	trainer FIREBREATHER, RAY, EVENT_BEAT_FIREBREATHER_RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext FirebreatherRayAfterBattleText
 	waitbutton
@@ -83,8 +81,9 @@ UnionCave1FPotion:
 UnionCave1FAwakening:
 	itemball AWAKENING
 
-UnknownScript_0x59c08:
-	jumptext UnknownText_0x59f29
+UnionCave1FUnusedSign:
+; unused
+	jumptext UnionCave1FUnusedSignText
 
 HikerRussellSeenText:
 	text "You're headed to"
@@ -195,35 +194,30 @@ FirebreatherRayAfterBattleText:
 	cont "up this cave."
 	done
 
-UnknownText_0x59f29:
+UnionCave1FUnusedSignText:
 	text "UNION CAVE"
 	done
 
 UnionCave1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 5, 19, 3, UNION_CAVE_B1F
-	warp_def 3, 33, 4, UNION_CAVE_B1F
-	warp_def 17, 31, 1, ROUTE_33
-	warp_def 17, 3, 4, ROUTE_32
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 9
-	object_event 3, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1
-	object_event 4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1
-	object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  5, 19, UNION_CAVE_B1F, 3
+	warp_event  3, 33, UNION_CAVE_B1F, 4
+	warp_event 17, 31, ROUTE_33, 1
+	warp_event 17,  3, ROUTE_32, 4
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 9 ; object events
+	object_event  3,  6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1
+	object_event  4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1
+	object_event 11,  8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1
 	object_event 15, 27, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherRay, -1
 	object_event 14, 19, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherBill, -1
-	object_event 17, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL
-	object_event 4, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK
-	object_event 4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION
-	object_event 12, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING
+	object_event 17, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL
+	object_event  4,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK
+	object_event  4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION
+	object_event 12, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING
diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
index 980855221..10ed31e30 100644
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const UNIONCAVEB1F_POKEFAN_M1
 	const UNIONCAVEB1F_POKEFAN_M2
 	const UNIONCAVEB1F_SUPER_NERD1
@@ -8,17 +8,15 @@ const_value set 2
 	const UNIONCAVEB1F_POKE_BALL2
 
 UnionCaveB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 TrainerPokemaniacAndrew:
-	trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script
+	trainer POKEMANIAC, ANDREW, EVENT_BEAT_POKEMANIAC_ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacAndrewAfterBattleText
 	waitbutton
@@ -26,10 +24,10 @@ TrainerPokemaniacAndrew:
 	end
 
 TrainerPokemaniacCalvin:
-	trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script
+	trainer POKEMANIAC, CALVIN, EVENT_BEAT_POKEMANIAC_CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext PokemaniacCalvinAfterBattleText
 	waitbutton
@@ -37,10 +35,10 @@ TrainerPokemaniacCalvin:
 	end
 
 TrainerHikerPhillip:
-	trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script
+	trainer HIKER, PHILLIP, EVENT_BEAT_HIKER_PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerPhillipAfterBattleText
 	waitbutton
@@ -48,10 +46,10 @@ TrainerHikerPhillip:
 	end
 
 TrainerHikerLeonard:
-	trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script
+	trainer HIKER, LEONARD, EVENT_BEAT_HIKER_LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext HikerLeonardAfterBattleText
 	waitbutton
@@ -153,29 +151,24 @@ PokemaniacCalvinAfterBattleText:
 	done
 
 UnionCaveB1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 3, 3, 7, RUINS_OF_ALPH_OUTSIDE
-	warp_def 3, 11, 8, RUINS_OF_ALPH_OUTSIDE
-	warp_def 7, 19, 1, UNION_CAVE_1F
-	warp_def 3, 33, 2, UNION_CAVE_1F
-	warp_def 17, 31, 1, UNION_CAVE_B2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 7
-	object_event 9, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1
-	object_event 16, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1
-	object_event 5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  3,  3, RUINS_OF_ALPH_OUTSIDE, 7
+	warp_event  3, 11, RUINS_OF_ALPH_OUTSIDE, 8
+	warp_event  7, 19, UNION_CAVE_1F, 1
+	warp_event  3, 33, UNION_CAVE_1F, 2
+	warp_event 17, 31, UNION_CAVE_B2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 7 ; object events
+	object_event  9,  4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1
+	object_event 16,  7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1
+	object_event  5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1
 	object_event 17, 30, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1
-	object_event 2, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT
-	object_event 7, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1
-	object_event 17, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND
+	object_event  2, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT
+	object_event  7, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1
+	object_event 17, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index 5f2baabf2..2c3b63973 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const UNIONCAVEB2F_ROCKER
 	const UNIONCAVEB2F_COOLTRAINER_F1
 	const UNIONCAVEB2F_COOLTRAINER_F2
@@ -7,18 +7,16 @@ const_value set 2
 	const UNIONCAVEB2F_LAPRAS
 
 UnionCaveB2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Lapras
 
 .Lapras:
 	checkflag ENGINE_UNION_CAVE_LAPRAS
 	iftrue .NoAppear
 	checkcode VAR_WEEKDAY
-	if_equal FRIDAY, .Appear
+	ifequal FRIDAY, .Appear
 .NoAppear:
 	disappear UNIONCAVEB2F_LAPRAS
 	return
@@ -38,10 +36,10 @@ UnionCaveLapras:
 	end
 
 TrainerCooltrainermNick:
-	trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script
+	trainer COOLTRAINERM, NICK, EVENT_BEAT_COOLTRAINERM_NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainermNickAfterBattleText
 	waitbutton
@@ -49,10 +47,10 @@ TrainerCooltrainermNick:
 	end
 
 TrainerCooltrainerfGwen:
-	trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script
+	trainer COOLTRAINERF, GWEN, EVENT_BEAT_COOLTRAINERF_GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfGwenAfterBattleText
 	waitbutton
@@ -60,10 +58,10 @@ TrainerCooltrainerfGwen:
 	end
 
 TrainerCooltrainerfEmma:
-	trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script
+	trainer COOLTRAINERF, EMMA, EVENT_BEAT_COOLTRAINERF_EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext CooltrainerfEmmaAfterBattleText
 	waitbutton
@@ -142,24 +140,19 @@ CooltrainerfEmmaAfterBattleText:
 	done
 
 UnionCaveB2F_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 5, 3, 5, UNION_CAVE_B1F
+	db 1 ; warp events
+	warp_event  5,  3, UNION_CAVE_B1F, 5
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 6
+	db 6 ; object events
 	object_event 15, 19, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1
-	object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1
-	object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1
-	object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER
-	object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION
-	object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS
+	object_event  5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1
+	object_event  3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1
+	object_event 16,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER
+	object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION
+	object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_SWIM_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index 2430b97d3..26caecfec 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VERMILIONCITY_TEACHER
 	const VERMILIONCITY_GRAMPS
 	const VERMILIONCITY_MACHOP
@@ -7,11 +7,9 @@ const_value set 2
 	const VERMILIONCITY_POKEFAN_M
 
 VermilionCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -42,14 +40,14 @@ VermilionCitySuperNerdScript:
 
 VermilionSnorlax:
 	opentext
-	special Special_SnorlaxAwake
-	iftrue UnknownScript_0x1aa9ab
+	special SnorlaxAwake
+	iftrue .Awake
 	writetext UnknownText_0x1aab64
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x1aa9ab:
+.Awake:
 	writetext UnknownText_0x1aab84
 	pause 15
 	cry SNORLAX
@@ -68,9 +66,9 @@ VermilionGymBadgeGuy:
 	checkevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY
 	iftrue .AlreadyGotItem
 	checkcode VAR_BADGES
-	if_equal NUM_BADGES, .AllBadges
-	if_greater_than 13, .MostBadges
-	if_greater_than 9, .SomeBadges
+	ifequal NUM_BADGES, .AllBadges
+	ifgreater 13, .MostBadges
+	ifgreater 9, .SomeBadges
 	writetext UnknownText_0x1aabc8
 	waitbutton
 	closetext
@@ -123,7 +121,7 @@ VermilionCityMartSign:
 	jumpstd martsign
 
 VermilionCityHiddenFullHeal:
-	hiddenitem EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL
+	hiddenitem FULL_HEAL, EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL
 
 VermilionCityTeacherText:
 	text "VERMILION PORT is"
@@ -268,41 +266,36 @@ VermilionCityPortSignText:
 	done
 
 VermilionCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 10
-	warp_def 5, 5, 1, VERMILION_HOUSE_FISHING_SPEECH_HOUSE
-	warp_def 9, 5, 1, VERMILION_POKECENTER_1F
-	warp_def 7, 13, 1, POKEMON_FAN_CLUB
-	warp_def 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE
-	warp_def 21, 13, 2, VERMILION_MART
-	warp_def 21, 17, 1, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE
-	warp_def 10, 19, 1, VERMILION_GYM
-	warp_def 19, 31, 1, VERMILION_PORT_PASSAGE
-	warp_def 20, 31, 2, VERMILION_PORT_PASSAGE
-	warp_def 34, 7, 1, DIGLETTS_CAVE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 8
-	bg_event 25, 3, BGEVENT_READ, VermilionCitySign
-	bg_event 5, 19, BGEVENT_READ, VermilionGymSign
-	bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign
-	bg_event 33, 9, BGEVENT_READ, VermilionCityDiglettsCaveSign
+	db 0, 0 ; filler
+
+	db 10 ; warp events
+	warp_event  5,  5, VERMILION_FISHING_SPEECH_HOUSE, 1
+	warp_event  9,  5, VERMILION_POKECENTER_1F, 1
+	warp_event  7, 13, POKEMON_FAN_CLUB, 1
+	warp_event 13, 13, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 1
+	warp_event 21, 13, VERMILION_MART, 2
+	warp_event 21, 17, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 1
+	warp_event 10, 19, VERMILION_GYM, 1
+	warp_event 19, 31, VERMILION_PORT_PASSAGE, 1
+	warp_event 20, 31, VERMILION_PORT_PASSAGE, 2
+	warp_event 34,  7, DIGLETTS_CAVE, 1
+
+	db 0 ; coord events
+
+	db 8 ; bg events
+	bg_event 25,  3, BGEVENT_READ, VermilionCitySign
+	bg_event  5, 19, BGEVENT_READ, VermilionGymSign
+	bg_event  5, 13, BGEVENT_READ, PokemonFanClubSign
+	bg_event 33,  9, BGEVENT_READ, VermilionCityDiglettsCaveSign
 	bg_event 27, 15, BGEVENT_READ, VermilionCityPortSign
-	bg_event 10, 5, BGEVENT_READ, VermilionCityPokecenterSign
+	bg_event 10,  5, BGEVENT_READ, VermilionCityPokecenterSign
 	bg_event 22, 13, BGEVENT_READ, VermilionCityMartSign
 	bg_event 12, 19, BGEVENT_ITEM, VermilionCityHiddenFullHeal
 
-.ObjectEvents:
-	db 6
-	object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1
-	object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1
-	object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1
+	db 6 ; object events
+	object_event 18,  9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1
+	object_event 23,  6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1
+	object_event 26,  7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1
 	object_event 14, 16, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1
-	object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
+	object_event 34,  8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX
 	object_event 31, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1
diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm
new file mode 100644
index 000000000..e6225afa5
--- /dev/null
+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm
@@ -0,0 +1,33 @@
+	const_def 2 ; object constants
+	const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
+
+VermilionDiglettsCaveSpeechHouse_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+VermilionDiglettsCaveSpeechHouseGentlemanScript:
+	jumptextfaceplayer VermilionDiglettsCaveSpeechHouseGentlemanText
+
+VermilionDiglettsCaveSpeechHouseGentlemanText:
+	text "Over many years,"
+	line "DIGLETT dug a"
+	cont "large tunnel."
+
+	para "That tunnel goes"
+	line "to a distant town."
+	done
+
+VermilionDiglettsCaveSpeechHouse_MapEvents:
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, VERMILION_CITY, 6
+	warp_event  3,  7, VERMILION_CITY, 6
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event  1,  3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1
diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm
index 72ed1ba4a..dd333af75 100644
--- a/maps/VermilionHouseFishingSpeechHouse.asm
+++ b/maps/VermilionFishingSpeechHouse.asm
@@ -1,12 +1,10 @@
-const_value set 2
-	const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU
+	const_def 2 ; object constants
+	const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU
 
-VermilionHouseFishingSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+VermilionFishingSpeechHouse_MapScripts:
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 FishingDude:
 	jumptextfaceplayer FishingDudeText
@@ -50,22 +48,17 @@ FishingDudesHousePhotoText:
 	line "great time…"
 	done
 
-VermilionHouseFishingSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+VermilionFishingSpeechHouse_MapEvents:
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, VERMILION_CITY
-	warp_def 3, 7, 1, VERMILION_CITY
+	db 2 ; warp events
+	warp_event  2,  7, VERMILION_CITY, 1
+	warp_event  3,  7, VERMILION_CITY, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 1
-	bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto
+	db 1 ; bg events
+	bg_event  3,  0, BGEVENT_READ, FishingDudesHousePhoto
 
-.ObjectEvents:
-	db 1
-	object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1
+	db 1 ; object events
+	object_event  2,  4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1
diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm
index 31f19615d..aa81430a9 100644
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VERMILIONGYM_SURGE
 	const VERMILIONGYM_GENTLEMAN
 	const VERMILIONGYM_ROCKER
@@ -6,13 +6,11 @@ const_value set 2
 	const VERMILIONGYM_GYM_GUY
 
 VermilionGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-SurgeScript_0x1920a5:
+VermilionGymSurgeScript:
 	faceplayer
 	opentext
 	checkflag ENGINE_THUNDERBADGE
@@ -45,10 +43,10 @@ SurgeScript_0x1920a5:
 	end
 
 TrainerGentlemanGregory:
-	trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script
+	trainer GENTLEMAN, GREGORY, EVENT_BEAT_GENTLEMAN_GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GentlemanGregoryAfterBattleText
 	waitbutton
@@ -56,10 +54,10 @@ TrainerGentlemanGregory:
 	end
 
 TrainerGuitaristVincent:
-	trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script
+	trainer GUITARIST, VINCENT, EVENT_BEAT_GUITARIST_VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext GuitaristVincentAfterBattleText
 	waitbutton
@@ -67,10 +65,10 @@ TrainerGuitaristVincent:
 	end
 
 TrainerJugglerHorton:
-	trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script
+	trainer JUGGLER, HORTON, EVENT_BEAT_JUGGLER_HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext JugglerHortonAfterBattleText
 	waitbutton
@@ -93,8 +91,8 @@ VermilionGymGuyScript:
 	closetext
 	end
 
-MapVermilionGymSignpost14Script:
-	jumptext UnknownText_0x19261e
+VermilionGymTrashCan:
+	jumptext VermilionGymTrashCanText
 
 VermilionGymStatue:
 	checkflag ENGINE_THUNDERBADGE
@@ -255,47 +253,42 @@ VermilionGymGuyWinText:
 	line "nervous."
 	done
 
-UnknownText_0x19261e:
+VermilionGymTrashCanText:
 	text "Nope! Nothing here"
 	line "but trash."
 	done
 
 VermilionGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 17, 7, VERMILION_CITY
-	warp_def 5, 17, 7, VERMILION_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 17
-	bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 1, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 3, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 5, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 1, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 3, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 5, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 7, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 9, 11, BGEVENT_READ, MapVermilionGymSignpost14Script
-	bg_event 3, 15, BGEVENT_READ, VermilionGymStatue
-	bg_event 6, 15, BGEVENT_READ, VermilionGymStatue
-
-.ObjectEvents:
-	db 5
-	object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1
-	object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1
-	object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1
-	object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1
-	object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 17, VERMILION_CITY, 7
+	warp_event  5, 17, VERMILION_CITY, 7
+
+	db 0 ; coord events
+
+	db 17 ; bg events
+	bg_event  1,  7, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  3,  7, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  5,  7, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  7,  7, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  9,  7, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  1,  9, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  3,  9, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  5,  9, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  7,  9, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  9,  9, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  1, 11, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  3, 11, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  5, 11, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  7, 11, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  9, 11, BGEVENT_READ, VermilionGymTrashCan
+	bg_event  3, 15, BGEVENT_READ, VermilionGymStatue
+	bg_event  6, 15, BGEVENT_READ, VermilionGymStatue
+
+	db 5 ; object events
+	object_event  5,  2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, VermilionGymSurgeScript, -1
+	object_event  8,  8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1
+	object_event  4,  7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1
+	object_event  0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1
+	object_event  7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1
diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
deleted file mode 100644
index 718d5e005..000000000
--- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
+++ /dev/null
@@ -1,40 +0,0 @@
-const_value set 2
-	const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
-
-VermilionHouseDiglettsCaveSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 0
-
-VermilionHouseDiglettsCaveSpeechHouseGentlemanScript:
-	jumptextfaceplayer VermilionHouseDiglettsCaveSpeechHouseGentlemanText
-
-VermilionHouseDiglettsCaveSpeechHouseGentlemanText:
-	text "Over many years,"
-	line "DIGLETT dug a"
-	cont "large tunnel."
-
-	para "That tunnel goes"
-	line "to a distant town."
-	done
-
-VermilionHouseDiglettsCaveSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 6, VERMILION_CITY
-	warp_def 3, 7, 6, VERMILION_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1
diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
index e2ba0b77c..db7f34db7 100644
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F
 	const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER
 
 VermilionMagnetTrainSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VermilionMagnetTrainSpeechHousePokefanFScript:
 	jumptextfaceplayer VermilionMagnetTrainSpeechHousePokefanFText
@@ -34,23 +32,18 @@ VermilionMagnetTrainSpeechHouseYoungsterText:
 	done
 
 VermilionMagnetTrainSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 4, VERMILION_CITY
-	warp_def 3, 7, 4, VERMILION_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
-
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1
-	object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, VERMILION_CITY, 4
+	warp_event  3,  7, VERMILION_CITY, 4
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  0,  1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
+	bg_event  1,  1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf
+
+	db 2 ; object events
+	object_event  2,  3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1
+	object_event  0,  3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
index b72ea6aec..a258df7bf 100644
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VERMILIONMART_CLERK
 	const VERMILIONMART_SUPER_NERD
 	const VERMILIONMART_BUENA
 
 VermilionMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x191f7e:
+VermilionMartClerkScript:
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_VERMILION
 	closetext
@@ -37,22 +35,17 @@ VermilionMartBuenaText:
 	done
 
 VermilionMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 5, VERMILION_CITY
-	warp_def 3, 7, 5, VERMILION_CITY
+	db 2 ; warp events
+	warp_event  2,  7, VERMILION_CITY, 5
+	warp_event  3,  7, VERMILION_CITY, 5
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1
-	object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
-	object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMartClerkScript, -1
+	object_event  5,  2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
+	object_event  8,  6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1
diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm
index 43821efdc..c5ab46c3d 100644
--- a/maps/VermilionPokecenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -1,31 +1,29 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VERMILIONPOKECENTER1F_NURSE
 	const VERMILIONPOKECENTER1F_FISHING_GURU
 	const VERMILIONPOKECENTER1F_SAILOR
 	const VERMILIONPOKECENTER1F_BUG_CATCHER
 
 VermilionPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x191603:
+VermilionPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
-FishingGuruScript_0x191606:
+VermilionPokecenter1FFishingGuruScript:
 	faceplayer
 	opentext
 	checkevent EVENT_FOUGHT_SNORLAX
-	iftrue UnknownScript_0x191614
-	writetext UnknownText_0x191620
+	iftrue .FoughtSnorlax
+	writetext VermilionPokecenter1FFishingGuruText
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x191614:
-	writetext UnknownText_0x191698
+.FoughtSnorlax:
+	writetext VermilionPokecenter1FFishingGuruText_FoughtSnorlax
 	waitbutton
 	closetext
 	end
@@ -36,7 +34,7 @@ VermilionPokecenter1FSailorScript:
 VermilionPokecenter1FBugCatcherScript:
 	jumptextfaceplayer VermilionPokecenter1FBugCatcherText
 
-UnknownText_0x191620:
+VermilionPokecenter1FFishingGuruText:
 	text "A sleeping #MON"
 	line "is lying in front"
 	cont "of DIGLETT'S CAVE."
@@ -48,7 +46,7 @@ UnknownText_0x191620:
 	line "wake it up?"
 	done
 
-UnknownText_0x191698:
+VermilionPokecenter1FFishingGuruText_FoughtSnorlax:
 	text "There used to be a"
 	line "sleeping #MON"
 
@@ -77,24 +75,19 @@ VermilionPokecenter1FBugCatcherText:
 	done
 
 VermilionPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 2, VERMILION_CITY
-	warp_def 4, 7, 2, VERMILION_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1
-	object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1
-	object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1
-	object_event 1, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, VERMILION_CITY, 2
+	warp_event  4,  7, VERMILION_CITY, 2
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FNurseScript, -1
+	object_event  7,  2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FFishingGuruScript, -1
+	object_event  6,  5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1
+	object_event  1,  5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1
diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm
index a82bd9e48..6bca09fd0 100644
--- a/maps/VermilionPokecenter2FBeta.asm
+++ b/maps/VermilionPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 VermilionPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VermilionPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 0, 7, 3, VERMILION_POKECENTER_1F
+	db 1 ; warp events
+	warp_event  0,  7, VERMILION_POKECENTER_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index f698ef9ea..cf21a05df 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VERMILIONPORT_SAILOR1
 	const VERMILIONPORT_SAILOR2
 	const VERMILIONPORT_SUPER_NERD
 
 VermilionPort_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .LeaveFastShip
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_LEAVE_SHIP
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .DummyScene0:
@@ -27,32 +25,32 @@ VermilionPort_MapScripts:
 .LeaveFastShipScript:
 	applymovement PLAYER, MovementData_0x74ef3
 	appear VERMILIONPORT_SAILOR1
-	setscene 0
+	setscene SCENE_DEFAULT
 	setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
 	setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
 	setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
 	clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
 	setevent EVENT_FAST_SHIP_FIRST_TIME
-	setevent EVENT_GAVE_KURT_APRICORNS
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	blackoutmod VERMILION_CITY
 	end
 
-SailorScript_0x74dc4:
+VermilionPortSailorAtGangwayScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iftrue UnknownScript_0x74e1a
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iftrue VermilionPortAlreadyRodeScript
 	writetext UnknownText_0x74f06
 	waitbutton
 	closetext
-	spriteface VERMILIONPORT_SAILOR1, DOWN
+	turnobject VERMILIONPORT_SAILOR1, DOWN
 	pause 10
 	playsound SFX_EXIT_BUILDING
 	disappear VERMILIONPORT_SAILOR1
 	waitsfx
 	applymovement PLAYER, MovementData_0x74ef1
 	playsound SFX_EXIT_BUILDING
-	special Special_FadeOutPalettes
+	special FadeOutPalettes
 	waitsfx
 	setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
 	clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
@@ -68,105 +66,105 @@ SailorScript_0x74dc4:
 	clearevent EVENT_BEAT_SCHOOLBOY_RICKY
 	setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
 	appear VERMILIONPORT_SAILOR1
-	setmapscene FAST_SHIP_1F, 1
+	setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_ENTER_SHIP
 	warp FAST_SHIP_1F, 25, 1
 	end
 
-UnknownScript_0x74e1a:
+VermilionPortAlreadyRodeScript:
 	writetext UnknownText_0x74f31
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x74e20:
-	spriteface VERMILIONPORT_SAILOR2, RIGHT
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iftrue UnknownScript_0x74e86
-	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
-	iftrue UnknownScript_0x74e86
-	spriteface PLAYER, LEFT
+VermilionPortWalkUpToShipScript:
+	turnobject VERMILIONPORT_SAILOR2, RIGHT
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iftrue .skip
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+	iftrue .skip
+	turnobject PLAYER, LEFT
 	opentext
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, UnknownScript_0x74e72
-	if_equal TUESDAY, UnknownScript_0x74e72
-	if_equal THURSDAY, UnknownScript_0x74e7c
-	if_equal FRIDAY, UnknownScript_0x74e7c
-	if_equal SATURDAY, UnknownScript_0x74e7c
+	ifequal MONDAY, .NextShipWednesday
+	ifequal TUESDAY, .NextShipWednesday
+	ifequal THURSDAY, .NextShipSunday
+	ifequal FRIDAY, .NextShipSunday
+	ifequal SATURDAY, .NextShipSunday
 	writetext UnknownText_0x74f4d
 	yesorno
-	iffalse UnknownScript_0x74e8d
+	iffalse VermilionPortNotRidingMoveAwayScript
 	writetext UnknownText_0x74f8b
 	buttonsound
 	checkitem S_S_TICKET
-	iffalse UnknownScript_0x74e68
-	writetext UnknownText_0x74fc2
+	iffalse .NoTicket
+	writetext VermilionPortSSTicketText
 	waitbutton
 	closetext
-	setevent EVENT_RECEIVED_BALLS_FROM_KURT
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	applymovement PLAYER, MovementData_0x74ef8
-	jump SailorScript_0x74dc4
+	jump VermilionPortSailorAtGangwayScript
 
-UnknownScript_0x74e68:
+.NoTicket:
 	writetext UnknownText_0x74ff2
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x74ef5
 	end
 
-UnknownScript_0x74e72:
+.NextShipWednesday:
 	writetext UnknownText_0x75059
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x74ef5
 	end
 
-UnknownScript_0x74e7c:
+.NextShipSunday:
 	writetext UnknownText_0x75080
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x74ef5
 	end
 
-UnknownScript_0x74e86:
+.skip:
 	end
 
-UnknownScript_0x74e87:
+VermilionPortNotRidingScript:
 	writetext UnknownText_0x74fa7
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x74e8d:
+VermilionPortNotRidingMoveAwayScript:
 	writetext UnknownText_0x74fa7
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x74ef5
 	end
 
-SailorScript_0x74e97:
+VermilionPortSailorScript:
 	faceplayer
 	opentext
-	checkevent EVENT_GAVE_KURT_APRICORNS
-	iftrue UnknownScript_0x74e1a
+	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
+	iftrue VermilionPortAlreadyRodeScript
 	checkcode VAR_WEEKDAY
-	if_equal MONDAY, .NextShipWednesday
-	if_equal TUESDAY, .NextShipWednesday
-	if_equal THURSDAY, .NextShipSunday
-	if_equal FRIDAY, .NextShipSunday
-	if_equal SATURDAY, .NextShipSunday
+	ifequal MONDAY, .NextShipWednesday
+	ifequal TUESDAY, .NextShipWednesday
+	ifequal THURSDAY, .NextShipSunday
+	ifequal FRIDAY, .NextShipSunday
+	ifequal SATURDAY, .NextShipSunday
 	writetext UnknownText_0x74f4d
 	yesorno
-	iffalse UnknownScript_0x74e87
+	iffalse VermilionPortNotRidingScript
 	writetext UnknownText_0x74f8b
 	buttonsound
 	checkitem S_S_TICKET
 	iffalse .NoTicket
-	writetext UnknownText_0x74fc2
+	writetext VermilionPortSSTicketText
 	waitbutton
 	closetext
-	setevent EVENT_RECEIVED_BALLS_FROM_KURT
+	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	applymovement PLAYER, MovementData_0x74efe
-	jump SailorScript_0x74dc4
+	jump VermilionPortSailorAtGangwayScript
 
 .NoTicket:
 	writetext UnknownText_0x74ff2
@@ -186,7 +184,7 @@ SailorScript_0x74e97:
 	closetext
 	end
 
-SuperNerdScript_0x74ee6:
+VermilionPortSuperNerdScript:
 	faceplayer
 	opentext
 	writetext UnknownText_0x750a6
@@ -195,7 +193,7 @@ SuperNerdScript_0x74ee6:
 	end
 
 VermilionPortHiddenIron:
-	hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON
+	hiddenitem IRON, EVENT_VERMILION_PORT_HIDDEN_IRON
 
 MovementData_0x74ef1:
 	step DOWN
@@ -257,7 +255,7 @@ UnknownText_0x74fa7:
 	line "again!"
 	done
 
-UnknownText_0x74fc2:
+VermilionPortSSTicketText:
 	text "<PLAYER> flashed"
 	line "the S.S.TICKET."
 
@@ -299,24 +297,19 @@ UnknownText_0x750a6:
 	done
 
 VermilionPort_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 9, 5, 5, VERMILION_PORT_PASSAGE
-	warp_def 7, 17, 1, FAST_SHIP_1F
+	db 2 ; warp events
+	warp_event  9,  5, VERMILION_PORT_PASSAGE, 5
+	warp_event  7, 17, FAST_SHIP_1F, 1
 
-.CoordEvents:
-	db 1
-	coord_event 7, 11, 0, UnknownScript_0x74e20
+	db 1 ; coord events
+	coord_event  7, 11, SCENE_DEFAULT, VermilionPortWalkUpToShipScript
 
-.BGEvents:
-	db 1
+	db 1 ; bg events
 	bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron
 
-.ObjectEvents:
-	db 3
-	object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
-	object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1
-	object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1
+	db 3 ; object events
+	object_event  7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorAtGangwayScript, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
+	object_event  6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorScript, -1
+	object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSuperNerdScript, -1
diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm
index 1e078e525..1ea12457a 100644
--- a/maps/VermilionPortPassage.asm
+++ b/maps/VermilionPortPassage.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VERMILIONPORTPASSAGE_TEACHER
 
 VermilionPortPassage_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VermilionPortPassageTeacherScript:
 	jumptextfaceplayer VermilionPortPassageTeacherText
@@ -19,23 +17,18 @@ VermilionPortPassageTeacherText:
 	done
 
 VermilionPortPassage_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 15, 0, 8, VERMILION_CITY
-	warp_def 16, 0, 9, VERMILION_CITY
-	warp_def 15, 4, 4, VERMILION_PORT_PASSAGE
-	warp_def 3, 2, 3, VERMILION_PORT_PASSAGE
-	warp_def 3, 14, 1, VERMILION_PORT
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event 15,  0, VERMILION_CITY, 8
+	warp_event 16,  0, VERMILION_CITY, 9
+	warp_event 15,  4, VERMILION_PORT_PASSAGE, 4
+	warp_event  3,  2, VERMILION_PORT_PASSAGE, 3
+	warp_event  3, 14, VERMILION_PORT, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event 17,  1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index e0389faeb..065b3335a 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VICTORYROAD_SILVER
 	const VICTORYROAD_POKE_BALL1
 	const VICTORYROAD_POKE_BALL2
@@ -7,13 +7,11 @@ const_value set 2
 	const VICTORYROAD_POKE_BALL5
 
 VictoryRoad_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -21,77 +19,77 @@ VictoryRoad_MapScripts:
 .DummyScene1:
 	end
 
-UnknownScript_0x74492:
+VictoryRoadRivalLeft:
 	moveobject VICTORYROAD_SILVER, 18, 11
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	appear VICTORYROAD_SILVER
 	applymovement VICTORYROAD_SILVER, MovementData_0x74539
-	scall UnknownScript_0x744d4
+	scall VictoryRoadRivalNext
 	applymovement VICTORYROAD_SILVER, MovementData_0x7454c
 	disappear VICTORYROAD_SILVER
-	setscene 1
+	setscene SCENE_FINISHED
 	playmapmusic
 	end
 
-UnknownScript_0x744b5:
-	spriteface PLAYER, DOWN
+VictoryRoadRivalRight:
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
-	special Special_FadeOutMusic
+	special FadeOutMusic
 	pause 15
 	appear VICTORYROAD_SILVER
 	applymovement VICTORYROAD_SILVER, MovementData_0x74542
-	scall UnknownScript_0x744d4
+	scall VictoryRoadRivalNext
 	applymovement VICTORYROAD_SILVER, MovementData_0x74555
 	disappear VICTORYROAD_SILVER
-	setscene 1
+	setscene SCENE_FINISHED
 	playmapmusic
 	end
 
-UnknownScript_0x744d4:
-	spriteface PLAYER, DOWN
+VictoryRoadRivalNext:
+	turnobject PLAYER, DOWN
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
-	writetext UnknownText_0x7455f
+	writetext VictoryRoadRivalBeforeText
 	waitbutton
 	closetext
 	setevent EVENT_RIVAL_VICTORY_ROAD
 	checkevent EVENT_GOT_TOTODILE_FROM_ELM
-	iftrue UnknownScript_0x744ff
+	iftrue .GotTotodile
 	checkevent EVENT_GOT_CHIKORITA_FROM_ELM
-	iftrue UnknownScript_0x7450f
-	winlosstext UnknownText_0x7463d, UnknownText_0x747aa
+	iftrue .GotChikorita
+	winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
 	setlasttalked VICTORYROAD_SILVER
 	loadtrainer RIVAL1, RIVAL1_5_TOTODILE
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump UnknownScript_0x7451f
+	jump .AfterBattle
 
-UnknownScript_0x744ff:
-	winlosstext UnknownText_0x7463d, UnknownText_0x747aa
+.GotTotodile:
+	winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
 	setlasttalked VICTORYROAD_SILVER
 	loadtrainer RIVAL1, RIVAL1_5_CHIKORITA
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump UnknownScript_0x7451f
+	jump .AfterBattle
 
-UnknownScript_0x7450f:
-	winlosstext UnknownText_0x7463d, UnknownText_0x747aa
+.GotChikorita:
+	winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
 	setlasttalked VICTORYROAD_SILVER
 	loadtrainer RIVAL1, RIVAL1_5_CYNDAQUIL
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump UnknownScript_0x7451f
+	jump .AfterBattle
 
-UnknownScript_0x7451f:
+.AfterBattle:
 	playmusic MUSIC_RIVAL_AFTER
 	opentext
-	writetext UnknownText_0x746ce
+	writetext VictoryRoadRivalAfterText
 	waitbutton
 	closetext
 	end
@@ -112,10 +110,10 @@ VictoryRoadHPUp:
 	itemball HP_UP
 
 VictoryRoadHiddenMaxPotion:
-	hiddenitem EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION
+	hiddenitem MAX_POTION, EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION
 
 VictoryRoadHiddenFullHeal:
-	hiddenitem EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL
+	hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL
 
 MovementData_0x74539:
 	step LEFT
@@ -163,7 +161,7 @@ MovementData_0x74555:
 	step DOWN
 	step_end
 
-UnknownText_0x7455f:
+VictoryRoadRivalBeforeText:
 	text "Hold it."
 
 	para "…Are you going to"
@@ -189,7 +187,7 @@ UnknownText_0x7455f:
 	line "I challenge you!"
 	done
 
-UnknownText_0x7463d:
+VictoryRoadRivalDefeatText:
 	text "…I couldn't win…"
 
 	para "I gave it every-"
@@ -205,7 +203,7 @@ UnknownText_0x7463d:
 	line "said to me…"
 	done
 
-UnknownText_0x746ce:
+VictoryRoadRivalAfterText:
 	text "…I haven't given up"
 	line "on becoming the"
 	cont "greatest trainer…"
@@ -227,7 +225,7 @@ UnknownText_0x746ce:
 	line "at it until then."
 	done
 
-UnknownText_0x747aa:
+VictoryRoadRivalVictoryText:
 	text "…Humph!"
 
 	para "When it comes down"
@@ -239,37 +237,32 @@ UnknownText_0x747aa:
 	done
 
 VictoryRoad_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 10
-	warp_def 9, 67, 5, VICTORY_ROAD_GATE
-	warp_def 1, 49, 3, VICTORY_ROAD
-	warp_def 1, 35, 2, VICTORY_ROAD
-	warp_def 13, 31, 5, VICTORY_ROAD
-	warp_def 13, 17, 4, VICTORY_ROAD
-	warp_def 17, 33, 7, VICTORY_ROAD
-	warp_def 17, 19, 6, VICTORY_ROAD
-	warp_def 0, 11, 9, VICTORY_ROAD
-	warp_def 0, 27, 8, VICTORY_ROAD
-	warp_def 13, 5, 3, ROUTE_23
-
-.CoordEvents:
-	db 2
-	coord_event 12, 8, 0, UnknownScript_0x74492
-	coord_event 13, 8, 0, UnknownScript_0x744b5
-
-.BGEvents:
-	db 2
-	bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
-	bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal
-
-.ObjectEvents:
-	db 6
+	db 0, 0 ; filler
+
+	db 10 ; warp events
+	warp_event  9, 67, VICTORY_ROAD_GATE, 5
+	warp_event  1, 49, VICTORY_ROAD, 3
+	warp_event  1, 35, VICTORY_ROAD, 2
+	warp_event 13, 31, VICTORY_ROAD, 5
+	warp_event 13, 17, VICTORY_ROAD, 4
+	warp_event 17, 33, VICTORY_ROAD, 7
+	warp_event 17, 19, VICTORY_ROAD, 6
+	warp_event  0, 11, VICTORY_ROAD, 9
+	warp_event  0, 27, VICTORY_ROAD, 8
+	warp_event 13,  5, ROUTE_23, 3
+
+	db 2 ; coord events
+	coord_event 12,  8, SCENE_DEFAULT, VictoryRoadRivalLeft
+	coord_event 13,  8, SCENE_DEFAULT, VictoryRoadRivalRight
+
+	db 2 ; bg events
+	bg_event  3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion
+	bg_event  3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal
+
+	db 6 ; object events
 	object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
-	object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
-	object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
-	object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE
-	object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL
-	object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP
+	object_event  3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
+	object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
+	object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE
+	object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL
+	object_event  7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index b466a32b6..451bf9371 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VICTORYROADGATE_OFFICER
 	const VICTORYROADGATE_BLACK_BELT1
 	const VICTORYROADGATE_BLACK_BELT2
 
 VictoryRoadGate_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 .DummyScene0:
 	end
@@ -19,7 +17,7 @@ VictoryRoadGate_MapScripts:
 	end
 
 VictoryRoadGateBadgeCheckScene:
-	spriteface PLAYER, LEFT
+	turnobject PLAYER, LEFT
 	jump VictoryRoadGateBadgeCheckScript
 
 VictoryRoadGateOfficerScript:
@@ -29,7 +27,7 @@ VictoryRoadGateBadgeCheckScript:
 	writetext VictoryRoadGateOfficerText
 	buttonsound
 	checkcode VAR_BADGES
-	if_greater_than NUM_JOHTO_BADGES - 1, .AllEightBadges
+	ifgreater NUM_JOHTO_BADGES - 1, .AllEightBadges
 	writetext VictoryRoadGateNotEnoughBadgesText
 	waitbutton
 	closetext
@@ -40,7 +38,7 @@ VictoryRoadGateBadgeCheckScript:
 	writetext VictoryRoadGateEightBadgesText
 	waitbutton
 	closetext
-	setscene 1
+	setscene SCENE_FINISHED
 	end
 
 VictoryRoadGateLeftBlackBeltScript:
@@ -98,29 +96,24 @@ VictoryRoadGateRightBlackBeltText:
 	done
 
 VictoryRoadGate_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 8
-	warp_def 17, 7, 1, ROUTE_22
-	warp_def 18, 7, 1, ROUTE_22
-	warp_def 9, 17, 1, ROUTE_26
-	warp_def 10, 17, 1, ROUTE_26
-	warp_def 9, 0, 1, VICTORY_ROAD
-	warp_def 10, 0, 1, VICTORY_ROAD
-	warp_def 1, 7, 2, ROUTE_28
-	warp_def 2, 7, 2, ROUTE_28
-
-.CoordEvents:
-	db 1
-	coord_event 10, 11, 0, VictoryRoadGateBadgeCheckScene
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1
-	object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER
-	object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX
+	db 0, 0 ; filler
+
+	db 8 ; warp events
+	warp_event 17,  7, ROUTE_22, 1
+	warp_event 18,  7, ROUTE_22, 1
+	warp_event  9, 17, ROUTE_26, 1
+	warp_event 10, 17, ROUTE_26, 1
+	warp_event  9,  0, VICTORY_ROAD, 1
+	warp_event 10,  0, VICTORY_ROAD, 1
+	warp_event  1,  7, ROUTE_28, 2
+	warp_event  2,  7, ROUTE_28, 2
+
+	db 1 ; coord events
+	coord_event 10, 11, SCENE_DEFAULT, VictoryRoadGateBadgeCheckScene
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1
+	object_event  7,  5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER
+	object_event 12,  5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index 6890ffa8a..966d1f4ae 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VIOLETCITY_EARL
 	const VIOLETCITY_LASS
 	const VIOLETCITY_SUPER_NERD
@@ -9,11 +9,9 @@ const_value set 2
 	const VIOLETCITY_POKE_BALL2
 
 VioletCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -42,7 +40,7 @@ VioletCityEarlScript:
 	playmusic MUSIC_SHOW_ME_AROUND
 	follow VIOLETCITY_EARL, PLAYER
 	applymovement VIOLETCITY_EARL, VioletCityFollowEarl_MovementData
-	spriteface PLAYER, UP
+	turnobject PLAYER, UP
 	applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
 	stopfollow
 	special RestartMapMusic
@@ -94,11 +92,11 @@ VioletCityPPUp:
 VioletCityRareCandy:
 	itemball RARE_CANDY
 
-VioletCityFruitTreeScript:
+VioletCityFruitTree:
 	fruittree FRUITTREE_VIOLET_CITY
 
 VioletCityHiddenHyperPotion:
-	hiddenitem EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION
+	hiddenitem HYPER_POTION, EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION
 
 VioletCityFollowEarl_MovementData:
 	big_step DOWN
@@ -279,41 +277,36 @@ EarlsPokemonAcademySignText:
 	done
 
 VioletCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 9
-	warp_def 9, 17, 2, VIOLET_MART
-	warp_def 18, 17, 1, VIOLET_GYM
-	warp_def 30, 17, 1, EARLS_POKEMON_ACADEMY
-	warp_def 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE
-	warp_def 31, 25, 1, VIOLET_POKECENTER_1F
-	warp_def 21, 29, 1, VIOLET_KYLES_HOUSE
-	warp_def 23, 5, 1, SPROUT_TOWER_1F
-	warp_def 39, 24, 1, ROUTE_31_VIOLET_GATE
-	warp_def 39, 25, 2, ROUTE_31_VIOLET_GATE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 7
+	db 0, 0 ; filler
+
+	db 9 ; warp events
+	warp_event  9, 17, VIOLET_MART, 2
+	warp_event 18, 17, VIOLET_GYM, 1
+	warp_event 30, 17, EARLS_POKEMON_ACADEMY, 1
+	warp_event  3, 15, VIOLET_NICKNAME_SPEECH_HOUSE, 1
+	warp_event 31, 25, VIOLET_POKECENTER_1F, 1
+	warp_event 21, 29, VIOLET_KYLES_HOUSE, 1
+	warp_event 23,  5, SPROUT_TOWER_1F, 1
+	warp_event 39, 24, ROUTE_31_VIOLET_GATE, 1
+	warp_event 39, 25, ROUTE_31_VIOLET_GATE, 2
+
+	db 0 ; coord events
+
+	db 7 ; bg events
 	bg_event 24, 20, BGEVENT_READ, VioletCitySign
 	bg_event 15, 17, BGEVENT_READ, VioletGymSign
-	bg_event 24, 8, BGEVENT_READ, SproutTowerSign
+	bg_event 24,  8, BGEVENT_READ, SproutTowerSign
 	bg_event 27, 17, BGEVENT_READ, EarlsPokemonAcademySign
 	bg_event 32, 25, BGEVENT_READ, VioletCityPokecenterSign
 	bg_event 10, 17, BGEVENT_READ, VioletCityMartSign
 	bg_event 37, 14, BGEVENT_ITEM, VioletCityHiddenHyperPotion
 
-.ObjectEvents:
-	db 8
+	db 8 ; object events
 	object_event 13, 16, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL
 	object_event 28, 28, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1
 	object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1
 	object_event 17, 20, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1
-	object_event 5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1
-	object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1
-	object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP
-	object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY
+	object_event  5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1
+	object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTree, -1
+	object_event  4,  1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP
+	object_event 35,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 12480e21f..21e588b1d 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -1,17 +1,15 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VIOLETGYM_FALKNER
 	const VIOLETGYM_YOUNGSTER1
 	const VIOLETGYM_YOUNGSTER2
 	const VIOLETGYM_GYM_GUY
 
 VioletGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-FalknerScript_0x683c2:
+VioletGymFalknerScript:
 	faceplayer
 	opentext
 	checkevent EVENT_BEAT_FALKNER
@@ -36,7 +34,7 @@ FalknerScript_0x683c2:
 	iftrue .SpeechAfterTM
 	setevent EVENT_BEAT_BIRD_KEEPER_ROD
 	setevent EVENT_BEAT_BIRD_KEEPER_ABE
-	setmapscene ELMS_LAB, 2
+	setmapscene ELMS_LAB, SCENE_ELMSLAB_NOTHING
 	specialphonecall SPECIALCALL_ASSISTANT
 	writetext UnknownText_0x685c8
 	buttonsound
@@ -56,8 +54,8 @@ FalknerScript_0x683c2:
 	end
 
 VioletGymActivateRockets:
-	if_equal 7, .RadioTowerRockets
-	if_equal 6, .GoldenrodRockets
+	ifequal 7, .RadioTowerRockets
+	ifequal 6, .GoldenrodRockets
 	end
 
 .GoldenrodRockets:
@@ -67,10 +65,10 @@ VioletGymActivateRockets:
 	jumpstd radiotowerrockets
 
 TrainerBirdKeeperRod:
-	trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script
+	trainer BIRD_KEEPER, ROD, EVENT_BEAT_BIRD_KEEPER_ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperRodAfterBattleText
 	waitbutton
@@ -78,10 +76,10 @@ TrainerBirdKeeperRod:
 	end
 
 TrainerBirdKeeperAbe:
-	trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script
+	trainer BIRD_KEEPER, ABE, EVENT_BEAT_BIRD_KEEPER_ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script
 
 .Script:
-	end_if_just_battled
+	endifjustbattled
 	opentext
 	writetext BirdKeeperAbeAfterBattleText
 	waitbutton
@@ -282,25 +280,20 @@ VioletGymGuyWinText:
 	done
 
 VioletGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 15, 2, VIOLET_CITY
-	warp_def 5, 15, 2, VIOLET_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 13, BGEVENT_READ, VioletGymStatue
-	bg_event 6, 13, BGEVENT_READ, VioletGymStatue
-
-.ObjectEvents:
-	db 4
-	object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1
-	object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
-	object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1
-	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 15, VIOLET_CITY, 2
+	warp_event  5, 15, VIOLET_CITY, 2
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3, 13, BGEVENT_READ, VioletGymStatue
+	bg_event  6, 13, BGEVENT_READ, VioletGymStatue
+
+	db 4 ; object events
+	object_event  5,  1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletGymFalknerScript, -1
+	object_event  7,  6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
+	object_event  2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1
+	object_event  7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1
diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm
index 4d903cb70..eb9062708 100644
--- a/maps/VioletKylesHouse.asm
+++ b/maps/VioletKylesHouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VIOLETKYLESHOUSE_POKEFAN_M
 	const VIOLETKYLESHOUSE_KYLE
 
 VioletKylesHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VioletKylesHousePokefanMScript:
 	jumptextfaceplayer VioletKylesHousePokefanMText
@@ -15,7 +13,7 @@ VioletKylesHousePokefanMScript:
 Kyle:
 	faceplayer
 	opentext
-	trade NPCTRADE_KYLE
+	trade NPC_TRADE_KYLE
 	waitbutton
 	closetext
 	end
@@ -33,21 +31,16 @@ VioletKylesHousePokefanMText:
 	done
 
 VioletKylesHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 3, 7, 6, VIOLET_CITY
-	warp_def 4, 7, 6, VIOLET_CITY
+	db 2 ; warp events
+	warp_event  3,  7, VIOLET_CITY, 6
+	warp_event  4,  7, VIOLET_CITY, 6
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 2
-	object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1
-	object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1
+	db 2 ; object events
+	object_event  2,  3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1
+	object_event  6,  5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
index e1a86e0c7..d3e4ce73c 100644
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VIOLETMART_CLERK
 	const VIOLETMART_GRANNY
 	const VIOLETMART_COOLTRAINER_M
 
 VioletMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x68295:
+VioletMartClerkScript:
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_VIOLET
 	closetext
@@ -49,22 +47,17 @@ VioletMartCooltrainerMText:
 	done
 
 VioletMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 1, VIOLET_CITY
-	warp_def 3, 7, 1, VIOLET_CITY
+	db 2 ; warp events
+	warp_event  2,  7, VIOLET_CITY, 1
+	warp_event  3,  7, VIOLET_CITY, 1
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1
-	object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1
-	object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartClerkScript, -1
+	object_event  7,  6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1
+	object_event  5,  2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1
diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm
index 7ec074324..ec2747865 100644
--- a/maps/VioletNicknameSpeechHouse.asm
+++ b/maps/VioletNicknameSpeechHouse.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VIOLETNICKNAMESPEECHHOUSE_TEACHER
 	const VIOLETNICKNAMESPEECHHOUSE_LASS
 	const VIOLETNICKNAMESPEECHHOUSE_BIRD
 
 VioletNicknameSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VioletNicknameSpeechHouseTeacherScript:
 	jumptextfaceplayer VioletNicknameSpeechHouseTeacherText
@@ -16,10 +14,10 @@ VioletNicknameSpeechHouseTeacherScript:
 VioletNicknameSpeechHouseLassScript:
 	jumptextfaceplayer VioletNicknameSpeechHouseLassText
 
-BirdScript_0x693ef:
+VioletNicknameSpeechHouseBirdScript:
 	faceplayer
 	opentext
-	writetext UnknownText_0x6947c
+	writetext VioletNicknameSpeechHouseBirdText
 	cry PIDGEY
 	waitbutton
 	closetext
@@ -40,27 +38,22 @@ VioletNicknameSpeechHouseLassText:
 	line "STRAWBERRY!"
 	done
 
-UnknownText_0x6947c:
+VioletNicknameSpeechHouseBirdText:
 	text "STRAWBERRY: Pijji!"
 	done
 
 VioletNicknameSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 3, 7, 4, VIOLET_CITY
-	warp_def 4, 7, 4, VIOLET_CITY
+	db 2 ; warp events
+	warp_event  3,  7, VIOLET_CITY, 4
+	warp_event  4,  7, VIOLET_CITY, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1
-	object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1
-	object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1
+	db 3 ; object events
+	object_event  2,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1
+	object_event  6,  4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1
+	object_event  5,  2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseBirdScript, -1
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index 9413849b8..ca11063d6 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VIOLETPOKECENTER1F_NURSE
 	const VIOLETPOKECENTER1F_GAMEBOY_KID
 	const VIOLETPOKECENTER1F_GENTLEMAN
@@ -6,11 +6,9 @@ const_value set 2
 	const VIOLETPOKECENTER1F_SCIENTIST
 
 VioletPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 VioletPokecenterNurse:
 	jumpstd pokecenternurse
@@ -25,20 +23,20 @@ VioletPokecenter1F_ElmsAideScript:
 	yesorno
 	iffalse .RefusedEgg
 	checkcode VAR_PARTYCOUNT
-	if_equal PARTY_LENGTH, .PartyFull
+	ifequal PARTY_LENGTH, .PartyFull
 	giveegg TOGEPI, 5
 	stringtotext .eggname, MEM_BUFFER_1
 	scall .AideGivesEgg
 	setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
 	clearevent EVENT_ELMS_AIDE_IN_LAB
 	clearevent EVENT_TOGEPI_HATCHED
-	setmapscene ROUTE_32, 1
+	setmapscene ROUTE_32, SCENE_ROUTE32_OFFER_SLOWPOKETAIL
 	writetext UnknownText_0x695c5
 	waitbutton
 	closetext
 	checkcode VAR_FACING
-	if_equal UP, .AideWalksAroundPlayer
-	spriteface PLAYER, DOWN
+	ifequal UP, .AideWalksAroundPlayer
+	turnobject PLAYER, DOWN
 	applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter
 	playsound SFX_EXIT_BUILDING
 	disappear VIOLETPOKECENTER1F_SCIENTIST
@@ -47,7 +45,7 @@ VioletPokecenter1F_ElmsAideScript:
 
 .AideWalksAroundPlayer:
 	applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter
-	spriteface PLAYER, DOWN
+	turnobject PLAYER, DOWN
 	applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter
 	playsound SFX_EXIT_BUILDING
 	disappear VIOLETPOKECENTER1F_SCIENTIST
@@ -216,25 +214,20 @@ VioletPokecenter1FYoungsterText:
 	done
 
 VioletPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 5, VIOLET_CITY
-	warp_def 4, 7, 5, VIOLET_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 5
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1
-	object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1
-	object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1
-	object_event 8, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1
-	object_event 4, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, VIOLET_CITY, 5
+	warp_event  4,  7, VIOLET_CITY, 5
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 5 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1
+	object_event  7,  6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1
+	object_event  1,  4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1
+	object_event  8,  1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1
+	object_event  4,  3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index 54899e2a4..70c0b8ced 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VIRIDIANCITY_GRAMPS1
 	const VIRIDIANCITY_GRAMPS2
 	const VIRIDIANCITY_FISHER
 	const VIRIDIANCITY_YOUNGSTER
 
 ViridianCity_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_NEWMAP, .FlyPoint
 
 .FlyPoint:
@@ -216,32 +214,27 @@ TrainerHouseSignText:
 	done
 
 ViridianCity_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 32, 7, 1, VIRIDIAN_GYM
-	warp_def 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE
-	warp_def 23, 15, 1, TRAINER_HOUSE_1F
-	warp_def 29, 19, 2, VIRIDIAN_MART
-	warp_def 23, 25, 1, VIRIDIAN_POKECENTER_1F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 6
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event 32,  7, VIRIDIAN_GYM, 1
+	warp_event 21,  9, VIRIDIAN_NICKNAME_SPEECH_HOUSE, 1
+	warp_event 23, 15, TRAINER_HOUSE_1F, 1
+	warp_event 29, 19, VIRIDIAN_MART, 2
+	warp_event 23, 25, VIRIDIAN_POKECENTER_1F, 1
+
+	db 0 ; coord events
+
+	db 6 ; bg events
 	bg_event 17, 17, BGEVENT_READ, ViridianCitySign
-	bg_event 27, 7, BGEVENT_READ, ViridianGymSign
-	bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign
+	bg_event 27,  7, BGEVENT_READ, ViridianGymSign
+	bg_event 19,  1, BGEVENT_READ, ViridianCityWelcomeSign
 	bg_event 21, 15, BGEVENT_READ, TrainerHouseSign
 	bg_event 24, 25, BGEVENT_READ, ViridianCityPokecenterSign
 	bg_event 30, 19, BGEVENT_READ, ViridianCityMartSign
 
-.ObjectEvents:
-	db 4
-	object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1
-	object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1
-	object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1
+	db 4 ; object events
+	object_event 18,  5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1
+	object_event 30,  8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1
+	object_event  6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1
 	object_event 17, 21, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm
index ed47a099e..ac0003fd5 100644
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -1,13 +1,11 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VIRIDIANGYM_BLUE
 	const VIRIDIANGYM_GYM_GUY
 
 ViridianGym_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ViridianGymBlueScript:
 	faceplayer
@@ -170,23 +168,18 @@ ViridianGymGuyWinText:
 	done
 
 ViridianGym_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 4, 17, 1, VIRIDIAN_CITY
-	warp_def 5, 17, 1, VIRIDIAN_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 2
-	bg_event 3, 13, BGEVENT_READ, ViridianGymStatue
-	bg_event 6, 13, BGEVENT_READ, ViridianGymStatue
-
-.ObjectEvents:
-	db 2
-	object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE
-	object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  4, 17, VIRIDIAN_CITY, 1
+	warp_event  5, 17, VIRIDIAN_CITY, 1
+
+	db 0 ; coord events
+
+	db 2 ; bg events
+	bg_event  3, 13, BGEVENT_READ, ViridianGymStatue
+	bg_event  6, 13, BGEVENT_READ, ViridianGymStatue
+
+	db 2 ; object events
+	object_event  5,  3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE
+	object_event  7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
index 275b57e2d..6045fab29 100644
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -1,16 +1,14 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VIRIDIANMART_CLERK
 	const VIRIDIANMART_LASS
 	const VIRIDIANMART_COOLTRAINER_M
 
 ViridianMart_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-ClerkScript_0x9b5e7:
+ViridianMartClerkScript:
 	opentext
 	pokemart MARTTYPE_STANDARD, MART_VIRIDIAN
 	closetext
@@ -37,22 +35,17 @@ ViridianMartCooltrainerMText:
 	done
 
 ViridianMart_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 2, 7, 4, VIRIDIAN_CITY
-	warp_def 3, 7, 4, VIRIDIAN_CITY
+	db 2 ; warp events
+	warp_event  2,  7, VIRIDIAN_CITY, 4
+	warp_event  3,  7, VIRIDIAN_CITY, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 3
-	object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1
-	object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1
-	object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1
+	db 3 ; object events
+	object_event  1,  3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartClerkScript, -1
+	object_event  7,  2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1
+	object_event  1,  6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1
diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm
index 10d2c52e5..8fd12eb25 100644
--- a/maps/ViridianNicknameSpeechHouse.asm
+++ b/maps/ViridianNicknameSpeechHouse.asm
@@ -1,15 +1,13 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M
 	const VIRIDIANNICKNAMESPEECHHOUSE_LASS
 	const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY
 	const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY
 
 ViridianNicknameSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ViridianNicknameSpeechHousePokefanMScript:
 	jumptextfaceplayer ViridianNicknameSpeechHousePokefanMText
@@ -62,23 +60,18 @@ RatteyText:
 	done
 
 ViridianNicknameSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 2, VIRIDIAN_CITY
-	warp_def 3, 7, 2, VIRIDIAN_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1
-	object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1
-	object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1
-	object_event 6, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1
+	db 0, 0 ; filler
+
+	db 2 ; warp events
+	warp_event  2,  7, VIRIDIAN_CITY, 2
+	warp_event  3,  7, VIRIDIAN_CITY, 2
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  2,  4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1
+	object_event  5,  4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1
+	object_event  5,  2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1
+	object_event  6,  3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1
diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm
index 86f767a5f..431bda180 100644
--- a/maps/ViridianPokecenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -1,31 +1,29 @@
-const_value set 2
+	const_def 2 ; object constants
 	const VIRIDIANPOKECENTER1F_NURSE
 	const VIRIDIANPOKECENTER1F_COOLTRAINER_M
 	const VIRIDIANPOKECENTER1F_COOLTRAINER_F
 	const VIRIDIANPOKECENTER1F_BUG_CATCHER
 
 ViridianPokecenter1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
-NurseScript_0x9b690:
+ViridianPokecenter1FNurseScript:
 	jumpstd pokecenternurse
 
-CooltrainerMScript_0x9b693:
+ViridianPokecenter1FCooltrainerMScript:
 	faceplayer
 	opentext
 	checkevent EVENT_BLUE_IN_CINNABAR
 	iftrue .BlueReturned
-	writetext UnknownText_0x9b6ad
+	writetext ViridianPokecenter1FCooltrainerMText
 	waitbutton
 	closetext
 	end
 
 .BlueReturned:
-	writetext UnknownText_0x9b6f5
+	writetext ViridianPokecenter1FCooltrainerMText_BlueReturned
 	waitbutton
 	closetext
 	end
@@ -36,7 +34,7 @@ ViridianPokecenter1FCooltrainerFScript:
 ViridianPokecenter1FBugCatcherScript:
 	jumptextfaceplayer ViridianPokecenter1FBugCatcherText
 
-UnknownText_0x9b6ad:
+ViridianPokecenter1FCooltrainerMText:
 	text "Where in the world"
 	line "is VIRIDIAN's GYM"
 
@@ -44,7 +42,7 @@ UnknownText_0x9b6ad:
 	line "to challenge him."
 	done
 
-UnknownText_0x9b6f5:
+ViridianPokecenter1FCooltrainerMText_BlueReturned:
 	text "There are no GYM"
 	line "TRAINERS at the"
 	cont "VIRIDIAN GYM."
@@ -72,24 +70,19 @@ ViridianPokecenter1FBugCatcherText:
 	done
 
 ViridianPokecenter1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 3, 7, 5, VIRIDIAN_CITY
-	warp_def 4, 7, 5, VIRIDIAN_CITY
-	warp_def 0, 7, 1, POKECENTER_2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 4
-	object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1
-	object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1
-	object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1
-	object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  3,  7, VIRIDIAN_CITY, 5
+	warp_event  4,  7, VIRIDIAN_CITY, 5
+	warp_event  0,  7, POKECENTER_2F, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 4 ; object events
+	object_event  3,  1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FNurseScript, -1
+	object_event  8,  4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerMScript, -1
+	object_event  5,  3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1
+	object_event  1,  6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1
diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm
index 3a00d3be1..1c22d7dd1 100644
--- a/maps/ViridianPokecenter2FBeta.asm
+++ b/maps/ViridianPokecenter2FBeta.asm
@@ -1,23 +1,16 @@
 ViridianPokecenter2FBeta_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 ViridianPokecenter2FBeta_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 0, 7, 3, VIRIDIAN_POKECENTER_1F
+	db 1 ; warp events
+	warp_event  0,  7, VIRIDIAN_POKECENTER_1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
index 8b816062f..a38e53a1d 100644
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const WHIRLISLANDB1F_POKE_BALL1
 	const WHIRLISLANDB1F_POKE_BALL2
 	const WHIRLISLANDB1F_POKE_BALL3
@@ -7,11 +7,9 @@ const_value set 2
 	const WHIRLISLANDB1F_BOULDER
 
 WhirlIslandB1F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandB1FFullRestore:
 	itemball FULL_RESTORE
@@ -32,44 +30,39 @@ WhirlIslandB1FBoulder:
 	jumpstd strengthboulder
 
 WhirlIslandB1FHiddenRareCandy:
-	hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY
+	hiddenitem RARE_CANDY, EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY
 
 WhirlIslandB1FHiddenUltraBall:
-	hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
+	hiddenitem ULTRA_BALL, EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL
 
 WhirlIslandB1FHiddenFullRestore:
-	hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE
+	hiddenitem FULL_RESTORE, EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE
 
 WhirlIslandB1F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 9
-	warp_def 5, 5, 2, WHIRL_ISLAND_NW
-	warp_def 35, 3, 2, WHIRL_ISLAND_NE
-	warp_def 29, 9, 3, WHIRL_ISLAND_NE
-	warp_def 9, 31, 3, WHIRL_ISLAND_SW
-	warp_def 23, 31, 2, WHIRL_ISLAND_SW
-	warp_def 31, 29, 2, WHIRL_ISLAND_SE
-	warp_def 25, 21, 1, WHIRL_ISLAND_B2F
-	warp_def 13, 27, 2, WHIRL_ISLAND_B2F
-	warp_def 17, 21, 1, WHIRL_ISLAND_CAVE
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 3
-	bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy
+	db 0, 0 ; filler
+
+	db 9 ; warp events
+	warp_event  5,  5, WHIRL_ISLAND_NW, 2
+	warp_event 35,  3, WHIRL_ISLAND_NE, 2
+	warp_event 29,  9, WHIRL_ISLAND_NE, 3
+	warp_event  9, 31, WHIRL_ISLAND_SW, 3
+	warp_event 23, 31, WHIRL_ISLAND_SW, 2
+	warp_event 31, 29, WHIRL_ISLAND_SE, 2
+	warp_event 25, 21, WHIRL_ISLAND_B2F, 1
+	warp_event 13, 27, WHIRL_ISLAND_B2F, 2
+	warp_event 17, 21, WHIRL_ISLAND_CAVE, 1
+
+	db 0 ; coord events
+
+	db 3 ; bg events
+	bg_event 30,  4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy
 	bg_event 36, 18, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall
-	bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore
-
-.ObjectEvents:
-	db 6
-	object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
-	object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
-	object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM
-	object_event 17, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET
-	object_event 19, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
+	bg_event  2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore
+
+	db 6 ; object events
+	object_event  7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE
+	object_event  2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS
+	object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM
+	object_event 17,  8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET
+	object_event 19, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE
 	object_event 23, 26, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1
diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm
index d589b7d05..acee9670a 100644
--- a/maps/WhirlIslandB2F.asm
+++ b/maps/WhirlIslandB2F.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const WHIRLISLANDB2F_POKE_BALL1
 	const WHIRLISLANDB2F_POKE_BALL2
 	const WHIRLISLANDB2F_POKE_BALL3
 
 WhirlIslandB2F_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandB2FFullRestore:
 	itemball FULL_RESTORE
@@ -20,24 +18,19 @@ WhirlIslandB2FMaxElixer:
 	itemball MAX_ELIXER
 
 WhirlIslandB2F_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 4
-	warp_def 11, 5, 7, WHIRL_ISLAND_B1F
-	warp_def 7, 11, 8, WHIRL_ISLAND_B1F
-	warp_def 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER
-	warp_def 13, 31, 5, WHIRL_ISLAND_SW
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 3
-	object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
-	object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
-	object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event 11,  5, WHIRL_ISLAND_B1F, 7
+	warp_event  7, 11, WHIRL_ISLAND_B1F, 8
+	warp_event  7, 25, WHIRL_ISLAND_LUGIA_CHAMBER, 1
+	warp_event 13, 31, WHIRL_ISLAND_SW, 5
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE
+	object_event  6,  4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE
+	object_event  5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER
diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm
index 29c8500bb..35e726b5c 100644
--- a/maps/WhirlIslandCave.asm
+++ b/maps/WhirlIslandCave.asm
@@ -1,24 +1,17 @@
 WhirlIslandCave_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandCave_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 7, 5, 9, WHIRL_ISLAND_B1F
-	warp_def 3, 13, 4, WHIRL_ISLAND_NW
+	db 2 ; warp events
+	warp_event  7,  5, WHIRL_ISLAND_B1F, 9
+	warp_event  3, 13, WHIRL_ISLAND_NW, 4
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
index aa0a15c1e..4381a3636 100644
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -1,12 +1,10 @@
-const_value set 2
+	const_def 2 ; object constants
 	const WHIRLISLANDLUGIACHAMBER_LUGIA
 
 WhirlIslandLugiaChamber_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .Lugia
 
 .Lugia:
@@ -44,19 +42,14 @@ LugiaText:
 	done
 
 WhirlIslandLugiaChamber_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 1
-	warp_def 9, 13, 3, WHIRL_ISLAND_B2F
+	db 1 ; warp events
+	warp_event  9, 13, WHIRL_ISLAND_B2F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 9, 5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
+	db 1 ; object events
+	object_event  9,  5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm
index b022a4c72..c13cd7a93 100644
--- a/maps/WhirlIslandNE.asm
+++ b/maps/WhirlIslandNE.asm
@@ -1,32 +1,25 @@
-const_value set 2
+	const_def 2 ; object constants
 	const WHIRLISLANDNE_POKE_BALL
 
 WhirlIslandNE_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandNEUltraBall:
 	itemball ULTRA_BALL
 
 WhirlIslandNE_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 3, 13, 2, ROUTE_41
-	warp_def 17, 3, 2, WHIRL_ISLAND_B1F
-	warp_def 13, 11, 3, WHIRL_ISLAND_B1F
+	db 3 ; warp events
+	warp_event  3, 13, ROUTE_41, 2
+	warp_event 17,  3, WHIRL_ISLAND_B1F, 2
+	warp_event 13, 11, WHIRL_ISLAND_B1F, 3
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
+	db 1 ; object events
+	object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL
diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm
index e8475c19b..55e4f2d0b 100644
--- a/maps/WhirlIslandNW.asm
+++ b/maps/WhirlIslandNW.asm
@@ -1,26 +1,19 @@
 WhirlIslandNW_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandNW_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 4
-	warp_def 5, 7, 1, ROUTE_41
-	warp_def 5, 3, 1, WHIRL_ISLAND_B1F
-	warp_def 3, 15, 4, WHIRL_ISLAND_SW
-	warp_def 7, 15, 2, WHIRL_ISLAND_CAVE
+	db 4 ; warp events
+	warp_event  5,  7, ROUTE_41, 1
+	warp_event  5,  3, WHIRL_ISLAND_B1F, 1
+	warp_event  3, 15, WHIRL_ISLAND_SW, 4
+	warp_event  7, 15, WHIRL_ISLAND_CAVE, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm
index 3e7edc484..be43871ce 100644
--- a/maps/WhirlIslandSE.asm
+++ b/maps/WhirlIslandSE.asm
@@ -1,24 +1,17 @@
 WhirlIslandSE_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandSE_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 2
-	warp_def 5, 13, 4, ROUTE_41
-	warp_def 5, 3, 6, WHIRL_ISLAND_B1F
+	db 2 ; warp events
+	warp_event  5, 13, ROUTE_41, 4
+	warp_event  5,  3, WHIRL_ISLAND_B1F, 6
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 0
+	db 0 ; object events
diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm
index b80b00b6a..66c3fff23 100644
--- a/maps/WhirlIslandSW.asm
+++ b/maps/WhirlIslandSW.asm
@@ -1,34 +1,27 @@
-const_value set 2
+	const_def 2 ; object constants
 	const WHIRLISLANDSW_POKE_BALL
 
 WhirlIslandSW_MapScripts:
-.SceneScripts:
-	db 0
+	db 0 ; scene scripts
 
-.MapCallbacks:
-	db 0
+	db 0 ; callbacks
 
 WhirlIslandSWUltraBall:
 	itemball ULTRA_BALL
 
 WhirlIslandSW_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 5
-	warp_def 5, 7, 3, ROUTE_41
-	warp_def 17, 3, 5, WHIRL_ISLAND_B1F
-	warp_def 3, 3, 4, WHIRL_ISLAND_B1F
-	warp_def 3, 15, 3, WHIRL_ISLAND_NW
-	warp_def 17, 15, 4, WHIRL_ISLAND_B2F
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
+	db 0, 0 ; filler
+
+	db 5 ; warp events
+	warp_event  5,  7, ROUTE_41, 3
+	warp_event 17,  3, WHIRL_ISLAND_B1F, 5
+	warp_event  3,  3, WHIRL_ISLAND_B1F, 4
+	warp_event  3, 15, WHIRL_ISLAND_NW, 3
+	warp_event 17, 15, WHIRL_ISLAND_B2F, 4
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 1 ; object events
+	object_event 15,  2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 1b0522ce9..af3c5091f 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -1,14 +1,12 @@
-const_value set 2
+	const_def 2 ; object constants
 	const WILLSROOM_WILL
 
 WillsRoom_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .LockDoor
-	scene_script .DummyScene
+	db 2 ; scene scripts
+	scene_script .LockDoor ; SCENE_DEFAULT
+	scene_script .DummyScene ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_TILES, .WillsRoomDoors
 
 .LockDoor:
@@ -37,7 +35,7 @@ WillsRoom_MapScripts:
 	changeblock 4, 14, $2a ; wall
 	reloadmappart
 	closetext
-	setscene 1
+	setscene SCENE_FINISHED
 	setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
 	waitsfx
 	end
@@ -129,21 +127,16 @@ WillScript_WillDefeatText:
 	done
 
 WillsRoom_MapEvents:
-	; filler
-	db 0, 0
+	db 0, 0 ; filler
 
-.Warps:
-	db 3
-	warp_def 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F
-	warp_def 4, 2, 1, KOGAS_ROOM
-	warp_def 5, 2, 2, KOGAS_ROOM
+	db 3 ; warp events
+	warp_event  5, 17, INDIGO_PLATEAU_POKECENTER_1F, 4
+	warp_event  4,  2, KOGAS_ROOM, 1
+	warp_event  5,  2, KOGAS_ROOM, 2
 
-.CoordEvents:
-	db 0
+	db 0 ; coord events
 
-.BGEvents:
-	db 0
+	db 0 ; bg events
 
-.ObjectEvents:
-	db 1
-	object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1
+	db 1 ; object events
+	object_event  5,  7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index ef30655c2..e1136222a 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -1,4 +1,4 @@
-const_value set 2
+	const_def 2 ; object constants
 	const WISETRIOSROOM_SAGE1
 	const WISETRIOSROOM_SAGE2
 	const WISETRIOSROOM_SAGE3
@@ -7,13 +7,11 @@ const_value set 2
 	const WISETRIOSROOM_SAGE6
 
 WiseTriosRoom_MapScripts:
-.SceneScripts:
-	db 2
-	scene_script .DummyScene0
-	scene_script .DummyScene1
+	db 2 ; scene scripts
+	scene_script .DummyScene0 ; SCENE_DEFAULT
+	scene_script .DummyScene1 ; SCENE_FINISHED
 
-.MapCallbacks:
-	db 1
+	db 1 ; callbacks
 	callback MAPCALLBACK_OBJECTS, .WiseTrioCallback
 
 .DummyScene0:
@@ -52,24 +50,24 @@ WiseTriosRoomSage2Script:
 WiseTriosRoomSage3Script:
 	jumptextfaceplayer WiseTriosRoomSage3Text
 
-UnknownScript_0x985a3:
-	spriteface WISETRIOSROOM_SAGE3, UP
-	spriteface PLAYER, DOWN
+WiseTriosRoom_CannotEnterTinTowerScript:
+	turnobject WISETRIOSROOM_SAGE3, UP
+	turnobject PLAYER, DOWN
 	showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20
 	follow PLAYER, WISETRIOSROOM_SAGE3
 	applymovement PLAYER, MovementData_0x98622
 	stopfollow
-	spriteface PLAYER, RIGHT
+	turnobject PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x98712
 	waitbutton
 	closetext
 	applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625
-	spriteface WISETRIOSROOM_SAGE3, LEFT
+	turnobject WISETRIOSROOM_SAGE3, LEFT
 	end
 
 TrainerSageGaku:
-	trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script
+	trainer SAGE, GAKU, EVENT_BEAT_SAGE_GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script
 
 .Script:
 	opentext
@@ -79,7 +77,7 @@ TrainerSageGaku:
 	end
 
 TrainerSageMasa:
-	trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script
+	trainer SAGE, MASA, EVENT_BEAT_SAGE_MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script
 
 .Script:
 	opentext
@@ -89,11 +87,11 @@ TrainerSageMasa:
 	end
 
 TrainerSageKoji:
-	trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script
+	trainer SAGE, KOJI, EVENT_BEAT_SAGE_KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script
 
 .Script:
 	checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
-	iftrue UnknownScript_0x9861b
+	iftrue .KojiAllowsPassage
 	pause 10
 	showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE6, 20
 	opentext
@@ -103,12 +101,12 @@ TrainerSageKoji:
 	waitbutton
 	closetext
 	applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628
-	spriteface WISETRIOSROOM_SAGE6, UP
+	turnobject WISETRIOSROOM_SAGE6, UP
 	setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
-	setscene 1
+	setscene SCENE_FINISHED
 	end
 
-UnknownScript_0x9861b:
+.KojiAllowsPassage:
 	opentext
 	writetext UnknownText_0x98db5
 	waitbutton
@@ -345,27 +343,22 @@ UnknownText_0x98db5:
 	done
 
 WiseTriosRoom_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 3
-	warp_def 7, 4, 4, ECRUTEAK_CITY
-	warp_def 7, 5, 5, ECRUTEAK_CITY
-	warp_def 1, 4, 5, ECRUTEAK_HOUSE
-
-.CoordEvents:
-	db 1
-	coord_event 7, 4, 0, UnknownScript_0x985a3
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 6
-	object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
-	object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
-	object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
-	object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
-	object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
-	object_event 6, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
+	db 0, 0 ; filler
+
+	db 3 ; warp events
+	warp_event  7,  4, ECRUTEAK_CITY, 4
+	warp_event  7,  5, ECRUTEAK_CITY, 5
+	warp_event  1,  4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5
+
+	db 1 ; coord events
+	coord_event  7,  4, SCENE_DEFAULT, WiseTriosRoom_CannotEnterTinTowerScript
+
+	db 0 ; bg events
+
+	db 6 ; object events
+	object_event  6,  2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
+	object_event  6,  7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
+	object_event  7,  5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
+	object_event  4,  2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
+	object_event  4,  6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
+	object_event  6,  4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm
index d2b20dff1..839529faf 100755..100644
--- a/mobile/fixed_words.asm
+++ b/mobile/fixed_words.asm
@@ -1,7 +1,7 @@
 ; These functions seem to be related to the selection of preset phrases
 ; for use in mobile communications.  Annoyingly, they separate the
 ; Battle Tower function above from the data it references.
-Function11c05d: ; 11c05d
+Function11c05d:
 	ld a, e
 	or d
 	jr z, .error
@@ -21,9 +21,8 @@ Function11c05d: ; 11c05d
 	ld b, h
 	scf
 	ret
-; 11c075
 
-Function11c075: ; 11c075
+Function11c075:
 	push de
 	ld a, c
 	call Function11c254
@@ -31,9 +30,8 @@ Function11c075: ; 11c075
 	ld bc, wcd36
 	call Function11c08f
 	ret
-; 11c082
 
-Unreferenced_Function11c082: ; 11c082
+Unreferenced_Function11c082:
 	push de
 	ld a, c
 	call Function11c254
@@ -41,9 +39,8 @@ Unreferenced_Function11c082: ; 11c082
 	ld bc, wcd36
 	call PrintEZChatBattleMessage
 	ret
-; 11c08f
 
-Function11c08f: ; 11c08f
+Function11c08f:
 	ld l, e
 	ld h, d
 	push hl
@@ -93,9 +90,8 @@ Function11c08f: ; 11c08f
 	dec a
 	jr nz, .loop2
 	ret
-; 11c0c6
 
-PrintEZChatBattleMessage: ; 11c0c6
+PrintEZChatBattleMessage:
 ; Use up to 6 words from bc to print text starting at de.
 	; Preserve $cf63, $cf64
 	ld a, [wJumptableIndex]
@@ -210,9 +206,8 @@ PrintEZChatBattleMessage: ; 11c0c6
 	ld a, h
 	ld [wcf64], a
 	ret
-; 11c14a
 
-GetLengthOfWordAtC608: ; 11c14a
+GetLengthOfWordAtC608:
 	ld c, $0
 	ld hl, $c608
 .loop
@@ -221,9 +216,8 @@ GetLengthOfWordAtC608: ; 11c14a
 	ret z
 	inc c
 	jr .loop
-; 11c156
 
-CopyMobileEZChatToC608: ; 11c156
+CopyMobileEZChatToC608:
 	ld a, [rSVBK]
 	push af
 	ld a, $1
@@ -272,9 +266,8 @@ CopyMobileEZChatToC608: ; 11c156
 	ld hl, wStringBuffer1
 	ld bc, MON_NAME_LENGTH - 1
 	jr .copy_string
-; 11c1ab
 
-Special_Function11c1ab: ; 11c1ab
+Function11c1ab:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -283,9 +276,8 @@ Special_Function11c1ab: ; 11c1ab
 	pop af
 	ld [hInMenu], a
 	ret
-; 11c1b9
 
-Function11c1b9: ; 11c1b9
+Function11c1b9:
 	call .InitKanaMode
 	ld a, [rSVBK]
 	push af
@@ -295,9 +287,8 @@ Function11c1b9: ; 11c1b9
 	pop af
 	ld [rSVBK], a
 	ret
-; 11c1ca
 
-.InitKanaMode: ; 11c1ca
+.InitKanaMode:
 	xor a
 	ld [wJumptableIndex], a
 	ld [wcf64], a
@@ -345,9 +336,8 @@ Function11c1b9: ; 11c1b9
 	call EZChat_GetCategoryWordsByKana
 	call EZChat_GetSeenPokemonByKana
 	ret
-; 11c254
 
-Function11c254: ; 11c254
+Function11c254:
 	push af
 	ld a, $4
 	call GetSRAMBank
@@ -366,16 +356,15 @@ Function11c254: ; 11c254
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 11c277
 
-EZChat_ClearBottom12Rows: ; 11c277 (47:4277)
+EZChat_ClearBottom12Rows:
 	ld a, "　"
 	hlcoord 0, 6
 	ld bc, (SCREEN_HEIGHT - 6) * SCREEN_WIDTH
 	call ByteFill
 	ret
 
-EZChat_MasterLoop: ; 11c283
+EZChat_MasterLoop:
 .loop
 	call JoyTextDelay
 	ld a, [hJoyPressed]
@@ -392,13 +381,11 @@ EZChat_MasterLoop: ; 11c283
 	farcall ClearSpriteAnims
 	call ClearSprites
 	ret
-; 11c2ac
 
-.DoJumptableFunction: ; 11c2ac
+.DoJumptableFunction:
 	jumptable .Jumptable, wJumptableIndex
-; 11c2bb
 
-.Jumptable: ; 11c2bb (47:42bb)
+.Jumptable:
 	dw .SpawnObjects ; 00
 	dw .InitRAM ; 01
 	dw Function11c35f ; 02
@@ -423,7 +410,7 @@ EZChat_MasterLoop: ; 11c283
 	dw Function11ce0b ; 15
 	dw Function11ce2b ; 16
 
-.SpawnObjects: ; 11c2e9 (47:42e9)
+.SpawnObjects:
 	depixel 3, 1, 2, 5
 	ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
 	call _InitSpriteAnimStruct
@@ -473,7 +460,7 @@ EZChat_MasterLoop: ; 11c283
 	set 2, [hl]
 	jp Function11cfb5
 
-.InitRAM: ; 11c346 (47:4346)
+.InitRAM:
 	ld a, $9
 	ld [wcd2d], a
 	ld a, $2
@@ -484,7 +471,7 @@ EZChat_MasterLoop: ; 11c283
 	call Function11cfce
 	jp Function11cfb5
 
-Function11c35f: ; 11c35f (47:435f)
+Function11c35f:
 	ld hl, wcd2f
 	inc [hl]
 	inc [hl]
@@ -498,7 +485,7 @@ Function11c35f: ; 11c35f (47:435f)
 	ret nz
 	jp Function11cfb5
 
-Function11c373: ; 11c373 (47:4373)
+Function11c373:
 	ld hl, wcd30
 	inc [hl]
 	inc [hl]
@@ -513,7 +500,7 @@ Function11c373: ; 11c373 (47:4373)
 	call Function11c38a
 	jp Function11cfb5
 
-Function11c38a: ; 11c38a (47:438a)
+Function11c38a:
 	ld hl, Unknown_11c986
 	ld bc, wcd36
 	ld a, $6
@@ -551,13 +538,11 @@ Function11c38a: ; 11c38a (47:438a)
 	dec a
 	jr nz, .asm_11c392
 	ret
-; 11c3bc (47:43bc)
 
-String_11c3bc: ; 11c3bc
+String_11c3bc:
 	db "ーーーーー@"
-; 11c3c2
 
-Function11c3c2: ; 11c3c2 (47:43c2)
+Function11c3c2:
 	call EZChat_ClearBottom12Rows
 	ld de, Unknown_11cfbe
 	call Function11d035
@@ -574,7 +559,7 @@ Function11c3c2: ; 11c3c2 (47:43c2)
 	res 0, [hl]
 	call Function11cfb5
 
-Function11c3ed: ; 11c3ed (47:43ed)
+Function11c3ed:
 	ld hl, wcd20 ; wcd20
 	ld de, hJoypadPressed ; $ffa3
 	ld a, [de]
@@ -692,7 +677,7 @@ Function11c3ed: ; 11c3ed (47:43ed)
 	ld [hl], a
 	ret
 
-Function11c4a5: ; 11c4a5 (47:44a5)
+Function11c4a5:
 	ld hl, wcd23
 	res 0, [hl]
 	ld a, [wcd2b]
@@ -709,7 +694,7 @@ Function11c4a5: ; 11c4a5 (47:44a5)
 	ld a, $15
 	ret
 
-Function11c4be: ; 11c4be (47:44be)
+Function11c4be:
 	ld a, $1
 	hlcoord 0, 6, wAttrMap
 	ld bc, $a0
@@ -720,21 +705,18 @@ Function11c4be: ; 11c4be (47:44be)
 	call ByteFill
 	farcall ReloadMapPart
 	ret
-; 11c4db (47:44db)
 
-String_11c4db: ; 11c4db
+String_11c4db:
 	db   "６つのことば¯くみあわせます"
 	next "かえたいところ¯えらぶと　でてくる"
 	next "ことばのグループから　いれかえたい"
 	next "たんご¯えらんでください"
 	db   "@"
-; 11c51b
 
-String_11c51b: ; 11c51b
+String_11c51b:
 	db "ぜんぶけす　やめる　　　けってい@"
-; 11c52c
 
-Function11c52c: ; 11c52c (47:452c)
+Function11c52c:
 	call EZChat_ClearBottom12Rows
 	call EZChat_PlaceCategoryNames
 	call Function11c618
@@ -742,7 +724,7 @@ Function11c52c: ; 11c52c (47:452c)
 	res 1, [hl]
 	call Function11cfb5
 
-Function11c53d: ; 11c53d (47:453d)
+Function11c53d:
 	ld hl, wcd21
 	ld de, hJoypadPressed ; $ffa3
 
@@ -879,9 +861,8 @@ Function11c53d: ; 11c53d (47:453d)
 .finish_dpad
 	ld [hl], a
 	ret
-; 11c5f0
 
-EZChat_PlaceCategoryNames: ; 11c5f0 (47:45f0)
+EZChat_PlaceCategoryNames:
 	ld de, MobileEZChatCategoryNames
 	ld bc, Coords_11c63a
 	ld a, 15
@@ -912,20 +893,18 @@ EZChat_PlaceCategoryNames: ; 11c5f0 (47:45f0)
 	call PlaceString
 	ret
 
-Function11c618: ; 11c618 (47:4618)
+Function11c618:
 	ld a, $2
 	hlcoord 0, 6, wAttrMap
 	ld bc, $c8
 	call ByteFill
 	farcall ReloadMapPart
 	ret
-; 11c62a (47:462a)
 
-EZChatString_Stop_Mode_Cancel: ; 11c62a
+EZChatString_Stop_Mode_Cancel:
 	db "けす　　　　モード　　　やめる@"
-; 11c63a
 
-Coords_11c63a: ; 11c63a
+Coords_11c63a:
 	dwcoord  1,  7
 	dwcoord  7,  7
 	dwcoord 13,  7
@@ -941,9 +920,8 @@ Coords_11c63a: ; 11c63a
 	dwcoord  1, 15
 	dwcoord  7, 15
 	dwcoord 13, 15
-; 11c658
 
-Function11c658: ; 11c658 (47:4658)
+Function11c658:
 	call EZChat_ClearBottom12Rows
 	call Function11c770
 	ld de, Unknown_11cfc2
@@ -955,7 +933,7 @@ Function11c658: ; 11c658 (47:4658)
 	res 3, [hl]
 	call Function11cfb5
 
-Function11c675: ; 11c675 (47:4675)
+Function11c675:
 	ld hl, wMobileCommsJumptableIndex
 	ld de, hJoypadPressed ; $ffa3
 	ld a, [de]
@@ -1114,7 +1092,7 @@ Function11c675: ; 11c675 (47:4675)
 	ld [hl], a
 	ret
 
-Function11c770: ; 11c770 (47:4770)
+Function11c770:
 	xor a
 	ld [wMobileCommsJumptableIndex], a
 	ld [wcd26], a
@@ -1165,7 +1143,7 @@ Function11c770: ; 11c770 (47:4770)
 	ld [wcd28], a
 	jr .div_12
 
-Function11c7bc: ; 11c7bc (47:47bc)
+Function11c7bc:
 	ld bc, Unknown_11c854
 	ld a, [wcd2b]
 	and a
@@ -1284,9 +1262,8 @@ Function11c7bc: ; 11c7bc (47:47bc)
 	pop hl
 	pop de
 	ret
-; 11c854 (47:4854)
 
-Unknown_11c854: ; 11c854
+Unknown_11c854:
 	dwcoord  2,  8
 	dwcoord  8,  8
 	dwcoord 14,  8
@@ -1300,9 +1277,8 @@ Unknown_11c854: ; 11c854
 	dwcoord  8, 14
 	dwcoord 14, 14
 	dw -1
-; 11c86e
 
-Function11c86e: ; 11c86e (47:486e)
+Function11c86e:
 	ld a, [wcd26]
 	and a
 	jr z, .asm_11c88a
@@ -1357,9 +1333,8 @@ Function11c86e: ; 11c86e (47:486e)
 	dec c
 	jr nz, .asm_11c8c2
 	ret
-; 11c8c7 (47:48c7)
 
-BCD2String: ; 11c8c7
+BCD2String:
 	inc a
 	push af
 	and $f
@@ -1380,21 +1355,17 @@ BCD2String: ; 11c8c7
 	add "０"
 	ld [hli], a
 	ret
-; 11c8ec
 
-MobileString_Page: ; 11c8ec
+MobileString_Page:
 	db "ぺージ@"
-; 11c8f0
 
-MobileString_Prev: ; 11c8f0
+MobileString_Prev:
 	db "まえ@"
-; 11c8f3
 
-MobileString_Next: ; 11c8f3
+MobileString_Next:
 	db "つぎ@"
-; 11c8f6
 
-Function11c8f6: ; 11c8f6 (47:48f6)
+Function11c8f6:
 	ld a, [wcd20] ; wcd20
 	call Function11c95d
 	push hl
@@ -1464,7 +1435,7 @@ Function11c8f6: ; 11c8f6 (47:48f6)
 	ld d, a
 	jr .asm_11c912
 
-Function11c95d: ; 11c95d (47:495d)
+Function11c95d:
 	sla a
 	ld c, a
 	ld b, 0
@@ -1496,7 +1467,6 @@ Function11c95d: ; 11c95d (47:495d)
 	jr nz, .asm_11c980
 	pop hl
 	ret
-; 11c986 (47:4986)
 
 Unknown_11c986:
 	dwcoord  1,  2
@@ -1505,9 +1475,8 @@ Unknown_11c986:
 	dwcoord  1,  4
 	dwcoord  7,  4
 	dwcoord 13,  4
-; 11c992
 
-Function11c992: ; 11c992 (47:4992)
+Function11c992:
 	ld a, $8
 	hlcoord 2, 7
 .asm_11c997
@@ -1524,7 +1493,7 @@ Function11c992: ; 11c992 (47:4992)
 	jr nz, .asm_11c997
 	ret
 
-Function11c9ab: ; 11c9ab (47:49ab)
+Function11c9ab:
 	ld a, $7
 	hlcoord 0, 6, wAttrMap
 	ld bc, $c8
@@ -1532,11 +1501,11 @@ Function11c9ab: ; 11c9ab (47:49ab)
 	farcall ReloadMapPart
 	ret
 
-Function11c9bd: ; 11c9bd (47:49bd)
+Function11c9bd:
 	ld de, String_11ca38
 	call Function11ca7f
 
-Function11c9c3: ; 11c9c3 (47:49c3)
+Function11c9c3:
 	ld hl, wcd2a
 	ld de, hJoypadPressed ; $ffa3
 	ld a, [de]
@@ -1582,7 +1551,7 @@ Function11c9c3: ; 11c9c3 (47:49c3)
 	inc [hl]
 	ret
 
-Function11ca01: ; 11ca01 (47:4a01)
+Function11ca01:
 	hlcoord 14, 7, wAttrMap
 	ld de, $14
 	ld a, $5
@@ -1601,7 +1570,7 @@ Function11ca01: ; 11ca01 (47:4a01)
 	dec c
 	jr nz, .asm_11ca0a
 
-Function11ca19: ; 11ca19 (47:4a19)
+Function11ca19:
 	hlcoord 0, 12, wAttrMap
 	ld de, $14
 	ld a, $6
@@ -1621,19 +1590,16 @@ Function11ca19: ; 11ca19 (47:4a19)
 	jr nz, .asm_11ca22
 	farcall ReloadMapPart
 	ret
-; 11ca38 (47:4a38)
 
-String_11ca38: ; 11ca38
+String_11ca38:
 	db   "とうろくちゅう<NO>あいさつ¯ぜんぶ"
 	next "けしても　よろしいですか？@"
-; 11ca57
 
-String_11ca57: ; 11ca57
+String_11ca57:
 	db   "はい"
 	next "いいえ@"
-; 11ca5e
 
-Function11ca5e: ; 11ca5e (47:4a5e)
+Function11ca5e:
 	xor a
 .loop
 	push af
@@ -1644,7 +1610,7 @@ Function11ca5e: ; 11ca5e (47:4a5e)
 	jr nz, .loop
 	ret
 
-Function11ca6a: ; 11ca6a (47:4a6a)
+Function11ca6a:
 	ld hl, wcd36
 	ld c, a
 	ld b, $0
@@ -1658,7 +1624,7 @@ Function11ca6a: ; 11ca6a (47:4a6a)
 	call PlaceString
 	ret
 
-Function11ca7f: ; 11ca7f (47:4a7f)
+Function11ca7f:
 	push de
 	ld de, Unknown_11cfc6
 	call Function11cfce
@@ -1678,11 +1644,11 @@ Function11ca7f: ; 11ca7f (47:4a7f)
 	call Function11cfb5
 	ret
 
-Function11caad: ; 11caad (47:4aad)
+Function11caad:
 	ld de, String_11cb1c
 	call Function11ca7f
 
-Function11cab3: ; 11cab3 (47:4ab3)
+Function11cab3:
 	ld hl, wcd2a
 	ld de, hJoypadPressed ; $ffa3
 	ld a, [de]
@@ -1750,19 +1716,16 @@ Function11cab3: ; 11cab3 (47:4ab3)
 	ret nz
 	inc [hl]
 	ret
-; 11cb1c (47:4b1c)
 
-String_11cb1c: ; 11cb1c
+String_11cb1c:
 	db   "あいさつ<NO>とうろく¯ちゅうし"
 	next "しますか？@"
-; 11cb31
 
-String_11cb31: ; 11cb31
+String_11cb31:
 	db   "とうろくちゅう<NO>あいさつ<WA>ほぞん"
 	next "されません<GA>よろしい　ですか？@"
-; 11cb52
 
-Function11cb52: ; 11cb52 (47:4b52)
+Function11cb52:
 	ld hl, Unknown_11cc01
 	ld a, [wMenuCursorY]
 .asm_11cb58
@@ -1778,7 +1741,7 @@ Function11cb52: ; 11cb52 (47:4b52)
 	ld d, a
 	call Function11ca7f
 
-Function11cb66: ; 11cb66 (47:4b66)
+Function11cb66:
 	ld hl, wcd2a
 	ld de, hJoypadPressed ; $ffa3
 	ld a, [de]
@@ -1872,7 +1835,7 @@ Function11cb66: ; 11cb66 (47:4b66)
 	inc [hl]
 	ret
 
-Function11cbf5: ; 11cbf5 (47:4bf5)
+Function11cbf5:
 	call WaitSFX
 	ld hl, wcf64
 	dec [hl]
@@ -1880,55 +1843,52 @@ Function11cbf5: ; 11cbf5 (47:4bf5)
 	dec hl
 	set 7, [hl]
 	ret
-; 11cc01 (47:4c01)
 
-Unknown_11cc01: ; 11cc01
+Unknown_11cc01:
 	dw String_11cc09
 	dw String_11cc23
 	dw String_11cc42
 	dw String_11cc60
 
-String_11cc09: ; 11cc09
+String_11cc09:
 	db   "じこしょうかい　は"
 	next "この　あいさつで　いいですか？@"
 
-String_11cc23: ; 11cc23
+String_11cc23:
 	db   "たいせん　<GA>はじまるとき　は"
 	next "この　あいさつで　いいですか？@"
 
-String_11cc42: ; 11cc42
+String_11cc42:
 	db   "たいせん　<NI>かったとき　は"
 	next "この　あいさつで　いいですか？@"
 
-String_11cc60: ; 11cc60
+String_11cc60:
 	db   "たいせん　<NI>まけたとき　は"
 	next "この　あいさつで　いいですか？@"
-; 11cc7e
 
-Unknown_11cc7e: ; 11cc7e
+Unknown_11cc7e:
 	dw String_11cc86
 	dw String_11cc9d
 	dw String_11ccb9
 	dw String_11ccd4
 
-String_11cc86: ; 11cc86
+String_11cc86:
 	db   "じこしょうかい　の"
 	next "あいさつ¯とうろくした！@"
 
-String_11cc9d: ; 11cc9d
+String_11cc9d:
 	db   "たいせん　<GA>はじまるとき　の"
 	next "あいさつ¯とうろくした！@"
 
-String_11ccb9: ; 11ccb9
+String_11ccb9:
 	db   "たいせん　<NI>かったとき　の"
 	next "あいさつ¯とうろくした！@"
 
-String_11ccd4: ; 11ccd4
+String_11ccd4:
 	db   "たいせん　<NI>まけたとき　の"
 	next "あいさつ¯とうろくした！@"
-; 11ccef
 
-Function11ccef: ; 11ccef (47:4cef)
+Function11ccef:
 	ld de, Unknown_11cfc6
 	call Function11cfce
 	hlcoord 1, 14
@@ -1937,7 +1897,7 @@ Function11ccef: ; 11ccef (47:4cef)
 	call Function11ca19
 	call Function11cfb5
 
-Function11cd04: ; 11cd04 (47:4d04)
+Function11cd04:
 	ld de, hJoypadPressed ; $ffa3
 	ld a, [de]
 	and a
@@ -1945,13 +1905,11 @@ Function11cd04: ; 11cd04 (47:4d04)
 	ld a, $4
 	ld [wJumptableIndex], a
 	ret
-; 11cd10 (47:4d10)
 
-String_11cd10: ; 11cd10
+String_11cd10:
 	db "なにか　ことば¯いれてください@"
-; 11cd20
 
-Function11cd20: ; 11cd20 (47:4d20)
+Function11cd20:
 	call EZChat_ClearBottom12Rows
 	ld de, Unknown_11cfc6
 	call Function11cfce
@@ -1974,7 +1932,7 @@ Function11cd20: ; 11cd20 (47:4d20)
 	res 5, [hl]
 	call Function11cfb5
 
-Function11cd54: ; 11cd54 (47:4d54)
+Function11cd54:
 	ld hl, wcd2c
 	ld de, hJoypadPressed ; $ffa3
 	ld a, [de]
@@ -2033,7 +1991,7 @@ Function11cd54: ; 11cd54 (47:4d54)
 	call PlaceString
 	ret
 
-Function11cdaa: ; 11cdaa (47:4daa)
+Function11cdaa:
 	ld a, $2
 	hlcoord 0, 6, wAttrMap
 	ld bc, 6 * SCREEN_WIDTH
@@ -2044,26 +2002,22 @@ Function11cdaa: ; 11cdaa (47:4daa)
 	call ByteFill
 	farcall ReloadMapPart
 	ret
-; 11cdc7 (47:4dc7)
 
-String_11cdc7: ; 11cdc7
+String_11cdc7:
 ; Words will be displayed by category
 	db   "ことば¯しゅるいべつに"
 	next "えらべます@"
-; 11cdd9
 
-String_11cdd9: ; 11cdd9
+String_11cdd9:
 ; Words will be displayed in alphabetical order
 	db   "ことば¯アイウエオ　の"
 	next "じゅんばんで　ひょうじ　します@"
-; 11cdf5
 
-String_11cdf5: ; 11cdf5
+String_11cdf5:
 	db   "しゅるいべつ　モード"  ; Category mode
 	next "アイウエオ　　モード@" ; ABC mode
-; 11ce0b
 
-Function11ce0b: ; 11ce0b (47:4e0b)
+Function11ce0b:
 	call EZChat_ClearBottom12Rows
 	hlcoord 1, 7
 	ld de, String_11cf79
@@ -2076,7 +2030,7 @@ Function11ce0b: ; 11ce0b (47:4e0b)
 	res 2, [hl]
 	call Function11cfb5
 
-Function11ce2b: ; 11ce2b (47:4e2b)
+Function11ce2b:
 	ld a, [wcd22]
 	sla a
 	sla a
@@ -2172,9 +2126,8 @@ Function11ce2b: ; 11ce2b (47:4e2b)
 	ret z
 	ld [wcd22], a
 	ret
-; 11ceb9 (47:4eb9)
 
-Unknown_11ceb9: ; 11ceb9
+Unknown_11ceb9:
 	; up left down right
 	db $ff, $01
 	db $05, $ff
@@ -2272,22 +2225,19 @@ Unknown_11ceb9: ; 11ceb9
 	db $ff, $2d
 	db $2c, $ff
 	db $ff, $2e
-; 11cf79
 
-String_11cf79: ; 11cf79
+String_11cf79:
 ; Hiragana table
 	db   "あいうえお　なにぬねの　や　ゆ　よ"
 	next "かきくけこ　はひふへほ　わ"
 	next "さしすせそ　まみむめも　そのた"
 	next "たちつてと　らりるれろ"
 	db   "@"
-; 11cfb5
 
-Function11cfb5: ; 11cfb5 (47:4fb5)
+Function11cfb5:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
-; 11cfba (47:4fba)
 
 Unknown_11cfba:
 	db  0,  0 ; start coords
@@ -2308,9 +2258,8 @@ Unknown_11cfc6:
 Unknown_11cfca:
 	db 14,  7 ; start coords
 	db  6,  5 ; end coords
-; 11cfce
 
-Function11cfce: ; 11cfce (47:4fce)
+Function11cfce:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH
 	ld a, [de]
@@ -2397,7 +2346,7 @@ Function11cfce: ; 11cfce (47:4fce)
 	ld [hl], a
 	ret
 
-Function11d035: ; 11d035 (47:5035)
+Function11d035:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH
 	ld a, [de]
@@ -2493,7 +2442,7 @@ Function11d035: ; 11d035 (47:5035)
 	jr nz, .loop3
 	ret
 
-.AddNMinusOneTimes: ; 11d0ac (47:50ac)
+.AddNMinusOneTimes:
 	ld a, [de]
 	dec a
 	ld bc, SCREEN_WIDTH
@@ -2503,7 +2452,7 @@ Function11d035: ; 11d035 (47:5035)
 	jr nz, .add_n_minus_one_times
 	ret
 
-AnimateEZChatCursor: ; 11d0b6 (47:50b6)
+AnimateEZChatCursor:
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -2530,21 +2479,21 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	dw .nine
 	dw .ten
 
-.zero ; 11d0dd (47:50dd)
+.zero
 	ld a, [wcd20] ; wcd20
 	sla a
 	ld hl, .Coords_Zero
 	ld e, $1
 	jr .load
 
-.one ; 11d0e9 (47:50e9)
+.one
 	ld a, [wcd21]
 	sla a
 	ld hl, .Coords_One
 	ld e, $2
 	jr .load
 
-.two ; 11d0f5 (47:50f5)
+.two
 	ld hl, .FramesetsIDs_Two
 	ld a, [wcd22]
 	ld e, a
@@ -2559,14 +2508,14 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	ld e, $4
 	jr .load
 
-.three ; 11d10f (47:510f)
+.three
 	ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2
 	call ReinitSpriteAnimFrame
 	ld a, [wMobileCommsJumptableIndex]
 	sla a
 	ld hl, .Coords_Three
 	ld e, $8
-.load ; 11d11e (47:511e)
+.load
 	push de
 	ld e, a
 	ld d, $0
@@ -2585,7 +2534,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	call .UpdateObjectFlags
 	ret
 
-.four ; 11d134 (47:5134)
+.four
 	ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2
 	call ReinitSpriteAnimFrame
 	ld a, [wcd2a]
@@ -2594,7 +2543,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	ld e, $10
 	jr .load
 
-.five ; 11d145 (47:5145)
+.five
 	ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2
 	call ReinitSpriteAnimFrame
 	ld a, [wcd2c]
@@ -2603,7 +2552,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	ld e, $20
 	jr .load
 
-.six ; 11d156 (47:5156)
+.six
 	ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_5
 	call ReinitSpriteAnimFrame
 	; X = [wcd4a] * 8 + 24
@@ -2624,7 +2573,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	call .UpdateObjectFlags
 	ret
 
-.seven ; 11d175 (47:5175)
+.seven
 	ld a, [wEZChatCursorYCoord]
 	cp $4
 	jr z, .cursor0
@@ -2682,15 +2631,15 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	call .UpdateObjectFlags
 	ret
 
-.nine ; 11d1d1 (47:51d1)
+.nine
 	ld d, -13 * 8
 	ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_7
 	jr .eight_nine_load
 
-.eight ; 11d1d7 (47:51d7)
+.eight
 	ld d, 2 * 8
 	ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_6
-.eight_nine_load ; 11d1db (47:51db)
+.eight_nine_load
 	push de
 	call ReinitSpriteAnimFrame
 	ld a, [wcd4a]
@@ -2711,16 +2660,15 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	call .UpdateObjectFlags
 	ret
 
-.ten ; 11d1fc (47:51fc)
+.ten
 	ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1
 	call ReinitSpriteAnimFrame
 	ld a, $8
 	ld e, a
 	call .UpdateObjectFlags
 	ret
-; 11d208 (47:5208)
 
-.Coords_Zero: ; 11d208
+.Coords_Zero:
 	dbpixel  1,  3, 5, 2
 	dbpixel  7,  3, 5, 2
 	dbpixel 13,  3, 5, 2
@@ -2731,7 +2679,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	dbpixel  7, 17, 5, 2
 	dbpixel 13, 17, 5, 2
 
-.Coords_One: ; 11d21a
+.Coords_One:
 	dbpixel  1,  8, 5, 2
 	dbpixel  7,  8, 5, 2
 	dbpixel 13,  8, 5, 2
@@ -2751,7 +2699,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	dbpixel  7, 18, 5, 2
 	dbpixel 13, 18, 5, 2
 
-.Coords_Two: ; 11d23e
+.Coords_Two:
 	dbpixel  2,  9       ; 00
 	dbpixel  3,  9       ; 01
 	dbpixel  4,  9       ; 02
@@ -2801,7 +2749,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	dbpixel  7, 18, 5, 2 ; 2e
 	dbpixel 13, 18, 5, 2 ; 2f
 
-.Coords_Three: ; 11d29e
+.Coords_Three:
 	dbpixel  2, 10
 	dbpixel  8, 10
 	dbpixel 14, 10
@@ -2815,15 +2763,15 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	dbpixel  8, 16
 	dbpixel 14, 16
 
-.Coords_Four: ; 11d2b6
+.Coords_Four:
 	dbpixel 16, 10
 	dbpixel 16, 12
 
-.Coords_Five: ; 11d2ba
+.Coords_Five:
 	dbpixel  4, 10
 	dbpixel  4, 12
 
-.FramesetsIDs_Two: ; 11d2be
+.FramesetsIDs_Two:
 	db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_3 ; 00
 	db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_3 ; 01
 	db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_3 ; 02
@@ -2873,7 +2821,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1 ; 2e
 	db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1 ; 2f
 
-.UpdateObjectFlags: ; 11d2ee (47:52ee)
+.UpdateObjectFlags:
 	ld hl, wcd24
 	and [hl]
 	jr nz, .update_y_offset
@@ -2914,7 +2862,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
 	ld [hl], a
 	ret
 
-Function11d323: ; 11d323
+Function11d323:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -2926,7 +2874,6 @@ Function11d323: ; 11d323
 	pop af
 	ld [rSVBK], a
 	ret
-; 11d33a
 
 Palette_11d33a:
 	RGB 31, 31, 31
@@ -3008,9 +2955,8 @@ Palette_11d33a:
 	RGB 00, 00, 00
 	RGB 00, 00, 00
 	RGB 00, 00, 00
-; 11d3ba
 
-EZChat_GetSeenPokemonByKana: ; 11d3ba
+EZChat_GetSeenPokemonByKana:
 	ld a, [rSVBK]
 	push af
 	ld hl, $c648
@@ -3037,9 +2983,9 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba
 	ld [wcd34], a
 
 	ld hl, EZChat_SortedWords
-	ld a, (EZChat_SortedWordsEnd - EZChat_SortedWords) / 4
+	ld a, (EZChat_SortedWords.End - EZChat_SortedWords) / 4
 
-.MasterLoop: ; 11d3ef
+.MasterLoop:
 	push af
 ; read row
 ; offset
@@ -3186,9 +3132,8 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba
 	pop af
 	ld [rSVBK], a
 	ret
-; 11d493
 
-.CheckSeenMon: ; 11d493
+.CheckSeenMon:
 	push hl
 	push bc
 	push de
@@ -3204,9 +3149,8 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba
 	pop bc
 	pop hl
 	ret
-; 11d4aa
 
-EZChat_GetCategoryWordsByKana: ; 11d4aa
+EZChat_GetCategoryWordsByKana:
 	ld a, [rSVBK]
 	push af
 	ld a, $3
@@ -3289,19 +3233,16 @@ EZChat_GetCategoryWordsByKana: ; 11d4aa
 	pop af
 	ld [rSVBK], a
 	ret
-; 11d4fe
 
 INCLUDE "data/pokemon/ezchat_order.asm"
 
 GFX_11d67e:
 INCBIN "gfx/pokedex/select_start.2bpp"
-; 11d6de
 
 LZ_11d6de:
 INCBIN "gfx/pokedex/slowpoke.2bpp.lz"
-; 11da52
 
-MobileEZChatCategoryNames: ; 11da52
+MobileEZChatCategoryNames:
 ; Fixed message categories
 	db "ポケモン@@" ; 00
 	db "タイプ@@@" ; 01
@@ -3318,9 +3259,8 @@ MobileEZChatCategoryNames: ; 11da52
 	db "じかん@@@" ; 0c
 	db "むすび@@@" ; 0d
 	db "あれこれ@@" ; 0e
-; 11daac
 
-MobileEZChatCategoryPointers: ; 11daac
+MobileEZChatCategoryPointers:
 ; entries correspond to EZCHAT_* constants
 	dw .Types          ; 01
 	dw .Greetings      ; 02
@@ -3337,7 +3277,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	dw .Farewells      ; 0d
 	dw .ThisAndThat    ; 0e
 
-.Types: ; 11dac8
+.Types:
 	db "あく@@@", $26, $0, $0
 	db "いわ@@@", $aa, $0, $0
 	db "エスパー@", $da, $0, $0
@@ -3357,7 +3297,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "みず@@@", $f4, $4, $0
 	db "むし@@@", $12, $5, $0
 
-.Greetings: ; 11db58
+.Greetings:
 	db "ありがと@", $58, $0, $0
 	db "ありがとう", $5a, $0, $0
 	db "いくぜ！@", $80, $0, $0
@@ -3395,7 +3335,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "よろしく@", $80, $5, $0
 	db "らっしゃい", $94, $5, $0
 
-.People: ; 11dc78
+.People:
 	db "あいて@@", $1c, $0, $0
 	db "あたし@@", $36, $0, $0
 	db "あなた@@", $40, $0, $0
@@ -3466,7 +3406,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "わたしは@", $ca, $5, $0
 	db "わたしを@", $cc, $5, $0
 
-.Battle: ; 11dea0
+.Battle:
 	db "あいしょう", $18, $0, $0
 	db "いけ！@@", $88, $0, $0
 	db "いちばん@", $96, $0, $0
@@ -3537,7 +3477,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "レべル@@", $a6, $5, $0
 	db "わざ@@@", $be, $5, $0
 
-.Exclamations: ; 11e0c8
+.Exclamations:
 	db "！@@@@", $0, $0, $0
 	db "！！@@@", $2, $0, $0
 	db "！？@@@", $4, $0, $0
@@ -3605,7 +3545,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "わっ！！@", $ce, $5, $0
 	db "わははは！", $d0, $5, $0
 
-.Conversation: ; 11e2d8
+.Conversation:
 	db "あのね@@", $50, $0, $0
 	db "あんまり@", $6e, $0, $0
 	db "いじわる@", $8e, $0, $0
@@ -3673,7 +3613,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "より@@@", $7c, $5, $0
 	db "れば@@@", $a4, $5, $0
 
-.Feelings: ; 11e4e8
+.Feelings:
 	db "あいたい@", $1a, $0, $0
 	db "あそびたい", $32, $0, $0
 	db "いきたい@", $7c, $0, $0
@@ -3744,7 +3684,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "わかり@@", $b6, $5, $0
 	db "わくわく@", $ba, $5, $0
 
-.Conditions: ; 11e710
+.Conditions:
 	db "あつい@@", $38, $0, $0
 	db "あった@@", $3a, $0, $0
 	db "あり@@@", $56, $0, $0
@@ -3812,7 +3752,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "らしい@@", $90, $5, $0
 	db "わるい@@", $d4, $5, $0
 
-.Life: ; 11e920
+.Life:
 	db "アルバイト", $64, $0, $0
 	db "うち@@@", $ba, $0, $0
 	db "おかね@@", $ee, $0, $0
@@ -3853,7 +3793,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "ラジオ@@", $92, $5, $0
 	db "ワールド@", $ae, $5, $0
 
-.Hobbies: ; 11ea58
+.Hobbies:
 	db "アイドル@", $1e, $0, $0
 	db "アニメ@@", $4c, $0, $0
 	db "うた@@@", $b8, $0, $0
@@ -3894,7 +3834,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "やすみ@@", $44, $5, $0
 	db "よてい@@", $74, $5, $0
 
-.Actions: ; 11eb90
+.Actions:
 	db "あう@@@", $20, $0, $0
 	db "あきらめ@", $24, $0, $0
 	db "あげる@@", $28, $0, $0
@@ -3965,7 +3905,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "わかる@@", $b8, $5, $0
 	db "わすれ@@", $c0, $5, $0
 
-.Time: ; 11edb8
+.Time:
 	db "あき@@@", $22, $0, $0
 	db "あさ@@@", $2a, $0, $0
 	db "あした@@", $2c, $0, $0
@@ -4006,7 +3946,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "よる@@@", $7e, $5, $0
 	db "らいしゅう", $88, $5, $0
 
-.Farewells: ; 11eef0
+.Farewells:
 	db "いたします", $92, $0, $0
 	db "おります@", $32, $1, $0
 	db "か！？@@", $3c, $1, $0
@@ -4074,7 +4014,7 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "わけ@@@", $bc, $5, $0
 	db "わよ！@@", $d2, $5, $0
 
-.ThisAndThat: ; 11f100
+.ThisAndThat:
 	db "ああ@@@", $12, $0, $0
 	db "あっち@@", $3c, $0, $0
 	db "あの@@@", $4e, $0, $0
@@ -4111,7 +4051,6 @@ MobileEZChatCategoryPointers: ; 11daac
 	db "なんで@@", $f6, $3, $0
 	db "なんなんだ", $0, $4, $0
 	db "なんの@@", $2, $4, $0
-; 11f220
 
 MobileEZChatData_WordAndPageCounts:
 macro_11f220: MACRO
@@ -4120,7 +4059,7 @@ macro_11f220: MACRO
 ; 12 words per page (0-based indexing)
 x = \1 / 12
 if \1 % 12 == 0
-x = x +- 1
+x = x + -1
 endc
 	db x
 ENDM
@@ -4196,4 +4135,4 @@ x = $d012
 	macro_11f23c $15 ; wa
 x = $d000
 	macro_11f23c $09 ; end
-EZChat_SortedWordsEnd:
+.End
diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm
index c7db74e70..d9528fbf6 100755..100644
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -1,4 +1,4 @@
-InitMobileProfile: ; 4802f (12:402f)
+InitMobileProfile:
 	xor a
 	set 6, a
 	ld [wd002], a
@@ -120,12 +120,12 @@ InitMobileProfile: ; 4802f (12:402f)
 	push bc
 	jr asm_4815f
 
-Function48157: ; 48157 (12:4157)
+Function48157:
 	call ScrollingMenuJoypad
 	ld hl, wMenuCursorY
 	ld b, [hl]
 	push bc
-asm_4815f: ; 4815f (12:415f)
+asm_4815f:
 	bit A_BUTTON_F, a
 	jp nz, Function4820d
 	ld b, a
@@ -148,7 +148,7 @@ asm_4815f: ; 4815f (12:415f)
 	ld a, $ff
 	ret
 
-Function48187: ; 48187 (12:4187)
+Function48187:
 	ld a, [wd479]
 	bit 1, a
 	jr nz, .asm_481f1
@@ -207,13 +207,11 @@ Function48187: ; 48187 (12:4187)
 	call PlaceString
 .asm_48201
 	ret
-; 48202 (12:4202)
 
-.String_TellLater: ; 48202
+.String_TellLater:
 	db "Tell Later@"
-; 4820d
 
-Function4820d: ; 4820d (12:420d)
+Function4820d:
 	call PlaceHollowCursor
 	ld hl, wMenuCursorY
 	ld a, [hl]
@@ -240,7 +238,6 @@ Function4820d: ; 4820d (12:420d)
 	bit 6, a
 	jr z, .asm_4825c
 	jr .asm_4825c
-; 48241 (12:4241)
 
 	hlcoord 1, 15
 	ld b, $2
@@ -265,27 +262,25 @@ Function4820d: ; 4820d (12:420d)
 	xor a
 	ret
 
-Function48272: ; 48272 (12:4272)
+Function48272:
 	jp Function4840c
-; 48275 (12:4275)
 
-MobileString_PersonalInfo: ; 48275
+MobileString_PersonalInfo:
 	db "Personal Info@"
-; 48283
 
-Function48283: ; 48283 (12:4283)
+Function48283:
 	lb bc, 2, 18
 	hlcoord 1, 15
 	call ClearBox
 	ret
 
-asm_4828d: ; 4828d (12:428d)
+asm_4828d:
 	call Function48283
 	hlcoord 1, 16
 	ld de, MobileDesc_Gender
 	call PlaceString
-	ld hl, MenuDataHeader_0x484f1
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_0x484f1
+	call LoadMenuHeader
 	call Function4873c
 	hlcoord 11, 2
 	ld b, $4
@@ -315,7 +310,7 @@ asm_4828d: ; 4828d (12:428d)
 	ld a, [hli]
 	cp $50
 	jr nz, .asm_482e1
-	ld a, $1
+	ld a, 1 << PLAYERGENDER_FEMALE_F
 	ld [wPlayerGender], a
 	jr .asm_482f1
 .asm_482ed
@@ -331,15 +326,15 @@ asm_4828d: ; 4828d (12:428d)
 	ld [wd003], a
 	jp Function4840c
 
-Function48304: ; 48304 (12:4304)
+Function48304:
 	call Function48283
 	hlcoord 1, 16
 	ld de, MobileDesc_Address
 	call PlaceString
-	ld hl, MenuDataHeader_0x48504
-	call LoadMenuDataHeader
-	ld hl, MenuDataHeader_0x48513
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_0x48504
+	call LoadMenuHeader
+	ld hl, MenuHeader_0x48513
+	call LoadMenuHeader
 	hlcoord 10, 0
 	ld b, $c
 	ld c, $8
@@ -388,7 +383,7 @@ Function48304: ; 48304 (12:4304)
 	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
 	jp Function4840c
 
-Function48383: ; 48383 (12:4383)
+Function48383:
 	push bc
 	push af
 	bit 5, a
@@ -425,7 +420,7 @@ Function48383: ; 48383 (12:4383)
 	pop bc
 	ret
 
-Function483bb: ; 483bb (12:43bb)
+Function483bb:
 	ld hl, wScrollingMenuCursorPosition
 	ld a, [hl]
 	inc a
@@ -454,9 +449,8 @@ Function483bb: ; 483bb (12:43bb)
 	hlcoord 11, 8
 	call PlaceString
 	ret
-; 483e8 (12:43e8)
 
-Function483e8: ; 483e8
+Function483e8:
 	push de
 	ld hl, Prefectures
 	ld a, [wMenuSelection]
@@ -483,9 +477,8 @@ Function483e8: ; 483e8
 	pop hl
 	call PlaceString
 	ret
-; 4840c
 
-Function4840c: ; 4840c (12:440c)
+Function4840c:
 	call Function48187
 	call Function48283
 	hlcoord 1, 16
@@ -511,7 +504,7 @@ Function4840c: ; 4840c (12:440c)
 	call ClearBox
 	jp Function48157
 
-Mobile12_Bin2Dec: ; 48444 (12:4444)
+Mobile12_Bin2Dec:
 	push bc
 	push af
 	push de
@@ -533,10 +526,8 @@ Mobile12_Bin2Dec: ; 48444 (12:4444)
 	pop af
 	pop bc
 	ret
-; 4845d (12:445d)
 
-.DigitStrings: ; 4845d
-; 4845d
+.DigitStrings:
 	db "0@"
 	db "1@"
 	db "2@"
@@ -547,7 +538,6 @@ Mobile12_Bin2Dec: ; 48444 (12:4444)
 	db "7@"
 	db "8@"
 	db "9@"
-; 48471
 
 MobileProfileString:         db "  Mobile Profile@"
 MobileString_Gender:         db "Gender@"
@@ -560,47 +550,43 @@ MobileDesc_Gender:           db "Boy or girl?@"
 MobileDesc_Age:              db "How old are you?@"
 MobileDesc_Address:          db "Where do you live?@"
 MobileDesc_ZipCode:          db "Your zip code?@"
-; 484f1
 
-MenuDataHeader_0x484f1: ; 0x484f1
+MenuHeader_0x484f1:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 2, SCREEN_WIDTH - 1, 7
-	dw MenuData2_0x484f9
+	dw MenuData_0x484f9
 	db 1 ; default option
-; 0x484f9
 
-MenuData2_0x484f9: ; 0x484f9
+MenuData_0x484f9:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 2 ; items
 Strings_484fb:
 String_484fb: db "Boy@"
 String_484ff: db "Girl@"
-; 0x48504
 
-MenuDataHeader_0x48504: ; 0x48504
+MenuHeader_0x48504:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 
-MenuDataHeader_0x48509: ; 0x48509
+MenuHeader_0x48509:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 5, SCREEN_WIDTH - 1, 7
 
-MenuDataHeader_0x4850e: ; 0x4850e
+MenuHeader_0x4850e:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 
-MenuDataHeader_0x48513: ; 0x48513
+MenuHeader_0x48513:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 1, 18, 12
-	dw MenuData2_0x4851b
+	dw MenuData_0x4851b
 	db 1 ; default option
-; 0x4851b
 
-MenuData2_0x4851b: ; 0x4851b
+MenuData_0x4851b:
 	db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_CALL_FUNCTION1_CANCEL ; flags
 	db 6 ; items
 
-Unknown_4851d: ; 4851d
+Unknown_4851d:
 	db $00, $01, $12, $2b, $45, $12, $e8, $43, $00, $00, $00, $00, $00, $00, $2e, $00, $01, $02, $03, $04
 	db $05, $06, $07, $08, $09, $0a, $0b, $0c, $0d, $0e, $0f, $10, $11, $12, $13, $14, $15, $16, $17, $18
 	db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $2a, $2b, $2c
@@ -654,9 +640,8 @@ Yamagata:  db "やまがたけん@" ; Yamagata
 Yamaguchi: db "やまぐちけん@" ; Yamaguchi
 Yamanashi: db "やまなしけん@" ; Yamanashi
 Wakayama:  db "わかやまけん@" ; Wakayama
-; 48689
 
-Function48689: ; 48689 (12:4689)
+Function48689:
 	ld c, 7
 	call DelayFrames
 	ld b, $1
@@ -681,7 +666,7 @@ Function48689: ; 48689 (12:4689)
 	call Function48cdc
 	ret
 
-Function486bf: ; 486bf (12:46bf)
+Function486bf:
 	ld hl, w2DMenuCursorInitY
 	ld a, [wd002]
 	bit 6, a
@@ -752,7 +737,7 @@ Function486bf: ; 486bf (12:46bf)
 	ld [hli], a ; cursor tile + 1
 	ret
 
-Function48725: ; 48725 (12:4725)
+Function48725:
 ;	 ld a, [wd003]
 ;	 and $f
 ;	 cp $f
@@ -779,7 +764,7 @@ Function48725: ; 48725 (12:4725)
 	and a
 	ret
 
-Function4873c: ; 4873c (12:473c)
+Function4873c:
 	ld hl, w2DMenuCursorInitY
 	ld a, 4
 	ld [hli], a
@@ -800,7 +785,7 @@ Function4873c: ; 4873c (12:473c)
 	add B_BUTTON
 	ld [hli], a ; joypad filter
 	; ld a, [wPlayerGender]
-	; xor 1
+	; xor 1 << PLAYERGENDER_FEMALE_F
 	; inc a
 	ld a, [wPlayerGender]
 	and a
@@ -820,13 +805,13 @@ Function4873c: ; 4873c (12:473c)
 	ld [hli], a ; cursor tile + 1
 	ret
 
-Function4876f: ; 4876f (12:476f)
+Function4876f:
 	call Function48283
 	hlcoord 1, 16
 	ld de, MobileDesc_Age
 	call PlaceString
-	ld hl, MenuDataHeader_0x48509
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_0x48509
+	call LoadMenuHeader
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -879,7 +864,7 @@ Function4876f: ; 4876f (12:476f)
 	ld [hInMenu], a
 	jp Function4840c
 
-Function487ec: ; 487ec (12:47ec)
+Function487ec:
 	push hl
 	ld de, wd473
 	call Function487ff
@@ -891,7 +876,7 @@ endr
 	call PlaceString
 	ret
 
-Function487ff: ; 487ff (12:47ff)
+Function487ff:
 	push hl
 	ld a, " "
 	ld [hli], a
@@ -901,13 +886,11 @@ Function487ff: ; 487ff (12:47ff)
 	ld c, 3
 	call PrintNum
 	ret
-; 4880d (12:480d)
 
-String_4880d: ; 4880d
+String_4880d:
 	db "@"
-; 4880e
 
-Function4880e: ; 4880e (12:480e)
+Function4880e:
 	ld a, [hJoyPressed]
 	and A_BUTTON
 	jp nz, Function488b9
@@ -1001,35 +984,34 @@ Function4880e: ; 4880e (12:480e)
 	and a
 	ret
 
-Function488b4: ; 488b4 (12:48b4)
+Function488b4:
 	ld a, $0
 	and a
 	scf
 	ret
 
-Function488b9: ; 488b9 (12:48b9)
+Function488b9:
 	ld a, [wd003]
 	set 1, a
 	ld [wd003], a
 	scf
 	ret
-; 488c3 (12:48c3)
 
-MobileUpArrowGFX: ; 488c3
+MobileUpArrowGFX:
 INCBIN "gfx/mobile/up_arrow.2bpp"
 
-MobileDownArrowGFX: ; 488cb
+MobileDownArrowGFX:
 INCBIN "gfx/mobile/down_arrow.2bpp"
 
-Function488d3: ; 488d3 (12:48d3)
+Function488d3:
 	call Function48283
 	hlcoord 1, 16
 	ld de, MobileDesc_ZipCode
 	call PlaceString
 	call Function48a3a
 	jp c, Function4840c
-	ld hl, MenuDataHeader_0x4850e
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_0x4850e
+	call LoadMenuHeader
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -1057,7 +1039,7 @@ Function488d3: ; 488d3 (12:48d3)
 	ld d, $0
 	ld b, $0
 
-asm_48922: ; 48922 (12:4922)
+asm_48922:
 	push bc
 	call JoyTextDelay
 	ld a, [hJoyDown]
@@ -1089,9 +1071,8 @@ asm_48922: ; 48922 (12:4922)
 	ld c, 10
 	call DelayFrames
 	jr asm_48972
-; 4895a (12:495a)
 
-Function4895a: ; 4895a
+Function4895a:
 	ld a, [hJoyPressed]
 	and a
 	jr z, .asm_48965
@@ -1109,12 +1090,12 @@ Function4895a: ; 4895a
 	ld b, $1
 	push bc
 
-Function4896e: ; 4896e (12:496e)
+Function4896e:
 	pop bc
 	ld b, $0
 	push bc
 
-asm_48972: ; 48972 (12:4972)
+asm_48972:
 	call Function48ab5
 	push af
 	cp $f0
@@ -1181,7 +1162,7 @@ asm_48972: ; 48972 (12:4972)
 	ld [hInMenu], a
 	jp Function4840c
 
-Function489ea: ; 489ea (12:49ea)
+Function489ea:
 	push de
 	ld a, [wd475]
 	and $f
@@ -1218,15 +1199,13 @@ Function489ea: ; 489ea (12:49ea)
 	call Mobile12_Bin2Dec
 	pop de
 	ret
-; 48a38 (12:4a38)
 
-String_48a38: ; 48a38
+String_48a38:
 	db "-@"
-; 48a3a
 
-Function48a3a: ; 48a3a (12:4a3a)
-	ld hl, MenuDataHeader_0x48a9c
-	call LoadMenuDataHeader
+Function48a3a:
+	ld hl, MenuHeader_0x48a9c
+	call LoadMenuHeader
 	call Function4873c
 	ld a, $a
 	ld [w2DMenuCursorInitY], a
@@ -1266,22 +1245,19 @@ Function48a3a: ; 48a3a (12:4a3a)
 	and a
 	ret
 
-Function48a9a: ; 48a9a (12:4a9a)
+Function48a9a:
 	scf
 	ret
-; 48a9c (12:4a9c)
 
-MenuDataHeader_0x48a9c: ; 0x48a9c
+MenuHeader_0x48a9c:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 8, SCREEN_WIDTH - 1, 13
 
-String_48aa1: ; 48aa1
+String_48aa1:
 	db   "Tell Now"
 	next "Tell Later@"
-; 48ab5
-
 
-Function48ab5: ; 48ab5 (12:4ab5)
+Function48ab5:
 	ld a, [hJoyPressed]
 	and A_BUTTON
 	jp nz, Function48c0f
@@ -1457,7 +1433,7 @@ Function48ab5: ; 48ab5 (12:4ab5)
 	ld a, [hl]
 	and $f
 
-asm_48bc7: ; 48bc7 (12:4bc7)
+asm_48bc7:
 	hlcoord 11, 10
 	push af
 	ld a, d
@@ -1470,7 +1446,7 @@ asm_48bc7: ; 48bc7 (12:4bc7)
 	ld a, $f
 	jr Function48c00
 
-Function48bd7: ; 48bd7 (12:4bd7)
+Function48bd7:
 	push de
 	hlcoord 10, 9
 	ld b, $1
@@ -1501,7 +1477,7 @@ Function48bd7: ; 48bd7 (12:4bd7)
 	and $f
 	jr asm_48bc7
 
-Function48c00: ; 48c00 (12:4c00)
+Function48c00:
 	push af
 	hlcoord 11, 10
 	call Function489ea
@@ -1511,15 +1487,15 @@ Function48c00: ; 48c00 (12:4c00)
 	ld a, b
 	ret
 
-Function48c0d: ; 48c0d (12:4c0d)
+Function48c0d:
 	xor a
 	and a
 
-Function48c0f: ; 48c0f (12:4c0f)
+Function48c0f:
 	scf
 	ret
 
-Function48c11: ; 48c11 (12:4c11)
+Function48c11:
 	ld a, [wd002]
 	bit 7, a
 	jr z, .asm_48c20
@@ -1556,7 +1532,7 @@ Function48c11: ; 48c11 (12:4c11)
 	ld [wd002], a
 	ret
 
-Function48c4d: ; 48c4d (12:4c4d)
+Function48c4d:
 	swap a
 	and $f0
 	push af
@@ -1568,7 +1544,7 @@ Function48c4d: ; 48c4d (12:4c4d)
 	ld [hl], a
 	ret
 
-Function48c5a: ; 48c5a (12:4c5a)
+Function48c5a:
 	push af
 	ld a, [hl]
 	and $f0
@@ -1578,7 +1554,7 @@ Function48c5a: ; 48c5a (12:4c5a)
 	ld [hl], a
 	ret
 
-Function48c63: ; 48c63
+Function48c63:
 	ld a, "@"
 	ld [de], a
 	ld a, c
@@ -1613,9 +1589,8 @@ Function48c63: ; 48c63
 .asm_48c8c
 	scf
 	ret
-; 48c8e
 
-Unreferenced_Function48c8e: ; 48c8e
+Unreferenced_Function48c8e:
 	ld hl, wd019 + $11
 	ld d, h
 	ld e, l
@@ -1624,9 +1599,8 @@ Unreferenced_Function48c8e: ; 48c8e
 	call PlaceString
 	call WaitBGMap
 	ret
-; 48ca3
 
-Function48ca3: ; 48ca3
+Function48ca3:
 	push af
 	push bc
 	push de
@@ -1669,13 +1643,12 @@ Function48ca3: ; 48ca3
 	pop bc
 	pop af
 	ret
-; 48cda
 
-Function48cda: ; 48cda (12:4cda)
+Function48cda:
 	ld h, d
 	ld l, e
 
-Function48cdc: ; 48cdc (12:4cdc)
+Function48cdc:
 	push bc
 	push hl
 	call Function48cfd
@@ -1703,7 +1676,7 @@ Function48cdc: ; 48cdc (12:4cdc)
 	jr nz, .asm_48ced
 	ret
 
-Function48cfd: ; 48cfd (12:4cfd)
+Function48cfd:
 	push hl
 	ld a, $4
 	ld [hli], a
@@ -1733,7 +1706,7 @@ Function48cfd: ; 48cfd (12:4cfd)
 	ld [hl], $b
 	ret
 
-Function48d2a: ; 48d2a (12:4d2a)
+Function48d2a:
 	ld d, c
 .asm_48d2b
 	ld [hli], a
@@ -1741,21 +1714,21 @@ Function48d2a: ; 48d2a (12:4d2a)
 	jr nz, .asm_48d2b
 	ret
 
-Function48d30: ; 48d30 (12:4d30)
+Function48d30:
 	ld hl, wd475
 	call Function48d4a
 	ld hl, wd477
 	call Function48d4a
 	ret
 
-Function48d3d: ; 48d3d (12:4d3d)
+Function48d3d:
 	ld hl, wd475
 	call Function48d94
 	ld hl, wd477
 	call Function48d94
 	ret
 
-Function48d4a: ; 48d4a (12:4d4a)
+Function48d4a:
 	inc hl
 	ld a, [hl]
 	ld b, a
@@ -1798,14 +1771,14 @@ Function48d4a: ; 48d4a (12:4d4a)
 	add e
 	ld c, a
 	ld a, b
-	adc $0
+	adc 0
 	ld b, a
 	ld a, c
 	ld [hld], a
 	ld [hl], b
 	ret
 
-Function48d94: ; 48d94 (12:4d94)
+Function48d94:
 	xor a
 	ld [hDividend + 0], a
 	ld [hDividend + 1], a
diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm
index 66ed07bef..c89cffb14 100755..100644
--- a/mobile/mobile_12_2.asm
+++ b/mobile/mobile_12_2.asm
@@ -1,4 +1,4 @@
-MobileCheckOwnMonAnywhere: ; 4a843
+MobileCheckOwnMonAnywhere:
 ; Like CheckOwnMonAnywhere, but only check for species.
 ; OT/ID don't matter.
 
@@ -103,9 +103,8 @@ MobileCheckOwnMonAnywhere: ; 4a843
 	call CloseSRAM
 	and a
 	ret
-; 4a8dc
 
-.CheckMatch: ; 4a8dc
+.CheckMatch:
 	push bc
 	push hl
 	push de
@@ -130,9 +129,8 @@ MobileCheckOwnMonAnywhere: ; 4a843
 	pop bc
 	scf
 	ret
-; 4a8f4
 
-.BoxAddrs: ; 4a8f4
+.BoxAddrs:
 	dba sBox1
 	dba sBox2
 	dba sBox3
@@ -147,9 +145,8 @@ MobileCheckOwnMonAnywhere: ; 4a843
 	dba sBox12
 	dba sBox13
 	dba sBox14
-; 4a91e
 
-.CopyName: ; 4a91e
+.CopyName:
 	push hl
 	ld hl, NAME_LENGTH
 	add hl, bc
@@ -157,9 +154,8 @@ MobileCheckOwnMonAnywhere: ; 4a843
 	ld c, l
 	pop hl
 	ret
-; 4a927
 
-UnusedSpecial_FindItemInPCOrBag: ; 4a927
+UnusedFindItemInPCOrBag:
 	ld a, [wScriptVar]
 	ld [wCurItem], a
 	ld hl, wPCItems
@@ -180,9 +176,8 @@ UnusedSpecial_FindItemInPCOrBag: ; 4a927
 	ld a, 1
 	ld [wScriptVar], a
 	ret
-; 4a94e
 
-Function4a94e: ; 4a94e
+Function4a94e:
 	call FadeToMenu
 	ld a, -1
 	ld hl, wd002
@@ -243,15 +238,13 @@ Function4a94e: ; 4a94e
 	ld hl, UnknownText_0x4a9be
 	call PrintText
 	jr .asm_4a974
-; 4a9be
 
-UnknownText_0x4a9be: ; 0x4a9be
+UnknownText_0x4a9be:
 	; Pick three #MON for battle.
 	text_jump UnknownText_0x1c51d7
 	db "@"
-; 0x4a9c3
 
-Function4a9c3: ; 4a9c3
+Function4a9c3:
 	ld hl, wd002
 	ld a, $ff
 	cp [hl]
@@ -268,9 +261,8 @@ Function4a9c3: ; 4a9c3
 .asm_4a9d5
 	scf
 	ret
-; 4a9d7
 
-Function4a9d7: ; 4a9d7
+Function4a9d7:
 	ld a, [wd002]
 	ld hl, wPartyMonNicknames
 	call GetNick
@@ -299,23 +291,21 @@ Function4a9d7: ; 4a9d7
 	call PrintText
 	call YesNoBox
 	ret
-; 4aa1d
 
-UnknownText_0x4aa1d: ; 0x4aa1d
+UnknownText_0x4aa1d:
 	; , @  and @ . Use these three?
 	text_jump UnknownText_0x1c51f4
 	db "@"
-; 0x4aa22
 
-Function4aa22: ; 4aa22
+Function4aa22:
 	call ClearBGPalettes
 
-Function4aa25: ; 4aa25
+Function4aa25:
 	farcall LoadPartyMenuGFX
 	farcall InitPartyMenuWithCancel
 	call Function4aad3
 
-Function4aa34: ; 4aa34
+Function4aa34:
 	ld a, PARTYMENUACTION_MOBILE
 	ld [wPartyMenuActionText], a
 	farcall WritePartyMenuTilemap
@@ -343,17 +333,15 @@ Function4aa34: ; 4aa34
 	set 1, [hl]
 	pop af
 	ret
-; 4aa6e
 
-Function4aa6e: ; 4aa6e
+Function4aa6e:
 	pop af
 	ld de, SFX_WRONG
 	call PlaySFX
 	call WaitSFX
 	jr Function4aa34
-; 4aa7a
 
-Function4aa7a: ; 4aa7a
+Function4aa7a:
 	ld hl, wd002
 	ld d, $3
 .loop
@@ -406,9 +394,8 @@ Function4aa7a: ; 4aa7a
 
 .finished
 	ret
-; 4aab6
 
-Function4aab6: ; 4aab6
+Function4aab6:
 	ld hl, wd002
 	ld d, $3
 .loop
@@ -428,9 +415,8 @@ Function4aab6: ; 4aab6
 
 .done
 	ret
-; 4aad3
 
-Function4aad3: ; 4aad3
+Function4aad3:
 	ld hl, wPartyCount
 	ld a, [hli]
 	and a
@@ -455,9 +441,8 @@ Function4aad3: ; 4aad3
 	call Function4aa7a
 	farcall PlaySpriteAnimations
 	ret
-; 4aafb
 
-Function4aafb: ; 4aafb
+Function4aafb:
 	ld a, [wCurPartySpecies]
 	cp EGG
 	jr z, .egg
@@ -467,9 +452,8 @@ Function4aafb: ; 4aafb
 .egg
 	scf
 	ret
-; 4ab06
 
-Function4ab06: ; 4ab06
+Function4ab06:
 	ld a, [wCurPartyMon]
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, wPartyMon1HP
@@ -483,9 +467,8 @@ Function4ab06: ; 4ab06
 
 .NotFainted:
 	ret
-; 4ab1a
 
-Function4ab1a: ; 4ab1a
+Function4ab1a:
 .asm_4ab1a
 	ld a, $fb
 	ld [wMenuJoypadFilter], a
@@ -549,9 +532,8 @@ Function4ab1a: ; 4ab1a
 	ld [wd018], a
 	and a
 	ret
-; 4ab99
 
-Function4ab99: ; 4ab99
+Function4ab99:
 	bit 1, a
 	jr z, .asm_4aba6
 	ld a, [wd002]
@@ -563,9 +545,8 @@ Function4ab99: ; 4ab99
 .asm_4aba6
 	and a
 	ret
-; 4aba8
 
-Function4aba8: ; 4aba8
+Function4aba8:
 	ld hl, wd004
 	ld a, [hl]
 	cp $ff
@@ -586,9 +567,8 @@ Function4aba8: ; 4aba8
 	ld [hl], a
 	scf
 	ret
-; 4abc3
 
-Function4abc3: ; 4abc3
+Function4abc3:
 	bit 3, a
 	jr z, .asm_4abd5
 	ld a, [wPartyCount]
@@ -677,15 +657,14 @@ Function4abc3: ; 4abc3
 .asm_4ac56
 	and a
 	ret
-; 4ac58
 
-Function4ac58: ; 4ac58
+Function4ac58:
 	lb bc, 2, 18
 	hlcoord 1, 15
 	call ClearBox
 	farcall FreezeMonIcons
-	ld hl, MenuDataHeader_0x4aca2
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_0x4aca2
+	call LoadMenuHeader
 	ld hl, wd019
 	bit 1, [hl]
 	jr z, .asm_4ac89
@@ -712,31 +691,29 @@ Function4ac58: ; 4ac58
 	call ExitMenu
 	and a
 	ret
-; 4aca2
 
-MenuDataHeader_0x4aca2: ; 0x4aca2
+MenuHeader_0x4aca2:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 9, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw NULL
 	db 1 ; default option
-; 0x4acaa
 
-Function4acaa: ; 4acaa
+Function4acaa:
 .asm_4acaa
 	ld a, $a0
-	ld [wMenuData2Flags], a
+	ld [wMenuDataFlags], a
 	ld a, [wd019]
 	bit 1, a
 	jr z, .asm_4acc2
 	ld a, $2
-	ld [wMenuData2Items], a
+	ld [wMenuDataItems], a
 	ld a, $c
 	ld [wMenuBorderTopCoord], a
 	jr .asm_4accc
 
 .asm_4acc2
 	ld a, $4
-	ld [wMenuData2Items], a
+	ld [wMenuDataItems], a
 	ld a, $8
 	ld [wMenuBorderTopCoord], a
 
@@ -780,7 +757,7 @@ Function4acaa: ; 4acaa
 	jr z, Function4ad56
 	jr .asm_4acf3
 
-Function4ad17: ; 4ad17
+Function4ad17:
 	call Function4adb2
 	jr z, .asm_4ad4a
 	ld hl, wd002
@@ -815,28 +792,24 @@ Function4ad17: ; 4ad17
 	call Function4adc2
 	ret
 
-UnknownText_0x4ad51: ; 0x4ad51
+UnknownText_0x4ad51:
 	; Only three #MON may enter.
 	text_jump UnknownText_0x1c521c
 	db "@"
-; 0x4ad56
 
-Function4ad56: ; 4ad56
+Function4ad56:
 	farcall OpenPartyStats
 	call WaitBGMap2
 	ret
-; 4ad60
 
-Function4ad60: ; 4ad60
+Function4ad60:
 	farcall ManagePokemonMoves
 	ret
-; 4ad67
 
-Function4ad67: ; 4ad67
+Function4ad67:
 	ret
-; 4ad68
 
-Function4ad68: ; 4ad68
+Function4ad68:
 	hlcoord 13, 12
 	ld de, String_4ad88
 	call PlaceString
@@ -853,28 +826,23 @@ Function4ad68: ; 4ad68
 .asm_4ad84
 	call PlaceString
 	ret
-; 4ad88
 
-String_4ad88: ; 4ad88
+String_4ad88:
 	db   "つよさをみる"
 	next "つかえるわざ"
 	next "もどる@"
-; 4ad9a
 
-String_4ad9a: ; 4ad9a
+String_4ad9a:
 	db   "さんかする@"
-; 4ada0
 
-String_4ada0: ; 4ada0
+String_4ada0:
 	db   "さんかしない@"
-; 4ada7
 
-String_4ada7: ; 4ada7
+String_4ada7:
 	db   "つよさをみる"
 	next "もどる@" ; BACK
-; 4adb2
 
-Function4adb2: ; 4adb2
+Function4adb2:
 	ld hl, wd002
 	ld a, [wCurPartyMon]
 	cp [hl]
@@ -887,9 +855,8 @@ Function4adb2: ; 4adb2
 	ret z
 	scf
 	ret
-; 4adc2
 
-Function4adc2: ; 4adc2
+Function4adc2:
 	ld a, [wd002]
 	cp $ff
 	jr nz, .skip
@@ -917,9 +884,8 @@ Function4adc2: ; 4adc2
 	ld a, b
 	ld [wd004], a
 	ret
-; 4adf7
 
-Function4adf7: ; 4adf7
+Function4adf7:
 	ld a, [wd019]
 	bit 0, a
 	ret z
@@ -932,4 +898,3 @@ Function4adf7: ; 4adf7
 	res 0, a
 	ld [wd019], a
 	ret
-; 4ae12
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm
index 8af7cc896..5f0f3e86e 100644
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -1,52 +1,47 @@
 String_89116:
 	db "-----@"
 
-String_8911c: ; 8911c
+String_8911c:
 	db   "でんわばんごうが　ただしく" ; Phone number is not
 	next "はいって　いません！@"   ; entered correctly!
-; 89135
 
-String_89135: ; 89135
+String_89135:
 	db   "データが　かわって　いますが"  ; The data has changed.
 	next "かきかえないで　やめますか？@" ; Quit anyway?
-; 89153
 
-String_89153: ; 89153
+String_89153:
 	db   "メッセージは　ありません@"    ; No message
-; 89160
 
-OpenSRAMBank4: ; 89160
+OpenSRAMBank4:
 	push af
 	ld a, $4
 	call GetSRAMBank
 	pop af
 	ret
-; 89168
 
-
-Function89168: ; 89168 (22:5168)
+Function89168:
 	ld hl, wGameTimerPause
-	set 7, [hl]
+	set GAMETIMERPAUSE_MOBILE_7_F, [hl]
 	ret
 
-Function8916e: ; 8916e (22:516e)
+Function8916e:
 	ld hl, wGameTimerPause
-	res 7, [hl]
+	res GAMETIMERPAUSE_MOBILE_7_F, [hl]
 	ret
 
-Function89174: ; 89174 (22:5174)
+Function89174:
 	ld hl, wGameTimerPause
-	bit 7, [hl]
+	bit GAMETIMERPAUSE_MOBILE_7_F, [hl]
 	ret
 
-Function8917a: ; 8917a (22:517a)
+Function8917a:
 	ld hl, wd002
 	ld bc, $32
 	xor a
 	call ByteFill
 	ret
 
-Function89185: ; 89185 (22:5185)
+Function89185:
 ; strcmp(hl, de, c)
 ; Compares c bytes starting at de and hl and incrementing together until a mismatch is found.
 ; Preserves hl and de.
@@ -65,7 +60,7 @@ Function89185: ; 89185 (22:5185)
 	pop de
 	ret
 
-Function89193: ; 89193
+Function89193:
 ; copy(hl, de, 4)
 ; Copies c bytes from hl to de.
 ; Preserves hl and de.
@@ -80,10 +75,8 @@ Function89193: ; 89193
 	pop hl
 	pop de
 	ret
-; 8919e
 
-
-Function8919e: ; 8919e (22:519e)
+Function8919e:
 ; Searches for the c'th string starting at de.  Returns the pointer in de.
 	ld a, c
 	and a
@@ -97,14 +90,13 @@ Function8919e: ; 8919e (22:519e)
 	jr nz, .loop
 	ret
 
-Function891ab: ; 891ab
+Function891ab:
 	call Mobile22_SetBGMapMode1
 	farcall ReloadMapPart
 	call Mobile22_SetBGMapMode0
 	ret
-; 891b8
 
-Function891b8: ; 891b8
+Function891b8:
 	call Mobile22_SetBGMapMode0
 	hlcoord 0, 0
 	ld a, " "
@@ -112,17 +104,15 @@ Function891b8: ; 891b8
 	call ByteFill
 	call DelayFrame
 	ret
-; 891ca
-
 
-Function891ca: ; 891ca (22:51ca)
+Function891ca:
 	push bc
 	call Function891b8
 	call WaitBGMap
 	pop bc
 	ret
 
-Function891d3: ; 891d3 (22:51d3)
+Function891d3:
 	push bc
 	call Function891ca
 	ld c, $10
@@ -130,7 +120,7 @@ Function891d3: ; 891d3 (22:51d3)
 	pop bc
 	ret
 
-Function891de: ; 891de
+Function891de:
 	call Mobile22_SetBGMapMode0
 	call ClearPalettes
 	hlcoord 0, 0, wAttrMap
@@ -143,30 +133,26 @@ Function891de: ; 891de
 	call ByteFill
 	call Function891ab
 	ret
-; 891fe
 
-Function891fe: ; 891fe
+Function891fe:
 	push bc
 	call Function891de
 	ld c, $10
 	call DelayFrames
 	pop bc
 	ret
-; 89209
 
-Function89209: ; 89209
+Function89209:
 	ld a, 1
 	ld [wSpriteUpdatesEnabled], a
 	ret
-; 8920f
 
-Function8920f: ; 8920f
+Function8920f:
 	ld a, 0
 	ld [wSpriteUpdatesEnabled], a
 	ret
-; 89215
 
-Function89215: ; 89215
+Function89215:
 	push hl
 	push bc
 	ld bc, wAttrMap - wTileMap
@@ -175,10 +161,8 @@ Function89215: ; 89215
 	pop bc
 	pop hl
 	ret
-; 8921f
 
-
-Function8921f: ; 8921f (22:521f)
+Function8921f:
 	push de
 	ld de, SCREEN_WIDTH
 	add hl, de
@@ -199,47 +183,44 @@ Function8921f: ; 8921f (22:521f)
 	pop de
 	ret
 
-Mobile22_ButtonSound: ; 89235 (22:5235)
+Mobile22_ButtonSound:
 	call JoyWaitAorB
 	call PlayClickSFX
 	ret
 
-Mobile22_SetBGMapMode0: ; 8923c
+Mobile22_SetBGMapMode0:
 	xor a
 	ld [hBGMapMode], a
 	ret
-; 89240
 
-Mobile22_SetBGMapMode1: ; 89240
+Mobile22_SetBGMapMode1:
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; 89245
-
 
-Function89245: ; 89245 (22:5245)
+Function89245:
 	farcall TryLoadSaveFile
 	ret c
 	farcall _LoadData
 	and a
 	ret
 
-Function89254: ; 89254 (22:5254)
+Function89254:
 	ld bc, $d07
 	jr Function89261
 
-Function89259: ; 89259
+Function89259:
 	ld bc, $0e07
 	jr Function89261
 
-Function8925e: ; 8925e
+Function8925e:
 	ld bc, $0e0c
 
-Function89261: ; 89261
+Function89261:
 	push af
 	push bc
-	ld hl, MenuDataHeader_0x892a3
-	call CopyMenuDataHeader
+	ld hl, MenuHeader_0x892a3
+	call CopyMenuHeader
 	pop bc
 	ld hl, wMenuBorderTopCoord
 	ld a, c
@@ -274,26 +255,23 @@ Function89261: ; 89261
 .done
 	scf
 	ret
-; 892a3
 
-MenuDataHeader_0x892a3: ; 0x892a3
+MenuHeader_0x892a3:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 5, 15, 9
-	dw MenuData2_0x892ab
+	dw MenuData_0x892ab
 	db 1 ; default option
-; 0x892ab
 
-MenuData2_0x892ab: ; 0x892ab
+MenuData_0x892ab:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "はい@"
 	db "いいえ@"
-; 0x892b4
 
-Function892b4: ; 892b4 (22:52b4)
+Function892b4:
 	call Function8931b
 
-Function892b7: ; 892b7
+Function892b7:
 	ld d, b
 	ld e, c
 	ld hl, 0
@@ -340,10 +318,8 @@ Function892b7: ; 892b7
 	dec e
 	jr nz, .loop
 	ret
-; 89305
 
-
-Function89305: ; 89305 (22:5305)
+Function89305:
 	xor a
 	ld [wMenuSelection], a
 	ld c, 40
@@ -358,7 +334,7 @@ Function89305: ; 89305 (22:5305)
 	jr nz, .loop
 	ret
 
-Function8931b: ; 8931b
+Function8931b:
 	push hl
 	ld hl, $a03b ; 4:a03b
 	ld a, [wMenuSelection]
@@ -369,13 +345,12 @@ Function8931b: ; 8931b
 	ld c, l
 	pop hl
 	ret
-; 8932d
 
-Function8932d: ; 8932d
+Function8932d:
 	ld hl, 0
 	add hl, bc
 
-Function89331: ; 89331
+Function89331:
 ; Scans up to 5 characters starting at hl, looking for a nonspace character up to the next terminator.
 ; Sets carry if it does not find a nonspace character.
 ; Returns the location of the following character in hl.
@@ -400,15 +375,13 @@ Function89331: ; 89331
 .done
 	pop bc
 	ret
-; 89346
-
 
-Function89346: ; 89346 (22:5346)
+Function89346:
 	ld h, b
 	ld l, c
 	jr _incave
 
-Function8934a: ; 8934a
+Function8934a:
 	ld hl, NAME_LENGTH_JAPANESE
 	add hl, bc
 _incave:
@@ -434,9 +407,8 @@ _incave:
 .done
 	pop bc
 	ret
-; 89363
 
-Function89363: ; 89363
+Function89363:
 ; Scans six byte pairs starting at bc to find $ff.  Sets carry if it does not find a $ff.  Returns the location of the byte after the first $ff found in hl.
 	ld h, b
 	ld l, c
@@ -466,9 +438,8 @@ Function89363: ; 89363
 .done
 	pop de
 	ret
-; 89381
 
-Function89381: ; 89381
+Function89381:
 	push bc
 	push de
 	call Function89b45
@@ -485,9 +456,8 @@ Function89381: ; 89381
 	call Function89193
 	pop bc
 	ret
-; 8939a
 
-Function8939a: ; 8939a
+Function8939a:
 	push bc
 	ld hl, 0
 	add hl, bc
@@ -500,10 +470,8 @@ Function8939a: ; 8939a
 	ld de, wd008
 	call Function89381
 	ret
-; 893b3
 
-
-Function893b3: ; 893b3 (22:53b3)
+Function893b3:
 	call DisableLCD
 	call ClearSprites
 	call LoadStandardFont
@@ -514,7 +482,7 @@ Function893b3: ; 893b3 (22:53b3)
 	call EnableLCD
 	ret
 
-Function893cc: ; 893cc
+Function893cc:
 	call DisableLCD
 	call ClearSprites
 	call LoadStandardFont
@@ -523,38 +491,33 @@ Function893cc: ; 893cc
 	call Function89464
 	call EnableLCD
 	ret
-; 893e2
-
 
-Function893e2: ; 893e2 (22:53e2)
+Function893e2:
 	call Function89b1e
 	call Function893b3
 	call Function8a5b6
 	call Function8949c
 	ret
 
-Function893ef: ; 893ef
+Function893ef:
 	ld de, vTiles0
 	ld hl, GFX_8940b
 	ld bc, $20
 	ld a, BANK(GFX_8940b)
 	call FarCopyBytes
 	ret
-; 893fe
 
-Function893fe: ; 893fe
+Function893fe:
 	call DisableLCD
 	call Function893ef
 	call EnableLCD
 	call DelayFrame
 	ret
-; 8940b
 
-GFX_8940b: ; 8940b
+GFX_8940b:
 INCBIN "gfx/unknown/08940b.2bpp"
-; 8942b
 
-Function8942b: ; 8942b (22:542b)
+Function8942b:
 	ld de, vTiles0 tile $02
 	ld hl, MobileAdapterGFX + $7d tiles
 	ld bc, 8 tiles
@@ -567,7 +530,7 @@ Function8942b: ; 8942b (22:542b)
 	call FarCopyBytes
 	ret
 
-Function89448: ; 89448 (22:5448)
+Function89448:
 ; Clears the sprite array
 	push af
 	ld hl, wVirtualOAM
@@ -580,7 +543,7 @@ Function89448: ; 89448 (22:5448)
 	pop af
 	ret
 
-Function89455: ; 89455 (22:5455)
+Function89455:
 	ld hl, MobileAdapterGFX + $7d tiles
 	ld de, vTiles2 tile $0c
 	ld bc, $49 tiles
@@ -588,7 +551,7 @@ Function89455: ; 89455 (22:5455)
 	call FarCopyBytes
 	ret
 
-Function89464: ; 89464
+Function89464:
 	ld hl, MobileAdapterGFX
 	ld de, vTiles2
 	ld bc, $20 tiles
@@ -600,9 +563,8 @@ Function89464: ; 89464
 	ld a, BANK(MobileAdapterGFX)
 	call FarCopyBytes
 	ret
-; 89481
 
-Function89481: ; 89481
+Function89481:
 	ld d, 2
 	call Function8934a
 	ret c
@@ -613,18 +575,16 @@ Function89481: ; 89481
 	ret z
 	inc d
 	ret
-; 89492
 
-
-Function89492: ; 89492 (22:5492)
+Function89492:
 	ld d, 0
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	ret z
 	inc d
 	ret
 
-Function8949c: ; 8949c
+Function8949c:
 	ld a, [rSVBK]
 	push af
 	ld a, 5
@@ -636,16 +596,14 @@ Function8949c: ; 8949c
 	pop af
 	ld [rSVBK], a
 	ret
-; 894b3
 
-Palette_894b3: ; 894b3
+Palette_894b3:
 	RGB 31, 31, 31
 	RGB 31, 31, 31
 	RGB 31, 31, 31
 	RGB 00, 00, 00
-; 894bb
 
-Function894bb: ; 894bb
+Function894bb:
 	call Function894dc
 	push bc
 	call Function8956f
@@ -653,10 +611,8 @@ Function894bb: ; 894bb
 	call Function8a60d
 	pop bc
 	ret
-; 894ca
 
-
-Function894ca: ; 894ca (22:54ca)
+Function894ca:
 	push bc
 	call Function894dc
 	call Function895c7
@@ -666,7 +622,7 @@ Function894ca: ; 894ca (22:54ca)
 	pop bc
 	ret
 
-Function894dc: ; 894dc
+Function894dc:
 	push bc
 	ld a, [rSVBK]
 	push af
@@ -693,15 +649,13 @@ Function894dc: ; 894dc
 	ld [rSVBK], a
 	pop bc
 	ret
-; 89509
 
-.PalettePointers: ; 89509
+.PalettePointers:
 	dw .Pals012a
 	dw .Pals012b
 	dw .Pals012c
-; 8950f
 
-.Pals012a: ; 8950f
+.Pals012a:
 	RGB 31, 31, 31
 	RGB 10, 17, 13
 	RGB 10, 08, 22
@@ -717,7 +671,7 @@ Function894dc: ; 894dc
 	RGB 10, 17, 13
 	RGB 00, 00, 00
 
-.Pals012b: ; 89527
+.Pals012b:
 	RGB 31, 31, 31
 	RGB 30, 22, 11
 	RGB 31, 08, 15
@@ -733,7 +687,7 @@ Function894dc: ; 894dc
 	RGB 30, 22, 11
 	RGB 00, 00, 00
 
-.Pals012c: ; 8953f
+.Pals012c:
 	RGB 31, 31, 31
 	RGB 15, 20, 26
 	RGB 25, 07, 20
@@ -749,7 +703,7 @@ Function894dc: ; 894dc
 	RGB 15, 20, 26
 	RGB 00, 00, 00
 
-.Pals345: ; 89557
+.Pals345:
 	RGB 31, 31, 31
 	RGB 31, 31, 31
 	RGB 31, 13, 00
@@ -764,9 +718,8 @@ Function894dc: ; 894dc
 	RGB 00, 00, 00
 	RGB 00, 00, 00
 	RGB 00, 00, 00
-; 8956f
 
-Function8956f: ; 8956f
+Function8956f:
 	push bc
 	ld hl, 16
 	add hl, bc
@@ -819,10 +772,8 @@ Function8956f: ; 8956f
 	ld [rSVBK], a
 	pop bc
 	ret
-; 895c7
-
 
-Function895c7: ; 895c7 (22:55c7)
+Function895c7:
 	ld a, [rSVBK]
 	push af
 	ld a, 5
@@ -834,24 +785,21 @@ Function895c7: ; 895c7 (22:55c7)
 	pop af
 	ld [rSVBK], a
 	ret
-; 895de (22:55de)
 
-Palette_895de: ; 895de
+Palette_895de:
 	RGB 31, 31, 31
 	RGB 07, 07, 06
 	RGB 07, 07, 06
 	RGB 00, 00, 00
-; 895e6
 
-Function895e6: ; 895e6
+Function895e6:
 	ld a, 7
 	hlcoord 0, 0, wAttrMap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	ret
-; 895f2
 
-Function895f2: ; 895f2
+Function895f2:
 	push bc
 	xor a
 	hlcoord 0, 0, wAttrMap
@@ -861,9 +809,8 @@ Function895f2: ; 895f2
 	call Function89655
 	pop bc
 	ret
-; 89605
 
-Function89605: ; 89605
+Function89605:
 	hlcoord 19, 2, wAttrMap
 	ld a, 1
 	ld de, SCREEN_WIDTH
@@ -899,9 +846,8 @@ Function89605: ; 89605
 	ld bc, 14
 	call ByteFill
 	ret
-; 8963d
 
-Function8963d: ; 8963d
+Function8963d:
 	hlcoord 12, 3, wAttrMap
 	ld a, 6
 	ld de, SCREEN_WIDTH
@@ -918,9 +864,8 @@ Function8963d: ; 8963d
 	dec b
 	jr nz, .loop
 	ret
-; 89655
 
-Function89655: ; 89655
+Function89655:
 	hlcoord 1, 12, wAttrMap
 	ld de, SCREEN_WIDTH
 	ld a, 5
@@ -937,9 +882,8 @@ Function89655: ; 89655
 	dec b
 	jr nz, .loop
 	ret
-; 8966c
 
-Function8966c: ; 8966c
+Function8966c:
 	push bc
 	call Function89688
 	hlcoord 4, 0
@@ -947,10 +891,8 @@ Function8966c: ; 8966c
 	call Function896f5
 	pop bc
 	ret
-; 8967a
-
 
-Function8967a: ; 8967a (22:567a)
+Function8967a:
 	push bc
 	call Function89688
 	hlcoord 2, 0
@@ -959,7 +901,7 @@ Function8967a: ; 8967a (22:567a)
 	pop bc
 	ret
 
-Function89688: ; 89688
+Function89688:
 	hlcoord 0, 0
 	ld a, 1
 	ld e, SCREEN_WIDTH
@@ -997,9 +939,8 @@ Function89688: ; 89688
 	ld e, SCREEN_WIDTH
 	call Function896eb
 	ret
-; 896cb
 
-Function896cb: ; 896cb
+Function896cb:
 	ld de, SCREEN_WIDTH - 1
 	ld a, 7
 	ld [hl], a
@@ -1007,9 +948,8 @@ Function896cb: ; 896cb
 	ld a, 9
 	ld [hli], a
 	ret
-; 896d6
 
-Function896d6: ; 896d6
+Function896d6:
 	ld de, SCREEN_WIDTH - 1
 	ld a, 10
 	ld [hl], a
@@ -1017,9 +957,8 @@ Function896d6: ; 896d6
 	ld a, 11
 	ld [hli], a
 	ret
-; 896e1
 
-Function896e1: ; 896e1
+Function896e1:
 .loop
 	ld [hli], a
 	inc a
@@ -1030,9 +969,8 @@ Function896e1: ; 896e1
 	dec e
 	jr nz, .loop
 	ret
-; 896eb
 
-Function896eb: ; 896eb
+Function896eb:
 .loop
 	ld [hli], a
 	dec a
@@ -1043,16 +981,15 @@ Function896eb: ; 896eb
 	dec e
 	jr nz, .loop
 	ret
-; 896f5
 
-Function896f5: ; 896f5
+Function896f5:
 	call Function8971f
 	call Function89736
 	inc hl
 	inc hl
 	ld b, 2
 
-ClearScreenArea: ; 0x896ff
+ClearScreenArea:
 ; clears an area of the screen
 ; INPUT:
 ; hl = address of upper left corner of the area
@@ -1085,11 +1022,10 @@ ClearScreenArea: ; 0x896ff
 	ld a, $18
 	ld [hli], a
 	dec c
-	jr nz, .asm_89713 ; 0x8971c $f5
+	jr nz, .asm_89713
 	ret
-; 0x8971f
 
-Function8971f: ; 8971f
+Function8971f:
 	ld a, $2c
 	ld [hli], a
 	ld a, $2d
@@ -1106,9 +1042,8 @@ Function8971f: ; 8971f
 	ld [hl], a
 	pop hl
 	ret
-; 89736
 
-Function89736: ; 89736
+Function89736:
 	push hl
 	inc hl
 	inc hl
@@ -1130,17 +1065,15 @@ Function89736: ; 89736
 	ld [hl], a
 	pop hl
 	ret
-; 89753
 
-Function89753: ; 89753
+Function89753:
 	ld a, $c
 	ld [hl], a
 	xor a
 	call Function89215
 	ret
-; 8975b
 
-Function8975b: ; 8975b
+Function8975b:
 	ld a, $1d
 	ld [hli], a
 	inc a
@@ -1157,17 +1090,15 @@ Function8975b: ; 8975b
 	dec e
 	jr nz, .asm_89769
 	ret
-; 89771
 
-Function89771: ; 89771
+Function89771:
 	ld a, $12
 	ld [hl], a
 	ld a, $3
 	call Function89215
 	ret
-; 8977a
 
-Function8977a: ; 8977a
+Function8977a:
 	ld e, $4
 	ld d, $13
 .asm_8977e
@@ -1189,9 +1120,8 @@ Function8977a: ; 8977a
 	dec e
 	jr nz, .asm_8978c
 	ret
-; 89797
 
-Function89797: ; 89797
+Function89797:
 	push bc
 	ld a, $e
 	ld [hl], a
@@ -1209,9 +1139,8 @@ Function89797: ; 89797
 	ld [hl], a
 	pop bc
 	ret
-; 897af
 
-Function897af: ; 897af
+Function897af:
 	push bc
 	ld hl, $0010
 	add hl, bc
@@ -1230,9 +1159,8 @@ Function897af: ; 897af
 	farcall GetTrainerPic
 	pop bc
 	ret
-; 897d5
 
-Function897d5: ; 897d5
+Function897d5:
 	push bc
 	call Function8934a
 	jr nc, .asm_897f3
@@ -1263,13 +1191,11 @@ Function897d5: ; 897d5
 	call Function8963d
 	pop bc
 	ret
-; 89807
 
-
-Function89807: ; 89807 (22:5807)
+Function89807:
 	ld hl, MobileAdapterGFX + $20 tiles
 	ld a, [wPlayerGender]
-	bit 0, a
+	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .asm_89814
 	ld hl, MobileAdapterGFX + $43 tiles
 .asm_89814
@@ -1282,7 +1208,7 @@ Function89807: ; 89807 (22:5807)
 	call DelayFrame
 	ret
 
-Function89829: ; 89829 (22:5829)
+Function89829:
 	push bc
 	ld bc, $705
 	ld de, $14
@@ -1304,7 +1230,7 @@ Function89829: ; 89829 (22:5829)
 	pop bc
 	ret
 
-Function89844: ; 89844
+Function89844:
 	call Function89481
 	call Function894bb
 	call Function897af
@@ -1313,9 +1239,8 @@ Function89844: ; 89844
 	call SetPalettes
 	pop bc
 	ret
-; 89856
 
-Function89856: ; 89856
+Function89856:
 	push bc
 	call Function891b8
 	pop bc
@@ -1333,10 +1258,8 @@ Function89856: ; 89856
 	pop bc
 	call Function897d5
 	ret
-; 8987f
 
-
-Function8987f: ; 8987f (22:587f)
+Function8987f:
 	call Function891b8
 	call Function895f2
 	call Function8967a
@@ -1353,7 +1276,7 @@ Function8987f: ; 8987f (22:587f)
 	call Function89975
 	ret
 
-Function898aa: ; 898aa
+Function898aa:
 	ld a, [wMenuSelection]
 	and a
 	ret z
@@ -1364,9 +1287,8 @@ Function898aa: ; 898aa
 	call PrintNum
 	pop bc
 	ret
-; 898be
 
-Function898be: ; 898be
+Function898be:
 	push bc
 	ld de, wd002
 	ld hl, wd002
@@ -1385,9 +1307,8 @@ Function898be: ; 898be
 	call PlaceString
 	pop bc
 	ret
-; 898dc
 
-Function898dc: ; 898dc
+Function898dc:
 	ld hl, $0006
 	add hl, bc
 	push bc
@@ -1402,9 +1323,8 @@ Function898dc: ; 898dc
 	call PlaceString
 	pop bc
 	ret
-; 898f3
 
-Function898f3: ; 898f3
+Function898f3:
 	push bc
 	ld hl, $000c
 	add hl, bc
@@ -1425,9 +1345,8 @@ Function898f3: ; 898f3
 .asm_89913
 	pop bc
 	ret
-; 89915
 
-Function89915: ; 89915
+Function89915:
 	push bc
 	push hl
 	ld de, Unknown_89942
@@ -1461,15 +1380,13 @@ Function89915: ; 89915
 	jr nz, .asm_89932
 	pop bc
 	ret
-; 89942
 
-Unknown_89942: ; 89942
+Unknown_89942:
 	db $24, $25, $26, " ", $27, $28, $29, $2a
-Unknown_8994a: ; 8994a
+Unknown_8994a:
 	db $24, $27, $29, $ff
-; 8994e
 
-Function8994e: ; 8994e
+Function8994e:
 	push hl
 	push de
 	ld de, SCREEN_WIDTH
@@ -1486,9 +1403,8 @@ Function8994e: ; 8994e
 	pop de
 	pop hl
 	ret
-; 89962
 
-Function89962: ; 89962
+Function89962:
 	push bc
 	ld c, $4
 	ld b, $20
@@ -1503,9 +1419,8 @@ Function89962: ; 89962
 	jr nz, .asm_89967
 	pop bc
 	ret
-; 89975
 
-Function89975: ; 89975
+Function89975:
 	push bc
 	ld e, $8
 .asm_89978
@@ -1522,9 +1437,8 @@ Function89975: ; 89975
 	jr nz, .asm_89978
 	pop bc
 	ret
-; 8998b
 
-Function8998b: ; 8998b
+Function8998b:
 	push bc
 	and $f
 	cp $a
@@ -1540,10 +1454,8 @@ Function8998b: ; 8998b
 	ld [hl], a
 	pop bc
 	ret
-; 8999c
-
 
-Function8999c: ; 8999c (22:599c)
+Function8999c:
 	ld de, wPlayerName
 	call PlaceString
 	inc bc
@@ -1552,13 +1464,11 @@ Function8999c: ; 8999c (22:599c)
 	ld de, String_899ac
 	call PlaceString
 	ret
-; 899ac (22:59ac)
 
-String_899ac: ; 899ac
+String_899ac:
 	db "の　めいし@"
-; 899b2
 
-Function899b2: ; 899b2 (22:59b2)
+Function899b2:
 	ld bc, wPlayerName
 	call Function89346
 	jr c, .asm_899bf
@@ -1571,13 +1481,13 @@ Function899b2: ; 899b2 (22:59b2)
 	call PlaceString
 	ret
 
-Function899c9: ; 899c9 (22:59c9)
+Function899c9:
 	ld de, wPlayerID
 	lb bc, PRINTNUM_LEADINGZEROS | 2, 5
 	call PrintNum
 	ret
 
-Function899d3: ; 899d3
+Function899d3:
 	hlcoord 1, 4
 	call Function89753
 	hlcoord 2, 5
@@ -1593,9 +1503,8 @@ Function899d3: ; 899d3
 	hlcoord 2, 9
 	call Function89915
 	ret
-; 899fe
 
-Function899fe: ; 899fe
+Function899fe:
 	push bc
 	push hl
 	ld hl, $0019
@@ -1606,9 +1515,8 @@ Function899fe: ; 899fe
 	call Function89a0c
 	pop bc
 	ret
-; 89a0c
 
-Function89a0c: ; 89a0c
+Function89a0c:
 	push hl
 	call Function89363
 	pop hl
@@ -1622,17 +1530,15 @@ Function89a0c: ; 89a0c
 	ld de, String_89153
 	call PlaceString
 	ret
-; 89a23
 
-
-Function89a23: ; 89a23 (22:5a23)
+Function89a23:
 	hlcoord 0, 11
 	ld b, $4
 	ld c, $12
 	call Function8921f
 	ret
 
-Function89a2e: ; 89a2e (22:5a2e)
+Function89a2e:
 	hlcoord 11, 12
 	ld b, $2
 	ld c, $6
@@ -1645,17 +1551,14 @@ Function89a2e: ; 89a2e (22:5a2e)
 	call PlaceString
 	call Function89655
 	ret
-; 89a4e (22:5a4e)
 
-String_89a4e: ; 89a4e
+String_89a4e:
 	db "けってい@"
-; 89a53
 
-String_89a53: ; 89a53
+String_89a53:
 	db "やめる@"
-; 89a57
 
-Function89a57: ; 89a57
+Function89a57:
 	call JoyTextDelay_ForcehJoyDown ; joypad
 	bit D_UP_F, c
 	jr nz, .d_up
@@ -1691,31 +1594,27 @@ Function89a57: ; 89a57
 	call nc, .PlayPocketSwitchSFX
 	ld a, $0
 	ret
-; 89a8a
 
-.PlayPocketSwitchSFX: ; 89a8a
+.PlayPocketSwitchSFX:
 	push af
 	ld de, SFX_SWITCH_POCKETS
 	call PlaySFX
 	pop af
 	ret
-; 89a93
 
-.MoveCursorDown: ; 89a93
+.MoveCursorDown:
 	ld d, 40
 	ld e,  1
 	call .ApplyCursorMovement
 	ret
-; 89a9b
 
-.MoveCursorUp: ; 89a9b
+.MoveCursorUp:
 	ld d,  1
 	ld e, -1
 	call .ApplyCursorMovement
 	ret
-; 89aa3
 
-.ApplyCursorMovement: ; 89aa3
+.ApplyCursorMovement:
 	ld a, [wMenuSelection]
 	ld c, a
 	push bc
@@ -1742,17 +1641,15 @@ Function89a57: ; 89a57
 	ld [wMenuSelection], a
 	scf
 	ret
-; 89ac7
 
-.Function89ac7: ; 89ac7
+.Function89ac7:
 	call OpenSRAMBank4
 	call Function8931b
 	call .Function89ad4
 	call CloseSRAM
 	ret
-; 89ad4
 
-.Function89ad4: ; 89ad4
+.Function89ad4:
 	push de
 	call Function8932d ; find a non-space character within 5 bytes of bc
 	jr c, .no_nonspace_character
@@ -1767,9 +1664,8 @@ Function89a57: ; 89a57
 .finish_decode
 	pop de
 	ret
-; 89ae6
 
-.Function89ae6: ; 89ae6
+.Function89ae6:
 	ld hl, wd031
 	xor a
 	ld [hl], a
@@ -1788,34 +1684,29 @@ Function89a57: ; 89a57
 .load_and_ret
 	ld [wd030], a
 	ret
-; 89b00
-
 
-Function89b00: ; 89b00 (22:5b00)
+Function89b00:
 	farcall MG_Mobile_Layout_LoadPals
 	ret
-; 89b07 (22:5b07)
 
-Function89b07: ; 89b07
+Function89b07:
 	call Mobile22_SetBGMapMode0
 	call DelayFrame
 	farcall Function4a3a7
 	ret
-; 89b14
 
-Function89b14: ; 89b14
+Function89b14:
 	call ClearBGPalettes
 	call Function89b07
 	call Function89b00
 	ret
-; 89b1e
 
-Function89b1e: ; 89b1e (22:5b1e)
+Function89b1e:
 	farcall Function4a485
 	call Function89b00
 	ret
 
-Function89b28: ; 89b28 (22:5b28)
+Function89b28:
 	call Function891de
 	call ClearBGPalettes
 	call Function893e2
@@ -1824,12 +1715,12 @@ Function89b28: ; 89b28 (22:5b28)
 	call SetPalettes
 	ret
 
-Function89b3b: ; 89b3b (22:5b3b)
+Function89b3b:
 	call Mobile22_SetBGMapMode0
 	farcall Function48cda
 	ret
 
-Function89b45: ; 89b45
+Function89b45:
 	; some sort of decoder?
 	; BCD?
 	push hl
@@ -1877,10 +1768,8 @@ Function89b45: ; 89b45
 	pop bc
 	pop hl
 	ret
-; 89b78
 
-
-Function89b78: ; 89b78 (22:5b78)
+Function89b78:
 	push bc
 	ld a, [wd010]
 	cp $10
@@ -1904,7 +1793,7 @@ Function89b78: ; 89b78 (22:5b78)
 	pop bc
 	ret
 
-Function89b97: ; 89b97 (22:5b97)
+Function89b97:
 	call Function89c34
 	jr c, .asm_89ba0
 	call Function89448
@@ -1955,45 +1844,42 @@ Function89b97: ; 89b97 (22:5b97)
 	ld c, $4
 	add hl, bc
 	jr .asm_89bb4
-; 89bd8 (22:5bd8)
 
-Unknown_89bd8: ; 89bd8
+Unknown_89bd8:
 	dw Unknown_89be0
 	dw Unknown_89bf5
 	dw Unknown_89c0a
 	dw Unknown_89c1f
-; 89be0
 
-Unknown_89be0: ; 89be0
+Unknown_89be0:
 	db $01, $12, $4e, $01, 0
 	db $01, $19, $4e, $01, 0 | Y_FLIP
 	db $01, $12, $72, $01, 0 | X_FLIP
 	db $01, $19, $72, $01, 0 | X_FLIP | Y_FLIP
 	db -1 ; end
 
-Unknown_89bf5: ; 89bf5
+Unknown_89bf5:
 	db $01, $60, $16, $01, 0
 	db $01, $62, $16, $01, 0 | Y_FLIP
 	db $01, $60, $92, $01, 0 | X_FLIP
 	db $01, $62, $92, $01, 0 | X_FLIP | Y_FLIP
 	db -1 ; end
 
-Unknown_89c0a: ; 89c0a
+Unknown_89c0a:
 	db $01, $78, $66, $01, 0
 	db $01, $78, $66, $01, 0 | Y_FLIP
 	db $01, $78, $92, $01, 0 | X_FLIP
 	db $01, $78, $92, $01, 0 | X_FLIP | Y_FLIP
 	db -1 ; end
 
-Unknown_89c1f: ; 89c1f
+Unknown_89c1f:
 	db $01, $80, $66, $01, 0
 	db $01, $80, $66, $01, 0 | Y_FLIP
 	db $01, $80, $92, $01, 0 | X_FLIP
 	db $01, $80, $92, $01, 0 | X_FLIP | Y_FLIP
 	db -1 ; end
-; 89c34
 
-Function89c34: ; 89c34 (22:5c34)
+Function89c34:
 	push bc
 	ld a, [wd012]
 	ld c, a
@@ -2005,7 +1891,7 @@ Function89c34: ; 89c34 (22:5c34)
 	pop bc
 	ret
 
-Function89c44: ; 89c44 (22:5c44)
+Function89c44:
 	call Function89c34
 	jr c, .asm_89c4f
 	push de
@@ -2035,7 +1921,7 @@ Function89c44: ; 89c44 (22:5c44)
 	ld [hli], a ; attributes
 	ret
 
-Function89c67: ; 89c67 (22:5c67)
+Function89c67:
 ; menu scrolling?
 	call JoyTextDelay_ForcehJoyDown ; joypad
 	ld b, $0
@@ -2099,22 +1985,20 @@ Function89c67: ; 89c67 (22:5c67)
 	xor a
 	ld [wd012], a
 	ret
-; 89cbf (22:5cbf)
 
-.ScrollData0: ; 89cbf
+.ScrollData0:
 	db 0, 2, 0, 0
 	db 1, 3, 0, 0
 	db 2, 4, 0, 0
 	db 3, 0, 0, 0
 
-.ScrollData1: ; 89ccf
+.ScrollData1:
 	db 0, 0, 0, 0
 	db 0, 3, 0, 0
 	db 2, 4, 0, 0
 	db 3, 0, 0, 0
-; 89cdf
 
-Function89cdf: ; 89cdf (22:5cdf)
+Function89cdf:
 	ld a, $10
 	add b
 	ld b, a
@@ -2152,7 +2036,7 @@ Function89cdf: ; 89cdf (22:5cdf)
 	jr nz, .asm_89cee
 	ret
 
-Function89d0d: ; 89d0d (22:5d0d)
+Function89d0d:
 	call Mobile22_SetBGMapMode0
 	ld a, [rSVBK]
 	push af
@@ -2185,25 +2069,22 @@ Function89d0d: ; 89d0d (22:5d0d)
 	call DelayFrames
 	call RestartMapMusic
 	ret
-; 89d4e (22:5d4e)
 
-.Palette1: ; 89d4e
+.Palette1:
 	RGB 31, 31, 31
 	RGB 19, 19, 19
 	RGB 15, 15, 15
 	RGB 00, 00, 00
-; 89d56
 
-.Palette2: ; 89d56
+.Palette2:
 	RGB 31, 31, 31
 	RGB 19, 19, 19
 	RGB 19, 19, 19
 	RGB 00, 00, 00
-; 89d5e
 
-Function89d5e: ; 89d5e (22:5d5e)
+Function89d5e:
 	push af
-	call CopyMenuDataHeader
+	call CopyMenuHeader
 	pop af
 	ld [wMenuCursorBuffer], a
 	call Mobile22_SetBGMapMode0
@@ -2213,7 +2094,7 @@ Function89d5e: ; 89d5e (22:5d5e)
 	set 7, [hl]
 	ret
 
-Function89d75: ; 89d75 (22:5d75)
+Function89d75:
 	push hl
 	call Mobile22_SetBGMapMode0
 	call _hl_
@@ -2221,14 +2102,14 @@ Function89d75: ; 89d75 (22:5d75)
 	pop hl
 	jr asm_89d90
 
-Function89d85: ; 89d85 (22:5d85)
+Function89d85:
 	push hl
 	call Mobile22_SetBGMapMode0
 	call _hl_
 	call CGBOnly_CopyTilemapAtOnce
 	pop hl
 
-asm_89d90: ; 89d90 (22:5d90)
+asm_89d90:
 	call Mobile22_SetBGMapMode0
 	push hl
 	call _hl_
@@ -2246,7 +2127,7 @@ asm_89d90: ; 89d90 (22:5d90)
 	and a
 	ret
 
-Function89dab: ; 89dab (22:5dab)
+Function89dab:
 	call Mobile22_SetBGMapMode0
 	farcall MobileMenuJoypad
 	call Mobile22_SetBGMapMode0
@@ -2276,7 +2157,7 @@ Function89dab: ; 89dab (22:5dab)
 	and a
 	ret
 
-Function89de0: ; 89de0 (22:5de0)
+Function89de0:
 	call ClearSprites
 	call Function89e0a
 	jr c, .asm_89e00
@@ -2299,13 +2180,12 @@ Function89de0: ; 89de0 (22:5de0)
 	call Function8917a
 	ret
 
-Jumptable_89e04: ; 89e04 (22:5e04)
+Jumptable_89e04:
 	dw Function8a62c
 	dw Function8a999
 	dw Function8ab93
 
-
-Function89e0a: ; 89e0a (22:5e0a)
+Function89e0a:
 	call OpenSRAMBank4
 	call Function8b3b0
 	call CloseSRAM
@@ -2313,32 +2193,31 @@ Function89e0a: ; 89e0a (22:5e0a)
 	rst JumpTable
 	ret
 
-Jumptable_89e18: ; 89e18 (22:5e18)
+Jumptable_89e18:
 	dw Function89e1e
 	dw Function8a116
 	dw Function8a2aa
 
-
-Function89e1e: ; 89e1e (22:5e1e)
+Function89e1e:
 	call OpenSRAMBank4
-	ld bc, $a037 ; 4:a037
+	ld bc, $a037
 	call Function8b36c
 	call CloseSRAM
 	xor a
 	ld [wd02d], a
 
-asm_89e2e: ; 89e2e (22:5e2e)
+asm_89e2e:
 	ld a, [wd02d]
 	ld hl, Jumptable_89e3c
 	rst JumpTable
 	ret
 
-Function89e36: ; 89e36 (22:5e36)
+Function89e36:
 	ld hl, wd02d
 	inc [hl]
 	jr asm_89e2e
 
-Jumptable_89e3c: ; 89e3c (22:5e3c)
+Jumptable_89e3c:
 	dw Function89e6f
 	dw Function89fed
 	dw Function89ff6
@@ -2354,8 +2233,7 @@ Jumptable_89e3c: ; 89e3c (22:5e3c)
 	dw Function89e58
 	dw Function89e68
 
-
-Function89e58: ; 89e58 (22:5e58)
+Function89e58:
 	ld a, $1
 	call Function8a2fe
 	call Function891fe
@@ -2364,13 +2242,13 @@ Function89e58: ; 89e58 (22:5e58)
 	and a
 	ret
 
-Function89e68: ; 89e68 (22:5e68)
+Function89e68:
 	call Function891fe
 	ld a, $1
 	scf
 	ret
 
-Function89e6f: ; 89e6f (22:5e6f)
+Function89e6f:
 	call Function891de
 	call Function89245
 	call Function89ee1
@@ -2387,7 +2265,7 @@ Function89e6f: ; 89e6f (22:5e6f)
 	call SetPalettes
 	jp Function89e36
 
-Function89e9a: ; 89e9a (22:5e9a)
+Function89e9a:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -2399,16 +2277,14 @@ Function89e9a: ; 89e9a (22:5e9a)
 	pop af
 	ld [rSVBK], a
 	ret
-; 89eb1 (22:5eb1)
 
-Palette_89eb1: ; 89eb1
+Palette_89eb1:
 	RGB 31, 31, 31
 	RGB 31, 31, 31
 	RGB 27, 19, 00
 	RGB 00, 00, 00
-; 89eb9
 
-Function89eb9: ; 89eb9 (22:5eb9)
+Function89eb9:
 	call Function891fe
 	call Function89ee1
 	call Function89e9a
@@ -2424,7 +2300,7 @@ Function89eb9: ; 89eb9 (22:5eb9)
 	call SetPalettes
 	jp Function89e36
 
-Function89ee1: ; 89ee1 (22:5ee1)
+Function89ee1:
 	call ClearBGPalettes
 	call Function893e2
 	call Mobile22_SetBGMapMode0
@@ -2434,7 +2310,7 @@ Function89ee1: ; 89ee1 (22:5ee1)
 	call Function8a53d
 	ret
 
-Function89efd: ; 89efd (22:5efd)
+Function89efd:
 	ld hl, wd012
 	ld a, $ff
 	ld [hli], a
@@ -2508,7 +2384,7 @@ endr
 	jr nz, .asm_89f60
 	jp Function89e36
 
-Function89f6a: ; 89f6a (22:5f6a)
+Function89f6a:
 	push af
 	ld de, $10
 	call Function89f9a
@@ -2519,7 +2395,7 @@ Function89f6a: ; 89f6a (22:5f6a)
 	pop af
 	ret
 
-Function89f77: ; 89f77 (22:5f77)
+Function89f77:
 	push af
 	ld de, $10
 	call Function89f9a
@@ -2548,7 +2424,7 @@ Function89f77: ; 89f77 (22:5f77)
 	pop af
 	ret
 
-Function89f9a: ; 89f9a (22:5f9a)
+Function89f9a:
 	dec a
 	ld hl, wVirtualOAM
 	and a
@@ -2559,7 +2435,7 @@ Function89f9a: ; 89f9a (22:5f9a)
 	jr nz, .asm_89fa0
 	ret
 
-Function89fa5: ; 89fa5 (22:5fa5)
+Function89fa5:
 	ld de, $10
 	call Function89f9a
 	ld e, $2
@@ -2592,7 +2468,7 @@ Function89fa5: ; 89fa5 (22:5fa5)
 	jr nz, .asm_89faf
 	ret
 
-Function89fce: ; 89fce (22:5fce)
+Function89fce:
 	call Function8a5b6
 	ld a, $5
 	hlcoord 7, 4, wAttrMap
@@ -2605,12 +2481,12 @@ Function89fce: ; 89fce (22:5fce)
 	call Function891ab
 	jp Function89e36
 
-Function89fed: ; 89fed (22:5fed)
+Function89fed:
 	ld hl, UnknownText_0x8a102
 	call PrintText
 	jp Function89e36
 
-Function89ff6: ; 89ff6 (22:5ff6)
+Function89ff6:
 	call Function891fe
 	call ClearBGPalettes
 	call Function893cc
@@ -2636,19 +2512,19 @@ Function89ff6: ; 89ff6 (22:5ff6)
 	call Mobile22_ButtonSound
 	jp Function89e36
 
-Function8a03d: ; 8a03d (22:603d)
+Function8a03d:
 	ld hl, UnknownText_0x8a107
 	call Function89209
 	call PrintText
 	call Function8920f
 	jp Function89e36
 
-Function8a04c: ; 8a04c (22:604c)
+Function8a04c:
 	ld hl, UnknownText_0x8a10c
 	call PrintText
 	jp Function89e36
 
-Function8a055: ; 8a055 (22:6055)
+Function8a055:
 	ld c, $7
 	ld b, $4
 .asm_8a059
@@ -2687,7 +2563,7 @@ Function8a055: ; 8a055 (22:6055)
 	call CGBOnly_CopyTilemapAtOnce
 	jp Function89e36
 
-Function8a0a1: ; 8a0a1 (22:60a1)
+Function8a0a1:
 	call Mobile22_SetBGMapMode0
 	push bc
 	call Function8a0c9
@@ -2708,7 +2584,7 @@ Function8a0a1: ; 8a0a1 (22:60a1)
 	pop bc
 	ret
 
-Function8a0c1: ; 8a0c1 (22:60c1)
+Function8a0c1:
 	push hl
 	ld bc, wAttrMap - wTileMap
 	add hl, bc
@@ -2716,7 +2592,7 @@ Function8a0c1: ; 8a0c1 (22:60c1)
 	pop hl
 	ret
 
-Function8a0c9: ; 8a0c9 (22:60c9)
+Function8a0c9:
 	push bc
 	hlcoord 0, 0
 	ld de, $14
@@ -2734,60 +2610,55 @@ Function8a0c9: ; 8a0c9 (22:60c9)
 	pop bc
 	ret
 
-Function8a0de: ; 8a0de (22:60de)
+Function8a0de:
 	call Function8a0c9
 	ld de, wAttrMap - wTileMap
 	add hl, de
 	ret
 
-Function8a0e6: ; 8a0e6 (22:60e6)
+Function8a0e6:
 	call Function8b539
 	jp Function89e36
 
-Function8a0ec: ; 8a0ec (22:60ec)
+Function8a0ec:
 	ld hl, UnknownText_0x8a111
 	call PrintText
 	jp Function89e36
 
-Function8a0f5: ; 8a0f5 (22:60f5)
+Function8a0f5:
 	call Function8b555
 	jp nc, Function8a0ff
 	ld hl, wd02d
 	inc [hl]
 
-Function8a0ff: ; 8a0ff (22:60ff)
+Function8a0ff:
 	jp Function89e36
-; 8a102 (22:6102)
 
-UnknownText_0x8a102: ; 0x8a102
+UnknownText_0x8a102:
 	; The CARD FOLDER stores your and your friends' CARDS. A CARD contains information like the person's name, phone number and profile.
 	text_jump UnknownText_0x1c5238
 	db "@"
-; 0x8a107
 
-UnknownText_0x8a107: ; 0x8a107
+UnknownText_0x8a107:
 	; This is your CARD. Once you've entered your phone number, you can trade CARDS with your friends.
 	text_jump UnknownText_0x1c52bc
 	db "@"
-; 0x8a10c
 
-UnknownText_0x8a10c: ; 0x8a10c
+UnknownText_0x8a10c:
 	; If you have your friend's CARD, you can use it to make a call from a mobile phone on the 2nd floor of a #MON CENTER.
 	text_jump UnknownText_0x1c531e
 	db "@"
-; 0x8a111
 
-UnknownText_0x8a111: ; 0x8a111
+UnknownText_0x8a111:
 	; To safely store your collection of CARDS, you must set a PASSCODE for your CARD FOLDER.
 	text_jump UnknownText_0x1c5394
 	db "@"
-; 0x8a116
 
-Function8a116: ; 8a116 (22:6116)
+Function8a116:
 	ld a, $1
 	ld [wd030], a
-	ld hl, MenuDataHeader_0x8a176
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_0x8a176
+	call LoadMenuHeader
 .asm_8a121
 	call Mobile22_SetBGMapMode0
 	call Function8a17b
@@ -2828,19 +2699,17 @@ Function8a116: ; 8a116 (22:6116)
 	call Function8920f
 	scf
 	ret
-; 8a176 (22:6176)
 
-MenuDataHeader_0x8a176: ; 0x8a176
+MenuHeader_0x8a176:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 0, SCREEN_WIDTH - 1, 6
-; 8a17b
 
-Function8a17b: ; 8a17b (22:617b)
+Function8a17b:
 	decoord 14, 0
 	ld b, $5
 	ld c, $4
 	call Function89b3b
-	ld hl, MenuDataHeader_0x8a19a
+	ld hl, MenuHeader_0x8a19a
 	ld a, [wd030]
 	call Function89d5e
 	ld hl, Function8a1b0
@@ -2850,24 +2719,21 @@ Function8a17b: ; 8a17b (22:617b)
 .asm_8a198
 	ld d, a
 	ret
-; 8a19a (22:619a)
 
-MenuDataHeader_0x8a19a: ; 0x8a19a
+MenuHeader_0x8a19a:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 0, SCREEN_WIDTH - 1, 6
-	dw MenuData2_0x8a1a2
+	dw MenuData_0x8a1a2
 	db 1 ; default option
-; 0x8a1a2
 
-MenuData2_0x8a1a2: ; 0x8a1a2
+MenuData_0x8a1a2:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
 	db 3 ; items
 	db "ひらく@"
 	db "すてる@"
 	db "もどる@"
-; 0x8a1b0
 
-Function8a1b0: ; 8a1b0
+Function8a1b0:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
@@ -2880,9 +2746,8 @@ Function8a1b0: ; 8a1b0
 	call Function8919e
 	call PlaceString
 	ret
-; 8a1cc
 
-Strings_8a1cc: ; 8a1cc
+Strings_8a1cc:
 	db   "めいし<NO>せいりと　へんしゅうを"
 	next "おこないます"
 	db   "@"
@@ -2893,10 +2758,8 @@ Strings_8a1cc: ; 8a1cc
 
 	db   "まえ<NO>がめん<NI>もどります"
 	db   "@"
-; 8a20d
 
-
-Function8a20d: ; 8a20d (22:620d)
+Function8a20d:
 	ld hl, UnknownText_0x8a232
 	call PrintText
 	ld a, $2
@@ -2914,28 +2777,24 @@ Function8a20d: ; 8a20d (22:620d)
 	xor a
 	and a
 	ret
-; 8a232 (22:6232)
 
-UnknownText_0x8a232: ; 0x8a232
+UnknownText_0x8a232:
 	; If the CARD FOLDER is deleted, all its CARDS and the PASSCODE will also be deleted. Beware--a deleted CARD FOLDER can't be restored. Want to delete your CARD FOLDER?
 	text_jump UnknownText_0x1c53ee
 	db "@"
-; 0x8a237
 
-UnknownText_0x8a237: ; 0x8a237
+UnknownText_0x8a237:
 	; Are you sure you want to delete it?
 	text_jump UnknownText_0x1c5494
 	db "@"
-; 0x8a23c
 
-UnknownText_0x8a23c: ; 0x8a23c
+UnknownText_0x8a23c:
 	; The CARD FOLDER has been deleted.
 	text_jump UnknownText_0x1c54b9
 	db "@"
-; 0x8a241
 
-Function8a241: ; 8a241 (22:6241)
-	call LoadStandardMenuDataHeader
+Function8a241:
+	call LoadStandardMenuHeader
 	call Function891fe
 	call Function8a262
 	jr nc, .asm_8a254
@@ -2951,7 +2810,7 @@ Function8a241: ; 8a241 (22:6241)
 	and a
 	ret
 
-Function8a262: ; 8a262 (22:6262)
+Function8a262:
 	call ClearBGPalettes
 	call Function893e2
 	call Mobile22_SetBGMapMode0
@@ -2977,9 +2836,9 @@ Function8a262: ; 8a262 (22:6262)
 	call Function8b5e7
 	ret
 
-Function8a2aa: ; 8a2aa (22:62aa)
-	ld hl, MenuDataHeader_0x8a2ef
-	call LoadMenuDataHeader
+Function8a2aa:
+	ld hl, MenuHeader_0x8a2ef
+	call LoadMenuHeader
 	ld hl, UnknownText_0x8a2f4
 	call PrintText
 	ld a, $1
@@ -3009,26 +2868,22 @@ Function8a2aa: ; 8a2aa (22:62aa)
 .asm_8a2ed
 	scf
 	ret
-; 8a2ef (22:62ef)
 
-MenuDataHeader_0x8a2ef: ; 0x8a2ef
+MenuHeader_0x8a2ef:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-; 8a2f4
 
-UnknownText_0x8a2f4: ; 0x8a2f4
+UnknownText_0x8a2f4:
 	; There is an older CARD FOLDER from a previous journey. Do you want to open it?
 	text_jump UnknownText_0x1c54dd
 	db "@"
-; 0x8a2f9
 
-UnknownText_0x8a2f9: ; 0x8a2f9
+UnknownText_0x8a2f9:
 	; Delete the old CARD FOLDER?
 	text_jump UnknownText_0x1c552d
 	db "@"
-; 0x8a2fe
 
-Function8a2fe: ; 8a2fe (22:62fe)
+Function8a2fe:
 	call Function8a313
 	call Function89305
 	ld hl, $a603
@@ -3038,14 +2893,14 @@ Function8a2fe: ; 8a2fe (22:62fe)
 	call CloseSRAM
 	ret
 
-Function8a313: ; 8a313 (22:6313)
+Function8a313:
 	ld c, a
 	call OpenSRAMBank4
 	ld a, c
 	ld [$a60b], a
 	ret
 
-Function8a31c: ; 8a31c (22:631c)
+Function8a31c:
 	push bc
 	call Mobile22_SetBGMapMode0
 	farcall Function4a3a7
@@ -3090,7 +2945,7 @@ Function8a31c: ; 8a31c (22:631c)
 	and a
 	ret
 
-Function8a383: ; 8a383 (22:6383)
+Function8a383:
 	farcall MobileMenuJoypad
 	ld a, c
 	ld hl, wMenuJoypadFilter
@@ -3110,7 +2965,7 @@ Function8a383: ; 8a383 (22:6383)
 	call PlayClickSFX
 	ret
 
-Function8a3a2: ; 8a3a2 (22:63a2)
+Function8a3a2:
 	ld a, [wMenuCursorY]
 	dec a
 	ld hl, wd002
@@ -3121,7 +2976,7 @@ Function8a3a2: ; 8a3a2 (22:63a2)
 	ld [wMenuSelection], a
 	ret
 
-Function8a3b2: ; 8a3b2 (22:63b2)
+Function8a3b2:
 	ld a, $1
 	ld [wMenuSelection], a
 	call Function8a4fc
@@ -3131,19 +2986,19 @@ Function8a3b2: ; 8a3b2 (22:63b2)
 	ld b, $6
 	ld c, $9
 	call Function89b3b
-	ld hl, MenuDataHeader_0x8a435
+	ld hl, MenuHeader_0x8a435
 	jr .asm_8a3db
 .asm_8a3ce
 	decoord 0, 2
 	ld b, $8
 	ld c, $9
 	call Function89b3b
-	ld hl, MenuDataHeader_0x8a40f
+	ld hl, MenuHeader_0x8a40f
 .asm_8a3db
-	call CopyMenuDataHeader
+	call CopyMenuHeader
 	ret
 
-Function8a3df: ; 8a3df (22:63df)
+Function8a3df:
 	call OpenSRAMBank4
 	ld hl, $a603
 	call Function89b45
@@ -3160,50 +3015,45 @@ Function8a3df: ; 8a3df (22:63df)
 	and a
 	ret
 
-Function8a400: ; 8a400 (22:6400)
+Function8a400:
 	ld a, [de]
 	inc de
 	ld [hli], a
 	cp $ff
 	jr nz, Function8a400
 	ret
-; 8a408 (22:6408)
 
 Unknown_8a408: db 1, 2, -1
 Unknown_8a40b: db 1, 2, 3, -1
 
-MenuDataHeader_0x8a40f: ; 0x8a40f
+MenuHeader_0x8a40f:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 10, TEXTBOX_Y - 1
-	dw MenuData2_0x8a417
+	dw MenuData_0x8a417
 	db 1 ; default option
-; 0x8a417
 
-MenuData2_0x8a417: ; 0x8a417
+MenuData_0x8a417:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 4 ; items
 	db "めいしりスト@"
 	db "じぶんの　めいし@"
 	db "めいしこうかん@"
 	db "やめる@"
-; 0x8a435
 
-MenuDataHeader_0x8a435: ; 0x8a435
+MenuHeader_0x8a435:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 10, 9
-	dw MenuData2_0x8a43d
+	dw MenuData_0x8a43d
 	db 1 ; default option
-; 0x8a43d
 
-MenuData2_0x8a43d: ; 0x8a43d
+MenuData_0x8a43d:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 3 ; items
 	db "めいしりスト@"
 	db "じぶんの　めいし@"
 	db "やめる@"
-; 0x8a453
 
-Function8a453: ; 8a453 (22:6453)
+Function8a453:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
@@ -3220,13 +3070,11 @@ Function8a453: ; 8a453 (22:6453)
 .asm_8a472
 	call PlaceString
 	ret
-; 8a476 (22:6476)
 
-String_8a476: ; 8a476
+String_8a476:
 	db   "まえ<NO>がめん<NI>もどります@"
-; 8a483
 
-Strings_8a483: ; 8a483
+Strings_8a483:
 	db   "おともだち<NO>めいしは"
 	next "ここ<NI>いれておきます@"
 
@@ -3235,9 +3083,8 @@ Strings_8a483: ; 8a483
 
 	db   "ともだちと　じぶん<NO>めいしを"
 	next "せきがいせんで　こうかん　します@"
-; 8a4d3
 
-Function8a4d3: ; 8a4d3 (22:64d3)
+Function8a4d3:
 	ld a, [wMenuSelection]
 	cp $1
 	jr nz, .asm_8a4eb
@@ -3257,7 +3104,7 @@ Function8a4d3: ; 8a4d3 (22:64d3)
 	call Function8a5a3
 	ret
 
-Function8a4fc: ; 8a4fc (22:64fc)
+Function8a4fc:
 	ld a, [wMenuSelection]
 	cp $3
 	jr nz, asm_8a529
@@ -3273,7 +3120,7 @@ Function8a4fc: ; 8a4fc (22:64fc)
 	call Function8a515
 	ret
 
-Function8a515: ; 8a515 (22:6515)
+Function8a515:
 	ld hl, wd012
 	ld a, [hl]
 	cp $38
@@ -3287,7 +3134,7 @@ Function8a515: ; 8a515 (22:6515)
 	ld [wd013], a
 	ret
 
-asm_8a529: ; 8a529 (22:6529)
+asm_8a529:
 	ld hl, wd012
 	ld a, $3c
 	ld [hli], a
@@ -3299,7 +3146,7 @@ asm_8a529: ; 8a529 (22:6529)
 	call ByteFill
 	ret
 
-Function8a53d: ; 8a53d (22:653d)
+Function8a53d:
 	push hl
 	ld a, $15
 	ld c, $8
@@ -3328,7 +3175,7 @@ Function8a53d: ; 8a53d (22:653d)
 	ld a, $27
 	ld c, $6
 
-Function8a573: ; 8a573 (22:6573)
+Function8a573:
 	ld [hl], a
 	call Function8a584
 	inc a
@@ -3336,14 +3183,14 @@ Function8a573: ; 8a573 (22:6573)
 	jr nz, Function8a573
 	ret
 
-Function8a57c: ; 8a57c (22:657c)
+Function8a57c:
 	ld [hl], a
 	call Function8a584
 	dec c
 	jr nz, Function8a57c
 	ret
 
-Function8a584: ; 8a584 (22:6584)
+Function8a584:
 	push af
 	ld a, $4
 	call Function89215
@@ -3351,7 +3198,7 @@ Function8a584: ; 8a584 (22:6584)
 	pop af
 	ret
 
-Function8a58d: ; 8a58d (22:658d)
+Function8a58d:
 	ld a, $2d
 	ld bc, $606
 	ld de, $14
@@ -3370,7 +3217,7 @@ Function8a58d: ; 8a58d (22:658d)
 	jr nz, .asm_8a595
 	ret
 
-Function8a5a3: ; 8a5a3 (22:65a3)
+Function8a5a3:
 	ld bc, $603
 	ld de, $14
 .asm_8a5a9
@@ -3387,7 +3234,7 @@ Function8a5a3: ; 8a5a3 (22:65a3)
 	jr nz, .asm_8a5a9
 	ret
 
-Function8a5b6: ; 8a5b6 (22:65b6)
+Function8a5b6:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -3407,9 +3254,8 @@ Function8a5b6: ; 8a5b6 (22:65b6)
 	pop af
 	ld [rSVBK], a
 	ret
-; 8a5e5 (22:65e5)
 
-Palette_8a5e5: ; 8a5e5
+Palette_8a5e5:
 	RGB 31, 31, 31
 	RGB 27, 19, 00
 	RGB 07, 11, 22
@@ -3424,23 +3270,20 @@ Palette_8a5e5: ; 8a5e5
 	RGB 31, 00, 00
 	RGB 27, 19, 00
 	RGB 00, 00, 00
-; 8a5fd
 
-Palette_8a5fd: ; 8a5fd
+Palette_8a5fd:
 	RGB 00, 00, 00
 	RGB 00, 00, 00
 	RGB 00, 00, 00
 	RGB 31, 31, 31
-; 8a605
 
-Palette_8a605: ; 8a605
+Palette_8a605:
 	RGB 00, 00, 00
 	RGB 14, 18, 31
 	RGB 16, 16, 31
 	RGB 31, 31, 31
-; 8a60d
 
-Function8a60d: ; 8a60d
+Function8a60d:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -3452,17 +3295,15 @@ Function8a60d: ; 8a60d
 	pop af
 	ld [rSVBK], a
 	ret
-; 8a624
 
-Palette_8a624: ; 8a624
+Palette_8a624:
 	RGB 31, 31, 31
 	RGB 31, 31, 31
 	RGB 31, 31, 31
 	RGB 00, 00, 00
-; 8a62c
 
-Function8a62c: ; 8a62c (22:662c)
-	call LoadStandardMenuDataHeader
+Function8a62c:
+	call LoadStandardMenuHeader
 	call Function891fe
 	xor a
 	call Function8b94a
@@ -3499,14 +3340,13 @@ Function8a62c: ; 8a62c (22:662c)
 	call Function89b28
 	ret
 
-Jumptable_8a671: ; 8a671 (22:6671)
+Jumptable_8a671:
 	dw Function8a679
 	dw Function8a6cd
 	dw Function8a8c3
 	dw Function8a930
 
-
-Function8a679: ; 8a679 (22:6679)
+Function8a679:
 	call Function891de
 	call ClearBGPalettes
 	call Function893cc
@@ -3535,23 +3375,22 @@ Function8a679: ; 8a679 (22:6679)
 	call Function89448
 	ret
 
-Jumptable_8a6bc: ; 8a6bc (22:66bc)
+Jumptable_8a6bc:
 	dw Function8a6c0
 	dw Function8a6c5
 
-
-Function8a6c0: ; 8a6c0 (22:66c0)
+Function8a6c0:
 	call PlayClickSFX
 	and a
 	ret
 
-Function8a6c5: ; 8a6c5 (22:66c5)
+Function8a6c5:
 	call PlayClickSFX
 	call Function89d0d
 	scf
 	ret
 
-Function8a6cd: ; 8a6cd (22:66cd)
+Function8a6cd:
 	call Function891de
 	call ClearBGPalettes
 	call Function893cc
@@ -3607,14 +3446,13 @@ Function8a6cd: ; 8a6cd (22:66cd)
 	call Function8b677
 	ret
 
-Jumptable_8a74f: ; 8a74f (22:674f)
+Jumptable_8a74f:
 	dw Function8a78c
 	dw Function8a7cb
 	dw Function8a818
 	dw Function8a8a1
 
-
-Function8a757: ; 8a757 (22:6757)
+Function8a757:
 	call Function8939a
 	xor a
 	ld [wd010], a
@@ -3622,7 +3460,7 @@ Function8a757: ; 8a757 (22:6757)
 	ld [wd012], a
 	ret
 
-Function8a765: ; 8a765 (22:6765)
+Function8a765:
 	call Function8931b
 	push bc
 	ld hl, $0
@@ -3646,7 +3484,7 @@ Function8a765: ; 8a765 (22:6765)
 	scf
 	ret
 
-Function8a78c: ; 8a78c (22:678c)
+Function8a78c:
 	call Function891fe
 	ld de, wd002
 	ld b, $5
@@ -3673,7 +3511,7 @@ Function8a78c: ; 8a78c (22:678c)
 	and a
 	ret
 
-Function8a7cb: ; 8a7cb (22:67cb)
+Function8a7cb:
 	ld a, [wMenuSelection]
 	push af
 	call Function891de
@@ -3706,7 +3544,7 @@ Function8a7cb: ; 8a7cb (22:67cb)
 	and a
 	ret
 
-Function8a818: ; 8a818 (22:6818)
+Function8a818:
 	call Function89a23
 	ld hl, wd002
 	call Function89331
@@ -3743,7 +3581,6 @@ Function8a818: ; 8a818 (22:6818)
 	call CloseSRAM
 	scf
 	ret
-; 8a868 (22:6868)
 
 .string_8a868
 	db "めいし<WO>かきかえ　まし<TA!>@"
@@ -3760,14 +3597,12 @@ Function8a818: ; 8a818 (22:6818)
 	call JoyWaitAorB
 	and a
 	ret
-; 8a88b (22:688b)
 
-String_8a88b: ; 8a88b
+String_8a88b:
 	db   "おともだち<NO>なまえが"
 	next "かかれて　いません！@"
-; 8a8a1
 
-Function8a8a1: ; 8a8a1 (22:68a1)
+Function8a8a1:
 	call OpenSRAMBank4
 	call Function8a765
 	call CloseSRAM
@@ -3786,7 +3621,7 @@ Function8a8a1: ; 8a8a1 (22:68a1)
 	and a
 	ret
 
-Function8a8c3: ; 8a8c3 (22:68c3)
+Function8a8c3:
 	call Function891de
 	call ClearBGPalettes
 	call Function893cc
@@ -3818,17 +3653,14 @@ Function8a8c3: ; 8a8c3 (22:68c3)
 	call Function891fe
 	call Function8b677
 	ret
-; 8a919 (22:6919)
 
-String_8a919: ; 8a919
+String_8a919:
 	db "このデータ<WO>けしますか？@"
-; 8a926
 
-String_8a926: ; 8a926
+String_8a926:
 	db "データ<WO>けしまし<TA!>@"
-; 8a930
 
-Function8a930: ; 8a930 (22:6930)
+Function8a930:
 	ld a, [wMenuSelection]
 	push af
 	xor a
@@ -3883,16 +3715,16 @@ Function8a930: ; 8a930 (22:6930)
 	call CloseSRAM
 	ret
 
-Function8a999: ; 8a999 (22:6999)
-	ld hl, MenuDataHeader_0x8a9c9
-	call LoadMenuDataHeader
+Function8a999:
+	ld hl, MenuHeader_0x8a9c9
+	call LoadMenuHeader
 	ld c, $1
 .asm_8a9a1
 	call Function8a9ce
 	jr c, .asm_8a9bb
 	push bc
 	push de
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	pop de
 	dec e
 	ld a, e
@@ -3908,17 +3740,15 @@ Function8a999: ; 8a999 (22:6999)
 	call Function8920f
 	ret
 
-Jumptable_8a9c5: ; 8a9c5 (22:69c5)
+Jumptable_8a9c5:
 	dw Function8aa0a
 	dw Function8ab3b
-; 8a9c9 (22:69c9)
 
-MenuDataHeader_0x8a9c9: ; 0x8a9c9
+MenuHeader_0x8a9c9:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 4, 18, TEXTBOX_Y - 1
-; 8a9ce
 
-Function8a9ce: ; 8a9ce (22:69ce)
+Function8a9ce:
 	push bc
 	decoord 11, 4
 	ld b, $6
@@ -3926,7 +3756,7 @@ Function8a9ce: ; 8a9ce (22:69ce)
 	call Function89b3b
 	pop bc
 	ld a, c
-	ld hl, MenuDataHeader_0x8a9f2
+	ld hl, MenuHeader_0x8a9f2
 	call Function89d5e
 	ld hl, Function8aa09
 	call Function89d85
@@ -3940,28 +3770,24 @@ Function8a9ce: ; 8a9ce (22:69ce)
 	ld e, $0
 	scf
 	ret
-; 8a9f2 (22:69f2)
 
-MenuDataHeader_0x8a9f2: ; 0x8a9f2
+MenuHeader_0x8a9f2:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 4, 18, TEXTBOX_Y - 1
-	dw MenuData2_0x8a9fa
+	dw MenuData_0x8a9fa
 	db 1 ; default option
-; 0x8a9fa
 
-MenuData2_0x8a9fa: ; 0x8a9fa
+MenuData_0x8a9fa:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 3 ; items
 	db "へんしゅう@"
 	db "みる@"
 	db "やめる@"
-; 0x8aa09
 
-Function8aa09: ; 8aa09
+Function8aa09:
 	ret
-; 8aa0a
 
-Function8aa0a: ; 8aa0a (22:6a0a)
+Function8aa0a:
 	ld a, $1
 	ld [wd02f], a
 	ld [wd011], a
@@ -4006,13 +3832,12 @@ Function8aa0a: ; 8aa0a (22:6a0a)
 	call Function89448
 	ret
 
-Jumptable_8aa6d: ; 8aa6d (22:6a6d)
+Jumptable_8aa6d:
 	dw Function8aa73
 	dw Function8aab6
 	dw Function8ab11
 
-
-Function8aa73: ; 8aa73 (22:6a73)
+Function8aa73:
 	ld a, [wMenuSelection]
 	ld e, a
 	push de
@@ -4043,7 +3868,7 @@ Function8aa73: ; 8aa73 (22:6a73)
 	and a
 	ret
 
-Function8aab6: ; 8aab6 (22:6ab6)
+Function8aab6:
 	call Function89a23
 	ld hl, wd008
 	call Function89b45
@@ -4067,13 +3892,11 @@ Function8aab6: ; 8aab6 (22:6ab6)
 	call CloseSRAM
 	scf
 	ret
-; 8aaf0 (22:6af0)
 
-String_8aaf0: ; 8aaf0
-	db "あたらしい　めいし<PKMN>できまし<LNBRK>@"
-; 8ab00
+String_8aaf0:
+	db "あたらしい　めいし<PKMN>できまし<LF>@"
 
-Function8ab00: ; 8ab00
+Function8ab00:
 	ld de, String_8911c
 	hlcoord 1, 13
 	call PlaceString
@@ -4082,7 +3905,7 @@ Function8ab00: ; 8ab00
 	and a
 	ret
 
-Function8ab11: ; 8ab11 (22:6b11)
+Function8ab11:
 	call OpenSRAMBank4
 	ld hl, $a603
 	ld de, wd008
@@ -4104,7 +3927,7 @@ Function8ab11: ; 8ab11 (22:6b11)
 	and a
 	ret
 
-Function8ab3b: ; 8ab3b (22:6b3b)
+Function8ab3b:
 .pressed_start
 	call Function891fe
 	call ClearBGPalettes
@@ -4128,7 +3951,7 @@ Function8ab3b: ; 8ab3b (22:6b3b)
 	jr c, .pressed_start
 	ret
 
-.JoypadLoop: ; 8ab77 (22:6b77)
+.JoypadLoop:
 	call JoyTextDelay_ForcehJoyDown
 	bit A_BUTTON_F, c
 	jr nz, .a_b_button
@@ -4146,17 +3969,16 @@ Function8ab3b: ; 8ab3b (22:6b3b)
 	and a
 	ret
 
-Function8ab93: ; 8ab93 (22:6b93)
+Function8ab93:
 	call ClearBGPalettes
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	farcall Function105688
 	call ClearSprites
 	call Function891fe
 	call Function89b28
 	ret
-; 8aba9 (22:6ba9)
 
-Function8aba9: ; 8aba9
+Function8aba9:
 	ld a, $2
 	call Function8b94a
 	ld a, $1
@@ -4223,14 +4045,12 @@ Function8aba9: ; 8aba9
 	ld a, [wMenuSelection]
 	ld c, a
 	ret
-; 8ac3b
 
-String_8ac3b: ; 8ac3b
+String_8ac3b:
 	db   "こ<NO>ともだち<NI>でんわを"
 	next "かけますか？@"
-; 8ac4e
 
-Function8ac4e: ; 8ac4e
+Function8ac4e:
 	xor a
 	ld [wMenuSelection], a
 	push de
@@ -4245,18 +4065,17 @@ Function8ac4e: ; 8ac4e
 	call Function899fe
 	call Function891ab
 	ret
-; 8ac70
 
-Function8ac70: ; 8ac70
+Function8ac70:
 	push de
 	ld a, $3
 	call Function8b94a
 
-Function8ac76: ; 8ac76
+Function8ac76:
 	call Function891fe
 	call Function8b677
 
-Function8ac7c: ; 8ac7c
+Function8ac7c:
 	call Function8b7bd
 	jr z, .asm_8acf0
 	ld a, c
@@ -4331,15 +4150,13 @@ Function8ac7c: ; 8ac7c
 	ld c, $0
 	scf
 	ret
-; 8ad06
 
-UnknownText_0x8ad06: ; 0x8ad06
+UnknownText_0x8ad06:
 	; Finish registering CARDS?
 	text_jump UnknownText_0x1c554a
 	db "@"
-; 0x8ad0b
 
-Function8ad0b: ; 8ad0b
+Function8ad0b:
 .asm_8ad0b
 	ld a, [wMenuSelection]
 	ld [wd02f], a
@@ -4401,36 +4218,31 @@ Function8ad0b: ; 8ad0b
 .asm_8ad87
 	pop bc
 	ret
-; 8ad89
 
-String_8ad89: ; 8ad89
+String_8ad89:
 	db   "こ<NO>めいし<WO>けして"
 	next "いれかえますか？@"
-; 8ad9c
 
-String_8ad9c: ; 8ad9c
+String_8ad9c:
 	db   "おともだち<NO>なまえを"
 	next "のこして　おきますか？@"
-; 8adb3
 
-Function8adb3: ; 8adb3
+Function8adb3:
 	call Function891de
 	call Function8a262
 	push af
 	call Function891de
 	pop af
 	ret
-; 8adbf
 
-Function8adbf: ; 8adbf
+Function8adbf:
 	call OpenSRAMBank4
 	ld hl, $a603
 	call Function89b45
 	call CloseSRAM
 	ret
-; 8adcc
 
-Function8adcc: ; 8adcc
+Function8adcc:
 	call OpenSRAMBank4
 	call Function8b3b0
 	call CloseSRAM
@@ -4439,4 +4251,3 @@ Function8adcc: ; 8adcc
 	ret z
 	scf
 	ret
-; 8addb
diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm
index a55daafc9..be1c897d8 100644
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -1,8 +1,8 @@
-Function8b342:: ; 8b342
+Function8b342::
 ; Loads the map data pointer, then runs through a
 ; dw with three dummy functions. Spends a lot of energy
 ; doing pretty much nothing.
-	call GetMapDataPointer
+	call GetMapAttributesPointer
 	ld d, h
 	ld e, l
 
@@ -17,43 +17,36 @@ Function8b342:: ; 8b342
 	cp 3
 	jr nz, .loop
 	ret
-; 8b354
 
-.dw ; 8b354
+.dw
 	dw .zero
 	dw .one
 	dw .two
-; 8b35a
 
-.zero ; 8b35a
+.zero
 	ret
-; 8b35b
 
-.one ; 8b35b
+.one
 	ret
-; 8b35c
 
-.two ; 8b35c
+.two
 	ret
-; 8b35d
 
-Function8b35d: ; 8b35d
+Function8b35d:
 	ld a, h
 	cp d
 	ret nz
 	ld a, l
 	cp e
 	ret
-; 8b363
 
-Function8b363: ; 8b363
+Function8b363:
 	push bc
 	farcall Mobile_AlwaysReturnNotCarry
 	pop bc
 	ret
-; 8b36c
 
-Function8b36c: ; 8b36c (22:736c)
+Function8b36c:
 	; [bc + (0:4)] = -1
 	push bc
 	ld h, b
@@ -64,7 +57,7 @@ Function8b36c: ; 8b36c (22:736c)
 	pop bc
 	ret
 
-Function8b379: ; 8b379 (22:7379)
+Function8b379:
 	; d = [bc + e]
 	push bc
 	ld a, c
@@ -78,7 +71,7 @@ Function8b379: ; 8b379 (22:7379)
 	pop bc
 	ret
 
-Function8b385: ; 8b385 (22:7385)
+Function8b385:
 	; [bc + e] = d
 	push bc
 	ld a, c
@@ -92,7 +85,7 @@ Function8b385: ; 8b385 (22:7385)
 	pop bc
 	ret
 
-Function8b391: ; 8b391 (22:7391)
+Function8b391:
 	; find first e in range(4) such that [bc + e] == -1
 	; if none exist, return carry
 	push bc
@@ -112,7 +105,7 @@ Function8b391: ; 8b391 (22:7391)
 	pop bc
 	ret
 
-Function8b3a4: ; 8b3a4 (22:73a4)
+Function8b3a4:
 	; strcmp(hl, bc, 4)
 	push de
 	push bc
@@ -124,7 +117,7 @@ Function8b3a4: ; 8b3a4 (22:73a4)
 	pop de
 	ret
 
-Function8b3b0: ; 8b3b0 (22:73b0)
+Function8b3b0:
 	ld bc, $a037 ; 4:a037
 	ld a, [$a60b]
 	and a
@@ -141,7 +134,7 @@ Function8b3b0: ; 8b3b0 (22:73b0)
 	ld a, [$a60b]
 	ret
 
-Function8b3cd: ; 8b3cd (22:73cd)
+Function8b3cd:
 	push de
 	push bc
 	ld e, $4
@@ -156,7 +149,7 @@ Function8b3cd: ; 8b3cd (22:73cd)
 	pop de
 	ret
 
-Function8b3dd: ; 8b3dd (22:73dd)
+Function8b3dd:
 	push de
 	push bc
 	call JoyTextDelay_ForcehJoyDown ; joypad
@@ -246,7 +239,7 @@ Function8b3dd: ; 8b3dd (22:73dd)
 	ld [wd010], a
 	ret
 
-Function8b45c: ; 8b45c (22:745c)
+Function8b45c:
 	call Function8b36c
 	xor a
 	ld [wd010], a
@@ -274,7 +267,7 @@ Function8b45c: ; 8b45c (22:745c)
 	scf
 	ret
 
-Function8b493: ; 8b493 (22:7493)
+Function8b493:
 	push bc
 	call Mobile22_SetBGMapMode0
 	call Function8b521
@@ -283,12 +276,11 @@ Function8b493: ; 8b493 (22:7493)
 	rst JumpTable
 	ret
 
-Jumptable_8b4a0: ; 8b4a0 (22:74a0)
+Jumptable_8b4a0:
 	dw Function8b4a4
 	dw Function8b4b8
 
-
-Function8b4a4: ; 8b4a4 (22:74a4)
+Function8b4a4:
 	push bc
 	push de
 	call Function8b4d8
@@ -300,7 +292,7 @@ Function8b4a4: ; 8b4a4 (22:74a4)
 	call Function8b3cd
 	ret
 
-Function8b4b8: ; 8b4b8 (22:74b8)
+Function8b4b8:
 	push bc
 	push de
 	call Function8b4ea
@@ -312,7 +304,7 @@ Function8b4b8: ; 8b4b8 (22:74b8)
 	call Function8b3cd
 	ret
 
-Function8b4cc: ; 8b4cc (22:74cc)
+Function8b4cc:
 	push bc
 	ld hl, Unknown_8b529
 	call Function8b50a
@@ -322,7 +314,7 @@ Function8b4cc: ; 8b4cc (22:74cc)
 	pop bc
 	ret
 
-Function8b4d8: ; 8b4d8 (22:74d8)
+Function8b4d8:
 	ld hl, Unknown_8b529
 	call Function8b50a
 	push hl
@@ -338,7 +330,7 @@ Function8b4d8: ; 8b4d8 (22:74d8)
 	ld l, a
 	ret
 
-Function8b4ea: ; 8b4ea (22:74ea)
+Function8b4ea:
 	ld hl, Unknown_8b529
 	call Function8b50a
 	push hl
@@ -355,7 +347,7 @@ Function8b4ea: ; 8b4ea (22:74ea)
 	ld d, a
 	ret
 
-Function8b4fd: ; 8b4fd (22:74fd)
+Function8b4fd:
 	ld hl, Unknown_8b529 + 4
 	call Function8b50a
 	ld a, [hli]
@@ -366,7 +358,7 @@ Function8b4fd: ; 8b4fd (22:74fd)
 	ld d, a
 	ret
 
-Function8b50a: ; 8b50a (22:750a)
+Function8b50a:
 	ld a, [wd02e]
 	and a
 	ret z
@@ -378,7 +370,7 @@ Function8b50a: ; 8b50a (22:750a)
 	jr nz, .asm_8b513
 	ret
 
-Function8b518: ; 8b518 (22:7518)
+Function8b518:
 	push de
 	ld d, $0
 	ld e, $14
@@ -387,21 +379,19 @@ Function8b518: ; 8b518 (22:7518)
 	pop de
 	ret
 
-Function8b521: ; 8b521 (22:7521)
+Function8b521:
 	ld hl, Unknown_8b529 + 7
 	call Function8b50a
 	ld a, [hl]
 	ret
-; 8b529 (22:7529)
 
-Unknown_8b529: ; 8b529
+Unknown_8b529:
 	dwcoord 2, 5
 	db 1, 4, $20, $49, 0, 1
 	dwcoord 7, 4
 	db 1, 4, $48, $41, 0, 0
-; 8b539
 
-Function8b539: ; 8b539 (22:7539)
+Function8b539:
 	ld bc, wd017
 	call Function8b36c
 	xor a
@@ -414,7 +404,7 @@ Function8b539: ; 8b539 (22:7539)
 	call CGBOnly_CopyTilemapAtOnce
 	ret
 
-Function8b555: ; 8b555 (22:7555)
+Function8b555:
 .loop
 	ld hl, UnknownText_0x8b5ce
 	call PrintText
@@ -466,39 +456,33 @@ Function8b555: ; 8b555 (22:7555)
 	call Function89448
 	pop af
 	ret
-; 8b5ce (22:75ce)
 
-UnknownText_0x8b5ce: ; 0x8b5ce
+UnknownText_0x8b5ce:
 	; Please enter any four-digit number.
 	text_jump UnknownText_0x1bc187
 	db "@"
-; 0x8b5d3
 
-UnknownText_0x8b5d3: ; 0x8b5d3
+UnknownText_0x8b5d3:
 	; Enter the same number to confirm.
 	text_jump UnknownText_0x1bc1ac
 	db "@"
-; 0x8b5d8
 
-UnknownText_0x8b5d8: ; 0x8b5d8
+UnknownText_0x8b5d8:
 	; That's not the same number.
 	text_jump UnknownText_0x1bc1cf
 	db "@"
-; 0x8b5dd
 
-UnknownText_0x8b5dd: ; 0x8b5dd
+UnknownText_0x8b5dd:
 	; Your PASSCODE has been set. Enter this number next time to open the CARD FOLDER.
 	text_jump UnknownText_0x1bc1eb
 	db "@"
-; 0x8b5e2
 
-UnknownText_0x8b5e2: ; 0x8b5e2
+UnknownText_0x8b5e2:
 	; 0000 is invalid!
 	text_jump UnknownText_0x1bc23e
 	db "@"
-; 0x8b5e7
 
-Function8b5e7: ; 8b5e7 (22:75e7)
+Function8b5e7:
 	ld bc, wd013
 	call Function8b36c
 	xor a
@@ -537,21 +521,18 @@ Function8b5e7: ; 8b5e7 (22:75e7)
 	call Function89448
 	pop af
 	ret
-; 8b642 (22:7642)
 
-UnknownText_0x8b642: ; 0x8b642
+UnknownText_0x8b642:
 	; Enter the CARD FOLDER PASSCODE.
 	text_jump UnknownText_0x1bc251
 	db "@"
-; 0x8b647
 
-UnknownText_0x8b647: ; 0x8b647
+UnknownText_0x8b647:
 	; Incorrect PASSCODE!
 	text_jump UnknownText_0x1bc272
 	db "@"
-; 0x8b64c
 
-UnknownText_0x8b64c: ; 0x8b64c
+UnknownText_0x8b64c:
 	; CARD FOLDER open.@ @
 	text_jump UnknownText_0x1bc288
 	start_asm
@@ -564,9 +545,8 @@ UnknownText_0x8b64c: ; 0x8b64c
 	ret
 .string_8b663
 	db "@"
-; 8b664
 
-Function8b664: ; 8b664 (22:7664)
+Function8b664:
 	push bc
 	ld de, $4
 .asm_8b668
@@ -583,7 +563,7 @@ Function8b664: ; 8b664 (22:7664)
 	cp $4
 	ret
 
-Function8b677: ; 8b677
+Function8b677:
 	call ClearBGPalettes
 	call DisableLCD
 	call Function8b690
@@ -593,9 +573,8 @@ Function8b677: ; 8b677
 	call Function891ab
 	call SetPalettes
 	ret
-; 8b690
 
-Function8b690: ; 8b690
+Function8b690:
 	ld hl, GFX_17afa5 + $514
 	ld de, vTiles2
 	ld bc, $160
@@ -607,14 +586,13 @@ Function8b690: ; 8b690
 	ld a, BANK(GFX_17afa5)
 	call FarCopyBytes
 	ld hl, GFX_17afa5 + $514 + $160
-	ld de, vTiles1 tile $6e
+	ld de, vTiles0 tile $ee
 	ld bc, $10
 	ld a, BANK(GFX_17afa5)
 	call FarCopyBytes
 	ret
-; 8b6bb
 
-Function8b6bb: ; 8b6bb
+Function8b6bb:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -627,9 +605,8 @@ Function8b6bb: ; 8b6bb
 	ld [rSVBK], a
 	call Function8949c
 	ret
-; 8b6d5
 
-Palette_8b6d5: ; 8b6d5
+Palette_8b6d5:
 	RGB 31, 31, 31
 	RGB 31, 21, 00
 	RGB 14, 07, 03
@@ -642,9 +619,8 @@ Palette_8b6d5: ; 8b6d5
 	RGB 31, 21, 00
 	RGB 06, 24, 08
 	RGB 00, 00, 00
-; 8b6ed
 
-Function8b6ed: ; 8b6ed
+Function8b6ed:
 	hlcoord 0, 0, wAttrMap
 	ld bc, $012c
 	xor a
@@ -654,9 +630,8 @@ Function8b6ed: ; 8b6ed
 	ld a, $7
 	call ByteFill
 	ret
-; 8b703
 
-Function8b703: ; 8b703
+Function8b703:
 	call Mobile22_SetBGMapMode0
 	push hl
 	ld a, $c
@@ -687,9 +662,8 @@ Function8b703: ; 8b703
 	pop bc
 	pop hl
 	jr Function8b744
-; 8b732
 
-Function8b732: ; 8b732
+Function8b732:
 	ld a, $12
 	ld [hli], a
 	ld a, $13
@@ -697,18 +671,16 @@ Function8b732: ; 8b732
 	ld a, $14
 	ld [hl], a
 	ret
-; 8b73e
 
-Function8b73e: ; 8b73e
+Function8b73e:
 	ld d, c
 .asm_8b73f
 	ld [hli], a
 	dec d
 	jr nz, .asm_8b73f
 	ret
-; 8b744
 
-Function8b744: ; 8b744
+Function8b744:
 	ld de, wAttrMap - wTileMap
 	add hl, de
 	inc b
@@ -730,9 +702,8 @@ Function8b744: ; 8b744
 	dec b
 	jr nz, .asm_8b74d
 	ret
-; 8b75d
 
-Function8b75d: ; 8b75d
+Function8b75d:
 	call Mobile22_SetBGMapMode0
 	hlcoord 0, 0
 	ld a, $1
@@ -753,13 +724,11 @@ Function8b75d: ; 8b75d
 	dec e
 	jr nz, .asm_8b780
 	jr Function8b79e
-; 8b787
 
-Function8b787: ; 8b787
+Function8b787:
 	ret
-; 8b788
 
-Function8b788: ; 8b788
+Function8b788:
 .asm_8b788
 	ld a, $2
 	ld [hli], a
@@ -778,9 +747,8 @@ Function8b788: ; 8b788
 	dec c
 	jr nz, .asm_8b788
 	ret
-; 8b79e
 
-Function8b79e: ; 8b79e
+Function8b79e:
 	hlcoord 0, 1, wAttrMap
 	ld a, $1
 	ld [hli], a
@@ -804,12 +772,11 @@ Function8b79e: ; 8b79e
 	dec e
 	jr nz, .asm_8b7a9
 	ret
-; 8b7bd
 
-Function8b7bd: ; 8b7bd
+Function8b7bd:
 	call Function8b855
-	ld hl, MenuDataHeader_0x8b867
-	call CopyMenuDataHeader
+	ld hl, MenuHeader_0x8b867
+	call CopyMenuHeader
 	ld a, [wd030]
 	ld [wMenuCursorBuffer], a
 	ld a, [wd031]
@@ -867,33 +834,30 @@ Function8b7bd: ; 8b7bd
 	ld a, [wMenuScrollPosition]
 	ld [wd031], a
 	ret
-; 8b832
 
-Function8b832: ; 8b832
+Function8b832:
 	ld a, [wMenuScrollPosition]
-	ld hl, wMenuData2Items
+	ld hl, wMenuDataItems
 	sub [hl]
 	jr nc, Function8b84b
 	xor a
 	jr Function8b84b
-; 8b83e
 
-Function8b83e: ; 8b83e
+Function8b83e:
 	ld a, [wMenuScrollPosition]
-	ld hl, wMenuData2Items
+	ld hl, wMenuDataItems
 	add [hl]
 	cp $24
 	jr c, Function8b84b
 	ld a, $24
 
-Function8b84b: ; 8b84b
+Function8b84b:
 	ld [wMenuScrollPosition], a
 	ld a, [wMenuCursorY]
 	ld [wMenuCursorBuffer], a
 	ret
-; 8b855
 
-Function8b855: ; 8b855
+Function8b855:
 	ld a, $28
 	ld hl, wd002
 	ld [hli], a
@@ -907,18 +871,16 @@ Function8b855: ; 8b855
 	ld a, $ff
 	ld [hl], a
 	ret
-; 8b867
 
-MenuDataHeader_0x8b867: ; 0x8b867
+MenuHeader_0x8b867:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 3, 18, 13
-	dw MenuData2_0x8b870
+	dw MenuData_0x8b870
 	db 1 ; default option
-; 0x8b86f
 
 	db 0
 
-MenuData2_0x8b870: ; 0x8b870
+MenuData_0x8b870:
 	db SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT ; flags
 	db 5 ; items
 	db 3, 1
@@ -926,18 +888,16 @@ MenuData2_0x8b870: ; 0x8b870
 	dba Function8b880
 	dba Function8b88c
 	dba Function8b8c8
-; 8b880
 
-Function8b880: ; 8b880
+Function8b880:
 	ld h, d
 	ld l, e
 	ld de, wMenuSelection
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 2
 	call PrintNum
 	ret
-; 8b88c
 
-Function8b88c: ; 8b88c
+Function8b88c:
 	call OpenSRAMBank4
 	ld h, d
 	ld l, e
@@ -974,9 +934,8 @@ Function8b88c: ; 8b88c
 	call PlaceString
 	call CloseSRAM
 	ret
-; 8b8c8
 
-Function8b8c8: ; 8b8c8
+Function8b8c8:
 	hlcoord 0, 14
 	ld b, $2
 	ld c, $12
@@ -1007,9 +966,8 @@ Function8b8c8: ; 8b8c8
 	ld c, $12
 	call Function8b732
 	ret
-; 8b903
 
-Unknown_8b903: ; 8b903
+Unknown_8b903:
 	dw String_8b90b
 	dw String_8b919
 	dw String_8b92a
@@ -1019,9 +977,8 @@ String_8b90b: db "めいしを　えらんでください@"        ; Please sele
 String_8b919: db "どの　めいしと　いれかえますか？@"    ; OK to swap with any noun?
 String_8b92a: db "あいてを　えらんでください@"        ; Please select an opponent.
 String_8b938: db "いれる　ところを　えらんでください@" ; Please select a location.
-; 8b94a
 
-Function8b94a: ; 8b94a
+Function8b94a:
 	ld [wd033], a
 	xor a
 	ld [wMenuScrollPosition], a
@@ -1031,26 +988,24 @@ Function8b94a: ; 8b94a
 	ld a, $1
 	ld [wd030], a
 	ret
-; 8b960
-
 
-Function8b960: ; 8b960 (22:7960)
-	ld hl, MenuDataHeader_0x8b9ac
-	call LoadMenuDataHeader
+Function8b960:
+	ld hl, MenuHeader_0x8b9ac
+	call LoadMenuHeader
 	call Function8b9e9
 	jr c, .asm_8b97a
 	hlcoord 11, 0
 	ld b, $6
 	ld c, $7
 	call Function8b703
-	ld hl, MenuDataHeader_0x8b9b1
+	ld hl, MenuHeader_0x8b9b1
 	jr .asm_8b987
 .asm_8b97a
 	hlcoord 11, 0
 	ld b, $a
 	ld c, $7
 	call Function8b703
-	ld hl, MenuDataHeader_0x8b9ca
+	ld hl, MenuHeader_0x8b9ca
 .asm_8b987
 	ld a, $1
 	call Function89d5e
@@ -1066,7 +1021,7 @@ Function8b960: ; 8b960 (22:7960)
 	ld c, a
 	ret
 
-Function8b99f: ; 8b99f (22:799f)
+Function8b99f:
 	ld hl, wd002
 	dec a
 	ld c, a
@@ -1075,39 +1030,34 @@ Function8b99f: ; 8b99f (22:799f)
 	ld a, [hl]
 	cp $ff
 	ret
-; 8b9ab (22:79ab)
 
-Function8b9ab: ; 8b9ab
+Function8b9ab:
 	ret
-; 8b9ac
 
-MenuDataHeader_0x8b9ac: ; 0x8b9ac
+MenuHeader_0x8b9ac:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 
-MenuDataHeader_0x8b9b1: ; 0x8b9b1
+MenuHeader_0x8b9b1:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 0, SCREEN_WIDTH - 1, 7
-	dw MenuData2_0x8b9b9
+	dw MenuData_0x8b9b9
 	db 1 ; default option
-; 0x8b9b9
 
-MenuData2_0x8b9b9: ; 0x8b9b9
+MenuData_0x8b9b9:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 3 ; items
 	db "へんしゅう@" ; EDIT
 	db "いれかえ@"   ; REPLACE
 	db "やめる@"     ; QUIT
-; 0x8b9ca
 
-MenuDataHeader_0x8b9ca: ; 0x8b9ca
+MenuHeader_0x8b9ca:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw MenuData2_0x8b9d2
+	dw MenuData_0x8b9d2
 	db 1 ; default option
-; 0x8b9d2
 
-MenuData2_0x8b9d2: ; 0x8b9d2
+MenuData_0x8b9d2:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 5 ; items
 	db "みる@"       ; VIEW
@@ -1115,9 +1065,8 @@ MenuData2_0x8b9d2: ; 0x8b9d2
 	db "いれかえ@"   ; REPLACE
 	db "けす@"       ; ERASE
 	db "やめる@"     ; QUIT
-; 0x8b9e9
 
-Function8b9e9: ; 8b9e9 (22:79e9)
+Function8b9e9:
 	call OpenSRAMBank4
 	call Function8931b
 	call Function8932d
@@ -1148,11 +1097,9 @@ Function8b9e9: ; 8b9e9 (22:79e9)
 	call CloseSRAM
 	pop af
 	ret
-; 8ba1c (22:7a1c)
 
-Unknown_8ba1c: ; 8b1ac
+Unknown_8ba1c:
 	db 2, 4, -1
 
-Unknown_8ba1f: ; 8ba1f
+Unknown_8ba1f:
 	db 1, 2, 4, 3, -1
-; 8ba24
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm
index b96e6c470..dc3767bf4 100644
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -1,6 +1,6 @@
 SECTION "mobile_40", ROMX
 
-Function100000: ; 100000
+Function100000:
 ; d: 1 or 2
 ; e: bank
 ; bc: addr
@@ -23,9 +23,8 @@ Function100000: ; 100000
 	pop af
 	ld [rSVBK], a
 	ret
-; 100022
 
-Function100022: ; 100022
+Function100022:
 	push de
 	push bc
 	call SetRAMStateForMobile
@@ -46,17 +45,15 @@ Function100022: ; 100022
 	ld hl, wVramState
 	set 1, [hl]
 	ret
-; 100057
 
-Function100057: ; 100057
+Function100057:
 	call DisableMobile
 	call ReturnToMapFromSubmenu
 	ld hl, wVramState
 	res 1, [hl]
 	ret
-; 100063
 
-SetRAMStateForMobile: ; 100063
+SetRAMStateForMobile:
 	xor a
 	ld hl, wBGMapBuffer
 	ld bc, $65
@@ -71,19 +68,18 @@ SetRAMStateForMobile: ; 100063
 	ld [hMapAnims], a
 	ld [hLCDCPointer], a
 	ret
-; 100082
 
-EnableMobile: ; 100082
+EnableMobile:
 	xor a
-	ld hl, wOverworldMap
-	ld bc, wOverworldMapEnd - wOverworldMap
+	ld hl, wOverworldMapBlocks
+	ld bc, wOverworldMapBlocksEnd - wOverworldMapBlocks
 	call ByteFill
 
 	di
 	call DoubleSpeed
 	xor a
 	ld [rIF], a
-	ld a, 1 << VBLANK + 1 << LCD_STAT + 1 << TIMER + 1 << SERIAL
+	ld a, 1 << VBLANK | 1 << LCD_STAT | 1 << TIMER | 1 << SERIAL
 	ld [rIE], a
 	xor a
 	ld [hMapAnims], a
@@ -94,9 +90,8 @@ EnableMobile: ; 100082
 	ei
 
 	ret
-; 0x1000a4
 
-DisableMobile: ; 1000a4
+DisableMobile:
 	di
 	xor a
 	ld [hMobileReceive], a
@@ -110,9 +105,8 @@ DisableMobile: ; 1000a4
 	ld [rIE], a
 	ei
 	ret
-; 1000ba
 
-Function1000ba: ; 1000ba
+Function1000ba:
 .loop
 	; call [wcd22]:([wcd23][wcd24] + [wMobileCommsJumptableIndex])
 	ld hl, wcd23
@@ -138,9 +132,8 @@ Function1000ba: ; 1000ba
 	jr z, .loop
 	call DelayFrame
 	ret
-; 1000e8
 
-Function1000e8: ; 1000e8
+Function1000e8:
 	ld hl, wcd29
 	bit 7, [hl]
 	ret z
@@ -148,9 +141,8 @@ Function1000e8: ; 1000e8
 	ld hl, wcd29
 	set 6, [hl]
 	ret
-; 1000fa
 
-Function1000fa: ; 1000fa
+Function1000fa:
 	ld a, [wc30d]
 	and a
 	ret z
@@ -189,9 +181,8 @@ Function1000fa: ; 1000fa
 	pop af
 	ld [wLinkMode], a
 	ret
-; 100144
 
-Function100144: ; 100144
+Function100144:
 	ld hl, wcd29
 	bit 5, [hl]
 	jr z, .asm_100155
@@ -208,18 +199,16 @@ Function100144: ; 100144
 	res 6, [hl]
 	farcall HDMATransferTileMapToWRAMBank3
 	ret
-; 100163
 
-Function100163: ; 100163
+Function100163:
 	ld hl, wcd29
 	bit 6, [hl]
 	ret z
 	res 6, [hl]
 	call DelayFrame
 	ret
-; 10016f
 
-Function10016f: ; 10016f
+Function10016f:
 	ld a, [wcd2b]
 	cp $01
 	ret z
@@ -313,12 +302,11 @@ Function10016f: ; 10016f
 	ld [wc301], a
 	call Function10020b
 	ret
-; 10020b
 
-Function10020b: ; 10020b
+Function10020b:
 	xor a
 	ld [wc303], a
-	farcall Special_FadeOutPalettes
+	farcall FadeOutPalettes
 	farcall Function106464
 	call HideSprites
 	call DelayFrame
@@ -333,9 +321,8 @@ Function10020b: ; 10020b
 	pop af
 	ld [rSVBK], a
 	ret
-; 100232
 
-Function100232: ; 100232
+Function100232:
 	push de
 	farcall Function106464
 	call Function3f20
@@ -346,18 +333,15 @@ Function100232: ; 100232
 	call Function100320
 	call JoyWaitAorB
 	ret
-; 10024d
 
-String10024d: ; 10024d
+String10024d:
 	db   "つうしんを　キャンセル　しました@"
-; 10025e
 
-String10025e: ; 10025e
+String10025e:
 	db   "おともだちと　えらんだ　へやが"
 	next "ちがうようです@"
-; 100276
 
-Function100276: ; 100276
+Function100276:
 	ld a, [wcd2b]
 	cp $01
 	jr z, .asm_10029f
@@ -406,18 +390,16 @@ Function100276: ; 100276
 	call Function1002dc
 	ld c, $01
 	ret
-; 1002c9
 
-Function1002c9: ; 1002c9
+Function1002c9:
 	ld hl, wcd2a
 	bit 0, [hl]
 	ret z
 	farcall CleanUpBattleRAM
 	farcall LoadPokemonData
 	ret
-; 1002dc
 
-Function1002dc: ; 1002dc
+Function1002dc:
 	ld a, MAPSETUP_LINKRETURN
 	ld [hMapEntryMethod], a
 	farcall RunMapSetupScript
@@ -425,18 +407,16 @@ Function1002dc: ; 1002dc
 	ld [hMapEntryMethod], a
 	call LoadStandardFont
 	ret
-; 1002ed
 
-Function1002ed: ; 1002ed
+Function1002ed:
 	farcall LoadOW_BGPal7
 	farcall ApplyPals
 	ld a, $01
 	ld [hCGBPalUpdate], a
 	call DelayFrame
 	ret
-; 100301
 
-Function100301: ; 100301
+Function100301:
 	ld hl, wcd2a
 	bit 1, [hl]
 	ret z
@@ -446,28 +426,23 @@ Function100301: ; 100301
 	call Function100320
 	call JoyWaitAorB
 	ret
-; 100320
 
-Function100320: ; 100320
+Function100320:
 	farcall Mobile_ReloadMapPart
 	ret
-; 100327
 
-Function100327: ; 100327
+Function100327:
 	farcall HDMATransferTileMapToWRAMBank3
 	ret
-; 100327
 
-
-Function10032e: ; 10032e
+Function10032e:
 	call Function10034d
 	ld e, a
 	ret nc
 	ld [wcd2b], a
 	ret
-; 100337
 
-Function100337: ; 100337
+Function100337:
 	call Function10032e
 	ret c
 	ld a, [wc821]
@@ -483,9 +458,8 @@ Function100337: ; 100337
 	ld [wcd2b], a
 	scf
 	ret
-; 10034d
 
-Function10034d: ; 10034d
+Function10034d:
 	ld a, [wc821]
 	bit 1, a
 	jr nz, .asm_10036a
@@ -524,66 +498,58 @@ Function10034d: ; 10034d
 	ld a, $fe
 	scf
 	ret
-; 100382
 
-Function100382: ; 100382
+Function100382:
 	ld a, [wcd27]
 	ld hl, Jumptable_10044e
 	rst JumpTable
 	ret
-; 10038a
 
-Function10038a: ; 10038a
+Function10038a:
 	ld hl, wccb4
 	ld a, $2e
 	call Function3e32
 	ret
-; 100393
 
-Function100393: ; 100393
+Function100393:
 	ld hl, wcc60
 	ld a, $3a
 	call Function3e32
 	ret
-; 10039c
 
-Function10039c: ; 10039c
+Function10039c:
 	ld hl, wcc60
 	ld de, w3_d000
 	ld bc, $54
 	ld a, $03
 	call FarCopyWRAM
 	ret
-; 1003ab
 
-Function1003ab: ; 1003ab
+Function1003ab:
 	ld hl, w3_d000
 	ld de, wcc60
 	ld bc, $54
 	ld a, $03
 	call FarCopyWRAM
 	ret
-; 1003ba
 
-Function1003ba: ; 1003ba
+Function1003ba:
 	ld hl, wccb4
 	ld de, w3_d080
 	ld bc, $54
 	ld a, $03
 	call FarCopyWRAM
 	ret
-; 1003c9
 
-Function1003c9: ; 1003c9
+Function1003c9:
 	ld hl, w3_d080
 	ld de, wccb4
 	ld bc, $54
 	ld a, $03
 	call FarCopyWRAM
 	ret
-; 1003d8
 
-Function1003d8: ; 1003d8
+Function1003d8:
 	ld hl, wccb4
 	ld a, [hli]
 	ld c, a
@@ -603,9 +569,8 @@ Function1003d8: ; 1003d8
 	add $02
 	ld [wccb4], a
 	ret
-; 1003f5
 
-Function1003f5: ; 1003f5
+Function1003f5:
 	ld a, [wcc60]
 	sub $03
 	ld [wcc60], a
@@ -613,9 +578,8 @@ Function1003f5: ; 1003f5
 	sub $03
 	ld [wccb4], a
 	ret
-; 100406
 
-Function100406: ; 100406
+Function100406:
 	ld a, [wcc60]
 	sub $02
 	ld c, a
@@ -652,9 +616,8 @@ Function100406: ; 100406
 	pop hl
 	scf
 	ret
-; 10043a
 
-Function10043a: ; 10043a
+Function10043a:
 	push hl
 	push bc
 	ld de, 0
@@ -672,10 +635,8 @@ Function10043a: ; 10043a
 	pop bc
 	pop hl
 	ret
-; 10044e
-
 
-Jumptable_10044e: ; 10044e (40:444e)
+Jumptable_10044e:
 	dw Function10046a
 	dw Function10047c
 	dw Function100493
@@ -691,7 +652,7 @@ Jumptable_10044e: ; 10044e (40:444e)
 	dw Function1004f4
 	dw Function1004a4
 
-Function10046a: ; 10046a
+Function10046a:
 	ld hl, wBGMapPalBuffer
 	inc [hl]
 	call Function1003d8
@@ -700,9 +661,8 @@ Function10046a: ; 10046a
 	inc a
 	ld [wcd27], a
 	ret
-; 10047c
 
-Function10047c: ; 10047c
+Function10047c:
 	call Function100337
 	ret c
 	ret z
@@ -719,12 +679,11 @@ Function10047c: ; 10047c
 	ld a, $02
 	ld [wcd27], a
 	ret
-; 100493
 
-Function100493: ; 100493
+Function100493:
 	jr asm_100497
 
-Function100495: ; 100495
+Function100495:
 	jr asm_100497
 
 asm_100497
@@ -735,9 +694,8 @@ asm_100497
 	inc a
 	ld [wcd27], a
 	ret
-; 1004a4
 
-Function1004a4: ; 1004a4
+Function1004a4:
 	call Function100406
 	jr c, .asm_1004b8
 	call Function1003c9
@@ -750,9 +708,8 @@ Function1004a4: ; 1004a4
 .asm_1004b8
 	scf
 	ret
-; 1004ba
 
-Function1004ba: ; 1004ba
+Function1004ba:
 	call Function10038a
 	and a
 	jr nz, .asm_1004c8
@@ -765,9 +722,8 @@ Function1004ba: ; 1004ba
 	ld a, $08
 	ld [wcd27], a
 	ret
-; 1004ce
 
-Function1004ce: ; 1004ce
+Function1004ce:
 	call Function100337
 	ret c
 	ret z
@@ -777,25 +733,22 @@ Function1004ce: ; 1004ce
 	inc a
 	ld [wcd27], a
 	ret
-; 1004de
 
-Function1004de: ; 1004de
+Function1004de:
 	call Function100393
 	ld a, [wcd27]
 	inc a
 	ld [wcd27], a
 	ret
-; 1004e9
 
-Function1004e9: ; 1004e9
+Function1004e9:
 	call Function10038a
 	ld a, [wcd27]
 	inc a
 	ld [wcd27], a
 	ret
-; 1004f4
 
-Function1004f4: ; 1004f4
+Function1004f4:
 	call Function100337
 	ret c
 	ret z
@@ -804,9 +757,8 @@ Function1004f4: ; 1004f4
 	ld [wcd27], a
 	call Function10039c
 	ret
-; 100504
 
-Function100504: ; 100504
+Function100504:
 	push de
 	call Function3f20
 	call UpdateSprites
@@ -814,33 +766,29 @@ Function100504: ; 100504
 	hlcoord 4, 2
 	call PlaceString
 	ret
-; 100513
 
-Function100513: ; 100513
+Function100513:
 	call Function3f7c
 	call PlaceVerticalMenuItems
 	call InitVerticalMenuCursor
 	ld hl, w2DMenuFlags1
 	set 7, [hl]
 	ret
-; 100522
 
-Function100522: ; 100522
+Function100522:
 	ld a, [wcd28]
 	ld hl, Jumptable_10052a
 	rst JumpTable
 	ret
-; 10052a
 
-Jumptable_10052a: ; 10052a
+Jumptable_10052a:
 	dw Function100534
 	dw Function100545
 	dw Function100545
 	dw Function100545
 	dw Function10054d
-; 100534
 
-Function100534: ; 100534
+Function100534:
 	call Function100513
 	call UpdateSprites
 	call ApplyTilemap
@@ -848,16 +796,14 @@ Function100534: ; 100534
 	inc a
 	ld [wcd28], a
 	ret
-; 100545
 
-Function100545: ; 100545
+Function100545:
 	ld a, [wcd28]
 	inc a
 	ld [wcd28], a
 	ret
-; 10054d
 
-Function10054d: ; 10054d
+Function10054d:
 	farcall MobileMenuJoypad
 	ld a, c
 	ld hl, wMenuJoypadFilter
@@ -883,30 +829,27 @@ Function10054d: ; 10054d
 	ld [wcd28], a
 	scf
 	ret
-; 100579
 
-Function100579: ; 100579
+Function100579:
 	ld a, [wcd26]
 	ld hl, Jumptable_100581
 	rst JumpTable
 	ret
-; 100581
 
-Jumptable_100581: ; 100581
+Jumptable_100581:
 	dw Function100585
 	dw Function100597
-; 100585
 
-Function100585: ; 100585
-	ld hl, MenuDataHeader_1005b2
-	call LoadMenuDataHeader
+Function100585:
+	ld hl, MenuHeader_1005b2
+	call LoadMenuHeader
 	ld a, 0
 	ld [wcd28], a
 	ld a, [wcd26]
 	inc a
 	ld [wcd26], a
 
-Function100597: ; 100597
+Function100597:
 	call Function100522
 	ld a, [wcd28]
 	bit 7, a
@@ -921,44 +864,40 @@ Function100597: ; 100597
 	set 7, a
 	ld [wcd26], a
 	ret
-; 1005b2
 
-MenuDataHeader_1005b2: ; 1005b2
+MenuHeader_1005b2:
 	db MENU_BACKUP_TILES ; flags
 	db 6, 14
 	db 10, 19
-	dw MenuData2_1005ba
+	dw MenuData_1005ba
 	db 1 ; default option
 
-MenuData2_1005ba:
+MenuData_1005ba:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2
 	db "はい@"
 	db "いいえ@"
-; 1005c3
 
-Function1005c3: ; 1005c3
+Function1005c3:
 	ld a, [wcd26]
 	ld hl, Jumptable_1005cb
 	rst JumpTable
 	ret
-; 1005cb
 
-Jumptable_1005cb: ; 1005cb
+Jumptable_1005cb:
 	dw Function1005cf
 	dw Function1005e1
-; 1005cf
 
-Function1005cf: ; 1005cf
-	ld hl, MenuDataHeader_1005fc
-	call LoadMenuDataHeader
+Function1005cf:
+	ld hl, MenuHeader_1005fc
+	call LoadMenuHeader
 	ld a, 0
 	ld [wcd28], a
 	ld a, [wcd26]
 	inc a
 	ld [wcd26], a
 
-Function1005e1: ; 1005e1
+Function1005e1:
 	call Function100522
 	ld a, [wcd28]
 	bit 7, a
@@ -972,23 +911,21 @@ Function1005e1: ; 1005e1
 	set 7, a
 	ld [wcd26], a
 	ret
-; 1005fc
 
-MenuDataHeader_1005fc: ; 1005fc
+MenuHeader_1005fc:
 	db MENU_BACKUP_TILES ; flags
 	db 6, 14
 	db 10, 19
-	dw MenuData2_100604
+	dw MenuData_100604
 	db 1 ; default option
 
-MenuData2_100604: ; 100604
+MenuData_100604:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2
 	db "かける@"
 	db "まつ@"
-; 10060d
 
-Mobile_CommunicationStandby: ; 10060d
+Mobile_CommunicationStandby:
 	hlcoord 3, 10
 	ld b, 1
 	ld c, 11
@@ -997,13 +934,11 @@ Mobile_CommunicationStandby: ; 10060d
 	hlcoord 4, 11
 	call PlaceString
 	ret
-; 100621
 
-.String: ; 100621
+.String:
 	db "つうしんたいきちゅう！@"
-; 10062d
 
-AdvanceMobileInactivityTimerAndCheckExpired: ; 10062d
+AdvanceMobileInactivityTimerAndCheckExpired:
 	push bc
 	call IncrementMobileInactivityTimerByCFrames
 	pop bc
@@ -1018,19 +953,17 @@ AdvanceMobileInactivityTimerAndCheckExpired: ; 10062d
 	ld [wcd2b], a
 	scf
 	ret
-; 100641
 
-StartMobileInactivityTimer: ; 100641
+StartMobileInactivityTimer:
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	ld [wMobileInactivityTimerSeconds], a
 	ld [wMobileInactivityTimerFrames], a
 	ret
-; 10064c
 
-IncrementMobileInactivityTimerBy1Frame: ; 10064c
+IncrementMobileInactivityTimerBy1Frame:
 	ld c, 1
-IncrementMobileInactivityTimerByCFrames: ; 10064e
+IncrementMobileInactivityTimerByCFrames:
 	ld hl, wMobileInactivityTimerFrames ; timer?
 	ld a, [hl]
 	add c
@@ -1052,9 +985,8 @@ IncrementMobileInactivityTimerByCFrames: ; 10064e
 	ret c
 	inc [hl]
 	ret
-; 100665
 
-Function100665: ; 100665
+Function100665:
 	call UpdateTime
 	ld hl, wcd36
 	ld a, [hHours]
@@ -1064,18 +996,16 @@ Function100665: ; 100665
 	ld a, [hSeconds]
 	ld [hl], a
 	ret
-; 100675
 
-Function100675: ; 100675
+Function100675:
 	ld hl, wcd2a
 	bit 2, [hl]
 	set 2, [hl]
 	ret nz
 	call Function1006d3
 	ret
-; 100681
 
-Function100681: ; 100681
+Function100681:
 	push hl
 	ld hl, wcd2a
 	bit 2, [hl]
@@ -1089,7 +1019,7 @@ Function100681: ; 100681
 .asm_100694
 	ld de, wcd32
 
-Function100697: ; 100697
+Function100697:
 	ld a, [de]
 	and a
 	jr nz, .asm_1006bb
@@ -1116,22 +1046,20 @@ Function100697: ; 100697
 	ld de, String1006ca
 	call PlaceString
 	ret
-; 1006c2
 
-String1006c2: ; 1006c2
+String1006c2:
 	db "ふん　@"
-String1006c6: ; 1006c6
+String1006c6:
 	db "びょう@"
-String1006ca: ; 1006ca
+String1006ca:
 	db "１じかんいじょう@"
-; 1006d3
 
-Function1006d3: ; 1006d3
+Function1006d3:
 	call UpdateTime
 	ld de, wcd34
 	ld hl, wcd38
 
-Function1006dc: ; 1006dc
+Function1006dc:
 	ld a, [hld]
 	ld c, a
 	ld a, [hSeconds]
@@ -1162,9 +1090,8 @@ Function1006dc: ; 1006dc
 .asm_1006fb
 	ld [de], a
 	ret
-; 1006fd
 
-Function1006fd: ; 1006fd
+Function1006fd:
 	ld a, $04
 	ld hl, $a800
 	call GetSRAMBank
@@ -1174,9 +1101,8 @@ Function1006fd: ; 1006fd
 	ld [hli], a
 	call CloseSRAM
 	ret
-; 10070d
 
-Function10070d: ; 10070d
+Function10070d:
 	ld a, $04
 	ld hl, $a800
 	call GetSRAMBank
@@ -1188,9 +1114,8 @@ Function10070d: ; 10070d
 	ld [hli], a
 	call CloseSRAM
 	ret
-; 100720
 
-Function100720: ; 100720
+Function100720:
 	xor a
 	ld [wcd6a], a
 	call UpdateTime
@@ -1213,9 +1138,8 @@ Function100720: ; 100720
 	ld a, [wcd6d]
 	ld [wcd6b], a
 	ret
-; 100754
 
-Function100754: ; 100754
+Function100754:
 	call UpdateTime
 	ld a, [hHours]
 	ld [wcd72], a
@@ -1228,9 +1152,8 @@ Function100754: ; 100754
 	ld hl, wcd2a
 	res 6, [hl]
 	ret
-; 100772
 
-Function100772: ; 100772
+Function100772:
 	push de
 	ld hl, wcd6c
 	ld a, [de]
@@ -1263,10 +1186,8 @@ Function100772: ; 100772
 .asm_10079a
 	pop de
 	ret
-; 10079c
-
 
-Function10079c: ; 10079c
+Function10079c:
 	ld a, [wcd21]
 	cp $01
 	jr nz, .dont_quit
@@ -1322,9 +1243,8 @@ Function10079c: ; 10079c
 .dont_quit
 	and a
 	ret
-; 1007f6
 
-Function1007f6: ; 1007f6
+Function1007f6:
 	call UpdateTime
 	ld hl, wcd74
 	ld de, wcd71
@@ -1343,9 +1263,8 @@ Function1007f6: ; 1007f6
 	ld a, [hSeconds]
 	ld [wcd74], a
 	ret
-; 100826
 
-Function100826: ; 100826
+Function100826:
 	ld a, [wcd71]
 	add [hl]
 	sub $3c
@@ -1370,9 +1289,8 @@ Function100826: ; 100826
 	ld [hl], a
 	ld c, a
 	ret
-; 100846
 
-Function100846: ; 100846
+Function100846:
 	ld hl, wcd2a
 	bit 5, [hl]
 	jr nz, .asm_10087c
@@ -1409,18 +1327,15 @@ Function100846: ; 100846
 	ld de, String_10089f
 	call PlaceString
 	ret
-; 10088e
 
-String_10088e: ; 10088e
+String_10088e:
 	db   "モバイルたいせん　できる"
 	next "じかん@"
-; 10089f
 
-String_10089f: ; 10089f
+String_10089f:
 	db "　むせいげん@"
-; 1008a6
 
-Function1008a6: ; 1008a6
+Function1008a6:
 	ld a, $04
 	ld hl, $a800
 	call GetSRAMBank
@@ -1455,10 +1370,8 @@ Function1008a6: ; 1008a6
 	call Function10070d
 	ld c, 0
 	ret
-; 1008e0
 
-
-Function1008e0: ; 1008e0
+Function1008e0:
 	ld a, [hBGMapMode]
 	ld b, a
 	ld a, [hVBlank]
@@ -1478,9 +1391,8 @@ Function1008e0: ; 1008e0
 	ld a, b
 	ld [hBGMapMode], a
 	ret
-; 100902
 
-Function100902: ; 100902
+Function100902:
 	hlcoord 3, 10
 	ld b, $01
 	ld c, $0b
@@ -1515,16 +1427,13 @@ Function100902: ; 100902
 	ld c, 120
 	call DelayFrames
 	ret
-; 10095a
 
-.string_10095a ; 10095a
+.string_10095a
 	db "たいせん　しゅうりょう@"
-.string_100966 ; 100966
+.string_100966
 	db "のこり　　　ふん！@"
-; 100970
-
 
-Function100970: ; 100970
+Function100970:
 	hlcoord 0, 0
 	ld de, w3_dc00
 	call Function1009a5
@@ -1534,9 +1443,8 @@ Function100970: ; 100970
 	call Function1009d2
 	call Function1009ae
 	ret
-; 100989
 
-Function100989: ; 100989
+Function100989:
 	ld hl, w3_dc00
 	decoord 0, 0
 	call Function1009a5
@@ -1546,16 +1454,14 @@ Function100989: ; 100989
 	decoord 0, 0, wAttrMap
 	call Function1009a5
 	ret
-; 1009a5
 
-Function1009a5: ; 1009a5
+Function1009a5:
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, $03
 	call FarCopyWRAM
 	ret
-; 1009ae
 
-Function1009ae: ; 1009ae
+Function1009ae:
 	ld a, [rSVBK]
 	push af
 	ld a, $03
@@ -1582,9 +1488,8 @@ Function1009ae: ; 1009ae
 	pop af
 	ld [rSVBK], a
 	ret
-; 1009d2
 
-Function1009d2: ; 1009d2
+Function1009d2:
 	ld a, [rSVBK]
 	push af
 	ld a, $03
@@ -1606,9 +1511,8 @@ Function1009d2: ; 1009d2
 	pop af
 	ld [rSVBK], a
 	ret
-; 1009f3
 
-Function1009f3: ; 1009f3
+Function1009f3:
 	ld a, [hJoyDown]
 	and SELECT + A_BUTTON
 	cp SELECT + A_BUTTON
@@ -1623,9 +1527,8 @@ Function1009f3: ; 1009f3
 .select_a
 	xor a
 	ret
-; 100a09
 
-_LinkBattleSendReceiveAction: ; 100a09
+_LinkBattleSendReceiveAction:
 	call .StageForSend
 	ld [wd431], a
 	farcall PlaceWaitingText
@@ -1643,9 +1546,8 @@ _LinkBattleSendReceiveAction: ; 100a09
 
 .done
 	ret
-; 100a2e
 
-.StageForSend: ; 100a2e
+.StageForSend:
 	ld a, [wBattlePlayerAction]
 	and a
 	jr nz, .switch
@@ -1670,9 +1572,8 @@ _LinkBattleSendReceiveAction: ; 100a09
 .use_move
 	and $0f
 	ret
-; 100a53
 
-.LinkBattle_SendReceiveAction: ; 100a53
+.LinkBattle_SendReceiveAction:
 	ld a, [wd431]
 	ld [wPlayerLinkAction], a
 	ld a, $ff
@@ -1701,9 +1602,8 @@ _LinkBattleSendReceiveAction: ; 100a09
 	ld a, [wOtherPlayerLinkAction]
 	ld [wBattleAction], a
 	ret
-; 100a87
 
-.MobileBattle_SendReceiveAction: ; 100a87
+.MobileBattle_SendReceiveAction:
 	call Function100acf
 	call StartMobileInactivityTimer
 	ld a, 0
@@ -1739,9 +1639,8 @@ _LinkBattleSendReceiveAction: ; 100a09
 
 .asm_100ace
 	ret
-; 100acf
 
-Function100acf: ; 100acf
+Function100acf:
 	ld de, Unknown_100b0a
 	ld hl, wccb5
 	ld a, [wd431]
@@ -1757,9 +1656,8 @@ Function100acf: ; 100acf
 	ld a, c
 	ld [wccb4], a
 	ret
-; 100ae7
 
-Function100ae7: ; 100ae7
+Function100ae7:
 	ld de, Unknown_100b0a
 	ld hl, wcc62
 .asm_100aed
@@ -1783,29 +1681,27 @@ Function100ae7: ; 100ae7
 	ld a, $f1
 	ld [wcd2b], a
 	ret
-; 100b0a
 
 
 SECTION "tetsuji", ROMX
 
 	charmap " ", $20 ; revert to ascii
 
-Unknown_100b0a: ; 100b0a
+Unknown_100b0a:
 	db "tetsuji", 0
-; 100b12
 
 
 SECTION "bank40_2", ROMX
 
-Function100b12: ; 100b12
+Function100b12:
 	call Function100dd8
 	ret c
-	ld hl, BattleMenuDataHeader
-	ld a, BANK(BattleMenuDataHeader)
-	ld de, LoadMenuDataHeader
+	ld hl, BattleMenuHeader
+	ld a, BANK(BattleMenuHeader)
+	ld de, LoadMenuHeader
 	call FarCall_de
-	ld a, BANK(BattleMenuDataHeader)
-	ld [wMenuData2_2DMenuItemStringsBank], a
+	ld a, BANK(BattleMenuHeader)
+	ld [wMenuData_2DMenuItemStringsBank], a
 	ld a, [wBattleMenuCursorBuffer]
 	ld [wMenuCursorBuffer], a
 	call Function100e72
@@ -1816,9 +1712,8 @@ Function100b12: ; 100b12
 	ld [wBattleMenuCursorBuffer], a
 	call ExitMenu
 	ret
-; 100b45
 
-Function100b45: ; 100b45
+Function100b45:
 	call Function100b7a
 .loop
 	call Mobile_SetOverworldDelay
@@ -1842,11 +1737,10 @@ Function100b45: ; 100b45
 	ld [wMenuCursorBuffer], a
 	and a
 	ret
-; 100b7a
 
-Function100b7a: ; 100b7a
-	ld hl, CopyMenuData2
-	ld a, [wMenuData2_2DMenuItemStringsBank]
+Function100b7a:
+	ld hl, CopyMenuData
+	ld a, [wMenuData_2DMenuItemStringsBank]
 	rst FarCall
 	farcall Draw2DMenu
 	farcall MobileTextBorder
@@ -1856,9 +1750,8 @@ Function100b7a: ; 100b7a
 	ld hl, w2DMenuFlags1
 	set 7, [hl]
 	ret
-; 100b9f
 
-MobileMoveSelectionScreen: ; 100b9f
+MobileMoveSelectionScreen:
 	xor a
 	ld [wMoveSwapBuffer], a
 	farcall CheckPlayerHasUsableMoves
@@ -1872,9 +1765,8 @@ MobileMoveSelectionScreen: ; 100b9f
 	call Function100ed4
 	pop af
 	ret
-; 100bc2
 
-.GetMoveSelection: ; 100bc2
+.GetMoveSelection:
 	xor a
 	ld [hBGMapMode], a
 	call Function100c74
@@ -1971,9 +1863,8 @@ MobileMoveSelectionScreen: ; 100b9f
 	call StdBattleTextBox
 	call Call_LoadTempTileMapToTileMap
 	jp .GetMoveSelection
-; 100c74
 
-Function100c74: ; 100c74
+Function100c74:
 	hlcoord 0, 8
 	ld b, 8
 	ld c, 8
@@ -1987,9 +1878,8 @@ Function100c74: ; 100c74
 	hlcoord 2, 10
 	predef ListMoves
 	ret
-; 100c98
 
-Function100c98: ; 100c98
+Function100c98:
 	ld de, .attrs
 	call SetMenuAttributes
 	ld a, [wNumMoves]
@@ -1999,16 +1889,15 @@ Function100c98: ; 100c98
 	inc a
 	ld [wMenuCursorY], a
 	ret
-; 100cad
 
-.attrs ; 100cad
+.attrs
 	db 10, 1
 	db 255, 1
 	db $a0, $00
 	dn 2, 0
 	db D_UP | D_DOWN | A_BUTTON | B_BUTTON
 
-Mobile_PartyMenuSelect: ; 100cb5
+Mobile_PartyMenuSelect:
 	call Function100dd8
 	ret c
 	ld hl, w2DMenuFlags1
@@ -2059,9 +1948,8 @@ Mobile_PartyMenuSelect: ; 100cb5
 	call WaitSFX
 	scf
 	ret
-; 100d22
 
-MobileBattleMonMenu: ; 100d22
+MobileBattleMonMenu:
 	call Function100dd8
 	ret c
 	call Function100d67
@@ -2100,47 +1988,43 @@ MobileBattleMonMenu: ; 100d22
 .asm_100d65
 	and a
 	ret
-; 100d67
 
-Function100d67: ; 100d67
-	ld hl, .MenuDataHeader
-	call CopyMenuDataHeader
+Function100d67:
+	ld hl, .MenuHeader
+	call CopyMenuHeader
 	xor a
 	ld [hBGMapMode], a
 	call MenuBox
 	call UpdateSprites
 	call PlaceVerticalMenuItems
 	call WaitBGMap
-	call CopyMenuData2
+	call CopyMenuData
 	call InitVerticalMenuCursor
 	ld hl, w2DMenuFlags1
 	set 6, [hl]
 	ret
-; 100d88
 
-.MenuDataHeader: ; 100d88
+.MenuHeader:
 	db 0 ; flags
 	menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
-	dw .MenuData2
+	dw .MenuData
 	db 1 ; default option
 
-.MenuData2: ; 100d90
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 3
 	db "いれかえる@"  ; TRADE
 	db "つよさをみる@" ; STATS
 	db "キャンセル@"  ; CANCEL
-; 100da5
 
-Function100da5: ; 100da5
+Function100da5:
 	ld hl, wcd2a
 	res 3, [hl]
 	ld hl, wcd29
 	res 0, [hl]
 	ret
-; 100db0
 
-Function100db0: ; 100db0
+Function100db0:
 	ld hl, wcd2a
 	bit 3, [hl]
 	jr nz, .asm_100dbe
@@ -2152,11 +2036,8 @@ Function100db0: ; 100db0
 .asm_100dbe
 	xor a
 	ret
-; 100dc0
-
 
-
-Function100dc0: ; 100dc0
+Function100dc0:
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
 	jr nz, .mobile
@@ -2169,15 +2050,13 @@ Function100dc0: ; 100dc0
 .mobile
 	xor a
 	ret
-; 100dd2
 
-Mobile_SetOverworldDelay: ; 100dd2
+Mobile_SetOverworldDelay:
 	ld a, 30
 	ld [wOverworldDelay], a
 	ret
-; 100dd8
 
-Function100dd8: ; 100dd8
+Function100dd8:
 	ld c, $01
 	ld b, $03
 	farcall AdvanceMobileInactivityTimerAndCheckExpired
@@ -2196,9 +2075,8 @@ Function100dd8: ; 100dd8
 .asm_100dfb
 	scf
 	ret
-; 100dfd
 
-MobileComms_CheckInactivityTimer: ; 100dfd
+MobileComms_CheckInactivityTimer:
 	ld a, [wOverworldDelay]
 	ld c, a
 	ld a, 30
@@ -2224,9 +2102,8 @@ MobileComms_CheckInactivityTimer: ; 100dfd
 .quit
 	scf
 	ret
-; 100e2d
 
-Function100e2d: ; 100e2d
+Function100e2d:
 	ld a, [wOverworldDelay]
 	ld c, a
 	ld a, 30
@@ -2254,9 +2131,8 @@ Function100e2d: ; 100e2d
 .asm_100e61
 	scf
 	ret
-; 100e63
 
-Function100e63: ; 100e63
+Function100e63:
 	ld a, e
 	cp $02
 	ret nz
@@ -2265,9 +2141,8 @@ Function100e63: ; 100e63
 	ld de, SFX_ELEVATOR_END
 	call PlaySFX
 	ret
-; 100e72
 
-Function100e72: ; 100e72
+Function100e72:
 	xor a
 	ld hl, wcd29
 	bit 0, [hl]
@@ -2279,17 +2154,14 @@ Function100e72: ; 100e72
 	xor a
 	ld [wcd68], a
 	ret
-; 100e84
 
-Function100e84: ; 100e84
+Function100e84:
 	ld a, [wcd67]
 	ld hl, Jumptable_100e8c
 	rst JumpTable
 	ret
-; 100e8c
-
 
-Jumptable_100e8c: ; 100e8c (40:4e8c)
+Jumptable_100e8c:
 	dw Function100ea2
 	dw Function100eae
 	dw Function100eb4
@@ -2302,25 +2174,23 @@ Jumptable_100e8c: ; 100e8c (40:4e8c)
 	dw Function100eae
 	dw Function100ec4
 
-
-Function100ea2: ; 100ea2 (40:4ea2)
+Function100ea2:
 	call Function100dc0
 	ret nc
 	ld hl, wcd29
 	set 0, [hl]
 	call Function100ec5
 
-
-Function100eae: ; 100eae
+Function100eae:
 	scf
 	call Function100eca
 	jr asm_100eb8
 
-Function100eb4: ; 100eb4
+Function100eb4:
 	and a
 	call Function100eca
 
-asm_100eb8
+asm_100eb8:
 	ld hl, wcd68
 	inc [hl]
 	ld a, [hl]
@@ -2329,49 +2199,46 @@ asm_100eb8
 	ld [hl], 0
 	jr Function100ec5
 
-Function100ec4: ; 100ec4
+Function100ec4:
 	ret
 
-Function100ec5
+Function100ec5:
 	ld hl, wcd67
 	inc [hl]
 	ret
-; 100eca
 
-Function100eca: ; 100eca
+Function100eca:
 	farcall Mobile_InitPartyMenuBGPal7
 	call Function100ed4
 	ret
-; 100ed4
 
-Function100ed4: ; 100ed4
+Function100ed4:
 	farcall ApplyPals
 	ld a, $01
 	ld [hCGBPalUpdate], a
 	ret
-; 100edf
 
-Function100edf: ; 100edf
+Function100edf:
 	ld hl, Unknown_100fc0
 	ld c, 1
 	jr asm_100f02
 
-Function100ee6: ; 100ee6
+Function100ee6:
 	ld hl, Unknown_100fc0
 	ld c, 2
 	jr asm_100f02
 
-Function100eed: ; 100eed
+Function100eed:
 	ld hl, Unknown_100feb
 	ld c, 1
 	jr asm_100f02
 
-Function100ef4: ; 100ef4
+Function100ef4:
 	ld hl, Unknown_100ff3
 	ld c, 1
 	jr asm_100f02
 
-Function100efb: ; 100efb
+Function100efb:
 	ld hl, Unknown_10102c
 	ld c, 1
 	jr asm_100f02
@@ -2423,9 +2290,8 @@ asm_100f02:
 	ld a, [wStringBuffer2 + 5]
 	ld b, a
 	ret
-; 100f3d
 
-Function100f3d: ; 100f3d
+Function100f3d:
 	; parameter
 	ld a, [wStringBuffer2]
 	cp $02
@@ -2484,9 +2350,8 @@ Function100f3d: ; 100f3d
 	ld a, d
 	ld [wStringBuffer2 + 2], a
 	ret
-; 100f8d
 
-Function100f8d: ; 100f8d
+Function100f8d:
 	push hl
 	ld a, [wStringBuffer2 + 4]
 	ld l, a
@@ -2517,9 +2382,8 @@ Function100f8d: ; 100f8d
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 100fc0
 
-Unknown_100fc0: ; 100fc0
+Unknown_100fc0:
 	; first byte:
 	;     Bit 7 set: Not SRAM
 	;     Lower 7 bits: Bank
@@ -2532,11 +2396,11 @@ Unknown_100fc0: ; 100fc0
 	dbwww $80, wPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, wOTPartyMonNicknames
 	db -1
 
-Unknown_100feb: ; 100feb
+Unknown_100feb:
 	dbwww $00, sPartyMail, MAIL_STRUCT_LENGTH * PARTY_LENGTH, NULL
 	db -1
 
-Unknown_100ff3: ; 100ff3
+Unknown_100ff3:
 	dbwww $80, wdc41, 1, NULL
 	dbwww $80, wPlayerName, NAME_LENGTH, NULL
 	dbwww $80, wPlayerName, NAME_LENGTH, NULL
@@ -2547,16 +2411,15 @@ Unknown_100ff3: ; 100ff3
 	dbwww $04, $a007, PARTYMON_STRUCT_LENGTH, NULL
 	db -1
 
-Unknown_10102c: ; 10102c
+Unknown_10102c:
 	dbwww $80, wOTPlayerName, NAME_LENGTH, NULL
 	dbwww $80, wOTPlayerID, 2, NULL
 	dbwww $80, wOTPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, NULL
 	dbwww $80, wOTPartyMonOT, NAME_LENGTH * PARTY_LENGTH, NULL
 	dbwww $80, wOTPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, NULL
 	db -1
-; 10104f
 
-Function101050: ; 101050
+Function101050:
 	call Function10107d
 	ld a, [wOTPartyCount]
 rept 2 ; ???
@@ -2576,9 +2439,8 @@ endr
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 10107d
 
-Function10107d: ; 10107d
+Function10107d:
 	xor a
 	ld hl, wc608
 	ld bc, wc7bd - wc608
@@ -2609,9 +2471,8 @@ Function10107d: ; 10107d
 	ld a, $33
 	ld [wc7ba], a
 	ret
-; 1010cd
 
-.CopyAllFromOT: ; 1010cd
+.CopyAllFromOT:
 	push hl
 	ld hl, 0
 	ld a, [wOTPartyCount]
@@ -2621,9 +2482,8 @@ Function10107d: ; 10107d
 	pop hl
 	call CopyBytes
 	ret
-; 1010de
 
-Function1010de: ; 1010de
+Function1010de:
 	push hl
 	push bc
 	ld de, 0
@@ -2641,9 +2501,8 @@ Function1010de: ; 1010de
 	pop bc
 	pop hl
 	ret
-; 1010f2
 
-LoadSelectedPartiesForColosseum: ; 1010f2
+LoadSelectedPartiesForColosseum:
 	xor a
 	ld hl, wStringBuffer2
 	ld bc, 9
@@ -2673,9 +2532,8 @@ LoadSelectedPartiesForColosseum: ; 1010f2
 	ld de, wOTPartyMonNicknames
 	call .CopyName
 	ret
-; 101145
 
-.CopyThreeSpecies: ; 101145
+.CopyThreeSpecies:
 ; Load the 3 choices to the buffer
 	push de
 	ld bc, wStringBuffer2 + NAME_LENGTH_JAPANESE
@@ -2700,9 +2558,8 @@ LoadSelectedPartiesForColosseum: ; 1010f2
 	ld a, $ff
 	ld [de], a
 	ret
-; 101168
 
-.GetNthSpecies: ; 101168
+.GetNthSpecies:
 ; Preserves hl and de
 ; Get the index of the Nth selection
 	push hl
@@ -2724,13 +2581,12 @@ LoadSelectedPartiesForColosseum: ; 1010f2
 	ld a, [de]
 	pop de
 	ret
-; 10117c
 
-.CopyPartyStruct: ; 10117c
+.CopyPartyStruct:
 	ld bc, PARTYMON_STRUCT_LENGTH
 	jr .ContinueCopy
 
-.CopyName: ; 101181
+.CopyName:
 	ld bc, NAME_LENGTH
 
 .ContinueCopy:
@@ -2785,25 +2641,22 @@ LoadSelectedPartiesForColosseum: ; 1010f2
 	ld hl, wc608
 	call CopyBytes
 	ret
-; 1011df
 
-.GetDestinationAddress: ; 1011df
+.GetDestinationAddress:
 	ld a, [wStringBuffer2 + 4]
 	ld l, a
 	ld a, [wStringBuffer2 + 5]
 	ld h, a
 	ret
-; 1011e8
 
-.GetCopySize: ; 1011e8
+.GetCopySize:
 	ld a, [wStringBuffer2 + 2]
 	ld c, a
 	ld a, [wStringBuffer2 + 3]
 	ld b, a
 	ret
-; 1011f1
 
-Special_Function1011f1: ; 1011f1
+Function1011f1:
 	ld a, $04
 	call GetSRAMBank
 	ld a, [$a60c]
@@ -2812,7 +2665,7 @@ Special_Function1011f1: ; 1011f1
 	ld hl, wdc41
 	res 4, [hl]
 	ld hl, wGameTimerPause
-	bit 7, [hl]
+	bit GAMETIMERPAUSE_MOBILE_7_F, [hl]
 	jr z, .skip
 	ld hl, wdc41
 	set 4, [hl]
@@ -2825,79 +2678,70 @@ Special_Function1011f1: ; 1011f1
 	ld a, LINK_MOBILE
 	ld [wLinkMode], a
 	ret
-; 101220
 
-Special_Function101220: ; 101220
+Function101220:
 	xor a
 	ld [wLinkMode], a
 	ret
-; 101225
 
-Special_Function101225: ; 101225
+Function101225:
 	ld d, 1
 	ld e, BANK(Jumptable_101297)
 	ld bc, Jumptable_101297
 	call Function100000
 	jr Function10123d
 
-Special_Function101231: ; 101231
+Function101231:
 	ld d, 2
 	ld e, BANK(Jumptable_101297)
 	ld bc, Jumptable_101297
 	call Function100000
 	jr Function10123d
 
-Function10123d: ; 10123d
+Function10123d:
 	xor a
 	ld [wScriptVar], a
 	ld a, c
 	ld hl, Jumptable_101247
 	rst JumpTable
 	ret
-; 101247
 
-Jumptable_101247: ; 101247
+Jumptable_101247:
 	dw Function101251
 	dw Function10127d
 	dw Function10127c
 	dw Function10126c
 	dw Function101265
-; 101251
 
-Function101251: ; 101251
+Function101251:
 	call UpdateSprites
 	call RefreshScreen
 	ld hl, UnknownText_0x1021f4
 	call Function1021e0
 	call Function1020ea
 	ret c
-	call Special_Function102142
+	call Function102142
 	ret
-; 101265
 
-Function101265: ; 101265
+Function101265:
 	ld hl, UnknownText_0x1021ef
 	call Function1021e0
 	ret
-; 10126c
 
-Function10126c: ; 10126c
+Function10126c:
 	call UpdateSprites
 	farcall Script_reloadmappart
 	ld hl, UnknownText_0x1021f4
 	call Function1021e0
 	ret
-; 10127c
 
-Function10127c: ; 10127c
+Function10127c:
 	ret
-; 10127d
 
-Function10127d: ; 10127d
+Function10127d:
 	ret
-; 10127e
 
-Function10127e: ; 10127e
+Function10127e:
 	ld a, [wdc5f]
 	and a
 	jr z, .zero
@@ -2913,9 +2757,8 @@ Function10127e: ; 10127e
 	ld a, c
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101297
 
-Jumptable_101297: ; 101297
+Jumptable_101297:
 	dw Function101a97                         ; 00
 	dw Function101ab4                         ; 01
 	dw Function101475                         ; 02
@@ -3038,9 +2881,8 @@ Jumptable_101297: ; 101297
 	dw Function101ca0                         ; 77
 	dw Function101475                         ; 78
 	dw Function101cbc                         ; 79
-; 10138b
 
-Function10138b: ; 10138b
+Function10138b:
 	farcall Function8adcc
 	ld c, 0
 	jr c, .asm_101396
@@ -3062,9 +2904,8 @@ Function10138b: ; 10138b
 
 .asm_1013a9
 	ret
-; 1013aa
 
-Function1013aa: ; 1013aa
+Function1013aa:
 	call ClearBGPalettes
 	call Call_ExitMenu
 	call ReloadTilesetAndPalettes
@@ -3072,27 +2913,23 @@ Function1013aa: ; 1013aa
 	call UpdateSprites
 	call FinishExitMenu
 	ret
-; 1013c0
 
-Function1013c0: ; 1013c0
+Function1013c0:
 	farcall BlankScreen
 	farcall Stubbed_Function106462
 	farcall Function106464
 	call FinishExitMenu
 	ret
-; 1013d6
 
-Function1013d6: ; 1013d6
+Function1013d6:
 	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
 	ret
-; 1013dd
 
-Function1013dd: ; 1013dd
+Function1013dd:
 	call CGBOnly_CopyTilemapAtOnce
 	ret
-; 1013e1
 
-Unreferenced_Function1013e1: ; 1013e1
+Unreferenced_Function1013e1:
 	push de
 	inc de
 	ld b, a
@@ -3113,9 +2950,8 @@ Unreferenced_Function1013e1: ; 1013e1
 	ld a, c
 	ld [de], a
 	ret
-; 1013f5
 
-Function1013f5: ; 1013f5
+Function1013f5:
 	ld a, [hli]
 	ld [de], a
 	inc de
@@ -3127,16 +2963,15 @@ Function1013f5: ; 1013f5
 	dec c
 	jr nz, .asm_1013f9
 	ret
-; 101400
 
-Unreferenced_Function101400: ; 101400
+Unreferenced_Function101400:
 	ld a, [de]
 	inc de
 	cp [hl]
 	jr nz, asm_101416
 	inc hl
 
-Function101406: ; 101406
+Function101406:
 	ld c, a
 	ld b, 0
 .asm_101409
@@ -3155,9 +2990,8 @@ Function101406: ; 101406
 asm_101416
 	scf
 	ret
-; 101418
 
-Function101418: ; 101418
+Function101418:
 	call GetJoypad
 	ld a, [hJoyDown]
 	and SELECT + A_BUTTON
@@ -3171,16 +3005,14 @@ Function101418: ; 101418
 	ld [wcd2b], a
 	scf
 	ret
-; 10142c
 
-Function10142c: ; 10142c
+Function10142c:
 	ld a, $01
 	ld [wc305], a
 	farcall Function115e18
 	ret
-; 101438
 
-Function101438: ; 101438
+Function101438:
 	ld hl, wcd29
 	set 6, [hl]
 	ld a, [wcd26]
@@ -3195,21 +3027,19 @@ Function101438: ; 101438
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101457
 
-Jumptable_101457: ; 101457
+Jumptable_101457:
 	dw Function10145b
 	dw Function101467
-; 10145b
 
-Function10145b: ; 10145b
+Function10145b:
 	ld a, $3c
 	ld [wcd42], a
 	ld a, [wcd26]
 	inc a
 	ld [wcd26], a
 
-Function101467: ; 101467
+Function101467:
 	ld hl, wcd42
 	dec [hl]
 	ret nz
@@ -3217,9 +3047,8 @@ Function101467: ; 101467
 	set 7, a
 	ld [wcd26], a
 	ret
-; 101475
 
-Function101475: ; 101475
+Function101475:
 	ld hl, wcd29
 	set 6, [hl]
 	ld a, [wcd26]
@@ -3234,22 +3063,20 @@ Function101475: ; 101475
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101494
 
-Jumptable_101494: ; 101494
+Jumptable_101494:
 	dw Function10149a
 	dw Function1014a6
 	dw Function1014b7
-; 10149a
 
-Function10149a: ; 10149a
+Function10149a:
 	ld a, $28
 	ld [wcd42], a
 	ld a, [wcd26]
 	inc a
 	ld [wcd26], a
 
-Function1014a6: ; 1014a6
+Function1014a6:
 	ld hl, wcd42
 	dec [hl]
 	ret nz
@@ -3259,7 +3086,7 @@ Function1014a6: ; 1014a6
 	inc a
 	ld [wcd26], a
 
-Function1014b7: ; 1014b7
+Function1014b7:
 	call GetJoypad
 	ld a, [hJoyPressed]
 	and $03
@@ -3273,18 +3100,16 @@ Function1014b7: ; 1014b7
 	set 7, a
 	ld [wcd26], a
 	ret
-; 1014ce
 
-Function1014ce: ; 1014ce
+Function1014ce:
 	farcall Function100720
 	farcall StartMobileInactivityTimer
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1014e2
 
-Function1014e2: ; 1014e2
+Function1014e2:
 	ld hl, wcd29
 	set 6, [hl]
 	ld a, 0
@@ -3293,9 +3118,8 @@ Function1014e2: ; 1014e2
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1014f4
 
-Function1014f4: ; 1014f4
+Function1014f4:
 	farcall EnableMobile
 	ld hl, wcd29
 	set 6, [hl]
@@ -3303,9 +3127,8 @@ Function1014f4: ; 1014f4
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101507
 
-Function101507: ; 101507
+Function101507:
 	ld de, wcd30
 	ld hl, $40
 	ld bc, $40
@@ -3315,36 +3138,32 @@ Function101507: ; 101507
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10151d
 
-Unreferenced_Function10151d: ; 10151d
+Unreferenced_Function10151d:
 	ld a, $34
 	call Function3e32
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10152a
 
-Function10152a: ; 10152a
+Function10152a:
 	ld a, $36
 	call Function3e32
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101537
 
-Function101537: ; 101537
+Function101537:
 	ld a, $0a
 	call Function3e32
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101544
 
-Function101544: ; 101544
+Function101544:
 	farcall StartMobileInactivityTimer
 	ld a, $12
 	call Function3e32
@@ -3352,9 +3171,8 @@ Function101544: ; 101544
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101557
 
-Function101557: ; 101557
+Function101557:
 	farcall StartMobileInactivityTimer
 	ld hl, wcd53
 	ld a, $08
@@ -3363,13 +3181,12 @@ Function101557: ; 101557
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10156d
 
-Function10156d: ; 10156d
+Function10156d:
 	call Function101418
 	ret c
 
-Function101571: ; 101571
+Function101571:
 	farcall Function10032e
 	ret c
 	ret z
@@ -3384,9 +3201,8 @@ Function101571: ; 101571
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10158a
 
-Function10158a: ; 10158a
+Function10158a:
 	farcall IncrementMobileInactivityTimerBy1Frame
 	ld a, [wMobileInactivityTimerMinutes]
 	cp $0a
@@ -3394,9 +3210,8 @@ Function10158a: ; 10158a
 	ld a, $fb
 	ld [wcd2b], a
 	ret
-; 10159d
 
-Function10159d: ; 10159d
+Function10159d:
 	ld de, wc608
 	farcall Function100edf
 	ld de, wc608
@@ -3409,9 +3224,8 @@ Function10159d: ; 10159d
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1015be
 
-Function1015be: ; 1015be
+Function1015be:
 	ld de, wc608
 	farcall Function100eed
 	ld de, wc608
@@ -3424,9 +3238,8 @@ Function1015be: ; 1015be
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1015df
 
-Function1015df: ; 1015df
+Function1015df:
 	ld de, wc608
 	farcall Function100ef4
 	ld de, wc608
@@ -3439,9 +3252,8 @@ Function1015df: ; 1015df
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101600
 
-Function101600: ; 101600
+Function101600:
 	ld hl, w5_d800
 	ld de, wc608
 	ld bc, $1e0
@@ -3453,39 +3265,34 @@ Function101600: ; 101600
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10161f
 
-Function10161f: ; 10161f
+Function10161f:
 	call Function101649
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10162a
 
-Function10162a: ; 10162a
+Function10162a:
 	call Function101663
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101635
 
-Function101635: ; 101635
+Function101635:
 	ld de, wc608
 	ld bc, $1e0
 	call FarCopyWRAM
 	ret
-; 10163f
 
-Function10163f: ; 10163f
+Function10163f:
 	ld hl, wc608
 	ld bc, $1e0
 	call FarCopyWRAM
 	ret
-; 101649
 
-Function101649: ; 101649
+Function101649:
 	ld a, $05
 	ld hl, w5_d800
 	call Function101635
@@ -3493,16 +3300,14 @@ Function101649: ; 101649
 	ld de, w5_da00
 	call Function10163f
 	ret
-; 10165a
 
-Function10165a: ; 10165a
+Function10165a:
 	ld a, $05
 	ld hl, w5_da00
 	call Function101635
 	ret
-; 101663
 
-Function101663: ; 101663
+Function101663:
 	ld a, $05
 	ld hl, w5_d800
 	call Function101635
@@ -3510,29 +3315,26 @@ Function101663: ; 101663
 	ld de, w5_dc00
 	call Function10163f
 	ret
-; 101674
 
-Unreferenced_Function101674: ; 101674
+Unreferenced_Function101674:
 	ld a, $05
 	ld hl, w5_dc00
 	call Function101635
 	ret
-; 10167d
 
-Function10167d: ; 10167d
+Function10167d:
 	ld a, 0
 	ld [wcd26], a
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10168a
 
-Function10168a: ; 10168a
+Function10168a:
 	call Function101418
 	ret c
 
-Function10168e: ; 10168e
+Function10168e:
 	ld b, 0
 	ld c, $01
 	farcall Function10079c
@@ -3555,18 +3357,16 @@ Function10168e: ; 10168e
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1016c3
 
-Jumptable_1016c3: ; 1016c3
+Jumptable_1016c3:
 	dw Function1016cf
 	dw Function1016de
 	dw Function1016f8
 	dw Function101705
 	dw Function101719
 	dw Function101724
-; 1016cf
 
-Function1016cf: ; 1016cf
+Function1016cf:
 	ld hl, wcd3a
 	inc [hl]
 	call Function10176f
@@ -3574,9 +3374,8 @@ Function1016cf: ; 1016cf
 	inc a
 	ld [wcd26], a
 	ret
-; 1016de
 
-Function1016de: ; 1016de
+Function1016de:
 	call Function10177b
 	jr nc, .asm_1016eb
 	ld a, [wcd26]
@@ -3591,18 +3390,16 @@ Function1016de: ; 1016de
 	inc a
 	ld [wcd26], a
 	ret
-; 1016f8
 
-Function1016f8: ; 1016f8
+Function1016f8:
 	ld a, 0
 	ld [wcd27], a
 	ld a, [wcd26]
 	inc a
 	ld [wcd26], a
 	ret
-; 101705
 
-Function101705: ; 101705
+Function101705:
 	farcall Function100382
 	ld a, [wcd27]
 	bit 7, a
@@ -3611,17 +3408,15 @@ Function101705: ; 101705
 	inc a
 	ld [wcd26], a
 	ret
-; 101719
 
-Function101719: ; 101719
+Function101719:
 	call Function1017c7
 	ld a, [wcd26]
 	inc a
 	ld [wcd26], a
 	ret
-; 101724
 
-Function101724: ; 101724
+Function101724:
 	ld a, [wcd39]
 	cp $ff
 	jr z, .asm_101731
@@ -3634,12 +3429,11 @@ Function101724: ; 101724
 	set 7, a
 	ld [wcd26], a
 	ret
-; 10173a
 
 Unknown_10173a:
 	db $50
 
-Function10173b: ; 10173b
+Function10173b:
 	push bc
 	push af
 	ld a, [hli]
@@ -3652,9 +3446,8 @@ Function10173b: ; 10173b
 	call AddNTimes
 	pop bc
 	ret
-; 10174c
 
-Function10174c: ; 10174c
+Function10174c:
 	ld [wcd3d], a
 	ld a, l
 	ld [wcd3e], a
@@ -3672,17 +3465,15 @@ Function10174c: ; 10174c
 	ld [wcd39], a
 	ld [wcd3a], a
 	ret
-; 10176f
 
-Function10176f: ; 10176f
+Function10176f:
 	ld hl, wccb4
 	ld bc, $54
 	ld a, $11
 	call ByteFill
 	ret
-; 10177b
 
-Function10177b: ; 10177b
+Function10177b:
 	ld a, [Unknown_10173a]
 	ld c, a
 	ld b, 0
@@ -3719,9 +3510,8 @@ Function10177b: ; 10177b
 	call Function1017b0
 	xor a
 	ret
-; 1017b0
 
-Function1017b0: ; 1017b0
+Function1017b0:
 	ld a, c
 	ld [wccb4], a
 	push bc
@@ -3733,9 +3523,8 @@ Function1017b0: ; 1017b0
 	ld de, wccb5
 	call CopyBytes
 	ret
-; 1017c7
 
-Function1017c7: ; 1017c7
+Function1017c7:
 	ld a, [wcc60]
 	ld c, a
 	ld b, 0
@@ -3750,22 +3539,20 @@ Function1017c7: ; 1017c7
 	call FarCopyWRAM
 	and a
 	ret
-; 1017e4
 
-Function1017e4: ; 1017e4
+Function1017e4:
 	ld a, 0
 	ld [wcd27], a
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1017f1
 
-Function1017f1: ; 1017f1
+Function1017f1:
 	call Function101418
 	ret c
 
-Function1017f5: ; 1017f5
+Function1017f5:
 	ld b, 0
 	ld c, $01
 	farcall Function10079c
@@ -3787,9 +3574,8 @@ Function1017f5: ; 1017f5
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101826
 
-Function101826: ; 101826
+Function101826:
 	ld a, [wcd21]
 	cp $02
 	jr z, .asm_101833
@@ -3829,7 +3615,6 @@ Function101826: ; 101826
 	ld a, $fe
 	ld [wcd2b], a
 	ret
-; 10186f
 
 
 SECTION "ascii 10186f", ROMX
@@ -3850,12 +3635,11 @@ Unknown_101895:
 	db .end - @
 	db $19, $67, $10, $01, "limit_crystal"
 .end	db 0
-; 1018a8
 
 
 SECTION "bank40_3", ROMX
 
-Function1018a8: ; 1018a8
+Function1018a8:
 	ld hl, wccb5
 	ld de, wcc61
 	ld a, $04
@@ -3880,25 +3664,22 @@ Function1018a8: ; 1018a8
 	ld a, $f5
 	ld [wcd2b], a
 	ret
-; 1018d6
 
-Function1018d6: ; 1018d6
+Function1018d6:
 	call Function1018ec
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1018e1
 
-Function1018e1: ; 1018e1
+Function1018e1:
 	call Function1018fb
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1018ec
 
-Function1018ec: ; 1018ec
+Function1018ec:
 	ld a, $0a
 	ld hl, wccb4
 	ld [hli], a
@@ -3909,9 +3690,8 @@ Function1018ec: ; 1018ec
 	dec c
 	jr nz, .asm_1018f3
 	ret
-; 1018fb
 
-Function1018fb: ; 1018fb
+Function1018fb:
 	ld a, [wcd2f]
 	and a
 	jr z, .asm_101906
@@ -3926,9 +3706,8 @@ Function1018fb: ; 1018fb
 	ld bc, 10
 	call CopyBytes
 	ret
-; 101913
 
-Function101913: ; 101913
+Function101913:
 	ld hl, wcd2a
 	set 0, [hl]
 	xor a
@@ -3959,9 +3738,8 @@ Function101913: ; 101913
 	ld a, $65
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10194b
 
-Function10194b: ; 10194b
+Function10194b:
 	call DisableSpriteUpdates
 	call ClearSprites
 	farcall Function1021f9
@@ -3977,9 +3755,8 @@ Function10194b: ; 10194b
 	ld a, $60
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10196d
 
-_SelectMonsForMobileBattle: ; 10196d
+_SelectMonsForMobileBattle:
 	farcall BlankScreen
 	farcall Mobile_CommunicationStandby
 	ld hl, wcd29
@@ -4003,9 +3780,8 @@ _SelectMonsForMobileBattle: ; 10196d
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1019ab
 
-_StartMobileBattle: ; 1019ab
+_StartMobileBattle:
 	call CopyOtherPlayersBattleMonSelection
 	farcall Function100754
 	xor a
@@ -4029,9 +3805,8 @@ _StartMobileBattle: ; 1019ab
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1019ee
 
-.CopyOTDetails: ; 1019ee
+.CopyOTDetails:
 	ld a, [rSVBK]
 	push af
 	ld a, 5
@@ -4058,9 +3833,8 @@ _StartMobileBattle: ; 1019ab
 .got_link_player_number
 	ld [hSerialConnectionStatus], a
 	ret
-; 101a21
 
-StartMobileBattle: ; 101a21
+StartMobileBattle:
 	; force stereo and fast text speed
 	ld hl, wOptions
 	ld a, [hl]
@@ -4080,9 +3854,8 @@ StartMobileBattle: ; 101a21
 	pop af
 	ld [wOptions], a
 	ret
-; 101a4f
 
-Function101a4f: ; 101a4f
+Function101a4f:
 	ld a, 1
 	ld [wDisableTextAcceleration], a
 	farcall DisplayLinkBattleResult
@@ -4095,9 +3868,8 @@ Function101a4f: ; 101a4f
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101a75
 
-CopyOtherPlayersBattleMonSelection: ; 101a75
+CopyOtherPlayersBattleMonSelection:
 	ld hl, wcc61
 	ld de, wOTMonSelection
 	ld bc, 3
@@ -4107,9 +3879,8 @@ CopyOtherPlayersBattleMonSelection: ; 101a75
 	farcall Function101050
 	farcall LoadSelectedPartiesForColosseum
 	ret
-; 101a97
 
-Function101a97: ; 101a97
+Function101a97:
 	farcall Function115d99
 	ld hl, wcd29
 	set 7, [hl]
@@ -4121,9 +3892,8 @@ Function101a97: ; 101a97
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101ab4
 
-Function101ab4: ; 101ab4
+Function101ab4:
 	ld e, $01
 	call Function101ee4
 	ld hl, wcd29
@@ -4132,9 +3902,8 @@ Function101ab4: ; 101ab4
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101ac6
 
-Function101ac6: ; 101ac6
+Function101ac6:
 	farcall Function115d99
 	ld hl, wcd29
 	set 7, [hl]
@@ -4150,9 +3919,8 @@ Function101ac6: ; 101ac6
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101aed
 
-Function101aed: ; 101aed
+Function101aed:
 	farcall Function115d99
 	ld hl, wcd29
 	set 7, [hl]
@@ -4166,9 +3934,8 @@ Function101aed: ; 101aed
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101b0f
 
-Function101b0f: ; 101b0f
+Function101b0f:
 	ld c, 0
 	call Function10142c
 	ld e, $03
@@ -4181,9 +3948,8 @@ Function101b0f: ; 101b0f
 	ld a, 0
 	ld [wcd26], a
 	ret
-; 101b2b
 
-Function101b2b: ; 101b2b
+Function101b2b:
 	farcall Function100579
 	ld hl, wcd29
 	set 2, [hl]
@@ -4205,9 +3971,8 @@ Function101b2b: ; 101b2b
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101b59
 
-Function101b59: ; 101b59
+Function101b59:
 	ld c, $02
 	call Function10142c
 	ld e, $02
@@ -4218,9 +3983,8 @@ Function101b59: ; 101b59
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101b70
 
-Function101b70: ; 101b70
+Function101b70:
 	ld c, $02
 	call Function10142c
 	ld e, $04
@@ -4234,9 +3998,8 @@ Function101b70: ; 101b70
 	ld a, 0
 	ld [wcd26], a
 	ret
-; 101b8f
 
-Function101b8f: ; 101b8f
+Function101b8f:
 	farcall Function1005c3
 	ld hl, wcd29
 	set 2, [hl]
@@ -4263,9 +4026,8 @@ Function101b8f: ; 101b8f
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101bc8
 
-Function101bc8: ; 101bc8
+Function101bc8:
 	ld c, $02
 	call Function10142c
 	ld e, $08
@@ -4278,9 +4040,8 @@ Function101bc8: ; 101bc8
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101be5
 
-Function101be5: ; 101be5
+Function101be5:
 	farcall Function100579
 	ld hl, wcd29
 	set 2, [hl]
@@ -4301,9 +4062,8 @@ Function101be5: ; 101be5
 	ld a, $02
 	ld [wcd2b], a
 	ret
-; 101c11
 
-Function101c11: ; 101c11
+Function101c11:
 	ld a, $01
 	ld [wdc5f], a
 	ld e, $09
@@ -4315,9 +4075,8 @@ Function101c11: ; 101c11
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101c2b
 
-Function101c2b: ; 101c2b
+Function101c2b:
 	ld a, $02
 	ld [wdc5f], a
 	ld e, $07
@@ -4328,18 +4087,16 @@ Function101c2b: ; 101c2b
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101c42
 
-Function101c42: ; 101c42
+Function101c42:
 	ld hl, wcd2a
 	set 1, [hl]
 	call Function100665
 	ld a, $47
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101c50
 
-Function101c50: ; 101c50
+Function101c50:
 	ld e, $0a
 	call Function101ee4
 	ld hl, wcd29
@@ -4348,9 +4105,8 @@ Function101c50: ; 101c50
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101c62
 
-Function101c62: ; 101c62
+Function101c62:
 	farcall Function115d99
 	ld hl, wcd29
 	set 7, [hl]
@@ -4370,17 +4126,15 @@ Function101c62: ; 101c62
 	ld a, 0
 	ld [wcd26], a
 	ret
-; 101c92
 
-Function101c92: ; 101c92
+Function101c92:
 	farcall Function100675
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101ca0
 
-Function101ca0: ; 101ca0
+Function101ca0:
 	ld c, $02
 	call Function10142c
 	ld e, $0c
@@ -4393,21 +4147,18 @@ Function101ca0: ; 101ca0
 	ld a, 0
 	ld [wcd26], a
 	ret
-; 101cbc
 
-Function101cbc: ; 101cbc
+Function101cbc:
 	ld a, $01
 	ld [wcd2b], a
 	ret
-; 101cc2
 
-Unreferenced_Function101cc2: ; 101cc2
+Unreferenced_Function101cc2:
 	ld a, $02
 	ld [wcd2b], a
 	ret
-; 101cc8
 
-Function101cc8: ; 101cc8
+Function101cc8:
 	ld a, $01
 	ld [wc314], a
 	ld a, $01
@@ -4418,9 +4169,8 @@ Function101cc8: ; 101cc8
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101cdf
 
-Function101cdf: ; 101cdf
+Function101cdf:
 	ld a, $06
 	ld [wc314], a
 	ld a, $01
@@ -4431,27 +4181,24 @@ Function101cdf: ; 101cdf
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101cf6
 
-Function101cf6: ; 101cf6
+Function101cf6:
 	ld a, $0b
 	ld [wc314 + 1], a
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101d03
 
-Function101d03: ; 101d03
+Function101d03:
 	ld a, $0e
 	ld [wc314 + 1], a
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101d10
 
-Function101d10: ; 101d10
+Function101d10:
 	ld c, $01
 	call Function10142c
 	ld a, [wMobileCommsJumptableIndex]
@@ -4459,14 +4206,14 @@ Function101d10: ; 101d10
 	ld [wMobileCommsJumptableIndex], a
 	jr Function101d2a
 
-Function101d1e: ; 101d1e
+Function101d1e:
 	ld c, $03
 	call Function10142c
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 
-Function101d2a: ; 101d2a
+Function101d2a:
 	call Function101418
 	ret c
 	ld hl, wcd29
@@ -4483,21 +4230,19 @@ Function101d2a: ; 101d2a
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101d4d
 
-Jumptable_101d4d: ; 101d4d
+Jumptable_101d4d:
 	dw Function101d51
 	dw Function101d5d
-; 101d51
 
-Function101d51: ; 101d51
+Function101d51:
 	ld a, $3c
 	ld [wcd42], a
 	ld a, [wcd26]
 	inc a
 	ld [wcd26], a
 
-Function101d5d: ; 101d5d
+Function101d5d:
 	ld hl, wcd42
 	dec [hl]
 	ret nz
@@ -4505,9 +4250,8 @@ Function101d5d: ; 101d5d
 	set 7, a
 	ld [wcd26], a
 	ret
-; 101d6b
 
-Function101d6b: ; 101d6b
+Function101d6b:
 	ld a, [wc30d]
 	and a
 	ret nz
@@ -4516,9 +4260,8 @@ Function101d6b: ; 101d6b
 	ld a, $64
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101d7b
 
-Function101d7b: ; 101d7b
+Function101d7b:
 	farcall Function10138b
 	ld b, 0
 	ld hl, Unknown_101d8d
@@ -4527,15 +4270,13 @@ Function101d7b: ; 101d7b
 	ld a, c
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101d8d
 
-Unknown_101d8d: ; 101d8d
+Unknown_101d8d:
 	db $15, $15, $1f, $1f, $0c, $12, $3a, $3a
-; 101d95
 
-Function101d95: ; 101d95
+Function101d95:
 	call Function101ee2
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	ld e, $0e
 	call Function101ee4
 	ld hl, wcd29
@@ -4546,9 +4287,8 @@ Function101d95: ; 101d95
 	ld a, 0
 	ld [wcd26], a
 	ret
-; 101db2
 
-Function101db2: ; 101db2
+Function101db2:
 	farcall Function103302
 	call ExitMenu
 	ld hl, wcd29
@@ -4563,9 +4303,8 @@ Function101db2: ; 101db2
 	ld a, $02
 	ld [wcd2b], a
 	ret
-; 101dd0
 
-Function101dd0: ; 101dd0
+Function101dd0:
 	ld hl, wdc41
 	bit 1, [hl]
 	jr nz, .asm_101ddd
@@ -4577,9 +4316,8 @@ Function101dd0: ; 101dd0
 	ld a, $1b
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101de3
 
-Function101de3: ; 101de3
+Function101de3:
 	call Function101ecc
 	call Function101ead
 	jr c, .asm_101df3
@@ -4601,9 +4339,8 @@ Function101de3: ; 101de3
 	ld a, $02
 	ld [wcd2b], a
 	ret
-; 101e09
 
-Function101e09: ; 101e09
+Function101e09:
 	call Function101ead
 	jr c, .asm_101e16
 	ld a, [wMobileCommsJumptableIndex]
@@ -4627,15 +4364,13 @@ Function101e09: ; 101e09
 	ld a, $02
 	ld [wcd2b], a
 	ret
-; 101e31
 
-Function101e31: ; 101e31
+Function101e31:
 	ld a, $3a
 	ld [wMobileCommsJumptableIndex], a
 	jp Function101c2b
-; 101e39
 
-Function101e39: ; 101e39
+Function101e39:
 	call Function1020bf
 	push af
 	call Function101ed3
@@ -4649,9 +4384,8 @@ Function101e39: ; 101e39
 	ld a, $02
 	ld [wcd2b], a
 	ret
-; 101e4f
 
-Function101e4f: ; 101e4f
+Function101e4f:
 	ld e, $06
 	call Function101ee4
 	call Function1013d6
@@ -4661,9 +4395,8 @@ Function101e4f: ; 101e4f
 	ld a, 0
 	ld [wcd26], a
 	ret
-; 101e64
 
-Function101e64: ; 101e64
+Function101e64:
 	call Function101ecc
 	call Function1020a8
 	push af
@@ -4680,38 +4413,34 @@ Function101e64: ; 101e64
 	ld a, $02
 	ld [wcd2b], a
 	ret
-; 101e82
 
-Unreferenced_Function101e82: ; 101e82
+Unreferenced_Function101e82:
 	call Function101ecc
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101e8d
 
-Unreferenced_Function101e8d: ; 101e8d
+Unreferenced_Function101e8d:
 	call Function101ed3
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101e98
 
-Function101e98: ; 101e98
+Function101e98:
 	call ClearSprites
 	farcall Function8adb3
 	ret c
 	ld hl, wGameTimerPause
-	set 7, [hl]
+	set GAMETIMERPAUSE_MOBILE_7_F, [hl]
 	ld hl, wdc41
 	set 4, [hl]
 	ret
-; 101ead
 
-Function101ead: ; 101ead
+Function101ead:
 	ld hl, wGameTimerPause
-	bit 7, [hl]
+	bit GAMETIMERPAUSE_MOBILE_7_F, [hl]
 	jr nz, .asm_101ec8
 	ld hl, wdc41
 	bit 2, [hl]
@@ -4730,26 +4459,23 @@ Function101ead: ; 101ead
 .asm_101eca
 	scf
 	ret
-; 101ecc
 
-Function101ecc: ; 101ecc
+Function101ecc:
 	call Function101ee2
 	call FadeToMenu
 	ret
-; 101ed3
 
-Function101ed3: ; 101ed3
+Function101ed3:
 	call Function1013aa
 	farcall Function115d99
 	ld hl, wcd29
 	set 7, [hl]
 	ret
-; 101ee2
 
-Function101ee2: ; 101ee2
+Function101ee2:
 	ld e, 0
 
-Function101ee4: ; 101ee4
+Function101ee4:
 	ld d, 0
 	ld hl, Unknown_101ef5
 	add hl, de
@@ -4759,9 +4485,8 @@ Function101ee4: ; 101ee4
 	ld e, a
 	farcall Function100504
 	ret
-; 101ef5
 
-Unknown_101ef5: ; 101ef5
+Unknown_101ef5:
 	dw String_101f13
 	dw String_101f14
 	dw String_101f32
@@ -4778,62 +4503,61 @@ Unknown_101ef5: ; 101ef5
 	dw String_10200c
 	dw String_102014
 
-String_101f13: ; 101f13
+String_101f13:
 	db "@"
 
-String_101f14: ; 101f14
+String_101f14:
 	db   "モバイルアダプタを　つかって"
 	next "おともだちと　つうしんします@"
 
-String_101f32: ; 101f32
+String_101f32:
 	db   "でんわを　かけるひとには"
 	next "つうわりょうきんが　かかります@"
 
-String_101f4f: ; 101f4f
+String_101f4f:
 	db   "モバイルアダプタの　じゅんびは"
 	next "できて　いますか？@"
 
-String_101f69: ; 101f69
+String_101f69:
 	db   "あなたが　おともだちに"
 	next "でんわを　かけますか？@"
 
-String_101f81: ; 101f81
+String_101f81:
 	db   "めいしフォルダーを"
 	next "つかいますか？@"
 
-String_101f93: ; 101f93
+String_101f93:
 	db   "でんわばんごうを　にゅうりょく"
 	next "してください@"
 
-String_101faa: ; 101faa
+String_101faa:
 	db   "それでは　おともだちからの"
 	next "でんわを　おまちします⋯@"
 
-String_101fc5: ; 101fc5
+String_101fc5:
 	next "に　でんわを　かけます@"
 
-String_101fd2: ; 101fd2
+String_101fd2:
 	next "に　でんわを　かけています@"
 
-String_101fe1: ; 101fe1
+String_101fe1:
 	db   "でんわが　つながりました!@"
 
-String_101fef: ; 101fef
+String_101fef:
 	db   "つうわを"
 	next "しゅうりょう　します⋯@"
 
-String_102000: ; 102000
+String_102000:
 	db   "つうしん　しゅうりょう@"
 
-String_10200c: ; 10200c
+String_10200c:
 	db   "つうわ　じかん@"
 
-String_102014: ; 102014
+String_102014:
 	db   "それでは　つうしんの"
 	next "せっていを　してください@"
-; 10202c
 
-Function10202c: ; 10202c
+Function10202c:
 	farcall Function115d99
 	ld hl, wcd29
 	set 7, [hl]
@@ -4844,14 +4568,12 @@ Function10202c: ; 10202c
 	hlcoord 4, 4
 	call Function100681
 	ret
-; 102048
 
-Function102048: ; 102048
+Function102048:
 	call Function10204c
 	ret
-; 10204c
 
-Function10204c: ; 10204c
+Function10204c:
 	hlcoord 3, 2
 	ld c, $10
 	ld de, wcd53
@@ -4871,9 +4593,8 @@ Function10204c: ; 10204c
 
 .asm_102067
 	ret
-; 102068
 
-Function102068: ; 102068
+Function102068:
 	ld hl, wcd53
 	ld c, $08
 .asm_10206d
@@ -4890,9 +4611,8 @@ Function102068: ; 102068
 
 .asm_10207f
 	ret
-; 102080
 
-Function102080: ; 102080
+Function102080:
 	and $0f
 	cp $0f
 	jr z, .asm_10208a
@@ -4904,9 +4624,8 @@ Function102080: ; 102080
 	ld [hl], 0
 	scf
 	ret
-; 10208e
 
-Function10208e: ; 10208e
+Function10208e:
 	push de
 	ld h, d
 	ld l, e
@@ -4915,17 +4634,15 @@ Function10208e: ; 10208e
 	call CopyBytes
 	pop de
 	ret
-; 10209c
 
-Function10209c: ; 10209c
+Function10209c:
 	ld a, $ff
 	ld hl, wdc42
 	ld bc, 8
 	call ByteFill
 	ret
-; 1020a8
 
-Function1020a8: ; 1020a8
+Function1020a8:
 	call Function10209c
 	ld c, $01
 	ld de, wdc42
@@ -4935,9 +4652,8 @@ Function1020a8: ; 1020a8
 	call Function102068
 	xor a
 	ret
-; 1020bf
 
-Function1020bf: ; 1020bf
+Function1020bf:
 	call ClearSprites
 	farcall Function8aba9
 	ld a, c
@@ -4960,9 +4676,8 @@ Function1020bf: ; 1020bf
 .asm_1020e8
 	scf
 	ret
-; 1020ea
 
-Function1020ea: ; 1020ea
+Function1020ea:
 	ld hl, wdc41
 	bit 4, [hl]
 	jr z, .quit
@@ -4984,9 +4699,8 @@ Function1020ea: ; 1020ea
 .quit
 	scf
 	ret
-; 102112
 
-Function102112: ; 102112
+Function102112:
 	ld a, $04
 	call GetSRAMBank
 	ld hl, $a041
@@ -5022,9 +4736,8 @@ Function102112: ; 102112
 	call CloseSRAM
 	pop af
 	ret
-; 102142
 
-Special_Function102142: ; 102142
+Function102142:
 	call Function10218d
 	call Function102180
 	ld hl, UnknownText_0x1021d1
@@ -5049,17 +4762,15 @@ Special_Function102142: ; 102142
 .asm_10217c
 	call Function1013d6
 	ret
-; 102180
 
-Function102180: ; 102180
+Function102180:
 	ld hl, wc608 + 1
 	ld de, wStringBuffer2
 	ld bc, 11
 	call CopyBytes
 	ret
-; 10218d
 
-Function10218d: ; 10218d
+Function10218d:
 	ld hl, w5_dc00
 	ld de, wc608
 	ld bc, $26
@@ -5067,9 +4778,8 @@ Function10218d: ; 10218d
 	call FarCopyWRAM
 	ld de, wc608 + 1 ; useless
 	ret
-; 10219f
 
-Function10219f: ; 10219f
+Function10219f:
 	call FadeToMenu
 	call Function10218d
 	ld de, wc608 + 1
@@ -5078,9 +4788,8 @@ Function10219f: ; 10219f
 	call PlayClickSFX
 	call Function1013aa
 	ret
-; 1021b8
 
-Function1021b8: ; 1021b8
+Function1021b8:
 	call FadeToMenu
 	call Function10218d
 	ld de, wPlayerMoveStruct
@@ -5091,29 +4800,26 @@ Function1021b8: ; 1021b8
 	call Function1013aa
 	pop af
 	ret
-; 1021d1
 
-UnknownText_0x1021d1: ; 1021d1
+UnknownText_0x1021d1:
 	text_jump UnknownText_0x1bd19a
 	db "@"
 
-UnknownText_0x1021d6: ; 1021d1
+UnknownText_0x1021d6:
 	text_jump UnknownText_0x1bd1ba
 	db "@"
 
-UnknownText_0x1021db: ; 1021d1
+UnknownText_0x1021db:
 	text_jump UnknownText_0x1bd1dd
 	db "@"
-; 1021e0
 
-Function1021e0: ; 1021e0
+Function1021e0:
 	call MenuTextBox
 	call JoyWaitAorB
 	call ExitMenu
 	ret
-; 1021ea
 
-UnknownText_0x1021ea: ; 1021ea
+UnknownText_0x1021ea:
 	text_jump UnknownText_0x1bd201
 	db "@"
 
@@ -5124,9 +4830,8 @@ UnknownText_0x1021ef:
 UnknownText_0x1021f4:
 	text_jump UnknownText_0x1bd223
 	db "@"
-; 1021f9
 
-Function1021f9: ; 1021f9
+Function1021f9:
 	call Function102233
 	ld a, $0 ; Function10234b
 	ld [wcd49], a
@@ -5158,25 +4863,22 @@ Function1021f9: ; 1021f9
 .asm_102231
 	xor a
 	ret
-; 102233
 
-Function102233: ; 102233
+Function102233:
 	ld hl, wcd49
 	ld bc, 10
 	xor a
 	call ByteFill
 	call Function10304f
 	ret
-; 102241
 
-Function102241: ; 102241
+Function102241:
 	call Function10226a
 	call Function102274
 	call Function10224b
 	ret
-; 10224b
 
-Function10224b: ; 10224b
+Function10224b:
 	ld hl, wcd4b
 	bit 1, [hl]
 	jr nz, .asm_10225e
@@ -5193,17 +4895,15 @@ Function10224b: ; 10224b
 	farcall Mobile_ReloadMapPart
 	scf
 	ret
-; 10226a
 
-Function10226a: ; 10226a
+Function10226a:
 	ld hl, wcd4b
 	bit 0, [hl]
 	ret z
 	call Function10305d
 	ret
-; 102274
 
-Function102274: ; 102274
+Function102274:
 	ld hl, wcd4b
 	bit 3, [hl]
 	ret z
@@ -5211,25 +4911,22 @@ Function102274: ; 102274
 	ld de, 8
 	call PlaySFX
 	ret
-; 102283
 
-Function102283: ; 102283
+Function102283:
 	ld a, $01
 	ld [wAttrMapEnd], a
 	ld hl, wcd4b
 	set 0, [hl]
 	ret
-; 10228e
 
-Function10228e: ; 10228e
+Function10228e:
 	xor a
 	ld [wAttrMapEnd], a
 	ld hl, wcd4b
 	res 0, [hl]
 	ret
-; 102298
 
-Function102298: ; 102298
+Function102298:
 	ld a, e
 	cp $02
 	ret nz
@@ -5257,15 +4954,13 @@ Function102298: ; 102298
 	ld a, $01
 	ld [wAttrMapEnd], a
 	ret
-; 1022ca
 
-Function1022ca: ; 1022ca
+Function1022ca:
 	ld a, 30
 	ld [wOverworldDelay], a
 	ret
-; 1022d0
 
-Function1022d0: ; 1022d0
+Function1022d0:
 	farcall Function10032e
 	ld a, [wcd2b]
 	and a
@@ -5285,9 +4980,8 @@ Function1022d0: ; 1022d0
 .asm_1022f3
 	scf
 	ret
-; 1022f5
 
-Jumptable_1022f5: ; 1022f5
+Jumptable_1022f5:
 	dw Function10234b ; 00
 	dw Function102361 ; 01
 	dw Function10236e ; 02
@@ -5331,9 +5025,8 @@ Jumptable_1022f5: ; 1022f5
 	dw Function1028da ; 28
 	dw Function1024a8 ; 29
 	dw Function10248d ; 2a
-; 10234b
 
-Function10234b: ; 10234b
+Function10234b:
 	call Function102d9a
 	call Function102dd3
 	call Function102dec
@@ -5343,18 +5036,16 @@ Function10234b: ; 10234b
 	inc a
 	ld [wcd49], a
 	ret
-; 102361
 
-Function102361: ; 102361
+Function102361:
 	ld a, $cc
 	call Function1028e8
 	ld a, [wcd49]
 	inc a
 	ld [wcd49], a
 	ret
-; 10236e
 
-Function10236e: ; 10236e
+Function10236e:
 	call Function1028fc
 	ret nc
 	ld a, [wcd51]
@@ -5369,9 +5060,8 @@ Function10236e: ; 10236e
 	inc a
 	ld [wcd49], a
 	ret
-; 102387
 
-Function102387: ; 102387
+Function102387:
 	ld hl, wcd4b
 	set 6, [hl]
 	xor a
@@ -5383,7 +5073,7 @@ Function102387: ; 102387
 	ld a, $01
 	ld [wMenuCursorY], a
 
-Function1023a1: ; 1023a1
+Function1023a1:
 	call Function102283
 	call Function102db7
 	call Function102dec
@@ -5392,9 +5082,8 @@ Function1023a1: ; 1023a1
 	ld a, $1d
 	ld [wcd49], a
 	ret
-; 1023b5
 
-Function1023b5: ; 1023b5
+Function1023b5:
 	call Function10228e
 	call Function102a3b
 	call Function102b12
@@ -5402,15 +5091,14 @@ Function1023b5: ; 1023b5
 	inc a
 	ld [wcd49], a
 	ret
-; 1023c6
 
-Function1023c6: ; 1023c6
+Function1023c6:
 	call Function102c48
 	call Function102c87
 	ld a, [wcd4c]
 	dec a
 	ld [wCurPartyMon], a
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ld hl, wPartyCount
@@ -5438,18 +5126,16 @@ Function1023c6: ; 1023c6
 	inc a
 	ld [wcd49], a
 	ret
-; 102416
 
-Function102416: ; 102416
+Function102416:
 	ld a, $aa
 	call Function1028e8
 	ld a, [wcd49]
 	inc a
 	ld [wcd49], a
 	ret
-; 102423
 
-Function102423: ; 102423
+Function102423:
 	call Function102921
 	ret nc
 	farcall SaveAfterLinkTrade
@@ -5463,9 +5149,8 @@ Function102423: ; 102423
 	inc a
 	ld [wcd49], a
 	ret
-; 10244b
 
-Function10244b: ; 10244b
+Function10244b:
 	call Function102f32
 	ld hl, wcd4b
 	set 1, [hl]
@@ -5479,9 +5164,8 @@ Function10244b: ; 10244b
 	inc a
 	ld [wcd49], a
 	ret
-; 10246a
 
-Function10246a: ; 10246a
+Function10246a:
 	call Function102d9a
 	ld hl, wcd29
 	set 3, [hl]
@@ -5491,25 +5175,22 @@ Function10246a: ; 10246a
 	ld a, $2a
 	ld [wcd49], a
 	ret
-; 102480
 
-Function102480: ; 102480
+Function102480:
 	ld c, $32
 	call DelayFrames
 	ld a, [wcd49]
 	inc a
 	ld [wcd49], a
 	ret
-; 10248d
 
-Function10248d: ; 10248d
+Function10248d:
 	ld a, [wcd49]
 	set 7, a
 	ld [wcd49], a
 	ret
-; 102496
 
-Function102496: ; 102496
+Function102496:
 	ld hl, wcd4e
 	dec [hl]
 	ret nz
@@ -5519,34 +5200,31 @@ Function102496: ; 102496
 	inc a
 	ld [wcd49], a
 	ret
-; 1024a8
 
-Function1024a8: ; 1024a8
+Function1024a8:
 	farcall Function1009f3
 	ret c
 
-Function1024af: ; 1024af
+Function1024af:
 	call GetJoypad
 	ld a, [wcd4a]
 	ld hl, Jumptable_1024ba
 	rst JumpTable
 	ret
-; 1024ba
 
-Jumptable_1024ba: ; 1024ba
+Jumptable_1024ba:
 	dw Function1024c0
 	dw Function1024cb
 	dw Function1024de
-; 1024c0
 
-Function1024c0: ; 1024c0
+Function1024c0:
 	ld hl, wcd4e
 	inc [hl]
 	ld a, [wcd4a]
 	inc a
 	ld [wcd4a], a
 
-Function1024cb: ; 1024cb
+Function1024cb:
 	ld hl, wcd4e
 	dec [hl]
 	ret nz
@@ -5557,7 +5235,7 @@ Function1024cb: ; 1024cb
 	inc a
 	ld [wcd4a], a
 
-Function1024de: ; 1024de
+Function1024de:
 	ld hl, wcd4e
 	dec [hl]
 	jr z, .asm_1024e9
@@ -5572,9 +5250,8 @@ Function1024de: ; 1024de
 	inc a
 	ld [wcd49], a
 	ret
-; 1024f6
 
-Function1024f6: ; 1024f6
+Function1024f6:
 	call PlaceHollowCursor
 	ld hl, wcd4b
 	set 1, [hl]
@@ -5584,9 +5261,8 @@ Function1024f6: ; 1024f6
 	inc a
 	ld [wcd49], a
 	ret
-; 10250c
 
-Function10250c: ; 10250c
+Function10250c:
 	call Function1028fc
 	ret nc
 	ld a, [wcd51]
@@ -5653,9 +5329,8 @@ Function10250c: ; 10250c
 	ld a, $09
 	ld [wcd49], a
 	ret
-; 102591
 
-Function102591: ; 102591
+Function102591:
 	call Function102ee7
 	ld hl, wcd4b
 	set 1, [hl]
@@ -5669,26 +5344,23 @@ Function102591: ; 102591
 	inc a
 	ld [wcd49], a
 	ret
-; 1025b0
 
-Function1025b0: ; 1025b0
+Function1025b0:
 	ld a, $09
 	call Function1028e8
 	ld a, [wcd49]
 	inc a
 	ld [wcd49], a
 	ret
-; 1025bd
 
-Function1025bd: ; 1025bd
+Function1025bd:
 	call Function1028fc
 	ret nc
 	ld a, $04
 	ld [wcd49], a
 	ret
-; 1025c7
 
-Function1025c7: ; 1025c7
+Function1025c7:
 	call Function102f6d
 	ld hl, wcd4b
 	set 1, [hl]
@@ -5698,18 +5370,16 @@ Function1025c7: ; 1025c7
 	inc a
 	ld [wcd49], a
 	ret
-; 1025dc
 
-Function1025dc: ; 1025dc
+Function1025dc:
 	call Function1028fc
 	ret nc
 	ld a, [wcd49]
 	set 7, a
 	ld [wcd49], a
 	ret
-; 1025e9
 
-Function1025e9: ; 1025e9
+Function1025e9:
 	nop
 	ld hl, wcd4b
 	set 6, [hl]
@@ -5720,9 +5390,8 @@ Function1025e9: ; 1025e9
 	inc a
 	ld [wcd49], a
 	ret
-; 1025ff
 
-Function1025ff: ; 1025ff
+Function1025ff:
 	ld hl, wcd4b
 	set 2, [hl]
 	farcall Function1009f3
@@ -5766,9 +5435,8 @@ Function1025ff: ; 1025ff
 	ld a, $23 ; Function1026b7
 	ld [wcd49], a
 	ret
-; 102652
 
-Function102652: ; 102652
+Function102652:
 	nop
 	ld hl, wcd4b
 	set 6, [hl]
@@ -5782,9 +5450,8 @@ Function102652: ; 102652
 	inc a
 	ld [wcd49], a
 	ret
-; 10266b
 
-Function10266b: ; 10266b
+Function10266b:
 	ld hl, wcd4b
 	set 2, [hl]
 	farcall Function1009f3
@@ -5826,9 +5493,8 @@ Function10266b: ; 10266b
 	ld a, $23 ; Function1026b7
 	ld [wcd49], a
 	ret
-; 1026b7
 
-Function1026b7: ; 1026b7
+Function1026b7:
 	ld hl, wcd4b
 	set 6, [hl]
 	ld a, [wcd49]
@@ -5837,7 +5503,7 @@ Function1026b7: ; 1026b7
 	ld a, 0
 	ld [wcd4a], a
 
-Function1026c8: ; 1026c8
+Function1026c8:
 	call GetJoypad
 	farcall Function1009f3
 	ret c
@@ -5845,14 +5511,12 @@ Function1026c8: ; 1026c8
 	ld hl, Jumptable_1026da
 	rst JumpTable
 	ret
-; 1026da
 
-Jumptable_1026da: ; 1026da
+Jumptable_1026da:
 	dw Function1026de
 	dw Function1026f3
-; 1026de
 
-Function1026de: ; 1026de
+Function1026de:
 	call HideCursor
 	hlcoord 9, 17
 	ld [hl], $ed
@@ -5862,9 +5526,8 @@ Function1026de: ; 1026de
 	ld hl, wcd4b
 	set 1, [hl]
 	ret
-; 1026f3
 
-Function1026f3: ; 1026f3
+Function1026f3:
 	ld a, [hJoyPressed]
 	bit A_BUTTON_F, a
 	jr nz, .asm_102723
@@ -5902,9 +5565,8 @@ Function1026f3: ; 1026f3
 	ld a, $5 ; Function1025c7
 	ld [wcd49], a
 	ret
-; 102738
 
-Function102738: ; 102738
+Function102738:
 	ld hl, wcd4b
 	set 6, [hl]
 	call PlaceHollowCursor
@@ -5917,7 +5579,7 @@ Function102738: ; 102738
 	ld a, 0
 	ld [wcd4a], a
 
-Function102754: ; 102754
+Function102754:
 	call GetJoypad
 	farcall Function1009f3
 	ret c
@@ -5925,21 +5587,19 @@ Function102754: ; 102754
 	ld hl, Jumptable_102766
 	rst JumpTable
 	ret
-; 102766
 
-Jumptable_102766: ; 102766
+Jumptable_102766:
 	dw Function102770
 	dw Function102775
 	dw Function10278c
 	dw Function1027a0
 	dw Function1027b7
-; 102770
 
-Function102770: ; 102770
+Function102770:
 	ld a, $01
 	ld [wcd4a], a
 
-Function102775: ; 102775
+Function102775:
 	hlcoord 1, 16
 	ld [hl], "▶"
 	hlcoord 11, 16
@@ -5950,9 +5610,8 @@ Function102775: ; 102775
 	inc a
 	ld [wcd4a], a
 	ret
-; 10278c
 
-Function10278c: ; 10278c
+Function10278c:
 	ld a, [hJoyPressed]
 	bit A_BUTTON_F, a
 	jr nz, asm_1027c6
@@ -5965,7 +5624,7 @@ Function10278c: ; 10278c
 .asm_10279b
 	ld a, $03
 	ld [wcd4a], a
-Function1027a0: ; 1027a0
+Function1027a0:
 	hlcoord 1, 16
 	ld [hl], " "
 	hlcoord 11, 16
@@ -5977,7 +5636,7 @@ Function1027a0: ; 1027a0
 	ld [wcd4a], a
 	ret
 
-Function1027b7: ; 1027b7
+Function1027b7:
 	ld a, [hJoyPressed]
 	bit A_BUTTON_F, a
 	jr nz, asm_1027d1
@@ -6008,9 +5667,8 @@ asm_1027e2:
 	ld a, $1d ; Function102652
 	ld [wcd49], a
 	ret
-; 1027eb
 
-Function1027eb: ; 1027eb
+Function1027eb:
 	hlcoord 0, 14
 	ld b, 2
 	ld c, 18
@@ -6021,13 +5679,11 @@ Function1027eb: ; 1027eb
 	hlcoord 2, 16
 	call PlaceString
 	ret
-; 102804
 
-.Stats_Trade: ; 102804
+.Stats_Trade:
 	db "STATS     TRADE@"
-; 102814
 
-Function102814: ; 102814
+Function102814:
 	ld a, [wMenuCursorY]
 	ld [wcd52], a
 	ld a, [wcd4c]
@@ -6045,7 +5701,7 @@ Function102814: ; 102814
 	ld hl, wcd4b
 	set 1, [hl]
 
-Function10283c: ; 10283c
+Function10283c:
 	ld hl, wcd4b
 	set 2, [hl]
 	call Function1029c3
@@ -6065,18 +5721,16 @@ Function10283c: ; 10283c
 	ld hl, wcd4b
 	set 1, [hl]
 	ret
-; 102862
 
-Function102862: ; 102862
+Function102862:
 	ld a, $08
 	call Function1028e8
 	ld a, [wcd49]
 	inc a
 	ld [wcd49], a
 	ret
-; 10286f
 
-Function10286f: ; 10286f
+Function10286f:
 	call Function1028fc
 	ret nc
 	ld a, [wcd52]
@@ -6102,15 +5756,13 @@ Function10286f: ; 10286f
 	inc a
 	ld [wcd49], a
 	ret
-; 1028a5
 
-Function1028a5: ; 1028a5
+Function1028a5:
 	ld a, $4 ; Function1023a1
 	ld [wcd49], a
 	ret
-; 1028ab
 
-Function1028ab: ; 1028ab
+Function1028ab:
 	ld a, [wcd52]
 	ld [wMenuCursorY], a
 	call Function102f15
@@ -6119,37 +5771,34 @@ Function1028ab: ; 1028ab
 	ld a, $c ; Function1025b0
 	ld [wcd49], a
 	ret
-; 1028bf
 
-Function1028bf: ; 1028bf
+Function1028bf:
 	ld a, [wcd49]
 	inc a
 	ld [wcd49], a
 
-Function1028c6: ; 1028c6
+Function1028c6:
 	xor a
 	ld [wMonType], a
 	call Function102bac
 	ld a, $1d ; Function102652
 	ld [wcd49], a
 	ret
-; 1028d3
 
-Function1028d3: ; 1028d3
+Function1028d3:
 	ld a, [wcd49]
 	inc a
 	ld [wcd49], a
 
-Function1028da: ; 1028da
+Function1028da:
 	ld a, OTPARTYMON
 	ld [wMonType], a
 	call Function102bac
 	ld a, $1f ; Function1025e9
 	ld [wcd49], a
 	ret
-; 1028e8
 
-Function1028e8: ; 1028e8
+Function1028e8:
 	ld hl, wcd4b
 	res 6, [hl]
 	ld [wcd50], a
@@ -6157,9 +5806,8 @@ Function1028e8: ; 1028e8
 	ld a, 0
 	ld [wcd4a], a
 	ret
-; 1028fc
 
-Function1028fc: ; 1028fc
+Function1028fc:
 	call GetJoypad
 	farcall Function1009f3
 	jr nc, .asm_102909
@@ -6174,17 +5822,15 @@ Function1028fc: ; 1028fc
 	ld a, 0
 	ld [wcd4a], a
 	ret
-; 102917
 
-Jumptable_102917: ; 102917
+Jumptable_102917:
 	dw Function102933
 	dw Function10294f
 	dw Function10295d
 	dw Function10296e
 	dw Function102996
-; 102921
 
-Function102921: ; 102921
+Function102921:
 	ld a, [wcd4a]
 	ld hl, Jumptable_10292f
 	rst JumpTable
@@ -6192,16 +5838,14 @@ Function102921: ; 102921
 	ld a, 0
 	ld [wcd4a], a
 	ret
-; 10292f
 
-Jumptable_10292f: ; 10292f
+Jumptable_10292f:
 	dw Function10295d
 	dw Function102984
-; 102933
 
-Function102933: ; 102933
-	ld hl, MenuDataHeader_1029bb
-	call LoadMenuDataHeader
+Function102933:
+	ld hl, MenuHeader_1029bb
+	call LoadMenuHeader
 	call Function102e07
 	ld a, $32
 	ld [wTextDelayFrames], a
@@ -6212,9 +5856,8 @@ Function102933: ; 102933
 	ld [wcd4a], a
 	and a
 	ret
-; 10294f
 
-Function10294f: ; 10294f
+Function10294f:
 	ld a, [wTextDelayFrames]
 	and a
 	ret nz
@@ -6223,9 +5866,8 @@ Function10294f: ; 10294f
 	ld [wcd4a], a
 	and a
 	ret
-; 10295d
 
-Function10295d: ; 10295d
+Function10295d:
 	call Function10299e
 	ld a, 0
 	ld [wcd27], a
@@ -6234,9 +5876,8 @@ Function10295d: ; 10295d
 	ld [wcd4a], a
 	and a
 	ret
-; 10296e
 
-Function10296e: ; 10296e
+Function10296e:
 	farcall Function100382
 	and a
 	ld a, [wcd27]
@@ -6247,9 +5888,8 @@ Function10296e: ; 10296e
 	ld [wcd4a], a
 	and a
 	ret
-; 102984
 
-Function102984: ; 102984
+Function102984:
 	farcall Function100382
 	and a
 	ld a, [wcd27]
@@ -6258,16 +5898,14 @@ Function102984: ; 102984
 	call Function1029af
 	scf
 	ret
-; 102996
 
-Function102996: ; 102996
+Function102996:
 	call Function1029af
 	call ExitMenu
 	scf
 	ret
-; 10299e
 
-Function10299e: ; 10299e
+Function10299e:
 	ld a, $01
 	ld [wccb4], a
 	ld a, [wcd50]
@@ -6275,37 +5913,32 @@ Function10299e: ; 10299e
 	ld a, $aa
 	ld [wcd51], a
 	ret
-; 1029af
 
-Function1029af: ; 1029af
+Function1029af:
 	ld hl, wcd4b
 	res 7, [hl]
 	ld a, [wcc61]
 	ld [wcd51], a
 	ret
-; 1029bb
 
-MenuDataHeader_1029bb: ; 1029bb
+MenuHeader_1029bb:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 3, 10, 15, 12
 	dw NULL
 	db 1 ; default option
-; 1029c3
 
-Function1029c3: ; 1029c3
+Function1029c3:
 	ld a, [wcd4a]
 	ld hl, Jumptable_1029cb
 	rst JumpTable
 	ret
-; 1029cb
 
-Jumptable_1029cb: ; 1029cb
+Jumptable_1029cb:
 	dw Function1029cf
 	dw Function1029fe
-; 1029cf
 
-Function1029cf: ; 1029cf
-	call LoadStandardMenuDataHeader
+Function1029cf:
+	call LoadStandardMenuHeader
 	hlcoord 10, 7
 	ld b, 3
 	ld c, 8
@@ -6324,9 +5957,8 @@ Function1029cf: ; 1029cf
 	ld [wcd4a], a
 	xor a
 	ret
-; 1029fe
 
-Function1029fe: ; 1029fe
+Function1029fe:
 	farcall Function1009f3
 	ret c
 	farcall MobileMenuJoypad
@@ -6349,13 +5981,11 @@ Function1029fe: ; 1029fe
 	and a
 	scf
 	ret
-; 102a26
 
-String_102a26: ; 102a26
+String_102a26:
 	db   "TRADE"
 	next "CANCEL"
 	db   "@"
-; 102a33
 
 MenuData3_102a33:
 	db 8, 11
@@ -6364,7 +5994,7 @@ MenuData3_102a33:
 	dn 2, 0
 	db A_BUTTON
 
-Function102a3b: ; 102a3b
+Function102a3b:
 	ld a, [wcd30]
 	ld [wc74e], a
 	ld hl, wPlayerName
@@ -6457,9 +6087,8 @@ Function102a3b: ; 102a3b
 	ld a, c
 	ld [wOTTrademonCaughtData], a
 	ret
-; 102b12
 
-Function102b12: ; 102b12
+Function102b12:
 	ld c, 100
 	call DelayFrames
 	call Function102d9a
@@ -6475,9 +6104,8 @@ Function102b12: ; 102b12
 
 .asm_102b31
 	ret
-; 102b32
 
-Function102b32: ; 102b32
+Function102b32:
 	ld a, [wcd4c]
 	dec a
 	ld [wCurPartyMon], a
@@ -6488,9 +6116,8 @@ Function102b32: ; 102b32
 	call Function102dd3
 	call Function102dec
 	ret
-; 102b4e
 
-Function102b4e: ; 102b4e
+Function102b4e:
 	ld a, OTPARTYMON
 	ld [wMonType], a
 	ld a, [wMenuCursorY]
@@ -6502,15 +6129,13 @@ Function102b4e: ; 102b4e
 	ld a, [wOTPartyCount]
 	ld [w2DMenuNumRows], a
 	ret
-; 102b68
 
-Unreferenced_Function102b68: ; 102b68
+Unreferenced_Function102b68:
 	xor a
 	ld hl, wWindowStackPointer
 	ld bc, $10
 	call ByteFill
 	ret
-; 102b73
 
 Unknown_102b73:
 	db 9, 6
@@ -6519,7 +6144,7 @@ Unknown_102b73:
 	dn 1, 0
 	db D_UP | D_DOWN | A_BUTTON
 
-Function102b7b: ; 102b7b
+Function102b7b:
 	xor a
 	ld [wMonType], a
 	ld a, [wMenuCursorY]
@@ -6531,7 +6156,6 @@ Function102b7b: ; 102b7b
 	ld a, [wPartyCount]
 	ld [w2DMenuNumRows], a
 	ret
-; 102b94
 
 Unknown_102b94:
 	db 1, 6
@@ -6540,7 +6164,7 @@ Unknown_102b94:
 	dn 1, 0
 	db D_UP | D_DOWN | A_BUTTON
 
-Function102b9c: ; 102b9c
+Function102b9c:
 	ld a, [wcd4d]
 	dec a
 	hlcoord 6, 9
@@ -6548,9 +6172,8 @@ Function102b9c: ; 102b9c
 	call AddNTimes
 	ld [hl], $ec
 	ret
-; 102bac
 
-Function102bac: ; 102bac
+Function102bac:
 	ld a, [wMenuCursorY]
 	dec a
 	ld [wCurPartyMon], a
@@ -6568,9 +6191,8 @@ Function102bac: ; 102bac
 	call Function102dec
 	call Function102db7
 	ret
-; 102bdc
 
-Function102bdc: ; 102bdc
+Function102bdc:
 	ld a, [wcd4d]
 	dec a
 	ld hl, wOTPartyMon1Species
@@ -6600,49 +6222,43 @@ Function102bdc: ; 102bdc
 .asm_102c05
 	scf
 	ret
-; 102c07
 
-Function102c07: ; 102c07
+Function102c07:
 	call Function102c14
 	call Function102c3b
 	call Function102c21
 	call Function102c2e
 	ret
-; 102c14
 
-Function102c14: ; 102c14
+Function102c14:
 	ld hl, wPartySpecies
 	ld de, wOTPartySpecies
 	ld bc, 1
 	call Function102c71
 	ret
-; 102c21
 
-Function102c21: ; 102c21
+Function102c21:
 	ld hl, wPartyMonNicknames
 	ld de, wOTPartyMonNicknames
 	ld bc, 11
 	call Function102c71
 	ret
-; 102c2e
 
-Function102c2e: ; 102c2e
+Function102c2e:
 	ld hl, wPartyMonOT
 	ld de, wOTPartyMonOT
 	ld bc, 11
 	call Function102c71
 	ret
-; 102c3b
 
-Function102c3b: ; 102c3b
+Function102c3b:
 	ld hl, wPartyMon1
 	ld de, wOTPartyMon1
 	ld bc, $30
 	call Function102c71
 	ret
-; 102c48
 
-Function102c48: ; 102c48
+Function102c48:
 	farcall Function10165a
 	ld a, 0
 	call GetSRAMBank
@@ -6657,9 +6273,8 @@ Function102c48: ; 102c48
 	ld a, $05
 	call FarCopyWRAM
 	ret
-; 102c71
 
-Function102c71: ; 102c71
+Function102c71:
 	ld a, [wcd4c]
 	dec a
 	call AddNTimes
@@ -6672,9 +6287,8 @@ Function102c71: ; 102c71
 	pop de
 	call SwapBytes
 	ret
-; 102c87
 
-Function102c87: ; 102c87
+Function102c87:
 	ld a, [wJumptableIndex]
 	push af
 	ld a, [wcf64]
@@ -6714,9 +6328,8 @@ Function102c87: ; 102c87
 	pop af
 	ld [wJumptableIndex], a
 	ret
-; 102cee
 
-Function102cee: ; 102cee
+Function102cee:
 	ld a, [wJumptableIndex]
 	dec a
 	call Function102d34
@@ -6750,23 +6363,20 @@ Function102cee: ; 102cee
 	ld bc, $2f
 	call CopyBytes
 	ret
-; 102d34
 
-Function102d34: ; 102d34
+Function102d34:
 	ld hl, wc608
 	ld bc, $2f
 	call AddNTimes
 	ret
-; 102d3e
 
-Function102d3e: ; 102d3e
+Function102d3e:
 	call GetSRAMBank
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 102d48
 
-Function102d48: ; 102d48
+Function102d48:
 	ld a, [wcd4c]
 	ld e, a
 	ld d, 0
@@ -6805,9 +6415,8 @@ Function102d48: ; 102d48
 .asm_102d98
 	and a
 	ret
-; 102d9a
 
-Function102d9a: ; 102d9a
+Function102d9a:
 	ld a, " "
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@@ -6818,17 +6427,15 @@ Function102d9a: ; 102d9a
 	call ByteFill
 	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
 	ret
-; 102db7
 
-Function102db7: ; 102db7
+Function102db7:
 	call Function102e4f
 	call Function102e3e
 	ld hl, wcd4b
 	set 1, [hl]
 	ret
-; 102dc3
 
-Function102dc3: ; 102dc3
+Function102dc3:
 	hlcoord 0, 12
 	ld b,  4
 	ld c, 18
@@ -6836,9 +6443,8 @@ Function102dc3: ; 102dc3
 	ld e, l
 	farcall _LinkTextbox
 	ret
-; 102dd3
 
-Function102dd3: ; 102dd3
+Function102dd3:
 	call DisableLCD
 	ld de, GFX_1032a2
 	ld hl, vTiles0
@@ -6847,9 +6453,8 @@ Function102dd3: ; 102dd3
 	farcall __LoadTradeScreenBorder
 	call EnableLCD
 	ret
-; 102dec
 
-Function102dec: ; 102dec
+Function102dec:
 	ld hl, Palettes_1032e2
 	ld de, wOBPals1
 	ld bc, 4 palettes
@@ -6859,9 +6464,8 @@ Function102dec: ; 102dec
 	call SetPalettes
 	call DelayFrame
 	ret
-; 102e07
 
-Function102e07: ; 102e07
+Function102e07:
 	hlcoord 3, 10
 	ld b,  1
 	ld c, 11
@@ -6885,24 +6489,20 @@ Function102e07: ; 102e07
 	hlcoord 4, 11
 	call PlaceString
 	ret
-; 102e32
 
-.waiting ; 102e32
+.waiting
 	db "Waiting...!@"
-; 102e3e
 
-Function102e3e: ; 102e3e
+Function102e3e:
 	ld de, .CANCEL
 	hlcoord 10, 17
 	call PlaceString
 	ret
-; 102e48
 
-.CANCEL: ; 102e48
+.CANCEL:
 	db "CANCEL@"
-; 102e4f
 
-Function102e4f: ; 102e4f
+Function102e4f:
 	farcall Function16d42e
 	farcall _InitMG_Mobile_LinkTradePalMap
 	ld de, wPlayerName
@@ -6922,9 +6522,8 @@ Function102e4f: ; 102e4f
 	ld de, wOTPartySpecies
 	call .PlaceSpeciesNames
 	ret
-; 102e86
 
-.PlaceSpeciesNames: ; 102e86
+.PlaceSpeciesNames:
 	ld c, 0
 .count_loop
 	ld a, [de]
@@ -6948,9 +6547,8 @@ Function102e4f: ; 102e4f
 	pop bc
 	inc c
 	jr .count_loop
-; 102ea8
 
-Function102ea8: ; 102ea8
+Function102ea8:
 	call Function102dc3
 	ld a, [wcd4c]
 	dec a
@@ -6977,75 +6575,64 @@ Function102ea8: ; 102ea8
 	ld hl, UnknownText_0x102ee2
 	call PrintTextBoxText
 	ret
-; 102ee2
 
-UnknownText_0x102ee2: ; 102ee2
+UnknownText_0x102ee2:
 	text_jump UnknownText_0x1bd286
 	db "@"
 
-Function102ee7: ; 102ee7
+Function102ee7:
 	call Function102dc3
 	ld de, String_102ef4
 	hlcoord 1, 14
 	call PlaceString
 	ret
-; 102ef4
 
-String_102ef4: ; 102ef4
+String_102ef4:
 	db   "Too bad! The trade"
 	next "was canceled!"
 	db   "@"
-; 102f15
 
-Function102f15: ; 102f15
+Function102f15:
 	call Function102dc3
 	ld de, .TooBadTheTradeWasCanceled
 	hlcoord 1, 14
 	call PlaceString
 	ret
-; 102f22
 
-.TooBadTheTradeWasCanceled: ; 102f22
+.TooBadTheTradeWasCanceled:
 	db "こうかんを　キャンセルしました@"
-; 102f32
 
-Function102f32: ; 102f32
+Function102f32:
 	call Function102dc3
 	ld de, .TradeCompleted
 	hlcoord 1, 14
 	call PlaceString
 	ret
-; 102f3f
 
-.TradeCompleted: ; 102f3f
+.TradeCompleted:
 	db "Trade completed!@"
-; 102f50
 
-Function102f50: ; 102f50
+Function102f50:
 	call Function102dc3
 	ld de, .PleaseWait
 	hlcoord 1, 14
 	call PlaceString
 	ret
-; 102f5d
 
-.PleaseWait: ; 102f5d
+.PleaseWait:
 	db "しょうしょう　おまち　ください@"
-; 102f6d
 
-Function102f6d: ; 102f6d
+Function102f6d:
 	call Function102dc3
 	ld de, .Finished
 	hlcoord 1, 14
 	call PlaceString
 	ret
-; 102f7a
 
-.Finished: ; 102f7a
+.Finished:
 	db "しゅうりょう　します@"
-; 102f85
 
-Function102f85: ; 102f85
+Function102f85:
 	ld a, [wd003]
 	ld c, a
 	ld b, 0
@@ -7064,70 +6651,60 @@ Function102f85: ; 102f85
 	ld de, String_102fcc
 	call PlaceString
 	ret
-; 102fb2
 
-String_102fb2: ; 102fb2
+String_102fb2:
 	db   "あいてがわ<PKMN>えらんだ　"
 	next "いじょう<PKMN>あるようです！！"
 	db   "@"
-; 102fcc
 
-String_102fcc: ; 102fcc
+String_102fcc:
 	db "に@"
-; 102fce
 
-Function102fce: ; 102fce
+Function102fce:
 	call Function102dc3
 	ld de, String_102fdb
 	hlcoord 1, 14
 	call PlaceString
 	ret
-; 102fdb
 
-String_102fdb: ; 102fdb
+String_102fdb:
 	db   "あいてがわ<NO>せんたくに"
 	next "いじょう<PKMN>あるようです！！"
 	done
-; 102ff5
 
-Function102ff5: ; 102ff5
+Function102ff5:
 	call Function102dc3
 	ld de, String_103002
 	hlcoord 1, 14
 	call PlaceString
 	ret
-; 103002
 
-String_103002: ; 103002
+String_103002:
 	db   "その#を　こうかんすると"
 	next "せんとう　できなく　なっちゃうよ！"
 	db   "@"
-; 103021
 
-Function103021: ; 103021
+Function103021:
 	call Function102dc3
 	ld de, String_10302e
 	hlcoord 1, 14
 	call PlaceString
 	ret
-; 10302e
 
-String_10302e: ; 10302e
+String_10302e:
 	db   "あいてが　ちゅうしを　えらんだので"
 	next "こうかんを　ちゅうし　します"
 	db   "@"
-; 10304f
 
-Function10304f: ; 10304f
+Function10304f:
 	xor a
 	ld [wAttrMapEnd], a
 	ld [wcf42], a
 	ld [wcf44], a
 	ld [wcf45], a
 	ret
-; 10305d
 
-Function10305d: ; 10305d
+Function10305d:
 	nop
 	ld a, [wAttrMapEnd]
 	and a
@@ -7137,9 +6714,8 @@ Function10305d: ; 10305d
 	call Function103094
 	call Function10306e
 	ret
-; 10306e
 
-Function10306e: ; 10306e
+Function10306e:
 	ld a, $01
 	ld [hOAMUpdate], a
 	call ClearSprites
@@ -7148,9 +6724,8 @@ Function10306e: ; 10306e
 	xor a
 	ld [hOAMUpdate], a
 	ret
-; 10307f
 
-Function10307f: ; 10307f
+Function10307f:
 	ld c, $02
 	ld hl, wcd4b
 	bit 7, [hl]
@@ -7166,9 +6741,8 @@ Function10307f: ; 10307f
 	xor a
 	ld [hl], a
 	ret
-; 103094
 
-Function103094: ; 103094
+Function103094:
 	ld hl, wcd4b
 	bit 7, [hl]
 	jr nz, .asm_1030c0
@@ -7205,9 +6779,8 @@ Function103094: ; 103094
 .asm_1030ca
 	ld [hl], $2c
 	ret
-; 1030cd
 
-Function1030cd: ; 1030cd
+Function1030cd:
 	ld a, [wcf44]
 	ld l, a
 	ld h, 0
@@ -7264,9 +6837,8 @@ Function1030cd: ; 1030cd
 	dec c
 	jr nz, .asm_1030de
 	ret
-; 103112
 
-Unknown_103112: ; 103112
+Unknown_103112:
 	db $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00
@@ -7312,9 +6884,8 @@ Unknown_103112: ; 103112
 	db $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00
 	db $00, $00, $00, $00, $00, $00, $00, $00
-; 10327a
 
-Unknown_10327a: ; 10327a
+Unknown_10327a:
 	db $00, $00, $00, $00
 	db $00, $00, $01, $00
 	db $00, $00, $02, $00
@@ -7350,15 +6921,12 @@ Palettes_1032e2:
 	RGB  0,  0,  0
 	RGB  0,  0,  0
 
-; 103302
-
-Function103302: ; 103302
+Function103302:
 	call Function103309
 	call Function103362
 	ret
-; 103309
 
-Function103309: ; 103309
+Function103309:
 	xor a
 	ld [hBGMapMode], a
 	ld hl, wBuffer1
@@ -7402,9 +6970,8 @@ Function103309: ; 103309
 	ld [wd1f0], a
 	call Function10339a
 	ret
-; 103362
 
-Function103362: ; 103362
+Function103362:
 .asm_103362
 	ld a, [wd1f0]
 	ld [wd1f1], a
@@ -7430,9 +6997,8 @@ Function103362: ; 103362
 .asm_103398
 	scf
 	ret
-; 10339a
 
-Function10339a: ; 10339a
+Function10339a:
 	ld a, [wd1f0]
 	ld [wd1f2], a
 	ld c, a
@@ -7445,9 +7011,8 @@ Function10339a: ; 10339a
 	ld a, [hl]
 	ld [wd1f3], a
 	ret
-; 1033af
 
-Function1033af: ; 1033af
+Function1033af:
 	call GetJoypad
 	ld a, [hJoyPressed]
 	bit D_LEFT_F, a
@@ -7518,18 +7083,16 @@ Function1033af: ; 1033af
 	xor e
 	ld [wBuffer1], a
 	ret
-; 10342c
 
-Function10342c: ; 10342c
+Function10342c:
 	ld a, [wd1f0]
 	ld [wd1f2], a
 	call Function103490
 	call Function10343c
 	call Function1034a7
 	ret
-; 10343c
 
-Function10343c: ; 10343c
+Function10343c:
 	ld a, [wd1f3]
 	cp $02
 	jr nz, .asm_103452
@@ -7565,17 +7128,15 @@ Function10343c: ; 10343c
 	ld bc, 11
 	call Function103487
 	ret
-; 103487
 
-Function103487: ; 103487
+Function103487:
 	push de
 	call Function1034f7
 	pop de
 	call PlaceString
 	ret
-; 103490
 
-Function103490: ; 103490
+Function103490:
 	hlcoord 0, 15
 	ld c, $14
 	ld b, $03
@@ -7585,9 +7146,8 @@ Function103490: ; 103490
 	hlcoord 1, 16
 	call PlaceString
 	ret
-; 1034a7
 
-Function1034a7: ; 1034a7
+Function1034a7:
 	ld a, [wd1f1]
 	ld [wd1f2], a
 	ld bc, 10
@@ -7597,9 +7157,8 @@ Function1034a7: ; 1034a7
 	call Function1034f1
 	ld [hl], $ed
 	ret
-; 1034be
 
-Function1034be: ; 1034be
+Function1034be:
 	ld a, $01
 	ld [wd1f2], a
 	ld hl, wd1ec
@@ -7621,9 +7180,8 @@ Function1034be: ; 1034be
 	jr nz, .asm_1034ca
 	call Function103490
 	ret
-; 1034e0
 
-Function1034e0: ; 1034e0
+Function1034e0:
 	push bc
 	push hl
 	call ClearBox
@@ -7634,13 +7192,12 @@ Function1034e0: ; 1034e0
 	ld a, $06
 	call FillBoxWithByte
 	ret
-; 1034f1
 
-Function1034f1: ; 1034f1
+Function1034f1:
 	ld a, [wd1f0]
 	ld [wd1f2], a
 
-Function1034f7: ; 10134f7
+Function1034f7:
 	hlcoord 0, 0
 	add hl, bc
 	ld a, [wd1ef]
@@ -7651,9 +7208,8 @@ Function1034f7: ; 10134f7
 	ld bc, 40
 	call AddNTimes
 	ret
-; 10350f
 
-Function10350f: ; 10350f
+Function10350f:
 	ld a, [wd1f3]
 	push bc
 	ld hl, Unknown_103522
@@ -7665,9 +7221,8 @@ Function10350f: ; 10350f
 	ld d, [hl]
 	ld e, a
 	ret
-; 103522
 
-Unknown_103522: ; 103522
+Unknown_103522:
 	dw String_103546
 	dw String_103598
 	dw String_1035a0
@@ -7702,9 +7257,8 @@ String_1035b1: db "すうじで　いれる@"
 String_1035ba: db "する@"
 String_1035bd: db "しない@"
 String_1035c1: db "けってい@"
-; 1035c6
 
-Function1035c6: ; 1035c6
+Function1035c6:
 	farcall Function10138b
 	ld b, 0
 	ld hl, Unknown_1035d7
@@ -7714,50 +7268,48 @@ Function1035c6: ; 1035c6
 	ld h, [hl]
 	ld l, a
 	ret
-; 1035d7
 
-Unknown_1035d7: ; 1035d7
+Unknown_1035d7:
 	dw Unknown_1035e7
 	dw Unknown_1035f3
 	dw Unknown_103608
 	dw Unknown_103608
 	dw Unknown_1035fe
-	dw Special_AskMobileOrCable
-	dw Special_AskMobileOrCable
-	dw Special_AskMobileOrCable
+	dw AskMobileOrCable
+	dw AskMobileOrCable
+	dw AskMobileOrCable
 
-Unknown_1035e7: ; 1035e7
+Unknown_1035e7:
 	dwcoord 0, 6
 	db $12, $07, $07
 	dw .this
 .this
 	db 4, 2, 1, 0, 3
 
-Unknown_1035f3: ; 1035f3
+Unknown_1035f3:
 	dwcoord 0, 7
 	db $12, $06, $09
 	dw .this
 .this
 	db 3, 2, 1, 3
 
-Unknown_1035fe: ; 1035fe
+Unknown_1035fe:
 	dwcoord 0, 9
 	db $12, $04, $0b
 	dw .this
 .this
 	db 2, 0, 3
 
-Unknown_103608: ; 103608
+Unknown_103608:
 	dwcoord 0, 9
 	db $12, $04, $0b
 	dw .this
 .this
 	db 2, 2, 3
-; 103612
 
-Special_AskMobileOrCable: ; 103612
-	ld hl, MenuDataHeader_103640
-	call LoadMenuDataHeader
+AskMobileOrCable:
+	ld hl, MenuHeader_103640
+	call LoadMenuHeader
 	ld a, [wMobileOrCable_LastSelection]
 	and $0f
 	jr z, .skip_load
@@ -7780,22 +7332,20 @@ Special_AskMobileOrCable: ; 103612
 	xor a
 	ld [wScriptVar], a
 	ret
-; 103640
 
-MenuDataHeader_103640: ; 103640
+MenuHeader_103640:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 6, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw MenuData2_103648
+	dw MenuData_103648
 	db 1 ; default option
 
-MenuData2_103648: ; 103648
+MenuData_103648:
 	db STATICMENU_CURSOR ; flags
 	db 2
 	db "モバイル@"
 	db "ケーブル@"
-; 103654
 
-Function103654: ; 103654
+Function103654:
 	farcall Mobile_AlwaysReturnNotCarry
 	bit 7, c
 	jr nz, .asm_103666
@@ -7809,9 +7359,8 @@ Function103654: ; 103654
 	set 5, [hl]
 	ld c, $01
 	ret
-; 10366e
 
-Special_Mobile_SelectThreeMons: ; 10366e
+Mobile_SelectThreeMons:
 	farcall Mobile_AlwaysReturnNotCarry
 	bit 7, c
 	jr z, .asm_10369b
@@ -7849,8 +7398,8 @@ Special_Mobile_SelectThreeMons: ; 10366e
 .asm_1036b5
 	call Function103700
 	jr c, .asm_1036f4
-	ld hl, MenuDataHeader_103747
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_103747
+	call LoadMenuHeader
 	call VerticalMenu
 	call ExitMenu
 	jr c, .asm_1036f4
@@ -7883,18 +7432,16 @@ Special_Mobile_SelectThreeMons: ; 10366e
 	xor a
 	ld [wScriptVar], a
 	ret
-; 1036f9
 
-Function1036f9: ; 1036f9
+Function1036f9:
 	ld hl, UnknownText_0x103767
 	call PrintText
 	ret
-; 103700
 
-Function103700: ; 103700
+Function103700:
 	ld c, $0a
 	ld hl, wSwarmFlags
-	bit 4, [hl]
+	bit SWARMFLAGS_MOBILE_4_F, [hl]
 	jr z, .asm_10370f
 	farcall Function1008a6
 
@@ -7934,75 +7481,65 @@ Function103700: ; 103700
 	call JoyWaitAorB
 	scf
 	ret
-; 103747
 
-MenuDataHeader_103747: ; 103747
+MenuHeader_103747:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw MenuData2_10374f
+	dw MenuData_10374f
 	db 1 ; default option
 
-MenuData2_10374f: ; 10374f
+MenuData_10374f:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 3
 	db "はい@"
 	db "やめる@"
 	db "せつめい@"
-; 10375d
 
-UnknownText_0x10375d: ; 0x10375d
+UnknownText_0x10375d:
 	text_jump UnknownText_0x1c422a
 	db "@"
-; 0x103762
-UnknownText_0x103762: ; 0x103762
+UnknownText_0x103762:
 	text_jump UnknownText_0x1c4275
 	db "@"
-; 0x103767
-UnknownText_0x103767: ; 0x103767
+UnknownText_0x103767:
 	text_jump UnknownText_0x1c4298
 	db "@"
-; 0x10376c
-UnknownText_0x10376c: ; 0x10376c
+UnknownText_0x10376c:
 	text_jump UnknownText_0x1c439c
 	db "@"
-; 0x103771
-UnknownText_0x103771: ; 0x103771
+UnknownText_0x103771:
 	text_jump UnknownText_0x1c43dc
 	db "@"
-; 0x103776
-UnknownText_0x103776: ; 0x103776
+UnknownText_0x103776:
 	text_jump UnknownText_0x1c4419
 	db "@"
-; 0x10377b
-UnknownText_0x10377b: ; 0x10377b
+UnknownText_0x10377b:
 	text_jump UnknownText_0x1c445a
 	db "@"
-; 0x103780
 
-Special_Function103780: ; 103780
+Function103780:
 	ld a, [wd265]
 	push af
 	call Function10378c
 	pop af
 	ld [wd265], a
 	ret
-; 10378c
 
-Function10378c: ; 10378c
+Function10378c:
 	ld c, 0
 	ld hl, wSwarmFlags
-	bit 4, [hl]
+	bit SWARMFLAGS_MOBILE_4_F, [hl]
 	jr nz, .already_set
-	ld c, $01
+	ld c, 1
 	ld hl, wSwarmFlags
-	set 4, [hl]
+	set SWARMFLAGS_MOBILE_4_F, [hl]
 
 .already_set
 	push bc
 	farcall Link_SaveGame
 	pop bc
 	jr c, .failed_to_save
-	ld a, $01
+	ld a, 1
 	ld [wScriptVar], a
 	ld a, c
 	and a
@@ -8017,11 +7554,10 @@ Function10378c: ; 10378c
 	and a
 	ret z
 	ld hl, wSwarmFlags
-	res 4, [hl]
+	res SWARMFLAGS_MOBILE_4_F, [hl]
 	ret
-; 1037c2
 
-Special_Function1037c2: ; 1037c2
+Function1037c2:
 	call Function103823
 	jr c, .nope
 	ld a, [wdc5f]
@@ -8040,14 +7576,12 @@ Special_Function1037c2: ; 1037c2
 	ld [wdc5f], a
 	ld [wScriptVar], a
 	ret
-; 1037e6
 
-UnknownText_0x1037e6: ; 0x1037e6
+UnknownText_0x1037e6:
 	text_jump UnknownText_0x1c449c
 	db "@"
-; 0x1037eb
 
-Special_Function1037eb: ; 1037eb
+Function1037eb:
 	call Function103823
 	jr nc, .asm_103807
 	ld hl, UnknownText_0x103819
@@ -8072,19 +7606,16 @@ Special_Function1037eb: ; 1037eb
 	ld a, $02
 	ld [wScriptVar], a
 	ret
-; 103819
 
-UnknownText_0x103819: ; 0x103819
+UnknownText_0x103819:
 	text_jump UnknownText_0x1c44c0
 	db "@"
-; 0x10381e
 
-UnknownText_0x10381e: ; 0x10381e
+UnknownText_0x10381e:
 	text_jump UnknownText_0x1c44e7
 	db "@"
-; 0x103823
 
-Function103823: ; 103823
+Function103823:
 	farcall Mobile_AlwaysReturnNotCarry
 	bit 7, c
 	jr nz, .asm_103838
@@ -8100,9 +7631,8 @@ Function103823: ; 103823
 .asm_10383a
 	scf
 	ret
-; 10383c
 
-Special_Function10383c: ; 10383c
+Function10383c:
 	ld a, $01
 	ld [wdc60], a
 	xor a
@@ -8128,14 +7658,12 @@ Special_Function10383c: ; 10383c
 	ld a, $01
 	ld [wScriptVar], a
 	ret
-; 103876
 
-UnknownText_0x103876: ; 0x103876
+UnknownText_0x103876:
 	text_jump UnknownText_0x1c4508
 	db "@"
-; 0x10387b
 
-Special_Function10387b: ; 10387b
+Function10387b:
 	farcall Mobile_AlwaysReturnNotCarry
 	bit 7, c
 	ret nz
@@ -8146,9 +7674,7 @@ Special_Function10387b: ; 10387b
 	call PrintText
 	call JoyWaitAorB
 	ret
-; 103898
 
-UnknownText_0x103898: ; 0x103898
+UnknownText_0x103898:
 	text_jump UnknownText_0x1c4525
 	db "@"
-; 0x10389d
diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm
index e66618ef4..087467710 100755..100644
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -2,7 +2,7 @@
 ; which were used for Trainer Rankings in Pokémon News.
 
 ; Copies certain values at the time the player enters the Hall of Fame.
-StubbedTrainerRankings_HallOfFame2:: ; 0x105ef6
+StubbedTrainerRankings_HallOfFame2::
 	ret
 	ld a, BANK(sTrainerRankingGameTimeHOF)
 	call GetSRAMBank
@@ -32,9 +32,8 @@ StubbedTrainerRankings_HallOfFame2:: ; 0x105ef6
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 105f33
 
-StubbedTrainerRankings_MagikarpLength: ; 105f33
+StubbedTrainerRankings_MagikarpLength:
 	ret
 	ld a, BANK(sTrainerRankingLongestMagikarp)
 	call GetSRAMBank
@@ -101,9 +100,8 @@ StubbedTrainerRankings_MagikarpLength: ; 105f33
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 105f79
 
-StubbedTrainerRankings_BugContestScore: ; 105f79
+StubbedTrainerRankings_BugContestScore:
 	ret
 	ld a, BANK(sTrainerRankingBugContestScore)
 	call GetSRAMBank
@@ -131,9 +129,8 @@ StubbedTrainerRankings_BugContestScore: ; 105f79
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 105f9f
 
-StubbedTrainerRankings_AddToSlotsWinStreak: ; 105f9f
+StubbedTrainerRankings_AddToSlotsWinStreak:
 	ret
 	ld a, BANK(sTrainerRankingCurrentSlotsStreak)
 	call GetSRAMBank
@@ -172,9 +169,8 @@ StubbedTrainerRankings_AddToSlotsWinStreak: ; 105f9f
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 105fd0
 
-StubbedTrainerRankings_EndSlotsWinStreak: ; 105fd0
+StubbedTrainerRankings_EndSlotsWinStreak:
 	ret
 	ld a, BANK(sTrainerRankingCurrentSlotsStreak)
 	call GetSRAMBank
@@ -185,9 +181,8 @@ StubbedTrainerRankings_EndSlotsWinStreak: ; 105fd0
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 105fe3
 
-StubbedTrainerRankings_AddToSlotsPayouts: ; 105fe3
+StubbedTrainerRankings_AddToSlotsPayouts:
 	ret
 	ld a, BANK(sTrainerRankingTotalSlotsPayouts)
 	call GetSRAMBank
@@ -214,9 +209,8 @@ StubbedTrainerRankings_AddToSlotsPayouts: ; 105fe3
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 106008
 
-StubbedTrainerRankings_AddToBattlePayouts: ; 106008
+StubbedTrainerRankings_AddToBattlePayouts:
 	ret
 	ld a, BANK(sTrainerRankingTotalBattlePayouts)
 	call GetSRAMBank
@@ -245,14 +239,13 @@ StubbedTrainerRankings_AddToBattlePayouts: ; 106008
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 10602e
 
-StubbedTrainerRankings_StepCount: ; 10602e (41:602e)
+StubbedTrainerRankings_StepCount:
 	ret
 	ld hl, sTrainerRankingStepCount
 	jp StubbedTrainerRankings_Increment4Byte
 
-Unreferenced_StubbedTrainerRankings_BattleTowerWins: ; 106035
+Unreferenced_StubbedTrainerRankings_BattleTowerWins:
 	ret
 	ld a, $5
 	call GetSRAMBank
@@ -263,12 +256,12 @@ Unreferenced_StubbedTrainerRankings_BattleTowerWins: ; 106035
 	ld hl, sTrainerRankingBattleTowerWins
 	jp StubbedTrainerRankings_Increment2Byte
 
-StubbedTrainerRankings_TMsHMsTaught: ; 106049
+StubbedTrainerRankings_TMsHMsTaught:
 	ret
 	ld hl, sTrainerRankingTMsHMsTaught
 	jp StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_Battles: ; 106050
+StubbedTrainerRankings_Battles:
 	ret
 	ld a, [wBattleType]
 	cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
@@ -276,7 +269,7 @@ StubbedTrainerRankings_Battles: ; 106050
 	ld hl, sTrainerRankingBattles
 	jp StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_WildBattles: ; 10605d
+StubbedTrainerRankings_WildBattles:
 	ret
 	ld a, [wBattleType]
 	cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
@@ -284,102 +277,102 @@ StubbedTrainerRankings_WildBattles: ; 10605d
 	ld hl, sTrainerRankingWildBattles
 	jp StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_TrainerBattles: ; 10606a
+StubbedTrainerRankings_TrainerBattles:
 	ret
 	ld hl, sTrainerRankingTrainerBattles
 	jp StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_Unused1: ; 106071
+StubbedTrainerRankings_Unused1:
 	ret
 	ld hl, sTrainerRankingUnused1
 	jp StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_HallOfFame:: ; 0x106078
+StubbedTrainerRankings_HallOfFame::
 	ret
 	ld hl, sTrainerRankingHOFEntries
 	jp StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_WildMonsCaught: ; 10607f (41:607f)
+StubbedTrainerRankings_WildMonsCaught:
 	ret
 	ld hl, sTrainerRankingWildMonsCaught
 	jp StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_HookedEncounters: ; 106086
+StubbedTrainerRankings_HookedEncounters:
 	ret
 	ld hl, sTrainerRankingHookedEncounters
 	jp StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_EggsHatched: ; 10608d (41:608d)
+StubbedTrainerRankings_EggsHatched:
 	ret
 	ld hl, sTrainerRankingEggsHatched
 	jp StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_MonsEvolved: ; 106094
+StubbedTrainerRankings_MonsEvolved:
 	ret
 	ld hl, sTrainerRankingMonsEvolved
 	jp StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_FruitPicked: ; 10609b
+StubbedTrainerRankings_FruitPicked:
 	ret
 	ld hl, sTrainerRankingFruitPicked
 	jp StubbedTrainerRankings_Increment3Byte
 
-Special_StubbedTrainerRankings_Healings: ; 1060a2
+StubbedTrainerRankings_Healings:
 	ret
 	ld hl, sTrainerRankingHealings
 	jp StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_MysteryGift: ; 1060a9 (41:60a9)
+StubbedTrainerRankings_MysteryGift:
 	ret
 	ld hl, sTrainerRankingMysteryGift
 	jr StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_Trades: ; 1060af
+StubbedTrainerRankings_Trades:
 	ret
 	ld hl, sTrainerRankingTrades
 	jr StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_Fly: ; 1060b5
+StubbedTrainerRankings_Fly:
 	ret
 	ld hl, sTrainerRankingFly
 	jr StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_Surf: ; 1060bb
+StubbedTrainerRankings_Surf:
 	ret
 	ld hl, sTrainerRankingSurf
 	jr StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_Waterfall: ; 1060c1
+StubbedTrainerRankings_Waterfall:
 	ret
 	ld hl, sTrainerRankingWaterfall
 	jr StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_WhiteOuts: ; 1060c7
+StubbedTrainerRankings_WhiteOuts:
 	ret
 	ld hl, sTrainerRankingWhiteOuts
 	jr StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_LuckyNumberShow: ; 1060cd
+StubbedTrainerRankings_LuckyNumberShow:
 	ret
 	ld hl, sTrainerRankingLuckyNumberShow
 	jr StubbedTrainerRankings_Increment2Byte
 
-StubbedTrainerRankings_PhoneCalls: ; 1060d3
+StubbedTrainerRankings_PhoneCalls:
 	ret
 	ld hl, sTrainerRankingPhoneCalls
 	jr StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_Unused2: ; 1060df
+StubbedTrainerRankings_Unused2:
 	ret
 	ld hl, sTrainerRankingUnused2
 	jr StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_LinkBattles: ; 1060df
+StubbedTrainerRankings_LinkBattles:
 	ret
 	ld hl, sTrainerRankingLinkBattles
 	jr StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_Splash: ; 1060e5
+StubbedTrainerRankings_Splash:
 	ret
 	; Only counts if it’s the player’s turn
 	ld a, [hBattleTurn]
@@ -388,12 +381,12 @@ StubbedTrainerRankings_Splash: ; 1060e5
 	ld hl, sTrainerRankingSplash
 	jr StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_TreeEncounters: ; 1060ef
+StubbedTrainerRankings_TreeEncounters:
 	ret
 	ld hl, sTrainerRankingTreeEncounters
 	jr StubbedTrainerRankings_Increment3Byte
 
-StubbedTrainerRankings_Unused3: ; 1060f5
+StubbedTrainerRankings_Unused3:
 	ret
 	ld hl, sTrainerRankingUnused3
 	jr StubbedTrainerRankings_Increment3Byte
@@ -407,16 +400,14 @@ StubbedTrainerRankings_ColosseumLosses: ; lose
 	ret
 	ld hl, sTrainerRankingColosseumLosses
 	jr StubbedTrainerRankings_Increment3Byte
-; 106107
 
 StubbedTrainerRankings_ColosseumDraws: ; draw
 	ret
 	ld hl, sTrainerRankingColosseumDraws
 	jr StubbedTrainerRankings_Increment3Byte
-; 10610d
 
 ; Counts uses of both Selfdestruct and Explosion.
-StubbedTrainerRankings_Selfdestruct: ; 10610d
+StubbedTrainerRankings_Selfdestruct:
 	ret
 	; Only counts if it’s the player’s turn
 	ld a, [hBattleTurn]
@@ -424,33 +415,29 @@ StubbedTrainerRankings_Selfdestruct: ; 10610d
 	ret nz
 	ld hl, sTrainerRankingSelfdestruct
 	jr StubbedTrainerRankings_Increment3Byte
-; 106117
 
-StubbedTrainerRankings_Increment4Byte: ; 106117
+StubbedTrainerRankings_Increment4Byte:
 	push bc
 	ld bc, 3
 	jr StubbedTrainerRankings_Increment
-; 10611d
 
-StubbedTrainerRankings_Increment3Byte: ; 10611d
+StubbedTrainerRankings_Increment3Byte:
 	push bc
 	ld bc, 2
 	jr StubbedTrainerRankings_Increment
-; 106123
 
-StubbedTrainerRankings_Increment2Byte: ; 106123
+StubbedTrainerRankings_Increment2Byte:
 	push bc
 	ld bc, 1
 	jr StubbedTrainerRankings_Increment
-; 106129
 
 ; unused
-StubbedTrainerRankings_Increment1Byte: ; 106129
+StubbedTrainerRankings_Increment1Byte:
 	push bc
 	ld bc, 0
 
 ; Increments a big-endian value of bc + 1 bytes at hl
-StubbedTrainerRankings_Increment: ; 10612d
+StubbedTrainerRankings_Increment:
 	ld a, BANK(sTrainerRankings)
 	call GetSRAMBank
 	push hl
@@ -484,19 +471,17 @@ StubbedTrainerRankings_Increment: ; 10612d
 	call CloseSRAM
 	pop bc
 	ret
-; 106155
 
 ; Used when SRAM bank 5 isn’t already loaded — what’s the point of this?
-UpdateTrainerRankingsChecksum2: ; 106155
+UpdateTrainerRankingsChecksum2:
 	ret
 	ld a, BANK(sTrainerRankings)
 	call GetSRAMBank
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 106162
 
-UpdateTrainerRankingsChecksum: ; 106162
+UpdateTrainerRankingsChecksum:
 	push de
 	call CalculateTrainerRankingsChecksum
 	ld hl, sTrainerRankingsChecksum
@@ -505,9 +490,8 @@ UpdateTrainerRankingsChecksum: ; 106162
 	ld [hl], e
 	pop de
 	ret
-; 10616e
 
-CalculateTrainerRankingsChecksum: ; 10616e
+CalculateTrainerRankingsChecksum:
 	push bc
 	ld hl, sTrainerRankings
 	ld bc, sTrainerRankingsChecksum - sTrainerRankings
@@ -528,10 +512,8 @@ CalculateTrainerRankingsChecksum: ; 10616e
 	jr nz, .asm_106179
 	pop bc
 	ret
-; 106187
 
-
-BackupMobileEventIndex: ; 106187
+BackupMobileEventIndex:
 	ld a, BANK(sMobileEventIndex)
 	call GetSRAMBank
 	ld a, [sMobileEventIndex]
@@ -542,10 +524,8 @@ BackupMobileEventIndex: ; 106187
 	ld [sMobileEventIndexBackup], a
 	call CloseSRAM
 	ret
-; 10619d
-
 
-RestoreMobileEventIndex: ; 10619d (41:619d)
+RestoreMobileEventIndex:
 	ld a, BANK(sMobileEventIndexBackup)
 	call GetSRAMBank
 	ld a, [sMobileEventIndexBackup]
@@ -556,9 +536,8 @@ RestoreMobileEventIndex: ; 10619d (41:619d)
 	ld [sMobileEventIndex], a
 	call CloseSRAM
 	ret
-; 1061b3 (41:61b3)
 
-Unreferenced_VerifyTrainerRankingsChecksum: ; 1061b3
+Unreferenced_VerifyTrainerRankingsChecksum:
 	call CalculateTrainerRankingsChecksum
 	ld hl, sTrainerRankingsChecksum
 	ld a, d
@@ -568,16 +547,14 @@ Unreferenced_VerifyTrainerRankingsChecksum: ; 1061b3
 	ld a, e
 	cp [hl]
 	ret
-; 1061c0
 
-DeleteMobileEventIndex: ; 1061c0 (41:61c0)
+DeleteMobileEventIndex:
 	ld a, BANK(sMobileEventIndex)
 	call GetSRAMBank
 	xor a
 	ld [sMobileEventIndex], a
 	call CloseSRAM
 	ret
-; 1061cd (41:61cd)
 
 ; Used in the Japanese version to initialize Trainer Rankings data
 ; for a new save file. Unreferenced in the English version.
@@ -599,10 +576,8 @@ InitializeTrainerRankings:
 	ld bc, sTrainerRankingsEnd - sTrainerRankings
 	call CopyBytes
 	ret
-; 1061ef
-
 
-_MobilePrintNum:: ; 1061ef
+_MobilePrintNum::
 ; Supports signed 31-bit integers (up to 10 digits)
 ; b: Bits 0-4 = # bytes
 ;    Bit 7 = set if negative
@@ -723,7 +698,6 @@ endr
 	pop de
 	pop bc
 	ret
-; 106292
 
 ._9	dd 1000000000
 ._8	dd 100000000
@@ -733,9 +707,8 @@ endr
 ._4	dd 10000
 ._3	dd 1000
 ._2	dd 100
-; 1062b2
 
-.Function1062b2: ; 1062b2
+.Function1062b2:
 	ld c, $0
 .asm_1062b4
 	ld a, [de]
@@ -793,9 +766,8 @@ endr
 
 	ld [hl], -10
 	ret
-; 1062ff
 
-.Function1062ff: ; 1062ff
+.Function1062ff:
 	ld a, [hPrintNum10]
 	bit 7, a
 	jr nz, .asm_10630d
@@ -808,17 +780,15 @@ endr
 .asm_10630d
 	inc hl
 	ret
-; 10630f
 
 ; functions related to the cable club and various NPC scripts referencing communications
 
-Special_Mobile_DummyReturnFalse: ; 10630f
+Mobile_DummyReturnFalse:
 	xor a
 	ld [wScriptVar], a
 	ret
-; 106314
 
-Stubbed_Function106314: ; 106314
+Stubbed_Function106314:
 	ret
 	ld a, $4
 	call GetSRAMBank
@@ -832,13 +802,13 @@ Stubbed_Function106314: ; 106314
 	ld [$a800], a
 	call CloseSRAM
 	ret
-; 10632f
 
-Mobile_AlwaysReturnNotCarry: ; 10632f
+Mobile_AlwaysReturnNotCarry:
 	or a
 	ret
 
-Function106331: ; 106331 - called by Special_Mobile_DummyReturnFalse in Crystal-J
+Function106331:
+; called by Mobile_DummyReturnFalse in Crystal-J
 	; check ~[4:b000] == [7:a800]
 	ld a, $4
 	call GetSRAMBank
@@ -872,9 +842,8 @@ Function106331: ; 106331 - called by Special_Mobile_DummyReturnFalse in Crystal-
 	xor a
 	ld c, a
 	ret
-; 10635c
 
-Function10635c: ; 10635c
+Function10635c:
 	ld a, [wMobileCommsJumptableIndex]
 	bit 7, a
 	ret nz
@@ -882,9 +851,8 @@ Function10635c: ; 10635c
 	ld hl, .Jumptable
 	rst JumpTable
 	ret
-; 10636a
 
-.Jumptable: ; 10636a
+.Jumptable:
 	dw .init
 	dw Function106392
 	dw Function1063cc
@@ -894,9 +862,8 @@ Function10635c: ; 10635c
 	dw Function106403
 	dw Function106442
 	dw Function106453
-; 10637c
 
-.init: ; 10637c
+.init:
 	ld de, wcd30
 	ld hl, $41
 	ld bc, $41
@@ -906,9 +873,8 @@ Function10635c: ; 10635c
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 106392
 
-Function106392: ; 106392
+Function106392:
 	xor a
 	ld [wcf64], a
 	ld a, [wc821]
@@ -943,16 +909,15 @@ Function106392: ; 106392
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1063cc
 
-Function1063cc: ; 1063cc
+Function1063cc:
 	ld a, $78
 	ld [wcd42], a
 	ld a, [wMobileCommsJumptableIndex]
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 
-Function1063d8: ; 1063d8
+Function1063d8:
 	ld hl, wcd42
 	dec [hl]
 	ret nz
@@ -960,9 +925,8 @@ Function1063d8: ; 1063d8
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1063e5
 
-Function1063e5: ; 1063e5
+Function1063e5:
 	ld a, [wcf64]
 	cp $3
 	ret nz
@@ -970,9 +934,8 @@ Function1063e5: ; 1063e5
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1063f3
 
-Function1063f3: ; 1063f3
+Function1063f3:
 	ld de, wcd31
 	ld a, $32
 	call Function3e32
@@ -980,9 +943,8 @@ Function1063f3: ; 1063f3
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 106403
 
-Function106403: ; 106403
+Function106403:
 	ld a, [wc821]
 	bit 1, a
 	jr nz, .asm_106426
@@ -1021,9 +983,8 @@ Function106403: ; 106403
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 106442
 
-Function106442: ; 106442
+Function106442:
 	ld a, $36
 	call Function3e32
 	xor a
@@ -1033,7 +994,7 @@ Function106442: ; 106442
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 
-Function106453: ; 106453
+Function106453:
 	ld a, [wMobileCommsJumptableIndex]
 	set 7, a
 	ld [wMobileCommsJumptableIndex], a
@@ -1041,14 +1002,12 @@ Function106453: ; 106453
 	ld a, $4
 	ld [wcf64], a
 	ret
-; 106462
 
 Stubbed_Function106462:
 	ret
 	ret
-; 106464
 
-Function106464:: ; 106464
+Function106464::
 	ld de, FontsExtra_SolidBlackGFX
 	ld hl, vTiles2 tile "■" ; $60
 	lb bc, BANK(FontsExtra_SolidBlackGFX), 1
@@ -1068,9 +1027,8 @@ Function106464:: ; 106464
 	call Get2bpp
 	farcall LoadFrame
 	ret
-; 10649b
 
-Function10649b: ; 10649b
+Function10649b:
 	ld a, [wTextBoxFrame]
 	maskbits NUM_FRAMES
 	ld bc, 6 * LEN_1BPP_TILE
@@ -1088,9 +1046,8 @@ Function10649b: ; 10649b
 	ld b, BANK(TextBoxSpaceGFX)
 	call Function1064c3
 	ret
-; 1064c3
 
-Function1064c3: ; 1064c3
+Function1064c3:
 	ld a, [rSVBK]
 	push af
 	ld a, $6
@@ -1106,7 +1063,7 @@ Function1064c3: ; 1064c3
 	ld [rSVBK], a
 	jr asm_1064ed
 
-Function1064d8: ; 1064d8
+Function1064d8:
 	ld a, [rSVBK]
 	push af
 	ld a, $6
@@ -1139,14 +1096,12 @@ asm_1064ed
 	pop af
 	ld [rSVBK], a
 	ret
-; 10650a
 
-Function10650a: ; 10650a
+Function10650a:
 	ld de, MobilePhoneTilesGFX
 	lb bc, BANK(MobilePhoneTilesGFX), 17
 	call Get2bpp
 	ret
-; 106514
 
 GFX_106514:
 INCBIN "gfx/unknown/106514.2bpp"
diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm
index eeedffb5a..3f53146bb 100644
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -1,9 +1,8 @@
-MobileTradeAnimation_SendGivemonToGTS: ; 108000
+MobileTradeAnimation_SendGivemonToGTS:
 	ld a, $80
 	ld [wcf65], a
 	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_NoFrontpics
-; 10800b
 
 .TradeAnimScript:
 	mobiletradeanim_showgtsgivemon
@@ -18,13 +17,12 @@ MobileTradeAnimation_RetrieveGivemonFromGTS:
 	ld a, $80
 	jr asm_108018
 
-MobileTradeAnimation_ReceiveGetmonFromGTS: ; 108016
+MobileTradeAnimation_ReceiveGetmonFromGTS:
 	ld a, $0
 asm_108018:
 	ld [wcf65], a
 	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_NoFrontpics
-; 108021
 
 .TradeAnimScript:
 	mobiletradeanim_11
@@ -33,18 +31,17 @@ asm_108018:
 	mobiletradeanim_showgtsgetmon
 	mobiletradeanim_end
 
-Function108026: ; 108026
+Function108026:
 	ld a, $0
 	jr asm_10802c
 
-Function10802a: ; 10802a
+Function10802a:
 	ld a, $1
 
 asm_10802c:
 	ld [wcf65], a
 	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_Frontpics
-; 108035
 
 .TradeAnimScript: ; trade
 	mobiletradeanim_showgivemon
@@ -56,12 +53,11 @@ asm_10802c:
 	mobiletradeanim_showgetmon
 	mobiletradeanim_end
 
-Function10803d: ; 10803d
+Function10803d:
 	ld a, $0
 	ld [wcf65], a
 	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_NoFrontpics
-; 108048
 
 .TradeAnimScript:
 	mobiletradeanim_11
@@ -70,19 +66,18 @@ Function10803d: ; 10803d
 	mobiletradeanim_showoddegg
 	mobiletradeanim_end
 
-Function10804d: ; 10804d
+Function10804d:
 	ld a, $0
 	ld [wcf65], a
 	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_NoFrontpics
-; 108058
 
 .TradeAnimScript:
 	mobiletradeanim_11
 	mobiletradeanim_showgtsgetmon
 	mobiletradeanim_end
 
-RunMobileTradeAnim_Frontpics: ; 10805b
+RunMobileTradeAnim_Frontpics:
 	ld hl, wTradeAnimAddress
 	ld [hl], e
 	inc hl
@@ -110,9 +105,8 @@ RunMobileTradeAnim_Frontpics: ; 10805b
 	pop af
 	ld [hMapAnims], a
 	ret
-; 108089
 
-RunMobileTradeAnim_NoFrontpics: ; 108089
+RunMobileTradeAnim_NoFrontpics:
 	ld hl, wTradeAnimAddress
 	ld [hl], e
 	inc hl
@@ -140,9 +134,8 @@ RunMobileTradeAnim_NoFrontpics: ; 108089
 	pop af
 	ld [hMapAnims], a
 	ret
-; 1080b7
 
-Function1080b7: ; 1080b7
+Function1080b7:
 	xor a
 	ld [wJumptableIndex], a
 	call ClearBGPalettes
@@ -216,9 +209,8 @@ Function1080b7: ; 1080b7
 	call Function108b98
 	call Function108af4
 	ret
-; 108157
 
-Function108157: ; 108157
+Function108157:
 	xor a
 	ld [wJumptableIndex], a
 	call ClearBGPalettes
@@ -253,9 +245,8 @@ Function108157: ; 108157
 	call Function108b98
 	call Function108af4
 	ret
-; 1081ad
 
-MobileTradeAnim_ClearTiles: ; 1081ad
+MobileTradeAnim_ClearTiles:
 	ld a, $1
 	ld [rVBK], a
 	ld hl, vTiles0
@@ -269,9 +260,8 @@ MobileTradeAnim_ClearTiles: ; 1081ad
 	xor a
 	call ByteFill
 	ret
-; 1081ca
 
-MobileTradeAnim_ClearBGMap: ; 1081ca
+MobileTradeAnim_ClearBGMap:
 	ld a, $1
 	ld [rVBK], a
 	hlbgcoord 0, 0
@@ -285,9 +275,8 @@ MobileTradeAnim_ClearBGMap: ; 1081ca
 	ld a, $7f
 	call ByteFill
 	ret
-; 1081e9
 
-MobileTradeAnim_GetFrontpic: ; 1081e9
+MobileTradeAnim_GetFrontpic:
 	push de
 	push af
 	predef GetUnownLetter
@@ -298,9 +287,8 @@ MobileTradeAnim_GetFrontpic: ; 1081e9
 	pop de
 	predef GetMonFrontpic
 	ret
-; 108201
 
-Function108201: ; 108201
+Function108201:
 	push de
 	push af
 	predef GetUnownLetter
@@ -311,27 +299,24 @@ Function108201: ; 108201
 	pop de
 	predef GetAnimatedFrontpic
 	ret
-; 108219
 
-Function108219: ; 108219
+Function108219:
 	ld [wCurPartySpecies], a
 	hlcoord 7, 2
 	ld d, $0
 	ld e, ANIM_MON_TRADE
 	predef AnimateFrontpic
 	ret
-; 108229
 
-Function108229: ; 108229
+Function108229:
 	ld [wCurPartySpecies], a
 	hlcoord 7, 2
 	ld d, $0
 	ld e, ANIM_MON_TRADE
 	predef LoadMonAnimation
 	ret
-; 108239
 
-MobileTradeAnim_InitSpeciesName: ; 108239
+MobileTradeAnim_InitSpeciesName:
 	push de
 	ld [wd265], a
 	call GetPokemonName
@@ -340,9 +325,8 @@ MobileTradeAnim_InitSpeciesName: ; 108239
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 	ret
-; 10824b
 
-MobileTradeAnim_JumptableLoop: ; 10824b
+MobileTradeAnim_JumptableLoop:
 	ld a, [wJumptableIndex]
 	bit 7, a
 	jr nz, .StopAnim
@@ -365,9 +349,8 @@ MobileTradeAnim_JumptableLoop: ; 10824b
 	farcall Function106464
 	scf
 	ret
-; 10827b
 
-.ExecuteMobileTradeAnimCommand: ; 10827b
+.ExecuteMobileTradeAnimCommand:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -378,9 +361,8 @@ MobileTradeAnim_JumptableLoop: ; 10824b
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 10828a
 
-.Jumptable: ; 10828a
+.Jumptable:
 	dw GetMobileTradeAnimByte ; 00
 	dw MobileTradeAnim_ShowPlayerMonToBeSent ; 01
 	dw MobileTradeAnim_02 ; 02
@@ -401,15 +383,13 @@ MobileTradeAnim_JumptableLoop: ; 10824b
 	dw MobileTradeAnim_11 ; 11
 	dw MobileTradeAnim_FadeToBlack ; 12
 	dw MobileTradeAnim_GetOddEgg ; 13 get odd egg
-; 1082b2
 
-MobileTradeAnim_Next: ; 1082b2
+MobileTradeAnim_Next:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
-; 1082b7
 
-GetMobileTradeAnimByte: ; 1082b7
+GetMobileTradeAnimByte:
 	ld hl, wTradeAnimAddress
 	ld e, [hl]
 	inc hl
@@ -421,15 +401,13 @@ GetMobileTradeAnimByte: ; 1082b7
 	dec hl
 	ld [hl], e
 	ret
-; 1082c6
 
-EndMobileTradeAnim: ; 1082c6
+EndMobileTradeAnim:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
-; 1082cc
 
-WaitMobileTradeSpriteAnims: ; 1082cc
+WaitMobileTradeSpriteAnims:
 .loop
 	push bc
 	farcall PlaySpriteAnimations
@@ -438,27 +416,24 @@ WaitMobileTradeSpriteAnims: ; 1082cc
 	dec c
 	jr nz, .loop
 	ret
-; 1082db
 
-Function1082db: ; 1082db
+Function1082db:
 .loop
 	farcall PlaySpriteAnimations
 	farcall SetUpPokeAnim
 	farcall HDMATransferTileMapToWRAMBank3
 	jr nc, .loop
 	ret
-; 1082f0
 
-Function1082f0: ; 1082f0
+Function1082f0:
 .loop
 	call Function108b78
 	call DelayFrame
 	dec c
 	jr nz, .loop
 	ret
-; 1082fa
 
-Function1082fa: ; 1082fa
+Function1082fa:
 .loop
 	call Function108b78
 	push hl
@@ -470,9 +445,8 @@ Function1082fa: ; 1082fa
 	dec c
 	jr nz, .loop
 	ret
-; 10830e
 
-MobileTradeAnim_ShowPlayerMonToBeSent: ; 10830e
+MobileTradeAnim_ShowPlayerMonToBeSent:
 	ld de, MUSIC_EVOLUTION
 	call PlayMusic2
 	ld a, $80
@@ -537,9 +511,8 @@ MobileTradeAnim_ShowPlayerMonToBeSent: ; 10830e
 	call WaitMobileTradeSpriteAnims
 	call GetMobileTradeAnimByte
 	ret
-; 10839b
 
-MobileTradeAnim_ShowOTMonFromTrade: ; 10839b
+MobileTradeAnim_ShowOTMonFromTrade:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -595,9 +568,8 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b
 	call Function108c16
 	call GetMobileTradeAnimByte
 	ret
-; 10842c
 
-MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
+MobileTradeAnim_ShowPlayerMonForGTS:
 	ld de, MUSIC_EVOLUTION
 	call PlayMusic2
 	ld a, $80
@@ -672,9 +644,8 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
 	call WaitMobileTradeSpriteAnims
 	call GetMobileTradeAnimByte
 	ret
-; 1084d7
 
-MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7
+MobileTradeAnim_ShowOTMonFromGTS:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -741,9 +712,8 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7
 	call Function108c40
 	call GetMobileTradeAnimByte
 	ret
-; 108589
 
-MobileTradeAnim_GetOddEgg: ; 108589
+MobileTradeAnim_GetOddEgg:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -809,9 +779,8 @@ MobileTradeAnim_GetOddEgg: ; 108589
 	call Function1082db
 	call GetMobileTradeAnimByte
 	ret
-; 108638
 
-MobileTradeAnim_02: ; 108638
+MobileTradeAnim_02:
 	farcall DeinitializeAllSprites
 	call ClearBGPalettes
 	call ClearSprites
@@ -845,9 +814,8 @@ MobileTradeAnim_02: ; 108638
 	call Function108af4
 	call GetMobileTradeAnimByte
 	ret
-; 108689
 
-MobileTradeAnim_10: ; 108689
+MobileTradeAnim_10:
 	farcall DeinitializeAllSprites
 	call ClearBGPalettes
 	call ClearSprites
@@ -891,9 +859,8 @@ MobileTradeAnim_10: ; 108689
 	call Function108af4
 	call GetMobileTradeAnimByte
 	ret
-; 1086f4
 
-MobileTradeAnim_11: ; 1086f4
+MobileTradeAnim_11:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -940,9 +907,8 @@ MobileTradeAnim_11: ; 1086f4
 	call PlayMusic2
 	call GetMobileTradeAnimByte
 	ret
-; 108763
 
-MobileTradeAnim_GiveTrademon1: ; 108763
+MobileTradeAnim_GiveTrademon1:
 	ld de, SFX_GIVE_TRADEMON
 	call PlaySFX
 	ld c, 40
@@ -1006,9 +972,8 @@ MobileTradeAnim_GiveTrademon1: ; 108763
 .done
 	call MobileTradeAnim_Next
 	ret
-; 1087cf
 
-MobileTradeAnim_GiveTrademon2: ; 1087cf
+MobileTradeAnim_GiveTrademon2:
 	ld c, 40
 	ld hl, wBGPals2 + 1 palettes
 	call Function1082f0
@@ -1039,9 +1004,8 @@ MobileTradeAnim_GiveTrademon2: ; 1087cf
 .done
 	call GetMobileTradeAnimByte
 	ret
-; 108811
 
-MobileTradeAnim_05: ; 108811
+MobileTradeAnim_05:
 	ld c, 40
 	call WaitMobileTradeSpriteAnims
 	ld a, $1
@@ -1057,9 +1021,8 @@ MobileTradeAnim_05: ; 108811
 	ld de, SFX_THROW_BALL
 	call PlaySFX
 	ret
-; 108838
 
-MobileTradeAnim_06: ; 108838
+MobileTradeAnim_06:
 	ld c, 40
 	call WaitMobileTradeSpriteAnims
 	ld a, $1
@@ -1068,9 +1031,8 @@ MobileTradeAnim_06: ; 108838
 	call PlaySFX
 	call GetMobileTradeAnimByte
 	ret
-; 10884c
 
-MobileTradeAnim_07: ; 10884c
+MobileTradeAnim_07:
 	ld c, 80
 	call DelayFrames
 	depixel 30, 10, 2, 0
@@ -1080,9 +1042,8 @@ MobileTradeAnim_07: ; 10884c
 	ld de, SFX_THROW_BALL
 	call PlaySFX
 	ret
-; 108863
 
-MobileTradeAnim_GetTrademon1: ; 108863
+MobileTradeAnim_GetTrademon1:
 	ld c, 40
 	call WaitMobileTradeSpriteAnims
 .loop
@@ -1105,9 +1066,8 @@ MobileTradeAnim_GetTrademon1: ; 108863
 	call Function108af4
 	call MobileTradeAnim_Next
 	ret
-; 108894
 
-MobileTradeAnim_GetTrademon2: ; 108894
+MobileTradeAnim_GetTrademon2:
 	ld c, 20
 	ld hl, wBGPals2 + 1 palettes
 	call Function1082fa
@@ -1174,18 +1134,16 @@ MobileTradeAnim_GetTrademon2: ; 108894
 .asm_108906
 	call MobileTradeAnim_Next
 	ret
-; 10890a
 
-MobileTradeAnim_GetTrademon3: ; 10890a
+MobileTradeAnim_GetTrademon3:
 	ld c, 40
 	ld hl, wBGPals2 palette 6
 	call Function1082f0
 	call Function108af4
 	call GetMobileTradeAnimByte
 	ret
-; 108919
 
-MobileTradeAnim_0f: ; 108919
+MobileTradeAnim_0f:
 	ld c, 40
 	call WaitMobileTradeSpriteAnims
 	farcall DeinitializeAllSprites
@@ -1198,9 +1156,8 @@ MobileTradeAnim_0f: ; 108919
 	call EnableLCD
 	call GetMobileTradeAnimByte
 	ret
-; 10893d
 
-MobileTradeAnim_FadeToBlack: ; 10893d
+MobileTradeAnim_FadeToBlack:
 .loop
 	ld a, [rBGP]
 	and a
@@ -1219,9 +1176,8 @@ MobileTradeAnim_FadeToBlack: ; 10893d
 	call DmgToCgbObjPal0
 	call GetMobileTradeAnimByte
 	ret
-; 10895e
 
-Function10895e: ; 10895e
+Function10895e:
 	ld de, vTiles0 tile $30
 	jr asm_108966
 
@@ -1241,9 +1197,8 @@ asm_108966
 	predef PlaceGraphic
 	call WaitBGMap
 	ret
-; 10898a
 
-Function10898a: ; 10898a
+Function10898a:
 	ld de, vTiles2
 	call MobileTradeAnim_GetFrontpic
 	call WaitTop
@@ -1255,9 +1210,8 @@ Function10898a: ; 10898a
 	predef PlaceGraphic
 	call WaitBGMap
 	ret
-; 1089a8
 
-MobileTradeAnim_DisplayMonToBeSent: ; 1089a8
+MobileTradeAnim_DisplayMonToBeSent:
 	ld de, wPlayerTrademonSpecies
 	ld a, [de]
 	cp EGG
@@ -1293,7 +1247,7 @@ MobileTradeAnim_DisplayReceivedMon:
 	call MobileTradeAnim_MonDisplay_UpdateBGMap
 	ret
 
-MobileTradeAnim_DisplayEggData
+MobileTradeAnim_DisplayEggData:
 	call WaitTop
 	call MobileTradeAnim_ClearTilemap
 	ld a, HIGH(vBGMap1)
@@ -1307,16 +1261,14 @@ MobileTradeAnim_DisplayEggData
 	call PlaceString
 	call MobileTradeAnim_MonDisplay_UpdateBGMap
 	ret
-; 108a1d
 
-.EggTemplate: ; 108a1d
+.EggTemplate:
 	db   "タマゴ"
 	next "おや/？？？？？"
 	next "<ID>№<DOT>？？？？？"
 	db   "@"
-; 108a33
 
-Function108a33: ; 108a33
+Function108a33:
 	call WaitTop
 	call MobileTradeAnim_ClearTilemap
 	ld a, HIGH(vBGMap1)
@@ -1330,13 +1282,11 @@ Function108a33: ; 108a33
 	call PlaceString
 	call MobileTradeAnim_MonDisplay_UpdateBGMap
 	ret
-; 108a54
 
-.OddEgg: ; 108a54
+.OddEgg:
 	db "なぞのタマゴ@"
-; 108a5b
 
-MobileTradeAnim_LoadMonTemplate: ; 108a5b
+MobileTradeAnim_LoadMonTemplate:
 	call WaitTop
 	call MobileTradeAnim_ClearTilemap
 	ld a, HIGH(vBGMap1)
@@ -1349,38 +1299,33 @@ MobileTradeAnim_LoadMonTemplate: ; 108a5b
 	ld de, .MonTemplate
 	call PlaceString
 	ret
-; 108a79
 
-.MonTemplate: ; 108a79
+.MonTemplate:
 	db   "─　№<DOT>"
 	next ""
 	next "おや／"
 	next "<ID>№<DOT>"
 	db   "@"
-; 108a87
 
-MobileTradeAnim_MonDisplay_UpdateBGMap: ; 108a87
+MobileTradeAnim_MonDisplay_UpdateBGMap:
 	call WaitBGMap
 	call WaitTop
 	ld a, HIGH(vBGMap0)
 	ld [hBGMapAddress + 1], a
 	ret
-; 108a92
 
-MobileTradeAnim_MonDisplay_PrintSpeciesNumber: ; 108a92
+MobileTradeAnim_MonDisplay_PrintSpeciesNumber:
 	hlcoord 9, 0
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 3
 	call PrintNum
 	ret
-; 108a9c
 
-MobileTradeAnim_MonDisplay_PrintSpeciesName: ; 108a9c
+MobileTradeAnim_MonDisplay_PrintSpeciesName:
 	hlcoord 5, 2
 	call PlaceString
 	ret
-; 108aa3
 
-MobileTradeAnim_MonDisplay_PrintOTNameAndGender: ; 108aa3
+MobileTradeAnim_MonDisplay_PrintOTNameAndGender:
 	cp $3
 	jr c, .got_gender
 	xor a
@@ -1397,30 +1342,26 @@ MobileTradeAnim_MonDisplay_PrintOTNameAndGender: ; 108aa3
 	ld a, [hl]
 	ld [bc], a
 	ret
-; 108abb
 
-.GenderChars: ; 108abb
+.GenderChars:
 	db " "
 	db "♂"
 	db "♀"
-; 108abe
 
-MobileTradeAnim_MonDisplay_PrintIDNumber: ; 108abe
+MobileTradeAnim_MonDisplay_PrintIDNumber:
 	hlcoord 8, 6
 	lb bc, PRINTNUM_LEADINGZEROS | 2, 5
 	call PrintNum
 	ret
-; 108ac8
 
-MobileTradeAnim_ClearTilemap: ; 108ac8
+MobileTradeAnim_ClearTilemap:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, " "
 	call ByteFill
 	ret
-; 108ad4
 
-Function108ad4: ; 108ad4
+Function108ad4:
 	and a
 	jr z, .asm_108adc
 	ld de, GFX_1092c7
@@ -1438,9 +1379,8 @@ Function108ad4: ; 108ad4
 	ld a, $0
 	ld [rVBK], a
 	ret
-; 108af4
 
-Function108af4: ; 108af4
+Function108af4:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -1477,9 +1417,8 @@ Function108af4: ; 108af4
 	call DmgToCgbBGPals
 	call DelayFrame
 	ret
-; 108b45
 
-Function108b45: ; 108b45
+Function108b45:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -1493,9 +1432,8 @@ Function108b45: ; 108b45
 	pop af
 	ld [rSVBK], a
 	ret
-; 108b5a
 
-Function108b5a: ; 108b5a
+Function108b5a:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -1515,9 +1453,8 @@ Function108b5a: ; 108b5a
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 108b78
 
-Function108b78: ; 108b78
+Function108b78:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -1540,12 +1477,11 @@ Function108b78: ; 108b78
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 108b98
 
 Palette_108b98:
 ; removed
 
-Function108b98: ; 108b98
+Function108b98:
 	ld d, a
 	ld a, [rSVBK]
 	push af
@@ -1567,15 +1503,13 @@ Function108b98: ; 108b98
 	pop af
 	ld [rSVBK], a
 	ret
-; 108bbd
 
-MobileTradeAnim_DeleteSprites: ; 108bbd
+MobileTradeAnim_DeleteSprites:
 	farcall DeinitializeAllSprites
 	call ClearSprites
 	ret
-; 108bc7
 
-Function108bc7: ; 108bc7 (42:4bc7)
+Function108bc7:
 	ld a, [wcf64]
 	and a
 	ret z
@@ -1592,7 +1526,7 @@ Function108bc7: ; 108bc7 (42:4bc7)
 	farcall DeinitializeSprite
 	ret
 
-Function108be0: ; 108be0 (42:4be0)
+Function108be0:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1601,9 +1535,8 @@ Function108be0: ; 108be0 (42:4be0)
 	add 1 * 8
 	ld [hl], a
 	ret
-; 108bec (42:4bec)
 
-Function108bec: ; 108bec
+Function108bec:
 	ld a, $90
 	ld [hWY], a
 	ld hl, .PlayerWillTradeMon
@@ -1615,24 +1548,20 @@ Function108bec: ; 108bec
 	ld c, 80
 	call DelayFrames
 	ret
-; 108c07
 
-.PlayerWillTradeMon: ; 0x108c07
+.PlayerWillTradeMon:
 	text_jump UnknownText_0x1bc787
 	db "@"
-; 0x108c0c
 
-.ForPartnersMon: ; 0x108c0c
+.ForPartnersMon:
 	text_jump UnknownText_0x1bc79d
 	db "@"
-; 0x108c11
 
-.UnusedTextPlayersMonTrade: ; 0x108c11
+.UnusedTextPlayersMonTrade:
 	text_jump UnknownText_0x1bc7b0
 	db "@"
-; 0x108c16
 
-Function108c16: ; 108c16
+Function108c16:
 	ld a, $90
 	ld [hWY], a
 	ld hl, .TakeGoodCareOfMon
@@ -1640,14 +1569,12 @@ Function108c16: ; 108c16
 	ld c, 80
 	call DelayFrames
 	ret
-; 108c26
 
-.TakeGoodCareOfMon: ; 0x108c26
+.TakeGoodCareOfMon:
 	text_jump UnknownText_0x1bc7c3
 	db "@"
-; 0x108c2b
 
-Function108c2b: ; 108c2b
+Function108c2b:
 	ld a, $90
 	ld [hWY], a
 	ld hl, .PlayersMonTrade
@@ -1655,14 +1582,12 @@ Function108c2b: ; 108c2b
 	ld c, 80
 	call DelayFrames
 	ret
-; 108c3b
 
-.PlayersMonTrade: ; 0x108c3b
+.PlayersMonTrade:
 	text_jump UnknownText_0x1bc7dd
 	db "@"
-; 0x108c40
 
-Function108c40: ; 108c40
+Function108c40:
 	ld a, $90
 	ld [hWY], a
 	ld a, [wcf65]
@@ -1680,19 +1605,16 @@ Function108c40: ; 108c40
 	ld c, 80
 	call DelayFrames
 	ret
-; 108c63
 
-.TakeGoodCareOf: ; 0x108c63
+.TakeGoodCareOf:
 	text_jump UnknownText_0x1bc7f0
 	db "@"
-; 0x108c68
 
-.CameBack: ; 0x108c68
+.CameBack:
 	text_jump UnknownText_0x1bc80a
 	db "@"
-; 0x108c6d
 
-Function108c6d: ; 108c6d
+Function108c6d:
 	ld hl, LZ_108fe7
 	debgcoord 0, 0
 	call Decompress
@@ -1700,9 +1622,8 @@ Function108c6d: ; 108c6d
 	debgcoord 0, 0, vBGMap1
 	call Decompress
 	ret
-; 108c80
 
-Function108c80: ; 108c80
+Function108c80:
 	ld a, $1
 	ld [rVBK], a
 	ld hl, LZ_1090a7
@@ -1714,9 +1635,8 @@ Function108c80: ; 108c80
 	ld a, $0
 	ld [rVBK], a
 	ret
-; 108c9b
 
-DebugMobileTrade: ; 108c9b
+DebugMobileTrade:
 ; localization error: NAME_LENGTH (11) should be NAME_LENGTH_JAPANESE (6) here
 
 	ld hl, .DebugTradeData
@@ -1781,7 +1701,6 @@ DebugMobileTrade: ; 108c9b
 	jr nz, .their_ot_loop
 
 	ret
-; 108ce9
 
 .DebugTradeData:
 	db VENUSAUR
@@ -1792,9 +1711,8 @@ DebugMobileTrade: ; 108c9b
 	db "クりーチャ@"
 	dw $0456
 	db "マツミヤ@@"
-; 108d07
 
-Function108d07: ; 108d07
+Function108d07:
 	ld a, [wc74e]
 	and $7f
 	cp $8
@@ -1810,7 +1728,6 @@ Function108d07: ; 108d07
 	ld bc, 1 palettes
 	call FarCopyWRAM
 	ret
-; 108d27
 
 LZ_108d27:
 INCBIN "gfx/unknown/108d27.2bpp.lz"
diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm
index a5d4ebf35..e2168a737 100644
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -7,7 +7,7 @@ String_114000:
 String_114004:
 	db "CGB-AAAA-00", 0, 0
 
-Unknown_114011: ; 114011
+Unknown_114011:
 	dw String_114033
 	dw String_11403a
 	dw String_114043
@@ -26,41 +26,40 @@ Unknown_114011: ; 114011
 	dw String_114160
 	dw String_114163
 
-String_114033: ; 114033
+String_114033:
 	db "From: ", 0
-String_11403a: ; 11403a
+String_11403a:
 	db "Sender: ", 0
-String_114043: ; 114043
+String_114043:
 	db "Reply-To: ", 0
-String_11404e: ; 11404e
+String_11404e:
 	db "To: ", 0
-String_114053: ; 114053
+String_114053:
 	db "Cc: ", 0
-String_114058: ; 114058
+String_114058:
 	db "Subject: ", 0
-String_114062: ; 114062
+String_114062:
 	db "MIME-Version: 1.0", 0
-String_114074: ; 114074
+String_114074:
 	db "X-Game-title: XXXXXXXXXX", 0
-String_11408d: ; 11408d
+String_11408d:
 	db "X-Game-code: CGB-", 0
-String_11409f: ; 11409f
+String_11409f:
 	db "X-GBmail-type: exclusive", 0
-String_1140b8: ; 1140b8
+String_1140b8:
 	db "Content-Type: text/plain; charset=iso-2022-jp", 0
-String_1140e6: ; 1140e6
+String_1140e6:
 	db "Content-Type: multipart/mixed; boundary=\"", 0
-String_114110: ; 114110
+String_114110:
 	db "Content-Type: Application/Octet-Stream; name=\"", 0
-String_11413f: ; 11413f
+String_11413f:
 	db "Content-Transfer-Encoding:Base64", 0
-String_114160: ; 114160
+String_114160:
 	db "--", 0
-String_114163: ; 114163
+String_114163:
 	db ".", 0
-; 114165
 
-Jumptable_114165: ; 114165
+Jumptable_114165:
 	dw Stubbed_Function114268
 	dw Function114269
 	dw Function11433c
@@ -74,9 +73,8 @@ Jumptable_114165: ; 114165
 	dw Function1154d4
 	dw Function1156cc
 	dw Function1159fb
-; 11417f
 
-Unknown_11417f: ; 11417f
+Unknown_11417f:
 	dw .From
 	dw .Sender
 	dw .ReplyTo
@@ -91,45 +89,43 @@ Unknown_11417f: ; 11417f
 	dw .XGameCode
 	dw .XGBMailType
 
-.From: ; 114199
+.From:
 	db "FROM:", 0
-.Sender: ; 11419f
+.Sender:
 	db "SENDER:", 0
-.ReplyTo: ; 1141a7
+.ReplyTo:
 	db "REPLY-TO:", 0
-.To: ; 1141b1
+.To:
 	db "TO:", 0
-.CC: ; 1141b5
+.CC:
 	db "CC:", 0
-.Subject: ; 1141b9
+.Subject:
 	db "SUBJECT:", 0
-.Date: ; 1141c2
+.Date:
 	db "DATE:", 0
-.ContentType: ; 1141c8
+.ContentType:
 	db "CONTENT-TYPE:", 0
-.MimeVersion: ; 1141d6
+.MimeVersion:
 	db "MIME-VERSION:", 0
-.XMailer: ; 1141e4
+.XMailer:
 	db "X-MAILER:", 0
-.XGameTitle: ; 1141ee
+.XGameTitle:
 	db "X-GAME-TITLE:", 0
-.XGameCode: ; 1141fc
+.XGameCode:
 	db "X-GAME-CODE:", 0
-.XGBMailType: ; 114209
+.XGBMailType:
 	db "X-GBMAIL-TYPE:", 0
-; 114218
 
-String_114218: ; 114218
+String_114218:
 	db "NAME=", 0
-String_11421e: ; 11421e
+String_11421e:
 	db "MULTIPART", 0
-String_114228: ; 114228
+String_114228:
 	db "BOUNDARY=", 0
-String_114232: ; 114232
+String_114232:
 	db "=?ISO-2022-JP?B?", 0
-; 114243
 
-Function114243:: ; 114243
+Function114243::
 	ld a, SRAM_ENABLE
 	ld [MBC3SRamEnable], a
 	ld a, [hFF8C]
@@ -147,9 +143,7 @@ Function114243:: ; 114243
 	pop de
 	jp hl
 
-; 11425c
-
-Function11425c: ; 11425c
+Function11425c:
 	ld [$dc02], a
 	pop af
 	ld [hFF8C], a
@@ -157,14 +151,10 @@ Function11425c: ; 11425c
 	ld [MBC3SRamBank], a
 	ret
 
-; 114268
-
 Stubbed_Function114268:
 	ret
 
-; 114269
-
-Function114269: ; 114269
+Function114269:
 	ld h, d
 	ld l, e
 	xor a
@@ -303,18 +293,14 @@ Function114269: ; 114269
 	ld [$dc02], a
 	jp .asm_11429b
 
-; 114333
-
-Function114333: ; 114333
+Function114333:
 	push bc
 	ld bc, $dc00
 	call Function115d80
 	pop bc
 	ret
 
-; 11433c
-
-Function11433c: ; 11433c
+Function11433c:
 	push de
 	ld h, d
 	ld l, e
@@ -406,9 +392,7 @@ Function11433c: ; 11433c
 	ld b, $1
 	jp Function11425c
 
-; 1143b7
-
-Function1143b7: ; 1143b7
+Function1143b7:
 	ld a, [de]
 	ld b, a
 	inc de
@@ -458,9 +442,7 @@ Function1143b7: ; 1143b7
 	pop hl
 	jp Function11425c
 
-; 1143f3
-
-Function1143f3: ; 1143f3
+Function1143f3:
 	call Function114412
 	and a
 	jr nz, .asm_11440d
@@ -487,9 +469,7 @@ Function1143f3: ; 1143f3
 	ld b, $84
 	ret
 
-; 114412
-
-Function114412: ; 114412
+Function114412:
 	ld a, c
 	ld [$dc00], a
 	ld [hFF8C], a
@@ -618,18 +598,14 @@ Function114412: ; 114412
 	ld a, $1
 	ret
 
-; 1144c8
-
-Function1144c8: ; 1144c8
+Function1144c8:
 	push bc
 	ld bc, $dc00
 	call Function115d80
 	pop bc
 	ret
 
-; 1144d1
-
-Function1144d1: ; 1144d1
+Function1144d1:
 	call Function114561
 	dec de
 	dec de
@@ -726,9 +702,7 @@ Function1144d1: ; 1144d1
 	ld a, $1
 	jp Function11425c
 
-; 114561
-
-Function114561: ; 114561
+Function114561:
 	ld hl, $dc03
 	ld a, [de]
 	ld [hli], a
@@ -749,9 +723,7 @@ Function114561: ; 114561
 	ld [hl], a
 	ret
 
-; 114576
-
-Function114576: ; 114576
+Function114576:
 	xor a
 	ld [wDecoBed], a
 	ld b, $7
@@ -805,9 +777,7 @@ Function114576: ; 114576
 	ld [wDecoBed], a
 	ret
 
-; 1145c5
-
-Function1145c5: ; 1145c5
+Function1145c5:
 	ld hl, $dc24
 	ld de, String_11421e
 	ld c, $0
@@ -899,9 +869,7 @@ Function1145c5: ; 1145c5
 	xor a
 	ret
 
-; 11463c
-
-Function11463c: ; 11463c
+Function11463c:
 	ld a, [$dc00]
 	push af
 	push de
@@ -963,18 +931,14 @@ Function11463c: ; 11463c
 	ld a, $1
 	ret
 
-; 11469b
-
-Function11469b: ; 11469b
+Function11469b:
 	push bc
 	ld bc, $dc00
 	call Function115d80
 	pop bc
 	ret
 
-; 1146a4
-
-Function1146a4: ; 1146a4
+Function1146a4:
 	call Function114867
 	and a
 	jr nz, .asm_1146e4
@@ -1031,9 +995,7 @@ Function1146a4: ; 1146a4
 	ld a, $1
 	ret
 
-; 1146fa
-
-Function1146fa: ; 1146fa
+Function1146fa:
 	call Function114867
 	and a
 	jp nz, .asm_11478a
@@ -1158,9 +1120,7 @@ Function1146fa: ; 1146fa
 	xor a
 	ret
 
-; 1147cd
-
-Function1147cd: ; 1147cd
+Function1147cd:
 	ld bc, NULL
 	ld a, [wDecoRightOrnament]
 	and a
@@ -1236,18 +1196,14 @@ Function1147cd: ; 1147cd
 	ld a, $1
 	ret
 
-; 11483a
-
-Function11483a: ; 11483a
+Function11483a:
 	push bc
 	ld bc, $dc00
 	call Function115d80
 	pop bc
 	ret
 
-; 114843
-
-Function114843: ; 114843
+Function114843:
 	ld a, [$dc00]
 	push af
 	push de
@@ -1270,9 +1226,7 @@ Function114843: ; 114843
 	ld a, $1
 	ret
 
-; 114867
-
-Function114867: ; 114867
+Function114867:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -1330,18 +1284,14 @@ Function114867: ; 114867
 	ld a, $1
 	ret
 
-; 1148b9
-
-Function1148b9: ; 1148b9
+Function1148b9:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
 
-; 1148c2
-
-Function1148c2: ; 1148c2
+Function1148c2:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -1432,18 +1382,14 @@ Function1148c2: ; 1148c2
 	ld a, $1
 	ret
 
-; 114944
-
-Function114944: ; 114944
+Function114944:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
 
-; 11494d
-
-Function11494d: ; 11494d
+Function11494d:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -1526,18 +1472,14 @@ Function11494d: ; 11494d
 	ld a, $1
 	ret
 
-; 1149c3
-
-Function1149c3: ; 1149c3
+Function1149c3:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
 
-; 1149cc
-
-Function1149cc: ; 1149cc
+Function1149cc:
 	ld hl, $dc06
 	ld a, [hl]
 	ld [wCurrMapBGEventCount], a
@@ -1586,18 +1528,14 @@ Function1149cc: ; 1149cc
 	ld a, $1
 	ret
 
-; 114a0f
-
-Function114a0f: ; 114a0f
+Function114a0f:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
 
-; 114a18
-
-Function114a18: ; 114a18
+Function114a18:
 	ld bc, NULL
 	ld h, b
 .asm_114a1c
@@ -1663,18 +1601,14 @@ Function114a18: ; 114a18
 	ld a, $1
 	ret
 
-; 114a71
-
-Function114a71: ; 114a71
+Function114a71:
 	push bc
 	ld bc, $dc00
 	call Function115d80
 	pop bc
 	ret
 
-; 114a7a
-
-Function114a7a: ; 114a7a
+Function114a7a:
 	ld bc, NULL
 .asm_114a7d
 	inc bc
@@ -1725,18 +1659,14 @@ Function114a7a: ; 114a7a
 	ld a, $1
 	ret
 
-; 114ac6
-
-Function114ac6: ; 114ac6
+Function114ac6:
 	push bc
 	ld bc, $dc00
 	call Function115d80
 	pop bc
 	ret
 
-; 114acf
-
-Function114acf: ; 114acf
+Function114acf:
 .asm_114acf
 	push hl
 	push bc
@@ -1838,18 +1768,14 @@ Function114acf: ; 114acf
 	xor a
 	ret
 
-; 114b4c
-
-Function114b4c: ; 114b4c
+Function114b4c:
 	push bc
 	ld bc, $dc00
 	call Function115d80
 	pop bc
 	ret
 
-; 114b55
-
-Function114b55: ; 114b55
+Function114b55:
 	call Function114561
 	ld b, $0
 	ld hl, $dc03
@@ -1923,9 +1849,7 @@ endr
 	ld b, $82
 	jp Function11425c
 
-; 114bbc
-
-Function114bbc: ; 114bbc
+Function114bbc:
 	ld h, d
 	ld l, e
 	ld a, [hli]
@@ -1978,9 +1902,7 @@ Function114bbc: ; 114bbc
 	pop hl
 	jp Function11425c
 
-; 114c0b
-
-Function114c0b: ; 114c0b
+Function114c0b:
 	ld hl, $dc24
 	push bc
 	call Function115d53
@@ -2038,18 +1960,14 @@ Function114c0b: ; 114c0b
 	jr z, .asm_114c24
 	jr .asm_114c18
 
-; 114c55
-
-Function114c55: ; 114c55
+Function114c55:
 	push bc
 	ld bc, $dc00
 	call Function115d80
 	pop bc
 	ret
 
-; 114c5e
-
-Function114c5e: ; 114c5e
+Function114c5e:
 	ld de, wPartyMon5Defense
 	push hl
 .asm_114c62
@@ -2148,9 +2066,7 @@ Function114c5e: ; 114c5e
 	dec bc
 	ret
 
-; 114cd9
-
-Function114cd9: ; 114cd9
+Function114cd9:
 	ld h, d
 	ld l, e
 	ld b, [hl]
@@ -2215,9 +2131,7 @@ endr
 	ld a, $1
 	jp Function11425c
 
-; 114d39
-
-Function114d39: ; 114d39
+Function114d39:
 .asm_114d39
 	ld a, [$dc04]
 	and a
@@ -2284,9 +2198,7 @@ Function114d39: ; 114d39
 	ld [hli], a
 	ret
 
-; 114d99
-
-Function114d99: ; 114d99
+Function114d99:
 	ld de, wPartyMon5Defense
 	xor a
 	ld [de], a
@@ -2359,9 +2271,7 @@ Function114d99: ; 114d99
 	xor a
 	ret
 
-; 114df1
-
-Function114df1: ; 114df1
+Function114df1:
 	cp $1b
 	ret nz
 	ld a, [hli]
@@ -2410,9 +2320,7 @@ Function114df1: ; 114df1
 	xor a
 	ret
 
-; 114e2d
-
-Function114e2d: ; 114e2d
+Function114e2d:
 	cp $30
 	jr c, .asm_114e45
 	cp $40
@@ -2447,9 +2355,7 @@ Function114e2d: ; 114e2d
 	xor a
 	ret
 
-; 114e62
-
-Function114e62: ; 114e62
+Function114e62:
 	ld a, c
 	and a
 	jr nz, .asm_114e6f
@@ -2492,9 +2398,7 @@ Function114e62: ; 114e62
 	ld b, $83
 	jp Function11425c
 
-; 114ea0
-
-Function114ea0: ; 114ea0
+Function114ea0:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -2540,18 +2444,14 @@ Function114ea0: ; 114ea0
 	ld b, $83
 	ret
 
-; 114ee0
-
-Function114ee0: ; 114ee0
+Function114ee0:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
 
-; 114ee9
-
-Function114ee9: ; 114ee9
+Function114ee9:
 	ld hl, $dc03
 	ld a, b
 	ld [hli], a
@@ -2584,9 +2484,7 @@ Function114ee9: ; 114ee9
 	ld [hl], d
 	ret
 
-; 114f0a
-
-Function114f0a: ; 114f0a
+Function114f0a:
 	call Function114f39
 	and a
 	jr nz, .asm_114f26
@@ -2621,9 +2519,7 @@ Function114f0a: ; 114f0a
 	ld a, $ff
 	ret
 
-; 114f39
-
-Function114f39: ; 114f39
+Function114f39:
 	ld hl, $dc0d
 	ld e, [hl]
 	inc hl
@@ -2653,9 +2549,7 @@ Function114f39: ; 114f39
 .asm_114f58
 	ret
 
-; 114f59
-
-Function114f59: ; 114f59
+Function114f59:
 	ld a, [wTimerEventStartDay]
 	and a
 	jr nz, .asm_114f7c
@@ -2781,9 +2675,7 @@ Function114f59: ; 114f59
 	xor a
 	ret
 
-; 115020
-
-Function115020: ; 115020
+Function115020:
 	push hl
 	ld hl, $dc06
 	ld a, [hli]
@@ -2830,18 +2722,14 @@ Function115020: ; 115020
 	ld a, $1
 	ret
 
-; 115059
-
-Function115059: ; 115059
+Function115059:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
 
-; 115062
-
-Function115062: ; 115062
+Function115062:
 	ld hl, wDecoBed
 	ld a, [hli]
 	and a
@@ -2894,9 +2782,7 @@ Function115062: ; 115062
 .asm_1150b2
 	ret
 
-; 1150b3
-
-Function1150b3: ; 1150b3
+Function1150b3:
 	ld hl, $dc24
 	ld de, wPartyMon5Defense
 	ld b, $0
@@ -2998,9 +2884,7 @@ Function1150b3: ; 1150b3
 	ld [de], a
 	ret
 
-; 115136
-
-Function115136: ; 115136
+Function115136:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -3046,18 +2930,14 @@ Function115136: ; 115136
 	ld a, $1
 	ret
 
-; 115170
-
-Function115170: ; 115170
+Function115170:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
 
-; 115179
-
-Function115179: ; 115179
+Function115179:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -3167,18 +3047,14 @@ Function115179: ; 115179
 	xor a
 	ret
 
-; 11520e
-
-Function11520e: ; 11520e
+Function11520e:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
 
-; 115217
-
-Function115217: ; 115217
+Function115217:
 	push hl
 	ld hl, $dc06
 	ld a, [hli]
@@ -3263,18 +3139,14 @@ Function115217: ; 115217
 	call z, Function115286
 	jr .asm_115252
 
-; 115286
-
-Function115286: ; 115286
+Function115286:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
 
-; 11528f
-
-Function11528f: ; 11528f
+Function11528f:
 	ld hl, wDecoBed
 	ld c, [hl]
 	inc hl
@@ -3297,18 +3169,14 @@ Function11528f: ; 11528f
 	ld [hl], c
 	ret
 
-; 1152af
-
-Function1152af: ; 1152af
+Function1152af:
 	push bc
 	ld bc, $dc00
 	call Function115d80
 	pop bc
 	ret
 
-; 1152b8
-
-Function1152b8: ; 1152b8
+Function1152b8:
 	push bc
 	call Function11537d
 	push de
@@ -3433,9 +3301,7 @@ Function1152b8: ; 1152b8
 	xor a
 	jp Function11425c
 
-; 11537d
-
-Function11537d: ; 11537d
+Function11537d:
 	ld hl, $dc06
 	ld a, [de]
 	ld [hli], a
@@ -3483,9 +3349,7 @@ Function11537d: ; 11537d
 	ld [wTimerEventStartDay], a
 	ret
 
-; 1153b5
-
-Function1153b5: ; 1153b5
+Function1153b5:
 	ld hl, $dc0d
 	ld e, [hl]
 	inc hl
@@ -3510,9 +3374,7 @@ Function1153b5: ; 1153b5
 	ld [hl], d
 	ret
 
-; 1153d2
-
-Function1153d2: ; 1153d2
+Function1153d2:
 	ld a, [$dc03]
 	ld d, a
 	ld a, [$dc04]
@@ -3698,9 +3560,7 @@ Function1153d2: ; 1153d2
 	xor a
 	ret
 
-; 1154d4
-
-Function1154d4: ; 1154d4
+Function1154d4:
 	xor a
 	ld [wTimerEventStartDay], a
 	call Function1155af
@@ -3830,9 +3690,7 @@ Function1154d4: ; 1154d4
 	call Function1155d1
 	jr .asm_115547
 
-; 1155af
-
-Function1155af: ; 1155af
+Function1155af:
 	ld hl, $dc06
 	ld a, [de]
 	ld [hli], a
@@ -3862,9 +3720,7 @@ Function1155af: ; 1155af
 	call Function1155d1
 	ret
 
-; 1155d1
-
-Function1155d1: ; 1155d1
+Function1155d1:
 	ld a, [$dc0d]
 	ld l, a
 	ld a, [$dc0e]
@@ -3907,9 +3763,7 @@ Function1155d1: ; 1155d1
 	ld [$dc0e], a
 	ret
 
-; 11560a
-
-Function11560a: ; 11560a
+Function11560a:
 	ld a, [$dc06]
 	ld [wCurrMapBGEventCount], a
 	ld a, [$dc17]
@@ -4035,9 +3889,7 @@ Function11560a: ; 11560a
 	ld bc, $03db
 	jr .asm_115659
 
-; 1156cc
-
-Function1156cc: ; 1156cc
+Function1156cc:
 	ld a, [wTimerEventStartDay]
 	and a
 	jp z, Function11425c
@@ -4099,9 +3951,7 @@ Function1156cc: ; 1156cc
 	ld b, $83
 	jp Function11425c
 
-; 115732
-
-Function115732: ; 115732
+Function115732:
 	ld hl, $dc02
 	ld a, [de]
 	ld [hli], a
@@ -4143,9 +3993,7 @@ Function115732: ; 115732
 	ld [hl], b
 	ret
 
-; 11575c
-
-Function11575c: ; 11575c
+Function11575c:
 	ld hl, $dc05
 	ld a, [hli]
 	ld h, [hl]
@@ -4231,9 +4079,7 @@ Function11575c: ; 11575c
 	ld [wTimerEventStartDay], a
 	ret
 
-; 1157d0
-
-Function1157d0: ; 1157d0
+Function1157d0:
 	ld hl, $dc05
 	ld a, [hli]
 	ld h, [hl]
@@ -4290,9 +4136,7 @@ Function1157d0: ; 1157d0
 	ld [wTimerEventStartDay], a
 	ret
 
-; 11581e
-
-Function11581e: ; 11581e
+Function11581e:
 	ld a, [wTimerEventStartDay]
 	and a
 	ret z
@@ -4398,9 +4242,7 @@ Function11581e: ; 11581e
 	ld [wTimerEventStartDay], a
 	ret
 
-; 1158c2
-
-Function1158c2: ; 1158c2
+Function1158c2:
 	ld a, e
 	ld [wSwarmFlags], a
 	ld a, d
@@ -4608,9 +4450,7 @@ endr
 	ld [hl], a
 	ret
 
-; 1159dc
-
-Function1159dc: ; 1159dc
+Function1159dc:
 	cp $1a
 	jr c, .asm_1159ef
 	cp $34
@@ -4638,9 +4478,7 @@ Function1159dc: ; 1159dc
 	ld a, $2b
 	ret
 
-; 1159fb
-
-Function1159fb: ; 1159fb
+Function1159fb:
 	ld a, [wTimerEventStartDay]
 	and a
 	jp z, Function11425c
@@ -4701,9 +4539,7 @@ Function1159fb: ; 1159fb
 	ld a, $1
 	jp Function11425c
 
-; 115a5f
-
-Function115a5f: ; 115a5f
+Function115a5f:
 	ld hl, $dc05
 	ld a, [hli]
 	ld h, [hl]
@@ -4762,9 +4598,7 @@ Function115a5f: ; 115a5f
 	ld [wTimerEventStartDay], a
 	ret
 
-; 115ab0
-
-Function115ab0: ; 115ab0
+Function115ab0:
 	ld hl, $dc05
 	ld a, [hli]
 	ld h, [hl]
@@ -4823,9 +4657,7 @@ Function115ab0: ; 115ab0
 	xor a
 	ret
 
-; 115b00
-
-Function115b00: ; 115b00
+Function115b00:
 	ld a, [wTimerEventStartDay]
 	and a
 	ret z
@@ -4957,9 +4789,7 @@ Function115b00: ; 115b00
 	xor a
 	ret
 
-; 115bc8
-
-Function115bc8: ; 115bc8
+Function115bc8:
 	xor a
 	ld [wDecoCarpet], a
 .asm_115bcc
@@ -5058,9 +4888,7 @@ Function115bc8: ; 115bc8
 	ld a, $2
 	ret
 
-; 115c49
-
-Function115c49: ; 115c49
+Function115c49:
 	ld a, e
 	ld [wWeeklyFlags], a
 	ld a, d
@@ -5197,9 +5025,7 @@ endr
 	jp nz, .asm_115c64
 	ret
 
-; 115cfd
-
-Function115cfd: ; 115cfd
+Function115cfd:
 	cp $2b
 	jr c, .asm_115d27
 	jr z, .asm_115d2f
@@ -5268,9 +5094,7 @@ Function115cfd: ; 115cfd
 	sub $47
 	ret
 
-; 115d53
-
-Function115d53: ; 115d53
+Function115d53:
 .asm_115d53
 	ld a, [de]
 	ld [hli], a
@@ -5284,18 +5108,14 @@ Function115d53: ; 115d53
 	ld [hl], a
 	ret
 
-; 115d61
-
-Function115d61: ; 115d61
+Function115d61:
 	push bc
 	ld bc, $dc00
 	call Function115d80
 	pop bc
 	ret
 
-; 115d6a
-
-Function115d6a: ; 115d6a
+Function115d6a:
 .asm_115d6a
 	ld a, [hli]
 	ld [de], a
@@ -5308,18 +5128,14 @@ Function115d6a: ; 115d6a
 	xor a
 	ret
 
-; 115d77
-
-Function115d77: ; 115d77
+Function115d77:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
 
-; 115d80
-
-Function115d80: ; 115d80
+Function115d80:
 	ld e, a
 	ld a, d
 	cp $bf
@@ -5340,13 +5156,9 @@ Function115d80: ; 115d80
 	ld e, $0
 	ret
 
-; 115d99
-
 INCLUDE "mobile/mobile_45_sprite_engine.asm"
 
-; 116567
-
-Function116567: ; 116567
+Function116567:
 	ld hl, wc3f7
 	dec [hl]
 	ret nz
@@ -5383,9 +5195,7 @@ Function116567: ; 116567
 	ld [wc3f7], a
 	ret
 
-; 11659d
-
-Function11659d: ; 11659d
+Function11659d:
 	ld a, [wc314]
 	cp $12
 	ret nc
@@ -5399,9 +5209,7 @@ Function11659d: ; 11659d
 	ld l, a
 	jp hl
 
-; 1165af
-
-Jumptable_1165af: ; 1165af
+Jumptable_1165af:
 	dw Function11677e
 	dw Function1165d5
 	dw Function1165d8
@@ -5421,9 +5229,8 @@ Jumptable_1165af: ; 1165af
 	dw Function1166c4
 	dw Function1166d6
 	dw Function1166d6
-; 1165d5
 
-Function1165d5: ; 1165d5
+Function1165d5:
 	call Function11678e
 
 Function1165d8:
@@ -5444,9 +5251,7 @@ Function1165e3:
 	ret c
 	jp Function116797
 
-; 1165f5
-
-Function1165f5: ; 1165f5
+Function1165f5:
 	ld a, $1
 	ld c, a
 	ld a, $1
@@ -5466,9 +5271,7 @@ Function116600:
 	ld [wc314], a
 	ret
 
-; 116615
-
-Function116615: ; 116615
+Function116615:
 	call Function11678e
 
 Function116618:
@@ -5489,9 +5292,7 @@ Function116623:
 	ret c
 	jp Function116797
 
-; 116635
-
-Function116635: ; 116635
+Function116635:
 	ld a, $2
 	ld c, a
 	ld a, $ff
@@ -5511,9 +5312,7 @@ Function116640:
 	ld [wc314], a
 	ret
 
-; 116655
-
-Function116655: ; 116655
+Function116655:
 	xor a
 	ld [wc314 + 3], a
 	call Function11678e
@@ -5558,9 +5357,7 @@ Function11668d:
 	ld [wc314], a
 	ret
 
-; 11669f
-
-Function11669f: ; 11669f
+Function11669f:
 	call Function11678e
 
 Function1166a2:
@@ -5607,9 +5404,7 @@ Function1166d6:
 	ld [wc314], a
 	ret
 
-; 1166f4
-
-Function1166f4: ; 1166f4
+Function1166f4:
 	ld [wc30e], a
 	ld a, b
 	ld [wc314 + 2], a
@@ -5635,9 +5430,7 @@ Function1166f4: ; 1166f4
 	call Function116797
 	ret
 
-; 11671f
-
-Function11671f: ; 11671f
+Function11671f:
 	ld [wc30f], a
 	ld a, b
 	ld [wc314 + 3], a
@@ -5659,9 +5452,7 @@ Function11671f: ; 11671f
 	call Function116797
 	ret
 
-; 116747
-
-Function116747: ; 116747
+Function116747:
 	ld hl, wc30e
 	ld a, [wc314 + 2]
 	add [hl]
@@ -5672,9 +5463,7 @@ Function116747: ; 116747
 	ld [hl], a
 	ret
 
-; 116758
-
-Function116758: ; 116758
+Function116758:
 	ld a, [wc30f]
 	cp $30
 	jr c, .asm_116770
@@ -5703,9 +5492,7 @@ Function116758: ; 116758
 	ld [wc314 + 4], a
 	ret
 
-; 11677e
-
-Function11677e: ; 11677e
+Function11677e:
 	ld a, $0
 
 Function116780:
@@ -5721,24 +5508,18 @@ Function116780:
 	and a
 	ret
 
-; 11678e
-
-Function11678e: ; 11678e
+Function11678e:
 	ld hl, wc314
 	ld a, [hl]
 	ld [wc314 + 1], a
 	inc [hl]
 	ret
 
-; 116797
-
-Function116797: ; 116797
+Function116797:
 	ld hl, wc314
 	inc [hl]
 	ret
 
-; 11679c
-
 Function11679c:
 	ld a, c
 	ld [wc311], a
@@ -5746,7 +5527,7 @@ Function11679c:
 	ld [wc312], a
 	jr asm_1167af
 
-Function1167a6: ; 1167a6
+Function1167a6:
 	ld hl, wc313
 	dec [hl]
 	ret nz
@@ -5794,8 +5575,6 @@ asm_1167af
 	ld [wc313], a
 	ret
 
-; 1167eb
-
 Unknown_1167eb:
 	dw Unknown_1167fb
 	dw Unknown_116808
@@ -5806,7 +5585,7 @@ Unknown_1167eb:
 	dw Unknown_116881
 	dw Unknown_1168ae
 
-Unknown_1167fb: ; 1167fb
+Unknown_1167fb:
 	db $0, $6
 	db $1, $4
 	db $2, $4
@@ -5815,7 +5594,7 @@ Unknown_1167fb: ; 1167fb
 	db $1, $4
 	db $fe
 
-Unknown_116808: ; 116808
+Unknown_116808:
 	db $4, $6
 	db $5, $4
 	db $6, $4
@@ -5824,7 +5603,7 @@ Unknown_116808: ; 116808
 	db $5, $4
 	db $fe
 
-Unknown_116815: ; 116815
+Unknown_116815:
 	db $fd, $20
 	db $8, $c
 	db $9, $24
@@ -5847,7 +5626,7 @@ Unknown_116815: ; 116815
 	db $8, $4
 	db -1 ; end
 
-Unknown_11683e: ; 11683e
+Unknown_11683e:
 	db $fd, $20
 	db $e, $c
 	db $f, $24
@@ -5870,14 +5649,14 @@ Unknown_11683e: ; 11683e
 	db $e, $4
 	db -1 ; end
 
-Unknown_116867: ; 116867
+Unknown_116867:
 	db $14, $8
 	db $15, $8
 	db $16, $8
 	db $15, $8
 	db $fe
 
-Unknown_116870: ; 116870
+Unknown_116870:
 	db $17, $5
 	db $18, $5
 	db $19, $5
@@ -5888,7 +5667,7 @@ Unknown_116870: ; 116870
 	db $18, $5
 	db $fe
 
-Unknown_116881: ; 116881
+Unknown_116881:
 	db $1c, $7
 	db $1d, $7
 	db $1e, $a
@@ -5913,7 +5692,7 @@ Unknown_116881: ; 116881
 	db $fd, $40
 	db -1 ; end
 
-Unknown_1168ae: ; 1168ae
+Unknown_1168ae:
 	db $24, $4
 	db $25, $4
 	db $26, $4
@@ -5926,7 +5705,6 @@ Unknown_1168ae: ; 1168ae
 	db $2d, $4
 	db $2e, $4
 	db $fe
-; 1168c5
 
 Unknown_1168c5:
 	dw Unknown_116923
@@ -5977,7 +5755,7 @@ Unknown_1168c5:
 	dw Unknown_1172c4
 	dw Unknown_1172e9
 
-Unknown_116923: ; 116923
+Unknown_116923:
 	db $f
 	db $0, $0, $1, $a
 	db $0, $8, $2, $d
@@ -5995,7 +5773,7 @@ Unknown_116923: ; 116923
 	db $18, $8, $32, $a
 	db $18, $10, $33, $a
 
-Unknown_116960: ; 116960
+Unknown_116960:
 	db $10
 	db $1, $0, $1, $a
 	db $1, $8, $2, $d
@@ -6014,7 +5792,7 @@ Unknown_116960: ; 116960
 	db $19, $10, $17, $a
 	db $19, $18, $35, $a
 
-Unknown_1169a1: ; 1169a1
+Unknown_1169a1:
 	db $f
 	db $1, $0, $1, $a
 	db $1, $8, $2, $d
@@ -6032,7 +5810,7 @@ Unknown_1169a1: ; 1169a1
 	db $19, $10, $37, $a
 	db $19, $18, $35, $a
 
-Unknown_1169de: ; 1169de
+Unknown_1169de:
 	db $f
 	db $0, $0, $1, $a
 	db $0, $8, $2, $d
@@ -6050,7 +5828,7 @@ Unknown_1169de: ; 1169de
 	db $18, $8, $32, $a
 	db $18, $10, $33, $a
 
-Unknown_116a1b: ; 116a1b
+Unknown_116a1b:
 	db $f
 	db $0, $0, $4, $2d
 	db $0, $8, $3, $2d
@@ -6068,7 +5846,7 @@ Unknown_116a1b: ; 116a1b
 	db $18, $10, $32, $2a
 	db $18, $18, $31, $2a
 
-Unknown_116a58: ; 116a58
+Unknown_116a58:
 	db $10
 	db $1, $0, $4, $2d
 	db $1, $8, $3, $2d
@@ -6087,7 +5865,7 @@ Unknown_116a58: ; 116a58
 	db $19, $10, $16, $2a
 	db $19, $18, $15, $2a
 
-Unknown_116a99: ; 116a99
+Unknown_116a99:
 	db $f
 	db $1, $0, $4, $2d
 	db $1, $8, $3, $2d
@@ -6105,7 +5883,7 @@ Unknown_116a99: ; 116a99
 	db $19, $8, $37, $2a
 	db $19, $10, $36, $2a
 
-Unknown_116ad6: ; 116ad6
+Unknown_116ad6:
 	db $f
 	db $0, $0, $4, $2d
 	db $0, $8, $3, $2d
@@ -6123,7 +5901,7 @@ Unknown_116ad6: ; 116ad6
 	db $18, $10, $32, $2a
 	db $18, $18, $31, $2a
 
-Unknown_116b13: ; 116b13
+Unknown_116b13:
 	db $10
 	db $18, $0, $0, $b
 	db $18, $8, $8, $b
@@ -6142,7 +5920,7 @@ Unknown_116b13: ; 116b13
 	db $0, $10, $44, $2b
 	db $0, $18, $43, $2b
 
-Unknown_116b54: ; 116b54
+Unknown_116b54:
 	db $10
 	db $19, $0, $0, $b
 	db $19, $8, $18, $b
@@ -6161,7 +5939,7 @@ Unknown_116b54: ; 116b54
 	db $1, $10, $44, $2b
 	db $1, $18, $d, $2b
 
-Unknown_116b95: ; 116b95
+Unknown_116b95:
 	db $10
 	db $18, $0, $0, $b
 	db $18, $8, $5c, $2b
@@ -6180,7 +5958,7 @@ Unknown_116b95: ; 116b95
 	db $0, $10, $44, $2b
 	db $0, $18, $43, $2b
 
-Unknown_116bd6: ; 116bd6
+Unknown_116bd6:
 	db $10
 	db $18, $0, $0, $a
 	db $18, $8, $56, $a
@@ -6199,7 +5977,7 @@ Unknown_116bd6: ; 116bd6
 	db $0, $10, $49, $2a
 	db $0, $18, $48, $2a
 
-Unknown_116c17: ; 116c17
+Unknown_116c17:
 	db $10
 	db $19, $0, $0, $a
 	db $19, $8, $76, $a
@@ -6218,7 +5996,7 @@ Unknown_116c17: ; 116c17
 	db $1, $10, $19, $2a
 	db $1, $18, $63, $2a
 
-Unknown_116c58: ; 116c58
+Unknown_116c58:
 	db $10
 	db $1a, $0, $6c, $a
 	db $1a, $8, $6d, $a
@@ -6237,7 +6015,7 @@ Unknown_116c58: ; 116c58
 	db $2, $10, $47, $2a
 	db $2, $18, $46, $2a
 
-Unknown_116c99: ; 116c99
+Unknown_116c99:
 	db $10
 	db $19, $0, $0, $2a
 	db $19, $8, $77, $2a
@@ -6256,7 +6034,7 @@ Unknown_116c99: ; 116c99
 	db $1, $10, $19, $2a
 	db $1, $18, $63, $2a
 
-Unknown_116cda: ; 116cda
+Unknown_116cda:
 	db $10
 	db $18, $0, $0, $a
 	db $18, $8, $57, $2a
@@ -6275,7 +6053,7 @@ Unknown_116cda: ; 116cda
 	db $0, $10, $49, $2a
 	db $0, $18, $48, $2a
 
-Unknown_116d1b: ; 116d1b
+Unknown_116d1b:
 	db $c
 	db $0, $0, $38, $4a
 	db $0, $8, $39, $4a
@@ -6290,7 +6068,7 @@ Unknown_116d1b: ; 116d1b
 	db $10, $10, $19, $6a
 	db $10, $18, $9, $6d
 
-Unknown_116d4c: ; 116d4c
+Unknown_116d4c:
 	db $e
 	db $0, $8, $3b, $4a
 	db $0, $10, $3b, $6a
@@ -6307,7 +6085,7 @@ Unknown_116d4c: ; 116d4c
 	db $18, $10, $b, $6a
 	db $18, $18, $a, $6a
 
-Unknown_116d85: ; 116d85
+Unknown_116d85:
 	db $e
 	db $0, $0, $35, $2a
 	db $0, $8, $3c, $4a
@@ -6324,7 +6102,7 @@ Unknown_116d85: ; 116d85
 	db $18, $10, $e, $4d
 	db $18, $18, $f, $4a
 
-Unknown_116dbe: ; 116dbe
+Unknown_116dbe:
 	db $e
 	db $0, $0, $65, $4a
 	db $0, $8, $66, $4a
@@ -6341,7 +6119,7 @@ Unknown_116dbe: ; 116dbe
 	db $18, $8, $40, $4d
 	db $18, $10, $41, $4d
 
-Unknown_116df7: ; 116df7
+Unknown_116df7:
 	db $e
 	db $0, $0, $3e, $6a
 	db $0, $8, $3d, $6a
@@ -6358,7 +6136,7 @@ Unknown_116df7: ; 116df7
 	db $18, $0, $f, $6a
 	db $18, $8, $e, $6d
 
-Unknown_116e30: ; 116e30
+Unknown_116e30:
 	db $e
 	db $0, $0, $68, $6a
 	db $0, $8, $67, $6a
@@ -6375,7 +6153,7 @@ Unknown_116e30: ; 116e30
 	db $18, $10, $40, $6d
 	db $18, $18, $3f, $6d
 
-Unknown_116e69: ; 116e69
+Unknown_116e69:
 	db $c
 	db $8, $0, $9, $d
 	db $8, $8, $19, $a
@@ -6390,7 +6168,7 @@ Unknown_116e69: ; 116e69
 	db $18, $10, $39, $2a
 	db $18, $18, $38, $2a
 
-Unknown_116e9a: ; 116e9a
+Unknown_116e9a:
 	db $e
 	db $0, $0, $a, $a
 	db $0, $8, $b, $a
@@ -6407,7 +6185,7 @@ Unknown_116e9a: ; 116e9a
 	db $18, $8, $3b, $a
 	db $18, $10, $3b, $2a
 
-Unknown_116ed3: ; 116ed3
+Unknown_116ed3:
 	db $e
 	db $0, $10, $e, $d
 	db $0, $18, $f, $a
@@ -6424,7 +6202,7 @@ Unknown_116ed3: ; 116ed3
 	db $18, $10, $3d, $a
 	db $18, $18, $3e, $a
 
-Unknown_116f0c: ; 116f0c
+Unknown_116f0c:
 	db $e
 	db $0, $0, $3f, $d
 	db $0, $8, $40, $d
@@ -6441,7 +6219,7 @@ Unknown_116f0c: ; 116f0c
 	db $18, $10, $67, $a
 	db $18, $18, $68, $a
 
-Unknown_116f45: ; 116f45
+Unknown_116f45:
 	db $e
 	db $0, $0, $f, $2a
 	db $0, $8, $e, $2d
@@ -6458,7 +6236,7 @@ Unknown_116f45: ; 116f45
 	db $18, $10, $3c, $2a
 	db $18, $18, $35, $4a
 
-Unknown_116f7e: ; 116f7e
+Unknown_116f7e:
 	db $e
 	db $0, $8, $41, $2d
 	db $0, $10, $40, $2d
@@ -6475,7 +6253,7 @@ Unknown_116f7e: ; 116f7e
 	db $18, $10, $66, $2a
 	db $18, $18, $65, $2a
 
-Unknown_116fb7: ; 116fb7
+Unknown_116fb7:
 	db $d
 	db $fa, $0, $72, $a
 	db $fa, $8, $73, $d
@@ -6491,7 +6269,7 @@ Unknown_116fb7: ; 116fb7
 	db $a, $18, $94, $a
 	db $12, $10, $a3, $a
 
-Unknown_116fec: ; 116fec
+Unknown_116fec:
 	db $e
 	db $fd, $0, $85, $d
 	db $fd, $8, $86, $d
@@ -6508,7 +6286,7 @@ Unknown_116fec: ; 116fec
 	db $15, $10, $b5, $a
 	db $15, $18, $b6, $a
 
-Unknown_117025: ; 117025
+Unknown_117025:
 	db $c
 	db $8, $0, $79, $d
 	db $8, $8, $7a, $d
@@ -6523,7 +6301,7 @@ Unknown_117025: ; 117025
 	db $18, $10, $9b, $a
 	db $18, $18, $9c, $a
 
-Unknown_117056: ; 117056
+Unknown_117056:
 	db $b
 	db $8, $0, $7d, $a
 	db $8, $8, $7e, $d
@@ -6537,7 +6315,7 @@ Unknown_117056: ; 117056
 	db $18, $10, $9f, $a
 	db $18, $18, $a0, $a
 
-Unknown_117083: ; 117083
+Unknown_117083:
 	db $f
 	db $0, $0, $a1, $a
 	db $0, $8, $a2, $a
@@ -6555,7 +6333,7 @@ Unknown_117083: ; 117083
 	db $18, $10, $87, $a
 	db $18, $18, $88, $a
 
-Unknown_1170c0: ; 1170c0
+Unknown_1170c0:
 	db $f
 	db $0, $0, $a1, $a
 	db $0, $8, $a2, $d
@@ -6573,7 +6351,7 @@ Unknown_1170c0: ; 1170c0
 	db $18, $10, $87, $a
 	db $18, $18, $88, $a
 
-Unknown_1170fd: ; 1170fd
+Unknown_1170fd:
 	db $f
 	db $0, $0, $a9, $a
 	db $0, $8, $aa, $a
@@ -6591,7 +6369,7 @@ Unknown_1170fd: ; 1170fd
 	db $18, $10, $ba, $a
 	db $18, $18, $bb, $a
 
-Unknown_11713a: ; 11713a
+Unknown_11713a:
 	db $f
 	db $0, $0, $ae, $c
 	db $0, $8, $af, $c
@@ -6609,7 +6387,7 @@ Unknown_11713a: ; 11713a
 	db $18, $10, $c0, $c
 	db $18, $18, $be, $c
 
-Unknown_117177: ; 117177
+Unknown_117177:
 	db $9
 	db $14, $0, $1f, $6
 	db $14, $8, $20, $6
@@ -6621,7 +6399,7 @@ Unknown_117177: ; 117177
 	db $4, $8, $2, $6
 	db $4, $10, $3, $6
 
-Unknown_11719c: ; 11719c
+Unknown_11719c:
 	db $9
 	db $14, $0, $22, $6
 	db $14, $8, $23, $6
@@ -6633,7 +6411,7 @@ Unknown_11719c: ; 11719c
 	db $4, $8, $5, $6
 	db $4, $10, $6, $6
 
-Unknown_1171c1: ; 1171c1
+Unknown_1171c1:
 	db $9
 	db $14, $0, $25, $6
 	db $14, $8, $26, $6
@@ -6645,7 +6423,7 @@ Unknown_1171c1: ; 1171c1
 	db $4, $8, $8, $6
 	db $4, $10, $9, $6
 
-Unknown_1171e6: ; 1171e6
+Unknown_1171e6:
 	db $9
 	db $14, $0, $28, $6
 	db $14, $8, $29, $6
@@ -6657,7 +6435,7 @@ Unknown_1171e6: ; 1171e6
 	db $4, $8, $b, $6
 	db $4, $10, $c, $6
 
-Unknown_11720b: ; 11720b
+Unknown_11720b:
 	db $9
 	db $14, $0, $2b, $6
 	db $14, $8, $2c, $6
@@ -6669,7 +6447,7 @@ Unknown_11720b: ; 11720b
 	db $4, $8, $e, $6
 	db $4, $10, $f, $6
 
-Unknown_117230: ; 117230
+Unknown_117230:
 	db $9
 	db $14, $0, $47, $6
 	db $14, $8, $48, $6
@@ -6681,7 +6459,7 @@ Unknown_117230: ; 117230
 	db $4, $8, $2f, $6
 	db $4, $10, $30, $6
 
-Unknown_117255: ; 117255
+Unknown_117255:
 	db $9
 	db $14, $0, $35, $6
 	db $14, $8, $4a, $6
@@ -6693,7 +6471,7 @@ Unknown_117255: ; 117255
 	db $4, $8, $32, $6
 	db $4, $10, $31, $26
 
-Unknown_11727a: ; 11727a
+Unknown_11727a:
 	db $9
 	db $14, $0, $4b, $6
 	db $14, $8, $4c, $6
@@ -6705,7 +6483,7 @@ Unknown_11727a: ; 11727a
 	db $4, $8, $34, $6
 	db $4, $10, $35, $6
 
-Unknown_11729f: ; 11729f
+Unknown_11729f:
 	db $9
 	db $14, $0, $4e, $6
 	db $14, $8, $4f, $6
@@ -6717,7 +6495,7 @@ Unknown_11729f: ; 11729f
 	db $4, $8, $36, $6
 	db $4, $10, $37, $6
 
-Unknown_1172c4: ; 1172c4
+Unknown_1172c4:
 	db $9
 	db $14, $0, $51, $6
 	db $14, $8, $52, $6
@@ -6729,7 +6507,7 @@ Unknown_1172c4: ; 1172c4
 	db $4, $8, $39, $6
 	db $4, $10, $3a, $6
 
-Unknown_1172e9: ; 1172e9
+Unknown_1172e9:
 	db $9
 	db $10, $0, $0, $2
 	db $10, $8, $0, $2
@@ -6740,7 +6518,6 @@ Unknown_1172e9: ; 1172e9
 	db $0, $0, $0, $2
 	db $0, $8, $0, $2
 	db $4, $10, $10, $6
-; 11730e
 
 Palette_11730e:
 	RGB 31, 31, 31
@@ -6782,7 +6559,7 @@ Palette_11734e:
 	RGB 10,  9,  9
 	RGB 15, 14, 14
 
-Unknown_117356: ; 117356
+Unknown_117356:
 	db $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9
 	db $c9, $c9, $c9, $c9, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1
 	db $c5, $c6, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2
@@ -6832,18 +6609,15 @@ Unknown_117356: ; 117356
 	db $8f, $8f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08
 	db $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f
 	db $8f, $8f, $8f, $8f, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08
-; 117656
 
 
 SECTION "Mobile Stadium", ROMX
 
-Special_GiveOddEgg: ; 117656
-	farcall GiveOddEgg
+GiveOddEgg:
+	farcall _GiveOddEgg
 	ret
 
-; 11765d
-
-Function11765d: ; 11765d (45:765d)
+Function11765d:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -6853,7 +6627,7 @@ Function11765d: ; 11765d (45:765d)
 	ld [hInMenu], a
 	ret
 
-Function11766b: ; 11766b (45:766b)
+Function11766b:
 	call Function117699
 	ld a, [rSVBK]
 	push af
@@ -6874,7 +6648,7 @@ Function11766b: ; 11766b (45:766b)
 	ld [rSVBK], a
 	ret
 
-Function117699: ; 117699 (45:7699)
+Function117699:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, wcd49
@@ -6903,7 +6677,7 @@ Function117699: ; 117699 (45:7699)
 	farcall ClearSpriteAnims
 	ret
 
-Function1176ee: ; 1176ee (45:76ee)
+Function1176ee:
 .loop
 	call JoyTextDelay
 	ld a, [wcd49]
@@ -6921,7 +6695,7 @@ Function1176ee: ; 1176ee (45:76ee)
 	call ClearSprites
 	ret
 
-Function117719: ; 117719 (45:7719)
+Function117719:
 	ld a, [wcd49]
 	ld e, a
 	ld d, 0
@@ -6933,7 +6707,7 @@ Function117719: ; 117719 (45:7719)
 	ld l, a
 	jp hl
 
-Jumptable_117728: ; 117728 (45:7728)
+Jumptable_117728:
 	dw Function117738
 	dw Function117764
 	dw Function1178aa
@@ -6943,8 +6717,7 @@ Jumptable_117728: ; 117728 (45:7728)
 	dw Function117984
 	dw Function1179a7
 
-
-Function117738: ; 117738 (45:7738)
+Function117738:
 	farcall Function171ccd
 	depixel 6, 3
 	ld a, $1d
@@ -6964,7 +6737,7 @@ Function117738: ; 117738 (45:7738)
 	ld [wcd23], a
 	jp MobilePassword_IncrementJumptable
 
-Function117764: ; 117764 (45:7764)
+Function117764:
 	ld a, [wcd4a]
 	cp $10
 	jr nz, .asm_11776f
@@ -7003,18 +6776,18 @@ Function117764: ; 117764 (45:7764)
 	jp nz, Function117764_d_right
 	ret
 
-Function117764_select: ; 1177a5 (45:77a5)
+Function117764_select:
 	farcall Function171cf0
 	ret
 
-Function117764_start: ; 1177ac (45:77ac)
+Function117764_start:
 	ld a, $2
 	ld [wcd4c], a
 	ld a, $4
 	ld [wcd4d], a
 	ret
 
-Function1177b7: ; 1177b7 (45:77b7)
+Function1177b7:
 	ld a, $3
 	ld [wcd24], a
 	ld a, [wcd4a]
@@ -7027,13 +6800,13 @@ Function1177b7: ; 1177b7 (45:77b7)
 	ld [wcd49], a
 	ret
 
-Function1177cb: ; 1177cb (45:77cb)
+Function1177cb:
 	ld a, $80
 	ld [wcd49], a
 	ld [wScriptVar], a
 	jp MobilePassword_IncrementJumptable
 
-Function117764_b_button: ; 1177d6 (45:77d6)
+Function117764_b_button:
 	call PlayClickSFX
 	ld a, [wcd4a]
 	and a
@@ -7051,7 +6824,7 @@ Function117764_b_button: ; 1177d6 (45:77d6)
 	ld [hl], a
 	ret
 
-Function117764_d_up: ; 1177f1 (45:77f1)
+Function117764_d_up:
 	ld a, [wcd4d]
 	and a
 	ret z
@@ -7064,11 +6837,11 @@ Function117764_d_up: ; 1177f1 (45:77f1)
 	sla a
 	sla a
 	add e
-Function117764_d_vertical_load: ; 117806 (45:7806)
+Function117764_d_vertical_load:
 	ld [wcd4c], a
 	ret
 
-Function117764_d_down: ; 11780a (45:780a)
+Function117764_d_down:
 	ld a, [wcd4d]
 	cp $4
 	ret z
@@ -7092,7 +6865,7 @@ Function117764_d_down: ; 11780a (45:780a)
 	ld a, $1
 	jr Function117764_d_vertical_load
 
-Function117764_d_left: ; 11782d (45:782d)
+Function117764_d_left:
 	ld a, [wcd4c]
 	and a
 	ret z
@@ -7100,7 +6873,7 @@ Function117764_d_left: ; 11782d (45:782d)
 	ld [wcd4c], a
 	ret
 
-Function117764_d_right: ; 117837 (45:7837)
+Function117764_d_right:
 	ld e, $d
 	ld a, [wcd4d]
 	cp $4
@@ -7114,7 +6887,7 @@ Function117764_d_right: ; 117837 (45:7837)
 	ld [wcd4c], a
 	ret
 
-Function117764_a_button: ; 11784c (45:784c)
+Function117764_a_button:
 	call PlayClickSFX
 	ld a, [wcd4d]
 	cp $4
@@ -7167,13 +6940,13 @@ Function117764_a_button: ; 11784c (45:784c)
 	ret nz
 	jp Function117764_start
 
-Function1178aa: ; 1178aa (45:78aa)
-	ld hl, MenuDataHeader_1179b5
-	call LoadMenuDataHeader
+Function1178aa:
+	ld hl, MenuHeader_1179b5
+	call LoadMenuHeader
 	call MenuBox
 	call MenuBoxCoord2Tile
-	ld hl, MenuDataHeader_1179bd
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_1179bd
+	call LoadMenuHeader
 	call MenuBox
 	call MenuBoxCoord2Tile
 	farcall ReloadMapPart
@@ -7190,7 +6963,7 @@ Function1178aa: ; 1178aa (45:78aa)
 	ld [wcd4e], a
 	jp MobilePassword_IncrementJumptable
 
-Function1178e8: ; 1178e8 (45:78e8)
+Function1178e8:
 	ld a, [hJoyPressed]
 	cp B_BUTTON
 	jr z, .b_button
@@ -7242,7 +7015,7 @@ Function1178e8: ; 1178e8 (45:78e8)
 	call ExitMenu
 	jp MobilePassword_IncrementJumptable
 
-Function117942: ; 117942 (45:7942)
+Function117942:
 	call SpeechTextBox
 	hlcoord 1, 14
 	ld de, SavedPasswordString
@@ -7263,19 +7036,19 @@ Function117942: ; 117942 (45:7942)
 	jr z, asm_11797e
 	call MobilePassword_IncrementJumptable
 
-Function117976: ; 117976 (45:7976)
+Function117976:
 	ld hl, wcd4e
 	dec [hl]
 	ret nz
 	call ExitMenu
-asm_11797e: ; 11797e (45:797e)
+asm_11797e:
 	ld a, $80
 	ld [wcd49], a
 	ret
 
-Function117984: ; 117984 (45:7984)
-	ld hl, MenuDataHeader_1179b5
-	call LoadMenuDataHeader
+Function117984:
+	ld hl, MenuHeader_1179b5
+	call LoadMenuHeader
 	call MenuBox
 	call MenuBoxCoord2Tile
 	farcall ReloadMapPart
@@ -7286,7 +7059,7 @@ Function117984: ; 117984 (45:7984)
 	ld [wcd4e], a
 	call MobilePassword_IncrementJumptable
 
-Function1179a7: ; 1179a7 (45:79a7)
+Function1179a7:
 	ld hl, wcd4e
 	dec [hl]
 	ret nz
@@ -7295,62 +7068,49 @@ Function1179a7: ; 1179a7 (45:79a7)
 	ld [wcd49], a
 	ret
 
-; 1179b5 (45:79b5)
-
-MenuDataHeader_1179b5: ; 1179b5
+MenuHeader_1179b5:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw NULL
 	db 0 ; default option
-; 1179bd
 
-MenuDataHeader_1179bd: ; 1179bd
+MenuHeader_1179bd:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw NULL
 	db 0 ; default option
-; 1179c5
 
-
-YessNoString_1179c5: ; 1179c5
+YessNoString_1179c5:
 	db   "はい"
 	next "いいえ@"
-; 1179cc
 
-AskSavePasswordString: ; 1179cc
+AskSavePasswordString:
 	db   "こ<NO>パスワード¯ほぞんして"
 	line "おきますか？@"
-; 1179e1
 
-NotAPokemonPasswordString: ; 1179e1
+NotAPokemonPasswordString:
 	db   "パスワード<PKMN>にゅうりょく"
 	line "されていません！@"
-; 1179f7
 
-SavedPasswordString: ; 1179f7
+SavedPasswordString:
 	db   "ログインパスワード¯ほぞん"
 	line "しました@"
-; 117a0a
 
-MobilePassword_IncrementJumptable: ; 117a0a (45:7a0a)
+MobilePassword_IncrementJumptable:
 	ld hl, wcd49
 	inc [hl]
 	ret
 
-; 117a0f (45:7a0f)
-
 Unknown_117a0f:
 INCBIN "data/mobile/ascii-alpha.txt"
 
 Unknown_117a47:
 INCBIN "data/mobile/ascii-sym.txt"
-; 117a7f
-
 
 ; everything from here to the end of the bank is related to the
 ; Mobile Stadium option from the continue/newgame menu.
 ; Needs better function names
-MobileStudium: ; 0x117a7f
+MobileStudium:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -7360,16 +7120,12 @@ MobileStudium: ; 0x117a7f
 	ld [hInMenu], a
 	ret
 
-; 0x117a8d
-
-Function117a8d: ; 0x117a8d
+Function117a8d:
 	call Function117a94
 	call Function117acd
 	ret
 
-; 0x117a94
-
-Function117a94: ; 0x117a94
+Function117a94:
 	xor a
 	ld [wJumptableIndex], a
 	ld [wcf64], a
@@ -7381,9 +7137,7 @@ Function117a94: ; 0x117a94
 	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
 	ret
 
-; 0x117ab4
-
-Function117ab4: ; 0x117ab4
+Function117ab4:
 	call ClearBGPalettes
 	call ClearSprites
 	farcall Function172e78
@@ -7391,9 +7145,7 @@ Function117ab4: ; 0x117ab4
 	farcall ReloadMapPart
 	ret
 
-; 0x117acd
-
-Function117acd: ; 0x117acd
+Function117acd:
 	call JoyTextDelay
 	ld a, [wJumptableIndex]
 	bit 7, a
@@ -7407,7 +7159,7 @@ Function117acd: ; 0x117acd
 	call ClearSprites
 	ret
 
-Function117ae9: ; 0x117ae9
+Function117ae9:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, $0
@@ -7419,7 +7171,7 @@ Function117ae9: ; 0x117ae9
 	ld l, a
 	jp hl
 
-.Jumptable: ; 0x117af8
+.Jumptable:
 	dw Function117b06
 	dw Function117b14
 	dw Function117b28
@@ -7438,8 +7190,8 @@ Function117b14:
 	ld hl, wcf64
 	dec [hl]
 	ret nz
-	ld hl, MenuDataHeader_117cbc
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_117cbc
+	call LoadMenuHeader
 	call MenuBox
 	call MenuBoxCoord2Tile
 	jp MobileStudium_JumptableIncrement
@@ -7450,8 +7202,8 @@ Function117b28:
 	jp MobileStudium_JumptableIncrement
 
 Function117b31:
-	ld hl, MenuDataHeader_117cc4
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_117cc4
+	call LoadMenuHeader
 	call MenuBox
 	call MenuBoxCoord2Tile
 	hlcoord 16, 8
@@ -7595,8 +7347,8 @@ Function117bb6:
 	jp MobileStudium_JumptableIncrement
 
 Function117c4a:
-	ld hl, MenuDataHeader_117cbc
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_117cbc
+	call LoadMenuHeader
 	call MenuBox
 	call MenuBoxCoord2Tile
 	farcall ReloadMapPart
@@ -7656,31 +7408,31 @@ Function117c89:
 	call CloseSRAM
 	ret
 
-MenuDataHeader_117cbc: ; 0x117cbc
+MenuHeader_117cbc:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw NULL
 	db 0 ; default option
 
-MenuDataHeader_117cc4: ; 0x117cc4
+MenuHeader_117cc4:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw NULL
 	db 0 ; default item
 
-YesNo117ccc: ; 0x117ccc
+YesNo117ccc:
 	db   "はい"
 	next "いいえ@"
 
-MobileStadiumEntryText: ; 0x117cd3
+MobileStadiumEntryText:
 	text_jump _MobileStadiumEntryText
 	db "@"
 
-MobileStadiumSuccessText: ; 0x117cd8
+MobileStadiumSuccessText:
 	text_jump _MobileStadiumSuccessText
 	db "@"
 
-MobileStudium_JumptableIncrement: ; 0x117cdd
+MobileStudium_JumptableIncrement:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm
index 438f42107..eb1b74ab2 100755..100644
--- a/mobile/mobile_45_sprite_engine.asm
+++ b/mobile/mobile_45_sprite_engine.asm
@@ -1,4 +1,4 @@
-Function115d99: ; 115d99
+Function115d99:
 	ld de, GFX_11601a
 	ld hl, vTiles0 tile $60
 	lb bc, BANK(GFX_11601a), 20
@@ -16,9 +16,7 @@ Function115d99: ; 115d99
 	ld [wc308], a
 	ret
 
-; 115dc3
-
-Function115dc3: ; 115dc3
+Function115dc3:
 	xor a
 	ld [wc305], a
 	ld a, $a0
@@ -27,9 +25,7 @@ Function115dc3: ; 115dc3
 	call ByteFill
 	ret
 
-; 115dd3
-
-Function115dd3: ; 115dd3
+Function115dd3:
 	ld a, [wc305]
 	and a
 	ret z
@@ -77,25 +73,21 @@ Function115dd3: ; 115dd3
 	jr nz, .asm_115e04
 	ret
 
-; 115e18
-
-Function115e18: ; 115e18
+Function115e18:
 	ld a, c
 	ld [wc30a], a
 	xor a
 	ld [wc30b], a
 	jr Function115e2b
 
-; 115e22
-
-Function115e22: ; 115e22
+Function115e22:
 	ld hl, wc30c
 	dec [hl]
 	ret nz
 	ld hl, wc30b
 	inc [hl]
 
-Function115e2b: ; 115e2b
+Function115e2b:
 	ld a, [wc30a]
 	sla a
 	ld c, a
@@ -126,8 +118,6 @@ Function115e2b: ; 115e2b
 	ld [wc30c], a
 	ret
 
-; 115e59
-
 Unknown_115e59:
 	dw Unknown_115e61
 	dw Unknown_115e6c
@@ -135,7 +125,7 @@ Unknown_115e59:
 	dw Unknown_115e79
 
 ; OAM idx (see Unknown_115e86), flip flags/duration
-Unknown_115e61: ; 115e61
+Unknown_115e61:
 	db $04, $08
 	db $05, $08
 	db $06, $08
@@ -143,17 +133,17 @@ Unknown_115e61: ; 115e61
 	db $08, $08
 	db -1
 
-Unknown_115e6c: ; 115e6c
+Unknown_115e6c:
 	db $01, $08
 	db $02, $08
 	db $03, $08
 	db $09, $08
 	db $0a, $08
-Unknown_115e76: ; 115e76
+Unknown_115e76:
 	db $00, $08
 	db -1
 
-Unknown_115e79: ; 115e79
+Unknown_115e79:
 	db $0b, $08
 	db $0c, $08
 	db $0d, $08
@@ -161,7 +151,6 @@ Unknown_115e79: ; 115e79
 	db $0f, $08
 	db $00, $08
 	db -1
-; 115e86
 
 Unknown_115e86:
 	dw Unknown_115ea6
@@ -181,14 +170,14 @@ Unknown_115e86:
 	dw Unknown_115ff0
 	dw Unknown_116005
 
-Unknown_115ea6: ; 115ea6
+Unknown_115ea6:
 	db 4
 	dsprite   1, 0,   0, 0, $60, $01
 	dsprite   1, 0,   1, 0, $61, $01
 	dsprite   2, 0,   0, 0, $62, $01
 	dsprite   2, 0,   1, 0, $63, $01
 
-Unknown_115eb7: ; 115eb7
+Unknown_115eb7:
 	db 5
 	dsprite   0, 0,   1, 0, $64, $00
 	dsprite   1, 0,   0, 0, $60, $01
@@ -196,7 +185,7 @@ Unknown_115eb7: ; 115eb7
 	dsprite   2, 0,   0, 0, $62, $01
 	dsprite   2, 0,   1, 0, $63, $01
 
-Unknown_115ecc: ; 115ecc
+Unknown_115ecc:
 	db 5
 	dsprite   0, 0,   1, 0, $65, $00
 	dsprite   1, 0,   0, 0, $60, $01
@@ -204,7 +193,7 @@ Unknown_115ecc: ; 115ecc
 	dsprite   2, 0,   0, 0, $62, $01
 	dsprite   2, 0,   1, 0, $63, $01
 
-Unknown_115ee1: ; 115ee1
+Unknown_115ee1:
 	db 5
 	dsprite   0, 0,   1, 0, $66, $00
 	dsprite   1, 0,   0, 0, $60, $01
@@ -212,7 +201,7 @@ Unknown_115ee1: ; 115ee1
 	dsprite   2, 0,   0, 0, $62, $01
 	dsprite   2, 0,   1, 0, $63, $01
 
-Unknown_115ef6: ; 115ef6
+Unknown_115ef6:
 	db 7
 	dsprite   0, 0,   0, 0, $67, $01
 	dsprite   1, 0,   0, 0, $68, $01
@@ -222,7 +211,7 @@ Unknown_115ef6: ; 115ef6
 	dsprite   3, 0,   1, 0, $6b, $00
 	dsprite   3, 0,   2, 0, $6c, $00
 
-Unknown_115f13: ; 115f13
+Unknown_115f13:
 	db 7
 	dsprite   0, 0,   0, 0, $67, $01
 	dsprite   1, 0,   0, 0, $68, $01
@@ -232,7 +221,7 @@ Unknown_115f13: ; 115f13
 	dsprite   3, 0,   1, 0, $6b, $00
 	dsprite   3, 0,   2, 0, $6c, $00
 
-Unknown_115f30: ; 115f30
+Unknown_115f30:
 	db 7
 	dsprite   0, 0,   0, 0, $67, $01
 	dsprite   1, 0,   0, 0, $68, $01
@@ -242,7 +231,7 @@ Unknown_115f30: ; 115f30
 	dsprite   3, 0,   1, 0, $6b, $00
 	dsprite   3, 0,   2, 0, $6c, $00
 
-Unknown_115f4d: ; 115f4d
+Unknown_115f4d:
 	db 7
 	dsprite   0, 0,   0, 0, $67, $01
 	dsprite   1, 0,   0, 0, $68, $01
@@ -252,7 +241,7 @@ Unknown_115f4d: ; 115f4d
 	dsprite   3, 0,   1, 0, $6b, $00
 	dsprite   3, 0,   2, 0, $6c, $00
 
-Unknown_115f6a: ; 115f6a
+Unknown_115f6a:
 	db 7
 	dsprite   0, 0,   0, 0, $67, $01
 	dsprite   1, 0,   0, 0, $68, $01
@@ -262,7 +251,7 @@ Unknown_115f6a: ; 115f6a
 	dsprite   3, 0,   1, 0, $6b, $00
 	dsprite   3, 0,   2, 0, $6c, $00
 
-Unknown_115f87: ; 115f87
+Unknown_115f87:
 	db 5
 	dsprite   0, 0,   1, 0, $72, $00
 	dsprite   1, 0,   0, 0, $60, $01
@@ -270,7 +259,7 @@ Unknown_115f87: ; 115f87
 	dsprite   2, 0,   0, 0, $62, $01
 	dsprite   2, 0,   1, 0, $63, $01
 
-Unknown_115f9c: ; 115f9c
+Unknown_115f9c:
 	db 5
 	dsprite   0, 0,   1, 0, $73, $00
 	dsprite   1, 0,   0, 0, $60, $01
@@ -278,7 +267,7 @@ Unknown_115f9c: ; 115f9c
 	dsprite   2, 0,   0, 0, $62, $01
 	dsprite   2, 0,   1, 0, $63, $01
 
-Unknown_115fb1: ; 115fb1
+Unknown_115fb1:
 	db 5
 	dsprite   0, 1,   1, 0, $64, $60
 	dsprite   1, 0,   0, 0, $60, $01
@@ -286,7 +275,7 @@ Unknown_115fb1: ; 115fb1
 	dsprite   2, 0,   0, 0, $62, $01
 	dsprite   2, 0,   1, 0, $63, $01
 
-Unknown_115fc6: ; 115fc6
+Unknown_115fc6:
 	db 5
 	dsprite   0, 1,   1, 0, $65, $60
 	dsprite   1, 0,   0, 0, $60, $01
@@ -294,7 +283,7 @@ Unknown_115fc6: ; 115fc6
 	dsprite   2, 0,   0, 0, $62, $01
 	dsprite   2, 0,   1, 0, $63, $01
 
-Unknown_115fdb: ; 115fdb
+Unknown_115fdb:
 	db 5
 	dsprite   0, 1,   1, 0, $66, $60
 	dsprite   1, 0,   0, 0, $60, $01
@@ -302,7 +291,7 @@ Unknown_115fdb: ; 115fdb
 	dsprite   2, 0,   0, 0, $62, $01
 	dsprite   2, 0,   1, 0, $63, $01
 
-Unknown_115ff0: ; 115ff0
+Unknown_115ff0:
 	db 5
 	dsprite   0, 1,   1, 0, $72, $60
 	dsprite   1, 0,   0, 0, $60, $01
@@ -310,20 +299,18 @@ Unknown_115ff0: ; 115ff0
 	dsprite   2, 0,   0, 0, $62, $01
 	dsprite   2, 0,   1, 0, $63, $01
 
-Unknown_116005: ; 116005
+Unknown_116005:
 	db 5
 	dsprite   0, 1,   1, 0, $73, $60
 	dsprite   1, 0,   0, 0, $60, $01
 	dsprite   1, 0,   1, 0, $61, $01
 	dsprite   2, 0,   0, 0, $62, $01
 	dsprite   2, 0,   1, 0, $63, $01
-; 11601a
 
-GFX_11601a:: ; 11601a
+GFX_11601a::
 INCBIN "gfx/unknown/11601a.2bpp"
 
-
-Function11615a: ; 11615a
+Function11615a:
 	xor a
 	ld [wc30d], a
 	ld [$c319], a
@@ -350,9 +337,7 @@ Function11615a: ; 11615a
 	ld [wc3f3], a
 	ret
 
-; 11619d
-
-Function11619d: ; 11619d
+Function11619d:
 	ld a, [wc30d]
 	and a
 	ret z
@@ -368,9 +353,7 @@ Function11619d: ; 11619d
 	call Function1161b8
 	ret
 
-; 1161b8
-
-Function1161b8: ; 1161b8
+Function1161b8:
 	ld a, [$c319]
 	ld e, a
 	ld d, 0
@@ -382,9 +365,7 @@ Function1161b8: ; 1161b8
 	ld l, a
 	jp hl
 
-; 1161c7
-
-.Jumptable: ; 1161c7
+.Jumptable:
 	dw Function1161d5
 	dw Function116294
 	dw Function1162cb
@@ -392,9 +373,8 @@ Function1161b8: ; 1161b8
 	dw Function1163c0
 	dw Function11636e
 	dw Function116441
-; 1161d5
 
-Function1161d5: ; 1161d5
+Function1161d5:
 	ld a, [rSVBK]
 	push af
 
@@ -504,16 +484,13 @@ Function1161d5: ; 1161d5
 	ld [$c319], a
 	ret
 
-; 11628c
-
-MenuDataHeader_11628c: ; 11628c
+MenuHeader_11628c:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 6, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw NULL
 	db 0 ; default option
-; 116294
 
-Function116294: ; 116294
+Function116294:
 	farcall Function170d02
 	ld a, [$c319]
 	inc a
@@ -537,9 +514,7 @@ Function116294: ; 116294
 	ld [hWY], a
 	ret
 
-; 1162cb
-
-Function1162cb: ; 1162cb
+Function1162cb:
 	farcall Function170cc6
 	ld a, [$c319]
 	inc a
@@ -557,9 +532,7 @@ Function1162cb: ; 1162cb
 	ld [rSVBK], a
 	ret
 
-; 1162f2
-
-Function1162f2: ; 1162f2
+Function1162f2:
 	call Function11659d
 	call Function116758
 	call Function1167a6
@@ -648,9 +621,7 @@ Function1162f2: ; 1162f2
 	jr nz, .asm_11635a
 	ret
 
-; 11636e
-
-Function11636e: ; 11636e
+Function11636e:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -687,9 +658,7 @@ Function11636e: ; 11636e
 	ld [wc30d], a
 	ret
 
-; 1163c0
-
-Function1163c0: ; 1163c0
+Function1163c0:
 	ld a, [rSVBK]
 	push af
 	ld a, $1
@@ -746,9 +715,7 @@ Function1163c0: ; 1163c0
 	ld [wc30d], a
 	ret
 
-; 116441
-
-Function116441: ; 116441
+Function116441:
 	farcall Function17d405
 	ld a, $90
 	ld [hWY], a
@@ -764,9 +731,7 @@ Function116441: ; 116441
 	ld [wc30d], a
 	ret
 
-; 116468
-
-Function116468: ; 116468
+Function116468:
 	call Function116567
 	ld a, [wc314]
 	cp $d
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index 0298c075b..95e1f5ac5 100755..100644
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1,11 +1,11 @@
 SECTION "Mobile 46", ROMX
 
-Function118000: ; 118000
+Function118000:
 	ld a, $1
 	ld [wcd38], a
 	jr asm_11800b
 
-Function118007: ; 118007
+Function118007:
 	xor a
 	ld [wcd38], a
 
@@ -44,11 +44,10 @@ asm_11800b
 	ld [rSVBK], a
 	call BattleTowerRoomMenu_Cleanup
 	call ReturnToMapFromSubmenu
-BattleTowerRoomMenu_DoNothing: ; 11805e (46:405e)
+BattleTowerRoomMenu_DoNothing:
 	ret
-; 11805f
 
-Function11805f: ; 11805f
+Function11805f:
 	ld a, $1
 	ld [wcd38], a
 	call BattleTowerRoomMenu_InitRAM
@@ -86,9 +85,8 @@ Function11805f: ; 11805f
 	call BattleTowerRoomMenu_Cleanup
 	call ReturnToMapFromSubmenu
 	ret
-; 1180b8
 
-Function1180b8: ; 1180b8
+Function1180b8:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $22
 	ld [wcd33], a
@@ -132,17 +130,16 @@ Function1180b8: ; 1180b8
 	call BattleTowerRoomMenu_Cleanup
 	call ReturnToMapFromSubmenu
 	ret
-; 11811a
 
-Function11811a: ; 11811a
+Function11811a:
 	ld a, 1
 	ld [wcd38], a
 	jr Function118125
 
-_BattleTowerRoomMenu: ; 118121
+_BattleTowerRoomMenu:
 	xor a
 	ld [wcd38], a
-Function118125: ; 118125
+Function118125:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $3
 	ld [wcd33], a
@@ -180,9 +177,8 @@ Function118125: ; 118125
 	call Function118180
 	call ReturnToMapFromSubmenu
 	ret
-; 118180
 
-Function118180: ; 118180
+Function118180:
 	ld a, [wScriptVar]
 	and a
 	ret nz
@@ -226,9 +222,8 @@ Function118180: ; 118180
 	ld [wc300], a
 	ld [wScriptVar], a
 	jr .reset_banks
-; 1181da
 
-Function1181da: ; 1181da
+Function1181da:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $2
 	ld [wcd38], a
@@ -266,9 +261,8 @@ Function1181da: ; 1181da
 	call BattleTowerRoomMenu_Cleanup
 	call ReturnToMapFromSubmenu
 	ret
-; 118233
 
-Function118233: ; 118233
+Function118233:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $1b
 	ld [wcd33], a
@@ -303,9 +297,8 @@ Function118233: ; 118233
 	ld [rSVBK], a
 	call BattleTowerRoomMenu_Cleanup
 	ret
-; 118284
 
-Function118284: ; 118284
+Function118284:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $19
 	ld [wcd33], a
@@ -339,10 +332,8 @@ Function118284: ; 118284
 	ld [rSVBK], a
 	call BattleTowerRoomMenu_Cleanup
 	ret
-; 1182d5 (46:42d5)
 
-
-Function1182d5: ; 1182d5
+Function1182d5:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $18
 	ld [wcd33], a
@@ -378,9 +369,8 @@ Function1182d5: ; 1182d5
 	call BattleTowerRoomMenu_Cleanup
 	call ReturnToMapFromSubmenu
 	ret
-; 118329
 
-Function118329: ; 118329
+Function118329:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $15
 	ld [wcd33], a
@@ -415,9 +405,8 @@ Function118329: ; 118329
 	ld [rSVBK], a
 	call BattleTowerRoomMenu_Cleanup
 	ret
-; 11837a
 
-Function11837a: ; 11837a
+Function11837a:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $16
 	ld [wcd33], a
@@ -452,9 +441,8 @@ Function11837a: ; 11837a
 	ld [rSVBK], a
 	call BattleTowerRoomMenu_Cleanup
 	ret
-; 1183cb
 
-BattleTowerRoomMenu_InitRAM: ; 1183cb
+BattleTowerRoomMenu_InitRAM:
 	di
 	ld a, [rIE]
 	ld [wcd32], a
@@ -497,9 +485,8 @@ BattleTowerRoomMenu_InitRAM: ; 1183cb
 	ld [$bfff], a
 	call CloseSRAM
 	ret
-; 118440
 
-Function118440: ; 118440
+Function118440:
 	push af
 	ld a, $5
 	call GetSRAMBank
@@ -509,9 +496,8 @@ Function118440: ; 118440
 	call CloseSRAM
 	pop af
 	ret
-; 118452
 
-BattleTowerRoomMenu_Cleanup: ; 118452
+BattleTowerRoomMenu_Cleanup:
 	di
 	xor a
 	ld [hMobileReceive], a
@@ -528,9 +514,8 @@ BattleTowerRoomMenu_Cleanup: ; 118452
 	ld a, [wc300]
 	ld [wScriptVar], a
 	ret
-; 118473
 
-Function118473: ; 118473
+Function118473:
 	ld a, [wcd65]
 	and a
 	ret z
@@ -559,13 +544,11 @@ Function118473: ; 118473
 	xor a
 	ld [wcd65], a
 	ret
-; 1184a5
 
-Function1184a5: ; 1184a5
+Function1184a5:
 	jumptable .Jumptable, wcf66
-; 1184b4
 
-.Jumptable: ; 1184b4
+.Jumptable:
 	dw Function11886e
 	dw Function118880
 	dw Function11878d
@@ -594,13 +577,11 @@ Function1184a5: ; 1184a5
 	dw Function118e76
 	dw BattleTowerRoomMenu_CallRoomMenu2
 	dw Function118e76
-; 1184ec
 
-Function1184ec: ; 1184ec
+Function1184ec:
 	jumptable .Jumptable, wcf66
-; 1184fb
 
-.Jumptable: ; 1184fb
+.Jumptable:
 	dw Function11886e
 	dw Function118880
 	dw Function11878d
@@ -642,13 +623,11 @@ Function1184ec: ; 1184ec
 	dw Function11878d
 	dw Function119ac9
 	dw Function118e76
-; 11854d
 
-BattleTowerRoomMenu_Jumptable: ; 11854d
+BattleTowerRoomMenu_Jumptable:
 	jumptable .Jumptable, wcf66
-; 11855c
 
-.Jumptable: ; 11855c
+.Jumptable:
 	dw BattleTowerRoomMenu_PickLevelMessage
 	dw BattleTowerRoomMenu_PlacePickLevelMenu
 	dw BattleTowerRoomMenu_UpdatePickLevelMenu
@@ -665,13 +644,11 @@ BattleTowerRoomMenu_Jumptable: ; 11854d
 	dw Function118e76 ; mobile
 	dw BattleTowerRoomMenu_CallRoomMenu2 ; mobile
 	dw Function118e76 ; mobile
-; 11857c
 
-Function11857c: ; 11857c
+Function11857c:
 	jumptable .Jumptable, wcf66
-; 11858b
 
-.Jumptable: ; 11858b
+.Jumptable:
 	dw Function11886e
 	dw Function118880
 	dw Function11878d
@@ -700,13 +677,11 @@ Function11857c: ; 11857c
 	dw Function118e76
 	dw BattleTowerRoomMenu_CallRoomMenu2
 	dw Function118e76
-; 1185c3
 
-Function1185c3: ; 1185c3
+Function1185c3:
 	jumptable .Jumptable, wcf66
-; 1185d2
 
-.Jumptable: ; 1185d2
+.Jumptable:
 	dw Function11886e
 	dw Function118880
 	dw Function11878d
@@ -748,13 +723,11 @@ Function1185c3: ; 1185c3
 	dw BattleTowerRoomMenu_UpdateYesNoMenu
 	dw Function11914e
 	dw Function118e76
-; 118624
 
-Function118624: ; 118624
+Function118624:
 	jumptable .Jumptable, wcf66
-; 118633
 
-.Jumptable: ; 118633
+.Jumptable:
 	dw Function118866
 	dw Function118880
 	dw Function11878d
@@ -786,13 +759,11 @@ Function118624: ; 118624
 	dw Function118e76
 	dw BattleTowerRoomMenu_CallRoomMenu2
 	dw Function118e76
-; 118671
 
-Function118671: ; 118671
+Function118671:
 	jumptable .Jumptable, wcf66
-; 118680
 
-.Jumptable: ; 118680
+.Jumptable:
 	dw Function118866
 	dw Function118880
 	dw Function11878d
@@ -818,13 +789,11 @@ Function118671: ; 118671
 	dw Function118e76
 	dw BattleTowerRoomMenu_CallRoomMenu2
 	dw Function118e76
-; 1186b2
 
-Function1186b2: ; 1186b2
+Function1186b2:
 	jumptable .Jumptable, wcf66
-; 1186c1
 
-.Jumptable: ; 1186c1
+.Jumptable:
 	dw Function118866
 	dw Function118880
 	dw Function11878d
@@ -851,13 +820,11 @@ Function1186b2: ; 1186b2
 	dw Function118e76
 	dw BattleTowerRoomMenu_CallRoomMenu2
 	dw Function118e76
-; 1186f5
 
-Function1186f5: ; 1186f5 (46:46f5)
+Function1186f5:
 	jumptable .Jumptable, wcf66
-; 118704 (46:4704)
 
-.Jumptable: ; 118704 (46:4704)
+.Jumptable:
 	dw Function11886a
 	dw Function118880
 	dw Function11878d
@@ -891,13 +858,11 @@ Function1186f5: ; 1186f5 (46:46f5)
 	dw Function118e76
 	dw BattleTowerRoomMenu_CallRoomMenu2
 	dw Function118e76
-; 118746 (46:4746)
 
-Function118746: ; 118746
+Function118746:
 	jumptable .Jumptable, wcf66
-; 118755
 
-.Jumptable: ; 118755
+.Jumptable:
 	dw Function11886e
 	dw Function118880
 	dw Function11878d
@@ -926,9 +891,8 @@ Function118746: ; 118746
 	dw Function118e76
 	dw BattleTowerRoomMenu_CallRoomMenu2
 	dw Function118e76
-; 11878d
 
-Function11878d: ; 11878d (46:478d)
+Function11878d:
 	ld a, [wc821]
 	bit 1, a
 	jr nz, .asm_1187af
@@ -994,7 +958,7 @@ Function11878d: ; 11878d (46:478d)
 .asm_118803
 	ld a, $d3
 
-Function118805: ; 118805 (46:4805)
+Function118805:
 	ld [wc300], a
 	xor a
 	ld [wc301], a
@@ -1007,7 +971,7 @@ Function118805: ; 118805 (46:4805)
 	ld [wcf66], a
 	ret
 
-Function118821: ; 118821 (46:4821)
+Function118821:
 	ld a, [$c319]
 	cp $3
 	jr c, .asm_11884a
@@ -1029,9 +993,8 @@ Function118821: ; 118821 (46:4821)
 .asm_11884a
 	and a
 	ret
-; 11884c (46:484c)
 
-Function11884c: ; 11884c
+Function11884c:
 	ld a, [hJoyDown]
 	cp $5
 	jr nz, .asm_118864
@@ -1047,16 +1010,14 @@ Function11884c: ; 11884c
 .asm_118864
 	and a
 	ret
-; 118866
 
 Function118866:
 	ld a, 2
 	jr asm_11886f
 
-Function11886a: ; 11886a (46:486a)
+Function11886a:
 	ld a, 1
 	jr asm_11886f
-; 11886e (46:486e)
 
 Function11886e:
 	xor a
@@ -1069,7 +1030,7 @@ asm_11886f
 	ld a, [wcd33]
 	ld [wMobileInactivityTimerSeconds], a
 
-Function118880: ; 118880 (46:4880)
+Function118880:
 	call BattleTowerRoomMenu2
 	ret c
 	xor a
@@ -1079,9 +1040,8 @@ Function118880: ; 118880 (46:4880)
 	ld hl, $46
 	ld a, $2
 	jp Function119e2b
-; 118896 (46:4896)
 
-Function118896: ; 118896
+Function118896:
 	ld a, [wc821]
 	bit 1, a
 	jr nz, .asm_1188a5
@@ -1097,24 +1057,23 @@ Function118896: ; 118896
 .asm_1188aa
 	call BattleTowerRoomMenu_IncrementJumptable
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 1188b0
 
-Function1188b0: ; 1188b0 (46:48b0)
+Function1188b0:
 	ld de, $c346
 	ld a, $c
 	jp Function119e2b
 
-Function1188b8: ; 1188b8 (46:48b8)
+Function1188b8:
 	ld de, wc3ac
 	ld a, $e
 	jp Function119e2b
 
-Function1188c0: ; 1188c0 (46:48c0)
+Function1188c0:
 	ld de, wc3cd
 	ld a, $10
 	jp Function119e2b
 
-Function1188c8: ; 1188c8 (46:48c8)
+Function1188c8:
 	ld a, $1
 	ld [wcd65], a
 	call Function1188e7
@@ -1131,7 +1090,7 @@ Function1188c8: ; 1188c8 (46:48c8)
 	ld a, $6
 	jp Function119e2b
 
-Function1188e7: ; 1188e7 (46:48e7)
+Function1188e7:
 	ld de, $c346
 	ld a, $5
 	call GetSRAMBank
@@ -1150,7 +1109,7 @@ Function1188e7: ; 1188e7 (46:48e7)
 	jr nz, .asm_1188fa
 	ret
 
-Function118903: ; 118903 (46:4903)
+Function118903:
 	ld a, [wc3f0]
 	ld [$c319], a
 	ld c, $1
@@ -1160,13 +1119,11 @@ Function118903: ; 118903 (46:4903)
 	call BattleTowerRoomMenu2
 	jp BattleTowerRoomMenu_IncrementJumptable
 
-
-Function11891c: ; 11891c
+Function11891c:
 	call Function118b42
 	jp BattleTowerRoomMenu_IncrementJumptable
 
-
-BattleTowerRoomMenu_PickLevelMessage: ; 118922
+BattleTowerRoomMenu_PickLevelMessage:
 	ld a, [wcd38]
 	and a
 	jr nz, .asm_11892d
@@ -1184,8 +1141,8 @@ BattleTowerRoomMenu_PlacePickLevelMenu:
 	ld a, [$c31a]
 	and a
 	ret nz
-	ld hl, MenuDataHeader_119cf7
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_119cf7
+	call LoadMenuHeader
 	call MenuBox
 	call MenuBoxCoord2Tile
 	call ApplyTilemap
@@ -1199,15 +1156,15 @@ BattleTowerRoomMenu_PlacePickLevelMenu:
 	ld a, $1
 	ld [rSVBK], a
 	ld a, [wStatusFlags]
-	bit 6, a ; Hall Of Fame
+	bit STATUSFLAGS_HALL_OF_FAME_F, a
 	jr nz, .asm_11896b
-	ld hl, Strings_Ll0ToL40		; Address to list of strings with the choosable levels
-	ld a, 5						; 4 levels to choose from, including 'Cancel'-option
+	ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels
+	ld a, 5                 ; 4 levels to choose from, including 'Cancel'-option
 	jr .asm_118970
 
 .asm_11896b
-	ld hl, Strings_L10ToL100	; Address to list of strings with the choosable levels
-	ld a, 11					; 10 levels to choose from, including 'Cancel'-option
+	ld hl, Strings_L10ToL100 ; Address to list of strings with the choosable levels
+	ld a, 11                 ; 10 levels to choose from, including 'Cancel'-option
 
 .asm_118970
 	ld [wcd4a], a
@@ -1347,9 +1304,7 @@ BattleTowerRoomMenu_UpdatePickLevelMenu:
 	ld [wMobileInactivityTimerFrames], a
 	ret
 
-
-
-Function118a54: ; 118a54
+Function118a54:
 	ld a, [wcd55]
 	ld l, a
 	ld a, [wcd56]
@@ -1357,9 +1312,8 @@ Function118a54: ; 118a54
 	ld de, wc3ec
 	ld bc, $0004
 	jp Function118ae4
-; 118a65
 
-Function118a65: ; 118a65
+Function118a65:
 	ld hl, BattleDownloadURL
 	ld de, wcc60
 	ld bc, $80
@@ -1367,9 +1321,8 @@ Function118a65: ; 118a65
 	ld de, w3_d000
 	ld bc, $1000
 	jp Function118b10
-; 118a7a
 
-Function118a7a: ; 118a7a
+Function118a7a:
 	ld hl, BattleDownloadURL
 	ld de, wcc60
 	ld bc, $80
@@ -1377,9 +1330,8 @@ Function118a7a: ; 118a7a
 	ld de, w3_d000
 	ld bc, $1000
 	jp Function118b10
-; 118a8f
 
-Function118a8f: ; 118a8f
+Function118a8f:
 	ld hl, ExchangeDownloadURL
 	ld de, wcc60
 	ld bc, $80
@@ -1387,9 +1339,8 @@ Function118a8f: ; 118a8f
 	ld de, w3_d000
 	ld bc, $1000
 	jp Function118b10
-; 118aa4
 
-Function118aa4: ; 118aa4
+Function118aa4:
 	ld hl, NewsDownloadURL
 	ld de, wcc60
 	ld bc, $80
@@ -1399,9 +1350,8 @@ Function118aa4: ; 118aa4
 	ld de, w3_d100
 	ld bc, $e00
 	jr Function118b10
-; 118abc
 
-Function118abc: ; 118abc (46:4abc)
+Function118abc:
 	ld hl, MenuDownloadURL
 	ld de, wcc60
 	ld bc, $80
@@ -1409,7 +1359,6 @@ Function118abc: ; 118abc (46:4abc)
 	ld de, w3_d000
 	ld bc, $1000
 	jr Function118b10
-; 118ad0 (46:4ad0)
 
 Function118ad0:
 	ld hl, IndexDownloadURL
@@ -1449,7 +1398,6 @@ Function118ae4:
 	pop bc
 	ld a, $2a
 	jp Function119e2b
-; 118b10
 
 Function118b10:
 	push de
@@ -1463,7 +1411,7 @@ Function118b10:
 	ld a, $2a
 	jp Function119e2b
 
-Function118b24: ; 118b24 (46:4b24)
+Function118b24:
 	ld hl, $c346
 	ld a, $8
 	ld [hli], a
@@ -1479,9 +1427,8 @@ Function118b24: ; 118b24 (46:4b24)
 	ld [wcd89], a
 	ld hl, $c346
 	ret
-; 118b42 (46:4b42)
 
-Function118b42: ; 118b42
+Function118b42:
 	ld hl, wd002
 	ld a, l
 	ld [wcd51], a
@@ -1514,9 +1461,8 @@ Function118b42: ; 118b42
 	ld a, h
 	ld [wcd60], a
 	ret
-; 118b8c
 
-Function118b8c: ; 118b8c
+Function118b8c:
 .asm_118b8c
 	call Function118b9a
 	ret nc
@@ -1528,9 +1474,8 @@ Function118b8c: ; 118b8c
 	ld [hli], a
 	ld [hli], a
 	ret
-; 118b9a
 
-Function118b9a: ; 118b9a
+Function118b9a:
 	ld a, h
 	cp $e0
 	ret c
@@ -1538,28 +1483,25 @@ Function118b9a: ; 118b9a
 	call Function118805
 	and a
 	ret
-; 118ba5
-
 
 	charmap " ", $20 ; revert to ascii
 
-ExchangeDownloadURL: ; 0x118ba5
+ExchangeDownloadURL:
 	db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/exchange/index.txt", 0
 
-BattleDownloadURL: ; 0x118bf7
+BattleDownloadURL:
 	db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/battle/index.txt", 0
 
-NewsDownloadURL: ; 0x118c47
+NewsDownloadURL:
 	db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/news/index.txt", 0
 
-MenuDownloadURL: ; 0x118c95
+MenuDownloadURL:
 	db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/POKESTA/menu.cgb", 0
 
-IndexDownloadURL: ; 0x118ce5
+IndexDownloadURL:
 	db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0
 
-
-Unreferenced_Function118d35: ; 118d35
+Unreferenced_Function118d35:
 	ld hl, $d200
 	ld a, [wcd38]
 	and a
@@ -1600,9 +1542,8 @@ Unreferenced_Function118d35: ; 118d35
 .asm_118d7b
 	ld a, $d3
 	jp Function118805
-; 118d80
 
-Function118d80: ; 118d80
+Function118d80:
 	call Function118e06
 	ld a, [wcd38]
 	and a
@@ -1662,9 +1603,8 @@ asm_118d9f
 	ld bc, $0200
 	ld a, $2c
 	jp Function119e2b
-; 118ded
 
-Function118ded: ; 118ded
+Function118ded:
 	ld a, [wcd38]
 	and a
 	jr z, .asm_118e03
@@ -1672,15 +1612,14 @@ Function118ded: ; 118ded
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	farcall Special_Function11b93b
+	farcall Function11b93b
 	pop af
 	ld [rSVBK], a
 
 .asm_118e03
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 118e06
 
-Function118e06: ; 118e06
+Function118e06:
 	ld hl, wd002
 	ld a, [wcd38]
 	and a
@@ -1715,7 +1654,7 @@ Function118e06: ; 118e06
 	ld [hl], a
 	jr asm_118e3e
 
-Function118e39: ; 118e39 (46:4e39)
+Function118e39:
 .asm_118e39
 	ld a, [hli]
 	and a
@@ -1755,33 +1694,32 @@ asm_118e3e
 	inc de
 	jr .asm_118e63
 
-Function118e6d: ; 118e6d (46:4e6d)
+Function118e6d:
 	xor a
 	ld [wcd65], a
 	ld a, $a
 	jp Function119e2b
 
-Function118e76: ; 118e76 (46:4e76)
+Function118e76:
 	; Call $c in BattleTowerRoomMenu2
 	ld a, $c
 	ld [wcd3c], a
 	jp BattleTowerRoomMenu_IncrementJumptable
 
-Function118e7e: ; 118e7e (46:4e7e)
+Function118e7e:
 	call BattleTowerRoomMenu2
 	ret c
 	ld a, $36
 	jp Function119e2b
 
-BattleTowerRoomMenu_CallRoomMenu2: ; 118e87 (46:4e87)
+BattleTowerRoomMenu_CallRoomMenu2:
 	call BattleTowerRoomMenu2
 	ret c
 	ld a, [wcd33]
 	ld [wcf66], a
 	ret
-; 118e92 (46:4e92)
 
-Function118e92: ; 118e92
+Function118e92:
 	call Function118440
 	call Function1191d3
 	ld a, [wcd53]
@@ -1794,9 +1732,8 @@ Function118e92: ; 118e92
 	ld de, w3_d800
 	ld bc, $0800
 	jp Function118b10
-; 118eb0
 
-Function118eb0: ; 118eb0
+Function118eb0:
 	call Function118440
 	ld hl, $d802
 	ld de, wBGMapBuffer
@@ -1805,9 +1742,8 @@ Function118eb0: ; 118eb0
 	call Function1192cc
 	ret c
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 118ec6
 
-Function118ec6: ; 118ec6
+Function118ec6:
 	call Function118440
 	call SpeechTextBox
 	ld hl, $d80e
@@ -1836,9 +1772,8 @@ Function118ec6: ; 118ec6
 	ld a, $1c
 	ld [wcd47], a
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 118f0d
 
-Function118f0d: ; 118f0d
+Function118f0d:
 	call BattleTowerRoomMenu2
 	ret c
 	call Function118440
@@ -1877,9 +1812,8 @@ Function118f14:
 	ld a, $1c
 	ld [wcd47], a
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 118f5e
 
-Function118f5e: ; 118f5e
+Function118f5e:
 	call BattleTowerRoomMenu2
 	ret c
 	call Function118440
@@ -1929,9 +1863,8 @@ Function118f68:
 .asm_118fba
 	call BattleTowerRoomMenu_IncrementJumptable
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 118fc0
 
-Function118fc0: ; 118fc0
+Function118fc0:
 	call Function118440
 	ld a, [wcd55]
 	ld l, a
@@ -2006,9 +1939,8 @@ Function119009:
 	ld bc, $1000
 	ld a, $2c
 	jp Function119e2b
-; 119054
 
-Function119054: ; 119054
+Function119054:
 	ld a, $6
 	call GetSRAMBank
 	ld hl, wd002
@@ -2063,9 +1995,8 @@ Function119054: ; 119054
 	ld [rSVBK], a
 	call CloseSRAM
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 1190d0
 
-Function1190d0: ; 1190d0
+Function1190d0:
 	ld a, $3
 	ld [rSVBK], a
 	ld a, [wcd57]
@@ -2078,9 +2009,8 @@ Function1190d0: ; 1190d0
 	ld de, w3_d000
 	ld bc, $1000
 	jp Function118b10
-; 1190ec
 
-Function1190ec: ; 1190ec
+Function1190ec:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, wBGMapBuffer
@@ -2123,9 +2053,8 @@ Function1190ec: ; 1190ec
 	ld hl, Text_ReceivedNews
 	call BattleTowerRoomMenu_SetMessage
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 11914e
 
-Function11914e: ; 11914e
+Function11914e:
 	call BattleTowerRoomMenu2
 	ret c
 	ld a, $1c
@@ -2133,9 +2062,8 @@ Function11914e: ; 11914e
 	ld a, $a
 	ld [wc300], a
 	ret
-; 11915d
 
-Function11915d: ; 11915d
+Function11915d:
 	ld hl, $d802
 	ld de, wBGMapBuffer
 	ld bc, $000c
@@ -2165,9 +2093,8 @@ Function11915d: ; 11915d
 .asm_11918e
 	call CloseSRAM
 	ret
-; 119192
 
-Function119192: ; 119192
+Function119192:
 	inc b
 	inc c
 	jr .asm_11919e
@@ -2193,9 +2120,8 @@ Function119192: ; 119192
 	call Function118805
 	scf
 	ret
-; 1191ad
 
-Function1191ad: ; 1191ad
+Function1191ad:
 	push bc
 	ld c, $0
 	ld a, $5
@@ -2224,9 +2150,8 @@ Function1191ad: ; 1191ad
 	pop bc
 	and a
 	ret
-; 1191d3
 
-Function1191d3: ; 1191d3
+Function1191d3:
 	ld hl, w3_d100 + 2
 	ld a, l
 	ld [wcd53], a
@@ -2253,9 +2178,8 @@ Function1191d3: ; 1191d3
 	ld [wcd58], a
 	call Function11920f
 	ret
-; 11920f
 
-Function11920f: ; 11920f
+Function11920f:
 .asm_11920f
 	call Function118b9a
 	ret nc
@@ -2271,9 +2195,8 @@ Function11920f: ; 11920f
 	ld [hli], a
 	inc hl
 	ret
-; 119223
 
-Function119223: ; 119223
+Function119223:
 	xor a
 	ld [wcd4b], a
 	ld [wcd4c], a
@@ -2382,9 +2305,8 @@ Function119223: ; 119223
 	ld [wcd4e], a
 	and a
 	ret
-; 1192cc
 
-Function1192cc: ; 1192cc
+Function1192cc:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $aa73
@@ -2414,9 +2336,8 @@ Function1192cc: ; 1192cc
 .asm_1192fe
 	and a
 	ret
-; 119300
 
-Function119300: ; 119300
+Function119300:
 	xor a
 	ld [wcd4b], a
 	ld [wcd4c], a
@@ -2501,15 +2422,13 @@ Function119300: ; 119300
 
 .asm_11937f
 	ret
-; 119380
 
-Function119380: ; 119380
+Function119380:
 	ld a, $80
 	ld [wcd49], a
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 119388
 
-Function119388: ; 119388
+Function119388:
 	ld hl, wcd49
 	dec [hl]
 	ret nz
@@ -2554,9 +2473,8 @@ Function1193a0:
 	ld bc, $0200
 	ld a, $2c
 	jp Function119e2b
-; 1193e3
 
-Function1193e3: ; 1193e3
+Function1193e3:
 	ld hl, wcd49
 	dec [hl]
 	ret nz
@@ -2578,9 +2496,8 @@ Function1193fb:
 	ld de, w3_d000
 	ld bc, $1000
 	jp Function118b10
-; 119413
 
-Function119413: ; 119413
+Function119413:
 	ld a, $6
 	call GetSRAMBank
 	ld a, [w3_d000]
@@ -2614,9 +2531,8 @@ Function119413: ; 119413
 	ld [rSVBK], a
 	call CloseSRAM
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 119451
 
-Function119451: ; 119451 (46:5451)
+Function119451:
 	ld a, [wcd89]
 	and $1
 	jr z, .asm_11945d
@@ -2632,7 +2548,7 @@ Function119451: ; 119451 (46:5451)
 	ld a, [wd002]
 	ld hl, wd003
 
-Function119471: ; 119471 (46:5471)
+Function119471:
 	push af
 	ld a, [hli]
 	ld [$c608], a
@@ -2813,7 +2729,7 @@ endr
 	call Function1195c4
 	ret
 
-Function119584: ; 119584 (46:5584)
+Function119584:
 	ld a, [$c608]
 	ld b, a
 	ld a, [$c608 + 3]
@@ -2858,7 +2774,7 @@ Function119584: ; 119584 (46:5584)
 	and a
 	ret
 
-Function1195c4: ; 1195c4 (46:55c4)
+Function1195c4:
 	ld a, [hli]
 	ld c, a
 	ld a, [hli]
@@ -2891,7 +2807,7 @@ Function1195c4: ; 1195c4 (46:55c4)
 	ld a, $d8
 	jp Function118805
 
-Function1195f8: ; 1195f8 (46:55f8)
+Function1195f8:
 	ld a, $11
 	ld [wcd3c], a
 	ld a, $1c
@@ -2903,7 +2819,7 @@ Function1195f8: ; 1195f8 (46:55f8)
 	call BattleTowerRoomMenu_IncrementJumptable
 	jp BattleTowerRoomMenu_IncrementJumptable
 
-Function119612: ; 119612 (46:5612)
+Function119612:
 	ld a, $14
 	ld [wcd3c], a
 	ld a, $1c
@@ -2914,7 +2830,7 @@ Function119612: ; 119612 (46:5612)
 	ld [wcd47], a
 	jp BattleTowerRoomMenu_IncrementJumptable
 
-Function119629: ; 119629 (46:5629)
+Function119629:
 	call BattleTowerRoomMenu2
 	ret c
 	ld a, $60
@@ -2930,7 +2846,7 @@ Function119629: ; 119629 (46:5629)
 	ld [wcd47], a
 	call BattleTowerRoomMenu_IncrementJumptable
 
-Function119648: ; 119648 (46:5648)
+Function119648:
 	call BattleTowerRoomMenu2
 	ret c
 	call DelayFrame
@@ -2943,12 +2859,12 @@ Function119648: ; 119648 (46:5648)
 	ld a, $2a
 	jp Function119e2b
 
-Function119665: ; 119665 (46:5665)
+Function119665:
 	ld a, $1a
 	ld [wcd3c], a
 	call BattleTowerRoomMenu_IncrementJumptable
 
-Function11966d: ; 11966d (46:566d)
+Function11966d:
 	call BattleTowerRoomMenu2
 	ret c
 	ld a, [wcd47]
@@ -2957,12 +2873,12 @@ Function11966d: ; 11966d (46:566d)
 	ld [wc300], a
 	ret
 
-Function11967d: ; 11967d (46:567d)
+Function11967d:
 	ld a, $18
 	ld [wcd3c], a
 	call BattleTowerRoomMenu_IncrementJumptable
 
-Function119685: ; 119685 (46:5685)
+Function119685:
 	call BattleTowerRoomMenu2
 	ret c
 	ld a, $14
@@ -2971,7 +2887,7 @@ Function119685: ; 119685 (46:5685)
 	ld [wc300], a
 	ret
 
-Function119694: ; 119694 (46:5694)
+Function119694:
 	ld b, 0
 	ld hl, Unknown_1196b8
 .asm_119699
@@ -3002,9 +2918,8 @@ Function119694: ; 119694 (46:5694)
 	cp $7
 	jr nz, .asm_119699
 	ret
-; 1196b8 (46:56b8)
 
-Unknown_1196b8: ; 1196b8
+Unknown_1196b8:
 	db "Mon"
 	db "Tue"
 	db "Wed"
@@ -3012,13 +2927,12 @@ Unknown_1196b8: ; 1196b8
 	db "Fri"
 	db "Sat"
 	db "Sun"
-; 1196cd
 
 
 SECTION "Mobile 46 ASCII", ROMX
 ; A hack to use ascii above.
 
-Function1196cd: ; 1196cd (46:56cd)
+Function1196cd:
 	ld de, $c719
 	call Function1196de
 	ld [wcd4a], a
@@ -3027,7 +2941,7 @@ Function1196cd: ; 1196cd (46:56cd)
 	ld [wcd4b], a
 	ret
 
-Function1196de: ; 1196de (46:56de)
+Function1196de:
 	ld a, [de]
 	inc de
 	; b = ([de] - 48) * 2
@@ -3045,9 +2959,8 @@ Function1196de: ; 1196de (46:56de)
 	sub $30
 	add c
 	ret
-; 1196f2 (46:56f2)
 
-Function1196f2: ; 1196f2
+Function1196f2:
 	ld hl, wd002
 .asm_1196f5
 	call Function118b9a
@@ -3169,9 +3082,8 @@ Function1196f2: ; 1196f2
 	call Function1197bf
 	ld [hli], a
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 119798
 
-Function119798: ; 119798
+Function119798:
 	ld d, $0
 	ld e, d
 	call Function1197b4
@@ -3189,9 +3101,8 @@ Function119798: ; 119798
 	or e
 	ld e, a
 	ret
-; 1197b4
 
-Function1197b4: ; 1197b4
+Function1197b4:
 	ld a, [hli]
 	cp $61
 	jr nc, .asm_1197bc
@@ -3201,9 +3112,8 @@ Function1197b4: ; 1197b4
 .asm_1197bc
 	sub $57
 	ret
-; 1197bf
 
-Function1197bf: ; 1197bf
+Function1197bf:
 	cp $a
 	jr nc, .asm_1197c6
 	add $30
@@ -3212,9 +3122,8 @@ Function1197bf: ; 1197bf
 .asm_1197c6
 	add $57
 	ret
-; 1197c9
 
-Function1197c9: ; 1197c9
+Function1197c9:
 	ld hl, wd002
 	call Function118e39
 	ld a, $9
@@ -3239,9 +3148,8 @@ Function1197dc:
 	ld bc, $1000
 	ld a, $2a
 	jp Function119e2b
-; 119800
 
-Function119800: ; 119800
+Function119800:
 	ld a, $fd
 	ld [$c6d0], a
 	ld [wOTTrademonSpecies], a
@@ -3273,9 +3181,8 @@ Function119800: ; 119800
 	ld [wJumptableIndex], a
 	farcall Function115dc3
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 11984e
 
-Function11984e: ; 11984e
+Function11984e:
 	ld a, [wcd80]
 	and a
 	jr nz, .asm_1198a0
@@ -3343,9 +3250,8 @@ Function11984e: ; 11984e
 	ld [wJumptableIndex], a
 	farcall Function115dc3
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 1198ee
 
-Function1198ee: ; 1198ee
+Function1198ee:
 	ld hl, Text_RegisteringRecord
 	call BattleTowerRoomMenu_SetMessage
 	call BattleTowerRoomMenu_IncrementJumptable
@@ -3382,14 +3288,12 @@ Function1198f7:
 	ld bc, $0200
 	ld a, $2c
 	jp Function119e2b
-; 119937
 
-Function119937: ; 119937
+Function119937:
 	farcall Function1707f4
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 119940
 
-Function119940: ; 119940
+Function119940:
 	ld de, wc3cd
 	ld c, $1e
 .asm_119945
@@ -3408,9 +3312,8 @@ Function119940: ; 119940
 
 .asm_119953
 	ret
-; 119954
 
-Function119954: ; 119954
+Function119954:
 	ld a, $1c
 	ld [wcd3c], a
 	call BattleTowerRoomMenu2
@@ -3426,9 +3329,8 @@ Function119954: ; 119954
 	ld hl, $c608
 	ld a, $1e
 	jp Function119e2b
-; 119973
 
-Function119973: ; 119973
+Function119973:
 	ld a, $1
 	ld [wcf64], a
 	xor a
@@ -3437,9 +3339,8 @@ Function119973: ; 119973
 	ld de, w3_d000
 	ld a, $20
 	jp Function119e2b
-; 119987
 
-Function119987: ; 119987
+Function119987:
 	ld hl, w3_d000 + 1
 	ld a, [w3_d000]
 	or [hl]
@@ -3464,9 +3365,8 @@ Function119987: ; 119987
 	ld a, $1b
 	ld [wcf66], a
 	ret
-; 1199b4
 
-Function1199b4: ; 1199b4
+Function1199b4:
 	ld a, [w3_d081+1]
 	and a
 	jr nz, .asm_1199c7
@@ -3478,9 +3378,8 @@ Function1199b4: ; 1199b4
 
 .asm_1199c7
 	jp Function119ac9
-; 1199ca
 
-Function1199ca: ; 1199ca
+Function1199ca:
 	ld a, $20
 	ld [wcd89], a
 	ld a, [wcf64]
@@ -3491,9 +3390,8 @@ Function1199ca: ; 1199ca
 	ld bc, $0700
 	ld a, $28
 	jp Function119e2b
-; 1199e2
 
-Function1199e2: ; 1199e2
+Function1199e2:
 	ld c, $c
 	ld de, XGameCodePrefix
 	call Function119e4f
@@ -3624,15 +3522,13 @@ Function119ac9:
 	ld a, $10
 	ld [wcf66], a
 	ret
-; 119af1
 
 XGameCode:
 INCBIN "data/mobile/x-game-code.txt"
 XGameResult:
 INCBIN "data/mobile/x-game-result.txt"
-; 119b0d
 
-Function119b0d: ; 119b0d
+Function119b0d:
 	ld a, $8
 	ld [wcd3c], a
 	call BattleTowerRoomMenu2
@@ -3671,9 +3567,8 @@ Function119b45:
 asm_119b4d
 	ld a, $26
 	jp Function119e2b
-; 119b52
 
-Function119b52: ; 119b52
+Function119b52:
 	ld a, [w3_d090]
 	cp $1
 	jr nz, .asm_119b66
@@ -3686,9 +3581,8 @@ Function119b52: ; 119b52
 .asm_119b66
 	ld a, $1c
 	jp Function119e2b
-; 119b6b
 
-Function119b6b: ; 119b6b
+Function119b6b:
 	ld a, [w3_d090]
 	cp $1
 	jr z, .asm_119b75
@@ -3816,9 +3710,8 @@ Function119b6b: ; 119b6b
 	ld bc, $0069
 	call CopyBytes
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 119c3e
 
-Function119c3e: ; 119c3e
+Function119c3e:
 	cp $2b
 	jr c, .asm_119c68
 	jr z, .asm_119c80
@@ -3883,9 +3776,8 @@ Function119c3e: ; 119c3e
 	sub $47
 	and a
 	ret
-; 119c97
 
-BattleTowerRoomMenu_UberRestrictionMessage: ; 119c97
+BattleTowerRoomMenu_UberRestrictionMessage:
 	ld hl, Text_UberRestriction
 	call BattleTowerRoomMenu_SetMessage
 	call BattleTowerRoomMenu_IncrementJumptable
@@ -3914,9 +3806,8 @@ BattleTowerRoomMenu_DelayRestartMenu:
 	ld a, $0
 	ld [wcf66], a
 	ret
-; 119cc3
 
-BattleTowerRoomMenu_QuitMessage: ; 119cc3
+BattleTowerRoomMenu_QuitMessage:
 	ld a, [wcd38]
 	and a
 	jr z, .asm_119cd1
@@ -3951,26 +3842,23 @@ BattleTowerRoomMenu_UpdateYesNoMenu:
 	ld a, [wMobileInactivityTimerFrames]
 	ld [wcf66], a
 	ret
-; 119cf7
 
-MenuDataHeader_119cf7: ; 119cf7
+MenuHeader_119cf7:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 12, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw NULL
 	db 0 ; default option
-; 119cff
 
-MenuData_119cff: ; 119cff
+MenuData_119cff:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 15, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw NULL
 	db 0 ; default option
-; 119d07
 
 String_119d07:
 	db "   ▼@"
 
-Strings_L10ToL100: ; 119d0c
+Strings_L10ToL100:
 	db " L:10 @@"
 	db " L:20 @@"
 	db " L:30 @@"
@@ -3983,7 +3871,7 @@ Strings_L10ToL100: ; 119d0c
 	db " L:100@@"
 	db "CANCEL@@"
 
-Strings_Ll0ToL40: ; 119d64
+Strings_Ll0ToL40:
 	db " L:10 @@"
 	db " L:20 @@"
 	db " L:30 @@"
@@ -3992,9 +3880,8 @@ Strings_Ll0ToL40: ; 119d64
 
 String_119d8c:
 	db "CANCEL@"
-; 119d93
 
-BattleTower_LevelCheck: ; 119d93 (46:5d93)
+BattleTower_LevelCheck:
 	ld a, [rSVBK]
 	push af
 	ld a, $1
@@ -4038,7 +3925,7 @@ BattleTower_LevelCheck: ; 119d93 (46:5d93)
 	scf
 	ret
 
-BattleTower_UbersCheck: ; 119dd1 (46:5dd1)
+BattleTower_UbersCheck:
 	ld a, [rSVBK]
 	push af
 	ld a, [wcd4f]
@@ -4092,28 +3979,22 @@ BattleTower_UbersCheck: ; 119dd1 (46:5dd1)
 	ld [rSVBK], a
 	scf
 	ret
-; 119e2b (46:5e2b)
 
-Function119e2b: ; 119e2b (46:5e2b)
+Function119e2b:
 	call Function3e32
 
-BattleTowerRoomMenu_IncrementJumptable: ; 119e2e (46:5e2e)
+BattleTowerRoomMenu_IncrementJumptable:
 	ld hl, wcf66
 	inc [hl]
 	ret
-; 119e33 (46:5e33)
 
-XGameCodePrefix: ; 119e33
+XGameCodePrefix:
 INCBIN "data/mobile/x-game-code-prefix.txt"
-XGameCodePrefixEnd:
-;119e40
 
-XGameResultPrefix: ; 119e40
+XGameResultPrefix:
 INCBIN "data/mobile/x-game-result-prefix.txt"
-XGameResultPrefixEnd:
-; 119e4f
 
-Function119e4f: ; 119e4f
+Function119e4f:
 	push bc
 	ld hl, w3_d100
 	ld a, [hli]
@@ -4175,9 +4056,8 @@ Function119e4f: ; 119e4f
 .finish
 	and a
 	ret
-; 119e8e
 
-Function119e8e: ; 119e8e
+Function119e8e:
 	cp $60
 	jr c, .less_than_0x60
 	sub $57
@@ -4186,9 +4066,8 @@ Function119e8e: ; 119e8e
 .less_than_0x60
 	sub $30
 	ret
-; 119e98
 
-Function119e98: ; 119e98
+Function119e98:
 	ld a, $2
 .loop
 	push af
@@ -4212,9 +4091,8 @@ Function119e98: ; 119e98
 	and a
 	jr nz, .loop
 	ret
-; 119eb4
 
-Function119eb4: ; 119eb4 (46:5eb4)
+Function119eb4:
 	xor a
 	ld [wc3cc], a
 	ld de, wc3ac
@@ -4226,7 +4104,7 @@ Function119eb4: ; 119eb4 (46:5eb4)
 	jr nz, .loop
 	ret
 
-Function119ec2: ; 119ec2 (46:5ec2)
+Function119ec2:
 	ld a, BANK(sMobileLoginPassword)
 	call GetSRAMBank
 	xor a
@@ -4241,7 +4119,7 @@ Function119ec2: ; 119ec2 (46:5ec2)
 	call CloseSRAM
 	ret
 
-BattleTowerRoomMenu2: ; 119ed8 (46:5ed8)
+BattleTowerRoomMenu2:
 	ld a, [rSVBK]
 	ld [wcd8c], a
 	ld a, $1
@@ -4292,23 +4170,20 @@ BattleTowerRoomMenu2: ; 119ed8 (46:5ed8)
 	dw Function11a4fe
 	dw Function11a466
 	dw Function11a47a
-; 119f3f
 
-Function119f3f: ; 119f3f
+Function119f3f:
 	call Function11a5b9
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 119f45
 
-Function119f45: ; 119f45
+Function119f45:
 	hlcoord 4, 2
 	ld de, String_11a661
 	call PlaceString
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 119f56
 
-Function119f56: ; 119f56
+Function119f56:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_119f62
@@ -4325,9 +4200,8 @@ Function119f56: ; 119f56
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 119f76
 
-Function119f76: ; 119f76
+Function119f76:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_119f82
@@ -4345,9 +4219,8 @@ Function119f76: ; 119f76
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 119f98
 
-Function119f98: ; 119f98
+Function119f98:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -4395,9 +4268,8 @@ Function119f98: ; 119f98
 	ld [wc300], a
 	scf
 	ret
-; 11a00e
 
-Function11a00e: ; 11a00e
+Function11a00e:
 	ld a, BANK(sMobileLoginPassword)
 	call GetSRAMBank
 	ld a, [sMobileLoginPassword]
@@ -4469,9 +4341,8 @@ Function11a00e: ; 11a00e
 	ld a, $1
 	ld [wc305], a
 	ret
-; 11a0ca
 
-Function11a0ca: ; 11a0ca
+Function11a0ca:
 	xor a
 	ld [wMenuBorderLeftCoord], a
 	ld [wMenuBorderTopCoord], a
@@ -4492,9 +4363,8 @@ Function11a0ca: ; 11a0ca
 	ld a, $1
 	ld [wc305], a
 	ret
-; 11a113
 
-Function11a113: ; 11a113
+Function11a113:
 	call Function11a63c
 	ld c, $1
 	farcall Function115e18
@@ -4503,15 +4373,13 @@ Function11a113: ; 11a113
 	call PlaceString
 	and a
 	ret
-; 11a129
 
-Function11a129: ; 11a129
+Function11a129:
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a131
 
-Function11a131: ; 11a131
+Function11a131:
 	ld hl, wMobileInactivityTimerMinutes
 	dec [hl]
 	ret nz
@@ -4526,9 +4394,8 @@ Function11a13d:
 	call PlaceString
 	and a
 	ret
-; 11a14b
 
-Function11a14b: ; 11a14b
+Function11a14b:
 	ld hl, wcd85
 	ld a, [hl]
 	cp $f3
@@ -4546,9 +4413,8 @@ Function11a14b: ; 11a14b
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a16d
 
-Function11a16d: ; 11a16d
+Function11a16d:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a179
@@ -4567,9 +4433,8 @@ Function11a16d: ; 11a16d
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a192
 
-Function11a192: ; 11a192
+Function11a192:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -4597,9 +4462,8 @@ Function11a192: ; 11a192
 	call PlaceString
 	scf
 	ret
-; 11a1d6
 
-Function11a1d6: ; 11a1d6
+Function11a1d6:
 	ld a, [wcd85]
 	cp $50
 	jr nz, .asm_11a1e4
@@ -4611,9 +4475,8 @@ Function11a1d6: ; 11a1d6
 .asm_11a1e4
 	and a
 	ret
-; 11a1e6
 
-Function11a1e6: ; 11a1e6
+Function11a1e6:
 	ld hl, String_11a706
 	ld de, $c346
 	call Function11a1ff
@@ -4624,9 +4487,8 @@ Function11a1e6: ; 11a1e6
 	ld a, $50
 	ld [de], a
 	ret
-; 11a1ff
 
-Function11a1ff: ; 11a1ff
+Function11a1ff:
 .asm_11a1ff
 	ld a, [hli]
 	cp $50
@@ -4634,11 +4496,10 @@ Function11a1ff: ; 11a1ff
 	ld [de], a
 	inc de
 	jr .asm_11a1ff
-; 11a207
 
-BattleTowerRoomMenu2_PlaceYesNoMenu: ; 11a207
-	ld hl, MenuDataHeader_11a2de
-	call LoadMenuDataHeader
+BattleTowerRoomMenu2_PlaceYesNoMenu:
+	ld hl, MenuHeader_11a2de
+	call LoadMenuHeader
 	call MenuBox
 	call MenuBoxCoord2Tile
 	call ApplyTilemap
@@ -4654,9 +4515,8 @@ BattleTowerRoomMenu2_PlaceYesNoMenu: ; 11a207
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a235
 
-BattleTowerRoomMenu2_UpdateYesNoMenu: ; 11a235
+BattleTowerRoomMenu2_UpdateYesNoMenu:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and A_BUTTON
@@ -4743,31 +4603,26 @@ BattleTowerRoomMenu2_UpdateYesNoMenu: ; 11a235
 	farcall ReloadMapPart
 	and a
 	ret
-; 11a2cf
 
-String_11a2cf: ; 11a2cf
+String_11a2cf:
 	db "YES@"
-; 11a2d3
 
-String_11a2d3: ; 11a2d3
+String_11a2d3:
 	db "NO@"
-; 11a2d6
 
-MenuDataHeader_11a2d6: ; 11a2d6
+MenuHeader_11a2d6:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 6, SCREEN_WIDTH - 1, 10
 	dw NULL
 	db 0 ; default option
-; 11a2de
 
-MenuDataHeader_11a2de: ; 11a2de
+MenuHeader_11a2de:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw NULL
 	db 0 ; default option
-; 11a2e6
 
-Function11a2e6: ; 11a2e6
+Function11a2e6:
 	call Function11a63c
 	ld c, $2
 	farcall Function115e18
@@ -4777,9 +4632,8 @@ Function11a2e6: ; 11a2e6
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a302
 
-Function11a302: ; 11a302
+Function11a302:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a30e
@@ -4804,9 +4658,8 @@ Function11a302: ; 11a302
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a33a
 
-Function11a33a: ; 11a33a
+Function11a33a:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a346
@@ -4821,9 +4674,8 @@ Function11a33a: ; 11a33a
 	farcall Function115dc3
 	and a
 	ret
-; 11a357
 
-Function11a357: ; 11a357
+Function11a357:
 	call Function11a63c
 	hlcoord 4, 2
 	ld de, String_11a743
@@ -4831,9 +4683,8 @@ Function11a357: ; 11a357
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a36b
 
-Function11a36b: ; 11a36b
+Function11a36b:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a377
@@ -4851,9 +4702,8 @@ Function11a36b: ; 11a36b
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a38d
 
-Function11a38d: ; 11a38d
+Function11a38d:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -4877,9 +4727,8 @@ Function11a38d: ; 11a38d
 	ld [wcd80], a
 	scf
 	ret
-; 11a3c5
 
-Function11a3c5: ; 11a3c5
+Function11a3c5:
 	call Function11a63c
 	hlcoord 4, 2
 	ld de, String_11a762
@@ -4887,9 +4736,8 @@ Function11a3c5: ; 11a3c5
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a3d9
 
-Function11a3d9: ; 11a3d9
+Function11a3d9:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a3e5
@@ -4906,9 +4754,8 @@ Function11a3d9: ; 11a3d9
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a3f9
 
-Function11a3f9: ; 11a3f9
+Function11a3f9:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a405
@@ -4926,9 +4773,8 @@ Function11a3f9: ; 11a3f9
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a41b
 
-Function11a41b: ; 11a41b
+Function11a41b:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -4952,9 +4798,8 @@ Function11a41b: ; 11a41b
 	ld [wcd80], a
 	scf
 	ret
-; 11a452
 
-Function11a452: ; 11a452
+Function11a452:
 	call Function11a63c
 	hlcoord 4, 2
 	ld de, String_11a791
@@ -4962,9 +4807,8 @@ Function11a452: ; 11a452
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a466
 
-Function11a466: ; 11a466
+Function11a466:
 	call Function11a63c
 	hlcoord 4, 2
 	ld de, String_11a7c1
@@ -4972,9 +4816,8 @@ Function11a466: ; 11a466
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a47a
 
-Function11a47a: ; 11a47a
+Function11a47a:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a486
@@ -4986,9 +4829,8 @@ Function11a47a: ; 11a47a
 .asm_11a486
 	and a
 	ret
-; 11a488
 
-Function11a488: ; 11a488
+Function11a488:
 	call Function11a63c
 	hlcoord 4, 2
 	ld de, String_11a7ac
@@ -4997,9 +4839,8 @@ Function11a488: ; 11a488
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a49e
 
-Function11a49e: ; 11a49e
+Function11a49e:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -5025,17 +4866,15 @@ Function11a49e: ; 11a49e
 	ld [wcd80], a
 	scf
 	ret
-; 11a4db
 
-Function11a4db: ; 11a4db
+Function11a4db:
 	call Function11a63c
 	ld de, String_11a6db
 	hlcoord 4, 2
 	call PlaceString
 	ret
-; 11a4e8
 
-Function11a4e8: ; 11a4e8
+Function11a4e8:
 	call Function11a63c
 	hlcoord 4, 2
 	ld de, String_11a7d7
@@ -5044,9 +4883,8 @@ Function11a4e8: ; 11a4e8
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a4fe
 
-Function11a4fe: ; 11a4fe
+Function11a4fe:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -5070,9 +4908,8 @@ Function11a4fe: ; 11a4fe
 	ld [wcd80], a
 	scf
 	ret
-; 11a536
 
-Function11a536: ; 11a536
+Function11a536:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and $1
@@ -5143,17 +4980,15 @@ Function11a536: ; 11a536
 	ld [wcd8b], a
 	and a
 	ret
-; 11a5b0
 
-BattleTowerRoomMenu2_IncrementJumptable: ; 11a5b0
+BattleTowerRoomMenu2_IncrementJumptable:
 	ld a, [wcd3c]
 	inc a
 	ld [wcd3c], a
 	scf
 	ret
-; 11a5b9
 
-Function11a5b9: ; 11a5b9
+Function11a5b9:
 	xor a
 	ld [wMenuBorderLeftCoord], a
 	ld [wMenuBorderTopCoord], a
@@ -5176,9 +5011,8 @@ Function11a5b9: ; 11a5b9
 	ld a, $1
 	ld [wc305], a
 	ret
-; 11a5f5
 
-Function11a5f5: ; 11a5f5
+Function11a5f5:
 	ld a, $e
 	ld [wMenuBorderLeftCoord], a
 	ld a, $13
@@ -5206,9 +5040,8 @@ Function11a5f5: ; 11a5f5
 	ld [hl], a
 	farcall ReloadMapPart
 	ret
-; 11a63c
 
-Function11a63c: ; 11a63c
+Function11a63c:
 	hlcoord 4, 1
 	ld de, String_11a7f4
 	call PlaceString
@@ -5222,115 +5055,92 @@ Function11a63c: ; 11a63c
 	ld de, String_11a7f4
 	call PlaceString
 	ret
-; 11a661
 
-String_11a661: ; 11a661
+String_11a661:
 	db   "これから　モバイルセンターに"
 	next "でんわ<WO>かけます@"
-; 11a679
 
-String_11a679: ; 11a679
+String_11a679:
 	db   "モバイルアダプタ<NO>じゅんびは"
 	next "できて　いますか？@"
-; 11a692
 
-String_11a692: ; 11a692
+String_11a692:
 	db   "でんわ<WO>かけています"
 	next "しばらく　おまちください@"
-; 11a6aa
 
-String_11a6aa: ; 11a6aa
+String_11a6aa:
 	db   "でんわをかけると　つうわりょう"
 	next "せつぞくりょう<GA>かかります@"
-; 11a6c8
 
-String_11a6c8: ; 11a6c8
+String_11a6c8:
 	db   "せつぞく　しました@"
-; 11a6d2
 
-String_11a6d2: ; 11a6d2
+String_11a6d2:
 	db   "つうしん　ちゅう@"
-; 11a6db
 
-String_11a6db: ; 11a6db
+String_11a6db:
 	db   "つうしん　ちゅう"
 	next "セレクト　エーでちゅうし@"
-; 11a6f1
 
-String_11a6f1: ; 11a6f1
+String_11a6f1:
 	db   "この　サービスには"
 	next "つうわりょう<NO>ほかに@"
-; 11a706
 
-String_11a706: ; 11a706
+String_11a706:
 	db   "おかね<GA>@"
-; 11a70b
 
-String_11a70b: ; 11a70b
+String_11a70b:
 	db   "えん"
 	next "かかります　よろしい　ですか？@"
-; 11a71e
 
-String_11a71e: ; 11a71e
+String_11a71e:
 	db   "つうしん　しゅうりょう@"
-; 11a72a
 
-String_11a72a: ; 11a72a
+String_11a72a:
 	db   "つないだ　じかん"
 	next "　　やく　　　ふん　　　びょう@"
-; 11a743
 
-String_11a743: ; 11a743
+String_11a743:
 	db   "もっていない　データが"
 	next "あります！@"
-; 11a755
 
-String_11a755: ; 11a755
+String_11a755:
 	db   "データ<WO>よみこみますか？@"
-; 11a762
 
-String_11a762: ; 11a762
+String_11a762:
 	db   "おなじ　データ<WO>よみこんだ"
 	next "こと<GA>ありますが@"
-; 11a779
 
-String_11a779: ; 11a779
+String_11a779:
 	db   "そのデータ<WA>なくなっているか"
 	next "こわれて　います@"
-; 11a791
 
-String_11a791: ; 11a791
+String_11a791:
 	db   "もっている　データと"
 	next "おなじデータしか　ありません！@"
-; 11a7ac
 
-String_11a7ac: ; 11a7ac
+String_11a7ac:
 	db   "データ<NO>よみこみを"
 	next "ちゅうし　しますか？@"
-; 11a7c1
 
-String_11a7c1: ; 11a7c1 ; new news?
+String_11a7c1:
 	db   "あたらしい　ニュースは"
 	next "ありません　でした@"
-; 11a7d7
 
-String_11a7d7: ; 11a7d7
+String_11a7d7:
 	db   "あたらしいニュース<GA>あります"
 	next "ニュース<WO>よみこみますか？@"
-; 11a7f4
 
-String_11a7f4: ; 11a7f4
+String_11a7f4:
 	db   "　　　　　　　　　　　　　　　@"
-; 11a804
 
-MenuDataHeader_11a804: ; 11a804
+MenuHeader_11a804:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, SCREEN_WIDTH - 1, 5
 	dw NULL
 	db 0 ; default option
-; 11a80c
 
-Function11a80c: ; 11a80c
+Function11a80c:
 	ld de, hDivisor
 	ld bc, hDividend
 	ld hl, Unknown_11a89a
@@ -5388,18 +5198,16 @@ Function11a80c: ; 11a80c
 	call Function11a884
 	ld [wcd64], a
 	ret
-; 11a884
 
-Function11a884: ; 11a884
+Function11a884:
 	add e
 	cp $a
 	ret c
 	sub $a
 	inc b
 	ret
-; 11a88c
 
-Function11a88c: ; 11a88c
+Function11a88c:
 	ld a, [bc]
 	sla a
 	ld c, a
@@ -5413,41 +5221,37 @@ Function11a88c: ; 11a88c
 	ld [de], a
 	inc de
 	ret
-; 11a89a
 
-Unknown_11a89a: ; 11a89a
+Unknown_11a89a:
 x = 0
 rept 16
 	bcd x % 100, x / 100
 x = x + 1
 endr
 
-Unknown_11a8ba: ; 11a8ba
+Unknown_11a8ba:
 x = 0
 rept 16
 	bcd x % 100, x / 100
 x = x + 16
 endr
 
-Unknown_11a8da: ; 11a8da
+Unknown_11a8da:
 x = 0
 rept 16
 	bcd x % 100, x / 100
 x = x + 256
 endr
-; 11a8fa
 
-BattleTowerRoomMenu_WriteMessage: ; 11a8fa
+BattleTowerRoomMenu_WriteMessage:
 	jumptable .Jumptable, $c31a
-; 11a909
 
-.Jumptable: ; 11a909
+.Jumptable:
 	dw BattleTowerRoomMenu_WriteMessage_DoNothing
 	dw Function11a90f
 	dw Function11a971
-; 11a90f
 
-Function11a90f: ; 11a90f
+Function11a90f:
 	ld a, $1
 	ld [rSVBK], a
 	call SpeechTextBox
@@ -5507,9 +5311,8 @@ Function11a90f: ; 11a90f
 
 BattleTowerRoomMenu_WriteMessage_DoNothing:
 	ret
-; 11a971
 
-Function11a971: ; 11a971
+Function11a971:
 	ld hl, $c31f
 	ld a, [hJoyDown]
 	and a
@@ -5556,9 +5359,8 @@ Function11a971: ; 11a971
 
 .asm_11a9bf
 	ret
-; 11a9c0
 
-BattleTowerRoomMenu_SetMessage: ; 11a9c0
+BattleTowerRoomMenu_SetMessage:
 	ld a, l
 	ld [$c31b], a
 	ld a, h
@@ -5566,9 +5368,8 @@ BattleTowerRoomMenu_SetMessage: ; 11a9c0
 	ld a, $1
 	ld [$c31a], a
 	ret
-; 11a9ce
 
-Function11a9ce: ; 11a9ce
+Function11a9ce:
 	call ClearBGPalettes
 	call ReloadTilesetAndPalettes
 	call Call_ExitMenu
@@ -5578,15 +5379,13 @@ Function11a9ce: ; 11a9ce
 	farcall FinishExitMenu
 	call UpdateSprites
 	ret
-; 11a9f0
 
-Function11a9f0: ; 11a9f0
+Function11a9f0:
 	ld a, $1
 	and a
 	ret
-; 11a9f4
 
-Function11a9f4: ; 11a9f4
+Function11a9f4:
 	ld a, [wcd8a]
 	ld l, a
 	ld a, [wcd8b]
@@ -5604,66 +5403,55 @@ Function11a9f4: ; 11a9f4
 	call Function118805
 	and a
 	ret
-; 11aa13
 
-Text_SaveFileWillBeSent: ; 0x11aa13
+Text_SaveFileWillBeSent:
 	text "SAVE FILE will be"
 	line "sent."
 	done
-; 0x11aa2c
 
-Text_SentSaveFileReadingNews: ; 0x11aa2c
+Text_SentSaveFileReadingNews:
 	text "Sent SAVE FILE."
 	line "Reading NEWS…"
 	done
-; 0x11aa4b
 
-Text_ReadingNews: ; 0x11aa4b
+Text_ReadingNews:
 	text "Reading NEWS…"
 	done
-; 0x11aa5a
 
-Text_ReceivedNews: ; 0x11aa5a
+Text_ReceivedNews:
 	text "Received NEWS!"
 	done
-; 0x11aa6a
 
-Text_QuitReadingNews: ; 0x11aa6a
+Text_QuitReadingNews:
 	text "Quit reading NEWS?"
 	done
-; 0x11aa7e
 
-Text_CanceledSendingSaveFile: ; 0x11aa7e
+Text_CanceledSendingSaveFile:
 	text "Canceled sending"
 	line "SAVE FILE."
 	done
-; 0x11aa9b
 
-Text_ReceivedOddEgg: ; 0x11aa9b
+Text_ReceivedOddEgg:
 	text "ODD EGG"
 	line "was received!"
 	done
-; 0x11aab2
 
-Text_RegisteringRecord: ; 0x11aab2
+Text_RegisteringRecord:
 	text "Registering your"
 	line "record…"
 	done
-; 0x11aacc
 
-Text_BattleRoomVisitLimit: ; 0x11aacc
+Text_BattleRoomVisitLimit:
 	text "One visit per day"
 	line "per BATTLE ROOM!"
 	done
-; 0x11aaf0
 
-Text_PartyMonTopsThisLevel: ; 0x11aaf0
+Text_PartyMonTopsThisLevel:
 	text "A party #MON"
 	line "tops this level."
 	done
-; 0x11ab0f
 
-Text_UberRestriction: ; 0x11ab0f
+Text_UberRestriction:
 	text_from_ram wcd49
 	text " may go"
 	line "only to BATTLE"
@@ -5671,50 +5459,42 @@ Text_UberRestriction: ; 0x11ab0f
 	para "ROOMS that are"
 	line "Lv.70 or higher."
 	done
-; 0x11ab4a
 
-Text_CancelBattleRoomChallenge: ; 0x11ab4a
+Text_CancelBattleRoomChallenge:
 	text "Cancel your BATTLE"
 	line "ROOM challenge?"
 	done
-; 0x11ab6e
 
-Text_ExitGymLeaderHonorRoll: ; 0x11ab6e
+Text_ExitGymLeaderHonorRoll:
 	text "Exit GYM LEADER"
 	line "HONOR ROLL?"
 	done
-; 0x11ab8b
 
-Text_LinkingWithCenter: ; 0x11ab8b
+Text_LinkingWithCenter:
 	text "Linking with the"
 	line "CENTER…"
 	done
-; 0x11aba5
 
-Text_WhatLevelDoYouWantToChallenge: ; 0x11aba5
+Text_WhatLevelDoYouWantToChallenge:
 	text "What level do you"
 	line "want to challenge?"
 	done
-; 0x11abcb
 
-Text_CheckBattleRoomListByMaxLevel: ; 0x11abcb
+Text_CheckBattleRoomListByMaxLevel:
 	text "Check BATTLE ROOM"
 	line "list by max level?"
 	done
-; 0x11abf1
 
-Text_EnterWhichBattleRoom: ; 0x11abf1
+Text_EnterWhichBattleRoom:
 	text "Enter which"
 	line "BATTLE ROOM?"
 	done
-; 0x11ac0b
 
-Text_WhichBattleRoom: ; 0x11ac0b
+Text_WhichBattleRoom:
 	text "Which BATTLE ROOM?"
 	done
-; 0x11ac1f
 
-Text_ThisBattleRoomPleaseWait: ; 0x11ac1f
+Text_ThisBattleRoomPleaseWait:
 	text_from_ram wStringBuffer3
 	text "'s ROOM"
 	line "@"
@@ -5722,18 +5502,16 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f
 	text "?"
 	cont "Please wait…"
 	done
-; 0x11ac3e
 
-Special_Function11ac3e: ; 11ac3e
+Function11ac3e:
 	call SpeechTextBox
 	call FadeToMenu
 	callfar ClearSpriteAnims2
 	call Function11ac51
 	call CloseSubmenu
 	ret
-; 11ac51
 
-Function11ac51: ; 11ac51
+Function11ac51:
 	xor a
 	ld [hBGMapMode], a
 	ld hl, wOptions
@@ -5765,7 +5543,7 @@ Function11ac51: ; 11ac51
 	call Function11b314
 	call Function11acb7
 	call Function11ad6e
-	ld a, 30 * 4
+	ld a, 30 * SPRITEOAMSTRUCT_LENGTH
 	ld [wCurrSpriteOAMAddr], a
 	farcall DoNextFrameForAllSprites
 	farcall ReloadMapPart
@@ -5780,9 +5558,8 @@ Function11ac51: ; 11ac51
 	pop af
 	ld [wOptions], a
 	ret
-; 11acb7
 
-Function11acb7: ; 11acb7
+Function11acb7:
 	ld hl, TilemapPack_11ba44
 	ld a, [wcd49]
 	ld c, a
@@ -5833,9 +5610,8 @@ Function11acb7: ; 11acb7
 	xor a
 	ld [wcd4a], a
 	ret
-; 11ad1b
 
-Function11ad1b: ; 11ad1b
+Function11ad1b:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -5868,16 +5644,14 @@ Function11ad1b: ; 11ad1b
 	ld [wc7d4], a
 	farcall Pokedex_OrderMonsByMode
 	ret
-; 11ad6e
 
-Function11ad6e: ; 11ad6e
+Function11ad6e:
 	ld a, [wJumptableIndex]
 	ld hl, Jumptable_11ad78
 	call Function11b239
 	jp hl
-; 11ad78
 
-Jumptable_11ad78: ; 11ad78
+Jumptable_11ad78:
 	dw Function11b082
 	dw Function11b0ff
 	dw Function11ad95
@@ -5887,23 +5661,20 @@ Jumptable_11ad78: ; 11ad78
 	dw Function11ad8f
 	dw Function11af04
 	dw Function11af4e
-; 11ad8a
 
-Function11ad8a: ; 11ad8a
+Function11ad8a:
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
-; 11ad8f
 
-Function11ad8f: ; 11ad8f
+Function11ad8f:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret
-; 11ad95
 
-Function11ad95: ; 11ad95
-	ld hl, MenuDataHeader_11ae38
-	call LoadMenuDataHeader
+Function11ad95:
+	ld hl, MenuHeader_11ae38
+	call LoadMenuHeader
 	call MenuBox
 	hlcoord 12, 12
 	ld de, String_11ae40
@@ -5992,31 +5763,28 @@ Function11adc4:
 	call ExitMenu
 	farcall ReloadMapPart
 	ret
-; 11ae38
 
-MenuDataHeader_11ae38: ; 11ae38
+MenuHeader_11ae38:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 10, 17, SCREEN_HEIGHT - 1
 	dw NULL
 	db 0 ; default option
-; 11ae40
 
-String_11ae40: ; 11ae40
+String_11ae40:
 	db   "どちらでも"
 	next "♂オス"
 	next "♀メス"
 	db   "@"
-; 11ae4e
 
-Function11ae4e: ; 11ae4e
-	ld hl, MenuDataHeader_11afe8
-	call LoadMenuDataHeader
+Function11ae4e:
+	ld hl, MenuHeader_11afe8
+	call LoadMenuHeader
 	call MenuBox
 	hlcoord 10, 14
 	ld de, String_11aff0
 	call PlaceString
-	ld hl, MenuDataHeader_11b013
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_11b013
+	call LoadMenuHeader
 	call MenuBox
 	hlcoord 16, 8
 	ld de, String_11b01b
@@ -6097,17 +5865,16 @@ Function11ae98:
 	call ExitMenu
 	farcall ReloadMapPart
 	ret
-; 11af04
 
-Function11af04: ; 11af04
-	ld hl, MenuDataHeader_11afe8
-	call LoadMenuDataHeader
+Function11af04:
+	ld hl, MenuHeader_11afe8
+	call LoadMenuHeader
 	call MenuBox
 	hlcoord 10, 14
 	ld de, String_11b003
 	call PlaceString
-	ld hl, MenuDataHeader_11b013
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_11b013
+	call LoadMenuHeader
 	call MenuBox
 	hlcoord 16, 8
 	ld de, String_11b01b
@@ -6188,9 +5955,8 @@ Function11af4e:
 	call ExitMenu
 	farcall ReloadMapPart
 	ret
-; 11afb7
 
-Function11afb7: ; 11afb7
+Function11afb7:
 	ld e, $ed
 	jr asm_11afbd
 
@@ -6210,7 +5976,6 @@ asm_11afbd:
 	ld d, [hl]
 	ld [de], a
 	ret
-; 11afcc
 
 Unknown_11afcc:
 	dwcoord 11, 12
@@ -6220,9 +5985,8 @@ Unknown_11afcc:
 Unknown_11afd2:
 	dwcoord 15,  8
 	dwcoord 15, 10
-; 11afd6
 
-Function11afd6: ; 11afd6
+Function11afd6:
 	ld de, SCREEN_WIDTH
 	ld a, $3
 .row
@@ -6238,38 +6002,32 @@ Function11afd6: ; 11afd6
 	dec b
 	jr nz, .row
 	ret
-; 11afe8
 
-MenuDataHeader_11afe8: ; 11afe8
+MenuHeader_11afe8:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw NULL
 	db 0 ; default option
-; 11aff0
 
-String_11aff0: ; 11aff0
+String_11aff0:
 	db   "この　じょうけんで"
 	next "よろしいですか?@"
-; 11b003
 
-String_11b003: ; 11b003
+String_11b003:
 	db   "こうかんを"
 	next "ちゅうししますか？@"
-; 11b013
 
-MenuDataHeader_11b013: ; 11b013
+MenuHeader_11b013:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw NULL
 	db 1 ; default option
-; 11b01b
 
 String_11b01b:
 	db   "はい"
 	next "いいえ@"
-; 11b022
 
-Function11b022: ; 11b022
+Function11b022:
 	ld a, [wcd2e]
 	and a
 	jr z, .asm_11b02e
@@ -6285,9 +6043,8 @@ Function11b022: ; 11b022
 	ld hl, wStringBuffer4
 	call Function11b03d
 	ret
-; 11b03d
 
-Function11b03d: ; 11b03d
+Function11b03d:
 	push hl
 	push af
 	ld c, $1
@@ -6336,12 +6093,11 @@ Function11b03d: ; 11b03d
 	ld bc, 4 ; string length
 	call CopyBytes
 	ret
-; 11b07a
 
 .MaleString: db "オスの　"
 .FemaleString: db "メスの　"
 
-Function11b082: ; 11b082
+Function11b082:
 	call Function11b242
 	ld a, $7
 	ld [wc7d3], a
@@ -6350,9 +6106,8 @@ Function11b082: ; 11b082
 	call Function11b275
 	call SetPalettes
 	jp Function11ad8a
-; 11b099
 
-Function11b099: ; 11b099
+Function11b099:
 	ld c, $6
 	hlcoord 11, 1
 	ld a, [wc7d3]
@@ -6385,9 +6140,8 @@ Function11b099: ; 11b099
 	dec a
 	jr nz, .loop
 	ret
-; 11b0cf
 
-.PlaceMonNameOrPlaceholderString: ; 11b0cf
+.PlaceMonNameOrPlaceholderString:
 	and a
 	ret z
 
@@ -6400,9 +6154,8 @@ Function11b099: ; 11b099
 	pop hl
 	call PlaceString
 	ret
-; 11b0e1
 
-.SetCaughtFlag: ; 11b0e1
+.SetCaughtFlag:
 	call CheckCaughtMemMon
 	jr nz, .okay
 	inc hl
@@ -6412,9 +6165,8 @@ Function11b099: ; 11b099
 	ld a, $1
 	ld [hli], a
 	ret
-; 11b0ec
 
-.CheckSeenFlag: ; 11b0ec
+.CheckSeenFlag:
 	call CheckSeenMemMon
 	ret nz
 
@@ -6423,13 +6175,11 @@ Function11b099: ; 11b099
 	call PlaceString
 	scf
 	ret
-; 11b0f9
 
-.EmptySlot: ; 11b0f9
+.EmptySlot:
 	db "ーーーーー@"
-; 11b0ff
 
-Function11b0ff: ; 11b0ff
+Function11b0ff:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and $2
@@ -6506,9 +6256,8 @@ Function11b0ff: ; 11b0ff
 	ld a, $4
 	ld [wJumptableIndex], a
 	ret
-; 11b175
 
-Function11b175: ; 11b175
+Function11b175:
 	ld a, [wc7d3]
 	ld d, a
 	ld a, [wc7d2]
@@ -6612,17 +6361,15 @@ Function11b175: ; 11b175
 	call Function11b275
 	scf
 	ret
-; 11b1f7
 
-Function11b1f7: ; 11b1f7
+Function11b1f7:
 	hlcoord 0, 0
 	ld a, $32
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call ByteFill
 	ret
-; 11b203
 
-Function11b203: ; 11b203
+Function11b203:
 .asm_11b203
 	ld a, [de]
 	cp $ff
@@ -6630,9 +6377,8 @@ Function11b203: ; 11b203
 	inc de
 	ld [hli], a
 	jr .asm_11b203
-; 11b20b
 
-Function11b20b: ; 11b20b
+Function11b20b:
 	ld a, [wc7d1]
 	ld hl, wc7d0
 	add [hl]
@@ -6643,9 +6389,8 @@ Function11b20b: ; 11b20b
 	ld a, [hl]
 	ld [wd265], a
 	ret
-; 11b21e
 
-CheckCaughtMemMon: ; 11b21e
+CheckCaughtMemMon:
 	push de
 	push hl
 	ld a, [wd265]
@@ -6654,9 +6399,8 @@ CheckCaughtMemMon: ; 11b21e
 	pop hl
 	pop de
 	ret
-; 11b22a
 
-CheckSeenMemMon: ; 11b22a
+CheckSeenMemMon:
 	push de
 	push hl
 	ld a, [wd265]
@@ -6665,13 +6409,11 @@ CheckSeenMemMon: ; 11b22a
 	pop hl
 	pop de
 	ret
-; 11b236
 
-Function11b236: ; 11b236
+Function11b236:
 	jp FillBoxWithByte
-; 11b239
 
-Function11b239: ; 11b239
+Function11b239:
 	ld e, a
 	ld d, 0
 	add hl, de
@@ -6680,9 +6422,8 @@ Function11b239: ; 11b239
 	ld h, [hl]
 	ld l, a
 	ret
-; 11b242
 
-Function11b242: ; 11b242
+Function11b242:
 	hlcoord 3, 4
 	ld de, wStringBuffer3
 	call PlaceString
@@ -6716,14 +6457,12 @@ asm_11b26f
 Function11b272:
 	ld [hl], $f5
 	ret
-; 11b275
 
-Function11b275: ; 11b275
+Function11b275:
 	call Function11b279
 	ret
-; 11b279
 
-Function11b279: ; 11b279
+Function11b279:
 	ld a, [wd265]
 	ld [wCurSpecies], a
 	call CheckSeenMemMon
@@ -6739,9 +6478,8 @@ Function11b279: ; 11b279
 
 .asm_11b294
 	ret
-; 11b295
 
-Function11b295: ; 11b295
+Function11b295:
 	hlcoord 4, 13
 	ld de, String_11b308
 	call PlaceString
@@ -6798,31 +6536,25 @@ Function11b295: ; 11b295
 	ld de, wStringBuffer4
 	call PlaceString
 	ret
-; 11b2fe
 
-String_11b2fe: ; 11b2fe
+String_11b2fe:
 	db "あげる#@"
-; 11b303
 
-String_11b303: ; 11b303
+String_11b303:
 	db "ほしい#@"
-; 11b308
 
-String_11b308: ; 11b308
+String_11b308:
 	db "　　　　　@"
-; 11b30e
 
-String_11b30e: ; 11b30e
+String_11b30e:
 	db "みはっけん@"
-; 11b314
 
-Function11b314: ; 11b314
+Function11b314:
 	call Function11b31b
 	call Function11b3d9
 	ret
-; 11b31b
 
-Function11b31b: ; 11b31b
+Function11b31b:
 	ld hl, .Coords
 	ld a, [wJumptableIndex]
 	cp 2
@@ -6853,7 +6585,6 @@ Function11b31b: ; 11b31b
 .load_sprites
 	call Function11b397
 	ret
-; 11b350
 
 .Coords:
 	dbpixel 3, 11, 2, 6 ;  0
@@ -6920,7 +6651,7 @@ Function11b31b: ; 11b31b
 	db $39 ; 12
 	db $39 ; 13
 
-Function11b397: ; 11b397
+Function11b397:
 	ld de, wVirtualOAMSprite00
 .loop
 	ld a, [hl]
@@ -6946,9 +6677,8 @@ Function11b397: ; 11b397
 	ld [de], a ; attributes
 	inc de
 	jr .loop
-; 11b3b6
 
-Unreferenced_Function11b3b6: ; 11b3b6
+Unreferenced_Function11b3b6:
 .loop
 	ld a, [hl]
 	cp -1
@@ -6976,9 +6706,8 @@ Unreferenced_Function11b3b6: ; 11b3b6
 	ld [de], a
 	inc de
 	jr .loop
-; 11b3d9
 
-Function11b3d9: ; 11b3d9
+Function11b3d9:
 	ld de, wVirtualOAMSprite28
 	push de
 	ld a, [wc7d2]
@@ -7050,16 +6779,14 @@ Function11b3d9: ; 11b3d9
 	xor a
 	ld [hl], a
 	ret
-; 11b444
 
-Special_Function11b444: ; 11b444
+Function11b444:
 ; special
 	call Mobile46_InitJumptable
 	call Mobile46_RunJumptable
 	ret
-; 11b44b
 
-Mobile46_InitJumptable: ; 11b44b
+Mobile46_InitJumptable:
 	xor a
 	ld [wJumptableIndex], a
 	ld [wcf64], a
@@ -7067,9 +6794,8 @@ Mobile46_InitJumptable: ; 11b44b
 	ld [wcf66], a
 	call UpdateTime
 	ret
-; 11b45c
 
-Mobile46_RunJumptable: ; 11b45c
+Mobile46_RunJumptable:
 .loop
 	call .IterateJumptable
 	call DelayFrame
@@ -7077,9 +6803,8 @@ Mobile46_RunJumptable: ; 11b45c
 	cp 4
 	jr nz, .loop
 	ret
-; 11b46a
 
-.IterateJumptable: ; 11b46a
+.IterateJumptable:
 	jumptable .Jumptable, wJumptableIndex
 
 .Jumptable:
@@ -7088,9 +6813,8 @@ Mobile46_RunJumptable: ; 11b45c
 	dw Function11b5c0
 	dw Function11b5e0
 	dw Function11b5e7 ; unused
-; 11b483
 
-Function11b483: ; 11b483
+Function11b483:
 	call .InitRAM
 	ld hl, wPlayerName
 	ld a, NAME_LENGTH_JAPANESE - 1
@@ -7145,8 +6869,8 @@ Function11b483: ; 11b483
 	add hl, de
 	pop de
 	push de
-	ld b, OTPARTYMON
-	predef CalcPkmnStats
+	ld b, TRUE
+	predef CalcMonStats
 	pop de
 	ld h, d
 	ld l, e
@@ -7266,9 +6990,8 @@ Function11b483: ; 11b483
 	ld [bc], a
 	inc bc
 	ret
-; 11b570
 
-Function11b570: ; 11b570
+Function11b570:
 	call Function118007
 	ld a, [wScriptVar]
 	and a
@@ -7317,31 +7040,27 @@ Function11b570: ; 11b570
 
 	call CloseSRAM
 	ret
-; 11b5c0
 
-Function11b5c0: ; 11b5c0
+Function11b5c0:
 	ld a, [wcd82]
 	dec a
 	ld [wCurPartyMon], a
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	farcall Function170807
 	farcall SaveAfterLinkTrade
 	jp Function11ad8a
-; 11b5e0
 
-Function11b5e0: ; 11b5e0
+Function11b5e0:
 	xor a
 	ld [wScriptVar], a
 	jp Function11ad8a
-; 11b5e7
 
-Function11b5e7: ; 11b5e7
+Function11b5e7:
 	ret
-; 11b5e8
 
-Special_Function11b5e8: ; 11b5e8
+Function11b5e8:
 	ld a, $0
 	call GetSRAMBank
 	ld hl, wRTC
@@ -7392,9 +7111,8 @@ Special_Function11b5e8: ; 11b5e8
 .Jumptable:
 	dw Function11b66d
 	dw Function11b6b3
-; 11b66d
 
-Function11b66d: ; 11b66d
+Function11b66d:
 	call Function1180b8
 	ld a, [wScriptVar]
 	and a
@@ -7433,13 +7151,11 @@ Function11b66d: ; 11b66d
 
 .asm_11b6b0
 	jp Function11ad8a
-; 11b6b3
 
-Function11b6b3: ; 11b6b3
+Function11b6b3:
 	ret
-; 11b6b4
 
-Function11b6b4: ; 11b6b4
+Function11b6b4:
 	ld a, $5
 	call GetSRAMBank
 	ld a, [wcd30]
@@ -7564,8 +7280,8 @@ Function11b6b4: ; 11b6b4
 
 	ld hl, $c60d + MON_STAT_EXP - 1
 	ld de, $c60d + MON_MAXHP
-	ld b, $1
-	predef CalcPkmnStats
+	ld b, TRUE
+	predef CalcMonStats
 	ld de, $c60d + MON_MAXHP
 	ld hl, $c60d + MON_HP
 	ld a, [de]
@@ -7575,9 +7291,8 @@ Function11b6b4: ; 11b6b4
 	ld [hl], a
 	call AddMobileMonToParty
 	ret
-; 11b7e5
 
-Special_Function11b7e5: ; 11b7e5
+Function11b7e5:
 	ld a, [$c60d] ; species
 	ld [wOTTrademonSpecies], a
 	ld [wCurPartySpecies], a
@@ -7634,9 +7349,8 @@ Special_Function11b7e5: ; 11b7e5
 	call CloseSubmenu
 	call RestartMapMusic
 	ret
-; 11b879
 
-Special_Function11b879: ; 11b879
+Function11b879:
 	farcall BattleTower_CheckSaveFileExistsAndIsYours
 	ld a, [wScriptVar]
 	and a
@@ -7716,7 +7430,7 @@ Special_Function11b879: ; 11b879
 	ld e, a
 	ld a, h
 	cpl
-	adc $0
+	adc 0
 	ld d, a
 	pop hl
 	add hl, de
@@ -7727,9 +7441,8 @@ Special_Function11b879: ; 11b879
 	ld a, $2
 	ld [wScriptVar], a
 	ret
-; 11b920
 
-Special_Function11b920: ; 11b920
+Function11b920:
 	call Mobile46_InitJumptable
 	ld a, $5
 	call GetSRAMBank
@@ -7740,9 +7453,8 @@ Special_Function11b920: ; 11b920
 	call CloseSRAM
 	call Function118000
 	ret
-; 11b93b
 
-Special_Function11b93b: ; 11b93b
+Function11b93b:
 	ld a, $5
 	call GetSRAMBank
 	xor a
@@ -7780,9 +7492,8 @@ Special_Function11b93b: ; 11b93b
 	call AddMobileMonToParty
 	farcall SaveAfterLinkTrade
 	ret
-; 11b98f
 
-AddMobileMonToParty: ; 11b98f
+AddMobileMonToParty:
 	ld hl, wPartyCount
 	ld a, [hl]
 	ld e, a
@@ -7884,15 +7595,13 @@ AddMobileMonToParty: ; 11b98f
 
 	call CloseSRAM
 	ret
-; 11ba38
 
-Special_Function11ba38: ; 11ba38
+Function11ba38:
 	farcall CheckCurPartyMonFainted
 	ret c
 	xor a
 	ld [wScriptVar], a
 	ret
-; 11ba44
 
 TilemapPack_11ba44:
 	db $47, $30, $0a, $0a, $0a, $0a, $0a, $56 ; 00
@@ -7974,5 +7683,3 @@ TilemapPack_11bb7d:
 	db $2e, $0a, $85, $0a, $0a, $0a, $8d, $00 ; 22
 	db $2e, $0a, $0a, $84, $0a, $0a, $8e, $00 ; 23
 	db -1
-
-
diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm
index c5cc54a50..9388e8d04 100755..100644
--- a/mobile/mobile_5b.asm
+++ b/mobile/mobile_5b.asm
@@ -1,4 +1,4 @@
-Unreferenced_Function16c000: ; 16c000
+Unreferenced_Function16c000:
 	; Only for CGB
 	ld a, [hCGB]
 	and a
@@ -26,9 +26,8 @@ Unreferenced_Function16c000: ; 16c000
 	pop af
 	ld [wcfbe], a
 	ret
-; 16c031
 
-.RunJumptable: ; 16c031
+.RunJumptable:
 	xor a
 	ld [wJumptableIndex], a
 	ld [wcf64], a
@@ -46,9 +45,8 @@ Unreferenced_Function16c000: ; 16c000
 	cp $ff
 	jr nz, .loop
 	ret
-; 16c05c
 
-.Jumptable: ; 16c05c
+.Jumptable:
 	dw .init
 	dw Function16c0ba
 	dw Function16c089
@@ -61,9 +59,8 @@ Unreferenced_Function16c000: ; 16c000
 	dw Function16c0dc
 	dw Function16c0ec
 	dw .quit
-; 16c074
 
-.init ; 16c074
+.init
 	ld a, [wcf64]
 	and a
 	ret z
@@ -71,17 +68,15 @@ Unreferenced_Function16c000: ; 16c000
 	xor a
 	ld [wd003], a
 	ret
-; 16c081
 
-.quit ; 16c081
+.quit
 	push af
 	ld a, $ff
 	ld [wd002], a
 	pop af
 	ret
-; 16c089
 
-Function16c089: ; 16c089
+Function16c089:
 	ld a, $1
 	ld [wBuffer2], a
 	ld [wd1f1], a
@@ -91,17 +86,15 @@ Function16c089: ; 16c089
 	ld a, [wd002]
 	ld [wcf64], a
 	ret
-; 16c09e
 
-Function16c09e: ; 16c09e
+Function16c09e:
 	ld a, [wcf64]
 	cp $4
 	ret nz
 	call Function16c0fa
 	ret
-; 16c0a8
 
-Function16c0a8: ; 16c0a8
+Function16c0a8:
 	xor a
 	ld [wBuffer2], a
 	ld [wd1f1], a
@@ -110,9 +103,8 @@ Function16c0a8: ; 16c0a8
 	ld [hWY], a
 	call Function16c0fa
 	ret
-; 16c0ba
 
-Function16c0ba: ; 16c0ba
+Function16c0ba:
 	call Function16c943
 	push af
 	ld a, [wd003]
@@ -121,9 +113,8 @@ Function16c0ba: ; 16c0ba
 	pop af
 	call c, Function16c0fa
 	ret
-; 16c0ca
 
-Function16c0ca: ; 16c0ca
+Function16c0ca:
 	ld a, [wd003]
 	cp $28
 	push af
@@ -133,9 +124,8 @@ Function16c0ca: ; 16c0ca
 	pop af
 	call z, Function16c0fa
 	ret
-; 16c0dc
 
-Function16c0dc: ; 16c0dc
+Function16c0dc:
 	call Function16ca11
 	push af
 	ld a, [wd003]
@@ -144,9 +134,8 @@ Function16c0dc: ; 16c0dc
 	pop af
 	call c, Function16c0fa
 	ret
-; 16c0ec
 
-Function16c0ec: ; 16c0ec
+Function16c0ec:
 	call ClearBGPalettes
 	call ClearScreen
 	push af
@@ -154,9 +143,8 @@ Function16c0ec: ; 16c0ec
 	ld [wd002], a
 	pop af
 	ret
-; 16c0fa
 
-Function16c0fa: ; 16c0fa
+Function16c0fa:
 	push af
 	ld a, [wd002]
 	inc a
@@ -165,9 +153,8 @@ Function16c0fa: ; 16c0fa
 	ld [wd003], a
 	pop af
 	ret
-; 16c108
 
-MobileSystemSplashScreen_InitGFX: ; 16c108
+MobileSystemSplashScreen_InitGFX:
 	call DisableLCD
 	ld hl, vTiles2
 	ld de, .Tiles
@@ -183,9 +170,8 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
 	ld [hBGMapMode], a
 	call EnableLCD
 	ret
-; 16c130
 
-.LoadPals: ; 16c130
+.LoadPals:
 	ld de, wBGPals1
 	ld hl, UnknownMobilePalettes_16c903
 	ld bc, 8
@@ -193,9 +179,8 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
 	call FarCopyWRAM
 	farcall ApplyPals
 	ret
-; 16c145
 
-.LoadTileMap: ; 16c145
+.LoadTileMap:
 	hlcoord 0, 0
 	ld bc, 20
 	xor a
@@ -205,9 +190,8 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
 	ld bc, $0154
 	call CopyBytes
 	ret
-; 16c15c
 
-.LoadAttrMap: ; 16c15c
+.LoadAttrMap:
 	hlcoord 0, 0, wAttrMap
 	ld bc, SCREEN_WIDTH
 	xor a
@@ -217,7 +201,6 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
 	ld bc, 17 * SCREEN_WIDTH
 	call CopyBytes
 	ret
-; 16c173
 
 .Tiles:
 INCBIN "gfx/mobile/mobile_splash.2bpp"
@@ -228,12 +211,10 @@ INCBIN "gfx/mobile/mobile_splash.tilemap"
 .AttrMap:
 INCBIN "gfx/mobile/mobile_splash.attrmap"
 
-UnknownMobilePalettes_16c903: ; 16c903
+UnknownMobilePalettes_16c903:
 INCLUDE "gfx/unknown/16c903.pal"
 
-; 16c943
-
-Function16c943: ; 16c943
+Function16c943:
 	ld a, [wd003]
 	and a
 	jr nz, .asm_16c95e
@@ -354,9 +335,8 @@ Function16c943: ; 16c943
 	ld [rSVBK], a
 	scf
 	ret
-; 16ca11
 
-Function16ca11: ; 16ca11
+Function16ca11:
 	ld a, [wd003]
 	and a
 	jr nz, .asm_16ca1d
@@ -455,25 +435,22 @@ Function16ca11: ; 16ca11
 	ld [rSVBK], a
 	scf
 	ret
-; 16cab6
 
-Function16cab6: ; 16cab6
+Function16cab6:
 	ld b, $0
 	ld c, e
 	add hl, bc
 	ret
-; 16cabb
 
-Function16cabb: ; 16cabb
+Function16cabb:
 	inc hl
 	ld a, [hl]
 	srl a
 	srl a
 	and $1f
 	ret
-; 16cac4
 
-Function16cac4: ; 16cac4
+Function16cac4:
 	inc hl
 	ld a, [hld]
 	and $3
@@ -487,15 +464,13 @@ Function16cac4: ; 16cac4
 	rl b
 	ld a, b
 	ret
-; 16cad8
 
-Function16cad8: ; 16cad8
+Function16cad8:
 	ld a, [hl]
 	and $1f
 	ret
-; 16cadc
 
-Function16cadc: ; 16cadc
+Function16cadc:
 	sla a
 	sla a
 	ld b, a
@@ -505,9 +480,8 @@ Function16cadc: ; 16cadc
 	or b
 	ld [hl], a
 	ret
-; 16cae8
 
-Function16cae8: ; 16cae8
+Function16cae8:
 	ld c, a
 	srl a
 	srl a
@@ -530,18 +504,16 @@ Function16cae8: ; 16cae8
 	or b
 	ld [hl], a
 	ret
-; 16cb08
 
-Function16cb08: ; 16cb08
+Function16cb08:
 	ld b, a
 	ld a, [hl]
 	and $e0
 	or b
 	ld [hl], a
 	ret
-; 16cb0f
 
-Function16cb0f: ; 16cb0f
+Function16cb0f:
 	xor a
 	ld [wBuffer1], a
 	ld [wBuffer2], a
@@ -556,9 +528,8 @@ Function16cb0f: ; 16cb0f
 	xor a
 	ld [wd1f0], a
 	ret
-; 16cb2e
 
-Function16cb2e: ; 16cb2e
+Function16cb2e:
 	ld a, [wBuffer2]
 	and a
 	ret z
@@ -567,9 +538,8 @@ Function16cb2e: ; 16cb2e
 	ld de, wVirtualOAM
 	call Function16cb5d
 	ret
-; 16cb40
 
-Function16cb40: ; 16cb40
+Function16cb40:
 	ld hl, wd1ec
 	inc [hl]
 	ld a, [hl]
@@ -588,9 +558,8 @@ Function16cb40: ; 16cb40
 	ld a, $a0
 	ld [wd1ef], a
 	ret
-; 16cb5d
 
-Function16cb5d: ; 16cb5d
+Function16cb5d:
 	ld a, [hli]
 	and a
 	ret z
@@ -622,7 +591,6 @@ Function16cb5d: ; 16cb5d
 	dec a
 	jr nz, .asm_16cb60
 	ret
-; 16cb86
 
 Unknown_16cb86:
 	db 7
@@ -633,26 +601,23 @@ Unknown_16cb86:
 	db 16,  0, 4, 1
 	db 16,  8, 5, 0
 	db 16, 16, 6, 0
-; 16cba3
 
-Function16cba3: ; 16cba3
+Function16cba3:
 	xor a
 	ld [wd1f1], a
 	ld [wd1f2], a
 	ld [wd1f3], a
 	ret
-; 16cbae
 
-Function16cbae: ; 16cbae
+Function16cbae:
 	ld a, [wd1f1]
 	and a
 	ret z
 	call Function16cbba
 	call Function16cbd1
 	ret
-; 16cbba
 
-Function16cbba: ; 16cbba
+Function16cbba:
 	ld hl, wd1f2
 	inc [hl]
 	ld a, [hl]
@@ -669,9 +634,8 @@ Function16cbba: ; 16cbba
 .asm_16cbcd
 	ld [wd1f3], a
 	ret
-; 16cbd1
 
-Function16cbd1: ; 16cbd1
+Function16cbd1:
 	ld a, [wd1f3]
 	ld c, a
 	ld b, 0
@@ -681,21 +645,19 @@ Function16cbd1: ; 16cbd1
 	ld bc, 2
 	ld hl, Unknown_16cfa3
 	call AddNTimes
-	ld de, wBGPals1 + 1 palettes + 4
-	ld bc, 2
+	ld de, wBGPals1 palette 1 color 2
+	ld bc, PAL_COLOR_SIZE
 	ld a, $5
 	call FarCopyWRAM
 	farcall ApplyPals
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 16cbfb
 
 Unknown_16cbfb:
 	db 0, 1, 2, 1, 0, 1, 2
-; 16cc02
 
-Function16cc02: ; 16cc02
+Function16cc02:
 	call Function16cc18
 	call Function16cc49
 	call Function16cc62
@@ -704,17 +666,15 @@ Function16cc02: ; 16cc02
 	call Function16cb0f
 	call Function16cba3
 	ret
-; 16cc18
 
-Function16cc18: ; 16cc18
+Function16cc18:
 	ld hl, vTiles1
 	ld de, GFX_16cca3
 	lb bc, BANK(GFX_16cca3), 46
 	call Get2bpp
 	ret
-; 16cc25
 
-Function16cc25: ; 16cc25
+Function16cc25:
 	ld hl, Unknown_16cfa9
 	ld de, wBGPals1 + 1 palettes
 	call .CopyPal
@@ -725,15 +685,13 @@ Function16cc25: ; 16cc25
 	ld de, wOBPals1 + 1 palettes
 	call .CopyPal
 	ret
-; 16cc41
 
-.CopyPal: ; 16cc41
+.CopyPal:
 	ld bc, 1 palettes
 	ld a, $5
 	jp FarCopyWRAM
-; 16cc49
 
-Function16cc49: ; 16cc49
+Function16cc49:
 	hlcoord 4, 15
 	ld a, $80
 	call Function16cc5a
@@ -741,9 +699,8 @@ Function16cc49: ; 16cc49
 	ld a, $90
 	call Function16cc5a
 	ret
-; 16cc5a
 
-Function16cc5a: ; 16cc5a
+Function16cc5a:
 	ld c, $10
 .asm_16cc5c
 	ld [hli], a
@@ -751,17 +708,15 @@ Function16cc5a: ; 16cc5a
 	dec c
 	jr nz, .asm_16cc5c
 	ret
-; 16cc62
 
-Function16cc62: ; 16cc62
+Function16cc62:
 	hlcoord 0, 15, wAttrMap
 	ld bc, $0028
 	ld a, $1
 	call ByteFill
 	ret
-; 16cc6e
 
-Function16cc6e: ; 16cc6e
+Function16cc6e:
 	hlbgcoord 0, 0, vBGMap1
 	jr Function16cc73
 
@@ -781,9 +736,8 @@ Function16cc73:
 	pop af
 	ld [rVBK], a
 	ret
-; 16cc90
 
-Function16cc90: ; 16cc90
+Function16cc90:
 	ld bc, $1214
 .asm_16cc93
 	push bc
@@ -799,7 +753,6 @@ Function16cc90: ; 16cc90
 	dec b
 	jr nz, .asm_16cc93
 	ret
-; 16cca3
 
 GFX_16cca3:
 INCBIN "gfx/unknown/16cca3.2bpp"
@@ -815,18 +768,14 @@ Unknown_16cfa9:
 	RGB 31, 31, 31
 	RGB 07, 07, 07
 
-
 Unknown_16cfb1:
 	RGB 31, 31, 31
 	RGB 13, 09, 18
 	RGB 26, 21, 16
 	RGB 07, 07, 07
 
-
 Unknown_16cfb9:
 	RGB 31, 31, 31
 	RGB 18, 05, 02
 	RGB 27, 11, 12
 	RGB 07, 07, 07
-
-; 16cfc1
diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm
index 474dde270..0b4d05014 100755..100644
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -1,4 +1,4 @@
-Function170000: ; 170000
+Function170000:
 	ld a, [$c62b]
 	ld [wPlayerTrademonSpecies], a
 	ld hl, $c62e
@@ -35,9 +35,7 @@ Function170000: ; 170000
 	call CopyBytes
 	ret
 
-; 17005a
-
-Function17005a: ; 17005a
+Function17005a:
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$a824]
@@ -73,11 +71,9 @@ Function17005a: ; 17005a
 	call CloseSRAM
 	ret
 
-; 1700b0
-
 INCLUDE "engine/events/battle_tower/battle_tower.asm"
 
-Function170be4: ; 170be4
+Function170be4:
 	ld a, $5
 	call GetSRAMBank
 	xor a
@@ -87,9 +83,7 @@ Function170be4: ; 170be4
 	call CloseSRAM
 	ret
 
-; 170bf7
-
-Clears5_a89a: ; 170bf7
+Clears5_a89a:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $a89a
@@ -99,14 +93,12 @@ Clears5_a89a: ; 170bf7
 	call CloseSRAM
 	ret
 
-; 170c06
-
-Function170c06: ; 170c06
+Function170c06:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $a894
 	ld a, [wBattleResult]
-	and a
+	and a ; WIN?
 	jr nz, .asm_170c15
 	inc [hl]
 
@@ -203,9 +195,7 @@ Function170c06: ; 170c06
 	call CloseSRAM
 	ret
 
-; 170c8b
-
-Function170c8b: ; 170c8b
+Function170c8b:
 	ld hl, wLastEnemyCounterMove
 	ld b, $5
 .asm_170c90
@@ -216,11 +206,9 @@ Function170c8b: ; 170c8b
 	jr nz, .asm_170c90
 	ret
 
-; 170c98
-
-CheckBTMonMovesForErrors: ; 170c98
+CheckBTMonMovesForErrors:
 	ld c, BATTLETOWER_PARTY_LENGTH
-	ld hl, wBT_OTTempPkmn1Moves
+	ld hl, wBT_OTTempMon1Moves
 .loop
 	push hl
 	ld a, [hl]
@@ -260,9 +248,7 @@ CheckBTMonMovesForErrors: ; 170c98
 	jr nz, .loop
 	ret
 
-; 170cc6
-
-Function170cc6: ; 170cc6
+Function170cc6:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -289,21 +275,17 @@ Function170cc6: ; 170cc6
 	ld [rSVBK], a
 	ret
 
-; 170d02
-
-Function170d02: ; 170d02
+Function170d02:
 	ld a, $1
 	ld [rVBK], a
 	ld de, GFX_171848
-	ld hl, vTiles1 tile $41
+	ld hl, vTiles0 tile $c1
 	lb bc, BANK(GFX_171848), 24
 	call Get2bpp
 	xor a
 	ld [rVBK], a
 	ret
 
-; 170d16
-
 PichuAnimatedMobileGFX:
 INCBIN "gfx/mobile/pichu_animated.2bpp.lz"
 
@@ -313,7 +295,7 @@ INCBIN "gfx/mobile/electro_ball.2bpp.lz"
 GFX_171848:
 INCBIN "gfx/unknown/171848.2bpp"
 
-Function1719c8: ; 1719c8 (5c:59c8)
+Function1719c8:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -323,7 +305,7 @@ Function1719c8: ; 1719c8 (5c:59c8)
 	ld [hInMenu], a
 	ret
 
-Function1719d6: ; 1719d6 (5c:59d6)
+Function1719d6:
 	farcall BattleTowerRoomMenu_InitRAM
 	call Function1719ed
 	ld a, [rSVBK]
@@ -335,7 +317,7 @@ Function1719d6: ; 1719d6 (5c:59d6)
 	ld [rSVBK], a
 	ret
 
-Function1719ed: ; 1719ed (5c:59ed)
+Function1719ed:
 	xor a
 	ld [wcd49], a
 	ld [wcd4a], a
@@ -348,7 +330,7 @@ Function1719ed: ; 1719ed (5c:59ed)
 	farcall ClearSpriteAnims
 	ret
 
-Function171a11: ; 171a11 (5c:5a11)
+Function171a11:
 .loop
 	call JoyTextDelay
 	ld a, [wcd49]
@@ -363,7 +345,7 @@ Function171a11: ; 171a11 (5c:5a11)
 	call ClearSprites
 	ret
 
-Function171a36: ; 171a36 (5c:5a36)
+Function171a36:
 	ld a, [wcd49]
 	ld e, a
 	ld d, 0
@@ -375,7 +357,7 @@ Function171a36: ; 171a36 (5c:5a36)
 	ld l, a
 	jp hl
 
-Jumptable_171a45: ; 171a45 (5c:5a45)
+Jumptable_171a45:
 	dw Function171a95
 	dw Function171ac9
 	dw Function171a5d
@@ -389,8 +371,7 @@ Jumptable_171a45: ; 171a45 (5c:5a45)
 	dw Function171c39
 	dw Function171c41
 
-
-Function171a5d: ; 171a5d (5c:5a5d)
+Function171a5d:
 	ld a, [wc821]
 	bit 1, a
 	jr nz, .asm_171a6a
@@ -419,30 +400,27 @@ Function171a5d: ; 171a5d (5c:5a5d)
 	ld [wcd49], a
 	ret
 
-Function171a95: ; 171a95 (5c:5a95)
+Function171a95:
 	farcall Function171ccd
 	hlcoord 2, 8
 	ld de, String_171aa7
 	call PlaceString
 	jp Function171c66
 
-; 171aa7 (5c:5aa7)
-
-String_171aa7: ; 171aa7
+String_171aa7:
 	db   "モバイルアダプタに"
 	next "せつぞく　しています"
 	next "しばらく　おまちください"
 	db   "@"
-; 171ac9
 
-Function171ac9: ; 171ac9 (5c:5ac9)
+Function171ac9:
 	ld de, wcd81
 	ld hl, $5c
 	ld a, $2
 	call Function3e32
 	jp Function171c66
 
-Function171ad7: ; 171ad7 (5c:5ad7)
+Function171ad7:
 	xor a
 	ld hl, $c608
 	ld bc, $66
@@ -452,7 +430,7 @@ Function171ad7: ; 171ad7 (5c:5ad7)
 	call Function3e32
 	jp Function171c66
 
-Function171aec: ; 171aec (5c:5aec)
+Function171aec:
 	ld a, [rSVBK]
 	push af
 	ld a, $1
@@ -503,7 +481,7 @@ Function171aec: ; 171aec (5c:5aec)
 	jr nz, .asm_171b1b
 	jp Function171c66
 
-Function171b42: ; 171b42 (5c:5b42)
+Function171b42:
 	ld a, [de]
 	inc de
 	and a
@@ -512,7 +490,7 @@ Function171b42: ; 171b42 (5c:5b42)
 	ld [hli], a
 	jr Function171b42
 
-Function171b4b: ; 171b4b (5c:5b4b)
+Function171b4b:
 	depixel 8, 2
 	ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
 	call _InitSpriteAnimStruct
@@ -543,7 +521,7 @@ Function171b4b: ; 171b4b (5c:5b4b)
 	ld [wcd24], a
 	jp Function171c66
 
-Function171b85: ; 171b85 (5c:5b85)
+Function171b85:
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and $2
@@ -559,12 +537,12 @@ Function171b85: ; 171b85 (5c:5b85)
 	jr nz, asm_171baf
 	ret
 
-Function171b9f: ; 171b9f (5c:5b9f)
+Function171b9f:
 	ld a, $80
 	ld [wcd49], a
 	ret
 
-asm_171ba5: ; 171ba5 (5c:5ba5)
+asm_171ba5:
 	ld a, [wcd4a]
 	and a
 	ret z
@@ -572,7 +550,7 @@ asm_171ba5: ; 171ba5 (5c:5ba5)
 	ld [wcd4a], a
 	ret
 
-asm_171baf: ; 171baf (5c:5baf)
+asm_171baf:
 	ld a, [wcd4b]
 	ld c, a
 	ld a, [wcd4a]
@@ -582,7 +560,7 @@ asm_171baf: ; 171baf (5c:5baf)
 	ld [wcd4a], a
 	ret
 
-Function171bbd: ; 171bbd (5c:5bbd)
+Function171bbd:
 	call PlayClickSFX
 	ld a, $8
 	ld [wcd23], a
@@ -590,7 +568,7 @@ Function171bbd: ; 171bbd (5c:5bbd)
 	ld [wcd24], a
 	jp Function171c66
 
-Function171bcc: ; 171bcc (5c:5bcc)
+Function171bcc:
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and $2
@@ -600,7 +578,7 @@ Function171bcc: ; 171bcc (5c:5bcc)
 	jp nz, Function171beb
 	ret
 
-Function171bdc: ; 171bdc (5c:5bdc)
+Function171bdc:
 	ld a, $4
 	ld [wcd23], a
 	ld a, $8
@@ -609,14 +587,14 @@ Function171bdc: ; 171bdc (5c:5bdc)
 	dec [hl]
 	ret
 
-Function171beb: ; 171beb (5c:5beb)
+Function171beb:
 	ld a, $5
 	call GetSRAMBank
 	ld a, [wcd4a]
 	ld [$aa4a], a
 	call CloseSRAM
-	ld hl, MenuDataHeader_171c6b
-	call LoadMenuDataHeader
+	ld hl, MenuHeader_171c6b
+	call LoadMenuHeader
 	call MenuBox
 	call MenuBoxCoord2Tile
 	farcall ReloadMapPart
@@ -636,7 +614,7 @@ Function171beb: ; 171beb (5c:5beb)
 	ld [wcd4c], a
 	call Function171c66
 
-Function171c2c: ; 171c2c (5c:5c2c)
+Function171c2c:
 	ld hl, wcd4c
 	dec [hl]
 	ret nz
@@ -644,12 +622,12 @@ Function171c2c: ; 171c2c (5c:5c2c)
 	call ClearBGPalettes
 	jr asm_171c60
 
-Function171c39: ; 171c39 (5c:5c39)
+Function171c39:
 	ld a, $28
 	ld [wcd4c], a
 	call Function171c66
 
-Function171c41: ; 171c41 (5c:5c41)
+Function171c41:
 	ld hl, wcd4c
 	dec [hl]
 	ret nz
@@ -659,31 +637,27 @@ Function171c41: ; 171c41 (5c:5c41)
 	ld a, $2
 	ld [wc303], a
 	farcall DisplayMobileError
-asm_171c60: ; 171c60 (5c:5c60)
+asm_171c60:
 	ld a, $80
 	ld [wcd49], a
 	ret
 
-Function171c66: ; 171c66 (5c:5c66)
+Function171c66:
 	ld hl, wcd49
 	inc [hl]
 	ret
 
-; 171c6b (5c:5c6b)
-
-MenuDataHeader_171c6b: ; 171c6b
+MenuHeader_171c6b:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw NULL
 	db 0 ; default option
-; 171c73
 
-String_171c73: ; 171c73
+String_171c73:
 	db   "モバイルセンターを　けってい"
 	next "しました@"
-; 171c87
 
-Function171c87: ; 171c87 (5c:5c87)
+Function171c87:
 	call DisableLCD
 	ld hl, GFX_171db1
 	ld de, vTiles2 tile $00
@@ -709,7 +683,7 @@ Function171c87: ; 171c87 (5c:5c87)
 	call PlaceString
 	ret
 
-Function171ccd: ; 171ccd (5c:5ccd)
+Function171ccd:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -728,7 +702,7 @@ Function171ccd: ; 171ccd (5c:5ccd)
 	ld [rSVBK], a
 	ret
 
-Function171cf0: ; 171cf0 (5c:5cf0)
+Function171cf0:
 	xor a
 	hlcoord 4, 15
 	ld [hli], a
@@ -755,7 +729,7 @@ Function171cf0: ; 171cf0 (5c:5cf0)
 	ld de, String_172e4e
 	jp PlaceString
 
-Function171d2b: ; 171d2b (5c:5d2b)
+Function171d2b:
 	call DisableLCD
 	ld hl, GFX_171db1
 	ld de, vTiles2 tile $00
@@ -781,8 +755,6 @@ Function171d2b: ; 171d2b (5c:5d2b)
 	call PlaceString
 	ret
 
-; 171d71 (5c:5d71)
-
 Palette_171d71:
 	RGB  0,  0,  0
 	RGB  3,  0,  0
@@ -836,21 +808,19 @@ INCBIN "gfx/unknown/172955.attrmap"
 LZ_172abd:
 INCBIN "gfx/pokedex/slowpoke.2bpp.lz"
 
-String_172e31: ; 172e31
+String_172e31:
 	db "パスワード<WO>いれてください@"
-String_172e3f: ; 172e3f
+String_172e3f:
 	db "きりかえ　やめる　　けってい@"
-String_172e4e: ; 172e4e
+String_172e4e:
 	db "きりかえ　やめる　　"
 String_172e58:
 	db "けってい@"
-String_172e5d: ; 172e5d
+String_172e5d:
 	db "せつぞくする　モバイルセンターを"
 	next "えらんで　ください@"
-; 172e78
-
 
-Function172e78: ; 172e78 (5c:6e78)
+Function172e78:
 	ld a, $7f
 	hlcoord 0, 0
 	ld bc, $168
@@ -875,8 +845,6 @@ Function172e78: ; 172e78 (5c:6e78)
 	call CopyBytes
 	ret
 
-; 172eb9 (5c:6eb9)
-
 Function172eb9:
 	ld a, [rSVBK]
 	push af
@@ -895,8 +863,6 @@ Function172eb9:
 	ld [rSVBK], a
 	ret
 
-; 172edf (5c:6edf)
-
 Palette_172edf:
 	RGB  5, 12, 17
 	RGB 31, 31, 31
diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm
index 3436d85b9..1035bb026 100644
--- a/mobile/mobile_5e.asm
+++ b/mobile/mobile_5e.asm
@@ -1,7 +1,7 @@
 MobileAdapterGFX::
 INCBIN "gfx/mobile/mobile_adapter.2bpp"
 
-Function17a68f:: ; 17a68f (5e:668f)
+Function17a68f::
 	call Function17a6a8
 	call Function17a751
 	ld hl, $d088
@@ -18,7 +18,7 @@ Function17a68f:: ; 17a68f (5e:668f)
 	scf
 	ret
 
-Function17a6a8: ; 17a6a8 (5e:66a8)
+Function17a6a8:
 	push de
 	push bc
 	ld hl, wStringBuffer2 ; $d086
@@ -49,7 +49,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8)
 	call DelayFrame
 	ret
 
-Function17a6f5: ; 17a6f5 (5e:66f5)
+Function17a6f5:
 	ld hl, wBuffer1
 	ld c, $0
 	ld b, $8
@@ -69,7 +69,7 @@ Function17a6f5: ; 17a6f5 (5e:66f5)
 	ld [$d08c], a
 	ret
 
-Function17a713: ; 17a713 (5e:6713)
+Function17a713:
 	and $f
 	cp $a
 	jr nc, .asm_17a71d
@@ -83,7 +83,7 @@ Function17a713: ; 17a713 (5e:6713)
 	scf
 	ret
 
-Function17a721: ; 17a721 (5e:6721)
+Function17a721:
 	push de
 	ld h, d
 	ld l, e
@@ -121,7 +121,7 @@ Function17a721: ; 17a721 (5e:6721)
 	ld [de], a
 	ret
 
-Function17a751: ; 17a751 (5e:6751)
+Function17a751:
 	xor a
 	ld [$d087], a
 .asm_17a755
@@ -137,7 +137,7 @@ Function17a751: ; 17a751 (5e:6751)
 	jr z, .asm_17a755
 	ret
 
-Function17a770: ; 17a770 (5e:6770)
+Function17a770:
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -148,7 +148,7 @@ Function17a770: ; 17a770 (5e:6770)
 	ld [hOAMUpdate], a
 	ret
 
-Function17a781: ; 17a781 (5e:6781)
+Function17a781:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -158,7 +158,7 @@ Function17a781: ; 17a781 (5e:6781)
 	ld [hInMenu], a
 	ret
 
-Function17a78f: ; 17a78f (5e:678f)
+Function17a78f:
 	ld hl, $d088
 	bit 7, [hl]
 	res 7, [hl]
@@ -169,21 +169,20 @@ Function17a78f: ; 17a78f (5e:678f)
 .asm_17a79f
 	farcall ReloadMapPart
 	ret
-; 17a7a6 (5e:67a6)
 
-Function17a7a6: ; 17a7a6
+Function17a7a6:
 	ld a, [$d087]
 	inc a
 	ld [$d087], a
 	ret
 
-Function17a7ae: ; 17a7ae (5e:67ae)
+Function17a7ae:
 	ld a, [$d087]
 	ld hl, Jumptable_17a7b6
 	rst JumpTable
 	ret
 
-Jumptable_17a7b6: ; 17a7b6 (5e:67b6)
+Jumptable_17a7b6:
 	dw Function17a7c2
 	dw Function17a7cd
 	dw Function17a7d8
@@ -191,22 +190,21 @@ Jumptable_17a7b6: ; 17a7b6 (5e:67b6)
 	dw Function17a81a
 	dw Function17a7f4
 
-
-Function17a7c2: ; 17a7c2 (5e:67c2)
+Function17a7c2:
 	ld a, $4
 	call Function17aad3
 	ld a, $1
 	ld [$d087], a
 	ret
 
-Function17a7cd: ; 17a7cd (5e:67cd)
+Function17a7cd:
 	call Function17a83c
 	call Function17a8ae
 	ret c
 	call Function17a848
 	ret
 
-Function17a7d8: ; 17a7d8 (5e:67d8)
+Function17a7d8:
 	call Function17a83c
 	call Function17a848
 	ld hl, $d08b
@@ -220,7 +218,7 @@ Function17a7d8: ; 17a7d8 (5e:67d8)
 	ld [$d087], a
 	ret
 
-Function17a7f4: ; 17a7f4 (5e:67f4)
+Function17a7f4:
 	ld hl, $d08b
 	dec [hl]
 	ret nz
@@ -228,7 +226,7 @@ Function17a7f4: ; 17a7f4 (5e:67f4)
 	set 7, [hl]
 	ret
 
-Function17a7ff: ; 17a7ff (5e:67ff)
+Function17a7ff:
 	ld hl, $d08b
 	dec [hl]
 	ret nz
@@ -242,7 +240,7 @@ Function17a7ff: ; 17a7ff (5e:67ff)
 	set 7, [hl]
 	ret
 
-Function17a81a: ; 17a81a (5e:681a)
+Function17a81a:
 	call IsSFXPlaying
 	ret nc
 	ld a, [hJoyPressed]
@@ -259,7 +257,7 @@ Function17a81a: ; 17a81a (5e:681a)
 	ld [$d087], a
 	ret
 
-Function17a83c: ; 17a83c (5e:683c)
+Function17a83c:
 	ld a, [hJoyLast]
 	and $f0
 	ld c, a
@@ -269,7 +267,7 @@ Function17a83c: ; 17a83c (5e:683c)
 	ld c, a
 	ret
 
-Function17a848: ; 17a848 (5e:6848)
+Function17a848:
 	ld a, c
 	and $60
 	cp $60
@@ -345,7 +343,7 @@ Function17a848: ; 17a848 (5e:6848)
 	scf
 	ret
 
-Function17a8ae: ; 17a8ae (5e:68ae)
+Function17a8ae:
 	bit 1, c
 	jr nz, .asm_17a8bc
 	bit 0, c
@@ -377,7 +375,7 @@ Function17a8ae: ; 17a8ae (5e:68ae)
 	scf
 	ret
 
-Function17a8de: ; 17a8de (5e:68de)
+Function17a8de:
 	ld a, $2
 	call Function17aae0
 	ld a, [hl]
@@ -414,7 +412,7 @@ Function17a8de: ; 17a8de (5e:68de)
 	call Function17aa88
 	ret
 
-Function17a91e: ; 17a91e (5e:691e)
+Function17a91e:
 	ld a, [$d08c]
 	cp $7
 	jr c, .asm_17a92c
@@ -424,7 +422,7 @@ Function17a91e: ; 17a91e (5e:691e)
 	ret
 
 .asm_17a92c
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	call Function17a99e
 	ld hl, $d088
 	set 7, [hl]
@@ -435,7 +433,7 @@ Function17a91e: ; 17a91e (5e:691e)
 	scf
 	ret
 
-Function17a943: ; 17a943 (5e:6943)
+Function17a943:
 	ld a, [$d08c]
 	and a
 	jr z, .asm_17a95d
@@ -457,7 +455,7 @@ Function17a943: ; 17a943 (5e:6943)
 	xor a
 	ret
 
-Function17a964: ; 17a964 (5e:6964)
+Function17a964:
 	ld a, [$d08c]
 	cp $10
 	jr nc, .asm_17a979
@@ -475,7 +473,7 @@ Function17a964: ; 17a964 (5e:6964)
 	scf
 	ret
 
-Function17a97b: ; 17a97b (5e:697b)
+Function17a97b:
 	hlcoord 1, 1
 	lb bc, 2, 18
 	call ClearBox
@@ -499,7 +497,7 @@ Function17a97b: ; 17a97b (5e:697b)
 .asm_17a99d
 	ret
 
-Function17a99e: ; 17a99e (5e:699e)
+Function17a99e:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
@@ -508,15 +506,13 @@ Function17a99e: ; 17a99e (5e:699e)
 	ld de, String_17a9b2
 	call PlaceString
 	ret
-; 17a9b2 (5e:69b2)
 
-String_17a9b2: ; 17a9b2
+String_17a9b2:
 	db   "でんわばんごうが　ただしく"
 	next "はいって　いません！"
 	db   "@"
-; 17a9cb
 
-Function17a9cb: ; 17a9cb (5e:69cb)
+Function17a9cb:
 	ld de, wVirtualOAM ; $c400
 	ld hl, $d088
 	bit 6, [hl]
@@ -530,7 +526,7 @@ Function17a9cb: ; 17a9cb (5e:69cb)
 	call Function17a9e3
 	ret
 
-Function17a9e3: ; 17a9e3 (5e:69e3)
+Function17a9e3:
 	ld a, $3
 	ld [$d08e], a
 	ld hl, Unknown_17aa77
@@ -540,7 +536,7 @@ Function17a9e3: ; 17a9e3 (5e:69e3)
 	call Function17aa4a
 	ret
 
-Function17a9f5: ; 17a9f5 (5e:69f5)
+Function17a9f5:
 	ld a, [$d08c]
 	cp $10
 	ret nc
@@ -564,7 +560,7 @@ Function17a9f5: ; 17a9f5 (5e:69f5)
 	call Function17aa4a
 	ret
 
-Function17aa22: ; 17aa22 (5e:6a22)
+Function17aa22:
 	ld a, $0
 	ld [$d08e], a
 	push de
@@ -590,7 +586,7 @@ Function17aa22: ; 17aa22 (5e:6a22)
 	call Function17aa4a
 	ret
 
-Function17aa4a: ; 17aa4a (5e:6a4a)
+Function17aa4a:
 	ld [$d08d], a
 	ld a, b
 	add $8
@@ -623,33 +619,30 @@ Function17aa4a: ; 17aa4a (5e:6a4a)
 	dec a
 	jr nz, .loop
 	ret
-; 17aa72 (5e:6a72)
 
-Unknown_17aa72: ; 17aa72
+Unknown_17aa72:
 	db 1
 	db 0, 0, 0, 0
-; 17aa77
 
-Unknown_17aa77: ; 17aa77
+Unknown_17aa77:
 	db 4
 	db 0, 0, 0, 0
 	db 0, 8, 1, 0
 	db 8, 0, 2, 0
 	db 8, 8, 3, 0
-; 17aa88
 
-Function17aa88: ; 17aa88 (5e:6a88)
+Function17aa88:
 	jr c, asm_17aa91
 	ld de, SFX_SWITCH_POKEMON
 	call PlaySFX
 	ret
 
-asm_17aa91: ; 17aa91 (5e:6a91)
+asm_17aa91:
 	ld de, SFX_WRONG
 	call PlaySFX
 	ret
 
-Function17aa98: ; 17aa98 (5e:6a98)
+Function17aa98:
 	ld a, $5
 	ld [$d08b], a
 	call Function17aaa9
@@ -658,7 +651,7 @@ Function17aa98: ; 17aa98 (5e:6a98)
 	set 7, [hl]
 	ret
 
-Function17aaa9: ; 17aaa9 (5e:6aa9)
+Function17aaa9:
 	ld a, $3
 	call Function17aae3
 	ld c, a
@@ -673,7 +666,7 @@ Function17aaa9: ; 17aaa9 (5e:6aa9)
 	call AddNTimes
 	ret
 
-Function17aac3: ; 17aac3 (5e:6ac3)
+Function17aac3:
 	ld a, $b
 	push hl
 	ld [hli], a
@@ -685,24 +678,24 @@ Function17aac3: ; 17aac3 (5e:6ac3)
 	ld [hli], a
 	ret
 
-Function17aad0: ; 17aad0 (5e:6ad0)
+Function17aad0:
 	call Function17aae0
 
-Function17aad3: ; 17aad3 (5e:6ad3)
+Function17aad3:
 	ld [$d089], a
 	ret
 
-Function17aad7: ; 17aad7 (5e:6ad7)
+Function17aad7:
 	push af
 	ld a, [$d089]
 	ld [$d08a], a
 	pop af
 	ret
 
-Function17aae0: ; 17aae0 (5e:6ae0)
+Function17aae0:
 	call Function17aad7
 
-Function17aae3: ; 17aae3 (5e:6ae3)
+Function17aae3:
 	push af
 	ld a, [$d08a]
 	ld bc, $d
@@ -714,9 +707,8 @@ Function17aae3: ; 17aae3 (5e:6ae3)
 	add hl, bc
 	ld a, [hl]
 	ret
-; 17aaf7 (5e:6af7)
 
-Unknown_17aaf7: ; 17aaf7
+Unknown_17aaf7:
 	db $0, $0, $1, $6, $5, $9, $3, $2, $1, $2, $1, $2, $4
 	db $0, $0, $2, $9, $5, $a, $4, $0, $2, $a, $a, $3, $5
 	db $0, $0, $3, $c, $5, $b, $5, $1, $0, $1, $0, $4, $0
@@ -730,9 +722,8 @@ Unknown_17aaf7: ; 17aaf7
 	db $0, $0, $0, $9, $e, $7, $1, $9, $b, $6, $8, $1, $1
 	db $0, $0,$f1, $c, $e, $8, $2, $a, $c, $7, $c, $2, $c
 	db $0, $0,$f0,$10, $e, $c, $c, $b, $9, $b, $9, $b, $9
-; 17aba0
 
-Function17aba0: ; 17aba0 (5e:6ba0)
+Function17aba0:
 	ld a, [rVBK]
 	push af
 	ld a, $1
@@ -757,7 +748,7 @@ Function17aba0: ; 17aba0 (5e:6ba0)
 	call Get2bpp
 	ret
 
-Function17abcf: ; 17abcf (5e:6bcf)
+Function17abcf:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
@@ -788,7 +779,7 @@ Function17abcf: ; 17abcf (5e:6bcf)
 	ld [rSVBK], a
 	ret
 
-Function17ac0c: ; 17ac0c (5e:6c0c)
+Function17ac0c:
 	call Function17ac1d
 	call Function17ac2a
 	hlcoord 0, 0
@@ -797,14 +788,14 @@ Function17ac0c: ; 17ac0c (5e:6c0c)
 	call Function17ac46
 	ret
 
-Function17ac1d: ; 17ac1d (5e:6c1d)
+Function17ac1d:
 	ld hl, Tilemap_17acd5
 	decoord 0, 4
 	ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
 	call CopyBytes
 	ret
 
-Function17ac2a: ; 17ac2a (5e:6c2a)
+Function17ac2a:
 	ld hl, Tilemap_17ae3d
 	decoord 0, 4, wAttrMap
 	ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
@@ -821,7 +812,7 @@ Function17ac2a: ; 17ac2a (5e:6c2a)
 	jr nz, .loop
 	ret
 
-Function17ac46: ; 17ac46 (5e:6c46)
+Function17ac46:
 	ld a, [$d088]
 	bit 4, a
 	jr nz, .bit_4_set
@@ -831,9 +822,8 @@ Function17ac46: ; 17ac46 (5e:6c46)
 .bit_4_set
 	call Function3eea
 	ret
-; 17ac55 (5e:6c55)
 
-Palette_17ac55: ; 17ac55
+Palette_17ac55:
 	RGB  0,  0,  0
 	RGB  9, 10, 25
 	RGB 16, 19, 31
@@ -874,7 +864,7 @@ Palette_17ac55: ; 17ac55
 	RGB  0,  0,  0
 	RGB  0,  0,  0
 
-Palette_17ac95: ; 17ac95
+Palette_17ac95:
 	RGB 31, 31, 31
 	RGB  4,  3,  3
 	RGB 31, 13,  0
@@ -915,11 +905,11 @@ Palette_17ac95: ; 17ac95
 	RGB 27, 31,  0
 	RGB 31, 31,  0
 
-Tilemap_17acd5: ; 17acd5
+Tilemap_17acd5:
 INCBIN "gfx/unknown/17acd5.tilemap"
 
-Tilemap_17ae3d: ; 17ae3d
+Tilemap_17ae3d:
 INCBIN "gfx/unknown/17ae3d.tilemap"
 
-GFX_17afa5:: ; 17afa5
+GFX_17afa5::
 INCBIN "gfx/unknown/17afa5.2bpp"
diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
index be9578d22..0f32df536 100644
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -1,4 +1,4 @@
-Function17c000: ; 17c000
+Function17c000:
 	call DisableLCD
 
 	ld hl, vTiles2
@@ -79,19 +79,18 @@ Function17c000: ; 17c000
 	call EnableLCD
 	farcall ReloadMapPart
 	ret
-; 17c083
 
-HaveWantGFX: ; 17c083
+HaveWantGFX:
 INCBIN "gfx/mobile/havewant.2bpp"
 
-MobileSelectGFX: ; 17c983
+MobileSelectGFX:
 INCBIN "gfx/mobile/select.2bpp"
 
-HaveWantMap: ; 17cb83
+HaveWantMap:
 ; Interleaved tile/palette map.
 INCBIN "gfx/mobile/havewant_map.bin"
 
-HaveWantPals: ; 17cff3
+HaveWantPals:
 ; BG and OBJ palettes.
 	RGB  0,  0,  0
 	RGB 21, 21, 21
@@ -173,8 +172,7 @@ HaveWantPals: ; 17cff3
 	RGB  0,  0,  0
 	RGB  0,  0,  0
 
-
-CheckStringForErrors: ; 17d073
+CheckStringForErrors:
 ; Valid character ranges:
 ; $0, $5 - $13, $19 - $1c, $26 - $34, $3a - $3e, $40 - $48, $60 - $ff
 .loop
@@ -220,9 +218,8 @@ CheckStringForErrors: ; 17d073
 .Done:
 	and a
 	ret
-; 17d0b3
 
-CheckStringForErrors_IgnoreTerminator: ; 17d0b3
+CheckStringForErrors_IgnoreTerminator:
 ; Find control chars
 .loop
 	ld a, [de]
@@ -266,30 +263,29 @@ CheckStringForErrors_IgnoreTerminator: ; 17d0b3
 	jr nz, .loop
 	and a
 	ret
-; 17d0f3
 
-Function17d0f3: ; 17d0f3
-	ld a, [$c608 + 5]
+Function17d0f3:
+	ld a, [wc608 + 5]
 	ld [wOTTrademonSpecies], a
 	ld [wCurPartySpecies], a
 	ld a, [wcd81]
-	ld [$c74e], a
-	ld hl, $c63d
+	ld [wc74e], a
+	ld hl, wc608 + 53
 	ld de, wOTTrademonOTName
 	ld bc, 5
 	call CopyBytes
 	ld a, "@"
 	ld [de], a
-	ld a, [$c608 + 11]
+	ld a, [wc608 + 11]
 	ld [wOTTrademonID], a
-	ld a, [$c608 + 12]
+	ld a, [wc608 + 12]
 	ld [wOTTrademonID + 1], a
-	ld hl, $c608 + 26
+	ld hl, wc608 + 26
 	ld a, [hli]
 	ld [wOTTrademonDVs], a
 	ld a, [hl]
 	ld [wOTTrademonDVs + 1], a
-	ld bc, $c608 + 5
+	ld bc, wc608 + 5
 	farcall GetCaughtGender
 	ld a, c
 	ld [wOTTrademonCaughtData], a
@@ -325,60 +321,53 @@ Function17d0f3: ; 17d0f3
 	call CloseSubmenu
 	call RestartMapMusic
 	ret
-; 17d187
 
-Mobile_CopyDefaultOTName: ; 17d187
-	ld hl, Mobile5F_KrissName
-	ld de, $c63d
+Mobile_CopyDefaultOTName:
+	ld hl, Mobile5F_PlayersName
+	ld de, wc63d
 	ld bc, 5
 	call CopyBytes
 	ret
-; 17d194
 
-Mobile5F_KrissName:
+Mobile5F_PlayersName:
 	db "クりス@@"
-; 17d198
 
-Mobile_CopyDefaultNickname: ; 17d199
+Mobile_CopyDefaultNickname:
 	ld hl, .DefaultNickname
-	ld de, $c642
+	ld de, wc642
 	ld bc, 5
 	call CopyBytes
 	ret
-; 17d1a6
 
 .DefaultNickname:
 	db "？？？？？"
 
-Mobile_CopyDefaultMail: ; 17d1ab
+Mobile_CopyDefaultMail:
 	ld a, "@"
-	ld hl, $c647
+	ld hl, wc647
 	ld bc, MAIL_MSG_LENGTH + 1
 	call ByteFill
 	ld hl, .DefaultMessage
-	ld de, $c647
+	ld de, wc647
 	ld bc, 6
 	call CopyBytes
 	ret
-; 17d1c3
 
 .DefaultMessage:
 	db "こんにちは@"
-; 17d1c9
 
-Mobile_CopyDefaultMailAuthor: ; 17d1c9
+Mobile_CopyDefaultMailAuthor:
 	ld a, "@"
-	ld de, $c668
+	ld de, wc668
 	ld bc, 5
 	call ByteFill
-	ld hl, Mobile5F_KrissName
-	ld de, $c668
+	ld hl, Mobile5F_PlayersName
+	ld de, wc668
 	ld bc, 5
 	call CopyBytes
 	ret
-; 17d1e1
 
-CheckStringContainsLessThanBNextCharacters: ; 17d1e1
+CheckStringContainsLessThanBNextCharacters:
 .loop
 	ld a, [de]
 	inc de
@@ -396,9 +385,8 @@ CheckStringContainsLessThanBNextCharacters: ; 17d1e1
 .done
 	scf
 	ret
-; 17d1f1
 
-Function17d1f1: ; 17d1f1
+Function17d1f1:
 	ld a, [wCurPartySpecies]
 	dec a
 	call SetSeenAndCaughtMon
@@ -423,8 +411,6 @@ Function17d1f1: ; 17d1f1
 
 .asm_17d223
 	ret
-; 17d224
-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Parameter: [wScriptVar] = 0..1
@@ -435,28 +421,27 @@ Function17d1f1: ; 17d1f1
 ; if [wScriptVar] == TRUE
 ;    Show BattleTower-Menu with 3 options in english language
 ;    - Challenge - Explanation - Cancel
-Special_Menu_ChallengeExplanationCancel: ; 17d224
+Menu_ChallengeExplanationCancel:
 	ld a, [wScriptVar]
 	and a
 	jr nz, .English
 	ld a, $4
 	ld [wScriptVar], a
-	ld hl, MenuDataHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option
+	ld hl, MenuHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option
 	jr .Load_Interpret
 
 .English:
 	ld a, $4
 	ld [wScriptVar], a
-	ld hl, MenuDataHeader_ChallengeExplanationCancel ; English Menu
+	ld hl, MenuHeader_ChallengeExplanationCancel ; English Menu
 
 .Load_Interpret:
-	call LoadMenuDataHeader
+	call LoadMenuHeader
 	call Function17d246
 	call CloseWindow
 	ret
-; 17d246
 
-Function17d246: ; 17d246
+Function17d246:
 	call VerticalMenu
 	jr c, .Exit
 	ld a, [wScriptVar]
@@ -480,53 +465,48 @@ Function17d246: ; 17d246
 	ld a, $4
 	ld [wScriptVar], a
 	ret
-; 17d26a
 
-MenuDataHeader_17d26a: ; 17d26a
+MenuHeader_17d26a:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 14, 9
-	dw MenuData2_17d272
+	dw MenuData_17d272
 	db 1 ; default option
 
-MenuData2_17d272: ; 17d272
+MenuData_17d272:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 4
 	db "ニュース¯よみこむ@"
 	db "ニュース¯みる@"
 	db "せつめい@"
 	db "やめる@"
-; 17d28f
 
-MenuDataHeader_ChallengeExplanationCancel: ; 17d28f
+MenuHeader_ChallengeExplanationCancel:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 14, 7
-	dw MenuData2_ChallengeExplanationCancel
+	dw MenuData_ChallengeExplanationCancel
 	db 1 ; default option
 
-MenuData2_ChallengeExplanationCancel: ; 17d297
+MenuData_ChallengeExplanationCancel:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 3
 	db "Challenge@"
 	db "Explanation@"
 	db "Cancel@"
-; 17d2b6
 
-Special_Function17d2b6: ; 17d2b6
+Function17d2b6:
 	call Function17d2c0
 	farcall Function1181da
 	ret
-; 17d2c0
 
-Function17d2c0: ; 17d2c0
+Function17d2c0:
 	xor a
 	ld [wJumptableIndex], a
 	ld [wcf64], a
 	ld [wcf65], a
 	ld [wcf66], a
 	ret
-; 17d2ce
 
-Special_Function17d2ce: ; 17d2ce
+Function17d2ce:
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$aa72]
@@ -560,9 +540,8 @@ Special_Function17d2ce: ; 17d2ce
 	call ReturnToMapFromSubmenu
 	call CloseSubmenu
 	ret
-; 17d314
 
-Function17d314: ; 17d314
+Function17d314:
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$b1b1]
@@ -613,9 +592,8 @@ Function17d314: ; 17d314
 	ld [wScriptVar], a
 	scf
 	ret
-; 17d370
 
-Function17d370: ; 17d370
+Function17d370:
 	xor a
 	ld [wcd77], a
 	ld [wMobileCrashCheckPointer], a
@@ -627,8 +605,8 @@ Function17d370: ; 17d370
 	call ClearScreen
 	farcall ReloadMapPart
 	call DisableLCD
-	ld hl, vTiles1 tile $6e
-	ld de, $c608
+	ld hl, vTiles0 tile $ee
+	ld de, wc608
 	ld bc, 1 tiles
 	call CopyBytes
 	ld a, $1
@@ -641,8 +619,8 @@ Function17d370: ; 17d370
 	ld hl, vTiles2 tile $7f
 	ld bc, 1 tiles
 	call ByteFill
-	ld hl, $c608
-	ld de, vTiles1 tile $6e
+	ld hl, wc608
+	ld de, vTiles0 tile $ee
 	ld bc, 1 tiles
 	call CopyBytes
 	xor a
@@ -665,9 +643,8 @@ Function17d370: ; 17d370
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 17d3f6
 
-Function17d3f6: ; 17d3f6
+Function17d3f6:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearScreen
@@ -675,8 +652,8 @@ Function17d3f6: ; 17d3f6
 
 Function17d405:
 	call DisableLCD
-	ld hl, vTiles1 tile $6e
-	ld de, $c608
+	ld hl, vTiles0 tile $ee
+	ld de, wc608
 	ld bc, 1 tiles
 	call CopyBytes
 	ld a, $1
@@ -689,8 +666,8 @@ Function17d405:
 	ld hl, vTiles2 tile $7f
 	ld bc, 1 tiles
 	call ByteFill
-	ld hl, $c608
-	ld de, vTiles1 tile $6e
+	ld hl, wc608
+	ld de, vTiles0 tile $ee
 	ld bc, 1 tiles
 	call CopyBytes
 	xor a
@@ -708,9 +685,8 @@ Function17d405:
 	pop af
 	ld [rSVBK], a
 	ret
-; 17d45a
 
-Function17d45a: ; 17d45a
+Function17d45a:
 .asm_17d45a
 	call JoyTextDelay
 	ld a, [wcd77]
@@ -724,23 +700,20 @@ Function17d45a: ; 17d45a
 	xor a
 	ld [wScriptVar], a
 	ret
-; 17d474
 
-Function17d474: ; 17d474
+Function17d474:
 	jumptable Jumptable_17d483, wcd77
-; 17d483
 
-Jumptable_17d483: ; 17d483
+Jumptable_17d483:
 	dw Function17d48d
 	dw Function17d5be
 	dw Function17d5c4
 	dw Function17d6fd
 	dw Function17e427
-; 17d48d
 
-Function17d48d: ; 17d48d
+Function17d48d:
 	ld hl, Palette_17eff6
-	ld de, $c608
+	ld de, wc608
 	ld bc, $40
 	call CopyBytes
 	ld hl, TileAttrmap_17eb8e
@@ -792,7 +765,7 @@ Function17d48d: ; 17d48d
 
 .asm_17d4e0
 	ld a, [hli]
-	ld de, $c608
+	ld de, wc608
 	ld c, $8
 .asm_17d4e6
 	srl a
@@ -921,9 +894,8 @@ Function17d48d: ; 17d48d
 	call Function17e5af
 	farcall ReloadMapPart
 	jp Function17e438
-; 17d5be
 
-Function17d5be: ; 17d5be
+Function17d5be:
 	call SetPalettes
 	call Function17e438
 
@@ -962,25 +934,23 @@ Function17d5c4:
 	ld a, $3
 	ld [wcd77], a
 	ret
-; 17d5f6
 
-Function17d5f6: ; 17d5f6
+Function17d5f6:
 	ld a, $5
 	ld [rSVBK], a
-	ld hl, $c608
+	ld hl, wc608
 	ld de, wBGPals1
 	ld bc, 8 palettes
 	call CopyBytes
 	ld a, $4
 	ld [rSVBK], a
 	ret
-; 17d60b
 
-Function17d60b: ; 17d60b
+Function17d60b:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $b1d3
-	ld de, $c608
+	ld de, wc608
 	ld bc, $20
 	call CopyBytes
 	ld a, [$b1b1]
@@ -994,7 +964,7 @@ Function17d60b: ; 17d60b
 	call CloseSRAM
 	ld a, $6
 	call GetSRAMBank
-	ld de, $c708
+	ld de, wc708
 	ld a, c
 	and a
 	jr z, .asm_17d684
@@ -1015,7 +985,7 @@ Function17d60b: ; 17d60b
 	ld [wcd49], a
 	push hl
 	push de
-	ld hl, $c608
+	ld hl, wc608
 	ld e, b
 	ld d, $0
 	add hl, de
@@ -1054,7 +1024,7 @@ Function17d60b: ; 17d60b
 	call CloseSRAM
 	ld a, $5
 	call GetSRAMBank
-	ld hl, $c708
+	ld hl, wc708
 	ld de, $b1b3
 	ld a, [$b1b1]
 	ld c, a
@@ -1063,10 +1033,8 @@ Function17d60b: ; 17d60b
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 17d6a1
-
 
-Function17d6a1: ; 17d6a1
+Function17d6a1:
 	push hl
 	ld a, [wcd6e]
 	ld c, a
@@ -1114,9 +1082,8 @@ Function17d6a1: ; 17d6a1
 	call CloseSRAM
 	pop hl
 	ret
-; 17d6fd
 
-Function17d6fd: ; 17d6fd
+Function17d6fd:
 	ld a, [wcd77]
 	bit 7, a
 	jr nz, asm_17d721
@@ -1147,9 +1114,8 @@ asm_17d721
 	ld a, $2
 	ld [wcd77], a
 	ret
-; 17d72a
 
-Jumptable17d72a: ; 17d72a
+Jumptable17d72a:
 	dw Function17d78c
 	dw Function17d78d
 	dw Function17d7b4
@@ -1199,13 +1165,11 @@ Jumptable17d72a: ; 17d72a
 	dw Function17e3e0
 	dw Function17e3f0
 	dw Function17e409
-; 17d78c
 
-Function17d78c: ; 17d78c
+Function17d78c:
 	ret
-; 17d78d
 
-Function17d78d: ; 17d78d
+Function17d78d:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld c, a
@@ -1224,9 +1188,8 @@ Function17d78d: ; 17d78d
 	ld [wcd77], a
 	call ClearBGPalettes
 	ret
-; 17d7b4
 
-Function17d7b4: ; 17d7b4
+Function17d7b4:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -1234,9 +1197,8 @@ Function17d7b4: ; 17d7b4
 	call PlayMusic2
 	call HlToCrashCheckPointer
 	ret
-; 17d7c2
 
-Function17d7c2: ; 17d7c2
+Function17d7c2:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -1245,9 +1207,8 @@ Function17d7c2: ; 17d7c2
 	call WaitSFX
 	call HlToCrashCheckPointer
 	ret
-; 17d7d3
 
-Function17d7d3: ; 17d7d3
+Function17d7d3:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	dec a
@@ -1257,9 +1218,8 @@ Function17d7d3: ; 17d7d3
 	call WaitSFX
 	call HlToCrashCheckPointer
 	ret
-; 17d7e5
 
-Function17d7e5: ; 17d7e5
+Function17d7e5:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld [wcd4f], a
@@ -1283,9 +1243,8 @@ Function17d7e5: ; 17d7e5
 	call Function17e691
 	call HlToCrashCheckPointer
 	ret
-; 17d818
 
-Function17d818: ; 17d818
+Function17d818:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld c, a
@@ -1303,9 +1262,8 @@ Function17d818: ; 17d818
 	add hl, bc
 	call PlaceString
 	ret
-; 17d833
 
-Function17d833: ; 17d833
+Function17d833:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -1331,9 +1289,8 @@ Function17d833: ; 17d833
 	farcall Function11c08f
 	call Function17e349
 	ret
-; 17d85d
 
-Function17d85d: ; 17d85d
+Function17d85d:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -1350,7 +1307,7 @@ Function17d85d: ; 17d85d
 	and a
 	jr nz, .asm_17d86c
 	pop hl
-	ld de, $c608
+	ld de, wc608
 	ld c, $0
 .asm_17d878
 	ld a, [hli]
@@ -1408,7 +1365,7 @@ Function17d85d: ; 17d85d
 	push bc
 	ld a, $3
 	ld [rSVBK], a
-	ld hl, $c608
+	ld hl, wc608
 	ld de, wBGPals1
 	ld b, $0
 	call CopyBytes
@@ -1432,9 +1389,8 @@ Function17d85d: ; 17d85d
 .asm_17d8fe
 	call Function17e349
 	ret
-; 17d902
 
-Function17d902: ; 17d902
+Function17d902:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -1467,11 +1423,10 @@ Function17d902: ; 17d902
 .asm_17d936
 	call Function17e349
 	ret
-; 17d93a
 
-Function17d93a: ; 17d93a
+Function17d93a:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $5
 	call CopyBytes
 	call HlToCrashCheckPointer
@@ -1480,19 +1435,19 @@ Function17d93a: ; 17d93a
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	ld a, [$c70c]
+	ld a, [wc70c]
 	call Function17e6de
-	ld a, [$c70a]
+	ld a, [wc70a]
 	ld [wCurPartySpecies], a
-	ld a, [$c70c]
+	ld a, [wc70c]
 	ld e, a
 	farcall LoadMonPaletteAsNthBGPal
 	call SetPalettes
-	ld a, [$c708]
+	ld a, [wc708]
 	ld l, a
-	ld a, [$c709]
+	ld a, [wc709]
 	ld h, a
-	ld a, [$c70b]
+	ld a, [wc70b]
 	ld c, a
 	decoord 0, 0
 	add hl, de
@@ -1503,11 +1458,10 @@ Function17d93a: ; 17d93a
 	ld [rSVBK], a
 	call Function17e349
 	ret
-; 17d98b
 
-Function17d98b: ; 17d98b
+Function17d98b:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $4
 	call CopyBytes
 	call HlToCrashCheckPointer
@@ -1516,17 +1470,17 @@ Function17d98b: ; 17d98b
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	ld a, [$c70b]
+	ld a, [wc70b]
 	call Function17e6de
-	ld a, [$c70a]
+	ld a, [wc70a]
 	ld [wTrainerClass], a
-	ld a, [$c70b]
+	ld a, [wc70b]
 	ld e, a
 	farcall LoadTrainerClassPaletteAsNthBGPal
 	call SetPalettes
-	ld a, [$c708]
+	ld a, [wc708]
 	ld e, a
-	ld a, [$c709]
+	ld a, [wc709]
 	ld d, a
 	push de
 	ld de, vTiles2
@@ -1540,38 +1494,37 @@ Function17d98b: ; 17d98b
 	ld [rSVBK], a
 	call Function17e349
 	ret
-; 17d9e3
 
-Function17d9e3: ; 17d9e3
+Function17d9e3:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $7
 	call CopyBytes
 	call HlToCrashCheckPointer
-	ld a, [$c70b]
+	ld a, [wc70b]
 	push af
 	cp $c0
 	jr c, .asm_17da01
-	ld a, [$c70c]
+	ld a, [wc70c]
 	ld [rSVBK], a
 	jr .asm_17da07
 
 .asm_17da01
-	ld a, [$c70c]
+	ld a, [wc70c]
 	call GetSRAMBank
 
 .asm_17da07
-	ld a, [$c708]
+	ld a, [wc708]
 	ld l, a
-	ld a, [$c709]
+	ld a, [wc709]
 	ld h, a
-	ld a, [$c70a]
+	ld a, [wc70a]
 	ld e, a
-	ld a, [$c70b]
+	ld a, [wc70b]
 	ld d, a
-	ld a, [$c70d]
+	ld a, [wc70d]
 	ld c, a
-	ld a, [$c70e]
+	ld a, [wc70e]
 	ld b, a
 	call CopyBytes
 	pop af
@@ -1586,32 +1539,31 @@ Function17d9e3: ; 17d9e3
 
 .asm_17da30
 	ret
-; 17da31
 
-Function17da31: ; 17da31
+Function17da31:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $4
 	call CopyBytes
 	call HlToCrashCheckPointer
-	ld a, [$c709]
+	ld a, [wc709]
 	push af
 	cp $c0
 	jr c, .asm_17da4f
-	ld a, [$c70a]
+	ld a, [wc70a]
 	ld [rSVBK], a
 	jr .asm_17da55
 
 .asm_17da4f
-	ld a, [$c70a]
+	ld a, [wc70a]
 	call GetSRAMBank
 
 .asm_17da55
-	ld a, [$c708]
+	ld a, [wc708]
 	ld e, a
-	ld a, [$c709]
+	ld a, [wc709]
 	ld d, a
-	ld a, [$c70b]
+	ld a, [wc70b]
 	ld c, a
 	bit 7, c
 	jr nz, .asm_17da70
@@ -1647,24 +1599,22 @@ Function17da31: ; 17da31
 
 .asm_17da8b
 	ret
-; 17da8c
 
 Unknown_17da8c:
 x = 0
-	rept 8
+rept 8
 	db 1 << x
 x = x + 1
-	endr
+endr
 
 Unknown_17da94:
 x = 0
-	rept 8
+rept 8
 	db (1 << x) ^ $ff
 x = x + 1
-	endr
-; 17da9c
+endr
 
-Function17da9c: ; 17da9c
+Function17da9c:
 	ld a, [wcd31]
 	dec a
 	jr z, .asm_17dabd
@@ -1695,9 +1645,8 @@ Function17da9c: ; 17da9c
 	call Function17e55b
 	call Function17e5af
 	jr .asm_17daba
-; 17dadc
 
-Function17dadc: ; 17dadc
+Function17dadc:
 	ld a, [wcd2e]
 	ld hl, wcd24
 	add [hl]
@@ -1735,9 +1684,8 @@ Function17dadc: ; 17dadc
 	call Function17e55b
 	call Function17e5af
 	jr .asm_17db0e
-; 17db2d
 
-Function17db2d: ; 17db2d
+Function17db2d:
 	ld a, [wcd30]
 	ld hl, wcd24
 	cp [hl]
@@ -1757,9 +1705,8 @@ Function17db2d: ; 17db2d
 
 .asm_17db53
 	jp IncCrashCheckPointer
-; 17db56
 
-Function17db56: ; 17db56
+Function17db56:
 	ld a, [wcd30]
 	cp $1
 	jr z, .asm_17db74
@@ -1775,9 +1722,8 @@ Function17db56: ; 17db56
 
 .asm_17db74
 	jp IncCrashCheckPointer
-; 17db77
 
-Function17db77: ; 17db77
+Function17db77:
 	ld hl, wcd2d
 	ld a, [wcd2f]
 	add [hl]
@@ -1807,9 +1753,8 @@ Function17db77: ; 17db77
 
 .asm_17dbae
 	jp IncCrashCheckPointer
-; 17dbb1
 
-Function17dbb1: ; 17dbb1
+Function17dbb1:
 	ld hl, wcd2f
 	ld a, [wcd42]
 	sub [hl]
@@ -1843,9 +1788,8 @@ Function17dbb1: ; 17dbb1
 	pop af
 	dec a
 	jr .asm_17dbd4
-; 17dbe9
 
-Function17dbe9: ; 17dbe9
+Function17dbe9:
 	ld hl, wcd2d
 	ld a, [wcd2f]
 	sub [hl]
@@ -1877,11 +1821,10 @@ Function17dbe9: ; 17dbe9
 	call Function17e55b
 	call Function17e5af
 	jp IncCrashCheckPointer
-; 17dc1f
 
-Function17dc1f: ; 17dc1f
+Function17dc1f:
 	call IncCrashCheckPointer
-	ld de, $c688
+	ld de, wc688
 	ld bc, $6
 	call CopyBytes
 	call Function17e32b
@@ -1889,25 +1832,25 @@ Function17dc1f: ; 17dc1f
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	ld hl, $c688
+	ld hl, wc688
 	ld a, $40
-	ld [$c708], a
+	ld [wc708], a
 	ld a, [hli]
-	ld [$c70a], a
+	ld [wc70a], a
 	add $5
-	ld [$c70c], a
+	ld [wc70c], a
 	ld a, [hli]
-	ld [$c709], a
+	ld [wc709], a
 	add $4
-	ld [$c70b], a
+	ld [wc70b], a
 	ld a, $96
-	ld [$c70d], a
+	ld [wc70d], a
 	ld a, $5c
-	ld [$c70e], a
+	ld [wc70e], a
 	ld a, $1
-	ld [$c70f], a
-	ld hl, $c708
-	call LoadMenuDataHeader
+	ld [wc70f], a
+	ld hl, wc708
+	call LoadMenuHeader
 	call VerticalMenu
 	jr nc, .asm_17dc6e
 	ld a, $2
@@ -1920,16 +1863,16 @@ Function17dc1f: ; 17dc1f
 	ld a, [wMenuCursorY]
 	cp $1
 	jr nz, .asm_17dc85
-	ld a, [$c68a]
+	ld a, [wc68a]
 	ld l, a
-	ld a, [$c68a + 1]
+	ld a, [wc68a + 1]
 	ld h, a
 	jr .asm_17dc8d
 
 .asm_17dc85
-	ld a, [$c68a + 2]
+	ld a, [wc68a + 2]
 	ld l, a
-	ld a, [$c68a + 3]
+	ld a, [wc68a + 3]
 	ld h, a
 
 .asm_17dc8d
@@ -1938,23 +1881,20 @@ Function17dc1f: ; 17dc1f
 	pop hl
 	call Function17e40f
 	ret
-; 17dc96
 
-MenuData2_17dc96:
+MenuData_17dc96:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
 	db 2
 	db "はい@"
 	db "いいえ@"
-; 17dc9f
 
-Function17dc9f: ; 17dc9f
+Function17dc9f:
 	call IncCrashCheckPointer
 	call HlToCrashCheckPointer
 	call RotateFourPalettesLeft
 	ret
-; 17dca9
 
-Function17dca9: ; 17dca9
+Function17dca9:
 	call IncCrashCheckPointer
 	call HlToCrashCheckPointer
 
@@ -1978,9 +1918,8 @@ Function17dcaf:
 	ld a, $4
 	ld [rSVBK], a
 	ret
-; 17dccf
 
-Function17dccf: ; 17dccf
+Function17dccf:
 	call IncCrashCheckPointer
 	push hl
 	ld a, [wcd4b]
@@ -2024,9 +1963,8 @@ Function17dccf: ; 17dccf
 .asm_17dd11
 	pop hl
 	ret
-; 17dd13
 
-Function17dd13: ; 17dd13
+Function17dd13:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld c, a
@@ -2046,9 +1984,8 @@ Function17dd13: ; 17dd13
 	pop hl
 	call PlaceHLTextAtBC
 	ret
-; 17dd30
 
-Function17dd30: ; 17dd30
+Function17dd30:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -2065,39 +2002,38 @@ Function17dd30: ; 17dd30
 	add hl, de
 	call Function17e600
 	ret
-; 17dd49
 
-Function17dd49: ; 17dd49
+Function17dd49:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $a
 	call CopyBytes
-	ld a, [$c711]
+	ld a, [wc711]
 	ld c, a
 	ld b, $0
 	call CopyBytes
-	ld a, [$c70a]
+	ld a, [wc70a]
 	cp $c0
 	jr c, .sram
-	ld a, [$c708]
+	ld a, [wc708]
 	ld [rSVBK], a
 	jr .got_bank
 
 .sram
-	ld a, [$c708]
+	ld a, [wc708]
 	call GetSRAMBank
 
 .got_bank
-	ld a, [$c709]
+	ld a, [wc709]
 	ld l, a
-	ld a, [$c70a]
+	ld a, [wc70a]
 	ld h, a
-	ld de, $c688
-	ld a, [$c711]
+	ld de, wc688
+	ld a, [wc711]
 	ld c, a
 	ld b, $0
 	call CopyBytes
-	ld a, [$c70a]
+	ld a, [wc70a]
 	cp $c0
 	jr c, .close_sram
 	ld a, $4
@@ -2108,10 +2044,10 @@ Function17dd49: ; 17dd49
 	call CloseSRAM
 
 .exited_bank
-	ld a, [$c711]
+	ld a, [wc711]
 	ld c, a
-	ld hl, $c712
-	ld de, $c688
+	ld hl, wc712
+	ld de, wc688
 .loop
 	ld a, [de]
 	inc de
@@ -2124,57 +2060,56 @@ Function17dd49: ; 17dd49
 .next
 	dec c
 	jr nz, .loop
-	ld a, [$c70d]
+	ld a, [wc70d]
 	ld l, a
-	ld a, [$c70e]
+	ld a, [wc70e]
 	ld h, a
 	jr .done
 
 .load2
-	ld a, [$c70f]
+	ld a, [wc70f]
 	ld l, a
-	ld a, [$c710]
+	ld a, [wc710]
 	ld h, a
 	jr .done
 
 .load
-	ld a, [$c70b]
+	ld a, [wc70b]
 	ld l, a
-	ld a, [$c70c]
+	ld a, [wc70c]
 	ld h, a
 
 .done
 	call Function17e40f
 	ret
-; 17ddcd
 
-Function17ddcd: ; 17ddcd
+Function17ddcd:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $8
 	call CopyBytes
-	ld a, [$c70a]
+	ld a, [wc70a]
 	cp $c0
 	jr c, .asm_17dde7
-	ld a, [$c708]
+	ld a, [wc708]
 	ld [rSVBK], a
 	jr .asm_17dded
 
 .asm_17dde7
-	ld a, [$c708]
+	ld a, [wc708]
 	call GetSRAMBank
 
 .asm_17dded
-	ld a, [$c709]
+	ld a, [wc709]
 	ld e, a
-	ld a, [$c70a]
+	ld a, [wc70a]
 	ld d, a
 	ld a, [de]
-	ld [$c710], a
-	ld a, [$c70b]
+	ld [wc710], a
+	ld a, [wc70b]
 	ld c, a
 	ld b, $0
-	ld a, [$c70a]
+	ld a, [wc70a]
 	cp $c0
 	jr c, .asm_17de0c
 	ld a, $4
@@ -2189,49 +2124,48 @@ Function17ddcd: ; 17ddcd
 	ld hl, Unknown_17da8c
 	add hl, bc
 	ld a, [hl]
-	ld hl, $c710
+	ld hl, wc710
 	and [hl]
 	pop hl
 	jr nz, .asm_17de26
-	ld a, [$c70e]
+	ld a, [wc70e]
 	ld l, a
-	ld a, [$c70f]
+	ld a, [wc70f]
 	ld h, a
 	jr .asm_17de2e
 
 .asm_17de26
-	ld a, [$c70c]
+	ld a, [wc70c]
 	ld l, a
-	ld a, [$c70d]
+	ld a, [wc70d]
 	ld h, a
 
 .asm_17de2e
 	call Function17e40f
 	ret
-; 17de32
 
-Function17de32: ; 17de32
+Function17de32:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $9
 	call CopyBytes
-	ld a, [$c710]
+	ld a, [wc710]
 	ld c, a
 	ld b, $0
 	call CopyBytes
 	ld a, $6
 	call GetSRAMBank
 	call Function17f4f6
-	ld a, [$c708]
+	ld a, [wc708]
 	ld e, a
-	ld a, [$c709]
+	ld a, [wc709]
 	ld d, a
 	add hl, de
 	ld e, l
 	ld d, h
-	ld a, [$c710]
+	ld a, [wc710]
 	ld c, a
-	ld hl, $c711
+	ld hl, wc711
 .asm_17de61
 	ld a, [de]
 	inc de
@@ -2244,47 +2178,46 @@ Function17de32: ; 17de32
 .asm_17de6b
 	dec c
 	jr nz, .asm_17de61
-	ld a, [$c70c]
+	ld a, [wc70c]
 	ld l, a
-	ld a, [$c70d]
+	ld a, [wc70d]
 	ld h, a
 	jr .asm_17de8a
 
 .asm_17de78
-	ld a, [$c70e]
+	ld a, [wc70e]
 	ld l, a
-	ld a, [$c70f]
+	ld a, [wc70f]
 	ld h, a
 	jr .asm_17de8a
 
 .asm_17de82
-	ld a, [$c70a]
+	ld a, [wc70a]
 	ld l, a
-	ld a, [$c70b]
+	ld a, [wc70b]
 	ld h, a
 
 .asm_17de8a
 	call CloseSRAM
 	call Function17e40f
 	ret
-; 17de91
 
-Function17de91: ; 17de91
+Function17de91:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $7
 	call CopyBytes
 	ld a, $6
 	call GetSRAMBank
 	call Function17f4f6
-	ld a, [$c708]
+	ld a, [wc708]
 	ld e, a
-	ld a, [$c709]
+	ld a, [wc709]
 	ld d, a
 	add hl, de
 	ld e, l
 	ld d, h
-	ld a, [$c70a]
+	ld a, [wc70a]
 	ld c, a
 	ld b, $0
 	ld hl, Unknown_17da8c
@@ -2294,27 +2227,26 @@ Function17de91: ; 17de91
 	ld h, d
 	and [hl]
 	jr nz, .asm_17deca
-	ld a, [$c70d]
+	ld a, [wc70d]
 	ld l, a
-	ld a, [$c70e]
+	ld a, [wc70e]
 	ld h, a
 	jr .asm_17ded2
 
 .asm_17deca
-	ld a, [$c70b]
+	ld a, [wc70b]
 	ld l, a
-	ld a, [$c70c]
+	ld a, [wc70c]
 	ld h, a
 
 .asm_17ded2
 	call CloseSRAM
 	call Function17e40f
 	ret
-; 17ded9
 
-Function17ded9: ; 17ded9
+Function17ded9:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $1f
 	call CopyBytes
 	call Function17e32b
@@ -2322,7 +2254,7 @@ Function17ded9: ; 17ded9
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	ld hl, $c708
+	ld hl, wc708
 	ld a, [hli]
 	ld [wCurPartySpecies], a
 	ld [wTempEnemyMonSpecies], a
@@ -2441,8 +2373,8 @@ Function17ded9: ; 17ded9
 	ld d, h
 	ld e, l
 	push hl
-	ld b, $0
-	farcall CalcPkmnStats
+	ld b, FALSE
+	farcall CalcMonStats
 	ld a, [wPartyCount]
 	dec a
 	ld hl, wPartyMon1HP
@@ -2517,9 +2449,8 @@ Function17ded9: ; 17ded9
 	ld de, $4
 	add hl, de
 	jp asm_17e0ee
-; 17e026
 
-Function17e026: ; 17e026
+Function17e026:
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
 	ld a, [sBoxCount]
@@ -2531,7 +2462,7 @@ Function17e026: ; 17e026
 	push bc
 	push hl
 	farcall LoadEnemyMon
-	farcall SendPkmnIntoBox
+	farcall SendMonIntoBox
 	farcall SetBoxMonCaughtData
 	pop hl
 	pop bc
@@ -2651,18 +2582,17 @@ asm_17e0ee
 	pop hl
 	call Function17e40f
 	ret
-; 17e0fd
 
-Function17e0fd: ; 17e0fd
+Function17e0fd:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $6
 	call CopyBytes
 	ld a, [rSVBK]
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	ld hl, $c708
+	ld hl, wc708
 	ld a, [hli]
 	ld [wCurItem], a
 	ld a, [hli]
@@ -2685,18 +2615,17 @@ Function17e0fd: ; 17e0fd
 	ld [rSVBK], a
 	call Function17e40f
 	ret
-; 17e133
 
-Function17e133: ; 17e133
+Function17e133:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $5
 	call CopyBytes
 	ld a, [rSVBK]
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	ld hl, $c708
+	ld hl, wc708
 	ld a, [hli]
 	ld [wScriptVar], a
 	push hl
@@ -2716,18 +2645,17 @@ Function17e133: ; 17e133
 	ld [rSVBK], a
 	call Function17e40f
 	ret
-; 17e165
 
-Function17e165: ; 17e165
+Function17e165:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $5
 	call CopyBytes
 	ld a, [rSVBK]
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	ld hl, $c708
+	ld hl, wc708
 	ld a, [hli]
 	ld [wCurItem], a
 	push hl
@@ -2753,35 +2681,34 @@ Function17e165: ; 17e165
 	ld [rSVBK], a
 	call Function17e40f
 	ret
-; 17e1a1
 
-Function17e1a1: ; 17e1a1
+Function17e1a1:
 	call IncCrashCheckPointer
-	ld de, $c708
+	ld de, wc708
 	ld bc, $d
 	call CopyBytes
-	ld a, [$c70a]
+	ld a, [wc70a]
 	cp $c0
 	jr c, .asm_17e1bb
-	ld a, [$c708]
+	ld a, [wc708]
 	ld [rSVBK], a
 	jr .asm_17e1c1
 
 .asm_17e1bb
-	ld a, [$c708]
+	ld a, [wc708]
 	call GetSRAMBank
 
 .asm_17e1c1
-	ld a, [$c709]
+	ld a, [wc709]
 	ld l, a
-	ld a, [$c70a]
+	ld a, [wc70a]
 	ld h, a
-	ld de, $c608
-	ld a, [$c70b]
+	ld de, wc608
+	ld a, [wc70b]
 	ld c, a
 	ld b, $0
 	call CopyBytes
-	ld a, [$c70a]
+	ld a, [wc70a]
 	cp $c0
 	jr c, .asm_17e1e2
 	ld a, $4
@@ -2792,28 +2719,28 @@ Function17e1a1: ; 17e1a1
 	call CloseSRAM
 
 .asm_17e1e5
-	ld a, [$c70e]
+	ld a, [wc70e]
 	cp $c0
 	jr c, .asm_17e1f3
-	ld a, [$c70c]
+	ld a, [wc70c]
 	ld [rSVBK], a
 	jr .asm_17e1f9
 
 .asm_17e1f3
-	ld a, [$c70c]
+	ld a, [wc70c]
 	call GetSRAMBank
 
 .asm_17e1f9
-	ld a, [$c70d]
+	ld a, [wc70d]
 	ld l, a
-	ld a, [$c70e]
+	ld a, [wc70e]
 	ld h, a
-	ld de, $c688
-	ld a, [$c70b]
+	ld de, wc688
+	ld a, [wc70b]
 	ld c, a
 	ld b, $0
 	call CopyBytes
-	ld a, [$c70e]
+	ld a, [wc70e]
 	cp $c0
 	jr c, .asm_17e21a
 	ld a, $4
@@ -2824,10 +2751,10 @@ Function17e1a1: ; 17e1a1
 	call CloseSRAM
 
 .asm_17e21d
-	ld a, [$c70b]
+	ld a, [wc70b]
 	ld c, a
-	ld hl, $c688
-	ld de, $c608
+	ld hl, wc688
+	ld de, wc608
 .asm_17e227
 	ld a, [de]
 	inc de
@@ -2840,31 +2767,30 @@ Function17e1a1: ; 17e1a1
 .asm_17e231
 	dec c
 	jr nz, .asm_17e227
-	ld a, [$c711]
+	ld a, [wc711]
 	ld l, a
-	ld a, [$c712]
+	ld a, [wc712]
 	ld h, a
 	jr .asm_17e250
 
 .asm_17e23e
-	ld a, [$c70f]
+	ld a, [wc70f]
 	ld l, a
-	ld a, [$c710]
+	ld a, [wc710]
 	ld h, a
 	jr .asm_17e250
 
 .asm_17e248
-	ld a, [$c712 + 1]
+	ld a, [wc712 + 1]
 	ld l, a
-	ld a, [$c712 + 2]
+	ld a, [wc712 + 2]
 	ld h, a
 
 .asm_17e250
 	call Function17e40f
 	ret
-; 17e254
 
-Function17e254: ; 17e254
+Function17e254:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -2874,9 +2800,8 @@ Function17e254: ; 17e254
 	ld [de], a
 	call HlToCrashCheckPointer
 	ret
-; 17e261
 
-Function17e261: ; 17e261
+Function17e261:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -2888,9 +2813,8 @@ Function17e261: ; 17e261
 	inc hl
 	call HlToCrashCheckPointer
 	ret
-; 17e270
 
-Function17e270: ; 17e270
+Function17e270:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -2902,9 +2826,8 @@ Function17e270: ; 17e270
 	inc hl
 	call HlToCrashCheckPointer
 	ret
-; 17e27f
 
-Function17e27f: ; 17e27f
+Function17e27f:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -2921,9 +2844,8 @@ Function17e27f: ; 17e27f
 	add [hl]
 	ld [de], a
 	ret
-; 17e293
 
-Function17e293: ; 17e293
+Function17e293:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -2940,9 +2862,8 @@ Function17e293: ; 17e293
 	sub [hl]
 	ld [de], a
 	ret
-; 17e2a7
 
-Function17e2a7: ; 17e2a7
+Function17e2a7:
 	call IncCrashCheckPointer
 	call HlToCrashCheckPointer
 	call Function17e32b
@@ -2988,9 +2909,8 @@ Function17e2a7: ; 17e2a7
 	ld a, $2
 	ld [wcd7a], a
 	ret
-; 17e309
 
-Function17e309: ; 17e309
+Function17e309:
 	ld a, $2
 	ld [wc303], a
 	call Function17dcaf
@@ -3003,12 +2923,11 @@ Function17e309: ; 17e309
 	xor a
 	ld [wcd77], a
 	ret
-; 17e32b
 
-Function17e32b: ; 17e32b
+Function17e32b:
 	ld a, $5
 	call GetSRAMBank
-	ld hl, $c608
+	ld hl, wc608
 	ld de, $b0b1
 	ld bc, $40
 	call CopyBytes
@@ -3017,13 +2936,12 @@ Function17e32b: ; 17e32b
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 17e349
 
-Function17e349: ; 17e349
+Function17e349:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $b0b1
-	ld de, $c608
+	ld de, wc608
 	ld bc, $40
 	call CopyBytes
 	ld de, wBGMapBuffer
@@ -3031,7 +2949,6 @@ Function17e349: ; 17e349
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 17e367
 
 inc_crash_check_pointer_farcall: MACRO
 	call IncCrashCheckPointer
@@ -3049,26 +2966,22 @@ endr
 	ret
 ENDM
 
-IncCrashCheckPointer_SaveGameData: ; 17e367
+IncCrashCheckPointer_SaveGameData:
 	inc_crash_check_pointer_farcall SaveGameData_
-; 17e37e
 
-IncCrashCheckPointer_SaveAfterLinkTrade: ; 17e37e
+IncCrashCheckPointer_SaveAfterLinkTrade:
 	inc_crash_check_pointer_farcall SaveAfterLinkTrade
 
-IncCrashCheckPointer_SaveBox: ; 17e395
+IncCrashCheckPointer_SaveBox:
 	inc_crash_check_pointer_farcall SaveBox
-; 17e3ac
 
-IncCrashCheckPointer_SaveChecksum: ; 17e3ac
+IncCrashCheckPointer_SaveChecksum:
 	inc_crash_check_pointer_farcall SaveChecksum
-; 17e3c3
 
-IncCrashCheckPointer_SaveTrainerRankingsChecksum: ; 17e3c3
+IncCrashCheckPointer_SaveTrainerRankingsChecksum:
 	inc_crash_check_pointer_farcall UpdateTrainerRankingsChecksum2, BackupMobileEventIndex
-; 17e3e0
 
-Function17e3e0: ; 17e3e0
+Function17e3e0:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld c, a
@@ -3077,9 +2990,8 @@ Function17e3e0: ; 17e3e0
 	ld [hBGMapMode], a
 	call DelayFrames
 	ret
-; 17e3f0
 
-Function17e3f0: ; 17e3f0
+Function17e3f0:
 	call IncCrashCheckPointer
 	call HlToCrashCheckPointer
 .asm_17e3f6
@@ -3093,15 +3005,13 @@ Function17e3f0: ; 17e3f0
 	ret nz
 	call WaitBGMap
 	jr .asm_17e3f6
-; 17e409
 
-Function17e409: ; 17e409
+Function17e409:
 	ld hl, wcd77
 	set 7, [hl]
 	ret
-; 17e40f
 
-Function17e40f: ; 17e40f
+Function17e40f:
 	ld de, wBGPals1
 	add hl, de
 	jr HlToCrashCheckPointer
@@ -3119,9 +3029,8 @@ HlToCrashCheckPointer:
 	ld a, h
 	ld [wMobileCrashCheckPointer + 1], a
 	ret
-; 17e427
 
-Function17e427: ; 17e427
+Function17e427:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and $1
@@ -3133,33 +3042,29 @@ Function17e427: ; 17e427
 	ld a, $3
 	ld [wcd77], a
 	ret
-; 17e438
 
-Function17e438: ; 17e438
+Function17e438:
 	ld hl, wcd77
 	inc [hl]
 	ret
-; 17e43d
 
-Function17e43d: ; 17e43d
+Function17e43d:
 	ld a, [wBGMapBuffer]
 	ld l, a
 	ld a, [wcd21]
 	ld h, a
 	add hl, bc
 	ret
-; 17e447
 
-Function17e447: ; 17e447
+Function17e447:
 	ld a, [wBGMapBuffer]
 	ld l, a
 	ld a, [wcd21]
 	ld h, a
 	add hl, de
 	ret
-; 17e451
 
-Function17e451: ; 17e451
+Function17e451:
 	ld a, [wcd42]
 	and a
 	ret z
@@ -3249,9 +3154,8 @@ Function17e451: ; 17e451
 	pop af
 	ld [wcd2e], a
 	ret
-; 17e4dd
 
-Function17e4dd: ; 17e4dd
+Function17e4dd:
 	ld a, [wcd2c]
 	and $1
 	ret z
@@ -3285,9 +3189,8 @@ Function17e4dd: ; 17e4dd
 	ld a, $ee
 	ld [hl], a
 	ret
-; 17e51b
 
-Function17e51b: ; 17e51b
+Function17e51b:
 	ld a, [wcd28]
 	ld hl, wCreditsTimer
 	sub [hl]
@@ -3321,27 +3224,24 @@ Function17e51b: ; 17e51b
 	dec a
 	jr nz, .asm_17e544
 	ret
-; 17e55b
 
-Function17e55b: ; 17e55b
+Function17e55b:
 	ld a, [wcd42]
 	and a
 	ret z
 	ld a, $ed
 	call Function17e571
 	ret
-; 17e566
 
-Function17e566: ; 17e566
+Function17e566:
 	ld a, [wcd42]
 	and a
 	ret z
 	ld a, $7f
 	call Function17e571
 	ret
-; 17e571
 
-Function17e571: ; 17e571
+Function17e571:
 	push af
 	hlcoord 0, 0
 	ld bc, $14
@@ -3375,9 +3275,8 @@ Function17e571: ; 17e571
 	pop af
 	ld [hl], a
 	ret
-; 17e5af
 
-Function17e5af: ; 17e5af
+Function17e5af:
 	ld a, [wcd2c]
 	and $2
 	ret z
@@ -3387,7 +3286,7 @@ Function17e5af: ; 17e5af
 	ld h, a
 	bccoord 0, 0
 	add hl, bc
-	ld bc, $ffec
+	ld bc, hFFEC
 	add hl, bc
 	ld a, [wMobileInactivityTimerSeconds]
 	ld c, a
@@ -3422,9 +3321,8 @@ Function17e5af: ; 17e5af
 	add hl, bc
 	call PlaceString
 	ret
-; 17e600
 
-Function17e600: ; 17e600
+Function17e600:
 .asm_17e600
 	push af
 	push hl
@@ -3439,9 +3337,8 @@ Function17e600: ; 17e600
 	dec a
 	jr nz, .asm_17e600
 	ret
-; 17e613
 
-Function17e613: ; 17e613
+Function17e613:
 	push hl
 	hlcoord 0, 0
 	ld bc, $14
@@ -3541,9 +3438,8 @@ Function17e613: ; 17e613
 	ld [hl], a
 	pop hl
 	ret
-; 17e691
 
-Function17e691: ; 17e691
+Function17e691:
 	push hl
 	ld hl, NULL
 	ld bc, $14
@@ -3606,13 +3502,12 @@ Function17e691: ; 17e691
 	jr nz, .asm_17e6ac
 	pop hl
 	ret
-; 17e6de
 
-Function17e6de: ; 17e6de
+Function17e6de:
 	push af
-	ld a, [$c708]
+	ld a, [wc708]
 	ld l, a
-	ld a, [$c709]
+	ld a, [wc709]
 	ld h, a
 	decoord 0, 0, wAttrMap
 	add hl, de
@@ -3631,10 +3526,8 @@ Function17e6de: ; 17e6de
 	dec b
 	jr nz, .asm_17e6ee
 	ret
-; 17e6fe
 
-
-PokemonNewsGFX: ; 17e6fe
+PokemonNewsGFX:
 INCBIN "gfx/mobile/pokemon_news.2bpp"
 
 GFX_17eb7e:
@@ -3677,27 +3570,25 @@ Palette_17eff6:
 	RGB 24, 16,  3
 	RGB  0,  0,  0
 
-
-Function17f036:: ; 17f036
+RunMobileScript::
 	ld a, $6
 	call GetSRAMBank
 	inc de
-.asm_17f03c
-	call Function17f047
-	jr c, .asm_17f043
-	jr .asm_17f03c
+.loop
+	call _RunMobileScript
+	jr c, .finished
+	jr .loop
 
-.asm_17f043
+.finished
 	call CloseSRAM
 	ret
-; 17f047
 
-Function17f047: ; 17f047
+_RunMobileScript:
 	ld a, [de]
 	inc de
-	cp $50
+	cp "@"
 	jr z, .finished
-	cp $10
+	cp $10 ; jumptable size
 	jr nc, .finished
 	dec a
 	push de
@@ -3714,9 +3605,8 @@ Function17f047: ; 17f047
 .finished
 	scf
 	ret
-; 17f061
 
-.Jumptable: ; 17f061
+.Jumptable:
 	dw Function17f081 ; 0
 	dw Function17f0f8 ; 1
 	dw Function17f154 ; 2
@@ -3733,9 +3623,8 @@ Function17f047: ; 17f047
 	dw Function17f41d ; d
 	dw Function17f44f ; e
 	dw Function17f44f ; f
-; 17f081
 
-Function17f081: ; 17f081
+Function17f081:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f09f
@@ -3752,7 +3641,7 @@ Function17f081: ; 17f081
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f09d
 	and a
 	ret
@@ -3821,9 +3710,8 @@ Function17f081: ; 17f081
 	pop de
 	and a
 	ret
-; 17f0f8
 
-Function17f0f8: ; 17f0f8
+Function17f0f8:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f114
@@ -3838,7 +3726,7 @@ Function17f0f8: ; 17f0f8
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f112
 	and a
 	ret
@@ -3861,15 +3749,15 @@ Function17f0f8: ; 17f0f8
 	ld a, [wcd55]
 	ld d, a
 	add hl, de
-	ld de, $c608
+	ld de, wc608
 	ld a, [wcd56]
 	ld c, a
 	ld b, $0
 	call CopyBytes
-	ld a, $50
+	ld a, "@"
 	ld [de], a
 	pop hl
-	ld de, $c608
+	ld de, wc608
 	call PlaceString
 	ld a, c
 	ld [wcd52], a
@@ -3880,9 +3768,8 @@ Function17f0f8: ; 17f0f8
 	pop de
 	and a
 	ret
-; 17f154
 
-Function17f154: ; 17f154
+Function17f154:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f167
@@ -3891,7 +3778,7 @@ Function17f154: ; 17f154
 	ld e, l
 	ld d, h
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f165
 	and a
 	ret
@@ -3920,9 +3807,8 @@ Function17f154: ; 17f154
 	pop de
 	and a
 	ret
-; 17f181
 
-Function17f181: ; 17f181
+Function17f181:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f19d
@@ -3937,7 +3823,7 @@ Function17f181: ; 17f181
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f19b
 	and a
 	ret
@@ -3961,10 +3847,10 @@ Function17f181: ; 17f181
 	add hl, de
 	ld a, [hl]
 	ld c, a
-	ld de, $c608
+	ld de, wc608
 	farcall Function48c63
 	pop hl
-	ld de, $c608
+	ld de, wc608
 	call PlaceString
 	ld a, c
 	ld [wcd52], a
@@ -3975,9 +3861,8 @@ Function17f181: ; 17f181
 	pop de
 	and a
 	ret
-; 17f1d0
 
-Function17f1d0: ; 17f1d0
+Function17f1d0:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f1ec
@@ -3992,7 +3877,7 @@ Function17f1d0: ; 17f1d0
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f1ea
 	and a
 	ret
@@ -4032,9 +3917,8 @@ Function17f1d0: ; 17f1d0
 	pop de
 	and a
 	ret
-; 17f220
 
-Function17f220: ; 17f220
+Function17f220:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f23c
@@ -4049,7 +3933,7 @@ Function17f220: ; 17f220
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f23a
 	and a
 	ret
@@ -4092,13 +3976,12 @@ Function17f220: ; 17f220
 	pop de
 	and a
 	ret
-; 17f26e
 
 .Genders: dw .Boy, .Girl
 .Boy:     db "Boy@"
 .Girl:    db "Girl@"
 
-Function17f27b: ; 17f27b
+Function17f27b:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f297
@@ -4113,7 +3996,7 @@ Function17f27b: ; 17f27b
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f295
 	and a
 	ret
@@ -4153,9 +4036,8 @@ Function17f27b: ; 17f27b
 	pop de
 	and a
 	ret
-; 17f2cb
 
-Function17f2cb: ; 17f2cb
+Function17f2cb:
 	pop hl
 	push bc
 	ld a, [hli]
@@ -4185,9 +4067,8 @@ Function17f2cb: ; 17f2cb
 	pop de
 	and a
 	ret
-; 17f2ff
 
-Function17f2ff: ; 17f2ff
+Function17f2ff:
 	pop hl
 	push bc
 	ld a, [hli]
@@ -4198,13 +4079,13 @@ Function17f2ff: ; 17f2ff
 	ld a, $1
 	ld [rSVBK], a
 	ld hl, wPlayerName
-	ld de, $c608
+	ld de, wc608
 	ld bc, $6
 	call CopyBytes
 	ld a, $4
 	ld [rSVBK], a
 	pop hl
-	ld de, $c608
+	ld de, wc608
 	call PlaceString
 	ld a, c
 	ld [wcd52], a
@@ -4215,9 +4096,8 @@ Function17f2ff: ; 17f2ff
 	pop de
 	and a
 	ret
-; 17f334
 
-Function17f334: ; 17f334
+Function17f334:
 	pop hl
 	push bc
 	ld a, [hli]
@@ -4245,10 +4125,10 @@ Function17f334: ; 17f334
 .asm_17f35d
 	ld c, a
 	call CloseSRAM
-	ld de, $c608
+	ld de, wc608
 	farcall Function48c63
 	pop hl
-	ld de, $c608
+	ld de, wc608
 	call PlaceString
 	ld a, c
 	ld [wcd52], a
@@ -4259,9 +4139,8 @@ Function17f334: ; 17f334
 	pop de
 	and a
 	ret
-; 17f382
 
-Function17f382: ; 17f382
+Function17f382:
 	pop hl
 	push bc
 	ld a, [hli]
@@ -4303,19 +4182,18 @@ Function17f382: ; 17f382
 	pop de
 	and a
 	ret
-; 17f3c9
 
-Function17f3c9: ; 17f3c9
+Function17f3c9:
 	push bc
 	ld hl, wcd36
-	ld de, $c708
+	ld de, wc708
 	ld bc, 12
 	call CopyBytes
 	pop de
 	ld c, $0
 	farcall Function11c075
 	push hl
-	ld hl, $c708
+	ld hl, wc708
 	ld de, wcd36
 	ld bc, $c
 	call CopyBytes
@@ -4323,9 +4201,8 @@ Function17f3c9: ; 17f3c9
 	pop de
 	and a
 	ret
-; 17f3f0
 
-Function17f3f0: ; 17f3f0
+Function17f3f0:
 	pop hl
 	push hl
 	ld a, [hli]
@@ -4365,9 +4242,8 @@ Function17f3f0: ; 17f3f0
 	ld h, b
 	scf
 	ret
-; 17f41d
 
-Function17f41d: ; 17f41d
+Function17f41d:
 	pop hl
 	ld a, [hli]
 	push hl
@@ -4410,9 +4286,8 @@ Function17f41d: ; 17f41d
 	pop de
 	and a
 	ret
-; 17f44f
 
-Function17f44f: ; 17f44f
+Function17f44f:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f46d
@@ -4429,7 +4304,7 @@ Function17f44f: ; 17f44f
 	ld b, 0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f46b
 	and a
 	ret
@@ -4462,7 +4337,7 @@ Function17f44f: ; 17f44f
 	ld l, a
 	ld a, [wcd56]
 	ld h, a
-	ld de, $c608
+	ld de, wc608
 	ld a, [wcd57]
 	ld c, a
 	ld b, $0
@@ -4480,7 +4355,7 @@ Function17f44f: ; 17f44f
 	call GetSRAMBank
 
 .asm_17f4b7
-	ld de, $c608
+	ld de, wc608
 	pop hl
 	push hl
 	ld a, [wcd57]
@@ -4523,9 +4398,8 @@ Function17f44f: ; 17f44f
 	pop de
 	and a
 	ret
-; 17f4f6
 
-Function17f4f6: ; 17f4f6
+Function17f4f6:
 	ld a, [wcd6a]
 	ld l, a
 	ld a, [wcd6b]
@@ -4541,9 +4415,8 @@ Function17f4f6: ; 17f4f6
 	dec a
 	add hl, bc
 	jr .asm_17f509
-; 17f50f
 
-Function17f50f: ; 17f50f
+Function17f50f:
 	and a
 	jr z, .asm_17f519
 	ld c, a
@@ -4561,9 +4434,8 @@ Function17f50f: ; 17f50f
 	ld b, a
 	ld h, a
 	ret
-; 17f524
 
-Function17f524: ; 17f524
+Function17f524:
 	push hl
 	push bc
 	push de
@@ -4584,9 +4456,8 @@ Function17f524: ; 17f524
 .asm_17f53a
 	scf
 	jr .asm_17f536
-; 17f53d
 
-Special_BattleTowerMobileError: ; 17f53d
+BattleTowerMobileError:
 	call FadeToMenu
 	xor a
 	ld [wc303], a
@@ -4601,9 +4472,8 @@ Special_BattleTowerMobileError: ; 17f53d
 	ld [rSVBK], a
 	call ExitAllMenus
 	ret
-; 17f555
 
-DisplayMobileError: ; 17f555
+DisplayMobileError:
 .loop
 	call JoyTextDelay
 	call .RunJumptable
@@ -4657,36 +4527,31 @@ DisplayMobileError: ; 17f555
 	ld [sMobileLoginPassword], a
 	call CloseSRAM
 	ret
-; 17f5ae
 
-.RunJumptable: ; 17f5ae
+.RunJumptable:
 	jumptable .Jumptable, wc303
-; 17f5bd
 
-.Jumptable: ; 17f5bd
+.Jumptable:
 	dw Function17f5c3
 	dw Function17ff23
 	dw Function17f5d2
-; 17f5c3
 
-Function17f5c3: ; 17f5c3
+Function17f5c3:
 	call Function17f5e4
 	farcall FinishExitMenu
 	ld a, $1
 	ld [wc303], a
 	ret
-; 17f5d2
 
-Function17f5d2: ; 17f5d2
+Function17f5d2:
 	call Function17f5e4
 	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
 	call SetPalettes
 	ld a, $1
 	ld [wc303], a
 	ret
-; 17f5e4
 
-Function17f5e4: ; 17f5e4
+Function17f5e4:
 	ld a, $8
 	ld [wMusicFade], a
 	ld de, MUSIC_NONE
@@ -4797,9 +4662,8 @@ Function17f5e4: ; 17f5e4
 	hlcoord 2, 6
 	call PlaceString
 	ret
-; 17f699
 
-Table_17f699: ; 17f699
+Table_17f699:
 	dw String_17fedf
 	dw String_17fdd9
 	dw String_17fdd9
@@ -4811,16 +4675,14 @@ Table_17f699: ; 17f699
 	dw String_17fe03
 	dw String_17fe03
 	dw String_17fe03
-; 17f6af
 
-Palette_17f6af: ; 17f6af
+Palette_17f6af:
 	RGB  5,  5, 16
 	RGB  8, 19, 28
 	RGB  0,  0,  0
 	RGB 31, 31, 31
-; 17f6b7
 
-Function17f6b7: ; 17f6b7
+Function17f6b7:
 	ld a, [wc300]
 	call .bcd_two_digits
 	inc hl
@@ -4830,9 +4692,8 @@ Function17f6b7: ; 17f6b7
 	ld a, [wc301]
 	call .bcd_two_digits
 	ret
-; 17f6cd
 
-.bcd_two_digits ; 17f6cd
+.bcd_two_digits
 	ld c, a
 	and $f0
 	swap a
@@ -4840,22 +4701,19 @@ Function17f6b7: ; 17f6b7
 	ld a, c
 	and $f
 
-.bcd_digit ; 17f6d8
+.bcd_digit
 	add "0"
 	ld [hli], a
 	ret
-; 17f6dc
 
-String_17f6dc: ; 17f6dc
+String_17f6dc:
 	db "つうしんエラー　　　ー@"
-; 17f6e8
 
-String_17f6e8: ; 17f6e8
+String_17f6e8:
 	db   "みていぎ<NO>エラーです"
 	next "プログラム<WO>"
 	next "かくにん　してください"
 	db   "@"
-; 17f706
 
 Table_17f706:
 	dw Unknown_17f74e
@@ -5009,7 +4867,7 @@ Unknown_17f844: db 19
 	dbbw $4, $4, String_17fa49
 	dbbw $ff, $ff, String_17fa49
 
-String_17f891: ; 17f891
+String_17f891:
 	db   "モバイルアダプタが　ただしく"
 	next "さしこまれていません"
 	next "とりあつかいせつめいしょを"
@@ -5017,7 +4875,7 @@ String_17f891: ; 17f891
 	next "さしこんで　ください"
 	db   "@"
 
-String_17f8d1: ; 17f8d1
+String_17f8d1:
 	db   "でんわが　うまく　かけられないか"
 	next "でんわかいせんが　こんでいるので"
 	next "つうしん　できません"
@@ -5025,14 +4883,14 @@ String_17f8d1: ; 17f8d1
 	next "かけなおして　ください"
 	db   "@"
 
-String_17f913: ; 17f913
+String_17f913:
 	db   "でんわかいせんが　こんでいるため"
 	next "でんわが　かけられません"
 	next "しばらく　まって"
 	next "かけなおして　ください"
 	db   "@"
 
-String_17f946: ; 17f946
+String_17f946:
 	db   "モバイルアダプタの　エラーです"
 	next "しばらく　まって"
 	next "かけなおして　ください"
@@ -5041,7 +4899,7 @@ String_17f946: ; 17f946
 	next "おといあわせください"
 	db   "@"
 
-String_17f98e: ; 17f98e
+String_17f98e:
 	db   "つうしんエラーです"
 	next "しばらく　まって"
 	next "かけなおして　ください"
@@ -5050,7 +4908,7 @@ String_17f98e: ; 17f98e
 	next "おといあわせください"
 	db   "@"
 
-String_17f9d0: ; 17f9d0
+String_17f9d0:
 	db   "ログインパスワードか"
 	next "ログイン　アイディーに"
 	next "まちがいがあります"
@@ -5059,7 +4917,7 @@ String_17f9d0: ; 17f9d0
 	next "かけなおして　ください"
 	db   "@"
 
-String_17fa14: ; 17fa14
+String_17fa14:
 	db   "でんわが　きれました"
 	next "とりあつかいせつめいしょを"
 	next "ごらんのうえ"
@@ -5067,14 +4925,14 @@ String_17fa14: ; 17fa14
 	next "かけなおして　ください"
 	db   "@"
 
-String_17fa49: ; 17fa49
+String_17fa49:
 	db   "モバイルセンターの"
 	next "つうしんエラーです"
 	next "しばらくまって"
 	next "かけなおして　ください"
 	db   "@"
 
-String_17fa71: ; 17fa71
+String_17fa71:
 	db   "モバイルアダプタに"
 	next "とうろくされた　じょうほうが"
 	next "ただしく　ありません"
@@ -5082,7 +4940,7 @@ String_17fa71: ; 17fa71
 	next "しょきとうろくを　してください"
 	db   "@"
 
-String_17fab0: ; 17fab0
+String_17fab0:
 	db   "モバイルセンターが"
 	next "こんでいて　つながりません"
 	next "しばらくまって"
@@ -5091,14 +4949,14 @@ String_17fab0: ; 17fab0
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17faf9: ; 17faf9
+String_17faf9:
 	db   "あてさき　メールアドレスに"
 	next "まちがいがあります"
 	next "ただしい　メールアドレスを"
 	next "いれなおしてください"
 	db   "@"
 
-String_17fb2a: ; 17fb2a
+String_17fb2a:
 	db   "メールアドレスに"
 	next "まちがいが　あります"
 	next "とりあつかいせつめいしょを"
@@ -5107,7 +4965,7 @@ String_17fb2a: ; 17fb2a
 	next "しょきとうろくを　してください"
 	db   "@"
 
-String_17fb6e: ; 17fb6e
+String_17fb6e:
 	db   "ログインパスワードに"
 	next "まちがいが　あるか"
 	next "モバイルセンターの　エラーです"
@@ -5116,7 +4974,7 @@ String_17fb6e: ; 17fb6e
 	next "かけなおして　ください"
 	db   "@"
 
-String_17fbb6: ; 17fbb6
+String_17fbb6:
 	db   "データの　よみこみが　できません"
 	next "しばらくまって"
 	next "かけなおして　ください"
@@ -5125,7 +4983,7 @@ String_17fbb6: ; 17fbb6
 	next "おといあわせください"
 	db   "@"
 
-String_17fbfe: ; 17fbfe
+String_17fbfe:
 	db   "じかんぎれです"
 	next "でんわが　きれました"
 	next "でんわを　かけなおしてください"
@@ -5133,7 +4991,7 @@ String_17fbfe: ; 17fbfe
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17fc3e: ; 17fc3e
+String_17fc3e:
 	db   "ごりよう　りょうきんの　"
 	next "おしはらいが　おくれたばあいには"
 	next "ごりようが　できなくなります"
@@ -5141,14 +4999,14 @@ String_17fc3e: ; 17fc3e
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17fc88: ; 17fc88
+String_17fc88:
 	db   "おきゃくさまの　ごつごうにより"
 	next "ごりようできません"
 	next "くわしくは　とりあつかい"
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17fcbf: ; 17fcbf
+String_17fcbf:
 	db   "でんわかいせんが　こんでいるか"
 	next "モバイルセンターの　エラーで"
 	next "つうしんが　できません"
@@ -5156,7 +5014,7 @@ String_17fcbf: ; 17fcbf
 	next "かけなおして　ください"
 	db   "@"
 
-String_17fcff: ; 17fcff
+String_17fcff:
 	db   "ごりよう　りょうきんが"
 	next "じょうげんを　こえているため"
 	next "こんげつは　ごりようできません"
@@ -5164,7 +5022,7 @@ String_17fcff: ; 17fcff
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17fd47: ; 17fd47
+String_17fd47:
 	db   "げんざい　モバイルセンターの"
 	next "てんけんを　しているので"
 	next "つうしんが　できません"
@@ -5172,27 +5030,26 @@ String_17fd47: ; 17fd47
 	next "かけなおして　ください"
 	db   "@"
 
-String_17fd84: ; 17fd84
+String_17fd84:
 	db   "データの　よみこみが　できません"
 	next "くわしくは　とりあつかい"
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-
-String_17fdb2: ; 17fdb2
+String_17fdb2:
 	db   "３ぷん　いじょう　なにも"
 	next "にゅうりょく　しなかったので"
 	next "でんわが　きれました"
 	db   "@"
 
-String_17fdd9: ; 17fdd9
+String_17fdd9:
 	db   "つうしんが　うまく"
 	next "できませんでした"
 	next "もういちど　はじめから"
 	next "やりなおしてください"
 	db   "@"
 
-String_17fe03: ; 17fe03
+String_17fe03:
 	db   "データの　よみこみが　できません"
 	next "しばらくまって"
 	next "かけなおして　ください"
@@ -5201,19 +5058,19 @@ String_17fe03: ; 17fe03
 	next "おといあわせください"
 	db   "@"
 
-String_17fe4b: ; 17fe4b
+String_17fe4b:
 	db   "まちじかんが　ながいので"
 	next "でんわが　きれました"
 	db   "@"
 
-String_17fe63: ; 17fe63
+String_17fe63:
 	db   "あいての　モバイルアダプタと"
 	next "タイプが　ちがいます"
 	next "くわしくは　とりあつかい"
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17fe9a: ; 17fe9a ; unused
+String_17fe9a: ; unused
 	db   "ポケモンニュースが"
 	next "あたらしくなっているので"
 	next "レポートを　おくれません"
@@ -5221,16 +5078,15 @@ String_17fe9a: ; 17fe9a ; unused
 	next "よみこみを　さきに　してください"
 	db   "@"
 
-String_17fedf: ; 17fedf
+String_17fedf:
 	db   "つうしんの　じょうきょうが"
 	next "よくないか　かけるあいてが"
 	next "まちがっています"
 	next "もういちど　かくにんをして"
 	next "でんわを　かけなおして　ください"
 	db   "@"
-; 17ff23
 
-Function17ff23: ; 17ff23
+Function17ff23:
 	ld a, [hJoyPressed]
 	and a
 	ret z
@@ -5243,9 +5099,8 @@ Function17ff23: ; 17ff23
 	ld hl, wc303
 	set 7, [hl]
 	ret
-; 17ff3c
 
-Function17ff3c: ; 17ff3c
+Function17ff3c:
 	nop
 	ld a, [wc300]
 	cp $d0
@@ -5266,8 +5121,6 @@ Function17ff3c: ; 17ff3c
 	ld [wc300], a
 	and a
 	ret
-; 17ff68
 
-String_17ff68: ; 17ff68
+String_17ff68:
 	db "１０１@"
-; 17ff6c
diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm
index 8de1f0f5e..ba8ae5784 100755..100644
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -1,15 +1,15 @@
-MainMenu_Mobile: ; 49efc
+MainMenu_Mobile:
 	call ClearBGPalettes
 	ld a, MUSIC_MOBILE_ADAPTER_MENU
 	ld [wMapMusic], a
 	ld de, MUSIC_MOBILE_ADAPTER_MENU
 	call Function4a6c5
-Function49f0a: ; 49f0a
+Function49f0a:
 	call ClearBGPalettes
 	call Function4a3a7
 	call Function4a492
 	call ClearBGPalettes
-Function49f16: ; 49f16
+Function49f16:
 	call MobileMenu_InitMenuBuffers
 	ld c, 12
 	call DelayFrames
@@ -98,47 +98,38 @@ Function49f16: ; 49f16
 	hlcoord 5, 1
 	call ClearBox
 	jp .joy_loop
-; 49fcc
 
-
-MobileString1: ; 49fcc
+MobileString1:
 	db   "めいしフォルダー"
 	next "あいさつ"
 	next "プロフィール"
 	next "せ<TTE>い"
 	next "もどる"
 	db   "@"
-; 49fe9
-
 
 MobileStrings2:
 
-String_0x49fe9: ; 49fe9
+String_0x49fe9:
 	db   "めいし¯つくったり"
 	next "ほぞんしておける　フォルダーです@"
-; 4a004
 
-String_0x4a004: ; 4a004
+String_0x4a004:
 	db   "モバイルたいせんや　じぶんのめいしで"
 	next "つかう　あいさつ¯つくります@"
-; 4a026
 
-String_0x4a026: ; 4a026
+String_0x4a026:
 	db   "あなた<NO>じゅうしょや　ねんれいの"
 	next "せ<TTE>い¯かえられます@"
-; 4a042
 
-String_0x4a042: ; 4a042
+String_0x4a042:
 	db  "モバイルセンター<NI>せつぞくするとき"
 	next "ひつような　こと¯きめます@"
-; 4a062
 
-String_0x4a062: ; 4a062
+String_0x4a062:
 	db   "まえ<NO>がめん　<NI>もどります"
 	next "@"
-; 4a071
 
-MobileMenu_InitMenuBuffers: ; 4a071 (12:6071)
+MobileMenu_InitMenuBuffers:
 	ld hl, w2DMenuCursorInitY
 	ld a, 2
 	ld [hli], a
@@ -166,12 +157,12 @@ MobileMenu_InitMenuBuffers: ; 4a071 (12:6071)
 	ld [hli], a ; wMenuCursorY, wMenuCursorX
 	ret
 
-Function4a098: ; 4a098 (12:6098)
+Function4a098:
 	ld a, 2
 	call MenuClickSound
 	call PlaceHollowCursor
 	call WaitBGMap
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	farcall Function89de0
 	call Call_ExitMenu
 	call MG_Mobile_Layout_LoadPals
@@ -179,13 +170,13 @@ Function4a098: ; 4a098 (12:6098)
 	pop bc
 	jp Function49f16
 
-Function4a0b9: ; 4a0b9 (12:60b9)
+Function4a0b9:
 	ld a, 2
 	call MenuClickSound
 	pop bc
 	jp Function4a4c4
 
-Function4a0c2: ; 4a0c2 (12:60c2)
+Function4a0c2:
 	ld a, 2
 	call MenuClickSound
 	ld a, BANK(sPlayerData)
@@ -211,7 +202,7 @@ Function4a0c2: ; 4a0c2 (12:60c2)
 	call DelayFrames
 	jr asm_4a111
 
-Function4a100: ; 4a100 (12:6100)
+Function4a100:
 	ld a, 2
 	call MenuClickSound
 	call ClearBGPalettes
@@ -219,12 +210,12 @@ Function4a100: ; 4a100 (12:6100)
 	call ClearBGPalettes
 	call ClearTileMap
 
-asm_4a111: ; 4a111 (12:6111)
+asm_4a111:
 	pop bc
 	call LoadFontsExtra
 	jp Function49f0a
 
-Function4a118: ; 4a118 (12:6118)
+Function4a118:
 	ld hl, w2DMenuCursorInitY
 	ld a, $1
 	ld [hli], a
@@ -249,14 +240,14 @@ Function4a118: ; 4a118 (12:6118)
 	ld [hli], a
 	ret
 
-Function4a13b: ; 4a13b (12:613b)
+Function4a13b:
 	call Function4a3a7
 	call Function4a492
 	call Function4a373
 	ld c, 10
 	call DelayFrames
 
-Function4a149: ; 4a149 (12:6149)
+Function4a149:
 	hlcoord 1, 2
 	ld b, $6
 	ld c, $10
@@ -288,13 +279,13 @@ Function4a149: ; 4a149 (12:6149)
 	push bc
 	jr asm_4a19d
 
-Function4a195: ; 4a195 (12:6195)
+Function4a195:
 	call ScrollingMenuJoypad
 	ld hl, wMenuCursorY
 	ld b, [hl]
 	push bc
 
-asm_4a19d: ; 4a19d (12:619d)
+asm_4a19d:
 	bit 0, a
 	jr nz, .asm_4a1a7
 	bit 1, a
@@ -336,15 +327,13 @@ asm_4a19d: ; 4a19d (12:619d)
 	hlcoord 2, 3
 	call ClearBox
 	jp Function4a195
-; 4a1ef (12:61ef)
 
-String_4a1ef: ; 4a1ef
+String_4a1ef:
 	db   "モバイルセンター¯えらぶ"
 	next "ログインパスワード¯いれる"
 	next "もどる@"
-; 4a20e
 
-Function4a20e: ; 4a20e (12:620e)
+Function4a20e:
 	ld a, $1
 	call MenuClickSound
 	farcall Function1719c8
@@ -352,7 +341,7 @@ Function4a20e: ; 4a20e (12:620e)
 	call DelayFrame
 	jr Function4a239
 
-Function4a221: ; 4a221 (12:6221)
+Function4a221:
 	ld a, $1
 	call MenuClickSound
 	call Function4a28a
@@ -365,12 +354,11 @@ Function4a221: ; 4a221 (12:6221)
 	pop bc
 	jp Function4a149
 
-Function4a239: ; 4a239 (12:6239)
+Function4a239:
 	pop bc
 	jp Function4a13b
-; 4a23d (12:623d)
 
-Strings_4a23d: ; 4a23d
+Strings_4a23d:
 	db   "いつも　せつぞく¯する"
 	next "モバイルセンター¯えらびます@"
 
@@ -380,16 +368,15 @@ Strings_4a23d: ; 4a23d
 	db   "まえ<NO>がめん　<NI>もどります@"
 
 	db   "@"
-; 4a28a
 
-Function4a28a: ; 4a28a (12:628a)
+Function4a28a:
 	hlcoord 2, 3
 	lb bc, 6, 1
 	ld a, " "
 	call Function4a6d8
 	call PlaceHollowCursor
 	call WaitBGMap
-	call LoadStandardMenuDataHeader
+	call LoadStandardMenuHeader
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$aa4b]
@@ -433,8 +420,8 @@ Function4a28a: ; 4a28a (12:628a)
 	ld c, 4
 	call TextBox
 	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
-	ld hl, DeletePassword_YesNo_MenuDataHeader
-	call LoadMenuDataHeader
+	ld hl, DeletePassword_YesNo_MenuHeader
+	call LoadMenuHeader
 	call VerticalMenu
 	bit B_BUTTON_F, a
 	jr nz, .dont_delete_password
@@ -458,45 +445,39 @@ Function4a28a: ; 4a28a (12:628a)
 	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
 	xor a
 	ret
-; 4a346 (12:6346)
 
-MenuDataHeader_0x4a346: ; 0x4a346
+MenuHeader_0x4a346:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 12, 0, SCREEN_WIDTH - 1, 6
 
-String_4a34b: ; 4a34b
+String_4a34b:
 	db   "いれなおす"
 	next "けす"
 	next "もどる@"
-; 4a358
 
-UnknownText_0x4a358: ; 0x4a358
+UnknownText_0x4a358:
 	; Delete the saved LOG-IN PASSWORD?
 	text_jump UnknownText_0x1c5196
 	db "@"
-; 0x4a35d
 
-UnknownText_0x4a35d: ; 0x4a35d
+UnknownText_0x4a35d:
 	; Deleted the LOG-IN PASSWORD.
 	text_jump UnknownText_0x1c51b9
 	db "@"
-; 0x4a362
 
-DeletePassword_YesNo_MenuDataHeader: ; 0x4a362
+DeletePassword_YesNo_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw MenuData2_0x4a36a
+	dw MenuData_0x4a36a
 	db 2 ; default option
-; 0x4a36a
 
-MenuData2_0x4a36a: ; 0x4a36a
+MenuData_0x4a36a:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
 	db 2 ; items
 	db "はい@"
 	db "いいえ@"
-; 0x4a373
 
-Function4a373: ; 4a373 (12:6373)
+Function4a373:
 	ld hl, w2DMenuCursorInitY
 	ld a, $4
 	ld [hli], a
@@ -522,19 +503,17 @@ Function4a373: ; 4a373 (12:6373)
 	ld [hli], a
 	ld [hli], a
 	ret
-; 4a39a (12:639a)
 
-Function4a39a: ; 4a39a
+Function4a39a:
 	call Function4a485
 	call Function4a492
 	call Function4a3aa
 	call SetPalettes
 	ret
-; 4a3a7
 
-Function4a3a7: ; 4a3a7 (12:63a7)
+Function4a3a7:
 	call Function4a485
-Function4a3aa: ; 4a3aa
+Function4a3aa:
 	hlcoord 0, 0
 	lb bc, 3, 1
 	xor a
@@ -596,9 +575,8 @@ Function4a3aa: ; 4a3aa
 	ld a, " "
 	call Function4a6d8
 	ret
-; 4a449 (12:6449)
 
-Function4a449: ; 4a449
+Function4a449:
 	ld bc, 3 * SCREEN_WIDTH
 	ld a, $0
 	hlcoord 0, 0
@@ -622,21 +600,19 @@ Function4a449: ; 4a449
 	ld a, " "
 	call ByteFill
 	ret
-; 4a485
 
-Function4a485: ; 4a485 (12:6485)
+Function4a485:
 	ld de, GFX_49c0c
 	ld hl, vTiles2 tile $00
 	lb bc, BANK(GFX_49c0c), 13
 	call Get2bpp
 	ret
 
-Function4a492: ; 4a492 (12:6492)
+Function4a492:
 	call MG_Mobile_Layout00
 	ret
 
-
-MainMenu_MobileStudium: ; 4a496
+MainMenu_MobileStudium:
 	ld a, [wStartDay]
 	ld b, a
 	ld a, [wStartHour]
@@ -660,10 +636,8 @@ MainMenu_MobileStudium: ; 4a496
 	ld a, e
 	ld [wStartSecond], a
 	ret
-; 4a4c4
-
 
-Function4a4c4: ; 4a4c4 (12:64c4)
+Function4a4c4:
 	call ClearBGPalettes
 	call Function4a3a7
 	call Function4a492
@@ -715,13 +689,13 @@ Function4a4c4: ; 4a4c4 (12:64c4)
 	push bc
 	jr asm_4a54d
 
-Function4a545: ; 4a545 (12:6545)
+Function4a545:
 	call ScrollingMenuJoypad
 	ld hl, wMenuCursorY
 	ld b, [hl]
 	push bc
 
-asm_4a54d: ; 4a54d (12:654d)
+asm_4a54d:
 	bit 0, a
 	jr nz, .asm_4a557
 	bit 1, a
@@ -771,7 +745,7 @@ asm_4a54d: ; 4a54d (12:654d)
 	call PlaceString
 	jp Function4a5b0
 
-Function4a5b0: ; 4a5b0 (12:65b0)
+Function4a5b0:
 	call Function4a680
 	pop bc
 	ld hl, wMenuCursorY
@@ -781,21 +755,19 @@ Function4a5b0: ; 4a5b0 (12:65b0)
 	hlcoord 3, 1
 	call ClearBox
 	jp Function4a545
-; 4a5c5 (12:65c5)
 
-String_4a5c5: ; 4a5c5
+String_4a5c5:
 	db "じこしょうかい@"
-String_4a5cd: ; 4a5cd
+String_4a5cd:
 	db "たいせん　<GA>はじまるとき@"
-String_4a5da: ; 4a5da
+String_4a5da:
 	db "たいせん　<NI>かったとき@"
-String_4a5e6: ; 4a5e6
+String_4a5e6:
 	db "たいせん　<NI>まけたとき@"
-String_4a5f2: ; 4a5f2
+String_4a5f2:
 	db "もどる@"
-; 4a5f6
 
-Strings_4a5f6: ; 4a5f6
+Strings_4a5f6:
 	db "めいし　や　ニュース　<NI>のせる@"
 	db "あなた<NO>あいさつです@"
 	db "モバイル　たいせん<GA>はじまるとき@"
@@ -806,9 +778,8 @@ Strings_4a5f6: ; 4a5f6
 	db "あいて<NI>みえる　あいさつです@"
 	db "まえ<NO>がめん　<NI>もどります@"
 	db "@"
-; 4a680
 
-Function4a680: ; 4a680 (12:6680)
+Function4a680:
 	ld hl, w2DMenuCursorInitY
 	ld a, $2
 	ld [hli], a
@@ -839,18 +810,18 @@ Function4a680: ; 4a680 (12:6680)
 	ld [hli], a
 	ret
 
-Function4a6ab: ; 4a6ab (12:66ab)
+Function4a6ab:
 	ld a, $2
 	call MenuClickSound
 	call ClearBGPalettes
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
-	farcall Special_Function11c1ab
+	farcall Function11c1ab
 	pop bc
 	call LoadFontsExtra
 	jp Function4a4c4
 
-Function4a6c5: ; 4a6c5 (12:66c5)
+Function4a6c5:
 	ld a, $5
 	ld [wMusicFade], a
 	ld a, e
@@ -861,7 +832,7 @@ Function4a6c5: ; 4a6c5 (12:66c5)
 	call DelayFrames
 	ret
 
-Function4a6d8: ; 4a6d8 (12:66d8)
+Function4a6d8:
 	push bc
 	push hl
 .asm_4a6da
diff --git a/mobile/news/news.asm b/mobile/news/news.asm
index d9dcc3ce8..868556bdd 100644
--- a/mobile/news/news.asm
+++ b/mobile/news/news.asm
@@ -2,7 +2,7 @@
 
 	db $cc, $6b, $1e ; unused
 
-Unreferenced_Function1f4003: ; 1f4003
+Unreferenced_Function1f4003:
 	ld a, $6
 	call GetSRAMBank
 	ld hl, .news_data
@@ -15,7 +15,7 @@ Unreferenced_Function1f4003: ; 1f4003
 .news_data
 INCBIN "mobile/news/news_1.bin"
 
-Unreferenced_Function1f4dbe: ; 1f4dbe
+Unreferenced_Function1f4dbe:
 	ld a, $6
 	call GetSRAMBank
 	ld hl, .news_data
@@ -28,7 +28,7 @@ Unreferenced_Function1f4dbe: ; 1f4dbe
 .news_data
 INCBIN "mobile/news/news_2.bin"
 
-Function1f5d9f: ; 1f5d9f
+Function1f5d9f:
 	ld a, $6
 	call GetSRAMBank
 	ld hl, .news_data
diff --git a/mobile/print_opp_message.asm b/mobile/print_opp_message.asm
index 987ad4b9a..9c94297a8 100644
--- a/mobile/print_opp_message.asm
+++ b/mobile/print_opp_message.asm
@@ -1,4 +1,4 @@
-Mobile_PrintOpponentBattleMessage: ; 4ea0a
+Mobile_PrintOpponentBattleMessage:
 	ld a, c
 	push af
 	call SpeechTextBox
diff --git a/pokecrystal.link b/pokecrystal.link
index 0cfb54a8b..157b39197 100644
--- a/pokecrystal.link
+++ b/pokecrystal.link
@@ -234,17 +234,22 @@ ROMX $5a
 	"Pics 19"
 ROMX $5b
 	"bank5B"
+	"Pics 20"
 ROMX $5c
 	"Mobile 5C"
+	"Pics 21"
 ROMX $5d
 	"Crystal Phone Text 2"
+	"Pics 22"
 ROMX $5e
 	"UpdateBattleHUDs"
 	"Songs 5"
 	"Crystal Sound Effects"
 	"Mobile 5E"
+	"Pics 23"
 ROMX $5f
 	"Mobile 5F"
+	"Pics 24"
 ROMX $60
 	"Map Scripts 13"
 	"Pokedex Entries 001-064"
@@ -271,7 +276,7 @@ ROMX $6a
 ROMX $6b
 	"Map Scripts 24"
 ROMX $6c
-	"Common Text 1"
+	"Phone Text 2"
 	"Map Scripts 25"
 ROMX $6d
 	"Special Phone Text"
diff --git a/sram.asm b/sram.asm
index 66c8af2c4..2cd457e61 100644
--- a/sram.asm
+++ b/sram.asm
@@ -122,7 +122,7 @@ sCheckValue2:: db ; loaded with SAVE_CHECK_VALUE_2, used to check save corruptio
 SECTION "Active Box", SRAM
 
 ; ad10
-	box sBox
+sBox:: box sBox
 ; b160
 
 	ds $f4
@@ -208,36 +208,37 @@ sBattleTowerSaveFileFlags:: db
 sBattleTowerReward:: db
 
 ; team of previous trainer
-sBTPkmnOfTrainers:: ; 0xbe51
-sBTPkmnPrevTrainer1:: db
-sBTPkmnPrevTrainer2:: db
-sBTPkmnPrevTrainer3:: db
+sBTMonOfTrainers:: ; be51
+sBTMonPrevTrainer1:: db
+sBTMonPrevTrainer2:: db
+sBTMonPrevTrainer3:: db
 ; team of preprevious trainer
-sBTPkmnPrevPrevTrainer1:: db
-sBTPkmnPrevPrevTrainer2:: db
-sBTPkmnPrevPrevTrainer3:: db
+sBTMonPrevPrevTrainer1:: db
+sBTMonPrevPrevTrainer2:: db
+sBTMonPrevPrevTrainer3:: db
 
 
 SECTION "Boxes 1-7",  SRAM, BANK [2]
 
-	box sBox1
-	box sBox2
-	box sBox3
-	box sBox4
-	box sBox5
-	box sBox6
-	box sBox7
+sBox1::  box sBox1
+sBox2::  box sBox2
+sBox3::  box sBox3
+sBox4::  box sBox4
+sBox5::  box sBox5
+sBox6::  box sBox6
+sBox7::  box sBox7
 
 
 SECTION "Boxes 8-14", SRAM
 
-	box sBox8
-	box sBox9
-	box sBox10
-	box sBox11
-	box sBox12
-	box sBox13
-	box sBox14
+sBox8::  box sBox8
+sBox9::  box sBox9
+sBox10:: box sBox10
+sBox11:: box sBox11
+sBox12:: box sBox12
+sBox13:: box sBox13
+sBox14:: box sBox14
+
 
 SECTION "SRAM Mobile", SRAM, BANK [5]
 
diff --git a/tools/free_space.awk b/tools/free_space.awk
new file mode 100644
index 000000000..1f2b04415
--- /dev/null
+++ b/tools/free_space.awk
@@ -0,0 +1,13 @@
+#!/usr/bin/awk -f
+
+# Usage: tools/free_space.awk pokecrystal.map
+
+BEGIN {
+	total = free = 16384 * 128
+}
+/^  SECTION: \$[0-7]/ {
+	free -= strtonum("0x" substr($3, 3))
+}
+END {
+	printf "Free space: %d/%d (%.2f%%)\n", free, total, free * 100 / total
+}
diff --git a/tools/lzcomp.c b/tools/lzcomp.c
index e0a88e44a..7d3e0b8fc 100644
--- a/tools/lzcomp.c
+++ b/tools/lzcomp.c
@@ -310,6 +310,7 @@ void optimize (struct command * commands, unsigned short count) {
         break;
       case 1:
         if (commands -> value != next -> value) break;
+        // falls through
       case 3:
         if ((commands -> count + next -> count) <= 1024) {
           commands -> count += next -> count;
diff --git a/tools/md5.c b/tools/md5.c
index 45562330a..6f4f58d2d 100644
--- a/tools/md5.c
+++ b/tools/md5.c
@@ -39,7 +39,7 @@ void md5_wikipedia(uint8_t *data, int length, uint8_t *result) {
 	uint8_t *message = calloc(length + 64, sizeof(uint8_t));
 	memcpy(message, data, length);
 
-	long orig_bitlength = length * 8;
+	int64_t orig_bitlength = length * 8;
 
 	message[length++] |= 1 << 7;
 
diff --git a/tools/scan_includes.c b/tools/scan_includes.c
index 2babdcfb5..63af3bcfb 100644
--- a/tools/scan_includes.c
+++ b/tools/scan_includes.c
@@ -48,9 +48,20 @@ void scan_file(char* filename) {
 				buffer = strchr(buffer, '\n');
 				if (!buffer) {
 					fprintf(stderr, "%s: no newline at end of file\n", filename);
+					break;
 				}
 				break;
 
+			case '"':
+				buffer++;
+				buffer = strchr(buffer, '"');
+				if (!buffer) {
+					fprintf(stderr, "%s: unterminated string\n", filename);
+					break;
+				}
+				buffer++;
+				break;
+
 			case 'i':
 			case 'I':
 				if ((strncmp(buffer, "INCBIN", 6) == 0) || (strncmp(buffer, "incbin", 6) == 0)) {
@@ -60,9 +71,10 @@ void scan_file(char* filename) {
 				}
 				if (is_incbin || is_include) {
 					buffer = strchr(buffer, '"');
-					if (!buffer++) {
+					if (!buffer) {
 						break;
 					}
+					buffer++;
 					int length = strcspn(buffer, "\"");
 					char *include = malloc(length + 1);
 					strncpy(include, buffer, length);
diff --git a/tools/sort_symfile.sh b/tools/sort_symfile.sh
index d53150faa..edde25e75 100755
--- a/tools/sort_symfile.sh
+++ b/tools/sort_symfile.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
-sed $1 \
+TEMP_FILE=$(mktemp)
+sed \
     -e "s/^..:[0-3]/0_ROM0@&/g" \
     -e "s/^..:[4-7]/1_ROMX@&/g" \
     -e "s/^..:[8-9]/2_VRAM@&/g" \
     -e "s/^..:[A-B]/3_SRAM@&/g" \
     -e "s/^00:[C-D]/4_WRAM0@&/g" \
     -e "s/^..:[D-D]/5_WRAMX@&/g" \
-| sort -o $1
-sed -i $1 -e "s/^\w*@//g"
+    $1 \
+| sort \
+| sed -e "s/^.*@//g" > $TEMP_FILE
+mv $TEMP_FILE $1
diff --git a/tools/toc.py b/tools/toc.py
index 9bdc8cca6..9bdc8cca6 100644..100755
--- a/tools/toc.py
+++ b/tools/toc.py
diff --git a/wram.asm b/wram.asm
index 1a14a0171..0291f587a 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1,4 +1,5 @@
 INCLUDE "constants.asm"
+
 INCLUDE "macros/wram.asm"
 
 
@@ -358,12 +359,22 @@ SECTION "Battle", WRAM0
 
 UNION ; c608
 ; unidentified uses
-wc608:: ds 480
+wc608:: ds 53
+wc63d:: ds 5
+wc642:: ds 5
+wc647:: ds 33
+wc668:: ds 32
+wc688:: ds 2
+wc68a:: ds 350
 
 NEXTU ; c608
-; miscellaneous
-wMisc:: ds WMISC_WIDTH * WMISC_HEIGHT
-wMiscEnd::
+; surrounding tiles
+wSurroundingTiles:: ds SURROUNDING_WIDTH * SURROUNDING_HEIGHT
+
+NEXTU ; c608
+; box save buffer
+wBoxPartialData:: ds 480
+wBoxPartialDataEnd::
 
 NEXTU ; c608
 ; odd egg
@@ -389,7 +400,7 @@ wInitMinuteBuffer:: db ; c626
 
 NEXTU ; c608
 ; link engine data
-	ds 10
+wLink_c608:: ds 10
 wc612:: ds 10
 
 NEXTU ; c608
@@ -863,7 +874,18 @@ endc
 
 NEXTU ; c6d0
 ; mobile data
-wc6d0:: ds 126
+wc6d0:: ds 56
+wc708:: db
+wc709:: db
+wc70a:: db
+wc70b:: db
+wc70c:: db
+wc70d:: db
+wc70e:: db
+wc70f:: db
+wc710:: db
+wc711:: db
+wc712:: ds 60
 wc74e:: ds 107
 wc7b9:: ds 1
 wc7ba:: ds 1
@@ -884,8 +906,9 @@ wc7e8_End::
 SECTION "Overworld Map", WRAM0
 
 UNION ; c800
-wOverworldMap:: ds 1300 ; c800
-wOverworldMapEnd::
+; overworld map blocks
+wOverworldMapBlocks:: ds 1300 ; c800
+wOverworldMapBlocksEnd::
 
 NEXTU ; c800
 ; GB Printer screen RAM
@@ -928,11 +951,15 @@ wGameboyPrinterRAMEnd::
 
 NEXTU ; c800
 ; bill's pc data
-wBillsPCPokemonList:: ; c800
-; Pokemon, box number, list index
+wBillsPCPokemonList::
+; (species, box number, list index) x30
 	ds 3 * 30
 
 NEXTU ; c800
+; Hall of Fame data
+wHallOfFamePokemonList:: hall_of_fame wHallOfFamePokemonList
+
+NEXTU ; c800
 ; raw link data
 wLinkData:: ds $514
 wLinkDataEnd::
@@ -940,9 +967,9 @@ wLinkDataEnd::
 NEXTU ; c800
 ; link data members
 wLinkPlayerName:: ds NAME_LENGTH
-wLinkPartyCount:: db
+wLinkPartyCount::   db
 wLinkPartySpecies:: ds PARTY_LENGTH
-wLinkPartySpeciesEnd:: db ; legacy scripts don't check wPartyCount
+wLinkPartyEnd::     db ; older code doesn't check PartyCount
 
 UNION ; c813
 ; time capsule party data
@@ -1226,7 +1253,7 @@ wcd72:: ds 1
 wcd73:: ds 1
 wcd74:: ds 1
 
-wOTMonSelection:: ds 2 ; ds 3
+wOTMonSelection:: ds 2 ; ds BATTLETOWER_PARTY_LENGTH
 wcd77:: ds 1
 
 wMobileCrashCheckPointer:: dw
@@ -1405,54 +1432,52 @@ wWindowStackSize:: db ; cf78
 
 	ds 8
 
-; menu data header
-wMenuDataHeader:: ; cf81
+; menu header
+wMenuHeader:: ; cf81
 wMenuFlags:: db
 wMenuBorderTopCoord:: db
 wMenuBorderLeftCoord:: db
 wMenuBorderBottomCoord:: db
 wMenuBorderRightCoord:: db
-wMenuData2Pointer:: dw
+wMenuDataPointer:: dw
 wMenuCursorBuffer:: dw
 wMenuDataBank:: db
 	ds 6
-wMenuDataHeaderEnd::
-
-wMenuData2::
-; MenuData2
+wMenuHeaderEnd::
 
-wMenuData2Flags:: db ; cf91
+wMenuData::
+wMenuDataFlags:: db ; cf91
 
 UNION ; cf92
 ; Vertical Menu/DoNthMenu/SetUpMenu
-wMenuData2Items:: db ; cf92
-wMenuData2IndicesPointer:: dw ; cf94
-wMenuData2DisplayFunctionPointer:: dw ; cf96
-wMenuData2PointerTableAddr:: dw ; cf97
+wMenuDataItems:: db ; cf92
+wMenuDataIndicesPointer:: dw ; cf94
+wMenuDataDisplayFunctionPointer:: dw ; cf96
+wMenuDataPointerTableAddr:: dw ; cf97
 
 NEXTU ; cf92
 ; 2D Menu
-wMenuData2_2DMenuDimensions:: db ; cf92
-wMenuData2_2DMenuSpacing:: db ; cf93
-wMenuData2_2DMenuItemStringsBank:: db ; cf94
-wMenuData2_2DMenuItemStringsAddr:: dw ; cf96
-wMenuData2_2DMenuFunctionBank:: db ; cf97
-wMenuData2_2DMenuFunctionAddr:: dw ; cf98
+wMenuData_2DMenuDimensions:: db ; cf92
+wMenuData_2DMenuSpacing:: db ; cf93
+wMenuData_2DMenuItemStringsBank:: db ; cf94
+wMenuData_2DMenuItemStringsAddr:: dw ; cf96
+wMenuData_2DMenuFunctionBank:: db ; cf97
+wMenuData_2DMenuFunctionAddr:: dw ; cf98
 
 NEXTU ; cf92
 ; Scrolling Menu
-wMenuData2_ScrollingMenuHeight:: db ; cf92
-wMenuData2_ScrollingMenuWidth:: db ; cf93
-wMenuData2_ScrollingMenuSpacing:: db ; cf94
-wMenuData2_ItemsPointerBank:: db ; cf95
-wMenuData2_ItemsPointerAddr:: dw ; cf97
-wMenuData2_ScrollingMenuFunction1:: ds 3 ; cf98
-wMenuData2_ScrollingMenuFunction2:: ds 3 ; cf9b
-wMenuData2_ScrollingMenuFunction3:: ds 3 ; cf9e
+wMenuData_ScrollingMenuHeight:: db ; cf92
+wMenuData_ScrollingMenuWidth:: db ; cf93
+wMenuData_ScrollingMenuSpacing:: db ; cf94
+wMenuData_ItemsPointerBank:: db ; cf95
+wMenuData_ItemsPointerAddr:: dw ; cf97
+wMenuData_ScrollingMenuFunction1:: ds 3 ; cf98
+wMenuData_ScrollingMenuFunction2:: ds 3 ; cf9b
+wMenuData_ScrollingMenuFunction3:: ds 3 ; cf9e
 ENDU ; cfa1
-wMenuData2End::
+wMenuDataEnd::
 
-wMenuData3::
+w2DMenuData::
 w2DMenuCursorInitY:: db ; cfa1
 w2DMenuCursorInitX:: db ; cfa2
 w2DMenuNumRows:: db ; cfa3
@@ -1470,7 +1495,7 @@ w2DMenuFlags1:: ; cfa5
 w2DMenuFlags2:: db ; cfa6
 w2DMenuCursorOffsets:: db ; cfa7
 wMenuJoypadFilter:: db ; cfa8
-wMenuData3End::
+w2DMenuDataEnd::
 
 wMenuCursorY:: db ; cfa9
 wMenuCursorX:: db ; cfaa
@@ -1491,13 +1516,17 @@ wFarCallBCBuffer:: dw ; cfb9
 wcfbb:: db
 
 wGameTimerPause:: ; cfbc
-; bit 0
+; bit 0: game timer paused
+; bit 7: something mobile
 	db
 
 	ds 1
 
-wcfbe:: ; SGB flags?
-; bit 7
+wcfbe:: ; cfbe
+; bits 4, 6, or 7 can be used to disable joypad input
+; bit 4
+; bit 6: mon fainted?
+; bit 7: SGB flag?
 	db
 
 	ds 1
@@ -1618,16 +1647,15 @@ wMartItem7BCD:: ds 3
 wMartItem8BCD:: ds 3
 wMartItem9BCD:: ds 3
 wMartItem10BCD:: ds 3
-wMartItemBCDEnd::
 
 NEXTU ; d002
 ; town map data
-wTownMapPlayerIconLandmark:: ds 1
+wTownMapPlayerIconLandmark:: db
 UNION
-wTownMapCursorLandmark:: ds 1
-wTownMapCursorObjectPointer:: ds 2
+wTownMapCursorLandmark:: db
+wTownMapCursorObjectPointer:: dw
 NEXTU
-wTownMapCursorCoordinates:: ds 2
+wTownMapCursorCoordinates:: dw
 ENDU
 
 NEXTU ; d002
@@ -1641,7 +1669,7 @@ wCurrentRadioLine:: db
 wNextRadioLine:: db
 wRadioTextDelay:: db
 wNumRadioLinesPrinted:: db
-wOaksPkmnTalkSegmentCounter:: db
+wOaksPKMNTalkSegmentCounter:: db
 	ds 5
 wRadioText:: ds 2 * SCREEN_WIDTH
 wRadioTextEnd::
@@ -1885,7 +1913,11 @@ wVramState:: ; d0ed
 ;        flickers when climbing waterfall
 	db
 
-wBattleResult:: db ; d0ee
+wBattleResult:: ; d0ee
+; WIN, LOSE, or DRAW
+; bit 6: caught celebi
+; bit 7: box full
+	db
 wUsingItemWithSelect:: db ; d0ef
 
 UNION ; d0f0
@@ -1904,7 +1936,7 @@ wCurMessageScrollPosition:: db
 wCurMessageIndex:: db
 wMailboxCount:: db
 wMailboxItems:: ds MAILBOX_CAPACITY
-wMailboxEnd:: ds 1 ; d0fe
+wMailboxEnd:: ; d0fe
 ENDU ; d100
 
 wListPointer:: dw ; d100
@@ -1993,14 +2025,14 @@ wOverworldMapAnchor:: dw ; d194
 wMetatileStandingY:: db ; d196
 wMetatileStandingX:: db ; d197
 
-wPartialMapDef::
-wMapDataBank:: db ; d198
+wMapPartial::
+wMapAttributesBank:: db ; d198
 wMapTileset:: db ; d199
 wEnvironment:: db ; d19a
-wMapDataPointer:: dw ; d19b
-wPartialMapDefEnd::
+wMapAttributesPointer:: dw ; d19b
+wMapPartialEnd::
 
-wMapData:: ; d19d
+wMapAttributes:: ; d19d
 wMapBorderBlock:: db ; d19d
 ; width/height are in blocks (2x2 walkable tiles, 4x4 graphics tiles)
 wMapHeight:: db ; d19e
@@ -2012,7 +2044,7 @@ wMapScriptsPointer:: dw ; d1a4
 wMapEventsPointer:: dw ; d1a6
 ; bit set
 wMapConnections:: db ; d1a8
-wMapDataEnd::
+wMapAttributesEnd::
 
 wNorthMapConnection:: map_connection_struct wNorth ; d1a9
 wSouthMapConnection:: map_connection_struct wSouth ; d1b5
@@ -2027,7 +2059,7 @@ wTilesetBlocksAddress:: dw ; d1dd
 wTilesetCollisionBank:: db ; d1df
 wTilesetCollisionAddress:: dw ; d1e0
 wTilesetAnim:: dw ; bank 3f ; d1e2
-	ds 2  ; unused ; d1e4
+	ds 2 ; unused ; d1e4
 wTilesetPalettes:: dw ; bank 3f ; d1e6
 wTilesetEnd::
 
@@ -2097,7 +2129,6 @@ wEnemyMonCatchRate:: db ; d22b
 wEnemyMonBaseExp::   db ; d22c
 wEnemyMonEnd::
 
-
 wBattleMode:: ; d22d
 ; 0: overworld
 ; 1: wild battle
@@ -2199,11 +2230,11 @@ NEXTU ; d26b
 wOTPlayerName:: ds NAME_LENGTH ; d26b
 ENDU ; d276
 
-wOTPlayerID:: ds 2 ; d276
+wOTPlayerID:: dw ; d276
 	ds 8
-wOTPartyCount::   ds 1 ; d280
+wOTPartyCount::   db ; d280
 wOTPartySpecies:: ds PARTY_LENGTH ; d281
-wOTPartyEnd::     ds 1 ; legacy scripts don't check wPartyCount
+wOTPartyEnd::     db ; older code doesn't check PartyCount
 
 UNION ; d288
 ; ot party mons
@@ -2285,7 +2316,9 @@ wXYComparePointer:: dw ; d453
 wBattleScriptFlags:: dw ; d459
 wPlayerSpriteSetupFlags:: ; d45b
 ; bit 7: if set, cancel wPlayerAction
+; bit 6: RefreshMapSprites doesn't reload player sprite
 ; bit 5: if set, set facing according to bits 0-1
+; bit 2: female player has been transformed into male
 ; bits 0-1: direction facing
 	db
 wMapReentryScriptQueueFlag:: db ; d45c MemScriptFlag
@@ -2299,7 +2332,9 @@ wReceiveCallDelay_StartTime:: ds 3 ; d466
 wBugContestMinsRemaining:: db ; d46c
 wBugContestSecsRemaining:: db ; d46d
 	ds 2
-wMapStatusEnd:: ds 2 ; d470
+wMapStatusEnd:: ; d470
+
+	ds 2
 
 wCrystalData::
 wPlayerGender:: ; d472
@@ -2338,9 +2373,11 @@ wStartMinute:: db ; d4b8
 wStartSecond:: db ; d4b9
 
 wRTC:: ds 8 ; d4ba
-wDST:: db ; d4c2
+wDST:: ; d4c2
+; bit 7: dst
+	db
 
-wGameTime::
+wGameTime:: ; used only for BANK(wGameTime)
 wGameTimeCap::     db ; d4c3
 wGameTimeHours::   dw ; d4c4
 wGameTimeMinutes:: db ; d4c6
@@ -2360,19 +2397,19 @@ wFollowerMovementQueueLength:: db
 wFollowMovementQueue:: ds 5
 
 wObjectStructs:: ; d4d6
-	object_struct wPlayer
-	object_struct wObject1
-	object_struct wObject2
-	object_struct wObject3
-	object_struct wObject4
-	object_struct wObject5
-	object_struct wObject6
-	object_struct wObject7
-	object_struct wObject8
-	object_struct wObject9
-	object_struct wObject10
-	object_struct wObject11
-	object_struct wObject12
+wPlayerStruct::   object_struct wPlayer
+wObject1Struct::  object_struct wObject1
+wObject2Struct::  object_struct wObject2
+wObject3Struct::  object_struct wObject3
+wObject4Struct::  object_struct wObject4
+wObject5Struct::  object_struct wObject5
+wObject6Struct::  object_struct wObject6
+wObject7Struct::  object_struct wObject7
+wObject8Struct::  object_struct wObject8
+wObject9Struct::  object_struct wObject9
+wObject10Struct:: object_struct wObject10
+wObject11Struct:: object_struct wObject11
+wObject12Struct:: object_struct wObject12
 wObjectStructsEnd:: ; d6de
 
 wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE
@@ -2380,27 +2417,27 @@ wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE
 	ds 40
 
 wMapObjects:: ; d71e
-	map_object wPlayer
-	map_object wMap1
-	map_object wMap2
-	map_object wMap3
-	map_object wMap4
-	map_object wMap5
-	map_object wMap6
-	map_object wMap7
-	map_object wMap8
-	map_object wMap9
-	map_object wMap10
-	map_object wMap11
-	map_object wMap12
-	map_object wMap13
-	map_object wMap14
-	map_object wMap15
+wPlayerObject:: map_object wPlayer
+wMap1Object::   map_object wMap1
+wMap2Object::   map_object wMap2
+wMap3Object::   map_object wMap3
+wMap4Object::   map_object wMap4
+wMap5Object::   map_object wMap5
+wMap6Object::   map_object wMap6
+wMap7Object::   map_object wMap7
+wMap8Object::   map_object wMap8
+wMap9Object::   map_object wMap9
+wMap10Object::  map_object wMap10
+wMap11Object::  map_object wMap11
+wMap12Object::  map_object wMap12
+wMap13Object::  map_object wMap13
+wMap14Object::  map_object wMap14
+wMap15Object::  map_object wMap15
 wMapObjectsEnd::
 
 wObjectMasks:: ds NUM_OBJECTS ; d81e
 
-wVariableSprites:: ds 16; d82e
+wVariableSprites:: ds $100 - SPRITE_VARS ; d82e
 
 wEnteredMapFromContinue:: db ; d83e
 	ds 2
@@ -2414,30 +2451,36 @@ wCurTimeOfDay:: db ; d848
 
 wSecretID:: dw
 wStatusFlags:: ; d84c
-	; 0 - pokedex
-	; 1 - unown dex
-	; 2 -
-	; 3 - pokerus
-	; 4 - rocket signal
-	; 5 - wild encounters on/off
-	; 6 - hall of fame
-	; 7 - bug contest on
+; bit 0: pokedex
+; bit 1: unown dex
+; bit 2: flash
+; bit 3: caught pokerus
+; bit 4: rocket signal
+; bit 5: wild encounters on/off
+; bit 6: hall of fame
+; bit 7: bug contest on
 	db
 
 wStatusFlags2:: ; d84d
-	; 0 - rockets
-	; 1 -
-	; 2 - bug contest timer
-	; 3 -
-	; 4 - bike shop call
-	; 5 - pokerus
-	; 6 - berry juice?
-	; 7 - rockets in mahogany
+; bit 0: rockets
+; bit 1: safari game (unused)
+; bit 2: bug contest timer
+; bit 3: unused
+; bit 4: bike shop call
+; bit 5: can use sweet scent
+; bit 6: reached goldenrod
+; bit 7: rockets in mahogany
 	db
 
 wMoney:: ds 3 ; d84e
 wMomsMoney:: ds 3 ; d851
-wMomSavingMoney:: db ; d854
+
+wMomSavingMoney:: ; d854
+; bit 0: saving some money
+; bit 1: saving half money (unused)
+; bit 2: saving all money (unused)
+; bit 7: active
+	db
 
 wCoins:: dw ; d855
 
@@ -2445,7 +2488,6 @@ wBadges::
 wJohtoBadges:: flag_array NUM_JOHTO_BADGES ; d857
 wKantoBadges:: flag_array NUM_KANTO_BADGES ; d858
 
-
 wTMsHMs:: ds NUM_TMS + NUM_HMS ; d859
 wTMsHMsEnd::
 
@@ -2482,7 +2524,7 @@ wRegisteredItem:: db ; d95c
 wPlayerState:: db ; d95d
 
 wHallOfFameCount:: dw
-wTradeFlags:: flag_array PARTY_LENGTH ; d960
+wTradeFlags:: flag_array NUM_NPC_TRADES ; d960
 	ds 1
 wMooMooBerries:: db ; d962
 wUndergroundSwitchPositions:: db ; d963
@@ -2513,7 +2555,7 @@ wHallOfFameSceneID::                              db ; d984
 wRoute27SceneID::                                 db ; d985
 wNewBarkTownSceneID::                             db ; d986
 wElmsLabSceneID::                                 db ; d987
-wKrissHouse1FSceneID::                            db ; d988
+wPlayersHouse1FSceneID::                          db ; d988
 wRoute29SceneID::                                 db ; d989
 wCherrygroveCitySceneID::                         db ; d98a
 wMrPokemonsHouseSceneID::                         db ; d98b
@@ -2528,7 +2570,7 @@ wGoldenrodPokecenter1FSceneID::                   db ; d993
 wOlivineCitySceneID::                             db ; d994
 wRoute34SceneID::                                 db ; d995
 wRoute34IlexForestGateSceneID::                   db ; d996
-wEcruteakHouseSceneID::                           db ; d997
+wEcruteakTinTowerEntranceSceneID::                db ; d997
 wWiseTriosRoomSceneID::                           db ; d998
 wEcruteakPokecenter1FSceneID::                    db ; d999
 wEcruteakGymSceneID::                             db ; d99a
@@ -2568,7 +2610,7 @@ wVermilionPortSceneID::                           db ; d9bb
 wFastShip1FSceneID::                              db ; d9bc
 wFastShipB1FSceneID::                             db ; d9bd
 wMountMoonSquareSceneID::                         db ; d9be
-wMobileTradeRoomMobileSceneID::                   db ; d9bf
+wMobileTradeRoomSceneID::                         db ; d9bf
 wMobileBattleRoomSceneID::                        db ; d9c0
 
 	ds 49
@@ -2618,7 +2660,9 @@ wCurBox:: db ; db72
 ; 8 chars + $50
 wBoxNames:: ds BOX_NAME_LENGTH * NUM_BOXES ; db75
 
-wCelebiEvent:: db
+wCelebiEvent:: ; dbf3
+; bit 2: forest is restless
+	db
 
 	ds 1
 
@@ -2627,8 +2671,7 @@ wBikeFlags:: ; dbf5
 ; bit 1: always on bike
 ; bit 2: downhill
 	db
-
-	ds 1
+	ds 1 ; cleared along with wBikeFlags by ResetBikeFlags
 
 wCurrMapSceneScriptPointer:: dw ; dbf7
 
@@ -2713,7 +2756,8 @@ wPhoneList:: ds CONTACT_LIST_SIZE ; dc7c
 ; dc86
 	ds 23
 
-wLuckyNumberShowFlag:: dw ; dc9d
+wLuckyNumberShowFlag:: db ; dc9d
+	ds 1
 wLuckyIDNumber:: dw ; dc9f
 
 wRepelEffect:: db ; If a Repel is in use, it contains the nr of steps it's still active
@@ -2722,7 +2766,6 @@ wKurtApricornQuantity:: db
 
 wPlayerDataEnd::
 
-
 wCurrMapData::
 
 wVisitedSpawns:: flag_array NUM_SPAWNS ; dca5
@@ -2747,7 +2790,7 @@ wMapGroup:: db ; dcb5 ; map group of current map
 wMapNumber:: db ; dcb6 ; map number of current map
 wYCoord:: db ; dcb7 ; current y coordinate relative to top-left corner of current map
 wXCoord:: db ; dcb8 ; current x coordinate relative to top-left corner of current map
-wScreenSave:: ds 6 * 5
+wScreenSave:: ds SCREEN_META_WIDTH * SCREEN_META_HEIGHT
 
 wCurrMapDataEnd::
 
@@ -2756,9 +2799,9 @@ SECTION "Party", WRAMX
 
 wPokemonData::
 
-wPartyCount:: db ; dcd7 ; number of Pokémon in party
+wPartyCount::   db ; dcd7 ; number of Pokémon in party
 wPartySpecies:: ds PARTY_LENGTH ; dcd8 ; species of each Pokémon in party
-wPartyEnd:: db ; dcde ; legacy scripts don't check wPartyCount
+wPartyEnd::     db ; dcde ; older code doesn't check wPartyCount
 
 wPartyMons::
 wPartyMon1:: party_struct wPartyMon1 ; dcdf
@@ -2787,8 +2830,8 @@ wFirstUnownSeen:: db
 
 wDayCareMan:: ; def5
 ; bit 7: active
-; bit 6: monsters are compatible
-; bit 5: egg ready
+; bit 6: egg ready
+; bit 5: monsters are compatible
 ; bit 0: monster 1 in day-care
 	db
 
@@ -2943,7 +2986,7 @@ w3_dffc:: ds 4
 SECTION "GBC Video", WRAMX
 
 ; eight 4-color palettes each
-wGBCPalettes::
+wGBCPalettes:: ; used only for BANK(wGBCPalettes)
 wBGPals1:: ds 8 palettes ; d000
 wOBPals1:: ds 8 palettes ; d040
 wBGPals2:: ds 8 palettes ; d080
@@ -2954,7 +2997,7 @@ wLYOverridesEnd:: ; d190
 
 	ds 1
 
-wMagnetTrain::
+wMagnetTrain:: ; used only for BANK(wMagnetTrain)
 wMagnetTrainDirection:: db
 wMagnetTrainInitPosition:: db
 wMagnetTrainHoldPosition:: db